X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/29e8831621af57c5056380b68a96337e7647b850..366eea36d3a9aaccf80a78c2fcd8c3cd6b563e25:/src/lalr.c diff --git a/src/lalr.c b/src/lalr.c index c16c6f52..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. @@ -24,11 +25,14 @@ tokens they accept. */ #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" @@ -38,20 +42,18 @@ /* All the decorated states, indexed by the state number. */ state_t **states = NULL; -int tokensetsize; -short *LAruleno; -unsigned *LA; +rule_t **LArule = NULL; +bitsetv LA = NULL; size_t nLA; static int ngotos; -short *goto_map; -short *from_state; -short *to_state; +short *goto_map = NULL; +short *from_state = NULL; +short *to_state = NULL; /* And for the famous F variable, which name is so descriptive that a comment is hardly needed. . */ -static unsigned *F = NULL; -#define F(Rule) (F + (Rule) * tokensetsize) +static bitsetv F = NULL; static short **includes; static shorts **lookback; @@ -74,9 +76,7 @@ static void traverse (int i) { int j; - size_t k; int height; - size_t size = F (i + 1) - F(i); VERTICES[++top] = i; INDEX[i] = height = top; @@ -90,8 +90,7 @@ traverse (int i) if (INDEX[i] > INDEX[R[i][j]]) INDEX[i] = INDEX[R[i][j]]; - for (k = 0; k < size; ++k) - F (i)[k] |= F (R[i][j])[k]; + bitset_or (F[i], F[i], F[R[i][j]]); } if (INDEX[i] == height) @@ -103,8 +102,7 @@ traverse (int i) if (i == j) break; - for (k = 0; k < size; ++k) - F (j)[k] = F (i)[k]; + bitset_copy (F[j], F[i]); } } @@ -136,30 +134,31 @@ digraph (short **relation) static void initialize_LA (void) { - int i; + size_t i; int j; - short *np; + rule_t **np; /* Avoid having to special case 0. */ if (!nLA) nLA = 1; - LA = XCALLOC (unsigned, nLA * tokensetsize); - 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]]; } static void set_goto_map (void) { - int state, i; + size_t state; + int i; short *temp_map; goto_map = XCALLOC (short, nvars + 1) - ntokens; @@ -171,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)]++; @@ -218,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; @@ -255,7 +254,7 @@ initialize_F (void) int i; - F = XCALLOC (unsigned, ngotos * tokensetsize); + F = bitsetv_create (ngotos, ntokens, BITSET_FIXED); for (i = 0; i < ngotos; i++) { @@ -264,11 +263,11 @@ initialize_F (void) int j; for (j = 0; j < sp->nshifts && SHIFT_IS_SHIFT (sp, j); j++) - SETBIT (F (i), SHIFT_SYMBOL (sp, j)); + bitset_set (F[i], SHIFT_SYMBOL (sp, j)); 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); } @@ -276,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; } @@ -299,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; } @@ -409,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; } @@ -446,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; } @@ -493,31 +495,29 @@ compute_lookaheads (void) for (i = 0; i < nLA; i++) for (sp = lookback[i]; sp; sp = sp->next) - { - int size = LA (i + 1) - LA (i); - int j; - for (j = 0; j < size; ++j) - LA (i)[j] |= F (sp->value)[j]; - } + bitset_or (LA[i], LA[i], F[sp->value]); /* Free LOOKBACK. */ for (i = 0; i < nLA; i++) LIST_FREE (shorts, lookback[i]); XFREE (lookback); - 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) { - int i; + size_t i; nLA = 0; + + /* Count */ for (i = 0; i < nstates; i++) { int k; @@ -543,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. | `---------------------------------------*/ @@ -556,7 +578,8 @@ initialize_lookaheads (void) static void lookaheads_print (FILE *out) { - int i, j, k; + size_t i; + int j, k; fprintf (out, "Lookaheads: BEGIN\n"); for (i = 0; i < nstates; ++i) { @@ -565,10 +588,10 @@ lookaheads_print (FILE *out) for (j = 0; j < states[i]->nlookaheads; ++j) for (k = 0; k < ntokens; ++k) - if (BITISSET (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"); } @@ -576,10 +599,9 @@ lookaheads_print (FILE *out) void lalr (void) { - tokensetsize = WORDSIZE (ntokens); - - initialize_lookaheads (); + states_lookaheads_count (); initialize_LA (); + states_lookaheads_initialize (); set_goto_map (); initialize_F (); build_relations ();