Locations are no longer required by lalr1.cc.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index c1f4bfb6d174d11eed8a0f053f8bf3353fb7adf4..4622f1f0607b95418f1289528339aee4d4085888 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,12 +1,14 @@
-/* A Bison parser, made by GNU Bison 2.1a.  */
+/* A Bison parser, made by GNU Bison 2.4.79-c85be.  */

 
 

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

 
 

-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008 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
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of


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

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

 
 

-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   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.  */

 
 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */
 
 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */


@@ -37,7 +45,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
 #define YYBISON 1
 
 /* Bison version.  */

-#define YYBISON_VERSION "2.1a"
+#define YYBISON_VERSION "2.4.79-c85be"

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


@@ -45,143 +53,39 @@
 /* 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_UNION = 265,
-     PERCENT_LEFT = 266,
-     PERCENT_RIGHT = 267,
-     PERCENT_NONASSOC = 268,
-     PERCENT_PREC = 269,
-     PERCENT_DPREC = 270,
-     PERCENT_MERGE = 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_LEX_PARAM = 282,
-     PERCENT_LOCATIONS = 283,
-     PERCENT_NAME_PREFIX = 284,
-     PERCENT_NO_DEFAULT_PREC = 285,
-     PERCENT_NO_LINES = 286,
-     PERCENT_NONDETERMINISTIC_PARSER = 287,
-     PERCENT_OUTPUT = 288,
-     PERCENT_PARSE_PARAM = 289,
-     PERCENT_PURE_PARSER = 290,
-     PERCENT_REQUIRE = 291,
-     PERCENT_SKELETON = 292,
-     PERCENT_START = 293,
-     PERCENT_TOKEN_TABLE = 294,
-     PERCENT_VERBOSE = 295,
-     PERCENT_YACC = 296,
-     TYPE = 297,
-     EQUAL = 298,
-     SEMICOLON = 299,
-     PIPE = 300,
-     ID = 301,
-     ID_COLON = 302,
-     PERCENT_PERCENT = 303,
-     PROLOGUE = 304,
-     EPILOGUE = 305,
-     BRACED_CODE = 306
-   };
-#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_UNION 265
-#define PERCENT_LEFT 266
-#define PERCENT_RIGHT 267
-#define PERCENT_NONASSOC 268
-#define PERCENT_PREC 269
-#define PERCENT_DPREC 270
-#define PERCENT_MERGE 271
-#define PERCENT_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_LEX_PARAM 282
-#define PERCENT_LOCATIONS 283
-#define PERCENT_NAME_PREFIX 284
-#define PERCENT_NO_DEFAULT_PREC 285
-#define PERCENT_NO_LINES 286
-#define PERCENT_NONDETERMINISTIC_PARSER 287
-#define PERCENT_OUTPUT 288
-#define PERCENT_PARSE_PARAM 289
-#define PERCENT_PURE_PARSER 290
-#define PERCENT_REQUIRE 291
-#define PERCENT_SKELETON 292
-#define PERCENT_START 293
-#define PERCENT_TOKEN_TABLE 294
-#define PERCENT_VERBOSE 295
-#define PERCENT_YACC 296
-#define TYPE 297
-#define EQUAL 298
-#define SEMICOLON 299
-#define PIPE 300
-#define ID 301
-#define ID_COLON 302
-#define PERCENT_PERCENT 303
-#define PROLOGUE 304
-#define EPILOGUE 305
-#define BRACED_CODE 306
-
-
-
+#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 191 of yacc.c  */

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

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

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

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

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

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

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


@@ -190,10 +94,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"


@@ -204,11 +105,11 @@
 #include "getargs.h"
 #include "gram.h"
 #include "muscle_tab.h"
 #include "getargs.h"
 #include "gram.h"
 #include "muscle_tab.h"

-#include "output.h"

 #include "quotearg.h"
 #include "reader.h"
 #include "symlist.h"
 #include "quotearg.h"
 #include "reader.h"
 #include "symlist.h"

-#include "strverscmp.h"
+#include "scan-gram.h"
+#include "scan-code.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);


@@ -225,27 +126,31 @@ 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 int current_prec = 0;
 
 static symbol *current_lhs;
 static location current_lhs_location;
 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 191 of yacc.c  */
+#line 154 "../../../src/parse-gram.c"

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


