* src/LR0.c, src/derives.c, src/gram.c, src/gram.h, src/lalr.c,

* src/nullable.c, src/output.c, src/print.c, src/print_graph.c,
* src/reader.c, src/reduce.c, src/state.h, src/symtab.h
(token_number_t, item_number_as_token_number)
(token_number_as_item_number, muscle_insert_token_number_table):
Rename as...
(symbol_number_t, item_number_as_symbol_number)
(symbol_number_as_item_number, muscle_insert_symbol_number_table):
these, since it is more appropriate.
This commit is contained in:
Akim Demaille
2002-05-26 18:39:05 +00:00
parent 5504898e82
commit a49aecd528
14 changed files with 63 additions and 51 deletions

View File

@@ -52,7 +52,7 @@ static state_t *this_state = NULL;
static state_t *last_state = NULL;
static int nshifts;
static token_number_t *shift_symbol = NULL;
static symbol_number_t *shift_symbol = NULL;
static short *redset = NULL;
static short *shiftset = NULL;
@@ -117,7 +117,7 @@ allocate_storage (void)
shiftset = XCALLOC (short, nsyms);
redset = XCALLOC (short, nrules + 1);
state_hash = XCALLOC (state_t *, STATE_HASH_SIZE);
shift_symbol = XCALLOC (token_number_t, nsyms);
shift_symbol = XCALLOC (symbol_number_t, nsyms);
}
@@ -164,8 +164,8 @@ new_itemsets (void)
for (i = 0; i < nritemset; ++i)
if (ritem[itemset[i]] >= 0)
{
token_number_t symbol
= item_number_as_token_number (ritem[itemset[i]]);
symbol_number_t symbol
= item_number_as_symbol_number (ritem[itemset[i]]);
if (!kernel_size[symbol])
{
shift_symbol[nshifts] = symbol;
@@ -185,7 +185,7 @@ new_itemsets (void)
`-----------------------------------------------------------------*/
static state_t *
new_state (token_number_t symbol, size_t core_size, item_number_t *core)
new_state (symbol_number_t symbol, size_t core_size, item_number_t *core)
{
state_t *p;
@@ -228,7 +228,7 @@ new_state (token_number_t symbol, size_t core_size, item_number_t *core)
`--------------------------------------------------------------*/
static int
get_state (token_number_t symbol, size_t core_size, item_number_t *core)
get_state (symbol_number_t symbol, size_t core_size, item_number_t *core)
{
int key;
size_t i;
@@ -297,7 +297,7 @@ append_states (void)
{
int i;
int j;
token_number_t symbol;
symbol_number_t symbol;
if (trace_flag)
fprintf (stderr, "Entering append_states, state = %d\n",