maint: run "make update-copyright"

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 725a8688220b18a6ffc5b5f8b0fe7fe3eb5a50e9..cb757d7f4aee8c10c837e19facc6baa0116d39bc 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,14 +1,13 @@
-/* A Bison parser, made by GNU Bison 2.3a.  */
+/* A Bison parser, made by GNU Bison 2.4.462-882b.  */

 
 

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

 
 

-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2010 Free Software Foundation, Inc.

 
 

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

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

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of


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

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

 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work


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

-#define YYBISON_VERSION "2.3a"
+#define YYBISON_VERSION "2.4.462-882b"

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


@@ -58,31 +55,34 @@
 /* Push parsers.  */
 #define YYPUSH 0
 
 /* Push parsers.  */
 #define YYPUSH 0
 

+/* Pull parsers.  */
+#define YYPULL 1
+

 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* Substitute the variable and function names.  */
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* Substitute the variable and function names.  */

-#define yyparse gram_parse
-#define yylex   gram_lex
-#define yyerror gram_error
-#define yylval  gram_lval
-#define yychar  gram_char
-#define yydebug gram_debug
-#define yynerrs gram_nerrs
-#define yylloc gram_lloc
+#define yyparse         gram_parse
+#define yylex           gram_lex
+#define yyerror         gram_error
+#define yylval          gram_lval
+#define yychar          gram_char
+#define yydebug         gram_debug
+#define yynerrs         gram_nerrs
+#define yylloc          gram_lloc

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

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

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

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

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

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

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

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

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


@@ -91,22 +91,18 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

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

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

-#include <strverscmp.h>
-

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

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

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


@@ -130,26 +126,8 @@ static void gram_error (location const *, char const *);
 
 static char const *char_name (char);
 
 
 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 uniqstr current_type = NULL;
-static symbol *current_lhs;
-static location current_lhs_location;
-static int current_prec = 0;
-
-#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 252 of yacc.c  */
+#line 131 "src/parse-gram.c"

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


@@ -169,6 +147,24 @@ static int current_prec = 0;
 # define YYTOKEN_TABLE 0
 #endif
 
 # define YYTOKEN_TABLE 0
 #endif
 

+/* "%code requires" blocks.  */
+/* Line 272 of yacc.c  */
+#line 201 "src/parse-gram.y"
+
+# ifndef PARAM_TYPE
+#  define PARAM_TYPE
+  typedef enum
+  {
+    param_none   = 0,
+    param_lex    = 1 << 0,
+    param_parse  = 1 << 1,
+    param_both   = param_lex | param_parse
+  } param_type;
+# endif
+
+
+/* Line 272 of yacc.c  */
+#line 168 "src/parse-gram.c"

 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE


@@ -184,55 +180,52 @@ static int current_prec = 0;
      PERCENT_TYPE = 262,
      PERCENT_DESTRUCTOR = 263,
      PERCENT_PRINTER = 264,
      PERCENT_TYPE = 262,
      PERCENT_DESTRUCTOR = 263,
      PERCENT_PRINTER = 264,

-     PERCENT_SYMBOL_DEFAULT = 265,
-     PERCENT_LEFT = 266,
-     PERCENT_RIGHT = 267,
-     PERCENT_NONASSOC = 268,
+     PERCENT_LEFT = 265,
+     PERCENT_RIGHT = 266,
+     PERCENT_NONASSOC = 267,
+     PERCENT_PRECEDENCE = 268,

      PERCENT_PREC = 269,
      PERCENT_DPREC = 270,
      PERCENT_MERGE = 271,
      PERCENT_PREC = 269,
      PERCENT_DPREC = 270,
      PERCENT_MERGE = 271,

-     PERCENT_AFTER_HEADER = 272,
-     PERCENT_BEFORE_HEADER = 273,
-     PERCENT_DEBUG = 274,
-     PERCENT_DEFAULT_PREC = 275,
-     PERCENT_DEFINE = 276,
-     PERCENT_DEFINES = 277,
-     PERCENT_END_HEADER = 278,
-     PERCENT_ERROR_VERBOSE = 279,
-     PERCENT_EXPECT = 280,
-     PERCENT_EXPECT_RR = 281,
-     PERCENT_FILE_PREFIX = 282,
-     PERCENT_GLR_PARSER = 283,
-     PERCENT_INITIAL_ACTION = 284,
-     PERCENT_LEX_PARAM = 285,
-     PERCENT_LOCATIONS = 286,
-     PERCENT_NAME_PREFIX = 287,
-     PERCENT_NO_DEFAULT_PREC = 288,
-     PERCENT_NO_LINES = 289,
-     PERCENT_NONDETERMINISTIC_PARSER = 290,
-     PERCENT_OUTPUT = 291,
-     PERCENT_PARSE_PARAM = 292,
-     PERCENT_PURE_PARSER = 293,
-     PERCENT_PUSH_PARSER = 294,
-     PERCENT_REQUIRE = 295,
-     PERCENT_SKELETON = 296,
-     PERCENT_START = 297,
-     PERCENT_START_HEADER = 298,
-     PERCENT_TOKEN_TABLE = 299,
-     PERCENT_VERBOSE = 300,
-     PERCENT_YACC = 301,
-     BRACED_CODE = 302,
-     CHAR = 303,
-     EPILOGUE = 304,
-     EQUAL = 305,
-     ID = 306,
-     ID_COLON = 307,
-     PERCENT_PERCENT = 308,
-     PIPE = 309,
-     PROLOGUE = 310,
-     SEMICOLON = 311,
-     TYPE = 312,
-     PERCENT_UNION = 313
+     PERCENT_CODE = 272,
+     PERCENT_DEFAULT_PREC = 273,
+     PERCENT_DEFINE = 274,
+     PERCENT_DEFINES = 275,
+     PERCENT_ERROR_VERBOSE = 276,
+     PERCENT_EXPECT = 277,
+     PERCENT_EXPECT_RR = 278,
+     PERCENT_FLAG = 279,
+     PERCENT_FILE_PREFIX = 280,
+     PERCENT_GLR_PARSER = 281,
+     PERCENT_INITIAL_ACTION = 282,
+     PERCENT_LANGUAGE = 283,
+     PERCENT_NAME_PREFIX = 284,
+     PERCENT_NO_DEFAULT_PREC = 285,
+     PERCENT_NO_LINES = 286,
+     PERCENT_NONDETERMINISTIC_PARSER = 287,
+     PERCENT_OUTPUT = 288,
+     PERCENT_REQUIRE = 289,
+     PERCENT_SKELETON = 290,
+     PERCENT_START = 291,
+     PERCENT_TOKEN_TABLE = 292,
+     PERCENT_VERBOSE = 293,
+     PERCENT_YACC = 294,
+     BRACED_CODE = 295,
+     BRACKETED_ID = 296,
+     CHAR = 297,
+     EPILOGUE = 298,
+     EQUAL = 299,
+     ID = 300,
+     ID_COLON = 301,
+     PERCENT_PERCENT = 302,
+     PIPE = 303,
+     PROLOGUE = 304,
+     SEMICOLON = 305,
+     TAG = 306,
+     TAG_ANY = 307,
+     TAG_NONE = 308,
+     PERCENT_PARAM = 309,
+     PERCENT_UNION = 310

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


@@ -244,75 +237,81 @@ static int current_prec = 0;
 #define PERCENT_TYPE 262
 #define PERCENT_DESTRUCTOR 263
 #define PERCENT_PRINTER 264
 #define PERCENT_TYPE 262
 #define PERCENT_DESTRUCTOR 263
 #define PERCENT_PRINTER 264

-#define PERCENT_SYMBOL_DEFAULT 265
-#define PERCENT_LEFT 266
-#define PERCENT_RIGHT 267
-#define PERCENT_NONASSOC 268
+#define PERCENT_LEFT 265
+#define PERCENT_RIGHT 266
+#define PERCENT_NONASSOC 267
+#define PERCENT_PRECEDENCE 268

 #define PERCENT_PREC 269
 #define PERCENT_DPREC 270
 #define PERCENT_MERGE 271
 #define PERCENT_PREC 269
 #define PERCENT_DPREC 270
 #define PERCENT_MERGE 271

-#define PERCENT_AFTER_HEADER 272
-#define PERCENT_BEFORE_HEADER 273
-#define PERCENT_DEBUG 274
-#define PERCENT_DEFAULT_PREC 275
-#define PERCENT_DEFINE 276
-#define PERCENT_DEFINES 277
-#define PERCENT_END_HEADER 278
-#define PERCENT_ERROR_VERBOSE 279
-#define PERCENT_EXPECT 280
-#define PERCENT_EXPECT_RR 281
-#define PERCENT_FILE_PREFIX 282
-#define PERCENT_GLR_PARSER 283
-#define PERCENT_INITIAL_ACTION 284
-#define PERCENT_LEX_PARAM 285
-#define PERCENT_LOCATIONS 286
-#define PERCENT_NAME_PREFIX 287
-#define PERCENT_NO_DEFAULT_PREC 288
-#define PERCENT_NO_LINES 289
-#define PERCENT_NONDETERMINISTIC_PARSER 290
-#define PERCENT_OUTPUT 291
-#define PERCENT_PARSE_PARAM 292
-#define PERCENT_PURE_PARSER 293
-#define PERCENT_PUSH_PARSER 294
-#define PERCENT_REQUIRE 295
-#define PERCENT_SKELETON 296
-#define PERCENT_START 297
-#define PERCENT_START_HEADER 298
-#define PERCENT_TOKEN_TABLE 299
-#define PERCENT_VERBOSE 300
-#define PERCENT_YACC 301
-#define BRACED_CODE 302
-#define CHAR 303
-#define EPILOGUE 304
-#define EQUAL 305
-#define ID 306
-#define ID_COLON 307
-#define PERCENT_PERCENT 308
-#define PIPE 309
-#define PROLOGUE 310
-#define SEMICOLON 311
-#define TYPE 312
-#define PERCENT_UNION 313
+#define PERCENT_CODE 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_FLAG 279
+#define PERCENT_FILE_PREFIX 280
+#define PERCENT_GLR_PARSER 281
+#define PERCENT_INITIAL_ACTION 282
+#define PERCENT_LANGUAGE 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_REQUIRE 289
+#define PERCENT_SKELETON 290
+#define PERCENT_START 291
+#define PERCENT_TOKEN_TABLE 292
+#define PERCENT_VERBOSE 293
+#define PERCENT_YACC 294
+#define BRACED_CODE 295
+#define BRACKETED_ID 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 TAG 306
+#define TAG_ANY 307
+#define TAG_NONE 308
+#define PERCENT_PARAM 309
+#define PERCENT_UNION 310

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

