Encapsulate code properties and related functionality for the various

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index e9b7900db05f66cb929f3e4c5b7689e88675c274..35187cd12d710070bb8acf6f09ccb0518702d800 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,20 +1,20 @@
-/* A Bison parser, made by GNU Bison 2.1b.  */
+/* A Bison parser, made by GNU Bison 2.3a+.  */

 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C

-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006

    Free Software Foundation, Inc.
    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
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
    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
    the Free Software Foundation; either version 2, or (at your option)
    any later version.

-
+   

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-
+   

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor,
    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,


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

-
+   

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


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

-#define YYBISON_VERSION "2.1b"
+#define YYBISON_VERSION "2.3a+"

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


@@ -55,6 +55,9 @@
 /* Pure parsers.  */
 #define YYPURE 1
 
 /* Pure parsers.  */
 #define YYPURE 1
 

+/* Push parsers.  */
+#define YYPUSH 0
+

 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 


@@ -68,121 +71,10 @@
 #define yynerrs gram_nerrs
 #define yylloc gram_lloc
 
 #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
-
-
-
-

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

-#line 1 "../../src/parse-gram.y"
+
+/* Line 164 of yacc.c  */
+#line 1 "parse-gram.y"

 /* Bison Grammar Parser                             -*- C -*-
 
    Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 /* Bison Grammar Parser                             -*- C -*-
 
    Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.


@@ -208,6 +100,8 @@
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"
 

+#include <strverscmp.h>
+

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


@@ -219,7 +113,6 @@
 #include "symlist.h"
 #include "scan-gram.h"
 #include "scan-code.h"
 #include "symlist.h"
 #include "scan-gram.h"
 #include "scan-code.h"

-#include "strverscmp.h"

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


@@ -236,27 +129,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 164 of yacc.c  */
+#line 157 "parse-gram.c"

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


@@ -276,23 +173,158 @@ static int current_prec = 0;
 # define YYTOKEN_TABLE 0
 #endif
 
 # define YYTOKEN_TABLE 0
 #endif
 

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

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

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

 {
 {

+/* Line 198 of yacc.c  */
+#line 97 "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;

+  unsigned char character;

 }
 }

-/* Line 193 of yacc.c.  */
-#line 292 "../../src/parse-gram.c"
+
+/* Line 198 of yacc.c  */
+#line 324 "parse-gram.c"

        YYSTYPE;
        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


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

-/* Line 216 of yacc.c.  */
-#line 317 "../../src/parse-gram.c"
+/* Line 221 of yacc.c  */
+#line 349 "parse-gram.c"

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


@@ -388,14 +420,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
 


@@ -530,20 +562,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   164
+#define YYLAST   205

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

-#define YYNTOKENS  52
+#define YYNTOKENS  60

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

-#define YYNNTS  24
+#define YYNNTS  31

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

-#define YYNRULES  80
+#define YYNRULES  99

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

-#define YYNSTATES  114
+#define YYNSTATES  138

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

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


@@ -581,7 +613,8 @@ 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,    58,    59

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG


@@ -589,55 +622,62 @@ static const yytype_uint8 yytranslate[] =
    YYRHS.  */
 static const yytype_uint8 yyprhs[] =
 {
    YYRHS.  */
 static const yytype_uint8 yyprhs[] =
 {

-       0,     0,     3,     8,     9,    12,    14,    16,    18,    21,
-      25,    27,    29,    32,    35,    39,    41,    44,    47,    49,
-      53,    55,    57,    61,    64,    66,    69,    72,    74,    76,
-      78,    80,    82,    84,    87,    89,    93,    97,    99,   101,
-     102,   106,   107,   111,   115,   119,   121,   123,   125,   126,
-     128,   130,   133,   135,   137,   140,   143,   147,   149,   152,
-     154,   157,   159,   162,   165,   166,   170,   172,   176,   179,
-     180,   183,   186,   190,   194,   198,   200,   202,   204,   206,
-     207
+       0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
+      24,    26,    29,    32,    36,    38,    41,    44,    46,    50,
+      52,    54,    58,    61,    63,    65,    68,    71,    73,    75,
+      77,    79,    81,    83,    86,    90,    94,    96,    98,   101,
+     104,   107,   110,   111,   113,   117,   118,   122,   123,   127,
+     131,   135,   137,   139,   141,   142,   144,   146,   149,   151,
+     154,   156,   158,   160,   162,   164,   166,   169,   172,   176,
+     178,   181,   183,   186,   188,   191,   194,   195,   199,   201,
+     205,   208,   209,   212,   215,   219,   223,   227,   229,   231,
+     232,   234,   236,   238,   240,   242,   244,   246,   248,   249

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

 };
 
 /* 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,   194,   194,   202,   204,   208,   209,   211,   212,   217,
-     218,   219,   220,   221,   222,   223,   228,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   249,   250,   251,   255,   271,   279,   287,   291,   298,
-     298,   303,   303,   308,   318,   333,   334,   335,   339,   340,
-     345,   346,   351,   355,   360,   366,   372,   383,   384,   393,
-     394,   400,   401,   402,   409,   409,   413,   414,   415,   420,
-     421,   423,   426,   428,   430,   435,   436,   441,   450,   455,
-     457
+       0,   210,   210,   218,   220,   224,   225,   233,   234,   235,
+     236,   237,   238,   239,   240,   245,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
+     268,   272,   273,   274,   278,   285,   292,   296,   300,   301,
+     302,   303,   314,   315,   319,   348,   348,   353,   353,   358,
+     369,   384,   385,   386,   390,   391,   396,   398,   403,   404,
+     408,   409,   410,   411,   416,   421,   426,   432,   438,   449,
+     450,   459,   460,   466,   467,   468,   475,   475,   479,   480,
+     481,   486,   487,   489,   491,   493,   495,   505,   506,   512,
+     516,   521,   541,   543,   552,   557,   558,   563,   570,   572

 };
 #endif
 
 };
 #endif
 


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

-  "\"%printer\"", "\"%union {...}\"", "\"%left\"", "\"%right\"",
-  "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%debug\"",
+  "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"",
+  "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%code-top\"", "\"%debug\"",

   "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
   "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
   "\"%initial-action\"", "\"%lex-param\"", "\"%locations\"",
   "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
   "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param\"",
   "\"%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",
+  "\"%provides\"", "\"%pure-parser\"", "\"%push-parser\"", "\"%require\"",
+  "\"%requires\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"",
+  "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"",
+  "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"",
+  "\"%{...%}\"", "\";\"", "\"type\"", "\"<*>\"", "\"<!>\"", "\"%union\"",
+  "$accept", "input", "prologue_declarations", "prologue_declaration",
+  "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2",
+  "precedence_declaration", "precedence_declarator", "type.opt",
+  "symbols.1", "generic_symlist", "generic_symlist_item", "symbol_def",

   "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules",
   "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules",

-  "@3", "rhses.1", "rhs", "symbol", "string_as_id", "string_content",
-  "epilogue.opt", 0
+  "$@3", "rhses.1", "rhs", "content", "content.opt", "braceless", "id",
+  "id_colon", "symbol", "string_as_id", "epilogue.opt", 0

 };
 #endif
 
 };
 #endif
 


@@ -678,36 +720,38 @@ 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,   313,   314

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

 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {

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


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

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

-      -1,     1,     2,    41,    69,    43,    47,    46,    44,    45,
-      74,    80,    77,    78,    70,    71,    72,    89,    99,   100,
-      81,    66,    52,    93
+      -1,     1,     2,    46,    80,    86,    48,    52,    51,    49,
+      50,    88,    94,    99,   100,    90,    91,    81,    82,    83,
+     115,   124,   125,   104,   105,    57,    75,    84,   101,    77,
+     114

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

 {
 {

-     -72,     7,   115,   -72,   -72,   -72,   -22,   -17,   -16,   -72,
-     -72,   -72,   -72,   -72,   -72,    26,   -72,   -72,    32,    33,
-      -3,   -72,    -8,    -6,   -72,     4,   -72,   -72,   -72,     9,
-       2,   -72,    26,    26,    -2,   -72,   -72,   -72,   -72,    72,
-     -72,   -72,   -72,   -72,   -72,    12,   -40,   -40,    -2,    -2,
-      -2,   -72,    26,   -72,   -72,    26,   -72,   -72,    26,    26,
-     -72,   -72,   -72,   -72,   -72,   -72,   -72,    11,   -72,    13,
-       3,   -72,   -72,   -72,    -2,   -72,    19,   -72,   -40,   -40,
-      -2,   -72,    -2,    -2,   -72,   -72,   -72,   -72,   -72,   -72,
-     -72,    18,   -72,   -72,    -2,    53,   -72,   -72,   -72,   -19,
-      16,   -72,   -72,   -72,   -72,    -2,    55,    21,   -72,   -72,
-      16,   -72,   -72,   -72
+     -89,    14,   112,   -89,   -89,   -89,   -33,   -16,   -11,   -89,
+     -89,   -89,    -6,    -6,   -89,   -89,    39,   -89,   -89,    42,
+      43,     5,   -89,     9,    11,   -89,    10,   -89,   -89,   -89,
+      12,    24,    -6,   -89,   -89,    48,    -6,    68,    30,   -89,
+     -89,   -89,    57,   -89,   -89,    28,   -89,   -89,   -89,   -89,
+      29,   -31,   -31,    30,    25,    25,   -89,   -89,   -89,     2,
+     -89,   -89,    86,   -89,   -89,    87,    89,   -89,   -89,   -89,
+     -89,   -89,   -89,   -89,   -89,   -89,   -89,   -89,    40,   -89,
+      45,     1,   -89,   -89,   -89,   -89,    52,   -89,    30,   -89,
+     -89,   -31,    35,   -31,    30,   -89,   -89,   -89,   -89,    25,
+     -89,   -89,    25,   -89,   -89,   -89,   -89,   -89,   -89,   -89,
+     -89,   -89,    46,   -89,   -89,   -89,   -89,    30,   -89,    98,
+     -89,   -89,   -89,   -89,   -26,   155,   -89,   -89,   -89,    30,
+      99,    49,   -89,   -89,   155,   -89,   -89,   -89

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

-     -72,   -72,   -72,   -72,    67,   -72,   -72,   -72,   -72,   -72,
-     -72,   -32,   -51,    23,   -72,     5,   -72,   -72,   -72,   -30,
-     -34,   -71,     6,   -72
+     -89,   -89,   -89,   -89,   100,   -89,   -89,   -89,   -89,   -89,
+     -89,   -89,    16,    51,   -78,   -57,    55,   -89,    31,   -89,
+     -89,   -89,   -18,   -89,   -89,   -10,    -7,   -89,   -38,   -88,
+     -89

 };
 
 /* 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 -80
-static const yytype_int8 yytable[] =
+#define YYTABLE_NINF -99
+static const yytype_int16 yytable[] =

 {
 {

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

 };
 
 };
 

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

 {
 {

-      34,     3,    42,     0,     1,    76,    46,     0,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    49,    50,     3,
-      42,    18,     3,     4,    95,    44,    45,    78,    79,     3,
-      14,    15,    16,    30,    51,    51,     4,     4,    32,    33,
-      43,    38,    74,    51,    46,    51,    80,    43,    82,    83,
-      47,    48,    43,    51,    42,    44,     3,    44,    52,     4,
-      94,    55,    46,    42,    58,    59,   100,    51,    50,     2,
-      47,   105,    -1,     1,   104,    70,   110,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    -1,    -1,    -1,    -1,
-      18,    -1,    -1,    -1,    -1,    -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
+      38,     0,     1,    13,    92,     3,     5,     6,     7,     8,
+       9,    10,    11,    12,     0,    53,    47,    16,    17,    50,
+      19,    99,    32,    56,   102,    56,    36,    53,     3,    55,
+      46,   119,    31,     3,    91,    46,    93,    36,     3,     4,
+      46,    40,     3,    42,    51,    52,     4,     4,    46,    59,
+      88,     3,    51,    52,    49,    46,    94,    46,     1,    49,
+      59,    49,     5,     6,     7,     8,     9,    10,    11,    12,
+      46,     3,    47,    16,    17,    50,    19,    47,    50,   117,
+      50,    56,    57,    58,    91,    56,    93,   125,    31,     3,
+       3,   129,     3,    36,    48,    55,   134,    40,    46,    42,
+      55,     3,     2,     4,    88,    56,    55,    52,    51,   127,
+      -1,    -1,    81,    -1,    -1,    -1,    59,     5,     6,     7,
+       8,     9,    10,    11,    12,    -1,    -1,    -1,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,     3,    -1,
+      -1,    -1,    -1,    -1,    52,    -1,    54,    55,    13,    14,
+      15,    59,    -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,    -1,
+      -1,    46,    47,    -1,    -1,    50

 };
 
 /* 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,
-      11,    12,    13,    17,    18,    19,    20,    21,    22,    23,
+       0,    61,    62,     0,     5,     6,     7,     8,     9,    10,
+      11,    12,    16,    17,    18,    19,    20,    21,    22,    23,

       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       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,    51,
-      51,     3,    74,     4,     4,    43,    51,    51,    43,    43,
-      51,    74,    74,     3,    46,    72,    73,     1,    47,    56,
-      66,    67,    68,    42,    62,    42,    46,    64,    65,    65,
-      63,    72,    63,    63,    74,    74,    74,    74,    44,    69,
-      44,    48,    67,    75,    63,     4,    73,    64,    72,    70,
-      71,    50,    73,    44,    45,    14,    15,    16,    51,    72,
-      71,    72,     4,    42
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    52,    54,    55,    59,    63,    64,    66,    69,
+      70,    68,    67,    56,    46,    46,    46,    85,    85,     3,
+       4,     4,    49,    46,    46,    49,    49,    46,    85,     3,
+      85,     3,     3,    47,    50,    86,    88,    89,     1,    51,
+      64,    77,    78,    79,    87,    50,    65,    56,    71,    56,
+      75,    76,    86,    76,    72,    88,    56,    57,    58,    73,
+      74,    88,    73,     3,    83,    84,    85,     3,     3,     3,
+      55,    55,    52,    78,    90,    80,    46,    72,    75,     4,
+      89,    88,    74,    48,    81,    82,    89,    53,    55,    13,
+      14,    15,    46,    88,    82,    88,     4,    56

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


@@ -975,64 +1035,148 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
   switch (yytype)
     {
       case 3: /* "\"string\"" */
   switch (yytype)
     {
       case 3: /* "\"string\"" */

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

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

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

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

-#line 986 "../../src/parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1054 "parse-gram.c"
+       break;
+      case 46: /* "\"{...}\"" */
+
+/* Line 670 of yacc.c  */
+#line 190 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
+
+/* Line 670 of yacc.c  */
+#line 1063 "parse-gram.c"

        break;
        break;

-      case 10: /* "\"%union {...}\"" */
-#line 177 "../../src/parse-gram.y"
+      case 47: /* "\"char\"" */
+
+/* Line 670 of yacc.c  */
+#line 182 "parse-gram.y"
+       { fputs (char_name ((yyvaluep->character)), stderr); };
+
+/* Line 670 of yacc.c  */
+#line 1072 "parse-gram.c"
+       break;
+      case 48: /* "\"epilogue\"" */
+
+/* Line 670 of yacc.c  */
+#line 190 "parse-gram.y"

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

-#line 991 "../../src/parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1081 "parse-gram.c"

        break;
        break;

-      case 42: /* "\"type\"" */
-#line 182 "../../src/parse-gram.y"
-       { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-#line 996 "../../src/parse-gram.c"
+      case 50: /* "\"identifier\"" */
+
+/* Line 670 of yacc.c  */
+#line 195 "parse-gram.y"
+       { fputs ((yyvaluep->uniqstr), stderr); };
+
+/* Line 670 of yacc.c  */
+#line 1090 "parse-gram.c"

        break;
        break;

-      case 46: /* "\"identifier\"" */
-#line 186 "../../src/parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-#line 1001 "../../src/parse-gram.c"
+      case 51: /* "\"identifier:\"" */
+
+/* Line 670 of yacc.c  */
+#line 196 "parse-gram.y"
+       { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
+
+/* Line 670 of yacc.c  */
+#line 1099 "parse-gram.c"

        break;
        break;

-      case 47: /* "\"identifier:\"" */
-#line 188 "../../src/parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-#line 1006 "../../src/parse-gram.c"
+      case 54: /* "\"%{...%}\"" */
+
+/* Line 670 of yacc.c  */
+#line 190 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+
+/* Line 670 of yacc.c  */
+#line 1108 "parse-gram.c"

        break;
        break;

-      case 49: /* "\"%{...%}\"" */
-#line 177 "../../src/parse-gram.y"
+      case 56: /* "\"type\"" */
+
+/* Line 670 of yacc.c  */
+#line 194 "parse-gram.y"
+       { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
+
+/* Line 670 of yacc.c  */
+#line 1117 "parse-gram.c"
+       break;
+      case 83: /* "content" */
+
+/* Line 670 of yacc.c  */
+#line 190 "parse-gram.y"

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

-#line 1011 "../../src/parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1126 "parse-gram.c"

        break;
        break;

-      case 50: /* "\"epilogue\"" */
-#line 177 "../../src/parse-gram.y"
+      case 84: /* "content.opt" */
+
+/* Line 670 of yacc.c  */
+#line 190 "parse-gram.y"

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

-#line 1016 "../../src/parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1135 "parse-gram.c"

        break;
        break;

-      case 51: /* "\"{...}\"" */
-#line 177 "../../src/parse-gram.y"
+      case 85: /* "braceless" */
+
+/* Line 670 of yacc.c  */
+#line 190 "parse-gram.y"

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

-#line 1021 "../../src/parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1144 "parse-gram.c"

        break;
        break;

-      case 72: /* "symbol" */
-#line 186 "../../src/parse-gram.y"
+      case 86: /* "id" */
+
+/* Line 670 of yacc.c  */
+#line 202 "parse-gram.y"

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

-#line 1026 "../../src/parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1153 "parse-gram.c"
+       break;
+      case 87: /* "id_colon" */
+
+/* Line 670 of yacc.c  */
+#line 203 "parse-gram.y"
+       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
+
+/* Line 670 of yacc.c  */
+#line 1162 "parse-gram.c"

        break;
        break;

-      case 73: /* "string_as_id" */
-#line 186 "../../src/parse-gram.y"
+      case 88: /* "symbol" */
+
+/* Line 670 of yacc.c  */
+#line 202 "parse-gram.y"

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

-#line 1031 "../../src/parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1171 "parse-gram.c"

        break;
        break;

-      case 74: /* "string_content" */
-#line 175 "../../src/parse-gram.y"
-       { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); };
-#line 1036 "../../src/parse-gram.c"
+      case 89: /* "string_as_id" */
+
+/* Line 670 of yacc.c  */
+#line 202 "parse-gram.y"
+       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+
+/* Line 670 of yacc.c  */
+#line 1180 "parse-gram.c"

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


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


@@ -1537,20 +1684,23 @@ YYLTYPE yylloc;
 #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
 
 
   /* User initialization code.  */
 #endif
 
 
   /* User initialization code.  */

-#line 86 "../../src/parse-gram.y"
+  
+/* Line 1082 of yacc.c  */
+#line 89 "parse-gram.y"

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

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

 }
 }

-/* Line 1078 of yacc.c.  */
-#line 1554 "../../src/parse-gram.c"
+
+/* Line 1082 of yacc.c  */
+#line 1704 "parse-gram.c"

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


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


@@ -1681,9 +1834,6 @@ yybackup:
       goto yyreduce;
     }
 
       goto yyreduce;
     }
 

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

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


