Output yylloc macro defn in glr.c even if locations are not being generated.

[bison.git] / src / lalr.c

diff --git a/src/lalr.c b/src/lalr.c
index 767c646e65596973d1d77d51b8f9b31d035871dd..7273805ac09107ba0e1f192591efcce346e770ce 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,763 +1,455 @@
-/* Compute look-ahead criteria for bison,
-   Copyright (C) 1984, 1986, 1989 Free Software Foundation, Inc.
+/* Compute look-ahead criteria for Bison.

 
 

-This file is part of Bison, the GNU Compiler Compiler.
+   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.

 
 

-Bison 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.
+   This file is part of Bison, the GNU Compiler Compiler.

 
 

-Bison 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.
+   Bison 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.

 
 

-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.  */
+   Bison 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.  */

 
 

-/* Compute how to make the finite state machine deterministic;
- find which rules need lookahead in each state, and which lookahead tokens they accept.

 
 

-lalr(), the entry point, builds these data structures:
+/* Compute how to make the finite state machine deterministic; find
+   which rules need lookahead in each state, and which lookahead
+   tokens they accept.  */

 
 

-goto_map, from_state and to_state
- record each shift transition which accepts a variable (a nonterminal).
-ngotos is the number of such transitions.
-from_state[t] is the state number which a transition leads from
-and to_state[t] is the state number it leads to.
-All the transitions that accept a particular variable are grouped together and
-goto_map[i - ntokens] is the index in from_state and to_state of the first of them.
-
-consistent[s] is nonzero if no lookahead is needed to decide what to do in state s.
-
-LAruleno is a vector which records the rules that need lookahead in various states.
-The elements of LAruleno that apply to state s are those from
- lookaheads[s] through lookaheads[s+1]-1.
-Each element of LAruleno is a rule number.
-
-If lr is the length of LAruleno, then a number from 0 to lr-1
-can specify both a rule and a state where the rule might be applied.
-
-LA is a lr by ntokens matrix of bits.
-LA[l, i] is 1 if the rule LAruleno[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.
-*/
-
-#include <stdio.h>

 #include "system.h"
 #include "system.h"

-#include "machine.h"
-#include "types.h"
-#include "state.h"
-#include "alloc.h"
-#include "gram.h"
-#include "complain.h"
-
-extern short **derives;
-extern char *nullable;
-
-
-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;
-
-void lalr PARAMS((void));
-short **transpose PARAMS((short **, int));
-void set_state_table PARAMS((void));
-void set_accessing_symbol PARAMS((void));
-void set_shift_table PARAMS((void));
-void set_reduction_table PARAMS((void));
-void set_maxrhs PARAMS((void));
-void initialize_LA PARAMS((void));
-void set_goto_map PARAMS((void));
-int map_goto PARAMS((int, int));
-void initialize_F PARAMS((void));
-void build_relations PARAMS((void));
-void add_lookback_edge PARAMS((int, int, int));
-void compute_FOLLOWS PARAMS((void));
-void compute_lookaheads PARAMS((void));
-void digraph PARAMS((short **));
-void traverse PARAMS((register int));
-
-extern void berror PARAMS((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;
-
-
-void
-lalr (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();
-}
-
-
-void
-set_state_table (void)
-{
-  register core *sp;
-
-  state_table = NEW2(nstates, core *);
-
-  for (sp = first_state; sp; sp = sp->next)
-    state_table[sp->number] = sp;
-}
-
-
-void
-set_accessing_symbol (void)
-{
-  register core *sp;
-
-  accessing_symbol = NEW2(nstates, short);
-
-  for (sp = first_state; sp; sp = sp->next)
-    accessing_symbol[sp->number] = sp->accessing_symbol;
-}
-
-
-void
-set_shift_table (void)
-{
-  register shifts *sp;
-
-  shift_table = NEW2(nstates, shifts *);
-
-  for (sp = first_shift; sp; sp = sp->next)
-    shift_table[sp->number] = sp;
-}
-
-
-void
-set_reduction_table (void)
-{
-  register reductions *rp;
-
-  reduction_table = NEW2(nstates, reductions *);
-
-  for (rp = first_reduction; rp; rp = rp->next)
-    reduction_table[rp->number] = rp;
-}
-
-
-void
-set_maxrhs (void)
-{
-  register short *itemp;
-  register int length;
-  register int max;
-
-  length = 0;
-  max = 0;
-  for (itemp = ritem; *itemp; itemp++)
-    {
-      if (*itemp > 0)
-       {
-         length++;
-       }
-      else
-       {
-         if (length > max) max = length;
-         length = 0;
-       }
-    }
-
-  maxrhs = max;
-}

 
 

+#include <bitset.h>
+#include <bitsetv.h>
+#include <quotearg.h>

 
 

-void
-initialize_LA (void)
+#include "LR0.h"
+#include "complain.h"
+#include "derives.h"
+#include "getargs.h"
+#include "gram.h"
+#include "lalr.h"
+#include "nullable.h"
+#include "reader.h"
+#include "relation.h"
+#include "symtab.h"
+
+goto_number *goto_map = NULL;
+static goto_number ngotos = 0;
+state_number *from_state = NULL;
+state_number *to_state = NULL;
+
+/* Linked list of goto numbers.  */
+typedef struct goto_list

 {
 {

-  register int i;
-  register int j;
-  register int count;
-  register reductions *rp;
-  register shifts *sp;
-  register short *np;
+  struct goto_list *next;
+  goto_number value;
+} goto_list;

 
 

-  consistent = NEW2(nstates, char);
-  lookaheads = NEW2(nstates + 1, short);

 
 

-  count = 0;
-  for (i = 0; i < nstates; i++)
-    {
-      register int k;
+/* LA is a LR 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.  */

 
 

-      lookaheads[i] = count;
+static bitsetv LA = NULL;
+size_t nLA;

 
 

-      rp = reduction_table[i];
-      sp = shift_table[i];
-      if (rp && (rp->nreds > 1
-          || (sp && ! ISVAR(accessing_symbol[sp->shifts[0]]))))
-       count += rp->nreds;
-      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;
-             }
-         }
-    }
+/* And for the famous F variable, which name is so descriptive that a
+   comment is hardly needed.  <grin>.  */
+static bitsetv F = NULL;

 
 

-  lookaheads[nstates] = count;
+static goto_number **includes;
+static goto_list **lookback;

 
 

-  if (count == 0)
-    {
-      LA = NEW2(1 * tokensetsize, unsigned);
-      LAruleno = NEW2(1, short);
-      lookback = NEW2(1, shorts *);
-    }
-  else
-    {
-      LA = NEW2(count * tokensetsize, unsigned);
-      LAruleno = NEW2(count, short);
-      lookback = NEW2(count, shorts *);
-    }

 
 

-  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];
-       }
-    }
-}

 
 
 
 

