conflicts: refactor the counting routines

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 3a8edba4529dcd9b120f0148134825970a8cc0c6..6ab47d4666403d826e0af7c46747199f857a3f1d 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -1,7 +1,7 @@
 /* Find and resolve or report lookahead conflicts for bison,
 
 /* Find and resolve or report lookahead conflicts for bison,
 

-   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000-2012 Free Software Foundation,
+   Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -64,149 +64,149 @@ enum conflict_resolution
 
 static inline void
 log_resolution (rule *r, symbol_number token,
 
 static inline void
 log_resolution (rule *r, symbol_number token,

-               enum conflict_resolution resolution)
+                enum conflict_resolution resolution)

 {
   if (report_flag & report_solved_conflicts)
     {
       /* The description of the resolution. */
       switch (resolution)
 {
   if (report_flag & report_solved_conflicts)
     {
       /* The description of the resolution. */
       switch (resolution)

-       {
-       case shift_resolution:
-       case right_resolution:
-         obstack_fgrow2 (&solved_conflicts_obstack,
-                         _("    Conflict between rule %d and token %s"
-                           " resolved as shift"),
-                         r->number,
-                         symbols[token]->tag);
-         break;
-
-       case reduce_resolution:
-       case left_resolution:
-         obstack_fgrow2 (&solved_conflicts_obstack,
-                         _("    Conflict between rule %d and token %s"
-                           " resolved as reduce"),
-                         r->number,
-                         symbols[token]->tag);
-         break;
-
-       case nonassoc_resolution:
-         obstack_fgrow2 (&solved_conflicts_obstack,
-                         _("    Conflict between rule %d and token %s"
-                           " resolved as an error"),
-                         r->number,
-                         symbols[token]->tag);
-         break;
-       }
+        {
+        case shift_resolution:
+        case right_resolution:
+          obstack_printf (&solved_conflicts_obstack,
+                          _("    Conflict between rule %d and token %s"
+                            " resolved as shift"),
+                          r->number,
+                          symbols[token]->tag);
+          break;
+
+        case reduce_resolution:
+        case left_resolution:
+          obstack_printf (&solved_conflicts_obstack,
+                          _("    Conflict between rule %d and token %s"
+                            " resolved as reduce"),
+                          r->number,
+                          symbols[token]->tag);
+          break;
+
+        case nonassoc_resolution:
+          obstack_printf (&solved_conflicts_obstack,
+                          _("    Conflict between rule %d and token %s"
+                            " resolved as an error"),
+                          r->number,
+                          symbols[token]->tag);
+          break;
+        }

 
       /* The reason. */
       switch (resolution)
 
       /* The reason. */
       switch (resolution)

-       {
-       case shift_resolution:
-         obstack_fgrow2 (&solved_conflicts_obstack,
-                         " (%s < %s)",
-                         r->prec->tag,
-                         symbols[token]->tag);
-         break;
-
-       case reduce_resolution:
-         obstack_fgrow2 (&solved_conflicts_obstack,
-                         " (%s < %s)",
-                         symbols[token]->tag,
-                         r->prec->tag);
-         break;
-
-       case left_resolution:
-         obstack_fgrow1 (&solved_conflicts_obstack,
-                         " (%%left %s)",
-                         symbols[token]->tag);
-         break;
-
-       case right_resolution:
-         obstack_fgrow1 (&solved_conflicts_obstack,
-                         " (%%right %s)",
-                         symbols[token]->tag);
-         break;
-
-       case nonassoc_resolution:
-         obstack_fgrow1 (&solved_conflicts_obstack,
-                         " (%%nonassoc %s)",
-                         symbols[token]->tag);
-         break;
-       }
+        {
+        case shift_resolution:
+          obstack_printf (&solved_conflicts_obstack,
+                          " (%s < %s)",
+                          r->prec->tag,
+                          symbols[token]->tag);
+          break;
+
+        case reduce_resolution:
+          obstack_printf (&solved_conflicts_obstack,
+                          " (%s < %s)",
+                          symbols[token]->tag,
+                          r->prec->tag);
+          break;
+
+        case left_resolution:
+          obstack_printf (&solved_conflicts_obstack,
+                          " (%%left %s)",
+                          symbols[token]->tag);
+          break;
+
+        case right_resolution:
+          obstack_printf (&solved_conflicts_obstack,
+                          " (%%right %s)",
+                          symbols[token]->tag);
+          break;
+
+        case nonassoc_resolution:
+          obstack_printf (&solved_conflicts_obstack,
+                          " (%%nonassoc %s)",
+                          symbols[token]->tag);
+          break;
+        }

 
       obstack_sgrow (&solved_conflicts_obstack, ".\n");
 
       obstack_sgrow (&solved_conflicts_obstack, ".\n");

+    }
+
+  /* XML report */
+  if (xml_flag)
+    {
+      /* The description of the resolution. */
+      switch (resolution)
+        {
+        case shift_resolution:
+        case right_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "        <resolution rule=\"%d\" symbol=\"%s\""
+                          " type=\"shift\">",
+                          r->number,
+                          xml_escape (symbols[token]->tag));
+          break;
+
+        case reduce_resolution:
+        case left_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "        <resolution rule=\"%d\" symbol=\"%s\""
+                          " type=\"reduce\">",
+                          r->number,
+                          xml_escape (symbols[token]->tag));
+          break;
+
+        case nonassoc_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "        <resolution rule=\"%d\" symbol=\"%s\""
+                          " type=\"error\">",
+                          r->number,
+                          xml_escape (symbols[token]->tag));
+          break;
+        }

 
 

