bench: More use of the verbosity level.

[bison.git] / src / parse-gram.c

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 1b6dd75ab954d717440d9ced1e72945bc3cb3b9d..56eba09b2b85bd03cbbfc2b441f6f17f0672fced 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,14 +1,15 @@
-/* A Bison parser, made by GNU Bison 2.3a+.  */
+
+/* A Bison parser, made by GNU Bison 2.3b.21-d67c5-dirty.  */

 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
       Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
    
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
       Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
    

-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

    
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -16,9 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work


@@ -47,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
 #define YYBISON 1
 
 /* Bison version.  */

-#define YYBISON_VERSION "2.3a+"
+#define YYBISON_VERSION "2.3b.21-d67c5-dirty"

 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"


@@ -58,32 +57,36 @@
 /* Push parsers.  */
 #define YYPUSH 0
 
 /* Push parsers.  */
 #define YYPUSH 0
 

+/* Pull parsers.  */
+#define YYPULL 1
+

 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* Substitute the variable and function names.  */
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* Substitute the variable and function names.  */

-#define yyparse gram_parse
-#define yylex   gram_lex
-#define yyerror gram_error
-#define yylval  gram_lval
-#define yychar  gram_char
-#define yydebug gram_debug
-#define yynerrs gram_nerrs
-#define yylloc gram_lloc
+#define yyparse         gram_parse
+#define yylex           gram_lex
+#define yyerror         gram_error
+#define yylval          gram_lval
+#define yychar          gram_char
+#define yydebug         gram_debug
+#define yynerrs         gram_nerrs
+#define yylloc          gram_lloc

 
 /* Copy the first part of user declarations.  */
 
 
 /* Copy the first part of user declarations.  */
 

-/* Line 164 of yacc.c  */
+/* Line 189 of yacc.c  */

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

-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
+   Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 

-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -92,16 +95,11 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301  USA
-*/
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include <config.h>
 #include "system.h"
 
 
 #include <config.h>
 #include "system.h"
 

-#include <strverscmp.h>
-

 #include "complain.h"
 #include "conflicts.h"
 #include "files.h"
 #include "complain.h"
 #include "conflicts.h"
 #include "files.h"


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

-/* Line 164 of yacc.c  */
-#line 157 "parse-gram.c"
+/* Line 189 of yacc.c  */
+#line 155 "parse-gram.c"

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


@@ -195,17 +193,17 @@ static int current_prec = 0;
      PERCENT_DPREC = 269,
      PERCENT_MERGE = 270,
      PERCENT_CODE = 271,
      PERCENT_DPREC = 269,
      PERCENT_MERGE = 270,
      PERCENT_CODE = 271,

-     PERCENT_CODE_TOP = 272,
-     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_DEBUG = 272,
+     PERCENT_DEFAULT_PREC = 273,
+     PERCENT_DEFINE = 274,
+     PERCENT_DEFINES = 275,
+     PERCENT_ERROR_VERBOSE = 276,
+     PERCENT_EXPECT = 277,
+     PERCENT_EXPECT_RR = 278,
+     PERCENT_FILE_PREFIX = 279,
+     PERCENT_GLR_PARSER = 280,
+     PERCENT_INITIAL_ACTION = 281,
+     PERCENT_LANGUAGE = 282,

      PERCENT_LEX_PARAM = 283,
      PERCENT_LOCATIONS = 284,
      PERCENT_NAME_PREFIX = 285,
      PERCENT_LEX_PARAM = 283,
      PERCENT_LOCATIONS = 284,
      PERCENT_NAME_PREFIX = 285,


@@ -214,30 +212,27 @@ static int current_prec = 0;
      PERCENT_NONDETERMINISTIC_PARSER = 288,
      PERCENT_OUTPUT = 289,
      PERCENT_PARSE_PARAM = 290,
      PERCENT_NONDETERMINISTIC_PARSER = 288,
      PERCENT_OUTPUT = 289,
      PERCENT_PARSE_PARAM = 290,

-     PERCENT_PROVIDES = 291,
-     PERCENT_PURE_PARSER = 292,
-     PERCENT_PUSH_PARSER = 293,
-     PERCENT_REQUIRE = 294,
-     PERCENT_REQUIRES = 295,
-     PERCENT_SKELETON = 296,
-     PERCENT_START = 297,
-     PERCENT_TOKEN_TABLE = 298,
-     PERCENT_VERBOSE = 299,
-     PERCENT_YACC = 300,
-     BRACED_CODE = 301,
-     CHAR = 302,
-     EPILOGUE = 303,
-     EQUAL = 304,
-     ID = 305,
-     ID_COLON = 306,
-     PERCENT_PERCENT = 307,
-     PIPE = 308,
-     PROLOGUE = 309,
-     SEMICOLON = 310,
-     TYPE = 311,
-     TYPE_TAG_ANY = 312,
-     TYPE_TAG_NONE = 313,
-     PERCENT_UNION = 314
+     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,
+     TYPE_TAG_ANY = 309,
+     TYPE_TAG_NONE = 310,
+     PERCENT_UNION = 311

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


@@ -256,17 +251,17 @@ static int current_prec = 0;
 #define PERCENT_DPREC 269
 #define PERCENT_MERGE 270
 #define PERCENT_CODE 271
 #define PERCENT_DPREC 269
 #define PERCENT_MERGE 270
 #define PERCENT_CODE 271

-#define PERCENT_CODE_TOP 272
-#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_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_LEX_PARAM 283
 #define PERCENT_LOCATIONS 284
 #define PERCENT_NAME_PREFIX 285


@@ -275,30 +270,27 @@ static int current_prec = 0;
 #define PERCENT_NONDETERMINISTIC_PARSER 288
 #define PERCENT_OUTPUT 289
 #define PERCENT_PARSE_PARAM 290
 #define PERCENT_NONDETERMINISTIC_PARSER 288
 #define PERCENT_OUTPUT 289
 #define PERCENT_PARSE_PARAM 290

