Do not use date ranges in copyright notices.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index dfadce4d63ea19dcde9109aef98f85aaec0e6dc1..4d4e1722debc4076b73306646c0fc2640e3b0b96 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,24 +1,21 @@
-/* A Bison parser, made by GNU Bison 2.1b.  */
+/* A Bison parser, made by GNU Bison 2.4.1.206-8a8b-dirty.  */

 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
 
 /* 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
+   
+      Copyright (C) 1984, 1989-1990, 2000-2010 Free Software Foundation, Inc.
+   
+   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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-
+   

    You should have received a copy of the GNU General Public License
    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


@@ -29,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.

-
+   

    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 


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

-#define YYBISON_VERSION "2.1b"
+#define YYBISON_VERSION "2.4.1.206-8a8b-dirty"

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


@@ -55,145 +52,38 @@
 /* Pure parsers.  */
 #define YYPURE 1
 
 /* Pure parsers.  */
 #define YYPURE 1
 

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

 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* 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
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     GRAM_EOF = 0,
-     STRING = 258,
-     INT = 259,
-     PERCENT_TOKEN = 260,
-     PERCENT_NTERM = 261,
-     PERCENT_TYPE = 262,
-     PERCENT_DESTRUCTOR = 263,
-     PERCENT_PRINTER = 264,
-     PERCENT_LEFT = 265,
-     PERCENT_RIGHT = 266,
-     PERCENT_NONASSOC = 267,
-     PERCENT_PREC = 268,
-     PERCENT_DPREC = 269,
-     PERCENT_MERGE = 270,
-     PERCENT_DEBUG = 271,
-     PERCENT_DEFAULT_PREC = 272,
-     PERCENT_DEFINE = 273,
-     PERCENT_DEFINES = 274,
-     PERCENT_ERROR_VERBOSE = 275,
-     PERCENT_EXPECT = 276,
-     PERCENT_EXPECT_RR = 277,
-     PERCENT_FILE_PREFIX = 278,
-     PERCENT_GLR_PARSER = 279,
-     PERCENT_INITIAL_ACTION = 280,
-     PERCENT_LEX_PARAM = 281,
-     PERCENT_LOCATIONS = 282,
-     PERCENT_NAME_PREFIX = 283,
-     PERCENT_NO_DEFAULT_PREC = 284,
-     PERCENT_NO_LINES = 285,
-     PERCENT_NONDETERMINISTIC_PARSER = 286,
-     PERCENT_OUTPUT = 287,
-     PERCENT_PARSE_PARAM = 288,
-     PERCENT_PURE_PARSER = 289,
-     PERCENT_REQUIRE = 290,
-     PERCENT_SKELETON = 291,
-     PERCENT_START = 292,
-     PERCENT_TOKEN_TABLE = 293,
-     PERCENT_VERBOSE = 294,
-     PERCENT_YACC = 295,
-     BRACED_CODE = 296,
-     CHAR = 297,
-     EPILOGUE = 298,
-     EQUAL = 299,
-     ID = 300,
-     ID_COLON = 301,
-     PERCENT_PERCENT = 302,
-     PIPE = 303,
-     PROLOGUE = 304,
-     SEMICOLON = 305,
-     TYPE = 306,
-     PERCENT_UNION = 307
-   };
-#endif
-/* Tokens.  */
-#define GRAM_EOF 0
-#define STRING 258
-#define INT 259
-#define PERCENT_TOKEN 260
-#define PERCENT_NTERM 261
-#define PERCENT_TYPE 262
-#define PERCENT_DESTRUCTOR 263
-#define PERCENT_PRINTER 264
-#define PERCENT_LEFT 265
-#define PERCENT_RIGHT 266
-#define PERCENT_NONASSOC 267
-#define PERCENT_PREC 268
-#define PERCENT_DPREC 269
-#define PERCENT_MERGE 270
-#define PERCENT_DEBUG 271
-#define PERCENT_DEFAULT_PREC 272
-#define PERCENT_DEFINE 273
-#define PERCENT_DEFINES 274
-#define PERCENT_ERROR_VERBOSE 275
-#define PERCENT_EXPECT 276
-#define PERCENT_EXPECT_RR 277
-#define PERCENT_FILE_PREFIX 278
-#define PERCENT_GLR_PARSER 279
-#define PERCENT_INITIAL_ACTION 280
-#define PERCENT_LEX_PARAM 281
-#define PERCENT_LOCATIONS 282
-#define PERCENT_NAME_PREFIX 283
-#define PERCENT_NO_DEFAULT_PREC 284
-#define PERCENT_NO_LINES 285
-#define PERCENT_NONDETERMINISTIC_PARSER 286
-#define PERCENT_OUTPUT 287
-#define PERCENT_PARSE_PARAM 288
-#define PERCENT_PURE_PARSER 289
-#define PERCENT_REQUIRE 290
-#define PERCENT_SKELETON 291
-#define PERCENT_START 292
-#define PERCENT_TOKEN_TABLE 293
-#define PERCENT_VERBOSE 294
-#define PERCENT_YACC 295
-#define BRACED_CODE 296
-#define CHAR 297
-#define EPILOGUE 298
-#define EQUAL 299
-#define ID 300
-#define ID_COLON 301
-#define PERCENT_PERCENT 302
-#define PIPE 303
-#define PROLOGUE 304
-#define SEMICOLON 305
-#define TYPE 306
-#define PERCENT_UNION 307
-
-
-
+#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 1 "../../src/parse-gram.y"
+
+/* Line 251 of yacc.c  */
+#line 1 "parse-gram.y"

 /* Bison Grammar Parser                             -*- C -*-
 
 /* Bison Grammar Parser                             -*- C -*-
 

-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002-2010 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,


@@ -202,10 +92,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"


@@ -215,13 +102,13 @@
 #include "files.h"
 #include "getargs.h"
 #include "gram.h"
 #include "files.h"
 #include "getargs.h"
 #include "gram.h"

-#include "muscle_tab.h"
+#include "muscle-tab.h"
+#include "named-ref.h"

 #include "quotearg.h"
 #include "reader.h"
 #include "symlist.h"
 #include "scan-gram.h"
 #include "scan-code.h"
 #include "quotearg.h"
 #include "reader.h"
 #include "symlist.h"
 #include "scan-gram.h"
 #include "scan-code.h"

-#include "strverscmp.h"

 
 #define YYLLOC_DEFAULT(Current, Rhs, N)  (Current) = lloc_default (Rhs, N)
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YYLLOC_DEFAULT(Current, Rhs, N)  (Current) = lloc_default (Rhs, N)
 static YYLTYPE lloc_default (YYLTYPE const *, int);


@@ -238,27 +125,32 @@ static void version_check (location const *loc, char const *version);
        gram_error (&yylloc, Msg)
 static void gram_error (location const *, char const *);
 
        gram_error (&yylloc, Msg)
 static void gram_error (location const *, char const *);
 

-static void add_param (char const *, char *, location);
+static char const *char_name (char);
+
+/** Add a lex-param or a parse-param.
+ *
+ * \param type  \a lex_param or \a parse_param
+ * \param decl  the formal argument
+ * \param loc   the location in the source.
+ */
+static void add_param (char const *type, char *decl, location loc);
+

 
 static symbol_class current_class = unknown_sym;
 
 static symbol_class current_class = unknown_sym;

-static uniqstr current_type = 0;
+static uniqstr current_type = NULL;

 static symbol *current_lhs;
 static location current_lhs_location;
 static symbol *current_lhs;
 static location current_lhs_location;

+static named_ref *current_lhs_named_ref;

 static int current_prec = 0;
 
 static int current_prec = 0;
 

-#ifdef UINT_FAST8_MAX
-# define YYTYPE_UINT8 uint_fast8_t
-#endif
-#ifdef INT_FAST8_MAX
-# define YYTYPE_INT8 int_fast8_t
-#endif
-#ifdef UINT_FAST16_MAX
-# define YYTYPE_UINT16 uint_fast16_t
-#endif
-#ifdef INT_FAST16_MAX
-# define YYTYPE_INT16 int_fast16_t
-#endif
+#define YYTYPE_INT16 int_fast16_t
+#define YYTYPE_INT8 int_fast8_t
+#define YYTYPE_UINT16 uint_fast16_t
+#define YYTYPE_UINT8 uint_fast8_t
+

 
 

+/* Line 251 of yacc.c  */
+#line 154 "parse-gram.c"

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


@@ -278,24 +170,157 @@ static int current_prec = 0;
 # define YYTOKEN_TABLE 0
 #endif
 
 # define YYTOKEN_TABLE 0
 #endif
 

