* tests/regression.at (Web2c Actions): Blindly move the actual

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index c5f3b11ec4e0a83b4d313ad5f8c79f0b205983ff..bebbc1539b494ff3ab31b817aa1a9b3d36c029c8 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -71,6 +71,7 @@ static int lastprec;
 static bucket *errtoken = NULL;
 static bucket *undeftoken = NULL;
 static bucket *eoftoken = NULL;
+static bucket *axiom = NULL;
 
 static symbol_list *
 symbol_list_new (bucket *sym)
@@ -1450,12 +1451,8 @@ readgram (void)
        t = lex ();
       }
 
-
   /* grammar has been read.  Do some checking */
 
-  if (nsyms > MAXSHORT)
-    fatal (_("too many symbols (tokens plus nonterminals); maximum %d"),
-          MAXSHORT);
   if (nrules == 0)
     fatal (_("no rules in the input grammar"));
 
@@ -1471,6 +1468,25 @@ readgram (void)
        bp->value = nvars++;
       }
 
+  /* Insert the initial rule, which line is that of the first rule
+     (not that of the start symbol):
+
+     axiom: %start EOF.  */
+  p = symbol_list_new (axiom);
+  p->line = grammar->line;
+  p->next = symbol_list_new (startval);
+  p->next->next = symbol_list_new (eoftoken);
+  p->next->next->next = symbol_list_new (NULL);
+  p->next->next->next->next = grammar;
+  nrules += 1;
+  nitems += 3;
+  grammar = p;
+  startval = axiom;
+
+  if (nsyms > MAXSHORT)
+    fatal (_("too many symbols (tokens plus nonterminals); maximum %d"),
+          MAXSHORT);
+
   ntokens = nsyms - nvars;
 }
 
@@ -1764,6 +1780,8 @@ packgram (void)
     }
 
   ritem[itemno] = 0;
+  nritems = itemno;
+  assert (nritems == nitems);
 
   if (trace_flag)
     ritem_print (stderr);
@@ -1805,6 +1823,11 @@ reader (void)
   /* Initialize the symbol table.  */
   tabinit ();
 
+  /* Construct the axiom symbol. */
+  axiom = getsym ("$axiom");
+  axiom->class = nterm_sym;
+  axiom->value = nvars++;
+
   /* Construct the error token */
   errtoken = getsym ("error");
   errtoken->class = token_sym;