-{/* Line 198 of yacc.c.  */
-#line 98 "parse-gram.y"
+{
+/* Line 277 of yacc.c  */
+#line 87 "src/parse-gram.y"

 
 

+  assoc assoc;
+  char *code;
+  char const *chars;
+  int integer;
+  named_ref *named_ref;

   symbol *symbol;
   symbol_list *list;
   symbol *symbol;
   symbol_list *list;

-  int integer;
-  char *chars;
-  assoc assoc;

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

-}
-/* Line 198 of yacc.c.  */
-#line 315 "parse-gram.c"
-       YYSTYPE;
+
+/* Line 277 of yacc.c  */
+#line 225 "src/parse-gram.y"
+
+  param_type param;
+
+
+/* Line 277 of yacc.c  */
+#line 314 "src/parse-gram.c"
+} YYSTYPE;

 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1


@@ -334,8 +333,39 @@ typedef struct YYLTYPE
 
 /* Copy the second part of user declarations.  */
 
 
 /* Copy the second part of user declarations.  */
 

-/* Line 221 of yacc.c.  */
-#line 339 "parse-gram.c"
+/* Line 327 of yacc.c  */
+#line 338 "src/parse-gram.c"
+/* Unqualified %code blocks.  */
+/* Line 328 of yacc.c  */
+#line 55 "src/parse-gram.y"
+
+  static int current_prec = 0;
+  static location current_lhs_location;
+  static named_ref *current_lhs_named_ref;
+  static symbol *current_lhs;
+  static symbol_class current_class = unknown_sym;
+  static uniqstr current_type = NULL;
+
+  #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 328 of yacc.c  */
+#line 214 "src/parse-gram.y"
+
+  /** Add a lex-param and/or a parse-param.
+   *
+   * \param type  where to push this formal argument.
+   * \param decl  the formal argument.  Destroyed.
+   * \param loc   the location in the source.
+   */
+  static void add_param (param_type type, char *decl, location loc);
+  static param_type current_param = param_none;
+
+
+/* Line 328 of yacc.c  */
+#line 369 "src/parse-gram.c"

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


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

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

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


@@ -499,9 +529,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {

-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-    YYLTYPE yyls;
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+  YYLTYPE yyls_alloc;

 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */


@@ -536,12 +566,12 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */

-# define YYSTACK_RELOCATE(Stack)                                       \
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                          \

     do                                                                 \
       {                                                                        \
        YYSIZE_T yynewbytes;                                            \
     do                                                                 \
       {                                                                        \
        YYSIZE_T yynewbytes;                                            \

-       YYCOPY (&yyptr->Stack, Stack, yysize);                          \
-       Stack = &yyptr->Stack;                                          \
+       YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+       Stack = &yyptr->Stack_alloc;                                    \

        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
        yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                        \
        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
        yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                        \


@@ -552,25 +582,27 @@ 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   185
+#define YYLAST   162

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

-#define YYNTOKENS  59
+#define YYNTOKENS  56

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

-#define YYNNTS  31
+#define YYNNTS  36

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

-#define YYNRULES  98
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  137
+#define YYNRULES  109
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  148

 
 

-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */

 #define YYUNDEFTOK  2
 #define YYUNDEFTOK  2

-#define YYMAXUTOK   313
+#define YYMAXUTOK   310

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

-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */

 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,


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

-      55,    56,    57,    58
+      55

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG

-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint8 yyprhs[] =
-{
-       0,     0,     3,     8,     9,    12,    14,    16,    19,    22,
-      24,    28,    30,    33,    35,    38,    41,    45,    47,    50,
-      53,    55,    59,    61,    63,    67,    70,    72,    74,    77,
-      80,    83,    85,    87,    89,    91,    93,    95,    98,   102,
-     106,   108,   110,   111,   113,   117,   118,   122,   123,   127,
-     131,   135,   137,   139,   141,   142,   144,   146,   149,   151,
-     154,   156,   158,   160,   162,   164,   167,   170,   174,   176,
-     179,   181,   184,   186,   189,   192,   193,   197,   199,   203,
-     206,   207,   210,   213,   217,   221,   225,   227,   229,   230,
-     232,   234,   236,   238,   240,   242,   244,   246,   247
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      60,     0,    -1,    61,    53,    76,    89,    -1,    -1,    61,
-      62,    -1,    63,    -1,    55,    -1,    17,    84,    -1,    18,
-      84,    -1,    19,    -1,    21,     3,    83,    -1,    22,    -1,
-      23,    84,    -1,    24,    -1,    25,     4,    -1,    26,     4,
-      -1,    27,    50,     3,    -1,    28,    -1,    29,    47,    -1,
-      30,    47,    -1,    31,    -1,    32,    50,     3,    -1,    34,
-      -1,    35,    -1,    36,    50,     3,    -1,    37,    47,    -1,
-      38,    -1,    39,    -1,    40,     3,    -1,    41,     3,    -1,
-      43,    84,    -1,    44,    -1,    45,    -1,    46,    -1,    56,
-      -1,    68,    -1,    65,    -1,    42,    87,    -1,     8,    47,
-      72,    -1,     9,    47,    72,    -1,    20,    -1,    33,    -1,
-      -1,    51,    -1,    58,    64,    47,    -1,    -1,     6,    66,
-      75,    -1,    -1,     5,    67,    75,    -1,     7,    57,    71,
-      -1,    69,    70,    71,    -1,    11,    -1,    12,    -1,    13,
-      -1,    -1,    57,    -1,    87,    -1,    71,    87,    -1,    73,
-      -1,    72,    73,    -1,    87,    -1,    57,    -1,    10,    -1,
-      57,    -1,    85,    -1,    85,     4,    -1,    85,    88,    -1,
-      85,     4,    88,    -1,    74,    -1,    75,    74,    -1,    77,
-      -1,    76,    77,    -1,    78,    -1,    63,    56,    -1,     1,
-      56,    -1,    -1,    86,    79,    80,    -1,    81,    -1,    80,
-      54,    81,    -1,    80,    56,    -1,    -1,    81,    87,    -1,
-      81,    47,    -1,    81,    14,    87,    -1,    81,    15,     4,
-      -1,    81,    16,    57,    -1,     3,    -1,    84,    -1,    -1,
-      82,    -1,    47,    -1,    51,    -1,    48,    -1,    52,    -1,
-      85,    -1,    88,    -1,     3,    -1,    -1,    53,    49,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINEYYN -- Source line where rule number YYN was defined.    */

 static const yytype_uint16 yyrline[] =
 {
 static const yytype_uint16 yyrline[] =
 {

-       0,   209,   209,   217,   219,   223,   224,   225,   226,   227,
-     228,   229,   230,   231,   232,   233,   234,   235,   240,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,   256,   257,   258,   259,   263,   264,   265,   269,   277,
-     285,   289,   303,   304,   308,   336,   336,   341,   341,   346,
-     357,   372,   373,   374,   378,   379,   384,   386,   391,   392,
-     396,   397,   398,   403,   408,   413,   419,   425,   436,   437,
-     446,   447,   453,   454,   455,   462,   462,   466,   467,   468,
-     473,   474,   476,   478,   480,   482,   492,   493,   499,   503,
-     508,   524,   526,   535,   540,   541,   546,   553,   555
+       0,   250,   250,   258,   260,   264,   265,   275,   279,   284,
+     285,   290,   295,   296,   297,   298,   299,   304,   313,   314,
+     315,   316,   317,   318,   319,   320,   320,   321,   322,   346,
+     347,   348,   349,   353,   354,   363,   364,   365,   369,   376,
+     383,   387,   391,   398,   413,   414,   418,   430,   430,   435,
+     435,   440,   451,   466,   467,   468,   469,   473,   474,   479,
+     481,   486,   487,   492,   494,   499,   500,   504,   505,   506,
+     507,   512,   517,   522,   528,   534,   545,   546,   555,   556,
+     562,   563,   564,   571,   571,   576,   577,   578,   583,   585,
+     587,   589,   591,   593,   598,   600,   611,   612,   617,   618,
+     619,   628,   648,   650,   659,   664,   665,   670,   677,   679

 };
 #endif
 
 };
 #endif
 


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

-  "\"%printer\"", "\"%symbol-default\"", "\"%left\"", "\"%right\"",
-  "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"",
-  "\"%after-header\"", "\"%before-header\"", "\"%debug\"",
-  "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%end-header\"",
-  "\"%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\"",
-  "\"%push-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"",
-  "\"%start-header\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"",
-  "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"",
-  "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"",
+  "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"",
+  "\"%precedence\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",
+  "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
+  "\"%expect\"", "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"",
+  "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"",
+  "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
+  "\"%nondeterministic-parser\"", "\"%output\"", "\"%require\"",
+  "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"",
+  "\"%yacc\"", "\"{...}\"", "\"[identifier]\"", "\"char\"", "\"epilogue\"",
+  "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"",
+  "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"", "\"%param\"",

   "\"%union\"", "$accept", "input", "prologue_declarations",
   "\"%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",
+  "prologue_declaration", "$@1", "params", "grammar_declaration",
+  "union_name", "symbol_declaration", "$@2", "$@3",
+  "precedence_declaration", "precedence_declarator", "tag.opt",
+  "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist",

   "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
   "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",

-  "rules_or_grammar_declaration", "rules", "@3", "rhses.1", "rhs",
-  "content", "content.opt", "braceless", "id", "id_colon", "symbol",
-  "string_as_id", "epilogue.opt", 0
+  "rules_or_grammar_declaration", "rules", "$@4", "rhses.1", "rhs",
+  "named_ref.opt", "variable", "content.opt", "braceless", "id",
+  "id_colon", "symbol", "string_as_id", "epilogue.opt", 0

 };
 #endif
 
 # ifdef YYPRINT
 };
 #endif
 
 # ifdef YYPRINT

-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */

 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,


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

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

 };
 # endif
 
 };
 # endif
 

