Simplify union and prologue handling, and escape union and lex/parse

params with digraphs.
* data/bison.m4 (b4_pre_prologue, b4_post_prologue): Set their default
values to the empty string since these are no longer guaranteed
initialized by the front-end.
* data/glr.c, data/glr.cc, data/lalr1.cc, data/push.c, data/yacc.c: Add
braces around b4_user_stype since this is no longer done by the
front-end.
* src/files.c, src/files.h (pre_prologue_obstack,
post_prologue_obstack): Remove.
* src/muscle_tab.c (muscle_pair_list_grow): Don't duplicate header
comments here.  Use MUSCLE_OBSTACK_SGROW so that values are escaped
with digraphs.  This fixes lex params and parse params.
* src/muscle_tab.h (muscle_pair_list_grow): Update comments.
* src/output.c (prepare): Remove muscle insertion of the prologues.
(output): Remove freeing of pre_prologue_obstack and
post_prologue_obstack.
* src/parse-gram.y (prologue_declaration): Use muscle_code_grow rather
than prologue_augment for prologue parsing so you don't need prologue
obstacks.
(grammar_declaration): Use `braceless' instead of "{...}" so that
braces are already stripped and code is escaped with digraphs.
* src/reader.c (prologue_augment): Remove.
(reader): Remove initialization of pre_prologue_obstack and
post_prologue_obstack.
* src/reader.h (prologue_augment): Remove.

* data/c.m4: Remove stray parenthesis.

diff --git a/ChangeLog b/ChangeLog
index 50f5ed1f13a771164063b7192a5e4b3f0438f153..1881aa53c4363d9eac5edbb41b8286206f24a7cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2007-01-09  Paolo Bonzini  <bonzini@gnu.org>
+       and Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Simplify union and prologue handling, and escape union and lex/parse
+       params with digraphs.
+       * data/bison.m4 (b4_pre_prologue, b4_post_prologue): Set their default
+       values to the empty string since these are no longer guaranteed
+       initialized by the front-end.
+       * data/glr.c, data/glr.cc, data/lalr1.cc, data/push.c, data/yacc.c: Add
+       braces around b4_user_stype since this is no longer done by the
+       front-end.
+       * src/files.c, src/files.h (pre_prologue_obstack,
+       post_prologue_obstack): Remove.
+       * src/muscle_tab.c (muscle_pair_list_grow): Don't duplicate header
+       comments here.  Use MUSCLE_OBSTACK_SGROW so that values are escaped
+       with digraphs.  This fixes lex params and parse params.
+       * src/muscle_tab.h (muscle_pair_list_grow): Update comments.
+       * src/output.c (prepare): Remove muscle insertion of the prologues.
+       (output): Remove freeing of pre_prologue_obstack and
+       post_prologue_obstack.
+       * src/parse-gram.y (prologue_declaration): Use muscle_code_grow rather
+       than prologue_augment for prologue parsing so you don't need prologue
+       obstacks.
+       (grammar_declaration): Use `braceless' instead of "{...}" so that
+       braces are already stripped and code is escaped with digraphs.
+       * src/reader.c (prologue_augment): Remove.
+       (reader): Remove initialization of pre_prologue_obstack and
+       post_prologue_obstack.
+       * src/reader.h (prologue_augment): Remove.
+
+       * data/c.m4: Remove stray parenthesis.
+

 2007-01-08  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Remove quotes from variables names in %define directives and from
 2007-01-08  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Remove quotes from variables names in %define directives and from