+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     GRAM_EOF = 0,
+     STRING = 258,
+     INT = 259,
+     PERCENT_TOKEN = 260,
+     PERCENT_NTERM = 261,
+     PERCENT_TYPE = 262,
+     PERCENT_DESTRUCTOR = 263,
+     PERCENT_PRINTER = 264,
+     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,
+     BRACKETED_ID = 299,
+     CHAR = 300,
+     EPILOGUE = 301,
+     EQUAL = 302,
+     ID = 303,
+     ID_COLON = 304,
+     PERCENT_PERCENT = 305,
+     PIPE = 306,
+     PROLOGUE = 307,
+     SEMICOLON = 308,
+     TYPE = 309,
+     TYPE_TAG_ANY = 310,
+     TYPE_TAG_NONE = 311,
+     PERCENT_UNION = 312
+   };
+#endif
+/* Tokens.  */
+#define GRAM_EOF 0
+#define STRING 258
+#define INT 259
+#define PERCENT_TOKEN 260
+#define PERCENT_NTERM 261
+#define PERCENT_TYPE 262
+#define PERCENT_DESTRUCTOR 263
+#define PERCENT_PRINTER 264
+#define PERCENT_LEFT 265
+#define PERCENT_RIGHT 266
+#define PERCENT_NONASSOC 267
+#define PERCENT_PREC 268
+#define PERCENT_DPREC 269
+#define PERCENT_MERGE 270
+#define PERCENT_CODE 271
+#define PERCENT_DEBUG 272
+#define PERCENT_DEFAULT_PREC 273
+#define PERCENT_DEFINE 274
+#define PERCENT_DEFINES 275
+#define PERCENT_ERROR_VERBOSE 276
+#define PERCENT_EXPECT 277
+#define PERCENT_EXPECT_RR 278
+#define PERCENT_FILE_PREFIX 279
+#define PERCENT_GLR_PARSER 280
+#define PERCENT_INITIAL_ACTION 281
+#define PERCENT_LANGUAGE 282
+#define PERCENT_LEX_PARAM 283
+#define PERCENT_LOCATIONS 284
+#define PERCENT_NAME_PREFIX 285
+#define PERCENT_NO_DEFAULT_PREC 286
+#define PERCENT_NO_LINES 287
+#define PERCENT_NONDETERMINISTIC_PARSER 288
+#define PERCENT_OUTPUT 289
+#define PERCENT_PARSE_PARAM 290
+#define PERCENT_PURE_PARSER 291
+#define PERCENT_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 BRACKETED_ID 299
+#define CHAR 300
+#define EPILOGUE 301
+#define EQUAL 302
+#define ID 303
+#define ID_COLON 304
+#define PERCENT_PERCENT 305
+#define PIPE 306
+#define PROLOGUE 307
+#define SEMICOLON 308
+#define TYPE 309
+#define TYPE_TAG_ANY 310
+#define TYPE_TAG_NONE 311
+#define PERCENT_UNION 312
+
+
+
+

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

-#line 95 "../../src/parse-gram.y"

 {
 {

+
+/* Line 276 of yacc.c  */
+#line 93 "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 193 of yacc.c.  */
-#line 295 "../../src/parse-gram.c"
-       YYSTYPE;
+  named_ref *named_ref;
+
+
+
+/* Line 276 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 YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

-# define YYSTYPE_IS_TRIVIAL 1

 #endif
 
 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
 #endif
 
 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED


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

-/* Line 216 of yacc.c.  */
-#line 320 "../../src/parse-gram.c"
+/* Line 326 of yacc.c  */
+#line 345 "parse-gram.c"

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


@@ -366,7 +391,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_

-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS

 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)


@@ -391,14 +416,14 @@ typedef short int yytype_int16;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int

-YYID (int i)
+YYID (int yyi)

 #else
 static int
 #else
 static int

-YYID (i)
-    int i;
+YYID (yyi)
+    int yyi;

 #endif
 {
 #endif
 {

-  return i;
+  return yyi;

 }
 #endif
 
 }
 #endif
 


@@ -480,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.  */


@@ -517,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);                          \
       }                                                                        \


@@ -533,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   134
+#define YYLAST   160

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

-#define YYNTOKENS  53
+#define YYNTOKENS  58

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

-#define YYNNTS  27
+#define YYNNTS  34

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

-#define YYNRULES  85
+#define YYNRULES  108

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

-#define YYNSTATES  120
+#define YYNSTATES  148

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

-#define YYMAXUTOK   307
+#define YYMAXUTOK   312

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


@@ -584,65 +609,75 @@ static const yytype_uint8 yytranslate[] =
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,

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

 };
 
 #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,    21,
-      25,    27,    29,    32,    35,    39,    41,    44,    47,    49,
-      53,    55,    57,    61,    64,    66,    69,    72,    74,    76,
-      78,    80,    82,    84,    87,    91,    95,    97,    99,   100,
-     102,   106,   107,   111,   112,   116,   120,   124,   126,   128,
-     130,   131,   133,   135,   138,   140,   142,   145,   148,   152,
-     154,   157,   159,   162,   164,   167,   170,   171,   175,   177,
-     181,   184,   185,   188,   191,   195,   199,   203,   205,   207,
-     209,   211,   213,   215,   217,   218
+       0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
+      24,    27,    29,    32,    35,    38,    42,    44,    47,    50,
+      53,    55,    58,    62,    64,    66,    69,    73,    76,    78,
+      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,   218,   220,   224,   227,   228,   232,
+     236,   240,   244,   248,   249,   251,   253,   255,   256,   258,
+     260,   262,   264,   266,   268,   270,   272,   274,   275

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

-      54,     0,    -1,    55,    47,    68,    79,    -1,    -1,    55,
-      56,    -1,    57,    -1,    49,    -1,    16,    -1,    18,    78,
-      -1,    18,    78,    78,    -1,    19,    -1,    20,    -1,    21,
-       4,    -1,    22,     4,    -1,    23,    44,    78,    -1,    24,
-      -1,    25,    41,    -1,    26,    41,    -1,    27,    -1,    28,
-      44,    78,    -1,    30,    -1,    31,    -1,    32,    44,    78,
-      -1,    33,    41,    -1,    34,    -1,    35,    78,    -1,    36,
-      78,    -1,    38,    -1,    39,    -1,    40,    -1,    50,    -1,
-      62,    -1,    59,    -1,    37,    76,    -1,     8,    41,    65,
-      -1,     9,    41,    65,    -1,    17,    -1,    29,    -1,    -1,
-      45,    -1,    52,    58,    41,    -1,    -1,     6,    60,    67,
-      -1,    -1,     5,    61,    67,    -1,     7,    51,    65,    -1,
-      63,    64,    65,    -1,    10,    -1,    11,    -1,    12,    -1,
-      -1,    51,    -1,    76,    -1,    65,    76,    -1,    51,    -1,
-      74,    -1,    74,     4,    -1,    74,    77,    -1,    74,     4,
-      77,    -1,    66,    -1,    67,    66,    -1,    69,    -1,    68,
-      69,    -1,    70,    -1,    57,    50,    -1,     1,    50,    -1,
-      -1,    75,    71,    72,    -1,    73,    -1,    72,    48,    73,
-      -1,    72,    50,    -1,    -1,    73,    76,    -1,    73,    41,
-      -1,    73,    13,    76,    -1,    73,    14,     4,    -1,    73,
-      15,    51,    -1,    45,    -1,    42,    -1,    46,    -1,    74,
-      -1,    77,    -1,     3,    -1,     3,    -1,    -1,    47,    43,
-      -1
+      59,     0,    -1,    60,    50,    77,    91,    -1,    -1,    60,
+      61,    -1,    62,    -1,    52,    -1,    17,    -1,    19,    84,
+      85,    -1,    20,    -1,    20,     3,    -1,    21,    -1,    22,
+       4,    -1,    23,     4,    -1,    24,     3,    -1,    24,    47,
+       3,    -1,    25,    -1,    26,    43,    -1,    27,     3,    -1,
+      28,    43,    -1,    29,    -1,    30,     3,    -1,    30,    47,
+       3,    -1,    32,    -1,    33,    -1,    34,     3,    -1,    34,
+      47,     3,    -1,    35,    43,    -1,    36,    -1,    37,     3,
+      -1,    38,     3,    -1,    40,    -1,    41,    -1,    42,    -1,
+      53,    -1,    67,    -1,    64,    -1,    39,    89,    -1,     8,
+      43,    73,    -1,     9,    43,    73,    -1,    18,    -1,    31,
+      -1,    16,    86,    -1,    16,    48,    86,    -1,    -1,    48,
+      -1,    57,    63,    86,    -1,    -1,     6,    65,    76,    -1,
+      -1,     5,    66,    76,    -1,     7,    54,    72,    -1,    68,
+      69,    70,    -1,    10,    -1,    11,    -1,    12,    -1,    -1,
+      54,    -1,    71,    -1,    70,    71,    -1,    89,    -1,    89,
+       4,    -1,    89,    -1,    72,    89,    -1,    74,    -1,    73,
+      74,    -1,    89,    -1,    54,    -1,    55,    -1,    56,    -1,
+      54,    -1,    87,    -1,    87,     4,    -1,    87,    90,    -1,
+      87,     4,    90,    -1,    75,    -1,    76,    75,    -1,    78,
+      -1,    77,    78,    -1,    79,    -1,    62,    53,    -1,     1,
+      53,    -1,    -1,    88,    83,    80,    81,    -1,    82,    -1,
+      81,    51,    82,    -1,    81,    53,    -1,    -1,    82,    89,
+      83,    -1,    82,    43,    83,    -1,    82,    13,    89,    -1,
+      82,    14,     4,    -1,    82,    15,    54,    -1,    -1,    44,
+      -1,    48,    -1,     3,    -1,    -1,    48,    -1,     3,    -1,
+      43,    -1,    48,    -1,    45,    -1,    49,    -1,    87,    -1,
+      90,    -1,     3,    -1,    -1,    50,    46,    -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,   195,   195,   203,   205,   209,   210,   212,   213,   218,
-     219,   220,   221,   222,   223,   224,   229,   233,   234,   235,
-     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
-     246,   250,   251,   252,   256,   264,   272,   276,   290,   291,
-     295,   317,   317,   322,   322,   327,   337,   352,   353,   354,
-     358,   359,   364,   365,   370,   374,   379,   385,   391,   402,
-     403,   412,   413,   419,   420,   421,   428,   428,   432,   433,
-     434,   439,   440,   442,   445,   447,   449,   462,   463,   472,
-     477,   478,   483,   492,   497,   499
+       0,   208,   208,   216,   218,   222,   223,   233,   234,   239,
+     240,   245,   246,   247,   248,   249,   250,   255,   264,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   289,
+     290,   314,   315,   316,   317,   321,   322,   323,   327,   334,
+     341,   345,   349,   356,   371,   372,   376,   388,   388,   393,
+     393,   398,   409,   424,   425,   426,   430,   431,   436,   438,
+     443,   444,   449,   451,   456,   457,   461,   462,   463,   464,
+     469,   474,   479,   485,   491,   502,   503,   512,   513,   519,
+     520,   521,   528,   528,   533,   534,   535,   540,   542,   544,
+     546,   548,   550,   555,   557,   568,   569,   574,   575,   576,
+     585,   605,   607,   616,   621,   622,   627,   634,   636

 };
 #endif
 
 };
 #endif
 


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

