X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ccde1f98b0f1e0967486b84297aec0f98716de6c..ff601366544d2cb2218c80e37083a88c6102061c:/src/parse-gram.c

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 3ad42185..135e7d7e 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,20 +1,20 @@
-/* A Bison parser, made by GNU Bison 2.3b.153-3d8d7.  */
+/* A Bison parser, made by GNU Bison 2.4.403-43f2.  */
 
 /* Implementation for Bison's Yacc-like parsers in C
-   
+
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008 Free Software Foundation, Inc.
-   
+   2007, 2008, 2009 Free Software Foundation, Inc.
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -27,7 +27,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -45,7 +45,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3b.153-3d8d7"
+#define YYBISON_VERSION "2.4.403-43f2"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -73,12 +73,11 @@
 #define yylloc          gram_lloc
 
 /* Copy the first part of user declarations.  */
-
 /* Line 191 of yacc.c  */
-#line 1 "parse-gram.y"
+#line 1 "src/parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -104,7 +103,8 @@
 #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"
@@ -128,29 +128,8 @@ static void gram_error (location const *, char const *);
 
 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 191 of yacc.c  */
-#line 154 "../../../src/parse-gram.c"
+#line 133 "src/parse-gram.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -170,6 +149,24 @@ static int current_prec = 0;
 # define YYTOKEN_TABLE 0
 #endif
 
+/* "%code requires" blocks.  */
+/* Line 211 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 211 of yacc.c  */
+#line 170 "src/parse-gram.c"
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -188,50 +185,49 @@ static int current_prec = 0;
      PERCENT_LEFT = 265,
      PERCENT_RIGHT = 266,
      PERCENT_NONASSOC = 267,
-     PERCENT_PREC = 268,
-     PERCENT_DPREC = 269,
-     PERCENT_MERGE = 270,
-     PERCENT_CODE = 271,
-     PERCENT_DEBUG = 272,
+     PERCENT_PRECEDENCE = 268,
+     PERCENT_PREC = 269,
+     PERCENT_DPREC = 270,
+     PERCENT_MERGE = 271,
+     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_FILE_PREFIX = 279,
-     PERCENT_GLR_PARSER = 280,
-     PERCENT_INITIAL_ACTION = 281,
-     PERCENT_LANGUAGE = 282,
-     PERCENT_LEX_PARAM = 283,
-     PERCENT_LOCATIONS = 284,
-     PERCENT_NAME_PREFIX = 285,
-     PERCENT_NO_DEFAULT_PREC = 286,
-     PERCENT_NO_LINES = 287,
-     PERCENT_NONDETERMINISTIC_PARSER = 288,
-     PERCENT_OUTPUT = 289,
-     PERCENT_PARSE_PARAM = 290,
-     PERCENT_PURE_PARSER = 291,
-     PERCENT_REQUIRE = 292,
-     PERCENT_SKELETON = 293,
-     PERCENT_START = 294,
-     PERCENT_TOKEN_TABLE = 295,
-     PERCENT_VERBOSE = 296,
-     PERCENT_YACC = 297,
-     BRACED_CODE = 298,
-     CHAR = 299,
-     EPILOGUE = 300,
-     EQUAL = 301,
-     ID = 302,
-     ID_COLON = 303,
-     PERCENT_PERCENT = 304,
-     PIPE = 305,
-     PROLOGUE = 306,
-     SEMICOLON = 307,
-     TYPE = 308,
-     TYPE_TAG_ANY = 309,
-     TYPE_TAG_NONE = 310,
-     PERCENT_UNION = 311
+     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,
+     CHAR = 296,
+     EPILOGUE = 297,
+     EQUAL = 298,
+     ID = 299,
+     ID_COLON = 300,
+     PERCENT_PERCENT = 301,
+     PIPE = 302,
+     PROLOGUE = 303,
+     SEMICOLON = 304,
+     TAG = 305,
+     TAG_ANY = 306,
+     TAG_NONE = 307,
+     BRACKETED_ID = 308,
+     PERCENT_PARAM = 309,
+     PERCENT_UNION = 310
    };
 #endif
 /* Tokens.  */
@@ -246,50 +242,49 @@ static int current_prec = 0;
 #define PERCENT_LEFT 265
 #define PERCENT_RIGHT 266
 #define PERCENT_NONASSOC 267
-#define PERCENT_PREC 268
-#define PERCENT_DPREC 269
-#define PERCENT_MERGE 270
-#define PERCENT_CODE 271
-#define PERCENT_DEBUG 272
+#define PERCENT_PRECEDENCE 268
+#define PERCENT_PREC 269
+#define PERCENT_DPREC 270
+#define PERCENT_MERGE 271
+#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_FILE_PREFIX 279
-#define PERCENT_GLR_PARSER 280
-#define PERCENT_INITIAL_ACTION 281
-#define PERCENT_LANGUAGE 282
-#define PERCENT_LEX_PARAM 283
-#define PERCENT_LOCATIONS 284
-#define PERCENT_NAME_PREFIX 285
-#define PERCENT_NO_DEFAULT_PREC 286
-#define PERCENT_NO_LINES 287
-#define PERCENT_NONDETERMINISTIC_PARSER 288
-#define PERCENT_OUTPUT 289
-#define PERCENT_PARSE_PARAM 290
-#define PERCENT_PURE_PARSER 291
-#define PERCENT_REQUIRE 292
-#define PERCENT_SKELETON 293
-#define PERCENT_START 294
-#define PERCENT_TOKEN_TABLE 295
-#define PERCENT_VERBOSE 296
-#define PERCENT_YACC 297
-#define BRACED_CODE 298
-#define CHAR 299
-#define EPILOGUE 300
-#define EQUAL 301
-#define ID 302
-#define ID_COLON 303
-#define PERCENT_PERCENT 304
-#define PIPE 305
-#define PROLOGUE 306
-#define SEMICOLON 307
-#define TYPE 308
-#define TYPE_TAG_ANY 309
-#define TYPE_TAG_NONE 310
-#define PERCENT_UNION 311
+#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 CHAR 296
+#define EPILOGUE 297
+#define EQUAL 298
+#define ID 299
+#define ID_COLON 300
+#define PERCENT_PERCENT 301
+#define PIPE 302
+#define PROLOGUE 303
+#define SEMICOLON 304
+#define TAG 305
+#define TAG_ANY 306
+#define TAG_NONE 307
+#define BRACKETED_ID 308
+#define PERCENT_PARAM 309
+#define PERCENT_UNION 310
 
 
 
@@ -297,23 +292,27 @@ static int current_prec = 0;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-
 /* Line 216 of yacc.c  */
-#line 92 "parse-gram.y"
+#line 88 "src/parse-gram.y"
 
+  assoc assoc;
+  char *code;
+  char const *chars;
+  int integer;
+  named_ref *named_ref;
   symbol *symbol;
   symbol_list *list;
-  int integer;
-  char const *chars;
-  char *code;
-  assoc assoc;
   uniqstr uniqstr;
   unsigned char character;
 
+/* Line 216 of yacc.c  */
+#line 225 "src/parse-gram.y"
+
+  param_type param;
 
 
 /* Line 216 of yacc.c  */
-#line 317 "../../../src/parse-gram.c"
+#line 316 "src/parse-gram.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -336,9 +335,39 @@ typedef struct YYLTYPE
 
 /* Copy the second part of user declarations.  */
 
-
 /* Line 266 of yacc.c  */
-#line 342 "../../../src/parse-gram.c"
+#line 340 "src/parse-gram.c"
+/* Unqualified %code blocks.  */
+/* Line 267 of yacc.c  */
+#line 56 "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 267 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 267 of yacc.c  */
+#line 371 "src/parse-gram.c"
 
 #ifdef short
 # undef short
@@ -555,25 +584,27 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   156
+#define YYLAST   190
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  57
+#define YYNTOKENS  56
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  33
+#define YYNNTS  36
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  105
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  143
+#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 YYMAXUTOK   311
+#define YYMAXUTOK   310
 
 #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,