-      /* XML report */
-      if (xml_flag)
-       {
-         /* The description of the resolution. */
-         switch (resolution)
-           {
-           case shift_resolution:
-           case right_resolution:
-             obstack_fgrow2 (&solved_conflicts_xml_obstack,
-                             "<resolution rule=\"%d\" symbol=\"%s\""
-                             " type=\"shift\">",
-                             r->number,
-                             xml_escape (symbols[token]->tag));
-             break;
-
-           case reduce_resolution:
-           case left_resolution:
-             obstack_fgrow2 (&solved_conflicts_xml_obstack,
-                             "<resolution rule=\"%d\" symbol=\"%s\""
-                             " type=\"reduce\">",
-                             r->number,
-                             xml_escape (symbols[token]->tag));
-             break;
-
-           case nonassoc_resolution:
-             obstack_fgrow2 (&solved_conflicts_xml_obstack,
-                             "<resolution rule=\"%d\" symbol=\"%s\""
-                             " type=\"error\">",
-                             r->number,
-                             xml_escape (symbols[token]->tag));
-             break;
-           }
-
-         /* The reason. */
-         switch (resolution)
-           {
-           case shift_resolution:
-             obstack_fgrow2 (&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:
-             obstack_fgrow2 (&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:
-             obstack_fgrow1 (&solved_conflicts_xml_obstack,
-                             "%%left %s",
-                             xml_escape (symbols[token]->tag));
-             break;
-
-           case right_resolution:
-             obstack_fgrow1 (&solved_conflicts_xml_obstack,
-                             "%%right %s",
-                             xml_escape (symbols[token]->tag));
-             break;
-
-           case nonassoc_resolution:
-             obstack_fgrow1 (&solved_conflicts_xml_obstack,
-                             "%%nonassoc %s",
-                             xml_escape (symbols[token]->tag));
-         break;
-           }
-
-         obstack_sgrow (&solved_conflicts_xml_obstack, "</resolution>\n");
-       }
+      /* The reason. */
+      switch (resolution)
+        {
+        case shift_resolution:
+          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:
+          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:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "%%left %s",
+                          xml_escape (symbols[token]->tag));
+          break;
+
+        case right_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "%%right %s",
+                          xml_escape (symbols[token]->tag));
+          break;
+
+        case nonassoc_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "%%nonassoc %s",
+                          xml_escape (symbols[token]->tag));
+      break;
+        }
+
+      obstack_sgrow (&solved_conflicts_xml_obstack, "</resolution>\n");

     }
 }
 
     }
 }
 


