Merge branch 'maint'

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 08bc1febe7011ff4f38aac28c23ab5012cf678c8..f8ed17727eb36bda9ce9bec2e54388a51ddb5914 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -1,89 +1,246 @@
-/* Find and resolve or report look-ahead conflicts for bison,
-   Copyright (C) 1984, 1989, 1992, 2000 Free Software Foundation, Inc.
+/* Find and resolve or report lookahead conflicts for bison,
+
+   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.
 

-   Bison is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
    You should have received a copy of the GNU General Public License
 
    You should have received a copy of the GNU General Public License

-   along with Bison; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

+#include <config.h>

 #include "system.h"
 #include "system.h"

-#include "getargs.h"
-#include "alloc.h"
+
+#include <bitset.h>
+
+#include "LR0.h"
+#include "complain.h"
+#include "conflicts.h"

 #include "files.h"
 #include "files.h"

+#include "getargs.h"

 #include "gram.h"
 #include "gram.h"

-#include "state.h"

 #include "lalr.h"
 #include "lalr.h"

+#include "print-xml.h"
+#include "reader.h"
+#include "state.h"
+#include "symtab.h"

 
 

-extern char **tags;
-extern int fixed_outfiles;
-
-extern void initialize_conflicts PARAMS ((void));
-extern void conflict_log PARAMS ((void));
-extern void verbose_conflict_log PARAMS ((void));
-extern void print_reductions PARAMS ((int));
-extern void finalize_conflicts PARAMS ((void));
-
-char any_conflicts;
-errs **err_table;
-int expected_conflicts;
+/* -1 stands for not specified. */
+int expected_sr_conflicts = -1;
+int expected_rr_conflicts = -1;

 static char *conflicts;
 static char *conflicts;

+static struct obstack solved_conflicts_obstack;
+static struct obstack solved_conflicts_xml_obstack;

 
 

+static bitset shift_set;
+static bitset lookahead_set;

 
 

-static unsigned *shiftset;
-static unsigned *lookaheadset;
-static int src_total;
-static int rrc_total;
-static int src_count;
-static int rrc_count;

 \f
 
 \f
 

+enum conflict_resolution
+  {
+    shift_resolution,
+    reduce_resolution,
+    left_resolution,
+    right_resolution,
+    nonassoc_resolution
+  };
+
+
+/*----------------------------------------------------------------.
+| Explain how an SR conflict between TOKEN and RULE was resolved: |
+| RESOLUTION.                                                     |
+`----------------------------------------------------------------*/
+

 static inline void
 static inline void