-  "\"%dprec\"", "\"%merge\"", "\"%debug\"", "\"%default-prec\"",
-  "\"%define\"", "\"%defines\"", "\"%error-verbose\"", "\"%expect\"",
-  "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
-  "\"%initial-action\"", "\"%lex-param\"", "\"%locations\"",
-  "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
-  "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param\"",
-  "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"",
-  "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"",
-  "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
-  "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", "\"%union\"", "$accept",
-  "input", "declarations", "declaration", "grammar_declaration",
-  "union_name", "symbol_declaration", "@1", "@2", "precedence_declaration",
-  "precedence_declarator", "type.opt", "symbols.1", "symbol_def",
-  "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules",
-  "@3", "rhses.1", "rhs", "id", "id_colon", "symbol", "string_as_id",
-  "string_content", "epilogue.opt", 0
+  "\"%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\"",
+  "\"{...}\"", "\"[identifier]\"", "\"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.prec", "symbol.prec", "symbols.1", "generic_symlist",
+  "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
+  "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs",
+  "named_ref.opt", "variable", "content.opt", "braceless", "id",
+  "id_colon", "symbol", "string_as_id", "epilogue.opt", 0

 };
 #endif
 
 };
 #endif
 


@@ -683,149 +721,175 @@ 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
+     305,   306,   307,   308,   309,   310,   311,   312

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

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

 };
 
 };
 