@@ -226,7 +226,7 @@ flush_shift (state *s, int token)
   bitset_reset (lookahead_set, token);
   for (i = 0; i < trans->num; i++)
     if (!TRANSITION_IS_DISABLED (trans, i)
   bitset_reset (lookahead_set, token);
   for (i = 0; i < trans->num; i++)
     if (!TRANSITION_IS_DISABLED (trans, i)

-       && TRANSITION_SYMBOL (trans, i) == token)
+        && TRANSITION_SYMBOL (trans, i) == token)

       TRANSITION_DISABLE (trans, i);
 }
 
       TRANSITION_DISABLE (trans, i);
 }
 


@@ -268,51 +268,56 @@ resolve_sr_conflict (state *s, int ruleno, symbol **errors, int *nerrs)
 
   for (i = 0; i < ntokens; i++)
     if (bitset_test (lookahead_tokens, i)
 
   for (i = 0; i < ntokens; i++)
     if (bitset_test (lookahead_tokens, i)

-       && bitset_test (lookahead_set, i)
-       && symbols[i]->prec)
+        && bitset_test (lookahead_set, i)
+        && symbols[i]->prec)

       {
       {

-       /* Shift-reduce conflict occurs for token number i
-          and it has a precedence.
-          The precedence of shifting is that of token i.  */
-       if (symbols[i]->prec < redprec)
-         {
-           log_resolution (redrule, i, reduce_resolution);
-           flush_shift (s, i);
-         }
-       else if (symbols[i]->prec > redprec)
-         {
-           log_resolution (redrule, i, shift_resolution);
-           flush_reduce (lookahead_tokens, i);
-         }
-       else
-         /* Matching precedence levels.
-            For left association, keep only the reduction.
-            For right association, keep only the shift.
-            For nonassociation, keep neither.  */
-
-         switch (symbols[i]->assoc)
-           {
-           default:
-             abort ();
-
-           case right_assoc:
-             log_resolution (redrule, i, right_resolution);
-             flush_reduce (lookahead_tokens, i);
-             break;
-
-           case left_assoc:
-             log_resolution (redrule, i, left_resolution);
-             flush_shift (s, i);
-             break;
-
-           case non_assoc:
-             log_resolution (redrule, i, nonassoc_resolution);
-             flush_shift (s, i);
-             flush_reduce (lookahead_tokens, i);
-             /* Record an explicit error for this token.  */
-             errors[(*nerrs)++] = symbols[i];
-             break;
-           }
+        /* Shift-reduce conflict occurs for token number i
+           and it has a precedence.
+           The precedence of shifting is that of token i.  */
+        if (symbols[i]->prec < redprec)
+          {
+            log_resolution (redrule, i, reduce_resolution);
+            flush_shift (s, i);
+          }
+        else if (symbols[i]->prec > redprec)
+          {
+            log_resolution (redrule, i, shift_resolution);
+            flush_reduce (lookahead_tokens, i);
+          }
+        else
+          /* Matching precedence levels.
+             For non-defined associativity, keep both: unexpected
+             associativity conflict.
+             For left associativity, keep only the reduction.
+             For right associativity, keep only the shift.
+             For nonassociativity, keep neither.  */
+
+          switch (symbols[i]->assoc)
+            {
+            case undef_assoc:
+              abort ();
+
+            case precedence_assoc:
+              break;
+
+            case right_assoc:
+              log_resolution (redrule, i, right_resolution);
+              flush_reduce (lookahead_tokens, i);
+              break;
+
+            case left_assoc:
+              log_resolution (redrule, i, left_resolution);
+              flush_shift (s, i);
+              break;
+
+            case non_assoc:
+              log_resolution (redrule, i, nonassoc_resolution);
+              flush_shift (s, i);
+              flush_reduce (lookahead_tokens, i);
+              /* Record an explicit error for this token.  */
+              errors[(*nerrs)++] = symbols[i];
+              break;
+            }

       }
 }
 
       }
 }
 