-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
+#define YYPACT_NINF -137
+
+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-137))
+
+#define YYTABLE_NINF -109
+
+#define yytable_value_is_error(yytable_value) \
+  YYID (0)
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.    */
+static const yytype_int16 yypact[] =

 {
 {

-       0,    59,    60,    61,    61,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    62,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    62,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    62,    63,    63,    63,    63,    63,
-      63,    63,    64,    64,    63,    66,    65,    67,    65,    65,
-      68,    69,    69,    69,    70,    70,    71,    71,    72,    72,
-      73,    73,    73,    74,    74,    74,    74,    74,    75,    75,
-      76,    76,    77,    77,    77,    79,    78,    80,    80,    80,
-      81,    81,    81,    81,    81,    81,    82,    82,    83,    83,
-      84,    85,    85,    86,    87,    87,    88,    89,    89
+    -137,    20,   106,  -137,  -137,  -137,    19,    -1,    36,  -137,
+    -137,  -137,  -137,    13,  -137,     0,    79,  -137,    89,    90,
+    -137,    41,  -137,    55,    93,    46,  -137,  -137,  -137,    47,
+      94,    95,    35,  -137,  -137,  -137,    16,  -137,  -137,  -137,
+      54,  -137,  -137,  -137,  -137,    49,    33,    33,    35,    12,
+      12,  -137,    61,  -137,  -137,  -137,    29,  -137,  -137,  -137,
+    -137,   100,  -137,  -137,  -137,   101,  -137,   103,  -137,  -137,
+    -137,  -137,  -137,  -137,  -137,  -137,    57,  -137,    58,     1,
+    -137,  -137,    68,    80,  -137,    61,  -137,    35,  -137,  -137,
+      33,    56,    33,    35,  -137,  -137,  -137,  -137,    12,  -137,
+    -137,    12,  -137,  -137,  -137,  -137,  -137,  -137,  -137,  -137,
+    -137,    78,  -137,  -137,  -137,  -137,  -137,    82,  -137,    35,
+    -137,   142,  -137,   144,  -137,  -137,  -137,  -137,  -137,  -137,
+    -137,  -137,  -137,    18,    27,  -137,  -137,    35,   145,    97,
+      68,    68,    27,  -137,  -137,  -137,  -137,  -137

 };
 
 };
 

-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+  /* YYDEFACT[S] -- default reduction number in state S.  Performed when
+     YYTABLE does not specify something else to do.  Zero means the default
+     is an error.    */
+static const yytype_uint8 yydefact[] =

 {
 {

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

 };
 
 };
 

-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const yytype_uint8 yydefact[] =
+  /* YYPGOTO[NTERM-NUM].    */
+static const yytype_int16 yypgoto[] =

 {
 {

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

 };
 
 };
 

-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int8 yydefgoto[] =
+  /* YYDEFGOTO[NTERM-NUM].    */
+static const yytype_int16 yydefgoto[] =

 {
 {

-      -1,     1,     2,    46,    80,    86,    48,    52,    51,    49,
-      50,    88,    94,    98,    99,    90,    91,    81,    82,    83,
-     114,   123,   124,   103,   104,    57,    74,    84,   100,    76,
-     113
+      -1,     1,     2,    41,    83,   117,    78,    85,    43,    47,
+      46,    44,    45,    87,   119,   120,    93,    98,    99,    89,
+      90,    79,    80,    81,   128,   133,   134,   115,    56,   105,
+      53,    73,    82,   100,    75,   113

 };
 
 };
 

-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -90
-static const yytype_int8 yypact[] =
+  /* 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 YYTABLE_NINF, syntax error.    */
+static const yytype_int16 yytable[] =

 {
 {

-     -90,    23,    92,   -90,   -90,   -90,   -24,   -10,    -6,   -90,
-     -90,   -90,    -2,    -2,   -90,   -90,    47,   -90,    -2,   -90,
-      62,    64,    20,   -90,    25,    27,   -90,    26,   -90,   -90,
-     -90,    28,    35,   -90,   -90,    72,    80,    14,    -2,   -90,
-     -90,   -90,    19,   -90,   -90,    34,   -90,   -90,   -90,   -90,
-      29,    16,    16,    14,    12,    12,   -90,   -90,   -90,     8,
-     -90,   -90,   -90,    85,   -90,   -90,    86,    87,   -90,   -90,
-     -90,   -90,   -90,   -90,   -90,   -90,   -90,   -90,    36,   -90,
-      37,     1,   -90,   -90,   -90,   -90,    48,   -90,    14,   -90,
-     -90,    16,    15,    16,    14,   -90,   -90,   -90,    12,   -90,
-     -90,    12,   -90,   -90,   -90,   -90,   -90,   -90,   -90,   -90,
-     -90,    45,   -90,   -90,   -90,   -90,    14,   -90,    99,   -90,
-     -90,   -90,   -90,   -14,    33,   -90,   -90,   -90,    14,   102,
-      50,   -90,   -90,    33,   -90,   -90,   -90
+      74,  -108,    76,    54,   146,   147,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    70,    94,    76,    13,    14,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      70,    26,   103,    13,    14,    91,    91,    32,    70,    49,
+     102,   137,   138,   139,    60,    55,    26,    77,   111,    64,
+      66,   124,    32,    51,    71,   121,    40,    72,    52,    70,
+     123,   125,    77,    95,    96,    97,   135,   140,   136,    71,
+      48,    40,    72,   118,   104,    71,    50,    71,    72,    91,
+      72,    91,    57,   132,    88,    61,   122,   121,   122,   126,
+      65,    67,   126,    58,    59,    62,    63,    68,    69,    84,
+      86,    51,   141,   106,   107,   143,   108,   109,   110,   114,
+     141,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+     116,   127,   129,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,   131,    70,   145,   144,
+      42,   130,   101,    36,    92,    37,    38,   142,     0,     0,
+      39,    40,   112

 };
 
 };
 

-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int8 yypgoto[] =
+static const yytype_int16 yycheck[] =

 {
 {

-     -90,   -90,   -90,   -90,   106,   -90,   -90,   -90,   -90,   -90,
-     -90,   -90,    52,    88,   -63,   -35,    89,   -90,    61,   -90,
-     -90,   -90,    30,   -90,   -90,   126,   -47,   -90,   -37,   -89,
-     -90
+      32,     0,     1,     3,   140,   141,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,     3,    48,     1,    17,    18,
+       0,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+       3,    30,     3,    17,    18,    46,    47,    36,     3,    40,
+      52,    14,    15,    16,     3,    45,    30,    46,    47,     3,
+       3,    91,    36,    40,    42,    87,    55,    45,    45,     3,
+       4,    93,    46,    51,    52,    53,    48,    40,    50,    42,
+      51,    55,    45,    85,    45,    42,    40,    42,    45,    90,
+      45,    92,     3,   123,    51,    44,    90,   119,    92,    98,
+      44,    44,   101,     4,     4,    40,     3,     3,     3,    45,
+      51,    40,   134,     3,     3,   137,     3,    50,    50,    41,
+     142,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      40,    43,    40,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,     4,     3,    51,     4,
+       2,   119,    50,    47,    47,    49,    50,   135,    -1,    -1,
+      54,    55,    79

 };
 
 };
 

-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -98
-static const yytype_int16 yytable[] =
+  /* STOS_[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.    */
+static const yytype_uint8 yystos[] =

 {
 {

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

 };
 
 };
 

-static const yytype_int16 yycheck[] =
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.    */
+static const yytype_uint8 yyr1[] =

 {
 {

-      37,     0,     1,    92,    51,    52,     5,     6,     7,     8,
-       9,     3,    11,    12,    13,     3,    53,     3,     3,     4,
-       1,    20,    10,     0,     5,     6,     7,     8,     9,   118,
-      11,    12,    13,    57,    33,    98,     3,    47,   101,    20,
-      54,    47,    56,    42,    91,    47,    93,    14,    15,    16,
-       3,    88,    33,    52,    53,    47,    91,    94,    93,    58,
-      48,    42,    48,    51,    48,    51,     4,    51,     4,    57,
-      50,    52,    47,    57,    47,     3,    50,    58,    50,   116,
-      47,    48,    47,     3,    51,    51,    57,   124,     3,     3,
-       3,   128,    56,    56,    49,    47,   133,     5,     6,     7,
-       8,     9,     3,    11,    12,    13,     4,    57,     2,    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,    13,
-      88,    52,    81,    55,    18,    53,    -1,    55,    56,    -1,
-      58,    -1,    -1,    -1,    -1,    -1,   126,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    59
+       0,    56,    57,    58,    58,    59,    59,    59,    59,    59,
+      59,    59,    59,    59,    59,    59,    59,    59,    59,    59,
+      59,    59,    59,    59,    59,    60,    59,    59,    59,    59,
+      59,    59,    59,    61,    61,    62,    62,    62,    62,    62,
+      62,    62,    62,    62,    63,    63,    62,    65,    64,    66,
+      64,    64,    67,    68,    68,    68,    68,    69,    69,    70,
+      70,    71,    71,    72,    72,    73,    73,    74,    74,    74,
+      74,    75,    75,    75,    75,    75,    76,    76,    77,    77,
+      78,    78,    78,    80,    79,    81,    81,    81,    82,    82,
+      82,    82,    82,    82,    83,    83,    84,    84,    85,    85,
+      85,    86,    87,    87,    88,    89,    89,    90,    91,    91

 };
 
 };
 