@@ -607,73 +638,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,
-      55,    56
+      55
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
-      24,    27,    29,    32,    35,    38,    42,    44,    47,    50,
-      53,    55,    58,    62,    64,    66,    69,    73,    76,    78,
-      81,    84,    86,    88,    90,    92,    94,    96,    99,   103,
-     107,   109,   111,   114,   118,   119,   121,   125,   126,   130,
-     131,   135,   139,   143,   145,   147,   149,   150,   152,   154,
-     157,   159,   162,   164,   167,   169,   172,   174,   176,   178,
-     180,   182,   184,   187,   190,   194,   196,   199,   201,   204,
-     206,   209,   212,   213,   217,   219,   223,   226,   227,   230,
-     233,   237,   241,   245,   247,   249,   250,   252,   254,   256,
-     258,   260,   262,   264,   266,   267
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      58,     0,    -1,    59,    49,    76,    89,    -1,    -1,    59,
-      60,    -1,    61,    -1,    51,    -1,    17,    -1,    19,    82,
-      83,    -1,    20,    -1,    20,     3,    -1,    21,    -1,    22,
-       4,    -1,    23,     4,    -1,    24,     3,    -1,    24,    46,
-       3,    -1,    25,    -1,    26,    43,    -1,    27,     3,    -1,
-      28,    43,    -1,    29,    -1,    30,     3,    -1,    30,    46,
-       3,    -1,    32,    -1,    33,    -1,    34,     3,    -1,    34,
-      46,     3,    -1,    35,    43,    -1,    36,    -1,    37,     3,
-      -1,    38,     3,    -1,    40,    -1,    41,    -1,    42,    -1,
-      52,    -1,    66,    -1,    63,    -1,    39,    87,    -1,     8,
-      43,    72,    -1,     9,    43,    72,    -1,    18,    -1,    31,
-      -1,    16,    84,    -1,    16,    47,    84,    -1,    -1,    47,
-      -1,    56,    62,    84,    -1,    -1,     6,    64,    75,    -1,
-      -1,     5,    65,    75,    -1,     7,    53,    71,    -1,    67,
-      68,    69,    -1,    10,    -1,    11,    -1,    12,    -1,    -1,
-      53,    -1,    70,    -1,    69,    70,    -1,    87,    -1,    87,
-       4,    -1,    87,    -1,    71,    87,    -1,    73,    -1,    72,
-      73,    -1,    87,    -1,    53,    -1,    54,    -1,    55,    -1,
-      53,    -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,    61,    52,    -1,     1,
-      52,    -1,    -1,    86,    79,    80,    -1,    81,    -1,    80,
-      50,    81,    -1,    80,    52,    -1,    -1,    81,    87,    -1,
-      81,    43,    -1,    81,    13,    87,    -1,    81,    14,     4,
-      -1,    81,    15,    53,    -1,    47,    -1,     3,    -1,    -1,
-       3,    -1,    43,    -1,    47,    -1,    44,    -1,    48,    -1,
-      85,    -1,    88,    -1,     3,    -1,    -1,    49,    45,    -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[] =
 {
-       0,   202,   202,   210,   212,   216,   217,   227,   228,   232,
-     233,   238,   239,   240,   241,   242,   243,   248,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   280,
-     281,   305,   306,   307,   308,   312,   313,   314,   318,   325,
-     332,   336,   340,   347,   362,   363,   367,   379,   379,   384,
-     384,   389,   400,   415,   416,   417,   421,   422,   427,   429,
-     434,   435,   440,   442,   447,   448,   452,   453,   454,   455,
-     460,   465,   470,   476,   482,   493,   494,   503,   504,   510,
-     511,   512,   519,   519,   523,   524,   525,   530,   531,   533,
-     535,   537,   539,   549,   550,   556,   559,   568,   588,   590,
-     599,   604,   605,   610,   617,   619
+       0,   249,   249,   257,   259,   263,   264,   274,   278,   283,
+     284,   289,   294,   295,   296,   297,   298,   303,   312,   313,
+     314,   315,   316,   317,   318,   319,   319,   320,   321,   345,
+     346,   347,   348,   352,   353,   362,   363,   364,   368,   375,
+     382,   386,   390,   397,   412,   413,   417,   429,   429,   434,
+     434,   439,   450,   465,   466,   467,   468,   472,   473,   478,
+     480,   485,   486,   491,   493,   498,   499,   503,   504,   505,
+     506,   511,   516,   521,   527,   533,   544,   545,   554,   555,
+     561,   562,   563,   570,   570,   575,   576,   577,   582,   584,
+     586,   588,   590,   592,   597,   599,   610,   611,   616,   617,
+     618,   627,   647,   649,   658,   663,   664,   669,   676,   678
 };
 #endif
 
