* m4/prereq.m4: Update, from Coreutils 4.5.1.

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 05f37bd1849d0b7f7a1d50bd16b06b7fa97cf33a..24f27cc8a37df8aad94bd6d20e83852be013e0b4 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -1,5 +1,6 @@
 /* Find and resolve or report look-ahead conflicts for bison,
 /* Find and resolve or report look-ahead conflicts for bison,

-   Copyright 1984, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002
+   Free Software Foundation, Inc.

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


@@ -19,6 +20,7 @@
    02111-1307, USA.  */
 
 #include "system.h"
    02111-1307, USA.  */
 
 #include "system.h"

+#include "bitset.h"

 #include "complain.h"
 #include "getargs.h"
 #include "symtab.h"
 #include "complain.h"
 #include "getargs.h"
 #include "symtab.h"


@@ -33,20 +35,98 @@
 /* -1 stands for not specified. */
 int expected_conflicts = -1;
 static char *conflicts = NULL;
 /* -1 stands for not specified. */
 int expected_conflicts = -1;
 static char *conflicts = NULL;

+struct obstack solved_conflicts_obstack;
+
+static bitset shiftset;
+static bitset lookaheadset;

 
 

-static unsigned *shiftset = NULL;
-static unsigned *lookaheadset = NULL;

 \f
 
 \f
 

+enum conflict_resolution_e
+  {
+    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 (state_t *state, int LAno, int token, char *resolution)
+log_resolution (rule_t *rule, symbol_number_t token,
+               enum conflict_resolution_e resolution)

 {
 {

-  if (verbose_flag)
-    obstack_fgrow4 (&output_obstack,
-                   _("\
-Conflict in state %d between rule %d and token %s resolved as %s.\n"),
-                   state->number, LAruleno[LAno], symbols[token]->tag,
-                   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"),
+                         rule->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"),
+                         rule->number,
+                         symbols[token]->tag);
+         break;
+       case nonassoc_resolution:
+         obstack_fgrow2 (&solved_conflicts_obstack,
+                         _("\
+    Conflict between rule %d and token %s resolved as an error"),
+                         rule->number,
+                         symbols[token]->tag);
+         break;
+       }
+
+      /* The reason. */
+      switch (resolution)
+       {
+       case shift_resolution:
+         obstack_fgrow2 (&solved_conflicts_obstack,
+                         " (%s < %s)",
+                         rule->prec->tag,
+                         symbols[token]->tag);
+         break;
+
+       case reduce_resolution:
+         obstack_fgrow2 (&solved_conflicts_obstack,
+                         " (%s < %s)",
+                         symbols[token]->tag,
+                         rule->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;
+       }
+      obstack_sgrow (&solved_conflicts_obstack, ".\n");
+    }

 }
 
 
 }
 
 


@@ -59,13 +139,14 @@ Conflict in state %d between rule %d and token %s resolved as %s.\n"),
 static void
 flush_shift (state_t *state, int token)
 {
 static void
 flush_shift (state_t *state, int token)
 {

-  shifts *shiftp = state->shifts;
+  transitions_t *transitions = state->transitions;

   int i;
 
   int i;
 

-  RESETBIT (lookaheadset, token);
-  for (i = 0; i < shiftp->nshifts; i++)
-    if (!SHIFT_IS_DISABLED (shiftp, i) && SHIFT_SYMBOL (shiftp, i) == token)
-      SHIFT_DISABLE (shiftp, i);
+  bitset_reset (lookaheadset, token);
+  for (i = 0; i < transitions->num; i++)
+    if (!TRANSITION_IS_DISABLED (transitions, i)
+       && TRANSITION_SYMBOL (transitions, i) == token)
+      TRANSITION_DISABLE (transitions, i);

 }
 
 
 }
 
 


@@ -76,9 +157,9 @@ flush_shift (state_t *state, int token)
 `-------------------------------------------------------------------*/
 
 static void
 `-------------------------------------------------------------------*/
 
 static void

-flush_reduce (int lookahead, int token)
+flush_reduce (bitset lookaheads, int token)

 {
 {

-  RESETBIT (LA (lookahead), token);
+  bitset_reset (lookaheads, token);

 }
 
 
 }
 
 