-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
+  /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.    */
+static const yytype_uint8 yyr2[] =

 {
 {

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

 };
 
 };
 

+

 #define yyerrok                (yyerrstatus = 0)
 #define yyclearin      (yychar = YYEMPTY)
 #define YYEMPTY                (-2)
 #define yyerrok                (yyerrstatus = 0)
 #define yyclearin      (yychar = YYEMPTY)
 #define YYEMPTY                (-2)


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

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

 
 #define YYFAIL         goto yyerrlab
 
 #define YYFAIL         goto yyerrlab

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

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


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

-      yytoken = YYTRANSLATE (yychar);                          \

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


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

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

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


@@ -1021,118 +1024,197 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
 # endif
   switch (yytype)
     {
 # endif
   switch (yytype)
     {

-      case 3: /* "\"string\"" */
-/* Line 670 of yacc.c.  */
-#line 187 "parse-gram.y"
-       { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-/* Line 670 of yacc.c.  */
-#line 1030 "parse-gram.c"
-       break;
-      case 4: /* "\"integer\"" */
-/* Line 670 of yacc.c.  */
-#line 198 "parse-gram.y"
-       { fprintf (stderr, "%d", (yyvaluep->integer)); };
-/* Line 670 of yacc.c.  */
-#line 1037 "parse-gram.c"
-       break;
-      case 47: /* "\"{...}\"" */
-/* Line 670 of yacc.c.  */
-#line 189 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c.  */
-#line 1044 "parse-gram.c"
-       break;
-      case 48: /* "\"char\"" */
-/* Line 670 of yacc.c.  */
-#line 182 "parse-gram.y"
-       { fputs (char_name ((yyvaluep->character)), stderr); };
-/* Line 670 of yacc.c.  */
-#line 1051 "parse-gram.c"
-       break;
-      case 49: /* "\"epilogue\"" */
-/* Line 670 of yacc.c.  */
-#line 189 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c.  */
-#line 1058 "parse-gram.c"
-       break;
-      case 51: /* "\"identifier\"" */
-/* Line 670 of yacc.c.  */
-#line 194 "parse-gram.y"
-       { fputs ((yyvaluep->uniqstr), stderr); };
-/* Line 670 of yacc.c.  */
-#line 1065 "parse-gram.c"
-       break;
-      case 52: /* "\"identifier:\"" */
-/* Line 670 of yacc.c.  */
-#line 195 "parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-/* Line 670 of yacc.c.  */
-#line 1072 "parse-gram.c"
-       break;
-      case 55: /* "\"%{...%}\"" */
-/* Line 670 of yacc.c.  */
-#line 189 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c.  */
-#line 1079 "parse-gram.c"
-       break;
-      case 57: /* "\"type\"" */
-/* Line 670 of yacc.c.  */
-#line 193 "parse-gram.y"
-       { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-/* Line 670 of yacc.c.  */
-#line 1086 "parse-gram.c"
-       break;
-      case 82: /* "content" */
-/* Line 670 of yacc.c.  */
-#line 189 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c.  */
-#line 1093 "parse-gram.c"
-       break;
-      case 83: /* "content.opt" */
-/* Line 670 of yacc.c.  */
-#line 189 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c.  */
-#line 1100 "parse-gram.c"
-       break;
-      case 84: /* "braceless" */
-/* Line 670 of yacc.c.  */
-#line 189 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-/* Line 670 of yacc.c.  */
-#line 1107 "parse-gram.c"
-       break;
-      case 85: /* "id" */
-/* Line 670 of yacc.c.  */
-#line 201 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 670 of yacc.c.  */
-#line 1114 "parse-gram.c"
-       break;
-      case 86: /* "id_colon" */
-/* Line 670 of yacc.c.  */
-#line 202 "parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-/* Line 670 of yacc.c.  */
-#line 1121 "parse-gram.c"
-       break;
-      case 87: /* "symbol" */
-/* Line 670 of yacc.c.  */
-#line 201 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 670 of yacc.c.  */
-#line 1128 "parse-gram.c"
-       break;
-      case 88: /* "string_as_id" */
-/* Line 670 of yacc.c.  */
-#line 201 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-/* Line 670 of yacc.c.  */
-#line 1135 "parse-gram.c"
-       break;
+            case 3: // "string"
+
+/* Line 729 of yacc.c  */
+#line 174 "src/parse-gram.y"
+        { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
+/* Line 729 of yacc.c  */
+#line 1034 "src/parse-gram.c"
+        break;
+
+            case 4: // "integer"
+
+/* Line 729 of yacc.c  */
+#line 187 "src/parse-gram.y"
+        { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
+/* Line 729 of yacc.c  */
+#line 1043 "src/parse-gram.c"
+        break;
+
+            case 24: // "%<flag>"
+
+/* Line 729 of yacc.c  */
+#line 183 "src/parse-gram.y"
+        { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
+/* Line 729 of yacc.c  */
+#line 1052 "src/parse-gram.c"
+        break;
+
+            case 40: // "{...}"
+
+/* Line 729 of yacc.c  */
+#line 176 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
+/* Line 729 of yacc.c  */
+#line 1061 "src/parse-gram.c"
+        break;
+
+            case 41: // "[identifier]"
+
+/* Line 729 of yacc.c  */
+#line 181 "src/parse-gram.y"
+        { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }
+/* Line 729 of yacc.c  */
+#line 1070 "src/parse-gram.c"
+        break;
+
+            case 42: // "char"
+
+/* Line 729 of yacc.c  */
+#line 168 "src/parse-gram.y"
+        { fputs (char_name (((*yyvaluep).character)), stderr); }
+/* Line 729 of yacc.c  */
+#line 1079 "src/parse-gram.c"
+        break;
+
+            case 43: // "epilogue"
+
+/* Line 729 of yacc.c  */
+#line 176 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 729 of yacc.c  */
+#line 1088 "src/parse-gram.c"
+        break;
+
+            case 45: // "identifier"
+
+/* Line 729 of yacc.c  */
+#line 180 "src/parse-gram.y"
+        { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 729 of yacc.c  */
+#line 1097 "src/parse-gram.c"
+        break;
+
+            case 46: // "identifier:"
+
+/* Line 729 of yacc.c  */
+#line 182 "src/parse-gram.y"
+        { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
+/* Line 729 of yacc.c  */
+#line 1106 "src/parse-gram.c"
+        break;
+
+            case 49: // "%{...%}"
+
+/* Line 729 of yacc.c  */
+#line 176 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 729 of yacc.c  */
+#line 1115 "src/parse-gram.c"
+        break;
+
+            case 51: // "<tag>"
+
+/* Line 729 of yacc.c  */
+#line 184 "src/parse-gram.y"
+        { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
+/* Line 729 of yacc.c  */
+#line 1124 "src/parse-gram.c"
+        break;
+
+            case 54: // "%param"
+
+/* Line 729 of yacc.c  */
+#line 230 "src/parse-gram.y"
+        {
+  switch (((*yyvaluep).param))
+    {
+#define CASE(In, Out)                                           \
+      case param_ ## In: fputs ("%" #Out, stderr); break
+      CASE(lex,   lex-param);
+      CASE(parse, parse-param);
+      CASE(both,  param);
+#undef CASE
+      case param_none: aver (false); break;
+    }
+}
+/* Line 729 of yacc.c  */
+#line 1144 "src/parse-gram.c"
+        break;
+
+            case 71: // symbol.prec
+
+/* Line 729 of yacc.c  */
+#line 190 "src/parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 729 of yacc.c  */
+#line 1153 "src/parse-gram.c"
+        break;
+
+            case 84: // variable
+
+/* Line 729 of yacc.c  */
+#line 180 "src/parse-gram.y"
+        { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 729 of yacc.c  */
+#line 1162 "src/parse-gram.c"
+        break;
+
+            case 85: // content.opt
+
+/* Line 729 of yacc.c  */
+#line 176 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 729 of yacc.c  */
+#line 1171 "src/parse-gram.c"
+        break;
+
+            case 86: // braceless
+
+/* Line 729 of yacc.c  */
+#line 176 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 729 of yacc.c  */
+#line 1180 "src/parse-gram.c"
+        break;
+
+            case 87: // id
+
+/* Line 729 of yacc.c  */
+#line 190 "src/parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 729 of yacc.c  */
+#line 1189 "src/parse-gram.c"
+        break;
+
+            case 88: // id_colon
+
+/* Line 729 of yacc.c  */
+#line 191 "src/parse-gram.y"
+        { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
+/* Line 729 of yacc.c  */
+#line 1198 "src/parse-gram.c"
+        break;
+
+            case 89: // symbol
+
+/* Line 729 of yacc.c  */
+#line 190 "src/parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 729 of yacc.c  */
+#line 1207 "src/parse-gram.c"
+        break;
+
+            case 90: // string_as_id
+
+/* Line 729 of yacc.c  */
+#line 190 "src/parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 729 of yacc.c  */
+#line 1216 "src/parse-gram.c"
+        break;
+

       default:
        break;
     }
       default:
        break;
     }


@@ -1206,35 +1288,37 @@ do {                                                            \
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void

-yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)

 #else
 static void
 #else
 static void

-yy_reduce_print (yyvsp, yylsp, yyrule)
+yy_reduce_print (yyssp, yyvsp, yylsp, yyrule)
+    yytype_int16 *yyssp;

     YYSTYPE *yyvsp;
     YYLTYPE *yylsp;
     int yyrule;
 #endif
 {
     YYSTYPE *yyvsp;
     YYLTYPE *yylsp;
     int yyrule;
 #endif
 {

+  unsigned long int yylno = yyrline[yyrule];

   int yynrhs = yyr2[yyrule];
   int yyi;
   int yynrhs = yyr2[yyrule];
   int yyi;

-  unsigned long int yylno = yyrline[yyrule];

   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",

-            yyrule - 1, yylno);
+             yyrule - 1, yylno);

   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {

-      fprintf (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-                      &(yyvsp[(yyi + 1) - (yynrhs)])
-                      , &(yylsp[(yyi + 1) - (yynrhs)])                );
-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                       , &(yylsp[(yyi + 1) - (yynrhs)])                       );
+      YYFPRINTF (stderr, "\n");

     }
 }
 
 # define YY_REDUCE_PRINT(Rule)         \
 do {                                   \
   if (yydebug)                         \
     }
 }
 
 # define YY_REDUCE_PRINT(Rule)         \
 do {                                   \
   if (yydebug)                         \

-    yy_reduce_print (yyvsp, yylsp, Rule); \
+    yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \

 } while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
 } while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that


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

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

 {
   int yyn = yypact[yystate];
 
   if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
 {
   int yyn = yypact[yystate];
 
   if (! (YYPACT_NINF < yyn && yyn <= YYLAST))

-    return 0;
+    return 1;

   else
     {
   else
     {

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

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

-      int yysize_overflow = 0;

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

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

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

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

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

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

       int yyxbegin = yyn < 0 ? -yyn : 0;
 
       /* Stay within bounds of both yycheck and yytname.  */
       int yychecklim = YYLAST - yyn + 1;
       int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
       int yyxbegin = yyn < 0 ? -yyn : 0;
 
       /* Stay within bounds of both yycheck and yytname.  */
       int yychecklim = YYLAST - yyn + 1;
       int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;

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

 
 

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

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

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

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

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

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

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

            yysize = yysize1;
            yysize = yysize1;

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

          }
 
          }
 

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

       yysize = yysize1;
 
       yysize = yysize1;
 

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

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


@@ -1504,23 +1598,23 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 
   switch (yytype)
     {
 
   switch (yytype)
     {

-

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

-\f

 
 

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

 
 

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

 #ifdef YYPARSE_PARAM
 #ifdef YYPARSE_PARAM

-#if defined __STDC__ || defined __cplusplus
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)

 int yyparse (void *YYPARSE_PARAM);
 #else
 int yyparse ();
 #endif
 #else /* ! YYPARSE_PARAM */
 int yyparse (void *YYPARSE_PARAM);
 #else
 int yyparse ();
 #endif
 #else /* ! YYPARSE_PARAM */

-#if defined __STDC__ || defined __cplusplus
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)

 int yyparse (void);
 #else
 int yyparse ();
 int yyparse (void);
 #else
 int yyparse ();


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

-
-
-
-

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


@@ -1558,103 +1648,112 @@ yyparse ()
 #endif
 #endif
 {
 #endif
 #endif
 {

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

 int yychar;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
 int yychar;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 

-/* Number of syntax errors so far.  */
-int yynerrs;

 /* Location data for the lookahead symbol.  */
 YYLTYPE yylloc;
 
 /* Location data for the lookahead symbol.  */
 YYLTYPE yylloc;
 

-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
+    /* Number of syntax errors so far.  */
+    int yynerrs;

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

-  YYSIZE_T yystacksize = YYINITDEPTH;
+    YYSIZE_T yystacksize;

 
 

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

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

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

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

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

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

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

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

-

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

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

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

-
-  /* User initialization code.  */
-  /* Line 1082 of yacc.c.  */
-#line 89 "parse-gram.y"
+/* User initialization code.  */
+/* Line 1214 of yacc.c  */
+#line 79 "src/parse-gram.y"

 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
   boundary_set (&yylloc.start, current_file, 1, 1);
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
   boundary_set (&yylloc.start, current_file, 1, 1);
   boundary_set (&yylloc.end, current_file, 1, 1);
 }

-/* Line 1082 of yacc.c.  */
-#line 1657 "parse-gram.c"
+/* Line 1214 of yacc.c  */
+#line 1755 "src/parse-gram.c"

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

+

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


@@ -1691,6 +1790,7 @@ YYLTYPE yylloc;
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),
                    &yystacksize);
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),
                    &yystacksize);

+

        yyls = yyls1;
        yyss = yyss1;
        yyvs = yyvs1;
        yyls = yyls1;
        yyss = yyss1;
        yyvs = yyvs1;


@@ -1712,9 +1812,9 @@ YYLTYPE yylloc;
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)
          goto yyexhaustedlab;
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)
          goto yyexhaustedlab;

-       YYSTACK_RELOCATE (yyss);
-       YYSTACK_RELOCATE (yyvs);
-       YYSTACK_RELOCATE (yyls);
+       YYSTACK_RELOCATE (yyss_alloc, yyss);
+       YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+       YYSTACK_RELOCATE (yyls_alloc, yyls);

 #  undef YYSTACK_RELOCATE
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);
 #  undef YYSTACK_RELOCATE
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);


@@ -1750,7 +1850,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];

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

     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */


@@ -1781,7 +1881,7 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
   yyn = yytable[yyn];
   if (yyn <= 0)
     {

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

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


@@ -1837,568 +1937,870 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-/* Line 1269 of yacc.c.  */
-#line 224 "parse-gram.y"
-    { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), union_seen); }
+/* Line 1427 of yacc.c  */
+#line 266 "src/parse-gram.y"
+    {
+      code_props plain_code;
+      code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
+      code_props_translate_code (&plain_code);
+      gram_scanner_last_string_free ();
+      muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
+                        plain_code.code, (yylsp[0]));
+      code_scanner_last_string_free ();
+    }
+/* Line 1427 of yacc.c  */
+#line 1953 "src/parse-gram.c"

     break;
 
   case 7:
     break;
 
   case 7:

-/* Line 1269 of yacc.c.  */
-#line 225 "parse-gram.y"
-    { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), true); }
+/* Line 1427 of yacc.c  */
+#line 276 "src/parse-gram.y"
+    {
+      muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
+    }
+/* Line 1427 of yacc.c  */
+#line 1963 "src/parse-gram.c"

     break;
 
   case 8:
     break;
 
   case 8:

-/* Line 1269 of yacc.c.  */
-#line 226 "parse-gram.y"
-    { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), false); }
+/* Line 1427 of yacc.c  */
+#line 280 "src/parse-gram.y"
+    {
+      muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
+                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+    }
+/* Line 1427 of yacc.c  */
+#line 1974 "src/parse-gram.c"

     break;
 
   case 9:
     break;
 
   case 9:

-/* Line 1269 of yacc.c.  */
-#line 227 "parse-gram.y"
-    { debug_flag = true; }
+/* Line 1427 of yacc.c  */
+#line 284 "src/parse-gram.y"
+    { defines_flag = true; }
+/* Line 1427 of yacc.c  */
+#line 1982 "src/parse-gram.c"

     break;
 
   case 10:
     break;
 
   case 10:

-/* Line 1269 of yacc.c.  */
-#line 228 "parse-gram.y"
-    { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }
+/* Line 1427 of yacc.c  */
+#line 286 "src/parse-gram.y"
+    {
+      defines_flag = true;
+      spec_defines_file = xstrdup ((yyvsp[0].chars));
+    }
+/* Line 1427 of yacc.c  */
+#line 1993 "src/parse-gram.c"

     break;
 
   case 11:
     break;
 
   case 11:

-/* Line 1269 of yacc.c.  */
-#line 229 "parse-gram.y"
-    { defines_flag = true; }
+/* Line 1427 of yacc.c  */
+#line 291 "src/parse-gram.y"
+    {
+      muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
+                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+    }
+/* Line 1427 of yacc.c  */
+#line 2004 "src/parse-gram.c"

     break;
 
   case 12:
     break;
 
   case 12:

