Regen.

[bison.git] / src / lalr.c

diff --git a/src/lalr.c b/src/lalr.c
index dd6a1dc07af5091a43a293b0e0b4c7c94293f19d..9af69ee29d6d41b21c8636c5b3c1075bc79002e6 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -77,7 +77,7 @@ initialize_LA (void)
   np = LArule;
   for (i = 0; i < nstates; i++)
     if (!states[i]->consistent)
-      for (j = 0; j < states[i]->reductions->nreds; j++)
+      for (j = 0; j < states[i]->reductions->num; j++)
        *np++ = &rules[states[i]->reductions->rules[j]];
 }
 
@@ -366,9 +366,9 @@ states_lookaheads_count (void)
         reductions (i.e., there are two or more), or to distinguish a
         reduction from a shift.  Otherwise, it is straightforward,
         and the state is `consistent'.  */
-      if (rp->nreds > 1
-         || (rp->nreds == 1 && sp->num && TRANSITION_IS_SHIFT (sp, 0)))
-       nlookaheads += rp->nreds;
+      if (rp->num > 1
+         || (rp->num == 1 && sp->num && TRANSITION_IS_SHIFT (sp, 0)))
+       nlookaheads += rp->num;
       else
        states[i]->consistent = 1;
 
@@ -427,7 +427,7 @@ lookaheads_print (FILE *out)
        BITSET_EXECUTE (states[i]->lookaheads[j], 0, k,
        {
          fprintf (out, "   on %d (%s) -> rule %d\n",
-                  k, symbol_tag_get (symbols[k]),
+                  k, symbols[k]->tag,
                   states[i]->lookaheads_rule[j]->number - 1);
        });
     }