@@ -1692,9 +1842,8 @@ yybackup:
   /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
   /* Shift the lookahead token.  */
   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;


@@ -1735,299 +1884,490 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-#line 209 "../../src/parse-gram.y"
-    { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])),
-                                                      (yylsp[(1) - (1)])); }
+
+/* Line 1269 of yacc.c  */
+#line 225 "parse-gram.y"
+    {
+   code_props plain_code;
+   code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
+   code_props_translate_code (&plain_code);
+   gram_scanner_last_string_free ();
+   prologue_augment (code_props_code_get (plain_code), (yylsp[(1) - (1)]), union_seen);
+   code_scanner_last_string_free ();
+}

     break;
 
   case 7:
     break;
 
   case 7:

-#line 211 "../../src/parse-gram.y"
+
+/* Line 1269 of yacc.c  */
+#line 233 "parse-gram.y"

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

-#line 213 "../../src/parse-gram.y"
-    {
-      static char one[] = "1";
-      muscle_insert ((yyvsp[(2) - (2)].chars), one);
-    }
-    break;

 
 

-  case 9:
-#line 217 "../../src/parse-gram.y"
+/* Line 1269 of yacc.c  */
+#line 234 "parse-gram.y"

     { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }
     break;
 
     { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }
     break;
 

-  case 10:
-#line 218 "../../src/parse-gram.y"
+  case 9:
+
+/* Line 1269 of yacc.c  */
+#line 235 "parse-gram.y"

     { defines_flag = true; }
     break;
 
     { defines_flag = true; }
     break;
 