-#define PERCENT_PROVIDES 291
-#define PERCENT_PURE_PARSER 292
-#define PERCENT_PUSH_PARSER 293
-#define PERCENT_REQUIRE 294
-#define PERCENT_REQUIRES 295
-#define PERCENT_SKELETON 296
-#define PERCENT_START 297
-#define PERCENT_TOKEN_TABLE 298
-#define PERCENT_VERBOSE 299
-#define PERCENT_YACC 300
-#define BRACED_CODE 301
-#define CHAR 302
-#define EPILOGUE 303
-#define EQUAL 304
-#define ID 305
-#define ID_COLON 306
-#define PERCENT_PERCENT 307
-#define PIPE 308
-#define PROLOGUE 309
-#define SEMICOLON 310
-#define TYPE 311
-#define TYPE_TAG_ANY 312
-#define TYPE_TAG_NONE 313
-#define PERCENT_UNION 314
+#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 TYPE_TAG_ANY 309
+#define TYPE_TAG_NONE 310
+#define PERCENT_UNION 311

 
 
 
 
 
 


@@ -306,8 +298,9 @@ static int current_prec = 0;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {

-/* Line 198 of yacc.c  */
-#line 97 "parse-gram.y"
+
+/* Line 222 of yacc.c  */
+#line 92 "parse-gram.y"

 
   symbol *symbol;
   symbol_list *list;
 
   symbol *symbol;
   symbol_list *list;


@@ -317,11 +310,12 @@ typedef union YYSTYPE
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;

-}

 
 

-/* Line 198 of yacc.c  */
-#line 324 "parse-gram.c"
-       YYSTYPE;
+
+
+/* Line 222 of yacc.c  */
+#line 318 "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


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

-/* Line 221 of yacc.c  */
-#line 349 "parse-gram.c"
+/* Line 264 of yacc.c  */
+#line 343 "parse-gram.c"

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


