Update.

[bison.git] / src / lalr.c

diff --git a/src/lalr.c b/src/lalr.c
index a56fbc04f79c32e2dad93eb7d11a94c57316edbe..42cd05ef938f287ae97866fccd98c1c7a02eb29d 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,5 +1,5 @@
 /* Compute look-ahead criteria for bison,
-   Copyright 1984, 1986, 1989, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 2000, 2001  Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -48,7 +48,6 @@ short *to_state;
 extern void berror PARAMS ((const char *));
 
 static int infinity;
-static int maxrhs;
 static int ngotos;
 
 /* And for the famous F variable, which named is so descriptive that a
@@ -213,8 +212,9 @@ set_state_table (void)
 }
 
 
-static void
-set_maxrhs (void)
+/* Return the size of the longest ride hand side of the rules. */
+static size_t
+maxrhs (void)
 {
   short *itemp;
   int length;
@@ -236,7 +236,7 @@ set_maxrhs (void)
        }
     }
 
-  maxrhs = max;
+  return max;
 }
 
 
@@ -547,7 +547,7 @@ build_relations (void)
 
   includes = XCALLOC (short *, ngotos);
   edge = XCALLOC (short, ngotos + 1);
-  states = XCALLOC (short, maxrhs + 1);
+  states = XCALLOC (short, maxrhs () + 1);
 
   for (i = 0; i < ngotos; i++)
     {
@@ -561,7 +561,7 @@ build_relations (void)
          states[0] = state1;
          stateno = state1;
 
-         for (rp = ritem + rrhs[*rulep]; *rp > 0; rp++)
+         for (rp = ritem + rule_table[*rulep].rhs; *rp > 0; rp++)
            {
              symbol2 = *rp;
              sp = state_table[stateno].shift_table;
@@ -653,14 +653,7 @@ compute_lookaheads (void)
 
   /* Free LOOKBACK. */
   for (i = 0; i < state_table[nstates].lookaheads; i++)
-    {
-      shorts *sptmp;
-      for (sp = lookback[i]; sp; sp = sptmp)
-       {
-         sptmp = sp->next;
-         XFREE (sp);
-       }
-    }
+    LIST_FREE (shorts, lookback[i]);
 
   XFREE (lookback);
   XFREE (F);
@@ -673,7 +666,6 @@ lalr (void)
   tokensetsize = WORDSIZE (ntokens);
 
   set_state_table ();
-  set_maxrhs ();
   initialize_LA ();
   set_goto_map ();
   initialize_F ();