Merge remote-tracking branch 'origin/maint'

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 18c659da72381a8a65dc2fae10c87367ecf43d83..ccd50ebf78d72b01c40fbcdd2ac3d708af4ef079 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -584,7 +584,7 @@ conflicts_print (void)
 
   if (! glr_parser && rrc_total > 0 && expected_rr_conflicts != -1)
     {
 
   if (! glr_parser && rrc_total > 0 && expected_rr_conflicts != -1)
     {

-      warn (_("%%expect-rr applies only to GLR parsers"));
+      complain (Wother, _("%%expect-rr applies only to GLR parsers"));

       expected_rr_conflicts = -1;
     }
 
       expected_rr_conflicts = -1;
     }
 


@@ -601,9 +601,9 @@ conflicts_print (void)
   /* Report the total number of conflicts on STDERR.  */
   if (expected_sr_conflicts == -1 && expected_rr_conflicts == -1)
     {
   /* Report the total number of conflicts on STDERR.  */
   if (expected_sr_conflicts == -1 && expected_rr_conflicts == -1)
     {

-      if (!(warnings_flag & warnings_conflicts_sr))
+      if (!(warnings_flag & Wconflicts_sr))

         src_total = 0;
         src_total = 0;

-      if (!(warnings_flag & warnings_conflicts_rr))
+      if (!(warnings_flag & Wconflicts_rr))

         rrc_total = 0;
     }
   if (src_total | rrc_total)
         rrc_total = 0;
     }
   if (src_total | rrc_total)


@@ -618,14 +618,14 @@ conflicts_print (void)
   if (expected_sr_conflicts != -1 || expected_rr_conflicts != -1)
     {
       if (! src_ok)
   if (expected_sr_conflicts != -1 || expected_rr_conflicts != -1)
     {
       if (! src_ok)

-        complain (ngettext ("expected %d shift/reduce conflict",
-                            "expected %d shift/reduce conflicts",
-                            src_expected),
+        complain (complaint, ngettext ("expected %d shift/reduce conflict",
+                                       "expected %d shift/reduce conflicts",
+                                       src_expected),

                   src_expected);
       if (! rrc_ok)
                   src_expected);
       if (! rrc_ok)

-        complain (ngettext ("expected %d reduce/reduce conflict",
-                            "expected %d reduce/reduce conflicts",
-                            rrc_expected),
+        complain (complaint, ngettext ("expected %d reduce/reduce conflict",
+                                       "expected %d reduce/reduce conflicts",
+                                       rrc_expected),

                   rrc_expected);
     }
 }
                   rrc_expected);
     }
 }