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

One structure for states is enough, even though theoretically

Browse Source 
there are LR(0) states and LALR(1) states.
* src/lalr.h (state_t): Remove.
(state_table): Be state_t **, not state_t *.
* src/state.h (core, CORE_ALLOC): Rename as...
(state_t, STATE_ALLOC): this.
Add the LALR(1) members: shifts, reductions, errs.
* src/LR0.c (state_table): Rename as...
(state_hash): this, to avoid name clashes with the global
`state_table'.
* src/print_graph.c, src/LR0.c, src/LR0.h, src/conflicts.c
* src/lalr.c, src/lalr.h, src/output.c, src/print.c: Adjust.
This commit is contained in:
Akim Demaille
2001-12-10 08:45:22 +00:00
parent 74ffbcb6bf
commit f693ad146e
10 changed files with 149 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/print_graph.c
View File

@@ -40,7 +40,7 @@ static void
print_core (int state, struct obstack *node_obstack)
{
int i;
core *statep = state_table[state].state;
state_t *statep = state_table[state];
if (!statep->nitems)
return;
@@ -85,10 +85,10 @@ print_actions (int state, const char *node_name)
{
int i;
shifts *shiftp = state_table[state].shifts;
reductions *redp = state_table[state].reductions;
shifts *shiftp = state_table[state]->shifts;
reductions *redp = state_table[state]->reductions;
#if 0
errs *errp = err_table[state];
errs *errp = state_table[state]->errs;
#endif
static char buff[10];
@@ -109,7 +109,7 @@ print_actions (int state, const char *node_name)
if (!SHIFT_IS_DISABLED (shiftp, i))
{
int state1 = shiftp->shifts[i];
int symbol = state_table[state1].accessing_symbol;
int symbol = state_table[state1]->accessing_symbol;
new_edge (&edge);
@@ -150,7 +150,7 @@ print_actions (int state, const char *node_name)
obstack_1grow (node_obstack, '\n');
}
if (state_table[state].consistent && redp)
if (state_table[state]->consistent && redp)
{
rule = redp->rules[0];
symbol = rule_table[rule].lhs;
@@ -168,7 +168,7 @@ print_actions (int state, const char *node_name)
if (!SHIFT_IS_DISABLED (shiftp, i))
{
int state1 = shiftp->shifts[i];
int symbol = state_table[state1].accessing_symbol;
int symbol = state_table[state1]->accessing_symbol;
new_edge (&edge);
open_edge (&edge, fgraph);