(_AT_TEST_GLR_CXXTYPES): Do not include <assert.h>.

[bison.git] / src / lalr.c

diff --git a/src/lalr.c b/src/lalr.c
index af2ea10012d48519898a6df2865a8260b1d5d263..a549e5b43061ce28977cc4cfcb53b57c1ec7dae4 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,5 +1,6 @@
 /* Compute look-ahead criteria for bison,
 /* Compute look-ahead criteria for bison,

-   Copyright (C) 1984, 1986, 1989, 2000 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.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -24,351 +25,130 @@
    tokens they accept.  */
 
 #include "system.h"
    tokens they accept.  */
 
 #include "system.h"

-#include "types.h"
-#include "LR0.h"
-#include "alloc.h"
+#include "bitset.h"
+#include "bitsetv.h"
+#include "relation.h"
+#include "quotearg.h"
+#include "symtab.h"

 #include "gram.h"
 #include "gram.h"

+#include "reader.h"
+#include "LR0.h"

 #include "complain.h"
 #include "lalr.h"
 #include "nullable.h"
 #include "derives.h"
 #include "complain.h"
 #include "lalr.h"
 #include "nullable.h"
 #include "derives.h"

+#include "getargs.h"

 
 

-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;
+goto_number_t *goto_map = NULL;
+static goto_number_t ngotos = 0;
+state_number_t *from_state = NULL;
+state_number_t *to_state = NULL;

 
 

-
-static void
-traverse (int i)
+/* Linked list of goto numbers.  */
+typedef struct goto_list_s

 {
 {

-  unsigned *fp1;
-  unsigned *fp2;
-  unsigned *fp3;
-  int j;
-  short *rp;
+  struct goto_list_s *next;
+  goto_number_t value;
+} goto_list_t;

 
 

-  int height;
-  unsigned *base;

 
 

-  VERTICES[++top] = i;
-  INDEX[i] = height = top;
+/* 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.  */

 
 

-  base = F + i * tokensetsize;
-  fp3 = base + tokensetsize;
+static bitsetv LA = NULL;
+size_t nLA;

 
 

-  rp = R[i];
-  if (rp)
-    {
-      while ((j = *rp++) >= 0)
-       {
-         if (INDEX[j] == 0)
-           traverse (j);

 
 

-         if (INDEX[i] > INDEX[j])
-           INDEX[i] = INDEX[j];
+/* And for the famous F variable, which name is so descriptive that a
+   comment is hardly needed.  <grin>.  */
+static bitsetv F = NULL;

 
 

-         fp1 = base;
-         fp2 = F + j * tokensetsize;
+static goto_number_t **includes;
+static goto_list_t **lookback;

 
 

-         while (fp1 < fp3)
-           *fp1++ |= *fp2++;
-       }
-    }

 
 

-  if (INDEX[i] == height)
-    {
-      for (;;)
-       {
-         j = VERTICES[top--];
-         INDEX[j] = infinity;
-
-         if (i == j)
-           break;
-
-         fp1 = base;
-         fp2 = F + j * tokensetsize;
-
-         while (fp1 < fp3)
-           *fp2++ = *fp1++;
-       }
-    }
-}
-
-
-static void
-digraph (short **relation)
-{
-  int i;
-
-  infinity = ngotos + 2;
-  INDEX = NEW2 (ngotos + 1, short);
-  VERTICES = NEW2 (ngotos + 1, short);
-  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);
-    }
-
-  FREE (INDEX);
-  FREE (VERTICES);
-}
-
-static void
-set_state_table (void)
-{
-  core *sp;
-
-  state_table = NEW2 (nstates, core *);
-
-  for (sp = first_state; sp; sp = sp->next)
-    state_table[sp->number] = sp;
-}
-
-
-static void
-set_accessing_symbol (void)
-{
-  core *sp;
-
-  accessing_symbol = NEW2 (nstates, short);
-
-  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 = NEW2 (nstates, shifts *);
-
-  for (sp = first_shift; sp; sp = sp->next)
-    shift_table[sp->number] = sp;
-}
-
-
-static void
-set_reduction_table (void)
-{
-  reductions *rp;
-
-  reduction_table = NEW2 (nstates, reductions *);
-
-  for (rp = first_reduction; rp; rp = rp->next)
-    reduction_table[rp->number] = rp;
-}
-
-
-static void
-set_maxrhs (void)
-{
-  short *itemp;
-  int length;
-  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;
-}
-
-
-static void
-initialize_LA (void)
-{
-  int i;
-  int j;
-  int count;
-  reductions *rp;
-  shifts *sp;
-  short *np;
-
-  consistent = NEW2 (nstates, char);
-  lookaheads = NEW2 (nstates + 1, short);
-
-  count = 0;
-  for (i = 0; i < nstates; i++)
-    {
-      int k;
-
-      lookaheads[i] = count;
-
-      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;
-             }
-         }
-    }
-
-  lookaheads[nstates] = count;
-
-  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];
-       }
-    }
-}

 
 
 static void
 set_goto_map (void)
 {
 
 
 static void
 set_goto_map (void)
 {

-  shifts *sp;
-  int i;
-  int symbol;
-  int k;
-  short *temp_map;
-  int state2;
-  int state1;
+  state_number_t state;
+  goto_number_t *temp_map;

 
 

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

 
   ngotos = 0;
 
   ngotos = 0;

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

     {
     {

-      for (i = sp->nshifts - 1; i >= 0; i--)
+      transitions_t *sp = states[state]->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_MAX)
+           abort ();

          ngotos++;
          ngotos++;

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

        }
     }
 
        }
     }
 