-void
+static void

 set_goto_map (void)
 {
 set_goto_map (void)
 {

-  register shifts *sp;
-  register int i;
-  register int symbol;
-  register int k;
-  register short *temp_map;
-  register int state2;
-  register int state1;
+  state_number s;
+  goto_number *temp_map;

 
 

-  goto_map = NEW2(nvars + 1, short) - ntokens;
-  temp_map = NEW2(nvars + 1, short) - ntokens;
+  CALLOC (goto_map, nvars + 1);
+  CALLOC (temp_map, nvars + 1);

 
   ngotos = 0;
 
   ngotos = 0;

-  for (sp = first_shift; sp; sp = sp->next)
+  for (s = 0; s < nstates; ++s)

     {
     {

-      for (i = sp->nshifts - 1; i >= 0; i--)
+      transitions *sp = states[s]->transitions;
+      int i;
+      for (i = sp->num - 1; i >= 0 && TRANSITION_IS_GOTO (sp, i); --i)

        {
        {

-         symbol = accessing_symbol[sp->shifts[i]];
-
-         if (ISTOKEN(symbol)) break;
-
-         if (ngotos == MAXSHORT)
-           fatal (_("too many gotos (max %d)"), MAXSHORT);
-
+         if (ngotos >= GOTO_NUMBER_MAXIMUM)
+           abort ();

          ngotos++;
          ngotos++;

-         goto_map[symbol]++;
-        }
+         goto_map[TRANSITION_SYMBOL (sp, i) - ntokens]++;
+       }

     }
 
     }
 

-  k = 0;
-  for (i = ntokens; i < nsyms; i++)
-    {
-      temp_map[i] = k;
-      k += goto_map[i];
-    }
+  {
+    int k = 0;
+    int i;
+    for (i = ntokens; i < nsyms; i++)
+      {
+       temp_map[i - ntokens] = k;
+       k += goto_map[i - ntokens];
+      }

 
 

-  for (i = ntokens; i < nsyms; i++)
-    goto_map[i] = temp_map[i];
+    for (i = ntokens; i < nsyms; i++)
+      goto_map[i - ntokens] = temp_map[i - ntokens];

 
 

-  goto_map[nsyms] = ngotos;
-  temp_map[nsyms] = ngotos;
+    goto_map[nsyms - ntokens] = ngotos;
+    temp_map[nsyms - ntokens] = ngotos;
+  }

 
 

-  from_state = NEW2(ngotos, short);
-  to_state = NEW2(ngotos, short);
+  CALLOC (from_state, ngotos);
+  CALLOC (to_state, ngotos);

 
 

-  for (sp = first_shift; sp; sp = sp->next)
+  for (s = 0; s < nstates; ++s)

     {
     {

-      state1 = sp->number;
-      for (i = sp->nshifts - 1; i >= 0; i--)
+      transitions *sp = states[s]->transitions;
+      int i;
+      for (i = sp->num - 1; i >= 0 && TRANSITION_IS_GOTO (sp, i); --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;
+         int k = temp_map[TRANSITION_SYMBOL (sp, i) - ntokens]++;
+         from_state[k] = s;
+         to_state[k] = sp->states[i]->number;

        }
     }
 
        }
     }
 

-  FREE(temp_map + ntokens);
+  XFREE (temp_map);

 }
 
 
 
 }
 
 
 

