* tests/actions.at (Actions after errors): New test case.

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 24f27cc8a37df8aad94bd6d20e83852be013e0b4..201c9c97eb87e6d5a907531f72a4fe8eed3dea98 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -252,7 +252,7 @@ resolve_sr_conflict (state_t *state, int ruleno,
 | 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     |
 | 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).   |
+| lookaheads on which this STATE raises a syntax error (%nonassoc).  |

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


@@ -302,7 +302,7 @@ void
 conflicts_solve (void)
 {
   state_number_t i;
 conflicts_solve (void)
 {
   state_number_t i;

-  /* List of lookaheads on which we explicitly raise a parse error.  */
+  /* List of lookaheads on which we explicitly raise a syntax error.  */

   symbol_t **errs = XMALLOC (symbol_t *, ntokens + 1);
 
   conflicts = XCALLOC (char, nstates);
   symbol_t **errs = XMALLOC (symbol_t *, ntokens + 1);
 
   conflicts = XCALLOC (char, nstates);


@@ -450,7 +450,7 @@ conflict_report_yacc (int src_num, int rrc_num)
 void
 conflicts_output (FILE *out)
 {
 void
 conflicts_output (FILE *out)
 {

-  bool printed_sth = FALSE;
+  bool printed_sth = false;

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


@@ -460,8 +460,8 @@ conflicts_output (FILE *out)
          fprintf (out, _("State %d contains "), i);
          fprintf (out, "%s.\n",
                   conflict_report (count_sr_conflicts (s),
          fprintf (out, _("State %d contains "), i);
          fprintf (out, "%s.\n",
                   conflict_report (count_sr_conflicts (s),

-                                   count_rr_conflicts (s, TRUE)));
-         printed_sth = TRUE;
+                                   count_rr_conflicts (s, true)));
+         printed_sth = true;

        }
     }
   if (printed_sth)
        }
     }
   if (printed_sth)


@@ -487,7 +487,7 @@ conflicts_total_count (void)
     if (conflicts[i])
       {
        count += count_sr_conflicts (states[i]);
     if (conflicts[i])
       {
        count += count_sr_conflicts (states[i]);

-       count += count_rr_conflicts (states[i], FALSE);
+       count += count_rr_conflicts (states[i], false);

       }
   return count;
 }
       }
   return count;
 }


@@ -516,7 +516,7 @@ conflicts_print (void)
       if (conflicts[i])
        {
          src_total += count_sr_conflicts (states[i]);
       if (conflicts[i])
        {
          src_total += count_sr_conflicts (states[i]);

-         rrc_total += count_rr_conflicts (states[i], TRUE);
+         rrc_total += count_rr_conflicts (states[i], true);

        }
   }
 
        }
   }