* src/muscle_tab.h (MUSCLE_INSERT_LONG_INT): New.

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index c45c84a02daad609800f96cadab3955adaf52a79..2d0050482e1f82a45195b62ff52a3eb82f77d96b 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,57 +1,69 @@
 /* Allocate input grammar variables for bison,
 /* Allocate input grammar variables for bison,

-   Copyright 1984, 1986, 1989, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2001, 2002 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 "system.h"

+#include "quotearg.h"

 #include "gram.h"
 #include "gram.h"

+#include "symtab.h"

 #include "reader.h"
 
 #include "reader.h"
 

-void dummy PARAMS((void));
-

 /* comments for these variables are in gram.h  */
 
 /* comments for these variables are in gram.h  */
 

-int nitems;
-int nrules;
-int nsyms;
-int ntokens;
-int nvars;
-

 short *ritem = NULL;
 short *ritem = NULL;

-rule_t *rule_table = NULL;
-short *rprec = NULL;
-short *rprecsym = NULL;
-short *sprec = NULL;
-short *rassoc = NULL;
-short *sassoc = NULL;
-short *token_translations = NULL;
-short *rline = NULL;
+int nritems = 0;
+
+rule_t *rules = NULL;
+int nrules = 0;
+
+symbol_t **symbols = NULL;
+int nsyms = 0;
+int ntokens = 1;
+int nvars = 0;

 
 

-int start_symbol;
+token_number_t *token_translations = NULL;

 
 

-int max_user_token_number;
+int start_symbol = 0;

 
 

-int semantic_parser;
+int max_user_token_number = 256;

 
 

-int pure_parser;
+int semantic_parser = 0;

 
 

-int error_token_number;
+int pure_parser = 0;
+
+int error_token_number = 0;
+
+
+/*--------------------------------------.
+| Return the number of symbols in RHS.  |
+`--------------------------------------*/
+
+int
+rule_rhs_length (rule_t *rule)
+{
+  int res = 0;
+  short *rhsp;
+  for (rhsp = rule->rhs; *rhsp >= 0; ++rhsp)
+    ++res;
+  return res;
+}

 
 
 /*------------------------.
 
 
 /*------------------------.


@@ -63,11 +75,12 @@ ritem_print (FILE *out)
 {
   int i;
   fputs ("RITEM\n", 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", quotearg_style (escape_quoting_style,
+                                           symbols[ritem[i]]->tag));

     else
     else

-      fprintf (out, "  (rule %d)\n", -ritem[i]);
+      fprintf (out, "  (rule %d)\n", -ritem[i] - 1);

   fputs ("\n\n", out);
 }
 
   fputs ("\n\n", out);
 }
 


@@ -79,23 +92,15 @@ ritem_print (FILE *out)
 size_t
 ritem_longest_rhs (void)
 {
 size_t
 ritem_longest_rhs (void)
 {

-  short *itemp;
-  int length;
-  int max;
-
-  length = 0;
-  max = 0;
-  for (itemp = ritem; *itemp; itemp++)
-    if (*itemp > 0)
-      {
-       length++;
-      }
-    else
-      {
-       if (length > max)
-         max = length;
-       length = 0;
-      }
+  int max = 0;
+  int i;
+
+  for (i = 1; i < nrules + 1; ++i)
+    {
+      int length = rule_rhs_length (&rules[i]);
+      if (length > max)
+       max = length;
+    }

 
   return max;
 }
 
   return max;
 }