-/* Line 1269 of yacc.c.  */
-#line 230 "parse-gram.y"
-    { muscle_code_grow ("end_header", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1427 of yacc.c  */
+#line 295 "src/parse-gram.y"
+    { expected_sr_conflicts = (yyvsp[0].integer); }
+/* Line 1427 of yacc.c  */
+#line 2012 "src/parse-gram.c"

     break;
 
   case 13:
     break;
 
   case 13:

-/* Line 1269 of yacc.c.  */
-#line 231 "parse-gram.y"
-    { error_verbose = true; }
+/* Line 1427 of yacc.c  */
+#line 296 "src/parse-gram.y"
+    { expected_rr_conflicts = (yyvsp[0].integer); }
+/* Line 1427 of yacc.c  */
+#line 2020 "src/parse-gram.c"

     break;
 
   case 14:
     break;
 
   case 14:

-/* Line 1269 of yacc.c.  */
-#line 232 "parse-gram.y"
-    { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1427 of yacc.c  */
+#line 297 "src/parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1427 of yacc.c  */
+#line 2028 "src/parse-gram.c"

     break;
 
   case 15:
     break;
 
   case 15:

-/* Line 1269 of yacc.c.  */
-#line 233 "parse-gram.y"
-    { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1427 of yacc.c  */
+#line 298 "src/parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1427 of yacc.c  */
+#line 2036 "src/parse-gram.c"

     break;
 
   case 16:
     break;
 
   case 16:

-/* Line 1269 of yacc.c.  */
-#line 234 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
-    break;
-
-  case 17:
-/* Line 1269 of yacc.c.  */
-#line 236 "parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 300 "src/parse-gram.y"

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

+/* Line 1427 of yacc.c  */
+#line 2047 "src/parse-gram.c"

     break;
 
     break;
 

-  case 18:
-/* Line 1269 of yacc.c.  */
-#line 241 "parse-gram.y"
+  case 17:
+/* Line 1427 of yacc.c  */
+#line 305 "src/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[0].code), (yylsp[0]));
+      code_props_translate_code (&action);
+      gram_scanner_last_string_free ();
+      muscle_code_grow ("initial_action", action.code, (yylsp[0]));
+      code_scanner_last_string_free ();

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2062 "src/parse-gram.c"
+    break;
+
+  case 18:
+/* Line 1427 of yacc.c  */
+#line 313 "src/parse-gram.y"
+    { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
+/* Line 1427 of yacc.c  */
+#line 2070 "src/parse-gram.c"

     break;
 
   case 19:
     break;
 
   case 19:

-/* Line 1269 of yacc.c.  */
-#line 244 "parse-gram.y"
-    { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1427 of yacc.c  */
+#line 314 "src/parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1427 of yacc.c  */
+#line 2078 "src/parse-gram.c"

     break;
 
   case 20:
     break;
 
   case 20:

-/* Line 1269 of yacc.c.  */
-#line 245 "parse-gram.y"
-    { locations_flag = true; }
+/* Line 1427 of yacc.c  */
+#line 315 "src/parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1427 of yacc.c  */
+#line 2086 "src/parse-gram.c"

     break;
 
   case 21:
     break;
 
   case 21:

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

     break;
 
   case 22:
     break;
 
   case 22:

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

     break;
 
   case 23:
     break;
 
   case 23:

-/* Line 1269 of yacc.c.  */
-#line 248 "parse-gram.y"
-    { nondeterministic_parser = true; }
+/* Line 1427 of yacc.c  */
+#line 318 "src/parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1427 of yacc.c  */
+#line 2110 "src/parse-gram.c"

     break;
 
   case 24:
     break;
 
   case 24:

-/* Line 1269 of yacc.c.  */
-#line 249 "parse-gram.y"
-    { spec_outfile = (yyvsp[(3) - (3)].chars); }
+/* Line 1427 of yacc.c  */
+#line 319 "src/parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1427 of yacc.c  */
+#line 2118 "src/parse-gram.c"

     break;
 
   case 25:
     break;
 
   case 25:

-/* Line 1269 of yacc.c.  */
-#line 250 "parse-gram.y"
-    { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1427 of yacc.c  */
+#line 320 "src/parse-gram.y"
+    { current_param = (yyvsp[0].param); }
+/* Line 1427 of yacc.c  */
+#line 2126 "src/parse-gram.c"

     break;
 
   case 26:
     break;
 
   case 26:

-/* Line 1269 of yacc.c.  */
-#line 251 "parse-gram.y"
-    { pure_parser = true; }
+/* Line 1427 of yacc.c  */
+#line 320 "src/parse-gram.y"
+    { current_param = param_none; }
+/* Line 1427 of yacc.c  */
+#line 2134 "src/parse-gram.c"

     break;
 
   case 27:
     break;
 
   case 27:

-/* Line 1269 of yacc.c.  */
-#line 252 "parse-gram.y"
-    { push_parser = true; }
+/* Line 1427 of yacc.c  */
+#line 321 "src/parse-gram.y"
+    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
+/* Line 1427 of yacc.c  */
+#line 2142 "src/parse-gram.c"

     break;
 
   case 28:
     break;
 
   case 28:

-/* Line 1269 of yacc.c.  */
-#line 253 "parse-gram.y"
-    { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
+/* Line 1427 of yacc.c  */
+#line 323 "src/parse-gram.y"
+    {
+      char const *skeleton_user = (yyvsp[0].chars);
+      if (strchr (skeleton_user, '/'))
+        {
+          size_t dir_length = strlen (current_file);
+          char *skeleton_build;
+          while (dir_length && current_file[dir_length - 1] != '/')
+            --dir_length;
+          while (dir_length && current_file[dir_length - 1] == '/')
+            --dir_length;
+          skeleton_build =
+            xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
+          if (dir_length > 0)
+            {
+              strncpy (skeleton_build, current_file, dir_length);
+              skeleton_build[dir_length++] = '/';
+            }
+          strcpy (skeleton_build + dir_length, skeleton_user);
+          skeleton_user = uniqstr_new (skeleton_build);
+          free (skeleton_build);
+        }
+      skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
+    }
+/* Line 1427 of yacc.c  */
+#line 2172 "src/parse-gram.c"

     break;
 
   case 29:
     break;
 
   case 29:

-/* Line 1269 of yacc.c.  */
-#line 254 "parse-gram.y"
-    { skeleton = (yyvsp[(2) - (2)].chars); }
+/* Line 1427 of yacc.c  */
+#line 346 "src/parse-gram.y"
+    { token_table_flag = true; }
+/* Line 1427 of yacc.c  */
+#line 2180 "src/parse-gram.c"

     break;
 
   case 30:
     break;
 
   case 30:

-/* Line 1269 of yacc.c.  */
-#line 255 "parse-gram.y"
-    { muscle_code_grow ("start_header", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+/* Line 1427 of yacc.c  */
+#line 347 "src/parse-gram.y"
+    { report_flag |= report_states; }
+/* Line 1427 of yacc.c  */
+#line 2188 "src/parse-gram.c"

     break;
 
   case 31:
     break;
 
   case 31:

-/* Line 1269 of yacc.c.  */
-#line 256 "parse-gram.y"
-    { token_table_flag = true; }
+/* Line 1427 of yacc.c  */
+#line 348 "src/parse-gram.y"
+    { yacc_flag = true; }
+/* Line 1427 of yacc.c  */
+#line 2196 "src/parse-gram.c"

     break;
 
     break;
 

-  case 32:
-/* Line 1269 of yacc.c.  */
-#line 257 "parse-gram.y"
-    { report_flag = report_states; }
+  case 33:
+/* Line 1427 of yacc.c  */
+#line 353 "src/parse-gram.y"
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2204 "src/parse-gram.c"

     break;
 
     break;
 

-  case 33:
-/* Line 1269 of yacc.c.  */
-#line 258 "parse-gram.y"
-    { yacc_flag = true; }
+  case 34:
+/* Line 1427 of yacc.c  */
+#line 354 "src/parse-gram.y"
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2212 "src/parse-gram.c"

     break;
 
   case 37:
     break;
 
   case 37:

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

     {
     {

-      grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
+      grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2222 "src/parse-gram.c"

     break;
 
   case 38:
     break;
 
   case 38:

-/* Line 1269 of yacc.c.  */
-#line 270 "parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 370 "src/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)
-        symbol_list_destructor_set (list, action, (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      for (list = (yyvsp[0].list); list; list = list->next)
+       symbol_list_destructor_set (list, (yyvsp[-1].code), (yylsp[-1]));
+      symbol_list_free ((yyvsp[0].list));

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2235 "src/parse-gram.c"

     break;
 
   case 39:
     break;
 
   case 39:

-/* Line 1269 of yacc.c.  */
-#line 278 "parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 377 "src/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)
-        symbol_list_printer_set (list, action, (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      for (list = (yyvsp[0].list); list; list = list->next)
+       symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1]));
+      symbol_list_free ((yyvsp[0].list));

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2248 "src/parse-gram.c"

     break;
 
   case 40:
     break;
 
   case 40:

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

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

+/* Line 1427 of yacc.c  */
+#line 2258 "src/parse-gram.c"

     break;
 
   case 41:
     break;
 
   case 41:

-/* Line 1269 of yacc.c.  */
-#line 290 "parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 388 "src/parse-gram.y"

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

+/* Line 1427 of yacc.c  */
+#line 2268 "src/parse-gram.c"

     break;
 
   case 42:
     break;
 
   case 42:

-/* Line 1269 of yacc.c.  */
-#line 303 "parse-gram.y"
-    {}
+/* Line 1427 of yacc.c  */
+#line 392 "src/parse-gram.y"
+    {
+      /* Do not invoke muscle_percent_code_grow here since it invokes
+         muscle_user_name_list_grow.  */
+      muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
+      code_scanner_last_string_free ();
+    }
+/* Line 1427 of yacc.c  */
+#line 2281 "src/parse-gram.c"

     break;
 
   case 43:
     break;
 
   case 43:

-/* Line 1269 of yacc.c.  */
-#line 304 "parse-gram.y"
-    { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1427 of yacc.c  */
+#line 399 "src/parse-gram.y"
+    {
+      muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
+      code_scanner_last_string_free ();
+    }
+/* Line 1427 of yacc.c  */
+#line 2292 "src/parse-gram.c"

     break;
 
   case 44:
     break;
 
   case 44:

-/* Line 1269 of yacc.c.  */
-#line 309 "parse-gram.y"
-    {
-      char const *body = (yyvsp[(3) - (3)].chars);
+/* Line 1427 of yacc.c  */
+#line 413 "src/parse-gram.y"
+    {}
+/* Line 1427 of yacc.c  */
+#line 2300 "src/parse-gram.c"
+    break;

 
 

-      /* 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++;
+  case 45:
+/* Line 1427 of yacc.c  */
+#line 414 "src/parse-gram.y"
+    { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2308 "src/parse-gram.c"
+    break;

 
 

+  case 46:
+/* Line 1427 of yacc.c  */
+#line 419 "src/parse-gram.y"
+    {

       union_seen = true;
       union_seen = true;

-      muscle_code_grow ("stype", body, (yylsp[(3) - (3)]));
+      muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
+      code_scanner_last_string_free ();

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2320 "src/parse-gram.c"

     break;
 
     break;
 

-  case 45:
-/* Line 1269 of yacc.c.  */
-#line 336 "parse-gram.y"
+  case 47:
+/* Line 1427 of yacc.c  */
+#line 430 "src/parse-gram.y"

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

+/* Line 1427 of yacc.c  */
+#line 2328 "src/parse-gram.c"

     break;
 
     break;
 

-  case 46:
-/* Line 1269 of yacc.c.  */
-#line 337 "parse-gram.y"
+  case 48:
+/* Line 1427 of yacc.c  */
+#line 431 "src/parse-gram.y"

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

+/* Line 1427 of yacc.c  */
+#line 2339 "src/parse-gram.c"

     break;
 
     break;
 

-  case 47:
-/* Line 1269 of yacc.c.  */
-#line 341 "parse-gram.y"
+  case 49:
+/* Line 1427 of yacc.c  */
+#line 435 "src/parse-gram.y"

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

+/* Line 1427 of yacc.c  */
+#line 2347 "src/parse-gram.c"

     break;
 
     break;
 

-  case 48:
-/* Line 1269 of yacc.c.  */
-#line 342 "parse-gram.y"
+  case 50:
+/* Line 1427 of yacc.c  */
+#line 436 "src/parse-gram.y"

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

+/* Line 1427 of yacc.c  */
+#line 2358 "src/parse-gram.c"

     break;
 
     break;
 

-  case 49:
-/* Line 1269 of yacc.c.  */
-#line 347 "parse-gram.y"
+  case 51:
+/* Line 1427 of yacc.c  */
+#line 441 "src/parse-gram.y"

     {
     {

-      tag_seen = true;

       symbol_list *list;
       symbol_list *list;

-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
-       symbol_type_set (list->content.sym, (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      tag_seen = true;
+      for (list = (yyvsp[0].list); list; list = list->next)
+       symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
+      symbol_list_free ((yyvsp[0].list));

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2372 "src/parse-gram.c"

     break;
 
     break;
 

-  case 50:
-/* Line 1269 of yacc.c.  */
-#line 358 "parse-gram.y"
+  case 52:
+/* Line 1427 of yacc.c  */
+#line 452 "src/parse-gram.y"

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

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

        {
        {

-         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_type_set (list->content.sym, current_type, (yylsp[-1]));
+         symbol_precedence_set (list->content.sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2]));

        }
        }

-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      symbol_list_free ((yyvsp[0].list));

       current_type = NULL;
     }
       current_type = NULL;
     }

-    break;
-
-  case 51:
-/* Line 1269 of yacc.c.  */
-#line 372 "parse-gram.y"
-    { (yyval.assoc) = left_assoc; }
-    break;
-
-  case 52:
-/* Line 1269 of yacc.c.  */
-#line 373 "parse-gram.y"
-    { (yyval.assoc) = right_assoc; }
+/* Line 1427 of yacc.c  */
+#line 2390 "src/parse-gram.c"

     break;
 
   case 53:
     break;
 
   case 53:

-/* Line 1269 of yacc.c.  */
-#line 374 "parse-gram.y"
-    { (yyval.assoc) = non_assoc; }
+/* Line 1427 of yacc.c  */
+#line 466 "src/parse-gram.y"
+    { (yyval.assoc) = left_assoc; }
+/* Line 1427 of yacc.c  */
+#line 2398 "src/parse-gram.c"

     break;
 
   case 54:
     break;
 
   case 54:

-/* Line 1269 of yacc.c.  */
-#line 378 "parse-gram.y"
-    { current_type = NULL; }
+/* Line 1427 of yacc.c  */
+#line 467 "src/parse-gram.y"
+    { (yyval.assoc) = right_assoc; }
+/* Line 1427 of yacc.c  */
+#line 2406 "src/parse-gram.c"

     break;
 
   case 55:
     break;
 
   case 55:

-/* Line 1269 of yacc.c.  */
-#line 379 "parse-gram.y"
-    { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
+/* Line 1427 of yacc.c  */
+#line 468 "src/parse-gram.y"
+    { (yyval.assoc) = non_assoc; }
+/* Line 1427 of yacc.c  */
+#line 2414 "src/parse-gram.c"

     break;
 
   case 56:
     break;
 
   case 56:

-/* Line 1269 of yacc.c.  */
-#line 385 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1427 of yacc.c  */
+#line 469 "src/parse-gram.y"
+    { (yyval.assoc) = precedence_assoc; }
+/* Line 1427 of yacc.c  */
+#line 2422 "src/parse-gram.c"

     break;
 
   case 57:
     break;
 
   case 57:

-/* Line 1269 of yacc.c.  */
-#line 387 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
+/* Line 1427 of yacc.c  */
+#line 473 "src/parse-gram.y"
+    { current_type = NULL; }
+/* Line 1427 of yacc.c  */
+#line 2430 "src/parse-gram.c"

     break;
 
   case 58:
     break;
 
   case 58:

-/* Line 1269 of yacc.c.  */
-#line 391 "parse-gram.y"
-    { (yyval.list) = (yyvsp[(1) - (1)].list); }
+/* Line 1427 of yacc.c  */
+#line 474 "src/parse-gram.y"
+    { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
+/* Line 1427 of yacc.c  */
+#line 2438 "src/parse-gram.c"

     break;
 
   case 59:
     break;
 
   case 59:

-/* Line 1269 of yacc.c.  */
-#line 392 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+/* Line 1427 of yacc.c  */
+#line 480 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2446 "src/parse-gram.c"

     break;
 
   case 60:
     break;
 
   case 60:

-/* Line 1269 of yacc.c.  */
-#line 396 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1427 of yacc.c  */
+#line 482 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1427 of yacc.c  */
+#line 2454 "src/parse-gram.c"

     break;
 
   case 61:
     break;
 
   case 61:

-/* Line 1269 of yacc.c.  */
-#line 397 "parse-gram.y"
-    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1427 of yacc.c  */
+#line 486 "src/parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }
+/* Line 1427 of yacc.c  */
+#line 2462 "src/parse-gram.c"

     break;
 
   case 62:
     break;
 
   case 62:

-/* Line 1269 of yacc.c.  */
-#line 398 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_new ((yylsp[(1) - (1)])); }
+/* Line 1427 of yacc.c  */
+#line 487 "src/parse-gram.y"
+    { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2470 "src/parse-gram.c"

     break;
 
   case 63:
     break;
 
   case 63:

-/* Line 1269 of yacc.c.  */
-#line 404 "parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 493 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2478 "src/parse-gram.c"
+    break;
+
+  case 64:
+/* Line 1427 of yacc.c  */
+#line 495 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1427 of yacc.c  */
+#line 2486 "src/parse-gram.c"
+    break;
+
+  case 65:
+/* Line 1427 of yacc.c  */
+#line 499 "src/parse-gram.y"
+    { (yyval.list) = (yyvsp[0].list); }
+/* Line 1427 of yacc.c  */
+#line 2494 "src/parse-gram.c"
+    break;
+
+  case 66:
+/* Line 1427 of yacc.c  */
+#line 500 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
+/* Line 1427 of yacc.c  */
+#line 2502 "src/parse-gram.c"
+    break;
+
+  case 67:
+/* Line 1427 of yacc.c  */
+#line 504 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2510 "src/parse-gram.c"
+    break;
+
+  case 68:
+/* Line 1427 of yacc.c  */
+#line 505 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2518 "src/parse-gram.c"
+    break;
+
+  case 69:
+/* Line 1427 of yacc.c  */
+#line 506 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2526 "src/parse-gram.c"
+    break;
+
+  case 70:
+/* Line 1427 of yacc.c  */
+#line 507 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2534 "src/parse-gram.c"
+    break;
+
+  case 71:
+/* Line 1427 of yacc.c  */
+#line 513 "src/parse-gram.y"

     {
     {

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

        tag_seen = true;
      }
        tag_seen = true;
      }

+/* Line 1427 of yacc.c  */
+#line 2545 "src/parse-gram.c"

     break;
 
     break;
 

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

     {
     {

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

      }
      }

+/* Line 1427 of yacc.c  */
+#line 2556 "src/parse-gram.c"

     break;
 
     break;
 

-  case 65:
-/* Line 1269 of yacc.c.  */
-#line 414 "parse-gram.y"
+  case 73:
+/* Line 1427 of yacc.c  */
+#line 523 "src/parse-gram.y"

     {
     {

-      symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
-      symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
-      symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)]));
+      symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
+      symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
+      symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2568 "src/parse-gram.c"

     break;
 
     break;
 

-  case 66:
-/* Line 1269 of yacc.c.  */
-#line 420 "parse-gram.y"
+  case 74:
+/* Line 1427 of yacc.c  */
+#line 529 "src/parse-gram.y"

     {
     {

-      symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
-      symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
-      symbol_make_alias ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].symbol), (yyloc));
+      symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
+      symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
+      symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2580 "src/parse-gram.c"

     break;
 
     break;
 

-  case 67:
-/* Line 1269 of yacc.c.  */
-#line 426 "parse-gram.y"
+  case 75:
+/* Line 1427 of yacc.c  */
+#line 535 "src/parse-gram.y"

     {
     {

-      symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
-      symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));
-      symbol_user_token_number_set ((yyvsp[(1) - (3)].symbol), (yyvsp[(2) - (3)].integer), (yylsp[(2) - (3)]));
-      symbol_make_alias ((yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol), (yyloc));
+      symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
+      symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
+      symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
+      symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2593 "src/parse-gram.c"

     break;
 
     break;
 

-  case 74:
-/* Line 1269 of yacc.c.  */
-#line 456 "parse-gram.y"
+  case 82:
+/* Line 1427 of yacc.c  */
+#line 565 "src/parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }

+/* Line 1427 of yacc.c  */
+#line 2603 "src/parse-gram.c"

     break;
 
     break;
 

-  case 75:
-/* Line 1269 of yacc.c.  */
-#line 462 "parse-gram.y"
-    { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
+  case 83:
+/* Line 1427 of yacc.c  */
+#line 571 "src/parse-gram.y"
+    { current_lhs = (yyvsp[-1].symbol); current_lhs_location = (yylsp[-1]);
+    current_lhs_named_ref = (yyvsp[0].named_ref); }
+/* Line 1427 of yacc.c  */
+#line 2612 "src/parse-gram.c"

     break;
 
     break;
 

-  case 77:
-/* Line 1269 of yacc.c.  */
-#line 466 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(1) - (1)])); }
+  case 85:
+/* Line 1427 of yacc.c  */
+#line 576 "src/parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2620 "src/parse-gram.c"

     break;
 
     break;
 

-  case 78:
-/* Line 1269 of yacc.c.  */
-#line 467 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(3) - (3)])); }
+  case 86:
+/* Line 1427 of yacc.c  */
+#line 577 "src/parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2628 "src/parse-gram.c"

     break;
 
     break;
 

-  case 80:
-/* Line 1269 of yacc.c.  */
-#line 473 "parse-gram.y"
-    { grammar_current_rule_begin (current_lhs, current_lhs_location); }
+  case 88:
+/* Line 1427 of yacc.c  */
+#line 583 "src/parse-gram.y"
+    { grammar_current_rule_begin (current_lhs, current_lhs_location,
+                                 current_lhs_named_ref); }
+/* Line 1427 of yacc.c  */
+#line 2637 "src/parse-gram.c"

     break;
 
     break;
 

-  case 81:
-/* Line 1269 of yacc.c.  */
-#line 475 "parse-gram.y"
-    { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
+  case 89:
+/* Line 1427 of yacc.c  */
+#line 586 "src/parse-gram.y"
+    { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1427 of yacc.c  */
+#line 2645 "src/parse-gram.c"

     break;
 
     break;
 

-  case 82:
-/* Line 1269 of yacc.c.  */
-#line 477 "parse-gram.y"
-    { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
+  case 90:
+/* Line 1427 of yacc.c  */
+#line 588 "src/parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1427 of yacc.c  */
+#line 2653 "src/parse-gram.c"

     break;
 
     break;
 

-  case 83:
-/* Line 1269 of yacc.c.  */
-#line 479 "parse-gram.y"
-    { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
+  case 91:
+/* Line 1427 of yacc.c  */
+#line 590 "src/parse-gram.y"
+    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2661 "src/parse-gram.c"

     break;
 
     break;
 

-  case 84:
-/* Line 1269 of yacc.c.  */
-#line 481 "parse-gram.y"
-    { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
+  case 92:
+/* Line 1427 of yacc.c  */
+#line 592 "src/parse-gram.y"
+    { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2669 "src/parse-gram.c"

     break;
 
     break;
 

-  case 85:
-/* Line 1269 of yacc.c.  */
-#line 483 "parse-gram.y"
-    { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
+  case 93:
+/* Line 1427 of yacc.c  */
+#line 594 "src/parse-gram.y"
+    { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2677 "src/parse-gram.c"

     break;
 
     break;
 

-  case 88:
-/* Line 1269 of yacc.c.  */
-#line 499 "parse-gram.y"
-    {
-      static char one[] = "1";
-      (yyval.chars) = one;
-    }
+  case 94:
+/* Line 1427 of yacc.c  */
+#line 598 "src/parse-gram.y"
+    { (yyval.named_ref) = 0; }
+/* Line 1427 of yacc.c  */
+#line 2685 "src/parse-gram.c"

     break;
 
     break;
 

-  case 90:
-/* Line 1269 of yacc.c.  */
-#line 509 "parse-gram.y"
+  case 95:
+/* Line 1427 of yacc.c  */
+#line 600 "src/parse-gram.y"
+    { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2693 "src/parse-gram.c"
+    break;
+
+  case 97:
+/* Line 1427 of yacc.c  */
+#line 612 "src/parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
+/* Line 1427 of yacc.c  */
+#line 2701 "src/parse-gram.c"
+    break;
+
+  case 98:
+/* Line 1427 of yacc.c  */
+#line 617 "src/parse-gram.y"
+    { (yyval.chars) = ""; }
+/* Line 1427 of yacc.c  */
+#line 2709 "src/parse-gram.c"
+    break;
+
+  case 99:
+/* Line 1427 of yacc.c  */
+#line 618 "src/parse-gram.y"
+    { (yyval.chars) = (yyvsp[0].uniqstr); }
+/* Line 1427 of yacc.c  */
+#line 2717 "src/parse-gram.c"
+    break;
+
+  case 101:
+/* Line 1427 of yacc.c  */
+#line 629 "src/parse-gram.y"

     {
     {

-      (yyvsp[(1) - (1)].chars)[strlen ((yyvsp[(1) - (1)].chars)) - 1] = '\n';
-      (yyval.chars) = translate_code ((yyvsp[(1) - (1)].chars) + 1, (yylsp[(1) - (1)]));
+      code_props plain_code;
+      (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n';
+      code_props_plain_init (&plain_code, (yyvsp[0].code)+1, (yylsp[0]));
+      code_props_translate_code (&plain_code);
+      gram_scanner_last_string_free ();
+      (yyval.chars) = plain_code.code;

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2732 "src/parse-gram.c"

     break;
 
     break;
 

-  case 91:
-/* Line 1269 of yacc.c.  */
-#line 525 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 102:
+/* Line 1427 of yacc.c  */
+#line 649 "src/parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2740 "src/parse-gram.c"

     break;
 
     break;
 

-  case 92:
-/* Line 1269 of yacc.c.  */
-#line 527 "parse-gram.y"
+  case 103:
+/* Line 1427 of yacc.c  */
+#line 651 "src/parse-gram.y"

     {
     {

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

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2752 "src/parse-gram.c"

     break;
 
     break;
 

-  case 93:
-/* Line 1269 of yacc.c.  */
-#line 535 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 104:
+/* Line 1427 of yacc.c  */
+#line 659 "src/parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2760 "src/parse-gram.c"

     break;
 
     break;
 

-  case 96:
-/* Line 1269 of yacc.c.  */
-#line 547 "parse-gram.y"
+  case 107:
+/* Line 1427 of yacc.c  */
+#line 671 "src/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);
+      (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0]));
+      symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2771 "src/parse-gram.c"

     break;
 
     break;
 

-  case 98:
-/* Line 1269 of yacc.c.  */
-#line 556 "parse-gram.y"
+  case 109:
+/* Line 1427 of yacc.c  */
+#line 680 "src/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[0].chars), (yylsp[0]));
+      code_props_translate_code (&plain_code);

       gram_scanner_last_string_free ();
       gram_scanner_last_string_free ();

+      muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
+      code_scanner_last_string_free ();

     }
     }

+/* Line 1427 of yacc.c  */
+#line 2786 "src/parse-gram.c"

     break;
 
 
     break;
 
 

-/* Line 1269 of yacc.c.  */
-#line 2400 "parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2791 "src/parse-gram.c"

       default: break;
     }
       default: break;
     }

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

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


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

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

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


@@ -2434,37 +2840,28 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else

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

 #endif
     }
 
 #endif
     }
 


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

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

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


@@ -2576,7 +2973,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
   yyresult = 1;
   goto yyreturn;
 

-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE

 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/


@@ -2588,8 +2985,13 @@ yyexhaustedlab:
 
 yyreturn:
   if (yychar != YYEMPTY)
 
 yyreturn:
   if (yychar != YYEMPTY)

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

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


@@ -2612,9 +3014,8 @@ yyreturn:
   return YYID (yyresult);
 }
 
   return YYID (yyresult);
 }
 

-
-/* Line 1486 of yacc.c.  */
-#line 562 "parse-gram.y"
+/* Line 1657 of yacc.c  */
+#line 690 "src/parse-gram.y"

 
 
 
 
 
 


@@ -2648,34 +3049,33 @@ lloc_default (YYLTYPE const *rhs, int n)
 }
 
 
 }
 
 

-/* Add a lex-param or a parse-param (depending on TYPE) with
-   declaration DECL and location LOC.  */
-

 static void
 static void

-add_param (char const *type, char *decl, location loc)
+add_param (param_type type, char *decl, location loc)

 {
   static char const alphanum[26 + 26 + 1 + 10] =
     "abcdefghijklmnopqrstuvwxyz"
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "_"
     "0123456789";
 {
   static char const alphanum[26 + 26 + 1 + 10] =
     "abcdefghijklmnopqrstuvwxyz"
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "_"
     "0123456789";

+

   char const *name_start = NULL;
   char const *name_start = NULL;

-  char *p;
-
-  /* Stop on last actual character.  */
-  for (p = decl; p[1]; p++)
-    if ((p == decl
-        || ! memchr (alphanum, p[-1], sizeof alphanum))
-       && memchr (alphanum, p[0], sizeof alphanum - 10))
-      name_start = p;
-
-  /* Strip the surrounding '{' and '}', and any blanks just inside
-     the braces.  */
-  while (*--p == ' ' || *p == '\t')
-    continue;
-  p[1] = '\0';
-  while (*++decl == ' ' || *decl == '\t')
-    continue;
+  {
+    char *p;
+    /* Stop on last actual character.  */
+    for (p = decl; p[1]; p++)
+      if ((p == decl
+           || ! memchr (alphanum, p[-1], sizeof alphanum))
+          && memchr (alphanum, p[0], sizeof alphanum - 10))
+        name_start = p;
+
+    /* Strip the surrounding '{' and '}', and any blanks just inside
+       the braces.  */
+    while (*--p == ' ' || *p == '\t')
+      continue;
+    p[1] = '\0';
+    while (*++decl == ' ' || *decl == '\t')
+      continue;
+  }

 
   if (! name_start)
     complain_at (loc, _("missing identifier in parameter declaration"));
 
   if (! name_start)
     complain_at (loc, _("missing identifier in parameter declaration"));


@@ -2692,7 +3092,10 @@ add_param (char const *type, char *decl, location loc)
       name = xmalloc (name_len + 1);
       memcpy (name, name_start, name_len);
       name[name_len] = '\0';
       name = xmalloc (name_len + 1);
       memcpy (name, name_start, name_len);
       name[name_len] = '\0';

-      muscle_pair_list_grow (type, decl, name);
+      if (type & param_lex)
+        muscle_pair_list_grow ("lex_param", decl, name);
+      if (type & param_parse)
+        muscle_pair_list_grow ("parse_param", decl, name);

       free (name);
     }
 
       free (name);
     }
 


@@ -2735,4 +3138,3 @@ char_name (char c)
       return quotearg_style (escape_quoting_style, buf);
     }
 }
       return quotearg_style (escape_quoting_style, buf);
     }
 }

-