-log_resolution (int state, int LAno, int token, char *resolution)
+log_resolution (rule *r, symbol_number token,
+                enum conflict_resolution resolution)

 {
 {

-  if (verboseflag)
-    fprintf (foutput,
-            _("\
-Conflict in state %d between rule %d and token %s resolved as %s.\n"),
-            state, LAruleno[LAno], tags[token], resolution);
+  if (report_flag & report_solved_conflicts)
+    {
+      /* The description of the resolution. */
+      switch (resolution)
+        {
+        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)
+        {
+        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");
+    }
+
+  /* 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;
+        }
+
+      /* 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");
+    }

 }
 
 
 /*------------------------------------------------------------------.
 | Turn off the shift recorded for the specified token in the        |
 | specified state.  Used when we resolve a shift-reduce conflict in |
 }
 
 
 /*------------------------------------------------------------------.
 | Turn off the shift recorded for the specified token in the        |
 | specified state.  Used when we resolve a shift-reduce conflict in |

-| favor of the reduction.                                           |
+| favor of the reduction or as an error (%nonassoc).                |

 `------------------------------------------------------------------*/
 
 static void
 `------------------------------------------------------------------*/
 
 static void

-flush_shift (int state, int token)
+flush_shift (state *s, int token)

 {
 {

-  shifts *shiftp;
-  int k, i;
+  transitions *trans = s->transitions;
+  int i;

 
 

-  shiftp = shift_table[state];
+  bitset_reset (lookahead_set, token);
+  for (i = 0; i < trans->num; i++)
+    if (!TRANSITION_IS_DISABLED (trans, i)
+        && TRANSITION_SYMBOL (trans, i) == token)
+      TRANSITION_DISABLE (trans, i);
+}

 
 

-  if (shiftp)
-    {
-      k = shiftp->nshifts;
-      for (i = 0; i < k; i++)
-       {
-         if (shiftp->shifts[i]
-             && token == accessing_symbol[shiftp->shifts[i]])
-           (shiftp->shifts[i]) = 0;
-       }
-    }
+
+/*--------------------------------------------------------------------.
+| Turn off the reduce recorded for the specified token in the         |
+| specified lookahead set.  Used when we resolve a shift-reduce       |
+| conflict in favor of the shift or as an error (%nonassoc).          |
+`--------------------------------------------------------------------*/
+
+static void
+flush_reduce (bitset lookahead_tokens, int token)
+{
+  bitset_reset (lookahead_tokens, token);

 }
 
 
 }
 
 


@@ -92,687 +249,376 @@ flush_shift (int state, int token)
 | precedence declarations.  It has already been checked that the    |
 | rule has a precedence.  A conflict is resolved by modifying the   |
 | shift or reduce tables so that there is no longer a conflict.     |
 | precedence declarations.  It has already been checked that the    |
 | rule has a precedence.  A conflict is resolved by modifying the   |
 | shift or reduce tables so that there is no longer a conflict.     |

+|                                                                   |
+| RULENO is the number of the lookahead bitset to consider.         |
+|                                                                   |
+| ERRORS and NERRS can be used to store discovered explicit         |
+| errors.                                                           |

 `------------------------------------------------------------------*/
 
 static void
 `------------------------------------------------------------------*/
 
 static void

-resolve_sr_conflict (int state, int lookaheadnum)
+resolve_sr_conflict (state *s, int ruleno, symbol **errors, int *nerrs)

 {
 {

-  int i;
-  int mask;
-  unsigned *fp1;
-  unsigned *fp2;
-  int redprec;
-  errs *errp = (errs *) xmalloc (sizeof (errs) + ntokens * sizeof (short));
-  short *errtokens = errp->errs;
-
-  /* find the rule to reduce by to get precedence of reduction  */
-  redprec = rprec[LAruleno[lookaheadnum]];
-
-  mask = 1;
-  fp1 = LA + lookaheadnum * tokensetsize;
-  fp2 = lookaheadset;
+  symbol_number i;
+  reductions *reds = s->reductions;
+  /* Find the rule to reduce by to get precedence of reduction.  */
+  rule *redrule = reds->rules[ruleno];
+  int redprec = redrule->prec->prec;
+  bitset lookahead_tokens = reds->lookahead_tokens[ruleno];
+

   for (i = 0; i < ntokens; i++)
   for (i = 0; i < ntokens; i++)

-    {
-      if ((mask & *fp2 & *fp1) && sprec[i])
-       /* Shift-reduce conflict occurs for token number i
-          and it has a precedence.
-          The precedence of shifting is that of token i.  */
-       {
-         if (sprec[i] < redprec)
-           {
-             log_resolution (state, lookaheadnum, i, _("reduce"));
-             *fp2 &= ~mask;    /* flush the shift for this token */
-             flush_shift (state, i);
-           }
-         else if (sprec[i] > redprec)
-           {
-             log_resolution (state, lookaheadnum, i, _("shift"));
-             *fp1 &= ~mask;    /* flush the reduce for this token */
-           }
-         else
-           {
-             /* Matching precedence levels.
-                For left association, keep only the reduction.
-                For right association, keep only the shift.
-                For nonassociation, keep neither.  */
-
-             switch (sassoc[i])
-               {
-               case RIGHT_ASSOC:
-                 log_resolution (state, lookaheadnum, i, _("shift"));
-                 break;
-
-               case LEFT_ASSOC:
-                 log_resolution (state, lookaheadnum, i, _("reduce"));
-                 break;
-
-               case NON_ASSOC:
-                 log_resolution (state, lookaheadnum, i, _("an error"));
-                 break;
-               }
-
-             if (sassoc[i] != RIGHT_ASSOC)
-               {
-                 *fp2 &= ~mask;        /* flush the shift for this token */
-                 flush_shift (state, i);
-               }
-             if (sassoc[i] != LEFT_ASSOC)
-               {
-                 *fp1 &= ~mask;        /* flush the reduce for this token */
-               }
-             if (sassoc[i] == NON_ASSOC)
-               {
-                 /* Record an explicit error for this token.  */
-                 *errtokens++ = i;
-               }
-           }
-       }
-
-      mask <<= 1;
-      if (mask == 0)
-       {
-         mask = 1;
-         fp2++;
-         fp1++;
-       }
-    }
-  errp->nerrs = errtokens - errp->errs;
-  if (errp->nerrs)
-    {
-      /* Some tokens have been explicitly made errors.  Allocate
-         a permanent errs structure for this state, to record them.  */
-      i = (char *) errtokens - (char *) errp;
-      err_table[state] = (errs *) xmalloc ((unsigned int) i);
-      bcopy (errp, err_table[state], i);
-    }
-  else
-    err_table[state] = 0;
-  free (errp);
+    if (bitset_test (lookahead_tokens, i)
+        && 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 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;
+            }
+      }

 }
 
 
 }
 
 

+/*-------------------------------------------------------------------.
+| Solve the S/R conflicts of state S using the                       |
+| precedence/associativity, and flag it inconsistent if it still has |
+| conflicts.  ERRORS can be used as storage to compute the list of   |
+| lookahead tokens on which S raises a syntax error (%nonassoc).     |
+`-------------------------------------------------------------------*/
+

 static void
 static void

-set_conflicts (int state)
+set_conflicts (state *s, symbol **errors)

 {
   int i;
 {
   int i;

-  int k;
-  shifts *shiftp;
-  unsigned *fp2;
-  unsigned *fp3;
-  unsigned *fp4;
-  unsigned *fp1;
-  int symbol;
-
-  if (consistent[state])
-    return;
+  transitions *trans = s->transitions;
+  reductions *reds = s->reductions;
+  int nerrs = 0;

 
 

-  for (i = 0; i < tokensetsize; i++)
-    lookaheadset[i] = 0;
+  if (s->consistent)
+    return;

 
 

-  shiftp = shift_table[state];
-  if (shiftp)
-    {
-      k = shiftp->nshifts;
-      for (i = 0; i < k; i++)
-       {
-         symbol = accessing_symbol[shiftp->shifts[i]];
-         if (ISVAR (symbol))
-           break;
-         SETBIT (lookaheadset, symbol);
-       }
-    }
+  bitset_zero (lookahead_set);

 
 

-  k = lookaheads[state + 1];
-  fp4 = lookaheadset + tokensetsize;
+  FOR_EACH_SHIFT (trans, i)
+    bitset_set (lookahead_set, TRANSITION_SYMBOL (trans, i));

 
   /* Loop over all rules which require lookahead in this state.  First
      check for shift-reduce conflict, and try to resolve using
 
   /* Loop over all rules which require lookahead in this state.  First
      check for shift-reduce conflict, and try to resolve using

-     precedence */
-  for (i = lookaheads[state]; i < k; i++)
-    if (rprec[LAruleno[i]])
-      {
-       fp1 = LA + i * tokensetsize;
-       fp2 = fp1;
-       fp3 = lookaheadset;
-
-       while (fp3 < fp4)
-         {
-           if (*fp2++ & *fp3++)
-             {
-               resolve_sr_conflict (state, i);
-               break;
-             }
-         }
-      }
+     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))
+      resolve_sr_conflict (s, i, errors, &nerrs);

 
 

+  if (nerrs)
+    {
+      /* Some tokens have been explicitly made errors.  Allocate a
+         permanent errs structure for this state, to record them.  */
+      state_errs_set (s, nerrs, errors);
+    }
+  if (obstack_object_size (&solved_conflicts_obstack))
+    s->solved_conflicts = obstack_finish0 (&solved_conflicts_obstack);
+  if (obstack_object_size (&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.  */

-  for (i = lookaheads[state]; i < k; i++)
+  for (i = 0; i < reds->num; ++i)

     {
     {

-      fp1 = LA + i * tokensetsize;
-      fp2 = fp1;
-      fp3 = lookaheadset;
-
-      while (fp3 < fp4)
-       {
-         if (*fp2++ & *fp3++)
-           {
-             conflicts[state] = 1;
-             any_conflicts = 1;
-           }
-       }
-
-      fp2 = fp1;
-      fp3 = lookaheadset;
-
-      while (fp3 < fp4)
-       *fp3++ |= *fp2++;
+      if (!bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set))
+        conflicts[s->number] = 1;
+      bitset_or (lookahead_set, lookahead_set, reds->lookahead_tokens[i]);

     }
 }
 
     }
 }
 