@@ -87,20 +168,27 @@ flush_reduce (int lookahead, 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.     |

+|                                                                   |
+| LOOKAHEAD is the number of the lookahead bitset to consider.      |
+|                                                                   |
+| ERRS can be used to store discovered explicit errors.             |

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

-resolve_sr_conflict (state_t *state, int lookahead)
+resolve_sr_conflict (state_t *state, int ruleno,
+                    symbol_t **errs)

 {
 {

-  int i;
-  /* find the rule to reduce by to get precedence of reduction  */
-  int redprec = rule_table[LAruleno[lookahead]].prec;
-  errs *errp = errs_new (ntokens + 1);
-  errp->nerrs = 0;
+  symbol_number_t i;
+  reductions_t *reds = state->reductions;
+  /* Find the rule to reduce by to get precedence of reduction.  */
+  rule_t *redrule = reds->rules[ruleno];
+  int redprec = redrule->prec->prec;
+  bitset lookaheads = reds->lookaheads[ruleno];
+  int nerrs = 0;

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

-    if (BITISSET (LA (lookahead), i)
-       && BITISSET (lookaheadset, i)
+    if (bitset_test (lookaheads, i)
+       && bitset_test (lookaheadset, i)

        && symbols[i]->prec)
       {
        /* Shift-reduce conflict occurs for token number i
        && symbols[i]->prec)
       {
        /* Shift-reduce conflict occurs for token number i


@@ -108,13 +196,13 @@ resolve_sr_conflict (state_t *state, int lookahead)
           The precedence of shifting is that of token i.  */
        if (symbols[i]->prec < redprec)
          {
           The precedence of shifting is that of token i.  */
        if (symbols[i]->prec < redprec)
          {

-           log_resolution (state, lookahead, i, _("reduce"));
+           log_resolution (redrule, i, reduce_resolution);

            flush_shift (state, i);
          }
        else if (symbols[i]->prec > redprec)
          {
            flush_shift (state, i);
          }
        else if (symbols[i]->prec > redprec)
          {

-           log_resolution (state, lookahead, i, _("shift"));
-           flush_reduce (lookahead, i);
+           log_resolution (redrule, i, shift_resolution);
+           flush_reduce (lookaheads, i);

          }
        else
          /* Matching precedence levels.
          }
        else
          /* Matching precedence levels.


@@ -122,89 +210,117 @@ resolve_sr_conflict (state_t *state, int lookahead)
             For right association, keep only the shift.
             For nonassociation, keep neither.  */
 
             For right association, keep only the shift.
             For nonassociation, keep neither.  */
 

-         switch (sassoc[i])
+         switch (symbols[i]->assoc)

            {
            case right_assoc:
            {
            case right_assoc:

-             log_resolution (state, lookahead, i, _("shift"));
-             flush_reduce (lookahead, i);
+             log_resolution (redrule, i, right_resolution);
+             flush_reduce (lookaheads, i);

              break;
 
            case left_assoc:
              break;
 
            case left_assoc:

-             log_resolution (state, lookahead, i, _("reduce"));
+             log_resolution (redrule, i, left_resolution);

              flush_shift (state, i);
              break;
 
            case non_assoc:
              flush_shift (state, i);
              break;
 
            case non_assoc:

-             log_resolution (state, lookahead, i, _("an error"));
+             log_resolution (redrule, i, nonassoc_resolution);

              flush_shift (state, i);
              flush_shift (state, i);

-             flush_reduce (lookahead, i);
+             flush_reduce (lookaheads, i);

              /* Record an explicit error for this token.  */
              /* Record an explicit error for this token.  */

-             errp->errs[errp->nerrs++] = i;
+             errs[nerrs++] = symbols[i];
+             break;
+
+           case undef_assoc:
+             assert (symbols[i]->assoc != undef_assoc);

              break;
            }
       }
 
   /* Some tokens have been explicitly made errors.  Allocate a
      permanent errs structure for this state, to record them.  */
              break;
            }
       }
 
   /* Some tokens have been explicitly made errors.  Allocate a
      permanent errs structure for this state, to record them.  */

-  state->errs = errs_dup (errp);
-  free (errp);
+  state_errs_set (state, nerrs, errs);
+
+  if (obstack_object_size (&solved_conflicts_obstack))
+    {
+      obstack_1grow (&solved_conflicts_obstack, '\0');
+      state->solved_conflicts = obstack_finish (&solved_conflicts_obstack);
+    }

 }
 
 
 }
 
 

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

 static void
 static void

-set_conflicts (state_t *state)
+set_conflicts (state_t *state, symbol_t **errs)

 {
 {

-  int i, j;
-  shifts *shiftp;
+  int i;
+  transitions_t *transitions = state->transitions;
+  reductions_t *reds = state->reductions;

 
   if (state->consistent)
     return;
 
 
   if (state->consistent)
     return;
 

-  for (i = 0; i < tokensetsize; i++)
-    lookaheadset[i] = 0;
+  bitset_zero (lookaheadset);

 
 

-  shiftp = state->shifts;
-  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
-    if (!SHIFT_IS_DISABLED (shiftp, i))
-      SETBIT (lookaheadset, SHIFT_SYMBOL (shiftp, i));
+  FOR_EACH_SHIFT (transitions, i)
+    bitset_set (lookaheadset, TRANSITION_SYMBOL (transitions, 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 = 0; i < state->nlookaheads; ++i)
-    if (rule_table[LAruleno[state->lookaheadsp + i]].prec)
-      for (j = 0; j < tokensetsize; ++j)
-       if (LA (state->lookaheadsp + i)[j] & lookaheadset[j])
-         {
-           resolve_sr_conflict (state, state->lookaheadsp + i);
-           break;
-         }
-
+     precedence.  */
+  for (i = 0; i < reds->num; ++i)
+    if (reds->rules[i]->prec && reds->rules[i]->prec->prec
+       && !bitset_disjoint_p (reds->lookaheads[i], lookaheadset))
+      {
+       resolve_sr_conflict (state, i, errs);
+       break;
+      }

 
   /* 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 = 0; i < state->nlookaheads; ++i)
+  for (i = 0; i < reds->num; ++i)

     {
     {

-      for (j = 0; j < tokensetsize; ++j)
-       if (LA (state->lookaheadsp + i)[j] & lookaheadset[j])
-         conflicts[state->number] = 1;
+      if (!bitset_disjoint_p (reds->lookaheads[i], lookaheadset))
+       conflicts[state->number] = 1;

 
 

-      for (j = 0; j < tokensetsize; ++j)
-       lookaheadset[j] |= LA (state->lookaheadsp + i)[j];
+      bitset_or (lookaheadset, lookaheadset, reds->lookaheads[i]);

     }
 }
 
     }
 }
 

+
+/*----------------------------------------------------------------.
+| Solve all the S/R conflicts using the precedence/associativity, |
+| and flag as inconsistent the states that still have conflicts.  |
+`----------------------------------------------------------------*/
+

 void
 void

-solve_conflicts (void)
+conflicts_solve (void)

 {
 {

-  int i;
+  state_number_t i;
+  /* List of lookaheads on which we explicitly raise a parse error.  */
+  symbol_t **errs = XMALLOC (symbol_t *, ntokens + 1);

 
   conflicts = XCALLOC (char, nstates);
 
   conflicts = XCALLOC (char, nstates);

-  shiftset = XCALLOC (unsigned, tokensetsize);
-  lookaheadset = XCALLOC (unsigned, tokensetsize);
+  shiftset = bitset_create (ntokens, BITSET_FIXED);
+  lookaheadset = bitset_create (ntokens, BITSET_FIXED);
+  obstack_init (&solved_conflicts_obstack);

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

-    set_conflicts (state_table[i]);
+    {
+      set_conflicts (states[i], errs);
+
+      /* 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 (errs);

 }
 
 
 }
 
 


@@ -215,66 +331,61 @@ solve_conflicts (void)
 static int
 count_sr_conflicts (state_t *state)
 {
 static int
 count_sr_conflicts (state_t *state)
 {

-  int i, k;
+  int i;

   int src_count = 0;
   int src_count = 0;

-  shifts *shiftp = state->shifts;
+  transitions_t *transitions = state->transitions;
+  reductions_t *reds = state->reductions;

 
 

-  if (!shiftp)
+  if (!transitions)

     return 0;
 
     return 0;
 

-  for (i = 0; i < tokensetsize; i++)
-    {
-      shiftset[i] = 0;
-      lookaheadset[i] = 0;
-    }
+  bitset_zero (lookaheadset);
+  bitset_zero (shiftset);

 
 

-  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
-    if (!SHIFT_IS_DISABLED (shiftp, i))
-      SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
+  FOR_EACH_SHIFT (transitions, i)
+    bitset_set (shiftset, TRANSITION_SYMBOL (transitions, i));

 
 

-  for (i = 0; i < state->nlookaheads; ++i)
-    for (k = 0; k < tokensetsize; ++k)
-      lookaheadset[k] |= LA (state->lookaheadsp + i)[k];
+  for (i = 0; i < reds->num; ++i)
+    bitset_or (lookaheadset, lookaheadset, reds->lookaheads[i]);

 
 

-  for (k = 0; k < tokensetsize; ++k)
-    lookaheadset[k] &= shiftset[k];
+  bitset_and (lookaheadset, lookaheadset, shiftset);

 
 

-  for (i = 0; i < ntokens; i++)
-    if (BITISSET (lookaheadset, i))
-      src_count++;
+  src_count = bitset_count (lookaheadset);

 
   return src_count;
 }
 
 
 
   return src_count;
 }
 
 

-/*----------------------------------------------.
-| Count the number of reduce/reduce conflicts.  |
-`----------------------------------------------*/
+/*----------------------------------------------------------------.
+| 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
 
 static int

-count_rr_conflicts (state_t *state)
+count_rr_conflicts (state_t *state, int one_per_token)

 {
   int i;
 {
   int i;

+  reductions_t *reds = state->reductions;

   int rrc_count = 0;
 
   int rrc_count = 0;
 

-  if (state->nlookaheads < 2)
-    return 0;
-

   for (i = 0; i < ntokens; i++)
     {
       int count = 0;
       int j;
   for (i = 0; i < ntokens; i++)
     {
       int count = 0;
       int j;

-      for (j = 0; j < state->nlookaheads; ++j)
-       if (BITISSET (LA (state->lookaheadsp), state->lookaheadsp + j))
+      for (j = 0; j < reds->num; ++j)
+       if (bitset_test (reds->lookaheads[j], i))

          count++;
 
       if (count >= 2)
          count++;
 
       if (count >= 2)

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

     }
 
   return rrc_count;
 }
 
     }
 
   return rrc_count;
 }
 

+

 /*--------------------------------------------------------------.
 | Return a human readable string which reports shift/reduce and |
 | reduce/reduce conflict numbers (SRC_NUM, RRC_NUM).            |
 /*--------------------------------------------------------------.
 | Return a human readable string which reports shift/reduce and |
 | reduce/reduce conflict numbers (SRC_NUM, RRC_NUM).            |


@@ -306,14 +417,32 @@ conflict_report (int src_num, int rrc_num)
       cp += strlen (cp);
     }
 
       cp += strlen (cp);
     }
 

-  *cp++ = '.';
-  *cp++ = '\n';

   *cp++ = '\0';
 
   return res;
 }
 
 
   *cp++ = '\0';
 
   return res;
 }
 
 

+/*----------------------------------------------------------------.
+| Same as above, but report the number of conflicts a` la POSIX.  |
+`----------------------------------------------------------------*/
+
+static void
+conflict_report_yacc (int src_num, int rrc_num)
+{
+  /* If invoked with `--yacc', use the output format specified by
+     POSIX.  */
+  fprintf (stderr, _("conflicts: "));
+  if (src_num > 0)
+    fprintf (stderr, _(" %d shift/reduce"), src_num);
+  if (src_num > 0 && rrc_num > 0)
+    fprintf (stderr, ",");
+  if (rrc_num > 0)
+    fprintf (stderr, _(" %d reduce/reduce"), rrc_num);
+  putc ('\n', stderr);
+}
+
+

 /*-----------------------------------------------------------.
 | Output the detailed description of states with conflicts.  |
 `-----------------------------------------------------------*/
 /*-----------------------------------------------------------.
 | Output the detailed description of states with conflicts.  |
 `-----------------------------------------------------------*/


@@ -322,17 +451,45 @@ void
 conflicts_output (FILE *out)
 {
   bool printed_sth = FALSE;
 conflicts_output (FILE *out)
 {
   bool printed_sth = FALSE;

-  int i;
+  state_number_t i;
+  for (i = 0; i < nstates; i++)
+    {
+      state_t *s = states[i];
+      if (conflicts[i])
+       {
+         fprintf (out, _("State %d contains "), i);
+         fprintf (out, "%s.\n",
+                  conflict_report (count_sr_conflicts (s),
+                                   count_rr_conflicts (s, TRUE)));
+         printed_sth = TRUE;
+       }
+    }
+  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.                                              |
+`--------------------------------------------------------*/
+
+int
+conflicts_total_count (void)
+{
+  state_number_t i;
+  int count;
+
+  /* Conflicts by state.  */
+  count = 0;

   for (i = 0; i < nstates; i++)
     if (conflicts[i])
       {
   for (i = 0; i < nstates; i++)
     if (conflicts[i])
       {

-       fprintf (out, _("State %d contains "), i);
-       fputs (conflict_report (count_sr_conflicts (state_table[i]),
-                               count_rr_conflicts (state_table[i])), out);
-       printed_sth = TRUE;
+       count += count_sr_conflicts (states[i]);
+       count += count_rr_conflicts (states[i], FALSE);

       }
       }

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

 }
 
 
 }
 
 


@@ -343,8 +500,6 @@ conflicts_output (FILE *out)
 void
 conflicts_print (void)
 {
 void
 conflicts_print (void)
 {

-  int i;
-

   /* Is the number of SR conflicts OK?  Either EXPECTED_CONFLICTS is
      not set, and then we want 0 SR, or else it is specified, in which
      case we want equality.  */
   /* Is the number of SR conflicts OK?  Either EXPECTED_CONFLICTS is
      not set, and then we want 0 SR, or else it is specified, in which
      case we want equality.  */


@@ -354,12 +509,16 @@ conflicts_print (void)
   int rrc_total = 0;
 
   /* Conflicts by state.  */
   int rrc_total = 0;
 
   /* Conflicts by state.  */

-  for (i = 0; i < nstates; i++)
-    if (conflicts[i])
-      {
-       src_total += count_sr_conflicts (state_table[i]);
-       rrc_total += count_rr_conflicts (state_table[i]);
-      }
+  {
+    state_number_t i;
+
+    for (i = 0; i < nstates; i++)
+      if (conflicts[i])
+       {
+         src_total += count_sr_conflicts (states[i]);
+         rrc_total += count_rr_conflicts (states[i], TRUE);
+       }
+  }

 
   src_ok = src_total == (expected_conflicts == -1 ? 0 : expected_conflicts);
 
 
   src_ok = src_total == (expected_conflicts == -1 ? 0 : expected_conflicts);
 


@@ -370,39 +529,23 @@ conflicts_print (void)
 
   /* Report the total number of conflicts on STDERR.  */
   if (yacc_flag)
 
   /* Report the total number of conflicts on STDERR.  */
   if (yacc_flag)

-    {
-      /* If invoked with `--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);
-    }
+    conflict_report_yacc (src_total, rrc_total);

   else
   else

-    {
-      fprintf (stderr, _("%s contains "), infile);
-      fputs (conflict_report (src_total, rrc_total), stderr);
-    }
+    warn ("%s", conflict_report (src_total, rrc_total));

 
   if (expected_conflicts != -1 && !src_ok)
 
   if (expected_conflicts != -1 && !src_ok)

-    {
-      complain_message_count++;
-      fprintf (stderr, ngettext ("expected %d shift/reduce conflict\n",
-                                "expected %d shift/reduce conflicts\n",
-                                expected_conflicts),
-              expected_conflicts);
-    }
+    complain (ngettext ("expected %d shift/reduce conflict",
+                       "expected %d shift/reduce conflicts",
+                       expected_conflicts),
+             expected_conflicts);

 }
 
 
 void
 }
 
 
 void

-free_conflicts (void)
+conflicts_free (void)

 {
   XFREE (conflicts);
 {
   XFREE (conflicts);

-  XFREE (shiftset);
-  XFREE (lookaheadset);
+  bitset_free (shiftset);
+  bitset_free (lookaheadset);
+  obstack_free (&solved_conflicts_obstack, NULL);

 }
 }