* src/lalr.c (initialize_lookaheads): New. Extracted from...

* src/LR0.c (set_state_table): here.
* src/lalr.c (lalr): Call it.

diff --git a/ChangeLog b/ChangeLog
index e108638d1b1c92e77220bdaaee88331dda8a9112..ff06798ab5eecae15b9b638899bf9d77e90f2d85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-10  Akim Demaille  <akim@epita.fr>
+
+       * src/lalr.c (initialize_lookaheads): New.  Extracted from...
+       * src/LR0.c (set_state_table): here.
+       * src/lalr.c (lalr): Call it.
+
 2001-12-10  Akim Demaille  <akim@epita.fr>
 
        * src/state.h (shifts): Remove the `number' member: shifts are

diff --git a/src/LR0.c b/src/LR0.c
index d3f099b60386e3dad171bed1fbc1f80977d79688..5e8caef046bd4bf12751459bd53534b7d4c95a7c 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -560,39 +560,6 @@ set_state_table (void)
       if (!state_table[i]->shifts)
        state_table[i]->shifts = shifts_new (0);
   }
-
-  /* Initializing the lookaheads members.  Please note that it must be
-     performed after having set some of the other members which are
-     used below.  Change with extreme caution.  */
-  {
-    int i;
-    int count = 0;
-    for (i = 0; i < nstates; i++)
-      {
-       int k;
-       reductions *rp = state_table[i]->reductions;
-       shifts *sp = state_table[i]->shifts;
-
-       state_table[i]->lookaheads = count;
-
-       if (rp
-           && (rp->nreds > 1 || (sp->nshifts && SHIFT_IS_SHIFT (sp, 0))))
-         count += rp->nreds;
-       else
-         state_table[i]->consistent = 1;
-
-       for (k = 0; k < sp->nshifts; k++)
-         if (SHIFT_IS_ERROR (sp, k))
-           {
-             state_table[i]->consistent = 0;
-             break;
-           }
-      }
-
-    /* Seems to be needed by conflicts.c. */
-    state_table[nstates] = STATE_ALLOC (0);
-    state_table[nstates]->lookaheads = count;
-  }
 }
 
 /*-------------------------------------------------------------------.

diff --git a/src/lalr.c b/src/lalr.c
index b1188d64484280072d48c723b0330860041e6168..150b15e9df0e46301bd0fcad742cde52e3c5b950 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -534,11 +534,48 @@ compute_lookaheads (void)
 }
 
 
+/*--------------------------------------.
+| Initializing the lookaheads members.  |
+`--------------------------------------*/
+
+static void
+initialize_lookaheads (void)
+{
+  int i;
+  int count = 0;
+  for (i = 0; i < nstates; i++)
+    {
+      int k;
+      reductions *rp = state_table[i]->reductions;
+      shifts *sp = state_table[i]->shifts;
+
+      state_table[i]->lookaheads = count;
+
+      if (rp
+         && (rp->nreds > 1 || (sp->nshifts && SHIFT_IS_SHIFT (sp, 0))))
+       count += rp->nreds;
+      else
+       state_table[i]->consistent = 1;
+
+      for (k = 0; k < sp->nshifts; k++)
+       if (SHIFT_IS_ERROR (sp, k))
+         {
+           state_table[i]->consistent = 0;
+           break;
+         }
+    }
+
+  /* Seems to be needed by conflicts.c. */
+  state_table[nstates] = STATE_ALLOC (0);
+  state_table[nstates]->lookaheads = count;
+}
+
 void
 lalr (void)
 {
   tokensetsize = WORDSIZE (ntokens);
 
+  initialize_lookaheads ();
   initialize_LA ();
   set_goto_map ();
   initialize_F ();