* src/gram.h (associativity): New enum type which replaces the

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 2840dcf600507e63c5d5e7ab2cc9d31c5ca7bfcb..c694f830e826be14a06a48ab0497f44a31b85d61 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -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;