-  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] = k;
+       k += goto_map[i];
+      }

 
 

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

 
 

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

 
 

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

 
 

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

     {
     {

-      state1 = sp->number;
-      for (i = sp->nshifts - 1; i >= 0; i--)
+      transitions_t *sp = states[state]->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)]++;
+         from_state[k] = state;
+         to_state[k] = sp->states[i]->number;

        }
     }
 
        }
     }
 

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

 }
 
 
 
 }
 
 
 

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

 
 static int
 
 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 high;
   int low;
   int middle;

-  int s;
+  state_number_t s;

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

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

     {
     {

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

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


@@ -378,227 +158,99 @@ map_goto (int state, int symbol)
       else
        high = middle - 1;
     }
       else
        high = middle - 1;
     }

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

 }
 
 
 static void
 initialize_F (void)
 {
 }
 
 
 static void
 initialize_F (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 = 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];
+  goto_number_t **reads = XCALLOC (goto_number_t *, ngotos);
+  goto_number_t *edge = XCALLOC (goto_number_t, ngotos + 1);
+  int nedges = 0;

 
 

-      if (sp)
-       {
-         k = sp->nshifts;
-
-         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_t stateno = to_state[i];
+      transitions_t *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_t symbol = TRANSITION_SYMBOL (sp, j);
+         if (nullable[symbol])
+           edge[nedges++] = map_goto (stateno, symbol);

        }
 
        }
 

-      rowp += tokensetsize;
+      if (nedges)
+       {
+         reads[i] = XCALLOC (goto_number_t, 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);

 }
 
 
 static void
 }
 
 
 static void

-add_lookback_edge (int stateno, int ruleno, int gotono)
+add_lookback_edge (state_t *state, rule_t *rule, int gotono)

 {
 {

-  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++;
-    }
-
-  assert (found);
-
-  sp = NEW (shorts);
-  sp->next = lookback[i];
+  int r = state_reduction_find (state, rule);
+  goto_list_t *sp = XCALLOC (goto_list_t, 1);
+  sp->next = lookback[(state->reductions->lookaheads - LA) + r];

   sp->value = gotono;
   sp->value = gotono;

-  lookback[i] = sp;
+  lookback[(state->reductions->lookaheads - LA) + r] = sp;

 }
 
 
 }
 
 

