#include "system.h"
#include "bitset.h"
#include "bitsetv.h"
+#include "relation.h"
#include "quotearg.h"
#include "symtab.h"
#include "gram.h"
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)
-{
- int j;
- int height;
-
- VERTICES[++top] = i;
- INDEX[i] = height = top;
-
- if (R[i])
- for (j = 0; R[i][j] >= 0; ++j)
- {
- if (INDEX[R[i][j]] == 0)
- traverse (R[i][j]);
-
- if (INDEX[i] > INDEX[R[i][j]])
- INDEX[i] = INDEX[R[i][j]];
-
- bitset_or (F[i], F[i], F[R[i][j]]);
- }
-
- if (INDEX[i] == height)
- for (;;)
- {
- j = VERTICES[top--];
- INDEX[j] = infinity;
-
- if (i == j)
- break;
-
- bitset_copy (F[j], F[i]);
- }
-}
-
-
-static void
-digraph (short **relation)
-{
- int i;
-
- infinity = ngotos + 2;
- INDEX = XCALLOC (short, ngotos + 1);
- VERTICES = XCALLOC (short, ngotos + 1);
- top = 0;
-
- R = relation;
-
- for (i = 0; i < ngotos; i++)
- INDEX[i] = 0;
-
- for (i = 0; i < ngotos; i++)
- if (INDEX[i] == 0 && R[i])
- traverse (i);
-
- XFREE (INDEX);
- XFREE (VERTICES);
-}
static void
ngotos = 0;
for (state = 0; state < nstates; ++state)
{
- shifts *sp = states[state]->shifts;
+ shifts_t *sp = states[state]->shifts;
int i;
for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i)
{
for (state = 0; state < nstates; ++state)
{
- shifts *sp = states[state]->shifts;
+ shifts_t *sp = states[state]->shifts;
int i;
for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i)
{
for (i = 0; i < ngotos; i++)
{
state_number_t stateno = to_state[i];
- shifts *sp = states[stateno]->shifts;
+ shifts_t *sp = states[stateno]->shifts;
int j;
for (j = 0; j < sp->nshifts && SHIFT_IS_SHIFT (sp, j); j++)
}
}
- digraph (reads);
+ relation_digraph (reads, ngotos, &F);
for (i = 0; i < ngotos; i++)
XFREE (reads[i]);
static void
-add_lookback_edge (state_t *state, int ruleno, int gotono)
+add_lookback_edge (state_t *state, rule_number_t ruleno, int gotono)
{
int i;
shorts *sp;
}
-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)
-{
- /* 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)
- {
- fputs ("transpose: input\n", stderr);
- matrix_print (stderr, R_arg, 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);
- sp[nedges[i]] = -1;
- new_R[i] = sp;
- end_R[i] = sp;
- }
-
- /* Store. */
- for (i = 0; i < n; 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]];
- }
-
- free (nedges);
- free (end_R);
-
- /* Free the input: it is replaced with the result. */
- for (i = 0; i < n; i++)
- XFREE (R_arg[i]);
- free (R_arg);
-
- if (trace_flag)
- {
- fputs ("transpose: output\n", stderr);
- matrix_print (stderr, new_R, n);
- }
-
- return new_R;
-}
-
static void
build_relations (void)
{
int nedges = 0;
symbol_number_t symbol1 = states[to_state[i]]->accessing_symbol;
- short *rulep;
+ rule_number_t *rulep;
for (rulep = derives[symbol1]; *rulep > 0; rulep++)
{
for (rp = rules[*rulep].rhs; *rp >= 0; rp++)
{
- shifts *sp = state->shifts;
- int j;
- for (j = 0; j < sp->nshifts; j++)
- {
- state = states[sp->shifts[j]];
- if (state->accessing_symbol
- == item_number_as_symbol_number (*rp))
- break;
- }
-
+ state = shifts_to (state->shifts,
+ item_number_as_symbol_number (*rp));
states1[length++] = state->number;
}
XFREE (edge);
XFREE (states1);
- includes = transpose (includes, ngotos);
+ relation_transpose (&includes, ngotos);
}
{
int i;
- digraph (includes);
+ relation_digraph (includes, ngotos, &F);
for (i = 0; i < ngotos; i++)
XFREE (includes[i]);
{
int k;
int nlookaheads = 0;
- reductions *rp = states[i]->reductions;
- shifts *sp = states[i]->shifts;
+ reductions_t *rp = states[i]->reductions;
+ shifts_t *sp = states[i]->shifts;
/* We need a lookahead either to distinguish different
reductions (i.e., there are two or more), or to distinguish a
projects / bison.git / blobdiff