The location tracking mechanism is precious for parse error

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 0b94848095d1606ad44601ca55e48d1eee863004..f89c3a387de6a3a69d8a050773d829f37a396734 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -45,7 +45,7 @@ static int rrc_count;
 static inline void
 log_resolution (int state, int LAno, int token, char *resolution)
 {
-  if (verboseflag)
+  if (verbose_flag)
     fprintf (foutput,
             _("\
 Conflict in state %d between rule %d and token %s resolved as %s.\n"),
@@ -131,29 +131,29 @@ resolve_sr_conflict (int state, int lookaheadnum)
 
              switch (sassoc[i])
                {
-               case RIGHT_ASSOC:
+               case right_assoc:
                  log_resolution (state, lookaheadnum, i, _("shift"));
                  break;
 
-               case LEFT_ASSOC:
+               case left_assoc:
                  log_resolution (state, lookaheadnum, i, _("reduce"));
                  break;
 
-               case NON_ASSOC:
+               case non_assoc:
                  log_resolution (state, lookaheadnum, i, _("an error"));
                  break;
                }
 
-             if (sassoc[i] != RIGHT_ASSOC)
+             if (sassoc[i] != right_assoc)
                {
                  *fp2 &= ~mask;        /* flush the shift for this token */
                  flush_shift (state, i);
                }
-             if (sassoc[i] != LEFT_ASSOC)
+             if (sassoc[i] != left_assoc)
                {
                  *fp1 &= ~mask;        /* flush the reduce for this token */
                }
-             if (sassoc[i] == NON_ASSOC)
+             if (sassoc[i] == non_assoc)
                {
                  /* Record an explicit error for this token.  */
                  *errtokens++ = i;
@@ -456,7 +456,7 @@ print_conflicts (void)
          src_total += src_count;
          rrc_total += rrc_count;
 
-         if (verboseflag)
+         if (verbose_flag)
            {
              fprintf (foutput, _("State %d contains"), i);
              conflict_report (foutput, src_count, rrc_count);
@@ -465,7 +465,7 @@ print_conflicts (void)
     }
 
   /* Report the total number of conflicts on STDERR.  */
-  if (fixed_outfiles)
+  if (yacc_flag)
     {
       /* If invoked with `--yacc', use the output format specified by
         POSIX.  */