Rearrange initialization of the parser state variables so that the

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 7ad37c6fc3f643b1b36c4a62da68993fa3433104..8950d9d5a90bdd85645722607db80b8a46545681 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,20 +1,20 @@
-/* A Bison parser, made by GNU Bison 2.3+.  */
+/* 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.3+"
+#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,122 +71,9 @@
 #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_LEFT = 265,
-     PERCENT_RIGHT = 266,
-     PERCENT_NONASSOC = 267,
-     PERCENT_PREC = 268,
-     PERCENT_DPREC = 269,
-     PERCENT_MERGE = 270,
-     PERCENT_DEBUG = 271,
-     PERCENT_DEFAULT_PREC = 272,
-     PERCENT_DEFINE = 273,
-     PERCENT_DEFINES = 274,
-     PERCENT_ERROR_VERBOSE = 275,
-     PERCENT_EXPECT = 276,
-     PERCENT_EXPECT_RR = 277,
-     PERCENT_FILE_PREFIX = 278,
-     PERCENT_GLR_PARSER = 279,
-     PERCENT_INITIAL_ACTION = 280,
-     PERCENT_LEX_PARAM = 281,
-     PERCENT_LOCATIONS = 282,
-     PERCENT_NAME_PREFIX = 283,
-     PERCENT_NO_DEFAULT_PREC = 284,
-     PERCENT_NO_LINES = 285,
-     PERCENT_NONDETERMINISTIC_PARSER = 286,
-     PERCENT_OUTPUT = 287,
-     PERCENT_PARSE_PARAM = 288,
-     PERCENT_PURE_PARSER = 289,
-     PERCENT_REQUIRE = 290,
-     PERCENT_SKELETON = 291,
-     PERCENT_START = 292,
-     PERCENT_TOKEN_TABLE = 293,
-     PERCENT_VERBOSE = 294,
-     PERCENT_YACC = 295,
-     BRACED_CODE = 296,
-     CHAR = 297,
-     EPILOGUE = 298,
-     EQUAL = 299,
-     ID = 300,
-     ID_COLON = 301,
-     PERCENT_PERCENT = 302,
-     PIPE = 303,
-     PROLOGUE = 304,
-     SEMICOLON = 305,
-     TYPE = 306,
-     PERCENT_UNION = 307
-   };
-#endif
-/* Tokens.  */
-#define GRAM_EOF 0
-#define STRING 258
-#define INT 259
-#define PERCENT_TOKEN 260
-#define PERCENT_NTERM 261
-#define PERCENT_TYPE 262
-#define PERCENT_DESTRUCTOR 263
-#define PERCENT_PRINTER 264
-#define PERCENT_LEFT 265
-#define PERCENT_RIGHT 266
-#define PERCENT_NONASSOC 267
-#define PERCENT_PREC 268
-#define PERCENT_DPREC 269
-#define PERCENT_MERGE 270
-#define PERCENT_DEBUG 271
-#define PERCENT_DEFAULT_PREC 272
-#define PERCENT_DEFINE 273
-#define PERCENT_DEFINES 274
-#define PERCENT_ERROR_VERBOSE 275
-#define PERCENT_EXPECT 276
-#define PERCENT_EXPECT_RR 277
-#define PERCENT_FILE_PREFIX 278
-#define PERCENT_GLR_PARSER 279
-#define PERCENT_INITIAL_ACTION 280
-#define PERCENT_LEX_PARAM 281
-#define PERCENT_LOCATIONS 282
-#define PERCENT_NAME_PREFIX 283
-#define PERCENT_NO_DEFAULT_PREC 284
-#define PERCENT_NO_LINES 285
-#define PERCENT_NONDETERMINISTIC_PARSER 286
-#define PERCENT_OUTPUT 287
-#define PERCENT_PARSE_PARAM 288
-#define PERCENT_PURE_PARSER 289
-#define PERCENT_REQUIRE 290
-#define PERCENT_SKELETON 291
-#define PERCENT_START 292
-#define PERCENT_TOKEN_TABLE 293
-#define PERCENT_VERBOSE 294
-#define PERCENT_YACC 295
-#define BRACED_CODE 296
-#define CHAR 297
-#define EPILOGUE 298
-#define EQUAL 299
-#define ID 300
-#define ID_COLON 301
-#define PERCENT_PERCENT 302
-#define PIPE 303
-#define PROLOGUE 304
-#define SEMICOLON 305
-#define TYPE 306
-#define PERCENT_UNION 307
-
-
-
-

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

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

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


@@ -210,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"


@@ -221,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);


@@ -240,27 +131,29 @@ static void gram_error (location const *, char const *);
 
 static char const *char_name (char);
 
 
 static char const *char_name (char);
 

-static void add_param (char const *, char *, location);
+/** 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


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

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

-#line 97 "parse-gram.y"

 {
 {

+/* Line 191 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;
   unsigned char character;
 }
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;
 }

-/* Line 193 of yacc.c.  */
-#line 297 "parse-gram.c"
+
+/* Line 191 of yacc.c  */
+#line 326 "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


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

