X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/43591cec981a3e7dd87bd1aef63ea0b9ec73c01c..22b081deb7ab1d0ec7a279e5213fa7fdc2c85207:/src/lalr.c diff --git a/src/lalr.c b/src/lalr.c index 76ad5173..1ceda002 100644 --- a/src/lalr.c +++ b/src/lalr.c @@ -1,723 +1,500 @@ -/* Compute look-ahead criteria for bison, - Copyright (C) 1984, 1986, 1989, 2000 Free Software Foundation, Inc. +/* Compute lookahead criteria for Bison. + + Copyright (C) 1984, 1986, 1989, 2000-2012 Free Software Foundation, + Inc. This file is part of Bison, the GNU Compiler Compiler. - Bison is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Bison is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with Bison; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + along with this program. If not, see . */ -/* Compute how to make the finite state machine deterministic; find - which rules need lookahead in each state, and which lookahead +/* Find which rules need lookahead in each state, and which lookahead tokens they accept. */ +#include #include "system.h" -#include "types.h" + +#include +#include + #include "LR0.h" -#include "xalloc.h" -#include "gram.h" #include "complain.h" +#include "derives.h" +#include "getargs.h" +#include "gram.h" #include "lalr.h" +#include "muscle-tab.h" #include "nullable.h" -#include "derives.h" +#include "reader.h" +#include "relation.h" +#include "symtab.h" + +goto_number *goto_map; +goto_number ngotos; +state_number *from_state; +state_number *to_state; +bitsetv goto_follows = NULL; + +/* Linked list of goto numbers. */ +typedef struct goto_list +{ + struct goto_list *next; + goto_number value; +} goto_list; -int tokensetsize; -short *lookaheads; -short *LAruleno; -unsigned *LA; -short *accessing_symbol; -char *consistent; -core **state_table; -shifts **shift_table; -reductions **reduction_table; -short *goto_map; -short *from_state; -short *to_state; - -extern void berror PARAMS ((const char *)); - -static int infinity; -static int maxrhs; -static int ngotos; -static unsigned *F; -static short **includes; -static shorts **lookback; -static short **R; -static short *INDEX; -static short *VERTICES; -static int top; +/* LA is an NLA by NTOKENS matrix of bits. LA[l, i] is 1 if the rule + LArule[l] is applicable in the appropriate state when the next + token is symbol i. If LA[l, i] and LA[l, j] are both 1 for i != j, + it is a conflict. */ -static void -traverse (int i) -{ - unsigned *fp1; - unsigned *fp2; - unsigned *fp3; - int j; - short *rp; +static bitsetv LA = NULL; +size_t nLA; - int height; - unsigned *base; - VERTICES[++top] = i; - INDEX[i] = height = top; +static goto_number **includes; +static goto_list **lookback; - base = F + i * tokensetsize; - fp3 = base + tokensetsize; - rp = R[i]; - if (rp) - { - while ((j = *rp++) >= 0) - { - if (INDEX[j] == 0) - traverse (j); - if (INDEX[i] > INDEX[j]) - INDEX[i] = INDEX[j]; - fp1 = base; - fp2 = F + j * tokensetsize; +void +set_goto_map (void) +{ + state_number s; + goto_number *temp_map; - while (fp1 < fp3) - *fp1++ |= *fp2++; - } - } + goto_map = xcalloc (nvars + 1, sizeof *goto_map); + temp_map = xnmalloc (nvars + 1, sizeof *temp_map); - if (INDEX[i] == height) + ngotos = 0; + for (s = 0; s < nstates; ++s) { - for (;;) - { - j = VERTICES[top--]; - INDEX[j] = infinity; + transitions *sp = states[s]->transitions; + int i; + for (i = sp->num - 1; i >= 0 && TRANSITION_IS_GOTO (sp, i); --i) + { + ngotos++; - if (i == j) - break; + /* Abort if (ngotos + 1) would overflow. */ + aver (ngotos != GOTO_NUMBER_MAXIMUM); - fp1 = base; - fp2 = F + j * tokensetsize; - - while (fp1 < fp3) - *fp2++ = *fp1++; - } + goto_map[TRANSITION_SYMBOL (sp, i) - ntokens]++; + } } -} + { + goto_number k = 0; + int i; + for (i = ntokens; i < nsyms; i++) + { + temp_map[i - ntokens] = k; + k += goto_map[i - ntokens]; + } -static void -digraph (short **relation) -{ - int i; + for (i = ntokens; i < nsyms; i++) + goto_map[i - ntokens] = temp_map[i - ntokens]; - infinity = ngotos + 2; - INDEX = XCALLOC (short, ngotos + 1); - VERTICES = XCALLOC (short, ngotos + 1); - top = 0; + goto_map[nsyms - ntokens] = ngotos; + temp_map[nsyms - ntokens] = ngotos; + } - R = relation; + from_state = xcalloc (ngotos, sizeof *from_state); + to_state = xcalloc (ngotos, sizeof *to_state); - for (i = 0; i < ngotos; i++) - INDEX[i] = 0; - - for (i = 0; i < ngotos; i++) + for (s = 0; s < nstates; ++s) { - if (INDEX[i] == 0 && R[i]) - traverse (i); + transitions *sp = states[s]->transitions; + int i; + for (i = sp->num - 1; i >= 0 && TRANSITION_IS_GOTO (sp, i); --i) + { + goto_number k = temp_map[TRANSITION_SYMBOL (sp, i) - ntokens]++; + from_state[k] = s; + to_state[k] = sp->states[i]->number; + } } - XFREE (INDEX); - XFREE (VERTICES); -} - -static void -set_state_table (void) -{ - core *sp; - - state_table = XCALLOC (core *, nstates); - - for (sp = first_state; sp; sp = sp->next) - state_table[sp->number] = sp; -} - - -static void -set_accessing_symbol (void) -{ - core *sp; - - accessing_symbol = XCALLOC (short, nstates); - - for (sp = first_state; sp; sp = sp->next) - accessing_symbol[sp->number] = sp->accessing_symbol; -} - - -static void -set_shift_table (void) -{ - shifts *sp; - - shift_table = XCALLOC (shifts *, nstates); - - for (sp = first_shift; sp; sp = sp->next) - shift_table[sp->number] = sp; + free (temp_map); } -static void -set_reduction_table (void) +goto_number +map_goto (state_number s0, symbol_number sym) { - reductions *rp; - - reduction_table = XCALLOC (reductions *, nstates); - - for (rp = first_reduction; rp; rp = rp->next) - reduction_table[rp->number] = rp; -} + goto_number high; + goto_number low; + goto_number middle; + state_number s; + low = goto_map[sym - ntokens]; + high = goto_map[sym - ntokens + 1] - 1; -static void -set_maxrhs (void) -{ - short *itemp; - int length; - int max; - - length = 0; - max = 0; - for (itemp = ritem; *itemp; itemp++) + for (;;) { - if (*itemp > 0) - { - length++; - } + aver (low <= high); + middle = (low + high) / 2; + s = from_state[middle]; + if (s == s0) + return middle; + else if (s < s0) + low = middle + 1; else - { - if (length > max) - max = length; - length = 0; - } + high = middle - 1; } - - maxrhs = max; } static void -initialize_LA (void) +initialize_F (void) { - int i; - int j; - int count; - reductions *rp; - shifts *sp; - short *np; + goto_number **reads = xnmalloc (ngotos, sizeof *reads); + goto_number *edge = xnmalloc (ngotos + 1, sizeof *edge); + goto_number nedges = 0; - consistent = XCALLOC (char, nstates); - lookaheads = XCALLOC (short, nstates + 1); - - count = 0; - for (i = 0; i < nstates; i++) - { - int k; + goto_number i; - lookaheads[i] = count; + goto_follows = bitsetv_create (ngotos, ntokens, BITSET_FIXED); - rp = reduction_table[i]; - sp = shift_table[i]; - if (rp && (rp->nreds > 1 - || (sp && !ISVAR (accessing_symbol[sp->shifts[0]])))) - count += rp->nreds; + for (i = 0; i < ngotos; i++) + { + state_number stateno = to_state[i]; + transitions *sp = states[stateno]->transitions; + + int j; + FOR_EACH_SHIFT (sp, j) + bitset_set (goto_follows[i], TRANSITION_SYMBOL (sp, j)); + + for (; j < sp->num; j++) + { + symbol_number sym = TRANSITION_SYMBOL (sp, j); + if (nullable[sym - ntokens]) + edge[nedges++] = map_goto (stateno, sym); + } + + if (nedges == 0) + reads[i] = NULL; else - consistent[i] = 1; - - if (sp) - for (k = 0; k < sp->nshifts; k++) - { - if (accessing_symbol[sp->shifts[k]] == error_token_number) - { - consistent[i] = 0; - break; - } - } + { + reads[i] = xnmalloc (nedges + 1, sizeof reads[i][0]); + memcpy (reads[i], edge, nedges * sizeof edge[0]); + reads[i][nedges] = END_NODE; + nedges = 0; + } } - lookaheads[nstates] = count; + relation_digraph (reads, ngotos, &goto_follows); - if (count == 0) - { - LA = XCALLOC (unsigned, 1 * tokensetsize); - LAruleno = XCALLOC (short, 1); - lookback = XCALLOC (shorts *, 1); - } - else - { - LA = XCALLOC (unsigned, count * tokensetsize); - LAruleno = XCALLOC (short, count); - lookback = XCALLOC (shorts *, count); - } + for (i = 0; i < ngotos; i++) + free (reads[i]); - np = LAruleno; - for (i = 0; i < nstates; i++) - { - if (!consistent[i]) - { - if ((rp = reduction_table[i])) - for (j = 0; j < rp->nreds; j++) - *np++ = rp->rules[j]; - } - } + free (reads); + free (edge); } static void -set_goto_map (void) +add_lookback_edge (state *s, rule *r, goto_number gotono) { - shifts *sp; - int i; - int symbol; - int k; - short *temp_map; - int state2; - int state1; - - goto_map = XCALLOC (short, nvars + 1) - ntokens; - temp_map = XCALLOC (short, nvars + 1) - ntokens; - - ngotos = 0; - for (sp = first_shift; sp; sp = sp->next) - { - for (i = sp->nshifts - 1; i >= 0; i--) - { - symbol = accessing_symbol[sp->shifts[i]]; - - if (ISTOKEN (symbol)) - break; - - if (ngotos == MAXSHORT) - fatal (_("too many gotos (max %d)"), MAXSHORT); - - ngotos++; - goto_map[symbol]++; - } - } - - k = 0; - for (i = ntokens; i < nsyms; i++) - { - temp_map[i] = k; - k += goto_map[i]; - } - - for (i = ntokens; i < nsyms; i++) - goto_map[i] = temp_map[i]; - - goto_map[nsyms] = ngotos; - temp_map[nsyms] = ngotos; - - from_state = XCALLOC (short, ngotos); - to_state = XCALLOC (short, ngotos); - - for (sp = first_shift; sp; sp = sp->next) - { - state1 = sp->number; - for (i = sp->nshifts - 1; i >= 0; i--) - { - state2 = sp->shifts[i]; - symbol = accessing_symbol[state2]; - - if (ISTOKEN (symbol)) - break; - - k = temp_map[symbol]++; - from_state[k] = state1; - to_state[k] = state2; - } - } - - XFREE (temp_map + ntokens); + int ri = state_reduction_find (s, r); + goto_list *sp = xmalloc (sizeof *sp); + sp->next = lookback[(s->reductions->lookahead_tokens - LA) + ri]; + sp->value = gotono; + lookback[(s->reductions->lookahead_tokens - LA) + ri] = sp; } -/*----------------------------------------------------------. -| Map a state/symbol pair into its numeric representation. | -`----------------------------------------------------------*/ - -static int -map_goto (int state, int symbol) +static void +build_relations (void) { - int high; - int low; - int middle; - int s; + goto_number *edge = xnmalloc (ngotos + 1, sizeof *edge); + state_number *states1 = xnmalloc (ritem_longest_rhs () + 1, sizeof *states1); + goto_number i; - low = goto_map[symbol]; - high = goto_map[symbol + 1] - 1; + includes = xnmalloc (ngotos, sizeof *includes); - while (low <= high) + for (i = 0; i < ngotos; i++) { - middle = (low + high) / 2; - s = from_state[middle]; - if (s == state) - return middle; - else if (s < state) - low = middle + 1; + int nedges = 0; + symbol_number symbol1 = states[to_state[i]]->accessing_symbol; + rule **rulep; + + for (rulep = derives[symbol1 - ntokens]; *rulep; rulep++) + { + bool done; + int length = 1; + item_number const *rp; + state *s = states[from_state[i]]; + states1[0] = s->number; + + for (rp = (*rulep)->rhs; ! item_number_is_rule_number (*rp); rp++) + { + s = transitions_to (s->transitions, + item_number_as_symbol_number (*rp)); + states1[length++] = s->number; + } + + if (!s->consistent) + add_lookback_edge (s, *rulep, i); + + length--; + done = false; + while (!done) + { + done = true; + /* Each rhs ends in a rule number, and there is a + sentinel (ritem[-1]=0) before the first rhs, so it is safe to + decrement RP here. */ + rp--; + if (ISVAR (*rp)) + { + /* Downcasting from item_number to symbol_number. */ + edge[nedges++] = map_goto (states1[--length], + item_number_as_symbol_number (*rp)); + if (nullable[*rp - ntokens]) + done = false; + } + } + } + + if (nedges == 0) + includes[i] = NULL; else - high = middle - 1; + { + int j; + includes[i] = xnmalloc (nedges + 1, sizeof includes[i][0]); + for (j = 0; j < nedges; j++) + includes[i][j] = edge[j]; + includes[i][nedges] = END_NODE; + } } - assert (0); - /* NOTREACHED */ - return 0; + free (edge); + free (states1); + + relation_transpose (&includes, ngotos); } + static void -initialize_F (void) +compute_FOLLOWS (void) { - int i; - int j; - int k; - shifts *sp; - short *edge; - unsigned *rowp; - short *rp; - short **reads; - int nedges; - int stateno; - int symbol; - int nwords; - - nwords = ngotos * tokensetsize; - F = XCALLOC (unsigned, nwords); - - reads = XCALLOC (short *, ngotos); - edge = XCALLOC (short, ngotos + 1); - nedges = 0; - - rowp = F; - for (i = 0; i < ngotos; i++) - { - stateno = to_state[i]; - sp = shift_table[stateno]; - - if (sp) - { - k = sp->nshifts; - - for (j = 0; j < k; j++) - { - symbol = accessing_symbol[sp->shifts[j]]; - if (ISVAR (symbol)) - break; - SETBIT (rowp, symbol); - } - - for (; j < k; j++) - { - symbol = accessing_symbol[sp->shifts[j]]; - if (nullable[symbol]) - edge[nedges++] = map_goto (stateno, symbol); - } - - if (nedges) - { - reads[i] = rp = XCALLOC (short, nedges + 1); - - for (j = 0; j < nedges; j++) - rp[j] = edge[j]; - - rp[nedges] = -1; - nedges = 0; - } - } - - rowp += tokensetsize; - } + goto_number i; - digraph (reads); + relation_digraph (includes, ngotos, &goto_follows); for (i = 0; i < ngotos; i++) - { - if (reads[i]) - XFREE (reads[i]); - } + free (includes[i]); - XFREE (reads); - XFREE (edge); + free (includes); } static void -add_lookback_edge (int stateno, int ruleno, int gotono) +compute_lookahead_tokens (void) { - int i; - int k; - int found; - shorts *sp; - - i = lookaheads[stateno]; - k = lookaheads[stateno + 1]; - found = 0; - while (!found && i < k) - { - if (LAruleno[i] == ruleno) - found = 1; - else - i++; - } + size_t i; + goto_list *sp; - assert (found); + for (i = 0; i < nLA; i++) + for (sp = lookback[i]; sp; sp = sp->next) + bitset_or (LA[i], LA[i], goto_follows[sp->value]); - sp = XCALLOC (shorts, 1); - sp->next = lookback[i]; - sp->value = gotono; - lookback[i] = sp; + /* Free LOOKBACK. */ + for (i = 0; i < nLA; i++) + LIST_FREE (goto_list, lookback[i]); + + free (lookback); } -static short ** -transpose (short **R_arg, int n) +/*----------------------------------------------------. +| Count the number of lookahead tokens required for S | +| (N_LOOKAHEAD_TOKENS member). | +`----------------------------------------------------*/ + +static int +state_lookahead_tokens_count (state *s, bool default_reduction_only_for_accept) { - short **new_R; - short **temp_R; - short *nedges; - short *sp; - int i; - int k; + int n_lookahead_tokens = 0; + reductions *rp = s->reductions; + transitions *sp = s->transitions; + + /* Transitions are only disabled during conflict resolution, and that + hasn't happened yet, so there should be no need to check that + transition 0 hasn't been disabled before checking if it is a shift. + However, this check was performed at one time, so we leave it as an + aver. */ + aver (sp->num == 0 || !TRANSITION_IS_DISABLED (sp, 0)); + + /* We need a lookahead either to distinguish different reductions + (i.e., there are two or more), or to distinguish a reduction from a + shift. Otherwise, it is straightforward, and the state is + `consistent'. However, do not treat a state with any reductions as + consistent unless it is the accepting state (because there is never + a lookahead token that makes sense there, and so no lookahead token + should be read) if the user has otherwise disabled default + reductions. */ + if (rp->num > 1 + || (rp->num == 1 && sp->num && TRANSITION_IS_SHIFT (sp, 0)) + || (rp->num == 1 && rp->rules[0]->number != 0 + && default_reduction_only_for_accept)) + n_lookahead_tokens += rp->num; + else + s->consistent = 1; - nedges = XCALLOC (short, n); + return n_lookahead_tokens; +} - for (i = 0; i < n; i++) - { - sp = R_arg[i]; - if (sp) - { - while (*sp >= 0) - nedges[*sp++]++; - } - } - new_R = XCALLOC (short *, n); - temp_R = XCALLOC (short *, n); +/*----------------------------------------------------. +| Compute LA, NLA, and the lookahead_tokens members. | +`----------------------------------------------------*/ - for (i = 0; i < n; i++) - { - k = nedges[i]; - if (k > 0) - { - sp = XCALLOC (short, k + 1); - new_R[i] = sp; - temp_R[i] = sp; - sp[k] = -1; - } - } +void +initialize_LA (void) +{ + state_number i; + bitsetv pLA; + bool default_reduction_only_for_accept; + { + char *default_reductions = + muscle_percent_define_get ("lr.default-reductions"); + default_reduction_only_for_accept = STREQ (default_reductions, "accepting"); + free (default_reductions); + } + + /* Compute the total number of reductions requiring a lookahead. */ + nLA = 0; + for (i = 0; i < nstates; i++) + nLA += + state_lookahead_tokens_count (states[i], + default_reduction_only_for_accept); + /* Avoid having to special case 0. */ + if (!nLA) + nLA = 1; - XFREE (nedges); + pLA = LA = bitsetv_create (nLA, ntokens, BITSET_FIXED); - for (i = 0; i < n; i++) + /* Initialize the members LOOKAHEAD_TOKENS for each state whose reductions + require lookahead tokens. */ + for (i = 0; i < nstates; i++) { - sp = R_arg[i]; - if (sp) - { - while (*sp >= 0) - *temp_R[*sp++]++ = i; - } + int count = + state_lookahead_tokens_count (states[i], + default_reduction_only_for_accept); + if (count) + { + states[i]->reductions->lookahead_tokens = pLA; + pLA += count; + } } - - XFREE (temp_R); - - return new_R; } +/*---------------------------------------------. +| Output the lookahead tokens for each state. | +`---------------------------------------------*/ + static void -build_relations (void) +lookahead_tokens_print (FILE *out) { - int i; - int j; - int k; - short *rulep; - short *rp; - shifts *sp; - int length; - int nedges; - int done; - int state1; - int stateno; - int symbol1; - int symbol2; - short *shortp; - short *edge; - short *states; - short **new_includes; - - includes = XCALLOC (short *, ngotos); - edge = XCALLOC (short, ngotos + 1); - states = XCALLOC (short, maxrhs + 1); - - for (i = 0; i < ngotos; i++) + state_number i; + int j, k; + fprintf (out, "Lookahead tokens: BEGIN\n"); + for (i = 0; i < nstates; ++i) { - nedges = 0; - state1 = from_state[i]; - symbol1 = accessing_symbol[to_state[i]]; - - for (rulep = derives[symbol1]; *rulep > 0; rulep++) - { - length = 1; - states[0] = state1; - stateno = state1; - - for (rp = ritem + rrhs[*rulep]; *rp > 0; rp++) - { - symbol2 = *rp; - sp = shift_table[stateno]; - k = sp->nshifts; - - for (j = 0; j < k; j++) - { - stateno = sp->shifts[j]; - if (accessing_symbol[stateno] == symbol2) - break; - } - - states[length++] = stateno; - } - - if (!consistent[stateno]) - add_lookback_edge (stateno, *rulep, i); - - length--; - done = 0; - while (!done) - { - done = 1; - rp--; - /* JF added rp>=ritem && I hope to god its right! */ - if (rp >= ritem && ISVAR (*rp)) - { - stateno = states[--length]; - edge[nedges++] = map_goto (stateno, *rp); - if (nullable[*rp]) - done = 0; - } - } - } - - if (nedges) - { - includes[i] = shortp = XCALLOC (short, nedges + 1); - for (j = 0; j < nedges; j++) - shortp[j] = edge[j]; - shortp[nedges] = -1; - } + reductions *reds = states[i]->reductions; + bitset_iterator iter; + int n_lookahead_tokens = 0; + + if (reds->lookahead_tokens) + for (k = 0; k < reds->num; ++k) + if (reds->lookahead_tokens[k]) + ++n_lookahead_tokens; + + fprintf (out, "State %d: %d lookahead tokens\n", + i, n_lookahead_tokens); + + if (reds->lookahead_tokens) + for (j = 0; j < reds->num; ++j) + BITSET_FOR_EACH (iter, reds->lookahead_tokens[j], k, 0) + { + fprintf (out, " on %d (%s) -> rule %d\n", + k, symbols[k]->tag, + reds->rules[j]->number); + }; } - - new_includes = transpose (includes, ngotos); - - for (i = 0; i < ngotos; i++) - if (includes[i]) - XFREE (includes[i]); - - XFREE (includes); - - includes = new_includes; - - XFREE (edge); - XFREE (states); + fprintf (out, "Lookahead tokens: END\n"); } - - -static void -compute_FOLLOWS (void) +void +lalr (void) { - int i; - - digraph (includes); - - for (i = 0; i < ngotos; i++) - { - if (includes[i]) - XFREE (includes[i]); - } + initialize_LA (); + set_goto_map (); + initialize_F (); + lookback = xcalloc (nLA, sizeof *lookback); + build_relations (); + compute_FOLLOWS (); + compute_lookahead_tokens (); - XFREE (includes); + if (trace_flag & trace_sets) + lookahead_tokens_print (stderr); } -static void -compute_lookaheads (void) +void +lalr_update_state_numbers (state_number old_to_new[], state_number nstates_old) { - int i; - int n; - unsigned *fp1; - unsigned *fp2; - unsigned *fp3; - shorts *sp; - unsigned *rowp; - shorts *sptmp; /* JF */ - - rowp = LA; - n = lookaheads[nstates]; - for (i = 0; i < n; i++) - { - fp3 = rowp + tokensetsize; - for (sp = lookback[i]; sp; sp = sp->next) - { - fp1 = rowp; - fp2 = F + tokensetsize * sp->value; - while (fp1 < fp3) - *fp1++ |= *fp2++; - } - - rowp = fp3; - } - - for (i = 0; i < n; i++) + goto_number ngotos_reachable = 0; + symbol_number nonterminal = 0; + aver (nsyms == nvars + ntokens); + { + goto_number i; + for (i = 0; i < ngotos; ++i) + { + while (i == goto_map[nonterminal]) + goto_map[nonterminal++] = ngotos_reachable; + /* If old_to_new[from_state[i]] = nstates_old, remove this goto + entry. */ + if (old_to_new[from_state[i]] != nstates_old) + { + /* from_state[i] is not removed, so it and thus to_state[i] are + reachable, so to_state[i] != nstates_old. */ + aver (old_to_new[to_state[i]] != nstates_old); + from_state[ngotos_reachable] = old_to_new[from_state[i]]; + to_state[ngotos_reachable] = old_to_new[to_state[i]]; + ++ngotos_reachable; + } + } + } + while (nonterminal <= nvars) { - /* JF removed ref to freed storage */ - for (sp = lookback[i]; sp; sp = sptmp) - { - sptmp = sp->next; - XFREE (sp); - } + aver (ngotos == goto_map[nonterminal]); + goto_map[nonterminal++] = ngotos_reachable; } - - XFREE (lookback); - XFREE (F); + ngotos = ngotos_reachable; } void -lalr (void) +lalr_free (void) { - tokensetsize = WORDSIZE (ntokens); - - set_state_table (); - set_accessing_symbol (); - set_shift_table (); - set_reduction_table (); - set_maxrhs (); - initialize_LA (); - set_goto_map (); - initialize_F (); - build_relations (); - compute_FOLLOWS (); - compute_lookaheads (); + state_number s; + for (s = 0; s < nstates; ++s) + states[s]->reductions->lookahead_tokens = NULL; + bitsetv_free (LA); }