#include "lalr.h"
#include "nullable.h"
#include "derives.h"
+#include "getargs.h"
/* 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;
unsigned *LA;
+static int ngotos;
short *goto_map;
short *from_state;
short *to_state;
-extern void berror PARAMS ((const char *));
-
-static int infinity;
-static int ngotos;
-
/* And for the famous F variable, which name is so descriptive that a
comment is hardly needed. <grin>. */
static unsigned *F = NULL;
static short **includes;
static shorts **lookback;
+
+
+/*---------------------------------------------------------------.
+| digraph & traverse. |
+| |
+| The following variables are used as common storage between the |
+| two. |
+`---------------------------------------------------------------*/
+
static short **R;
static short *INDEX;
static short *VERTICES;
static int top;
-
+static int infinity;
static void
traverse (int i)
/* 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 && !ISVAR (state_table[sp->shifts[0]].accessing_symbol))))
+ && (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 (state_table[sp->shifts[k]].accessing_symbol
- == error_token_number)
- {
- 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; i--)
- {
- symbol = state_table[sp->shifts[i]].accessing_symbol;
-
- if (ISTOKEN (symbol))
- break;
+ 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 (sp = first_shift; sp; sp = sp->next)
{
state1 = sp->number;
- for (i = sp->nshifts - 1; i >= 0; i--)
+ for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i)
{
state2 = sp->shifts[i];
- symbol = state_table[state2].accessing_symbol;
-
- if (ISTOKEN (symbol))
- break;
+ 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; j++)
- {
- int symbol = state_table[sp->shifts[j]].accessing_symbol;
- if (ISVAR (symbol))
- break;
- 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)
{
}
+static void
+matrix_print (FILE *out, short **matrix, int n)
+{
+ int i, j;
+
+ for (i = 0; i < n; ++i)
+ {
+ fprintf (out, "%3d: ", i);
+ if (matrix[i])
+ for (j = 0; matrix[i][j] != -1; ++j)
+ fprintf (out, "%3d ", matrix[i][j]);
+ fputc ('\n', out);
+ }
+ fputc ('\n', out);
+}
+
/*-------------------------------------------------------------------.
| Return the transpose of R_ARG, of size N. Destroy R_ARG, as it is |
| replaced with the result. |
+| |
+| R_ARG[I] is NULL or a -1 terminated list of numbers. |
+| |
+| RESULT[NUM] is NULL or the -1 terminated list of the I such as NUM |
+| is in R_ARG[I]. |
`-------------------------------------------------------------------*/
static short **
transpose (short **R_arg, int n)
{
- short **new_R;
- short **temp_R;
- short *nedges;
- int i;
-
- nedges = XCALLOC (short, n);
-
- for (i = 0; i < n; i++)
+ /* The result. */
+ short **new_R = XCALLOC (short *, n);
+ /* END_R[I] -- next entry of NEW_R[I]. */
+ short **end_R = XCALLOC (short *, n);
+ /* NEDGES[I] -- total size of NEW_R[I]. */
+ short *nedges = XCALLOC (short, n);
+ int i, j;
+
+ if (trace_flag)
{
- short *sp = R_arg[i];
- if (sp)
- {
- while (*sp >= 0)
- nedges[*sp++]++;
- }
+ fputs ("transpose: input\n", stderr);
+ matrix_print (stderr, R_arg, n);
}
- new_R = XCALLOC (short *, n);
- temp_R = XCALLOC (short *, n);
+ /* Count. */
+ for (i = 0; i < n; i++)
+ if (R_arg[i])
+ for (j = 0; R_arg[i][j] >= 0; ++j)
+ ++nedges[R_arg[i][j]];
+ /* Allocate. */
for (i = 0; i < n; i++)
if (nedges[i] > 0)
{
short *sp = XCALLOC (short, nedges[i] + 1);
- new_R[i] = sp;
- temp_R[i] = sp;
sp[nedges[i]] = -1;
+ new_R[i] = sp;
+ end_R[i] = sp;
}
- XFREE (nedges);
-
+ /* Store. */
for (i = 0; i < n; i++)
- {
- short *sp = R_arg[i];
- if (sp)
- while (*sp >= 0)
- *temp_R[*sp++]++ = i;
- }
+ if (R_arg[i])
+ for (j = 0; R_arg[i][j] >= 0; ++j)
+ {
+ *end_R[R_arg[i][j]] = i;
+ ++end_R[R_arg[i][j]];
+ }
- XFREE (temp_R);
+ free (nedges);
+ free (end_R);
/* Free the input: it is replaced with the result. */
for (i = 0; i < n; i++)
XFREE (R_arg[i]);
- XFREE (R_arg);
+ free (R_arg);
+
+ if (trace_flag)
+ {
+ fputs ("transpose: output\n", stderr);
+ matrix_print (stderr, new_R, n);
+ }
return new_R;
}
{
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