-void
-initialize_conflicts (void)
-{
-  int i;
-/*  errs *sp; JF unused */

 
 

-  conflicts = NEW2 (nstates, char);
-  shiftset = NEW2 (tokensetsize, unsigned);
-  lookaheadset = NEW2 (tokensetsize, unsigned);
+/*----------------------------------------------------------------.
+| Solve all the S/R conflicts using the precedence/associativity, |
+| and flag as inconsistent the states that still have conflicts.  |
+`----------------------------------------------------------------*/

 
 

-  err_table = NEW2 (nstates, errs *);
+void
+conflicts_solve (void)
+{
+  state_number i;
+  /* List of lookahead tokens on which we explicitly raise a syntax error.  */
+  symbol **errors = xnmalloc (ntokens + 1, sizeof *errors);

 
 

-  any_conflicts = 0;
+  conflicts = xcalloc (nstates, sizeof *conflicts);
+  shift_set = bitset_create (ntokens, BITSET_FIXED);
+  lookahead_set = bitset_create (ntokens, BITSET_FIXED);
+  obstack_init (&solved_conflicts_obstack);
+  obstack_init (&solved_conflicts_xml_obstack);

 
   for (i = 0; i < nstates; i++)
 
   for (i = 0; i < nstates; i++)

-    set_conflicts (i);
-}
-
-
-
+    {
+      set_conflicts (states[i], errors);

 
 

+      /* For uniformity of the code, make sure all the states have a valid
+         `errs' member.  */
+      if (!states[i]->errs)
+        states[i]->errs = errs_new (0, 0);
+    }

 
 

+  free (errors);
+}

 
 
 
 

