* 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.

tests/Makefile.am

@@ -25,7 +25,9 @@ MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
 TESTSUITE_AT = \
 	testsuite.at \
-	output.at sets.at reduce.at calc.at torture.at regression.at
+	output.at sets.at reduce.at calc.at torture.at regression.at \
+        semantic.at
+
 TESTSUITE = $(srcdir)/testsuite
 
 AUTOTEST = $(AUTOM4TE) --language=autotest

tests/regression.at

@@ -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
 

tests/semantic.at

@@ -0,0 +1,47 @@
+# Bison Semantic Parsers.                               -*- Autotest -*-
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AT_BANNER([[Semantic Parsers.]])
+
+# Well, nothing, or almost, is known about semantic parsers.  For the
+# time being, just make sure we still parse them properly.
+
+## ---------------- ##
+## Parsing Guards.  ##
+## ---------------- ##
+
+
+AT_SETUP([Parsing Guards])
+
+AT_DATA([input.y],
+[[%semantic-parser
+%union {
+  int ival;
+}
+%token <ival> INT
+%type  <ival> exp
+%%
+exp: exp '+' exp { $$ = $1 + $3 }
+   | exp '/' exp %guard { if ($3 == 0) yyerror = 1 } { $$ = $1 / $3 }
+   | INT
+%%
+]])
+
+AT_CHECK([bison -v input.y -o input.c], 0, ignore, ignore)
+
+AT_CLEANUP

tests/testsuite.at

@@ -31,3 +31,4 @@ m4_include([reduce.at])
 m4_include([calc.at])
 m4_include([torture.at])
 m4_include([regression.at])
+m4_include([semantic.at])