Replace `%push-parser' and `%push-pull-parser' with

`%define push_pull "push"' and `%define push_pull "both"'.
`%define push_pull "pull"' is the default.
* doc/bison.texinfo (Push Decl, Push Parser Function,
Pull Parser Function, Parser Create Function, Parser Delete Function):
Update declarations.
(Decl Summary, Table of Symbols): Replace %push-parser and
%push-pull-parser entries with a %define push_pull entry.
* data/bison.m4 (b4_percent_define_check_values): New macro.
(b4_pull_if, b4_push_if, b4_use_push_for_pull_if): Move these
definitions...
* data/c.m4 (b4_identification): ... and the YYPUSH and YYPULL cpp
definitions...
* data/push.c: ... to here and compute them from the value of the
%define variable push_pull.
* data/c-skel.m4: Instead of choosing the push.c skeleton for push
parsing requests here...
* data/yacc.c: ... hack this to switch to push.c any time
b4_use_push_pull_flag or the %define variable push_pull is set.  This
will go away when we mv push.c yacc.c.
* data/c++-skel.m4, data/glr.c, data/java-skel.m4: Don't report that
push parsing is not supported since unused %define variables are
reported anyway.
* src/getargs.c, src/getargs.h (pull_parser, push_parser): Remove.
* src/muscle_tab.h (muscle_percent_define_check_values): Update
comments for consistency with b4_percent_define_check_values.
* src/output.c (prepare): Don't insert b4_pull_flag and b4_push_flag
muscles.
* src/parse-gram.y (PERCENT_PUSH_PARSER, PERCENT_PUSH_PULL_PARSER):
Remove.
(prologue_declaration): Remove %push-parser and %push-pull-parser
rules.
* src/scan-gram.l (%push-parser, %push-pull-parser): Remove rules.
* tests/calc.at: Update declarations.
* tests/input.at (%define enum variables): New test case.
* tests/push.at (Push Parsing: Memory Leak for Early Deletion): Update
declaration.
(Push Parsing: Multiple impure instances): Update declaration.
(Push Parsing: Unsupported Skeletons): New test case.
* tests/torture.at (Exploding the Stack Size with Alloca): Update
declaration.
(Exploding the Stack Size with Malloc): Update declaration.

diff --git a/ChangeLog b/ChangeLog
index 844f2f1d40852d41f84ae283e1b9a1c83168802f..ae91903bd6a9d24a33a2f87967fc10b73e2a8817 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+2007-09-25  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Replace `%push-parser' and `%push-pull-parser' with
+       `%define push_pull "push"' and `%define push_pull "both"'.
+       `%define push_pull "pull"' is the default.
+       * doc/bison.texinfo (Push Decl, Push Parser Function,
+       Pull Parser Function, Parser Create Function, Parser Delete Function):
+       Update declarations.
+       (Decl Summary, Table of Symbols): Replace %push-parser and
+       %push-pull-parser entries with a %define push_pull entry.
+       * data/bison.m4 (b4_percent_define_check_values): New macro.
+       (b4_pull_if, b4_push_if, b4_use_push_for_pull_if): Move these
+       definitions...
+       * data/c.m4 (b4_identification): ... and the YYPUSH and YYPULL cpp
+       definitions...
+       * data/push.c: ... to here and compute them from the value of the
+       %define variable push_pull.
+       * data/c-skel.m4: Instead of choosing the push.c skeleton for push
+       parsing requests here...
+       * data/yacc.c: ... hack this to switch to push.c any time
+       b4_use_push_pull_flag or the %define variable push_pull is set.  This
+       will go away when we mv push.c yacc.c.
+       * data/c++-skel.m4, data/glr.c, data/java-skel.m4: Don't report that
+       push parsing is not supported since unused %define variables are
+       reported anyway.
+       * src/getargs.c, src/getargs.h (pull_parser, push_parser): Remove.
+       * src/muscle_tab.h (muscle_percent_define_check_values): Update
+       comments for consistency with b4_percent_define_check_values.
+       * src/output.c (prepare): Don't insert b4_pull_flag and b4_push_flag
+       muscles.
+       * src/parse-gram.y (PERCENT_PUSH_PARSER, PERCENT_PUSH_PULL_PARSER):
+       Remove.
+       (prologue_declaration): Remove %push-parser and %push-pull-parser
+       rules.
+       * src/scan-gram.l (%push-parser, %push-pull-parser): Remove rules.
+       * tests/calc.at: Update declarations.
+       * tests/input.at (%define enum variables): New test case.
+       * tests/push.at (Push Parsing: Memory Leak for Early Deletion): Update
+       declaration.
+       (Push Parsing: Multiple impure instances): Update declaration.
+       (Push Parsing: Unsupported Skeletons): New test case.
+       * tests/torture.at (Exploding the Stack Size with Alloca): Update
+       declaration.
+       (Exploding the Stack Size with Malloc): Update declaration.
+

 2007-09-24  Wojciech Polak  <polak@gnu.org>
 
        Add XSLT transformations.
 2007-09-24  Wojciech Polak  <polak@gnu.org>
 
        Add XSLT transformations.

diff --git a/data/bison.m4 b/data/bison.m4
index 332aa7bc77ee1e38bebc0899fdd560d6b2226804..395245d0bd4631bd5fb9cdeffef2cb301168908a 100644 (file)
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -214,13 +214,7 @@ b4_define_flag_if([error_verbose]) # Whether error are verbose.
 b4_define_flag_if([glr])               # Whether a GLR parser is requested.
 b4_define_flag_if([locations])         # Whether locations are tracked.
 b4_define_flag_if([nondeterministic])  # Whether conflicts should be handled.
 b4_define_flag_if([glr])               # Whether a GLR parser is requested.
 b4_define_flag_if([locations])         # Whether locations are tracked.
 b4_define_flag_if([nondeterministic])  # Whether conflicts should be handled.

-b4_define_flag_if([pull])              # Whether pull parsing is requested.

 b4_define_flag_if([pure])              # Whether the interface is pure.
 b4_define_flag_if([pure])              # Whether the interface is pure.

-b4_define_flag_if([push])              # Whether push parsing is requested.
-b4_define_flag_if([use_push_for_pull])  # Whether push parsing should be used
-                                        # in place of pull parsing (where
-                                        # available) for the sake of the test
-                                        # suite.

 b4_define_flag_if([yacc])              # Whether POSIX Yacc is emulated.
 
 
 b4_define_flag_if([yacc])              # Whether POSIX Yacc is emulated.
 
 


@@ -403,6 +397,43 @@ m4_define([b4_percent_define_default],
             m4_define([b4_percent_define_loc(]$1[)],
                       [[[[[Bison:b4_percent_define_default]:0.0]], [[[Bison:b4_percent_define_default]:0.0]]]])])])
 
             m4_define([b4_percent_define_loc(]$1[)],
                       [[[[[Bison:b4_percent_define_default]:0.0]], [[[Bison:b4_percent_define_default]:0.0]]]])])])
 

+# b4_percent_define_check_values(VALUES)
+# --------------------------------------
+# Mimic muscle_percent_define_check_values in ../src/muscle_tab.h exactly
+# except that the VALUES structure is more appropriate for M4.  That is, VALUES
+# is a list of sublists of strings.  For each sublist, the first string is the
+# name of a %define variable, and all remaining strings in that sublist are the
+# valid values for that variable.  Complain if such a variable is undefined (a
+# Bison error since the default value should have been set already) or defined
+# to any other value (possibly a user error).  Don't record this as a Bison
+# usage of the variable as there's no reason to suspect that the value has yet
+# influenced the output.
+#
+# For example:
+#
+#   b4_percent_define_check_values([[[[foo]], [[foo-value1]], [[foo-value2]]]],
+#                                  [[[[bar]], [[bar-value1]]]])
+m4_define([b4_percent_define_check_values],
+[m4_foreach([b4_sublist], m4_quote($@),
+            [_b4_percent_define_check_values(b4_sublist)])])
+
+m4_define([_b4_percent_define_check_values],
+[m4_ifdef([b4_percent_define(]$1[)],
+  [m4_pushdef([b4_good_value], [0])dnl
+   m4_if($#, 1, [],
+         [m4_foreach([b4_value], m4_dquote(m4_shift($@)),
+                     [m4_if(m4_indir([b4_percent_define(]$1[)]), b4_value,
+                            [m4_define([b4_good_value], [1])])])])dnl
+   m4_if(b4_good_value, [0],
+         [m4_pushdef([b4_loc], m4_indir([b4_percent_define_loc(]$1[)]))dnl
+          b4_complain_at(b4_loc,
+                         [[invalid value for %%define variable `%s': `%s']],
+                         [$1],
+                         m4_dquote(m4_indir([b4_percent_define(]$1[)])))dnl
+          m4_popdef([b4_loc])])dnl
+   m4_popdef([b4_good_value])],
+  [b4_fatal([[undefined %%define variable `%s' passed to b4_percent_define_check_values]], [$1])])])
+

 # b4_percent_code_get([QUALIFIER])
 # --------------------------------
 # If any %code blocks for QUALIFIER are defined, emit them beginning with a
 # b4_percent_code_get([QUALIFIER])
 # --------------------------------
 # If any %code blocks for QUALIFIER are defined, emit them beginning with a

diff --git a/data/c++-skel.m4 b/data/c++-skel.m4
index b76a7557e98410f045bbc2965e0dbedd41c3b00e..b8089ff8623f084b89696f72df2ee6205163e562 100644 (file)
--- a/data/c++-skel.m4
+++ b/data/c++-skel.m4
@@ -19,8 +19,6 @@
 b4_glr_if(             [m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])])
 b4_nondeterministic_if([m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])])
 
 b4_glr_if(             [m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])])
 b4_nondeterministic_if([m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])])
 

-b4_push_if([b4_complain([[C++ push parsers are not supported]])])
-

 m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.cc]])
 m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])
 
 m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.cc]])
 m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])
 

diff --git a/data/c-skel.m4 b/data/c-skel.m4
index 9a8bd587fa47464c74146c477c0e5cfb3e1e86c3..91f3c20523ce85286b6201f60c563c1112bf7b69 100644 (file)
--- a/data/c-skel.m4
+++ b/data/c-skel.m4
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

-b4_push_if(            [m4_define([b4_used_skeleton], [b4_pkgdatadir/[push.c]])])

 b4_glr_if(             [m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.c]])])
 b4_nondeterministic_if([m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.c]])])
 
 b4_glr_if(             [m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.c]])])
 b4_nondeterministic_if([m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.c]])])
 

diff --git a/data/c.m4 b/data/c.m4
index 955edee6f7c875b3a4240c2729f90ed461ac07ec..f5f38ba1bac284bba943cbe49fd5ac4badb112a2 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -41,12 +41,6 @@ m4_define([b4_identification],
 /* Pure parsers.  */
 [#]define YYPURE b4_pure_flag
 
 /* Pure parsers.  */
 [#]define YYPURE b4_pure_flag
 

-/* Push parsers.  */
-[#]define YYPUSH b4_push_flag
-
-/* Pull parsers.  */
-[#]define YYPULL b4_pull_flag
-

 /* Using locations.  */
 [#]define YYLSP_NEEDED b4_locations_flag
 ])
 /* Using locations.  */
 [#]define YYLSP_NEEDED b4_locations_flag
 ])

diff --git a/data/glr.c b/data/glr.c
index c23a9e666ea3a6de6bfadc29f62c50413cc3f4a7..0f0e3daa0a4c79c0a9a7ce4e0bfdb71f35c8ffeb 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -20,9 +20,6 @@
 
 m4_include(b4_pkgdatadir/[c.m4])
 
 
 m4_include(b4_pkgdatadir/[c.m4])
 

-b4_push_if([
-b4_complain([[non-deterministic push parsers are not yet supported]])])
-

 ## ---------------- ##
 ## Default values.  ##
 ## ---------------- ##
 ## ---------------- ##
 ## Default values.  ##
 ## ---------------- ##

diff --git a/data/java-skel.m4 b/data/java-skel.m4
index e1376280941cdb9ea194d6d7b5e1df212e26f902..7c4aa1095d9d9fc525a1e8da311515ea406280f2 100644 (file)
--- a/data/java-skel.m4
+++ b/data/java-skel.m4
@@ -18,7 +18,6 @@
 
 b4_glr_if(             [b4_complain([%%glr-parser not supported for Java])])
 b4_nondeterministic_if([b4_complain([%%nondeterministic-parser not supported for Java])])
 
 b4_glr_if(             [b4_complain([%%glr-parser not supported for Java])])
 b4_nondeterministic_if([b4_complain([%%nondeterministic-parser not supported for Java])])

-b4_push_if(            [b4_complain([%%push-parser is not supported for Java])])

 
 m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.java]])
 m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])
 
 m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.java]])
 m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])

diff --git a/data/push.c b/data/push.c
index 68095c1f753e4f8c06f3264d2a88633ae8a43026..d96712b785c56ccd7ea10176c77144bca7e97cca 100644 (file)
--- a/data/push.c
+++ b/data/push.c
@@ -18,17 +18,22 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

+# Check the value of %define push_pull.
+b4_percent_define_default([[push_pull]], [[pull]])
+b4_percent_define_check_values([[[[push_pull]], [[pull]], [[push]], [[both]]]])
+b4_define_flag_if([pull]) m4_define([b4_pull_flag], [[1]])
+b4_define_flag_if([push]) m4_define([b4_push_flag], [[1]])
+m4_case(b4_percent_define_get([[push_pull]]),
+        [pull], [m4_define([b4_push_flag], [[0]])],
+        [push], [m4_define([b4_pull_flag], [[0]])])
+

 # Handle BISON_USE_PUSH_FOR_PULL for the test suite.  So that push parsing
 # tests function as written, don't let BISON_USE_PUSH_FOR_PULL modify Bison's
 # behavior at all when push parsing is already requested.
 # Handle BISON_USE_PUSH_FOR_PULL for the test suite.  So that push parsing
 # tests function as written, don't let BISON_USE_PUSH_FOR_PULL modify Bison's
 # behavior at all when push parsing is already requested.

+b4_define_flag_if([use_push_for_pull])

 b4_use_push_for_pull_if([
 b4_use_push_for_pull_if([

-  b4_push_if([
-    m4_define([b4_use_push_for_pull_flag], [[0]])
-    b4_define_flag_if([use_push_for_pull])
-  ], [
-    m4_define([b4_push_flag], [[1]])
-    b4_define_flag_if([push])
-  ])])
+  b4_push_if([m4_define([b4_use_push_for_pull_flag], [[0]])],
+             [m4_define([b4_push_flag], [[1]])])])

 
 m4_include(b4_pkgdatadir/[c.m4])
 
 
 m4_include(b4_pkgdatadir/[c.m4])
 


@@ -157,8 +162,14 @@ b4_copyright([Skeleton implementation for Bison's Yacc-like parsers in C],dnl '
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 

-]b4_identification
-b4_percent_code_get([[top]])[]dnl
+]b4_identification[
+/* Push parsers.  */
+#define YYPUSH ]b4_push_flag[
+
+/* Pull parsers.  */
+#define YYPULL ]b4_pull_flag[
+
+]b4_percent_code_get([[top]])[]dnl

 m4_if(b4_prefix, [yy], [],
 [[/* Substitute the variable and function names.  */
 ]b4_pull_if([[#define yyparse         ]b4_prefix[parse
 m4_if(b4_prefix, [yy], [],
 [[/* Substitute the variable and function names.  */
 ]b4_pull_if([[#define yyparse         ]b4_prefix[parse

diff --git a/data/yacc.c b/data/yacc.c
index 04352a0dbfef10e8d02e20a8262b0852b365f765..5d32a5072c3475d509746f88c6a923bcdc5317f7 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -18,8 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

-# Handle BISON_USE_PUSH_FOR_PULL for the test suite.
-b4_use_push_for_pull_if([m4_include(b4_pkgdatadir/[push.c])], [
+# This hack will go away when we mv push.c yacc.c.
+m4_ifndef([b4_percent_define(push_pull)],
+[m4_if(b4_use_push_for_pull_flag, [0], [

 
 m4_include(b4_pkgdatadir/[c.m4])
 
 
 m4_include(b4_pkgdatadir/[c.m4])
 


@@ -1532,4 +1533,6 @@ b4_percent_code_get([[provides]])
 ])dnl b4_defines_if
 m4_divert_pop(0)
 
 ])dnl b4_defines_if
 m4_divert_pop(0)
 

-])dnl b4_use_push_for_pull_if
+],
+[m4_include(b4_pkgdatadir/[push.c])])],
+[m4_include(b4_pkgdatadir/[push.c])])

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 675c27c2445d9738742819b764b8b253f6eed52e..ccec0d4502171c6b35ce1132af8e0a603790fead 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -4528,7 +4528,7 @@ valid grammar.
 @subsection A Push Parser
 @cindex push parser
 @cindex push parser
 @subsection A Push Parser
 @cindex push parser
 @cindex push parser

-@findex %push-parser
+@findex %define push_pull

 
 A pull parser is called once and it takes control until all its input 
 is completely parsed.  A push parser, on the other hand, is called 
 
 A pull parser is called once and it takes control until all its input 
 is completely parsed.  A push parser, on the other hand, is called 


@@ -4539,12 +4539,12 @@ main event loop in the client's application.  This is typically
 a requirement of a GUI, when the main event loop needs to be triggered 
 within a certain time period.  
 
 a requirement of a GUI, when the main event loop needs to be triggered 
 within a certain time period.  
 

-Normally, Bison generates a pull parser.  The Bison declaration 
-@code{%push-parser} says that you want the parser to be a push parser.
-It looks like this:
+Normally, Bison generates a pull parser.
+The following Bison declaration says that you want the parser to be a push
+parser (@pxref{Decl Summary,,%define push_pull}):

 
 @example
 
 @example

-%push-parser
+%define push_pull "push"

 @end example
 
 In almost all cases, you want to ensure that your push parser is also
 @end example
 
 In almost all cases, you want to ensure that your push parser is also


@@ -4555,7 +4555,7 @@ what you are doing, your declarations should look like this:
 
 @example
 %pure-parser
 
 @example
 %pure-parser

-%push-parser
+%define push_pull "push"

 @end example
 
 There is a major notable functional difference between the pure push parser 
 @end example
 
 There is a major notable functional difference between the pure push parser 


@@ -4604,15 +4604,16 @@ for use by the next invocation of the @code{yypush_parse} function.
 
 Bison also supports both the push parser interface along with the pull parser 
 interface in the same generated parser.  In order to get this functionality,
 
 Bison also supports both the push parser interface along with the pull parser 
 interface in the same generated parser.  In order to get this functionality,

-you should replace the @code{%push-parser} declaration with the 
-@code{%push-pull-parser} declaration.  Doing this will create all of the 
+you should replace the @code{%define push_pull "push"} declaration with the 
+@code{%define push_pull "both"} declaration.  Doing this will create all of the 

 symbols mentioned earlier along with the two extra symbols, @code{yyparse} 
 and @code{yypull_parse}.  @code{yyparse} can be used exactly as it normally 
 would be used.  However, the user should note that it is implemented in the 
 symbols mentioned earlier along with the two extra symbols, @code{yyparse} 
 and @code{yypull_parse}.  @code{yyparse} can be used exactly as it normally 
 would be used.  However, the user should note that it is implemented in the 

-generated parser by calling @code{yypull_parse}.  This makes the 
-@code{yyparse} function that is generated with the @code{%push-pull-parser} 
-declaration slower than the normal @code{yyparse} function.  If the user 
-calls the @code{yypull_parse} function it will parse the rest of the input 
+generated parser by calling @code{yypull_parse}.
+This makes the @code{yyparse} function that is generated with the
+@code{%define push_pull "both"} declaration slower than the normal
+@code{yyparse} function.  If the user
+calls the @code{yypull_parse} function it will parse the rest of the input

 stream.  It is possible to @code{yypush_parse} tokens to select a subgrammar 
 and then @code{yypull_parse} the rest of the input stream.  If you would like 
 to switch back and forth between between parsing styles, you would have to 
 stream.  It is possible to @code{yypush_parse} tokens to select a subgrammar 
 and then @code{yypull_parse} the rest of the input stream.  If you would like 
 to switch back and forth between between parsing styles, you would have to 


@@ -4627,8 +4628,8 @@ yypstate_delete (ps);
 @end example
 
 Adding the @code{%pure-parser} declaration does exactly the same thing to the 
 @end example
 
 Adding the @code{%pure-parser} declaration does exactly the same thing to the 

-generated parser with @code{%push-pull-parser} as it did for 
-@code{%push-parser}.
+generated parser with @code{%define push_pull "both"} as it did for 
+@code{%define push_pull "push"}.

 
 @node Decl Summary
 @subsection Bison Declaration Summary
 
 @node Decl Summary
 @subsection Bison Declaration Summary


@@ -4834,6 +4835,14 @@ target language and/or parser skeleton.
 @end enumerate
 @end deffn
 
 @end enumerate
 @end deffn
 

+@deffn {Directive} %define push_pull "@var{value}"
+Bison declaration to request a @code{"pull"} parser, a @code{"push"} parser, or
+@code{"both"}.
+The default @code{"@var{value}"} is @code{"pull"}.
+This directive is currently only available for LALR(1) parsers in C.
+@xref{Push Decl, ,A Push Parser}.
+@end deffn
+

 @deffn {Directive} %defines
 Write a header file containing macro definitions for the token type
 names defined in the grammar as well as a few other declarations.
 @deffn {Directive} %defines
 Write a header file containing macro definitions for the token type
 names defined in the grammar as well as a few other declarations.


@@ -4944,16 +4953,6 @@ Request a pure (reentrant) parser program (@pxref{Pure Decl, ,A Pure
 (Reentrant) Parser}).
 @end deffn
 
 (Reentrant) Parser}).
 @end deffn
 

-@deffn {Directive} %push-parser
-Bison declaration to request a push parser.
-@xref{Push Decl, ,A Push Parser}.
-@end deffn
-
-@deffn {Directive} %push-pull-parser
-Bison declaration to request a push and a pull parser.
-@xref{Push Decl, ,A Push Parser}.
-@end deffn
-

 @deffn {Directive} %require "@var{version}"
 Require version @var{version} or higher of Bison.  @xref{Require Decl, ,
 Require a Version of Bison}.
 @deffn {Directive} %require "@var{version}"
 Require version @var{version} or higher of Bison.  @xref{Require Decl, ,
 Require a Version of Bison}.


@@ -5163,8 +5162,8 @@ exp: @dots{}    @{ @dots{}; *randomness += 1; @dots{} @}
 @findex yypush_parse
 
 You call the function @code{yypush_parse} to parse a single token.  This 
 @findex yypush_parse
 
 You call the function @code{yypush_parse} to parse a single token.  This 

-function is available if either the @code{%push-parser} or 
-@code{%push-pull-parser} declaration is used.  
+function is available if either the @code{%define push_pull "push"} or 
+@code{%define push_pull "both"} declaration is used.  

 @xref{Push Decl, ,A Push Parser}.
 
 @deftypefun int yypush_parse (yypstate *yyps)
 @xref{Push Decl, ,A Push Parser}.
 
 @deftypefun int yypush_parse (yypstate *yyps)


@@ -5178,7 +5177,7 @@ is required to finish parsing the grammar.
 @findex yypull_parse
 
 You call the function @code{yypull_parse} to parse the rest of the input 
 @findex yypull_parse
 
 You call the function @code{yypull_parse} to parse the rest of the input 

-stream.  This function is available if the @code{%push-pull-parser} 
+stream.  This function is available if the @code{%define push_pull "both"} 

 declaration is used.  
 @xref{Push Decl, ,A Push Parser}.
 
 declaration is used.  
 @xref{Push Decl, ,A Push Parser}.
 


@@ -5191,8 +5190,8 @@ The value returned by @code{yypull_parse} is the same as for @code{yyparse}.
 @findex yypstate_new
 
 You call the function @code{yypstate_new} to create a new parser instance.  
 @findex yypstate_new
 
 You call the function @code{yypstate_new} to create a new parser instance.  

-This function is available if either the @code{%push-parser} or 
-@code{%push-pull-parser} declaration is used.  
+This function is available if either the @code{%define push_pull "push"} or 
+@code{%define push_pull "both"} declaration is used.  

 @xref{Push Decl, ,A Push Parser}.
 
 @deftypefun yypstate *yypstate_new (void)
 @xref{Push Decl, ,A Push Parser}.
 
 @deftypefun yypstate *yypstate_new (void)


@@ -5205,8 +5204,8 @@ or NULL if no memory was available.
 @findex yypstate_delete
 
 You call the function @code{yypstate_delete} to delete a parser instance.
 @findex yypstate_delete
 
 You call the function @code{yypstate_delete} to delete a parser instance.

-This function is available if either the @code{%push-parser} or 
-@code{%push-pull-parser} declaration is used.  
+function is available if either the @code{%define push_pull "push"} or 
+@code{%define push_pull "both"} declaration is used.  

 @xref{Push Decl, ,A Push Parser}.
 
 @deftypefun void yypstate_delete (yypstate *yyps)
 @xref{Push Decl, ,A Push Parser}.
 
 @deftypefun void yypstate_delete (yypstate *yyps)


@@ -9330,6 +9329,12 @@ Define a variable to adjust Bison's behavior.
 @xref{Decl Summary,,%define}.
 @end deffn
 
 @xref{Decl Summary,,%define}.
 @end deffn
 

+@deffn {Directive} %define push_pull "@var{value}"
+Bison declaration to request a @code{"pull"} parser, a @code{"push"} parser, or
+@code{"both"}.
+@xref{Decl Summary,,%define push_pull}.
+@end deffn
+

 @deffn {Directive} %defines
 Bison declaration to create a header file meant for the scanner.
 @xref{Decl Summary}.
 @deffn {Directive} %defines
 Bison declaration to create a header file meant for the scanner.
 @xref{Decl Summary}.


@@ -9452,16 +9457,6 @@ Bison declaration to request a pure (reentrant) parser.
 @xref{Pure Decl, ,A Pure (Reentrant) Parser}.
 @end deffn
 
 @xref{Pure Decl, ,A Pure (Reentrant) Parser}.
 @end deffn
 

-@deffn {Directive} %push-parser
-Bison declaration to request a push parser.
-@xref{Push Decl, ,A Push Parser}.
-@end deffn
-
-@deffn {Directive} %push-pull-parser
-Bison declaration to request a push and a pull parser.
-@xref{Push Decl, ,A Push Parser}.
-@end deffn
-

 @deffn {Directive} %require "@var{version}"
 Require version @var{version} or higher of Bison.  @xref{Require Decl, ,
 Require a Version of Bison}.
 @deffn {Directive} %require "@var{version}"
 Require version @var{version} or higher of Bison.  @xref{Require Decl, ,
 Require a Version of Bison}.

diff --git a/src/getargs.c b/src/getargs.c
index 4e095eb277e3c1c7f0f628a741fb66ceda78130e..45b0dc847f22101eebd19dea64f4579ac4ff553f 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -58,9 +58,7 @@ bool error_verbose = false;
 
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 
 bool nondeterministic_parser = false;
 bool glr_parser = false;

-bool pull_parser = true;

 bool pure_parser = false;
 bool pure_parser = false;

-bool push_parser = false;

 
 int report_flag = report_none;
 int trace_flag = trace_none;
 
 int report_flag = report_none;
 int trace_flag = trace_none;

diff --git a/src/getargs.h b/src/getargs.h
index c7370d7792ed331bcd1720886ee9c24e12ad691e..f75ec1005fb17f8fec17df0ae3b84f4da294ab39 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -51,19 +51,11 @@ extern bool error_verbose;
 
 extern bool glr_parser;
 
 
 extern bool glr_parser;
 

-/* PULL_PARSER is true if should generate a pull parser.  */
-
-extern bool pull_parser;
-

 /* PURE_PARSER is true if should generate a parser that is all pure
    and reentrant.  */
 
 extern bool pure_parser;
 
 /* PURE_PARSER is true if should generate a parser that is all pure
    and reentrant.  */
 
 extern bool pure_parser;
 

-/* PUSH_PARSER is true if should generate a push parser.  */
-
-extern bool push_parser;
-

 /* NONDETERMINISTIC_PARSER is true iff conflicts are accepted.  This
    is used by the GLR parser, and might be used in BackTracking
    parsers too.  */
 /* NONDETERMINISTIC_PARSER is true iff conflicts are accepted.  This
    is used by the GLR parser, and might be used in BackTracking
    parsers too.  */

diff --git a/src/muscle_tab.h b/src/muscle_tab.h
index e2c8a8ecc55ee695f2acd442136e9d22cdf3ce77..c2881577212b7d57cf2181dd9867092e37a7e07b 100644 (file)
--- a/src/muscle_tab.h
+++ b/src/muscle_tab.h
@@ -156,15 +156,17 @@ bool muscle_percent_define_flag_if (char const *variable);
    suspect that the value has yet influenced the output.  */
 void muscle_percent_define_default (char const *variable, char const *value);
 
    suspect that the value has yet influenced the output.  */
 void muscle_percent_define_default (char const *variable, char const *value);
 

-/* VALUES points to a sequence of strings that is partitioned into
-   subsequences by NULL's, one terminating each subsequence.  The last
-   subsequence is followed by a second NULL.  For each subsequence, the first
-   string is the name of a %define variable, and all remaining strings in that
-   subsequence are the valid values for that variable.  Complain if such a
-   variable is undefined (a Bison error since the default value should have
-   been set already) or defined to any other value (possibly a user error).
-   Don't record this as a Bison usage of the variable as there's no reason to
-   suspect that the value has yet influenced the output.  */
+/* Mimic b4_percent_define_check_values in ../data/bison.m4 exactly except that
+   the VALUES structure is more appropriate for C.  That is, VALUES points to a
+   list of strings that is partitioned into sublists by NULL's, one terminating
+   each sublist.  The last sublist is followed by a second NULL.  For each
+   sublist, the first string is the name of a %define variable, and all
+   remaining strings in that sublist are the valid values for that variable.
+   Complain if such a variable is undefined (a Bison error since the default
+   value should have been set already) or defined to any other value (possibly
+   a user error).  Don't record this as a Bison usage of the variable as
+   there's no reason to suspect that the value has yet influenced the
+   output.  */

 void muscle_percent_define_check_values (char const * const *values);
 
 /* Grow the muscle for the %code qualifier QUALIFIER appearing at QUALIFIER_LOC
 void muscle_percent_define_check_values (char const * const *values);
 
 /* Grow the muscle for the %code qualifier QUALIFIER appearing at QUALIFIER_LOC

diff --git a/src/output.c b/src/output.c
index 36f0c69fa6311bcc9f988d62eeec3cbc9f1d591a..6cdc17bc80d9932d776f35068c668716927e4c76 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -571,9 +571,7 @@ prepare (void)
   MUSCLE_INSERT_BOOL ("glr_flag", glr_parser);
   MUSCLE_INSERT_BOOL ("locations_flag", locations_flag);
   MUSCLE_INSERT_BOOL ("nondeterministic_flag", nondeterministic_parser);
   MUSCLE_INSERT_BOOL ("glr_flag", glr_parser);
   MUSCLE_INSERT_BOOL ("locations_flag", locations_flag);
   MUSCLE_INSERT_BOOL ("nondeterministic_flag", nondeterministic_parser);

-  MUSCLE_INSERT_BOOL ("pull_flag", pull_parser);

   MUSCLE_INSERT_BOOL ("pure_flag", pure_parser);
   MUSCLE_INSERT_BOOL ("pure_flag", pure_parser);

-  MUSCLE_INSERT_BOOL ("push_flag", push_parser);

   MUSCLE_INSERT_BOOL ("synclines_flag", !no_lines_flag);
   MUSCLE_INSERT_BOOL ("tag_seen_flag", tag_seen);
   MUSCLE_INSERT_BOOL ("use_push_for_pull_flag", use_push_for_pull_flag);
   MUSCLE_INSERT_BOOL ("synclines_flag", !no_lines_flag);
   MUSCLE_INSERT_BOOL ("tag_seen_flag", tag_seen);
   MUSCLE_INSERT_BOOL ("use_push_for_pull_flag", use_push_for_pull_flag);

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 0a92ba19ec0ea5429842cbb624d72a513a8280f5..a652dcc4cc9686fb4c1f89dabdaf4644bff56c62 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -54,12 +54,6 @@
 /* Pure parsers.  */
 #define YYPURE 1
 
 /* Pure parsers.  */
 #define YYPURE 1
 

-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-

 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 


@@ -75,7 +69,7 @@
 
 /* Copy the first part of user declarations.  */
 
 
 /* Copy the first part of user declarations.  */
 

-/* Line 1535 of yacc.c  */
+/* Line 1538 of yacc.c  */

 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 


@@ -152,8 +146,8 @@ static int current_prec = 0;
 #define YYTYPE_UINT8 uint_fast8_t
 
 
 #define YYTYPE_UINT8 uint_fast8_t
 
 

-/* Line 1535 of yacc.c  */
-#line 157 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 151 "parse-gram.c"

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG


@@ -215,28 +209,26 @@ static int current_prec = 0;
      PERCENT_OUTPUT = 289,
      PERCENT_PARSE_PARAM = 290,
      PERCENT_PURE_PARSER = 291,
      PERCENT_OUTPUT = 289,
      PERCENT_PARSE_PARAM = 290,
      PERCENT_PURE_PARSER = 291,

-     PERCENT_PUSH_PARSER = 292,
-     PERCENT_PUSH_PULL_PARSER = 293,
-     PERCENT_REQUIRE = 294,
-     PERCENT_SKELETON = 295,
-     PERCENT_START = 296,
-     PERCENT_TOKEN_TABLE = 297,
-     PERCENT_VERBOSE = 298,
-     PERCENT_YACC = 299,
-     BRACED_CODE = 300,
-     CHAR = 301,
-     EPILOGUE = 302,
-     EQUAL = 303,
-     ID = 304,
-     ID_COLON = 305,
-     PERCENT_PERCENT = 306,
-     PIPE = 307,
-     PROLOGUE = 308,
-     SEMICOLON = 309,
-     TYPE = 310,
-     TYPE_TAG_ANY = 311,
-     TYPE_TAG_NONE = 312,
-     PERCENT_UNION = 313
+     PERCENT_REQUIRE = 292,
+     PERCENT_SKELETON = 293,
+     PERCENT_START = 294,
+     PERCENT_TOKEN_TABLE = 295,
+     PERCENT_VERBOSE = 296,
+     PERCENT_YACC = 297,
+     BRACED_CODE = 298,
+     CHAR = 299,
+     EPILOGUE = 300,
+     EQUAL = 301,
+     ID = 302,
+     ID_COLON = 303,
+     PERCENT_PERCENT = 304,
+     PIPE = 305,
+     PROLOGUE = 306,
+     SEMICOLON = 307,
+     TYPE = 308,
+     TYPE_TAG_ANY = 309,
+     TYPE_TAG_NONE = 310,
+     PERCENT_UNION = 311

    };
 #endif
 /* Tokens.  */
    };
 #endif
 /* Tokens.  */


@@ -275,28 +267,26 @@ static int current_prec = 0;
 #define PERCENT_OUTPUT 289
 #define PERCENT_PARSE_PARAM 290
 #define PERCENT_PURE_PARSER 291
 #define PERCENT_OUTPUT 289
 #define PERCENT_PARSE_PARAM 290
 #define PERCENT_PURE_PARSER 291

-#define PERCENT_PUSH_PARSER 292
-#define PERCENT_PUSH_PULL_PARSER 293
-#define PERCENT_REQUIRE 294
-#define PERCENT_SKELETON 295
-#define PERCENT_START 296
-#define PERCENT_TOKEN_TABLE 297
-#define PERCENT_VERBOSE 298
-#define PERCENT_YACC 299
-#define BRACED_CODE 300
-#define CHAR 301
-#define EPILOGUE 302
-#define EQUAL 303
-#define ID 304
-#define ID_COLON 305
-#define PERCENT_PERCENT 306
-#define PIPE 307
-#define PROLOGUE 308
-#define SEMICOLON 309
-#define TYPE 310
-#define TYPE_TAG_ANY 311
-#define TYPE_TAG_NONE 312
-#define PERCENT_UNION 313
+#define PERCENT_REQUIRE 292
+#define PERCENT_SKELETON 293
+#define PERCENT_START 294
+#define PERCENT_TOKEN_TABLE 295
+#define PERCENT_VERBOSE 296
+#define PERCENT_YACC 297
+#define BRACED_CODE 298
+#define CHAR 299
+#define EPILOGUE 300
+#define EQUAL 301
+#define ID 302
+#define ID_COLON 303
+#define PERCENT_PERCENT 304
+#define PIPE 305
+#define PROLOGUE 306
+#define SEMICOLON 307
+#define TYPE 308
+#define TYPE_TAG_ANY 309
+#define TYPE_TAG_NONE 310
+#define PERCENT_UNION 311

 
 
 
 
 
 


@@ -305,7 +295,7 @@ static int current_prec = 0;
 typedef union YYSTYPE
 {
 
 typedef union YYSTYPE
 {
 

-/* Line 1535 of yacc.c  */
+/* Line 1538 of yacc.c  */

 #line 94 "parse-gram.y"
 
   symbol *symbol;
 #line 94 "parse-gram.y"
 
   symbol *symbol;


@@ -319,8 +309,8 @@ typedef union YYSTYPE
 
 
 
 
 
 

-/* Line 1535 of yacc.c  */
-#line 324 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 314 "parse-gram.c"

 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */


@@ -344,8 +334,8 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 
 /* Copy the second part of user declarations.  */
 
 

-/* Line 1535 of yacc.c  */
-#line 349 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 339 "parse-gram.c"

 
 #ifdef short
 # undef short
 
 #ifdef short
 # undef short


@@ -562,20 +552,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */

-#define YYLAST   158
+#define YYLAST   155

 
 /* YYNTOKENS -- Number of terminals.  */
 
 /* YYNTOKENS -- Number of terminals.  */

-#define YYNTOKENS  59
+#define YYNTOKENS  57

 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  31
 /* YYNRULES -- Number of rules.  */
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  31
 /* YYNRULES -- Number of rules.  */

-#define YYNRULES  103
+#define YYNRULES  101

 /* YYNRULES -- Number of states.  */
 /* YYNRULES -- Number of states.  */

-#define YYNSTATES  141
+#define YYNSTATES  139

 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2

-#define YYMAXUTOK   313
+#define YYMAXUTOK   311

 
 #define YYTRANSLATE(YYX)                                               \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 #define YYTRANSLATE(YYX)                                               \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)


@@ -614,7 +604,7 @@ static const yytype_uint8 yytranslate[] =
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57,    58
+      55,    56

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG


@@ -625,62 +615,61 @@ static const yytype_uint16 yyprhs[] =
        0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
       24,    27,    29,    32,    35,    38,    42,    44,    47,    50,
       53,    55,    58,    62,    64,    66,    69,    73,    76,    78,
        0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
       24,    27,    29,    32,    35,    38,    42,    44,    47,    50,
       53,    55,    58,    62,    64,    66,    69,    73,    76,    78,

-      80,    82,    85,    88,    90,    92,    94,    96,    98,   100,
-     103,   107,   111,   113,   115,   118,   122,   123,   125,   129,
-     130,   134,   135,   139,   143,   147,   149,   151,   153,   154,
-     156,   158,   161,   163,   166,   168,   170,   172,   174,   176,
-     178,   181,   184,   188,   190,   193,   195,   198,   200,   203,
-     206,   207,   211,   213,   217,   220,   221,   224,   227,   231,
-     235,   239,   241,   243,   244,   246,   248,   250,   252,   254,
-     256,   258,   260,   261
+      81,    84,    86,    88,    90,    92,    94,    96,    99,   103,
+     107,   109,   111,   114,   118,   119,   121,   125,   126,   130,
+     131,   135,   139,   143,   145,   147,   149,   150,   152,   154,
+     157,   159,   162,   164,   166,   168,   170,   172,   174,   177,
+     180,   184,   186,   189,   191,   194,   196,   199,   202,   203,
+     207,   209,   213,   216,   217,   220,   223,   227,   231,   235,
+     237,   239,   240,   242,   244,   246,   248,   250,   252,   254,
+     256,   257

 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {

-      60,     0,    -1,    61,    51,    76,    89,    -1,    -1,    61,
-      62,    -1,    63,    -1,    53,    -1,    17,    -1,    19,    82,
-      83,    -1,    20,    -1,    20,     3,    -1,    21,    -1,    22,
-       4,    -1,    23,     4,    -1,    24,     3,    -1,    24,    48,
-       3,    -1,    25,    -1,    26,    45,    -1,    27,     3,    -1,
-      28,    45,    -1,    29,    -1,    30,     3,    -1,    30,    48,
+      58,     0,    -1,    59,    49,    74,    87,    -1,    -1,    59,
+      60,    -1,    61,    -1,    51,    -1,    17,    -1,    19,    80,
+      81,    -1,    20,    -1,    20,     3,    -1,    21,    -1,    22,
+       4,    -1,    23,     4,    -1,    24,     3,    -1,    24,    46,
+       3,    -1,    25,    -1,    26,    43,    -1,    27,     3,    -1,
+      28,    43,    -1,    29,    -1,    30,     3,    -1,    30,    46,

        3,    -1,    32,    -1,    33,    -1,    34,     3,    -1,    34,
        3,    -1,    32,    -1,    33,    -1,    34,     3,    -1,    34,

-      48,     3,    -1,    35,    45,    -1,    36,    -1,    37,    -1,
-      38,    -1,    39,     3,    -1,    40,     3,    -1,    42,    -1,
-      43,    -1,    44,    -1,    54,    -1,    68,    -1,    65,    -1,
-      41,    87,    -1,     8,    45,    72,    -1,     9,    45,    72,
-      -1,    18,    -1,    31,    -1,    16,    84,    -1,    16,    49,
-      84,    -1,    -1,    49,    -1,    58,    64,    84,    -1,    -1,
-       6,    66,    75,    -1,    -1,     5,    67,    75,    -1,     7,
-      55,    71,    -1,    69,    70,    71,    -1,    10,    -1,    11,
-      -1,    12,    -1,    -1,    55,    -1,    87,    -1,    71,    87,
-      -1,    73,    -1,    72,    73,    -1,    87,    -1,    55,    -1,
-      56,    -1,    57,    -1,    55,    -1,    85,    -1,    85,     4,
-      -1,    85,    88,    -1,    85,     4,    88,    -1,    74,    -1,
-      75,    74,    -1,    77,    -1,    76,    77,    -1,    78,    -1,
-      63,    54,    -1,     1,    54,    -1,    -1,    86,    79,    80,
-      -1,    81,    -1,    80,    52,    81,    -1,    80,    54,    -1,
-      -1,    81,    87,    -1,    81,    45,    -1,    81,    13,    87,
-      -1,    81,    14,     4,    -1,    81,    15,    55,    -1,    49,
-      -1,     3,    -1,    -1,     3,    -1,    45,    -1,    49,    -1,
-      46,    -1,    50,    -1,    85,    -1,    88,    -1,     3,    -1,
-      -1,    51,    47,    -1
+      46,     3,    -1,    35,    43,    -1,    36,    -1,    37,     3,
+      -1,    38,     3,    -1,    40,    -1,    41,    -1,    42,    -1,
+      52,    -1,    66,    -1,    63,    -1,    39,    85,    -1,     8,
+      43,    70,    -1,     9,    43,    70,    -1,    18,    -1,    31,
+      -1,    16,    82,    -1,    16,    47,    82,    -1,    -1,    47,
+      -1,    56,    62,    82,    -1,    -1,     6,    64,    73,    -1,
+      -1,     5,    65,    73,    -1,     7,    53,    69,    -1,    67,
+      68,    69,    -1,    10,    -1,    11,    -1,    12,    -1,    -1,
+      53,    -1,    85,    -1,    69,    85,    -1,    71,    -1,    70,
+      71,    -1,    85,    -1,    53,    -1,    54,    -1,    55,    -1,
+      53,    -1,    83,    -1,    83,     4,    -1,    83,    86,    -1,
+      83,     4,    86,    -1,    72,    -1,    73,    72,    -1,    75,
+      -1,    74,    75,    -1,    76,    -1,    61,    52,    -1,     1,
+      52,    -1,    -1,    84,    77,    78,    -1,    79,    -1,    78,
+      50,    79,    -1,    78,    52,    -1,    -1,    79,    85,    -1,
+      79,    43,    -1,    79,    13,    85,    -1,    79,    14,     4,
+      -1,    79,    15,    53,    -1,    47,    -1,     3,    -1,    -1,
+       3,    -1,    43,    -1,    47,    -1,    44,    -1,    48,    -1,
+      83,    -1,    86,    -1,     3,    -1,    -1,    49,    45,    -1

 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {

-       0,   207,   207,   215,   217,   221,   222,   232,   233,   237,
-     238,   243,   244,   245,   246,   247,   248,   253,   262,   263,
-     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
-     274,   275,   276,   300,   301,   302,   303,   307,   308,   309,
-     313,   320,   327,   331,   335,   342,   357,   358,   362,   374,
-     374,   379,   379,   384,   395,   410,   411,   412,   416,   417,
-     422,   424,   429,   430,   434,   435,   436,   437,   442,   447,
-     452,   458,   464,   475,   476,   485,   486,   492,   493,   494,
-     501,   501,   505,   506,   507,   512,   513,   515,   517,   519,
-     521,   531,   532,   538,   541,   550,   570,   572,   581,   586,
-     587,   592,   599,   601
+       0,   204,   204,   212,   214,   218,   219,   229,   230,   234,
+     235,   240,   241,   242,   243,   244,   245,   250,   259,   260,
+     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
+     271,   295,   296,   297,   298,   302,   303,   304,   308,   315,
+     322,   326,   330,   337,   352,   353,   357,   369,   369,   374,
+     374,   379,   390,   405,   406,   407,   411,   412,   417,   419,
+     424,   425,   429,   430,   431,   432,   437,   442,   447,   453,
+     459,   470,   471,   480,   481,   487,   488,   489,   496,   496,
+     500,   501,   502,   507,   508,   510,   512,   514,   516,   526,
+     527,   533,   536,   545,   565,   567,   576,   581,   582,   587,
+     594,   596

 };
 #endif
 
 };
 #endif
 


@@ -698,19 +687,18 @@ static const char *const yytname[] =
   "\"%initial-action\"", "\"%language\"", "\"%lex-param\"",
   "\"%locations\"", "\"%name-prefix\"", "\"%no-default-prec\"",
   "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"",
   "\"%initial-action\"", "\"%language\"", "\"%lex-param\"",
   "\"%locations\"", "\"%name-prefix\"", "\"%no-default-prec\"",
   "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"",

-  "\"%parse-param\"", "\"%pure-parser\"", "\"%push-parser\"",
-  "\"%push-pull-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"",
-  "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"",
-  "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
-  "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", "\"<*>\"", "\"<>\"",
-  "\"%union\"", "$accept", "input", "prologue_declarations",
-  "prologue_declaration", "grammar_declaration", "union_name",
-  "symbol_declaration", "$@1", "$@2", "precedence_declaration",
-  "precedence_declarator", "type.opt", "symbols.1", "generic_symlist",
-  "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
-  "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs",
-  "variable", "content.opt", "braceless", "id", "id_colon", "symbol",
-  "string_as_id", "epilogue.opt", 0
+  "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"",
+  "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"",
+  "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"",
+  "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"",
+  "\"<*>\"", "\"<>\"", "\"%union\"", "$accept", "input",
+  "prologue_declarations", "prologue_declaration", "grammar_declaration",
+  "union_name", "symbol_declaration", "$@1", "$@2",
+  "precedence_declaration", "precedence_declarator", "type.opt",
+  "symbols.1", "generic_symlist", "generic_symlist_item", "symbol_def",
+  "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules",
+  "$@3", "rhses.1", "rhs", "variable", "content.opt", "braceless", "id",
+  "id_colon", "symbol", "string_as_id", "epilogue.opt", 0

 };
 #endif
 
 };
 #endif
 


@@ -724,24 +712,24 @@ static const yytype_uint16 yytoknum[] =
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
      295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
      295,   296,   297,   298,   299,   300,   301,   302,   303,   304,

-     305,   306,   307,   308,   309,   310,   311,   312,   313
+     305,   306,   307,   308,   309,   310,   311

 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {

-       0,    59,    60,    61,    61,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    62,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    62,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    62,    62,    62,    63,    63,    63,
-      63,    63,    63,    63,    63,    63,    64,    64,    63,    66,
-      65,    67,    65,    65,    68,    69,    69,    69,    70,    70,
-      71,    71,    72,    72,    73,    73,    73,    73,    74,    74,
-      74,    74,    74,    75,    75,    76,    76,    77,    77,    77,
-      79,    78,    80,    80,    80,    81,    81,    81,    81,    81,
-      81,    82,    82,    83,    83,    84,    85,    85,    86,    87,
-      87,    88,    89,    89
+       0,    57,    58,    59,    59,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    60,    61,    61,    61,    61,    61,
+      61,    61,    61,    61,    62,    62,    61,    64,    63,    65,
+      63,    63,    66,    67,    67,    67,    68,    68,    69,    69,
+      70,    70,    71,    71,    71,    71,    72,    72,    72,    72,
+      72,    73,    73,    74,    74,    75,    75,    75,    77,    76,
+      78,    78,    78,    79,    79,    79,    79,    79,    79,    80,
+      80,    81,    81,    82,    83,    83,    84,    85,    85,    86,
+      87,    87

 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */


@@ -749,15 +737,15 @@ static const yytype_uint8 yyr2[] =
 {
        0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
        2,     1,     2,     2,     2,     3,     1,     2,     2,     2,
 {
        0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
        2,     1,     2,     2,     2,     3,     1,     2,     2,     2,

-       1,     2,     3,     1,     1,     2,     3,     2,     1,     1,
-       1,     2,     2,     1,     1,     1,     1,     1,     1,     2,
-       3,     3,     1,     1,     2,     3,     0,     1,     3,     0,
-       3,     0,     3,     3,     3,     1,     1,     1,     0,     1,
-       1,     2,     1,     2,     1,     1,     1,     1,     1,     1,
-       2,     2,     3,     1,     2,     1,     2,     1,     2,     2,
-       0,     3,     1,     3,     2,     0,     2,     2,     3,     3,
-       3,     1,     1,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     2
+       1,     2,     3,     1,     1,     2,     3,     2,     1,     2,
+       2,     1,     1,     1,     1,     1,     1,     2,     3,     3,
+       1,     1,     2,     3,     0,     1,     3,     0,     3,     0,
+       3,     3,     3,     1,     1,     1,     0,     1,     1,     2,
+       1,     2,     1,     1,     1,     1,     1,     1,     2,     2,
+       3,     1,     2,     1,     2,     1,     2,     2,     0,     3,
+       1,     3,     2,     0,     2,     2,     3,     3,     3,     1,
+       1,     0,     1,     1,     1,     1,     1,     1,     1,     1,
+       0,     2

 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state


@@ -765,127 +753,124 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {

-       3,     0,     0,     1,    51,    49,     0,     0,     0,    55,
-      56,    57,     0,     7,    42,     0,     9,    11,     0,     0,
-       0,    16,     0,     0,     0,    20,     0,    43,    23,    24,
-       0,     0,    28,    29,    30,     0,     0,     0,    33,    34,
-      35,     0,     6,    36,    46,     4,     5,    38,    37,    58,
-       0,     0,     0,     0,     0,    95,     0,    44,    92,    91,
-      93,    10,    12,    13,    14,     0,    17,    18,    19,    21,
-       0,    25,     0,    27,    31,    32,   101,    97,    96,    99,
-      39,   100,     0,    98,     0,     0,    75,    77,    80,    47,
-       0,    59,     0,    68,    73,    52,    69,    50,    53,    60,
-      65,    66,    67,    40,    62,    64,    41,    45,    94,     8,
-      15,    22,    26,    79,    78,     0,    76,     2,    85,    48,
-      54,    74,    70,    71,    61,    63,   103,    81,    82,    72,
-      85,    84,     0,     0,     0,    87,    86,    83,    88,    89,
-      90
+       3,     0,     0,     1,    49,    47,     0,     0,     0,    53,
+      54,    55,     0,     7,    40,     0,     9,    11,     0,     0,
+       0,    16,     0,     0,     0,    20,     0,    41,    23,    24,
+       0,     0,    28,     0,     0,     0,    31,    32,    33,     0,
+       6,    34,    44,     4,     5,    36,    35,    56,     0,     0,
+       0,     0,     0,    93,     0,    42,    90,    89,    91,    10,
+      12,    13,    14,     0,    17,    18,    19,    21,     0,    25,
+       0,    27,    29,    30,    99,    95,    94,    97,    37,    98,
+       0,    96,     0,     0,    73,    75,    78,    45,     0,    57,
+       0,    66,    71,    50,    67,    48,    51,    58,    63,    64,
+      65,    38,    60,    62,    39,    43,    92,     8,    15,    22,
+      26,    77,    76,     0,    74,     2,    83,    46,    52,    72,
+      68,    69,    59,    61,   101,    79,    80,    70,    83,    82,
+       0,     0,     0,    85,    84,    81,    86,    87,    88

 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */

-static const yytype_int16 yydefgoto[] =
+static const yytype_int8 yydefgoto[] =

 {
 {

-      -1,     1,     2,    45,    84,    90,    47,    51,    50,    48,
-      49,    92,    98,   103,   104,    94,    95,    85,    86,    87,
-     118,   127,   128,    60,   109,    57,    79,    88,   105,    81,
-     117
+      -1,     1,     2,    43,    82,    88,    45,    49,    48,    46,
+      47,    90,    96,   101,   102,    92,    93,    83,    84,    85,
+     116,   125,   126,    58,   107,    55,    77,    86,   103,    79,
+     115

 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */

-#define YYPACT_NINF -79
+#define YYPACT_NINF -60

 static const yytype_int16 yypact[] =
 {
 static const yytype_int16 yypact[] =
 {

-     -79,     5,    96,   -79,   -79,   -79,    -6,    13,    18,   -79,
-     -79,   -79,    -8,   -79,   -79,    27,    66,   -79,    74,    82,
-      31,   -79,    43,    86,    45,   -79,    32,   -79,   -79,   -79,
-      33,    47,   -79,   -79,   -79,    91,    93,    26,   -79,   -79,
-     -79,    15,   -79,   -79,    48,   -79,   -79,   -79,   -79,    44,
-      38,    38,    26,    11,    11,   -79,    53,   -79,   -79,   -79,
-     106,   -79,   -79,   -79,   -79,   107,   -79,   -79,   -79,   -79,
-     108,   -79,   138,   -79,   -79,   -79,   -79,   -79,   -79,   -79,
-     -79,   -79,    88,   -79,    89,     1,   -79,   -79,   -79,   -79,
-      53,   -79,    26,   -79,   -79,    38,    50,    38,    26,   -79,
-     -79,   -79,   -79,    11,   -79,   -79,    11,   -79,   -79,   -79,
-     -79,   -79,   -79,   -79,   -79,    97,   -79,   -79,   -79,   -79,
-      26,   -79,   142,   -79,   -79,   -79,   -79,    -7,    25,   -79,
-     -79,   -79,    26,   144,    98,   -79,   -79,    25,   -79,   -79,
-     -79
+     -60,    18,    96,   -60,   -60,   -60,   -16,    17,    24,   -60,
+     -60,   -60,    -8,   -60,   -60,    11,    70,   -60,    71,    80,
+       2,   -60,    46,    87,    49,   -60,    31,   -60,   -60,   -60,
+      40,    50,   -60,    91,    93,     0,   -60,   -60,   -60,    15,
+     -60,   -60,    51,   -60,   -60,   -60,   -60,    44,    12,    12,
+       0,    25,    25,   -60,    56,   -60,   -60,   -60,   106,   -60,
+     -60,   -60,   -60,   107,   -60,   -60,   -60,   -60,   108,   -60,
+     136,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,
+      88,   -60,    89,     1,   -60,   -60,   -60,   -60,    56,   -60,
+       0,   -60,   -60,    12,    84,    12,     0,   -60,   -60,   -60,
+     -60,    25,   -60,   -60,    25,   -60,   -60,   -60,   -60,   -60,
+     -60,   -60,   -60,    97,   -60,   -60,   -60,   -60,     0,   -60,
+     140,   -60,   -60,   -60,   -60,    14,    38,   -60,   -60,   -60,
+       0,   142,    98,   -60,   -60,    38,   -60,   -60,   -60

 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {

-     -79,   -79,   -79,   -79,   149,   -79,   -79,   -79,   -79,   -79,
-     -79,   -79,    54,   101,   -21,   -33,   105,   -79,    67,   -79,
-     -79,   -79,    28,   -79,   -79,   -13,   -47,   -79,   -37,   -78,
-     -79
+     -60,   -60,   -60,   -60,   147,   -60,   -60,   -60,   -60,   -60,
+     -60,   -60,    54,   101,   -59,   -25,   105,   -60,    67,   -60,
+     -60,   -60,    27,   -60,   -60,   -50,   -19,   -60,   -35,   -58,
+     -60

 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */

-#define YYTABLE_NINF -103
+#define YYTABLE_NINF -101

 static const yytype_int16 yytable[] =
 {
 static const yytype_int16 yytable[] =
 {

-      80,  -102,    82,    96,    96,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    76,    99,    82,    12,   123,    14,
-       4,     5,     6,     7,     8,     9,    10,    11,    76,    76,
-      58,    12,    27,    14,    64,    69,    71,    55,   132,   133,
-     134,    56,    37,   107,   129,   130,    27,   131,    96,    52,
-      96,    83,   115,    76,   122,    99,    37,    77,    53,    44,
-      78,   124,   121,    54,   121,    83,   100,   101,   102,    61,
-     135,    77,    77,    44,    78,    78,    59,   119,    62,    65,
-      70,    72,   125,   124,    77,   125,    63,    78,    66,    67,
-      68,   136,    73,    93,    74,   138,    75,    89,    55,    91,
-     136,     4,     5,     6,     7,     8,     9,    10,    11,   108,
-     110,   111,    12,    13,    14,    15,    16,    17,    18,    19,
+      78,  -100,    80,    74,   105,    62,     4,     5,     6,     7,
+       8,     9,    10,    11,    56,    97,    80,    12,     3,    14,
+       4,     5,     6,     7,     8,     9,    10,    11,    74,    94,
+      94,    12,    27,    14,    67,    53,   121,    50,   117,    54,
+      35,    74,   123,    69,    75,   123,    27,    76,    63,    81,
+     113,   130,   131,   132,    35,    97,    75,    42,    57,    76,
+      51,   122,   127,    81,   128,    91,   129,    52,   119,    75,
+     119,    42,    76,    59,    94,    60,    94,    68,    98,    99,
+     100,   133,    75,   122,    61,    76,    70,    74,   120,    64,
+      65,   134,    66,    71,    72,   136,    73,    89,    87,    53,
+     134,     4,     5,     6,     7,     8,     9,    10,    11,   106,
+     108,   109,    12,    13,    14,    15,    16,    17,    18,    19,

       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,

-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,   112,   113,   114,   126,    76,   120,    41,   139,    42,
-      43,    46,   116,   140,    44,   106,    97,     0,   137
+      30,    31,    32,    33,    34,    35,    36,    37,    38,   110,
+     111,   112,   124,    74,   118,    39,   137,    40,    41,    44,
+     114,   138,    42,   104,    95,   135

 };
 
 };
 

-static const yytype_int16 yycheck[] =
+static const yytype_uint8 yycheck[] =

 {
 {

-      37,     0,     1,    50,    51,     0,     5,     6,     7,     8,
-       9,    10,    11,    12,     3,    52,     1,    16,    96,    18,
-       5,     6,     7,     8,     9,    10,    11,    12,     3,     3,
-       3,    16,    31,    18,     3,     3,     3,    45,    13,    14,
-      15,    49,    41,    56,   122,    52,    31,    54,    95,    55,
-      97,    50,    51,     3,     4,    92,    41,    46,    45,    58,
-      49,    98,    95,    45,    97,    50,    55,    56,    57,     3,
-      45,    46,    46,    58,    49,    49,    49,    90,     4,    48,
-      48,    48,   103,   120,    46,   106,     4,    49,    45,     3,
-      45,   128,    45,    55,     3,   132,     3,    49,    45,    55,
-     137,     5,     6,     7,     8,     9,    10,    11,    12,     3,
+      35,     0,     1,     3,    54,     3,     5,     6,     7,     8,
+       9,    10,    11,    12,     3,    50,     1,    16,     0,    18,
+       5,     6,     7,     8,     9,    10,    11,    12,     3,    48,
+      49,    16,    31,    18,     3,    43,    94,    53,    88,    47,
+      39,     3,   101,     3,    44,   104,    31,    47,    46,    48,
+      49,    13,    14,    15,    39,    90,    44,    56,    47,    47,
+      43,    96,   120,    48,    50,    53,    52,    43,    93,    44,
+      95,    56,    47,     3,    93,     4,    95,    46,    53,    54,
+      55,    43,    44,   118,     4,    47,    46,     3,     4,    43,
+       3,   126,    43,    43,     3,   130,     3,    53,    47,    43,
+     135,     5,     6,     7,     8,     9,    10,    11,    12,     3,

        3,     3,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
        3,     3,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,     3,    54,    54,    47,     3,    92,    51,     4,    53,
-      54,     2,    85,    55,    58,    54,    51,    -1,   130
+      34,    35,    36,    37,    38,    39,    40,    41,    42,     3,
+      52,    52,    45,     3,    90,    49,     4,    51,    52,     2,
+      83,    53,    56,    52,    49,   128

 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {

-       0,    60,    61,     0,     5,     6,     7,     8,     9,    10,
+       0,    58,    59,     0,     5,     6,     7,     8,     9,    10,

       11,    12,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       11,    12,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    51,    53,    54,    58,    62,    63,    65,    68,    69,
-      67,    66,    55,    45,    45,    45,    49,    84,     3,    49,
-      82,     3,     4,     4,     3,    48,    45,     3,    45,     3,
-      48,     3,    48,    45,     3,     3,     3,    46,    49,    85,
-      87,    88,     1,    50,    63,    76,    77,    78,    86,    49,
-      64,    55,    70,    55,    74,    75,    85,    75,    71,    87,
-      55,    56,    57,    72,    73,    87,    72,    84,     3,    83,
-       3,     3,     3,    54,    54,    51,    77,    89,    79,    84,
-      71,    74,     4,    88,    87,    73,    47,    80,    81,    88,
-      52,    54,    13,    14,    15,    45,    87,    81,    87,     4,
-      55
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    49,
+      51,    52,    56,    60,    61,    63,    66,    67,    65,    64,
+      53,    43,    43,    43,    47,    82,     3,    47,    80,     3,
+       4,     4,     3,    46,    43,     3,    43,     3,    46,     3,
+      46,    43,     3,     3,     3,    44,    47,    83,    85,    86,
+       1,    48,    61,    74,    75,    76,    84,    47,    62,    53,
+      68,    53,    72,    73,    83,    73,    69,    85,    53,    54,
+      55,    70,    71,    85,    70,    82,     3,    81,     3,     3,
+       3,    52,    52,    49,    75,    87,    77,    82,    69,    72,
+       4,    86,    85,    71,    45,    78,    79,    86,    50,    52,
+      13,    14,    15,    43,    85,    79,    85,     4,    53

 };
 
 #define yyerrok                (yyerrstatus = 0)
 };
 
 #define yyerrok                (yyerrstatus = 0)


@@ -1035,147 +1020,147 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     {
       case 3: /* "\"string\"" */
 
     {
       case 3: /* "\"string\"" */
 

-/* Line 1535 of yacc.c  */
-#line 185 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 182 "parse-gram.y"

        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 
        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 

-/* Line 1535 of yacc.c  */
-#line 1044 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1029 "parse-gram.c"

        break;
       case 4: /* "\"integer\"" */
 
        break;
       case 4: /* "\"integer\"" */
 

-/* Line 1535 of yacc.c  */
-#line 196 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 193 "parse-gram.y"

        { fprintf (stderr, "%d", (yyvaluep->integer)); };
 
        { fprintf (stderr, "%d", (yyvaluep->integer)); };
 

-/* Line 1535 of yacc.c  */
-#line 1053 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1038 "parse-gram.c"

        break;
        break;

-      case 45: /* "\"{...}\"" */
+      case 43: /* "\"{...}\"" */

 
 

-/* Line 1535 of yacc.c  */
-#line 187 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 184 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 

-/* Line 1535 of yacc.c  */
-#line 1062 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1047 "parse-gram.c"

        break;
        break;

-      case 46: /* "\"char\"" */
+      case 44: /* "\"char\"" */

 
 

-/* Line 1535 of yacc.c  */
-#line 179 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 176 "parse-gram.y"

        { fputs (char_name ((yyvaluep->character)), stderr); };
 
        { fputs (char_name ((yyvaluep->character)), stderr); };
 

-/* Line 1535 of yacc.c  */
-#line 1071 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1056 "parse-gram.c"

        break;
        break;

-      case 47: /* "\"epilogue\"" */
+      case 45: /* "\"epilogue\"" */

 
 

-/* Line 1535 of yacc.c  */
-#line 187 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 184 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 1535 of yacc.c  */
-#line 1080 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1065 "parse-gram.c"

        break;
        break;

-      case 49: /* "\"identifier\"" */
+      case 47: /* "\"identifier\"" */

 
 

-/* Line 1535 of yacc.c  */
-#line 192 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 189 "parse-gram.y"

        { fputs ((yyvaluep->uniqstr), stderr); };
 
        { fputs ((yyvaluep->uniqstr), stderr); };
 

-/* Line 1535 of yacc.c  */
-#line 1089 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1074 "parse-gram.c"

        break;
        break;

-      case 50: /* "\"identifier:\"" */
+      case 48: /* "\"identifier:\"" */

 
 

-/* Line 1535 of yacc.c  */
-#line 193 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 190 "parse-gram.y"

        { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 
        { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 

-/* Line 1535 of yacc.c  */
-#line 1098 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1083 "parse-gram.c"

        break;
        break;

-      case 53: /* "\"%{...%}\"" */
+      case 51: /* "\"%{...%}\"" */

 
 

-/* Line 1535 of yacc.c  */
-#line 187 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 184 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 1535 of yacc.c  */
-#line 1107 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1092 "parse-gram.c"

        break;
        break;

-      case 55: /* "\"type\"" */
+      case 53: /* "\"type\"" */

 
 

-/* Line 1535 of yacc.c  */
-#line 191 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 188 "parse-gram.y"

        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
 
        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
 

-/* Line 1535 of yacc.c  */
-#line 1116 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1101 "parse-gram.c"

        break;
        break;

-      case 82: /* "variable" */
+      case 80: /* "variable" */

 
 

-/* Line 1535 of yacc.c  */
-#line 192 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 189 "parse-gram.y"

        { fputs ((yyvaluep->uniqstr), stderr); };
 
        { fputs ((yyvaluep->uniqstr), stderr); };
 

-/* Line 1535 of yacc.c  */
-#line 1125 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1110 "parse-gram.c"

        break;
        break;

-      case 83: /* "content.opt" */
+      case 81: /* "content.opt" */

 
 

-/* Line 1535 of yacc.c  */
-#line 187 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 184 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 1535 of yacc.c  */
-#line 1134 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1119 "parse-gram.c"

        break;
        break;

-      case 84: /* "braceless" */
+      case 82: /* "braceless" */

 
 

-/* Line 1535 of yacc.c  */
-#line 187 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 184 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 1535 of yacc.c  */
-#line 1143 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1128 "parse-gram.c"

        break;
        break;

-      case 85: /* "id" */
+      case 83: /* "id" */

 
 

-/* Line 1535 of yacc.c  */
-#line 199 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 196 "parse-gram.y"

        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 

-/* Line 1535 of yacc.c  */
-#line 1152 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1137 "parse-gram.c"

        break;
        break;

-      case 86: /* "id_colon" */
+      case 84: /* "id_colon" */

 
 

-/* Line 1535 of yacc.c  */
-#line 200 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 197 "parse-gram.y"

        { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
 
        { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
 

-/* Line 1535 of yacc.c  */
-#line 1161 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1146 "parse-gram.c"

        break;
        break;

-      case 87: /* "symbol" */
+      case 85: /* "symbol" */

 
 

-/* Line 1535 of yacc.c  */
-#line 199 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 196 "parse-gram.y"

        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 

-/* Line 1535 of yacc.c  */
-#line 1170 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1155 "parse-gram.c"

        break;
        break;

-      case 88: /* "string_as_id" */
+      case 86: /* "string_as_id" */

 
 

-/* Line 1535 of yacc.c  */
-#line 199 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 196 "parse-gram.y"

        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 

-/* Line 1535 of yacc.c  */
-#line 1179 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1164 "parse-gram.c"

        break;
       default:
        break;
        break;
       default:
        break;


@@ -1689,7 +1674,7 @@ YYLTYPE yylloc;
 
   /* User initialization code.  */
   
 
   /* User initialization code.  */
   

-/* Line 1535 of yacc.c  */
+/* Line 1538 of yacc.c  */

 #line 86 "parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
 #line 86 "parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default


@@ -1698,8 +1683,8 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 

-/* Line 1535 of yacc.c  */
-#line 1703 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 1688 "parse-gram.c"

   yylsp[0] = yylloc;
   goto yysetstate;
 
   yylsp[0] = yylloc;
   goto yysetstate;
 


@@ -1884,8 +1869,8 @@ yyreduce:
     {
         case 6:
 
     {
         case 6:
 

-/* Line 1535 of yacc.c  */
-#line 223 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 220 "parse-gram.y"

     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));


@@ -1899,15 +1884,15 @@ yyreduce:
 
   case 7:
 
 
   case 7:
 

-/* Line 1535 of yacc.c  */
-#line 232 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 229 "parse-gram.y"

     { debug_flag = true; }
     break;
 
   case 8:
 
     { debug_flag = true; }
     break;
 
   case 8:
 

-/* Line 1535 of yacc.c  */
-#line 234 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 231 "parse-gram.y"

     {
       muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars));
     }
     {
       muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars));
     }


@@ -1915,15 +1900,15 @@ yyreduce:
 
   case 9:
 
 
   case 9:
 

-/* Line 1535 of yacc.c  */
-#line 237 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 234 "parse-gram.y"

     { defines_flag = true; }
     break;
 
   case 10:
 
     { defines_flag = true; }
     break;
 
   case 10:
 

-/* Line 1535 of yacc.c  */
-#line 239 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 236 "parse-gram.y"

     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));


@@ -1932,43 +1917,43 @@ yyreduce:
 
   case 11:
 
 
   case 11:
 

-/* Line 1535 of yacc.c  */
-#line 243 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 240 "parse-gram.y"

     { error_verbose = true; }
     break;
 
   case 12:
 
     { error_verbose = true; }
     break;
 
   case 12:
 

-/* Line 1535 of yacc.c  */
-#line 244 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 241 "parse-gram.y"

     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 
     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 

-/* Line 1535 of yacc.c  */
-#line 245 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 242 "parse-gram.y"

     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 
     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 

-/* Line 1535 of yacc.c  */
-#line 246 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 243 "parse-gram.y"

     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 
     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 

-/* Line 1535 of yacc.c  */
-#line 247 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 244 "parse-gram.y"

     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 
     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 

-/* Line 1535 of yacc.c  */
-#line 249 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 246 "parse-gram.y"

     {
       nondeterministic_parser = true;
       glr_parser = true;
     {
       nondeterministic_parser = true;
       glr_parser = true;


@@ -1977,8 +1962,8 @@ yyreduce:
 
   case 17:
 
 
   case 17:
 

-/* Line 1535 of yacc.c  */
-#line 254 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 251 "parse-gram.y"

     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));


@@ -1991,106 +1976,92 @@ yyreduce:
 
   case 18:
 
 
   case 18:
 

-/* Line 1535 of yacc.c  */
-#line 262 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 259 "parse-gram.y"

     { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
     break;
 
   case 19:
 
     { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
     break;
 
   case 19:
 

-/* Line 1535 of yacc.c  */
-#line 263 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 260 "parse-gram.y"

     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 
     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 

-/* Line 1535 of yacc.c  */
-#line 264 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 261 "parse-gram.y"

     { locations_flag = true; }
     break;
 
   case 21:
 
     { locations_flag = true; }
     break;
 
   case 21:
 

-/* Line 1535 of yacc.c  */
-#line 265 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 262 "parse-gram.y"

     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 
     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 

-/* Line 1535 of yacc.c  */
-#line 266 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 263 "parse-gram.y"

     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 
     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 

-/* Line 1535 of yacc.c  */
-#line 267 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 264 "parse-gram.y"

     { no_lines_flag = true; }
     break;
 
   case 24:
 
     { no_lines_flag = true; }
     break;
 
   case 24:
 

-/* Line 1535 of yacc.c  */
-#line 268 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 265 "parse-gram.y"

     { nondeterministic_parser = true; }
     break;
 
   case 25:
 
     { nondeterministic_parser = true; }
     break;
 
   case 25:
 

-/* Line 1535 of yacc.c  */
-#line 269 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 266 "parse-gram.y"

     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 
     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 

-/* Line 1535 of yacc.c  */
-#line 270 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 267 "parse-gram.y"

     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 
     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 

-/* Line 1535 of yacc.c  */
-#line 271 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 268 "parse-gram.y"

     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 
     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 

-/* Line 1535 of yacc.c  */
-#line 272 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 269 "parse-gram.y"

     { pure_parser = true; }
     break;
 
   case 29:
 
     { pure_parser = true; }
     break;
 
   case 29:
 

-/* Line 1535 of yacc.c  */
-#line 273 "parse-gram.y"
-    { push_parser = true; pull_parser = false; }
-    break;
-
-  case 30:
-
-/* Line 1535 of yacc.c  */
-#line 274 "parse-gram.y"
-    { push_parser = true; pull_parser = true; }
-    break;
-
-  case 31:
-
-/* Line 1535 of yacc.c  */
-#line 275 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 270 "parse-gram.y"

     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 

-  case 32:
+  case 30:

 
 

-/* Line 1535 of yacc.c  */
-#line 277 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 272 "parse-gram.y"

     {
       char const *skeleton_user = (yyvsp[(2) - (2)].chars);
       if (strchr (skeleton_user, '/'))
     {
       char const *skeleton_user = (yyvsp[(2) - (2)].chars);
       if (strchr (skeleton_user, '/'))


@@ -2116,40 +2087,40 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 33:
+  case 31:

 
 

-/* Line 1535 of yacc.c  */
-#line 300 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 295 "parse-gram.y"

     { token_table_flag = true; }
     break;
 
     { token_table_flag = true; }
     break;
 

-  case 34:
+  case 32:

 
 

-/* Line 1535 of yacc.c  */
-#line 301 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 296 "parse-gram.y"

     { report_flag = report_states; }
     break;
 
     { report_flag = report_states; }
     break;
 

-  case 35:
+  case 33:

 
 

-/* Line 1535 of yacc.c  */
-#line 302 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 297 "parse-gram.y"

     { yacc_flag = true; }
     break;
 
     { yacc_flag = true; }
     break;
 

-  case 39:
+  case 37:

 
 

-/* Line 1535 of yacc.c  */
-#line 310 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 305 "parse-gram.y"

     {
       grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
     }
     break;
 
     {
       grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
     }
     break;
 

-  case 40:
+  case 38:

 
 

-/* Line 1535 of yacc.c  */
-#line 314 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 309 "parse-gram.y"

     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)


@@ -2158,10 +2129,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 41:
+  case 39:

 
 

-/* Line 1535 of yacc.c  */
-#line 321 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 316 "parse-gram.y"

     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)


@@ -2170,28 +2141,28 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 42:
+  case 40:

 
 

-/* Line 1535 of yacc.c  */
-#line 328 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 323 "parse-gram.y"

     {
       default_prec = true;
     }
     break;
 
     {
       default_prec = true;
     }
     break;
 

-  case 43:
+  case 41:

 
 

-/* Line 1535 of yacc.c  */
-#line 332 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 327 "parse-gram.y"

     {
       default_prec = false;
     }
     break;
 
     {
       default_prec = false;
     }
     break;
 

-  case 44:
+  case 42:

 
 

-/* Line 1535 of yacc.c  */
-#line 336 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 331 "parse-gram.y"

     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */


@@ -2200,34 +2171,34 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 45:
+  case 43:

 
 

-/* Line 1535 of yacc.c  */
-#line 343 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 338 "parse-gram.y"

     {
       muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
       code_scanner_last_string_free ();
     }
     break;
 
     {
       muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
       code_scanner_last_string_free ();
     }
     break;
 

-  case 46:
+  case 44:

 
 

-/* Line 1535 of yacc.c  */
-#line 357 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 352 "parse-gram.y"

     {}
     break;
 
     {}
     break;
 

-  case 47:
+  case 45:

 
 

-/* Line 1535 of yacc.c  */
-#line 358 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 353 "parse-gram.y"

     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 

-  case 48:
+  case 46:

 
 

-/* Line 1535 of yacc.c  */
-#line 363 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 358 "parse-gram.y"

     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));


@@ -2235,44 +2206,44 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 49:
+  case 47:

 
 

-/* Line 1535 of yacc.c  */
-#line 374 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 369 "parse-gram.y"

     { current_class = nterm_sym; }
     break;
 
     { current_class = nterm_sym; }
     break;
 

-  case 50:
+  case 48:

 
 

-/* Line 1535 of yacc.c  */
-#line 375 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 370 "parse-gram.y"

     {
       current_class = unknown_sym;
       current_type = NULL;
     }
     break;
 
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
     break;
 

-  case 51:
+  case 49:

 
 

-/* Line 1535 of yacc.c  */
-#line 379 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 374 "parse-gram.y"

     { current_class = token_sym; }
     break;
 
     { current_class = token_sym; }
     break;
 

-  case 52:
+  case 50:

 
 

-/* Line 1535 of yacc.c  */
-#line 380 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 375 "parse-gram.y"

     {
       current_class = unknown_sym;
       current_type = NULL;
     }
     break;
 
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
     break;
 

-  case 53:
+  case 51:

 
 

-/* Line 1535 of yacc.c  */
-#line 385 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 380 "parse-gram.y"

     {
       symbol_list *list;
       tag_seen = true;
     {
       symbol_list *list;
       tag_seen = true;


@@ -2282,10 +2253,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 54:
+  case 52:

 
 

-/* Line 1535 of yacc.c  */
-#line 396 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 391 "parse-gram.y"

     {
       symbol_list *list;
       ++current_prec;
     {
       symbol_list *list;
       ++current_prec;


@@ -2299,121 +2270,121 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 55:
+  case 53:

 
 

-/* Line 1535 of yacc.c  */
-#line 410 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 405 "parse-gram.y"

     { (yyval.assoc) = left_assoc; }
     break;
 
     { (yyval.assoc) = left_assoc; }
     break;
 

-  case 56:
+  case 54:

 
 

-/* Line 1535 of yacc.c  */
-#line 411 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 406 "parse-gram.y"

     { (yyval.assoc) = right_assoc; }
     break;
 
     { (yyval.assoc) = right_assoc; }
     break;
 

-  case 57:
+  case 55:

 
 

-/* Line 1535 of yacc.c  */
-#line 412 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 407 "parse-gram.y"

     { (yyval.assoc) = non_assoc; }
     break;
 
     { (yyval.assoc) = non_assoc; }
     break;
 

-  case 58:
+  case 56:

 
 

-/* Line 1535 of yacc.c  */
-#line 416 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 411 "parse-gram.y"

     { current_type = NULL; }
     break;
 
     { current_type = NULL; }
     break;
 

-  case 59:
+  case 57:

 
 

-/* Line 1535 of yacc.c  */
-#line 417 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 412 "parse-gram.y"

     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 

-  case 60:
+  case 58:

 
 

-/* Line 1535 of yacc.c  */
-#line 423 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 418 "parse-gram.y"

     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 

-  case 61:
+  case 59:

 
 

-/* Line 1535 of yacc.c  */
-#line 425 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 420 "parse-gram.y"

     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 

-  case 62:
+  case 60:

 
 

-/* Line 1535 of yacc.c  */
-#line 429 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 424 "parse-gram.y"

     { (yyval.list) = (yyvsp[(1) - (1)].list); }
     break;
 
     { (yyval.list) = (yyvsp[(1) - (1)].list); }
     break;
 

-  case 63:
+  case 61:

 
 

-/* Line 1535 of yacc.c  */
-#line 430 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 425 "parse-gram.y"

     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
     break;
 
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
     break;
 

-  case 64:
+  case 62:

 
 

-/* Line 1535 of yacc.c  */
-#line 434 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 429 "parse-gram.y"

     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 

-  case 65:
+  case 63:

 
 

-/* Line 1535 of yacc.c  */
-#line 435 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 430 "parse-gram.y"

     { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
     { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 

-  case 66:
+  case 64:

 
 

-/* Line 1535 of yacc.c  */
-#line 436 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 431 "parse-gram.y"

     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
     break;
 
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
     break;
 

-  case 67:
+  case 65:

 
 

-/* Line 1535 of yacc.c  */
-#line 437 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 432 "parse-gram.y"

     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
     break;
 
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
     break;
 

-  case 68:
+  case 66:

 
 

-/* Line 1535 of yacc.c  */
-#line 443 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 438 "parse-gram.y"

     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
        tag_seen = true;
      }
     break;
 
     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
        tag_seen = true;
      }
     break;
 

-  case 69:
+  case 67:

 
 

-/* Line 1535 of yacc.c  */
-#line 448 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 443 "parse-gram.y"

     {
        symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
        symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)]));
      }
     break;
 
     {
        symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
        symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)]));
      }
     break;
 

-  case 70:
+  case 68:

 
 

-/* Line 1535 of yacc.c  */
-#line 453 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 448 "parse-gram.y"

     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));


@@ -2421,10 +2392,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 71:
+  case 69:

 
 

-/* Line 1535 of yacc.c  */
-#line 459 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 454 "parse-gram.y"

     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));


@@ -2432,10 +2403,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 72:
+  case 70:

 
 

-/* Line 1535 of yacc.c  */
-#line 465 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 460 "parse-gram.y"

     {
       symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
       symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));
     {
       symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
       symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));


@@ -2444,98 +2415,98 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 79:
+  case 77:

 
 

-/* Line 1535 of yacc.c  */
-#line 495 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 490 "parse-gram.y"

     {
       yyerrok;
     }
     break;
 
     {
       yyerrok;
     }
     break;
 

-  case 80:
+  case 78:

 
 

-/* Line 1535 of yacc.c  */
-#line 501 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 496 "parse-gram.y"

     { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
     break;
 
     { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
     break;
 

-  case 82:
+  case 80:

 
 

-/* Line 1535 of yacc.c  */
-#line 505 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 500 "parse-gram.y"

     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 
     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 

-  case 83:
+  case 81:

 
 

-/* Line 1535 of yacc.c  */
-#line 506 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 501 "parse-gram.y"

     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 
     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 

-  case 85:
+  case 83:

 
 

-/* Line 1535 of yacc.c  */
-#line 512 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 507 "parse-gram.y"

     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     break;
 
     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     break;
 

-  case 86:
+  case 84:

 
 

-/* Line 1535 of yacc.c  */
-#line 514 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 509 "parse-gram.y"

     { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
     break;
 
     { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
     break;
 

-  case 87:
+  case 85:

 
 

-/* Line 1535 of yacc.c  */
-#line 516 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 511 "parse-gram.y"

     { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
     { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 

-  case 88:
+  case 86:

 
 

-/* Line 1535 of yacc.c  */
-#line 518 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 513 "parse-gram.y"

     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 

-  case 89:
+  case 87:

 
 

-/* Line 1535 of yacc.c  */
-#line 520 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 515 "parse-gram.y"

     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 

-  case 90:
+  case 88:

 
 

-/* Line 1535 of yacc.c  */
-#line 522 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 517 "parse-gram.y"

     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 
     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 

-  case 92:
+  case 90:

 
 

-/* Line 1535 of yacc.c  */
-#line 532 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 527 "parse-gram.y"

     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 

-  case 93:
+  case 91:

 
 

-/* Line 1535 of yacc.c  */
-#line 538 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 533 "parse-gram.y"

     {
       (yyval.chars) = "";
     }
     break;
 
     {
       (yyval.chars) = "";
     }
     break;
 

-  case 95:
+  case 93:

 
 

-/* Line 1535 of yacc.c  */
-#line 551 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 546 "parse-gram.y"

     {
       code_props plain_code;
       (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
     {
       code_props plain_code;
       (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';


@@ -2546,17 +2517,17 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 96:
+  case 94:

 
 

-/* Line 1535 of yacc.c  */
-#line 571 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 566 "parse-gram.y"

     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 

-  case 97:
+  case 95:

 
 

-/* Line 1535 of yacc.c  */
-#line 573 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 568 "parse-gram.y"

     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);


@@ -2564,27 +2535,27 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 98:
+  case 96:

 
 

-/* Line 1535 of yacc.c  */
-#line 581 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 576 "parse-gram.y"

     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 

-  case 101:
+  case 99:

 
 

-/* Line 1535 of yacc.c  */
-#line 593 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 588 "parse-gram.y"

     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
     }
     break;
 
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
     }
     break;
 

-  case 103:
+  case 101:

 
 

-/* Line 1535 of yacc.c  */
-#line 602 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 597 "parse-gram.y"

     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));


@@ -2597,8 +2568,8 @@ yyreduce:
 
 
 
 
 
 

-/* Line 1535 of yacc.c  */
-#line 2602 "parse-gram.c"
+/* Line 1538 of yacc.c  */
+#line 2573 "parse-gram.c"

       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);


@@ -2816,8 +2787,8 @@ yyreturn:
 
 
 
 
 
 

-/* Line 1535 of yacc.c  */
-#line 612 "parse-gram.y"
+/* Line 1538 of yacc.c  */
+#line 607 "parse-gram.y"

 
 
 
 
 
 

diff --git a/src/parse-gram.h b/src/parse-gram.h
index f5f64a630a9cffb2fe02759632a9db446e9a1b18..50f8daaa3a9aa180a2b96b8f8891884fdb856889 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -74,28 +74,26 @@
      PERCENT_OUTPUT = 289,
      PERCENT_PARSE_PARAM = 290,
      PERCENT_PURE_PARSER = 291,
      PERCENT_OUTPUT = 289,
      PERCENT_PARSE_PARAM = 290,
      PERCENT_PURE_PARSER = 291,

-     PERCENT_PUSH_PARSER = 292,
-     PERCENT_PUSH_PULL_PARSER = 293,
-     PERCENT_REQUIRE = 294,
-     PERCENT_SKELETON = 295,
-     PERCENT_START = 296,
-     PERCENT_TOKEN_TABLE = 297,
-     PERCENT_VERBOSE = 298,
-     PERCENT_YACC = 299,
-     BRACED_CODE = 300,
-     CHAR = 301,
-     EPILOGUE = 302,
-     EQUAL = 303,
-     ID = 304,
-     ID_COLON = 305,
-     PERCENT_PERCENT = 306,
-     PIPE = 307,
-     PROLOGUE = 308,
-     SEMICOLON = 309,
-     TYPE = 310,
-     TYPE_TAG_ANY = 311,
-     TYPE_TAG_NONE = 312,
-     PERCENT_UNION = 313
+     PERCENT_REQUIRE = 292,
+     PERCENT_SKELETON = 293,
+     PERCENT_START = 294,
+     PERCENT_TOKEN_TABLE = 295,
+     PERCENT_VERBOSE = 296,
+     PERCENT_YACC = 297,
+     BRACED_CODE = 298,
+     CHAR = 299,
+     EPILOGUE = 300,
+     EQUAL = 301,
+     ID = 302,
+     ID_COLON = 303,
+     PERCENT_PERCENT = 304,
+     PIPE = 305,
+     PROLOGUE = 306,
+     SEMICOLON = 307,
+     TYPE = 308,
+     TYPE_TAG_ANY = 309,
+     TYPE_TAG_NONE = 310,
+     PERCENT_UNION = 311

    };
 #endif
 /* Tokens.  */
    };
 #endif
 /* Tokens.  */


@@ -134,28 +132,26 @@
 #define PERCENT_OUTPUT 289
 #define PERCENT_PARSE_PARAM 290
 #define PERCENT_PURE_PARSER 291
 #define PERCENT_OUTPUT 289
 #define PERCENT_PARSE_PARAM 290
 #define PERCENT_PURE_PARSER 291

-#define PERCENT_PUSH_PARSER 292
-#define PERCENT_PUSH_PULL_PARSER 293
-#define PERCENT_REQUIRE 294
-#define PERCENT_SKELETON 295
-#define PERCENT_START 296
-#define PERCENT_TOKEN_TABLE 297
-#define PERCENT_VERBOSE 298
-#define PERCENT_YACC 299
-#define BRACED_CODE 300
-#define CHAR 301
-#define EPILOGUE 302
-#define EQUAL 303
-#define ID 304
-#define ID_COLON 305
-#define PERCENT_PERCENT 306
-#define PIPE 307
-#define PROLOGUE 308
-#define SEMICOLON 309
-#define TYPE 310
-#define TYPE_TAG_ANY 311
-#define TYPE_TAG_NONE 312
-#define PERCENT_UNION 313
+#define PERCENT_REQUIRE 292
+#define PERCENT_SKELETON 293
+#define PERCENT_START 294
+#define PERCENT_TOKEN_TABLE 295
+#define PERCENT_VERBOSE 296
+#define PERCENT_YACC 297
+#define BRACED_CODE 298
+#define CHAR 299
+#define EPILOGUE 300
+#define EQUAL 301
+#define ID 302
+#define ID_COLON 303
+#define PERCENT_PERCENT 304
+#define PIPE 305
+#define PROLOGUE 306
+#define SEMICOLON 307
+#define TYPE 308
+#define TYPE_TAG_ANY 309
+#define TYPE_TAG_NONE 310
+#define PERCENT_UNION 311

 
 
 
 
 
 


@@ -164,7 +160,7 @@
 typedef union YYSTYPE
 {
 
 typedef union YYSTYPE
 {
 

-/* Line 1535 of yacc.c  */
+/* Line 1538 of yacc.c  */

 #line 94 "parse-gram.y"
 
   symbol *symbol;
 #line 94 "parse-gram.y"
 
   symbol *symbol;


@@ -178,8 +174,8 @@ typedef union YYSTYPE
 
 
 
 
 
 

-/* Line 1535 of yacc.c  */
-#line 183 "parse-gram.h"
+/* Line 1538 of yacc.c  */
+#line 179 "parse-gram.h"

 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

diff --git a/src/parse-gram.y b/src/parse-gram.y
index 18e76fa8f532e4e8fed9c2ae045845fd2a78058d..e50ec271834fc38da83dbba228cb02f795558744 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -150,9 +150,6 @@ static int current_prec = 0;
   PERCENT_OUTPUT          "%output"
   PERCENT_PARSE_PARAM     "%parse-param"
   PERCENT_PURE_PARSER     "%pure-parser"
   PERCENT_OUTPUT          "%output"
   PERCENT_PARSE_PARAM     "%parse-param"
   PERCENT_PURE_PARSER     "%pure-parser"

-  PERCENT_PUSH_PARSER     "%push-parser"
-  PERCENT_PUSH_PULL_PARSER
-                          "%push-pull-parser"

   PERCENT_REQUIRE        "%require"
   PERCENT_SKELETON        "%skeleton"
   PERCENT_START           "%start"
   PERCENT_REQUIRE        "%require"
   PERCENT_SKELETON        "%skeleton"
   PERCENT_START           "%start"


@@ -270,8 +267,6 @@ prologue_declaration:
 | "%output" "=" STRING          { spec_outfile = $3; }  /* deprecated */
 | "%parse-param" "{...}"       { add_param ("parse_param", $2, @2); }
 | "%pure-parser"                { pure_parser = true; }
 | "%output" "=" STRING          { spec_outfile = $3; }  /* deprecated */
 | "%parse-param" "{...}"       { add_param ("parse_param", $2, @2); }
 | "%pure-parser"                { pure_parser = true; }

-| "%push-parser"                { push_parser = true; pull_parser = false; }
-| "%push-pull-parser"           { push_parser = true; pull_parser = true; }

 | "%require" STRING             { version_check (&@2, $2); }
 | "%skeleton" STRING
     {
 | "%require" STRING             { version_check (&@2, $2); }
 | "%skeleton" STRING
     {

diff --git a/src/scan-gram.l b/src/scan-gram.l
index 8e938544e413283f47f89bd1f3dcc77c062da392..697f52f054a73058ae287624c6fdf6ff9f757d46 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -185,8 +185,6 @@ splice       (\\[ \f\t\v]*\n)*
   "%prec"                          return PERCENT_PREC;
   "%printer"                       return PERCENT_PRINTER;
   "%pure"[-_]"parser"              return PERCENT_PURE_PARSER;
   "%prec"                          return PERCENT_PREC;
   "%printer"                       return PERCENT_PRINTER;
   "%pure"[-_]"parser"              return PERCENT_PURE_PARSER;

-  "%push-parser"                   return PERCENT_PUSH_PARSER;
-  "%push-pull-parser"              return PERCENT_PUSH_PULL_PARSER;

   "%require"                       return PERCENT_REQUIRE;
   "%right"                         return PERCENT_RIGHT;
   "%skeleton"                      return PERCENT_SKELETON;
   "%require"                       return PERCENT_REQUIRE;
   "%right"                         return PERCENT_RIGHT;
   "%skeleton"                      return PERCENT_SKELETON;

diff --git a/tests/calc.at b/tests/calc.at
index e6d603c08bdaab352efe7ec4312743087232cc14..d13d0c1d5c8e737671b57126b122e55a51ec2399 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -560,7 +560,7 @@ AT_CHECK_CALC_LALR([%yacc])
 AT_CHECK_CALC_LALR([%error-verbose])
 
 AT_CHECK_CALC_LALR([%pure-parser %locations])
 AT_CHECK_CALC_LALR([%error-verbose])
 
 AT_CHECK_CALC_LALR([%pure-parser %locations])

-AT_CHECK_CALC_LALR([%push-pull-parser %pure-parser %locations])
+AT_CHECK_CALC_LALR([%define push_pull "both" %pure-parser %locations])

 AT_CHECK_CALC_LALR([%error-verbose %locations])
 
 AT_CHECK_CALC_LALR([%error-verbose %locations %defines %name-prefix "calc" %verbose %yacc])
 AT_CHECK_CALC_LALR([%error-verbose %locations])
 
 AT_CHECK_CALC_LALR([%error-verbose %locations %defines %name-prefix "calc" %verbose %yacc])


@@ -569,7 +569,7 @@ AT_CHECK_CALC_LALR([%debug])
 AT_CHECK_CALC_LALR([%error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc])
 
 AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc])
 AT_CHECK_CALC_LALR([%error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc])
 
 AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc])

-AT_CHECK_CALC_LALR([%push-pull-parser %pure-parser %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc])
+AT_CHECK_CALC_LALR([%define push_pull "both" %pure-parser %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc])

 
 AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}])
 
 
 AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}])
 

diff --git a/tests/input.at b/tests/input.at
index 48e27ac1e8f432fb36e77eeca28fcf68fcbda532..9778078a3f1a940bc1097a2a5a58a5b22bbbf920 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -822,10 +822,10 @@ input.y:5.9-16: warning: %define variable `special2' is not used
 AT_CLEANUP
 
 ## --------------------------- ##
 AT_CLEANUP
 
 ## --------------------------- ##

-## Boolean %define variables.  ##
+## %define Boolean variables.  ##

 ## --------------------------- ##
 
 ## --------------------------- ##
 

-AT_SETUP([Boolean %define variables])
+AT_SETUP([[%define Boolean variables]])

 
 AT_DATA([Input.y],
 [[%language "Java"
 
 AT_DATA([Input.y],
 [[%language "Java"


@@ -840,3 +840,21 @@ AT_CHECK([[bison Input.y]], [1], [],
 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP

+
+## ------------------------ ##
+## %define enum variables.  ##
+## ------------------------ ##
+
+AT_SETUP([[%define enum variables]])
+
+AT_DATA([[input.y]],
+[[%define push_pull "neither"
+%%
+start: ;
+]])
+
+AT_CHECK([[bison input.y]], [1], [],
+[[input.y:1.9-17: invalid value for %define variable `push_pull': `neither'
+]])
+
+AT_CLEANUP

diff --git a/tests/push.at b/tests/push.at
index 16ca41322af6bee5a3a852dade1caaf5d9b74ddc..91c51f312d825b17d7f1e45701beb4a1a861e6fb 100644 (file)
--- a/tests/push.at
+++ b/tests/push.at
@@ -33,7 +33,7 @@ AT_DATA_GRAMMAR([[input.y]],
   void yyerror (char const *msg);
 %}
 
   void yyerror (char const *msg);
 %}
 

-%pure-parser %push-parser
+%pure-parser %define push_pull "push"

 
 %%
 
 
 %%
 


@@ -77,7 +77,6 @@ AT_PARSER_CHECK([[./input]])
 
 AT_CLEANUP
 
 
 AT_CLEANUP
 

-

 ## ----------------------------------------- ##
 ## Push Parsing: Multiple impure instances.  ##
 ## ----------------------------------------- ##
 ## ----------------------------------------- ##
 ## Push Parsing: Multiple impure instances.  ##
 ## ----------------------------------------- ##


@@ -93,7 +92,7 @@ AT_DATA_GRAMMAR([[input.y]],
   int yylex (void);
 %}
 
   int yylex (void);
 %}
 

-%push-pull-parser
+%define push_pull "both"

 
 %%
 
 
 %%
 


@@ -150,3 +149,22 @@ cannot allocate multiple impure push-parser instances
 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP

+
+## ------------------------------------- ##
+## Push Parsing: Unsupported Skeletons.  ##
+## ------------------------------------- ##
+
+AT_SETUP([[Push Parsing: Unsupported Skeletons]])
+
+AT_DATA([[input.y]],
+[[%glr-parser
+%define push_pull "push"
+%%
+start: ;
+]])
+
+AT_CHECK([[bison input.y]], [0], [],
+[[input.y:2.9-17: warning: %define variable `push_pull' is not used
+]])
+
+AT_CLEANUP

diff --git a/tests/torture.at b/tests/torture.at
index 9a2161562b747ac5af75cd8868413ab3fa4812bc..e21c93dcd12feb65df640be508621773982b1c0d 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -496,7 +496,7 @@ AT_PARSER_CHECK([./input 10000], 2, [], [ignore],
 # just helps guarantee we don't let the YYSTACK_USE_ALLOCA feature affect
 # push parsers.
 AT_DATA_STACK_TORTURE([AT_USE_ALLOCA],
 # just helps guarantee we don't let the YYSTACK_USE_ALLOCA feature affect
 # push parsers.
 AT_DATA_STACK_TORTURE([AT_USE_ALLOCA],

-[[%push-pull-parser
+[[%define push_pull "both"

 ]])
 AT_PARSER_CHECK([./input 20], 0, [], [ignore],
                 [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
 ]])
 AT_PARSER_CHECK([./input 20], 0, [], [ignore],
                 [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])


@@ -534,7 +534,7 @@ AT_PARSER_CHECK([./input 10000], 2, [], [ignore],
                 [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
 
 AT_DATA_STACK_TORTURE([AT_USE_ALLOCA],
                 [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
 
 AT_DATA_STACK_TORTURE([AT_USE_ALLOCA],

-[[%push-pull-parser
+[[%define push_pull "both"

 ]])
 AT_PARSER_CHECK([./input 20], 0, [], [ignore],
                 [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
 ]])
 AT_PARSER_CHECK([./input 20], 0, [], [ignore],
                 [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])