* src/lalr.c (set_maxrhs, maxrhs): Remove, replaced with...

(maxrhs): this new function.

diff --git a/ChangeLog b/ChangeLog
index 36a2d3f5326a3db09820de275a486853189f4e22..267fcd3e059902d9ed233876dd72019f7191e795 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-19  Akim Demaille  <akim@epita.fr>
+
+       * src/lalr.c (set_maxrhs, maxrhs): Remove, replaced with...
+       (maxrhs): this new function.
+

 2001-11-19  Akim Demaille  <akim@epita.fr>
 
        * src/lalr.c (F): New macro to access to the variable F.
 2001-11-19  Akim Demaille  <akim@epita.fr>
 
        * src/lalr.c (F): New macro to access to the variable F.

diff --git a/src/lalr.c b/src/lalr.c
index a56fbc04f79c32e2dad93eb7d11a94c57316edbe..c6d3f5c3874c7ec82e1beba84f3559f1f0f8e7f2 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,5 +1,5 @@
 /* Compute look-ahead criteria for bison,
 /* 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.
 
 
    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;
 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
 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;
 {
   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);
 
   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++)
     {
 
   for (i = 0; i < ngotos; i++)
     {


@@ -673,7 +673,6 @@ lalr (void)
   tokensetsize = WORDSIZE (ntokens);
 
   set_state_table ();
   tokensetsize = WORDSIZE (ntokens);
 
   set_state_table ();

-  set_maxrhs ();

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