@@ -345,7 +350,7 @@ set_conflicts (state *s, symbol **errors)
      precedence.  */
   for (i = 0; i < reds->num; ++i)
     if (reds->rules[i]->prec && reds->rules[i]->prec->prec
      precedence.  */
   for (i = 0; i < reds->num; ++i)
     if (reds->rules[i]->prec && reds->rules[i]->prec->prec

-       && !bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set))
+        && !bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set))

       resolve_sr_conflict (s, i, errors, &nerrs);
 
   if (nerrs)
       resolve_sr_conflict (s, i, errors, &nerrs);
 
   if (nerrs)


@@ -355,22 +360,16 @@ 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.  */
   for (i = 0; i < reds->num; ++i)
     {
       if (!bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set))
 
   /* Loop over all rules which require lookahead in this state.  Check
      for conflicts not resolved above.  */
   for (i = 0; i < reds->num; ++i)
     {
       if (!bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set))

-       conflicts[s->number] = 1;
+        conflicts[s->number] = 1;

       bitset_or (lookahead_set, lookahead_set, reds->lookahead_tokens[i]);
     }
 }
       bitset_or (lookahead_set, lookahead_set, reds->lookahead_tokens[i]);
     }
 }


@@ -399,9 +398,9 @@ conflicts_solve (void)
       set_conflicts (states[i], errors);
 
       /* For uniformity of the code, make sure all the states have a valid
       set_conflicts (states[i], errors);
 
       /* For uniformity of the code, make sure all the states have a valid

-        `errs' member.  */
+         `errs' member.  */

       if (!states[i]->errs)
       if (!states[i]->errs)

-       states[i]->errs = errs_new (0, 0);
+        states[i]->errs = errs_new (0, 0);

     }
 
   free (errors);
     }
 
   free (errors);


@@ -423,11 +422,10 @@ conflicts_update_state_numbers (state_number old_to_new[],
 | Count the number of shift/reduce conflicts.  |
 `---------------------------------------------*/
 
 | Count the number of shift/reduce conflicts.  |
 `---------------------------------------------*/
 

-static int
-count_sr_conflicts (state *s)
+static size_t
+count_state_sr_conflicts (state *s)

 {
   int i;
 {
   int i;

-  int src_count = 0;

   transitions *trans = s->transitions;
   reductions *reds = s->reductions;
 
   transitions *trans = s->transitions;
   reductions *reds = s->reductions;
 


@@ -445,56 +443,82 @@ count_sr_conflicts (state *s)
 
   bitset_and (lookahead_set, lookahead_set, shift_set);
 
 
   bitset_and (lookahead_set, lookahead_set, shift_set);
 

-  src_count = bitset_count (lookahead_set);
+  return bitset_count (lookahead_set);
+}
+
+/*---------------------------------------------.
+| The total number of shift/reduce conflicts.  |
+`---------------------------------------------*/

 
 

-  return src_count;
+static size_t
+count_sr_conflicts (void)
+{
+  size_t res = 0;
+  state_number i;
+
+  /* Conflicts by state.  */
+  for (i = 0; i < nstates; i++)
+    if (conflicts[i])
+      res += count_state_sr_conflicts (states[i]);
+  return res;

 }
 
 
 }
 
 

