/[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.72 by akim, Wed Mar 20 09:35:27 2002 UTC revision 1.73 by akim, Sun Apr 7 17:41:43 2002 UTC
# Line 46  log_resolution (state_t *state, int LAno Line 46  log_resolution (state_t *state, int LAno
46      obstack_fgrow4 (&output_obstack,      obstack_fgrow4 (&output_obstack,
47                      _("\                      _("\
48  Conflict in state %d between rule %d and token %s resolved as %s.\n"),  Conflict in state %d between rule %d and token %s resolved as %s.\n"),
49                      state->number, LAruleno[LAno], symbols[token]->tag,                      state->number,
50                        LArule[LAno]->number,
51                        symbols[token]->tag,
52                      resolution);                      resolution);
53  }  }
54    
# Line 95  resolve_sr_conflict (state_t *state, int Line 97  resolve_sr_conflict (state_t *state, int
97  {  {
98    int i;    int i;
99    /* find the rule to reduce by to get precedence of reduction  */    /* find the rule to reduce by to get precedence of reduction  */
100    int redprec = rules[LAruleno[lookahead]].prec;    int redprec = LArule[lookahead]->prec;
101    errs *errp = errs_new (ntokens + 1);    errs *errp = errs_new (ntokens + 1);
102    errp->nerrs = 0;    errp->nerrs = 0;
103    
# Line 172  set_conflicts (state_t *state) Line 174  set_conflicts (state_t *state)
174       check for shift-reduce conflict, and try to resolve using       check for shift-reduce conflict, and try to resolve using
175       precedence */       precedence */
176    for (i = 0; i < state->nlookaheads; ++i)    for (i = 0; i < state->nlookaheads; ++i)
177      if (rules[LAruleno[state->lookaheadsp + i]].prec      if (LArule[state->lookaheadsp + i]->prec
178          && !bitset_disjoint_p (LA[state->lookaheadsp + i], lookaheadset))          && !bitset_disjoint_p (LA[state->lookaheadsp + i], lookaheadset))
179        {        {
180          resolve_sr_conflict (state, state->lookaheadsp + i);          resolve_sr_conflict (state, state->lookaheadsp + i);

Legend:
Removed from v.1.72  
changed lines
  Added in v.1.73

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