Regen.

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index c45c84a02daad609800f96cadab3955adaf52a79..f6f39f5a7a0ce7705f204addd781fd596e536d4a 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,30 +1,29 @@
 /* Allocate input grammar variables for bison,
    Copyright 1984, 1986, 1989, 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.
 
-Bison is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   Bison is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-Bison is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   Bison is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with Bison; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 
 #include "system.h"
 #include "gram.h"
+#include "symtab.h"
 #include "reader.h"
 
-void dummy PARAMS((void));
-
 /* comments for these variables are in gram.h  */
 
 int nitems;
@@ -34,14 +33,12 @@ int ntokens;
 int nvars;
 
 short *ritem = NULL;
-rule_t *rule_table = NULL;
-short *rprec = NULL;
-short *rprecsym = NULL;
-short *sprec = NULL;
-short *rassoc = NULL;
-short *sassoc = NULL;
+int nritems;
+
+rule_t *rules = NULL;
+
+struct bucket **symbols = NULL;
 short *token_translations = NULL;
-short *rline = NULL;
 
 int start_symbol;
 
@@ -63,11 +60,11 @@ ritem_print (FILE *out)
 {
   int i;
   fputs ("RITEM\n", out);
-  for (i = 0; ritem[i]; ++i)
-    if (ritem[i] > 0)
-      fprintf (out, "  %s", tags[ritem[i]]);
+  for (i = 0; i < nritems; ++i)
+    if (ritem[i] >= 0)
+      fprintf (out, "  %s", symbols[ritem[i]]->tag);
     else
-      fprintf (out, "  (rule %d)\n", -ritem[i]);
+      fprintf (out, "  (rule %d)\n", -ritem[i] - 1);
   fputs ("\n\n", out);
 }
 
@@ -79,14 +76,14 @@ ritem_print (FILE *out)
 size_t
 ritem_longest_rhs (void)
 {
-  short *itemp;
   int length;
   int max;
+  int i;
 
   length = 0;
   max = 0;
-  for (itemp = ritem; *itemp; itemp++)
-    if (*itemp > 0)
+  for (i = 0; i < nritems; ++i)
+    if (ritem[i] >= 0)
       {
        length++;
       }