@@ -265,23 +170,156 @@ 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_PRECEDENCE = 268,
+     PERCENT_PREC = 269,
+     PERCENT_DPREC = 270,
+     PERCENT_MERGE = 271,
+     PERCENT_CODE = 272,
+     PERCENT_DEBUG = 273,
+     PERCENT_DEFAULT_PREC = 274,
+     PERCENT_DEFINE = 275,
+     PERCENT_DEFINES = 276,
+     PERCENT_ERROR_VERBOSE = 277,
+     PERCENT_EXPECT = 278,
+     PERCENT_EXPECT_RR = 279,
+     PERCENT_FILE_PREFIX = 280,
+     PERCENT_GLR_PARSER = 281,
+     PERCENT_INITIAL_ACTION = 282,
+     PERCENT_LANGUAGE = 283,
+     PERCENT_LEX_PARAM = 284,
+     PERCENT_LOCATIONS = 285,
+     PERCENT_NAME_PREFIX = 286,
+     PERCENT_NO_DEFAULT_PREC = 287,
+     PERCENT_NO_LINES = 288,
+     PERCENT_NONDETERMINISTIC_PARSER = 289,
+     PERCENT_OUTPUT = 290,
+     PERCENT_PARSE_PARAM = 291,
+     PERCENT_PURE_PARSER = 292,
+     PERCENT_REQUIRE = 293,
+     PERCENT_SKELETON = 294,
+     PERCENT_START = 295,
+     PERCENT_TOKEN_TABLE = 296,
+     PERCENT_VERBOSE = 297,
+     PERCENT_YACC = 298,
+     BRACED_CODE = 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_PRECEDENCE 268
+#define PERCENT_PREC 269
+#define PERCENT_DPREC 270
+#define PERCENT_MERGE 271
+#define PERCENT_CODE 272
+#define PERCENT_DEBUG 273
+#define PERCENT_DEFAULT_PREC 274
+#define PERCENT_DEFINE 275
+#define PERCENT_DEFINES 276
+#define PERCENT_ERROR_VERBOSE 277
+#define PERCENT_EXPECT 278
+#define PERCENT_EXPECT_RR 279
+#define PERCENT_FILE_PREFIX 280
+#define PERCENT_GLR_PARSER 281
+#define PERCENT_INITIAL_ACTION 282
+#define PERCENT_LANGUAGE 283
+#define PERCENT_LEX_PARAM 284
+#define PERCENT_LOCATIONS 285
+#define PERCENT_NAME_PREFIX 286
+#define PERCENT_NO_DEFAULT_PREC 287
+#define PERCENT_NO_LINES 288
+#define PERCENT_NONDETERMINISTIC_PARSER 289
+#define PERCENT_OUTPUT 290
+#define PERCENT_PARSE_PARAM 291
+#define PERCENT_PURE_PARSER 292
+#define PERCENT_REQUIRE 293
+#define PERCENT_SKELETON 294
+#define PERCENT_START 295
+#define PERCENT_TOKEN_TABLE 296
+#define PERCENT_VERBOSE 297
+#define PERCENT_YACC 298
+#define BRACED_CODE 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 "parse-gram.y"

 {
 {

+
+/* Line 216 of yacc.c  */
+#line 92 "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;
   assoc assoc;
   uniqstr uniqstr;

-}
-/* Line 198 of yacc.c.  */
-#line 281 "parse-gram.c"
-       YYSTYPE;
+  unsigned char character;
+
+
+
+/* Line 216 of yacc.c  */
+#line 319 "../../../src/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


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

-/* Line 221 of yacc.c.  */
-#line 306 "parse-gram.c"
+/* Line 266 of yacc.c  */
+#line 344 "../../../src/parse-gram.c"

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


@@ -377,14 +415,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
 


@@ -432,8 +470,13 @@ YYID (i)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif

-#  ifdef __cplusplus
-extern "C" {
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+            && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif

 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc


@@ -449,9 +492,6 @@ void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif

-#  ifdef __cplusplus
-}
-#  endif

 # endif
 #endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
 # endif
 #endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 


@@ -464,9 +504,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.  */


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


@@ -517,20 +557,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   161
+#define YYLAST   203

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

-#define YYNTOKENS  52
+#define YYNTOKENS  58

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

-#define YYNNTS  25
+#define YYNNTS  33

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

-#define YYNRULES  81
+#define YYNRULES  106

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

-#define YYNSTATES  110
+#define YYNSTATES  144

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

-#define YYMAXUTOK   306
+#define YYMAXUTOK   312

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


@@ -568,63 +608,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
+      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,    43,    45,    47,
-      51,    53,    55,    59,    61,    63,    66,    69,    71,    73,
-      75,    77,    79,    81,    84,    86,    89,    92,    94,    96,
-      97,   101,   102,   106,   110,   114,   116,   118,   120,   121,
-     123,   125,   128,   130,   132,   135,   138,   142,   144,   147,
-     149,   152,   154,   157,   160,   161,   165,   167,   171,   174,
-     175,   178,   181,   185,   189,   193,   195,   197,   199,   201,
-     203,   204
+       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,   151,   152,   154,
+     156,   159,   161,   164,   166,   169,   171,   174,   176,   178,
+     180,   182,   184,   186,   189,   192,   196,   198,   201,   203,
+     206,   208,   211,   214,   215,   219,   221,   225,   228,   229,
+     232,   235,   239,   243,   247,   249,   251,   252,   254,   256,
+     258,   260,   262,   264,   266,   268,   269

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

-      53,     0,    -1,    54,    48,    66,    76,    -1,    -1,    54,
-      55,    -1,    56,    -1,    49,    -1,    17,    -1,    19,    75,
-      -1,    19,    75,    75,    -1,    20,    -1,    21,    -1,    22,
-       4,    -1,    23,     4,    -1,    24,    43,    75,    -1,    25,
-      -1,    26,    -1,    27,    -1,    28,    -1,    29,    43,    75,
-      -1,    31,    -1,    32,    -1,    33,    43,    75,    -1,    34,
-      -1,    35,    -1,    36,    75,    -1,    37,    75,    -1,    39,
-      -1,    40,    -1,    41,    -1,    44,    -1,    60,    -1,    57,
-      -1,    38,    72,    -1,    10,    -1,     8,    63,    -1,     9,
-      63,    -1,    18,    -1,    30,    -1,    -1,     6,    58,    65,
-      -1,    -1,     5,    59,    65,    -1,     7,    42,    63,    -1,
-      61,    62,    63,    -1,    11,    -1,    12,    -1,    13,    -1,
-      -1,    42,    -1,    72,    -1,    63,    72,    -1,    42,    -1,
-      46,    -1,    46,     4,    -1,    46,    74,    -1,    46,     4,
-      74,    -1,    64,    -1,    65,    64,    -1,    67,    -1,    66,
-      67,    -1,    68,    -1,    56,    44,    -1,     1,    44,    -1,
-      -1,    47,    69,    70,    -1,    71,    -1,    70,    45,    71,
-      -1,    70,    44,    -1,    -1,    71,    72,    -1,    71,    73,
-      -1,    71,    14,    72,    -1,    71,    15,     4,    -1,    71,
-      16,    42,    -1,    46,    -1,    74,    -1,    51,    -1,     3,
-      -1,     3,    -1,    -1,    48,    50,    -1
+      59,     0,    -1,    60,    50,    77,    90,    -1,    -1,    60,
+      61,    -1,    62,    -1,    52,    -1,    18,    -1,    20,    83,
+      84,    -1,    21,    -1,    21,     3,    -1,    22,    -1,    23,
+       4,    -1,    24,     4,    -1,    25,     3,    -1,    25,    47,
+       3,    -1,    26,    -1,    27,    44,    -1,    28,     3,    -1,
+      29,    44,    -1,    30,    -1,    31,     3,    -1,    31,    47,
+       3,    -1,    33,    -1,    34,    -1,    35,     3,    -1,    35,
+      47,     3,    -1,    36,    44,    -1,    37,    -1,    38,     3,
+      -1,    39,     3,    -1,    41,    -1,    42,    -1,    43,    -1,
+      53,    -1,    67,    -1,    64,    -1,    40,    88,    -1,     8,
+      44,    73,    -1,     9,    44,    73,    -1,    19,    -1,    32,
+      -1,    17,    85,    -1,    17,    48,    85,    -1,    -1,    48,
+      -1,    57,    63,    85,    -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,    13,
+      -1,    -1,    54,    -1,    71,    -1,    70,    71,    -1,    88,
+      -1,    88,     4,    -1,    88,    -1,    72,    88,    -1,    74,
+      -1,    73,    74,    -1,    88,    -1,    54,    -1,    55,    -1,
+      56,    -1,    54,    -1,    86,    -1,    86,     4,    -1,    86,
+      89,    -1,    86,     4,    89,    -1,    75,    -1,    76,    75,
+      -1,    78,    -1,    77,    78,    -1,    79,    -1,    62,    53,
+      -1,     1,    53,    -1,    -1,    87,    80,    81,    -1,    82,
+      -1,    81,    51,    82,    -1,    81,    53,    -1,    -1,    82,
+      88,    -1,    82,    44,    -1,    82,    14,    88,    -1,    82,
+      15,     4,    -1,    82,    16,    54,    -1,    48,    -1,     3,
+      -1,    -1,     3,    -1,    44,    -1,    48,    -1,    45,    -1,
+      49,    -1,    86,    -1,    89,    -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,   205,   205,   213,   215,   219,   220,   221,   222,   227,
-     228,   229,   230,   231,   232,   233,   238,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,   259,   260,   261,   265,   281,   288,   295,   299,   306,
-     306,   311,   311,   316,   326,   341,   342,   343,   347,   348,
-     354,   355,   360,   364,   369,   375,   381,   392,   393,   402,
-     403,   409,   410,   411,   418,   418,   422,   423,   424,   429,
-     430,   432,   434,   436,   438,   443,   444,   448,   454,   463,
-     468,   470
+       0,   203,   203,   211,   213,   217,   218,   228,   229,   233,
+     234,   239,   240,   241,   242,   243,   244,   249,   258,   259,
+     260,   261,   262,   263,   264,   265,   266,   267,   268,   281,
+     282,   306,   307,   308,   309,   313,   314,   315,   319,   326,
+     333,   337,   341,   348,   363,   364,   368,   380,   380,   385,
+     385,   390,   401,   416,   417,   418,   419,   423,   424,   429,
+     431,   436,   437,   442,   444,   449,   450,   454,   455,   456,
+     457,   462,   467,   472,   478,   484,   495,   496,   505,   506,
+     512,   513,   514,   521,   521,   525,   526,   527,   532,   533,
+     535,   537,   539,   541,   551,   552,   558,   561,   570,   590,
+     592,   601,   606,   607,   612,   619,   621

 };
 #endif
 
 };
 #endif
 