@@ -684,32 +666,32 @@ static const char *const yytname[] =
 {
   "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
   "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
-  "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"",
-  "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%debug\"",
+  "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"",
+  "\"%precedence\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",
   "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
-  "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
-  "\"%initial-action\"", "\"%language\"", "\"%lex-param\"",
-  "\"%locations\"", "\"%name-prefix\"", "\"%no-default-prec\"",
-  "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"",
-  "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"",
-  "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"",
-  "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"",
-  "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"",
-  "\"<*>\"", "\"<>\"", "\"%union\"", "$accept", "input",
-  "prologue_declarations", "prologue_declaration", "grammar_declaration",
-  "union_name", "symbol_declaration", "$@1", "$@2",
-  "precedence_declaration", "precedence_declarator", "type.opt",
+  "\"%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\"", "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"",
+  "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"",
+  "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"", "\"[identifier]\"",
+  "\"%param\"", "\"%union\"", "$accept", "input", "prologue_declarations",
+  "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",
-  "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs",
-  "variable", "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
-/* 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,
@@ -717,170 +699,186 @@ 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,
-     305,   306,   307,   308,   309,   310,   311
+     305,   306,   307,   308,   309,   310
 };
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    57,    58,    59,    59,    60,    60,    60,    60,    60,
-      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
-      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
-      60,    60,    60,    60,    60,    61,    61,    61,    61,    61,
-      61,    61,    61,    61,    62,    62,    61,    64,    63,    65,
-      63,    63,    66,    67,    67,    67,    68,    68,    69,    69,
-      70,    70,    71,    71,    72,    72,    73,    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
-};
+#define YYPACT_NINF -88
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-88))
+
+#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,     2,     4,     0,     2,     1,     1,     1,     3,     1,
-       2,     1,     2,     2,     2,     3,     1,     2,     2,     2,
-       1,     2,     3,     1,     1,     2,     3,     2,     1,     2,
-       2,     1,     1,     1,     1,     1,     1,     2,     3,     3,
-       1,     1,     2,     3,     0,     1,     3,     0,     3,     0,
-       3,     3,     3,     1,     1,     1,     0,     1,     1,     2,
-       1,     2,     1,     2,     1,     2,     1,     1,     1,     1,
-       1,     1,     2,     2,     3,     1,     2,     1,     2,     1,
-       2,     2,     0,     3,     1,     3,     2,     0,     2,     2,
-       3,     3,     3,     1,     1,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     0,     2
+     -88,    38,   109,   -88,   -88,   -88,    -8,    13,    41,   -88,
+     -88,   -88,   -88,   -17,   -88,    14,    51,   -88,    53,    78,
+     -88,     2,   -88,    43,    81,    17,   -88,   -88,   -88,    30,
+      82,    83,    36,   -88,   -88,   -88,    58,   -88,   -88,   -88,
+      45,   -88,   -88,   -88,   -88,    40,    -1,    -1,    36,     0,
+       0,   -88,    52,   -88,   -88,   -88,    18,   -88,   -88,   -88,
+     -88,    88,   -88,   -88,   -88,    90,   -88,    92,   -88,   -88,
+     -88,   -88,   -88,   -88,   -88,   -88,    47,   -88,    48,     1,
+     -88,   -88,    46,    60,   -88,    52,   -88,    36,   -88,   -88,
+      -1,    31,    -1,    36,   -88,   -88,   -88,   -88,     0,   -88,
+     -88,     0,   -88,   -88,   -88,   -88,   -88,   -88,   -88,   -88,
+     -88,    56,   -88,   -88,   -88,   -88,   -88,    61,   -88,    36,
+     -88,   100,   -88,   103,   -88,   -88,   -88,   -88,   -88,   -88,
+     -88,   -88,   -88,   -23,   146,   -88,   -88,    36,   104,    57,
+      46,    46,   146,   -88,   -88,   -88,   -88,   -88
 };
 
-/* 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.  */
+  /* 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[] =
 {
        3,     0,     0,     1,    49,    47,     0,     0,     0,    53,
-      54,    55,     0,     7,    40,     0,     9,    11,     0,     0,
-       0,    16,     0,     0,     0,    20,     0,    41,    23,    24,
-       0,     0,    28,     0,     0,     0,    31,    32,    33,     0,
-       6,    34,    44,     4,     5,    36,    35,    56,     0,     0,
-       0,     0,     0,    97,     0,    42,    94,    93,    95,    10,
-      12,    13,    14,     0,    17,    18,    19,    21,     0,    25,
-       0,    27,    29,    30,   103,    99,    98,   101,    37,   102,
-       0,   100,     0,     0,    77,    79,    82,    45,     0,    57,
-       0,    70,    75,    50,    71,    48,    51,    62,    67,    68,
-      69,    38,    64,    66,    39,    43,    96,     8,    15,    22,
-      26,    81,    80,     0,    78,     2,    87,    46,    52,    58,
-      60,    76,    72,    73,    63,    65,   105,    83,    84,    59,
-      61,    74,    87,    86,     0,     0,     0,    89,    88,    85,
-      90,    91,    92
+      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
+};
+
+  /* YYPGOTO[NTERM-NUM].    */
+static const yytype_int8 yypgoto[] =
+{
+     -88,   -88,   -88,   -88,   -88,   -88,   107,   -88,   -88,   -88,
+     -88,   -88,   -88,   -88,   -88,    -7,   -88,    73,   -76,   -60,
+      64,   -88,    71,   -88,   -88,   -88,   -11,   -62,   -88,   -88,
+     -37,   -18,   -88,   -32,   -87,   -88
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
+  /* YYDEFGOTO[NTERM-NUM].    */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,     2,    43,    82,    88,    45,    49,    48,    46,
-      47,    90,   118,   119,    96,   101,   102,    92,    93,    83,
-      84,    85,   116,   127,   128,    58,   107,    55,    77,    86,
-     103,    79,   115
+      -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 -60
-static const yytype_int16 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[] =
 {
-     -60,    18,   100,   -60,   -60,   -60,   -16,    24,    27,   -60,
-     -60,   -60,    -8,   -60,   -60,    11,    70,   -60,    71,    80,
-       2,   -60,    46,    87,    48,   -60,    31,   -60,   -60,   -60,
-      40,    49,   -60,    91,    92,     0,   -60,   -60,   -60,    15,
-     -60,   -60,    50,   -60,   -60,   -60,   -60,    43,    12,    12,
-       0,    25,    25,   -60,    55,   -60,   -60,   -60,    97,   -60,
-     -60,   -60,   -60,    98,   -60,   -60,   -60,   -60,    99,   -60,
-     110,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,
-      51,   -60,    62,     1,   -60,   -60,   -60,   -60,    55,   -60,
-       0,   -60,   -60,    12,    84,    12,     0,   -60,   -60,   -60,
-     -60,    25,   -60,   -60,    25,   -60,   -60,   -60,   -60,   -60,
-     -60,   -60,   -60,   101,   -60,   -60,   -60,   -60,     0,   -60,
-     111,   -60,   140,   -60,   -60,   -60,   -60,    10,    38,   -60,
-     -60,   -60,   -60,   -60,     0,   141,    94,   -60,   -60,    38,
-     -60,   -60,   -60
+      74,  -108,    76,    70,   124,    60,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,   102,    94,    54,    13,    14,
+      64,   103,   126,    51,   135,   126,   136,    52,    91,    91,
+     122,    26,   122,    66,    70,   123,   132,    32,     3,    70,
+      71,    71,    48,    72,    72,    61,    77,   111,   118,    88,
+      95,    96,    97,    49,    57,   121,    40,    58,    55,    76,
+      65,   125,   104,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    91,    67,    91,    13,    14,    71,   146,   147,
+      72,    50,    59,    62,    63,    68,    69,   121,    26,    84,
+      86,   106,    51,   107,    32,   108,   109,   110,   127,   114,
+     116,   129,   141,    77,   131,   143,    70,   145,   144,    42,
+     141,    92,   130,    40,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,   101,   142,     0,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    70,
+     112,     0,     0,     0,     0,    36,     0,    37,    38,     0,
+     137,   138,   139,    39,    40,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   140,    71,     0,     0,
+      72
 };
 
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
+static const yytype_int16 yycheck[] =
 {
-     -60,   -60,   -60,   -60,   142,   -60,   -60,   -60,   -60,   -60,
-     -60,   -60,   -60,    30,   -60,   102,   -59,   -27,   104,   -60,
-      67,   -60,   -60,   -60,    23,   -60,   -60,   -50,   -19,   -60,
-     -35,   -58,   -60
+      32,     0,     1,     3,    91,     3,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    52,    48,     3,    17,    18,
+       3,     3,    98,    40,    47,   101,    49,    44,    46,    47,
+      90,    30,    92,     3,     3,     4,   123,    36,     0,     3,
+      41,    41,    50,    44,    44,    43,    45,    46,    85,    50,
+      50,    51,    52,    40,     3,    87,    55,     4,    44,     1,
+      43,    93,    44,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    90,    43,    92,    17,    18,    41,   140,   141,
+      44,    40,     4,    40,     3,     3,     3,   119,    30,    44,
+      50,     3,    40,     3,    36,     3,    49,    49,    42,    53,
+      40,    40,   134,    45,     4,   137,     3,    50,     4,     2,
+     142,    47,   119,    55,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    50,   135,    -1,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,     3,
+      79,    -1,    -1,    -1,    -1,    46,    -1,    48,    49,    -1,
+      14,    15,    16,    54,    55,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    40,    41,    -1,    -1,
+      44
 };
 
-/* 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 -105
-static const yytype_int16 yytable[] =
+  /* STOS_[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.    */
+static const yytype_uint8 yystos[] =
 {
-      78,  -104,    80,    74,   105,    62,     4,     5,     6,     7,
-       8,     9,    10,    11,    56,    97,    80,    12,     3,    14,
-       4,     5,     6,     7,     8,     9,    10,    11,    74,    94,
-      94,    12,    27,    14,    67,    53,   123,    50,   117,    54,
-      35,    74,   125,    69,    75,   125,    27,    76,    63,    81,
-     113,   134,   135,   136,    35,   120,    75,    42,    57,    76,
-     132,   124,   133,    81,   131,    91,   121,    51,   121,    75,
-      52,    42,    76,    59,    94,    60,    94,    68,    98,    99,
-     100,   137,    75,   120,    61,    76,    70,    74,   122,    64,
-      65,    66,    71,   138,    72,    73,    89,    87,    53,   140,
-     106,   108,   109,   111,   138,     4,     5,     6,     7,     8,
-       9,    10,    11,   110,   112,   130,    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,    74,    44,   141,   126,   142,   129,    39,
-     114,    40,    41,    95,   104,   139,    42
+       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,    46,    48,    49,    54,
+      55,    59,    62,    64,    67,    68,    66,    65,    50,    40,
+      40,    40,    44,    86,     3,    44,    84,     3,     4,     4,
+       3,    43,    40,     3,     3,    43,     3,    43,     3,     3,
+       3,    41,    44,    87,    89,    90,     1,    45,    62,    77,
+      78,    79,    88,    60,    44,    63,    50,    69,    50,    75,
+      76,    87,    76,    72,    89,    50,    51,    52,    73,    74,
+      89,    73,    86,     3,    44,    85,     3,     3,     3,    49,
+      49,    46,    78,    91,    53,    83,    40,    61,    86,    70,
+      71,    89,    75,     4,    90,    89,    74,    42,    80,    40,
+      71,     4,    90,    81,    82,    47,    49,    14,    15,    16,
+      40,    89,    82,    89,     4,    50,    83,    83
 };
 
-static const yytype_uint8 yycheck[] =
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.    */
+static const yytype_uint8 yyr1[] =
 {
-      35,     0,     1,     3,    54,     3,     5,     6,     7,     8,
-       9,    10,    11,    12,     3,    50,     1,    16,     0,    18,
-       5,     6,     7,     8,     9,    10,    11,    12,     3,    48,
-      49,    16,    31,    18,     3,    43,    94,    53,    88,    47,
-      39,     3,   101,     3,    44,   104,    31,    47,    46,    48,
-      49,    13,    14,    15,    39,    90,    44,    56,    47,    47,
-      50,    96,    52,    48,   122,    53,    93,    43,    95,    44,
-      43,    56,    47,     3,    93,     4,    95,    46,    53,    54,
-      55,    43,    44,   118,     4,    47,    46,     3,     4,    43,
-       3,    43,    43,   128,     3,     3,    53,    47,    43,   134,
-       3,     3,     3,    52,   139,     5,     6,     7,     8,     9,
-      10,    11,    12,     3,    52,     4,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,     3,     2,     4,    45,    53,   118,    49,
-      83,    51,    52,    49,    52,   132,    56
+       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,    58,    59,     0,     5,     6,     7,     8,     9,    10,
-      11,    12,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    49,
-      51,    52,    56,    60,    61,    63,    66,    67,    65,    64,
-      53,    43,    43,    43,    47,    84,     3,    47,    82,     3,
-       4,     4,     3,    46,    43,     3,    43,     3,    46,     3,
-      46,    43,     3,     3,     3,    44,    47,    85,    87,    88,
-       1,    48,    61,    76,    77,    78,    86,    47,    62,    53,
-      68,    53,    74,    75,    85,    75,    71,    87,    53,    54,
-      55,    72,    73,    87,    72,    84,     3,    83,     3,     3,
-       3,    52,    52,    49,    77,    89,    79,    84,    69,    70,
-      87,    74,     4,    88,    87,    73,    45,    80,    81,    70,
-       4,    88,    50,    52,    13,    14,    15,    43,    87,    81,
-      87,     4,    53
+       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)
@@ -1026,150 +1024,178 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
 # endif
   switch (yytype)
     {
-      case 3: /* "\"string\"" */
-
-/* Line 717 of yacc.c  */
-#line 180 "parse-gram.y"
-	{ fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); };
-
-/* Line 717 of yacc.c  */
-#line 1037 "../../../src/parse-gram.c"
-	break;
-      case 4: /* "\"integer\"" */
-
-/* Line 717 of yacc.c  */
-#line 191 "parse-gram.y"
-	{ fprintf (stderr, "%d", ((*yyvaluep).integer)); };
-
-/* Line 717 of yacc.c  */
-#line 1046 "../../../src/parse-gram.c"
-	break;
-      case 43: /* "\"{...}\"" */
-
-/* Line 717 of yacc.c  */
-#line 182 "parse-gram.y"
-	{ fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); };
-
-/* Line 717 of yacc.c  */
-#line 1055 "../../../src/parse-gram.c"
-	break;
-      case 44: /* "\"char\"" */
-
-/* Line 717 of yacc.c  */
-#line 174 "parse-gram.y"
-	{ fputs (char_name (((*yyvaluep).character)), stderr); };
-
-/* Line 717 of yacc.c  */
-#line 1064 "../../../src/parse-gram.c"
-	break;
-      case 45: /* "\"epilogue\"" */
-
-/* Line 717 of yacc.c  */
-#line 182 "parse-gram.y"
-	{ fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
-
-/* Line 717 of yacc.c  */
-#line 1073 "../../../src/parse-gram.c"
-	break;
-      case 47: /* "\"identifier\"" */
-
-/* Line 717 of yacc.c  */
-#line 187 "parse-gram.y"
-	{ fputs (((*yyvaluep).uniqstr), stderr); };
-
-/* Line 717 of yacc.c  */
-#line 1082 "../../../src/parse-gram.c"
-	break;
-      case 48: /* "\"identifier:\"" */
-
-/* Line 717 of yacc.c  */
-#line 188 "parse-gram.y"
-	{ fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); };
-
-/* Line 717 of yacc.c  */
-#line 1091 "../../../src/parse-gram.c"
-	break;
-      case 51: /* "\"%{...%}\"" */
-
-/* Line 717 of yacc.c  */
-#line 182 "parse-gram.y"
-	{ fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
-
-/* Line 717 of yacc.c  */
-#line 1100 "../../../src/parse-gram.c"
-	break;
-      case 53: /* "\"type\"" */
-
-/* Line 717 of yacc.c  */
-#line 186 "parse-gram.y"
-	{ fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); };
-
-/* Line 717 of yacc.c  */
-#line 1109 "../../../src/parse-gram.c"
-	break;
-      case 82: /* "variable" */
-
-/* Line 717 of yacc.c  */
-#line 187 "parse-gram.y"
-	{ fputs (((*yyvaluep).uniqstr), stderr); };
-
-/* Line 717 of yacc.c  */
-#line 1118 "../../../src/parse-gram.c"
-	break;
-      case 83: /* "content.opt" */
-
-/* Line 717 of yacc.c  */
-#line 182 "parse-gram.y"
-	{ fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
-
-/* Line 717 of yacc.c  */
-#line 1127 "../../../src/parse-gram.c"
-	break;
-      case 84: /* "braceless" */
-
-/* Line 717 of yacc.c  */
-#line 182 "parse-gram.y"
-	{ fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
-
-/* Line 717 of yacc.c  */
-#line 1136 "../../../src/parse-gram.c"
-	break;
-      case 85: /* "id" */
-
-/* Line 717 of yacc.c  */
-#line 194 "parse-gram.y"
-	{ fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
-
-/* Line 717 of yacc.c  */
-#line 1145 "../../../src/parse-gram.c"
-	break;
-      case 86: /* "id_colon" */
-
-/* Line 717 of yacc.c  */
-#line 195 "parse-gram.y"
-	{ fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); };
-
-/* Line 717 of yacc.c  */
-#line 1154 "../../../src/parse-gram.c"
-	break;
-      case 87: /* "symbol" */
-
-/* Line 717 of yacc.c  */
-#line 194 "parse-gram.y"
-	{ fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
-
-/* Line 717 of yacc.c  */
-#line 1163 "../../../src/parse-gram.c"
-	break;
-      case 88: /* "string_as_id" */
-
-/* Line 717 of yacc.c  */
-#line 194 "parse-gram.y"
-	{ fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
+            case 3: // "string"
+
+/* Line 653 of yacc.c  */
+#line 175 "src/parse-gram.y"
+        { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
+/* Line 653 of yacc.c  */
+#line 1034 "src/parse-gram.c"
+        break;
+
+            case 4: // "integer"
+
+/* Line 653 of yacc.c  */
+#line 188 "src/parse-gram.y"
+        { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
+/* Line 653 of yacc.c  */
+#line 1043 "src/parse-gram.c"
+        break;
+
+            case 24: // "%<flag>"
+
+/* Line 653 of yacc.c  */
+#line 184 "src/parse-gram.y"
+        { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
+/* Line 653 of yacc.c  */
+#line 1052 "src/parse-gram.c"
+        break;
+
+            case 40: // "{...}"
+
+/* Line 653 of yacc.c  */
+#line 177 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
+/* Line 653 of yacc.c  */
+#line 1061 "src/parse-gram.c"
+        break;
+
+            case 41: // "char"
+
+/* Line 653 of yacc.c  */
+#line 169 "src/parse-gram.y"
+        { fputs (char_name (((*yyvaluep).character)), stderr); }
+/* Line 653 of yacc.c  */
+#line 1070 "src/parse-gram.c"
+        break;
+
+            case 42: // "epilogue"
+
+/* Line 653 of yacc.c  */
+#line 177 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 653 of yacc.c  */
+#line 1079 "src/parse-gram.c"
+        break;
+
+            case 44: // "identifier"
+
+/* Line 653 of yacc.c  */
+#line 182 "src/parse-gram.y"
+        { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 653 of yacc.c  */
+#line 1088 "src/parse-gram.c"
+        break;
+
+            case 45: // "identifier:"
+
+/* Line 653 of yacc.c  */
+#line 183 "src/parse-gram.y"
+        { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
+/* Line 653 of yacc.c  */
+#line 1097 "src/parse-gram.c"
+        break;
+
+            case 48: // "%{...%}"
+
+/* Line 653 of yacc.c  */
+#line 177 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 653 of yacc.c  */
+#line 1106 "src/parse-gram.c"
+        break;
+
+            case 50: // "<tag>"
+
+/* Line 653 of yacc.c  */
+#line 185 "src/parse-gram.y"
+        { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
+/* Line 653 of yacc.c  */
+#line 1115 "src/parse-gram.c"
+        break;
+
+            case 54: // "%param"
+
+/* Line 653 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
+    }
+}
+/* Line 653 of yacc.c  */
+#line 1134 "src/parse-gram.c"
+        break;
+
+            case 84: // variable
+
+/* Line 653 of yacc.c  */
+#line 182 "src/parse-gram.y"
+        { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 653 of yacc.c  */
+#line 1143 "src/parse-gram.c"
+        break;
+
+            case 85: // content.opt
+
+/* Line 653 of yacc.c  */
+#line 177 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 653 of yacc.c  */
+#line 1152 "src/parse-gram.c"
+        break;
+
+            case 86: // braceless
+
+/* Line 653 of yacc.c  */
+#line 177 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 653 of yacc.c  */
+#line 1161 "src/parse-gram.c"
+        break;
+
+            case 87: // id
+
+/* Line 653 of yacc.c  */
+#line 191 "src/parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 653 of yacc.c  */
+#line 1170 "src/parse-gram.c"
+        break;
+
+            case 88: // id_colon
+
+/* Line 653 of yacc.c  */
+#line 192 "src/parse-gram.y"
+        { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
+/* Line 653 of yacc.c  */
+#line 1179 "src/parse-gram.c"
+        break;
+
+            case 89: // symbol
+
+/* Line 653 of yacc.c  */
+#line 191 "src/parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 653 of yacc.c  */
+#line 1188 "src/parse-gram.c"
+        break;
+
+            case 90: // string_as_id
+
+/* Line 653 of yacc.c  */
+#line 191 "src/parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 653 of yacc.c  */
+#line 1197 "src/parse-gram.c"
+        break;
 
-/* Line 717 of yacc.c  */
-#line 1172 "../../../src/parse-gram.c"
-	break;
       default:
 	break;
     }
@@ -1243,27 +1269,29 @@ do {								\
 #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
-yy_reduce_print (yyvsp, yylsp, yyrule)
+yy_reduce_print (yyssp, yyvsp, yylsp, yyrule)
+    yytype_int16 *yyssp;
     YYSTYPE *yyvsp;
     YYLTYPE *yylsp;
     int yyrule;
 #endif
 {
+  unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
   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++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       , &(yylsp[(yyi + 1) - (yynrhs)])		       );
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                       , &(yylsp[(yyi + 1) - (yynrhs)])                       );
       YYFPRINTF (stderr, "\n");
     }
 }
@@ -1271,7 +1299,7 @@ yy_reduce_print (yyvsp, yylsp, yyrule)
 # 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
@@ -1405,14 +1433,14 @@ yytnamerr (char *yyres, const char *yystr)
 # endif
 
 /* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   YYTOKEN 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)
+yysyntax_error (char *yyresult, int yystate, int yytoken)
 {
   int yyn = yypact[yystate];
 
@@ -1420,67 +1448,62 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
     return 0;
   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;
       int yysize_overflow = 0;
       enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      /* Internationalized format string. */
+      const char *yyformat = 0;
+      /* Arguments of yyformat. */
       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
-	 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 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)
-	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;
-		yyformat[sizeof yyunexpected - 1] = '\0';
 		break;
 	      }
 	    yyarg[yycount++] = yytname[yyx];
 	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
 	    yysize_overflow |= (yysize1 < yysize);
 	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
 	  }
 
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
+        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);
       yysize_overflow |= (yysize1 < yysize);
       yysize = yysize1;
 
@@ -1494,19 +1517,17 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
 	     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++;
-		}
-	    }
+	  while ((*yyp = *yyformat) != '\0')
+            if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+              {
+                yyp += yytnamerr (yyp, yyarg[yyi++]);
+                yyformat += 2;
+              }
+            else
+              {
+                yyp++;
+                yyformat++;
+              }
 	}
       return yysize;
     }
@@ -1541,7 +1562,6 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 
   switch (yytype)
     {
-
       default:
 	break;
     }
@@ -1549,13 +1569,15 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 
 /* Prevent warnings from -Wmissing-prototypes.  */
 #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 */
-#if defined __STDC__ || defined __cplusplus
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 int yyparse (void);
 #else
 int yyparse ();
@@ -1686,18 +1708,16 @@ YYLTYPE yylloc;
 #endif
 
 /* User initialization code.  */
-
-/* Line 1244 of yacc.c  */
-#line 84 "parse-gram.y"
+/* Line 1175 of yacc.c  */
+#line 80 "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);
 }
-
-/* Line 1244 of yacc.c  */
-#line 1701 "../../../src/parse-gram.c"
+/* Line 1175 of yacc.c  */
+#line 1721 "src/parse-gram.c"
   yylsp[0] = yylloc;
 
   goto yysetstate;
@@ -1796,7 +1816,7 @@ yybackup:
 
   /* 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.  */
@@ -1827,7 +1847,7 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
+      if (yytable_value_is_error (yyn))
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
@@ -1883,285 +1903,215 @@ yyreduce:
   switch (yyn)
     {
         case 6:
-
-/* Line 1457 of yacc.c  */
-#line 218 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 265 "src/parse-gram.y"
     {
       code_props plain_code;
-      code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
+      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[(1) - (1)]));
+                        plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-
-/* Line 1457 of yacc.c  */
-#line 1901 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 1919 "src/parse-gram.c"
     break;
 
   case 7:
-
-/* Line 1457 of yacc.c  */
-#line 227 "parse-gram.y"
-    { debug_flag = true; }
-
-/* Line 1457 of yacc.c  */
-#line 1911 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 275 "src/parse-gram.y"
+    {
+      muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
+    }
+/* Line 1388 of yacc.c  */
+#line 1929 "src/parse-gram.c"
     break;
 
   case 8:
-
-/* Line 1457 of yacc.c  */
-#line 229 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 279 "src/parse-gram.y"
     {
-      muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars));
+      muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
+                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
-
-/* Line 1457 of yacc.c  */
-#line 1923 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 1940 "src/parse-gram.c"
     break;
 
   case 9:
