Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 16:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Propagate more token_number_t.

Browse Source 
* 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:
Akim Demaille
2002-04-22 08:21:55 +00:00
parent 4f940944da
commit 5fbb0954b8
16 changed files with 137 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lalr.c
View File

@@ -217,7 +217,7 @@ set_goto_map (void)
`----------------------------------------------------------*/
static int
map_goto (int state, int symbol)
map_goto (int state, token_number_t symbol)
{
int high;
int low;
@@ -267,7 +267,7 @@ initialize_F (void)
for (; j < sp->nshifts; j++)
{
int symbol = SHIFT_SYMBOL (sp, j);
token_number_t symbol = SHIFT_SYMBOL (sp, j);
if (nullable[symbol])
edge[nedges++] = map_goto (stateno, symbol);
}
@@ -408,7 +408,7 @@ build_relations (void)
for (i = 0; i < ngotos; i++)
{
int nedges = 0;
int symbol1 = states[to_state[i]]->accessing_symbol;
token_number_t symbol1 = states[to_state[i]]->accessing_symbol;
short *rulep;
for (rulep = derives[symbol1]; *rulep > 0; rulep++)
@@ -426,7 +426,8 @@ build_relations (void)
for (j = 0; j < sp->nshifts; j++)
{
state = states[sp->shifts[j]];
if (state->accessing_symbol == *rp)
if (state->accessing_symbol
== item_number_as_token_number (*rp))
break;
}
@@ -445,7 +446,9 @@ build_relations (void)
/* JF added rp>=ritem && I hope to god its right! */
if (rp >= ritem && ISVAR (*rp))
{
edge[nedges++] = map_goto (states1[--length], *rp);
/* Downcasting from item_number_t to token_number_t. */
edge[nedges++] = map_goto (states1[--length],
item_number_as_token_number (*rp));
if (nullable[*rp])
done = 0;
}