negative short int. Used to flag ?? */
#include "system.h"
+#include "bitsetv.h"
#include "quotearg.h"
#include "error.h"
#include "getargs.h"
}
-/* FIXME. */
+/*----------------------------------------------------------------.
+| Format the FIRST and then TABLE_DATA[BEGIN..END[ into OOUT, and |
+| return the number of bits needed for its longuest value. |
+`----------------------------------------------------------------*/
-static inline void
+static inline long int
output_table_data (struct obstack *oout,
short *table_data,
short first,
int begin,
int end)
{
+ long int max = first;
int i;
int j = 1;
else
++j;
obstack_fgrow1 (oout, "%6d", table_data[i]);
+ if (table_data[i] > max)
+ max = table_data[i];
}
obstack_1grow (oout, 0);
+
+ return max;
}
+/*-----------------------------------------------------------------.
+| Prepare the muscles related to the tokens: translate, tname, and |
+| toknum. |
+`-----------------------------------------------------------------*/
+
static void
-output_token_translations (void)
+prepare_tokens (void)
{
- output_table_data (&format_obstack, token_translations,
- 0, 1, max_user_token_number + 1);
+ long int max = output_table_data (&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);
-}
+ {
+ int i;
+ 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");
+
+ /* Finish table and store. */
+ obstack_1grow (&format_obstack, 0);
+ muscle_insert ("tname", obstack_finish (&format_obstack));
+ }
-static void
-output_gram (void)
-{
+ /* Output YYTOKNUM. */
{
int i;
- short *values = XCALLOC (short, nrules + 1);
- for (i = 0; i < nrules + 1; ++i)
- values[i] = rules[i].rhs;
+ 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, nrules + 1);
- XFREE (values);
+ 0, 1, ntokens + 1);
+ muscle_insert ("toknum", obstack_finish (&format_obstack));
+ free (values);
}
+}
- muscle_insert ("prhs", obstack_finish (&format_obstack));
- {
- short *yyrhs;
- int i;
+/*-------------------------------------------------------------.
+| Prepare the muscles related to the rules: rhs, prhs, r1, r2, |
+| rline. |
+`-------------------------------------------------------------*/
+
+static void
+prepare_rules (void)
+{
+ short *rhsp;
+ int r;
+ int i = 0;
+ short *rhs = XMALLOC (short, nritems);
+ short *prhs = XMALLOC (short, nrules + 1);
+ short *r1 = XMALLOC (short, nrules + 1);
+ short *r2 = XMALLOC (short, nrules + 1);
+ short *rline = XMALLOC (short, nrules + 1);
+
+ for (r = 1; r < nrules + 1; ++r)
+ {
+ /* 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);
+
+ output_table_data (&format_obstack, rhs, ritem[0], 1, nritems);
+ muscle_insert ("rhs", obstack_finish (&format_obstack));
- yyrhs = XMALLOC (short, nritems);
+ output_table_data (&format_obstack, prhs, 0, 1, nrules + 1);
+ muscle_insert ("prhs", obstack_finish (&format_obstack));
- for (i = 1; i < nritems; ++i)
- yyrhs[i] = ritem[i] >= 0 ? ritem[i] : -1;
+ output_table_data (&format_obstack, rline, 0, 1, nrules + 1);
+ muscle_insert ("rline", obstack_finish (&format_obstack));
- output_table_data (&format_obstack, yyrhs,
- ritem[0], 1, nritems);
- muscle_insert ("rhs", obstack_finish (&format_obstack));
+ output_table_data (&format_obstack, r1, 0, 1, nrules + 1);
+ muscle_insert ("r1", obstack_finish (&format_obstack));
- XFREE (yyrhs);
- }
+ output_table_data (&format_obstack, r2, 0, 1, nrules + 1);
+ muscle_insert ("r2", obstack_finish (&format_obstack));
-#if 0
- if (!semantic_parser)
- obstack_sgrow (&table_obstack, "\n#endif\n");
-#endif
+ free (rhs);
+ free (prhs);
+ free (r2);
}
+/*--------------------------------------------.
+| Prepare the muscles related to the states. |
+`--------------------------------------------*/
static void
-output_stos (void)
+prepare_states (void)
{
- int i;
+ size_t i;
short *values = (short *) alloca (sizeof (short) * nstates);
for (i = 0; i < nstates; ++i)
values[i] = states[i]->accessing_symbol;
}
-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 - 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 |
for (j = 0; j < ntokens; j++)
/* and record this rule as the rule to use if that
token follows. */
- if (BITISSET (LA (state->lookaheadsp + i), j))
- actrow[j] = -LAruleno[state->lookaheadsp + i];
+ if (bitset_test (LA[state->lookaheadsp + i], j))
+ actrow[j] = -LArule[state->lookaheadsp + i]->number;
}
/* Now see which tokens are allowed for shifts in this state. For
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++)
static void
token_actions (void)
{
- int i;
+ size_t i;
short *yydefact = XCALLOC (short, nstates);
actrow = XCALLOC (short, ntokens);
token_definitions_output (FILE *out)
{
int i;
+ 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;
/* Skip error token. */
- if (symbol->value == error_token_number)
+ if (symbol->number == error_token_number)
continue;
if (symbol->tag[0] == '\'')
continue; /* skip literal character */
if (strchr (symbol->tag, '.') || strchr (symbol->tag, '$'))
continue;
- fprintf (out, "# define %s\t%d\n",
- symbol->tag, number);
+ 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->value);
+ fprintf (out, "# define T%s\t%d\n", symbol->tag, symbol->number);
+ first = 0;
}
}
static int
default_goto (int symbol)
{
- int i;
- int m = goto_map[symbol];
- int n = goto_map[symbol + 1];
+ size_t i;
+ size_t m = goto_map[symbol];
+ size_t n = goto_map[symbol + 1];
int default_state = -1;
int max = 0;
int w;
int prev;
- if (i >= nstates)
+ if (i >= (int) nstates)
return -1;
t = tally[i];
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)
{
- int i;
+ size_t i;
nvectors = nstates + nvars;
froms = XCALLOC (short *, nvectors);
width = XCALLOC (short, nvectors);
token_actions ();
- XFREE (LA);
- XFREE (LAruleno);
+ bitsetv_free (LA);
+ free (LArule);
goto_actions ();
XFREE (goto_map + ntokens);
output_skeleton (void)
{
/* Store the definition of all the muscles. */
- char *tempdir = getenv ("TMPDIR");
+ const char *tempdir = getenv ("TMPDIR");
char *tempfile = NULL;
FILE *out = NULL;
- ssize_t bytes_read;
int fd;
if (tempdir == NULL)
guards_output (out);
fputs ("]])\n\n", out);
- fputs ("m4_define([b4_tokendef], \n[[", out);
+ fputs ("m4_define([b4_tokens], \n[", out);
token_definitions_output (out);
- fputs ("]])\n\n", out);
+ fputs ("])\n\n", out);
muscles_m4_output (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: m4 -I %s m4sugar/m4sugar.m4 %s %s\n",
- bison_pkgdatadir, tempfile, skeleton);
- skel_in = readpipe ("m4",
- "-I",
- bison_pkgdatadir,
+ "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,
muscle_insert ("skeleton", skeleton);
}
-/*-------------------------.
-| Output the header file. |
-`-------------------------*/
-
-static void
-header_output (void)
-{
- FILE *out = xfopen (spec_defines_file, "w");
- char *macro_name = compute_header_macro ();
-
- fprintf (out, "#ifndef %s\n", macro_name);
- fprintf (out, "# define %s\n\n", macro_name);
-
- token_definitions_output (out);
- fprintf (out, "\
-#ifndef YYSTYPE\n\
-typedef %s
-yystype;\n\
-# define YYSTYPE yystype\n\
-#endif\n",
- muscle_find ("stype"));
-
- if (!pure_parser)
- fprintf (out, "\nextern YYSTYPE %slval;\n",
- spec_name_prefix ? spec_name_prefix : "yy");
-
- if (locations_flag)
- {
- fputs ("\n\n", out);
- fprintf (out, "\
-#ifndef YYLTYPE\n\
-typedef struct yyltype\n\
-{\n\
- int first_line;\n\
- int first_column;\n\
- int last_line;\n\
- int last_column;\n\
-} yyltype;\n\
-# define YYLTYPE yyltype\n\
-#endif\n");
- if (!pure_parser)
- fprintf (out, "\nextern YYLTYPE %slloc;\n",
- spec_name_prefix ? spec_name_prefix : "yy");
- }
-
- if (semantic_parser)
- {
- int i;
-
- for (i = ntokens; i < nsyms; i++)
- /* don't make these for dummy nonterminals made by gensym. */
- if (*symbols[i]->tag != '@')
- fprintf (out, "# define NT%s\t%d\n", symbols[i]->tag, i);
- }
-
- fprintf (out, "\n#endif /* not %s */\n", macro_name);
- free (macro_name);
- xfclose (out);
-}
-
/*----------------------------------------------------------.
| Output the parsing tables and the parser code to ftable. |
{
obstack_init (&format_obstack);
- output_token_translations ();
- output_gram ();
-
- XFREE (ritem);
- if (semantic_parser)
- output_stos ();
- output_rule_data ();
+ prepare_tokens ();
+ prepare_rules ();
+ prepare_states ();
output_actions ();
prepare ();
/* Process the selected skeleton file. */
output_skeleton ();
- /* Output the header if needed. */
-
- if (0)
- header_output ();
-
- free (rules + 1);
obstack_free (&muscle_obstack, NULL);
obstack_free (&format_obstack, NULL);
obstack_free (&action_obstack, NULL);
projects / bison.git / blobdiff