Add nls.m4, po.m4.

[bison.git] / src / lalr.c

diff --git a/src/lalr.c b/src/lalr.c
index 643f8fd91d20ab78bf6f460dde57cd424e8f67d1..7273805ac09107ba0e1f192591efcce346e770ce 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,5 +1,6 @@
-/* Compute look-ahead criteria for bison,
-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002
+/* Compute look-ahead criteria for Bison.
+
+   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003

    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -25,189 +26,109 @@
    tokens they accept.  */
 
 #include "system.h"
    tokens they accept.  */
 
 #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 <bitset.h>
+#include <bitsetv.h>
+#include <quotearg.h>
+

 #include "LR0.h"
 #include "complain.h"
 #include "LR0.h"
 #include "complain.h"

-#include "lalr.h"
-#include "nullable.h"

 #include "derives.h"
 #include "getargs.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"

 
 

-/* All the decorated states, indexed by the state number.  */
-state_t **states = 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;
-
-/* And for the famous F variable, which name is so descriptive that a
-   comment is hardly needed.  <grin>.  */
-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]);
-      }
-}
-
+goto_number *goto_map = NULL;
+static goto_number ngotos = 0;
+state_number *from_state = NULL;
+state_number *to_state = NULL;

 
 

-static void
-digraph (short **relation)
+/* Linked list of goto numbers.  */
+typedef struct goto_list

 {
 {

-  int i;
-
-  infinity = ngotos + 2;
-  INDEX = XCALLOC (short, ngotos + 1);
-  VERTICES = XCALLOC (short, ngotos + 1);
-  top = 0;
-
-  R = relation;
+  struct goto_list *next;
+  goto_number value;
+} goto_list;

 
 

-  for (i = 0; i < ngotos; i++)
-    INDEX[i] = 0;

 
 

-  for (i = 0; i < ngotos; i++)
-    if (INDEX[i] == 0 && R[i])
-      traverse (i);
+/* 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.  */

 
 

-  XFREE (INDEX);
-  XFREE (VERTICES);
-}
+static bitsetv LA = NULL;
+size_t nLA;

 
 
 
 

-static void
-initialize_LA (void)
-{
-  size_t i;
-  int j;
-  rule_t **np;
+/* And for the famous F variable, which name is so descriptive that a
+   comment is hardly needed.  <grin>.  */
+static bitsetv F = NULL;

 
 

-  /* Avoid having to special case 0.  */
-  if (!nLA)
-    nLA = 1;
+static goto_number **includes;
+static goto_list **lookback;

 
 

-  LA = bitsetv_create (nLA, ntokens, BITSET_FIXED);
-  LArule = XCALLOC (rule_t *, nLA);
-  lookback = XCALLOC (shorts *, nLA);

 
 

-  np = LArule;
-  for (i = 0; i < nstates; i++)
-    if (!states[i]->consistent)
-      for (j = 0; j < states[i]->reductions->nreds; j++)
-       *np++ = &rules[states[i]->reductions->rules[j]];
-}

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

-  size_t state;
-  int i;
-  short *temp_map;
+  state_number s;
+  goto_number *temp_map;

 
 

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

 
   ngotos = 0;
 
   ngotos = 0;