+

 /*----------------------------------------------------------------.
 | Count the number of reduce/reduce conflicts.  If ONE_PER_TOKEN, |
 | count one conflict for each token that has any reduce/reduce    |
 | conflicts.  Otherwise, count one conflict for each pair of      |
 | conflicting reductions.                                         |
 /*----------------------------------------------------------------.
 | Count the number of reduce/reduce conflicts.  If ONE_PER_TOKEN, |
 | count one conflict for each token that has any reduce/reduce    |
 | conflicts.  Otherwise, count one conflict for each pair of      |
 | conflicting reductions.                                         |

-+`----------------------------------------------------------------*/
+`----------------------------------------------------------------*/

 
 

-static int
-count_rr_conflicts (state *s, bool one_per_token)
+static size_t
+count_state_rr_conflicts (state *s, bool one_per_token)

 {
   int i;
   reductions *reds = s->reductions;
 {
   int i;
   reductions *reds = s->reductions;

-  int rrc_count = 0;
+  size_t res = 0;

 
   for (i = 0; i < ntokens; i++)
     {
       int count = 0;
       int j;
       for (j = 0; j < reds->num; ++j)
 
   for (i = 0; i < ntokens; i++)
     {
       int count = 0;
       int j;
       for (j = 0; j < reds->num; ++j)

-       if (bitset_test (reds->lookahead_tokens[j], i))
-         count++;
-
+        count += bitset_test (reds->lookahead_tokens[j], i);

       if (count >= 2)
       if (count >= 2)

-       rrc_count += one_per_token ? 1 : count-1;
+        res += one_per_token ? 1 : count-1;

     }
 
     }
 

-  return rrc_count;
+  return res;

 }
 
 }
 

+static size_t
+count_rr_conflicts (bool one_per_token)
+{
+  size_t res = 0;
+  state_number i;
+
+  /* Conflicts by state.  */
+  for (i = 0; i < nstates; i++)
+    if (conflicts[i])
+      res += count_state_rr_conflicts (states[i], one_per_token);
+  return res;
+}

 
 /*--------------------------------------------------------.
 | Report the number of conflicts, using the Yacc format.  |
 `--------------------------------------------------------*/
 
 static void
 
 /*--------------------------------------------------------.
 | Report the number of conflicts, using the Yacc format.  |
 `--------------------------------------------------------*/
 
 static void

-conflict_report (FILE *out, int src_num, int rrc_num)
+conflict_report (FILE *out, size_t src_num, size_t rrc_num)

 {
   if (src_num && rrc_num)
 {
   if (src_num && rrc_num)

-    fprintf (out, _("conflicts: %d shift/reduce, %d reduce/reduce\n"),
-            src_num, rrc_num);
+    fprintf (out, _("conflicts: %zd shift/reduce, %zd reduce/reduce\n"),
+             src_num, rrc_num);

   else if (src_num)
   else if (src_num)

-    fprintf (out, _("conflicts: %d shift/reduce\n"), src_num);
+    fprintf (out, _("conflicts: %zd shift/reduce\n"), src_num);

   else if (rrc_num)
   else if (rrc_num)

-    fprintf (out, _("conflicts: %d reduce/reduce\n"), rrc_num);
+    fprintf (out, _("conflicts: %zd reduce/reduce\n"), rrc_num);

 }
 
 
 }
 
 


@@ -511,80 +535,29 @@ conflicts_output (FILE *out)
     {
       state *s = states[i];
       if (conflicts[i])
     {
       state *s = states[i];
       if (conflicts[i])

-       {
-         fprintf (out, _("State %d "), i);
-         conflict_report (out, count_sr_conflicts (s),
-                          count_rr_conflicts (s, true));
-         printed_sth = true;
-       }
+        {
+          fprintf (out, _("State %d "), i);
+          conflict_report (out,
+                           count_state_sr_conflicts (s),
+                           count_state_rr_conflicts (s, true));
+          printed_sth = true;
+        }

     }
   if (printed_sth)
     fputs ("\n\n", out);
 }
 
     }
   if (printed_sth)
     fputs ("\n\n", out);
 }
 

