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

* src/state.h (state_t): Rename lookaheads as lookaheadsp.

Browse Source 
nlookaheads is a new member.
Adjust all users.
* src/lalr.h (nlookaheads): Remove this orphan declaration.
* src/lalr.c (initialize_lookaheads): Set nlookaheads for each
state.
This commit is contained in:
Akim Demaille
2001-12-17 17:32:59 +00:00
parent 331dbc1bb7
commit 3877f72ba2
6 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/lalr.c
View File

@@ -140,7 +140,7 @@ initialize_LA (void)
short *np;
reductions *rp;
size_t nLA = state_table[nstates]->lookaheads;
size_t nLA = state_table[nstates]->lookaheadsp;
if (!nLA)
nLA = 1;
@@ -314,8 +314,8 @@ add_lookback_edge (int stateno, int ruleno, int gotono)
int found;
shorts *sp;
i = state_table[stateno]->lookaheads;
k = state_table[stateno + 1]->lookaheads;
i = state_table[stateno]->lookaheadsp;
k = state_table[stateno + 1]->lookaheadsp;
found = 0;
while (!found && i < k)
{
@@ -516,7 +516,7 @@ compute_lookaheads (void)
int i;
shorts *sp;
for (i = 0; i < state_table[nstates]->lookaheads; i++)
for (i = 0; i < state_table[nstates]->lookaheadsp; i++)
for (sp = lookback[i]; sp; sp = sp->next)
{
int size = LA (i + 1) - LA (i);
@@ -526,7 +526,7 @@ compute_lookaheads (void)
}
/* Free LOOKBACK. */
for (i = 0; i < state_table[nstates]->lookaheads; i++)
for (i = 0; i < state_table[nstates]->lookaheadsp; i++)
LIST_FREE (shorts, lookback[i]);
XFREE (lookback);
@@ -546,14 +546,13 @@ initialize_lookaheads (void)
for (i = 0; i < nstates; i++)
{
int k;
int nlookaheads = 0;
reductions *rp = state_table[i]->reductions;
shifts *sp = state_table[i]->shifts;
state_table[i]->lookaheads = count;
if (rp
&& (rp->nreds > 1 || (sp->nshifts && SHIFT_IS_SHIFT (sp, 0))))
count += rp->nreds;
nlookaheads += rp->nreds;
else
state_table[i]->consistent = 1;
@@ -563,11 +562,15 @@ initialize_lookaheads (void)
state_table[i]->consistent = 0;
break;
}
state_table[i]->nlookaheads = nlookaheads;
state_table[i]->lookaheadsp = count;
count += nlookaheads;
}
/* Seems to be needed by conflicts.c. */
state_table[nstates] = STATE_ALLOC (0);
state_table[nstates]->lookaheads = count;
state_table[nstates]->lookaheadsp = count;
}
void