-  for (state = 0; state < nstates; ++state)
+  for (s = 0; s < nstates; ++s)

     {
     {

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

        {
        {

-         if (ngotos == SHRT_MAX)
-           fatal (_("too many gotos (max %d)"), SHRT_MAX);
-
+         if (ngotos >= GOTO_NUMBER_MAXIMUM)
+           abort ();

          ngotos++;
          ngotos++;

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

        }
     }
 
   {
     int k = 0;
        }
     }
 
   {
     int k = 0;

+    int i;

     for (i = ntokens; i < nsyms; i++)
       {
     for (i = ntokens; i < nsyms; i++)
       {

-       temp_map[i] = k;
-       k += goto_map[i];
+       temp_map[i - ntokens] = k;
+       k += goto_map[i - ntokens];

       }
 
     for (i = ntokens; i < nsyms; i++)
       }
 
     for (i = ntokens; i < nsyms; i++)

-      goto_map[i] = temp_map[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 = XCALLOC (short, ngotos);
-  to_state = XCALLOC (short, ngotos);
+  CALLOC (from_state, ngotos);
+  CALLOC (to_state, ngotos);

 
 

-  for (state = 0; state < nstates; ++state)
+  for (s = 0; s < nstates; ++s)

     {
     {

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

        {
        {

-         int k = temp_map[SHIFT_SYMBOL (sp, i)]++;
-         from_state[k] = state;
-         to_state[k] = sp->shifts[i];
+         int k = temp_map[TRANSITION_SYMBOL (sp, i) - ntokens]++;
+         from_state[k] = s;
+         to_state[k] = sp->states[i]->number;

        }
     }
 
        }
     }
 

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

 }
 
 
 }
 
 


@@ -217,39 +138,37 @@ set_goto_map (void)
 `----------------------------------------------------------*/
 
 static int
 `----------------------------------------------------------*/
 
 static int

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

 {
   int high;
   int low;
   int middle;
 {
   int high;
   int low;
   int middle;

-  int s;
+  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)
+      if (s == s0)

        return middle;
        return middle;

-      else if (s < state)
+      else if (s < s0)

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

-
-  assert (0);
-  /* NOTREACHED */
-  return 0;

 }
 
 
 static void
 initialize_F (void)
 {
 }
 
 
 static void
 initialize_F (void)
 {

-  short **reads = XCALLOC (short *, ngotos);
-  short *edge = XCALLOC (short, ngotos + 1);
+  goto_number **reads = CALLOC (reads, ngotos);
+  goto_number *edge = CALLOC (edge, ngotos + 1);

   int nedges = 0;
 
   int i;
   int nedges = 0;
 
   int i;


@@ -258,30 +177,30 @@ initialize_F (void)
 
   for (i = 0; i < ngotos; i++)
     {
 
   for (i = 0; i < ngotos; i++)
     {

-      int stateno = to_state[i];
-      shifts *sp = states[stateno]->shifts;
+      state_number stateno = to_state[i];
+      transitions *sp = states[stateno]->transitions;

 
       int j;
 
       int j;

-      for (j = 0; j < sp->nshifts && SHIFT_IS_SHIFT (sp, j); j++)
-       bitset_set (F[i], SHIFT_SYMBOL (sp, j));
+      FOR_EACH_SHIFT (sp, j)
+       bitset_set (F[i], TRANSITION_SYMBOL (sp, j));

 
 

-      for (; j < sp->nshifts; j++)
+      for (; j < sp->num; j++)

        {
        {

-         token_number_t symbol = SHIFT_SYMBOL (sp, j);
-         if (nullable[symbol])
-           edge[nedges++] = map_goto (stateno, symbol);
+         symbol_number sym = TRANSITION_SYMBOL (sp, j);
+         if (nullable[sym - ntokens])
+           edge[nedges++] = map_goto (stateno, sym);

        }
 
       if (nedges)
        {
        }
 
       if (nedges)
        {

-         reads[i] = XCALLOC (short, nedges + 1);
+         CALLOC (reads[i], nedges + 1);

          memcpy (reads[i], edge, nedges * sizeof (edge[0]));
          reads[i][nedges] = -1;
          nedges = 0;
        }
     }
 
          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]);
 
   for (i = 0; i < ngotos; i++)
     XFREE (reads[i]);


@@ -292,165 +211,64 @@ initialize_F (void)
 
 
 static void
 
 
 static void

-add_lookback_edge (state_t *state, int ruleno, int gotono)
+add_lookback_edge (state *s, rule *r, int gotono)

 {
 {

-  int i;
-  shorts *sp;
-
-  for (i = 0; i < state->nlookaheads; ++i)
-    if (LArule[state->lookaheadsp + i]->number == ruleno)
-      break;
-
-  assert (LArule[state->lookaheadsp + i]->number == ruleno);
-
-  sp = XCALLOC (shorts, 1);
-  sp->next = lookback[state->lookaheadsp + i];
+  int ri = state_reduction_find (s, r);
+  goto_list *sp = MALLOC (sp, 1);
+  sp->next = lookback[(s->reductions->lookaheads - LA) + ri];

   sp->value = gotono;
   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[(s->reductions->lookaheads - LA) + ri] = 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)
 {
 
 
 static void
 build_relations (void)
 {

-  short *edge = XCALLOC (short, ngotos + 1);
-  short *states1 = XCALLOC (short, ritem_longest_rhs () + 1);
+  goto_number *edge = CALLOC (edge, ngotos + 1);
+  state_number *states1 = CALLOC (states1, ritem_longest_rhs () + 1);

   int i;
 
   int i;
 

-  includes = XCALLOC (short *, ngotos);
+  CALLOC (includes, ngotos);

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

-      token_number_t symbol1 = states[to_state[i]]->accessing_symbol;
-      short *rulep;
+      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++)

        {
        {

-         int done;
+         bool done;

          int length = 1;
          int length = 1;

-         item_number_t *rp;
-         state_t *state = states[from_state[i]];
-         states1[0] = state->number;
+         item_number *rp;
+         state *s = states[from_state[i]];
+         states1[0] = s->number;

 
 

-         for (rp = rules[*rulep].rhs; *rp >= 0; rp++)
+         for (rp = (*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
-                     == item_number_as_token_number (*rp))
-                   break;
-               }
-
-             states1[length++] = state->number;
+             s = transitions_to (s->transitions,
+                                 item_number_as_symbol_number (*rp));
+             states1[length++] = s->number;

            }
 
            }
 

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

-                 /* Downcasting from item_number_t to token_number_t. */
+                 /* Downcasting from item_number to symbol_number.  */

                  edge[nedges++] = map_goto (states1[--length],
                  edge[nedges++] = map_goto (states1[--length],

-                                            item_number_as_token_number (*rp));
-                 if (nullable[*rp])
-                   done = 0;
+                                            item_number_as_symbol_number (*rp));
+                 if (nullable[*rp - ntokens])
+                   done = false;

                }
            }
        }
                }
            }
        }


