Add .gitignore everywhere based on .cvsignore.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 9278fdfb071f1f421767657a0ba2310c37889c7f..e0a3e854d17e0b95e69fcbac84b4f4cec6d50f97 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.  */

 
 /* 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"

 
 /* 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,10 +95,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/>.  */

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


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

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

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


@@ -188,55 +188,53 @@ static int current_prec = 0;
      PERCENT_TYPE = 262,
      PERCENT_DESTRUCTOR = 263,
      PERCENT_PRINTER = 264,
      PERCENT_TYPE = 262,
      PERCENT_DESTRUCTOR = 263,
      PERCENT_PRINTER = 264,

-     PERCENT_SYMBOL_DEFAULT = 265,
-     PERCENT_LEFT = 266,
-     PERCENT_RIGHT = 267,
-     PERCENT_NONASSOC = 268,
-     PERCENT_PREC = 269,
-     PERCENT_DPREC = 270,
-     PERCENT_MERGE = 271,
-     PERCENT_CODE = 272,
-     PERCENT_CODE_TOP = 273,
-     PERCENT_DEBUG = 274,
-     PERCENT_DEFAULT_PREC = 275,
-     PERCENT_DEFINE = 276,
-     PERCENT_DEFINES = 277,
-     PERCENT_ERROR_VERBOSE = 278,
-     PERCENT_EXPECT = 279,
-     PERCENT_EXPECT_RR = 280,
-     PERCENT_FILE_PREFIX = 281,
-     PERCENT_GLR_PARSER = 282,
-     PERCENT_INITIAL_ACTION = 283,
-     PERCENT_LEX_PARAM = 284,
-     PERCENT_LOCATIONS = 285,
-     PERCENT_NAME_PREFIX = 286,
-     PERCENT_NO_DEFAULT_PREC = 287,
-     PERCENT_NO_LINES = 288,
-     PERCENT_NONDETERMINISTIC_PARSER = 289,
-     PERCENT_OUTPUT = 290,
-     PERCENT_PARSE_PARAM = 291,
-     PERCENT_PROVIDES = 292,
-     PERCENT_PURE_PARSER = 293,
-     PERCENT_PUSH_PARSER = 294,
-     PERCENT_REQUIRE = 295,
-     PERCENT_REQUIRES = 296,
-     PERCENT_SKELETON = 297,
-     PERCENT_START = 298,
-     PERCENT_TOKEN_TABLE = 299,
-     PERCENT_VERBOSE = 300,
-     PERCENT_YACC = 301,
-     BRACED_CODE = 302,
-     CHAR = 303,
-     EPILOGUE = 304,
-     EQUAL = 305,
-     ID = 306,
-     ID_COLON = 307,
-     PERCENT_PERCENT = 308,
-     PIPE = 309,
-     PROLOGUE = 310,
-     SEMICOLON = 311,
-     TYPE = 312,
-     PERCENT_UNION = 313
+     PERCENT_LEFT = 265,
+     PERCENT_RIGHT = 266,
+     PERCENT_NONASSOC = 267,
+     PERCENT_PREC = 268,
+     PERCENT_DPREC = 269,
+     PERCENT_MERGE = 270,
+     PERCENT_CODE = 271,
+     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_NO_DEFAULT_PREC = 286,
+     PERCENT_NO_LINES = 287,
+     PERCENT_NONDETERMINISTIC_PARSER = 288,
+     PERCENT_OUTPUT = 289,
+     PERCENT_PARSE_PARAM = 290,
+     PERCENT_PURE_PARSER = 291,
+     PERCENT_REQUIRE = 292,
+     PERCENT_SKELETON = 293,
+     PERCENT_START = 294,
+     PERCENT_TOKEN_TABLE = 295,
+     PERCENT_VERBOSE = 296,
+     PERCENT_YACC = 297,
+     BRACED_CODE = 298,
+     CHAR = 299,
+     EPILOGUE = 300,
+     EQUAL = 301,
+     ID = 302,
+     ID_COLON = 303,
+     PERCENT_PERCENT = 304,
+     PIPE = 305,
+     PROLOGUE = 306,
+     SEMICOLON = 307,
+     TYPE = 308,
+     TYPE_TAG_ANY = 309,
+     TYPE_TAG_NONE = 310,
+     PERCENT_UNION = 311

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


