X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f0250de62e88cff12f9e5cb45b7757792a10e9fe..bc933ef16d171af4f27616649c7a99c77e9b75fe:/src/lalr.c?ds=sidebyside diff --git a/src/lalr.c b/src/lalr.c index 9dda7f05..3267172b 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,139 +26,66 @@ #include "system.h" #include "bitset.h" +#include "bitsetv.h" +#include "relation.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" #include "derives.h" #include "getargs.h" -/* 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; short *goto_map = NULL; -short *from_state = NULL; -short *to_state = NULL; +state_number_t *from_state = NULL; +state_number_t *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; -/*---------------------------------------------------------------. -| digraph & traverse. | -| | -| The following variables are used as common storage between the | -| two. | -`---------------------------------------------------------------*/ - -static short **R; -static short *INDEX; -static short *VERTICES; -static int top; -static int infinity; - -static void -traverse (int i) -{ - int j; - int height; - - VERTICES[++top] = i; - INDEX[i] = height = top; - - if (R[i]) - for (j = 0; R[i][j] >= 0; ++j) - { - if (INDEX[R[i][j]] == 0) - traverse (R[i][j]); - - if (INDEX[i] > INDEX[R[i][j]]) - INDEX[i] = INDEX[R[i][j]]; - - bitset_or (F[i], F[i], F[R[i][j]]); - } - - if (INDEX[i] == height) - for (;;) - { - j = VERTICES[top--]; - INDEX[j] = infinity; - - if (i == j) - break; - - bitset_copy (F[j], F[i]); - } -} - - -static void -digraph (short **relation) -{ - int i; - - infinity = ngotos + 2; - INDEX = XCALLOC (short, ngotos + 1); - VERTICES = XCALLOC (short, ngotos + 1); - top = 0; - - R = relation; - - for (i = 0; i < ngotos; i++) - INDEX[i] = 0; - - for (i = 0; i < ngotos; i++) - if (INDEX[i] == 0 && R[i]) - traverse (i); - - XFREE (INDEX); - XFREE (VERTICES); -} static void initialize_LA (void) { - size_t i; + state_number_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); - 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) { - size_t state; - int i; + state_number_t state; short *temp_map; goto_map = XCALLOC (short, nvars + 1) - ntokens; @@ -166,11 +94,12 @@ set_goto_map (void) ngotos = 0; for (state = 0; state < nstates; ++state) { - shifts *sp = states[state]->shifts; + shifts_t *sp = states[state]->shifts; + int i; 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)]++; @@ -179,6 +108,7 @@ set_goto_map (void) { int k = 0; + int i; for (i = ntokens; i < nsyms; i++) { temp_map[i] = k; @@ -192,12 +122,13 @@ set_goto_map (void) temp_map[nsyms] = ngotos; } - from_state = XCALLOC (short, ngotos); - to_state = XCALLOC (short, ngotos); + from_state = XCALLOC (state_number_t, ngotos); + to_state = XCALLOC (state_number_t, ngotos); for (state = 0; state < nstates; ++state) { - shifts *sp = states[state]->shifts; + shifts_t *sp = states[state]->shifts; + int i; for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i) { int k = temp_map[SHIFT_SYMBOL (sp, i)]++; @@ -216,12 +147,12 @@ set_goto_map (void) `----------------------------------------------------------*/ static int -map_goto (int state, int symbol) +map_goto (state_number_t state, symbol_number_t symbol) { int high; int low; int middle; - int s; + state_number_t s; low = goto_map[symbol]; high = goto_map[symbol + 1] - 1; @@ -253,14 +184,12 @@ initialize_F (void) int i; - F = XCALLOC (bitset, ngotos); - for (i = 0; i < ngotos; ++i) - F[i] = bitset_create (ntokens, BITSET_FIXED); + F = bitsetv_create (ngotos, ntokens, BITSET_FIXED); for (i = 0; i < ngotos; i++) { - int stateno = to_state[i]; - shifts *sp = states[stateno]->shifts; + state_number_t stateno = to_state[i]; + shifts_t *sp = states[stateno]->shifts; int j; for (j = 0; j < sp->nshifts && SHIFT_IS_SHIFT (sp, j); j++) @@ -268,7 +197,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); } @@ -276,13 +205,13 @@ 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; } } - digraph (reads); + relation_digraph (reads, ngotos, &F); for (i = 0; i < ngotos; i++) XFREE (reads[i]); @@ -293,115 +222,30 @@ initialize_F (void) static void -add_lookback_edge (state_t *state, int ruleno, int gotono) +add_lookback_edge (state_t *state, rule_number_t ruleno, int gotono) { int i; 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; -} - - -static void -matrix_print (FILE *out, short **matrix, int n) -{ - int i, j; - - for (i = 0; i < n; ++i) - { - fprintf (out, "%3d: ", i); - if (matrix[i]) - for (j = 0; matrix[i][j] != -1; ++j) - fprintf (out, "%3d ", matrix[i][j]); - fputc ('\n', out); - } - fputc ('\n', out); + lookback[(state->lookaheads - LA) + i] = sp; } -/*-------------------------------------------------------------------. -| Return the transpose of R_ARG, of size N. Destroy R_ARG, as it is | -| replaced with the result. | -| | -| R_ARG[I] is NULL or a -1 terminated list of numbers. | -| | -| RESULT[NUM] is NULL or the -1 terminated list of the I such as NUM | -| is in R_ARG[I]. | -`-------------------------------------------------------------------*/ - -static short ** -transpose (short **R_arg, int n) -{ - /* The result. */ - short **new_R = XCALLOC (short *, n); - /* END_R[I] -- next entry of NEW_R[I]. */ - short **end_R = XCALLOC (short *, n); - /* NEDGES[I] -- total size of NEW_R[I]. */ - short *nedges = XCALLOC (short, n); - int i, j; - - if (trace_flag) - { - fputs ("transpose: input\n", stderr); - matrix_print (stderr, R_arg, n); - } - - /* Count. */ - for (i = 0; i < n; i++) - if (R_arg[i]) - for (j = 0; R_arg[i][j] >= 0; ++j) - ++nedges[R_arg[i][j]]; - - /* Allocate. */ - for (i = 0; i < n; i++) - if (nedges[i] > 0) - { - short *sp = XCALLOC (short, nedges[i] + 1); - sp[nedges[i]] = -1; - new_R[i] = sp; - end_R[i] = sp; - } - - /* Store. */ - for (i = 0; i < n; i++) - if (R_arg[i]) - for (j = 0; R_arg[i][j] >= 0; ++j) - { - *end_R[R_arg[i][j]] = i; - ++end_R[R_arg[i][j]]; - } - - free (nedges); - free (end_R); - - /* Free the input: it is replaced with the result. */ - for (i = 0; i < n; i++) - XFREE (R_arg[i]); - free (R_arg); - - if (trace_flag) - { - fputs ("transpose: output\n", stderr); - matrix_print (stderr, new_R, n); - } - - return new_R; -} static void build_relations (void) { short *edge = XCALLOC (short, ngotos + 1); - short *states1 = XCALLOC (short, ritem_longest_rhs () + 1); + state_number_t *states1 = XCALLOC (state_number_t, ritem_longest_rhs () + 1); int i; includes = XCALLOC (short *, ngotos); @@ -409,28 +253,21 @@ build_relations (void) for (i = 0; i < ngotos; i++) { int nedges = 0; - int symbol1 = states[to_state[i]]->accessing_symbol; - short *rulep; + symbol_number_t symbol1 = states[to_state[i]]->accessing_symbol; + rule_number_t *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) - break; - } - + state = shifts_to (state->shifts, + item_number_as_symbol_number (*rp)); states1[length++] = state->number; } @@ -446,7 +283,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; } @@ -466,7 +305,7 @@ build_relations (void) XFREE (edge); XFREE (states1); - includes = transpose (includes, ngotos); + relation_transpose (&includes, ngotos); } @@ -476,7 +315,7 @@ compute_FOLLOWS (void) { int i; - digraph (includes); + relation_digraph (includes, ngotos, &F); for (i = 0; i < ngotos; i++) XFREE (includes[i]); @@ -500,27 +339,28 @@ 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; + state_number_t i; nLA = 0; + + /* Count */ for (i = 0; i < nstates; i++) { int k; int nlookaheads = 0; - reductions *rp = states[i]->reductions; - shifts *sp = states[i]->shifts; + reductions_t *rp = states[i]->reductions; + shifts_t *sp = states[i]->shifts; /* We need a lookahead either to distinguish different reductions (i.e., there are two or more), or to distinguish a @@ -540,12 +380,34 @@ initialize_lookaheads (void) } states[i]->nlookaheads = nlookaheads; - states[i]->lookaheadsp = nLA; nLA += nlookaheads; } } +/*--------------------------------------. +| Initializing the lookaheads members. | +`--------------------------------------*/ + +static void +states_lookaheads_initialize (void) +{ + state_number_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. | `---------------------------------------*/ @@ -553,7 +415,7 @@ initialize_lookaheads (void) static void lookaheads_print (FILE *out) { - size_t i; + state_number_t i; int j, k; fprintf (out, "Lookaheads: BEGIN\n"); for (i = 0; i < nstates; ++i) @@ -562,11 +424,12 @@ lookaheads_print (FILE *out) i, states[i]->nlookaheads); for (j = 0; j < states[i]->nlookaheads; ++j) - for (k = 0; k < ntokens; ++k) - if (bitset_test (LA[states[i]->lookaheadsp + j], j)) - fprintf (out, " on %d (%s) -> rule %d\n", - k, symbols[k]->tag, - -LAruleno[states[i]->lookaheadsp + j] - 1); + BITSET_EXECUTE (states[i]->lookaheads[j], 0, k, + { + fprintf (out, " on %d (%s) -> rule %d\n", + k, symbol_tag_get (symbols[k]), + states[i]->lookaheads_rule[j]->number - 1); + }); } fprintf (out, "Lookaheads: END\n"); } @@ -574,8 +437,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 ();