Rename %before-definitions to %start-header and %after-definitions to

%end-header.  Don't use these declarations to separate pre-prologue
blocks from post-prologue blocks.  Add new order-independent
declarations %before-header and %after-header as alternatives to the
traditional Yacc pre-prologue and post-prologue blocks.  Discussed at
<http://lists.gnu.org/archive/html/bison-patches/2006-06/msg00110.html>.
* NEWS (2.3+): Update for these changes.
* data/glr.c (b4_before_definitions): Update to...
(b4_start_header): ... this.
(b4_after_definitions): Update to...
(b4_end_header): ... this.
* data/glr.cc: Likewise.
* data/lalr1.cc: Likewise.
* data/yacc.c: Likewise.
* doc/bison.texinfo (The prologue): Update names, and replace remaining
prologue blocks with %*-header declarations.
(Calc++ Parser): Likewise.
(Bison Declaration Summary): Update names.
(Bison Symbols): Update description.
* src/parse-gram.y (PERCENT_AFTER_DEFINITIONS): Update to...
(PERCENT_END_HEADER): ... this.
(PERCENT_BEFORE_DEFINITIONS): Update to...
(PERCENT_START_HEADER): ... this.
(PERCENT_AFTER_HEADER, PERCENT_BEFORE_HEADER): New tokens.
(declaration): Update token names and m4 macro names.
When parsing %end-header and %start-header, invoke translate_code
before muscle_code_grow, and no longer set global booleans to remember
whether these declarations have been seen.
Parse new %after-header and %before-header.
* src/reader.c (before_definitions, after_definitions): Remove.
(prologue_augment): Accept a new bool argument to specify whether to
augment the pre-prologue or post-prologue.
* src/reader.h (before_definitions, after_definitions): Remove these
extern's.
(prologue_augment): Add new bool argument.
* src/scan-gram.l (PERCENT_AFTER_DEFINITIONS): Update to...
(PERCENT_END_HEADER): ... this.
(PERCENT_BEFORE_DEFINITIONS): Update to...
(PERCENT_START_HEADER): ... this.
(PERCENT_AFTER_HEADER, PERCENT_BEFORE_HEADER): New tokens.
* tests/actions.at (Printers and Destructors): Update names.

diff --git a/ChangeLog b/ChangeLog
index 4c12eeffeaa0fb56825157c39e1907d727fba3ef..540f35df8d9064f4e859af3bd6f69b55859937f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+2006-06-23  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Rename %before-definitions to %start-header and %after-definitions to
+       %end-header.  Don't use these declarations to separate pre-prologue
+       blocks from post-prologue blocks.  Add new order-independent
+       declarations %before-header and %after-header as alternatives to the
+       traditional Yacc pre-prologue and post-prologue blocks.  Discussed at
+       <http://lists.gnu.org/archive/html/bison-patches/2006-06/msg00110.html>.
+       * NEWS (2.3+): Update for these changes.
+       * data/glr.c (b4_before_definitions): Update to...
+       (b4_start_header): ... this.
+       (b4_after_definitions): Update to...
+       (b4_end_header): ... this.
+       * data/glr.cc: Likewise.
+       * data/lalr1.cc: Likewise.
+       * data/yacc.c: Likewise.
+       * doc/bison.texinfo (The prologue): Update names, and replace remaining
+       prologue blocks with %*-header declarations.
+       (Calc++ Parser): Likewise.
+       (Bison Declaration Summary): Update names.
+       (Bison Symbols): Update description.
+       * src/parse-gram.y (PERCENT_AFTER_DEFINITIONS): Update to...
+       (PERCENT_END_HEADER): ... this.
+       (PERCENT_BEFORE_DEFINITIONS): Update to...
+       (PERCENT_START_HEADER): ... this.
+       (PERCENT_AFTER_HEADER, PERCENT_BEFORE_HEADER): New tokens.
+       (declaration): Update token names and m4 macro names.
+       When parsing %end-header and %start-header, invoke translate_code
+       before muscle_code_grow, and no longer set global booleans to remember
+       whether these declarations have been seen.
+       Parse new %after-header and %before-header.
+       * src/reader.c (before_definitions, after_definitions): Remove.
+       (prologue_augment): Accept a new bool argument to specify whether to
+       augment the pre-prologue or post-prologue.
+       * src/reader.h (before_definitions, after_definitions): Remove these
+       extern's.
+       (prologue_augment): Add new bool argument.
+       * src/scan-gram.l (PERCENT_AFTER_DEFINITIONS): Update to...
+       (PERCENT_END_HEADER): ... this.
+       (PERCENT_BEFORE_DEFINITIONS): Update to...
+       (PERCENT_START_HEADER): ... this.
+       (PERCENT_AFTER_HEADER, PERCENT_BEFORE_HEADER): New tokens.
+       * tests/actions.at (Printers and Destructors): Update names.
+

 2006-06-22  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Add comparison operators for C++ location classes.  Discussed at
 2006-06-22  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Add comparison operators for C++ location classes.  Discussed at

diff --git a/NEWS b/NEWS
index d841db6f6fa6205e4b8cc1d648fe25f61c7ef180..dd36e633ad222f2632b280e160801978147a8d0a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,18 +9,16 @@ Changes in version 2.3+:
   helps to sanitize the global namespace during preprocessing, but POSIX Yacc
   requires them.  Bison still generates an enum for token names in all cases.
 
   helps to sanitize the global namespace during preprocessing, but POSIX Yacc
   requires them.  Bison still generates an enum for token names in all cases.
 

-* Handling of prologue blocks is now more consistent but potentially backward
-  incompatible.
+* Handling of traditional Yacc prologue blocks is now more consistent but
+  potentially incompatible with previous releases of Bison.

 
   As before, you declare prologue blocks in your grammar file with the
   `%{ ... %}' syntax.  To generate the pre-prologue, Bison concatenates all
 
   As before, you declare prologue blocks in your grammar file with the
   `%{ ... %}' syntax.  To generate the pre-prologue, Bison concatenates all

-  prologue blocks that you've declared before any %union.  If you've declared a
-  %union, Bison concatenates all prologue blocks that you've declared after it
-  to generate the post-prologue.  (The new %before-definitions and
-  %after-definitions have a similar effect as %union on the prologues.  See
-  below.)
+  prologue blocks that you've declared before the first %union.  To generate
+  the post-prologue, Bison concatenates all prologue blocks that you've
+  declared after the first %union.  

 
 

-  Previous versions of Bison inserted the pre-prologue into both the header
+  Previous releases of Bison inserted the pre-prologue into both the header

   file and the code file in all cases except for LALR(1) parsers in C.  In the
   latter case, Bison inserted it only into the code file.  For parsers in C++,
   the point of insertion was before any token definitions (which associate
   file and the code file in all cases except for LALR(1) parsers in C.  In the
   latter case, Bison inserted it only into the code file.  For parsers in C++,
   the point of insertion was before any token definitions (which associate


@@ -30,38 +28,50 @@ Changes in version 2.3+:
   Now, Bison never inserts the pre-prologue into the header file.  In the code
   file, it always inserts it before the token definitions.
 
   Now, Bison never inserts the pre-prologue into the header file.  In the code
   file, it always inserts it before the token definitions.
 

-* Bison now provides the %before-definitions and %after-definitions directives.
-
-  For example, in your grammar file:
-
-    %{
-      /* A pre-prologue block.  For Yacc portability, Bison no longer puts this
-       * in the header file.  In the code file, Bison inserts it before any
-       * %before-definitions blocks.  */
-    %}
-    %before-definitions {
-      /* Bison inserts this into both the header file and code file.  In both
-       * files, the point of insertion is before any Bison-generated token,
-       * semantic type, location type, and class definitions.  This is a good
-       * place to define %union dependencies, for example.  */
+* Bison now provides a more flexible alternative to the traditional Yacc
+  prologue blocks: %before-header, %start-header, %end-header, and
+  %after-header.
+
+  For example, the following declaration order in the grammar file reflects the
+  order in which Bison will output these code blocks.  However, you are free to
+  declare these code blocks in your grammar file in whatever order is most
+  convenient for you:
+
+    %before-header {
+      /* Bison treats this block like a pre-prologue block: it inserts it into
+       * the code file before the contents of the header file.  It does *not*
+       * insert it into the header file.  This is a good place to put
+       * #include's that you want at the top of your code file.  A common
+       * example is `#include "system.h"'.  */
+    }
+    %start-header {
+      /* Bison inserts this block into both the header file and the code file.
+       * In both files, the point of insertion is before any Bison-generated
+       * token, semantic type, location type, and class definitions.  This is a
+       * good place to define %union dependencies, for example.  */

     }
     %union {
     }
     %union {

-      /* With previous versions of Bison, the first %union in your grammar file
-       * separated the pre-prologue blocks from the post-prologue blocks.  Now,
-       * the first %union, %before-definitions, or %after-definitions does
-       * that.  */
+      /* Unlike the traditional Yacc prologue blocks, the output order for the
+       * new %*-header blocks is not affected by their declaration position
+       * relative to any %union in the grammar file.  */

     }
     }

-    %after-definitions {
-      /* If you want something in the header file and in the code file and it
-       * depends on any of the Bison-generated definitions in the header file,
-       * put it here.  */
+    %end-header {
+      /* Bison inserts this block into both the header file and the code file.
+       * In both files, the point of insertion is after the Bison-generated
+       * definitions.  This is a good place to declare or define public
+       * functions or data structures that depend on the Bison-generated
+       * definitions.  */

     }
     }

-    %{
-      /* A post-prologue block.  If you want something in the code file but not
-       * in the header file and it depends on Bison-generated definitions, put
-       * it here.  In the code file, Bison inserts it after any
-       * %after-definitions blocks.  */
-    %}
+    %after-header {
+      /* Bison treats this block like a post-prologue block: it inserts it into
+       * the code file after the contents of the header file.  It does *not*
+       * insert it into the header file.  This is a good place to declare or
+       * define internal functions or data structures that depend on the
+       * Bison-generated definitions.  */
+    }
+
+  If you have multiple occurrences of any one of the above declarations, Bison
+  will concatenate the contents in declaration order.

 
 * The option `--report=look-ahead' has been changed to `--report=lookahead'.
   The old spelling still works, but is not documented and may be removed
 
 * The option `--report=look-ahead' has been changed to `--report=lookahead'.
   The old spelling still works, but is not documented and may be removed

diff --git a/data/glr.c b/data/glr.c
index 16ced04fc2ea94520a5bf0c71cb17ed4b8b763f4..a8d2c67fd7e972a7d05230add52f46a10d0c0ada 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -169,9 +169,9 @@ dnl # ----------------------
 dnl # Declaration that might either go into the header (if --defines)
 dnl # or open coded in the parser body.
 m4_define([b4_shared_declarations],
 dnl # Declaration that might either go into the header (if --defines)
 dnl # or open coded in the parser body.
 m4_define([b4_shared_declarations],

-[m4_ifdef([b4_before_definitions],
-[[/* Copy the %before-definitions blocks.  */
-]b4_before_definitions])[]dnl
+[m4_ifdef([b4_start_header],
+[[/* Copy the %start-header blocks.  */
+]b4_start_header])[]dnl

 
 b4_token_enums(b4_tokens)
 
 
 b4_token_enums(b4_tokens)
 


@@ -203,9 +203,9 @@ typedef struct YYLTYPE
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 

-]m4_ifdef([b4_after_definitions],
-[[/* Copy the %after-definitions blocks.  */
-]b4_after_definitions])[]dnl
+]m4_ifdef([b4_end_header],
+[[/* Copy the %end-header blocks.  */
+]b4_end_header])[]dnl

 ])
 
 b4_defines_if([#include @output_header_name@],
 ])
 
 b4_defines_if([#include @output_header_name@],

diff --git a/data/glr.cc b/data/glr.cc
index 173a5cd146c2956b0d75d4a413b893d0bfa48a04..de1f543e5471e725331dfcf99f2dc1d82b1d0735 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -235,9 +235,9 @@ namespace ]b4_namespace[
   class location;
 }
 
   class location;
 }
 

-]m4_ifdef([b4_before_definitions],
-[[/* Copy the %before-definitions blocks.  */
-]b4_before_definitions])[]dnl
+]m4_ifdef([b4_start_header],
+[[/* Copy the %start-header blocks.  */
+]b4_start_header])[]dnl

 
 [/* Line __line__ of glr.cc.  */
 ]b4_syncline([@oline@], [@ofile@])[
 
 [/* Line __line__ of glr.cc.  */
 ]b4_syncline([@oline@], [@ofile@])[


@@ -386,8 +386,8 @@ m4_ifset([b4_global_tokens_and_yystype],
 
 }
 
 
 }
 

-]m4_ifdef([b4_after_definitions],
-[[/* Copy the %after-definitions blocks.  */
-]b4_after_definitions])[]dnl
+]m4_ifdef([b4_end_header],
+[[/* Copy the %end-header blocks.  */
+]b4_end_header])[]dnl

 
 [#endif /* ! defined PARSER_HEADER_H */]
 
 [#endif /* ! defined PARSER_HEADER_H */]

diff --git a/data/lalr1.cc b/data/lalr1.cc
index e6c622c71b5a8ea3c0a6c9ce9bd9aae9915f163a..6de35817cc6fef7bb282df2fd2258a739f164df4 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -53,9 +53,9 @@ namespace ]b4_namespace[
   class location;
 }
 
   class location;
 }
 