@@ -248,55 +246,53 @@ static int current_prec = 0;
 #define PERCENT_TYPE 262
 #define PERCENT_DESTRUCTOR 263
 #define PERCENT_PRINTER 264
 #define PERCENT_TYPE 262
 #define PERCENT_DESTRUCTOR 263
 #define PERCENT_PRINTER 264

-#define PERCENT_SYMBOL_DEFAULT 265
-#define PERCENT_LEFT 266
-#define PERCENT_RIGHT 267
-#define PERCENT_NONASSOC 268
-#define PERCENT_PREC 269
-#define PERCENT_DPREC 270
-#define PERCENT_MERGE 271
-#define PERCENT_CODE 272
-#define PERCENT_CODE_TOP 273
-#define PERCENT_DEBUG 274
-#define PERCENT_DEFAULT_PREC 275
-#define PERCENT_DEFINE 276
-#define PERCENT_DEFINES 277
-#define PERCENT_ERROR_VERBOSE 278
-#define PERCENT_EXPECT 279
-#define PERCENT_EXPECT_RR 280
-#define PERCENT_FILE_PREFIX 281
-#define PERCENT_GLR_PARSER 282
-#define PERCENT_INITIAL_ACTION 283
-#define PERCENT_LEX_PARAM 284
-#define PERCENT_LOCATIONS 285
-#define PERCENT_NAME_PREFIX 286
-#define PERCENT_NO_DEFAULT_PREC 287
-#define PERCENT_NO_LINES 288
-#define PERCENT_NONDETERMINISTIC_PARSER 289
-#define PERCENT_OUTPUT 290
-#define PERCENT_PARSE_PARAM 291
-#define PERCENT_PROVIDES 292
-#define PERCENT_PURE_PARSER 293
-#define PERCENT_PUSH_PARSER 294
-#define PERCENT_REQUIRE 295
-#define PERCENT_REQUIRES 296
-#define PERCENT_SKELETON 297
-#define PERCENT_START 298
-#define PERCENT_TOKEN_TABLE 299
-#define PERCENT_VERBOSE 300
-#define PERCENT_YACC 301
-#define BRACED_CODE 302
-#define CHAR 303
-#define EPILOGUE 304
-#define EQUAL 305
-#define ID 306
-#define ID_COLON 307
-#define PERCENT_PERCENT 308
-#define PIPE 309
-#define PROLOGUE 310
-#define SEMICOLON 311
-#define TYPE 312
-#define PERCENT_UNION 313
+#define PERCENT_LEFT 265
+#define PERCENT_RIGHT 266
+#define PERCENT_NONASSOC 267
+#define PERCENT_PREC 268
+#define PERCENT_DPREC 269
+#define PERCENT_MERGE 270
+#define PERCENT_CODE 271
+#define PERCENT_DEBUG 272
+#define PERCENT_DEFAULT_PREC 273
+#define PERCENT_DEFINE 274
+#define PERCENT_DEFINES 275
+#define PERCENT_ERROR_VERBOSE 276
+#define PERCENT_EXPECT 277
+#define PERCENT_EXPECT_RR 278
+#define PERCENT_FILE_PREFIX 279
+#define PERCENT_GLR_PARSER 280
+#define PERCENT_INITIAL_ACTION 281
+#define PERCENT_LANGUAGE 282
+#define PERCENT_LEX_PARAM 283
+#define PERCENT_LOCATIONS 284
+#define PERCENT_NAME_PREFIX 285
+#define PERCENT_NO_DEFAULT_PREC 286
+#define PERCENT_NO_LINES 287
+#define PERCENT_NONDETERMINISTIC_PARSER 288
+#define PERCENT_OUTPUT 289
+#define PERCENT_PARSE_PARAM 290
+#define PERCENT_PURE_PARSER 291
+#define PERCENT_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

 
 
 
 
 
 


