summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxplat <xplat>2002-10-29 01:00:09 (GMT)
committerxplat <xplat>2002-10-29 01:00:09 (GMT)
commit75a0bae14fcc60e294ffa4f11f5ffa8311304c76 (patch)
treebeb4518a11189cc4e1d1c3e28afaad9a76925ec1
parent7b6893ab4c5519bb61a492e8ced52d48cb884cd1 (diff)
downloadmoo-cvs-INLINEPC.zip
moo-cvs-INLINEPC.tar.gz
moo-cvs-INLINEPC.tar.bz2
moo-cvs-INLINEPC.tar.xz
Changed PMODE_* to PARSE_* for clarity.CONSTANTS.ROOTINLINEPC
-rw-r--r--db_io.c9
-rw-r--r--execute.c5
-rw-r--r--parser.h9
-rw-r--r--parser.y13
-rw-r--r--tasks.c5
5 files changed, 28 insertions, 13 deletions
diff --git a/db_io.c b/db_io.c
index 510693d..b84548b 100644
--- a/db_io.c
+++ b/db_io.c
@@ -307,7 +307,7 @@ dbio_read_program(DB_Version version, const char *(*fmtr) (void *), void *data)
s.prev_char = '\n';
s.fmtr = fmtr;
s.data = data;
- return parse_program(version, parser_client, &s, PMODE_VERB, 0, 0, 0);
+ return parse_program(version, parser_client, &s, PARSE_VERB, 0, 0, 0);
}
Program *
@@ -319,7 +319,7 @@ dbio_read_active_program(DB_Version version, const char *(*fmtr) (void *),
s.prev_char = '\n';
s.fmtr = fmtr;
s.data = data;
- return parse_program(version, parser_client, &s, PMODE_COMPAT, orig_names, pc_vector, pc);
+ return parse_program(version, parser_client, &s, PARSE_COMPAT, orig_names, pc_vector, pc);
}
Program *
@@ -330,7 +330,7 @@ dbio_read_forked_program(DB_Version version, const char *(*fmtr) (void *), void
s.prev_char = '\n';
s.fmtr = fmtr;
s.data = data;
- return parse_program(version, parser_client, &s, PMODE_FORK, orig_names, 0, 0);
+ return parse_program(version, parser_client, &s, PARSE_FORK, orig_names, 0, 0);
}
@@ -450,6 +450,9 @@ char rcsid_db_io[] = "$Id$";
/*
* $Log$
+ * Revision 1.5.6.4 2002/10/29 01:00:09 xplat
+ * Changed PMODE_* to PARSE_* for clarity.
+ *
* Revision 1.5.6.3 2002/10/27 22:48:12 xplat
* Changes to support PCs located in vectors other than MAIN_VECTOR.
*
diff --git a/execute.c b/execute.c
index 8ceaf5d..8a4b4ad 100644
--- a/execute.c
+++ b/execute.c
@@ -3071,7 +3071,7 @@ reparse_for_upgrade(Stream * s, DB_Version old_version, Names ** orig_names, int
contents = stream_contents(s);
/* root activations must be treated carefully -- they may be disembodied fork vectors */
- return parse_program(old_version, string_parser_client, &contents, (is_root ? PMODE_FORK : PMODE_VERB), orig_names, pc_vector, pc);
+ return parse_program(old_version, string_parser_client, &contents, (is_root ? PARSE_FORK : PARSE_VERB), orig_names, pc_vector, pc);
}
static int
@@ -3100,6 +3100,9 @@ char rcsid_execute[] = "$Id$";
/*
* $Log$
+ * Revision 1.13.6.7 2002/10/29 01:00:13 xplat
+ * Changed PMODE_* to PARSE_* for clarity.
+ *
* Revision 1.13.6.6 2002/10/27 22:48:12 xplat
* Changes to support PCs located in vectors other than MAIN_VECTOR.
*
diff --git a/parser.h b/parser.h
index fa50f2e..6ef1de7 100644
--- a/parser.h
+++ b/parser.h
@@ -30,9 +30,9 @@ typedef struct {
} Parser_Client;
typedef enum {
- PMODE_COMPAT,
- PMODE_VERB,
- PMODE_FORK
+ PARSE_COMPAT,
+ PARSE_VERB,
+ PARSE_FORK
} Parser_Mode;
extern Program *parse_program(DB_Version, Parser_Client, void *,
@@ -43,6 +43,9 @@ extern Program *parse_list_as_program(Var code, Var * errors);
/*
* $Log$
+ * Revision 1.3.6.3 2002/10/29 01:00:22 xplat
+ * Changed PMODE_* to PARSE_* for clarity.
+ *
* Revision 1.3.6.2 2002/10/27 22:48:12 xplat
* Changes to support PCs located in vectors other than MAIN_VECTOR.
*
diff --git a/parser.y b/parser.y
index 0c86e58..2a38bb1 100644
--- a/parser.y
+++ b/parser.y
@@ -1139,7 +1139,7 @@ parse_program(DB_Version version, Parser_Client c, void *data,
lineno = 1;
client = c;
client_data = data;
- local_names = new_builtin_names(version, mode != PMODE_COMPAT);
+ local_names = new_builtin_names(version, mode != PARSE_COMPAT);
dollars_ok = 0;
loop_stack = 0;
language_version = version;
@@ -1166,7 +1166,7 @@ parse_program(DB_Version version, Parser_Client c, void *data,
if (original_names)
*original_names = copy_names(local_names);
- if (must_rename_keywords && (mode != PMODE_COMPAT)) {
+ if (must_rename_keywords && (mode != PARSE_COMPAT)) {
/* One or more new keywords were used as identifiers in this code,
* possibly as local variable names (but maybe only as property or
* verb names). Such local variables must be renamed to avoid a
@@ -1191,7 +1191,7 @@ parse_program(DB_Version version, Parser_Client c, void *data,
}
}
- if ((mode != PMODE_COMPAT) && (version < DBV_Float)) {
+ if ((mode != PARSE_COMPAT) && (version < DBV_Float)) {
int bad_slot;
const char *name;
@@ -1225,7 +1225,7 @@ parse_program(DB_Version version, Parser_Client c, void *data,
local_names->names[SLOT_INT] = str_dup("INT");
}
- prog = generate_code(prog_start, (mode == PMODE_COMPAT) ? version : current_version, pc_vector, pc);
+ prog = generate_code(prog_start, (mode == PARSE_COMPAT) ? version : current_version, pc_vector, pc);
prog->num_var_names = local_names->size;
prog->var_names = local_names->names;
@@ -1289,7 +1289,7 @@ parse_list_as_program(Var code, Var *errors)
state.cur_string = 1;
state.cur_char = 0;
state.errors = new_list(0);
- program = parse_program(current_version, list_parser_client, &state, PMODE_VERB, 0, 0, 0);
+ program = parse_program(current_version, list_parser_client, &state, PARSE_VERB, 0, 0, 0);
*errors = state.errors;
return program;
@@ -1299,6 +1299,9 @@ char rcsid_parser[] = "$Id$";
/*
* $Log$
+ * Revision 1.2.6.4 2002/10/29 01:00:24 xplat
+ * Changed PMODE_* to PARSE_* for clarity.
+ *
* Revision 1.2.6.3 2002/10/27 22:48:12 xplat
* Changes to support PCs located in vectors other than MAIN_VECTOR.
*
diff --git a/tasks.c b/tasks.c
index 39a6b49..d4f0991 100644
--- a/tasks.c
+++ b/tasks.c
@@ -418,7 +418,7 @@ end_programming(tqueue * tq)
s.nerrors = 0;
s.input = stream_contents(tq->program_stream);
- program = parse_program(current_version, client, &s, PMODE_VERB, 0, 0, 0);
+ program = parse_program(current_version, client, &s, PARSE_VERB, 0, 0, 0);
sprintf(buf, "%d error(s).", s.nerrors);
notify(player, buf);
@@ -2014,6 +2014,9 @@ char rcsid_tasks[] = "$Id$";
/*
* $Log$
+ * Revision 1.9.6.5 2002/10/29 01:00:28 xplat
+ * Changed PMODE_* to PARSE_* for clarity.
+ *
* Revision 1.9.6.4 2002/10/27 22:48:12 xplat
* Changes to support PCs located in vectors other than MAIN_VECTOR.
*