* src/derives.c (print_derives): Be sure to use `>= 0', not `> 0',

[bison.git] / src / lalr.c

diff --git a/src/lalr.c b/src/lalr.c
index be178b8d5ee20e46f6b9e966230d1568036a686d..660088cd62fff85e7c404a21c2c7eb5e7c9ace18 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -137,7 +137,6 @@ initialize_LA (void)
   int i;
   int j;
   short *np;
-  reductions *rp;
 
   /* Avoid having to special case 0.  */
   if (!nLA)
@@ -150,9 +149,8 @@ initialize_LA (void)
   np = LAruleno;
   for (i = 0; i < nstates; i++)
     if (!state_table[i]->consistent)
-      if ((rp = state_table[i]->reductions))
-       for (j = 0; j < rp->nreds; j++)
-         *np++ = rp->rules[j];
+      for (j = 0; j < state_table[i]->reductions->nreds; j++)
+       *np++ = state_table[i]->reductions->rules[j];
 }
 
 
@@ -171,13 +169,11 @@ set_goto_map (void)
       shifts *sp = state_table[state]->shifts;
       for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i)
        {
-         int symbol = state_table[sp->shifts[i]]->accessing_symbol;
-
          if (ngotos == MAXSHORT)
            fatal (_("too many gotos (max %d)"), MAXSHORT);
 
          ngotos++;
-         goto_map[symbol]++;
+         goto_map[SHIFT_SYMBOL (sp, i)]++;
        }
     }
 
@@ -204,12 +200,9 @@ set_goto_map (void)
       shifts *sp = state_table[state]->shifts;
       for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i)
        {
-         int state2 = sp->shifts[i];
-         int symbol = state_table[state2]->accessing_symbol;
-
-         int k = temp_map[symbol]++;
+         int k = temp_map[SHIFT_SYMBOL (sp, i)]++;
          from_state[k] = state;
-         to_state[k] = state2;
+         to_state[k] = sp->shifts[i];
        }
     }
 
@@ -269,14 +262,11 @@ initialize_F (void)
 
       int j;
       for (j = 0; j < sp->nshifts && SHIFT_IS_SHIFT (sp, j); j++)
-       {
-         int symbol = state_table[sp->shifts[j]]->accessing_symbol;
-         SETBIT (F (i), symbol);
-       }
+       SETBIT (F (i), SHIFT_SYMBOL (sp, j));
 
       for (; j < sp->nshifts; j++)
        {
-         int symbol = state_table[sp->shifts[j]]->accessing_symbol;
+         int symbol = SHIFT_SYMBOL (sp, j);
          if (nullable[symbol])
            edge[nedges++] = map_goto (stateno, symbol);
        }
@@ -428,7 +418,7 @@ build_relations (void)
          state_t *state = state_table[from_state[i]];
          states[0] = state->number;
 
-         for (rp = ritem + rule_table[*rulep].rhs; *rp > 0; rp++)
+         for (rp = &ritem[rule_table[*rulep].rhs]; *rp >= 0; rp++)
            {
              shifts *sp = state->shifts;
              int j;
@@ -533,8 +523,12 @@ initialize_lookaheads (void)
       reductions *rp = state_table[i]->reductions;
       shifts *sp = state_table[i]->shifts;
 
-      if (rp
-         && (rp->nreds > 1 || (sp->nshifts && SHIFT_IS_SHIFT (sp, 0))))
+      /* We need a lookahead either to distinguish different
+        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->nshifts && SHIFT_IS_SHIFT (sp, 0)))
        nlookaheads += rp->nreds;
       else
        state_table[i]->consistent = 1;