From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 26 Dec 2002 22:10:52 +0000 (+0000)
Subject: (conflicts_print): If the user specifies "%expect N", report an error
X-Git-Tag: BISON-1_875~26
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/76be9271f2bd46510de83d9957d4cfc68d757996

(conflicts_print): If the user specifies "%expect N", report an error
if there are any reduce/reduce conflicts.  This is what the manual
says should happen.  This fixes Debian bug 130890, reported by Anthony
DeRobertis.
---

diff --git a/src/conflicts.c b/src/conflicts.c
index fcfa735d..0c2fb03c 100644
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -534,11 +534,16 @@ 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"));
+    }
 }