static int nentries;
static short **froms = NULL;
static short **tos = NULL;
+static unsigned int **conflict_tos = NULL;
static short *tally = NULL;
static short *width = NULL;
static short *actrow = NULL;
+static short *conflrow = NULL;
static short *state_count = NULL;
static short *order = NULL;
static short *base = NULL;
static short *pos = NULL;
+static unsigned int *conflict_table = NULL;
+static unsigned int *conflict_list = NULL;
+static int conflict_list_cnt;
+static int conflict_list_free;
+
/* TABLE_SIZE is the allocated size of both TABLE and CHECK.
We start with the original hard-coded value: SHRT_MAX
(yes, not USHRT_MAX). */
static int lowzero;
static int high;
-struct obstack muscle_obstack;
static struct obstack format_obstack;
int error_verbose = 0;
table = XREALLOC (table, short, table_size);
check = XREALLOC (check, short, table_size);
+ if (glr_parser)
+ conflict_table = XREALLOC (conflict_table, unsigned int, table_size);
for (/* Nothing. */; old_size < table_size; ++old_size)
{
}
-/*------------------------------------------------------------------.
-| Create a function NAME which Format the FIRST and then |
-| TABLE_DATA[BEGIN..END[ (of TYPE) into OOUT, and return the number |
-| of bits needed for its longuest value. |
-`------------------------------------------------------------------*/
+/*-------------------------------------------------------------------.
+| Create a function NAME which associates to the muscle NAME the |
+| result of formatting the FIRST and then TABLE_DATA[BEGIN..END[ (of |
+| TYPE), and to the muscle NAME_max, the max value of the |
+| TABLE_DATA. |
+`-------------------------------------------------------------------*/
-#define GENERATE_OUTPUT_TABLE(Name, Type) \
+#define GENERATE_MUSCLE_INSERT_TABLE(Name, Type) \
\
-static inline long int \
-Name (struct obstack *oout, \
+static void \
+Name (const char *name, \
Type *table_data, \
Type first, \
int begin, \
int end) \
{ \
- long int max = first; \
+ Type max = first; \
int i; \
int j = 1; \
\
- obstack_fgrow1 (oout, "%6d", first); \
+ obstack_fgrow1 (&format_obstack, "%6d", first); \
for (i = begin; i < end; ++i) \
{ \
- obstack_1grow (oout, ','); \
+ obstack_1grow (&format_obstack, ','); \
if (j >= 10) \
{ \
- obstack_sgrow (oout, "\n "); \
+ obstack_sgrow (&format_obstack, "\n "); \
j = 1; \
} \
else \
++j; \
- obstack_fgrow1 (oout, "%6d", table_data[i]); \
+ obstack_fgrow1 (&format_obstack, "%6d", table_data[i]); \
if (table_data[i] > max) \
max = table_data[i]; \
} \
- obstack_1grow (oout, 0); \
+ obstack_1grow (&format_obstack, 0); \
+ muscle_insert (name, obstack_finish (&format_obstack)); \
\
- return max; \
+ /* Build `NAME_max' in the obstack. */ \
+ obstack_fgrow1 (&format_obstack, "%s_max", name); \
+ obstack_1grow (&format_obstack, 0); \
+ MUSCLE_INSERT_LONG_INT (obstack_finish (&format_obstack), \
+ (long int) max); \
}
-GENERATE_OUTPUT_TABLE(output_int_table, int)
-GENERATE_OUTPUT_TABLE(output_short_table, short)
-GENERATE_OUTPUT_TABLE(output_token_number_table, token_number_t)
-GENERATE_OUTPUT_TABLE(output_item_number_table, item_number_t)
+GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_unsigned_int_table, unsigned int)
+GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_short_table, short)
+GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_symbol_number_table, symbol_number_t)
+GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_item_number_table, item_number_t)
+GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_state_number_table, state_number_t)
/*-----------------------------------------------------------------.
static void
prepare_tokens (void)
{
- long int max = output_token_number_table (&format_obstack,
- token_translations,
- 0, 1, max_user_token_number + 1);
- muscle_insert ("translate", obstack_finish (&format_obstack));
- MUSCLE_INSERT_LONG_INT ("token_number_max", max);
- XFREE (token_translations);
+ muscle_insert_symbol_number_table ("translate",
+ token_translations,
+ 0, 1, max_user_token_number + 1);
{
int i;
int j = 0;
for (i = 0; i < nsyms; i++)
{
- /* Be sure not to use twice the same quotearg slot. */
+ /* Be sure not to use twice the same QUOTEARG slot:
+ SYMBOL_TAG_GET uses slot 0. */
const char *cp =
quotearg_n_style (1, c_quoting_style,
- quotearg_style (escape_quoting_style,
- symbols[i]->tag));
+ symbol_tag_get (symbols[i]));
/* Width of the next token, including the two quotes, the coma
and the space. */
int strsize = strlen (cp) + 2;
short *values = XCALLOC (short, ntokens + 1);
for (i = 0; i < ntokens + 1; ++i)
values[i] = symbols[i]->user_token_number;
- output_short_table (&format_obstack, values,
- 0, 1, ntokens + 1);
- muscle_insert ("toknum", obstack_finish (&format_obstack));
+ muscle_insert_short_table ("toknum", values,
+ 0, 1, ntokens + 1);
free (values);
}
}
/*-------------------------------------------------------------.
| Prepare the muscles related to the rules: rhs, prhs, r1, r2, |
-| rline. |
+| rline, dprec, merger |
`-------------------------------------------------------------*/
static void
prepare_rules (void)
{
- long int max;
- item_number_t *rhsp;
- int r;
- int i = 0;
+ rule_number_t r;
+ unsigned int i = 0;
item_number_t *rhs = XMALLOC (item_number_t, nritems);
- short *prhs = XMALLOC (short, nrules + 1);
- token_number_t *r1 = XMALLOC (token_number_t, nrules + 1);
- short *r2 = XMALLOC (short, nrules + 1);
- short *rline = XMALLOC (short, nrules + 1);
+ unsigned int *prhs = XMALLOC (unsigned int, nrules + 1);
+ unsigned int *rline = XMALLOC (unsigned int, nrules + 1);
+ symbol_number_t *r1 = XMALLOC (symbol_number_t, nrules + 1);
+ unsigned int *r2 = XMALLOC (unsigned int, nrules + 1);
+ short *dprec = XMALLOC (short, nrules + 1);
+ short *merger = XMALLOC (short, nrules + 1);
for (r = 1; r < nrules + 1; ++r)
{
+ item_number_t *rhsp = NULL;
/* Index of rule R in RHS. */
prhs[r] = i;
/* RHS of the rule R. */
/* Separator in RHS. */
rhs[i++] = -1;
/* Line where rule was defined. */
- rline[r] = rules[r].line;
+ rline[r] = rules[r].location.first_line;
+ /* Dynamic precedence (GLR) */
+ dprec[r] = rules[r].dprec;
+ /* Merger-function index (GLR) */
+ merger[r] = rules[r].merger;
}
assert (i == nritems);
- max = output_int_table (&format_obstack, rhs, ritem[0], 1, nritems);
- muscle_insert ("rhs", obstack_finish (&format_obstack));
- MUSCLE_INSERT_LONG_INT ("rhs_number_max", max);
-
- output_short_table (&format_obstack, prhs, 0, 1, nrules + 1);
- muscle_insert ("prhs", obstack_finish (&format_obstack));
-
- output_short_table (&format_obstack, rline, 0, 1, nrules + 1);
- muscle_insert ("rline", obstack_finish (&format_obstack));
-
- output_token_number_table (&format_obstack, r1, 0, 1, nrules + 1);
- muscle_insert ("r1", obstack_finish (&format_obstack));
-
- output_short_table (&format_obstack, r2, 0, 1, nrules + 1);
- muscle_insert ("r2", obstack_finish (&format_obstack));
+ muscle_insert_item_number_table ("rhs", rhs, ritem[0], 1, nritems);
+ muscle_insert_unsigned_int_table ("prhs", prhs, 0, 1, nrules + 1);
+ muscle_insert_unsigned_int_table ("rline", rline, 0, 1, nrules + 1);
+ muscle_insert_symbol_number_table ("r1", r1, 0, 1, nrules + 1);
+ muscle_insert_unsigned_int_table ("r2", r2, 0, 1, nrules + 1);
+ muscle_insert_short_table ("dprec", dprec, 0, 1, nrules + 1);
+ muscle_insert_short_table ("merger", merger, 0, 1, nrules + 1);
free (rhs);
free (prhs);
+ free (rline);
+ free (r1);
free (r2);
+ free (dprec);
+ free (merger);
}
/*--------------------------------------------.
static void
prepare_states (void)
{
- size_t i;
- token_number_t *values =
- (token_number_t *) alloca (sizeof (token_number_t) * nstates);
+ state_number_t i;
+ symbol_number_t *values =
+ (symbol_number_t *) alloca (sizeof (symbol_number_t) * nstates);
for (i = 0; i < nstates; ++i)
values[i] = states[i]->accessing_symbol;
- output_token_number_table (&format_obstack, values,
- 0, 1, nstates);
- muscle_insert ("stos", obstack_finish (&format_obstack));
+ muscle_insert_symbol_number_table ("stos", values,
+ 0, 1, nstates);
+}
+
+
+/*-------------------------------------------------------------------.
+| For GLR parsers, for each conflicted token in STATE, as indicated |
+| by non-zero entries in conflrow, create a list of possible |
+| reductions that are alternatives to the shift or reduction |
+| currently recorded for that token in STATE. Store the alternative |
+| reductions followed by a 0 in conflict_list, updating |
+| conflict_list_cnt, and storing an index to the start of the list |
+| back into conflrow. |
+`-------------------------------------------------------------------*/
+
+static void
+conflict_row (state_t *state)
+{
+ int i, j;
+
+ if (! glr_parser)
+ return;
+
+ for (j = 0; j < ntokens; j += 1)
+ if (conflrow[j])
+ {
+ conflrow[j] = conflict_list_cnt;
+
+ /* find all reductions for token j, and record all that do
+ * not match actrow[j] */
+ for (i = 0; i < state->nlookaheads; i += 1)
+ if (bitset_test (state->lookaheads[i], j)
+ && actrow[j] != -state->lookaheads_rule[i]->number)
+ {
+ assert (conflict_list_free > 0);
+ conflict_list[conflict_list_cnt]
+ = state->lookaheads_rule[i]->number;
+ conflict_list_cnt += 1;
+ conflict_list_free -= 1;
+ }
+
+ /* Leave a 0 at the end */
+ assert (conflict_list_free > 0);
+ conflict_list_cnt += 1;
+ conflict_list_free -= 1;
+ }
}
| This is where conflicts are resolved. The loop over lookahead |
| rules considered lower-numbered rules last, and the last rule |
| considered that likes a token gets to handle it. |
+| |
+| For GLR parsers, also sets conflrow[SYM] to an index into |
+| conflict_list iff there is an unresolved conflict (s/r or r/r) |
+| with symbol SYM. The default reduction is not used for a symbol |
+| that has any such conflicts. |
`------------------------------------------------------------------*/
static int
action_row (state_t *state)
{
int i;
- int default_rule = 0;
- reductions *redp = state->reductions;
- shifts *shiftp = state->shifts;
- errs *errp = state->errs;
+ rule_number_t default_rule = 0;
+ reductions_t *redp = state->reductions;
+ shifts_t *shiftp = state->shifts;
+ errs_t *errp = state->errs;
/* set nonzero to inhibit having any default reduction */
int nodefault = 0;
+ int conflicted = 0;
for (i = 0; i < ntokens; i++)
- actrow[i] = 0;
+ actrow[i] = conflrow[i] = 0;
if (redp->nreds >= 1)
{
for (i = state->nlookaheads - 1; i >= 0; --i)
/* and find each token which the rule finds acceptable
to come next */
- for (j = 0; j < ntokens; j++)
+ BITSET_EXECUTE (state->lookaheads[i], 0, j,
+ {
/* and record this rule as the rule to use if that
token follows. */
- if (bitset_test (LA[state->lookaheadsp + i], j))
- actrow[j] = -LArule[state->lookaheadsp + i]->number;
+ if (actrow[j] != 0)
+ conflicted = conflrow[j] = 1;
+ actrow[j] = -state->lookaheads_rule[i]->number;
+ });
}
/* Now see which tokens are allowed for shifts in this state. For
them, record the shift as the thing to do. So shift is preferred
to reduce. */
- for (i = 0; i < shiftp->nshifts; i++)
- {
- token_number_t symbol;
- int shift_state = shiftp->shifts[i];
- if (!shift_state)
- continue;
-
- symbol = states[shift_state]->accessing_symbol;
-
- if (ISVAR (symbol))
- break;
+ for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+ if (!SHIFT_IS_DISABLED (shiftp, i))
+ {
+ symbol_number_t symbol = SHIFT_SYMBOL (shiftp, i);
+ state_number_t shift_state = shiftp->shifts[i];
- actrow[symbol] = shift_state;
+ if (actrow[symbol] != 0)
+ conflicted = conflrow[symbol] = 1;
+ actrow[symbol] = state_number_as_int (shift_state);
- /* Do not use any default reduction if there is a shift for
- error */
- if (symbol == errtoken->number)
- nodefault = 1;
- }
+ /* Do not use any default reduction if there is a shift for
+ error */
+ if (symbol == errtoken->number)
+ nodefault = 1;
+ }
/* See which tokens are an explicit error in this state (due to
%nonassoc). For them, record SHRT_MIN as the action. */
for (i = 0; i < state->nlookaheads; i++)
{
int count = 0;
- int rule = -LArule[state->lookaheadsp + i]->number;
- int j;
+ rule_number_t rule = state->lookaheads_rule[i]->number;
+ symbol_number_t j;
for (j = 0; j < ntokens; j++)
- if (actrow[j] == rule)
+ if (actrow[j] == -rule)
count++;
if (count > max)
}
}
- /* actions which match the default are replaced with zero,
- which means "use the default" */
+ /* GLR parsers need space for conflict lists, so we can't
+ default conflicted entries. For non-conflicted entries
+ or as long as we are not building a GLR parser,
+ actions that match the default are replaced with zero,
+ which means "use the default". */
if (max > 0)
{
int j;
for (j = 0; j < ntokens; j++)
- if (actrow[j] == default_rule)
+ if (actrow[j] == -default_rule
+ && ! (glr_parser && conflrow[j]))
actrow[j] = 0;
-
- default_rule = -default_rule;
}
}
}
if (actrow[i] == SHRT_MIN)
actrow[i] = 0;
+ if (conflicted)
+ conflict_row (state);
+
return default_rule;
}
static void
-save_row (int state)
+save_row (state_number_t state)
{
- int i;
+ symbol_number_t i;
int count;
- short *sp;
- short *sp1;
- short *sp2;
+ short *sp = NULL;
+ short *sp1 = NULL;
+ short *sp2 = NULL;
+ unsigned int *sp3 = NULL;
count = 0;
for (i = 0; i < ntokens; i++)
froms[state] = sp1 = sp = XCALLOC (short, count);
tos[state] = sp2 = XCALLOC (short, count);
+ if (glr_parser)
+ conflict_tos[state] = sp3 = XCALLOC (unsigned int, count);
+ else
+ conflict_tos[state] = NULL;
for (i = 0; i < ntokens; i++)
if (actrow[i] != 0)
{
*sp1++ = i;
*sp2++ = actrow[i];
+ if (glr_parser)
+ *sp3++ = conflrow[i];
}
tally[state] = count;
static void
token_actions (void)
{
- size_t i;
+ state_number_t i;
+ int nconflict = conflicts_total_count ();
+
short *yydefact = XCALLOC (short, nstates);
actrow = XCALLOC (short, ntokens);
+
+ conflrow = XCALLOC (short, ntokens);
+ if (glr_parser)
+ {
+ conflict_list = XCALLOC (unsigned int, 1 + 2 * nconflict);
+ conflict_list_free = 2 * nconflict;
+ conflict_list_cnt = 1;
+ }
+ else
+ conflict_list_free = conflict_list_cnt = 0;
+
for (i = 0; i < nstates; ++i)
{
yydefact[i] = action_row (states[i]);
save_row (i);
}
- output_short_table (&format_obstack, yydefact,
- yydefact[0], 1, nstates);
- muscle_insert ("defact", obstack_finish (&format_obstack));
-
+ muscle_insert_short_table ("defact", yydefact,
+ yydefact[0], 1, nstates);
XFREE (actrow);
+ XFREE (conflrow);
XFREE (yydefact);
}
void
actions_output (FILE *out)
{
- int rule;
- for (rule = 1; rule < nrules + 1; ++rule)
- if (rules[rule].action)
+ rule_number_t r;
+
+ fputs ("m4_define([b4_actions], \n[[", out);
+ for (r = 1; r < nrules + 1; ++r)
+ if (rules[r].action)
{
- fprintf (out, " case %d:\n", rule);
+ fprintf (out, " case %d:\n", r);
if (!no_lines_flag)
fprintf (out, muscle_find ("linef"),
- rules[rule].action_line,
+ rules[r].action_location.first_line,
quotearg_style (c_quoting_style,
muscle_find ("filename")));
- /* As a Bison extension, add the ending semicolon. Since some
- Yacc don't do that, help people using bison as a Yacc
- finding their missing semicolons. */
- fprintf (out, "{ %s%s }\n break;\n\n",
- rules[rule].action,
- yacc_flag ? ";" : "");
+ fprintf (out, " %s\n break;\n\n",
+ rules[r].action);
}
+ fputs ("]])\n\n", out);
}
+/*--------------------------------------.
+| Output the merge functions to OUT. |
+`--------------------------------------*/
-/*----------------------------.
-| Output the guards to OOUT. |
-`----------------------------*/
-
-void
-guards_output (FILE *out)
+static void
+merger_output (FILE *out)
{
- int rule;
- for (rule = 1; rule < nrules + 1; ++rule)
- if (rules[rule].guard)
- {
- fprintf (out, " case %d:\n", rule);
+ int n;
+ merger_list* p;
- if (!no_lines_flag)
- fprintf (out, muscle_find ("linef"),
- rules[rule].guard_line,
- quotearg_style (c_quoting_style,
- muscle_find ("filename")));
- fprintf (out, "{ %s; }\n break;\n\n",
- rules[rule].guard);
- }
+ fputs ("m4_define([b4_mergers], \n[[", out);
+ for (n = 1, p = merge_functions; p != NULL; n += 1, p = p->next)
+ {
+ if (p->type[0] == '\0')
+ fprintf (out, " case %d: yyval = %s (*yy0, *yy1); break;\n",
+ n, p->name);
+ else
+ fprintf (out, " case %d: yyval.%s = %s (*yy0, *yy1); break;\n",
+ n, p->type, p->name);
+ }
+ fputs ("]])\n\n", out);
}
-
/*---------------------------------------.
| Output the tokens definition to OOUT. |
`---------------------------------------*/
{
int i;
int first = 1;
+
+ fputs ("m4_define([b4_tokens], \n[", out);
for (i = 0; i < ntokens; ++i)
{
symbol_t *symbol = symbols[i];
int number = symbol->user_token_number;
- if (number == SALIAS)
- continue;
+ /* At this stage, if there are literal aliases, they are part of
+ SYMBOLS, so we should not find symbols which are the aliases
+ here. */
+ assert (number != USER_NUMBER_ALIAS);
+
/* Skip error token. */
if (symbol == errtoken)
continue;
- if (symbol->tag[0] == '\'')
- continue; /* skip literal character */
- if (symbol->tag[0] == '\"')
- {
- /* use literal string only if given a symbol with an alias */
- if (symbol->alias)
- symbol = symbol->alias;
- else
- continue;
- }
+
+ /* If this string has an alias, then it is necessarily the alias
+ which is to be output. */
+ if (symbol->alias)
+ symbol = symbol->alias;
+
+ /* Don't output literal chars or strings (when defined only as a
+ string). Note that must be done after the alias resolution:
+ think about `%token 'f' "f"'. */
+ if (symbol->tag[0] == '\'' || symbol->tag[0] == '\"')
+ continue;
/* Don't #define nonliteral tokens whose names contain periods
or '$' (as does the default value of the EOF token). */
if (strchr (symbol->tag, '.') || strchr (symbol->tag, '$'))
continue;
- fprintf (out, "%s [[[%s]], [%d]]",
+ fprintf (out, "%s[[[%s]], [%d]]",
first ? "" : ",\n", symbol->tag, number);
- if (semantic_parser)
- /* FIXME: This is probably wrong, and should be just as
- above. --akim. */
- fprintf (out, "# define T%s\t%d\n", symbol->tag, symbol->number);
+
first = 0;
}
+ fputs ("])\n\n", out);
}
+/*----------------------------------------.
+| Output the symbol destructors to OOUT. |
+`----------------------------------------*/
+
static void
-save_column (int symbol, int default_state)
+symbol_destructors_output (FILE *out)
+{
+ int i;
+ int first = 1;
+
+ fputs ("m4_define([b4_symbol_destructors], \n[", out);
+ for (i = 0; i < nsyms; ++i)
+ if (symbols[i]->destructor)
+ {
+ symbol_t *symbol = symbols[i];
+
+ /* Filename, lineno,
+ Symbol-name, Symbol-number,
+ destructor, typename. */
+ fprintf (out, "%s[[[%s]], [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]",
+ first ? "" : ",\n",
+ infile, symbol->destructor_location.first_line,
+ symbol_tag_get (symbol),
+ symbol->number,
+ symbol->destructor,
+ symbol->type_name);
+
+ first = 0;
+ }
+ fputs ("])\n\n", out);
+}
+
+
+/*-------------------------------------.
+| Output the symbol printers to OOUT. |
+`-------------------------------------*/
+
+static void
+symbol_printers_output (FILE *out)
+{
+ int i;
+ int first = 1;
+
+ fputs ("m4_define([b4_symbol_printers], \n[", out);
+ for (i = 0; i < nsyms; ++i)
+ if (symbols[i]->destructor)
+ {
+ symbol_t *symbol = symbols[i];
+
+ /* Filename, lineno,
+ Symbol-name, Symbol-number,
+ destructor, typename. */
+ fprintf (out, "%s[[[%s]], [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]",
+ first ? "" : ",\n",
+ infile, symbol->printer_location.first_line,
+ symbol_tag_get (symbol),
+ symbol->number,
+ symbol->printer,
+ symbol->type_name);
+
+ first = 0;
+ }
+ fputs ("])\n\n", out);
+}
+
+
+static void
+save_column (symbol_number_t symbol, state_number_t default_state)
{
int i;
short *sp;
short *sp1;
short *sp2;
int count;
- int symno = symbol - ntokens + nstates;
+ int symno = symbol - ntokens + state_number_as_int (nstates);
- short begin = goto_map[symbol];
- short end = goto_map[symbol + 1];
+ int begin = goto_map[symbol];
+ int end = goto_map[symbol + 1];
count = 0;
for (i = begin; i < end; i++)
width[symno] = sp1[-1] - sp[0] + 1;
}
-static int
-default_goto (int symbol)
+
+static state_number_t
+default_goto (symbol_number_t symbol)
{
- size_t i;
- size_t m = goto_map[symbol];
- size_t n = goto_map[symbol + 1];
- int default_state = -1;
+ state_number_t s;
+ int i;
+ int m = goto_map[symbol];
+ int n = goto_map[symbol + 1];
+ state_number_t default_state = (state_number_t) -1;
int max = 0;
if (m == n)
- return -1;
+ return (state_number_t) -1;
- for (i = 0; i < nstates; i++)
- state_count[i] = 0;
+ for (s = 0; s < nstates; s++)
+ state_count[s] = 0;
for (i = m; i < n; i++)
state_count[to_state[i]]++;
- for (i = 0; i < nstates; i++)
- if (state_count[i] > max)
+ for (s = 0; s < nstates; s++)
+ if (state_count[s] > max)
{
- max = state_count[i];
- default_state = i;
+ max = state_count[s];
+ default_state = s;
}
return default_state;
static void
goto_actions (void)
{
- int i;
- short *yydefgoto = XMALLOC (short, nsyms - ntokens);
+ symbol_number_t i;
+ state_number_t *yydefgoto = XMALLOC (state_number_t, nsyms - ntokens);
state_count = XCALLOC (short, nstates);
for (i = ntokens; i < nsyms; ++i)
{
- int default_state = default_goto (i);
+ state_number_t default_state = default_goto (i);
save_column (i, default_state);
yydefgoto[i - ntokens] = default_state;
}
- output_short_table (&format_obstack, yydefgoto,
- yydefgoto[0], 1, nsyms - ntokens);
- muscle_insert ("defgoto", obstack_finish (&format_obstack));
-
+ muscle_insert_state_number_table ("defgoto", yydefgoto,
+ yydefgoto[0], 1, nsyms - ntokens);
XFREE (state_count);
XFREE (yydefgoto);
}
int loc = 0;
short *from = froms[i];
short *to = tos[i];
+ unsigned int *conflict_to = conflict_tos[i];
assert (t);
for (k = 0; ok && k < t; k++)
{
- loc = j + from[k];
+ loc = j + state_number_as_int (from[k]);
if (loc > (int) table_size)
table_grow (loc);
{
for (k = 0; k < t; k++)
{
- loc = j + from[k];
- table[loc] = to[k];
- check[loc] = from[k];
+ loc = j + state_number_as_int (from[k]);
+ table[loc] = state_number_as_int (to[k]);
+ if (glr_parser && conflict_to != NULL)
+ conflict_table[loc] = conflict_to[k];
+ check[loc] = state_number_as_int (from[k]);
}
while (table[lowzero] != 0)
base = XCALLOC (short, nvectors);
pos = XCALLOC (short, nentries);
table = XCALLOC (short, table_size);
+ if (glr_parser)
+ conflict_table = XCALLOC (unsigned int, table_size);
check = XCALLOC (short, table_size);
lowzero = 0;
{
XFREE (froms[i]);
XFREE (tos[i]);
+ XFREE (conflict_tos[i]);
}
XFREE (froms);
XFREE (tos);
+ XFREE (conflict_tos);
XFREE (pos);
}
-/* the following functions output yytable, yycheck
+/* the following functions output yytable, yycheck, yyconflp, yyconfl,
and the vectors whose elements index the portion starts */
static void
output_base (void)
{
/* Output pact. */
- output_short_table (&format_obstack, base,
- base[0], 1, nstates);
- muscle_insert ("pact", obstack_finish (&format_obstack));
+ muscle_insert_short_table ("pact", base,
+ base[0], 1, nstates);
/* Output pgoto. */
- output_short_table (&format_obstack, base,
- base[nstates], nstates + 1, nvectors);
- muscle_insert ("pgoto", obstack_finish (&format_obstack));
-
+ muscle_insert_short_table ("pgoto", base,
+ base[nstates], nstates + 1, nvectors);
XFREE (base);
}
static void
output_table (void)
{
- output_short_table (&format_obstack, table,
- table[0], 1, high + 1);
- muscle_insert ("table", obstack_finish (&format_obstack));
+ muscle_insert_short_table ("table", table,
+ table[0], 1, high + 1);
XFREE (table);
}
+static void
+output_conflicts (void)
+{
+ /* GLR parsing slightly modifies yytable and yycheck
+ (and thus yypact) so that in states with unresolved conflicts,
+ the default reduction is not used in the conflicted entries, so
+ that there is a place to put a conflict pointer. This means that
+ yyconflp and yyconfl are nonsense for a non-GLR parser, so we
+ avoid accidents by not writing them out in that case. */
+ if (! glr_parser)
+ return;
+
+ muscle_insert_unsigned_int_table ("conflict_list_heads", conflict_table,
+ conflict_table[0], 1, high+1);
+ muscle_insert_unsigned_int_table ("conflicting_rules", conflict_list,
+ conflict_list[0], 1, conflict_list_cnt);
+
+ XFREE (conflict_table);
+ XFREE (conflict_list);
+}
+
+
static void
output_check (void)
{
- output_short_table (&format_obstack, check,
- check[0], 1, high + 1);
- muscle_insert ("check", obstack_finish (&format_obstack));
+ muscle_insert_short_table ("check", check,
+ check[0], 1, high + 1);
XFREE (check);
}
static void
output_actions (void)
{
- size_t i;
- nvectors = nstates + nvars;
+ /* That's a poor way to make sure the sizes are properly corelated,
+ in particular the signedness is not taking into account, but it's
+ not useless. */
+ assert (sizeof (nvectors) >= sizeof (nstates));
+ assert (sizeof (nvectors) >= sizeof (nvars));
+
+ nvectors = state_number_as_int (nstates) + nvars;
froms = XCALLOC (short *, nvectors);
tos = XCALLOC (short *, nvectors);
+ conflict_tos = XCALLOC (unsigned int *, nvectors);
tally = XCALLOC (short, nvectors);
width = XCALLOC (short, nvectors);
output_base ();
output_table ();
+ output_conflicts ();
output_check ();
-
- for (i = 0; i < nstates; ++i)
- {
- free (states[i]->shifts);
- XFREE (states[i]->reductions);
- free (states[i]->errs);
- free (states[i]);
- }
- XFREE (states);
}
\f
+/*----------------------.
+| Run our backend, M4. |
+`----------------------*/
+
+static void
+m4_invoke (const char *definitions)
+{
+ /* Invoke m4 on the definition of the muscles, and the skeleton. */
+ const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR");
+ const char *m4 = getenv ("M4");
+ int pkg_data_len;
+ char *full_skeleton;
+
+ if (!m4)
+ m4 = M4;
+ if (!bison_pkgdatadir)
+ bison_pkgdatadir = PKGDATADIR;
+ pkg_data_len = strlen (bison_pkgdatadir);
+ full_skeleton = XMALLOC (char, pkg_data_len + strlen (skeleton) + 2);
+ if (bison_pkgdatadir[pkg_data_len-1] == '/')
+ sprintf (full_skeleton, "%s%s", bison_pkgdatadir, skeleton);
+ else
+ sprintf (full_skeleton, "%s/%s", bison_pkgdatadir, skeleton);
+ if (trace_flag)
+ fprintf (stderr,
+ "running: %s -I %s m4sugar/m4sugar.m4 %s %s\n",
+ m4, bison_pkgdatadir, definitions, full_skeleton);
+ skel_in = readpipe (m4,
+ "-I", bison_pkgdatadir,
+ "m4sugar/m4sugar.m4",
+ definitions,
+ full_skeleton,
+ NULL);
+ XFREE (full_skeleton);
+ if (!skel_in)
+ error (EXIT_FAILURE, errno, "cannot run m4");
+ skel_lex ();
+
+}
+
/*---------------------------.
| Call the skeleton parser. |
`---------------------------*/
fputs ("m4_changecom()\n", out);
fputs ("m4_init()\n", out);
- fputs ("m4_define([b4_actions], \n[[", out);
actions_output (out);
- fputs ("]])\n\n", out);
-
- fputs ("m4_define([b4_guards], \n[[", out);
- guards_output (out);
- fputs ("]])\n\n", out);
-
- fputs ("m4_define([b4_tokens], \n[", out);
+ merger_output (out);
token_definitions_output (out);
- fputs ("])\n\n", out);
+ symbol_destructors_output (out);
+ symbol_printers_output (out);
muscles_m4_output (out);
fputs ("m4_divert_push(0)dnl\n", out);
xfclose (out);
- /* Invoke m4 on the definition of the muscles, and the skeleton. */
- {
- const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR");
- const char *m4 = getenv ("M4");
- if (!m4)
- m4 = M4;
- if (!bison_pkgdatadir)
- bison_pkgdatadir = PKGDATADIR;
- if (trace_flag)
- fprintf (stderr,
- "running: %s -I %s m4sugar/m4sugar.m4 %s %s\n",
- m4, bison_pkgdatadir, tempfile, skeleton);
- skel_in = readpipe (m4,
- "-I", bison_pkgdatadir,
- "m4sugar/m4sugar.m4",
- tempfile,
- skeleton,
- NULL);
- if (!skel_in)
- error (EXIT_FAILURE, errno, "cannot run m4");
- skel_lex ();
-
- /* If `debugging', keep this file alive. */
- if (!trace_flag)
- unlink (tempfile);
- }
+ m4_invoke (tempfile);
+
+ /* If `debugging', keep this file alive. */
+ if (!trace_flag)
+ unlink (tempfile);
+
+ free (tempfile);
}
static void
MUSCLE_INSERT_INT ("pure", pure_parser);
MUSCLE_INSERT_INT ("nsym", nsyms);
MUSCLE_INSERT_INT ("debug", debug_flag);
- MUSCLE_INSERT_INT ("final", final_state);
+ MUSCLE_INSERT_INT ("final", final_state->number);
MUSCLE_INSERT_INT ("undef_token_number", undeftoken->number);
MUSCLE_INSERT_INT ("user_token_number_max", max_user_token_number);
MUSCLE_INSERT_INT ("error_verbose", error_verbose);
/* Find the right skeleton file. */
if (!skeleton)
{
- if (semantic_parser)
- skeleton = "bison.hairy";
+ if (glr_parser)
+ skeleton = "glr.c";
else
- skeleton = "bison.simple";
+ skeleton = "yacc.c";
}
/* Parse the skeleton file and output the needed parsers. */
/* Process the selected skeleton file. */
output_skeleton ();
- obstack_free (&muscle_obstack, NULL);
obstack_free (&format_obstack, NULL);
- obstack_free (&action_obstack, NULL);
obstack_free (&pre_prologue_obstack, NULL);
obstack_free (&post_prologue_obstack, NULL);
}
projects / bison.git / blobdiff