Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-15 07:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/conflicts.c (log_resolution, flush_shift)

Browse Source 
(resolve_sr_conflict, set_conflicts, solve_conflicts)
(count_sr_conflicts, count_rr_conflicts, conflicts_output)
(conflicts_print, print_reductions): Use a state_t instead of an
integer when referring to a state.
As much as possible, depend upon nlookaheads, instead of the
`lookaheadsp' member of the following state (since lookaheads of
successive states are successive, the difference between state n + 1
and n served as the number of lookaheads for state n).
* src/lalr.c (add_lookback_edge): Likewise.
* src/print.c (print_core, print_actions, print_state)
(print_results): Likewise.
* src/print_graph.c (print_core, print_actions, print_state)
(print_graph): Likewise.
* src/conflicts.h: Adjust.
This commit is contained in:
Akim Demaille
2001-12-27 18:05:05 +00:00
parent 1b177bd731
commit 065fbd27af
6 changed files with 100 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/print.c
View File

@@ -46,11 +46,11 @@ print_token (int extnum, int token)
`--------------------------------*/
static void
print_core (FILE *out, int state)
print_core (FILE *out, state_t *state)
{
int i;
short *sitems = state_table[state]->items;
int snitems = state_table[state]->nitems;
short *sitems = state->items;
int snitems = state->nitems;
/* New experimental feature: if TRACE_FLAGS output all the items of
a state, not only its kernel. */
@@ -94,17 +94,17 @@ print_core (FILE *out, int state)
}
static void
print_actions (FILE *out, int state)
print_actions (FILE *out, state_t *state)
{
int i;
shifts *shiftp = state_table[state]->shifts;
reductions *redp = state_table[state]->reductions;
errs *errp = state_table[state]->errs;
shifts *shiftp = state->shifts;
reductions *redp = state->reductions;
errs *errp = state->errs;
if (!shiftp->nshifts && !redp)
{
if (final_state == state)
if (final_state == state->number)
fprintf (out, _(" $default\taccept\n"));
else
fprintf (out, _(" NO ACTIONS\n"));
@@ -140,7 +140,7 @@ print_actions (FILE *out, int state)
fputc ('\n', out);
}
if (state_table[state]->consistent && redp)
if (state->consistent && redp)
{
int rule = redp->rules[0];
int symbol = rule_table[rule].lhs;
@@ -168,9 +168,9 @@ print_actions (FILE *out, int state)
}
static void
print_state (FILE *out, int state)
print_state (FILE *out, state_t *state)
{
fprintf (out, _("state %d"), state);
fprintf (out, _("state %d"), state->number);
fputs ("\n\n", out);
print_core (out, state);
print_actions (out, state);
@@ -331,7 +331,7 @@ print_results (void)
if (trace_flag)
new_closure (nitems);
for (i = 0; i < nstates; i++)
print_state (out, i);
print_state (out, state_table[i]);
if (trace_flag)
free_closure ();