-/*  Map_goto maps a state/symbol pair into its numeric representation. */
+/*----------------------------------------------------------.
+| Map a state/symbol pair into its numeric representation.  |
+`----------------------------------------------------------*/

 
 

-int
-map_goto (int state, int symbol)
+static int
+map_goto (state_number s0, symbol_number sym)

 {
 {

-  register int high;
-  register int low;
-  register int middle;
-  register int s;
+  int high;
+  int low;
+  int middle;
+  state_number s;

 
 

-  low = goto_map[symbol];
-  high = goto_map[symbol + 1] - 1;
+  low = goto_map[sym - ntokens];
+  high = goto_map[sym - ntokens + 1] - 1;

 
 

-  while (low <= high)
+  for (;;)

     {
     {

+      if (high < low)
+       abort ();

       middle = (low + high) / 2;
       s = from_state[middle];
       middle = (low + high) / 2;
       s = from_state[middle];

-      if (s == state)
-       return (middle);
-      else if (s < state)
+      if (s == s0)
+       return middle;
+      else if (s < s0)

        low = middle + 1;
       else
        high = middle - 1;
     }
        low = middle + 1;
       else
        high = middle - 1;
     }

-
-  berror("map_goto");
-/* NOTREACHED */
-  return 0;

 }
 
 
 }
 
 