@@ -509,9 +503,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {

-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-    YYLTYPE yyls;
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+  YYLTYPE yyls_alloc;

 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */


@@ -546,12 +540,12 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */

-# define YYSTACK_RELOCATE(Stack)                                       \
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                          \

     do                                                                 \
       {                                                                        \
        YYSIZE_T yynewbytes;                                            \
     do                                                                 \
       {                                                                        \
        YYSIZE_T yynewbytes;                                            \

-       YYCOPY (&yyptr->Stack, Stack, yysize);                          \
-       Stack = &yyptr->Stack;                                          \
+       YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+       Stack = &yyptr->Stack_alloc;                                    \

        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
        yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                        \
        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
        yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                        \


@@ -562,20 +556,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   182
+#define YYLAST   156

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

-#define YYNTOKENS  60
+#define YYNTOKENS  57

 /* YYNNTS -- Number of nonterminals.  */
 /* YYNNTS -- Number of nonterminals.  */

-#define YYNNTS  31
+#define YYNNTS  33

 /* YYNRULES -- Number of rules.  */
 /* YYNRULES -- Number of rules.  */

-#define YYNRULES  103
+#define YYNRULES  105

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

-#define YYNSTATES  142
+#define YYNSTATES  143

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

-#define YYMAXUTOK   314
+#define YYMAXUTOK   311

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


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

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

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG


@@ -624,63 +618,63 @@ static const yytype_uint16 yyprhs[] =
 {
        0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
       24,    27,    29,    32,    35,    38,    42,    44,    47,    50,
 {
        0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
       24,    27,    29,    32,    35,    38,    42,    44,    47,    50,

-      52,    55,    59,    61,    63,    66,    70,    73,    75,    77,
-      80,    83,    85,    87,    89,    91,    93,    95,    98,   102,
-     106,   108,   110,   113,   116,   119,   122,   123,   125,   129,
-     130,   134,   135,   139,   143,   147,   149,   151,   153,   154,
-     156,   158,   161,   163,   166,   168,   170,   172,   174,   176,
-     178,   181,   184,   188,   190,   193,   195,   198,   200,   203,
-     206,   207,   211,   213,   217,   220,   221,   224,   227,   231,
-     235,   239,   241,   243,   244,   246,   248,   250,   252,   254,
-     256,   258,   260,   261
+      53,    55,    58,    62,    64,    66,    69,    73,    76,    78,
+      81,    84,    86,    88,    90,    92,    94,    96,    99,   103,
+     107,   109,   111,   114,   118,   119,   121,   125,   126,   130,
+     131,   135,   139,   143,   145,   147,   149,   150,   152,   154,
+     157,   159,   162,   164,   167,   169,   172,   174,   176,   178,
+     180,   182,   184,   187,   190,   194,   196,   199,   201,   204,
+     206,   209,   212,   213,   217,   219,   223,   226,   227,   230,
+     233,   237,   241,   245,   247,   249,   250,   252,   254,   256,
+     258,   260,   262,   264,   266,   267

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

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

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

-       0,   210,   210,   218,   220,   224,   225,   226,   227,   228,
-     229,   234,   235,   236,   237,   238,   239,   244,   248,   249,
-     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
-     260,   261,   262,   263,   264,   268,   269,   270,   274,   282,
-     290,   294,   298,   299,   300,   301,   312,   313,   317,   345,
-     345,   350,   350,   355,   366,   381,   382,   383,   387,   388,
-     393,   395,   400,   401,   405,   406,   407,   408,   413,   418,
-     423,   429,   435,   446,   447,   456,   457,   463,   464,   465,
-     472,   472,   476,   477,   478,   483,   484,   486,   488,   490,
-     492,   502,   503,   509,   513,   518,   534,   536,   545,   550,
-     551,   556,   563,   565
+       0,   202,   202,   210,   212,   216,   217,   227,   228,   232,
+     233,   238,   239,   240,   241,   242,   243,   248,   257,   258,
+     259,   260,   261,   262,   263,   264,   265,   266,   267,   280,
+     281,   305,   306,   307,   308,   312,   313,   314,   318,   325,
+     332,   336,   340,   347,   362,   363,   367,   379,   379,   384,
+     384,   389,   400,   415,   416,   417,   421,   422,   427,   429,
+     434,   435,   440,   442,   447,   448,   452,   453,   454,   455,
+     460,   465,   470,   476,   482,   493,   494,   503,   504,   510,
+     511,   512,   519,   519,   523,   524,   525,   530,   531,   533,
+     535,   537,   539,   549,   550,   556,   559,   568,   588,   590,
+     599,   604,   605,   610,   617,   619

 };
 #endif
 
 };
 #endif
 


@@ -692,24 +686,25 @@ 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\"", "\"%code\"", "\"%code-top\"", "\"%debug\"",
+  "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%debug\"",

   "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
   "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
   "\"%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\"",
-  "\"%provides\"", "\"%pure-parser\"", "\"%push-parser\"", "\"%require\"",
-  "\"%requires\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"",
-  "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"",
-  "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"",
-  "\"%{...%}\"", "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", "\"%union\"",
-  "$accept", "input", "prologue_declarations", "prologue_declaration",
-  "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2",
+  "\"%initial-action\"", "\"%language\"", "\"%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",
+  "prologue_declarations", "prologue_declaration", "grammar_declaration",
+  "union_name", "symbol_declaration", "$@1", "$@2",

   "precedence_declaration", "precedence_declarator", "type.opt",
   "precedence_declaration", "precedence_declarator", "type.opt",

-  "symbols.1", "generic_symlist", "generic_symlist_item", "symbol_def",
-  "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules",
-  "$@3", "rhses.1", "rhs", "content", "content.opt", "braceless", "id",
-  "id_colon", "symbol", "string_as_id", "epilogue.opt", 0
+  "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist",
+  "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
+  "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs",
+  "variable", "content.opt", "braceless", "id", "id_colon", "symbol",
+  "string_as_id", "epilogue.opt", 0

 };
 #endif
 
 };
 #endif
 


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

-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314
+     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,    60,    61,    62,    62,    63,    63,    63,    63,    63,
-      63,    63,    63,    63,    63,    63,    63,    63,    63,    63,
-      63,    63,    63,    63,    63,    63,    63,    63,    63,    63,
-      63,    63,    63,    63,    63,    64,    64,    64,    64,    64,
-      64,    64,    64,    64,    64,    64,    65,    65,    64,    67,
-      66,    68,    66,    66,    69,    70,    70,    70,    71,    71,
-      72,    72,    73,    73,    74,    74,    74,    74,    75,    75,
-      75,    75,    75,    76,    76,    77,    77,    78,    78,    78,
-      80,    79,    81,    81,    81,    82,    82,    82,    82,    82,
-      82,    83,    83,    84,    84,    85,    86,    86,    87,    88,
-      88,    89,    90,    90
+       0,    57,    58,    59,    59,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    60,    61,    61,    61,    61,    61,
+      61,    61,    61,    61,    62,    62,    61,    64,    63,    65,
+      63,    63,    66,    67,    67,    67,    68,    68,    69,    69,
+      70,    70,    71,    71,    72,    72,    73,    73,    73,    73,
+      74,    74,    74,    74,    74,    75,    75,    76,    76,    77,
+      77,    77,    79,    78,    80,    80,    80,    81,    81,    81,
+      81,    81,    81,    82,    82,    83,    83,    84,    85,    85,
+      86,    87,    87,    88,    89,    89

 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     4,     0,     2,     1,     1,     1,     3,     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,     1,     3,     1,

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

        2,     1,     1,     1,     1,     1,     1,     2,     3,     3,
        2,     1,     1,     1,     1,     1,     1,     2,     3,     3,

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

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


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

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

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

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

-#define YYPACT_NINF -97
-static const yytype_int8 yypact[] =
+#define YYPACT_NINF -60
+static const yytype_int16 yypact[] =

 {
 {

-     -97,     3,   123,   -97,   -97,   -97,   -42,    -6,    -5,   -97,
-     -97,   -97,    -3,    -3,   -97,   -97,    41,    55,   -97,    57,
-      60,     1,   -97,    36,    40,   -97,    10,   -97,   -97,   -97,
-      23,    44,    -3,   -97,   -97,    85,    -3,    90,    -2,   -97,
-     -97,   -97,    68,   -97,   -97,    46,   -97,   -97,   -97,   -97,
-      38,    42,    42,    -2,    -1,    -1,   -97,   -97,   -97,    35,
-     -97,   -97,   -97,   -97,    94,   -97,   -97,   -97,    98,   -97,
-      99,   -97,   -97,   -97,   -97,   -97,   -97,   -97,   -97,   -97,
-     -97,   -97,    48,   -97,    50,    11,   -97,   -97,   -97,   -97,
-      61,   -97,    -2,   -97,   -97,    42,     5,    42,    -2,   -97,
-     -97,   -97,   -97,    -1,   -97,   -97,    -1,   -97,   -97,   -97,
-     -97,   -97,   -97,   -97,   -97,   -97,    58,   -97,   -97,   -97,
-     -97,    -2,   -97,   109,   -97,   -97,   -97,   -97,   -22,    21,
-     -97,   -97,   -97,    -2,   110,    59,   -97,   -97,    21,   -97,
-     -97,   -97
+     -60,    18,   100,   -60,   -60,   -60,   -16,    24,    27,   -60,
+     -60,   -60,    -8,   -60,   -60,    11,    70,   -60,    71,    80,
+       2,   -60,    46,    87,    48,   -60,    31,   -60,   -60,   -60,
+      40,    49,   -60,    91,    92,     0,   -60,   -60,   -60,    15,
+     -60,   -60,    50,   -60,   -60,   -60,   -60,    43,    12,    12,
+       0,    25,    25,   -60,    55,   -60,   -60,   -60,    97,   -60,
+     -60,   -60,   -60,    98,   -60,   -60,   -60,   -60,    99,   -60,
+     110,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,
+      51,   -60,    62,     1,   -60,   -60,   -60,   -60,    55,   -60,
+       0,   -60,   -60,    12,    84,    12,     0,   -60,   -60,   -60,
+     -60,    25,   -60,   -60,    25,   -60,   -60,   -60,   -60,   -60,
+     -60,   -60,   -60,   101,   -60,   -60,   -60,   -60,     0,   -60,
+     111,   -60,   140,   -60,   -60,   -60,   -60,    10,    38,   -60,
+     -60,   -60,   -60,   -60,     0,   141,    94,   -60,   -60,    38,
+     -60,   -60,   -60

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

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

 {
 {

-     -97,   -97,   -97,   -97,   111,   -97,   -97,   -97,   -97,   -97,
-     -97,   -97,    24,    62,   -96,   -58,    66,   -97,    37,   -97,
-     -97,   -97,   -11,   -97,   -97,    -7,    14,   -97,   -38,   -91,
-     -97
+     -60,   -60,   -60,   -60,   142,   -60,   -60,   -60,   -60,   -60,
+     -60,   -60,   -60,    30,   -60,   102,   -59,   -27,   104,   -60,
+      67,   -60,   -60,   -60,    23,   -60,   -60,   -50,   -19,   -60,
+     -35,   -58,   -60

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

-#define YYTABLE_NINF -103
+#define YYTABLE_NINF -105

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

-      80,    76,    76,     3,    63,   124,    58,   126,    76,   123,
-     126,  -102,    82,    67,    53,    99,     4,     5,     6,     7,
-       8,     9,    10,    11,    76,    72,    69,    12,    13,    74,
-      15,   131,   130,   132,   133,   134,   135,   122,   107,   122,
-      54,    55,    27,    56,    59,    77,    77,    32,    78,    78,
-      64,    36,   110,    38,    99,   100,   101,   102,    60,    68,
-     125,    61,    83,   116,    62,    96,    96,   136,    77,    82,
-      45,    78,    70,     4,     5,     6,     7,     8,     9,    10,
-      11,    56,    65,   125,    12,    13,    66,    15,    73,    77,
-      71,   137,    78,    75,    91,   139,    89,   111,    93,    27,
-     137,   112,   113,   114,    32,   115,   127,   120,    36,    96,
-      38,    96,    76,    47,   140,   141,   121,   106,    97,    83,
-     138,     0,   117,     0,     0,     0,     0,    45,     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,    41,     0,
-       0,     0,     0,     0,     0,    42,     0,    43,    44,     0,
-       0,     0,    45
+      78,  -104,    80,    74,   105,    62,     4,     5,     6,     7,
+       8,     9,    10,    11,    56,    97,    80,    12,     3,    14,
+       4,     5,     6,     7,     8,     9,    10,    11,    74,    94,
+      94,    12,    27,    14,    67,    53,   123,    50,   117,    54,
+      35,    74,   125,    69,    75,   125,    27,    76,    63,    81,
+     113,   134,   135,   136,    35,   120,    75,    42,    57,    76,
+     132,   124,   133,    81,   131,    91,   121,    51,   121,    75,
+      52,    42,    76,    59,    94,    60,    94,    68,    98,    99,
+     100,   137,    75,   120,    61,    76,    70,    74,   122,    64,
+      65,    66,    71,   138,    72,    73,    89,    87,    53,   140,
+     106,   108,   109,   111,   138,     4,     5,     6,     7,     8,
+       9,    10,    11,   110,   112,   130,    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,    74,    44,   141,   126,   142,   129,    39,
+     114,    40,    41,    95,   104,   139,    42

 };
 
 };
 

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

 {
 {

-      38,     3,     3,     0,     3,    96,    13,   103,     3,     4,
-     106,     0,     1,     3,    56,    53,     5,     6,     7,     8,
-       9,    10,    11,    12,     3,    32,     3,    16,    17,    36,
-      19,    53,   123,    55,    13,    14,    15,    95,     3,    97,
-      46,    46,    31,    46,     3,    47,    47,    36,    50,    50,
-      49,    40,    59,    42,    92,    56,    57,    58,     3,    49,
-      98,     4,    51,    52,     4,    51,    52,    46,    47,     1,
-      59,    50,    49,     5,     6,     7,     8,     9,    10,    11,
-      12,    46,    46,   121,    16,    17,    46,    19,     3,    47,
-      46,   129,    50,     3,    56,   133,    50,     3,    56,    31,
-     138,     3,     3,    55,    36,    55,    48,    46,    40,    95,
-      42,    97,     3,     2,     4,    56,    92,    55,    52,    51,
-     131,    -1,    85,    -1,    -1,    -1,    -1,    59,     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,    45,    -1,
-      -1,    -1,    -1,    -1,    -1,    52,    -1,    54,    55,    -1,
-      -1,    -1,    59
+      35,     0,     1,     3,    54,     3,     5,     6,     7,     8,
+       9,    10,    11,    12,     3,    50,     1,    16,     0,    18,
+       5,     6,     7,     8,     9,    10,    11,    12,     3,    48,
+      49,    16,    31,    18,     3,    43,    94,    53,    88,    47,
+      39,     3,   101,     3,    44,   104,    31,    47,    46,    48,
+      49,    13,    14,    15,    39,    90,    44,    56,    47,    47,
+      50,    96,    52,    48,   122,    53,    93,    43,    95,    44,
+      43,    56,    47,     3,    93,     4,    95,    46,    53,    54,
+      55,    43,    44,   118,     4,    47,    46,     3,     4,    43,
+       3,    43,    43,   128,     3,     3,    53,    47,    43,   134,
+       3,     3,     3,    52,   139,     5,     6,     7,     8,     9,
+      10,    11,    12,     3,    52,     4,    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,     3,     2,     4,    45,    53,   118,    49,
+      83,    51,    52,    49,    52,   132,    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,    61,    62,     0,     5,     6,     7,     8,     9,    10,
+       0,    58,    59,     0,     5,     6,     7,     8,     9,    10,

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

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

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


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

-/* Line 670 of yacc.c  */
-#line 188 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 180 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1049 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1038 "parse-gram.c"

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

-/* Line 670 of yacc.c  */
-#line 199 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 191 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1058 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1047 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 182 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1067 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1056 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 182 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 174 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1076 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1065 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 182 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1085 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1074 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 195 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 187 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1094 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1083 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 196 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 188 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1103 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1092 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 182 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1112 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1101 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 194 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 186 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1121 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1110 "parse-gram.c"

        break;
        break;

-      case 83: /* "content" */
+      case 82: /* "variable" */

 
 

-/* Line 670 of yacc.c  */
-#line 190 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+/* Line 715 of yacc.c  */
+#line 187 "parse-gram.y"
+       { fputs ((yyvaluep->uniqstr), stderr); };

 
 

-/* Line 670 of yacc.c  */
-#line 1130 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1119 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 182 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1139 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1128 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 182 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1148 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1137 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 202 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 194 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1157 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1146 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 203 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 195 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1166 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1155 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 202 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 194 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1175 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1164 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 202 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 194 "parse-gram.y"

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

-/* Line 670 of yacc.c  */
-#line 1184 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1173 "parse-gram.c"

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


@@ -1272,11 +1261,11 @@ yy_reduce_print (yyvsp, yylsp, yyrule)
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {

-      fprintf (stderr, "   $%d = ", yyi + 1);
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);

       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
                       &(yyvsp[(yyi + 1) - (yynrhs)])
                       , &(yylsp[(yyi + 1) - (yynrhs)])                );
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
                       &(yyvsp[(yyi + 1) - (yynrhs)])
                       , &(yylsp[(yyi + 1) - (yynrhs)])                );

-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "\n");

     }
 }
 
     }
 }
 