@@ -458,7 +276,7 @@ build_relations (void)
       if (nedges)
        {
          int j;
       if (nedges)
        {
          int j;

-         includes[i] = XCALLOC (short, nedges + 1);
+         CALLOC (includes[i], nedges + 1);

          for (j = 0; j < nedges; j++)
            includes[i][j] = edge[j];
          includes[i][nedges] = -1;
          for (j = 0; j < nedges; j++)
            includes[i][j] = edge[j];
          includes[i][nedges] = -1;


@@ -468,7 +286,7 @@ build_relations (void)
   XFREE (edge);
   XFREE (states1);
 
   XFREE (edge);
   XFREE (states1);
 

-  includes = transpose (includes, ngotos);
+  relation_transpose (&includes, ngotos);

 }
 
 
 }
 
 


@@ -478,7 +296,7 @@ compute_FOLLOWS (void)
 {
   int i;
 
 {
   int i;
 

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

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


@@ -491,7 +309,7 @@ static void
 compute_lookaheads (void)
 {
   size_t i;
 compute_lookaheads (void)
 {
   size_t i;

-  shorts *sp;
+  goto_list *sp;

 
   for (i = 0; i < nLA; i++)
     for (sp = lookback[i]; sp; sp = sp->next)
 
   for (i = 0; i < nLA; i++)
     for (sp = lookback[i]; sp; sp = sp->next)


@@ -499,49 +317,79 @@ compute_lookaheads (void)
 
   /* Free LOOKBACK. */
   for (i = 0; i < nLA; i++)
 
   /* Free LOOKBACK. */
   for (i = 0; i < nLA; i++)

-    LIST_FREE (shorts, lookback[i]);
+    LIST_FREE (goto_list, lookback[i]);

 
   XFREE (lookback);
   bitsetv_free (F);
 }
 
 
 
   XFREE (lookback);
   bitsetv_free (F);
 }
 
 

-/*--------------------------------------.
-| Initializing the lookaheads members.  |
-`--------------------------------------*/
+/*-----------------------------------------------------------.
+| Count the number of lookaheads required for S (NLOOKAHEADS |
+| member).                                                   |
+`-----------------------------------------------------------*/
+
+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 (k = 0; k < sp->num; k++)
+    if (!TRANSITION_IS_DISABLED (sp, k) && TRANSITION_IS_ERROR (sp, k))
+      {
+       s->consistent = 0;
+       break;
+      }
+
+  return nlookaheads;
+}
+
+
+/*----------------------------------------------.
+| Compute LA, NLA, and the lookaheads members.  |
+`----------------------------------------------*/

 
 static void
 
 static void

-initialize_lookaheads (void)
+initialize_LA (void)

 {
 {

-  size_t i;
+  state_number i;
+  bitsetv pLA;
+
+  /* Compute the total number of reductions requiring a lookahead.  */

   nLA = 0;
   for (i = 0; i < nstates; i++)
   nLA = 0;
   for (i = 0; i < nstates; i++)

-    {
-      int k;
-      int nlookaheads = 0;
-      reductions *rp = states[i]->reductions;
-      shifts *sp = states[i]->shifts;
-
-      /* 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->nreds > 1
-         || (rp->nreds == 1 && sp->nshifts && SHIFT_IS_SHIFT (sp, 0)))
-       nlookaheads += rp->nreds;
-      else
-       states[i]->consistent = 1;
+    nLA += state_lookaheads_count (states[i]);
+  /* Avoid having to special case 0.  */
+  if (!nLA)
+    nLA = 1;

 
 

-      for (k = 0; k < sp->nshifts; k++)
-       if (SHIFT_IS_ERROR (sp, k))
-         {
-           states[i]->consistent = 0;
-           break;
-         }
+  pLA = LA = bitsetv_create (nLA, ntokens, BITSET_FIXED);
+  CALLOC (lookback, nLA);

 
 

-      states[i]->nlookaheads = nlookaheads;
-      states[i]->lookaheadsp = nLA;
-      nLA += nlookaheads;
+  /* Initialize the members LOOKAHEADS for each state which reductions
+     require lookaheads.  */
+  for (i = 0; i < nstates; i++)
+    {
+      int count = state_lookaheads_count (states[i]);
+      if (count)
+       {
+         states[i]->reductions->lookaheads = pLA;
+         pLA += count;
+       }

     }
 }
 
     }
 }
 


@@ -553,20 +401,31 @@ initialize_lookaheads (void)
 static void
 lookaheads_print (FILE *out)
 {
 static void
 lookaheads_print (FILE *out)
 {

-  size_t i;
+  state_number i;

   int j, k;
   fprintf (out, "Lookaheads: BEGIN\n");
   for (i = 0; i < nstates; ++i)
     {
   int j, k;
   fprintf (out, "Lookaheads: BEGIN\n");
   for (i = 0; i < nstates; ++i)
     {

+      reductions *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",
       fprintf (out, "State %d: %d lookaheads\n",

-              i, states[i]->nlookaheads);
+              i, nlookaheads);

 
 

-      for (j = 0; j < states[i]->nlookaheads; ++j)
-       for (k = 0; k < ntokens; ++k)
-         if (bitset_test (LA[states[i]->lookaheadsp + j], k))
+      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",
            fprintf (out, "   on %d (%s) -> rule %d\n",

-                    k, quotearg_style (escape_quoting_style, symbols[k]->tag),
-                    LArule[states[i]->lookaheadsp + j]->number - 1);
+                    k, symbols[k]->tag,
+                    reds->rules[j]->number);
+         };

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


@@ -574,7 +433,6 @@ lookaheads_print (FILE *out)
 void
 lalr (void)
 {
 void
 lalr (void)
 {

-  initialize_lookaheads ();

   initialize_LA ();
   set_goto_map ();
   initialize_F ();
   initialize_LA ();
   set_goto_map ();
   initialize_F ();


@@ -582,6 +440,16 @@ lalr (void)
   compute_FOLLOWS ();
   compute_lookaheads ();
 
   compute_FOLLOWS ();
   compute_lookaheads ();
 

-  if (trace_flag)
+  if (trace_flag & trace_sets)

     lookaheads_print (stderr);
 }
     lookaheads_print (stderr);
 }

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