/[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.103 by eggert, Mon Jan 13 06:41:28 2003 UTC revision 1.104 by eggert, Fri Apr 18 05:07:08 2003 UTC
# Line 237  resolve_sr_conflict (state *s, int rulen Line 237  resolve_sr_conflict (state *s, int rulen
237              }              }
238        }        }
239    
240    /* Some tokens have been explicitly made errors.  Allocate a    if (nerrs)
241       permanent errs structure for this state, to record them.  */      {
242    state_errs_set (s, nerrs, errors);        /* Some tokens have been explicitly made errors.  Allocate a
243             permanent errs structure for this state, to record them.  */
244          state_errs_set (s, nerrs, errors);
245        }
246    
247    if (obstack_object_size (&solved_conflicts_obstack))    if (obstack_object_size (&solved_conflicts_obstack))
248      {      {
# Line 277  set_conflicts (state *s, symbol **errors Line 280  set_conflicts (state *s, symbol **errors
280    for (i = 0; i < reds->num; ++i)    for (i = 0; i < reds->num; ++i)
281      if (reds->rules[i]->prec && reds->rules[i]->prec->prec      if (reds->rules[i]->prec && reds->rules[i]->prec->prec
282          && !bitset_disjoint_p (reds->lookaheads[i], lookaheadset))          && !bitset_disjoint_p (reds->lookaheads[i], lookaheadset))
283        {        resolve_sr_conflict (s, i, errors);
         resolve_sr_conflict (s, i, errors);  
         break;  
       }  
284    
285    /* Loop over all rules which require lookahead in this state.  Check    /* Loop over all rules which require lookahead in this state.  Check
286       for conflicts not resolved above.  */       for conflicts not resolved above.  */

Legend:
Removed from v.1.103  
changed lines
  Added in v.1.104

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