+void
+conflicts_update_state_numbers (state_number old_to_new[],
+                                state_number nstates_old)
+{
+  state_number i;
+  for (i = 0; i < nstates_old; ++i)
+    if (old_to_new[i] != nstates_old)
+      conflicts[old_to_new[i]] = conflicts[i];
+}

 
 
 /*---------------------------------------------.
 | Count the number of shift/reduce conflicts.  |
 `---------------------------------------------*/
 
 
 
 /*---------------------------------------------.
 | Count the number of shift/reduce conflicts.  |
 `---------------------------------------------*/
 

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

 {
   int i;
 {
   int i;

-  int k;
-  int mask;
-  shifts *shiftp;
-  unsigned *fp1;
-  unsigned *fp2;
-  unsigned *fp3;
-  int symbol;
-
-  src_count = 0;
-
-  shiftp = shift_table[state];
-  if (!shiftp)
-    return;
+  transitions *trans = s->transitions;
+  reductions *reds = s->reductions;

 
 

-  for (i = 0; i < tokensetsize; i++)
-    {
-      shiftset[i] = 0;
-      lookaheadset[i] = 0;
-    }
+  if (!trans)
+    return 0;

 
 

-  k = shiftp->nshifts;
-  for (i = 0; i < k; i++)
-    {
-      if (!shiftp->shifts[i])
-       continue;
-      symbol = accessing_symbol[shiftp->shifts[i]];
-      if (ISVAR (symbol))
-       break;
-      SETBIT (shiftset, symbol);
-    }
+  bitset_zero (lookahead_set);
+  bitset_zero (shift_set);

 
 

-  k = lookaheads[state + 1];
-  fp3 = lookaheadset + tokensetsize;
+  FOR_EACH_SHIFT (trans, i)
+    bitset_set (shift_set, TRANSITION_SYMBOL (trans, i));

 
 

-  for (i = lookaheads[state]; i < k; i++)
-    {
-      fp1 = LA + i * tokensetsize;
-      fp2 = lookaheadset;
+  for (i = 0; i < reds->num; ++i)
+    bitset_or (lookahead_set, lookahead_set, reds->lookahead_tokens[i]);

 
 

-      while (fp2 < fp3)
-       *fp2++ |= *fp1++;
-    }
+  bitset_and (lookahead_set, lookahead_set, shift_set);

 
 

-  fp1 = shiftset;
-  fp2 = lookaheadset;
+  return bitset_count (lookahead_set);
+}

 
 

-  while (fp2 < fp3)
-    *fp2++ &= *fp1++;
+/*---------------------------------------------.
+| The total number of shift/reduce conflicts.  |
+`---------------------------------------------*/

 
 

-  mask = 1;
-  fp2 = lookaheadset;
-  for (i = 0; i < ntokens; i++)
-    {
-      if (mask & *fp2)
-       src_count++;
-
-      mask <<= 1;
-      if (mask == 0)
-       {
-         mask = 1;
-         fp2++;
-       }
-    }
+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.  |
-`----------------------------------------------*/

 
 

-static void
-count_rr_conflicts (int state)
+/*----------------------------------------------------------------.
+| 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 size_t
+count_state_rr_conflicts (state *s, bool one_per_token)

 {
   int i;
 {
   int i;

-  int j;
-  int count;
-  unsigned mask;
-  unsigned *baseword;
-  unsigned *wordp;
-  int m;
-  int n;
-
-  rrc_count = 0;
-
-  m = lookaheads[state];
-  n = lookaheads[state + 1];
-
-  if (n - m < 2)
-    return;
+  reductions *reds = s->reductions;
+  size_t res = 0;

 
 

-  mask = 1;
-  baseword = LA + m * tokensetsize;

   for (i = 0; i < ntokens; i++)
     {
   for (i = 0; i < ntokens; i++)
     {

-      wordp = baseword;
-
-      count = 0;
-      for (j = m; j < n; j++)
-       {
-         if (mask & *wordp)
-           count++;
-
-         wordp += tokensetsize;
-       }
-
+      int count = 0;
+      int j;
+      for (j = 0; j < reds->num; ++j)
+        count += bitset_test (reds->lookahead_tokens[j], i);

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

-       rrc_count++;
-
-      mask <<= 1;
-      if (mask == 0)
-       {
-         mask = 1;
-         baseword++;
-       }
+        res += one_per_token ? 1 : count-1;

     }
     }

-}

 
 

-/*------------------------------------.
-| Give a report about the conflicts.  |
-`------------------------------------*/
+  return res;
+}

 
 