-  case 11:
-#line 219 "../../src/parse-gram.y"
+  case 10:
+
+/* Line 1269 of yacc.c  */
+#line 236 "parse-gram.y"

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

-  case 12:
-#line 220 "../../src/parse-gram.y"
+  case 11:
+
+/* Line 1269 of yacc.c  */
+#line 237 "parse-gram.y"

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

-  case 13:
-#line 221 "../../src/parse-gram.y"
+  case 12:
+
+/* Line 1269 of yacc.c  */
+#line 238 "parse-gram.y"

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

-  case 14:
-#line 222 "../../src/parse-gram.y"
+  case 13:
+
+/* Line 1269 of yacc.c  */
+#line 239 "parse-gram.y"

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

-  case 15:
-#line 224 "../../src/parse-gram.y"
+  case 14:
+
+/* Line 1269 of yacc.c  */
+#line 241 "parse-gram.y"

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

-  case 16:
-#line 229 "../../src/parse-gram.y"
+  case 15:
+
+/* Line 1269 of yacc.c  */
+#line 246 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

+  case 16:
+
+/* Line 1269 of yacc.c  */
+#line 254 "parse-gram.y"
+    { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+    break;
+

   case 17:
   case 17:

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

     break;
 
   case 18:
     break;
 
   case 18:

-#line 233 "../../src/parse-gram.y"
-    { locations_flag = true; }
+
+/* Line 1269 of yacc.c  */
+#line 256 "parse-gram.y"
+    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }

     break;
 
   case 19:
     break;
 
   case 19:

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

     break;
 
   case 20:
     break;
 
   case 20:

