Revert "made previous commit less hairy"

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 18c659da72381a8a65dc2fae10c87367ecf43d83..105c5ceb5efae9739dd85f49a6f85a9b9e1ead32 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -73,7 +73,7 @@ log_resolution (rule *r, symbol_number token,
         {
         case shift_resolution:
         case right_resolution:
         {
         case shift_resolution:
         case right_resolution:

-          obstack_fgrow2 (&solved_conflicts_obstack,
+          obstack_printf (&solved_conflicts_obstack,

                           _("    Conflict between rule %d and token %s"
                             " resolved as shift"),
                           r->number,
                           _("    Conflict between rule %d and token %s"
                             " resolved as shift"),
                           r->number,


@@ -82,7 +82,7 @@ log_resolution (rule *r, symbol_number token,
 
         case reduce_resolution:
         case left_resolution:
 
         case reduce_resolution:
         case left_resolution:

-          obstack_fgrow2 (&solved_conflicts_obstack,
+          obstack_printf (&solved_conflicts_obstack,

                           _("    Conflict between rule %d and token %s"
                             " resolved as reduce"),
                           r->number,
                           _("    Conflict between rule %d and token %s"
                             " resolved as reduce"),
                           r->number,


@@ -90,7 +90,7 @@ log_resolution (rule *r, symbol_number token,
           break;
 
         case nonassoc_resolution:
           break;
 
         case nonassoc_resolution:

-          obstack_fgrow2 (&solved_conflicts_obstack,
+          obstack_printf (&solved_conflicts_obstack,

                           _("    Conflict between rule %d and token %s"
                             " resolved as an error"),
                           r->number,
                           _("    Conflict between rule %d and token %s"
                             " resolved as an error"),
                           r->number,


@@ -102,33 +102,33 @@ log_resolution (rule *r, symbol_number token,
       switch (resolution)
         {
         case shift_resolution:
       switch (resolution)
         {
         case shift_resolution:

-          obstack_fgrow2 (&solved_conflicts_obstack,
+          obstack_printf (&solved_conflicts_obstack,

                           " (%s < %s)",
                           r->prec->tag,
                           symbols[token]->tag);
           break;
 
         case reduce_resolution:
                           " (%s < %s)",
                           r->prec->tag,
                           symbols[token]->tag);
           break;
 
         case reduce_resolution:

-          obstack_fgrow2 (&solved_conflicts_obstack,
+          obstack_printf (&solved_conflicts_obstack,

                           " (%s < %s)",
                           symbols[token]->tag,
                           r->prec->tag);
           break;
 
         case left_resolution:
                           " (%s < %s)",
                           symbols[token]->tag,
                           r->prec->tag);
           break;
 
         case left_resolution:

-          obstack_fgrow1 (&solved_conflicts_obstack,
+          obstack_printf (&solved_conflicts_obstack,

                           " (%%left %s)",
                           symbols[token]->tag);
           break;
 
         case right_resolution:
                           " (%%left %s)",
                           symbols[token]->tag);
           break;
 
         case right_resolution:

-          obstack_fgrow1 (&solved_conflicts_obstack,
+          obstack_printf (&solved_conflicts_obstack,

                           " (%%right %s)",
                           symbols[token]->tag);
           break;
 
         case nonassoc_resolution:
                           " (%%right %s)",
                           symbols[token]->tag);
           break;
 
         case nonassoc_resolution:

-          obstack_fgrow1 (&solved_conflicts_obstack,
+          obstack_printf (&solved_conflicts_obstack,

                           " (%%nonassoc %s)",
                           symbols[token]->tag);
           break;
                           " (%%nonassoc %s)",
                           symbols[token]->tag);
           break;


@@ -145,7 +145,7 @@ log_resolution (rule *r, symbol_number token,
         {
         case shift_resolution:
         case right_resolution:
         {
         case shift_resolution:
         case right_resolution:

-          obstack_fgrow2 (&solved_conflicts_xml_obstack,
+          obstack_printf (&solved_conflicts_xml_obstack,

                           "        <resolution rule=\"%d\" symbol=\"%s\""
                           " type=\"shift\">",
                           r->number,
                           "        <resolution rule=\"%d\" symbol=\"%s\""
                           " type=\"shift\">",
                           r->number,


@@ -154,7 +154,7 @@ log_resolution (rule *r, symbol_number token,
 
         case reduce_resolution:
         case left_resolution:
 
         case reduce_resolution:
         case left_resolution:

-          obstack_fgrow2 (&solved_conflicts_xml_obstack,
+          obstack_printf (&solved_conflicts_xml_obstack,

                           "        <resolution rule=\"%d\" symbol=\"%s\""
                           " type=\"reduce\">",
                           r->number,
                           "        <resolution rule=\"%d\" symbol=\"%s\""
                           " type=\"reduce\">",
                           r->number,


@@ -162,7 +162,7 @@ log_resolution (rule *r, symbol_number token,
           break;
 
         case nonassoc_resolution:
           break;
 
         case nonassoc_resolution:

-          obstack_fgrow2 (&solved_conflicts_xml_obstack,
+          obstack_printf (&solved_conflicts_xml_obstack,

                           "        <resolution rule=\"%d\" symbol=\"%s\""
                           " type=\"error\">",
                           r->number,
                           "        <resolution rule=\"%d\" symbol=\"%s\""
                           " type=\"error\">",
                           r->number,


@@ -174,33 +174,33 @@ log_resolution (rule *r, symbol_number token,
       switch (resolution)
         {
         case shift_resolution:
       switch (resolution)
         {
         case shift_resolution:

-          obstack_fgrow2 (&solved_conflicts_xml_obstack,
+          obstack_printf (&solved_conflicts_xml_obstack,

                           "%s &lt; %s",
                           xml_escape_n (0, r->prec->tag),
                           xml_escape_n (1, symbols[token]->tag));
           break;
 
         case reduce_resolution:
                           "%s &lt; %s",
                           xml_escape_n (0, r->prec->tag),
                           xml_escape_n (1, symbols[token]->tag));
           break;
 
         case reduce_resolution:

-          obstack_fgrow2 (&solved_conflicts_xml_obstack,
+          obstack_printf (&solved_conflicts_xml_obstack,

                           "%s &lt; %s",
                           xml_escape_n (0, symbols[token]->tag),
                           xml_escape_n (1, r->prec->tag));
           break;
 
         case left_resolution:
                           "%s &lt; %s",
                           xml_escape_n (0, symbols[token]->tag),
                           xml_escape_n (1, r->prec->tag));
           break;
 
         case left_resolution:

-          obstack_fgrow1 (&solved_conflicts_xml_obstack,
+          obstack_printf (&solved_conflicts_xml_obstack,

                           "%%left %s",
                           xml_escape (symbols[token]->tag));
           break;
 
         case right_resolution:
                           "%%left %s",
                           xml_escape (symbols[token]->tag));
           break;
 
         case right_resolution:

-          obstack_fgrow1 (&solved_conflicts_xml_obstack,
+          obstack_printf (&solved_conflicts_xml_obstack,

                           "%%right %s",
                           xml_escape (symbols[token]->tag));
           break;
 
         case nonassoc_resolution:
                           "%%right %s",
                           xml_escape (symbols[token]->tag));
           break;
 
         case nonassoc_resolution:

-          obstack_fgrow1 (&solved_conflicts_xml_obstack,
+          obstack_printf (&solved_conflicts_xml_obstack,

                           "%%nonassoc %s",
                           xml_escape (symbols[token]->tag));
       break;
                           "%%nonassoc %s",
                           xml_escape (symbols[token]->tag));
       break;


@@ -360,15 +360,9 @@ set_conflicts (state *s, symbol **errors)
       state_errs_set (s, nerrs, errors);
     }
   if (obstack_object_size (&solved_conflicts_obstack))
       state_errs_set (s, nerrs, errors);
     }
   if (obstack_object_size (&solved_conflicts_obstack))

-    {
-      obstack_1grow (&solved_conflicts_obstack, '\0');
-      s->solved_conflicts = obstack_finish (&solved_conflicts_obstack);
-    }
+    s->solved_conflicts = obstack_finish0 (&solved_conflicts_obstack);

   if (obstack_object_size (&solved_conflicts_xml_obstack))
   if (obstack_object_size (&solved_conflicts_xml_obstack))

-    {
-      obstack_1grow (&solved_conflicts_xml_obstack, '\0');
-      s->solved_conflicts_xml = obstack_finish (&solved_conflicts_xml_obstack);
-    }
+    s->solved_conflicts_xml = obstack_finish0 (&solved_conflicts_xml_obstack);

 
   /* Loop over all rules which require lookahead in this state.  Check
      for conflicts not resolved above.  */
 
   /* Loop over all rules which require lookahead in this state.  Check
      for conflicts not resolved above.  */


@@ -584,7 +578,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,15 +595,17 @@ 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)
     {

-      if (expected_sr_conflicts == -1 && expected_rr_conflicts == -1)
-        set_warning_issued ();
+      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 (! yacc_flag)
         fprintf (stderr, "%s: ", current_file);
       conflict_report (stderr, src_total, rrc_total);
       if (! yacc_flag)
         fprintf (stderr, "%s: ", current_file);
       conflict_report (stderr, src_total, rrc_total);


@@ -618,14 +614,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);
     }
 }