/* All the decorated states, indexed by the state number. Warning:
there is a state_TABLE in LR0.c, but it is different and static.
*/
-state_t *state_table = NULL;
+state_t **state_table = NULL;
int tokensetsize;
short *LAruleno;
/* NSTATES + 1 because lookahead for the pseudo state number NSTATES
might be used (see conflicts.c). It is too opaque for me to
provide a probably less hacky implementation. --akim */
- state_table = XCALLOC (state_t, nstates + 1);
+ state_table = XCALLOC (state_t *, nstates + 1);
{
- core *sp;
+ state_t *sp;
for (sp = first_state; sp; sp = sp->next)
- {
- state_table[sp->number].state = sp;
- state_table[sp->number].accessing_symbol = sp->accessing_symbol;
- }
+ state_table[sp->number] = sp;
}
{
shifts *sp;
for (sp = first_shift; sp; sp = sp->next)
- state_table[sp->number].shift_table = sp;
+ state_table[sp->number]->shifts = sp;
}
{
reductions *rp;
for (rp = first_reduction; rp; rp = rp->next)
- state_table[rp->number].reduction_table = rp;
+ state_table[rp->number]->reductions = rp;
+ }
+
+ /* Pessimization, but simplification of the code: make sure all the
+ states have a shifts, even if reduced to 0 shifts. */
+ {
+ int i;
+ for (i = 0; i < nstates; i++)
+ if (!state_table[i]->shifts)
+ state_table[i]->shifts = shifts_new (0);
}
/* Initializing the lookaheads members. Please note that it must be
for (i = 0; i < nstates; i++)
{
int k;
- reductions *rp = state_table[i].reduction_table;
- shifts *sp = state_table[i].shift_table;
+ reductions *rp = state_table[i]->reductions;
+ shifts *sp = state_table[i]->shifts;
- state_table[i].lookaheads = count;
+ state_table[i]->lookaheads = count;
if (rp
- && (rp->nreds > 1 || (sp && SHIFT_IS_SHIFT (sp, 0))))
+ && (rp->nreds > 1 || (sp->nshifts && SHIFT_IS_SHIFT (sp, 0))))
count += rp->nreds;
else
- state_table[i].consistent = 1;
-
- if (sp)
- for (k = 0; k < sp->nshifts; k++)
- if (SHIFT_IS_ERROR (sp, k))
- {
- state_table[i].consistent = 0;
- break;
- }
+ state_table[i]->consistent = 1;
+
+ for (k = 0; k < sp->nshifts; k++)
+ if (SHIFT_IS_ERROR (sp, k))
+ {
+ state_table[i]->consistent = 0;
+ break;
+ }
}
- state_table[nstates].lookaheads = count;
+
+ /* Seems to be needed by conflicts.c. */
+ state_table[nstates] = STATE_ALLOC (0);
+ state_table[nstates]->lookaheads = count;
}
}
short *np;
reductions *rp;
- size_t nLA = state_table[nstates].lookaheads;
+ size_t nLA = state_table[nstates]->lookaheads;
if (!nLA)
nLA = 1;
np = LAruleno;
for (i = 0; i < nstates; i++)
- if (!state_table[i].consistent)
- if ((rp = state_table[i].reduction_table))
+ if (!state_table[i]->consistent)
+ if ((rp = state_table[i]->reductions))
for (j = 0; j < rp->nreds; j++)
*np++ = rp->rules[j];
}
ngotos = 0;
for (sp = first_shift; sp; sp = sp->next)
- {
- for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i)
- {
- symbol = state_table[sp->shifts[i]].accessing_symbol;
+ for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i)
+ {
+ symbol = state_table[sp->shifts[i]]->accessing_symbol;
- if (ngotos == MAXSHORT)
- fatal (_("too many gotos (max %d)"), MAXSHORT);
+ if (ngotos == MAXSHORT)
+ fatal (_("too many gotos (max %d)"), MAXSHORT);
- ngotos++;
- goto_map[symbol]++;
- }
- }
+ ngotos++;
+ goto_map[symbol]++;
+ }
k = 0;
for (i = ntokens; i < nsyms; i++)
for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i)
{
state2 = sp->shifts[i];
- symbol = state_table[state2].accessing_symbol;
+ symbol = state_table[state2]->accessing_symbol;
k = temp_map[symbol]++;
from_state[k] = state1;
for (i = 0; i < ngotos; i++)
{
int stateno = to_state[i];
- shifts *sp = state_table[stateno].shift_table;
+ shifts *sp = state_table[stateno]->shifts;
- if (sp)
+ int j;
+ for (j = 0; j < sp->nshifts && SHIFT_IS_SHIFT (sp, j); j++)
{
- int j;
- for (j = 0; j < sp->nshifts && SHIFT_IS_SHIFT (sp, j); j++)
- {
- int symbol = state_table[sp->shifts[j]].accessing_symbol;
- SETBIT (F + i * tokensetsize, symbol);
- }
+ int symbol = state_table[sp->shifts[j]]->accessing_symbol;
+ SETBIT (F (i), symbol);
+ }
- for (; j < sp->nshifts; j++)
- {
- int symbol = state_table[sp->shifts[j]].accessing_symbol;
- if (nullable[symbol])
- edge[nedges++] = map_goto (stateno, symbol);
- }
+ for (; j < sp->nshifts; j++)
+ {
+ int symbol = state_table[sp->shifts[j]]->accessing_symbol;
+ if (nullable[symbol])
+ edge[nedges++] = map_goto (stateno, symbol);
+ }
- if (nedges)
- {
- reads[i] = XCALLOC (short, nedges + 1);
- shortcpy (reads[i], edge, nedges);
- reads[i][nedges] = -1;
- nedges = 0;
- }
+ if (nedges)
+ {
+ reads[i] = XCALLOC (short, nedges + 1);
+ shortcpy (reads[i], edge, nedges);
+ reads[i][nedges] = -1;
+ nedges = 0;
}
}
int found;
shorts *sp;
- i = state_table[stateno].lookaheads;
- k = state_table[stateno + 1].lookaheads;
+ i = state_table[stateno]->lookaheads;
+ k = state_table[stateno + 1]->lookaheads;
found = 0;
while (!found && i < k)
{
{
int nedges = 0;
int state1 = from_state[i];
- int symbol1 = state_table[to_state[i]].accessing_symbol;
+ int symbol1 = state_table[to_state[i]]->accessing_symbol;
short *rulep;
for (rulep = derives[symbol1]; *rulep > 0; rulep++)
for (rp = ritem + rule_table[*rulep].rhs; *rp > 0; rp++)
{
- shifts *sp = state_table[stateno].shift_table;
+ shifts *sp = state_table[stateno]->shifts;
int j;
for (j = 0; j < sp->nshifts; j++)
{
stateno = sp->shifts[j];
- if (state_table[stateno].accessing_symbol == *rp)
+ if (state_table[stateno]->accessing_symbol == *rp)
break;
}
states[length++] = stateno;
}
- if (!state_table[stateno].consistent)
+ if (!state_table[stateno]->consistent)
add_lookback_edge (stateno, *rulep, i);
length--;
int i;
shorts *sp;
- for (i = 0; i < state_table[nstates].lookaheads; i++)
+ for (i = 0; i < state_table[nstates]->lookaheads; i++)
for (sp = lookback[i]; sp; sp = sp->next)
{
int size = LA (i + 1) - LA (i);
}
/* Free LOOKBACK. */
- for (i = 0; i < state_table[nstates].lookaheads; i++)
+ for (i = 0; i < state_table[nstates]->lookaheads; i++)
LIST_FREE (shorts, lookback[i]);
XFREE (lookback);
projects / bison.git / blobdiff