@@ -634,24 +686,27 @@ static const yytype_uint16 yyrline[] =
 static const char *const yytname[] =
 {
   "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
 static const char *const yytname[] =
 {
   "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",

-  "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor {...}\"",
-  "\"%printer {...}\"", "\"%union {...}\"", "\"%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\"", "\"type\"", "\"=\"",
-  "\";\"", "\"|\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
-  "\"%{...%}\"", "\"epilogue\"", "\"{...}\"", "$accept", "input",
-  "declarations", "declaration", "grammar_declaration",
-  "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", "symbol", "action", "string_as_id",
-  "string_content", "epilogue.opt", 0
+  "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
+  "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"",
+  "\"%precedence\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",
+  "\"%debug\"", "\"%default-prec\"", "\"%define\"", "\"%defines\"",
+  "\"%error-verbose\"", "\"%expect\"", "\"%expect-rr\"",
+  "\"%file-prefix\"", "\"%glr-parser\"", "\"%initial-action\"",
+  "\"%language\"", "\"%lex-param\"", "\"%locations\"", "\"%name-prefix\"",
+  "\"%no-default-prec\"", "\"%no-lines\"", "\"%nondeterministic-parser\"",
+  "\"%output\"", "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"",
+  "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"",
+  "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"",
+  "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"",
+  "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", "\"%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",
+  "variable", "content.opt", "braceless", "id", "id_colon", "symbol",
+  "string_as_id", "epilogue.opt", 0

 };
 #endif
 
 };
 #endif
 


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

