Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-11 05:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Still making progress in separating Bison into (i) input, (ii)

Browse Source 
process, (iii) output: now we can directly output the parser file
without using table_obstack at all.
* src/files.c, src/files.h (table_obstack): Bye bye.
(parser_file_name): New.
* src/files.c (compute_output_file_names): Compute it.
* src/output.c (actions_output, output_parser)
(output_master_parser): To a file instead of an obstack.
This commit is contained in:
Akim Demaille
2001-12-15 14:35:57 +00:00
parent 3f96f4dc41
commit ea52d7066d
4 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/output.c
View File

@@ -515,25 +515,25 @@ token_actions (void)
`-----------------------------*/
static void
actions_output (struct obstack *oout)
actions_output (FILE *out)
{
int rule;
for (rule = 1; rule < nrules + 1; ++rule)
if (rule_table[rule].action)
{
obstack_fgrow1 (oout, " case %d:\n", rule);
fprintf (out, " case %d:\n", rule);
if (!no_lines_flag)
obstack_fgrow2 (oout, muscle_find ("linef"),
rule_table[rule].action_line,
quotearg_style (c_quoting_style,
muscle_find ("filename")));
obstack_1grow (oout, '{');
obstack_sgrow (oout, rule_table[rule].action);
fprintf (out, muscle_find ("linef"),
rule_table[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. */
obstack_fgrow1 (oout, "%s}\n break;\n\n", yacc_flag ? ";" : "");
fprintf (out, "{ %s%s }\n break;\n\n",
rule_table[rule].action,
yacc_flag ? ";" : "");
}
}
@@ -924,7 +924,7 @@ output_actions (void)
`------------------------------------------------------------*/
static void
output_parser (const char *skel_filename, struct obstack *oout)
output_parser (const char *skel_filename, FILE *out)
{
int c;
FILE *fskel;
@@ -941,7 +941,7 @@ output_parser (const char *skel_filename, struct obstack *oout)
{
if (c == '\n')
++line;
obstack_1grow (oout, c);
putc (c, out);
c = getc (fskel);
}
else if ((c = getc (fskel)) == '%')
@@ -958,19 +958,19 @@ output_parser (const char *skel_filename, struct obstack *oout)
muscle_key = obstack_finish (&muscle_obstack);
muscle_value = muscle_find (muscle_key);
if (!strcmp (muscle_key, "actions"))
actions_output (oout);
actions_output (out);
else if (!strcmp (muscle_key, "line"))
obstack_fgrow1 (oout, "%d", line + 1);
fprintf (out, "%d", line + 1);
else if (muscle_value)
obstack_sgrow (oout, muscle_value);
fputs (muscle_value, out);
else
{
obstack_sgrow (oout, "%%");
obstack_sgrow (oout, muscle_key);
fputs ("%%", out);
fputs (muscle_key, out);
}
}
else
obstack_1grow (oout, '%');
putc ('%', out);
}
/* End. */
@@ -984,6 +984,7 @@ output_parser (const char *skel_filename, struct obstack *oout)
static void
output_master_parser (void)
{
FILE *parser = xfopen (parser_file_name, "w");
if (!skeleton)
{
if (semantic_parser)
@@ -992,7 +993,9 @@ output_master_parser (void)
skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
}
muscle_insert ("skeleton", skeleton);
output_parser (skeleton, &table_obstack);
output_parser (skeleton, parser);
xfclose (parser);
}