mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-15 07:13:02 +00:00
* src/gram.h (rule_t): guard' and guard_line' are new members.
* src/reader.c (symbol_list): `guard' and `guard_line' are new members. (symbol_list_new): Adjust. (copy_action): action_line is the first line, not the last. (copy_guard): Just as for actions, store the `action' only, not the switch/case/break flesh. Don't parse the user action that might follow the guard, let... (readgram): do it, i.e., now, there can be an action after a guard. In other words the guard is just explicitly optional. (packgram): Adjust. * src/output.c (guards_output): New. (output_parser): Call it when needed. (output): Also free the guard and attrs obstacks. * src/files.c, src/files.h (obstack_save): Remove. (output_files): Remove. As a result, if one needs the former `.act' file, using an appropriate skeleton which requires actions and guards is now required. * src/main.c (main): Adjust. * tests/semantic.at: New. * tests/regression.at: Use `input.y' as input file name. Avoid 8+3 problems by requiring input.c when the test needs the parser.
This commit is contained in:
47
src/files.c
47
src/files.c
@@ -164,18 +164,6 @@ xfclose (FILE *ptr)
|
||||
return result;
|
||||
}
|
||||
|
||||
/*--------------------------------------------------.
|
||||
| Save the content of the obstack OBS in FILENAME. |
|
||||
`--------------------------------------------------*/
|
||||
|
||||
static void
|
||||
obstack_save (struct obstack *obs, const char *filename)
|
||||
{
|
||||
FILE *out = xfopen (filename, "w");
|
||||
size_t size = obstack_object_size (obs);
|
||||
fwrite (obstack_finish (obs), 1, size, out);
|
||||
xfclose (out);
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------.
|
||||
| Return the path to the skeleton which locaction might be given in |
|
||||
@@ -436,38 +424,3 @@ compute_output_file_names (void)
|
||||
attrsfile = stringappend (attrsfile, header_extension);
|
||||
#endif /* MSDOS */
|
||||
}
|
||||
|
||||
|
||||
/*---------------------------.
|
||||
| Produce the output files. |
|
||||
`---------------------------*/
|
||||
|
||||
void
|
||||
output_files (void)
|
||||
{
|
||||
#if 0
|
||||
/* Seems to be invalid now --akim. */
|
||||
|
||||
/* If we output only the table, dump the actions in ACTFILE. */
|
||||
if (no_parser_flag)
|
||||
obstack_save (&action_obstack, stringappend (short_base_name, ".act"));
|
||||
obstack_free (&action_obstack, NULL);
|
||||
#endif
|
||||
|
||||
/* If we produced a semantic parser ATTRS_OBSTACK must be dumped
|
||||
into its own file, ATTTRSFILE. */
|
||||
if (semantic_parser)
|
||||
{
|
||||
char *temp_name;
|
||||
|
||||
obstack_save (&attrs_obstack, attrsfile);
|
||||
temp_name = stringappend (short_base_name, EXT_GUARD_C);
|
||||
#ifndef MSDOS
|
||||
temp_name = stringappend (temp_name, src_extension);
|
||||
#endif /* MSDOS */
|
||||
obstack_save (&guard_obstack, temp_name);
|
||||
}
|
||||
|
||||
obstack_free (&guard_obstack, NULL);
|
||||
obstack_free (&attrs_obstack, NULL);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user