Use more accurate diagnostics, e.g.

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index c965fa8a10b88d15663c41065c2d3f7ebbcbf1a7..99e951e20c1c4194b0d22a8e797c87e32f1e6919 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -22,7 +22,6 @@
 
 #include "system.h"
 #include "quotearg.h"
-#include "quote.h"
 #include "getargs.h"
 #include "files.h"
 #include "symtab.h"
@@ -138,7 +137,7 @@ get_merge_function (const char* name, const char* type,
       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'"),
+    warn_at (loc, _("result type clash on merge function %s: <%s> != <%s>"),
             name, type, syms->next->type);
   return n;
 }
@@ -265,7 +264,7 @@ grammar_current_rule_check (void)
       const char *rhs_type = first_rhs->type_name ? first_rhs->type_name : "";
       if (strcmp (lhs_type, rhs_type))
        complain_at (current_rule->location,
-                    _("type clash (`%s' `%s') on default action"),
+                    _("type clash on default action: <%s> != <%s>"),
                     lhs_type, rhs_type);
     }
   /* Warn if there is no default for $$ but we need one.  */
@@ -422,7 +421,7 @@ packgram (void)
       rules[ruleno].lhs = p->sym;
       rules[ruleno].rhs = ritem + itemno;
       rules[ruleno].location = p->location;
-      rules[ruleno].useful = TRUE;
+      rules[ruleno].useful = true;
       rules[ruleno].action = p->action;
       rules[ruleno].action_location = p->action_location;
       rules[ruleno].dprec = p->dprec;
@@ -507,8 +506,8 @@ reader (void)
 
   /* If something went wrong during the parsing, don't try to
      continue.  */
-  if (complain_message_count)
-    exit (1);
+  if (complaint_issued)
+    return;
 
   /* Grammar has been read.  Do some checking */
   if (nrules == 0)