/[bison]/bison/src/output.c
ViewVC logotype

Diff of /bison/src/output.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.178 by akim, Sun Jun 30 17:32:35 2002 UTC revision 1.179 by akim, Sun Jun 30 17:33:37 2002 UTC
# Line 430  action_row (state_t *state) Line 430  action_row (state_t *state)
430    int i;    int i;
431    rule_number_t default_rule = 0;    rule_number_t default_rule = 0;
432    reductions_t *redp = state->reductions;    reductions_t *redp = state->reductions;
433    shifts_t *shiftp = state->shifts;    transitions_t *transitions = state->shifts;
434    errs_t *errp = state->errs;    errs_t *errp = state->errs;
435    /* set nonzero to inhibit having any default reduction */    /* set nonzero to inhibit having any default reduction */
436    int nodefault = 0;    int nodefault = 0;
# Line 460  action_row (state_t *state) Line 460  action_row (state_t *state)
460    /* Now see which tokens are allowed for shifts in this state.  For    /* Now see which tokens are allowed for shifts in this state.  For
461       them, record the shift as the thing to do.  So shift is preferred       them, record the shift as the thing to do.  So shift is preferred
462       to reduce.  */       to reduce.  */
463    for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)    for (i = 0; i < transitions->num && TRANSITION_IS_SHIFT (transitions, i); i++)
464      if (!SHIFT_IS_DISABLED (shiftp, i))      if (!TRANSITION_IS_DISABLED (transitions, i))
465        {        {
466          symbol_number_t symbol = SHIFT_SYMBOL (shiftp, i);          symbol_number_t symbol = TRANSITION_SYMBOL (transitions, i);
467          state_number_t shift_state = shiftp->shifts[i];          state_number_t shift_state = transitions->states[i];
468    
469          if (actrow[symbol] != 0)          if (actrow[symbol] != 0)
470            conflicted = conflrow[symbol] = 1;            conflicted = conflrow[symbol] = 1;

Legend:
Removed from v.1.178  
changed lines
  Added in v.1.179

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26