-     305,   306
+     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,    52,    53,    54,    54,    55,    55,    55,    55,    55,
-      55,    55,    55,    55,    55,    55,    55,    55,    55,    55,
-      55,    55,    55,    55,    55,    55,    55,    55,    55,    55,
-      55,    56,    56,    56,    56,    56,    56,    56,    56,    58,
-      57,    59,    57,    57,    60,    61,    61,    61,    62,    62,
-      63,    63,    64,    64,    64,    64,    64,    65,    65,    66,
-      66,    67,    67,    67,    69,    68,    70,    70,    70,    71,
-      71,    71,    71,    71,    71,    72,    72,    73,    74,    75,
-      76,    76
+       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,    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,    86,
+      86,    87,    88,    88,    89,    90,    90

 };
 
 /* 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,     1,     1,     1,     3,
-       1,     1,     3,     1,     1,     2,     2,     1,     1,     1,
-       1,     1,     1,     2,     1,     2,     2,     1,     1,     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,
-       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,     1,     0,     1,     1,
+       2,     1,     2,     1,     2,     1,     2,     1,     1,     1,
+       1,     1,     1,     2,     2,     3,     1,     2,     1,     2,
+       1,     2,     2,     0,     3,     1,     3,     2,     0,     2,
+       2,     3,     3,     3,     1,     1,     0,     1,     1,     1,
+       1,     1,     1,     1,     1,     0,     2

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


@@ -702,115 +761,137 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {

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

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

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

 {
 {

-      -1,     1,     2,    41,    67,    43,    47,    46,    44,    45,
-      72,    51,    75,    76,    68,    69,    70,    85,    94,    95,
-      52,   105,    53,    56,    89
+      -1,     1,     2,    44,    83,    89,    46,    50,    49,    47,
+      48,    91,   119,   120,    97,   102,   103,    93,    94,    84,
+      85,    86,   117,   128,   129,    59,   108,    56,    78,    87,
+     104,    80,   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 -69
-static const yytype_int8 yypact[] =
+#define YYPACT_NINF -81
+static const yytype_int16 yypact[] =

 {
 {

-     -69,     5,   112,   -69,   -69,   -69,   -35,     0,     0,   -69,
-     -69,   -69,   -69,   -69,   -69,    13,   -69,   -69,    20,    31,
-     -18,   -69,   -69,   -69,   -69,    -6,   -69,   -69,   -69,    -5,
-     -69,   -69,    13,    13,     0,   -69,   -69,   -69,   -69,    69,
-     -69,   -69,   -69,   -69,   -69,    -2,   -38,   -38,     0,   -69,
-     -69,     0,   -69,   -69,     0,   -69,    13,   -69,   -69,    13,
-      13,    13,   -69,   -69,   -69,    -8,   -69,     3,    21,   -69,
-     -69,   -69,     0,   -69,     6,   -69,   -38,   -38,     0,   -69,
-     -69,   -69,   -69,   -69,   -69,   -69,   -69,     2,   -69,   -69,
-       0,    39,   -69,   -69,   -33,    -1,   -69,   -69,   -69,   -69,
-       0,    44,     1,   -69,   -69,   -69,    -1,   -69,   -69,   -69
+     -81,    23,   111,   -81,   -81,   -81,   -28,   -12,    -8,   -81,
+     -81,   -81,   -81,   -13,   -81,   -81,    14,    43,   -81,    48,
+      49,     2,   -81,    10,    53,    34,   -81,    13,   -81,   -81,
+     -81,    26,    36,   -81,    54,    78,     0,   -81,   -81,   -81,
+      58,   -81,   -81,    41,   -81,   -81,   -81,   -81,    28,   -24,
+     -24,     0,    31,    31,   -81,    44,   -81,   -81,   -81,    81,
+     -81,   -81,   -81,   -81,    88,   -81,   -81,   -81,   -81,    89,
+     -81,    91,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
+     -81,    42,   -81,    47,     1,   -81,   -81,   -81,   -81,    44,
+     -81,     0,   -81,   -81,   -24,    40,   -24,     0,   -81,   -81,
+     -81,   -81,    31,   -81,   -81,    31,   -81,   -81,   -81,   -81,
+     -81,   -81,   -81,   -81,    50,   -81,   -81,   -81,   -81,     0,
+     -81,    93,   -81,    98,   -81,   -81,   -81,   -81,   -14,   155,
+     -81,   -81,   -81,   -81,   -81,     0,    99,    51,   -81,   -81,
+     155,   -81,   -81,   -81

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

-     -69,   -69,   -69,   -69,    47,   -69,   -69,   -69,   -69,   -69,
-     -69,    -7,   -58,     7,   -69,   -15,   -69,   -69,   -69,   -44,
-     -34,   -69,   -68,    30,   -69
+     -81,   -81,   -81,   -81,   100,   -81,   -81,   -81,   -81,   -81,
+     -81,   -81,   -81,   -11,   -81,    56,   -80,   -54,    60,   -81,
+      22,   -81,   -81,   -81,   -21,   -81,   -81,   -51,   -22,   -81,
+     -36,   -76,   -81

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

-#define YYTABLE_NINF -81
-static const yytype_int8 yytable[] =
+#define YYTABLE_NINF -106
+static const yytype_int16 yytable[] =

 {
 {

-      64,    54,    49,    49,    73,     3,    92,    48,    74,    49,
-      91,    98,    99,   100,   101,   102,    55,    79,    93,    93,
-      79,   -80,    65,    97,    57,    59,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    58,    84,    60,    61,    14,
-      71,    78,    49,   109,    79,    50,    50,    86,   108,    42,
-     103,    26,    96,    88,    77,   106,    79,     0,     0,    34,
-       0,   104,    62,    63,     0,    90,   107,     0,    66,    87,
-      65,     0,   104,     0,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,     0,     0,     0,    80,    14,     0,    81,
-      82,    83,     0,     0,     0,     0,     0,     0,     0,    26,
-       0,     0,     0,     0,     0,     0,     0,    34,     0,     0,
-       0,     0,     0,     0,     0,     0,    66,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,     0,     0,     0,    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,     0,     0,    38,     0,     0,     0,
-      39,    40
+      79,  -105,    81,    75,   106,    63,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    98,    68,    57,    13,   124,
+      15,    76,   126,     3,    77,   126,    51,    95,    95,    70,
+      92,    54,    52,    28,    75,    55,    53,   133,   118,   134,
+     122,    36,   122,    75,   123,    76,    60,   132,    77,    64,
+      82,   114,    61,    62,    65,   121,    66,    73,    43,    81,
+      69,   125,    58,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    95,    71,    95,    13,    76,    15,    67,    77,
+      72,    74,    90,   121,   107,    99,   100,   101,    54,    88,
+      28,   109,   110,   139,   111,   112,   127,   131,    36,   141,
+     113,    75,    45,   142,   139,   143,   115,    82,   130,   105,
+      96,     0,   140,     0,     0,    43,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,     0,     0,     0,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,     0,     0,     0,    75,     0,
+       0,    40,     0,    41,    42,     0,     0,     0,    43,   135,
+     136,   137,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   138,
+      76,     0,     0,    77

 };
 
 };
 

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

 {
 {

-      34,     8,     3,     3,    42,     0,    74,    42,    46,     3,
-       4,    44,    45,    14,    15,    16,     3,    51,    76,    77,
-      54,     0,     1,    91,     4,    43,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,     4,    44,    43,    43,    18,
-      42,    48,     3,    42,    78,    46,    46,    44,     4,     2,
-      51,    30,    50,    68,    47,    99,    90,    -1,    -1,    38,
-      -1,    95,    32,    33,    -1,    72,   100,    -1,    47,    48,
-       1,    -1,   106,    -1,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    -1,    -1,    -1,    56,    18,    -1,    59,
-      60,    61,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    47,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,    -1,    -1,    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,    -1,    -1,    44,    -1,    -1,    -1,
-      48,    49
+      36,     0,     1,     3,    55,     3,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    51,     3,     3,    17,    95,
+      19,    45,   102,     0,    48,   105,    54,    49,    50,     3,
+      54,    44,    44,    32,     3,    48,    44,    51,    89,    53,
+      94,    40,    96,     3,     4,    45,     3,   123,    48,    47,
+      49,    50,     4,     4,    44,    91,     3,     3,    57,     1,
+      47,    97,    48,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    94,    47,    96,    17,    45,    19,    44,    48,
+      44,     3,    54,   119,     3,    54,    55,    56,    44,    48,
+      32,     3,     3,   129,     3,    53,    46,     4,    40,   135,
+      53,     3,     2,     4,   140,    54,    84,    49,   119,    53,
+      50,    -1,   133,    -1,    -1,    57,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    -1,    -1,    -1,    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,    -1,    -1,    -1,     3,    -1,
+      -1,    50,    -1,    52,    53,    -1,    -1,    -1,    57,    14,
+      15,    16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    44,
+      45,    -1,    -1,    48

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

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

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

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


@@ -937,14 +1018,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)


@@ -959,94 +1040,148 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
   switch (yytype)
     {
       case 3: /* "\"string\"" */
   switch (yytype)
     {
       case 3: /* "\"string\"" */

-#line 182 "parse-gram.y"
-       { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); };
-#line 965 "parse-gram.c"
+
+/* Line 717 of yacc.c  */
+#line 181 "parse-gram.y"
+       { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); };
+
+/* Line 717 of yacc.c  */
+#line 1050 "../../../src/parse-gram.c"

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

-#line 195 "parse-gram.y"
-       { fprintf (stderr, "%d", (yyvaluep->integer)); };
-#line 970 "parse-gram.c"
+
+/* Line 717 of yacc.c  */
+#line 192 "parse-gram.y"
+       { fprintf (stderr, "%d", ((*yyvaluep).integer)); };
+
+/* Line 717 of yacc.c  */
+#line 1059 "../../../src/parse-gram.c"
+       break;
+      case 44: /* "\"{...}\"" */
+
+/* Line 717 of yacc.c  */
+#line 183 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); };
+
+/* Line 717 of yacc.c  */
+#line 1068 "../../../src/parse-gram.c"
+       break;
+      case 45: /* "\"char\"" */
+
+/* Line 717 of yacc.c  */
+#line 175 "parse-gram.y"
+       { fputs (char_name (((*yyvaluep).character)), stderr); };
+
+/* Line 717 of yacc.c  */
+#line 1077 "../../../src/parse-gram.c"

        break;
        break;

-      case 8: /* "\"%destructor {...}\"" */
-#line 184 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-#line 975 "parse-gram.c"
+      case 46: /* "\"epilogue\"" */
+
+/* Line 717 of yacc.c  */
+#line 183 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
+
+/* Line 717 of yacc.c  */
+#line 1086 "../../../src/parse-gram.c"

        break;
        break;

-      case 9: /* "\"%printer {...}\"" */
+      case 48: /* "\"identifier\"" */
+
+/* Line 717 of yacc.c  */

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

-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-#line 980 "parse-gram.c"
+       { fputs (((*yyvaluep).uniqstr), stderr); };
+
+/* Line 717 of yacc.c  */
+#line 1095 "../../../src/parse-gram.c"

        break;
        break;

-      case 10: /* "\"%union {...}\"" */
+      case 49: /* "\"identifier:\"" */
+
+/* Line 717 of yacc.c  */

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