-
-/* Line 1457 of yacc.c  */
-#line 232 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 283 "src/parse-gram.y"
     { defines_flag = true; }
-
-/* Line 1457 of yacc.c  */
-#line 1933 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 1948 "src/parse-gram.c"
     break;
 
   case 10:
-
-/* Line 1457 of yacc.c  */
-#line 234 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 285 "src/parse-gram.y"
     {
       defines_flag = true;
-      spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
+      spec_defines_file = xstrdup ((yyvsp[0].chars));
     }
-
-/* Line 1457 of yacc.c  */
-#line 1946 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 1959 "src/parse-gram.c"
     break;
 
   case 11:
-
-/* Line 1457 of yacc.c  */
-#line 238 "parse-gram.y"
-    { error_verbose = true; }
-
-/* Line 1457 of yacc.c  */
-#line 1956 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 290 "src/parse-gram.y"
+    {
+      muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
+                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+    }
+/* Line 1388 of yacc.c  */
+#line 1970 "src/parse-gram.c"
     break;
 
   case 12:
-
-/* Line 1457 of yacc.c  */
-#line 239 "parse-gram.y"
-    { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
-
-/* Line 1457 of yacc.c  */
-#line 1966 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 294 "src/parse-gram.y"
+    { expected_sr_conflicts = (yyvsp[0].integer); }
+/* Line 1388 of yacc.c  */
+#line 1978 "src/parse-gram.c"
     break;
 
   case 13:
-
-/* Line 1457 of yacc.c  */
-#line 240 "parse-gram.y"
-    { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
-
-/* Line 1457 of yacc.c  */
-#line 1976 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 295 "src/parse-gram.y"
+    { expected_rr_conflicts = (yyvsp[0].integer); }
+/* Line 1388 of yacc.c  */
+#line 1986 "src/parse-gram.c"
     break;
 
   case 14:
-
-/* Line 1457 of yacc.c  */
-#line 241 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 1986 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 296 "src/parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1388 of yacc.c  */
+#line 1994 "src/parse-gram.c"
     break;
 
   case 15:
-
-/* Line 1457 of yacc.c  */
-#line 242 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 1996 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 297 "src/parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1388 of yacc.c  */
+#line 2002 "src/parse-gram.c"
     break;
 
   case 16:
-
-/* Line 1457 of yacc.c  */
-#line 244 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 299 "src/parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
     }
-
-/* Line 1457 of yacc.c  */
-#line 2009 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2013 "src/parse-gram.c"
     break;
 
   case 17:
-
-/* Line 1457 of yacc.c  */
-#line 249 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 304 "src/parse-gram.y"
     {
       code_props action;
-      code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
+      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[(2) - (2)]));
+      muscle_code_grow ("initial_action", action.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-
-/* Line 1457 of yacc.c  */
-#line 2026 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2028 "src/parse-gram.c"
     break;
 
   case 18:
-
-/* Line 1457 of yacc.c  */
-#line 257 "parse-gram.y"
-    { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2036 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 312 "src/parse-gram.y"
+    { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
+/* Line 1388 of yacc.c  */
+#line 2036 "src/parse-gram.c"
     break;
 
   case 19:
-
-/* Line 1457 of yacc.c  */
-#line 258 "parse-gram.y"
-    { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2046 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 313 "src/parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1388 of yacc.c  */
+#line 2044 "src/parse-gram.c"
     break;
 
   case 20:
-
-/* Line 1457 of yacc.c  */
-#line 259 "parse-gram.y"
-    { locations_flag = true; }
-
-/* Line 1457 of yacc.c  */
-#line 2056 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 314 "src/parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1388 of yacc.c  */
+#line 2052 "src/parse-gram.c"
     break;
 
   case 21:
-
-/* Line 1457 of yacc.c  */
-#line 260 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 2066 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 315 "src/parse-gram.y"
+    { no_lines_flag = true; }
+/* Line 1388 of yacc.c  */
+#line 2060 "src/parse-gram.c"
     break;
 
   case 22:
-
-/* Line 1457 of yacc.c  */
-#line 261 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 2076 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 316 "src/parse-gram.y"
+    { nondeterministic_parser = true; }
+/* Line 1388 of yacc.c  */
+#line 2068 "src/parse-gram.c"
     break;
 
   case 23:
-
-/* Line 1457 of yacc.c  */
-#line 262 "parse-gram.y"
-    { no_lines_flag = true; }
-
-/* Line 1457 of yacc.c  */
-#line 2086 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 317 "src/parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1388 of yacc.c  */
+#line 2076 "src/parse-gram.c"
     break;
 
   case 24:
-
-/* Line 1457 of yacc.c  */
-#line 263 "parse-gram.y"
-    { nondeterministic_parser = true; }
-
-/* Line 1457 of yacc.c  */
-#line 2096 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 318 "src/parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1388 of yacc.c  */
+#line 2084 "src/parse-gram.c"
     break;
 
   case 25:
-
-/* Line 1457 of yacc.c  */
-#line 264 "parse-gram.y"
-    { spec_outfile = (yyvsp[(2) - (2)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 2106 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 319 "src/parse-gram.y"
+    { current_param = (yyvsp[0].param); }
+/* Line 1388 of yacc.c  */
+#line 2092 "src/parse-gram.c"
     break;
 
   case 26:
-
-/* Line 1457 of yacc.c  */
-#line 265 "parse-gram.y"
-    { spec_outfile = (yyvsp[(3) - (3)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 2116 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 319 "src/parse-gram.y"
+    { current_param = param_none; }
+/* Line 1388 of yacc.c  */
+#line 2100 "src/parse-gram.c"
     break;
 
   case 27:
-
-/* Line 1457 of yacc.c  */
-#line 266 "parse-gram.y"
-    { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2126 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 320 "src/parse-gram.y"
+    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
+/* Line 1388 of yacc.c  */
+#line 2108 "src/parse-gram.c"
     break;
 
   case 28:
-
-/* Line 1457 of yacc.c  */
-#line 268 "parse-gram.y"
-    {
-      /* %pure-parser is deprecated in favor of `%define api.pure', so use
-         `%define api.pure' in a backward-compatible manner here.  First, don't
-         complain if %pure-parser is specified multiple times.  */
-      if (!muscle_find_const ("percent_define(api.pure)"))
-        muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "");
-      /* In all cases, use api.pure now so that the backend doesn't complain if
-         the skeleton ignores api.pure, but do warn now if there's a previous
-         conflicting definition from an actual %define.  */
-      if (!muscle_percent_define_flag_if ("api.pure"))
-        muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "");
-    }
-
-/* Line 1457 of yacc.c  */
-#line 2147 "../../../src/parse-gram.c"
-    break;
-
-  case 29:
-
-/* Line 1457 of yacc.c  */
-#line 280 "parse-gram.y"
-    { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
-
-/* Line 1457 of yacc.c  */
-#line 2157 "../../../src/parse-gram.c"
-    break;
-
-  case 30:
-
-/* Line 1457 of yacc.c  */
-#line 282 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 322 "src/parse-gram.y"
     {
-      char const *skeleton_user = (yyvsp[(2) - (2)].chars);
+      char const *skeleton_user = (yyvsp[0].chars);
       if (strchr (skeleton_user, '/'))
         {
           size_t dir_length = strlen (current_file);
@@ -2181,701 +2131,629 @@ yyreduce:
           skeleton_user = uniqstr_new (skeleton_build);
           free (skeleton_build);
         }
-      skeleton_arg (skeleton_user, 1, &(yylsp[(1) - (2)]));
+      skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
-
-/* Line 1457 of yacc.c  */
-#line 2189 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2138 "src/parse-gram.c"
     break;
 
-  case 31:
-
-/* Line 1457 of yacc.c  */
-#line 305 "parse-gram.y"
+  case 29:
+/* Line 1388 of yacc.c  */
+#line 345 "src/parse-gram.y"
     { token_table_flag = true; }
-
-/* Line 1457 of yacc.c  */
-#line 2199 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2146 "src/parse-gram.c"
     break;
 
-  case 32:
-
-/* Line 1457 of yacc.c  */
-#line 306 "parse-gram.y"
+  case 30:
+/* Line 1388 of yacc.c  */
+#line 346 "src/parse-gram.y"
     { report_flag |= report_states; }
+/* Line 1388 of yacc.c  */
+#line 2154 "src/parse-gram.c"
+    break;
 
-/* Line 1457 of yacc.c  */
-#line 2209 "../../../src/parse-gram.c"
+  case 31:
+/* Line 1388 of yacc.c  */
+#line 347 "src/parse-gram.y"
+    { yacc_flag = true; }
+/* Line 1388 of yacc.c  */
+#line 2162 "src/parse-gram.c"
     break;
 
   case 33:
+/* Line 1388 of yacc.c  */
+#line 352 "src/parse-gram.y"
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2170 "src/parse-gram.c"
+    break;
 
-/* Line 1457 of yacc.c  */
-#line 307 "parse-gram.y"
-    { yacc_flag = true; }
-
-/* Line 1457 of yacc.c  */
-#line 2219 "../../../src/parse-gram.c"
+  case 34:
+/* Line 1388 of yacc.c  */
+#line 353 "src/parse-gram.y"
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2178 "src/parse-gram.c"
     break;
 
   case 37:
-
-/* Line 1457 of yacc.c  */
-#line 315 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 365 "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 1457 of yacc.c  */
-#line 2231 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2188 "src/parse-gram.c"
     break;
 
   case 38:
-
-/* Line 1457 of yacc.c  */
-#line 319 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 369 "src/parse-gram.y"
     {
       symbol_list *list;
-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
-	symbol_list_destructor_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      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 1457 of yacc.c  */
-#line 2246 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2201 "src/parse-gram.c"
     break;
 
   case 39:
-
-/* Line 1457 of yacc.c  */
-#line 326 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 376 "src/parse-gram.y"
     {
       symbol_list *list;
-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
-	symbol_list_printer_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      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 1457 of yacc.c  */
-#line 2261 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2214 "src/parse-gram.c"
     break;
 
   case 40:
-
-/* Line 1457 of yacc.c  */
-#line 333 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 383 "src/parse-gram.y"
     {
       default_prec = true;
     }
-
-/* Line 1457 of yacc.c  */
-#line 2273 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2224 "src/parse-gram.c"
     break;
 
   case 41:
-
-/* Line 1457 of yacc.c  */
-#line 337 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 387 "src/parse-gram.y"
     {
       default_prec = false;
     }
-
-/* Line 1457 of yacc.c  */
-#line 2285 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2234 "src/parse-gram.c"
     break;
 
   case 42:
-
-/* Line 1457 of yacc.c  */
-#line 341 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 391 "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[(2) - (2)].chars), (yylsp[(2) - (2)]));
+      muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-
-/* Line 1457 of yacc.c  */
-#line 2300 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2247 "src/parse-gram.c"
     break;
 
   case 43:
-
-/* Line 1457 of yacc.c  */
-#line 348 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 398 "src/parse-gram.y"
     {
-      muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+      muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-
-/* Line 1457 of yacc.c  */
-#line 2313 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2258 "src/parse-gram.c"
     break;
 
   case 44:
-
-/* Line 1457 of yacc.c  */
-#line 362 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 412 "src/parse-gram.y"
     {}
-
-/* Line 1457 of yacc.c  */
-#line 2323 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2266 "src/parse-gram.c"
     break;
 
   case 45:
-
-/* Line 1457 of yacc.c  */
-#line 363 "parse-gram.y"
-    { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2333 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 413 "src/parse-gram.y"
+    { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2274 "src/parse-gram.c"
     break;
 
   case 46:
-
-/* Line 1457 of yacc.c  */
-#line 368 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 418 "src/parse-gram.y"
     {
       union_seen = true;
-      muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+      muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-
-/* Line 1457 of yacc.c  */
-#line 2347 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2286 "src/parse-gram.c"
     break;
 
   case 47:
-
-/* Line 1457 of yacc.c  */
-#line 379 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 429 "src/parse-gram.y"
     { current_class = nterm_sym; }
-
-/* Line 1457 of yacc.c  */
-#line 2357 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2294 "src/parse-gram.c"
     break;
 
   case 48:
-
-/* Line 1457 of yacc.c  */
-#line 380 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 430 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
-
-/* Line 1457 of yacc.c  */
-#line 2370 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2305 "src/parse-gram.c"
     break;
 
   case 49:
-
-/* Line 1457 of yacc.c  */
-#line 384 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 434 "src/parse-gram.y"
     { current_class = token_sym; }
-
-/* Line 1457 of yacc.c  */
-#line 2380 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2313 "src/parse-gram.c"
     break;
 
   case 50:
-
-/* Line 1457 of yacc.c  */
-#line 385 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 435 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
-
-/* Line 1457 of yacc.c  */
-#line 2393 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2324 "src/parse-gram.c"
     break;
 
   case 51:
-
-/* Line 1457 of yacc.c  */
-#line 390 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 440 "src/parse-gram.y"
     {
       symbol_list *list;
       tag_seen = true;
-      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));
+      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 1457 of yacc.c  */
-#line 2409 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2338 "src/parse-gram.c"
     break;
 
   case 52:
-
-/* Line 1457 of yacc.c  */
-#line 401 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 451 "src/parse-gram.y"
     {
       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;
     }
-
-/* Line 1457 of yacc.c  */
-#line 2429 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2356 "src/parse-gram.c"
     break;
 
   case 53:
-
-/* Line 1457 of yacc.c  */
-#line 415 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 465 "src/parse-gram.y"
     { (yyval.assoc) = left_assoc; }
-
-/* Line 1457 of yacc.c  */
-#line 2439 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2364 "src/parse-gram.c"
     break;
 
   case 54:
-
-/* Line 1457 of yacc.c  */
-#line 416 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 466 "src/parse-gram.y"
     { (yyval.assoc) = right_assoc; }
-
-/* Line 1457 of yacc.c  */
-#line 2449 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2372 "src/parse-gram.c"
     break;
 
   case 55:
-
-/* Line 1457 of yacc.c  */
-#line 417 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 467 "src/parse-gram.y"
     { (yyval.assoc) = non_assoc; }
-
-/* Line 1457 of yacc.c  */
-#line 2459 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2380 "src/parse-gram.c"
     break;
 
   case 56:
-
-/* Line 1457 of yacc.c  */
-#line 421 "parse-gram.y"
-    { current_type = NULL; }
-
-/* Line 1457 of yacc.c  */
-#line 2469 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 468 "src/parse-gram.y"
+    { (yyval.assoc) = precedence_assoc; }
+/* Line 1388 of yacc.c  */
+#line 2388 "src/parse-gram.c"
     break;
 
   case 57:
-
-/* Line 1457 of yacc.c  */
-#line 422 "parse-gram.y"
-    { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
-
-/* Line 1457 of yacc.c  */
-#line 2479 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 472 "src/parse-gram.y"
+    { current_type = NULL; }
+/* Line 1388 of yacc.c  */
+#line 2396 "src/parse-gram.c"
     break;
 
   case 58:
-
-/* Line 1457 of yacc.c  */
-#line 428 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2489 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 473 "src/parse-gram.y"
+    { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
+/* Line 1388 of yacc.c  */
+#line 2404 "src/parse-gram.c"
     break;
 
   case 59:
-
-/* Line 1457 of yacc.c  */
-#line 430 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
-
-/* Line 1457 of yacc.c  */
-#line 2499 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 479 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2412 "src/parse-gram.c"
     break;
 
   case 60:
-
-/* Line 1457 of yacc.c  */
-#line 434 "parse-gram.y"
-    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
-
-/* Line 1457 of yacc.c  */
-#line 2509 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 481 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1388 of yacc.c  */
+#line 2420 "src/parse-gram.c"
     break;
 
   case 61:
-
-/* Line 1457 of yacc.c  */
-#line 435 "parse-gram.y"
-    { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2519 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 485 "src/parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }
+/* Line 1388 of yacc.c  */
+#line 2428 "src/parse-gram.c"
     break;
 
   case 62:
-
-/* Line 1457 of yacc.c  */
-#line 441 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2529 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 486 "src/parse-gram.y"
+    { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2436 "src/parse-gram.c"
     break;
 
   case 63:
-
-/* Line 1457 of yacc.c  */
-#line 443 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
-
-/* Line 1457 of yacc.c  */
-#line 2539 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 492 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2444 "src/parse-gram.c"
     break;
 
   case 64:
-
-/* Line 1457 of yacc.c  */
-#line 447 "parse-gram.y"
-    { (yyval.list) = (yyvsp[(1) - (1)].list); }
-
-/* Line 1457 of yacc.c  */
-#line 2549 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 494 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1388 of yacc.c  */
+#line 2452 "src/parse-gram.c"
     break;
 
   case 65:
-
-/* Line 1457 of yacc.c  */
-#line 448 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
-
-/* Line 1457 of yacc.c  */
-#line 2559 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 498 "src/parse-gram.y"
+    { (yyval.list) = (yyvsp[0].list); }
+/* Line 1388 of yacc.c  */
+#line 2460 "src/parse-gram.c"
     break;
 
   case 66:
-
-/* Line 1457 of yacc.c  */
-#line 452 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2569 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 499 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
+/* Line 1388 of yacc.c  */
+#line 2468 "src/parse-gram.c"
     break;
 
   case 67:
-
-/* Line 1457 of yacc.c  */
-#line 453 "parse-gram.y"
-    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2579 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 503 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2476 "src/parse-gram.c"
     break;
 
   case 68:
-
-/* Line 1457 of yacc.c  */
-#line 454 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2589 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 504 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2484 "src/parse-gram.c"
     break;
 
   case 69:
-
-/* Line 1457 of yacc.c  */
-#line 455 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2599 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 505 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2492 "src/parse-gram.c"
     break;
 
   case 70:
-
-/* Line 1457 of yacc.c  */
-#line 461 "parse-gram.y"
-    {
-       current_type = (yyvsp[(1) - (1)].uniqstr);
-       tag_seen = true;
-     }
-
-/* Line 1457 of yacc.c  */
-#line 2612 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 506 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2500 "src/parse-gram.c"
     break;
 
   case 71:
-
-/* Line 1457 of yacc.c  */
-#line 466 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 512 "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)]));
+       current_type = (yyvsp[0].uniqstr);
+       tag_seen = true;
      }
-
-/* Line 1457 of yacc.c  */
-#line 2625 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2511 "src/parse-gram.c"
     break;
 
   case 72:
-
-/* Line 1457 of yacc.c  */
-#line 471 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 517 "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)]));
-    }
-
-/* Line 1457 of yacc.c  */
-#line 2639 "../../../src/parse-gram.c"
+       symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
+       symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
+     }
+/* Line 1388 of yacc.c  */
+#line 2522 "src/parse-gram.c"
     break;
 
   case 73:
-
-/* Line 1457 of yacc.c  */
-#line 477 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 522 "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_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
     }
-
-/* Line 1457 of yacc.c  */
-#line 2653 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2534 "src/parse-gram.c"
     break;
 
   case 74:
-
-/* Line 1457 of yacc.c  */
-#line 483 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 528 "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[-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 1457 of yacc.c  */
-#line 2668 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2546 "src/parse-gram.c"
     break;
 
-  case 81:
-
-/* Line 1457 of yacc.c  */
-#line 513 "parse-gram.y"
+  case 75:
+/* Line 1388 of yacc.c  */
+#line 534 "src/parse-gram.y"
     {
-      yyerrok;
+      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 1457 of yacc.c  */
-#line 2680 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2559 "src/parse-gram.c"
     break;
 
   case 82:
-
-/* Line 1457 of yacc.c  */
-#line 519 "parse-gram.y"
-    { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
-
-/* Line 1457 of yacc.c  */
-#line 2690 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 564 "src/parse-gram.y"
+    {
+      yyerrok;
+    }
+/* Line 1388 of yacc.c  */
+#line 2569 "src/parse-gram.c"
     break;
 
-  case 84:
-
-/* Line 1457 of yacc.c  */
-#line 523 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2700 "../../../src/parse-gram.c"
+  case 83:
+/* Line 1388 of yacc.c  */
+#line 570 "src/parse-gram.y"
+    { current_lhs = (yyvsp[-1].symbol); current_lhs_location = (yylsp[-1]);
+    current_lhs_named_ref = (yyvsp[0].named_ref); }
+/* Line 1388 of yacc.c  */
+#line 2578 "src/parse-gram.c"
     break;
 
   case 85:
-
-/* Line 1457 of yacc.c  */
-#line 524 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(3) - (3)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2710 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 575 "src/parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2586 "src/parse-gram.c"
     break;
 
-  case 87:
-
-/* Line 1457 of yacc.c  */
-#line 530 "parse-gram.y"
-    { grammar_current_rule_begin (current_lhs, current_lhs_location); }
-
-/* Line 1457 of yacc.c  */
-#line 2720 "../../../src/parse-gram.c"
+  case 86:
+/* Line 1388 of yacc.c  */
+#line 576 "src/parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2594 "src/parse-gram.c"
     break;
 
   case 88:
-
-/* Line 1457 of yacc.c  */
-#line 532 "parse-gram.y"
-    { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2730 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 582 "src/parse-gram.y"
+    { grammar_current_rule_begin (current_lhs, current_lhs_location,
+				  current_lhs_named_ref); }
+/* Line 1388 of yacc.c  */
+#line 2603 "src/parse-gram.c"
     break;
 
   case 89:
-
-/* Line 1457 of yacc.c  */
-#line 534 "parse-gram.y"
-    { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2740 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 585 "src/parse-gram.y"
+    { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1388 of yacc.c  */
+#line 2611 "src/parse-gram.c"
     break;
 
   case 90:
-
-/* Line 1457 of yacc.c  */
-#line 536 "parse-gram.y"
-    { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2750 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 587 "src/parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1388 of yacc.c  */
+#line 2619 "src/parse-gram.c"
     break;
 
   case 91:
-
-/* Line 1457 of yacc.c  */
-#line 538 "parse-gram.y"
-    { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2760 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 589 "src/parse-gram.y"
+    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2627 "src/parse-gram.c"
     break;
 
   case 92:
+/* Line 1388 of yacc.c  */
+#line 591 "src/parse-gram.y"
+    { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2635 "src/parse-gram.c"
+    break;
 
-/* Line 1457 of yacc.c  */
-#line 540 "parse-gram.y"
-    { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2770 "../../../src/parse-gram.c"
+  case 93:
+/* Line 1388 of yacc.c  */
+#line 593 "src/parse-gram.y"
+    { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2643 "src/parse-gram.c"
     break;
 
   case 94:
-
-/* Line 1457 of yacc.c  */
-#line 550 "parse-gram.y"
-    { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
-
-/* Line 1457 of yacc.c  */
-#line 2780 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 597 "src/parse-gram.y"
+    { (yyval.named_ref) = 0; }
+/* Line 1388 of yacc.c  */
+#line 2651 "src/parse-gram.c"
     break;
 
   case 95:
+/* Line 1388 of yacc.c  */
+#line 599 "src/parse-gram.y"
+    { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2659 "src/parse-gram.c"
+    break;
 
-/* Line 1457 of yacc.c  */
-#line 556 "parse-gram.y"
-    {
-      (yyval.chars) = "";
-    }
+  case 97:
+/* Line 1388 of yacc.c  */
+#line 611 "src/parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
+/* Line 1388 of yacc.c  */
+#line 2667 "src/parse-gram.c"
+    break;
 
-/* Line 1457 of yacc.c  */
-#line 2792 "../../../src/parse-gram.c"
+  case 98:
+/* Line 1388 of yacc.c  */
+#line 616 "src/parse-gram.y"
+    { (yyval.chars) = ""; }
+/* Line 1388 of yacc.c  */
+#line 2675 "src/parse-gram.c"
     break;
 
-  case 97:
+  case 99:
+/* Line 1388 of yacc.c  */
+#line 617 "src/parse-gram.y"
+    { (yyval.chars) = (yyvsp[0].uniqstr); }
+/* Line 1388 of yacc.c  */
+#line 2683 "src/parse-gram.c"
+    break;
 
-/* Line 1457 of yacc.c  */
-#line 569 "parse-gram.y"
+  case 101:
+/* Line 1388 of yacc.c  */
+#line 628 "src/parse-gram.y"
     {
       code_props plain_code;
-      (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
-      code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].code)+1, (yylsp[(1) - (1)]));
+      (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 1457 of yacc.c  */
-#line 2809 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2698 "src/parse-gram.c"
     break;
 
-  case 98:
-
-/* Line 1457 of yacc.c  */
-#line 589 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2819 "../../../src/parse-gram.c"
+  case 102:
+/* Line 1388 of yacc.c  */
+#line 648 "src/parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2706 "src/parse-gram.c"
     break;
 
-  case 99:
-
-/* Line 1457 of yacc.c  */
-#line 591 "parse-gram.y"
+  case 103:
+/* Line 1388 of yacc.c  */
+#line 650 "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 1457 of yacc.c  */
-#line 2833 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2718 "src/parse-gram.c"
     break;
 
-  case 100:
-
-/* Line 1457 of yacc.c  */
-#line 599 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2843 "../../../src/parse-gram.c"
+  case 104:
+/* Line 1388 of yacc.c  */
+#line 658 "src/parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1388 of yacc.c  */
+#line 2726 "src/parse-gram.c"
     break;
 
-  case 103:
-
-/* Line 1457 of yacc.c  */
-#line 611 "parse-gram.y"
+  case 107:
+/* Line 1388 of yacc.c  */
+#line 670 "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 1457 of yacc.c  */
-#line 2856 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2737 "src/parse-gram.c"
     break;
 
-  case 105:
-
-/* Line 1457 of yacc.c  */
-#line 620 "parse-gram.y"
+  case 109:
+/* Line 1388 of yacc.c  */
+#line 679 "src/parse-gram.y"
     {
       code_props plain_code;
-      code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
+      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 ("epilogue", plain_code.code, (yylsp[(2) - (2)]));
+      muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-
-/* Line 1457 of yacc.c  */
-#line 2873 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2752 "src/parse-gram.c"
     break;
 
 
-
-/* Line 1457 of yacc.c  */
-#line 2879 "../../../src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2757 "src/parse-gram.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2914,7 +2792,7 @@ yyerrlab:
       yyerror (YY_("syntax error"));
 #else
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yytoken);
 	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
 	  {
 	    YYSIZE_T yyalloc = 2 * yysize;
@@ -2934,7 +2812,7 @@ yyerrlab:
 
 	if (0 < yysize && yysize <= yymsg_alloc)
 	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    (void) yysyntax_error (yymsg, yystate, yytoken);
 	    yyerror (yymsg);
 	  }
 	else
@@ -3003,7 +2881,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
+      if (!yypact_value_is_default (yyn))
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -3091,10 +2969,8 @@ yyreturn:
   return YYID (yyresult);
 }
 
-
-
-/* Line 1677 of yacc.c  */
-#line 630 "parse-gram.y"
+/* Line 1607 of yacc.c  */
+#line 689 "src/parse-gram.y"
 
 
 
@@ -3128,34 +3004,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
-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";
+
   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"));
@@ -3172,7 +3047,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';
-      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);
     }
 
@@ -3215,4 +3093,3 @@ char_name (char c)
       return quotearg_style (escape_quoting_style, buf);
     }
 }
-