-/* Line 216 of yacc.c.  */
-#line 322 "parse-gram.c"
+/* Line 221 of yacc.c  */
+#line 351 "parse-gram.c"

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


@@ -393,14 +422,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
 


@@ -535,20 +564,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */

-#define YYLAST   134
+#define YYLAST   187

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

-#define YYNTOKENS  53
+#define YYNTOKENS  61

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

-#define YYNNTS  27
+#define YYNNTS  31

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

-#define YYNRULES  85
+#define YYNRULES  104

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

-#define YYNSTATES  120
+#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   307
+#define YYMAXUTOK   315

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


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

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

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

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

 {
 {

-       0,     0,     3,     8,     9,    12,    14,    16,    18,    21,
-      25,    27,    29,    32,    35,    39,    41,    44,    47,    49,
-      53,    55,    57,    61,    64,    66,    69,    72,    74,    76,
-      78,    80,    82,    84,    87,    91,    95,    97,    99,   100,
-     102,   106,   107,   111,   112,   116,   120,   124,   126,   128,
-     130,   131,   133,   135,   138,   140,   142,   145,   148,   152,
-     154,   157,   159,   162,   164,   167,   170,   171,   175,   177,
-     181,   184,   185,   188,   191,   195,   199,   203,   205,   207,
-     209,   211,   213,   215,   217,   218
+       0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
+      24,    27,    29,    32,    35,    38,    42,    44,    47,    50,
+      53,    55,    58,    62,    64,    66,    69,    73,    76,    78,
+      80,    83,    86,    88,    90,    92,    94,    96,    98,   101,
+     105,   109,   111,   113,   116,   119,   122,   125,   126,   128,
+     132,   133,   137,   138,   142,   146,   150,   152,   154,   156,
+     157,   159,   161,   164,   166,   169,   171,   173,   175,   177,
+     179,   181,   184,   187,   191,   193,   196,   198,   201,   203,
+     206,   209,   210,   214,   216,   220,   223,   224,   227,   230,
+     234,   238,   242,   244,   246,   247,   249,   251,   253,   255,
+     257,   259,   261,   263,   264

 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {

-      54,     0,    -1,    55,    47,    68,    79,    -1,    -1,    55,
-      56,    -1,    57,    -1,    49,    -1,    16,    -1,    18,    78,
-      -1,    18,    78,    78,    -1,    19,    -1,    20,    -1,    21,
-       4,    -1,    22,     4,    -1,    23,    44,    78,    -1,    24,
-      -1,    25,    41,    -1,    26,    41,    -1,    27,    -1,    28,
-      44,    78,    -1,    30,    -1,    31,    -1,    32,    44,    78,
-      -1,    33,    41,    -1,    34,    -1,    35,    78,    -1,    36,
-      78,    -1,    38,    -1,    39,    -1,    40,    -1,    50,    -1,
-      62,    -1,    59,    -1,    37,    76,    -1,     8,    41,    65,
-      -1,     9,    41,    65,    -1,    17,    -1,    29,    -1,    -1,
-      45,    -1,    52,    58,    41,    -1,    -1,     6,    60,    67,
-      -1,    -1,     5,    61,    67,    -1,     7,    51,    65,    -1,
-      63,    64,    65,    -1,    10,    -1,    11,    -1,    12,    -1,
-      -1,    51,    -1,    76,    -1,    65,    76,    -1,    51,    -1,
-      74,    -1,    74,     4,    -1,    74,    77,    -1,    74,     4,
-      77,    -1,    66,    -1,    67,    66,    -1,    69,    -1,    68,
-      69,    -1,    70,    -1,    57,    50,    -1,     1,    50,    -1,
-      -1,    75,    71,    72,    -1,    73,    -1,    72,    48,    73,
-      -1,    72,    50,    -1,    -1,    73,    76,    -1,    73,    41,
-      -1,    73,    13,    76,    -1,    73,    14,     4,    -1,    73,
-      15,    51,    -1,    45,    -1,    42,    -1,    46,    -1,    74,
-      -1,    77,    -1,     3,    -1,     3,    -1,    -1,    47,    43,
-      -1
+      62,     0,    -1,    63,    53,    78,    91,    -1,    -1,    63,
+      64,    -1,    65,    -1,    55,    -1,    18,    -1,    20,     3,
+      85,    -1,    21,    -1,    21,     3,    -1,    22,    -1,    23,
+       4,    -1,    24,     4,    -1,    25,     3,    -1,    25,    50,
+       3,    -1,    26,    -1,    27,    47,    -1,    28,     3,    -1,
+      29,    47,    -1,    30,    -1,    31,     3,    -1,    31,    50,
+       3,    -1,    33,    -1,    34,    -1,    35,     3,    -1,    35,
+      50,     3,    -1,    36,    47,    -1,    38,    -1,    39,    -1,
+      40,     3,    -1,    42,     3,    -1,    44,    -1,    45,    -1,
+      46,    -1,    56,    -1,    70,    -1,    67,    -1,    43,    89,
+      -1,     8,    47,    74,    -1,     9,    47,    74,    -1,    19,
+      -1,    32,    -1,    16,    86,    -1,    17,    86,    -1,    37,
+      86,    -1,    41,    86,    -1,    -1,    51,    -1,    60,    66,
+      47,    -1,    -1,     6,    68,    77,    -1,    -1,     5,    69,
+      77,    -1,     7,    57,    73,    -1,    71,    72,    73,    -1,
+      10,    -1,    11,    -1,    12,    -1,    -1,    57,    -1,    89,
+      -1,    73,    89,    -1,    75,    -1,    74,    75,    -1,    89,
+      -1,    57,    -1,    58,    -1,    59,    -1,    57,    -1,    87,
+      -1,    87,     4,    -1,    87,    90,    -1,    87,     4,    90,
+      -1,    76,    -1,    77,    76,    -1,    79,    -1,    78,    79,
+      -1,    80,    -1,    65,    56,    -1,     1,    56,    -1,    -1,
+      88,    81,    82,    -1,    83,    -1,    82,    54,    83,    -1,
+      82,    56,    -1,    -1,    83,    89,    -1,    83,    47,    -1,
+      83,    13,    89,    -1,    83,    14,     4,    -1,    83,    15,
+      57,    -1,     3,    -1,    86,    -1,    -1,    84,    -1,    47,
+      -1,    51,    -1,    48,    -1,    52,    -1,    87,    -1,    90,
+      -1,     3,    -1,    -1,    53,    49,    -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,   198,   198,   206,   208,   212,   213,   215,   216,   221,
-     222,   223,   224,   225,   226,   227,   232,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   253,   254,   255,   259,   267,   275,   279,   293,   294,
-     298,   320,   320,   325,   325,   330,   340,   355,   356,   357,
-     361,   362,   367,   368,   373,   377,   382,   388,   394,   405,
-     406,   415,   416,   422,   423,   424,   431,   431,   435,   436,
-     437,   442,   443,   445,   448,   450,   452,   465,   467,   476,
-     481,   482,   487,   496,   501,   503
+       0,   211,   211,   219,   221,   225,   226,   227,   228,   229,
+     230,   235,   236,   237,   238,   239,   240,   245,   249,   250,
+     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,   263,   264,   265,   266,   270,   271,   272,   276,
+     284,   292,   296,   300,   301,   302,   303,   314,   315,   319,
+     347,   347,   352,   352,   357,   368,   383,   384,   385,   389,
+     390,   395,   397,   402,   403,   407,   408,   409,   410,   415,
+     420,   425,   431,   437,   448,   449,   458,   459,   465,   466,
+     467,   474,   474,   478,   479,   480,   485,   486,   488,   490,
+     492,   494,   504,   505,   511,   515,   520,   536,   538,   547,
+     552,   553,   558,   565,   567

 };
 #endif
 
 };
 #endif
 


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

-  "\"%dprec\"", "\"%merge\"", "\"%debug\"", "\"%default-prec\"",
-  "\"%define\"", "\"%defines\"", "\"%error-verbose\"", "\"%expect\"",
-  "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
-  "\"%initial-action\"", "\"%lex-param\"", "\"%locations\"",
-  "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
-  "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param\"",
-  "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"",
-  "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"",
-  "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
-  "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", "\"%union\"", "$accept",
-  "input", "declarations", "declaration", "grammar_declaration",
-  "union_name", "symbol_declaration", "@1", "@2", "precedence_declaration",
-  "precedence_declarator", "type.opt", "symbols.1", "symbol_def",
+  "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%code-top\"", "\"%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\"", "\"%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", "id", "id_colon", "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
 


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

-     305,   306,   307
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315

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

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

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

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


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

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

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

 {
 {

-      -1,     1,     2,    41,    71,    77,    43,    47,    46,    44,
-      45,    79,    85,    81,    82,    72,    73,    74,    98,   106,
-     107,    66,    75,    86,    68,    52,    97
+      -1,     1,     2,    47,    86,    92,    49,    53,    52,    50,
+      51,    94,   100,   105,   106,    96,    97,    87,    88,    89,
+     121,   130,   131,   110,   111,    58,    81,    90,   107,    83,
+     120

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

-#define YYPACT_NINF -70
+#define YYPACT_NINF -95

 static const yytype_int8 yypact[] =
 {
 static const yytype_int8 yypact[] =
 {

-     -70,     5,    79,   -70,   -70,   -70,   -19,    -4,     8,   -70,
-     -70,   -70,   -70,   -70,    47,   -70,   -70,    54,    61,    25,
-     -70,    38,    39,   -70,    37,   -70,   -70,   -70,    48,    41,
-     -70,    47,    47,    26,   -70,   -70,   -70,    14,   -70,   -70,
-      49,   -70,   -70,   -70,   -70,    42,    19,    19,    26,    26,
-      26,   -70,    47,   -70,   -70,    47,   -70,   -70,    47,    47,
-     -70,   -70,   -70,   -70,   -70,   -70,   -70,   -70,   -70,    70,
-     -70,    71,     1,   -70,   -70,   -70,   -70,    81,   -70,    26,
-     -70,   -70,    19,    13,    19,    26,   -70,    26,    26,   -70,
-     -70,   -70,   -70,   -70,   -70,    80,   -70,   -70,   -70,   -70,
-      26,   -70,   121,   -70,   -70,   -70,    -8,    31,   -70,   -70,
-     -70,    26,   123,    74,   -70,   -70,    31,   -70,   -70,   -70
+     -95,     3,   127,   -95,   -95,   -95,   -24,    -7,    -6,   -95,
+     -95,   -95,    -3,    -3,   -95,   -95,    42,    56,   -95,    70,
+      87,    10,   -95,    28,    90,    47,   -95,    35,   -95,   -95,
+     -95,    36,    48,    -3,   -95,   -95,    94,    -3,    95,    -2,
+     -95,   -95,   -95,    71,   -95,   -95,    49,   -95,   -95,   -95,
+     -95,    45,   -43,   -43,    -2,    -1,    -1,   -95,   -95,   -95,
+      21,   -95,   -95,   -95,   -95,    96,   -95,   -95,   -95,   -95,
+     101,   -95,   102,   -95,   -95,   -95,   -95,   -95,   -95,   -95,
+     -95,   -95,   -95,   -95,    50,   -95,    51,    11,   -95,   -95,
+     -95,   -95,    62,   -95,    -2,   -95,   -95,   -43,     6,   -43,
+      -2,   -95,   -95,   -95,   -95,    -1,   -95,   -95,    -1,   -95,
+     -95,   -95,   -95,   -95,   -95,   -95,   -95,   -95,    61,   -95,
+     -95,   -95,   -95,    -2,   -95,   108,   -95,   -95,   -95,   -95,
+     -22,    22,   -95,   -95,   -95,    -2,   109,    58,   -95,   -95,
+      22,   -95,   -95,   -95

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

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

 {
 {

-     -70,   -70,   -70,   -70,   128,   -70,   -70,   -70,   -70,   -70,
-     -70,   -70,   -22,    -7,    85,   -70,    62,   -70,   -70,   -70,
-      24,   -43,   -70,   -33,   -69,     4,   -70
+     -95,   -95,   -95,   -95,   114,   -95,   -95,   -95,   -95,   -95,
+     -95,   -95,    23,    63,   -79,   -32,    65,   -95,    33,   -95,
+     -95,   -95,   -12,   -95,   -95,    29,   -46,   -95,   -39,   -94,
+     -95

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

 {
 {

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

 };
 
 };
 

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

 {
 {

-      33,     0,     1,    46,    47,     0,     5,     6,     7,     8,
-       9,    10,    11,    12,    83,     1,     3,     4,    17,     5,
-       6,     7,     8,     9,    10,    11,    12,    49,    50,     3,
-      29,    17,    51,   102,     3,    31,    32,    41,    37,    82,
-      48,    84,    50,    29,    13,    14,    15,    46,    47,    41,
-       3,    37,    85,    52,    87,    88,    52,    79,     4,    55,
-      46,    42,    58,    59,    45,     4,    52,   100,    42,    44,
-      51,    45,    41,    42,   107,    82,    45,    84,   111,    41,
-      41,    44,    41,   116,     5,     6,     7,     8,     9,    10,
-      11,    12,    44,    51,    45,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      50,    50,    41,    43,     3,    51,    47,     4,    49,    50,
-       2,    52,    47,   109,    72
+      39,     3,     3,     0,    98,    48,    52,    53,    51,     3,
+       4,     0,     1,     3,    57,    54,     5,     6,     7,     8,
+       9,    10,    11,    12,     3,     3,   105,    16,    17,   108,
+      19,   125,    54,    57,    56,    13,    14,    15,     3,     3,
+      47,    47,    13,    32,    47,     3,    48,    48,    37,    51,
+      51,    97,    41,    99,    43,    94,    57,    58,    59,     3,
+      50,   100,    33,    52,    53,    97,    37,    99,    47,    47,
+      48,    60,     1,    51,     4,    47,     5,     6,     7,     8,
+       9,    10,    11,    12,   123,    50,    50,    16,    17,    60,
+      19,     4,   131,     3,    47,    47,   135,     3,     3,     3,
+      51,   140,    57,    32,     3,     3,    56,    56,    37,    47,
+      49,     3,    41,     4,    43,    57,     2,    94,    53,    56,
+      87,   133,    -1,    52,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    60,     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,    46,    -1,    -1,    -1,    -1,    -1,    -1,
+      53,    -1,    55,    56,    -1,    -1,    -1,    60

 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {

-       0,    54,    55,     0,     5,     6,     7,     8,     9,    10,
+       0,    62,    63,     0,     5,     6,     7,     8,     9,    10,

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

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

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


@@ -976,74 +1043,148 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
   switch (yytype)
     {
       case 3: /* "\"string\"" */
   switch (yytype)
     {
       case 3: /* "\"string\"" */

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

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

-#line 982 "parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1053 "parse-gram.c"

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

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

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

-#line 987 "parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1062 "parse-gram.c"

        break;
        break;

-      case 41: /* "\"{...}\"" */
-#line 179 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-#line 992 "parse-gram.c"
+      case 47: /* "\"{...}\"" */
+
+/* Line 670 of yacc.c  */
+#line 191 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
+
+/* Line 670 of yacc.c  */
+#line 1071 "parse-gram.c"

        break;
        break;

-      case 42: /* "\"char\"" */
-#line 174 "parse-gram.y"
+      case 48: /* "\"char\"" */
+
+/* Line 670 of yacc.c  */
+#line 183 "parse-gram.y"

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

-#line 997 "parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1080 "parse-gram.c"

        break;
        break;

-      case 43: /* "\"epilogue\"" */
-#line 179 "parse-gram.y"
+      case 49: /* "\"epilogue\"" */
+
+/* Line 670 of yacc.c  */
+#line 191 "parse-gram.y"

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

-#line 1002 "parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1089 "parse-gram.c"

        break;
        break;

-      case 45: /* "\"identifier\"" */
-#line 183 "parse-gram.y"
+      case 51: /* "\"identifier\"" */
+
+/* Line 670 of yacc.c  */
+#line 196 "parse-gram.y"

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

-#line 1007 "parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1098 "parse-gram.c"

        break;
        break;

-      case 46: /* "\"identifier:\"" */
-#line 184 "parse-gram.y"
+      case 52: /* "\"identifier:\"" */
+
+/* Line 670 of yacc.c  */
+#line 197 "parse-gram.y"

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

-#line 1012 "parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1107 "parse-gram.c"

        break;
        break;

-      case 49: /* "\"%{...%}\"" */
-#line 179 "parse-gram.y"
+      case 55: /* "\"%{...%}\"" */
+
+/* Line 670 of yacc.c  */
+#line 191 "parse-gram.y"

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

-#line 1017 "parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1116 "parse-gram.c"

        break;
        break;

-      case 51: /* "\"type\"" */
-#line 182 "parse-gram.y"
+      case 57: /* "\"type\"" */
+
+/* Line 670 of yacc.c  */
+#line 195 "parse-gram.y"

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

-#line 1022 "parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1125 "parse-gram.c"

        break;
        break;

-      case 74: /* "id" */
-#line 190 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-#line 1027 "parse-gram.c"
+      case 84: /* "content" */
+
+/* Line 670 of yacc.c  */
+#line 191 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+
+/* Line 670 of yacc.c  */
+#line 1134 "parse-gram.c"

        break;
        break;

-      case 75: /* "id_colon" */
+      case 85: /* "content.opt" */
+
+/* Line 670 of yacc.c  */

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

-       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-#line 1032 "parse-gram.c"
+       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+
+/* Line 670 of yacc.c  */
+#line 1143 "parse-gram.c"

        break;
        break;

-      case 76: /* "symbol" */
-#line 190 "parse-gram.y"
+      case 86: /* "braceless" */
+
+/* Line 670 of yacc.c  */
+#line 191 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+
+/* Line 670 of yacc.c  */
+#line 1152 "parse-gram.c"
+       break;
+      case 87: /* "id" */
+
+/* Line 670 of yacc.c  */
+#line 203 "parse-gram.y"

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

-#line 1037 "parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1161 "parse-gram.c"
+       break;
+      case 88: /* "id_colon" */
+
+/* Line 670 of yacc.c  */
+#line 204 "parse-gram.y"
+       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
+
+/* Line 670 of yacc.c  */
+#line 1170 "parse-gram.c"

        break;
        break;

-      case 77: /* "string_as_id" */
-#line 190 "parse-gram.y"
+      case 89: /* "symbol" */
+
+/* Line 670 of yacc.c  */
+#line 203 "parse-gram.y"

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

-#line 1042 "parse-gram.c"
+
+/* Line 670 of yacc.c  */
+#line 1179 "parse-gram.c"

        break;
        break;

-      case 78: /* "string_content" */
-#line 177 "parse-gram.y"
-       { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-#line 1047 "parse-gram.c"
+      case 90: /* "string_as_id" */
+
+/* Line 670 of yacc.c  */
+#line 203 "parse-gram.y"
+       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+
+/* Line 670 of yacc.c  */
+#line 1188 "parse-gram.c"

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


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


@@ -1548,20 +1692,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 88 "parse-gram.y"
+  
+/* Line 1076 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 1565 "parse-gram.c"
+
+/* Line 1076 of yacc.c  */
+#line 1712 "parse-gram.c"

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


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


@@ -1692,9 +1842,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)


@@ -1703,9 +1850,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;


@@ -1746,309 +1892,517 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-#line 213 "parse-gram.y"
-    { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])),
-                                                      (yylsp[(1) - (1)])); }
+
+/* Line 1269 of yacc.c  */
+#line 226 "parse-gram.y"
+    { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), union_seen); }

     break;
 
   case 7:
     break;
 
   case 7:

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

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

-#line 217 "parse-gram.y"
-    {
-      static char one[] = "1";
-      muscle_insert ((yyvsp[(2) - (2)].chars), one);
-    }
+
+/* Line 1269 of yacc.c  */
+#line 228 "parse-gram.y"
+    { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }

     break;
 
   case 9:
     break;
 
   case 9:

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

     break;
 
   case 10:
     break;
 
   case 10:

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

     break;
 
   case 11:
     break;
 
   case 11:

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

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

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

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

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

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

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

     break;
 
   case 15:
     break;
 
   case 15:

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

     break;
 
   case 16:
     break;
 
   case 16:

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

     {
     {

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

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

-#line 236 "parse-gram.y"
-    { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+
+/* Line 1269 of yacc.c  */
+#line 246 "parse-gram.y"
+    {
+      muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
+    }

     break;
 
   case 18:
     break;
 
   case 18:

-#line 237 "parse-gram.y"
-    { locations_flag = true; }
+
+/* Line 1269 of yacc.c  */
+#line 249 "parse-gram.y"
+    { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }

     break;
 
   case 19:
     break;
 
   case 19:

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

     break;
 
   case 20:
     break;
 
   case 20:

-#line 239 "parse-gram.y"
-    { no_lines_flag = true; }
+
+/* Line 1269 of yacc.c  */
+#line 251 "parse-gram.y"
+    { locations_flag = true; }

     break;
 
   case 21:
     break;
 
   case 21:

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

     break;
 
   case 22:
     break;
 
   case 22:

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

     break;
 
   case 23:
     break;
 
   case 23:

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

     break;
 
   case 24:
     break;
 
   case 24:

-#line 243 "parse-gram.y"
-    { pure_parser = true; }
+
+/* Line 1269 of yacc.c  */
+#line 255 "parse-gram.y"
+    { nondeterministic_parser = true; }

     break;
 
   case 25:
     break;
 
   case 25:

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

     break;
 
   case 26:
     break;
 
   case 26:

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

     break;
 
   case 27:
     break;
 
   case 27:

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

     break;
 
   case 28:
     break;
 
   case 28:

-#line 247 "parse-gram.y"
-    { report_flag = report_states; }
+
+/* Line 1269 of yacc.c  */
+#line 259 "parse-gram.y"
+    { pure_parser = true; }

     break;
 
   case 29:
     break;
 
   case 29:

-#line 248 "parse-gram.y"
-    { yacc_flag = true; }
+
+/* Line 1269 of yacc.c  */
+#line 260 "parse-gram.y"
+    { push_parser = true; pure_parser = true; }
+    break;
+
+  case 30:
+
+/* Line 1269 of yacc.c  */
+#line 261 "parse-gram.y"
+    { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+    break;
+
+  case 31:
+
+/* Line 1269 of yacc.c  */
+#line 262 "parse-gram.y"
+    { skeleton_arg ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
+    break;
+
+  case 32:
+
+/* Line 1269 of yacc.c  */
+#line 263 "parse-gram.y"
+    { token_table_flag = true; }

     break;
 
   case 33:
     break;
 
   case 33:

-#line 256 "parse-gram.y"
+
+/* Line 1269 of yacc.c  */
+#line 264 "parse-gram.y"
+    { report_flag = report_states; }
+    break;
+
+  case 34:
+
+/* Line 1269 of yacc.c  */
+#line 265 "parse-gram.y"
+    { yacc_flag = true; }
+    break;
+
+  case 38:
+
+/* Line 1269 of yacc.c  */
+#line 273 "parse-gram.y"

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

-  case 34:
-#line 260 "parse-gram.y"
+  case 39:
+
+/* Line 1269 of yacc.c  */
+#line 277 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

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

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

-       symbol_destructor_set (list->sym, action, (yylsp[(2) - (3)]));
+       symbol_list_destructor_set (list, action, (yylsp[(2) - (3)]));

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

-  case 35:
-#line 268 "parse-gram.y"
+  case 40:
+
+/* Line 1269 of yacc.c  */
+#line 285 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

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

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

-       symbol_printer_set (list->sym, action, (yylsp[(2) - (3)]));
+       symbol_list_printer_set (list, action, (yylsp[(2) - (3)]));

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

-  case 36:
-#line 276 "parse-gram.y"
+  case 41:
+
+/* Line 1269 of yacc.c  */
+#line 293 "parse-gram.y"

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

-  case 37:
-#line 280 "parse-gram.y"
+  case 42:
+
+/* Line 1269 of yacc.c  */
+#line 297 "parse-gram.y"

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

-  case 38:
-#line 293 "parse-gram.y"
+  case 43:
+
+/* Line 1269 of yacc.c  */
+#line 300 "parse-gram.y"
+    { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), true); }
+    break;
+
+  case 44:
+
+/* Line 1269 of yacc.c  */
+#line 301 "parse-gram.y"
+    { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), false); }
+    break;
+
+  case 45:
+
+/* Line 1269 of yacc.c  */
+#line 302 "parse-gram.y"
+    { muscle_code_grow ("provides", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+    break;
+
+  case 46:
+
+/* Line 1269 of yacc.c  */
+#line 303 "parse-gram.y"
+    { muscle_code_grow ("requires", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+    break;
+
+  case 47:
+
+/* Line 1269 of yacc.c  */
+#line 314 "parse-gram.y"

     {}
     break;
 
     {}
     break;
 

-  case 39:
-#line 294 "parse-gram.y"
+  case 48:
+
+/* Line 1269 of yacc.c  */
+#line 315 "parse-gram.y"

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

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

     {
     {

-      char const *body = (yyvsp[(3) - (3)].chars);
+      char const *body = (yyvsp[(3) - (3)].code);

 
 

-      if (typed)
+      /* 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

        {
        {

-         /* 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';
          char *code = muscle_find ("stype");
          code[strlen (code) - 1] = '\n';

-         body++;

        }
        }

+      body++;

 
 

-      typed = true;
+      union_seen = true;

       muscle_code_grow ("stype", body, (yylsp[(3) - (3)]));
     }
     break;
 
       muscle_code_grow ("stype", body, (yylsp[(3) - (3)]));
     }
     break;
 

-  case 41:
-#line 320 "parse-gram.y"
+  case 50:
+
+/* Line 1269 of yacc.c  */
+#line 347 "parse-gram.y"

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

-  case 42:
-#line 321 "parse-gram.y"
+  case 51:
+
+/* Line 1269 of yacc.c  */
+#line 348 "parse-gram.y"

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

-  case 43:
-#line 325 "parse-gram.y"
+  case 52:
+
+/* Line 1269 of yacc.c  */
+#line 352 "parse-gram.y"

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

-  case 44:
-#line 326 "parse-gram.y"
+  case 53:
+
+/* Line 1269 of yacc.c  */
+#line 353 "parse-gram.y"

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

-  case 45:
-#line 331 "parse-gram.y"
+  case 54:
+
+/* Line 1269 of yacc.c  */
+#line 358 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

+      tag_seen = true;

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

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

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

-  case 46:
-#line 341 "parse-gram.y"
+  case 55:
+
+/* Line 1269 of yacc.c  */
+#line 369 "parse-gram.y"

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

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

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

-  case 47:
-#line 355 "parse-gram.y"
+  case 56:
+
+/* Line 1269 of yacc.c  */
+#line 383 "parse-gram.y"

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

-  case 48:
-#line 356 "parse-gram.y"
+  case 57:
+
+/* Line 1269 of yacc.c  */
+#line 384 "parse-gram.y"

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

-  case 49:
-#line 357 "parse-gram.y"
+  case 58:
+
+/* Line 1269 of yacc.c  */
+#line 385 "parse-gram.y"

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

-  case 50:
-#line 361 "parse-gram.y"
+  case 59:
+
+/* Line 1269 of yacc.c  */
+#line 389 "parse-gram.y"

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

-  case 51:
-#line 362 "parse-gram.y"
-    { current_type = (yyvsp[(1) - (1)].uniqstr); }
+  case 60:
+
+/* Line 1269 of yacc.c  */
+#line 390 "parse-gram.y"
+    { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }

     break;
 
     break;
 

-  case 52:
-#line 367 "parse-gram.y"
-    { (yyval.list) = symbol_list_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+  case 61:
+
+/* Line 1269 of yacc.c  */
+#line 396 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }

     break;
 
     break;
 

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

     break;
 
     break;
 

-  case 54:
-#line 374 "parse-gram.y"
+  case 63:
+
+/* Line 1269 of yacc.c  */
+#line 402 "parse-gram.y"
+    { (yyval.list) = (yyvsp[(1) - (1)].list); }
+    break;
+
+  case 64:
+
+/* Line 1269 of yacc.c  */
+#line 403 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+    break;
+
+  case 65:
+
+/* Line 1269 of yacc.c  */
+#line 407 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+    break;
+
+  case 66:
+
+/* Line 1269 of yacc.c  */
+#line 408 "parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+    break;
+
+  case 67:
+
+/* Line 1269 of yacc.c  */
+#line 409 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+    break;
+
+  case 68:
+
+/* Line 1269 of yacc.c  */
+#line 410 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+    break;
+
+  case 69:
+
+/* Line 1269 of yacc.c  */
+#line 416 "parse-gram.y"

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

+       tag_seen = true;

      }
     break;
 
      }
     break;
 

-  case 55:
-#line 378 "parse-gram.y"
+  case 70:
+
+/* Line 1269 of yacc.c  */
+#line 421 "parse-gram.y"

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

-  case 56:
-#line 383 "parse-gram.y"
+  case 71:
+
+/* Line 1269 of yacc.c  */
+#line 426 "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)]));


@@ -2056,8 +2410,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 57:
-#line 389 "parse-gram.y"
+  case 72:
+
+/* Line 1269 of yacc.c  */
+#line 432 "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)]));


@@ -2065,8 +2421,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 58:
-#line 395 "parse-gram.y"
+  case 73:
+
+/* Line 1269 of yacc.c  */
+#line 438 "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)]));


@@ -2075,66 +2433,109 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 65:
-#line 425 "parse-gram.y"
+  case 80:
+
+/* Line 1269 of yacc.c  */
+#line 468 "parse-gram.y"

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

-  case 66:
-#line 431 "parse-gram.y"
+  case 81:
+
+/* Line 1269 of yacc.c  */
+#line 474 "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 68:
-#line 435 "parse-gram.y"
+  case 83:
+
+/* Line 1269 of yacc.c  */
+#line 478 "parse-gram.y"

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

-  case 69:
-#line 436 "parse-gram.y"
+  case 84:
+
+/* Line 1269 of yacc.c  */
+#line 479 "parse-gram.y"

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

-  case 71:
-#line 442 "parse-gram.y"
+  case 86:
+
+/* Line 1269 of yacc.c  */
+#line 485 "parse-gram.y"

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

-  case 72:
-#line 444 "parse-gram.y"
+  case 87:
+
+/* Line 1269 of yacc.c  */
+#line 487 "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 73:
-#line 446 "parse-gram.y"
-    { grammar_current_rule_action_append (gram_last_string,
-                                         gram_last_braced_code_loc); }
+  case 88:
+
+/* Line 1269 of yacc.c  */
+#line 489 "parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }

     break;
 
     break;
 

-  case 74:
-#line 449 "parse-gram.y"
+  case 89:
+
+/* Line 1269 of yacc.c  */
+#line 491 "parse-gram.y"

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

-  case 75:
-#line 451 "parse-gram.y"
+  case 90:
+
+/* Line 1269 of yacc.c  */
+#line 493 "parse-gram.y"

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

-  case 76:
-#line 453 "parse-gram.y"
+  case 91:
+
+/* Line 1269 of yacc.c  */
+#line 495 "parse-gram.y"

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

-  case 77:
-#line 466 "parse-gram.y"
-    { (yyval.symbol) = symbol_get ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 94:
+
+/* Line 1269 of yacc.c  */
+#line 511 "parse-gram.y"
+    {
+      static char one[] = "1";
+      (yyval.chars) = one;
+    }

     break;
 
     break;
 

-  case 78:
-#line 468 "parse-gram.y"
+  case 96:
+
+/* Line 1269 of yacc.c  */
+#line 521 "parse-gram.y"
+    {
+      (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
+      (yyval.chars) = translate_code ((yyvsp[(1) - (1)].code) + 1, (yylsp[(1) - (1)]));
+    }
+    break;
+
+  case 97:
+
+/* Line 1269 of yacc.c  */
+#line 537 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+    break;
+
+  case 98:
+
+/* Line 1269 of yacc.c  */
+#line 539 "parse-gram.y"

     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);


@@ -2142,26 +2543,27 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 79:
-#line 476 "parse-gram.y"
-    { (yyval.symbol) = symbol_get ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 99:
+
+/* Line 1269 of yacc.c  */
+#line 547 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }

     break;
 
     break;
 

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

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

-  case 83:
-#line 497 "parse-gram.y"
-    { (yyval.chars) = (yyvsp[(1) - (1)].chars); }
-    break;
+  case 104:

 
 

-  case 85:
-#line 504 "parse-gram.y"
+/* Line 1269 of yacc.c  */
+#line 568 "parse-gram.y"

     {
       muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
       gram_scanner_last_string_free ();
     {
       muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
       gram_scanner_last_string_free ();


@@ -2169,8 +2571,9 @@ yyreduce:
     break;
 
 
     break;
 
 

-/* Line 1267 of yacc.c.  */
-#line 2174 "parse-gram.c"
+
+/* Line 1269 of yacc.c  */
+#line 2577 "parse-gram.c"

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


@@ -2321,9 +2724,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;


@@ -2364,7 +2764,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


@@ -2390,7 +2790,9 @@ yyreturn:
 }
 
 
 }
 
 

-#line 510 "parse-gram.y"
+
+/* Line 1486 of yacc.c  */
+#line 574 "parse-gram.y"

 
 
 
 
 
 


@@ -2475,6 +2877,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)
 {