/[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.64 by akim, Sat Dec 29 14:20:13 2001 UTC revision 1.65 by akim, Sat Dec 29 14:20:47 2001 UTC
# Line 204  solve_conflicts (void) Line 204  solve_conflicts (void)
204    lookaheadset = XCALLOC (unsigned, tokensetsize);    lookaheadset = XCALLOC (unsigned, tokensetsize);
205    
206    for (i = 0; i < nstates; i++)    for (i = 0; i < nstates; i++)
207      set_conflicts (state_table[i]);      set_conflicts (states[i]);
208  }  }
209    
210    
# Line 327  conflicts_output (FILE *out) Line 327  conflicts_output (FILE *out)
327      if (conflicts[i])      if (conflicts[i])
328        {        {
329          fprintf (out, _("State %d contains "), i);          fprintf (out, _("State %d contains "), i);
330          fputs (conflict_report (count_sr_conflicts (state_table[i]),          fputs (conflict_report (count_sr_conflicts (states[i]),
331                                  count_rr_conflicts (state_table[i])), out);                                  count_rr_conflicts (states[i])), out);
332          printed_sth = TRUE;          printed_sth = TRUE;
333        }        }
334    if (printed_sth)    if (printed_sth)
# Line 357  conflicts_print (void) Line 357  conflicts_print (void)
357    for (i = 0; i < nstates; i++)    for (i = 0; i < nstates; i++)
358      if (conflicts[i])      if (conflicts[i])
359        {        {
360          src_total += count_sr_conflicts (state_table[i]);          src_total += count_sr_conflicts (states[i]);
361          rrc_total += count_rr_conflicts (state_table[i]);          rrc_total += count_rr_conflicts (states[i]);
362        }        }
363    
364    src_ok = src_total == (expected_conflicts == -1 ? 0 : expected_conflicts);    src_ok = src_total == (expected_conflicts == -1 ? 0 : expected_conflicts);

Legend:
Removed from v.1.64  
changed lines
  Added in v.1.65

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