%expect-rr is for GLR only

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 105c5ceb5efae9739dd85f49a6f85a9b9e1ead32..0db0f575ef1026d14cdb28add79dca12a8c1c2dd 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -576,7 +576,7 @@ conflicts_print (void)
         }
   }
 
-  if (! glr_parser && rrc_total > 0 && expected_rr_conflicts != -1)
+  if (! glr_parser && expected_rr_conflicts != -1)
     {
       complain (Wother, _("%%expect-rr applies only to GLR parsers"));
       expected_rr_conflicts = -1;
@@ -602,10 +602,8 @@ conflicts_print (void)
     }
   if (src_total | rrc_total)
     {
-      if (expected_sr_conflicts == -1 && src_total)
-        set_warning_issued (Wconflicts_sr);
-      if (expected_rr_conflicts == -1 && rrc_total)
-        set_warning_issued (Wconflicts_rr);
+      if (expected_sr_conflicts == -1 && expected_rr_conflicts == -1)
+        set_warning_issued ();
       if (! yacc_flag)
         fprintf (stderr, "%s: ", current_file);
       conflict_report (stderr, src_total, rrc_total);