-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-#line 985 "parse-gram.c"
-       break;
-      case 26: /* "\"%initial-action {...}\"" */
-#line 185 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-#line 990 "parse-gram.c"
+       { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); };
+
+/* Line 717 of yacc.c  */
+#line 1104 "../../../src/parse-gram.c"

        break;
        break;

-      case 27: /* "\"%lex-param {...}\"" */
-#line 186 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-#line 995 "parse-gram.c"
+      case 52: /* "\"%{...%}\"" */
+
+/* Line 717 of yacc.c  */
+#line 183 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
+
+/* Line 717 of yacc.c  */
+#line 1113 "../../../src/parse-gram.c"

        break;
        break;

-      case 34: /* "\"%parse-param {...}\"" */
+      case 54: /* "\"type\"" */
+
+/* Line 717 of yacc.c  */

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

-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-#line 1000 "parse-gram.c"
-       break;
-      case 42: /* "\"type\"" */
-#line 193 "parse-gram.y"
-       { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-#line 1005 "parse-gram.c"
-       break;
-      case 46: /* "\"identifier\"" */
-#line 197 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-#line 1010 "parse-gram.c"
-       break;
-      case 47: /* "\"identifier:\"" */
-#line 199 "parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-#line 1015 "parse-gram.c"
+       { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); };
+
+/* Line 717 of yacc.c  */
+#line 1122 "../../../src/parse-gram.c"

        break;
        break;

-      case 49: /* "\"%{...%}\"" */
-#line 191 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-#line 1020 "parse-gram.c"
+      case 83: /* "variable" */
+
+/* Line 717 of yacc.c  */
+#line 188 "parse-gram.y"
+       { fputs (((*yyvaluep).uniqstr), stderr); };
+
+/* Line 717 of yacc.c  */
+#line 1131 "../../../src/parse-gram.c"

        break;
        break;

-      case 50: /* "\"epilogue\"" */
-#line 191 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-#line 1025 "parse-gram.c"
+      case 84: /* "content.opt" */
+
+/* Line 717 of yacc.c  */
+#line 183 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
+
+/* Line 717 of yacc.c  */
+#line 1140 "../../../src/parse-gram.c"

        break;
        break;

-      case 51: /* "\"{...}\"" */
-#line 190 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-#line 1030 "parse-gram.c"
+      case 85: /* "braceless" */
+
+/* Line 717 of yacc.c  */
+#line 183 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
+
+/* Line 717 of yacc.c  */
+#line 1149 "../../../src/parse-gram.c"

        break;
        break;

-      case 72: /* "symbol" */
-#line 197 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-#line 1035 "parse-gram.c"
+      case 86: /* "id" */
+
+/* Line 717 of yacc.c  */
+#line 195 "parse-gram.y"
+       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
+
+/* Line 717 of yacc.c  */
+#line 1158 "../../../src/parse-gram.c"

        break;
        break;

-      case 73: /* "action" */
-#line 190 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-#line 1040 "parse-gram.c"
+      case 87: /* "id_colon" */
+
+/* Line 717 of yacc.c  */
+#line 196 "parse-gram.y"
+       { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); };
+
+/* Line 717 of yacc.c  */
+#line 1167 "../../../src/parse-gram.c"

        break;
        break;

-      case 74: /* "string_as_id" */
-#line 197 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-#line 1045 "parse-gram.c"
+      case 88: /* "symbol" */
+
+/* Line 717 of yacc.c  */
+#line 195 "parse-gram.y"
+       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
+
+/* Line 717 of yacc.c  */
+#line 1176 "../../../src/parse-gram.c"

        break;
        break;

-      case 75: /* "string_content" */
-#line 182 "parse-gram.y"
-       { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); };
-#line 1050 "parse-gram.c"
+      case 89: /* "string_as_id" */
+
+/* Line 717 of yacc.c  */
+#line 195 "parse-gram.y"
+       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
+
+/* Line 717 of yacc.c  */
+#line 1185 "../../../src/parse-gram.c"

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


@@ -1061,14 +1196,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)


@@ -1090,17 +1225,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");
 }
 


@@ -1121,8 +1259,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;


@@ -1136,11 +1273,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");

     }
 }
 
     }
 }
 


@@ -1245,7 +1382,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 (;;)


@@ -1292,7 +1429,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
 {
   int yyn = yypact[yystate];
 
 {
   int yyn = yypact[yystate];
 

-  if (! (YYPACT_NINF < yyn && yyn < YYLAST))
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))

     return 0;
   else
     {
     return 0;
   else
     {


@@ -1330,7 +1467,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
       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 yycount = 1;
 
       int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
       int yycount = 1;
 


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

-\f

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

-

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


@@ -1444,10 +1579,9 @@ int yyparse ();
 
 
 
 
 
 

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

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


@@ -1471,103 +1605,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;

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

-  YYSIZE_T yystacksize = YYINITDEPTH;
+    YYSIZE_T yystacksize;

 
 

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

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

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

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

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

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

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

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

-

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

+

 #if YYLTYPE_IS_TRIVIAL
   /* Initialize the default location before parsing starts.  */
   yylloc.first_line   = yylloc.last_line   = 1;
 #if YYLTYPE_IS_TRIVIAL
   /* 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 85 "parse-gram.y"
+/* Line 1244 of yacc.c  */
+#line 84 "parse-gram.y"

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

-  yylloc.start.file   = yylloc.end.file   = current_file;
-  yylloc.start.line   = yylloc.end.line   = 1;
-  yylloc.start.column = yylloc.end.column = 0;
+  boundary_set (&yylloc.start, current_file, 1, 1);
+  boundary_set (&yylloc.end, current_file, 1, 1);

 }
 }

-/* Line 1081 of yacc.c.  */
-#line 1570 "parse-gram.c"
+
+/* Line 1244 of yacc.c  */
+#line 1714 "../../../src/parse-gram.c"

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

+

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


@@ -1604,6 +1749,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;


@@ -1625,9 +1771,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);


@@ -1648,6 +1794,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;
 
 /*-----------.


@@ -1656,16 +1805,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];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     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: "));


@@ -1697,20 +1846,16 @@ yybackup:
       goto yyreduce;
     }
 
       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;


@@ -1751,413 +1896,1009 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-#line 220 "parse-gram.y"
-    { prologue_augment ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); }
+
+/* Line 1457 of yacc.c  */
+#line 219 "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 ();
+    }
+
+/* Line 1457 of yacc.c  */
+#line 1914 "../../../src/parse-gram.c"

     break;
 
   case 7:
     break;
 
   case 7:

-#line 221 "parse-gram.y"
+
+/* Line 1457 of yacc.c  */
+#line 228 "parse-gram.y"

     { debug_flag = true; }
     { debug_flag = true; }

+
+/* Line 1457 of yacc.c  */
+#line 1924 "../../../src/parse-gram.c"

     break;
 
   case 8:
     break;
 
   case 8:

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

     }
     }