diff --git a/data/bison.m4 b/data/bison.m4
index 1c2eaaca7f21ad5f5415c82365ed2e6db5abcc1a..6ac4d9b070104ed2d0297de5b638c79ff3c8476c 100644 (file)
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -155,6 +155,8 @@ m4_define([b4_fatal_at],
 ## ---------------- ##
 
 # m4_define_default([b4_lex_param], [])   dnl breaks other skeletons
 ## ---------------- ##
 
 # m4_define_default([b4_lex_param], [])   dnl breaks other skeletons

+m4_define_default([b4_pre_prologue], [])
+m4_define_default([b4_post_prologue], [])

 m4_define_default([b4_epilogue], [])
 m4_define_default([b4_parse_param], [])
 
 m4_define_default([b4_epilogue], [])
 m4_define_default([b4_parse_param], [])
 

diff --git a/data/c.m4 b/data/c.m4
index ffab49709179d6e6aab69c5063ab28692652fffb..d4b44c290226dbdb5cf06a1039618b18e18652e2 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -79,7 +79,7 @@ m4_define([b4_user_args],
 # If defined, b4_parse_param arrives double quoted, but below we prefer
 # it to be single quoted.
 m4_define([b4_parse_param],
 # If defined, b4_parse_param arrives double quoted, but below we prefer
 # it to be single quoted.
 m4_define([b4_parse_param],

-b4_parse_param))
+b4_parse_param)

 
 
 # b4_parse_param_for(DECL, FORMAL, BODY)
 
 
 # b4_parse_param_for(DECL, FORMAL, BODY)

diff --git a/data/glr.c b/data/glr.c
index b235c65a98750cd60dcbf8f3236195ca20259e3b..8910737c0c31fd0161e01f9daa5ea806b1907453 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -180,8 +180,9 @@ b4_token_enums(b4_tokens)
 [#ifndef YYSTYPE
 ]m4_ifdef([b4_stype],
 [[typedef union ]b4_union_name[
 [#ifndef YYSTYPE
 ]m4_ifdef([b4_stype],
 [[typedef union ]b4_union_name[

+{

 ]b4_user_stype[
 ]b4_user_stype[

-       YYSTYPE;
+} YYSTYPE;

 # define YYSTYPE_IS_TRIVIAL 1]],
 [m4_if(b4_tag_seen_flag, 0,
 [[typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1]],
 [m4_if(b4_tag_seen_flag, 0,
 [[typedef int YYSTYPE;

diff --git a/data/glr.cc b/data/glr.cc
index 5d461ee5ccbd990d4819009dd1221b4f5036dac2..6d3151b09e216bcd3405afb776dc7f2b076079cf 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -280,8 +280,9 @@ namespace ]b4_namespace[
 #ifndef YYSTYPE
 ]m4_ifdef([b4_stype],
 [    union semantic_type
 #ifndef YYSTYPE
 ]m4_ifdef([b4_stype],
 [    union semantic_type

+    {

 b4_user_stype
 b4_user_stype

-       ;],
+    };],

 [m4_if(b4_tag_seen_flag, 0,
 [[    typedef int semantic_type;]],
 [[    typedef YYSTYPE semantic_type;]])])[
 [m4_if(b4_tag_seen_flag, 0,
 [[    typedef int semantic_type;]],
 [[    typedef YYSTYPE semantic_type;]])])[

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 433c62b3ce2eb7eb5307f81ca271c4b29e7f3f58..6682378d7934065b140cd6dd02654327b6d18c5f 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -108,8 +108,9 @@ namespace ]b4_namespace[
 #ifndef YYSTYPE
 ]m4_ifdef([b4_stype],
 [    union semantic_type
 #ifndef YYSTYPE
 ]m4_ifdef([b4_stype],
 [    union semantic_type

+    {

 b4_user_stype
 b4_user_stype

-       ;],
+    };],

 [m4_if(b4_tag_seen_flag, 0,
 [[    typedef int semantic_type;]],
 [[    typedef YYSTYPE semantic_type;]])])[
 [m4_if(b4_tag_seen_flag, 0,
 [[    typedef int semantic_type;]],
 [[    typedef YYSTYPE semantic_type;]])])[

diff --git a/data/push.c b/data/push.c
index 1482d47149f756d58d9c6e63d6071a42d35c9885..70cad70d2550dd09724c7fd4fe605a8f22419dac 100644 (file)
--- a/data/push.c
+++ b/data/push.c
@@ -205,8 +205,9 @@ b4_token_enums_defines(b4_tokens)[
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 ]m4_ifdef([b4_stype],
 [[typedef union ]b4_union_name[
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 ]m4_ifdef([b4_stype],
 [[typedef union ]b4_union_name[

+{

 ]b4_user_stype[
 ]b4_user_stype[

-       YYSTYPE;
+} YYSTYPE;

 # define YYSTYPE_IS_TRIVIAL 1]],
 [m4_if(b4_tag_seen_flag, 0,
 [[typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1]],
 [m4_if(b4_tag_seen_flag, 0,
 [[typedef int YYSTYPE;


@@ -1660,8 +1661,9 @@ b4_token_enums_defines(b4_tokens)
 [#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 ]m4_ifdef([b4_stype],
 [[typedef union ]b4_union_name[
 [#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 ]m4_ifdef([b4_stype],
 [[typedef union ]b4_union_name[

+{

 ]b4_user_stype[
 ]b4_user_stype[

-       YYSTYPE;
+} YYSTYPE;

 # define YYSTYPE_IS_TRIVIAL 1]],
 [m4_if(b4_tag_seen_flag, 0,
 [[typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1]],
 [m4_if(b4_tag_seen_flag, 0,
 [[typedef int YYSTYPE;

diff --git a/data/yacc.c b/data/yacc.c
index bf62f6d3fe1d51dbf76449ef83ed9097dca8eaa5..0df00a1f77e19030477c6bd23a6a3cfa24c0b7f8 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -192,8 +192,9 @@ b4_token_enums_defines(b4_tokens)[
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 ]m4_ifdef([b4_stype],
 [[typedef union ]b4_union_name[
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 ]m4_ifdef([b4_stype],
 [[typedef union ]b4_union_name[

+{

 ]b4_user_stype[
 ]b4_user_stype[

-       YYSTYPE;
+} YYSTYPE;

 # define YYSTYPE_IS_TRIVIAL 1]],
 [m4_if(b4_tag_seen_flag, 0,
 [[typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1]],
 [m4_if(b4_tag_seen_flag, 0,
 [[typedef int YYSTYPE;


@@ -1497,8 +1498,9 @@ b4_token_enums_defines(b4_tokens)
 [#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 ]m4_ifdef([b4_stype],
 [[typedef union ]b4_union_name[
 [#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 ]m4_ifdef([b4_stype],
 [[typedef union ]b4_union_name[

+{

 ]b4_user_stype[
 ]b4_user_stype[

-       YYSTYPE;
+} YYSTYPE;

 # define YYSTYPE_IS_TRIVIAL 1]],
 [m4_if(b4_tag_seen_flag, 0,
 [[typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1]],
 [m4_if(b4_tag_seen_flag, 0,
 [[typedef int YYSTYPE;

diff --git a/src/files.c b/src/files.c
index d90c466475c85d7d87cb926bf2a5bf73916fb997..009fdfd4ea07cf4f2f4436164235de41b738dbd2 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -35,9 +35,6 @@
 #include "getargs.h"
 #include "gram.h"
 
 #include "getargs.h"
 #include "gram.h"
 

-struct obstack pre_prologue_obstack;
-struct obstack post_prologue_obstack;
-

 /* Initializing some values below (such SPEC_NAME_PREFIX to `yy') is
    tempting, but don't do that: for the time being our handling of the
    %directive vs --option leaves precedence to the options by deciding
 /* Initializing some values below (such SPEC_NAME_PREFIX to `yy') is
    tempting, but don't do that: for the time being our handling of the
    %directive vs --option leaves precedence to the options by deciding

diff --git a/src/files.h b/src/files.h
index a315414c42e95613fe97af55fcf5941ff2f26563..bfff99e8c2de2ae5cfc2a92dea89911b06b07785 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -49,11 +49,6 @@ extern char *spec_defines_file;
 /* Directory prefix of output file names.  */
 extern char *dir_prefix;
 
 /* Directory prefix of output file names.  */
 extern char *dir_prefix;
 

-
-/* If semantic parser, output a .h file that defines YYSTYPE... */
-extern struct obstack pre_prologue_obstack;
-extern struct obstack post_prologue_obstack;
-

 /* The file name as given on the command line.
    Not named "input_file" because Flex uses this name for an argument,
    and therefore GCC warns about a name clash. */
 /* The file name as given on the command line.
    Not named "input_file" because Flex uses this name for an argument,
    and therefore GCC warns about a name clash. */

diff --git a/src/muscle_tab.c b/src/muscle_tab.c
index 5d02e5b7a7a1a7219615aa94a201f9b2d845ea15..e044c2ea7b5b1e83a8219ac665837c6a5b27cfc6 100644 (file)
--- a/src/muscle_tab.c
+++ b/src/muscle_tab.c
@@ -191,18 +191,15 @@ muscle_code_grow (const char *key, const char *val, location loc)
 }
 
 
 }
 
 

-/*-------------------------------------------------------------------.
-| MUSCLE is an M4 list of pairs.  Create or extend it with the pair  |
-| (A1, A2).  Note that because the muscle values are output *double* |
-| quoted, one needs to strip the first level of quotes to reach the  |
-| list itself.                                                       |
-`-------------------------------------------------------------------*/
-

 void muscle_pair_list_grow (const char *muscle,
                            const char *a1, const char *a2)
 {
   char *pair;
 void muscle_pair_list_grow (const char *muscle,
                            const char *a1, const char *a2)
 {
   char *pair;

-  obstack_fgrow2 (&muscle_obstack, "[[[%s]], [[%s]]]", a1, a2);
+  obstack_sgrow (&muscle_obstack, "[[[");
+  MUSCLE_OBSTACK_SGROW (&muscle_obstack, a1);
+  obstack_sgrow (&muscle_obstack, "]], [[");
+  MUSCLE_OBSTACK_SGROW (&muscle_obstack, a2);
+  obstack_sgrow (&muscle_obstack, "]]]");

   obstack_1grow (&muscle_obstack, 0);
   pair = obstack_finish (&muscle_obstack);
   muscle_grow (muscle, pair, ",\n");
   obstack_1grow (&muscle_obstack, 0);
   pair = obstack_finish (&muscle_obstack);
   muscle_grow (muscle, pair, ",\n");

diff --git a/src/muscle_tab.h b/src/muscle_tab.h
index dac7db0912056a34e3dfedb24f7831ba660e3df4..eb01241fdb6719bc4f231a3075ee5e4e149108e9 100644 (file)
--- a/src/muscle_tab.h
+++ b/src/muscle_tab.h
@@ -104,10 +104,9 @@ void muscle_code_grow (const char *key, const char *value, location loc);
 
 
 /* MUSCLE is an M4 list of pairs.  Create or extend it with the pair
 
 
 /* MUSCLE is an M4 list of pairs.  Create or extend it with the pair

-   (A1, A2).  Note that because the muscle values are output *double*
-   quoted, one needs to strip the first level of quotes to reach the
-   list itself.  */
-
+   (A1, A2) after escaping both values with digraphs.  Note that because the
+   muscle values are output *double* quoted, one needs to strip the first level
+   of quotes to reach the list itself.  */

 void muscle_pair_list_grow (const char *muscle,
                            const char *a1, const char *a2);
 
 void muscle_pair_list_grow (const char *muscle,
                            const char *a1, const char *a2);
 

diff --git a/src/output.c b/src/output.c
index 8a4b64f393621d172c6fbb15069e6d4d6d8b3bf1..b3e7c6c497c66b3b3d22b0563b986b2071e93267 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -595,12 +595,6 @@ prepare (void)
   DEFINE (spec_verbose_file);
 #undef DEFINE
 
   DEFINE (spec_verbose_file);
 #undef DEFINE
 

-  /* User Code.  */
-  obstack_1grow (&pre_prologue_obstack, 0);
-  obstack_1grow (&post_prologue_obstack, 0);
-  muscle_insert ("pre_prologue", obstack_finish (&pre_prologue_obstack));
-  muscle_insert ("post_prologue", obstack_finish (&post_prologue_obstack));
-

   /* Find the right skeleton file, and add muscles about the skeletons.  */
   if (skeleton)
     MUSCLE_INSERT_C_STRING ("skeleton", skeleton);
   /* Find the right skeleton file, and add muscles about the skeletons.  */
   if (skeleton)
     MUSCLE_INSERT_C_STRING ("skeleton", skeleton);


@@ -639,6 +633,4 @@ output (void)
   output_skeleton ();
 
   obstack_free (&format_obstack, NULL);
   output_skeleton ();
 
   obstack_free (&format_obstack, NULL);

-  obstack_free (&pre_prologue_obstack, NULL);
-  obstack_free (&post_prologue_obstack, NULL);

 }
 }

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 0b3b496c2ff04d045be321fde096f33c72d54d4e..75e59b84a1f1d81c79d738362034edd3f81d1ac6 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -77,7 +77,7 @@
 
 /* Copy the first part of user declarations.  */
 
 
 /* Copy the first part of user declarations.  */
 

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

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


@@ -157,7 +157,7 @@ static int current_prec = 0;
 #define YYTYPE_UINT8 uint_fast8_t
 
 
 #define YYTYPE_UINT8 uint_fast8_t
 
 

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

 #line 162 "parse-gram.c"
 
 /* Enabling traces.  */
 #line 162 "parse-gram.c"
 
 /* Enabling traces.  */


@@ -244,72 +244,14 @@ static int current_prec = 0;
      PERCENT_UNION = 313
    };
 #endif
      PERCENT_UNION = 313
    };
 #endif

-/* Tokens.  */
-#define GRAM_EOF 0
-#define STRING 258
-#define INT 259
-#define PERCENT_TOKEN 260
-#define PERCENT_NTERM 261
-#define PERCENT_TYPE 262
-#define PERCENT_DESTRUCTOR 263
-#define PERCENT_PRINTER 264
-#define PERCENT_LEFT 265
-#define PERCENT_RIGHT 266
-#define PERCENT_NONASSOC 267
-#define PERCENT_PREC 268
-#define PERCENT_DPREC 269
-#define PERCENT_MERGE 270
-#define PERCENT_CODE 271
-#define PERCENT_DEBUG 272
-#define PERCENT_DEFAULT_PREC 273
-#define PERCENT_DEFINE 274
-#define PERCENT_DEFINES 275
-#define PERCENT_ERROR_VERBOSE 276
-#define PERCENT_EXPECT 277
-#define PERCENT_EXPECT_RR 278
-#define PERCENT_FILE_PREFIX 279
-#define PERCENT_GLR_PARSER 280
-#define PERCENT_INITIAL_ACTION 281
-#define PERCENT_LANGUAGE 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_PUSH_PARSER 292
-#define PERCENT_PUSH_PULL_PARSER 293
-#define PERCENT_REQUIRE 294
-#define PERCENT_SKELETON 295
-#define PERCENT_START 296
-#define PERCENT_TOKEN_TABLE 297
-#define PERCENT_VERBOSE 298
-#define PERCENT_YACC 299
-#define BRACED_CODE 300
-#define CHAR 301
-#define EPILOGUE 302
-#define EQUAL 303
-#define ID 304
-#define ID_COLON 305
-#define PERCENT_PERCENT 306
-#define PIPE 307
-#define PROLOGUE 308
-#define SEMICOLON 309
-#define TYPE 310
-#define TYPE_TAG_ANY 311
-#define TYPE_TAG_NONE 312
-#define PERCENT_UNION 313
-

 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {

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

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


@@ -320,11 +262,12 @@ typedef union YYSTYPE
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;

-}

 
 

-/* Line 1535 of yacc.c  */
-#line 327 "parse-gram.c"
-       YYSTYPE;
+
+
+/* Line 1537 of yacc.c  */
+#line 270 "parse-gram.c"
+} YYSTYPE;

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


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

-/* Line 1535 of yacc.c  */
-#line 352 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 295 "parse-gram.c"

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


@@ -653,7 +596,7 @@ static const yytype_int8 yyrhs[] =
       43,    -1,    44,    -1,    54,    -1,    68,    -1,    65,    -1,
       41,    87,    -1,     8,    45,    72,    -1,     9,    45,    72,
       -1,    18,    -1,    31,    -1,    16,    84,    -1,    16,    49,
       43,    -1,    44,    -1,    54,    -1,    68,    -1,    65,    -1,
       41,    87,    -1,     8,    45,    72,    -1,     9,    45,    72,
       -1,    18,    -1,    31,    -1,    16,    84,    -1,    16,    49,

-      84,    -1,    -1,    49,    -1,    58,    64,    45,    -1,    -1,
+      84,    -1,    -1,    49,    -1,    58,    64,    84,    -1,    -1,

        6,    66,    75,    -1,    -1,     5,    67,    75,    -1,     7,
       55,    71,    -1,    69,    70,    71,    -1,    10,    -1,    11,
       -1,    12,    -1,    -1,    55,    -1,    87,    -1,    71,    87,
        6,    66,    75,    -1,    -1,     5,    67,    75,    -1,     7,
       55,    71,    -1,    69,    70,    71,    -1,    10,    -1,    11,
       -1,    12,    -1,    -1,    55,    -1,    87,    -1,    71,    87,


@@ -673,17 +616,17 @@ static const yytype_int8 yyrhs[] =
 /* 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,   210,   210,   218,   220,   224,   225,   234,   235,   247,
-     248,   253,   254,   255,   256,   257,   258,   263,   272,   273,
-     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
-     284,   285,   286,   287,   288,   289,   290,   294,   295,   296,
-     300,   307,   314,   318,   322,   327,   348,   349,   353,   382,
-     382,   387,   387,   392,   403,   418,   419,   420,   424,   425,
-     430,   432,   437,   438,   442,   443,   444,   445,   450,   455,
-     460,   466,   472,   483,   484,   493,   494,   500,   501,   502,
-     509,   509,   513,   514,   515,   520,   521,   523,   525,   527,
-     529,   539,   540,   546,   550,   559,   579,   581,   590,   595,
-     596,   601,   608,   610
+       0,   210,   210,   218,   220,   224,   225,   235,   236,   248,
+     249,   254,   255,   256,   257,   258,   259,   264,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   295,   296,   297,
+     301,   308,   315,   319,   323,   328,   349,   350,   354,   366,
+     366,   371,   371,   376,   387,   402,   403,   404,   408,   409,
+     414,   416,   421,   422,   426,   427,   428,   429,   434,   439,
+     444,   450,   456,   467,   468,   477,   478,   484,   485,   486,
+     493,   493,   497,   498,   499,   504,   505,   507,   509,   511,
+     513,   523,   524,   530,   534,   543,   563,   565,   574,   579,
+     580,   585,   592,   594

 };
 #endif
 
 };
 #endif
 


@@ -799,29 +742,29 @@ static const yytype_int16 yydefgoto[] =
 #define YYPACT_NINF -79
 static const yytype_int16 yypact[] =
 {
 #define YYPACT_NINF -79
 static const yytype_int16 yypact[] =
 {

-     -79,     5,    96,   -79,   -79,   -79,     3,    17,    18,   -79,
-     -79,   -79,    -8,   -79,   -79,    27,    61,   -79,    65,    73,
-      31,   -79,    41,    75,    43,   -79,    32,   -79,   -79,   -79,
-      33,    44,   -79,   -79,   -79,    87,    89,    26,   -79,   -79,
-     -79,    15,   -79,   -79,    45,   -79,   -79,   -79,   -79,    42,
-      38,    38,    26,    11,    11,   -79,    51,   -79,   -79,   -79,
-      95,   -79,   -79,   -79,   -79,   106,   -79,   -79,   -79,   -79,
-     107,   -79,   108,   -79,   -79,   -79,   -79,   -79,   -79,   -79,
-     -79,   -79,    88,   -79,    90,     1,   -79,   -79,   -79,   -79,
-      54,   -79,    26,   -79,   -79,    38,    50,    38,    26,   -79,
+     -79,     5,    96,   -79,   -79,   -79,    -6,    13,    18,   -79,
+     -79,   -79,    -8,   -79,   -79,    27,    66,   -79,    74,    82,
+      31,   -79,    43,    86,    45,   -79,    32,   -79,   -79,   -79,
+      33,    47,   -79,   -79,   -79,    91,    93,    26,   -79,   -79,
+     -79,    15,   -79,   -79,    48,   -79,   -79,   -79,   -79,    44,
+      38,    38,    26,    11,    11,   -79,    53,   -79,   -79,   -79,
+     106,   -79,   -79,   -79,   -79,   107,   -79,   -79,   -79,   -79,
+     108,   -79,   138,   -79,   -79,   -79,   -79,   -79,   -79,   -79,
+     -79,   -79,    88,   -79,    89,     1,   -79,   -79,   -79,   -79,
+      53,   -79,    26,   -79,   -79,    38,    50,    38,    26,   -79,

      -79,   -79,   -79,    11,   -79,   -79,    11,   -79,   -79,   -79,
      -79,   -79,   -79,    11,   -79,   -79,    11,   -79,   -79,   -79,

-     -79,   -79,   -79,   -79,   -79,    94,   -79,   -79,   -79,   -79,
-      26,   -79,   140,   -79,   -79,   -79,   -79,    -9,    25,   -79,
-     -79,   -79,    26,   141,    91,   -79,   -79,    25,   -79,   -79,
+     -79,   -79,   -79,   -79,   -79,    97,   -79,   -79,   -79,   -79,
+      26,   -79,   142,   -79,   -79,   -79,   -79,    -7,    25,   -79,
+     -79,   -79,    26,   144,    98,   -79,   -79,    25,   -79,   -79,

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

-     -79,   -79,   -79,   -79,   146,   -79,   -79,   -79,   -79,   -79,
-     -79,   -79,    59,    98,   -21,   -48,   102,   -79,    70,   -79,
-     -79,   -79,    28,   -79,   -79,   100,   -47,   -79,   -37,   -78,
+     -79,   -79,   -79,   -79,   149,   -79,   -79,   -79,   -79,   -79,
+     -79,   -79,    54,   101,   -21,   -33,   105,   -79,    67,   -79,
+     -79,   -79,    28,   -79,   -79,   -13,   -47,   -79,   -37,   -78,

      -79
 };
 
      -79
 };
 


@@ -836,18 +779,18 @@ static const yytype_int16 yytable[] =
        8,     9,    10,    11,    76,    99,    82,    12,   123,    14,
        4,     5,     6,     7,     8,     9,    10,    11,    76,    76,
       58,    12,    27,    14,    64,    69,    71,    55,   132,   133,
        8,     9,    10,    11,    76,    99,    82,    12,   123,    14,
        4,     5,     6,     7,     8,     9,    10,    11,    76,    76,
       58,    12,    27,    14,    64,    69,    71,    55,   132,   133,

-     134,    56,    37,   130,   129,   131,    27,   121,    96,   121,
-      96,    83,   115,    76,   122,    99,    37,    77,    52,    44,
-      78,   124,    53,    54,    61,    83,   100,   101,   102,    62,
-     135,    77,    77,    44,    78,    78,    59,    63,    67,    65,
-      70,    72,   125,   124,    77,   125,    66,    78,    68,    73,
-      74,   136,    75,    93,    89,   138,    55,    91,   108,   119,
-     136,     4,     5,     6,     7,     8,     9,    10,    11,   110,
-     111,   112,    12,    13,    14,    15,    16,    17,    18,    19,
+     134,    56,    37,   107,   129,   130,    27,   131,    96,    52,
+      96,    83,   115,    76,   122,    99,    37,    77,    53,    44,
+      78,   124,   121,    54,   121,    83,   100,   101,   102,    61,
+     135,    77,    77,    44,    78,    78,    59,   119,    62,    65,
+      70,    72,   125,   124,    77,   125,    63,    78,    66,    67,
+      68,   136,    73,    93,    74,   138,    75,    89,    55,    91,
+     136,     4,     5,     6,     7,     8,     9,    10,    11,   108,
+     110,   111,    12,    13,    14,    15,    16,    17,    18,    19,

       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
       30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
       30,    31,    32,    33,    34,    35,    36,    37,    38,    39,

-      40,   126,   113,    76,   114,   139,   140,    41,    46,    42,
-      43,   120,   106,    97,    44,   116,   107,     0,   137
+      40,   112,   113,   114,   126,    76,   120,    41,   139,    42,
+      43,    46,   116,   140,    44,   106,    97,     0,   137

 };
 
 static const yytype_int16 yycheck[] =
 };
 
 static const yytype_int16 yycheck[] =


@@ -856,18 +799,18 @@ static const yytype_int16 yycheck[] =
        9,    10,    11,    12,     3,    52,     1,    16,    96,    18,
        5,     6,     7,     8,     9,    10,    11,    12,     3,     3,
        3,    16,    31,    18,     3,     3,     3,    45,    13,    14,
        9,    10,    11,    12,     3,    52,     1,    16,    96,    18,
        5,     6,     7,     8,     9,    10,    11,    12,     3,     3,
        3,    16,    31,    18,     3,     3,     3,    45,    13,    14,

-      15,    49,    41,    52,   122,    54,    31,    95,    95,    97,
-      97,    50,    51,     3,     4,    92,    41,    46,    55,    58,
-      49,    98,    45,    45,     3,    50,    55,    56,    57,     4,
-      45,    46,    46,    58,    49,    49,    49,     4,     3,    48,
-      48,    48,   103,   120,    46,   106,    45,    49,    45,    45,
-       3,   128,     3,    55,    49,   132,    45,    55,     3,    45,
+      15,    49,    41,    56,   122,    52,    31,    54,    95,    55,
+      97,    50,    51,     3,     4,    92,    41,    46,    45,    58,
+      49,    98,    95,    45,    97,    50,    55,    56,    57,     3,
+      45,    46,    46,    58,    49,    49,    49,    90,     4,    48,
+      48,    48,   103,   120,    46,   106,     4,    49,    45,     3,
+      45,   128,    45,    55,     3,   132,     3,    49,    45,    55,

      137,     5,     6,     7,     8,     9,    10,    11,    12,     3,
        3,     3,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
      137,     5,     6,     7,     8,     9,    10,    11,    12,     3,
        3,     3,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       34,    35,    36,    37,    38,    39,    40,    41,    42,    43,

-      44,    47,    54,     3,    54,     4,    55,    51,     2,    53,
-      54,    92,    54,    51,    58,    85,    56,    -1,   130
+      44,     3,    54,    54,    47,     3,    92,    51,     4,    53,
+      54,     2,    85,    55,    58,    54,    51,    -1,   130

 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing


@@ -885,7 +828,7 @@ static const yytype_uint8 yystos[] =
       87,    88,     1,    50,    63,    76,    77,    78,    86,    49,
       64,    55,    70,    55,    74,    75,    85,    75,    71,    87,
       55,    56,    57,    72,    73,    87,    72,    84,     3,    83,
       87,    88,     1,    50,    63,    76,    77,    78,    86,    49,
       64,    55,    70,    55,    74,    75,    85,    75,    71,    87,
       55,    56,    57,    72,    73,    87,    72,    84,     3,    83,

-       3,     3,     3,    54,    54,    51,    77,    89,    79,    45,
+       3,     3,     3,    54,    54,    51,    77,    89,    79,    84,

       71,    74,     4,    88,    87,    73,    47,    80,    81,    88,
       52,    54,    13,    14,    15,    45,    87,    81,    87,     4,
       55
       71,    74,     4,    88,    87,    73,    47,    80,    81,    88,
       52,    54,    13,    14,    15,    45,    87,    81,    87,     4,
       55


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

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

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

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

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

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

 #line 199 "parse-gram.y"
        { fprintf (stderr, "%d", (yyvaluep->integer)); };
 
 #line 199 "parse-gram.y"
        { fprintf (stderr, "%d", (yyvaluep->integer)); };
 

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

        break;
       case 45: /* "\"{...}\"" */
 
        break;
       case 45: /* "\"{...}\"" */
 

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

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

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

        break;
       case 46: /* "\"char\"" */
 
        break;
       case 46: /* "\"char\"" */
 

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

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

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

        break;
       case 47: /* "\"epilogue\"" */
 
        break;
       case 47: /* "\"epilogue\"" */
 

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

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

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

        break;
       case 49: /* "\"identifier\"" */
 
        break;
       case 49: /* "\"identifier\"" */
 

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

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

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

        break;
       case 50: /* "\"identifier:\"" */
 
        break;
       case 50: /* "\"identifier:\"" */
 

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

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

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

        break;
       case 53: /* "\"%{...%}\"" */
 
        break;
       case 53: /* "\"%{...%}\"" */
 

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

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

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

        break;
       case 55: /* "\"type\"" */
 
        break;
       case 55: /* "\"type\"" */
 

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

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

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

        break;
       case 82: /* "variable" */
 
        break;
       case 82: /* "variable" */
 

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

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

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

        break;
       case 83: /* "content.opt" */
 
        break;
       case 83: /* "content.opt" */
 

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

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

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

        break;
       case 84: /* "braceless" */
 
        break;
       case 84: /* "braceless" */
 

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

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

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

        break;
       case 85: /* "id" */
 
        break;
       case 85: /* "id" */
 

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

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

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

        break;
       case 86: /* "id_colon" */
 
        break;
       case 86: /* "id_colon" */
 

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

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

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

        break;
       case 87: /* "symbol" */
 
        break;
       case 87: /* "symbol" */
 

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

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

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

        break;
       case 88: /* "string_as_id" */
 
        break;
       case 88: /* "string_as_id" */
 

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

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

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

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


@@ -1692,7 +1635,7 @@ YYLTYPE yylloc;
 
   /* User initialization code.  */
   
 
   /* User initialization code.  */
   

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

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


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

-/* Line 1535 of yacc.c  */
-#line 1706 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1649 "parse-gram.c"

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


@@ -1887,29 +1830,30 @@ yyreduce:
     {
         case 6:
 
     {
         case 6:
 

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

 #line 226 "parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
 #line 226 "parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();

-      prologue_augment (plain_code.code, (yylsp[(1) - (1)]), union_seen);
+      muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
+                        plain_code.code, (yylsp[(1) - (1)]));

       code_scanner_last_string_free ();
     }
     break;
 
   case 7:
 
       code_scanner_last_string_free ();
     }
     break;
 
   case 7:
 

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

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

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

     {
       char const name_prefix[] = "percent_define_";
       char *name = xmalloc (sizeof name_prefix + strlen ((yyvsp[(2) - (3)].uniqstr)));
     {
       char const name_prefix[] = "percent_define_";
       char *name = xmalloc (sizeof name_prefix + strlen ((yyvsp[(2) - (3)].uniqstr)));


@@ -1925,15 +1869,15 @@ yyreduce:
 
   case 9:
 
 
   case 9:
 

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

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

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

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


@@ -1942,43 +1886,43 @@ yyreduce:
 
   case 11:
 
 
   case 11:
 

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

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

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

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

-/* Line 1535 of yacc.c  */
-#line 255 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 256 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 256 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 257 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 257 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 258 "parse-gram.y"

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

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

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


@@ -1987,8 +1931,8 @@ yyreduce:
 
   case 17:
 
 
   case 17:
 

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

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


@@ -2001,134 +1945,134 @@ yyreduce:
 
   case 18:
 
 
   case 18:
 

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

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

-/* Line 1535 of yacc.c  */
-#line 273 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 274 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 274 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 275 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 275 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 276 "parse-gram.y"

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

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

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

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

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

-/* Line 1535 of yacc.c  */
-#line 278 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 279 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 279 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 280 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 280 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 281 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 281 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 282 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 282 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 283 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 283 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 284 "parse-gram.y"

     { push_parser = true; pull_parser = false; }
     break;
 
   case 30:
 
     { push_parser = true; pull_parser = false; }
     break;
 
   case 30:
 

-/* Line 1535 of yacc.c  */
-#line 284 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 285 "parse-gram.y"

     { push_parser = true; pull_parser = true; }
     break;
 
   case 31:
 
     { push_parser = true; pull_parser = true; }
     break;
 
   case 31:
 

-/* Line 1535 of yacc.c  */
-#line 285 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 286 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 286 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 287 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 287 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 288 "parse-gram.y"

     { token_table_flag = true; }
     break;
 
   case 34:
 
     { token_table_flag = true; }
     break;
 
   case 34:
 

-/* Line 1535 of yacc.c  */
-#line 288 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 289 "parse-gram.y"

     { report_flag = report_states; }
     break;
 
   case 35:
 
     { report_flag = report_states; }
     break;
 
   case 35:
 

-/* Line 1535 of yacc.c  */
-#line 289 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 290 "parse-gram.y"

     { yacc_flag = true; }
     break;
 
   case 39:
 
     { yacc_flag = true; }
     break;
 
   case 39:
 

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

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


@@ -2136,8 +2080,8 @@ yyreduce:
 
   case 40:
 
 
   case 40:
 

-/* Line 1535 of yacc.c  */
-#line 301 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 302 "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)


@@ -2148,8 +2092,8 @@ yyreduce:
 
   case 41:
 
 
   case 41:
 

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

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


@@ -2160,8 +2104,8 @@ yyreduce:
 
   case 42:
 
 
   case 42:
 

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

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


@@ -2169,8 +2113,8 @@ yyreduce:
 
   case 43:
 
 
   case 43:
 

-/* Line 1535 of yacc.c  */
-#line 319 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 320 "parse-gram.y"

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


@@ -2178,8 +2122,8 @@ yyreduce:
 
   case 44:
 
 
   case 44:
 

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

     {
       muscle_code_grow ("percent_code", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
       code_scanner_last_string_free ();
     {
       muscle_code_grow ("percent_code", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
       code_scanner_last_string_free ();


@@ -2188,8 +2132,8 @@ yyreduce:
 
   case 45:
 
 
   case 45:
 

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

     {
       char const name_prefix[] = "percent_code_";
       char *name = xmalloc (sizeof name_prefix + strlen ((yyvsp[(2) - (3)].uniqstr)));
     {
       char const name_prefix[] = "percent_code_";
       char *name = xmalloc (sizeof name_prefix + strlen ((yyvsp[(2) - (3)].uniqstr)));


@@ -2204,57 +2148,40 @@ yyreduce:
 
   case 46:
 
 
   case 46:
 

-/* Line 1535 of yacc.c  */
-#line 348 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 349 "parse-gram.y"

     {}
     break;
 
   case 47:
 
     {}
     break;
 
   case 47:
 

-/* Line 1535 of yacc.c  */
-#line 349 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 350 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 354 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 355 "parse-gram.y"

     {
     {

-      char const *body = (yyvsp[(3) - (3)].code);
-
-      /* Concatenate the %union bodies.  If this is the first %union, make sure
-        the synchronization line appears after the opening '{' so as not to
-        confuse Doxygen.  Otherwise, turn the previous %union's trailing '}'
-        into '\n', and omit the new %union's leading '{'.  */
-      if (!union_seen)
-       {
-         muscle_grow ("stype", "{", "");
-       }
-      else
-       {
-         char *code = muscle_find ("stype");
-         code[strlen (code) - 1] = '\n';
-       }
-      body++;
-

       union_seen = true;
       union_seen = true;

-      muscle_code_grow ("stype", body, (yylsp[(3) - (3)]));
-      gram_scanner_last_string_free ();
+      muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+      code_scanner_last_string_free ();

     }
     break;
 
   case 49:
 
     }
     break;
 
   case 49:
 

-/* Line 1535 of yacc.c  */
-#line 382 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 366 "parse-gram.y"

     { current_class = nterm_sym; }
     break;
 
   case 50:
 
     { current_class = nterm_sym; }
     break;
 
   case 50:
 

-/* Line 1535 of yacc.c  */
-#line 383 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 367 "parse-gram.y"

     {
       current_class = unknown_sym;
       current_type = NULL;
     {
       current_class = unknown_sym;
       current_type = NULL;


@@ -2263,15 +2190,15 @@ yyreduce:
 
   case 51:
 
 
   case 51:
 

-/* Line 1535 of yacc.c  */
-#line 387 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 371 "parse-gram.y"

     { current_class = token_sym; }
     break;
 
   case 52:
 
     { current_class = token_sym; }
     break;
 
   case 52:
 

-/* Line 1535 of yacc.c  */
-#line 388 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 372 "parse-gram.y"

     {
       current_class = unknown_sym;
       current_type = NULL;
     {
       current_class = unknown_sym;
       current_type = NULL;


@@ -2280,8 +2207,8 @@ yyreduce:
 
   case 53:
 
 
   case 53:
 

-/* Line 1535 of yacc.c  */
-#line 393 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 377 "parse-gram.y"

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


@@ -2293,8 +2220,8 @@ yyreduce:
 
   case 54:
 
 
   case 54:
 

-/* Line 1535 of yacc.c  */
-#line 404 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 388 "parse-gram.y"

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


@@ -2310,99 +2237,99 @@ yyreduce:
 
   case 55:
 
 
   case 55:
 

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

     { (yyval.assoc) = left_assoc; }
     break;
 
   case 56:
 
     { (yyval.assoc) = left_assoc; }
     break;
 
   case 56:
 

-/* Line 1535 of yacc.c  */
-#line 419 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 403 "parse-gram.y"

     { (yyval.assoc) = right_assoc; }
     break;
 
   case 57:
 
     { (yyval.assoc) = right_assoc; }
     break;
 
   case 57:
 

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

     { (yyval.assoc) = non_assoc; }
     break;
 
   case 58:
 
     { (yyval.assoc) = non_assoc; }
     break;
 
   case 58:
 

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

     { current_type = NULL; }
     break;
 
   case 59:
 
     { current_type = NULL; }
     break;
 
   case 59:
 

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

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

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

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

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

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

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

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

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

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

-/* Line 1535 of yacc.c  */
-#line 442 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 426 "parse-gram.y"

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

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

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

-/* Line 1535 of yacc.c  */
-#line 444 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 428 "parse-gram.y"

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

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

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

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

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


@@ -2411,8 +2338,8 @@ yyreduce:
 
   case 69:
 
 
   case 69:
 

-/* Line 1535 of yacc.c  */
-#line 456 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 440 "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)]));
     {
        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)]));


@@ -2421,8 +2348,8 @@ yyreduce:
 
   case 70:
 
 
   case 70:
 

-/* Line 1535 of yacc.c  */
-#line 461 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 445 "parse-gram.y"

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


@@ -2432,8 +2359,8 @@ yyreduce:
 
   case 71:
 
 
   case 71:
 

-/* Line 1535 of yacc.c  */
-#line 467 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 451 "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)]));


@@ -2443,8 +2370,8 @@ yyreduce:
 
   case 72:
 
 
   case 72:
 

-/* Line 1535 of yacc.c  */
-#line 473 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 457 "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)]));


@@ -2455,8 +2382,8 @@ yyreduce:
 
   case 79:
 
 
   case 79:
 

-/* Line 1535 of yacc.c  */
-#line 503 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 487 "parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }


@@ -2464,78 +2391,78 @@ yyreduce:
 
   case 80:
 
 
   case 80:
 

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

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

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

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

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

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

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

     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 86:
 
     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 86:
 

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

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

-/* Line 1535 of yacc.c  */
-#line 524 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 508 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 526 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 510 "parse-gram.y"

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

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

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

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

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

-/* Line 1535 of yacc.c  */
-#line 540 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 524 "parse-gram.y"

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

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

     {
       static char one[] = "1";
       (yyval.chars) = one;
     {
       static char one[] = "1";
       (yyval.chars) = one;


@@ -2544,8 +2471,8 @@ yyreduce:
 
   case 95:
 
 
   case 95:
 

-/* Line 1535 of yacc.c  */
-#line 560 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 544 "parse-gram.y"

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


@@ -2558,15 +2485,15 @@ yyreduce:
 
   case 96:
 
 
   case 96:
 

-/* Line 1535 of yacc.c  */
-#line 580 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 564 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 582 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 566 "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);


@@ -2576,15 +2503,15 @@ yyreduce:
 
   case 98:
 
 
   case 98:
 

-/* Line 1535 of yacc.c  */
-#line 590 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 574 "parse-gram.y"

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

-/* Line 1535 of yacc.c  */
-#line 602 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 586 "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);
     {
       (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);


@@ -2593,8 +2520,8 @@ yyreduce:
 
   case 103:
 
 
   case 103:
 

-/* Line 1535 of yacc.c  */
-#line 611 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 595 "parse-gram.y"

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


@@ -2607,8 +2534,8 @@ yyreduce:
 
 
 
 
 
 

-/* Line 1535 of yacc.c  */
-#line 2612 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 2539 "parse-gram.c"

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


@@ -2826,8 +2753,8 @@ yyreturn:
 
 
 
 
 
 

-/* Line 1535 of yacc.c  */
-#line 621 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 605 "parse-gram.y"

 
 
 
 
 
 

diff --git a/src/parse-gram.h b/src/parse-gram.h
index 978f4e0fdbd131e2a5734a552cb496390d2b1f84..6f02484b49b1482dec3c462630ef793afce6549e 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -100,72 +100,14 @@
      PERCENT_UNION = 313
    };
 #endif
      PERCENT_UNION = 313
    };
 #endif

-/* Tokens.  */
-#define GRAM_EOF 0
-#define STRING 258
-#define INT 259
-#define PERCENT_TOKEN 260
-#define PERCENT_NTERM 261
-#define PERCENT_TYPE 262
-#define PERCENT_DESTRUCTOR 263
-#define PERCENT_PRINTER 264
-#define PERCENT_LEFT 265
-#define PERCENT_RIGHT 266
-#define PERCENT_NONASSOC 267
-#define PERCENT_PREC 268
-#define PERCENT_DPREC 269
-#define PERCENT_MERGE 270
-#define PERCENT_CODE 271
-#define PERCENT_DEBUG 272
-#define PERCENT_DEFAULT_PREC 273
-#define PERCENT_DEFINE 274
-#define PERCENT_DEFINES 275
-#define PERCENT_ERROR_VERBOSE 276
-#define PERCENT_EXPECT 277
-#define PERCENT_EXPECT_RR 278
-#define PERCENT_FILE_PREFIX 279
-#define PERCENT_GLR_PARSER 280
-#define PERCENT_INITIAL_ACTION 281
-#define PERCENT_LANGUAGE 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_PUSH_PARSER 292
-#define PERCENT_PUSH_PULL_PARSER 293
-#define PERCENT_REQUIRE 294
-#define PERCENT_SKELETON 295
-#define PERCENT_START 296
-#define PERCENT_TOKEN_TABLE 297
-#define PERCENT_VERBOSE 298
-#define PERCENT_YACC 299
-#define BRACED_CODE 300
-#define CHAR 301
-#define EPILOGUE 302
-#define EQUAL 303
-#define ID 304
-#define ID_COLON 305
-#define PERCENT_PERCENT 306
-#define PIPE 307
-#define PROLOGUE 308
-#define SEMICOLON 309
-#define TYPE 310
-#define TYPE_TAG_ANY 311
-#define TYPE_TAG_NONE 312
-#define PERCENT_UNION 313
-

 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {

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

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


@@ -176,11 +118,12 @@ typedef union YYSTYPE
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;

-}

 
 

-/* Line 1535 of yacc.c  */
-#line 183 "parse-gram.h"
-       YYSTYPE;
+
+
+/* Line 1537 of yacc.c  */
+#line 126 "parse-gram.h"
+} YYSTYPE;

 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
 # 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 1fca61d36e623b01fe7c8614e3d7ecbce8a04a1b..802347fa628ddaa32232c85a1085743d1f7dcbb0 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -228,7 +228,8 @@ prologue_declaration:
       code_props_plain_init (&plain_code, $1, @1);
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
       code_props_plain_init (&plain_code, $1, @1);
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();

-      prologue_augment (plain_code.code, @1, union_seen);
+      muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
+                        plain_code.code, @1);

       code_scanner_last_string_free ();
     }
 | "%debug"                         { debug_flag = true; }
       code_scanner_last_string_free ();
     }
 | "%debug"                         { debug_flag = true; }


@@ -350,28 +351,11 @@ union_name:
 ;
 
 grammar_declaration:
 ;
 
 grammar_declaration:

-  "%union" union_name "{...}"
+  "%union" union_name braceless

     {
     {

-      char const *body = $3;
-
-      /* Concatenate the %union bodies.  If this is the first %union, make sure
-        the synchronization line appears after the opening '{' so as not to
-        confuse Doxygen.  Otherwise, turn the previous %union's trailing '}'
-        into '\n', and omit the new %union's leading '{'.  */
-      if (!union_seen)
-       {
-         muscle_grow ("stype", "{", "");
-       }
-      else
-       {
-         char *code = muscle_find ("stype");
-         code[strlen (code) - 1] = '\n';
-       }
-      body++;
-

       union_seen = true;
       union_seen = true;

-      muscle_code_grow ("stype", body, @3);
-      gram_scanner_last_string_free ();
+      muscle_code_grow ("stype", $3, @3);
+      code_scanner_last_string_free ();

     }
 ;
 
     }
 ;
 

diff --git a/src/reader.c b/src/reader.c
index 587a4f099886c75b4051712cd83300e2621bbc8b..24da9b74bbefd236cc185aeacc57a9f588da399f 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -69,27 +69,6 @@ grammar_start_symbol_set (symbol *sym, location loc)
     }
 }
 
     }
 }
 

-
-/*---------------------------------------------------------------------.
-| There are two prologues: one before the first %union and one after.  |
-| Augment the one specified by POST.                                   |
-`---------------------------------------------------------------------*/
-
-void
-prologue_augment (const char *prologue, location loc, bool post)
-{
-  struct obstack *oout =
-    !post ? &pre_prologue_obstack : &post_prologue_obstack;
-
-  obstack_fgrow1 (oout, "]b4_syncline(%d, [[", loc.start.line);
-  /* FIXME: Protection of M4 characters missing here.  See
-     output.c:escaped_output.  */
-  MUSCLE_OBSTACK_SGROW (oout,
-                       quotearg_style (c_quoting_style, loc.start.file));
-  obstack_sgrow (oout, "]])[\n");
-  obstack_sgrow (oout, prologue);
-}
-

 \f
 
 /*------------------------------------------------------------------------.
 \f
 
 /*------------------------------------------------------------------------.


@@ -585,10 +564,6 @@ reader (void)
   undeftoken->class = token_sym;
   undeftoken->number = ntokens++;
 
   undeftoken->class = token_sym;
   undeftoken->number = ntokens++;
 

-  /* Initialize the obstacks. */
-  obstack_init (&pre_prologue_obstack);
-  obstack_init (&post_prologue_obstack);
-

   gram_in = xfopen (grammar_file, "r");
 
   gram__flex_debug = trace_flag & trace_scan;
   gram_in = xfopen (grammar_file, "r");
 
   gram__flex_debug = trace_flag & trace_scan;

diff --git a/src/reader.h b/src/reader.h
index 43985965c4c41e893889c9731d04775e57d0969b..9a7974eb422436abfbd961f6483309ade67142b5 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -44,7 +44,6 @@ 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, 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);