* src/output.c (prepare_tokens): Go up to ntokens, not ntokens + 1.

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index 6eda2327dd50ef7851a202631622082462e3aeb9..a029b6714cc9fd01bb0190086205e658f9192e41 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -34,7 +34,6 @@
 #include "conflicts.h"
 #include "muscle_tab.h"
 
-int lineno;
 static symbol_list_t *grammar = NULL;
 static int start_flag = 0;
 merger_list *merge_functions;
@@ -113,7 +112,8 @@ epilogue_set (const char *epilogue, location_t location)
 `-------------------------------------------------------------------*/
 
 static int
-get_merge_function (const char* name, const char* type)
+get_merge_function (const char* name, const char* type,
+                   location_t loc)
 {
   merger_list *syms;
   merger_list head;
@@ -129,15 +129,17 @@ get_merge_function (const char* name, const char* type)
   for (syms = &head, n = 1; syms->next != NULL; syms = syms->next, n += 1)
     if (strcmp (name, syms->next->name) == 0)
       break;
-  if (syms->next == NULL) {
-    syms->next = XMALLOC (merger_list, 1);
-    syms->next->name = strdup (name);
-    syms->next->type = strdup (type);
-    syms->next->next = NULL;
-    merge_functions = head.next;
-  } else if (strcmp (type, syms->next->type) != 0)
-    warn (_("result type clash on merge function %s: `%s' vs. `%s'"),
-         name, type, syms->next->type);
+  if (syms->next == NULL)
+    {
+      syms->next = XMALLOC (merger_list, 1);
+      syms->next->name = strdup (name);
+      syms->next->type = strdup (type);
+      syms->next->next = NULL;
+      merge_functions = head.next;
+    }
+  else if (strcmp (type, syms->next->type) != 0)
+    warn_at (loc, _("result type clash on merge function %s: `%s' vs. `%s'"),
+            name, type, syms->next->type);
   return n;
 }
 
@@ -367,7 +369,7 @@ grammar_current_rule_merge_set (const char* name, location_t location)
   if (current_rule->merger != 0)
     complain_at (location, _("only one %%merge allowed per rule"));
   current_rule->merger =
-    get_merge_function (name, current_rule->sym->type_name);
+    get_merge_function (name, current_rule->sym->type_name, location);
 }
 
 /* Attach a SYMBOL to the current rule.  If needed, move the previous
@@ -403,17 +405,13 @@ grammar_current_rule_action_append (const char *action, location_t location)
 static void
 packgram (void)
 {
-  unsigned int itemno;
-  int ruleno;
-  symbol_list_t *p;
+  unsigned int itemno = 0;
+  rule_number_t ruleno = 0;
+  symbol_list_t *p = grammar;
 
   ritem = XCALLOC (item_number_t, nritems);
-  rules = XCALLOC (rule_t, nrules) - 1;
+  rules = XCALLOC (rule_t, nrules);
 
-  itemno = 0;
-  ruleno = 1;
-
-  p = grammar;
   while (p)
     {
       symbol_t *ruleprec = p->ruleprec;
@@ -449,7 +447,7 @@ packgram (void)
          rules[ruleno].precsym = ruleprec;
          rules[ruleno].prec = ruleprec;
        }
-      ritem[itemno++] = -ruleno;
+      ritem[itemno++] = rule_number_as_item_number (ruleno);
       ++ruleno;
 
       if (p)
@@ -473,7 +471,6 @@ void
 reader (void)
 {
   gram_control_t gram_control;
-  lineno = 1;
 
   /* Initialize the symbol table.  */
   symbols_new ();
@@ -506,6 +503,11 @@ reader (void)
   scanner_initialize ();
   gram_parse (&gram_control);
 
+  /* If something went wrong during the parsing, don't try to
+     continue.  */
+  if (complain_message_count)
+    exit (1);
+
   /* Grammar has been read.  Do some checking */
   if (nrules == 0)
     fatal (_("no rules in the input grammar"));