-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE doesn't specify something else to do.  Zero

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

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

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

 {
 {

-      -1,     1,     2,    41,    71,    77,    43,    47,    46,    44,
-      45,    79,    85,    81,    82,    72,    73,    74,    98,   106,
-     107,    66,    75,    86,    68,    52,    97
+      -1,     1,     2,    43,    82,    88,    45,    49,    48,    46,
+      47,    90,   120,   121,    96,   101,   102,    92,    93,    83,
+      84,    85,   129,   133,   134,   118,    58,   108,    55,    77,
+      86,   103,    79,   116

 };
 
 /* 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 -70
-static const yytype_int8 yypact[] =
+#define YYPACT_NINF -91
+static const yytype_int16 yypact[] =

 {
 {

-     -70,     5,    79,   -70,   -70,   -70,   -19,    -4,     8,   -70,
-     -70,   -70,   -70,   -70,    47,   -70,   -70,    54,    61,    25,
-     -70,    38,    39,   -70,    37,   -70,   -70,   -70,    48,    41,
-     -70,    47,    47,    26,   -70,   -70,   -70,    14,   -70,   -70,
-      49,   -70,   -70,   -70,   -70,    42,    19,    19,    26,    26,
-      26,   -70,    47,   -70,   -70,    47,   -70,   -70,    47,    47,
-     -70,   -70,   -70,   -70,   -70,   -70,   -70,   -70,   -70,    70,
-     -70,    71,     1,   -70,   -70,   -70,   -70,    81,   -70,    26,
-     -70,   -70,    19,    13,    19,    26,   -70,    26,    26,   -70,
-     -70,   -70,   -70,   -70,   -70,    80,   -70,   -70,   -70,   -70,
-      26,   -70,   121,   -70,   -70,   -70,    -8,    31,   -70,   -70,
-     -70,    26,   123,    74,   -70,   -70,    31,   -70,   -70,   -70
+     -91,     3,   103,   -91,   -91,   -91,   -36,     2,    10,   -91,
+     -91,   -91,     9,   -91,   -91,    32,    60,   -91,    65,    67,
+      27,   -91,    41,    73,    51,   -91,    39,   -91,   -91,   -91,
+      40,    52,   -91,    93,    95,    33,   -91,   -91,   -91,    15,
+     -91,   -91,    53,   -91,   -91,   -91,   -91,    46,    43,    43,
+      33,    11,    11,   -91,    61,   -91,   -91,   -91,    35,   -91,
+     -91,   -91,   -91,   100,   -91,   -91,   -91,   -91,   102,   -91,
+     113,   -91,   -91,   -91,   -91,   -91,   -91,   -91,   -91,   -91,
+      64,   -91,    94,     1,   -91,   -91,    62,   -91,    61,   -91,
+      33,   -91,   -91,    43,    86,    43,    33,   -91,   -91,   -91,
+     -91,    11,   -91,   -91,    11,   -91,   -91,   -91,   -91,   -91,
+     -91,   -91,   -91,   -91,    72,   -91,   -91,   -91,   -91,   -91,
+      33,   -91,   142,   -91,   145,   -91,   -91,   -91,   -91,   -91,
+     -91,   -91,   -91,    17,    34,   -91,   -91,    33,   146,    97,
+      62,    62,    34,   -91,   -91,   -91,   -91,   -91

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

-     -70,   -70,   -70,   -70,   128,   -70,   -70,   -70,   -70,   -70,
-     -70,   -70,   -22,    -7,    85,   -70,    62,   -70,   -70,   -70,
-      24,   -43,   -70,   -33,   -69,     4,   -70
+     -91,   -91,   -91,   -91,   147,   -91,   -91,   -91,   -91,   -91,
+     -91,   -91,   -91,    37,   -91,   106,   -60,   -33,   105,   -91,
+      69,   -91,   -91,   -91,    24,   -48,   -91,   -91,   -49,   -20,
+     -91,   -35,   -90,   -91

 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
 };
 
 /* 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 -85
-static const yytype_int8 yytable[] =
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -108
+static const yytype_int16 yytable[] =

 {
 {

-      67,   -84,    69,    83,    83,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,   103,    69,    63,   102,    13,     4,
-       5,     6,     7,     8,     9,    10,    11,    87,    88,    63,
-      25,    13,    48,   108,    63,    61,    62,    49,    33,    83,
-     109,    83,   110,    25,   111,   112,   113,    70,    95,    50,
-      51,    33,   104,    40,   104,   104,    89,   100,    53,    90,
-      70,    64,    91,    92,    65,    54,    40,   104,    64,    55,
-      80,    65,   114,    64,   115,   101,    65,   101,   117,    56,
-      57,    58,    60,   115,     4,     5,     6,     7,     8,     9,
-      10,    11,    59,    78,    76,    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,
-      93,    94,    99,   105,    63,   119,    37,   118,    38,    39,
-      42,    40,    84,   116,    96
+      78,  -107,    80,     3,   125,   105,     4,     5,     6,     7,
+       8,     9,    10,    11,    74,    97,    80,    12,    50,    14,
+       4,     5,     6,     7,     8,     9,    10,    11,    94,    94,
+      62,    12,    27,    14,   132,    56,    74,    74,   106,   119,
+      35,   127,    67,    69,   127,    51,    27,   137,   138,   139,
+      81,   114,    53,    52,    35,   122,    75,    54,    42,    76,
+     123,   126,   123,    59,    81,    98,    99,   100,   135,    60,
+     136,    61,    42,    94,    63,    94,    65,   140,    75,    75,
+      57,    76,    76,   107,    64,   122,    68,    70,    75,    74,
+     124,    76,   146,   147,    66,    71,    72,    91,    73,   141,
+      89,    87,   143,   109,    53,   110,   117,   141,     4,     5,
+       6,     7,     8,     9,    10,    11,   111,   112,   128,    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,   131,   113,    74,    44,
+     144,   145,   115,    39,    95,    40,    41,   130,   104,   142,
+      42

 };
 
 };
 

+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-91))
+
+#define yytable_value_is_error(yytable_value) \
+  YYID (0)
+

 static const yytype_uint8 yycheck[] =
 {
 static const yytype_uint8 yycheck[] =
 {

-      33,     0,     1,    46,    47,     0,     5,     6,     7,     8,
-       9,    10,    11,    12,    83,     1,     3,     4,    17,     5,
-       6,     7,     8,     9,    10,    11,    12,    49,    50,     3,
-      29,    17,    51,   102,     3,    31,    32,    41,    37,    82,
-      48,    84,    50,    29,    13,    14,    15,    46,    47,    41,
-       3,    37,    85,    52,    87,    88,    52,    79,     4,    55,
-      46,    42,    58,    59,    45,     4,    52,   100,    42,    44,
-      51,    45,    41,    42,   107,    82,    45,    84,   111,    41,
-      41,    44,    41,   116,     5,     6,     7,     8,     9,    10,
-      11,    12,    44,    51,    45,    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,
-      50,    50,    41,    43,     3,    51,    47,     4,    49,    50,
-       2,    52,    47,   109,    72
+      35,     0,     1,     0,    94,    54,     5,     6,     7,     8,
+       9,    10,    11,    12,     3,    50,     1,    16,    54,    18,
+       5,     6,     7,     8,     9,    10,    11,    12,    48,    49,
+       3,    16,    31,    18,   124,     3,     3,     3,     3,    88,
+      39,   101,     3,     3,   104,    43,    31,    13,    14,    15,
+      49,    50,    43,    43,    39,    90,    45,    48,    57,    48,
+      93,    96,    95,     3,    49,    54,    55,    56,    51,     4,
+      53,     4,    57,    93,    47,    95,     3,    43,    45,    45,
+      48,    48,    48,    48,    43,   120,    47,    47,    45,     3,
+       4,    48,   140,   141,    43,    43,     3,    54,     3,   134,
+      54,    48,   137,     3,    43,     3,    44,   142,     5,     6,
+       7,     8,     9,    10,    11,    12,     3,    53,    46,    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,     4,    53,     3,     2,
+       4,    54,    83,    50,    49,    52,    53,   120,    52,   135,
+      57

 };
 
 /* 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,    54,    55,     0,     5,     6,     7,     8,     9,    10,
+       0,    59,    60,     0,     5,     6,     7,     8,     9,    10,

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

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

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


@@ -840,9 +904,18 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.

-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */

 
 #define YYFAIL         goto yyerrlab
 
 #define YYFAIL         goto yyerrlab

+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif

 
 #define YYRECOVERING()  (!!yyerrstatus)
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
 


@@ -852,7 +925,6 @@ do                                                          \
     {                                                          \
       yychar = (Token);                                                \
       yylval = (Value);                                                \
     {                                                          \
       yychar = (Token);                                                \
       yylval = (Value);                                                \

-      yytoken = YYTRANSLATE (yychar);                          \

       YYPOPSTACK (1);                                          \
       goto yybackup;                                           \
     }                                                          \
       YYPOPSTACK (1);                                          \
       goto yybackup;                                           \
     }                                                          \


@@ -899,7 +971,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT

-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL

 #  define YY_LOCATION_PRINT(File, Loc)                 \
      fprintf (File, "%d.%d-%d.%d",                     \
              (Loc).first_line, (Loc).first_column,     \
 #  define YY_LOCATION_PRINT(File, Loc)                 \
      fprintf (File, "%d.%d-%d.%d",                     \
              (Loc).first_line, (Loc).first_column,     \


@@ -952,14 +1024,14 @@ do {                                                                       \
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void

-yy_symbol_value_print (FILE *yyoutput, int yytype, const YYSTYPE * const yyvaluep, const YYLTYPE * const yylocationp)
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)

 #else
 static void
 yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     FILE *yyoutput;
     int yytype;
 #else
 static void
 yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     FILE *yyoutput;
     int yytype;

-    const YYSTYPE * const yyvaluep;
-    const YYLTYPE * const yylocationp;
+    YYSTYPE const * const yyvaluep;
+    YYLTYPE const * const yylocationp;

 #endif
 {
   if (!yyvaluep)
 #endif
 {
   if (!yyvaluep)


@@ -974,74 +1046,166 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
   switch (yytype)
     {
       case 3: /* "\"string\"" */
   switch (yytype)
     {
       case 3: /* "\"string\"" */

-#line 175 "../../src/parse-gram.y"
-       { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); };
-#line 980 "../../src/parse-gram.c"
+
+/* Line 797 of yacc.c  */
+#line 183 "parse-gram.y"
+       { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
+
+/* Line 797 of yacc.c  */
+#line 1056 "parse-gram.c"

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

-#line 184 "../../src/parse-gram.y"
+
+/* Line 797 of yacc.c  */
+#line 195 "parse-gram.y"

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

-#line 985 "../../src/parse-gram.c"
+
+/* Line 797 of yacc.c  */
+#line 1065 "parse-gram.c"

        break;
        break;

-      case 41: /* "\"{...}\"" */
-#line 176 "../../src/parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-#line 990 "../../src/parse-gram.c"
+      case 43: /* "\"{...}\"" */
+
+/* Line 797 of yacc.c  */
+#line 185 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
+
+/* Line 797 of yacc.c  */
+#line 1074 "parse-gram.c"

        break;
        break;

-      case 42: /* "\"char\"" */
-#line 172 "../../src/parse-gram.y"
-       { fprintf (stderr, "'%c' (%d)", (yyvaluep->character), (yyvaluep->character)); };
-#line 995 "../../src/parse-gram.c"
+      case 44: /* "\"[identifier]\"" */
+
+/* Line 797 of yacc.c  */
+#line 190 "parse-gram.y"
+       { fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); };
+
+/* Line 797 of yacc.c  */
+#line 1083 "parse-gram.c"

        break;
        break;

-      case 43: /* "\"epilogue\"" */
-#line 176 "../../src/parse-gram.y"
+      case 45: /* "\"char\"" */
+
+/* Line 797 of yacc.c  */
+#line 177 "parse-gram.y"
+       { fputs (char_name ((yyvaluep->character)), stderr); };
+
+/* Line 797 of yacc.c  */
+#line 1092 "parse-gram.c"
+       break;
+      case 46: /* "\"epilogue\"" */
+
+/* Line 797 of yacc.c  */
+#line 185 "parse-gram.y"

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

-#line 1000 "../../src/parse-gram.c"
+
+/* Line 797 of yacc.c  */
+#line 1101 "parse-gram.c"

        break;
        break;

-      case 45: /* "\"identifier\"" */
-#line 180 "../../src/parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->uniqstr)); };
-#line 1005 "../../src/parse-gram.c"
+      case 48: /* "\"identifier\"" */
+
+/* Line 797 of yacc.c  */
+#line 189 "parse-gram.y"
+       { fputs ((yyvaluep->uniqstr), stderr); };
+
+/* Line 797 of yacc.c  */
+#line 1110 "parse-gram.c"

        break;
        break;

-      case 46: /* "\"identifier:\"" */
-#line 181 "../../src/parse-gram.y"
+      case 49: /* "\"identifier:\"" */
+
+/* Line 797 of yacc.c  */
+#line 191 "parse-gram.y"

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

-#line 1010 "../../src/parse-gram.c"
+
+/* Line 797 of yacc.c  */
+#line 1119 "parse-gram.c"

        break;
        break;

-      case 49: /* "\"%{...%}\"" */
-#line 176 "../../src/parse-gram.y"
+      case 52: /* "\"%{...%}\"" */
+
+/* Line 797 of yacc.c  */
+#line 185 "parse-gram.y"

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

-#line 1015 "../../src/parse-gram.c"
+
+/* Line 797 of yacc.c  */
+#line 1128 "parse-gram.c"

        break;
        break;

-      case 51: /* "\"type\"" */
-#line 179 "../../src/parse-gram.y"
+      case 54: /* "\"type\"" */
+
+/* Line 797 of yacc.c  */
+#line 192 "parse-gram.y"

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

-#line 1020 "../../src/parse-gram.c"
+
+/* Line 797 of yacc.c  */
+#line 1137 "parse-gram.c"

        break;
        break;

-      case 74: /* "id" */
-#line 187 "../../src/parse-gram.y"
+      case 71: /* "symbol.prec" */
+
+/* Line 797 of yacc.c  */
+#line 198 "parse-gram.y"

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

-#line 1025 "../../src/parse-gram.c"
+
+/* Line 797 of yacc.c  */
+#line 1146 "parse-gram.c"

        break;
        break;

-      case 75: /* "id_colon" */
-#line 188 "../../src/parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-#line 1030 "../../src/parse-gram.c"
+      case 84: /* "variable" */
+
+/* Line 797 of yacc.c  */
+#line 189 "parse-gram.y"
+       { fputs ((yyvaluep->uniqstr), stderr); };
+
+/* Line 797 of yacc.c  */
+#line 1155 "parse-gram.c"
+       break;
+      case 85: /* "content.opt" */
+
+/* Line 797 of yacc.c  */
+#line 185 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+
+/* Line 797 of yacc.c  */
+#line 1164 "parse-gram.c"

        break;
        break;

-      case 76: /* "symbol" */
-#line 187 "../../src/parse-gram.y"
+      case 86: /* "braceless" */
+
+/* Line 797 of yacc.c  */
+#line 185 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+
+/* Line 797 of yacc.c  */
+#line 1173 "parse-gram.c"
+       break;
+      case 87: /* "id" */
+
+/* Line 797 of yacc.c  */
+#line 198 "parse-gram.y"

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

-#line 1035 "../../src/parse-gram.c"
+
+/* Line 797 of yacc.c  */
+#line 1182 "parse-gram.c"
+       break;
+      case 88: /* "id_colon" */
+
+/* Line 797 of yacc.c  */
+#line 199 "parse-gram.y"
+       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
+
+/* Line 797 of yacc.c  */
+#line 1191 "parse-gram.c"

        break;
        break;

-      case 77: /* "string_as_id" */
-#line 187 "../../src/parse-gram.y"
+      case 89: /* "symbol" */
+
+/* Line 797 of yacc.c  */
+#line 198 "parse-gram.y"

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

-#line 1040 "../../src/parse-gram.c"
+
+/* Line 797 of yacc.c  */
+#line 1200 "parse-gram.c"

        break;
        break;

-      case 78: /* "string_content" */
-#line 175 "../../src/parse-gram.y"
-       { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); };
-#line 1045 "../../src/parse-gram.c"
+      case 90: /* "string_as_id" */
+
+/* Line 797 of yacc.c  */
+#line 198 "parse-gram.y"
+       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+
+/* Line 797 of yacc.c  */
+#line 1209 "parse-gram.c"

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


@@ -1056,14 +1220,14 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void

-yy_symbol_print (FILE *yyoutput, int yytype, const YYSTYPE * const yyvaluep, const YYLTYPE * const yylocationp)
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)

 #else
 static void
 yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp)
     FILE *yyoutput;
     int yytype;
 #else
 static void
 yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp)
     FILE *yyoutput;
     int yytype;

-    const YYSTYPE * const yyvaluep;
-    const YYLTYPE * const yylocationp;
+    YYSTYPE const * const yyvaluep;
+    YYLTYPE const * const yylocationp;

 #endif
 {
   if (yytype < YYNTOKENS)
 #endif
 {
   if (yytype < YYNTOKENS)


@@ -1085,17 +1249,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp)
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void

-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)

 #else
 static void
 #else
 static void

-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;

 #endif
 {
   YYFPRINTF (stderr, "Stack now");
 #endif
 {
   YYFPRINTF (stderr, "Stack now");

-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }

   YYFPRINTF (stderr, "\n");
 }
 
   YYFPRINTF (stderr, "\n");
 }
 


@@ -1116,8 +1283,7 @@ static void
 yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
 #else
 static void
 yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
 #else
 static void

-yy_reduce_print (yyvsp, yylsp, yyrule
-                  )
+yy_reduce_print (yyvsp, yylsp, yyrule)

     YYSTYPE *yyvsp;
     YYLTYPE *yylsp;
     int yyrule;
     YYSTYPE *yyvsp;
     YYLTYPE *yylsp;
     int yyrule;


@@ -1131,11 +1297,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");

     }
 }
 
     }
 }
 