-static void
-total_conflicts (void)
+static size_t
+count_rr_conflicts (bool one_per_token)

 {
 {

-  if (src_total == expected_conflicts && rrc_total == 0)
-    return;
-
-  if (fixed_outfiles)
-    {
-      /* If invoked under the name `yacc', use the output format
-         specified by POSIX.  */
-      fprintf (stderr, _("conflicts: "));
-      if (src_total > 0)
-       fprintf (stderr, _(" %d shift/reduce"), src_total);
-      if (src_total > 0 && rrc_total > 0)
-       fprintf (stderr, ",");
-      if (rrc_total > 0)
-       fprintf (stderr, _(" %d reduce/reduce"), rrc_total);
-      putc ('\n', stderr);
-    }
-  else
-    {
-      fprintf (stderr, _("%s contains"), infile);
-
-      if (src_total == 1)
-       fprintf (stderr, _(" 1 shift/reduce conflict"));
-      else if (src_total > 1)
-       fprintf (stderr, _(" %d shift/reduce conflicts"), src_total);
+  size_t res = 0;
+  state_number i;

 
 

-      if (src_total > 0 && rrc_total > 0)
-       fprintf (stderr, _(" and"));
-
-      if (rrc_total == 1)
-       fprintf (stderr, _(" 1 reduce/reduce conflict"));
-      else if (rrc_total > 1)
-       fprintf (stderr, _(" %d reduce/reduce conflicts"), rrc_total);
-
-      putc ('.', stderr);
-      putc ('\n', stderr);
-    }
+  /* Conflicts by state.  */
+  for (i = 0; i < nstates; i++)
+    if (conflicts[i])
+      res += count_state_rr_conflicts (states[i], one_per_token);
+  return res;

 }
 
 
 }
 
 