@@ -304,21 +300,24 @@ 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 98 "parse-gram.y"
+
+/* Line 214 of yacc.c  */
+#line 94 "parse-gram.y"

 
   symbol *symbol;
   symbol_list *list;
   int integer;
 
   symbol *symbol;
   symbol_list *list;
   int integer;

-  char *chars;
+  char const *chars;
+  char *code;

   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;

-}

 
 

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


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

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

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


@@ -506,9 +505,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.  */


@@ -543,12 +542,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);                          \
       }                                                                        \


@@ -559,20 +558,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   187
+#define YYLAST   156

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

-#define YYNTOKENS  59
+#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  98
+#define YYNRULES  105

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

-#define YYNSTATES  137
+#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   313
+#define YYMAXUTOK   311

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


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

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

 };
 
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
 };
 
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */

-static const yytype_uint8 yyprhs[] =
+static const yytype_uint16 yyprhs[] =

 {
        0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
 {
        0,     0,     3,     8,     9,    12,    14,    16,    18,    22,

-      24,    26,    29,    32,    36,    38,    41,    44,    46,    50,
-      52,    54,    58,    61,    63,    65,    68,    71,    73,    75,
-      77,    79,    81,    83,    86,    90,    94,    96,    98,   101,
-     104,   107,   110,   111,   113,   117,   118,   122,   123,   127,
-     131,   135,   137,   139,   141,   142,   144,   146,   149,   151,
-     154,   156,   158,   160,   162,   164,   167,   170,   174,   176,
-     179,   181,   184,   186,   189,   192,   193,   197,   199,   203,
-     206,   207,   210,   213,   217,   221,   225,   227,   229,   230,
-     232,   234,   236,   238,   240,   242,   244,   246,   247
+      24,    27,    29,    32,    35,    38,    42,    44,    47,    50,
+      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[] =
 {

-      60,     0,    -1,    61,    53,    76,    89,    -1,    -1,    61,
-      62,    -1,    63,    -1,    55,    -1,    19,    -1,    21,     3,
-      83,    -1,    22,    -1,    23,    -1,    24,     4,    -1,    25,
-       4,    -1,    26,    50,     3,    -1,    27,    -1,    28,    47,
-      -1,    29,    47,    -1,    30,    -1,    31,    50,     3,    -1,
-      33,    -1,    34,    -1,    35,    50,     3,    -1,    36,    47,
-      -1,    38,    -1,    39,    -1,    40,     3,    -1,    42,     3,
-      -1,    44,    -1,    45,    -1,    46,    -1,    56,    -1,    68,
-      -1,    65,    -1,    43,    87,    -1,     8,    47,    72,    -1,
-       9,    47,    72,    -1,    20,    -1,    32,    -1,    17,    84,
-      -1,    18,    84,    -1,    37,    84,    -1,    41,    84,    -1,
-      -1,    51,    -1,    58,    64,    47,    -1,    -1,     6,    66,
-      75,    -1,    -1,     5,    67,    75,    -1,     7,    57,    71,
-      -1,    69,    70,    71,    -1,    11,    -1,    12,    -1,    13,
-      -1,    -1,    57,    -1,    87,    -1,    71,    87,    -1,    73,
-      -1,    72,    73,    -1,    87,    -1,    57,    -1,    10,    -1,
-      57,    -1,    85,    -1,    85,     4,    -1,    85,    88,    -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,
       85,     4,    88,    -1,    74,    -1,    75,    74,    -1,    77,

-      -1,    76,    77,    -1,    78,    -1,    63,    56,    -1,     1,
-      56,    -1,    -1,    86,    79,    80,    -1,    81,    -1,    80,
-      54,    81,    -1,    80,    56,    -1,    -1,    81,    87,    -1,
-      81,    47,    -1,    81,    14,    87,    -1,    81,    15,     4,
-      -1,    81,    16,    57,    -1,     3,    -1,    84,    -1,    -1,
-      82,    -1,    47,    -1,    51,    -1,    48,    -1,    52,    -1,
-      85,    -1,    88,    -1,     3,    -1,    -1,    53,    49,    -1
+      -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,   209,   209,   217,   219,   223,   224,   225,   226,   227,
-     228,   229,   230,   231,   232,   237,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,   259,   260,   261,   265,   273,   281,   285,   289,   290,
-     291,   292,   303,   304,   308,   336,   336,   341,   341,   346,
-     357,   372,   373,   374,   378,   379,   384,   386,   391,   392,
-     396,   397,   398,   403,   408,   413,   419,   425,   436,   437,
-     446,   447,   453,   454,   455,   462,   462,   466,   467,   468,
-     473,   474,   476,   478,   480,   482,   492,   493,   499,   503,
-     508,   524,   526,   535,   540,   541,   546,   553,   555
+       0,   204,   204,   212,   214,   218,   219,   229,   230,   234,
+     235,   240,   241,   242,   243,   244,   245,   250,   259,   260,
+     261,   262,   263,   264,   265,   266,   267,   268,   269,   282,
+     283,   307,   308,   309,   310,   314,   315,   316,   320,   327,
+     334,   338,   342,   349,   364,   365,   369,   381,   381,   386,
+     386,   391,   402,   417,   418,   419,   423,   424,   429,   431,
+     436,   437,   442,   444,   449,   450,   454,   455,   456,   457,
+     462,   467,   472,   478,   484,   495,   496,   505,   506,   512,
+     513,   514,   521,   521,   525,   526,   527,   532,   533,   535,
+     537,   539,   541,   551,   552,   558,   561,   570,   590,   592,
+     601,   606,   607,   612,   619,   621

 };
 #endif
 
 };
 #endif
 


@@ -684,25 +687,25 @@ static const char *const yytname[] =
 {
   "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
   "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
 {
   "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
   "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",

-  "\"%printer\"", "\"%symbol-default\"", "\"%left\"", "\"%right\"",
-  "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",
-  "\"%code-top\"", "\"%debug\"", "\"%default-prec\"", "\"%define\"",
-  "\"%defines\"", "\"%error-verbose\"", "\"%expect\"", "\"%expect-rr\"",
-  "\"%file-prefix\"", "\"%glr-parser\"", "\"%initial-action\"",
-  "\"%lex-param\"", "\"%locations\"", "\"%name-prefix\"",
-  "\"%no-default-prec\"", "\"%no-lines\"", "\"%nondeterministic-parser\"",
-  "\"%output\"", "\"%parse-param\"", "\"%provides\"", "\"%pure-parser\"",
-  "\"%push-parser\"", "\"%require\"", "\"%requires\"", "\"%skeleton\"",
+  "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"",
+  "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%debug\"",
+  "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
+  "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
+  "\"%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\"",
   "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"",
   "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"",
   "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"",

-  "\"%union\"", "$accept", "input", "prologue_declarations",
-  "prologue_declaration", "grammar_declaration", "union_name",
-  "symbol_declaration", "@1", "@2", "precedence_declaration",
-  "precedence_declarator", "type.opt", "symbols.1", "generic_symlist",
+  "\"<*>\"", "\"<>\"", "\"%union\"", "$accept", "input",
+  "prologue_declarations", "prologue_declaration", "grammar_declaration",
+  "union_name", "symbol_declaration", "$@1", "$@2",
+  "precedence_declaration", "precedence_declarator", "type.opt",
+  "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist",

   "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
   "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",
+  "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs",
+  "variable", "content.opt", "braceless", "id", "id_colon", "symbol",

   "string_as_id", "epilogue.opt", 0
 };
 #endif
   "string_as_id", "epilogue.opt", 0
 };
 #endif


@@ -717,38 +720,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
+     305,   306,   307,   308,   309,   310,   311

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

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

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


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

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

 {
 {

-      -1,     1,     2,    46,    80,    86,    48,    52,    51,    49,
-      50,    88,    94,    98,    99,    90,    91,    81,    82,    83,
-     114,   123,   124,   103,   104,    57,    75,    84,   100,    77,
-     113
+      -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 -82
+#define YYPACT_NINF -60

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

-     -82,     4,    91,   -82,   -82,   -82,   -52,   -31,   -24,   -82,
-     -82,   -82,    -8,    -8,   -82,   -82,    49,   -82,   -82,    53,
-      54,    12,   -82,    16,    26,   -82,    30,   -82,   -82,   -82,
-      32,    36,    -8,   -82,   -82,    81,    -8,    82,     0,   -82,
-     -82,   -82,    23,   -82,   -82,    37,   -82,   -82,   -82,   -82,
-      34,    19,    19,     0,    17,    17,   -82,   -82,   -82,    14,
-     -82,   -82,    84,   -82,   -82,    86,    90,   -82,   -82,   -82,
-     -82,   -82,   -82,   -82,   -82,   -82,   -82,   -82,    38,   -82,
-      45,     1,   -82,   -82,   -82,   -82,    58,   -82,     0,   -82,
-     -82,    19,    43,    19,     0,   -82,   -82,   -82,    17,   -82,
-     -82,    17,   -82,   -82,   -82,   -82,   -82,   -82,   -82,   -82,
-     -82,    57,   -82,   -82,   -82,   -82,     0,   -82,   104,   -82,
-     -82,   -82,   -82,    15,   136,   -82,   -82,   -82,     0,    88,
-      85,   -82,   -82,   136,   -82,   -82,   -82
+     -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].  */
 static const yytype_int16 yypgoto[] =
 {
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {

-     -82,   -82,   -82,   -82,   141,   -82,   -82,   -82,   -82,   -82,
-     -82,   -82,    50,    93,   -76,   -14,   101,   -82,    64,   -82,
-     -82,   -82,    28,   -82,   -82,    13,    89,   -82,   -38,   -81,
-     -82
+     -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 -98
+#define YYTABLE_NINF -105

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

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


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

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

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

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

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

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

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

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

        break;
        break;

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

 
 

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

 
 

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

        break;
        break;

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

 
 

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

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

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

        break;
        break;

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

 
 

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

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

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

        break;
        break;

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

 
 

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

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

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

        break;
        break;

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

 
 

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

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

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

        break;
        break;

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

 
 

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

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

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

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
-#line 193 "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 1110 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1112 "parse-gram.c"

        break;
        break;

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

 
 

-/* Line 670 of yacc.c  */
+/* Line 715 of yacc.c  */

 #line 189 "parse-gram.y"
 #line 189 "parse-gram.y"

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

 
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -1261,11 +1263,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");

     }
 }
 
     }
 }
 