+
+/* Line 1457 of yacc.c  */
+#line 1936 "../../../src/parse-gram.c"

     break;
 
   case 9:
     break;
 
   case 9:

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

     break;
 
   case 10:
     break;
 
   case 10:

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

     break;
 
   case 11:
     break;
 
   case 11:

-#line 229 "parse-gram.y"
+
+/* Line 1457 of yacc.c  */
+#line 239 "parse-gram.y"

     { error_verbose = true; }
     { error_verbose = true; }

+
+/* Line 1457 of yacc.c  */
+#line 1969 "../../../src/parse-gram.c"

     break;
 
   case 12:
     break;
 
   case 12:

-#line 230 "parse-gram.y"
+
+/* Line 1457 of yacc.c  */
+#line 240 "parse-gram.y"

     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }

+
+/* Line 1457 of yacc.c  */
+#line 1979 "../../../src/parse-gram.c"

     break;
 
   case 13:
     break;
 
   case 13:

-#line 231 "parse-gram.y"
+
+/* Line 1457 of yacc.c  */
+#line 241 "parse-gram.y"

     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }

+
+/* Line 1457 of yacc.c  */
+#line 1989 "../../../src/parse-gram.c"

     break;
 
   case 14:
     break;
 
   case 14:

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

     break;
 
   case 15:
     break;
 
   case 15:

-#line 234 "parse-gram.y"
+
+/* Line 1457 of yacc.c  */
+#line 243 "parse-gram.y"
+    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
+
+/* Line 1457 of yacc.c  */
+#line 2009 "../../../src/parse-gram.c"
+    break;
+
+  case 16:
+
+/* Line 1457 of yacc.c  */
+#line 245 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2022 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 16:
-#line 239 "parse-gram.y"
+  case 17:
+
+/* Line 1457 of yacc.c  */
+#line 250 "parse-gram.y"

     {
     {

-      muscle_code_grow ("initial_action", (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
+      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 17:
-#line 242 "parse-gram.y"
-    { add_param ("lex_param", (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); }
+/* Line 1457 of yacc.c  */
+#line 2039 "../../../src/parse-gram.c"

     break;
 
   case 18:
     break;
 
   case 18:

-#line 243 "parse-gram.y"
-    { locations_flag = true; }
+
+/* Line 1457 of yacc.c  */
+#line 258 "parse-gram.y"
+    { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2049 "../../../src/parse-gram.c"

     break;
 
   case 19:
     break;
 
   case 19:

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

     break;
 
   case 20:
     break;
 
   case 20:

-#line 245 "parse-gram.y"
-    { no_lines_flag = true; }
+
+/* Line 1457 of yacc.c  */
+#line 260 "parse-gram.y"
+    { locations_flag = true; }
+
+/* Line 1457 of yacc.c  */
+#line 2069 "../../../src/parse-gram.c"

     break;
 
   case 21:
     break;
 
   case 21:

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

     break;
 
   case 22:
     break;
 
   case 22:

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

     break;
 
   case 23:
     break;
 
   case 23:

-#line 248 "parse-gram.y"
-    { add_param ("parse_param", (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])); }
+
+/* Line 1457 of yacc.c  */
+#line 263 "parse-gram.y"
+    { no_lines_flag = true; }
+
+/* Line 1457 of yacc.c  */
+#line 2099 "../../../src/parse-gram.c"

     break;
 
   case 24:
     break;
 
   case 24:

-#line 249 "parse-gram.y"
-    { pure_parser = true; }
+
+/* Line 1457 of yacc.c  */
+#line 264 "parse-gram.y"
+    { nondeterministic_parser = true; }
+
+/* Line 1457 of yacc.c  */
+#line 2109 "../../../src/parse-gram.c"

     break;
 
   case 25:
     break;
 
   case 25:

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

     break;
 
   case 26:
     break;
 
   case 26:

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

     break;
 
   case 27:
     break;
 
   case 27:

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

     break;
 
   case 28:
     break;
 
   case 28:

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

     break;
 
   case 29:
     break;
 
   case 29:

-#line 254 "parse-gram.y"
-    { yacc_flag = true; }
+
+/* Line 1457 of yacc.c  */
+#line 281 "parse-gram.y"
+    { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+
+/* Line 1457 of yacc.c  */
+#line 2170 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 33:
-#line 262 "parse-gram.y"
+  case 30:
+
+/* Line 1457 of yacc.c  */
+#line 283 "parse-gram.y"

     {
     {

-      grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
+      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)]));

     }
     }

+
+/* Line 1457 of yacc.c  */
+#line 2202 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 34:
-#line 266 "parse-gram.y"
-    {
-      char const *body = (yyvsp[(1) - (1)].chars);
+  case 31:

 
 

-      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++;
-       }
+/* Line 1457 of yacc.c  */
+#line 306 "parse-gram.y"
+    { token_table_flag = true; }
+
+/* Line 1457 of yacc.c  */
+#line 2212 "../../../src/parse-gram.c"
+    break;
+
+  case 32:
+
+/* Line 1457 of yacc.c  */
+#line 307 "parse-gram.y"
+    { report_flag |= report_states; }
+
+/* Line 1457 of yacc.c  */
+#line 2222 "../../../src/parse-gram.c"
+    break;
+
+  case 33:
+
+/* Line 1457 of yacc.c  */
+#line 308 "parse-gram.y"
+    { yacc_flag = true; }

 
 

-      typed = true;
-      muscle_code_grow ("stype", body, (yylsp[(1) - (1)]));
+/* Line 1457 of yacc.c  */
+#line 2232 "../../../src/parse-gram.c"
+    break;
+
+  case 37:
+
+/* Line 1457 of yacc.c  */
+#line 316 "parse-gram.y"
+    {
+      grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));

     }
     }

+
+/* Line 1457 of yacc.c  */
+#line 2244 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 35:
-#line 282 "parse-gram.y"
+  case 38:
+
+/* Line 1457 of yacc.c  */
+#line 320 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

-      for (list = (yyvsp[(2) - (2)].list); list; list = list->next)
-       symbol_destructor_set (list->sym, (yyvsp[(1) - (2)].chars), (yylsp[(1) - (2)]));
-      symbol_list_free ((yyvsp[(2) - (2)].list));
+      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
+       symbol_list_destructor_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
+      symbol_list_free ((yyvsp[(3) - (3)].list));

     }
     }

+
+/* Line 1457 of yacc.c  */
+#line 2259 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 36:
-#line 289 "parse-gram.y"
+  case 39:
+
+/* Line 1457 of yacc.c  */
+#line 327 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

-      for (list = (yyvsp[(2) - (2)].list); list; list = list->next)
-       symbol_printer_set (list->sym, (yyvsp[(1) - (2)].chars), list->location);
-      symbol_list_free ((yyvsp[(2) - (2)].list));
+      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
+       symbol_list_printer_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
+      symbol_list_free ((yyvsp[(3) - (3)].list));

     }
     }