-]m4_ifdef([b4_before_definitions],
-[[/* Copy the %before-definitions blocks.  */
-]b4_before_definitions])[]dnl
+]m4_ifdef([b4_start_header],
+[[/* Copy the %start-header blocks.  */
+]b4_start_header])[]dnl

 
 [/* Line __line__ of lalr1.cc.  */
 ]b4_syncline([@oline@], [@ofile@])[
 
 [/* Line __line__ of lalr1.cc.  */
 ]b4_syncline([@oline@], [@ofile@])[


@@ -300,9 +300,9 @@ b4_error_verbose_if([, int tok])[);
 # define YYSTYPE b4_namespace::b4_parser_class_name::semantic_type
 #endif
 ])
 # define YYSTYPE b4_namespace::b4_parser_class_name::semantic_type
 #endif
 ])

-m4_ifdef([b4_after_definitions],
-[[/* Copy the %after-definitions blocks.  */
-]b4_after_definitions])[]dnl
+m4_ifdef([b4_end_header],
+[[/* Copy the %end-header blocks.  */
+]b4_end_header])[]dnl

 
 [#endif /* ! defined PARSER_HEADER_H */]
 ])dnl
 
 [#endif /* ! defined PARSER_HEADER_H */]
 ])dnl

diff --git a/data/yacc.c b/data/yacc.c
index 60eeaa5bbedf39cfa600b9ebf7cbf2067236f10c..357588ce65cf550309c0e2277874310d4ac79d17 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -181,9 +181,9 @@ b4_locations_if([#define yylloc b4_prefix[]lloc])])[
 # define YYTOKEN_TABLE ]b4_token_table[
 #endif
 
 # define YYTOKEN_TABLE ]b4_token_table[
 #endif
 

-]m4_ifdef([b4_before_definitions],
-[[/* Copy the %before-definitions blocks.  */
-]b4_before_definitions])[]dnl
+]m4_ifdef([b4_start_header],
+[[/* Copy the %start-header blocks.  */
+]b4_start_header])[]dnl

 
 b4_token_enums_defines(b4_tokens)[
 
 
 b4_token_enums_defines(b4_tokens)[
 


@@ -213,9 +213,9 @@ typedef struct YYLTYPE
 # define YYLTYPE_IS_TRIVIAL 1
 #endif])
 
 # define YYLTYPE_IS_TRIVIAL 1
 #endif])
 

-m4_ifdef([b4_after_definitions],
-[[/* Copy the %after-definitions blocks.  */
-]b4_after_definitions])[]dnl
+m4_ifdef([b4_end_header],
+[[/* Copy the %end-header blocks.  */
+]b4_end_header])[]dnl

 
 [/* Copy the second part of user declarations.  */
 ]b4_post_prologue
 
 [/* Copy the second part of user declarations.  */
 ]b4_post_prologue


@@ -1498,9 +1498,9 @@ b4_defines_if(
 b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],dnl '
   [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])
 
 b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],dnl '
   [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])
 

-m4_ifdef([b4_before_definitions],
-[[/* Copy the %before-definitions blocks.  */
-]b4_before_definitions])[]dnl
+m4_ifdef([b4_start_header],
+[[/* Copy the %start-header blocks.  */
+]b4_start_header])[]dnl

 
 b4_token_enums_defines(b4_tokens)
 
 
 b4_token_enums_defines(b4_tokens)
 


@@ -1538,7 +1538,7 @@ typedef struct YYLTYPE
           [extern YYLTYPE b4_prefix[]lloc;])
 )dnl b4_locations_if
 
           [extern YYLTYPE b4_prefix[]lloc;])
 )dnl b4_locations_if
 

-m4_ifdef([b4_after_definitions],
-[[/* Copy the %after-definitions blocks.  */
-]b4_after_definitions])[]dnl
+m4_ifdef([b4_end_header],
+[[/* Copy the %end-header blocks.  */
+]b4_end_header])[]dnl

 ])dnl b4_defines_if
 ])dnl b4_defines_if

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 14f1eba99355b3a89d4092740ee21f5108c77c4b..e40788c5984988ea7aecfa6d891ea928e89a0f43 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -2664,19 +2664,22 @@ can be done with two @var{Prologue} blocks, one before and one after the
 @dots{}
 @end smallexample
 
 @dots{}
 @end smallexample
 

-@findex %before-definitions
+@findex %before-header
+@findex %start-header
+@findex %after-header

 If you've instructed Bison to generate a header file (@pxref{Table of Symbols,
 ,%defines}), you probably want @code{#include "ptypes.h"} to appear
 in that header file as well.
 If you've instructed Bison to generate a header file (@pxref{Table of Symbols,
 ,%defines}), you probably want @code{#include "ptypes.h"} to appear
 in that header file as well.

-In that case, use @code{%before-definitions} instead of a @var{Prologue}
-section (@pxref{Table of Symbols, ,%before-definitions}):
+In that case, use @code{%before-header}, @code{%start-header}, and
+@code{%after-header} instead of @var{Prologue} sections
+(@pxref{Table of Symbols, ,%start-header}):

 
 @smallexample
 
 @smallexample

-%@{
+%before-header @{

   #include <stdio.h>
   #include <stdio.h>

-%@}
+@}

 
 

-%before-definitions @{
+%start-header @{

   #include "ptypes.h"
 @}
 %union @{
   #include "ptypes.h"
 @}
 %union @{


@@ -2684,10 +2687,10 @@ section (@pxref{Table of Symbols, ,%before-definitions}):
   tree t;  /* @r{@code{tree} is defined in @file{ptypes.h}.} */
 @}
 
   tree t;  /* @r{@code{tree} is defined in @file{ptypes.h}.} */
 @}
 

-%@{
+%after-header @{

   static void print_token_value (FILE *, int, YYSTYPE);
   #define YYPRINT(F, N, L) print_token_value (F, N, L)
   static void print_token_value (FILE *, int, YYSTYPE);
   #define YYPRINT(F, N, L) print_token_value (F, N, L)

-%@}
+@}

 
 @dots{}
 @end smallexample
 
 @dots{}
 @end smallexample


@@ -4228,11 +4231,11 @@ typically needs to be able to refer to the above-mentioned declarations
 and to the token type codes.  @xref{Token Values, ,Semantic Values of
 Tokens}.
 
 and to the token type codes.  @xref{Token Values, ,Semantic Values of
 Tokens}.
 

-@findex %before-definitions
-@findex %after-definitions
-If you have declared @code{%before-definitions} or @code{%after-definitions},
-the output header also contains their code.
-@xref{Table of Symbols, ,%before-definitions}.
+@findex %start-header
+@findex %end-header
+If you have declared @code{%start-header} or @code{%end-header}, the output
+header also contains their code.
+@xref{Table of Symbols, ,%start-header}.

 @end deffn
 
 @deffn {Directive} %destructor
 @end deffn
 
 @deffn {Directive} %destructor


@@ -7462,18 +7465,18 @@ the grammar for.
 @end example
 
 @noindent
 @end example
 
 @noindent

-@findex %before-definitions
+@findex %start-header

 Then come the declarations/inclusions needed to define the
 @code{%union}.  Because the parser uses the parsing driver and
 reciprocally, both cannot include the header of the other.  Because the
 driver's header needs detailed knowledge about the parser class (in
 particular its inner types), it is the parser's header which will simply
 use a forward declaration of the driver.
 Then come the declarations/inclusions needed to define the
 @code{%union}.  Because the parser uses the parsing driver and
 reciprocally, both cannot include the header of the other.  Because the
 driver's header needs detailed knowledge about the parser class (in
 particular its inner types), it is the parser's header which will simply
 use a forward declaration of the driver.

-@xref{Table of Symbols, ,%before-definitions}.
+@xref{Table of Symbols, ,%start-header}.

 
 @comment file: calc++-parser.yy
 @example
 
 @comment file: calc++-parser.yy
 @example

-%before-definitions @{
+%start-header @{

 # include <string>
 class calcxx_driver;
 @}
 # include <string>
 class calcxx_driver;
 @}


@@ -7532,15 +7535,15 @@ them.
 @end example
 
 @noindent
 @end example
 
 @noindent

-The code between @samp{%@{} and @samp{%@}} after the introduction of the
-@samp{%union} is output in the @file{*.cc} file; it needs detailed
-knowledge about the driver.
+@findex %after-header
+The code between @samp{%after-header @{} and @samp{@}} is output in the
+@file{*.cc} file; it needs detailed knowledge about the driver.

 
 @comment file: calc++-parser.yy
 @example
 
 @comment file: calc++-parser.yy
 @example

-%@{
+%after-header @{

 # include "calc++-driver.hh"
 # include "calc++-driver.hh"

-%@}
+@}

 @end example
 
 
 @end example
 
 


@@ -8208,54 +8211,79 @@ $end}, where @var{start} is the start symbol.  @xref{Start Decl, , The
 Start-Symbol}.  It cannot be used in the grammar.
 @end deffn
 
 Start-Symbol}.  It cannot be used in the grammar.
 @end deffn
 