@@ -1547,10 +1549,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);


@@ -1569,10 +1569,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__ \


@@ -1596,95 +1595,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;
+
+    /* The locations where the error started and ended.  */
+    YYLTYPE yyerror_range[2];

 
 

-  YYSIZE_T yystacksize = YYINITDEPTH;
+    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 1242 of yacc.c  */
+#line 86 "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. */


@@ -1692,9 +1699,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 1697 "parse-gram.c"
+/* Line 1242 of yacc.c  */
+#line 1704 "parse-gram.c"

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

+

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


@@ -1731,6 +1739,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;


@@ -1752,9 +1761,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);


@@ -1878,337 +1887,392 @@ yyreduce:
     {
         case 6:
 
     {
         case 6:
 

-/* Line 1269 of yacc.c  */
-#line 224 "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 220 "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 225 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 229 "parse-gram.y"

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

-/* Line 1269 of yacc.c  */
-#line 226 "parse-gram.y"
-    { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }
+/* Line 1455 of yacc.c  */
+#line 231 "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 227 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 234 "parse-gram.y"

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

-/* Line 1269 of yacc.c  */
-#line 228 "parse-gram.y"
-    { error_verbose = true; }
+/* Line 1455 of yacc.c  */
+#line 236 "parse-gram.y"
+    {
+      defines_flag = true;
+      spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
+    }

     break;
 
   case 11:
 
     break;
 
   case 11:
 

-/* Line 1269 of yacc.c  */
-#line 229 "parse-gram.y"
-    { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1455 of yacc.c  */
+#line 240 "parse-gram.y"
+    { error_verbose = true; }

     break;
 
   case 12:
 
     break;
 
   case 12:
 

-/* Line 1269 of yacc.c  */
-#line 230 "parse-gram.y"
-    { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1455 of yacc.c  */
+#line 241 "parse-gram.y"
+    { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }

     break;
 
   case 13:
 
     break;
 
   case 13:
 

-/* Line 1269 of yacc.c  */
-#line 231 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1455 of yacc.c  */
+#line 242 "parse-gram.y"
+    { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }

     break;
 
   case 14:
 
     break;
 
   case 14:
 

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

     break;
 
   case 15:
 
     break;
 
   case 15:
 

-/* Line 1269 of yacc.c  */
-#line 238 "parse-gram.y"
-    {
-      muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
-    }
+/* Line 1455 of yacc.c  */
+#line 244 "parse-gram.y"
+    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }

     break;
 
   case 16:
 
     break;
 
   case 16:
 

-/* Line 1269 of yacc.c  */
-#line 241 "parse-gram.y"
-    { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1455 of yacc.c  */
+#line 246 "parse-gram.y"
+    {
+      nondeterministic_parser = true;
+      glr_parser = true;
+    }

     break;
 
   case 17:
 
     break;
 
   case 17:
 

-/* Line 1269 of yacc.c  */
-#line 242 "parse-gram.y"
-    { locations_flag = true; }
+/* Line 1455 of yacc.c  */
+#line 251 "parse-gram.y"
+    {
+      code_props action;
+      code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
+      code_props_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 243 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1455 of yacc.c  */
+#line 259 "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 244 "parse-gram.y"
-    { no_lines_flag = true; }
+/* Line 1455 of yacc.c  */
+#line 260 "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 245 "parse-gram.y"
-    { nondeterministic_parser = true; }
+/* Line 1455 of yacc.c  */
+#line 261 "parse-gram.y"
+    { locations_flag = true; }

     break;
 
   case 21:
 
     break;
 
   case 21:
 

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

     break;
 
   case 22:
 
     break;
 
   case 22:
 

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

     break;
 
   case 23:
 
     break;
 
   case 23:
 

-/* Line 1269 of yacc.c  */
-#line 248 "parse-gram.y"
-    { pure_parser = true; }
+/* Line 1455 of yacc.c  */
+#line 264 "parse-gram.y"
+    { no_lines_flag = true; }

     break;
 
   case 24:
 
     break;
 
   case 24:
 

-/* Line 1269 of yacc.c  */
-#line 249 "parse-gram.y"
-    { push_parser = true; }
+/* Line 1455 of yacc.c  */
+#line 265 "parse-gram.y"
+    { nondeterministic_parser = true; }

     break;
 
   case 25:
 
     break;
 
   case 25:
 

-/* Line 1269 of yacc.c  */
-#line 250 "parse-gram.y"
-    { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+/* Line 1455 of yacc.c  */
+#line 266 "parse-gram.y"
+    { spec_outfile = (yyvsp[(2) - (2)].chars); }

     break;
 
   case 26:
 
     break;
 
   case 26:
 

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

     break;
 
   case 27:
 
     break;
 
   case 27:
 

-/* Line 1269 of yacc.c  */
-#line 252 "parse-gram.y"
-    { token_table_flag = true; }
+/* Line 1455 of yacc.c  */
+#line 268 "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 253 "parse-gram.y"
-    { report_flag = report_states; }
+/* Line 1455 of yacc.c  */
+#line 270 "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 254 "parse-gram.y"
-    { yacc_flag = true; }
+/* Line 1455 of yacc.c  */
+#line 282 "parse-gram.y"
+    { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+    break;
+
+  case 30:
+
+/* Line 1455 of yacc.c  */
+#line 284 "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:
+
+/* Line 1455 of yacc.c  */
+#line 307 "parse-gram.y"
+    { token_table_flag = true; }
+    break;
+
+  case 32:
+
+/* Line 1455 of yacc.c  */
+#line 308 "parse-gram.y"
+    { report_flag |= report_states; }

     break;
 
   case 33:
 
     break;
 
   case 33:
 

-/* Line 1269 of yacc.c  */
-#line 262 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 309 "parse-gram.y"
+    { yacc_flag = true; }
+    break;
+
+  case 37:
+
+/* Line 1455 of yacc.c  */
+#line 317 "parse-gram.y"

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

-  case 34:
+  case 38:

 
 

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

     {
       symbol_list *list;
     {
       symbol_list *list;

-      const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (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;
 
       symbol_list_free ((yyvsp[(3) - (3)].list));
     }
     break;
 

-  case 35:
+  case 39:

 
 

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

     {
       symbol_list *list;
     {
       symbol_list *list;

-      const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (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;
 
       symbol_list_free ((yyvsp[(3) - (3)].list));
     }
     break;
 

-  case 36:
+  case 40:

 
 

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

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

-  case 37:
+  case 41:

 
 

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

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

-  case 38:
-
-/* Line 1269 of yacc.c  */
-#line 289 "parse-gram.y"
-    { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), true); }
-    break;
-
-  case 39:
-
-/* Line 1269 of yacc.c  */
-#line 290 "parse-gram.y"
-    { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), false); }
-    break;
-
-  case 40:
+  case 42:

 
 

-/* Line 1269 of yacc.c  */
-#line 291 "parse-gram.y"
-    { muscle_code_grow ("provides", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1455 of yacc.c  */
+#line 343 "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;
 
     break;
 

-  case 41:
+  case 43:

 
 

-/* Line 1269 of yacc.c  */
-#line 292 "parse-gram.y"
-    { muscle_code_grow ("requires", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1455 of yacc.c  */
+#line 350 "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;
 
     break;
 

-  case 42:
+  case 44:

 
 

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

     {}
     break;
 
     {}
     break;
 

-  case 43:
+  case 45:

 
 

-/* Line 1269 of yacc.c  */
-#line 304 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 365 "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 44:
+  case 46:

 
 

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

     {
     {

-      char const *body = (yyvsp[(3) - (3)].chars);
-
-      /* 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 45:
+  case 47:

 
 

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

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

-  case 46:
+  case 48:

 
 

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

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

-  case 47:
+  case 49:

 
 

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

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

-  case 48:
+  case 50:

 
 

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

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

-  case 49:
+  case 51:

 
 

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

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


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

-  case 50:
+  case 52:

 
 

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

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


@@ -2235,114 +2299,149 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 51:
+  case 53:

 
 

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

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

-  case 52:
+  case 54:

 
 

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

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

-  case 53:
+  case 55:

 
 

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

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

-  case 54:
+  case 56:

 
 

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

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

-  case 55:
+  case 57:

 
 

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

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

-  case 56:
+  case 58:

 
 

-/* Line 1269 of yacc.c  */
-#line 385 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 430 "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 57:
+  case 59:

 
 

-/* Line 1269 of yacc.c  */
-#line 387 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 432 "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 58:
+  case 60:
+
+/* Line 1455 of yacc.c  */
+#line 436 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+    break;
+
+  case 61:
+
+/* Line 1455 of yacc.c  */
+#line 437 "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:
+
+/* Line 1455 of yacc.c  */
+#line 443 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+    break;
+
+  case 63:
+
+/* Line 1455 of yacc.c  */
+#line 445 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
+    break;

 
 

-/* Line 1269 of yacc.c  */
-#line 391 "parse-gram.y"
+  case 64:
+
+/* Line 1455 of yacc.c  */
+#line 449 "parse-gram.y"

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

-  case 59:
+  case 65:

 
 

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

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

-  case 60:
+  case 66:

 
 

-/* Line 1269 of yacc.c  */
-#line 396 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 454 "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 67:

 
 

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

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

-  case 62:
+  case 68:

 
 

-/* Line 1269 of yacc.c  */
-#line 398 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_new ((yylsp[(1) - (1)])); }
+/* Line 1455 of yacc.c  */
+#line 456 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }

     break;
 
     break;
 

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

 
 

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

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

-  case 64:
+  case 71:

 
 

-/* Line 1269 of yacc.c  */
-#line 409 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 468 "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 65:
+  case 72:

 
 

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


@@ -2350,10 +2449,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 66:
+  case 73:

 
 

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


@@ -2361,10 +2460,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 67:
+  case 74:

 
 

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


@@ -2373,109 +2472,119 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 74:
+  case 81:

 
 

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

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

-  case 75:
+  case 82:

 
 

-/* Line 1269 of yacc.c  */
-#line 462 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 521 "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 77:
+  case 84:

 
 

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

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

-  case 78:
+  case 85:

 
 

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

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

-  case 80:
+  case 87:

 
 

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

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

-  case 81:
+  case 88:

 
 

-/* Line 1269 of yacc.c  */
-#line 475 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 534 "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 82:
+  case 89:

 
 

-/* Line 1269 of yacc.c  */
-#line 477 "parse-gram.y"
-    { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1455 of yacc.c  */
+#line 536 "parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }

     break;
 
     break;
 

-  case 83:
+  case 90:

 
 

-/* Line 1269 of yacc.c  */
-#line 479 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 538 "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 84:
+  case 91:

 
 

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

 
 

-/* Line 1269 of yacc.c  */
-#line 483 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 542 "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 88:
+  case 94:
+
+/* Line 1455 of yacc.c  */
+#line 552 "parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+    break;
+
+  case 95:

 
 

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

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 90:
+  case 97:

 
 

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

     {
     {

-      (yyvsp[(1) - (1)].chars)[strlen ((yyvsp[(1) - (1)].chars)) - 1] = '\n';
-      (yyval.chars) = translate_code ((yyvsp[(1) - (1)].chars) + 1, (yylsp[(1) - (1)]));
+      code_props plain_code;
+      (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
+      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 91:
+  case 98:

 
 

-/* Line 1269 of yacc.c  */
-#line 525 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 591 "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 92:
+  case 99:

 
 

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


@@ -2483,37 +2592,41 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 93:
+  case 100:

 
 

-/* Line 1269 of yacc.c  */
-#line 535 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 601 "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 96:
+  case 103:

 
 

-/* Line 1269 of yacc.c  */
-#line 547 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 613 "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 98:
+  case 105:

 
 

-/* Line 1269 of yacc.c  */
-#line 556 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 622 "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 2517 "parse-gram.c"
+/* Line 1455 of yacc.c  */
+#line 2630 "parse-gram.c"

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


@@ -2693,7 +2806,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.  |
 `-------------------------------------------------*/


@@ -2731,8 +2844,8 @@ yyreturn:
 
 
 
 
 
 

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