* 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:
Akim Demaille
2001-12-27 18:06:06 +00:00
parent d945f5cd8e
commit f499b06243
11 changed files with 147 additions and 83 deletions

View File

@@ -25,7 +25,7 @@ AT_BANNER([[Regression tests.]])
AT_SETUP([Duplicate string])
AT_DATA([duplicate.y],
AT_DATA([input.y],
[[/* `Bison -v' used to dump core when two tokens are defined with the same
string, as LE and GE below. */
@@ -38,7 +38,7 @@ exp: '(' exp ')' | NUM ;
%%
]])
AT_CHECK([bison -v duplicate.y -o duplicate.c], 0, ignore, ignore)
AT_CHECK([bison -v input.y -o input.c], 0, ignore, ignore)
AT_CLEANUP
@@ -478,7 +478,7 @@ AT_CLEANUP
AT_SETUP([%union and --defines])
AT_DATA([union.y],
AT_DATA([input.y],
[%union
{
int integer;
@@ -488,7 +488,7 @@ AT_DATA([union.y],
exp: {};
])
AT_CHECK([bison --defines union.y])
AT_CHECK([bison --defines input.y])
AT_CLEANUP
@@ -500,7 +500,7 @@ AT_CLEANUP
AT_SETUP([%union and C comments])
AT_DATA([union-comment.y],
AT_DATA([input.y],
[%union
{
/* The int. */ int integer;
@@ -510,8 +510,8 @@ AT_DATA([union-comment.y],
exp: {};
])
AT_CHECK([bison union-comment.y])
AT_CHECK([fgrep '//*' union-comment.tab.c], [1], [])
AT_CHECK([bison input.y -o input.c])
AT_CHECK([fgrep '//*' input.c], [1], [])
AT_CLEANUP