X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0e721e7569828defbeb88572e7a1e331ee665006..366eea36d3a9aaccf80a78c2fcd8c3cd6b563e25:/src/lalr.c diff --git a/src/lalr.c b/src/lalr.c index 5b2761c3..14a3e231 100644 --- a/src/lalr.c +++ b/src/lalr.c @@ -1,5 +1,6 @@ /* Compute look-ahead criteria for bison, - Copyright 1984, 1986, 1989, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002 + Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -25,11 +26,13 @@ #include "system.h" #include "bitset.h" +#include "bitsetv.h" +#include "quotearg.h" +#include "symtab.h" +#include "gram.h" #include "reader.h" #include "types.h" #include "LR0.h" -#include "symtab.h" -#include "gram.h" #include "complain.h" #include "lalr.h" #include "nullable.h" @@ -39,8 +42,8 @@ /* All the decorated states, indexed by the state number. */ state_t **states = NULL; -short *LAruleno = NULL; -bitset *LA = NULL; +rule_t **LArule = NULL; +bitsetv LA = NULL; size_t nLA; static int ngotos; @@ -50,7 +53,7 @@ short *to_state = NULL; /* And for the famous F variable, which name is so descriptive that a comment is hardly needed. . */ -static bitset *F = NULL; +static bitsetv F = NULL; static short **includes; static shorts **lookback; @@ -133,26 +136,21 @@ initialize_LA (void) { size_t i; int j; - short *np; + rule_t **np; /* Avoid having to special case 0. */ if (!nLA) nLA = 1; - LA = XCALLOC (bitset, nLA); - for (i = 0; i < nLA; ++i) - { - LA[i] = bitset_create (ntokens, BITSET_FIXED); - bitset_zero (LA[i]); - } - LAruleno = XCALLOC (short, nLA); + LA = bitsetv_create (nLA, ntokens, BITSET_FIXED); + LArule = XCALLOC (rule_t *, nLA); lookback = XCALLOC (shorts *, nLA); - np = LAruleno; + np = LArule; for (i = 0; i < nstates; i++) if (!states[i]->consistent) for (j = 0; j < states[i]->reductions->nreds; j++) - *np++ = states[i]->reductions->rules[j]; + *np++ = &rules[states[i]->reductions->rules[j]]; } @@ -172,8 +170,8 @@ set_goto_map (void) shifts *sp = states[state]->shifts; for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i) { - if (ngotos == MAXSHORT) - fatal (_("too many gotos (max %d)"), MAXSHORT); + if (ngotos == SHRT_MAX) + fatal (_("too many gotos (max %d)"), SHRT_MAX); ngotos++; goto_map[SHIFT_SYMBOL (sp, i)]++; @@ -219,7 +217,7 @@ set_goto_map (void) `----------------------------------------------------------*/ static int -map_goto (int state, int symbol) +map_goto (int state, symbol_number_t symbol) { int high; int low; @@ -256,12 +254,7 @@ initialize_F (void) int i; - F = XCALLOC (bitset, ngotos); - for (i = 0; i < ngotos; ++i) - { - F[i] = bitset_create (ntokens, BITSET_FIXED); - bitset_zero (F[i]); - } + F = bitsetv_create (ngotos, ntokens, BITSET_FIXED); for (i = 0; i < ngotos; i++) { @@ -274,7 +267,7 @@ initialize_F (void) for (; j < sp->nshifts; j++) { - int symbol = SHIFT_SYMBOL (sp, j); + symbol_number_t symbol = SHIFT_SYMBOL (sp, j); if (nullable[symbol]) edge[nedges++] = map_goto (stateno, symbol); } @@ -282,7 +275,7 @@ initialize_F (void) if (nedges) { reads[i] = XCALLOC (short, nedges + 1); - shortcpy (reads[i], edge, nedges); + memcpy (reads[i], edge, nedges * sizeof (edge[0])); reads[i][nedges] = -1; nedges = 0; } @@ -305,15 +298,15 @@ add_lookback_edge (state_t *state, int ruleno, int gotono) shorts *sp; for (i = 0; i < state->nlookaheads; ++i) - if (LAruleno[state->lookaheadsp + i] == ruleno) + if (state->lookaheads_rule[i]->number == ruleno) break; - assert (LAruleno[state->lookaheadsp + i] == ruleno); + assert (state->lookaheads_rule[i]->number == ruleno); sp = XCALLOC (shorts, 1); - sp->next = lookback[state->lookaheadsp + i]; + sp->next = lookback[(state->lookaheads - LA) + i]; sp->value = gotono; - lookback[state->lookaheadsp + i] = sp; + lookback[(state->lookaheads - LA) + i] = sp; } @@ -415,25 +408,26 @@ build_relations (void) for (i = 0; i < ngotos; i++) { int nedges = 0; - int symbol1 = states[to_state[i]]->accessing_symbol; + symbol_number_t symbol1 = states[to_state[i]]->accessing_symbol; short *rulep; for (rulep = derives[symbol1]; *rulep > 0; rulep++) { int done; int length = 1; - short *rp; + item_number_t *rp; state_t *state = states[from_state[i]]; states1[0] = state->number; - for (rp = &ritem[rules[*rulep].rhs]; *rp >= 0; rp++) + for (rp = rules[*rulep].rhs; *rp >= 0; rp++) { shifts *sp = state->shifts; int j; for (j = 0; j < sp->nshifts; j++) { state = states[sp->shifts[j]]; - if (state->accessing_symbol == *rp) + if (state->accessing_symbol + == item_number_as_symbol_number (*rp)) break; } @@ -452,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 symbol_number_t. */ + edge[nedges++] = map_goto (states1[--length], + item_number_as_symbol_number (*rp)); if (nullable[*rp]) done = 0; } @@ -506,21 +502,22 @@ compute_lookaheads (void) LIST_FREE (shorts, lookback[i]); XFREE (lookback); - for (i = 0; i < (unsigned) ngotos; ++i) - bitset_free (F[i]); - XFREE (F); + bitsetv_free (F); } -/*--------------------------------------. -| Initializing the lookaheads members. | -`--------------------------------------*/ +/*-------------------------------------------------------------. +| Count the number of lookaheads required for each state | +| (NLOOKAHEADS member). Compute the total number of LA, NLA. | +`-------------------------------------------------------------*/ static void -initialize_lookaheads (void) +states_lookaheads_count (void) { size_t i; nLA = 0; + + /* Count */ for (i = 0; i < nstates; i++) { int k; @@ -546,12 +543,34 @@ initialize_lookaheads (void) } states[i]->nlookaheads = nlookaheads; - states[i]->lookaheadsp = nLA; nLA += nlookaheads; } } +/*--------------------------------------. +| Initializing the lookaheads members. | +`--------------------------------------*/ + +static void +states_lookaheads_initialize (void) +{ + size_t i; + bitsetv pLA = LA; + rule_t **pLArule = LArule; + + /* Initialize the members LOOKAHEADS and LOOKAHEADS_RULE for each + state. */ + for (i = 0; i < nstates; i++) + { + states[i]->lookaheads = pLA; + states[i]->lookaheads_rule = pLArule; + pLA += states[i]->nlookaheads; + pLArule += states[i]->nlookaheads; + } +} + + /*---------------------------------------. | Output the lookaheads for each state. | `---------------------------------------*/ @@ -569,10 +588,10 @@ lookaheads_print (FILE *out) for (j = 0; j < states[i]->nlookaheads; ++j) for (k = 0; k < ntokens; ++k) - if (bitset_test (LA[states[i]->lookaheadsp + j], j)) + if (bitset_test (states[i]->lookaheads[j], k)) fprintf (out, " on %d (%s) -> rule %d\n", - k, symbols[k]->tag, - -LAruleno[states[i]->lookaheadsp + j] - 1); + k, symbol_tag_get (symbols[k]), + states[i]->lookaheads_rule[j]->number - 1); } fprintf (out, "Lookaheads: END\n"); } @@ -580,8 +599,9 @@ lookaheads_print (FILE *out) void lalr (void) { - initialize_lookaheads (); + states_lookaheads_count (); initialize_LA (); + states_lookaheads_initialize (); set_goto_map (); initialize_F (); build_relations ();