@@ -1240,7 +1406,7 @@ yytnamerr (char *yyres, const char *yystr)
 {
   if (*yystr == '"')
     {
 {
   if (*yystr == '"')
     {

-      size_t yyn = 0;
+      YYSIZE_T yyn = 0;

       char const *yyp = yystr;
 
       for (;;)
       char const *yyp = yystr;
 
       for (;;)


@@ -1275,111 +1441,121 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
 }
 # endif
 

-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN while in state YYSTATE.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if an ordinary
+   "syntax error" message will suffice instead.  Return 2 if *YYMSG is
+   not large enough to hold the message.  In the last case, also set
+   *YYMSG_ALLOC to either (a) the required number of bytes or (b) zero
+   if the required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                int yystate, int yytoken)

 {
   int yyn = yypact[yystate];
 
 {
   int yyn = yypact[yystate];
 

-  if (! (YYPACT_NINF < yyn && yyn < YYLAST))
-    return 0;
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 1;

   else
     {
   else
     {

-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);

       YYSIZE_T yysize = yysize0;
       YYSIZE_T yysize1;
       YYSIZE_T yysize = yysize0;
       YYSIZE_T yysize1;

-      int yysize_overflow = 0;

       enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
       enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };

+      /* Internationalized format string. */
+      const char *yyformat = 0;
+      /* Arguments of yyformat. */

       char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
       char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];

-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-        constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-                   + sizeof yyexpecting - 1
-                   + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-                      * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;

 
       /* Start YYX at -YYN if negative to avoid negative indexes in
 
       /* Start YYX at -YYN if negative to avoid negative indexes in

-        YYCHECK.  */
+        YYCHECK.  In other words, skip the first -YYN actions for this
+        state because they are default actions.  */

       int yyxbegin = yyn < 0 ? -yyn : 0;
 
       /* Stay within bounds of both yycheck and yytname.  */
       int yyxbegin = yyn < 0 ? -yyn : 0;
 
       /* Stay within bounds of both yycheck and yytname.  */

-      int yychecklim = YYLAST - yyn;
+      int yychecklim = YYLAST - yyn + 1;

       int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
       int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;

-      int yycount = 1;
+      /* Number of reported tokens (one for the "unexpected", one per
+         "expected"). */
+      int yycount = 0;
+      int yyx;

 
 

-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
+      yyarg[yycount++] = yytname[yytoken];

 
       for (yyx = yyxbegin; yyx < yyxend; ++yyx)
 
       for (yyx = yyxbegin; yyx < yyxend; ++yyx)

-       if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+       if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+           && !yytable_value_is_error (yytable[yyx + yyn]))

          {
            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
              {
                yycount = 1;
                yysize = yysize0;
          {
            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
              {
                yycount = 1;
                yysize = yysize0;

-               yyformat[sizeof yyunexpected - 1] = '\0';

                break;
              }
            yyarg[yycount++] = yytname[yyx];
            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
                break;
              }
            yyarg[yycount++] = yytname[yyx];
            yysize1 = yysize + yytnamerr (0, yytname[yyx]);

-           yysize_overflow |= (yysize1 < yysize);
+           if (! (yysize <= yysize1
+                  && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+             {
+               /* Overflow.  */
+               *yymsg_alloc = 0;
+               return 2;
+             }

            yysize = yysize1;
            yysize = yysize1;

-           yyfmt = yystpcpy (yyfmt, yyprefix);
-           yyprefix = yyor;

          }
 
          }
 

-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
+      switch (yycount)
+        {
+#define YYCASE_(N, S)                           \
+          case N:                               \
+            yyformat = S;                       \
+          break
+          YYCASE_(1, YY_("syntax error, unexpected %s"));
+          YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+          YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+          YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+          YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+#undef YYCASE_
+        }
+
+      yysize1 = yysize + yystrlen (yyformat);
+      if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+        {
+          /* Overflow.  */
+          *yymsg_alloc = 0;
+          return 2;
+        }

       yysize = yysize1;
 
       yysize = yysize1;
 

-      if (yysize_overflow)
-       return YYSIZE_MAXIMUM;
-
-      if (yyresult)
-       {
-         /* Avoid sprintf, as that infringes on the user's name space.
-            Don't have undefined behavior even if the translation
-            produced a string with the wrong number of "%s"s.  */
-         char *yyp = yyresult;
-         int yyi = 0;
-         while ((*yyp = *yyf) != '\0')
-           {
-             if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-               {
-                 yyp += yytnamerr (yyp, yyarg[yyi++]);
-                 yyf += 2;
-               }
-             else
-               {
-                 yyp++;
-                 yyf++;
-               }
-           }
-       }
-      return yysize;
+      if (*yymsg_alloc < yysize)
+        {
+          *yymsg_alloc = 2 * yysize;
+          if (! (yysize <= *yymsg_alloc
+                 && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+            *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+          return 2;
+        }
+
+      /* Avoid sprintf, as that infringes on the user's name space.
+         Don't have undefined behavior even if the translation
+         produced a string with the wrong number of "%s"s.  */
+      {
+        char *yyp = *yymsg;
+        int yyi = 0;
+        while ((*yyp = *yyformat) != '\0')
+          if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+            {
+              yyp += yytnamerr (yyp, yyarg[yyi++]);
+              yyformat += 2;
+            }
+          else
+            {
+              yyp++;
+              yyformat++;
+            }
+      }
+      return 0;

     }
 }
 #endif /* YYERROR_VERBOSE */
     }
 }
 #endif /* YYERROR_VERBOSE */


@@ -1417,10 +1593,9 @@ 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);


@@ -1436,10 +1611,6 @@ int yyparse ();
 #endif /* ! YYPARSE_PARAM */
 
 
 #endif /* ! YYPARSE_PARAM */
 
 

-
-
-
-

 /*----------.
 | yyparse.  |
 `----------*/
 /*----------.
 | yyparse.  |
 `----------*/


@@ -1466,102 +1637,114 @@ yyparse ()
 #endif
 #endif
 {
 #endif
 #endif
 {

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

 int yychar;
 
 int yychar;
 

-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */

 YYSTYPE yylval;
 
 YYSTYPE yylval;
 

-/* Number of syntax errors so far.  */
-int yynerrs;
-/* Location data for the look-ahead symbol.  */
+/* Location data for the lookahead symbol.  */

 YYLTYPE yylloc;
 
 YYLTYPE yylloc;
 

-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead 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;
+
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;

 
 

-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
+       `yyls': related to locations.

 
 

-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */

 
 

-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;

 
 

-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;

 
 

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

 
 

-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+    /* The locations where the error started and ended.  */
+    YYLTYPE yyerror_range[3];

 
 

-  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
+
+#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL

   /* Initialize the default location before parsing starts.  */
   yylloc.first_line   = yylloc.last_line   = 1;
   /* Initialize the default location before parsing starts.  */
   yylloc.first_line   = yylloc.last_line   = 1;

-  yylloc.first_column = yylloc.last_column = 0;
+  yylloc.first_column = yylloc.last_column = 1;

 #endif
 
 #endif
 

+/* User initialization code.  */

 
 

-  /* User initialization code.  */
-#line 86 "../../src/parse-gram.y"
+/* Line 1280 of yacc.c  */
+#line 85 "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. */

-  boundary_set (&yylloc.start, current_file, 1, 0);
-  boundary_set (&yylloc.end, current_file, 1, 0);
+  boundary_set (&yylloc.start, current_file, 1, 1);
+  boundary_set (&yylloc.end, current_file, 1, 1);

 }
 }

-/* Line 1078 of yacc.c.  */
-#line 1564 "../../src/parse-gram.c"
+
+/* Line 1280 of yacc.c  */
+#line 1746 "parse-gram.c"

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

+

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


@@ -1598,6 +1781,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;


@@ -1619,9 +1803,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);


@@ -1642,6 +1826,9 @@ YYLTYPE yylloc;
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 

+  if (yystate == YYFINAL)
+    YYACCEPT;
+

   goto yybackup;
 
 /*-----------.
   goto yybackup;
 
 /*-----------.


@@ -1650,16 +1837,16 @@ YYLTYPE yylloc;
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a

-     look-ahead token if we need one and don't already have one.  */
+     lookahead token if we need one and don't already have one.  */

 
 

-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */

   yyn = yypact[yystate];
   yyn = yypact[yystate];

-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))

     goto yydefault;
 
     goto yydefault;
 

-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */

 
 

-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */

   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));


@@ -1685,26 +1872,22 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
   yyn = yytable[yyn];
   if (yyn <= 0)
     {

-      if (yyn == 0 || yyn == YYTABLE_NINF)
+      if (yytable_value_is_error (yyn))

        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
 
        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
 

-  if (yyn == YYFINAL)
-    YYACCEPT;
-

   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 

-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */

   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 

-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;

 
   yystate = yyn;
   *++yyvsp = yylval;
 
   yystate = yyn;
   *++yyvsp = yylval;


@@ -1745,309 +1928,565 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-#line 210 "../../src/parse-gram.y"
-    { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])),
-                                                      (yylsp[(1) - (1)])); }
+
+/* Line 1493 of yacc.c  */
+#line 224 "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 212 "../../src/parse-gram.y"
+
+/* Line 1493 of yacc.c  */
+#line 233 "parse-gram.y"

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

-#line 214 "../../src/parse-gram.y"
+
+/* Line 1493 of yacc.c  */
+#line 235 "parse-gram.y"

     {
     {

-      static char one[] = "1";
-      muscle_insert ((yyvsp[(2) - (2)].chars), one);
+      muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars),
+                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);

     }
     break;
 
   case 9:
     }
     break;
 
   case 9:

-#line 218 "../../src/parse-gram.y"
-    { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }
+
+/* Line 1493 of yacc.c  */
+#line 239 "parse-gram.y"
+    { defines_flag = true; }

     break;
 
   case 10:
     break;
 
   case 10:

-#line 219 "../../src/parse-gram.y"
-    { defines_flag = true; }
+
+/* Line 1493 of yacc.c  */
+#line 241 "parse-gram.y"
+    {
+      defines_flag = true;
+      spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
+    }

     break;
 
   case 11:
     break;
 
   case 11:

-#line 220 "../../src/parse-gram.y"
+
+/* Line 1493 of yacc.c  */
+#line 245 "parse-gram.y"

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

-#line 221 "../../src/parse-gram.y"
+
+/* Line 1493 of yacc.c  */
+#line 246 "parse-gram.y"

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

-#line 222 "../../src/parse-gram.y"
+
+/* Line 1493 of yacc.c  */
+#line 247 "parse-gram.y"

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

-#line 223 "../../src/parse-gram.y"
-    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
+
+/* Line 1493 of yacc.c  */
+#line 248 "parse-gram.y"
+    { spec_file_prefix = (yyvsp[(2) - (2)].chars); }

     break;
 
   case 15:
     break;
 
   case 15:

-#line 225 "../../src/parse-gram.y"
-    {
-      nondeterministic_parser = true;
-      glr_parser = true;
-    }
+
+/* Line 1493 of yacc.c  */
+#line 249 "parse-gram.y"
+    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }

     break;
 
   case 16:
     break;
 
   case 16:

-#line 230 "../../src/parse-gram.y"
+
+/* Line 1493 of yacc.c  */
+#line 251 "parse-gram.y"

     {
     {

-      muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
+      nondeterministic_parser = true;
+      glr_parser = true;

     }
     break;
 
   case 17:
     }
     break;
 
   case 17:

-#line 233 "../../src/parse-gram.y"
-    { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+
+/* Line 1493 of yacc.c  */
+#line 256 "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 234 "../../src/parse-gram.y"
-    { locations_flag = true; }
+
+/* Line 1493 of yacc.c  */
+#line 264 "parse-gram.y"
+    { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }

     break;
 
   case 19:
     break;
 
   case 19:

-#line 235 "../../src/parse-gram.y"
-    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
+
+/* Line 1493 of yacc.c  */
+#line 265 "parse-gram.y"
+    { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }

     break;
 
   case 20:
     break;
 
   case 20:

-#line 236 "../../src/parse-gram.y"
-    { no_lines_flag = true; }
+
+/* Line 1493 of yacc.c  */
+#line 266 "parse-gram.y"
+    { locations_flag = true; }

     break;
 
   case 21:
     break;
 
   case 21:

-#line 237 "../../src/parse-gram.y"
-    { nondeterministic_parser = true; }
+
+/* Line 1493 of yacc.c  */
+#line 267 "parse-gram.y"
+    { spec_name_prefix = (yyvsp[(2) - (2)].chars); }

     break;
 
   case 22:
     break;
 
   case 22:

-#line 238 "../../src/parse-gram.y"
-    { spec_outfile = (yyvsp[(3) - (3)].chars); }
+
+/* Line 1493 of yacc.c  */
+#line 268 "parse-gram.y"
+    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }

     break;
 
   case 23:
     break;
 
   case 23:

-#line 239 "../../src/parse-gram.y"
-    { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+
+/* Line 1493 of yacc.c  */
+#line 269 "parse-gram.y"
+    { no_lines_flag = true; }

     break;
 
   case 24:
     break;
 
   case 24:

-#line 240 "../../src/parse-gram.y"
-    { pure_parser = true; }
+
+/* Line 1493 of yacc.c  */
+#line 270 "parse-gram.y"
+    { nondeterministic_parser = true; }

     break;
 
   case 25:
     break;
 
   case 25:

-#line 241 "../../src/parse-gram.y"
-    { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+
+/* Line 1493 of yacc.c  */
+#line 271 "parse-gram.y"
+    { spec_outfile = (yyvsp[(2) - (2)].chars); }

     break;
 
   case 26:
     break;
 
   case 26:

-#line 242 "../../src/parse-gram.y"
-    { skeleton = (yyvsp[(2) - (2)].chars); }
+
+/* Line 1493 of yacc.c  */
+#line 272 "parse-gram.y"
+    { spec_outfile = (yyvsp[(3) - (3)].chars); }

     break;
 
   case 27:
     break;
 
   case 27:

-#line 243 "../../src/parse-gram.y"
-    { token_table_flag = true; }
+
+/* Line 1493 of yacc.c  */
+#line 273 "parse-gram.y"
+    { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }

     break;
 
   case 28:
     break;
 
   case 28:

-#line 244 "../../src/parse-gram.y"
-    { report_flag = report_states; }
+
+/* Line 1493 of yacc.c  */
+#line 275 "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)]), "",
+                                      MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+      /* 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)]), "",
+                                      MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+    }

     break;
 
   case 29:
     break;
 
   case 29:

-#line 245 "../../src/parse-gram.y"
-    { yacc_flag = true; }
+
+/* Line 1493 of yacc.c  */
+#line 289 "parse-gram.y"
+    { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+    break;
+
+  case 30:
+
+/* Line 1493 of yacc.c  */
+#line 291 "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, grammar_prio, (yylsp[(1) - (2)]));
+    }
+    break;
+
+  case 31:
+
+/* Line 1493 of yacc.c  */
+#line 314 "parse-gram.y"
+    { token_table_flag = true; }
+    break;
+
+  case 32:
+
+/* Line 1493 of yacc.c  */
+#line 315 "parse-gram.y"
+    { report_flag |= report_states; }

     break;
 
   case 33:
     break;
 
   case 33:

-#line 253 "../../src/parse-gram.y"
+
+/* Line 1493 of yacc.c  */
+#line 316 "parse-gram.y"
+    { yacc_flag = true; }
+    break;
+
+  case 37:
+
+/* Line 1493 of yacc.c  */
+#line 324 "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:
-#line 257 "../../src/parse-gram.y"
+  case 38:
+
+/* Line 1493 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_destructor_set (list->sym, 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:
-#line 265 "../../src/parse-gram.y"
+  case 39:
+
+/* Line 1493 of yacc.c  */
+#line 335 "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_printer_set (list->sym, 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:
-#line 273 "../../src/parse-gram.y"
+  case 40:
+
+/* Line 1493 of yacc.c  */
+#line 342 "parse-gram.y"

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

-  case 37:
-#line 277 "../../src/parse-gram.y"
+  case 41:
+
+/* Line 1493 of yacc.c  */
+#line 346 "parse-gram.y"

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

-  case 38:
-#line 290 "../../src/parse-gram.y"
+  case 42:
+
+/* Line 1493 of yacc.c  */
+#line 350 "parse-gram.y"
+    {
+      /* Do not invoke muscle_percent_code_grow here since it invokes
+         muscle_user_name_list_grow.  */
+      muscle_code_grow ("percent_code()", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
+      code_scanner_last_string_free ();
+    }
+    break;
+
+  case 43:
+
+/* Line 1493 of yacc.c  */
+#line 357 "parse-gram.y"
+    {
+      muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+      code_scanner_last_string_free ();
+    }
+    break;
+
+  case 44:
+
+/* Line 1493 of yacc.c  */
+#line 371 "parse-gram.y"

     {}
     break;
 
     {}
     break;
 

-  case 39:
-#line 291 "../../src/parse-gram.y"
+  case 45:
+
+/* Line 1493 of yacc.c  */
+#line 372 "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 40:
-#line 296 "../../src/parse-gram.y"
-    {
-      char const *body = (yyvsp[(3) - (3)].chars);
-
-      if (typed)
-       {
-         /* Concatenate the union bodies, turning the first one's
-            trailing '}' into '\n', and omitting the second one's '{'.  */
-         char *code = muscle_find ("stype");
-         code[strlen (code) - 1] = '\n';
-         body++;
-       }
+  case 46:

 
 

-      typed = true;
-      muscle_code_grow ("stype", body, (yylsp[(3) - (3)]));
+/* Line 1493 of yacc.c  */
+#line 377 "parse-gram.y"
+    {
+      union_seen = true;
+      muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+      code_scanner_last_string_free ();

     }
     break;
 
     }
     break;
 

-  case 41:
-#line 317 "../../src/parse-gram.y"
+  case 47:
+
+/* Line 1493 of yacc.c  */
+#line 388 "parse-gram.y"

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

-  case 42:
-#line 318 "../../src/parse-gram.y"
+  case 48:
+
+/* Line 1493 of yacc.c  */
+#line 389 "parse-gram.y"

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

-  case 43:
-#line 322 "../../src/parse-gram.y"
+  case 49:
+
+/* Line 1493 of yacc.c  */
+#line 393 "parse-gram.y"

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

-  case 44:
-#line 323 "../../src/parse-gram.y"
+  case 50:
+
+/* Line 1493 of yacc.c  */
+#line 394 "parse-gram.y"

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

-  case 45:
-#line 328 "../../src/parse-gram.y"
+  case 51:
+
+/* Line 1493 of yacc.c  */
+#line 399 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

+      tag_seen = true;

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

-       symbol_type_set (list->sym, (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]));
+       symbol_type_set (list->content.sym, (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]));

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

-  case 46:
-#line 338 "../../src/parse-gram.y"
+  case 52:
+
+/* Line 1493 of yacc.c  */
+#line 410 "parse-gram.y"

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

-         symbol_type_set (list->sym, current_type, (yylsp[(2) - (3)]));
-         symbol_precedence_set (list->sym, current_prec, (yyvsp[(1) - (3)].assoc), (yylsp[(1) - (3)]));
+         symbol_type_set (list->content.sym, current_type, (yylsp[(2) - (3)]));
+         symbol_precedence_set (list->content.sym, current_prec, (yyvsp[(1) - (3)].assoc), (yylsp[(1) - (3)]));

        }
       symbol_list_free ((yyvsp[(3) - (3)].list));
       current_type = NULL;
     }
     break;
 
        }
       symbol_list_free ((yyvsp[(3) - (3)].list));
       current_type = NULL;
     }
     break;
 

-  case 47:
-#line 352 "../../src/parse-gram.y"
+  case 53:
+
+/* Line 1493 of yacc.c  */
+#line 424 "parse-gram.y"

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

-  case 48:
-#line 353 "../../src/parse-gram.y"
+  case 54:
+
+/* Line 1493 of yacc.c  */
+#line 425 "parse-gram.y"

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

-  case 49:
-#line 354 "../../src/parse-gram.y"
+  case 55:
+
+/* Line 1493 of yacc.c  */
+#line 426 "parse-gram.y"

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

-  case 50:
-#line 358 "../../src/parse-gram.y"
+  case 56:
+
+/* Line 1493 of yacc.c  */
+#line 430 "parse-gram.y"

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

-  case 51:
-#line 359 "../../src/parse-gram.y"
-    { current_type = (yyvsp[(1) - (1)].uniqstr); }
+  case 57:
+
+/* Line 1493 of yacc.c  */
+#line 431 "parse-gram.y"
+    { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }

     break;
 
     break;
 

-  case 52:
-#line 364 "../../src/parse-gram.y"
-    { (yyval.list) = symbol_list_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+  case 58:
+
+/* Line 1493 of yacc.c  */
+#line 437 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }

     break;
 
     break;
 

-  case 53:
-#line 365 "../../src/parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
+  case 59:
+
+/* Line 1493 of yacc.c  */
+#line 439 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }

     break;
 
     break;
 

-  case 54:
-#line 371 "../../src/parse-gram.y"
+  case 60:
+
+/* Line 1493 of yacc.c  */
+#line 443 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+    break;
+
+  case 61:
+
+/* Line 1493 of yacc.c  */
+#line 444 "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 1493 of yacc.c  */
+#line 450 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+    break;
+
+  case 63:
+
+/* Line 1493 of yacc.c  */
+#line 452 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
+    break;
+
+  case 64:
+
+/* Line 1493 of yacc.c  */
+#line 456 "parse-gram.y"
+    { (yyval.list) = (yyvsp[(1) - (1)].list); }
+    break;
+
+  case 65:
+
+/* Line 1493 of yacc.c  */
+#line 457 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+    break;
+
+  case 66:
+
+/* Line 1493 of yacc.c  */
+#line 461 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+    break;
+
+  case 67:
+
+/* Line 1493 of yacc.c  */
+#line 462 "parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+    break;
+
+  case 68:
+
+/* Line 1493 of yacc.c  */
+#line 463 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+    break;
+
+  case 69:
+
+/* Line 1493 of yacc.c  */
+#line 464 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+    break;
+
+  case 70:
+
+/* Line 1493 of yacc.c  */
+#line 470 "parse-gram.y"

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

+       tag_seen = true;

      }
     break;
 
      }
     break;
 

-  case 55:
-#line 375 "../../src/parse-gram.y"
+  case 71:
+
+/* Line 1493 of yacc.c  */
+#line 475 "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 56:
-#line 380 "../../src/parse-gram.y"
+  case 72:
+
+/* Line 1493 of yacc.c  */
+#line 480 "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)]));


@@ -2055,8 +2494,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 57:
-#line 386 "../../src/parse-gram.y"
+  case 73:
+
+/* Line 1493 of yacc.c  */
+#line 486 "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)]));


@@ -2064,8 +2505,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 58:
-#line 392 "../../src/parse-gram.y"
+  case 74:
+
+/* Line 1493 of yacc.c  */
+#line 492 "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)]));


@@ -2074,105 +2517,195 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 65:
-#line 422 "../../src/parse-gram.y"
+  case 81:
+
+/* Line 1493 of yacc.c  */
+#line 522 "parse-gram.y"

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

-  case 66:
-#line 428 "../../src/parse-gram.y"
-    { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
+  case 82:
+
+/* Line 1493 of yacc.c  */
+#line 528 "parse-gram.y"
+    { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]);
+    current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); }

     break;
 
     break;
 

-  case 68:
-#line 432 "../../src/parse-gram.y"
+  case 84:
+
+/* Line 1493 of yacc.c  */
+#line 533 "parse-gram.y"

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

-  case 69:
-#line 433 "../../src/parse-gram.y"
+  case 85:
+
+/* Line 1493 of yacc.c  */
+#line 534 "parse-gram.y"

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

-  case 71:
-#line 439 "../../src/parse-gram.y"
-    { grammar_current_rule_begin (current_lhs, current_lhs_location); }
+  case 87:
+
+/* Line 1493 of yacc.c  */
+#line 540 "parse-gram.y"
+    { grammar_current_rule_begin (current_lhs, current_lhs_location,
+                                 current_lhs_named_ref); }

     break;
 
     break;
 

-  case 72:
-#line 441 "../../src/parse-gram.y"
-    { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
+  case 88:
+
+/* Line 1493 of yacc.c  */
+#line 543 "parse-gram.y"
+    { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }

     break;
 
     break;
 

-  case 73:
-#line 443 "../../src/parse-gram.y"
-    { grammar_current_rule_action_append (gram_last_string,
-                                         gram_last_braced_code_loc); }
+  case 89:
+
+/* Line 1493 of yacc.c  */
+#line 545 "parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }

     break;
 
     break;
 

-  case 74:
-#line 446 "../../src/parse-gram.y"
+  case 90:
+
+/* Line 1493 of yacc.c  */
+#line 547 "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 75:
-#line 448 "../../src/parse-gram.y"
+  case 91:
+
+/* Line 1493 of yacc.c  */
+#line 549 "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 76:
-#line 450 "../../src/parse-gram.y"
+  case 92:
+
+/* Line 1493 of yacc.c  */
+#line 551 "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 77:
-#line 462 "../../src/parse-gram.y"
-    { (yyval.symbol) = symbol_get ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 93:
+
+/* Line 1493 of yacc.c  */
+#line 555 "parse-gram.y"
+    { (yyval.named_ref) = 0; }
+    break;
+
+  case 94:
+
+/* Line 1493 of yacc.c  */
+#line 557 "parse-gram.y"
+    { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }

     break;
 
     break;
 

-  case 78:
-#line 463 "../../src/parse-gram.y"
-    { char cp[4] = { '\'', (yyvsp[(1) - (1)].character), '\'', 0 };
-                    (yyval.symbol) = symbol_get (quotearg_style (escape_quoting_style, cp),
-                                    (yylsp[(1) - (1)]));
-                   symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
-                   symbol_user_token_number_set ((yyval.symbol), (yyvsp[(1) - (1)].character), (yylsp[(1) - (1)]));
-                  }
+  case 96:
+
+/* Line 1493 of yacc.c  */
+#line 569 "parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }

     break;
 
     break;
 

-  case 79:
-#line 472 "../../src/parse-gram.y"
-    { (yyval.symbol) = symbol_get ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 97:
+
+/* Line 1493 of yacc.c  */
+#line 574 "parse-gram.y"
+    { (yyval.chars) = ""; }

     break;
 
     break;
 

-  case 82:
-#line 484 "../../src/parse-gram.y"
+  case 98:
+
+/* Line 1493 of yacc.c  */
+#line 575 "parse-gram.y"
+    { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); }
+    break;
+
+  case 100:
+
+/* Line 1493 of yacc.c  */
+#line 586 "parse-gram.y"

     {
     {

-      (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (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;
+
+  case 101:
+
+/* Line 1493 of yacc.c  */
+#line 606 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+    break;
+
+  case 102:
+
+/* Line 1493 of yacc.c  */
+#line 608 "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);
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);

+      symbol_user_token_number_set ((yyval.symbol), (yyvsp[(1) - (1)].character), (yylsp[(1) - (1)]));

     }
     break;
 
     }
     break;
 

-  case 83:
-#line 493 "../../src/parse-gram.y"
-    { (yyval.chars) = (yyvsp[(1) - (1)].chars); }
+  case 103:
+
+/* Line 1493 of yacc.c  */
+#line 616 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }

     break;
 
     break;
 

-  case 85:
-#line 500 "../../src/parse-gram.y"
+  case 106:
+
+/* Line 1493 of yacc.c  */
+#line 628 "parse-gram.y"

     {
     {

-      muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
+      (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 108:
+
+/* Line 1493 of yacc.c  */
+#line 637 "parse-gram.y"
+    {
+      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 1267 of yacc.c.  */
-#line 2174 "../../src/parse-gram.c"
+
+/* Line 1493 of yacc.c  */
+#line 2696 "parse-gram.c"

       default: break;
     }
       default: break;
     }

+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */

   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);


@@ -2201,6 +2734,10 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:

+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = YYTRANSLATE (yychar);
+

   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {


@@ -2208,45 +2745,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else

-      {
-       YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-       if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-         {
-           YYSIZE_T yyalloc = 2 * yysize;
-           if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-             yyalloc = YYSTACK_ALLOC_MAXIMUM;
-           if (yymsg != yymsgbuf)
-             YYSTACK_FREE (yymsg);
-           yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-           if (yymsg)
-             yymsg_alloc = yyalloc;
-           else
-             {
-               yymsg = yymsgbuf;
-               yymsg_alloc = sizeof yymsgbuf;
-             }
-         }
-
-       if (0 < yysize && yysize <= yymsg_alloc)
-         {
-           (void) yysyntax_error (yymsg, yystate, yychar);
-           yyerror (yymsg);
-         }
-       else
-         {
-           yyerror (YY_("syntax error"));
-           if (yysize != 0)
-             goto yyexhaustedlab;
-         }
-      }
+      while (1)
+        {
+          int yysyntax_error_status =
+            yysyntax_error (&yymsg_alloc, &yymsg, yystate, yytoken);
+          if (yysyntax_error_status == 2 && 0 < yymsg_alloc)
+            {
+              if (yymsg != yymsgbuf)
+                YYSTACK_FREE (yymsg);
+              yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+              if (yymsg)
+                continue;
+              yymsg = yymsgbuf;
+              yymsg_alloc = sizeof yymsgbuf;
+            }
+          if (yysyntax_error_status == 0)
+            yyerror (yymsg);
+          else
+            yyerror (YY_("syntax error"));
+          if (yysyntax_error_status == 2)
+            goto yyexhaustedlab;
+          break;
+        }

 #endif
     }
 
 #endif
     }
 

-  yyerror_range[0] = yylloc;
+  yyerror_range[1] = yylloc;

 
   if (yyerrstatus == 3)
     {
 
   if (yyerrstatus == 3)
     {

-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an

         error, discard it.  */
 
       if (yychar <= YYEOF)
         error, discard it.  */
 
       if (yychar <= YYEOF)


@@ -2263,7 +2791,7 @@ yyerrlab:
        }
     }
 
        }
     }
 

-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error

      token.  */
   goto yyerrlab1;
 
      token.  */
   goto yyerrlab1;
 


@@ -2279,7 +2807,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 

-  yyerror_range[0] = yylsp[1-yylen];
+  yyerror_range[1] = yylsp[1-yylen];

   /* Do not reclaim the symbols of the rule which action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   /* Do not reclaim the symbols of the rule which action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);


@@ -2298,7 +2826,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
   for (;;)
     {
       yyn = yypact[yystate];

-      if (yyn != YYPACT_NINF)
+      if (!yypact_value_is_default (yyn))

        {
          yyn += YYTERROR;
          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
        {
          yyn += YYTERROR;
          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)


@@ -2313,7 +2841,7 @@ yyerrlab1:
       if (yyssp == yyss)
        YYABORT;
 
       if (yyssp == yyss)
        YYABORT;
 

-      yyerror_range[0] = *yylsp;
+      yyerror_range[1] = *yylsp;

       yydestruct ("Error: popping",
                  yystos[yystate], yyvsp, yylsp);
       YYPOPSTACK (1);
       yydestruct ("Error: popping",
                  yystos[yystate], yyvsp, yylsp);
       YYPOPSTACK (1);


@@ -2321,15 +2849,12 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
       YY_STACK_PRINT (yyss, yyssp);
     }
 

-  if (yyn == YYFINAL)
-    YYACCEPT;
-

   *++yyvsp = yylval;
 
   *++yyvsp = yylval;
 

-  yyerror_range[1] = yylloc;
+  yyerror_range[2] = yylloc;

   /* Using YYLLOC is tempting, but would change the location of
   /* Using YYLLOC is tempting, but would change the location of

-     the look-ahead.  YYLOC is available though.  */
-  YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
+     the lookahead.  YYLOC is available though.  */
+  YYLLOC_DEFAULT (yyloc, yyerror_range, 2);

   *++yylsp = yyloc;
 
   /* Shift the error token.  */
   *++yylsp = yyloc;
 
   /* Shift the error token.  */


@@ -2353,7 +2878,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.  |
 `-------------------------------------------------*/


@@ -2364,9 +2889,14 @@ yyexhaustedlab:
 #endif
 
 yyreturn:
 #endif
 
 yyreturn:

-  if (yychar != YYEOF && yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-                yytoken, &yylval, &yylloc);
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval, &yylloc);
+    }

   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);


@@ -2385,11 +2915,14 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif

-  return yyresult;
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);

 }
 
 
 }
 
 

-#line 506 "../../src/parse-gram.y"
+
+/* Line 1724 of yacc.c  */
+#line 647 "parse-gram.y"

 
 
 
 
 
 


@@ -2474,6 +3007,7 @@ add_param (char const *type, char *decl, location loc)
   gram_scanner_last_string_free ();
 }
 
   gram_scanner_last_string_free ();
 }
 

+

 static void
 version_check (location const *loc, char const *version)
 {
 static void
 version_check (location const *loc, char const *version)
 {


@@ -2497,3 +3031,16 @@ token_name (int type)
   return yytname[YYTRANSLATE (type)];
 }
 
   return yytname[YYTRANSLATE (type)];
 }
 

+static char const *
+char_name (char c)
+{
+  if (c == '\'')
+    return "'\\''";
+  else
+    {
+      char buf[4];
+      buf[0] = '\''; buf[1] = c; buf[2] = '\''; buf[3] = '\0';
+      return quotearg_style (escape_quoting_style, buf);
+    }
+}
+