Normalize conflict related messages.

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 299327b047dfdbe5b52c4318b2d3e32c9adf579d..cbf385ac3049d18786c377baded8a93aa5fff83b 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -48,12 +48,17 @@ enum conflict_resolution_e
     reduce_resolution,
     left_resolution,
     right_resolution,
     reduce_resolution,
     left_resolution,
     right_resolution,

-    nonassoc_resolution,
+    nonassoc_resolution

   };
 
 
   };
 
 

+/*----------------------------------------------------------------.
+| Explain how an SR conflict between TOKEN and RULE was resolved: |
+| RESOLUTION.                                                     |
+`----------------------------------------------------------------*/
+

 static inline void
 static inline void

-log_resolution (int lookahead, int token,
+log_resolution (rule_t *rule, symbol_number_t token,

                enum conflict_resolution_e resolution)
 {
   if (report_flag & report_solved_conflicts)
                enum conflict_resolution_e resolution)
 {
   if (report_flag & report_solved_conflicts)


@@ -62,26 +67,26 @@ log_resolution (int lookahead, int token,
       switch (resolution)
        {
        case shift_resolution:
       switch (resolution)
        {
        case shift_resolution:

-       case left_resolution:
+       case right_resolution:

          obstack_fgrow2 (&solved_conflicts_obstack,
                          _("\
     Conflict between rule %d and token %s resolved as shift"),
          obstack_fgrow2 (&solved_conflicts_obstack,
                          _("\
     Conflict between rule %d and token %s resolved as shift"),

-                         LArule[lookahead]->number,
+                         rule->number,

                          symbols[token]->tag);
          break;
        case reduce_resolution:
                          symbols[token]->tag);
          break;
        case reduce_resolution:

-       case right_resolution:
+       case left_resolution:

          obstack_fgrow2 (&solved_conflicts_obstack,
                          _("\
     Conflict between rule %d and token %s resolved as reduce"),
          obstack_fgrow2 (&solved_conflicts_obstack,
                          _("\
     Conflict between rule %d and token %s resolved as reduce"),

-                         LArule[lookahead]->number,
+                         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"),
                          symbols[token]->tag);
          break;
        case nonassoc_resolution:
          obstack_fgrow2 (&solved_conflicts_obstack,
                          _("\
     Conflict between rule %d and token %s resolved as an error"),

-                         LArule[lookahead]->number,
+                         rule->number,

                          symbols[token]->tag);
          break;
        }
                          symbols[token]->tag);
          break;
        }


@@ -92,7 +97,7 @@ log_resolution (int lookahead, int token,
        case shift_resolution:
          obstack_fgrow2 (&solved_conflicts_obstack,
                          " (%s < %s)",
        case shift_resolution:
          obstack_fgrow2 (&solved_conflicts_obstack,
                          " (%s < %s)",

-                         LArule[lookahead]->prec->tag,
+                         rule->prec->tag,

                          symbols[token]->tag);
          break;
 
                          symbols[token]->tag);
          break;
 


@@ -100,7 +105,7 @@ log_resolution (int lookahead, int token,
          obstack_fgrow2 (&solved_conflicts_obstack,
                          " (%s < %s)",
                          symbols[token]->tag,
          obstack_fgrow2 (&solved_conflicts_obstack,
                          " (%s < %s)",
                          symbols[token]->tag,

-                         LArule[lookahead]->prec->tag);
+                         rule->prec->tag);

          break;
 
        case left_resolution:
          break;
 
        case left_resolution:


@@ -134,13 +139,14 @@ log_resolution (int lookahead, int token,
 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;
 
   bitset_reset (lookaheadset, token);
   int i;
 
   bitset_reset (lookaheadset, token);

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

 }
 
 
 }
 
 


@@ -151,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)

 {
 {

-  bitset_reset (LA[lookahead], token);
+  bitset_reset (lookaheads, token);

 }
 
 
 }
 
 


@@ -162,19 +168,25 @@ 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 lookahead,
+                    symbol_t **errs)

 {
 {

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

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

-    if (bitset_test (LA[lookahead], i)
+    if (bitset_test (lookaheads, i)

        && bitset_test (lookaheadset, i)
        && symbols[i]->prec)
       {
        && bitset_test (lookaheadset, i)
        && symbols[i]->prec)
       {


@@ -183,13 +195,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 (lookahead, i, reduce_resolution);
+           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 (lookahead, i, shift_resolution);
-           flush_reduce (lookahead, i);
+           log_resolution (redrule, i, shift_resolution);
+           flush_reduce (lookaheads, i);

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


@@ -200,29 +212,32 @@ resolve_sr_conflict (state_t *state, int lookahead)
          switch (symbols[i]->assoc)
            {
            case right_assoc:
          switch (symbols[i]->assoc)
            {
            case right_assoc:

-             log_resolution (lookahead, i, right_resolution);
-             flush_reduce (lookahead, i);
+             log_resolution (redrule, i, right_resolution);
+             flush_reduce (lookaheads, i);

              break;
 
            case left_assoc:
              break;
 
            case left_assoc:

-             log_resolution (lookahead, i, left_resolution);
+             log_resolution (redrule, i, left_resolution);

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

-             log_resolution (lookahead, i, nonassoc_resolution);
+             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))
     {
 
   if (obstack_object_size (&solved_conflicts_obstack))
     {


@@ -232,31 +247,36 @@ resolve_sr_conflict (state_t *state, int lookahead)
 }
 
 
 }
 
 

+/*-------------------------------------------------------------------.
+| 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;
 {
   int i;

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

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

-  shiftp = state->shifts;
-  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
-    if (!SHIFT_IS_DISABLED (shiftp, i))
-      bitset_set (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 */
+     precedence.  */

   for (i = 0; i < state->nlookaheads; ++i)
   for (i = 0; i < state->nlookaheads; ++i)

-    if (LArule[state->lookaheadsp + i]->prec
-       && LArule[state->lookaheadsp + i]->prec->prec
-       && !bitset_disjoint_p (LA[state->lookaheadsp + i], lookaheadset))
+    if (state->lookaheads_rule[i]->prec
+       && state->lookaheads_rule[i]->prec->prec
+       && !bitset_disjoint_p (state->lookaheads[i], lookaheadset))

       {
       {

-       resolve_sr_conflict (state, state->lookaheadsp + i);
+       resolve_sr_conflict (state, i, errs);

        break;
       }
 
        break;
       }
 


@@ -264,17 +284,25 @@ set_conflicts (state_t *state)
      for conflicts not resolved above.  */
   for (i = 0; i < state->nlookaheads; ++i)
     {
      for conflicts not resolved above.  */
   for (i = 0; i < state->nlookaheads; ++i)
     {

-      if (!bitset_disjoint_p (LA[state->lookaheadsp + i], lookaheadset))
+      if (!bitset_disjoint_p (state->lookaheads[i], lookaheadset))

        conflicts[state->number] = 1;
 
        conflicts[state->number] = 1;
 

-      bitset_or (lookaheadset, lookaheadset, LA[state->lookaheadsp + i]);
+      bitset_or (lookaheadset, lookaheadset, state->lookaheads[i]);

     }
 }
 
     }
 }
 

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

 void
 conflicts_solve (void)
 {
 void
 conflicts_solve (void)
 {

-  size_t 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);
   shiftset = bitset_create (ntokens, BITSET_FIXED);
 
   conflicts = XCALLOC (char, nstates);
   shiftset = bitset_create (ntokens, BITSET_FIXED);


@@ -282,7 +310,16 @@ conflicts_solve (void)
   obstack_init (&solved_conflicts_obstack);
 
   for (i = 0; i < nstates; i++)
   obstack_init (&solved_conflicts_obstack);
 
   for (i = 0; i < nstates; i++)

-    set_conflicts (states[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);

 }
 
 
 }
 
 


@@ -295,20 +332,19 @@ count_sr_conflicts (state_t *state)
 {
   int i;
   int src_count = 0;
 {
   int i;
   int src_count = 0;

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

 
 

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

     return 0;
 
   bitset_zero (lookaheadset);
   bitset_zero (shiftset);
 
     return 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))
-      bitset_set (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 (i = 0; i < state->nlookaheads; ++i)

-    bitset_or (lookaheadset, lookaheadset, LA[state->lookaheadsp + i]);
+    bitset_or (lookaheadset, lookaheadset, state->lookaheads[i]);

 
   bitset_and (lookaheadset, lookaheadset, shiftset);
 
 
   bitset_and (lookaheadset, lookaheadset, shiftset);
 


@@ -318,12 +354,15 @@ count_sr_conflicts (state_t *state)
 }
 
 
 }
 
 

-/*----------------------------------------------.
-| 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 rrc_count = 0;
 {
   int i;
   int rrc_count = 0;


@@ -336,16 +375,17 @@ count_rr_conflicts (state_t *state)
       int count = 0;
       int j;
       for (j = 0; j < state->nlookaheads; ++j)
       int count = 0;
       int j;
       for (j = 0; j < state->nlookaheads; ++j)

-       if (bitset_test (LA[state->lookaheadsp + j], i))
+       if (bitset_test (state->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).            |


@@ -377,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.  |
 `-----------------------------------------------------------*/


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

-  size_t i;
+  bool *used_rules = XCALLOC (bool, nrules);
+  state_number_t i;
+  for (i = 0; i < nstates; i++)
+    {
+      state_t *s = states[i];
+      int j;
+      for (j = 0; j < s->reductions->num; ++j)
+       used_rules[s->reductions->rules[j]->number] = TRUE;
+      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);
+
+  for (i = 0; i < nstates; i++)
+    {
+      state_t *s = states[i];
+      reductions_t *r = s->reductions;
+      int j;
+      for (j = 0; j < r->num; ++j)
+       if (!used_rules[r->rules[j]->number])
+         {
+           LOCATION_PRINT (stderr, r->rules[j]->location);
+           fprintf (stderr, ": %s: %s: ",
+                    _("warning"),
+                    _("rule never reduced because of conflicts"));
+           rule_print (r->rules[j], stderr);
+         }
+    }
+  free (used_rules);
+}
+
+/*--------------------------------------------------------.
+| 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 (states[i]),
-                               count_rr_conflicts (states[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;

 }
 
 
 }
 
 


@@ -414,8 +521,6 @@ conflicts_output (FILE *out)
 void
 conflicts_print (void)
 {
 void
 conflicts_print (void)
 {

-  size_t 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.  */


@@ -425,12 +530,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 (states[i]);
-       rrc_total += count_rr_conflicts (states[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);
 


@@ -441,32 +550,15 @@ 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);

 }
 
 
 }