-@deffn {Directive} %after-definitions @{@var{code}@}
+@deffn {Directive} %after-header @{@var{code}@}
+Specifies code to be inserted into the code file after the contents of the
+header file.
+@xref{Table of Symbols, ,%start-header}.
+@end deffn
+
+@deffn {Directive} %before-header @{@var{code}@}
+Specifies code to be inserted into the code file before the contents of the
+header file.
+@xref{Table of Symbols, ,%start-header}.
+@end deffn
+
+@deffn {Directive} %end-header @{@var{code}@}

 Specifies code to be inserted both into the header file (if generated;
 @pxref{Table of Symbols, ,%defines}) and into the code file after any
 Bison-generated definitions.
 Specifies code to be inserted both into the header file (if generated;
 @pxref{Table of Symbols, ,%defines}) and into the code file after any
 Bison-generated definitions.

-For details, @xref{Table of Symbols, ,%before-definitions}.
+@xref{Table of Symbols, ,%start-header}.

 @end deffn
 
 @end deffn
 

-@deffn {Directive} %before-definitions @{@var{code}@}
+@deffn {Directive} %start-header @{@var{code}@}

 Specifies code to be inserted both into the header file (if generated;
 @pxref{Table of Symbols, ,%defines}) and into the code file before any
 Bison-generated definitions.
 
 @cindex Prologue
 Specifies code to be inserted both into the header file (if generated;
 @pxref{Table of Symbols, ,%defines}) and into the code file before any
 Bison-generated definitions.
 
 @cindex Prologue

-@findex %after-definitions
+@findex %before-header

 @findex %union
 @findex %union

-For example, in your grammar file:
+@findex %end-header
+@findex %after-header
+For example, the following declaration order in the grammar file reflects the
+order in which Bison will output these code blocks.  However, you are free to
+declare these code blocks in your grammar file in whatever order is most
+convenient for you:

 
 @smallexample
 
 @smallexample

-%@{
-  /* A pre-prologue block.  For Yacc portability, Bison does not put
-   * this in the header file.  In the code file, Bison inserts it
-   * before any %before-definitions blocks.  */
-%@}
-%before-definitions @{
-  /* Bison inserts this into both the header file and code file.  In
-   * both files, the point of insertion is before any Bison-generated
-   * token, semantic type, location type, and class definitions.
-   * This is a good place to define %union dependencies, for
-   * example.  */
+%before-header @{
+  /* Bison treats this block like a pre-prologue block: it inserts it
+   * into the code file before the contents of the header file.  It
+   * does *not* insert it into the header file.  This is a good place
+   * to put #include's that you want at the top of your code file.  A
+   * common example is `#include "system.h"'.  */
+@}
+%start-header @{
+  /* Bison inserts this block into both the header file and the code
+   * file.  In both files, the point of insertion is before any
+   * Bison-generated token, semantic type, location type, and class
+   * definitions.  This is a good place to define %union
+   * dependencies, for example.  */

 @}
 %union @{
 @}
 %union @{

-  /* The first %union, %before-definitions, or %after-definitions
-   * in your grammar file separates the pre-prologue blocks from the
-   * post-prologue blocks.  */
+  /* Unlike the traditional Yacc prologue blocks, the output order
+   * for the %*-header blocks is not affected by their declaration
+   * position relative to any %union in the grammar file.  */

 @}
 @}

-%after-definitions @{
-  /* If you want something in the header file and in the code file
-   * and it depends on any of the Bison-generated definitions in the
-   * header file, put it here.  */
+%end-header @{
+  /* Bison inserts this block into both the header file and the code
+   * file.  In both files, the point of insertion is after the
+   * Bison-generated definitions.  This is a good place to declare or
+   * define public functions or data structures that depend on the
+   * Bison-generated definitions.  */
+@}
+%after-header @{
+  /* Bison treats this block like a post-prologue block: it inserts
+   * it into the code file after the contents of the header file.  It
+   * does *not* insert it into the header file.  This is a good place
+   * to declare or define internal functions or data structures that
+   * depend on the Bison-generated definitions.  */

 @}
 @}

-%@{
-  /* A post-prologue block.  If you want something in the code file
-   * but not in the header file and it depends on Bison-generated
-   * definitions, put it here.  In the code file, Bison inserts it
-   * after any %after-definitions blocks.  */
-%@}

 @end smallexample
 
 @end smallexample
 

+If you have multiple occurrences of any one of the above declarations, Bison
+will concatenate the contents in declaration order.
+

 @xref{Prologue, ,The Prologue}.
 @end deffn
 
 @xref{Prologue, ,The Prologue}.
 @end deffn
 

diff --git a/src/parse-gram.c b/src/parse-gram.c
index c4a48d0522aedd706dd3b26474fd5fe5623320d0..0b1738d5d05397bcdae6375c9d1c7f32bed88084 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -186,45 +186,47 @@ static int current_prec = 0;
      PERCENT_PREC = 268,
      PERCENT_DPREC = 269,
      PERCENT_MERGE = 270,
      PERCENT_PREC = 268,
      PERCENT_DPREC = 269,
      PERCENT_MERGE = 270,

-     PERCENT_AFTER_DEFINITIONS = 271,
-     PERCENT_BEFORE_DEFINITIONS = 272,
+     PERCENT_AFTER_HEADER = 271,
+     PERCENT_BEFORE_HEADER = 272,

      PERCENT_DEBUG = 273,
      PERCENT_DEFAULT_PREC = 274,
      PERCENT_DEFINE = 275,
      PERCENT_DEFINES = 276,
      PERCENT_DEBUG = 273,
      PERCENT_DEFAULT_PREC = 274,
      PERCENT_DEFINE = 275,
      PERCENT_DEFINES = 276,

-     PERCENT_ERROR_VERBOSE = 277,
-     PERCENT_EXPECT = 278,
-     PERCENT_EXPECT_RR = 279,
-     PERCENT_FILE_PREFIX = 280,
-     PERCENT_GLR_PARSER = 281,
-     PERCENT_INITIAL_ACTION = 282,
-     PERCENT_LEX_PARAM = 283,
-     PERCENT_LOCATIONS = 284,
-     PERCENT_NAME_PREFIX = 285,
-     PERCENT_NO_DEFAULT_PREC = 286,
-     PERCENT_NO_LINES = 287,
-     PERCENT_NONDETERMINISTIC_PARSER = 288,
-     PERCENT_OUTPUT = 289,
-     PERCENT_PARSE_PARAM = 290,
-     PERCENT_PURE_PARSER = 291,
-     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,
-     PERCENT_UNION = 309
+     PERCENT_END_HEADER = 277,
+     PERCENT_ERROR_VERBOSE = 278,
+     PERCENT_EXPECT = 279,
+     PERCENT_EXPECT_RR = 280,
+     PERCENT_FILE_PREFIX = 281,
+     PERCENT_GLR_PARSER = 282,
+     PERCENT_INITIAL_ACTION = 283,
+     PERCENT_LEX_PARAM = 284,
+     PERCENT_LOCATIONS = 285,
+     PERCENT_NAME_PREFIX = 286,
+     PERCENT_NO_DEFAULT_PREC = 287,
+     PERCENT_NO_LINES = 288,
+     PERCENT_NONDETERMINISTIC_PARSER = 289,
+     PERCENT_OUTPUT = 290,
+     PERCENT_PARSE_PARAM = 291,
+     PERCENT_PURE_PARSER = 292,
+     PERCENT_REQUIRE = 293,
+     PERCENT_SKELETON = 294,
+     PERCENT_START = 295,
+     PERCENT_START_HEADER = 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,
+     PERCENT_UNION = 311

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


@@ -242,45 +244,47 @@ static int current_prec = 0;
 #define PERCENT_PREC 268
 #define PERCENT_DPREC 269
 #define PERCENT_MERGE 270
 #define PERCENT_PREC 268
 #define PERCENT_DPREC 269
 #define PERCENT_MERGE 270

-#define PERCENT_AFTER_DEFINITIONS 271
-#define PERCENT_BEFORE_DEFINITIONS 272
+#define PERCENT_AFTER_HEADER 271
+#define PERCENT_BEFORE_HEADER 272

 #define PERCENT_DEBUG 273
 #define PERCENT_DEFAULT_PREC 274
 #define PERCENT_DEFINE 275
 #define PERCENT_DEFINES 276
 #define PERCENT_DEBUG 273
 #define PERCENT_DEFAULT_PREC 274
 #define PERCENT_DEFINE 275
 #define PERCENT_DEFINES 276

-#define PERCENT_ERROR_VERBOSE 277
-#define PERCENT_EXPECT 278
-#define PERCENT_EXPECT_RR 279
-#define PERCENT_FILE_PREFIX 280
-#define PERCENT_GLR_PARSER 281
-#define PERCENT_INITIAL_ACTION 282
-#define PERCENT_LEX_PARAM 283
-#define PERCENT_LOCATIONS 284
-#define PERCENT_NAME_PREFIX 285
-#define PERCENT_NO_DEFAULT_PREC 286
-#define PERCENT_NO_LINES 287
-#define PERCENT_NONDETERMINISTIC_PARSER 288
-#define PERCENT_OUTPUT 289
-#define PERCENT_PARSE_PARAM 290
-#define PERCENT_PURE_PARSER 291
-#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 PERCENT_UNION 309
+#define PERCENT_END_HEADER 277
+#define PERCENT_ERROR_VERBOSE 278
+#define PERCENT_EXPECT 279
+#define PERCENT_EXPECT_RR 280
+#define PERCENT_FILE_PREFIX 281
+#define PERCENT_GLR_PARSER 282
+#define PERCENT_INITIAL_ACTION 283
+#define PERCENT_LEX_PARAM 284
+#define PERCENT_LOCATIONS 285
+#define PERCENT_NAME_PREFIX 286
+#define PERCENT_NO_DEFAULT_PREC 287
+#define PERCENT_NO_LINES 288
+#define PERCENT_NONDETERMINISTIC_PARSER 289
+#define PERCENT_OUTPUT 290
+#define PERCENT_PARSE_PARAM 291
+#define PERCENT_PURE_PARSER 292
+#define PERCENT_REQUIRE 293
+#define PERCENT_SKELETON 294
+#define PERCENT_START 295
+#define PERCENT_START_HEADER 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 PERCENT_UNION 311

 
 
 
 
 
 


@@ -298,7 +302,7 @@ typedef union YYSTYPE
   unsigned char character;
 }
 /* Line 197 of yacc.c.  */
   unsigned char character;
 }
 /* Line 197 of yacc.c.  */

-#line 302 "parse-gram.c"
+#line 306 "parse-gram.c"

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


@@ -323,7 +327,7 @@ typedef struct YYLTYPE
 
 
 /* Line __line__ of yacc.c.  */
 
 
 /* Line __line__ of yacc.c.  */

-#line 327 "parse-gram.c"
+#line 331 "parse-gram.c"

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


@@ -540,20 +544,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   185
+#define YYLAST   192

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

-#define YYNTOKENS  55
+#define YYNTOKENS  57

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

-#define YYNRULES  87
+#define YYNRULES  89

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

-#define YYNSTATES  124
+#define YYNSTATES  128

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

-#define YYMAXUTOK   309
+#define YYMAXUTOK   311

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


@@ -591,7 +595,8 @@ static const yytype_uint8 yytranslate[] =
       15,    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,
       15,    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,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG


@@ -600,56 +605,57 @@ static const yytype_uint8 yytranslate[] =
 static const yytype_uint8 yyprhs[] =
 {
        0,     0,     3,     8,     9,    12,    14,    16,    19,    22,
 static const yytype_uint8 yyprhs[] =
 {
        0,     0,     3,     8,     9,    12,    14,    16,    19,    22,

-      24,    27,    31,    33,    35,    38,    41,    45,    47,    50,
-      53,    55,    59,    61,    63,    67,    70,    72,    75,    78,
-      80,    82,    84,    86,    88,    90,    93,    97,   101,   103,
-     105,   106,   108,   112,   113,   117,   118,   122,   126,   130,
-     132,   134,   136,   137,   139,   141,   144,   146,   148,   151,
-     154,   158,   160,   163,   165,   168,   170,   173,   176,   177,
-     181,   183,   187,   190,   191,   194,   197,   201,   205,   209,
-     211,   213,   215,   217,   219,   221,   223,   224
+      24,    27,    31,    33,    36,    38,    41,    44,    48,    50,
+      53,    56,    58,    62,    64,    66,    70,    73,    75,    78,
+      81,    84,    86,    88,    90,    92,    94,    96,    99,   103,
+     107,   109,   111,   112,   114,   118,   119,   123,   124,   128,
+     132,   136,   138,   140,   142,   143,   145,   147,   150,   152,
+     154,   157,   160,   164,   166,   169,   171,   174,   176,   179,
+     182,   183,   187,   189,   193,   196,   197,   200,   203,   207,
+     211,   215,   217,   219,   221,   223,   225,   227,   229,   230

 };
 
 /* 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[] =
 {

-      56,     0,    -1,    57,    49,    70,    81,    -1,    -1,    57,
-      58,    -1,    59,    -1,    51,    -1,    16,    43,    -1,    17,
-      43,    -1,    18,    -1,    20,    80,    -1,    20,    80,    80,
-      -1,    21,    -1,    22,    -1,    23,     4,    -1,    24,     4,
-      -1,    25,    46,    80,    -1,    26,    -1,    27,    43,    -1,
-      28,    43,    -1,    29,    -1,    30,    46,    80,    -1,    32,
-      -1,    33,    -1,    34,    46,    80,    -1,    35,    43,    -1,
-      36,    -1,    37,    80,    -1,    38,    80,    -1,    40,    -1,
-      41,    -1,    42,    -1,    52,    -1,    64,    -1,    61,    -1,
-      39,    78,    -1,     8,    43,    67,    -1,     9,    43,    67,
-      -1,    19,    -1,    31,    -1,    -1,    47,    -1,    54,    60,
-      43,    -1,    -1,     6,    62,    69,    -1,    -1,     5,    63,
-      69,    -1,     7,    53,    67,    -1,    65,    66,    67,    -1,
-      10,    -1,    11,    -1,    12,    -1,    -1,    53,    -1,    78,
-      -1,    67,    78,    -1,    53,    -1,    76,    -1,    76,     4,
-      -1,    76,    79,    -1,    76,     4,    79,    -1,    68,    -1,
-      69,    68,    -1,    71,    -1,    70,    71,    -1,    72,    -1,
-      59,    52,    -1,     1,    52,    -1,    -1,    77,    73,    74,
-      -1,    75,    -1,    74,    50,    75,    -1,    74,    52,    -1,
-      -1,    75,    78,    -1,    75,    43,    -1,    75,    13,    78,
-      -1,    75,    14,     4,    -1,    75,    15,    53,    -1,    47,
-      -1,    44,    -1,    48,    -1,    76,    -1,    79,    -1,     3,
-      -1,     3,    -1,    -1,    49,    45,    -1
+      58,     0,    -1,    59,    51,    72,    83,    -1,    -1,    59,
+      60,    -1,    61,    -1,    53,    -1,    16,    45,    -1,    17,
+      45,    -1,    18,    -1,    20,    82,    -1,    20,    82,    82,
+      -1,    21,    -1,    22,    45,    -1,    23,    -1,    24,     4,
+      -1,    25,     4,    -1,    26,    48,    82,    -1,    27,    -1,
+      28,    45,    -1,    29,    45,    -1,    30,    -1,    31,    48,
+      82,    -1,    33,    -1,    34,    -1,    35,    48,    82,    -1,
+      36,    45,    -1,    37,    -1,    38,    82,    -1,    39,    82,
+      -1,    41,    45,    -1,    42,    -1,    43,    -1,    44,    -1,
+      54,    -1,    66,    -1,    63,    -1,    40,    80,    -1,     8,
+      45,    69,    -1,     9,    45,    69,    -1,    19,    -1,    32,
+      -1,    -1,    49,    -1,    56,    62,    45,    -1,    -1,     6,
+      64,    71,    -1,    -1,     5,    65,    71,    -1,     7,    55,
+      69,    -1,    67,    68,    69,    -1,    10,    -1,    11,    -1,
+      12,    -1,    -1,    55,    -1,    80,    -1,    69,    80,    -1,
+      55,    -1,    78,    -1,    78,     4,    -1,    78,    81,    -1,
+      78,     4,    81,    -1,    70,    -1,    71,    70,    -1,    73,
+      -1,    72,    73,    -1,    74,    -1,    61,    54,    -1,     1,
+      54,    -1,    -1,    79,    75,    76,    -1,    77,    -1,    76,
+      52,    77,    -1,    76,    54,    -1,    -1,    77,    80,    -1,
+      77,    45,    -1,    77,    13,    80,    -1,    77,    14,     4,
+      -1,    77,    15,    55,    -1,    49,    -1,    46,    -1,    50,
+      -1,    78,    -1,    81,    -1,     3,    -1,     3,    -1,    -1,
+      51,    47,    -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,   202,   202,   210,   212,   216,   217,   219,   226,   233,
-     234,   239,   240,   241,   242,   243,   244,   245,   250,   254,
-     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   271,   272,   273,   277,   285,   293,   297,
-     311,   312,   316,   338,   338,   343,   343,   348,   358,   373,
-     374,   375,   379,   380,   385,   386,   391,   395,   400,   406,
-     412,   423,   424,   433,   434,   440,   441,   442,   449,   449,
-     453,   454,   455,   460,   461,   463,   466,   468,   470,   483,
-     485,   494,   499,   500,   505,   514,   519,   521
+       0,   202,   202,   210,   212,   216,   217,   221,   227,   233,
+     234,   239,   240,   241,   247,   248,   249,   250,   251,   256,
+     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
+     270,   276,   277,   278,   279,   283,   284,   285,   289,   297,
+     305,   309,   323,   324,   328,   350,   350,   355,   355,   360,
+     370,   385,   386,   387,   391,   392,   397,   398,   403,   407,
+     412,   418,   424,   435,   436,   445,   446,   452,   453,   454,
+     461,   461,   465,   466,   467,   472,   473,   475,   478,   480,
+     482,   495,   497,   506,   511,   512,   517,   526,   531,   533

 };
 #endif
 
 };
 #endif
 


@@ -661,19 +667,19 @@ static const char *const yytname[] =
   "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
   "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
   "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"",
   "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
   "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
   "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"",

-  "\"%dprec\"", "\"%merge\"", "\"%after-definitions\"",
-  "\"%before-definitions\"", "\"%debug\"", "\"%default-prec\"",
-  "\"%define\"", "\"%defines\"", "\"%error-verbose\"", "\"%expect\"",
-  "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
-  "\"%initial-action\"", "\"%lex-param\"", "\"%locations\"",
-  "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
-  "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param\"",
-  "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"",
-  "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"",
-  "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
-  "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", "\"%union\"", "$accept",
-  "input", "declarations", "declaration", "grammar_declaration",
-  "union_name", "symbol_declaration", "@1", "@2", "precedence_declaration",
+  "\"%dprec\"", "\"%merge\"", "\"%after-header\"", "\"%before-header\"",
+  "\"%debug\"", "\"%default-prec\"", "\"%define\"", "\"%defines\"",
+  "\"%end-header\"", "\"%error-verbose\"", "\"%expect\"", "\"%expect-rr\"",
+  "\"%file-prefix\"", "\"%glr-parser\"", "\"%initial-action\"",
+  "\"%lex-param\"", "\"%locations\"", "\"%name-prefix\"",
+  "\"%no-default-prec\"", "\"%no-lines\"", "\"%nondeterministic-parser\"",
+  "\"%output\"", "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"",
+  "\"%skeleton\"", "\"%start\"", "\"%start-header\"", "\"%token-table\"",
+  "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"",
+  "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"",
+  "\"%{...%}\"", "\";\"", "\"type\"", "\"%union\"", "$accept", "input",
+  "declarations", "declaration", "grammar_declaration", "union_name",
+  "symbol_declaration", "@1", "@2", "precedence_declaration",

   "precedence_declarator", "type.opt", "symbols.1", "symbol_def",
   "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules",
   "@3", "rhses.1", "rhs", "id", "id_colon", "symbol", "string_as_id",
   "precedence_declarator", "type.opt", "symbols.1", "symbol_def",
   "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules",
   "@3", "rhses.1", "rhs", "id", "id_colon", "symbol", "string_as_id",


@@ -691,36 +697,36 @@ 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
+     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,    55,    56,    57,    57,    58,    58,    58,    58,    58,
-      58,    58,    58,    58,    58,    58,    58,    58,    58,    58,
-      58,    58,    58,    58,    58,    58,    58,    58,    58,    58,
-      58,    58,    58,    59,    59,    59,    59,    59,    59,    59,
-      60,    60,    59,    62,    61,    63,    61,    61,    64,    65,
-      65,    65,    66,    66,    67,    67,    68,    68,    68,    68,
-      68,    69,    69,    70,    70,    71,    71,    71,    73,    72,
-      74,    74,    74,    75,    75,    75,    75,    75,    75,    76,
-      76,    77,    78,    78,    79,    80,    81,    81
+       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,    62,    62,    61,    64,    63,    65,    63,    63,
+      66,    67,    67,    67,    68,    68,    69,    69,    70,    70,
+      70,    70,    70,    71,    71,    72,    72,    73,    73,    73,
+      75,    74,    76,    76,    76,    77,    77,    77,    77,    77,
+      77,    78,    78,    79,    80,    80,    81,    82,    83,    83

 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     4,     0,     2,     1,     1,     2,     2,     1,
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     4,     0,     2,     1,     1,     2,     2,     1,

-       2,     3,     1,     1,     2,     2,     3,     1,     2,     2,
-       1,     3,     1,     1,     3,     2,     1,     2,     2,     1,
-       1,     1,     1,     1,     1,     2,     3,     3,     1,     1,
-       0,     1,     3,     0,     3,     0,     3,     3,     3,     1,
-       1,     1,     0,     1,     1,     2,     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,     1,     1,     1,     1,     1,     0,     2
+       2,     3,     1,     2,     1,     2,     2,     3,     1,     2,
+       2,     1,     3,     1,     1,     3,     2,     1,     2,     2,
+       2,     1,     1,     1,     1,     1,     1,     2,     3,     3,
+       1,     1,     0,     1,     3,     0,     3,     0,     3,     3,
+       3,     1,     1,     1,     0,     1,     1,     2,     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,     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


@@ -728,125 +734,127 @@ 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,    45,    43,     0,     0,     0,    49,
-      50,    51,     0,     0,     9,    38,     0,    12,    13,     0,
-       0,     0,    17,     0,     0,    20,     0,    39,    22,    23,
-       0,     0,    26,     0,     0,     0,    29,    30,    31,     0,
-       6,    32,    40,     4,     5,    34,    33,    52,     0,     0,
-       0,     0,     0,     7,     8,    85,    10,    14,    15,     0,
-      18,    19,     0,     0,    25,    27,    28,    84,    80,    79,
-      82,    35,    83,     0,    81,     0,     0,    63,    65,    68,
-      41,     0,    53,     0,    56,    61,    46,    57,    44,    47,
-      54,    36,    37,    11,    16,    21,    24,    67,    66,     0,
-      64,     2,    73,    42,    48,    62,    58,    59,    55,    87,
-      69,    70,    60,    73,    72,     0,     0,     0,    75,    74,
-      71,    76,    77,    78
+       3,     0,     0,     1,    47,    45,     0,     0,     0,    51,
+      52,    53,     0,     0,     9,    40,     0,    12,     0,    14,
+       0,     0,     0,    18,     0,     0,    21,     0,    41,    23,
+      24,     0,     0,    27,     0,     0,     0,     0,    31,    32,
+      33,     0,     6,    34,    42,     4,     5,    36,    35,    54,
+       0,     0,     0,     0,     0,     7,     8,    87,    10,    13,
+      15,    16,     0,    19,    20,     0,     0,    26,    28,    29,
+      86,    82,    81,    84,    37,    85,    30,     0,    83,     0,
+       0,    65,    67,    70,    43,     0,    55,     0,    58,    63,
+      48,    59,    46,    49,    56,    38,    39,    11,    17,    22,
+      25,    69,    68,     0,    66,     2,    75,    44,    50,    64,
+      60,    61,    57,    89,    71,    72,    62,    75,    74,     0,
+       0,     0,    77,    76,    73,    78,    79,    80

 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {

-      -1,     1,     2,    43,    75,    81,    45,    49,    48,    46,
-      47,    83,    89,    85,    86,    76,    77,    78,   102,   110,
-     111,    70,    79,    90,    72,    56,   101
+      -1,     1,     2,    45,    79,    85,    47,    51,    50,    48,
+      49,    87,    93,    89,    90,    80,    81,    82,   106,   114,
+     115,    73,    83,    94,    75,    58,   105

 };
 
 /* 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 -74
+#define YYPACT_NINF -76

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

-     -74,    34,   131,   -74,   -74,   -74,   -38,    -5,    -2,   -74,
-     -74,   -74,     5,     8,   -74,   -74,    40,   -74,   -74,    48,
-      49,    14,   -74,    21,    22,   -74,    20,   -74,   -74,   -74,
-      24,    25,   -74,    40,    40,     0,   -74,   -74,   -74,    81,
-     -74,   -74,    26,   -74,   -74,   -74,   -74,    18,   -22,   -22,
-       0,     0,     0,   -74,   -74,   -74,    40,   -74,   -74,    40,
-     -74,   -74,    40,    40,   -74,   -74,   -74,   -74,   -74,   -74,
-     -74,   -74,   -74,    27,   -74,    29,     1,   -74,   -74,   -74,
-     -74,    31,   -74,     0,   -74,   -74,   -22,    23,   -22,     0,
-     -74,     0,     0,   -74,   -74,   -74,   -74,   -74,   -74,    30,
-     -74,   -74,   -74,   -74,     0,   -74,    64,   -74,   -74,   -74,
-     -31,    15,   -74,   -74,   -74,     0,    68,    41,   -74,   -74,
-      15,   -74,   -74,   -74
+     -76,     6,   136,   -76,   -76,   -76,   -40,   -12,    -9,   -76,
+     -76,   -76,    -5,     1,   -76,   -76,    40,   -76,     5,   -76,
+      47,    50,     7,   -76,    11,    18,   -76,    19,   -76,   -76,
+     -76,    20,    25,   -76,    40,    40,    -2,    26,   -76,   -76,
+     -76,    84,   -76,   -76,    27,   -76,   -76,   -76,   -76,    14,
+     -23,   -23,    -2,    -2,    -2,   -76,   -76,   -76,    40,   -76,
+     -76,   -76,    40,   -76,   -76,    40,    40,   -76,   -76,   -76,
+     -76,   -76,   -76,   -76,   -76,   -76,   -76,    21,   -76,    23,
+       2,   -76,   -76,   -76,   -76,    28,   -76,    -2,   -76,   -76,
+     -23,    24,   -23,    -2,   -76,    -2,    -2,   -76,   -76,   -76,
+     -76,   -76,   -76,    31,   -76,   -76,   -76,   -76,    -2,   -76,
+      71,   -76,   -76,   -76,   -32,    16,   -76,   -76,   -76,    -2,
+      76,    29,   -76,   -76,    16,   -76,   -76,   -76

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

-     -74,   -74,   -74,   -74,    75,   -74,   -74,   -74,   -74,   -74,
-     -74,   -74,   -47,   -51,    35,   -74,     2,   -74,   -74,   -74,
-     -30,   -25,   -74,   -35,   -73,   -17,   -74
+     -76,   -76,   -76,   -76,    79,   -76,   -76,   -76,   -76,   -76,
+     -76,   -76,   -49,   -53,    35,   -76,    17,   -76,   -76,   -76,
+     -35,   -26,   -76,   -36,   -75,   -17,   -76

 };
 
 /* 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 -87
+#define YYTABLE_NINF -89

 static const yytype_int8 yytable[] =
 {
 static const yytype_int8 yytable[] =
 {

-      71,   -86,    73,    67,    91,    92,     4,     5,     6,     7,
-       8,     9,    10,    11,   107,    50,    65,    66,    67,   113,
-      15,   114,    68,    87,    87,    69,    67,   106,   115,   116,
-     117,    84,    27,   112,     3,   105,   104,   105,    51,    93,
-      35,    52,    94,    55,    68,    95,    96,    69,    53,    74,
-      99,    54,    57,    58,   108,    42,   108,   108,   118,    68,
-      59,    87,    69,    87,    60,    61,    62,    67,    64,   108,
-      63,    82,   122,    80,   103,   109,   119,    44,   100,    97,
-     121,    98,    73,   120,    88,   119,     4,     5,     6,     7,
-       8,     9,    10,    11,   123,     0,     0,     0,     0,     0,
-      15,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    27,     0,     0,     0,     0,     0,     0,     0,
-      35,     0,     0,     0,     0,     0,     0,     0,     0,    74,
-       0,     0,     0,     0,     0,    42,     4,     5,     6,     7,
-       8,     9,    10,    11,     0,     0,     0,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,     0,     0,     0,     0,     0,     0,
-      39,     0,    40,    41,     0,    42
+      74,    70,   -88,    77,    95,    96,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    52,   111,    68,    69,    70,
+     117,    15,   118,    71,    91,    91,    72,    70,   110,   119,
+     120,   121,    88,    53,    28,   116,    54,   109,   108,   109,
+      55,    97,    36,    57,    71,    98,    56,    72,    99,   100,
+      59,    60,    78,   103,    61,    62,    63,   112,    44,   112,
+     112,   122,    71,    64,    91,    72,    91,    65,    66,    86,
+      67,    76,   112,   107,    70,   101,    84,   102,   113,   123,
+     126,    46,   124,   125,   127,    77,    92,     0,   123,     4,
+       5,     6,     7,     8,     9,    10,    11,   104,     0,     0,
+       0,     0,     0,    15,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    28,     0,     0,     0,
+       0,     0,     0,     0,    36,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    78,     0,     0,     0,     0,     0,
+      44,     4,     5,     6,     7,     8,     9,    10,    11,     0,
+       0,     0,    12,    13,    14,    15,    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,     0,     0,     0,     0,     0,     0,    41,     0,    42,
+      43,     0,    44

 };
 
 static const yytype_int8 yycheck[] =
 {
 };
 
 static const yytype_int8 yycheck[] =
 {

-      35,     0,     1,     3,    51,    52,     5,     6,     7,     8,
-       9,    10,    11,    12,    87,    53,    33,    34,     3,    50,
-      19,    52,    44,    48,    49,    47,     3,     4,    13,    14,
-      15,    53,    31,   106,     0,    86,    83,    88,    43,    56,
-      39,    43,    59,     3,    44,    62,    63,    47,    43,    48,
-      49,    43,     4,     4,    89,    54,    91,    92,    43,    44,
-      46,    86,    47,    88,    43,    43,    46,     3,    43,   104,
-      46,    53,     4,    47,    43,    45,   111,     2,    76,    52,
-     115,    52,     1,   113,    49,   120,     5,     6,     7,     8,
-       9,    10,    11,    12,    53,    -1,    -1,    -1,    -1,    -1,
-      19,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    31,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,
-      -1,    -1,    -1,    -1,    -1,    54,     5,     6,     7,     8,
-       9,    10,    11,    12,    -1,    -1,    -1,    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,    -1,    -1,    -1,    -1,    -1,    -1,
-      49,    -1,    51,    52,    -1,    54
+      36,     3,     0,     1,    53,    54,     0,     5,     6,     7,
+       8,     9,    10,    11,    12,    55,    91,    34,    35,     3,
+      52,    19,    54,    46,    50,    51,    49,     3,     4,    13,
+      14,    15,    55,    45,    32,   110,    45,    90,    87,    92,
+      45,    58,    40,     3,    46,    62,    45,    49,    65,    66,
+      45,     4,    50,    51,     4,    48,    45,    93,    56,    95,
+      96,    45,    46,    45,    90,    49,    92,    48,    48,    55,
+      45,    45,   108,    45,     3,    54,    49,    54,    47,   115,
+       4,     2,   117,   119,    55,     1,    51,    -1,   124,     5,
+       6,     7,     8,     9,    10,    11,    12,    80,    -1,    -1,
+      -1,    -1,    -1,    19,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,    -1,
+      56,     5,     6,     7,     8,     9,    10,    11,    12,    -1,
+      -1,    -1,    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,    -1,    -1,    -1,    -1,    -1,    -1,    51,    -1,    53,
+      54,    -1,    56

 };
 
 /* 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,    56,    57,     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,    49,
-      51,    52,    54,    58,    59,    61,    64,    65,    63,    62,
-      53,    43,    43,    43,    43,     3,    80,     4,     4,    46,
-      43,    43,    46,    46,    43,    80,    80,     3,    44,    47,
-      76,    78,    79,     1,    48,    59,    70,    71,    72,    77,
-      47,    60,    53,    66,    53,    68,    69,    76,    69,    67,
-      78,    67,    67,    80,    80,    80,    80,    52,    52,    49,
-      71,    81,    73,    43,    67,    68,     4,    79,    78,    45,
-      74,    75,    79,    50,    52,    13,    14,    15,    43,    78,
-      75,    78,     4,    53
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    51,    53,    54,    56,    60,    61,    63,    66,    67,
+      65,    64,    55,    45,    45,    45,    45,     3,    82,    45,
+       4,     4,    48,    45,    45,    48,    48,    45,    82,    82,
+       3,    46,    49,    78,    80,    81,    45,     1,    50,    61,
+      72,    73,    74,    79,    49,    62,    55,    68,    55,    70,
+      71,    78,    71,    69,    80,    69,    69,    82,    82,    82,
+      82,    54,    54,    51,    73,    83,    75,    45,    69,    70,
+       4,    81,    80,    47,    76,    77,    81,    52,    54,    13,
+      14,    15,    45,    80,    77,    80,     4,    55

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


@@ -997,72 +1005,72 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
       case 3: /* "\"string\"" */
 #line 181 "parse-gram.y"
        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
       case 3: /* "\"string\"" */
 #line 181 "parse-gram.y"
        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };

-#line 1001 "parse-gram.c"
+#line 1009 "parse-gram.c"

        break;
       case 4: /* "\"integer\"" */
 #line 191 "parse-gram.y"
        { fprintf (stderr, "%d", (yyvaluep->integer)); };
        break;
       case 4: /* "\"integer\"" */
 #line 191 "parse-gram.y"
        { fprintf (stderr, "%d", (yyvaluep->integer)); };

-#line 1006 "parse-gram.c"
+#line 1014 "parse-gram.c"

        break;
        break;

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

 #line 183 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 #line 183 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };

-#line 1011 "parse-gram.c"
+#line 1019 "parse-gram.c"

        break;
        break;

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

 #line 178 "parse-gram.y"
        { fputs (char_name ((yyvaluep->character)), stderr); };
 #line 178 "parse-gram.y"
        { fputs (char_name ((yyvaluep->character)), stderr); };

-#line 1016 "parse-gram.c"
+#line 1024 "parse-gram.c"

        break;
        break;

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

 #line 183 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 #line 183 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };

-#line 1021 "parse-gram.c"
+#line 1029 "parse-gram.c"

        break;
        break;

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

 #line 187 "parse-gram.y"
        { fputs ((yyvaluep->uniqstr), stderr); };
 #line 187 "parse-gram.y"
        { fputs ((yyvaluep->uniqstr), stderr); };

