static short *order = NULL;
static short *base = NULL;
static short *pos = NULL;
+
+/* 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 size_t table_size = SHRT_MAX;
static short *table = NULL;
static short *check = NULL;
static int lowzero;
static int high;
-struct obstack muscle_obstack;
static struct obstack format_obstack;
int error_verbose = 0;
-/* Returns the number of lines of S. */
-size_t
-get_lines_number (const char *s)
-{
- size_t lines = 0;
- size_t i;
- for (i = 0; s[i]; ++i)
- if (s[i] == '\n')
- ++lines;
+/*----------------------------------------------------------------.
+| If TABLE (and CHECK) appear to be small to be addressed at |
+| DESIRED, grow them. Note that TABLE[DESIRED] is to be used, so |
+| the desired size is at least DESIRED + 1. |
+`----------------------------------------------------------------*/
- return lines;
-}
+static void
+table_grow (size_t desired)
+{
+ size_t old_size = table_size;
+ while (table_size <= desired)
+ table_size *= 2;
-/* FIXME. */
+ if (trace_flag)
+ fprintf (stderr, "growing table and check from: %d to %d\n",
+ old_size, table_size);
-static inline void
-output_table_data (struct obstack *oout,
- short *table_data,
- short first,
- int begin,
- int end)
-{
- int i;
- int j = 1;
+ table = XREALLOC (table, short, table_size);
+ check = XREALLOC (check, short, table_size);
- obstack_fgrow1 (oout, "%6d", first);
- for (i = begin; i < end; ++i)
+ for (/* Nothing. */; old_size < table_size; ++old_size)
{
- obstack_1grow (oout, ',');
- if (j >= 10)
- {
- obstack_sgrow (oout, "\n ");
- j = 1;
- }
- else
- ++j;
- obstack_fgrow1 (oout, "%6d", table_data[i]);
+ table[old_size] = 0;
+ check[old_size] = -1;
}
- obstack_1grow (oout, 0);
}
-static void
-output_token_translations (void)
-{
- output_table_data (&format_obstack, token_translations,
- 0, 1, max_user_token_number + 1);
- muscle_insert ("translate", obstack_finish (&format_obstack));
- XFREE (token_translations);
+/*-------------------------------------------------------------------.
+| 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_MUSCLE_INSERT_TABLE(Name, Type) \
+ \
+static void \
+Name (const char *name, \
+ Type *table_data, \
+ Type first, \
+ int begin, \
+ int end) \
+{ \
+ Type max = first; \
+ int i; \
+ int j = 1; \
+ \
+ obstack_fgrow1 (&format_obstack, "%6d", first); \
+ for (i = begin; i < end; ++i) \
+ { \
+ obstack_1grow (&format_obstack, ','); \
+ if (j >= 10) \
+ { \
+ obstack_sgrow (&format_obstack, "\n "); \
+ j = 1; \
+ } \
+ else \
+ ++j; \
+ obstack_fgrow1 (&format_obstack, "%6d", table_data[i]); \
+ if (table_data[i] > max) \
+ max = table_data[i]; \
+ } \
+ obstack_1grow (&format_obstack, 0); \
+ muscle_insert (name, obstack_finish (&format_obstack)); \
+ \
+ /* 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_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)
+
+
+/*-----------------------------------------------------------------.
+| Prepare the muscles related to the tokens: translate, tname, and |
+| toknum. |
+`-----------------------------------------------------------------*/
static void
-output_gram (void)
+prepare_tokens (void)
{
+ muscle_insert_symbol_number_table ("translate",
+ token_translations,
+ 0, 1, max_user_token_number + 1);
+
{
int i;
- short *values = XCALLOC (short, nrules + 1);
- for (i = 0; i < nrules + 1; ++i)
- values[i] = rules[i].rhs - ritem;
- output_table_data (&format_obstack, values,
- 0, 1, nrules + 1);
- XFREE (values);
- }
+ int j = 0;
+ for (i = 0; i < nsyms; i++)
+ {
+ /* Be sure not to use twice the same quotearg slot. */
+ const char *cp =
+ quotearg_n_style (1, c_quoting_style,
+ quotearg_style (escape_quoting_style,
+ symbols[i]->tag));
+ /* Width of the next token, including the two quotes, the coma
+ and the space. */
+ int strsize = strlen (cp) + 2;
+
+ if (j + strsize > 75)
+ {
+ obstack_sgrow (&format_obstack, "\n ");
+ j = 2;
+ }
+
+ obstack_sgrow (&format_obstack, cp);
+ obstack_sgrow (&format_obstack, ", ");
+ j += strsize;
+ }
+ /* Add a NULL entry to list of tokens (well, 0, as NULL might not be
+ defined). */
+ obstack_sgrow (&format_obstack, "0");
- muscle_insert ("prhs", obstack_finish (&format_obstack));
+ /* Finish table and store. */
+ obstack_1grow (&format_obstack, 0);
+ muscle_insert ("tname", obstack_finish (&format_obstack));
+ }
+ /* Output YYTOKNUM. */
{
- short *yyrhs;
int i;
+ short *values = XCALLOC (short, ntokens + 1);
+ for (i = 0; i < ntokens + 1; ++i)
+ values[i] = symbols[i]->user_token_number;
+ muscle_insert_short_table ("toknum", values,
+ 0, 1, ntokens + 1);
+ free (values);
+ }
+}
- yyrhs = XMALLOC (short, nritems);
-
- for (i = 1; i < nritems; ++i)
- yyrhs[i] = ritem[i] >= 0 ? ritem[i] : -1;
-
- output_table_data (&format_obstack, yyrhs,
- ritem[0], 1, nritems);
- muscle_insert ("rhs", obstack_finish (&format_obstack));
- XFREE (yyrhs);
- }
+/*-------------------------------------------------------------.
+| Prepare the muscles related to the rules: rhs, prhs, r1, r2, |
+| rline. |
+`-------------------------------------------------------------*/
-#if 0
- if (!semantic_parser)
- obstack_sgrow (&table_obstack, "\n#endif\n");
-#endif
+static void
+prepare_rules (void)
+{
+ int r;
+ unsigned int i = 0;
+ item_number_t *rhs = XMALLOC (item_number_t, nritems);
+ 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);
+
+ for (r = 1; r < nrules + 1; ++r)
+ {
+ item_number_t *rhsp;
+ /* Index of rule R in RHS. */
+ prhs[r] = i;
+ /* RHS of the rule R. */
+ for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
+ rhs[i++] = *rhsp;
+ /* LHS of the rule R. */
+ r1[r] = rules[r].lhs->number;
+ /* Length of rule R's RHS. */
+ r2[r] = i - prhs[r];
+ /* Separator in RHS. */
+ rhs[i++] = -1;
+ /* Line where rule was defined. */
+ rline[r] = rules[r].line;
+ }
+ assert (i == nritems);
+
+ 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);
+
+ free (rhs);
+ free (prhs);
+ free (rline);
+ free (r1);
+ free (r2);
}
+/*--------------------------------------------.
+| Prepare the muscles related to the states. |
+`--------------------------------------------*/
static void
-output_stos (void)
+prepare_states (void)
{
size_t i;
- short *values = (short *) alloca (sizeof (short) * nstates);
+ 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_table_data (&format_obstack, values,
- 0, 1, nstates);
- muscle_insert ("stos", obstack_finish (&format_obstack));
+ muscle_insert_symbol_number_table ("stos", values,
+ 0, 1, nstates);
}
-static void
-output_rule_data (void)
-{
- int i;
- int j;
- short *short_tab = NULL;
-
- {
- short *values = XCALLOC (short, nrules + 1);
- for (i = 0; i < nrules + 1; ++i)
- values[i] = rules[i].line;
- output_table_data (&format_obstack, values,
- 0, 1, nrules + 1);
- muscle_insert ("rline", obstack_finish (&format_obstack));
- XFREE (values);
- }
-
-
- j = 0;
- for (i = 0; i < nsyms; i++)
- {
- /* Be sure not to use twice the same quotearg slot. */
- const char *cp =
- quotearg_n_style (1, c_quoting_style,
- quotearg_style (escape_quoting_style, symbols[i]->tag));
- /* Width of the next token, including the two quotes, the coma
- and the space. */
- int strsize = strlen (cp) + 2;
-
- if (j + strsize > 75)
- {
- obstack_sgrow (&format_obstack, "\n ");
- j = 2;
- }
-
- obstack_sgrow (&format_obstack, cp);
- obstack_sgrow (&format_obstack, ", ");
- j += strsize;
- }
- /* Add a NULL entry to list of tokens (well, 0, as NULL might not be
- defined). */
- obstack_sgrow (&format_obstack, "0");
-
- /* Finish table and store. */
- obstack_1grow (&format_obstack, 0);
- muscle_insert ("tname", obstack_finish (&format_obstack));
-
- /* Output YYTOKNUM. */
- {
- short *values = XCALLOC (short, ntokens + 1);
- for (i = 0; i < ntokens + 1; ++i)
- values[i] = symbols[i]->user_token_number;
- output_table_data (&format_obstack, values,
- 0, 1, ntokens + 1);
- muscle_insert ("toknum", obstack_finish (&format_obstack));
- XFREE (values);
- }
-
-
- /* Output YYR1. */
- {
- short *values = XCALLOC (short, nrules + 1);
- for (i = 0; i < nrules + 1; ++i)
- values[i] = rules[i].lhs;
- output_table_data (&format_obstack, values,
- 0, 1, nrules + 1);
- muscle_insert ("r1", obstack_finish (&format_obstack));
- XFREE (values);
- }
-
- /* Output YYR2. */
- short_tab = XMALLOC (short, nrules + 1);
- for (i = 1; i < nrules; i++)
- short_tab[i] = rules[i + 1].rhs - rules[i].rhs - 1;
- short_tab[nrules] = nritems - (rules[nrules].rhs - ritem) - 1;
- output_table_data (&format_obstack, short_tab,
- 0, 1, nrules + 1);
- muscle_insert ("r2", obstack_finish (&format_obstack));
- XFREE (short_tab);
-}
-
/*------------------------------------------------------------------.
| Decide what to do for each type of token if seen as the lookahead |
| token in specified state. The value returned is used as the |
| default action (yydefact) for the state. In addition, actrow is |
| filled with what to do for each kind of token, index by symbol |
| number, with zero meaning do the default action. The value |
-| MINSHORT, a very negative number, means this situation is an |
+| SHRT_MIN, a very negative number, means this situation is an |
| error. The parser recognizes this value specially. |
| |
| This is where conflicts are resolved. The loop over lookahead |
/* and record this rule as the rule to use if that
token follows. */
if (bitset_test (LA[state->lookaheadsp + i], j))
- actrow[j] = -LAruleno[state->lookaheadsp + i];
+ actrow[j] = -LArule[state->lookaheadsp + i]->number;
}
/* Now see which tokens are allowed for shifts in this state. For
to reduce. */
for (i = 0; i < shiftp->nshifts; i++)
{
- int symbol;
+ symbol_number_t symbol;
int shift_state = shiftp->shifts[i];
if (!shift_state)
continue;
/* Do not use any default reduction if there is a shift for
error */
- if (symbol == error_token_number)
+ if (symbol == errtoken->number)
nodefault = 1;
}
/* See which tokens are an explicit error in this state (due to
- %nonassoc). For them, record MINSHORT as the action. */
+ %nonassoc). For them, record SHRT_MIN as the action. */
for (i = 0; i < errp->nerrs; i++)
{
int symbol = errp->errs[i];
- actrow[symbol] = MINSHORT;
+ actrow[symbol] = SHRT_MIN;
}
/* Now find the most common reduction and make it the default action
for (i = 0; i < state->nlookaheads; i++)
{
int count = 0;
- int rule = -LAruleno[state->lookaheadsp + i];
+ int rule = -LArule[state->lookaheadsp + i]->number;
int j;
for (j = 0; j < ntokens; j++)
if (default_rule == 0)
for (i = 0; i < ntokens; i++)
- if (actrow[i] == MINSHORT)
+ if (actrow[i] == SHRT_MIN)
actrow[i] = 0;
return default_rule;
save_row (i);
}
- output_table_data (&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 (yydefact);
}
rules[rule].action_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 ? ";" : "");
- }
-}
-
-
-/*----------------------------.
-| Output the guards to OOUT. |
-`----------------------------*/
-
-void
-guards_output (FILE *out)
-{
- int rule;
- for (rule = 1; rule < nrules + 1; ++rule)
- if (rules[rule].guard)
- {
- fprintf (out, " case %d:\n", rule);
-
- 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);
+ fprintf (out, " %s\n break;\n\n",
+ rules[rule].action);
}
}
int first = 1;
for (i = 0; i < ntokens; ++i)
{
- bucket *symbol = symbols[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->number == error_token_number)
+ if (symbol == errtoken)
+ 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;
- 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;
- }
/* 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;
}
}
yydefgoto[i - ntokens] = default_state;
}
- output_table_data (&format_obstack, yydefgoto,
- yydefgoto[0], 1, nsyms - ntokens);
- muscle_insert ("defgoto", obstack_finish (&format_obstack));
-
+ muscle_insert_short_table ("defgoto", yydefgoto,
+ yydefgoto[0], 1, nsyms - ntokens);
XFREE (state_count);
XFREE (yydefgoto);
}
assert (t);
- for (j = lowzero - from[0]; j < MAXTABLE; j++)
+ for (j = lowzero - from[0]; j < (int) table_size; j++)
{
int k;
int ok = 1;
for (k = 0; ok && k < t; k++)
{
loc = j + from[k];
- if (loc > MAXTABLE)
- fatal (_("maximum table size (%d) exceeded"), MAXTABLE);
+ if (loc > (int) table_size)
+ table_grow (loc);
if (table[loc] != 0)
ok = 0;
base = XCALLOC (short, nvectors);
pos = XCALLOC (short, nentries);
- table = XCALLOC (short, MAXTABLE);
- check = XCALLOC (short, MAXTABLE);
+ table = XCALLOC (short, table_size);
+ check = XCALLOC (short, table_size);
lowzero = 0;
high = 0;
for (i = 0; i < nvectors; i++)
- base[i] = MINSHORT;
+ base[i] = SHRT_MIN;
- for (i = 0; i < MAXTABLE; i++)
+ for (i = 0; i < (int) table_size; i++)
check[i] = -1;
for (i = 0; i < nentries; i++)
output_base (void)
{
/* Output pact. */
- output_table_data (&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_table_data (&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_table_data (&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_check (void)
{
- output_table_data (&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);
}
-/* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable
- and yycheck. */
+/*-----------------------------------------------------------------.
+| Compute and output yydefact, yydefgoto, yypact, yypgoto, yytable |
+| and yycheck. |
+`-----------------------------------------------------------------*/
static void
output_actions (void)
token_actions ();
bitsetv_free (LA);
- XFREE (LAruleno);
+ free (LArule);
goto_actions ();
XFREE (goto_map + ntokens);
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);
token_definitions_output (out);
fputs ("])\n\n", out);
{
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, tempfile, skeleton);
+ m4, bison_pkgdatadir, tempfile, full_skeleton);
skel_in = readpipe (m4,
"-I", bison_pkgdatadir,
"m4sugar/m4sugar.m4",
tempfile,
- skeleton,
+ full_skeleton,
NULL);
+ XFREE (full_skeleton);
if (!skel_in)
error (EXIT_FAILURE, errno, "cannot run m4");
skel_lex ();
prepare (void)
{
MUSCLE_INSERT_INT ("last", high);
- MUSCLE_INSERT_INT ("flag", MINSHORT);
+ MUSCLE_INSERT_INT ("flag", SHRT_MIN);
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 ("maxtok", max_user_token_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);
MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy");
MUSCLE_INSERT_INT ("defines_flag", defines_flag);
/* Copy definitions in directive. */
- obstack_1grow (&attrs_obstack, 0);
- muscle_insert ("prologue", obstack_finish (&attrs_obstack));
+ obstack_1grow (&pre_prologue_obstack, 0);
+ obstack_1grow (&post_prologue_obstack, 0);
+ muscle_insert ("pre_prologue", obstack_finish (&pre_prologue_obstack));
+ muscle_insert ("post_prologue", obstack_finish (&post_prologue_obstack));
/* Find the right skeleton file. */
if (!skeleton)
- {
- if (semantic_parser)
- skeleton = "bison.hairy";
- else
- skeleton = "bison.simple";
- }
+ skeleton = "bison.simple";
/* Parse the skeleton file and output the needed parsers. */
muscle_insert ("skeleton", skeleton);
{
obstack_init (&format_obstack);
- output_token_translations ();
- output_gram ();
-
- if (semantic_parser)
- output_stos ();
- output_rule_data ();
+ prepare_tokens ();
+ prepare_rules ();
+ prepare_states ();
output_actions ();
prepare ();
/* Process the selected skeleton file. */
output_skeleton ();
- obstack_free (&muscle_obstack, NULL);
obstack_free (&format_obstack, NULL);
- obstack_free (&action_obstack, NULL);
- obstack_free (&attrs_obstack, NULL);
+ obstack_free (&pre_prologue_obstack, NULL);
+ obstack_free (&post_prologue_obstack, NULL);
}
projects / bison.git / blobdiff