@@ -1558,10 +1547,8 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
        break;
     }
 }
        break;
     }
 }

-\f

 
 /* Prevent warnings from -Wmissing-prototypes.  */
 
 /* Prevent warnings from -Wmissing-prototypes.  */

-

 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);


@@ -1580,10 +1567,9 @@ int yyparse ();
 
 
 
 
 
 

-
-/*----------.
-| yyparse.  |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/

 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \


@@ -1607,95 +1593,103 @@ yyparse ()
 #endif
 #endif
 {
 #endif
 #endif
 {

-  /* The lookahead symbol.  */
+/* The lookahead symbol.  */

 int yychar;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
 int yychar;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 

-/* Number of syntax errors so far.  */
-int yynerrs;

 /* Location data for the lookahead symbol.  */
 YYLTYPE yylloc;
 
 /* Location data for the lookahead symbol.  */
 YYLTYPE yylloc;
 

-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
+    /* Number of syntax errors so far.  */
+    int yynerrs;

 
 

-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;

 
 

-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
+       `yyls': related to locations.

 
 

-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */

 
 

-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;

 
 

-  /* The location stack.  */
-  YYLTYPE yylsa[YYINITDEPTH];
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-  /* The locations where the error started and ended.  */
-  YYLTYPE yyerror_range[2];
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;

 
 

-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+    /* The location stack.  */
+    YYLTYPE yylsa[YYINITDEPTH];
+    YYLTYPE *yyls;
+    YYLTYPE *yylsp;

 
 

-  YYSIZE_T yystacksize = YYINITDEPTH;
+    /* The locations where the error started and ended.  */
+    YYLTYPE yyerror_range[2];

 
 

+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;

   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
   YYLTYPE yyloc;
 
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
   YYLTYPE yyloc;
 

+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+

   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 

+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yyls = yylsa;
+  yystacksize = YYINITDEPTH;
+

   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;

-  yychar = YYEMPTY;            /* Cause a token to be read.  */
+  yychar = YYEMPTY; /* Cause a token to be read.  */

 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */

-

   yyssp = yyss;
   yyvsp = yyvs;
   yylsp = yyls;
   yyssp = yyss;
   yyvsp = yyvs;
   yylsp = yyls;

+

 #if YYLTYPE_IS_TRIVIAL
   /* Initialize the default location before parsing starts.  */
   yylloc.first_line   = yylloc.last_line   = 1;
   yylloc.first_column = yylloc.last_column = 1;
 #endif
 
 #if YYLTYPE_IS_TRIVIAL
   /* Initialize the default location before parsing starts.  */
   yylloc.first_line   = yylloc.last_line   = 1;
   yylloc.first_column = yylloc.last_column = 1;
 #endif
 

+/* User initialization code.  */

 
 

-  /* User initialization code.  */
-  
-/* Line 1082 of yacc.c  */
-#line 89 "parse-gram.y"
+/* Line 1248 of yacc.c  */
+#line 84 "parse-gram.y"

 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */


@@ -1703,9 +1697,10 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 

-/* Line 1082 of yacc.c  */
-#line 1708 "parse-gram.c"
+/* Line 1248 of yacc.c  */
+#line 1702 "parse-gram.c"

   yylsp[0] = yylloc;
   yylsp[0] = yylloc;

+

   goto yysetstate;
 
 /*------------------------------------------------------------.
   goto yysetstate;
 
 /*------------------------------------------------------------.


@@ -1742,6 +1737,7 @@ YYLTYPE yylloc;
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),
                    &yystacksize);
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),
                    &yystacksize);

+

        yyls = yyls1;
        yyss = yyss1;
        yyvs = yyvs1;
        yyls = yyls1;
        yyss = yyss1;
        yyvs = yyvs1;


@@ -1763,9 +1759,9 @@ YYLTYPE yylloc;
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)
          goto yyexhaustedlab;
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)
          goto yyexhaustedlab;

-       YYSTACK_RELOCATE (yyss);
-       YYSTACK_RELOCATE (yyvs);
-       YYSTACK_RELOCATE (yyls);
+       YYSTACK_RELOCATE (yyss_alloc, yyss);
+       YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+       YYSTACK_RELOCATE (yyls_alloc, yyls);

 #  undef YYSTACK_RELOCATE
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);
 #  undef YYSTACK_RELOCATE
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);


@@ -1889,36 +1885,46 @@ yyreduce:
     {
         case 6:
 
     {
         case 6:
 

-/* Line 1269 of yacc.c  */
-#line 225 "parse-gram.y"
-    { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), union_seen); }
+/* Line 1455 of yacc.c  */
+#line 218 "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 ();
+      muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
+                        plain_code.code, (yylsp[(1) - (1)]));
+      code_scanner_last_string_free ();
+    }

     break;
 
   case 7:
 
     break;
 
   case 7:
 

-/* Line 1269 of yacc.c  */
-#line 226 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 227 "parse-gram.y"

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

-/* Line 1269 of yacc.c  */
-#line 227 "parse-gram.y"
-    { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }
+/* Line 1455 of yacc.c  */
+#line 229 "parse-gram.y"
+    {
+      muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars));
+    }

     break;
 
   case 9:
 
     break;
 
   case 9:
 

-/* Line 1269 of yacc.c  */
-#line 228 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 232 "parse-gram.y"

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

-/* Line 1269 of yacc.c  */
-#line 230 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 234 "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));


@@ -1927,43 +1933,43 @@ yyreduce:
 
   case 11:
 
 
   case 11:
 

-/* Line 1269 of yacc.c  */
-#line 234 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 238 "parse-gram.y"

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

-/* Line 1269 of yacc.c  */
-#line 235 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 239 "parse-gram.y"

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

-/* Line 1269 of yacc.c  */
-#line 236 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 240 "parse-gram.y"

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

-/* Line 1269 of yacc.c  */
-#line 237 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 241 "parse-gram.y"

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

-/* Line 1269 of yacc.c  */
-#line 238 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 242 "parse-gram.y"

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

-/* Line 1269 of yacc.c  */
-#line 240 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 244 "parse-gram.y"

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


@@ -1972,129 +1978,167 @@ yyreduce:
 
   case 17:
 
 
   case 17:
 

-/* Line 1269 of yacc.c  */
-#line 245 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 249 "parse-gram.y"

     {
     {

-      muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
+      code_props action;
+      code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
+      code_props_translate_code (&action);
+      gram_scanner_last_string_free ();
+      muscle_code_grow ("initial_action", action.code, (yylsp[(2) - (2)]));
+      code_scanner_last_string_free ();

     }
     break;
 
   case 18:
 
     }
     break;
 
   case 18:
 

-/* Line 1269 of yacc.c  */
-#line 248 "parse-gram.y"
-    { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1455 of yacc.c  */
+#line 257 "parse-gram.y"
+    { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }

     break;
 
   case 19:
 
     break;
 
   case 19:
 

-/* Line 1269 of yacc.c  */
-#line 249 "parse-gram.y"
-    { locations_flag = true; }
+/* Line 1455 of yacc.c  */
+#line 258 "parse-gram.y"
+    { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }

     break;
 
   case 20:
 
     break;
 
   case 20:
 

-/* Line 1269 of yacc.c  */
-#line 250 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
+/* Line 1455 of yacc.c  */
+#line 259 "parse-gram.y"
+    { locations_flag = true; }

     break;
 
   case 21:
 
     break;
 
   case 21:
 

-/* Line 1269 of yacc.c  */
-#line 251 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1455 of yacc.c  */
+#line 260 "parse-gram.y"
+    { spec_name_prefix = (yyvsp[(2) - (2)].chars); }

     break;
 
   case 22:
 
     break;
 
   case 22:
 

-/* Line 1269 of yacc.c  */
-#line 252 "parse-gram.y"
-    { no_lines_flag = true; }
+/* Line 1455 of yacc.c  */
+#line 261 "parse-gram.y"
+    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }

     break;
 
   case 23:
 
     break;
 
   case 23:
 

-/* Line 1269 of yacc.c  */
-#line 253 "parse-gram.y"
-    { nondeterministic_parser = true; }
+/* Line 1455 of yacc.c  */
+#line 262 "parse-gram.y"
+    { no_lines_flag = true; }

     break;
 
   case 24:
 
     break;
 
   case 24:
 

-/* Line 1269 of yacc.c  */
-#line 254 "parse-gram.y"
-    { spec_outfile = (yyvsp[(2) - (2)].chars); }
+/* Line 1455 of yacc.c  */
+#line 263 "parse-gram.y"
+    { nondeterministic_parser = true; }

     break;
 
   case 25:
 
     break;
 
   case 25:
 

-/* Line 1269 of yacc.c  */
-#line 255 "parse-gram.y"
-    { spec_outfile = (yyvsp[(3) - (3)].chars); }
+/* Line 1455 of yacc.c  */
+#line 264 "parse-gram.y"
+    { spec_outfile = (yyvsp[(2) - (2)].chars); }

     break;
 
   case 26:
 
     break;
 
   case 26:
 

-/* Line 1269 of yacc.c  */
-#line 256 "parse-gram.y"
-    { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1455 of yacc.c  */
+#line 265 "parse-gram.y"
+    { spec_outfile = (yyvsp[(3) - (3)].chars); }

     break;
 
   case 27:
 
     break;
 
   case 27:
 

-/* Line 1269 of yacc.c  */
-#line 257 "parse-gram.y"
-    { pure_parser = true; }
+/* Line 1455 of yacc.c  */
+#line 266 "parse-gram.y"
+    { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }

     break;
 
   case 28:
 
     break;
 
   case 28:
 

-/* Line 1269 of yacc.c  */
-#line 258 "parse-gram.y"
-    { push_parser = true; pure_parser = true; }
+/* Line 1455 of yacc.c  */
+#line 268 "parse-gram.y"
+    {
+      /* %pure-parser is deprecated in favor of `%define api.pure', so use
+         `%define api.pure' in a backward-compatible manner here.  First, don't
+         complain if %pure-parser is specified multiple times.  */
+      if (!muscle_find_const ("percent_define(api.pure)"))
+        muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "");
+      /* In all cases, use api.pure now so that the backend doesn't complain if
+         the skeleton ignores api.pure, but do warn now if there's a previous
+         conflicting definition from an actual %define.  */
+      if (!muscle_percent_define_flag_if ("api.pure"))
+        muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "");
+    }

     break;
 
   case 29:
 
     break;
 
   case 29:
 

-/* Line 1269 of yacc.c  */
-#line 259 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 280 "parse-gram.y"

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

-/* Line 1269 of yacc.c  */
-#line 260 "parse-gram.y"
-    { skeleton = (yyvsp[(2) - (2)].chars); }
+/* Line 1455 of yacc.c  */
+#line 282 "parse-gram.y"
+    {
+      char const *skeleton_user = (yyvsp[(2) - (2)].chars);
+      if (strchr (skeleton_user, '/'))
+        {
+          size_t dir_length = strlen (current_file);
+          char *skeleton_build;
+          while (dir_length && current_file[dir_length - 1] != '/')
+            --dir_length;
+          while (dir_length && current_file[dir_length - 1] == '/')
+            --dir_length;
+          skeleton_build =
+            xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
+          if (dir_length > 0)
+            {
+              strncpy (skeleton_build, current_file, dir_length);
+              skeleton_build[dir_length++] = '/';
+            }
+          strcpy (skeleton_build + dir_length, skeleton_user);
+          skeleton_user = uniqstr_new (skeleton_build);
+          free (skeleton_build);
+        }
+      skeleton_arg (skeleton_user, 1, &(yylsp[(1) - (2)]));
+    }

     break;
 
   case 31:
 
     break;
 
   case 31:
 

-/* Line 1269 of yacc.c  */
-#line 261 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 305 "parse-gram.y"

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

-/* Line 1269 of yacc.c  */
-#line 262 "parse-gram.y"
-    { report_flag = report_states; }
+/* Line 1455 of yacc.c  */
+#line 306 "parse-gram.y"
+    { report_flag |= report_states; }

     break;
 
   case 33:
 
     break;
 
   case 33:
 

-/* Line 1269 of yacc.c  */
-#line 263 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 307 "parse-gram.y"

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

-/* Line 1269 of yacc.c  */
-#line 271 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 315 "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)]));
     }


@@ -2102,34 +2146,32 @@ yyreduce:
 
   case 38:
 
 
   case 38:
 

-/* Line 1269 of yacc.c  */
-#line 275 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 319 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

-      const char *action = translate_symbol_action ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));

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

-       symbol_list_destructor_set (list, action, (yylsp[(2) - (3)]));
+       symbol_list_destructor_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));

       symbol_list_free ((yyvsp[(3) - (3)].list));
     }
     break;
 
   case 39:
 
       symbol_list_free ((yyvsp[(3) - (3)].list));
     }
     break;
 
   case 39:
 

-/* Line 1269 of yacc.c  */
-#line 283 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 326 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

-      const char *action = translate_symbol_action ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));

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

-       symbol_list_printer_set (list, action, (yylsp[(2) - (3)]));
+       symbol_list_printer_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));

       symbol_list_free ((yyvsp[(3) - (3)].list));
     }
     break;
 
   case 40:
 
       symbol_list_free ((yyvsp[(3) - (3)].list));
     }
     break;
 
   case 40:
 

-/* Line 1269 of yacc.c  */
-#line 291 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 333 "parse-gram.y"

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


@@ -2137,8 +2179,8 @@ yyreduce:
 
   case 41:
 
 
   case 41:
 

-/* Line 1269 of yacc.c  */
-#line 295 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 337 "parse-gram.y"

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


@@ -2146,111 +2188,89 @@ yyreduce:
 
   case 42:
 
 
   case 42:
 

-/* Line 1269 of yacc.c  */
-#line 298 "parse-gram.y"
-    { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), true); }
+/* Line 1455 of yacc.c  */
+#line 341 "parse-gram.y"
+    {
+      /* Do not invoke muscle_percent_code_grow here since it invokes
+         muscle_user_name_list_grow.  */
+      muscle_code_grow ("percent_code()", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
+      code_scanner_last_string_free ();
+    }

     break;
 
   case 43:
 
     break;
 
   case 43:
 

-/* Line 1269 of yacc.c  */
-#line 299 "parse-gram.y"
-    { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), false); }
+/* Line 1455 of yacc.c  */
+#line 348 "parse-gram.y"
+    {
+      muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+      code_scanner_last_string_free ();
+    }

     break;
 
   case 44:
 
     break;
 
   case 44:
 

-/* Line 1269 of yacc.c  */
-#line 300 "parse-gram.y"
-    { muscle_code_grow ("provides", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
-    break;
-
-  case 45:
-
-/* Line 1269 of yacc.c  */
-#line 301 "parse-gram.y"
-    { muscle_code_grow ("requires", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
-    break;
-
-  case 46:
-
-/* Line 1269 of yacc.c  */
-#line 312 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 362 "parse-gram.y"

     {}
     break;
 
     {}
     break;
 

-  case 47:
+  case 45:

 
 

-/* Line 1269 of yacc.c  */
-#line 313 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 363 "parse-gram.y"

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

-  case 48:
+  case 46:

 
 

-/* Line 1269 of yacc.c  */
-#line 318 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 368 "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)]));
+      muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+      code_scanner_last_string_free ();

     }
     break;
 
     }
     break;
 

-  case 49:
+  case 47:

 
 

-/* Line 1269 of yacc.c  */
-#line 345 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 379 "parse-gram.y"

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

-  case 50:
+  case 48:

 
 

-/* Line 1269 of yacc.c  */
-#line 346 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 380 "parse-gram.y"

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

-  case 51:
+  case 49:

 
 

-/* Line 1269 of yacc.c  */
-#line 350 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 384 "parse-gram.y"

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

-  case 52:
+  case 50:

 
 

-/* Line 1269 of yacc.c  */
-#line 351 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 385 "parse-gram.y"

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

-  case 53:
+  case 51:

 
 

-/* Line 1269 of yacc.c  */
-#line 356 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 390 "parse-gram.y"

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


@@ -2260,10 +2280,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 54:
+  case 52:

 
 

-/* Line 1269 of yacc.c  */
-#line 367 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 401 "parse-gram.y"

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


@@ -2277,121 +2297,149 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 55:
+  case 53:

 
 

-/* Line 1269 of yacc.c  */
-#line 381 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 415 "parse-gram.y"

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

-  case 56:
+  case 54:

 
 

-/* Line 1269 of yacc.c  */
-#line 382 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 416 "parse-gram.y"

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

-  case 57:
+  case 55:

 
 

-/* Line 1269 of yacc.c  */
-#line 383 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 417 "parse-gram.y"

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

-  case 58:
+  case 56:

 
 

-/* Line 1269 of yacc.c  */
-#line 387 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 421 "parse-gram.y"

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

-  case 59:
+  case 57:

 
 

-/* Line 1269 of yacc.c  */
-#line 388 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 422 "parse-gram.y"

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

-  case 60:
+  case 58:

 
 

-/* Line 1269 of yacc.c  */
-#line 394 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 428 "parse-gram.y"

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

-  case 61:
+  case 59:

 
 

-/* Line 1269 of yacc.c  */
-#line 396 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 430 "parse-gram.y"

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

+  case 60:
+
+/* Line 1455 of yacc.c  */
+#line 434 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+    break;
+
+  case 61:
+
+/* Line 1455 of yacc.c  */
+#line 435 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
+    break;
+

   case 62:
 
   case 62:
 

-/* Line 1269 of yacc.c  */
-#line 400 "parse-gram.y"
-    { (yyval.list) = (yyvsp[(1) - (1)].list); }
+/* Line 1455 of yacc.c  */
+#line 441 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }

     break;
 
   case 63:
 
     break;
 
   case 63:
 

-/* Line 1269 of yacc.c  */
-#line 401 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+/* Line 1455 of yacc.c  */
+#line 443 "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 64:
 
     break;
 
   case 64:
 

-/* Line 1269 of yacc.c  */
-#line 405 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1455 of yacc.c  */
+#line 447 "parse-gram.y"
+    { (yyval.list) = (yyvsp[(1) - (1)].list); }

     break;
 
   case 65:
 
     break;
 
   case 65:
 

-/* Line 1269 of yacc.c  */
-#line 406 "parse-gram.y"
-    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1455 of yacc.c  */
+#line 448 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }

     break;
 
   case 66:
 
     break;
 
   case 66:
 

-/* Line 1269 of yacc.c  */
-#line 407 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+/* Line 1455 of yacc.c  */
+#line 452 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }

     break;
 
   case 67:
 
     break;
 
   case 67:
 

-/* Line 1269 of yacc.c  */
-#line 408 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+/* Line 1455 of yacc.c  */
+#line 453 "parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }

     break;
 
   case 68:
 
     break;
 
   case 68:
 

-/* Line 1269 of yacc.c  */
-#line 414 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 454 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+    break;
+
+  case 69:
+
+/* Line 1455 of yacc.c  */
+#line 455 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+    break;
+
+  case 70:
+
+/* Line 1455 of yacc.c  */
+#line 461 "parse-gram.y"

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

-  case 69:
+  case 71:

 
 

-/* Line 1269 of yacc.c  */
-#line 419 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 466 "parse-gram.y"

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

-  case 70:
+  case 72:

 
 

-/* Line 1269 of yacc.c  */
-#line 424 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 471 "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)]));


@@ -2399,10 +2447,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 71:
+  case 73:

 
 

-/* Line 1269 of yacc.c  */
-#line 430 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 477 "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)]));


@@ -2410,10 +2458,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 72:
+  case 74:

 
 

-/* Line 1269 of yacc.c  */
-#line 436 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 483 "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)]));


@@ -2422,109 +2470,119 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 79:
+  case 81:

 
 

-/* Line 1269 of yacc.c  */
-#line 466 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 513 "parse-gram.y"

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

-  case 80:
+  case 82:

 
 

-/* Line 1269 of yacc.c  */
-#line 472 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 519 "parse-gram.y"

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

-  case 82:
+  case 84:

 
 

-/* Line 1269 of yacc.c  */
-#line 476 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 523 "parse-gram.y"

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

-  case 83:
+  case 85:

 
 

-/* Line 1269 of yacc.c  */
-#line 477 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 524 "parse-gram.y"

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

-  case 85:
+  case 87:

 
 

-/* Line 1269 of yacc.c  */
-#line 483 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 530 "parse-gram.y"

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

-  case 86:
+  case 88:

 
 

-/* Line 1269 of yacc.c  */
-#line 485 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 532 "parse-gram.y"

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

-  case 87:
+  case 89:

 
 

-/* Line 1269 of yacc.c  */
-#line 487 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 534 "parse-gram.y"

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

-  case 88:
+  case 90:

 
 

-/* Line 1269 of yacc.c  */
-#line 489 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 536 "parse-gram.y"

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

-  case 89:
+  case 91:

 
 

-/* Line 1269 of yacc.c  */
-#line 491 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 538 "parse-gram.y"

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

-  case 90:
+  case 92:

 
 

-/* Line 1269 of yacc.c  */
-#line 493 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 540 "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 93:
+  case 94:

 
 

-/* Line 1269 of yacc.c  */
-#line 509 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 550 "parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+    break;
+
+  case 95:
+
+/* Line 1455 of yacc.c  */
+#line 556 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 95:
+  case 97:

 
 

-/* Line 1269 of yacc.c  */
-#line 519 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 569 "parse-gram.y"

     {
     {

+      code_props plain_code;

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

-      (yyval.chars) = translate_code ((yyvsp[(1) - (1)].code) + 1, (yylsp[(1) - (1)]));
+      code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].code)+1, (yylsp[(1) - (1)]));
+      code_props_translate_code (&plain_code);
+      gram_scanner_last_string_free ();
+      (yyval.chars) = plain_code.code;

     }
     break;
 
     }
     break;
 

-  case 96:
+  case 98:

 
 

-/* Line 1269 of yacc.c  */
-#line 535 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 589 "parse-gram.y"

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

-  case 97:
+  case 99:

 
 

-/* Line 1269 of yacc.c  */
-#line 537 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 591 "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);


@@ -2532,37 +2590,41 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 98:
+  case 100:

 
 

-/* Line 1269 of yacc.c  */
-#line 545 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 599 "parse-gram.y"

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

-  case 101:
+  case 103:

 
 

-/* Line 1269 of yacc.c  */
-#line 557 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 611 "parse-gram.y"

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

-  case 103:
+  case 105:

 
 

-/* Line 1269 of yacc.c  */
-#line 566 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 620 "parse-gram.y"

     {
     {

-      muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
+      code_props plain_code;
+      code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
+      code_props_translate_code (&plain_code);

       gram_scanner_last_string_free ();
       gram_scanner_last_string_free ();

+      muscle_code_grow ("epilogue", plain_code.code, (yylsp[(2) - (2)]));
+      code_scanner_last_string_free ();

     }
     break;
 
 
 
     }
     break;
 
 
 

-/* Line 1269 of yacc.c  */
-#line 2566 "parse-gram.c"
+/* Line 1455 of yacc.c  */
+#line 2628 "parse-gram.c"

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


@@ -2742,7 +2804,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
   yyresult = 1;
   goto yyreturn;
 

-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE

 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/


@@ -2780,8 +2842,8 @@ yyreturn:
 
 
 
 
 
 

-/* Line 1486 of yacc.c  */
-#line 572 "parse-gram.y"
+/* Line 1675 of yacc.c  */
+#line 630 "parse-gram.y"