-#line 1026 "parse-gram.c"
+#line 1034 "parse-gram.c"

        break;
        break;

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

 #line 188 "parse-gram.y"
        { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 #line 188 "parse-gram.y"
        { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };

-#line 1031 "parse-gram.c"
+#line 1039 "parse-gram.c"

        break;
        break;

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

 #line 183 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 #line 183 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };

-#line 1036 "parse-gram.c"
+#line 1044 "parse-gram.c"

        break;
        break;

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

 #line 186 "parse-gram.y"
        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
 #line 186 "parse-gram.y"
        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };

-#line 1041 "parse-gram.c"
+#line 1049 "parse-gram.c"

        break;
        break;

-      case 76: /* "id" */
+      case 78: /* "id" */

 #line 194 "parse-gram.y"
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 #line 194 "parse-gram.y"
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };

-#line 1046 "parse-gram.c"
+#line 1054 "parse-gram.c"

        break;
        break;

-      case 77: /* "id_colon" */
+      case 79: /* "id_colon" */

 #line 195 "parse-gram.y"
        { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
 #line 195 "parse-gram.y"
        { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };

-#line 1051 "parse-gram.c"
+#line 1059 "parse-gram.c"

        break;
        break;

-      case 78: /* "symbol" */
+      case 80: /* "symbol" */

 #line 194 "parse-gram.y"
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 #line 194 "parse-gram.y"
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };

-#line 1056 "parse-gram.c"
+#line 1064 "parse-gram.c"

        break;
        break;

-      case 79: /* "string_as_id" */
+      case 81: /* "string_as_id" */

 #line 194 "parse-gram.y"
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 #line 194 "parse-gram.y"
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };

-#line 1061 "parse-gram.c"
+#line 1069 "parse-gram.c"

        break;
        break;

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

 #line 181 "parse-gram.y"
        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 #line 181 "parse-gram.y"
        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };

-#line 1066 "parse-gram.c"
+#line 1074 "parse-gram.c"

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


@@ -1580,7 +1588,7 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.end, current_file, 1, 0);
 }
 /* Line 1085 of yacc.c.  */
   boundary_set (&yylloc.end, current_file, 1, 0);
 }
 /* Line 1085 of yacc.c.  */

-#line 1584 "parse-gram.c"
+#line 1592 "parse-gram.c"

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


@@ -1765,28 +1773,27 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-#line 217 "parse-gram.y"
-    { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])),
-                                                      (yylsp[(1) - (1)])); }
+#line 218 "parse-gram.y"
+    {
+      prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), typed);
+    }

     break;
 
   case 7:
     break;
 
   case 7:

-#line 220 "parse-gram.y"
+#line 222 "parse-gram.y"

     {
     {

-      after_definitions = true;

       /* Remove the '{', and replace the '}' with '\n'.  */
       (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';
       /* Remove the '{', and replace the '}' with '\n'.  */
       (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';

-      muscle_code_grow ("after_definitions", (yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)]));
+      prologue_augment (translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]), true);

     }
     break;
 
   case 8:
     }
     break;
 
   case 8:

-#line 227 "parse-gram.y"
+#line 228 "parse-gram.y"

     {
     {

-      before_definitions = true;

       /* Remove the '{', and replace the '}' with '\n'.  */
       (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';
       /* Remove the '{', and replace the '}' with '\n'.  */
       (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';

-      muscle_code_grow ("before_definitions", (yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)]));
+      prologue_augment (translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]), false);

     }
     break;
 
     }
     break;
 


@@ -1814,114 +1821,132 @@ yyreduce:
     break;
 
   case 13:
     break;
 
   case 13:

-#line 241 "parse-gram.y"
-    { error_verbose = true; }
+#line 242 "parse-gram.y"
+    {
+      /* Remove the '{', and replace the '}' with '\n'.  */
+      (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';
+      muscle_code_grow ("end_header", translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
+    }

     break;
 
   case 14:
     break;
 
   case 14:

-#line 242 "parse-gram.y"
-    { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
+#line 247 "parse-gram.y"
+    { error_verbose = true; }

     break;
 
   case 15:
     break;
 
   case 15:

-#line 243 "parse-gram.y"
-    { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
+#line 248 "parse-gram.y"
+    { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }

     break;
 
   case 16:
     break;
 
   case 16:

-#line 244 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
+#line 249 "parse-gram.y"
+    { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }

     break;
 
   case 17:
     break;
 
   case 17:

-#line 246 "parse-gram.y"
+#line 250 "parse-gram.y"
+    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
+    break;
+
+  case 18:
+#line 252 "parse-gram.y"

     {
       nondeterministic_parser = true;
       glr_parser = true;
     }
     break;
 
     {
       nondeterministic_parser = true;
       glr_parser = true;
     }
     break;
 

-  case 18:
-#line 251 "parse-gram.y"
+  case 19:
+#line 257 "parse-gram.y"

     {
       muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
     }
     break;
 
     {
       muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
     }
     break;
 

-  case 19:
-#line 254 "parse-gram.y"
+  case 20:
+#line 260 "parse-gram.y"

     { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
     break;
 
     { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
     break;
 

-  case 20:
-#line 255 "parse-gram.y"
+  case 21:
+#line 261 "parse-gram.y"

     { locations_flag = true; }
     break;
 
     { locations_flag = true; }
     break;
 

-  case 21:
-#line 256 "parse-gram.y"
+  case 22:
+#line 262 "parse-gram.y"

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

-  case 22:
-#line 257 "parse-gram.y"
+  case 23:
+#line 263 "parse-gram.y"

     { no_lines_flag = true; }
     break;
 
     { no_lines_flag = true; }
     break;
 

-  case 23:
-#line 258 "parse-gram.y"
+  case 24:
+#line 264 "parse-gram.y"

     { nondeterministic_parser = true; }
     break;
 
     { nondeterministic_parser = true; }
     break;
 

-  case 24:
-#line 259 "parse-gram.y"
+  case 25:
+#line 265 "parse-gram.y"

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

-  case 25:
-#line 260 "parse-gram.y"
+  case 26:
+#line 266 "parse-gram.y"

     { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
     break;
 
     { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
     break;
 

-  case 26:
-#line 261 "parse-gram.y"
+  case 27:
+#line 267 "parse-gram.y"

     { pure_parser = true; }
     break;
 
     { pure_parser = true; }
     break;
 

-  case 27:
-#line 262 "parse-gram.y"
+  case 28:
+#line 268 "parse-gram.y"

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

-  case 28:
-#line 263 "parse-gram.y"
+  case 29:
+#line 269 "parse-gram.y"

     { skeleton = (yyvsp[(2) - (2)].chars); }
     break;
 
     { skeleton = (yyvsp[(2) - (2)].chars); }
     break;
 

-  case 29:
-#line 264 "parse-gram.y"
+  case 30:
+#line 271 "parse-gram.y"
+    {
+      /* Remove the '{', and replace the '}' with '\n'.  */
+      (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n';
+      muscle_code_grow ("start_header", translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
+    }
+    break;
+
+  case 31:
+#line 276 "parse-gram.y"

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

-  case 30:
-#line 265 "parse-gram.y"
+  case 32:
+#line 277 "parse-gram.y"

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

-  case 31:
-#line 266 "parse-gram.y"
+  case 33:
+#line 278 "parse-gram.y"

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

-  case 35:
-#line 274 "parse-gram.y"
+  case 37:
+#line 286 "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 36:
-#line 278 "parse-gram.y"
+  case 38:
+#line 290 "parse-gram.y"

     {
       symbol_list *list;
       const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)]));
     {
       symbol_list *list;
       const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)]));


@@ -1931,8 +1956,8 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 37:
-#line 286 "parse-gram.y"
+  case 39:
+#line 298 "parse-gram.y"

     {
       symbol_list *list;
       const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)]));
     {
       symbol_list *list;
       const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)]));


@@ -1942,32 +1967,32 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 38:
-#line 294 "parse-gram.y"
+  case 40:
+#line 306 "parse-gram.y"

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

-  case 39:
-#line 298 "parse-gram.y"
+  case 41:
+#line 310 "parse-gram.y"

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

-  case 40:
-#line 311 "parse-gram.y"
+  case 42:
+#line 323 "parse-gram.y"

     {}
     break;
 
     {}
     break;
 