-/*---------------------------------------------.
-| Compute and give a report on the conflicts.  |
-`---------------------------------------------*/
+/*-----------------------------------------------------------.
+| Output the detailed description of states with conflicts.  |
+`-----------------------------------------------------------*/

 
 void
 
 void

-conflict_log (void)
+conflicts_output (FILE *out)

 {
 {

-  int i;
-
-  src_total = 0;
-  rrc_total = 0;
-
+  bool printed_sth = false;
+  state_number i;

   for (i = 0; i < nstates; i++)
     {
   for (i = 0; i < nstates; i++)
     {

+      state *s = states[i];

       if (conflicts[i])
       if (conflicts[i])

-       {
-         count_sr_conflicts (i);
-         count_rr_conflicts (i);
-         src_total += src_count;
-         rrc_total += rrc_count;
-       }
+        {
+          int src = count_state_sr_conflicts (s);
+          int rrc = count_state_rr_conflicts (s, true);
+          fprintf (out, _("State %d "), i);
+          if (src && rrc)
+            fprintf (out,
+                     _("conflicts: %d shift/reduce, %d reduce/reduce\n"),
+                     src, rrc);
+          else if (src)
+            fprintf (out, _("conflicts: %d shift/reduce\n"), src);
+          else if (rrc)
+            fprintf (out, _("conflicts: %d reduce/reduce\n"), rrc);
+          printed_sth = true;
+        }

     }
     }

-
-  total_conflicts ();
+  if (printed_sth)
+    fputs ("\n\n", out);

 }
 
 }
 

+/*--------------------------------------------------------.
+| 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.                                               |
+`--------------------------------------------------------*/

 
 

-void
-verbose_conflict_log (void)
+int
+conflicts_total_count (void)

 {
 {

-  int i;
-
-  src_total = 0;
-  rrc_total = 0;
-
-  for (i = 0; i < nstates; i++)
-    {
-      if (conflicts[i])
-       {
-         count_sr_conflicts (i);
-         count_rr_conflicts (i);
-         src_total += src_count;
-         rrc_total += rrc_count;
-
-         fprintf (foutput, _("State %d contains"), i);
-
-         if (src_count == 1)
-           fprintf (foutput, _(" 1 shift/reduce conflict"));
-         else if (src_count > 1)
-           fprintf (foutput, _(" %d shift/reduce conflicts"), src_count);
-
-         if (src_count > 0 && rrc_count > 0)
-           fprintf (foutput, _(" and"));
-
-         if (rrc_count == 1)
-           fprintf (foutput, _(" 1 reduce/reduce conflict"));
-         else if (rrc_count > 1)
-           fprintf (foutput, _(" %d reduce/reduce conflicts"), rrc_count);
-
-         putc ('.', foutput);
-         putc ('\n', foutput);
-       }
-    }
-
-  total_conflicts ();
+  return count_sr_conflicts () + count_rr_conflicts (false);

 }
 
 
 }
 
 

-
-
-
+/*------------------------------------------.
+| Reporting the total number of conflicts.  |
+`------------------------------------------*/

 
 void
 
 void