+
+/* Line 1457 of yacc.c  */
+#line 2274 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 37:
-#line 296 "parse-gram.y"
+  case 40:
+
+/* Line 1457 of yacc.c  */
+#line 334 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2286 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 38:
-#line 300 "parse-gram.y"
+  case 41:
+
+/* Line 1457 of yacc.c  */
+#line 338 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2298 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 39:
-#line 306 "parse-gram.y"
+  case 42:
+
+/* Line 1457 of yacc.c  */
+#line 342 "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 ();
+    }
+
+/* Line 1457 of yacc.c  */
+#line 2313 "../../../src/parse-gram.c"
+    break;
+
+  case 43:
+
+/* Line 1457 of yacc.c  */
+#line 349 "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 ();
+    }
+
+/* Line 1457 of yacc.c  */
+#line 2326 "../../../src/parse-gram.c"
+    break;
+
+  case 44:
+
+/* Line 1457 of yacc.c  */
+#line 363 "parse-gram.y"
+    {}
+
+/* Line 1457 of yacc.c  */
+#line 2336 "../../../src/parse-gram.c"
+    break;
+
+  case 45:
+
+/* Line 1457 of yacc.c  */
+#line 364 "parse-gram.y"
+    { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2346 "../../../src/parse-gram.c"
+    break;
+
+  case 46:
+
+/* Line 1457 of yacc.c  */
+#line 369 "parse-gram.y"
+    {
+      union_seen = true;
+      muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+      code_scanner_last_string_free ();
+    }
+
+/* Line 1457 of yacc.c  */
+#line 2360 "../../../src/parse-gram.c"
+    break;
+
+  case 47:
+
+/* Line 1457 of yacc.c  */
+#line 380 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2370 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 40:
-#line 307 "parse-gram.y"
+  case 48:
+
+/* Line 1457 of yacc.c  */
+#line 381 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2383 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 41:
-#line 311 "parse-gram.y"
+  case 49:
+
+/* Line 1457 of yacc.c  */
+#line 385 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2393 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 42:
-#line 312 "parse-gram.y"
+  case 50:
+
+/* Line 1457 of yacc.c  */
+#line 386 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2406 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 43:
-#line 317 "parse-gram.y"
+  case 51:
+
+/* Line 1457 of yacc.c  */
+#line 391 "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));
     }
       symbol_list_free ((yyvsp[(3) - (3)].list));
     }

+
+/* Line 1457 of yacc.c  */
+#line 2422 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 44:
-#line 327 "parse-gram.y"
+  case 52:
+
+/* Line 1457 of yacc.c  */
+#line 402 "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;
     }
        }
       symbol_list_free ((yyvsp[(3) - (3)].list));
       current_type = NULL;
     }

+
+/* Line 1457 of yacc.c  */
+#line 2442 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 45:
-#line 341 "parse-gram.y"
+  case 53:
+
+/* Line 1457 of yacc.c  */
+#line 416 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2452 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 46:
-#line 342 "parse-gram.y"
+  case 54:
+
+/* Line 1457 of yacc.c  */
+#line 417 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2462 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 47:
-#line 343 "parse-gram.y"
+  case 55:
+
+/* Line 1457 of yacc.c  */
+#line 418 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2472 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 48:
-#line 347 "parse-gram.y"
+  case 56:
+
+/* Line 1457 of yacc.c  */
+#line 419 "parse-gram.y"
+    { (yyval.assoc) = precedence_assoc; }
+
+/* Line 1457 of yacc.c  */
+#line 2482 "../../../src/parse-gram.c"
+    break;
+
+  case 57:
+
+/* Line 1457 of yacc.c  */
+#line 423 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2492 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 49:
-#line 348 "parse-gram.y"
-    { current_type = (yyvsp[(1) - (1)].uniqstr); }
+  case 58:
+
+/* Line 1457 of yacc.c  */
+#line 424 "parse-gram.y"
+    { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
+
+/* Line 1457 of yacc.c  */
+#line 2502 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 50:
-#line 354 "parse-gram.y"
-    { (yyval.list) = symbol_list_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+  case 59:
+
+/* Line 1457 of yacc.c  */
+#line 430 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2512 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 51:
-#line 355 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
+  case 60:
+
+/* Line 1457 of yacc.c  */
+#line 432 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
+
+/* Line 1457 of yacc.c  */
+#line 2522 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 52:
-#line 361 "parse-gram.y"
+  case 61:
+
+/* Line 1457 of yacc.c  */
+#line 436 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+
+/* Line 1457 of yacc.c  */
+#line 2532 "../../../src/parse-gram.c"
+    break;
+
+  case 62:
+
+/* Line 1457 of yacc.c  */
+#line 437 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2542 "../../../src/parse-gram.c"
+    break;
+
+  case 63:
+
+/* Line 1457 of yacc.c  */
+#line 443 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2552 "../../../src/parse-gram.c"
+    break;
+
+  case 64:
+
+/* Line 1457 of yacc.c  */
+#line 445 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
+
+/* Line 1457 of yacc.c  */
+#line 2562 "../../../src/parse-gram.c"
+    break;
+
+  case 65:
+
+/* Line 1457 of yacc.c  */
+#line 449 "parse-gram.y"
+    { (yyval.list) = (yyvsp[(1) - (1)].list); }
+
+/* Line 1457 of yacc.c  */
+#line 2572 "../../../src/parse-gram.c"
+    break;
+
+  case 66:
+
+/* Line 1457 of yacc.c  */
+#line 450 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+
+/* Line 1457 of yacc.c  */
+#line 2582 "../../../src/parse-gram.c"
+    break;
+
+  case 67:
+
+/* Line 1457 of yacc.c  */
+#line 454 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2592 "../../../src/parse-gram.c"
+    break;
+
+  case 68:
+
+/* Line 1457 of yacc.c  */
+#line 455 "parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2602 "../../../src/parse-gram.c"
+    break;
+
+  case 69:
+
+/* Line 1457 of yacc.c  */
+#line 456 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2612 "../../../src/parse-gram.c"
+    break;
+
+  case 70:
+
+/* Line 1457 of yacc.c  */
+#line 457 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2622 "../../../src/parse-gram.c"
+    break;
+
+  case 71:
+
+/* Line 1457 of yacc.c  */
+#line 463 "parse-gram.y"

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

+       tag_seen = true;

      }
      }

+
+/* Line 1457 of yacc.c  */
+#line 2635 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 53:
-#line 365 "parse-gram.y"
+  case 72:
+
+/* Line 1457 of yacc.c  */
+#line 468 "parse-gram.y"

     {
        symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
        symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)]));
      }
     {
        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)]));
      }

+
+/* Line 1457 of yacc.c  */
+#line 2648 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 54:
-#line 370 "parse-gram.y"
+  case 73:
+
+/* Line 1457 of yacc.c  */
+#line 473 "parse-gram.y"

     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
       symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (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)]));
       symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)]));
     }

+
+/* Line 1457 of yacc.c  */
+#line 2662 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 55:
-#line 376 "parse-gram.y"
+  case 74:
+
+/* Line 1457 of yacc.c  */
+#line 479 "parse-gram.y"

     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
       symbol_make_alias ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].symbol), (yyloc));
     }
     {
       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_make_alias ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].symbol), (yyloc));
     }

