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

Diff of /bison/src/conflicts.c

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

revision 1.49 by akim, Wed Dec 5 09:32:23 2001 UTC revision 1.50 by akim, Wed Dec 5 09:34:55 2001 UTC
# Line 60  flush_shift (int state, int token) Line 60  flush_shift (int state, int token)
60    shifts *shiftp = state_table[state].shift_table;    shifts *shiftp = state_table[state].shift_table;
61    int i;    int i;
62    
63    if (shiftp)    for (i = 0; i < shiftp->nshifts; i++)
64      for (i = 0; i < shiftp->nshifts; i++)      if (!SHIFT_IS_DISABLED (shiftp, i) && SHIFT_SYMBOL (shiftp, i) == token)
65        if (!SHIFT_IS_DISABLED (shiftp, i) && SHIFT_SYMBOL (shiftp, i) == token)        SHIFT_DISABLE (shiftp, i);
         SHIFT_DISABLE (shiftp, i);  
66  }  }
67    
68    
# Line 174  set_conflicts (int state) Line 173  set_conflicts (int state)
173      lookaheadset[i] = 0;      lookaheadset[i] = 0;
174    
175    shiftp = state_table[state].shift_table;    shiftp = state_table[state].shift_table;
176    if (shiftp)    for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
177      for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)      if (!SHIFT_IS_DISABLED (shiftp, i))
178        if (!SHIFT_IS_DISABLED (shiftp, i))        SETBIT (lookaheadset, SHIFT_SYMBOL (shiftp, i));
         SETBIT (lookaheadset, SHIFT_SYMBOL (shiftp, i));  
179    
180    /* Loop over all rules which require lookahead in this state.  First    /* Loop over all rules which require lookahead in this state.  First
181       check for shift-reduce conflict, and try to resolve using       check for shift-reduce conflict, and try to resolve using
# Line 436  print_reductions (FILE *out, int state) Line 434  print_reductions (FILE *out, int state)
434      shiftset[i] = 0;      shiftset[i] = 0;
435    
436    shiftp = state_table[state].shift_table;    shiftp = state_table[state].shift_table;
437    if (shiftp)    for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
438      for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)      if (!SHIFT_IS_DISABLED (shiftp, i))
439        if (!SHIFT_IS_DISABLED (shiftp, i))        {
440          {          /* if this state has a shift for the error token, don't use a
441            /* if this state has a shift for the error token, don't use a             default rule.  */
442               default rule.  */          if (SHIFT_IS_ERROR (shiftp, i))
443            if (SHIFT_IS_ERROR (shiftp, i))            nodefault = 1;
444              nodefault = 1;          SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
445            SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));        }
         }  
446    
447    errp = err_table[state];    errp = err_table[state];
448    if (errp)    if (errp)
# Line 507  print_reductions (FILE *out, int state) Line 504  print_reductions (FILE *out, int state)
504        for (i = 0; i < tokensetsize; i++)        for (i = 0; i < tokensetsize; i++)
505          shiftset[i] = 0;          shiftset[i] = 0;
506    
507        if (shiftp)        for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
508          for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)          if (!SHIFT_IS_DISABLED (shiftp, i))
509            if (!SHIFT_IS_DISABLED (shiftp, i))            SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
             SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));  
510    
511        for (i = 0; i < ntokens; i++)        for (i = 0; i < ntokens; i++)
512          {          {

Legend:
Removed from v.1.49  
changed lines
  Added in v.1.50

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