-static short **
-transpose (short **R_arg, int n)
-{
-  short **new_R;
-  short **temp_R;
-  short *nedges;
-  short *sp;
-  int i;
-  int k;
-
-  nedges = NEW2 (n, short);
-
-  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;
-       }
-    }
-
-  FREE (temp_R);
-
-  return new_R;
-}
-

 
 static void
 build_relations (void)
 {
 
 static void
 build_relations (void)
 {

+  goto_number_t *edge = XCALLOC (goto_number_t, ngotos + 1);
+  state_number_t *states1 = XCALLOC (state_number_t, ritem_longest_rhs () + 1);

   int i;
   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 = NEW2 (ngotos, short *);
-  edge = NEW2 (ngotos + 1, short);
-  states = NEW2 (maxrhs + 1, short);
+
+  includes = XCALLOC (goto_number_t *, 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_t symbol1 = states[to_state[i]]->accessing_symbol;
+      rule_t **rulep;

 
 

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

        {
        {

-         length = 1;
-         states[0] = state1;
-         stateno = state1;
+         int done;
+         int length = 1;
+         item_number_t *rp;
+         state_t *state = states[from_state[i]];
+         states1[0] = state->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;
+             state = transitions_to (state->transitions,
+                                     item_number_as_symbol_number (*rp));
+             states1[length++] = state->number;

            }
 
            }
 

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

 
          length--;
          done = 0;
 
          length--;
          done = 0;


@@ -609,8 +261,9 @@ build_relations (void)
              /* 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);
+                 /* 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;
                }
                  if (nullable[*rp])
                    done = 0;
                }


@@ -619,25 +272,18 @@ build_relations (void)
 
       if (nedges)
        {
 
       if (nedges)
        {

-         includes[i] = shortp = NEW2 (nedges + 1, short);
+         int j;
+         includes[i] = XCALLOC (goto_number_t, 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;
+  XFREE (edge);
+  XFREE (states1);

 
 

-  FREE (edge);
-  FREE (states);
+  relation_transpose (&includes, ngotos);

 }
 
 
 }
 
 


@@ -647,75 +293,160 @@ compute_FOLLOWS (void)
 {
   int i;
 
 {
   int i;
 

-  digraph (includes);
+  relation_digraph (includes, ngotos, &F);

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

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

 
 

-  FREE (includes);
+  XFREE (includes);

 }
 
 
 static void
 compute_lookaheads (void)
 {
 }
 
 
 static void
 compute_lookaheads (void)
 {

-  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++;
-       }
+  size_t i;
+  goto_list_t *sp;
+
+  for (i = 0; i < nLA; i++)
+    for (sp = lookback[i]; sp; sp = sp->next)
+      bitset_or (LA[i], LA[i], F[sp->value]);
+
+  /* Free LOOKBACK. */
+  for (i = 0; i < nLA; i++)
+    LIST_FREE (goto_list_t, lookback[i]);
+
+  XFREE (lookback);
+  bitsetv_free (F);
+}
+
+
+/*---------------------------------------------------------------.
+| Count the number of lookaheads required for STATE (NLOOKAHEADS |
+| member).                                                       |
+`---------------------------------------------------------------*/
+
+static int
+state_lookaheads_count (state_t *state)
+{
+  int k;
+  int nlookaheads = 0;
+  reductions_t *rp = state->reductions;
+  transitions_t *sp = state->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
+    state->consistent = 1;
+
+  for (k = 0; k < sp->num; k++)
+    if (!TRANSITION_IS_DISABLED (sp, k) && TRANSITION_IS_ERROR (sp, k))
+      {
+       state->consistent = 0;
+       break;
+      }
+
+  return nlookaheads;
+}

 
 

-      rowp = fp3;
-    }

 
 

-  for (i = 0; i < n; i++)
+/*----------------------------------------------.
+| Compute LA, NLA, and the lookaheads members.  |
+`----------------------------------------------*/
+
+static void
+initialize_LA (void)
+{
+  state_number_t i;
+  bitsetv pLA;
+
+  /* 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;
+
+  pLA = LA = bitsetv_create (nLA, ntokens, BITSET_FIXED);
+  lookback = XCALLOC (goto_list_t *, nLA);
+
+  /* Initialize the members LOOKAHEADS for each state which reductions
+     require lookaheads.  */
+  for (i = 0; i < nstates; i++)

     {
     {

-      /* JF removed ref to freed storage */
-      for (sp = lookback[i]; sp; sp = sptmp)
+      int count = state_lookaheads_count (states[i]);
+      if (count)

        {
        {

-         sptmp = sp->next;
-         FREE (sp);
+         states[i]->reductions->lookaheads = pLA;
+         pLA += count;

        }
     }
        }
     }

-
-  FREE (lookback);
-  FREE (F);

 }
 
 
 }
 
 

+/*---------------------------------------.
+| Output the lookaheads for each state.  |
+`---------------------------------------*/
+
+static void
+lookaheads_print (FILE *out)
+{
+  state_number_t i;
+  int j, k;
+  fprintf (out, "Lookaheads: BEGIN\n");
+  for (i = 0; i < nstates; ++i)
+    {
+      reductions_t *reds = states[i]->reductions;
+      bitset_iterator iter;
+      int nlookaheads = 0;
+
+      if (reds->lookaheads)
+       for (k = 0; k < reds->num; ++k)
+         if (reds->lookaheads[k])
+           ++nlookaheads;
+
+      fprintf (out, "State %d: %d lookaheads\n",
+              i, nlookaheads);
+
+      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");
+}
+

 void
 lalr (void)
 {
 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 ();
   initialize_LA ();
   set_goto_map ();
   initialize_F ();
   build_relations ();
   compute_FOLLOWS ();
   compute_lookaheads ();

+
+  if (trace_flag & trace_sets)
+    lookaheads_print (stderr);
+}
+
+
+void
+lalr_free (void)
+{
+  state_number_t s;
+  for (s = 0; s < nstates; ++s)
+    states[s]->reductions->lookaheads = NULL;
+  bitsetv_free (LA);

 }
 }