(conflicts_print): If the user specifies "%expect N", report an error

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 36f1d00c1a4ccfb7110b55bfeb26d950f49c674f..0c2fb03c38c1bd539bd2df8cd37ad77f635c6d86 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -534,18 +534,23 @@ conflicts_print (void)
   else
     warn ("%s", conflict_report (src_total, rrc_total));
 
-  if (expected_conflicts != -1 && !src_ok)
-    complain (ngettext ("expected %d shift/reduce conflict",
-                       "expected %d shift/reduce conflicts",
-                       expected_conflicts),
-             expected_conflicts);
+  if (expected_conflicts != -1)
+    {
+      if (! src_ok)
+       complain (ngettext ("expected %d shift/reduce conflict",
+                           "expected %d shift/reduce conflicts",
+                           expected_conflicts),
+                 expected_conflicts);
+      if (rrc_total)
+       complain (_("expected 0 reduce/reduce conflicts"));
+    }
 }
 
 
 void
 conflicts_free (void)
 {
-  free (conflicts);
+  XFREE (conflicts);
   bitset_free (shiftset);
   bitset_free (lookaheadset);
   obstack_free (&solved_conflicts_obstack, NULL);