-  case 41:
-#line 312 "parse-gram.y"
+  case 43:
+#line 324 "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 42:
-#line 317 "parse-gram.y"
+  case 44:
+#line 329 "parse-gram.y"

     {
       char const *body = (yyvsp[(3) - (3)].chars);
 
     {
       char const *body = (yyvsp[(3) - (3)].chars);
 


@@ -1985,34 +2010,34 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 43:
-#line 338 "parse-gram.y"
+  case 45:
+#line 350 "parse-gram.y"

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

-  case 44:
-#line 339 "parse-gram.y"
+  case 46:
+#line 351 "parse-gram.y"

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

-  case 45:
-#line 343 "parse-gram.y"
+  case 47:
+#line 355 "parse-gram.y"

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

-  case 46:
-#line 344 "parse-gram.y"
+  case 48:
+#line 356 "parse-gram.y"

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

-  case 47:
-#line 349 "parse-gram.y"
+  case 49:
+#line 361 "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)


@@ -2021,8 +2046,8 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 48:
-#line 359 "parse-gram.y"
+  case 50:
+#line 371 "parse-gram.y"

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


@@ -2036,58 +2061,58 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 49:
-#line 373 "parse-gram.y"
+  case 51:
+#line 385 "parse-gram.y"

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

-  case 50:
-#line 374 "parse-gram.y"
+  case 52:
+#line 386 "parse-gram.y"

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

-  case 51:
-#line 375 "parse-gram.y"
+  case 53:
+#line 387 "parse-gram.y"

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

-  case 52:
-#line 379 "parse-gram.y"
+  case 54:
+#line 391 "parse-gram.y"

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

-  case 53:
-#line 380 "parse-gram.y"
+  case 55:
+#line 392 "parse-gram.y"

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

-  case 54:
-#line 385 "parse-gram.y"
+  case 56:
+#line 397 "parse-gram.y"

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

-  case 55:
-#line 386 "parse-gram.y"
+  case 57:
+#line 398 "parse-gram.y"

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

-  case 56:
-#line 392 "parse-gram.y"
+  case 58:
+#line 404 "parse-gram.y"

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

-  case 57:
-#line 396 "parse-gram.y"
+  case 59:
+#line 408 "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 58:
-#line 401 "parse-gram.y"
+  case 60:
+#line 413 "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)]));


@@ -2095,8 +2120,8 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 59:
-#line 407 "parse-gram.y"
+  case 61:
+#line 419 "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)]));


@@ -2104,8 +2129,8 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 60:
-#line 413 "parse-gram.y"
+  case 62:
+#line 425 "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)]));


@@ -2114,66 +2139,66 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 67:
-#line 443 "parse-gram.y"
+  case 69:
+#line 455 "parse-gram.y"

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

-  case 68:
-#line 449 "parse-gram.y"
+  case 70:
+#line 461 "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 70:
-#line 453 "parse-gram.y"
+  case 72:
+#line 465 "parse-gram.y"

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

-  case 71:
-#line 454 "parse-gram.y"
+  case 73:
+#line 466 "parse-gram.y"

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

-  case 73:
-#line 460 "parse-gram.y"
+  case 75:
+#line 472 "parse-gram.y"

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

-  case 74:
-#line 462 "parse-gram.y"
+  case 76:
+#line 474 "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 75:
-#line 464 "parse-gram.y"
+  case 77:
+#line 476 "parse-gram.y"

     { grammar_current_rule_action_append (gram_last_string,
                                          gram_last_braced_code_loc); }
     break;
 
     { grammar_current_rule_action_append (gram_last_string,
                                          gram_last_braced_code_loc); }
     break;
 

-  case 76:
-#line 467 "parse-gram.y"
+  case 78:
+#line 479 "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 77:
-#line 469 "parse-gram.y"
+  case 79:
+#line 481 "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 78:
-#line 471 "parse-gram.y"
+  case 80:
+#line 483 "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 79:
-#line 484 "parse-gram.y"
+  case 81:
+#line 496 "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 80:
-#line 486 "parse-gram.y"
+  case 82:
+#line 498 "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);


@@ -2181,26 +2206,26 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 81:
-#line 494 "parse-gram.y"
+  case 83:
+#line 506 "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 84:
-#line 506 "parse-gram.y"
+  case 86:
+#line 518 "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 85:
-#line 515 "parse-gram.y"
+  case 87:
+#line 527 "parse-gram.y"

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

-  case 87:
-#line 522 "parse-gram.y"
+  case 89:
+#line 534 "parse-gram.y"

     {
       muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
       gram_scanner_last_string_free ();
     {
       muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
       gram_scanner_last_string_free ();


@@ -2209,7 +2234,7 @@ yyreduce:
 
 
 /* Line 1274 of yacc.c.  */
 
 
 /* Line 1274 of yacc.c.  */

-#line 2213 "parse-gram.c"
+#line 2238 "parse-gram.c"

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


@@ -2429,7 +2454,7 @@ yyreturn:
 }
 
 
 }
 
 

-#line 528 "parse-gram.y"
+#line 540 "parse-gram.y"

 
 
 
 
 
 

diff --git a/src/parse-gram.h b/src/parse-gram.h
index 54e07e6b9e018f431eaf65bf11d6ba0fae09d556..64e7ddf8e946ada298638a6490bfe86de36cd75f 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -54,45 +54,47 @@
      PERCENT_PREC = 268,
      PERCENT_DPREC = 269,
      PERCENT_MERGE = 270,
      PERCENT_PREC = 268,
      PERCENT_DPREC = 269,
      PERCENT_MERGE = 270,

-     PERCENT_AFTER_DEFINITIONS = 271,
-     PERCENT_BEFORE_DEFINITIONS = 272,
+     PERCENT_AFTER_HEADER = 271,
+     PERCENT_BEFORE_HEADER = 272,

      PERCENT_DEBUG = 273,
      PERCENT_DEFAULT_PREC = 274,
      PERCENT_DEFINE = 275,
      PERCENT_DEFINES = 276,
      PERCENT_DEBUG = 273,
      PERCENT_DEFAULT_PREC = 274,
      PERCENT_DEFINE = 275,
      PERCENT_DEFINES = 276,

-     PERCENT_ERROR_VERBOSE = 277,
-     PERCENT_EXPECT = 278,
-     PERCENT_EXPECT_RR = 279,
-     PERCENT_FILE_PREFIX = 280,
-     PERCENT_GLR_PARSER = 281,
-     PERCENT_INITIAL_ACTION = 282,
-     PERCENT_LEX_PARAM = 283,
-     PERCENT_LOCATIONS = 284,
-     PERCENT_NAME_PREFIX = 285,
-     PERCENT_NO_DEFAULT_PREC = 286,
-     PERCENT_NO_LINES = 287,
-     PERCENT_NONDETERMINISTIC_PARSER = 288,
-     PERCENT_OUTPUT = 289,
-     PERCENT_PARSE_PARAM = 290,
-     PERCENT_PURE_PARSER = 291,
-     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,
-     PERCENT_UNION = 309
+     PERCENT_END_HEADER = 277,
+     PERCENT_ERROR_VERBOSE = 278,
+     PERCENT_EXPECT = 279,
+     PERCENT_EXPECT_RR = 280,
+     PERCENT_FILE_PREFIX = 281,
+     PERCENT_GLR_PARSER = 282,
+     PERCENT_INITIAL_ACTION = 283,
+     PERCENT_LEX_PARAM = 284,
+     PERCENT_LOCATIONS = 285,
+     PERCENT_NAME_PREFIX = 286,
+     PERCENT_NO_DEFAULT_PREC = 287,
+     PERCENT_NO_LINES = 288,
+     PERCENT_NONDETERMINISTIC_PARSER = 289,
+     PERCENT_OUTPUT = 290,
+     PERCENT_PARSE_PARAM = 291,
+     PERCENT_PURE_PARSER = 292,
+     PERCENT_REQUIRE = 293,
+     PERCENT_SKELETON = 294,
+     PERCENT_START = 295,
+     PERCENT_START_HEADER = 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,
+     PERCENT_UNION = 311

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


@@ -110,45 +112,47 @@
 #define PERCENT_PREC 268
 #define PERCENT_DPREC 269
 #define PERCENT_MERGE 270
 #define PERCENT_PREC 268
 #define PERCENT_DPREC 269
 #define PERCENT_MERGE 270

-#define PERCENT_AFTER_DEFINITIONS 271
-#define PERCENT_BEFORE_DEFINITIONS 272
+#define PERCENT_AFTER_HEADER 271
+#define PERCENT_BEFORE_HEADER 272

 #define PERCENT_DEBUG 273
 #define PERCENT_DEFAULT_PREC 274
 #define PERCENT_DEFINE 275
 #define PERCENT_DEFINES 276
 #define PERCENT_DEBUG 273
 #define PERCENT_DEFAULT_PREC 274
 #define PERCENT_DEFINE 275
 #define PERCENT_DEFINES 276

-#define PERCENT_ERROR_VERBOSE 277
-#define PERCENT_EXPECT 278
-#define PERCENT_EXPECT_RR 279
-#define PERCENT_FILE_PREFIX 280
-#define PERCENT_GLR_PARSER 281
-#define PERCENT_INITIAL_ACTION 282
-#define PERCENT_LEX_PARAM 283
-#define PERCENT_LOCATIONS 284
-#define PERCENT_NAME_PREFIX 285
-#define PERCENT_NO_DEFAULT_PREC 286
-#define PERCENT_NO_LINES 287
-#define PERCENT_NONDETERMINISTIC_PARSER 288
-#define PERCENT_OUTPUT 289
-#define PERCENT_PARSE_PARAM 290
-#define PERCENT_PURE_PARSER 291
-#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 PERCENT_UNION 309
+#define PERCENT_END_HEADER 277
+#define PERCENT_ERROR_VERBOSE 278
+#define PERCENT_EXPECT 279
+#define PERCENT_EXPECT_RR 280
+#define PERCENT_FILE_PREFIX 281
+#define PERCENT_GLR_PARSER 282
+#define PERCENT_INITIAL_ACTION 283
+#define PERCENT_LEX_PARAM 284
+#define PERCENT_LOCATIONS 285
+#define PERCENT_NAME_PREFIX 286
+#define PERCENT_NO_DEFAULT_PREC 287
+#define PERCENT_NO_LINES 288
+#define PERCENT_NONDETERMINISTIC_PARSER 289
+#define PERCENT_OUTPUT 290
+#define PERCENT_PARSE_PARAM 291
+#define PERCENT_PURE_PARSER 292
+#define PERCENT_REQUIRE 293
+#define PERCENT_SKELETON 294
+#define PERCENT_START 295
+#define PERCENT_START_HEADER 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 PERCENT_UNION 311

 
 
 
 
 
 


@@ -166,7 +170,7 @@ typedef union YYSTYPE
   unsigned char character;
 }
 /* Line 1544 of yacc.c.  */
   unsigned char character;
 }
 /* Line 1544 of yacc.c.  */

-#line 170 "parse-gram.h"
+#line 174 "parse-gram.h"

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

diff --git a/src/parse-gram.y b/src/parse-gram.y
index 17857b2ad3d9613cc7d5cfe5ce4da3a5b1a376b1..bf80f1e121ab2f8438261375c68048a4d7737293 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -130,14 +130,13 @@ static int current_prec = 0;
 `----------------------*/
 
 %token
 `----------------------*/
 
 %token

-  PERCENT_AFTER_DEFINITIONS
-                         "%after-definitions"
-  PERCENT_BEFORE_DEFINITIONS
-                         "%before-definitions"
+  PERCENT_AFTER_HEADER    "%after-header"
+  PERCENT_BEFORE_HEADER   "%before-header"

   PERCENT_DEBUG           "%debug"
   PERCENT_DEFAULT_PREC    "%default-prec"
   PERCENT_DEFINE          "%define"
   PERCENT_DEFINES         "%defines"
   PERCENT_DEBUG           "%debug"
   PERCENT_DEFAULT_PREC    "%default-prec"
   PERCENT_DEFINE          "%define"
   PERCENT_DEFINES         "%defines"

+  PERCENT_END_HEADER      "%end-header"

   PERCENT_ERROR_VERBOSE   "%error-verbose"
   PERCENT_EXPECT          "%expect"
   PERCENT_EXPECT_RR      "%expect-rr"
   PERCENT_ERROR_VERBOSE   "%error-verbose"
   PERCENT_EXPECT          "%expect"
   PERCENT_EXPECT_RR      "%expect-rr"


@@ -157,6 +156,7 @@ static int current_prec = 0;
   PERCENT_REQUIRE        "%require"
   PERCENT_SKELETON        "%skeleton"
   PERCENT_START           "%start"
   PERCENT_REQUIRE        "%require"
   PERCENT_SKELETON        "%skeleton"
   PERCENT_START           "%start"

+  PERCENT_START_HEADER    "%start-header"

   PERCENT_TOKEN_TABLE     "%token-table"
   PERCENT_VERBOSE         "%verbose"
   PERCENT_YACC            "%yacc"
   PERCENT_TOKEN_TABLE     "%token-table"
   PERCENT_VERBOSE         "%verbose"
   PERCENT_YACC            "%yacc"


