X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/602bbf31c1fbb83a0e1703e35e33e1e8dc9b0fd2..e91ff6ce3d2653b41265591dafd4bdb32ae114c2:/src/lalr.c diff --git a/src/lalr.c b/src/lalr.c index 30e9f318..643f8fd9 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,9 +42,8 @@ /* All the decorated states, indexed by the state number. */ state_t **states = NULL; -int tokensetsize; -short *LAruleno = NULL; -bitset *LA = NULL; +rule_t **LArule = NULL; +bitsetv LA = NULL; size_t nLA; static int ngotos; @@ -51,8 +53,7 @@ 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; @@ -75,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; @@ -91,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) @@ -104,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]); } } @@ -139,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]]; } @@ -178,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)]++; @@ -225,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; @@ -262,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++) { @@ -271,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); + token_number_t symbol = SHIFT_SYMBOL (sp, j); if (nullable[symbol]) edge[nedges++] = map_goto (stateno, symbol); } @@ -283,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; } @@ -306,10 +298,10 @@ 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 (LArule[state->lookaheadsp + i]->number == ruleno) break; - assert (LAruleno[state->lookaheadsp + i] == ruleno); + assert (LArule[state->lookaheadsp + i]->number == ruleno); sp = XCALLOC (shorts, 1); sp->next = lookback[state->lookaheadsp + i]; @@ -416,25 +408,26 @@ 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++) { 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_token_number (*rp)) break; } @@ -453,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; } @@ -500,19 +495,14 @@ compute_lookaheads (void) for (i = 0; i < nLA; i++) for (sp = lookback[i]; sp; sp = sp->next) - { - int j; - for (j = 0; j < ntokens; ++j) - if (BITISSET (F (sp->value), j)) - bitset_set (LA[i], 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); } @@ -573,10 +563,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 (LA[states[i]->lookaheadsp + j], k)) fprintf (out, " on %d (%s) -> rule %d\n", - k, symbols[k]->tag, - -LAruleno[states[i]->lookaheadsp + j] - 1); + k, quotearg_style (escape_quoting_style, symbols[k]->tag), + LArule[states[i]->lookaheadsp + j]->number - 1); } fprintf (out, "Lookaheads: END\n"); } @@ -584,8 +574,6 @@ lookaheads_print (FILE *out) void lalr (void) { - tokensetsize = WORDSIZE (ntokens); - initialize_lookaheads (); initialize_LA (); set_goto_map ();