mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-15 23:33:03 +00:00
Propagate more token_number_t.
* src/gram.h (token_number_as_item_number) (item_number_as_token_number): New. * src/output.c (GENERATE_OUTPUT_TABLE): New. Use it to create output_item_number_table and output_token_number_table. * src/LR0.c, src/derives.c, src/gram.c, src/gram.h, src/lalr.c, * src/lex.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.c, src/symtab.h: Use token_number_t instead of shorts.
This commit is contained in:
@@ -278,12 +278,12 @@ reduce_grammar_tables (void)
|
||||
static void
|
||||
nonterminals_reduce (void)
|
||||
{
|
||||
int i, n;
|
||||
token_number_t i, n;
|
||||
|
||||
/* Map the nonterminals to their new index: useful first, useless
|
||||
afterwards. Kept for later report. */
|
||||
|
||||
short *nontermmap = XCALLOC (short, nvars) - ntokens;
|
||||
token_number_t *nontermmap = XCALLOC (token_number_t, nvars) - ntokens;
|
||||
n = ntokens;
|
||||
for (i = ntokens; i < nsyms; i++)
|
||||
if (bitset_test (V, i))
|
||||
@@ -308,7 +308,7 @@ nonterminals_reduce (void)
|
||||
|
||||
for (i = 0; i < nritems; ++i)
|
||||
if (ISVAR (ritem[i]))
|
||||
ritem[i] = nontermmap[ritem[i]];
|
||||
ritem[i] = token_number_as_item_number (nontermmap[ritem[i]]);
|
||||
|
||||
start_symbol = nontermmap[start_symbol];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user