* src/closure.c, src/conflicts.c, src/derives.c, src/gram.c

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 05f37bd1849d0b7f7a1d50bd16b06b7fa97cf33a..3a979410a2b9f377649e0fdeec1ff93c6ec6b81f 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -94,7 +94,7 @@ resolve_sr_conflict (state_t *state, int lookahead)
 {
   int i;
   /* find the rule to reduce by to get precedence of reduction  */
-  int redprec = rule_table[LAruleno[lookahead]].prec;
+  int redprec = rules[LAruleno[lookahead]].prec;
   errs *errp = errs_new (ntokens + 1);
   errp->nerrs = 0;
 
@@ -122,7 +122,7 @@ resolve_sr_conflict (state_t *state, int lookahead)
             For right association, keep only the shift.
             For nonassociation, keep neither.  */
 
-         switch (sassoc[i])
+         switch (symbols[i]->assoc)
            {
            case right_assoc:
              log_resolution (state, lookahead, i, _("shift"));
@@ -172,7 +172,7 @@ set_conflicts (state_t *state)
      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)
+    if (rules[LAruleno[state->lookaheadsp + i]].prec)
       for (j = 0; j < tokensetsize; ++j)
        if (LA (state->lookaheadsp + i)[j] & lookaheadset[j])
          {