X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9887c18aca3cedcf003ffb150af5f597f4bf3956..aa2aab3c165a39d7ec65696223479c343731a98e:/src/lalr.c diff --git a/src/lalr.c b/src/lalr.c index ad2623d6..e6738bda 100644 --- a/src/lalr.c +++ b/src/lalr.c @@ -31,6 +31,7 @@ #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. @@ -41,15 +42,11 @@ 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. . */ static unsigned *F = NULL; @@ -57,11 +54,20 @@ 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) @@ -174,16 +180,14 @@ set_state_table (void) state_table[i].lookaheads = count; if (rp - && (rp->nreds > 1 - || (sp && !ISVAR (state_table[sp->shifts[0]].accessing_symbol)))) + && (rp->nreds > 1 || (sp && 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) + if (SHIFT_IS_ERROR (sp, k)) { state_table[i].consistent = 0; break; @@ -194,37 +198,6 @@ set_state_table (void) } -/*------------------------------------------. -| Return the size of the longest rule RHS. | -`------------------------------------------*/ - -static size_t -maxrhs (void) -{ - short *itemp; - int length; - int max; - - length = 0; - max = 0; - for (itemp = ritem; *itemp; itemp++) - { - if (*itemp > 0) - { - length++; - } - else - { - if (length > max) - max = length; - length = 0; - } - } - - return max; -} - - static void initialize_LA (void) { @@ -267,13 +240,10 @@ set_goto_map (void) ngotos = 0; for (sp = first_shift; sp; sp = sp->next) { - for (i = sp->nshifts - 1; i >= 0; i--) + for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i) { symbol = state_table[sp->shifts[i]].accessing_symbol; - if (ISTOKEN (symbol)) - break; - if (ngotos == MAXSHORT) fatal (_("too many gotos (max %d)"), MAXSHORT); @@ -301,14 +271,11 @@ set_goto_map (void) 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; - k = temp_map[symbol]++; from_state[k] = state1; to_state[k] = state2; @@ -372,11 +339,9 @@ initialize_F (void) if (sp) { int j; - for (j = 0; j < sp->nshifts; j++) + for (j = 0; j < sp->nshifts && SHIFT_IS_SHIFT (sp, j); j++) { int symbol = state_table[sp->shifts[j]].accessing_symbol; - if (ISVAR (symbol)) - break; SETBIT (F + i * tokensetsize, symbol); } @@ -435,59 +400,87 @@ add_lookback_edge (int stateno, int ruleno, int gotono) } +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; } @@ -497,7 +490,7 @@ static void build_relations (void) { short *edge = XCALLOC (short, ngotos + 1); - short *states = XCALLOC (short, maxrhs () + 1); + short *states = XCALLOC (short, ritem_longest_rhs () + 1); int i; includes = XCALLOC (short *, ngotos);