-void
-conflicts_output_xml (FILE *out, int level)
-{
-  bool printed_sth = false;
-  state_number i;
-  int src_num;
-  int rrc_num;
-
-  for (i = 0; i < nstates; i++)
-    {
-      state *s = states[i];
-      if (conflicts[i])
-       {
-         if (!printed_sth) {
-           fputc ('\n', out);
-           xml_puts (out, level, "<conflicts>");
-         }
-
-         src_num = count_sr_conflicts (s);
-         rrc_num = count_rr_conflicts (s, true);
-
-         if (src_num)
-           xml_printf (out, level + 1,
-                       "<conflict state=\"%d\" num=\"%d\""
-                       " type=\"shift/reduce\"/>",
-                       i, src_num);
-         if (rrc_num)
-           xml_printf (out, level + 1,
-                       "<conflict state=\"%d\" num=\"%d\""
-                       " type=\"reduce/reduce\"/>",
-                       i, rrc_num);
-
-         printed_sth = true;
-       }
-    }
-  if (printed_sth)
-    xml_puts (out, level, "</conflicts>");
-  else
-    xml_puts (out, level, "<conflicts/>");
-}
-

 /*--------------------------------------------------------.
 | Total the number of S/R and R/R conflicts.  Unlike the  |
 | code in conflicts_output, however, count EACH pair of   |
 | reductions for the same state and lookahead as one      |
 /*--------------------------------------------------------.
 | Total the number of S/R and R/R conflicts.  Unlike the  |
 | code in conflicts_output, however, count EACH pair of   |
 | reductions for the same state and lookahead as one      |

-| conflict.                                              |
+| conflict.                                               |

 `--------------------------------------------------------*/
 
 int
 conflicts_total_count (void)
 {
 `--------------------------------------------------------*/
 
 int
 conflicts_total_count (void)
 {

-  state_number i;
-  int count;
-
-  /* Conflicts by state.  */
-  count = 0;
-  for (i = 0; i < nstates; i++)
-    if (conflicts[i])
-      {
-       count += count_sr_conflicts (states[i]);
-       count += count_rr_conflicts (states[i], false);
-      }
-  return count;
+  return count_sr_conflicts () + count_rr_conflicts (false);

 }
 
 
 }
 
 


@@ -601,26 +574,15 @@ conflicts_print (void)
   bool src_ok;
   bool rrc_ok;
 
   bool src_ok;
   bool rrc_ok;
 

-  int src_total = 0;
-  int rrc_total = 0;

   int src_expected;
   int rrc_expected;
 
   int src_expected;
   int rrc_expected;
 

-  /* Conflicts by state.  */
-  {
-    state_number i;
+  int src_total = count_sr_conflicts ();
+  int rrc_total = count_rr_conflicts (true);

 
 

-    for (i = 0; i < nstates; i++)
-      if (conflicts[i])
-       {
-         src_total += count_sr_conflicts (states[i]);
-         rrc_total += count_rr_conflicts (states[i], true);
-       }
-  }
-
-  if (! glr_parser && rrc_total > 0 && expected_rr_conflicts != -1)
+  if (! glr_parser && 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;
     }
 


@@ -635,25 +597,34 @@ conflicts_print (void)
     return;
 
   /* Report the total number of conflicts on STDERR.  */
     return;
 
   /* Report the total number of conflicts on STDERR.  */

+  if (expected_sr_conflicts == -1 && expected_rr_conflicts == -1)
+    {
+      if (!(warnings_flag & Wconflicts_sr))
+        src_total = 0;
+      if (!(warnings_flag & Wconflicts_rr))
+        rrc_total = 0;
+    }

   if (src_total | rrc_total)
     {
   if (src_total | rrc_total)
     {

+      if (expected_sr_conflicts == -1 && expected_rr_conflicts == -1)
+        set_warning_issued ();

       if (! yacc_flag)
       if (! yacc_flag)

-       fprintf (stderr, "%s: ", current_file);
+        fprintf (stderr, "%s: ", current_file);

       conflict_report (stderr, src_total, rrc_total);
     }
 
   if (expected_sr_conflicts != -1 || expected_rr_conflicts != -1)
     {
       if (! src_ok)
       conflict_report (stderr, src_total, rrc_total);
     }
 
   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),
-                 src_expected);
+        complain (complaint, ngettext ("expected %d shift/reduce conflict",
+                                       "expected %d shift/reduce conflicts",
+                                       src_expected),
+                  src_expected);

       if (! rrc_ok)
       if (! rrc_ok)

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

     }
 }
 
     }
 }