+
+/* Line 1457 of yacc.c  */
+#line 2676 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 56:
-#line 382 "parse-gram.y"
+  case 75:
+
+/* Line 1457 of yacc.c  */
+#line 485 "parse-gram.y"

     {
       symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
       symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));
       symbol_user_token_number_set ((yyvsp[(1) - (3)].symbol), (yyvsp[(2) - (3)].integer), (yylsp[(2) - (3)]));
       symbol_make_alias ((yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol), (yyloc));
     }
     {
       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_user_token_number_set ((yyvsp[(1) - (3)].symbol), (yyvsp[(2) - (3)].integer), (yylsp[(2) - (3)]));
       symbol_make_alias ((yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol), (yyloc));
     }

+
+/* Line 1457 of yacc.c  */
+#line 2691 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 63:
-#line 412 "parse-gram.y"
+  case 82:
+
+/* Line 1457 of yacc.c  */
+#line 515 "parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }

+
+/* Line 1457 of yacc.c  */
+#line 2703 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 64:
-#line 418 "parse-gram.y"
+  case 83:
+
+/* Line 1457 of yacc.c  */
+#line 521 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2713 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 66:
-#line 422 "parse-gram.y"
+  case 85:
+
+/* Line 1457 of yacc.c  */
+#line 525 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2723 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 67:
-#line 423 "parse-gram.y"
+  case 86:
+
+/* Line 1457 of yacc.c  */
+#line 526 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2733 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 69:
-#line 429 "parse-gram.y"
+  case 88:
+
+/* Line 1457 of yacc.c  */
+#line 532 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2743 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 70:
-#line 431 "parse-gram.y"
+  case 89:
+
+/* Line 1457 of yacc.c  */
+#line 534 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2753 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 71:
-#line 433 "parse-gram.y"
-    { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+  case 90:
+
+/* Line 1457 of yacc.c  */
+#line 536 "parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2763 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 72:
-#line 435 "parse-gram.y"
+  case 91:
+
+/* Line 1457 of yacc.c  */
+#line 538 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2773 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 73:
-#line 437 "parse-gram.y"
+  case 92:
+
+/* Line 1457 of yacc.c  */
+#line 540 "parse-gram.y"

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

+
+/* Line 1457 of yacc.c  */
+#line 2783 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 74:
-#line 439 "parse-gram.y"
+  case 93:
+
+/* Line 1457 of yacc.c  */
+#line 542 "parse-gram.y"

     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }

+
+/* Line 1457 of yacc.c  */
+#line 2793 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 75:
-#line 443 "parse-gram.y"
-    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+  case 95:
+
+/* Line 1457 of yacc.c  */
+#line 552 "parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+
+/* Line 1457 of yacc.c  */
+#line 2803 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 76:
-#line 444 "parse-gram.y"
-    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+  case 96:
+
+/* Line 1457 of yacc.c  */
+#line 558 "parse-gram.y"
+    {
+      (yyval.chars) = "";
+    }
+
+/* Line 1457 of yacc.c  */
+#line 2815 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 77:
-#line 449 "parse-gram.y"
-    { (yyval.chars) = (yyvsp[(1) - (1)].chars); }
+  case 98:
+
+/* Line 1457 of yacc.c  */
+#line 571 "parse-gram.y"
+    {
+      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;
+    }
+
+/* Line 1457 of yacc.c  */
+#line 2832 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 78:
-#line 455 "parse-gram.y"
+  case 99:
+
+/* Line 1457 of yacc.c  */
+#line 591 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2842 "../../../src/parse-gram.c"
+    break;
+
+  case 100:
+
+/* Line 1457 of yacc.c  */
+#line 593 "parse-gram.y"

     {
     {

-      (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
+      (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)]));

     }
     }

+
+/* Line 1457 of yacc.c  */
+#line 2856 "../../../src/parse-gram.c"
+    break;
+
+  case 101:
+
+/* Line 1457 of yacc.c  */
+#line 601 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2866 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 79:
-#line 464 "parse-gram.y"
-    { (yyval.chars) = (yyvsp[(1) - (1)].chars); }
+  case 104:
+
+/* Line 1457 of yacc.c  */
+#line 613 "parse-gram.y"
+    {
+      (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
+      symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
+    }
+
+/* Line 1457 of yacc.c  */
+#line 2879 "../../../src/parse-gram.c"

     break;
 
     break;
 

-  case 81:
-#line 471 "parse-gram.y"
+  case 106:
+
+/* Line 1457 of yacc.c  */
+#line 622 "parse-gram.y"

     {
     {

-      muscle_code_grow ("epilogue", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
-      scanner_last_string_free ();
+      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 ();
+      muscle_code_grow ("epilogue", plain_code.code, (yylsp[(2) - (2)]));
+      code_scanner_last_string_free ();

     }
     }

+
+/* Line 1457 of yacc.c  */
+#line 2896 "../../../src/parse-gram.c"

     break;
 
 
     break;
 
 

-/* Line 1270 of yacc.c.  */
-#line 2161 "parse-gram.c"
+
+/* Line 1457 of yacc.c  */
+#line 2902 "../../../src/parse-gram.c"

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


@@ -2233,7 +2974,7 @@ yyerrlab:
 
   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)


@@ -2250,7 +2991,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;
 


@@ -2308,14 +3049,11 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
       YY_STACK_PRINT (yyss, yyssp);
     }
 

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

   *++yyvsp = yylval;
 
   yyerror_range[1] = yylloc;
   /* Using YYLLOC is tempting, but would change the location of
   *++yyvsp = yylval;
 
   yyerror_range[1] = yylloc;
   /* Using YYLLOC is tempting, but would change the location of

-     the look-ahead.  YYLOC is available though.  */
+     the lookahead.  YYLOC is available though.  */

   YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
   *++yylsp = yyloc;
 
   YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
   *++yylsp = yyloc;
 


@@ -2340,7 +3078,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.  |
 `-------------------------------------------------*/


@@ -2351,7 +3089,7 @@ yyexhaustedlab:
 #endif
 
 yyreturn:
 #endif
 
 yyreturn:

-  if (yychar != YYEOF && yychar != YYEMPTY)
+  if (yychar != YYEMPTY)

      yydestruct ("Cleanup: discarding lookahead",
                 yytoken, &yylval, &yylloc);
   /* Do not reclaim the symbols of the rule which action triggered
      yydestruct ("Cleanup: discarding lookahead",
                 yytoken, &yylval, &yylloc);
   /* Do not reclaim the symbols of the rule which action triggered


@@ -2372,11 +3110,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 477 "parse-gram.y"
+
+/* Line 1677 of yacc.c  */
+#line 632 "parse-gram.y"

 
 
 
 
 
 


@@ -2458,9 +3199,10 @@ add_param (char const *type, char *decl, location loc)
       free (name);
     }
 
       free (name);
     }
 

-  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)
 {


@@ -2484,3 +3226,15 @@ 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);
+    }
+}