/[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.34 by akim, Mon Nov 19 10:19:20 2001 UTC revision 1.35 by akim, Mon Nov 19 10:19:56 2001 UTC
# Line 94  resolve_sr_conflict (int state, int look Line 94  resolve_sr_conflict (int state, int look
94    short *errtokens = errp->errs;    short *errtokens = errp->errs;
95    
96    /* find the rule to reduce by to get precedence of reduction  */    /* find the rule to reduce by to get precedence of reduction  */
97    redprec = rprec[LAruleno[lookaheadnum]];    redprec = rule_table[LAruleno[lookaheadnum]].prec;
98    
99    mask = 1;    mask = 1;
100    fp1 = LA (lookaheadnum);    fp1 = LA (lookaheadnum);
# Line 217  set_conflicts (int state) Line 217  set_conflicts (int state)
217       check for shift-reduce conflict, and try to resolve using       check for shift-reduce conflict, and try to resolve using
218       precedence */       precedence */
219    for (i = state_table[state].lookaheads; i < k; i++)    for (i = state_table[state].lookaheads; i < k; i++)
220      if (rprec[LAruleno[i]])      if (rule_table[LAruleno[i]].prec)
221        {        {
222          fp1 = LA (i);          fp1 = LA (i);
223          fp2 = fp1;          fp2 = fp1;

Legend:
Removed from v.1.34  
changed lines
  Added in v.1.35

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