-print_reductions (int state)
+conflicts_print (void)

 {
 {

-  int i;
-  int j;
-  int k;
-  unsigned *fp1;
-  unsigned *fp2;
-  unsigned *fp3;
-  unsigned *fp4;
-  int rule;
-  int symbol;
-  unsigned mask;
-  int m;
-  int n;
-  int default_LA;
-  int default_rule = 0;
-  int cmax;
-  int count;
-  shifts *shiftp;
-  errs *errp;
-  int nodefault = 0;
-
-  for (i = 0; i < tokensetsize; i++)
-    shiftset[i] = 0;
-
-  shiftp = shift_table[state];
-  if (shiftp)
-    {
-      k = shiftp->nshifts;
-      for (i = 0; i < k; i++)
-       {
-         if (!shiftp->shifts[i])
-           continue;
-         symbol = accessing_symbol[shiftp->shifts[i]];
-         if (ISVAR (symbol))
-           break;
-         /* if this state has a shift for the error token,
-            don't use a default rule.  */
-         if (symbol == error_token_number)
-           nodefault = 1;
-         SETBIT (shiftset, symbol);
-       }
-    }
-
-  errp = err_table[state];
-  if (errp)
+  if (! glr_parser && expected_rr_conflicts != -1)

     {
     {

-      k = errp->nerrs;
-      for (i = 0; i < k; i++)
-       {
-         if (!errp->errs[i])
-           continue;
-         symbol = errp->errs[i];
-         SETBIT (shiftset, symbol);
-       }
+      complain (NULL, Wother, _("%%expect-rr applies only to GLR parsers"));
+      expected_rr_conflicts = -1;

     }
 
     }
 

-  m = lookaheads[state];
-  n = lookaheads[state + 1];
-
-  if (n - m == 1 && !nodefault)
-    {
-      default_rule = LAruleno[m];
-
-      fp1 = LA + m * tokensetsize;
-      fp2 = shiftset;
-      fp3 = lookaheadset;
-      fp4 = lookaheadset + tokensetsize;
-
-      while (fp3 < fp4)
-       *fp3++ = *fp1++ & *fp2++;
-
-      mask = 1;
-      fp3 = lookaheadset;
-
-      for (i = 0; i < ntokens; i++)
-       {
-         if (mask & *fp3)
-           fprintf (foutput, _("    %-4s\t[reduce using rule %d (%s)]\n"),
-                    tags[i], default_rule, tags[rlhs[default_rule]]);
-
-         mask <<= 1;
-         if (mask == 0)
-           {
-             mask = 1;
-             fp3++;
-           }
-       }
-
-      fprintf (foutput, _("    $default\treduce using rule %d (%s)\n\n"),
-              default_rule, tags[rlhs[default_rule]]);
-    }
-  else if (n - m >= 1)
-    {
-      cmax = 0;
-      default_LA = -1;
-      fp4 = lookaheadset + tokensetsize;
-
-      if (!nodefault)
-       for (i = m; i < n; i++)
-         {
-           fp1 = LA + i * tokensetsize;
-           fp2 = shiftset;
-           fp3 = lookaheadset;
-
-           while (fp3 < fp4)
-             *fp3++ = *fp1++ & (~(*fp2++));
-
-           count = 0;
-           mask = 1;
-           fp3 = lookaheadset;
-           for (j = 0; j < ntokens; j++)
-             {
-               if (mask & *fp3)
-                 count++;
-
-               mask <<= 1;
-               if (mask == 0)
-                 {
-                   mask = 1;
-                   fp3++;
-                 }
-             }
-
-           if (count > cmax)
-             {
-               cmax = count;
-               default_LA = i;
-               default_rule = LAruleno[i];
-             }
-
-           fp2 = shiftset;
-           fp3 = lookaheadset;
-
-           while (fp3 < fp4)
-             *fp2++ |= *fp3++;
-         }
-
-      for (i = 0; i < tokensetsize; i++)
-       shiftset[i] = 0;
-
-      if (shiftp)
-       {
-         k = shiftp->nshifts;
-         for (i = 0; i < k; i++)
-           {
-             if (!shiftp->shifts[i])
-               continue;
-             symbol = accessing_symbol[shiftp->shifts[i]];
-             if (ISVAR (symbol))
-               break;
-             SETBIT (shiftset, symbol);
-           }
-       }
-
-      mask = 1;
-      fp1 = LA + m * tokensetsize;
-      fp2 = shiftset;
-      for (i = 0; i < ntokens; i++)
-       {
-         int defaulted = 0;
-
-         if (mask & *fp2)
-           count = 1;
-         else
-           count = 0;
-
-         fp3 = fp1;
-         for (j = m; j < n; j++)
-           {
-             if (mask & *fp3)
-               {
-                 if (count == 0)
-                   {
-                     if (j != default_LA)
-                       {
-                         rule = LAruleno[j];
-                         fprintf (foutput,
-                                  _("    %-4s\treduce using rule %d (%s)\n"),
-                                  tags[i], rule, tags[rlhs[rule]]);
-                       }
-                     else
-                       defaulted = 1;
-
-                     count++;
-                   }
-                 else
-                   {
-                     if (defaulted)
-                       {
-                         rule = LAruleno[default_LA];
-                         fprintf (foutput,
-                                  _("    %-4s\treduce using rule %d (%s)\n"),
-                                  tags[i], rule, tags[rlhs[rule]]);
-                         defaulted = 0;
-                       }
-                     rule = LAruleno[j];
-                     fprintf (foutput,
-                              _("    %-4s\t[reduce using rule %d (%s)]\n"),
-                              tags[i], rule, tags[rlhs[rule]]);
-                   }
-               }
-
-             fp3 += tokensetsize;
-           }
-
-         mask <<= 1;
-         if (mask == 0)
-           {
-             mask = 1;
-             /* We tried incrementing just fp1, and just fp2; both seem wrong.
-                It seems necessary to increment both in sync.  */
-             fp1++;
-             fp2++;
-           }
-       }
-
-      if (default_LA >= 0)
-       {
-         fprintf (foutput, _("    $default\treduce using rule %d (%s)\n"),
-                  default_rule, tags[rlhs[default_rule]]);
-       }
-
-      putc ('\n', foutput);
-    }
+  /* Screams for factoring, but almost useless because of the
+     different strings to translate.  */
+  {
+    int total = count_sr_conflicts ();
+    // If %expect is not used, but %expect-rr is, then expect 0 sr.
+    int expected =
+      (expected_sr_conflicts == -1 && expected_rr_conflicts != -1)
+      ? 0
+      : expected_sr_conflicts;
+    if (expected != -1)
+      {
+        if (expected != total)
+          complain (NULL, complaint,
+                    _("shift/reduce conflicts: %d found, %d expected"),
+                    total, expected);
+      }
+    else if (total)
+      complain (NULL, Wconflicts_sr,
+                ngettext ("%d shift/reduce conflict",
+                          "%d shift/reduce conflicts",
+                          total),
+                total);
+  }
+
+  {
+    int total = count_rr_conflicts (true);
+    // If %expect-rr is not used, but %expect is, then expect 0 rr.
+    int expected =
+      (expected_rr_conflicts == -1 && expected_sr_conflicts != -1)
+      ? 0
+      : expected_rr_conflicts;
+    if (expected != -1)
+      {
+        if (expected != total)
+          complain (NULL, complaint,
+                    _("reduce/reduce conflicts: %d found, %d expected"),
+                    total, expected);
+      }
+    else if (total)
+      complain (NULL, Wconflicts_rr,
+                ngettext ("%d reduce/reduce conflict",
+                          "%d reduce/reduce conflicts",
+                          total),
+                total);
+  }

 }
 
 
 void
 }
 
 
 void

-finalize_conflicts (void)
+conflicts_free (void)

 {
 {

-  FREE (conflicts);
-  FREE (shiftset);
-  FREE (lookaheadset);
+  free (conflicts);
+  bitset_free (shift_set);
+  bitset_free (lookahead_set);
+  obstack_free (&solved_conflicts_obstack, NULL);
+  obstack_free (&solved_conflicts_xml_obstack, NULL);

 }
 }