-#line 235 "../../src/parse-gram.y"
-    { no_lines_flag = true; }
+
+/* Line 1269 of yacc.c  */
+#line 258 "parse-gram.y"
+    { nondeterministic_parser = true; }

     break;
 
   case 21:
     break;
 
   case 21:

-#line 236 "../../src/parse-gram.y"
-    { nondeterministic_parser = true; }
+
+/* Line 1269 of yacc.c  */
+#line 259 "parse-gram.y"
+    { spec_outfile = (yyvsp[(3) - (3)].chars); }

     break;
 
   case 22:
     break;
 
   case 22:

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

     break;
 
   case 23:
     break;
 
   case 23:

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

     break;
 
   case 24:
     break;
 
   case 24:

-#line 239 "../../src/parse-gram.y"
-    { pure_parser = true; }
+
+/* Line 1269 of yacc.c  */
+#line 262 "parse-gram.y"
+    { push_parser = true; }

     break;
 
   case 25:
     break;
 
   case 25:

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

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

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

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

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

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

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

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

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

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

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

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

-#line 256 "../../src/parse-gram.y"
-    {
-      char const *body = (yyvsp[(1) - (1)].chars);
-
-      if (typed)
-       {
-         /* Concatenate the union bodies, turning the first one's
-            trailing '}' into '\n', and omitting the second one's '{'.  */
-         char *code = muscle_find ("stype");
-         code[strlen (code) - 1] = '\n';
-         body++;
-       }

 
 

-      typed = true;
-      muscle_code_grow ("stype", body, (yylsp[(1) - (1)]));
+/* Line 1269 of yacc.c  */
+#line 279 "parse-gram.y"
+    {
+      symbol_list *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));

     }
     break;
 
   case 35:
     }
     break;
 
   case 35:

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

     {
       symbol_list *list;
     {
       symbol_list *list;

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

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

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

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

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

     {
     {

-      symbol_list *list;
-      const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)]));
-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
-       symbol_printer_set (list->sym, action, (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      default_prec = true;

     }
     break;
 
   case 37:
     }
     break;
 
   case 37:

-#line 288 "../../src/parse-gram.y"
+
+/* Line 1269 of yacc.c  */
+#line 297 "parse-gram.y"

     {
     {

-      default_prec = true;
+      default_prec = false;

     }
     break;
 
   case 38:
     }
     break;
 
   case 38:

-#line 292 "../../src/parse-gram.y"
+
+/* Line 1269 of yacc.c  */
+#line 300 "parse-gram.y"
+    { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), true); }
+    break;
+
+  case 39:
+
+/* Line 1269 of yacc.c  */
+#line 301 "parse-gram.y"
+    { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), false); }
+    break;
+
+  case 40:
+
+/* Line 1269 of yacc.c  */
+#line 302 "parse-gram.y"
+    { muscle_code_grow ("provides", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+    break;
+
+  case 41:
+
+/* Line 1269 of yacc.c  */
+#line 303 "parse-gram.y"
+    { muscle_code_grow ("requires", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+    break;
+
+  case 42:
+
+/* Line 1269 of yacc.c  */
+#line 314 "parse-gram.y"
+    {}
+    break;
+
+  case 43:
+
+/* Line 1269 of yacc.c  */
+#line 315 "parse-gram.y"
+    { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+    break;
+
+  case 44:
+
+/* Line 1269 of yacc.c  */
+#line 320 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 39:
-#line 298 "../../src/parse-gram.y"
+  case 45:
+
+/* Line 1269 of yacc.c  */
+#line 348 "parse-gram.y"

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

-  case 40:
-#line 299 "../../src/parse-gram.y"
+  case 46:
+
+/* Line 1269 of yacc.c  */
+#line 349 "parse-gram.y"

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

-  case 41:
-#line 303 "../../src/parse-gram.y"
+  case 47:
+
+/* Line 1269 of yacc.c  */
+#line 353 "parse-gram.y"

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

-  case 42:
-#line 304 "../../src/parse-gram.y"
+  case 48:
+
+/* Line 1269 of yacc.c  */
+#line 354 "parse-gram.y"

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

-  case 43:
-#line 309 "../../src/parse-gram.y"
+  case 49:
+
+/* Line 1269 of yacc.c  */
+#line 359 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

+      tag_seen = true;

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

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

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

-  case 44:
-#line 319 "../../src/parse-gram.y"
+  case 50:
+
+/* Line 1269 of yacc.c  */
+#line 370 "parse-gram.y"

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

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

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

-  case 45:
-#line 333 "../../src/parse-gram.y"
+  case 51:
+
+/* Line 1269 of yacc.c  */
+#line 384 "parse-gram.y"

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

-  case 46:
-#line 334 "../../src/parse-gram.y"
+  case 52:
+
+/* Line 1269 of yacc.c  */
+#line 385 "parse-gram.y"

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

-  case 47:
-#line 335 "../../src/parse-gram.y"
+  case 53:
+
+/* Line 1269 of yacc.c  */
+#line 386 "parse-gram.y"

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

-  case 48:
-#line 339 "../../src/parse-gram.y"
+  case 54:
+
+/* Line 1269 of yacc.c  */
+#line 390 "parse-gram.y"

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

-  case 49:
-#line 340 "../../src/parse-gram.y"
-    { current_type = (yyvsp[(1) - (1)].uniqstr); }
+  case 55:
+
+/* Line 1269 of yacc.c  */
+#line 391 "parse-gram.y"
+    { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }

     break;
 
     break;
 

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

     break;
 
     break;
 

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

     break;
 
     break;
 

-  case 52:
-#line 352 "../../src/parse-gram.y"
+  case 58:
+
+/* Line 1269 of yacc.c  */
+#line 403 "parse-gram.y"
+    { (yyval.list) = (yyvsp[(1) - (1)].list); }
+    break;
+
+  case 59:
+
+/* Line 1269 of yacc.c  */
+#line 404 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+    break;
+
+  case 60:
+
+/* Line 1269 of yacc.c  */
+#line 408 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+    break;
+
+  case 61:
+
+/* Line 1269 of yacc.c  */
+#line 409 "parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+    break;
+
+  case 62:
+
+/* Line 1269 of yacc.c  */
+#line 410 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+    break;
+
+  case 63:
+
+/* Line 1269 of yacc.c  */
+#line 411 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+    break;
+
+  case 64:
+
+/* Line 1269 of yacc.c  */
+#line 417 "parse-gram.y"

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

+       tag_seen = true;

      }
     break;
 
      }
     break;
 

-  case 53:
-#line 356 "../../src/parse-gram.y"
+  case 65:
+
+/* Line 1269 of yacc.c  */
+#line 422 "parse-gram.y"

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

-  case 54:
-#line 361 "../../src/parse-gram.y"
+  case 66:
+
+/* Line 1269 of yacc.c  */
+#line 427 "parse-gram.y"

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


@@ -2035,8 +2375,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 55:
-#line 367 "../../src/parse-gram.y"
+  case 67:
+
+/* Line 1269 of yacc.c  */
+#line 433 "parse-gram.y"

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


@@ -2044,8 +2386,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 56:
-#line 373 "../../src/parse-gram.y"
+  case 68:
+
+/* Line 1269 of yacc.c  */
+#line 439 "parse-gram.y"

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


@@ -2054,93 +2398,155 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 63:
-#line 403 "../../src/parse-gram.y"
+  case 75:
+
+/* Line 1269 of yacc.c  */
+#line 469 "parse-gram.y"

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

-  case 64:
-#line 409 "../../src/parse-gram.y"
+  case 76:
+
+/* Line 1269 of yacc.c  */
+#line 475 "parse-gram.y"

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

-  case 66:
-#line 413 "../../src/parse-gram.y"
+  case 78:
+
+/* Line 1269 of yacc.c  */
+#line 479 "parse-gram.y"

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

-  case 67:
-#line 414 "../../src/parse-gram.y"
+  case 79:
+
+/* Line 1269 of yacc.c  */
+#line 480 "parse-gram.y"

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

-  case 69:
-#line 420 "../../src/parse-gram.y"
+  case 81:
+
+/* Line 1269 of yacc.c  */
+#line 486 "parse-gram.y"

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

-  case 70:
-#line 422 "../../src/parse-gram.y"
+  case 82:
+
+/* Line 1269 of yacc.c  */
+#line 488 "parse-gram.y"

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

-  case 71:
-#line 424 "../../src/parse-gram.y"
-    { grammar_current_rule_action_append (gram_last_string,
-                                         gram_last_braced_code_loc); }
+  case 83:
+
+/* Line 1269 of yacc.c  */
+#line 490 "parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }

     break;
 
     break;
 

-  case 72:
-#line 427 "../../src/parse-gram.y"
+  case 84:
+
+/* Line 1269 of yacc.c  */
+#line 492 "parse-gram.y"

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

-  case 73:
-#line 429 "../../src/parse-gram.y"
+  case 85:
+
+/* Line 1269 of yacc.c  */
+#line 494 "parse-gram.y"

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

-  case 74:
-#line 431 "../../src/parse-gram.y"
+  case 86:
+
+/* Line 1269 of yacc.c  */
+#line 496 "parse-gram.y"

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

-  case 75:
-#line 435 "../../src/parse-gram.y"
-    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+  case 89:
+
+/* Line 1269 of yacc.c  */
+#line 512 "parse-gram.y"
+    {
+      static char one[] = "1";
+      (yyval.chars) = one;
+    }

     break;
 
     break;
 

-  case 76:
-#line 436 "../../src/parse-gram.y"
-    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+  case 91:
+
+/* Line 1269 of yacc.c  */
+#line 522 "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) = code_props_code_get (plain_code);
+    }
+    break;
+
+  case 92:
+
+/* Line 1269 of yacc.c  */
+#line 542 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }

     break;
 
     break;
 

-  case 77:
-#line 442 "../../src/parse-gram.y"
+  case 93:
+
+/* Line 1269 of yacc.c  */
+#line 544 "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)]));

     }
     break;
 
     }
     break;
 

