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

* src/lalr.c (initialize_LA): Only initialize LA. Let...

Browse Source 
(set_state_table): handle the `lookaheads' members.
This commit is contained in:
Akim Demaille
2001-11-19 09:11:03 +00:00
parent 9043475828
commit e8ebe4b0c7
2 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2001-11-19 Akim Demaille <akim@epita.fr>
* src/lalr.c (initialize_LA): Only initialize LA. Let...
(set_state_table): handle the `lookaheads' members.
2001-11-19 Akim Demaille <akim@epita.fr> 2001-11-19 Akim Demaille <akim@epita.fr>
* src/lalr.h (lookaheads): Removed array, which contents is now * src/lalr.h (lookaheads): Removed array, which contents is now

93
src/lalr.c
View File

@@ -169,6 +169,39 @@ set_state_table (void)
for (rp = first_reduction; rp; rp = rp->next) for (rp = first_reduction; rp; rp = rp->next)
state_table[rp->number].reduction_table = rp; state_table[rp->number].reduction_table = rp;
} }
/* Initializing the lookaheads members. Please note that it must be
performed after having set some of the other members which are
used below. Change with extreme caution. */
{
int i;
int count = 0;
for (i = 0; i < nstates; i++)
{
int k;
reductions *rp = state_table[i].reduction_table;
shifts *sp = state_table[i].shift_table;
state_table[i].lookaheads = count;
if (rp
&& (rp->nreds > 1
|| (sp && !ISVAR (state_table[sp->shifts[0]].accessing_symbol))))
count += rp->nreds;
else
state_table[i].consistent = 1;
if (sp)
for (k = 0; k < sp->nshifts; k++)
if (state_table[sp->shifts[k]].accessing_symbol
== error_token_number)
{
state_table[i].consistent = 0;
break;
}
}
state_table[nstates].lookaheads = count;
}
} }
@@ -204,61 +237,23 @@ initialize_LA (void)
{ {
int i; int i;
int j; int j;
int count = 0;
reductions *rp;
shifts *sp;
short *np; short *np;
reductions *rp;
for (i = 0; i < nstates; i++) size_t nLA = state_table[nstates].lookaheads;
{ if (!nLA)
int k; nLA = 1;
state_table[i].lookaheads = count; LA = XCALLOC (unsigned, nLA * tokensetsize);
LAruleno = XCALLOC (short, nLA);
rp = state_table[i].reduction_table; lookback = XCALLOC (shorts *, nLA);
sp = state_table[i].shift_table;
if (rp
&& (rp->nreds > 1
|| (sp && !ISVAR (state_table[sp->shifts[0]].accessing_symbol))))
count += rp->nreds;
else
state_table[i].consistent = 1;
if (sp)
for (k = 0; k < sp->nshifts; k++)
if (state_table[sp->shifts[k]].accessing_symbol
== error_token_number)
{
state_table[i].consistent = 0;
break;
}
}
state_table[nstates].lookaheads = count;
if (count == 0)
{
LA = XCALLOC (unsigned, 1 * tokensetsize);
LAruleno = XCALLOC (short, 1);
lookback = XCALLOC (shorts *, 1);
}
else
{
LA = XCALLOC (unsigned, count * tokensetsize);
LAruleno = XCALLOC (short, count);
lookback = XCALLOC (shorts *, count);
}
np = LAruleno; np = LAruleno;
for (i = 0; i < nstates; i++) for (i = 0; i < nstates; i++)
{ if (!state_table[i].consistent)
if (!state_table[i].consistent) if ((rp = state_table[i].reduction_table))
{ for (j = 0; j < rp->nreds; j++)
if ((rp = state_table[i].reduction_table)) *np++ = rp->rules[j];
for (j = 0; j < rp->nreds; j++)
*np++ = rp->rules[j];
}
}
} }