-void
+static void

 initialize_F (void)
 {
 initialize_F (void)
 {

-  register int i;
-  register int j;
-  register int k;
-  register shifts *sp;
-  register short *edge;
-  register unsigned *rowp;
-  register short *rp;
-  register short **reads;
-  register int nedges;
-  register int stateno;
-  register int symbol;
-  register int nwords;
-
-  nwords = ngotos * tokensetsize;
-  F = NEW2(nwords, unsigned);
-
-  reads = NEW2(ngotos, short *);
-  edge = NEW2(ngotos + 1, short);
-  nedges = 0;
-
-  rowp = F;
-  for (i = 0; i < ngotos; i++)
-    {
-      stateno = to_state[i];
-      sp = shift_table[stateno];
-
-      if (sp)
-       {
-         k = sp->nshifts;
+  goto_number **reads = CALLOC (reads, ngotos);
+  goto_number *edge = CALLOC (edge, ngotos + 1);
+  int nedges = 0;

 
 

-         for (j = 0; j < k; j++)
-           {
-             symbol = accessing_symbol[sp->shifts[j]];
-             if (ISVAR(symbol))
-               break;
-             SETBIT(rowp, symbol);
-           }
+  int i;

 
 

-         for (; j < k; j++)
-           {
-             symbol = accessing_symbol[sp->shifts[j]];
-             if (nullable[symbol])
-               edge[nedges++] = map_goto(stateno, symbol);
-           }
+  F = bitsetv_create (ngotos, ntokens, BITSET_FIXED);

 
 

-         if (nedges)
-           {
-             reads[i] = rp = NEW2(nedges + 1, short);
+  for (i = 0; i < ngotos; i++)
+    {
+      state_number stateno = to_state[i];
+      transitions *sp = states[stateno]->transitions;

 
 

-             for (j = 0; j < nedges; j++)
-               rp[j] = edge[j];
+      int j;
+      FOR_EACH_SHIFT (sp, j)
+       bitset_set (F[i], TRANSITION_SYMBOL (sp, j));

 
 

-             rp[nedges] = -1;
-             nedges = 0;
-           }
+      for (; j < sp->num; j++)
+       {
+         symbol_number sym = TRANSITION_SYMBOL (sp, j);
+         if (nullable[sym - ntokens])
+           edge[nedges++] = map_goto (stateno, sym);

        }
 
        }
 

-      rowp += tokensetsize;
+      if (nedges)
+       {
+         CALLOC (reads[i], nedges + 1);
+         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++)
 
   for (i = 0; i < ngotos; i++)

-    {
-      if (reads[i])
-       FREE(reads[i]);
-    }
+    XFREE (reads[i]);

 
 

-  FREE(reads);
-  FREE(edge);
+  XFREE (reads);
+  XFREE (edge);

 }
 
 
 }
 
 

-void
+static void
+add_lookback_edge (state *s, rule *r, int gotono)
+{
+  int ri = state_reduction_find (s, r);
+  goto_list *sp = MALLOC (sp, 1);
+  sp->next = lookback[(s->reductions->lookaheads - LA) + ri];
+  sp->value = gotono;
+  lookback[(s->reductions->lookaheads - LA) + ri] = sp;
+}
+
+
+
+static void

 build_relations (void)
 {
 build_relations (void)
 {

-  register int i;
-  register int j;
-  register int k;
-  register short *rulep;
-  register short *rp;
-  register shifts *sp;
-  register int length;
-  register int nedges;
-  register int done;
-  register int state1;
-  register int stateno;
-  register int symbol1;
-  register int symbol2;
-  register short *shortp;
-  register short *edge;
-  register short *states;
-  register short **new_includes;
-
-  includes = NEW2(ngotos, short *);
-  edge = NEW2(ngotos + 1, short);
-  states = NEW2(maxrhs + 1, short);
+  goto_number *edge = CALLOC (edge, ngotos + 1);
+  state_number *states1 = CALLOC (states1, ritem_longest_rhs () + 1);
+  int i;
+
+  CALLOC (includes, ngotos);

 
   for (i = 0; i < ngotos; i++)
     {
 
   for (i = 0; i < ngotos; i++)
     {

-      nedges = 0;
-      state1 = from_state[i];
-      symbol1 = accessing_symbol[to_state[i]];
+      int nedges = 0;
+      symbol_number symbol1 = states[to_state[i]]->accessing_symbol;
+      rule **rulep;

 
 

-      for (rulep = derives[symbol1]; *rulep > 0; rulep++)
+      for (rulep = derives[symbol1 - ntokens]; *rulep; rulep++)

        {
        {

-         length = 1;
-         states[0] = state1;
-         stateno = state1;
+         bool done;
+         int length = 1;
+         item_number *rp;
+         state *s = states[from_state[i]];
+         states1[0] = s->number;

 
 

-         for (rp = ritem + rrhs[*rulep]; *rp > 0; rp++)
+         for (rp = (*rulep)->rhs; *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;
+             s = transitions_to (s->transitions,
+                                 item_number_as_symbol_number (*rp));
+             states1[length++] = s->number;

            }
 
            }
 

-         if (!consistent[stateno])
-           add_lookback_edge(stateno, *rulep, i);
+         if (!s->consistent)
+           add_lookback_edge (s, *rulep, i);

 
          length--;
 
          length--;

-         done = 0;
+         done = false;

          while (!done)
            {
          while (!done)
            {

-             done = 1;
+             done = true;

              rp--;
              rp--;

-                       /* JF added rp>=ritem &&   I hope to god its right! */
-             if (rp>=ritem && ISVAR(*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;
+                 /* 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)
        {
                }
            }
        }
 
       if (nedges)
        {

-         includes[i] = shortp = NEW2(nedges + 1, short);
+         int j;
+         CALLOC (includes[i], nedges + 1);

          for (j = 0; j < nedges; j++)
          for (j = 0; j < nedges; j++)

-           shortp[j] = edge[j];
-         shortp[nedges] = -1;
+           includes[i][j] = edge[j];
+         includes[i][nedges] = -1;

        }
     }
 
        }
     }
 

-  new_includes = transpose(includes, ngotos);
-
-  for (i = 0; i < ngotos; i++)
-    if (includes[i])
-      FREE(includes[i]);
-
-  FREE(includes);
-
-  includes = new_includes;
-
-  FREE(edge);
-  FREE(states);
-}
-
-
-void
-add_lookback_edge (int stateno, int ruleno, int gotono)
-{
-  register int i;
-  register int k;
-  register int found;
-  register shorts *sp;
-
-  i = lookaheads[stateno];
-  k = lookaheads[stateno + 1];
-  found = 0;
-  while (!found && i < k)
-    {
-      if (LAruleno[i] == ruleno)
-       found = 1;
-      else
-       i++;
-    }
-
-  if (found == 0)
-    berror("add_lookback_edge");
+  XFREE (edge);
+  XFREE (states1);

 
 

-  sp = NEW(shorts);
-  sp->next = lookback[i];
-  sp->value = gotono;
-  lookback[i] = sp;
+  relation_transpose (&includes, ngotos);

 }
 
 
 
 }
 
 
 

-short **
-transpose (short **R_arg, int n)
+static void
+compute_FOLLOWS (void)

 {
 {

-  register short **new_R;
-  register short **temp_R;
-  register short *nedges;
-  register short *sp;
-  register int i;
-  register int k;
-
-  nedges = NEW2(n, short);
+  int i;

 
 

-  for (i = 0; i < n; i++)
-    {
-      sp = R_arg[i];
-      if (sp)
-       {
-         while (*sp >= 0)
-           nedges[*sp++]++;
-       }
-    }
-
-  new_R = NEW2(n, short *);
-  temp_R = NEW2(n, short *);
-
-  for (i = 0; i < n; i++)
-    {
-      k = nedges[i];
-      if (k > 0)
-       {
-         sp = NEW2(k + 1, short);
-         new_R[i] = sp;
-         temp_R[i] = sp;
-         sp[k] = -1;
-       }
-    }
-
-  FREE(nedges);
-
-  for (i = 0; i < n; i++)
-    {
-      sp = R_arg[i];
-      if (sp)
-       {
-         while (*sp >= 0)
-           *temp_R[*sp++]++ = i;
-       }
-    }
+  relation_digraph (includes, ngotos, &F);

 
 

-  FREE(temp_R);
+  for (i = 0; i < ngotos; i++)
+    XFREE (includes[i]);

 
 

-  return (new_R);
+  XFREE (includes);

 }
 
 
 }
 
 

-void
-compute_FOLLOWS (void)
+static void
+compute_lookaheads (void)

 {
 {

-  register int i;
+  size_t i;
+  goto_list *sp;

 
 

-  digraph(includes);
+  for (i = 0; i < nLA; i++)
+    for (sp = lookback[i]; sp; sp = sp->next)
+      bitset_or (LA[i], LA[i], F[sp->value]);

 
 

-  for (i = 0; i < ngotos; i++)
-    {
-      if (includes[i]) FREE(includes[i]);
-    }
+  /* Free LOOKBACK. */
+  for (i = 0; i < nLA; i++)
+    LIST_FREE (goto_list, lookback[i]);

 
 

-  FREE(includes);
+  XFREE (lookback);
+  bitsetv_free (F);

 }
 
 
 }
 
 

-void
-compute_lookaheads (void)
-{
-  register int i;
-  register int n;
-  register unsigned *fp1;
-  register unsigned *fp2;
-  register unsigned *fp3;
-  register shorts *sp;
-  register unsigned *rowp;
-/*   register short *rulep; JF unused */
-/*  register int count; JF unused */
-  register 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++;
-       }
+/*-----------------------------------------------------------.
+| Count the number of lookaheads required for S (NLOOKAHEADS |
+| member).                                                   |
+`-----------------------------------------------------------*/

 
 

-      rowp = fp3;
-    }
+static int
+state_lookaheads_count (state *s)
+{
+  int k;
+  int nlookaheads = 0;
+  reductions *rp = s->reductions;
+  transitions *sp = s->transitions;
+
+  /* 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'.  */
+  if (rp->num > 1
+      || (rp->num == 1 && sp->num &&
+         !TRANSITION_IS_DISABLED (sp, 0) && TRANSITION_IS_SHIFT (sp, 0)))
+    nlookaheads += rp->num;
+  else
+    s->consistent = 1;

 
 

-  for (i = 0; i < n; i++)
-    {/* JF removed ref to freed storage */
-      for (sp = lookback[i]; sp; sp = sptmp) {
-       sptmp=sp->next;
-       FREE(sp);
+  for (k = 0; k < sp->num; k++)
+    if (!TRANSITION_IS_DISABLED (sp, k) && TRANSITION_IS_ERROR (sp, k))
+      {
+       s->consistent = 0;
+       break;

       }
       }

-    }

 
 

-  FREE(lookback);
-  FREE(F);
+  return nlookaheads;

 }
 
 
 }
 
 

-void
-digraph (short **relation)
-{
-  register int i;
+/*----------------------------------------------.
+| Compute LA, NLA, and the lookaheads members.  |
+`----------------------------------------------*/

 
 

-  infinity = ngotos + 2;
-  INDEX = NEW2(ngotos + 1, short);
-  VERTICES = NEW2(ngotos + 1, short);
-  top = 0;
+static void
+initialize_LA (void)
+{
+  state_number i;
+  bitsetv pLA;

 
 

-  R = relation;
+  /* Compute the total number of reductions requiring a lookahead.  */
+  nLA = 0;
+  for (i = 0; i < nstates; i++)
+    nLA += state_lookaheads_count (states[i]);
+  /* Avoid having to special case 0.  */
+  if (!nLA)
+    nLA = 1;

 
 

-  for (i = 0; i < ngotos; i++)
-    INDEX[i] = 0;
+  pLA = LA = bitsetv_create (nLA, ntokens, BITSET_FIXED);
+  CALLOC (lookback, nLA);

 
 

-  for (i = 0; i < ngotos; i++)
+  /* Initialize the members LOOKAHEADS for each state which reductions
+     require lookaheads.  */
+  for (i = 0; i < nstates; i++)

     {
     {

-      if (INDEX[i] == 0 && R[i])
-       traverse(i);
+      int count = state_lookaheads_count (states[i]);
+      if (count)
+       {
+         states[i]->reductions->lookaheads = pLA;
+         pLA += count;
+       }

     }
     }

-
-  FREE(INDEX);
-  FREE(VERTICES);

 }
 
 
 }
 
 

-void
-traverse (register int i)
-{
-  register unsigned *fp1;
-  register unsigned *fp2;
-  register unsigned *fp3;
-  register int j;
-  register short *rp;
-
-  int height;
-  unsigned *base;
+/*---------------------------------------.
+| Output the lookaheads for each state.  |
+`---------------------------------------*/

 
 

-  VERTICES[++top] = i;
-  INDEX[i] = height = top;
-
-  base = F + i * tokensetsize;
-  fp3 = base + tokensetsize;
-
-  rp = R[i];
-  if (rp)
+static void
+lookaheads_print (FILE *out)
+{
+  state_number i;
+  int j, k;
+  fprintf (out, "Lookaheads: BEGIN\n");
+  for (i = 0; i < nstates; ++i)

     {
     {

-      while ((j = *rp++) >= 0)
-       {
-         if (INDEX[j] == 0)
-           traverse(j);
+      reductions *reds = states[i]->reductions;
+      bitset_iterator iter;
+      int nlookaheads = 0;

 
 

-         if (INDEX[i] > INDEX[j])
-           INDEX[i] = INDEX[j];
+      if (reds->lookaheads)
+       for (k = 0; k < reds->num; ++k)
+         if (reds->lookaheads[k])
+           ++nlookaheads;

 
 

-         fp1 = base;
-         fp2 = F + j * tokensetsize;
+      fprintf (out, "State %d: %d lookaheads\n",
+              i, nlookaheads);

 
 

-         while (fp1 < fp3)
-           *fp1++ |= *fp2++;
-       }
+      if (reds->lookaheads)
+       for (j = 0; j < reds->num; ++j)
+         BITSET_FOR_EACH (iter, reds->lookaheads[j], k, 0)
+         {
+           fprintf (out, "   on %d (%s) -> rule %d\n",
+                    k, symbols[k]->tag,
+                    reds->rules[j]->number);
+         };

     }
     }

+  fprintf (out, "Lookaheads: END\n");
+}

 
 

-  if (INDEX[i] == height)
-    {
-      for (;;)
-       {
-         j = VERTICES[top--];
-         INDEX[j] = infinity;
-
-         if (i == j)
-           break;
+void
+lalr (void)
+{
+  initialize_LA ();
+  set_goto_map ();
+  initialize_F ();
+  build_relations ();
+  compute_FOLLOWS ();
+  compute_lookaheads ();
+
+  if (trace_flag & trace_sets)
+    lookaheads_print (stderr);
+}

 
 

-         fp1 = base;
-         fp2 = F + j * tokensetsize;

 
 

-         while (fp1 < fp3)
-           *fp2++ = *fp1++;
-       }
-    }
+void
+lalr_free (void)
+{
+  state_number s;
+  for (s = 0; s < nstates; ++s)
+    states[s]->reductions->lookaheads = NULL;
+  bitsetv_free (LA);

 }
 }