-  case 78:
-#line 451 "../../src/parse-gram.y"
-    { (yyval.chars) = (yyvsp[(1) - (1)].chars); }
+  case 94:
+
+/* Line 1269 of yacc.c  */
+#line 552 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+    break;
+
+  case 97:
+
+/* Line 1269 of yacc.c  */
+#line 564 "parse-gram.y"
+    {
+      (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
+      symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
+    }

     break;
 
     break;
 

-  case 80:
-#line 458 "../../src/parse-gram.y"
+  case 99:
+
+/* Line 1269 of yacc.c  */
+#line 573 "parse-gram.y"

     {
     {

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

       gram_scanner_last_string_free ();
       gram_scanner_last_string_free ();

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

     }
     break;
 
 
     }
     break;
 
 

-/* Line 1267 of yacc.c.  */
-#line 2144 "../../src/parse-gram.c"
+
+/* Line 1269 of yacc.c  */
+#line 2550 "parse-gram.c"

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


@@ -2291,9 +2697,6 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
       YY_STACK_PRINT (yyss, yyssp);
     }
 

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

   *++yyvsp = yylval;
 
   yyerror_range[1] = yylloc;
   *++yyvsp = yylval;
 
   yyerror_range[1] = yylloc;


@@ -2334,7 +2737,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


@@ -2360,7 +2763,9 @@ yyreturn:
 }
 
 
 }
 
 

-#line 464 "../../src/parse-gram.y"
+
+/* Line 1486 of yacc.c  */
+#line 583 "parse-gram.y"

 
 
 
 
 
 


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

+

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


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

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