@@ -214,21 +214,21 @@ declarations:
 
 declaration:
   grammar_declaration
 
 declaration:
   grammar_declaration

-| PROLOGUE                         { prologue_augment (translate_code ($1, @1),
-                                                      @1); }
-| "%after-definitions" "{...}"
+| PROLOGUE
+    {
+      prologue_augment (translate_code ($1, @1), @1, typed);
+    }
+| "%after-header" "{...}"

     {
     {

-      after_definitions = true;

       /* Remove the '{', and replace the '}' with '\n'.  */
       $2[strlen ($2) - 1] = '\n';
       /* Remove the '{', and replace the '}' with '\n'.  */
       $2[strlen ($2) - 1] = '\n';

-      muscle_code_grow ("after_definitions", $2+1, @2);
+      prologue_augment (translate_code ($2+1, @2), @2, true);

     }
     }

-| "%before-definitions" "{...}"
+| "%before-header" "{...}"

     {
     {

-      before_definitions = true;

       /* Remove the '{', and replace the '}' with '\n'.  */
       $2[strlen ($2) - 1] = '\n';
       /* Remove the '{', and replace the '}' with '\n'.  */
       $2[strlen ($2) - 1] = '\n';

-      muscle_code_grow ("before_definitions", $2+1, @2);
+      prologue_augment (translate_code ($2+1, @2), @2, false);

     }
 | "%debug"                                 { debug_flag = true; }
 | "%define" string_content
     }
 | "%debug"                                 { debug_flag = true; }
 | "%define" string_content


@@ -238,6 +238,12 @@ declaration:
     }
 | "%define" string_content string_content  { muscle_insert ($2, $3); }
 | "%defines"                               { defines_flag = true; }
     }
 | "%define" string_content string_content  { muscle_insert ($2, $3); }
 | "%defines"                               { defines_flag = true; }

+| "%end-header" "{...}"
+    {
+      /* Remove the '{', and replace the '}' with '\n'.  */
+      $2[strlen ($2) - 1] = '\n';
+      muscle_code_grow ("end_header", translate_code ($2+1, @2), @2);
+    }

 | "%error-verbose"                         { error_verbose = true; }
 | "%expect" INT                            { expected_sr_conflicts = $2; }
 | "%expect-rr" INT                        { expected_rr_conflicts = $2; }
 | "%error-verbose"                         { error_verbose = true; }
 | "%expect" INT                            { expected_sr_conflicts = $2; }
 | "%expect-rr" INT                        { expected_rr_conflicts = $2; }


@@ -261,6 +267,12 @@ declaration:
 | "%pure-parser"                           { pure_parser = true; }
 | "%require" string_content                { version_check (&@2, $2); }
 | "%skeleton" string_content               { skeleton = $2; }
 | "%pure-parser"                           { pure_parser = true; }
 | "%require" string_content                { version_check (&@2, $2); }
 | "%skeleton" string_content               { skeleton = $2; }

+| "%start-header" "{...}"
+    {
+      /* Remove the '{', and replace the '}' with '\n'.  */
+      $2[strlen ($2) - 1] = '\n';
+      muscle_code_grow ("start_header", translate_code ($2+1, @2), @2);
+    }

 | "%token-table"                           { token_table_flag = true; }
 | "%verbose"                               { report_flag = report_states; }
 | "%yacc"                                  { yacc_flag = true; }
 | "%token-table"                           { token_table_flag = true; }
 | "%verbose"                               { report_flag = report_states; }
 | "%yacc"                                  { yacc_flag = true; }

diff --git a/src/reader.c b/src/reader.c
index 8d2c668c7a3c321e585911698a4756308c7cc37b..4196189456bdbfc9dd77c79f2e526beb03e0b942 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -44,10 +44,8 @@ static symbol_list *grammar = NULL;
 static bool start_flag = false;
 merger_list *merge_functions;
 
 static bool start_flag = false;
 merger_list *merge_functions;
 

-/* Was %union, %before-definitions, or %after-definitions seen?  */
+/* Was %union seen?  */

 bool typed = false;
 bool typed = false;

-bool before_definitions = false;
-bool after_definitions = false;

 
 /* Should rules have a default precedence?  */
 bool default_prec = true;
 
 /* Should rules have a default precedence?  */
 bool default_prec = true;


@@ -70,17 +68,16 @@ grammar_start_symbol_set (symbol *sym, location loc)
 }
 
 
 }
 
 

-/*---------------------------------------------------------------------------.
-| There are two prologues: one before the first %union, %before-definitions, |
-| or %after-definitions; and one after.  Augment the current one.            |
-`---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------.
+| There are two prologues: one before the first %union and one after.  |
+|  Augment the one specified by POST.                                  |
+`---------------------------------------------------------------------*/

 
 void
 
 void

-prologue_augment (const char *prologue, location loc)
+prologue_augment (const char *prologue, location loc, bool post)

 {
   struct obstack *oout =
 {
   struct obstack *oout =

-    !(typed || before_definitions || after_definitions)
-    ? &pre_prologue_obstack : &post_prologue_obstack;
+    !post ? &pre_prologue_obstack : &post_prologue_obstack;

 
   obstack_fgrow1 (oout, "]b4_syncline(%d, [[", loc.start.line);
   /* FIXME: Protection of M4 characters missing here.  See
 
   obstack_fgrow1 (oout, "]b4_syncline(%d, [[", loc.start.line);
   /* FIXME: Protection of M4 characters missing here.  See

diff --git a/src/reader.h b/src/reader.h
index d49f8f67bce4c650d4a86b22286e84cd445d6816..a16bfaf3b9daa4ff1b7ed961443438ebe83f9eca 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -43,7 +43,7 @@ char const *token_name (int type);
 
 /* From reader.c. */
 void grammar_start_symbol_set (symbol *sym, location loc);
 
 /* From reader.c. */
 void grammar_start_symbol_set (symbol *sym, location loc);

-void prologue_augment (const char *prologue, location loc);
+void prologue_augment (const char *prologue, location loc, bool post);

 void grammar_current_rule_begin (symbol *lhs, location loc);
 void grammar_current_rule_end (location loc);
 void grammar_midrule_action (void);
 void grammar_current_rule_begin (symbol *lhs, location loc);
 void grammar_current_rule_end (location loc);
 void grammar_midrule_action (void);


@@ -58,10 +58,8 @@ void free_merger_functions (void);
 
 extern merger_list *merge_functions;
 
 
 extern merger_list *merge_functions;
 

-/* Was %union, %before-definitions, or %after-definitions seen?  */
+/* Was %union seen?  */

 extern bool typed;
 extern bool typed;

-extern bool before_definitions;
-extern bool after_definitions;

 
 /* Should rules have a default precedence?  */
 extern bool default_prec;
 
 /* Should rules have a default precedence?  */
 extern bool default_prec;

diff --git a/src/scan-gram.l b/src/scan-gram.l
index 2c200b452c6b864819b79e542cf35c9bc6625d60..25796dbd429b586fe1d6ba0ffe0815b2a35d35a3 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -164,8 +164,8 @@ splice       (\\[ \f\t\v]*\n)*
   `----------------------------*/
 <INITIAL>
 {
   `----------------------------*/
 <INITIAL>
 {

-  "%after-definitions"              return PERCENT_AFTER_DEFINITIONS;
-  "%before-definitions"             return PERCENT_BEFORE_DEFINITIONS;
+  "%after-header"                   return PERCENT_AFTER_HEADER;
+  "%before-header"                  return PERCENT_BEFORE_HEADER;

   "%binary"                        return PERCENT_NONASSOC;
   "%debug"                         return PERCENT_DEBUG;
   "%default"[-_]"prec"             return PERCENT_DEFAULT_PREC;
   "%binary"                        return PERCENT_NONASSOC;
   "%debug"                         return PERCENT_DEBUG;
   "%default"[-_]"prec"             return PERCENT_DEFAULT_PREC;


@@ -173,6 +173,7 @@ splice       (\\[ \f\t\v]*\n)*
   "%defines"                       return PERCENT_DEFINES;
   "%destructor"                            return PERCENT_DESTRUCTOR;
   "%dprec"                         return PERCENT_DPREC;
   "%defines"                       return PERCENT_DEFINES;
   "%destructor"                            return PERCENT_DESTRUCTOR;
   "%dprec"                         return PERCENT_DPREC;

+  "%end-header"                     return PERCENT_END_HEADER;

   "%error"[-_]"verbose"            return PERCENT_ERROR_VERBOSE;
   "%expect"                        return PERCENT_EXPECT;
   "%expect"[-_]"rr"                return PERCENT_EXPECT_RR;
   "%error"[-_]"verbose"            return PERCENT_ERROR_VERBOSE;
   "%expect"                        return PERCENT_EXPECT;
   "%expect"[-_]"rr"                return PERCENT_EXPECT_RR;


@@ -199,6 +200,7 @@ splice       (\\[ \f\t\v]*\n)*
   "%right"                         return PERCENT_RIGHT;
   "%skeleton"                      return PERCENT_SKELETON;
   "%start"                         return PERCENT_START;
   "%right"                         return PERCENT_RIGHT;
   "%skeleton"                      return PERCENT_SKELETON;
   "%start"                         return PERCENT_START;

+  "%start-header"                   return PERCENT_START_HEADER;

   "%term"                          return PERCENT_TOKEN;
   "%token"                         return PERCENT_TOKEN;
   "%token"[-_]"table"              return PERCENT_TOKEN_TABLE;
   "%term"                          return PERCENT_TOKEN;
   "%token"                         return PERCENT_TOKEN;
   "%token"[-_]"table"              return PERCENT_TOKEN_TABLE;

diff --git a/tests/actions.at b/tests/actions.at
index 14cbb3c7b1d78722cf5b282cd5545acde8b1fe3e..6267b74e782d538bf7e0ff33e1d9be0a2f12f50e 100644 (file)
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -172,7 +172,7 @@ m4_if([$1$2$3], $[1]$[2]$[3], [],
 # helping macros.  So don't put any directly in the Bison file.
 AT_BISON_OPTION_PUSHDEFS([$5])
 AT_DATA_GRAMMAR([[input.y]],
 # helping macros.  So don't put any directly in the Bison file.
 AT_BISON_OPTION_PUSHDEFS([$5])
 AT_DATA_GRAMMAR([[input.y]],

-[[%before-definitions {
+[[%start-header {

 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>


@@ -190,7 +190,7 @@ m4_ifval([$6], [%union
   int ival;
 }])
 AT_LALR1_CC_IF([%define "global_tokens_and_yystype"])
   int ival;
 }])
 AT_LALR1_CC_IF([%define "global_tokens_and_yystype"])

-m4_ifval([$6], [[%after-definitions {]], [[%before-definitions {]])
+m4_ifval([$6], [[%end-header {]], [[%start-header {]])

 AT_LALR1_CC_IF([typedef yy::location YYLTYPE;
                 m4_ifval([$6], , [#define YYSTYPE int])])
 [static int yylex (]AT_LEX_FORMALS[);
 AT_LALR1_CC_IF([typedef yy::location YYLTYPE;
                 m4_ifval([$6], , [#define YYSTYPE int])])
 [static int yylex (]AT_LEX_FORMALS[);