lalr1.cc: syntax_error as exceptions.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 2b806f54ed3a6499abc0c78217934f3f067d81e8..135e7d7e95a2cd1b7b5aa34afd7136d3fa18dbff 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.4.307-8f0d-dirty.  */
+/* A Bison parser, made by GNU Bison 2.4.403-43f2.  */

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


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

-#define YYBISON_VERSION "2.4.307-8f0d-dirty"
+#define YYBISON_VERSION "2.4.403-43f2"

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


@@ -74,7 +74,7 @@
 
 /* Copy the first part of user declarations.  */
 /* Line 191 of yacc.c  */
 
 /* 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, 2009 Free Software
 /* Bison Grammar Parser                             -*- C -*-
 
    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software


@@ -104,6 +104,7 @@
 #include "getargs.h"
 #include "gram.h"
 #include "muscle-tab.h"
 #include "getargs.h"
 #include "gram.h"
 #include "muscle-tab.h"

+#include "named-ref.h"

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


@@ -127,28 +128,8 @@ static void gram_error (location const *, char const *);
 
 static char const *char_name (char);
 
 
 static char const *char_name (char);
 

-/** Add a lex-param or a parse-param.
- *
- * \param type  \a lex_param or \a parse_param
- * \param decl  the formal argument
- * \param loc   the location in the source.
- */
-static void add_param (char const *type, char *decl, location loc);
-
-
-static symbol_class current_class = unknown_sym;
-static uniqstr current_type = NULL;
-static symbol *current_lhs;
-static location current_lhs_location;
-static int current_prec = 0;
-
-#define YYTYPE_INT16 int_fast16_t
-#define YYTYPE_INT8 int_fast8_t
-#define YYTYPE_UINT16 uint_fast16_t
-#define YYTYPE_UINT8 uint_fast8_t
-

 /* Line 191 of yacc.c  */
 /* Line 191 of yacc.c  */

-#line 152 "src/parse-gram.c"
+#line 133 "src/parse-gram.c"

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


@@ -168,6 +149,24 @@ static int current_prec = 0;
 # define YYTOKEN_TABLE 0
 #endif
 
 # 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
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE


@@ -194,40 +193,41 @@ static int current_prec = 0;
      PERCENT_DEFAULT_PREC = 273,
      PERCENT_DEFINE = 274,
      PERCENT_DEFINES = 275,
      PERCENT_DEFAULT_PREC = 273,
      PERCENT_DEFINE = 274,
      PERCENT_DEFINES = 275,

-     PERCENT_EXPECT = 276,
-     PERCENT_EXPECT_RR = 277,
-     PERCENT_FLAG = 278,
-     PERCENT_FILE_PREFIX = 279,
-     PERCENT_GLR_PARSER = 280,
-     PERCENT_INITIAL_ACTION = 281,
-     PERCENT_LANGUAGE = 282,
-     PERCENT_LEX_PARAM = 283,
+     PERCENT_ERROR_VERBOSE = 276,
+     PERCENT_EXPECT = 277,
+     PERCENT_EXPECT_RR = 278,
+     PERCENT_FLAG = 279,
+     PERCENT_FILE_PREFIX = 280,
+     PERCENT_GLR_PARSER = 281,
+     PERCENT_INITIAL_ACTION = 282,
+     PERCENT_LANGUAGE = 283,

      PERCENT_NAME_PREFIX = 284,
      PERCENT_NO_DEFAULT_PREC = 285,
      PERCENT_NO_LINES = 286,
      PERCENT_NONDETERMINISTIC_PARSER = 287,
      PERCENT_OUTPUT = 288,
      PERCENT_NAME_PREFIX = 284,
      PERCENT_NO_DEFAULT_PREC = 285,
      PERCENT_NO_LINES = 286,
      PERCENT_NONDETERMINISTIC_PARSER = 287,
      PERCENT_OUTPUT = 288,

-     PERCENT_PARSE_PARAM = 289,
-     PERCENT_REQUIRE = 290,
-     PERCENT_SKELETON = 291,
-     PERCENT_START = 292,
-     PERCENT_TOKEN_TABLE = 293,
-     PERCENT_VERBOSE = 294,
-     PERCENT_YACC = 295,
-     BRACED_CODE = 296,
-     CHAR = 297,
-     EPILOGUE = 298,
-     EQUAL = 299,
-     ID = 300,
-     ID_COLON = 301,
-     PERCENT_PERCENT = 302,
-     PIPE = 303,
-     PROLOGUE = 304,
-     SEMICOLON = 305,
-     TAG = 306,
-     TAG_ANY = 307,
-     TAG_NONE = 308,
-     PERCENT_UNION = 309
+     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.  */
    };
 #endif
 /* Tokens.  */


@@ -250,40 +250,41 @@ static int current_prec = 0;
 #define PERCENT_DEFAULT_PREC 273
 #define PERCENT_DEFINE 274
 #define PERCENT_DEFINES 275
 #define PERCENT_DEFAULT_PREC 273
 #define PERCENT_DEFINE 274
 #define PERCENT_DEFINES 275

-#define PERCENT_EXPECT 276
-#define PERCENT_EXPECT_RR 277
-#define PERCENT_FLAG 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_ERROR_VERBOSE 276
+#define PERCENT_EXPECT 277
+#define PERCENT_EXPECT_RR 278
+#define PERCENT_FLAG 279
+#define PERCENT_FILE_PREFIX 280
+#define PERCENT_GLR_PARSER 281
+#define PERCENT_INITIAL_ACTION 282
+#define PERCENT_LANGUAGE 283

 #define PERCENT_NAME_PREFIX 284
 #define PERCENT_NO_DEFAULT_PREC 285
 #define PERCENT_NO_LINES 286
 #define PERCENT_NONDETERMINISTIC_PARSER 287
 #define PERCENT_OUTPUT 288
 #define PERCENT_NAME_PREFIX 284
 #define PERCENT_NO_DEFAULT_PREC 285
 #define PERCENT_NO_LINES 286
 #define PERCENT_NONDETERMINISTIC_PARSER 287
 #define PERCENT_OUTPUT 288

-#define PERCENT_PARSE_PARAM 289
-#define PERCENT_REQUIRE 290
-#define PERCENT_SKELETON 291
-#define PERCENT_START 292
-#define PERCENT_TOKEN_TABLE 293
-#define PERCENT_VERBOSE 294
-#define PERCENT_YACC 295
-#define BRACED_CODE 296
-#define CHAR 297
-#define EPILOGUE 298
-#define EQUAL 299
-#define ID 300
-#define ID_COLON 301
-#define PERCENT_PERCENT 302
-#define PIPE 303
-#define PROLOGUE 304
-#define SEMICOLON 305
-#define TAG 306
-#define TAG_ANY 307
-#define TAG_NONE 308
-#define PERCENT_UNION 309
+#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

 
 
 
 
 
 


@@ -291,21 +292,27 @@ static int current_prec = 0;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {

-/* Line 224 of yacc.c  */
-#line 92 "parse-gram.y"
+/* Line 216 of yacc.c  */
+#line 88 "src/parse-gram.y"

 
 

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

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

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

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

+/* Line 216 of yacc.c  */
+#line 225 "src/parse-gram.y"
+
+  param_type param;
+

 
 

-/* Line 224 of yacc.c  */
-#line 309 "src/parse-gram.c"
+/* Line 216 of yacc.c  */
+#line 316 "src/parse-gram.c"

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


@@ -329,7 +336,38 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 /* Line 266 of yacc.c  */
 /* Copy the second part of user declarations.  */
 
 /* Line 266 of yacc.c  */

-#line 333 "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
 
 #ifdef short
 # undef short


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

-#define YYLAST   186
+#define YYLAST   190

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

-#define YYNTOKENS  55
+#define YYNTOKENS  56

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

-#define YYNNTS  33
+#define YYNNTS  36

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

-#define YYNRULES  103
+#define YYNRULES  109

 /* YYNSTATES -- Number of states.  */
 /* YYNSTATES -- Number of states.  */

-#define YYNSTATES  141
+#define YYNSTATES  148

 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2

-#define YYMAXUTOK   309
+#define YYMAXUTOK   310

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


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

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55

 };
 
 #if YYDEBUG
   /* YYRLINEYYN -- Source line where rule number YYN was defined.    */
 static const yytype_uint16 yyrline[] =
 {
 };
 
 #if YYDEBUG
   /* YYRLINEYYN -- Source line where rule number YYN was defined.    */
 static const yytype_uint16 yyrline[] =
 {

-       0,   201,   201,   209,   211,   215,   216,   226,   230,   234,
-     235,   240,   241,   242,   243,   244,   249,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   292,   293,
-     294,   295,   299,   300,   301,   305,   312,   319,   323,   327,
-     334,   349,   350,   354,   366,   366,   371,   371,   376,   387,
-     402,   403,   404,   405,   409,   410,   415,   417,   422,   423,
-     428,   430,   435,   436,   440,   441,   442,   443,   448,   453,
-     458,   464,   470,   481,   482,   491,   492,   498,   499,   500,
-     507,   507,   511,   512,   513,   518,   519,   521,   523,   525,
-     527,   539,   540,   545,   546,   555,   575,   577,   586,   591,
-     592,   597,   604,   606
+       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
 
 };
 #endif
 


@@ -629,23 +668,24 @@ static const char *const yytname[] =
   "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
   "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"",
   "\"%precedence\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",
   "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
   "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"",
   "\"%precedence\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",

-  "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%expect\"",
-  "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"", "\"%glr-parser\"",
-  "\"%initial-action\"", "\"%language\"", "\"%lex-param\"",
+  "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
+  "\"%expect\"", "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"",
+  "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"",

   "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
   "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",

-  "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param\"",
-  "\"%require\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"",
-  "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"",
-  "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"",
-  "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"", "\"%union\"",
-  "$accept", "input", "prologue_declarations", "prologue_declaration",
-  "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2",
+  "\"%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",
   "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
 
 };
 #endif
 


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

-     305,   306,   307,   308,   309
+     305,   306,   307,   308,   309,   310

 };
 # endif
 
 };
 # endif
 

-#define YYPACT_NINF -93
+#define YYPACT_NINF -88

 
 

-#define YYTABLE_NINF -103
+#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[] =
 {
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.    */
 static const yytype_int16 yypact[] =
 {

-     -93,     9,   100,   -93,   -93,   -93,   -50,    21,    32,   -93,
-     -93,   -93,   -93,   -39,   -93,     1,    56,    73,    74,   -93,
-      10,   -93,    38,    79,    43,    27,   -93,   -93,   -93,    37,
-      44,    83,    84,    22,   -93,   -93,   -93,    26,   -93,   -93,
-      45,   -93,   -93,   -93,   -93,    40,   -37,   -37,    22,     0,
-       0,   -93,    47,   -93,   -93,   -93,    86,   -93,   -93,   -93,
-     -93,    89,   -93,   -93,   -93,   -93,    92,   -93,    94,   -93,
-     -93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,    48,   -93,
-      50,    11,   -93,   -93,   -93,   -93,    47,   -93,    22,   -93,
-     -93,   -37,    66,   -37,    22,   -93,   -93,   -93,   -93,     0,
-     -93,   -93,     0,   -93,   -93,   -93,   -93,   -93,   -93,   -93,
-     -93,    58,   -93,   -93,   -93,   -93,    22,   -93,    98,   -93,
-     111,   -93,   -93,   -93,   -93,    18,   141,   -93,   -93,   -93,
-     -93,   -93,    22,    99,    64,   -93,   -93,   141,   -93,   -93,
-     -93
+     -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[S] -- default reduction number in state S.  Performed when
 };
 
   /* YYDEFACT[S] -- default reduction number in state S.  Performed when


@@ -693,142 +739,143 @@ static const yytype_int16 yypact[] =
      is an error.    */
 static const yytype_uint8 yydefact[] =
 {
      is an error.    */
 static const yytype_uint8 yydefact[] =
 {

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

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

-     -93,   -93,   -93,   -93,   114,   -93,   -93,   -93,   -93,   -93,
-     -93,   -93,   -93,    25,   -93,    93,   -92,   -17,    95,   -93,
-      65,   -93,   -93,   -93,    15,   -93,   -93,   -26,     3,   -93,
-     -33,   -45,   -93
+     -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_int8 yydefgoto[] =
+static const yytype_int16 yydefgoto[] =

 {
 {

-      -1,     1,     2,    41,    80,    86,    43,    47,    46,    44,
-      45,    88,   116,   117,    94,    99,   100,    90,    91,    81,
-      82,    83,   114,   125,   126,    56,   105,    53,    75,    84,
-     101,    77,   113
+      -1,     1,     2,    41,    83,   117,    78,    85,    43,    47,
+      46,    44,    45,    87,   119,   120,    93,    98,    99,    89,
+      90,    79,    80,    81,   128,   133,   134,   115,    56,   105,
+      53,    73,    82,   100,    75,   113

 };
 
   /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
      positive, shift that token.  If negative, reduce the rule which
 };
 
   /* 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.    */
+     number is the opposite.  If YYTABLE_NINF, syntax error.    */

 static const yytype_int16 yytable[] =
 {
 static const yytype_int16 yytable[] =
 {

-      76,    48,    51,    72,    54,    73,    52,   123,    74,     3,
-     123,  -102,    78,    60,    89,    95,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    72,   103,    78,    13,    14,
-      65,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      67,    26,    73,    13,    14,    74,    55,   121,    33,    92,
-      92,    96,    97,    98,    61,   118,    26,    79,   111,    57,
-     115,   122,    49,    33,    73,    40,   130,    74,   131,    72,
-     120,    66,    79,    50,   119,   129,   119,    58,    59,    62,
-      40,    68,    63,   118,    64,    69,    70,    71,    51,   104,
-      85,    87,   106,   136,    92,   107,    92,   108,   109,   138,
-     110,   124,   128,   139,   136,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    72,   140,    42,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,   127,    93,   102,    72,   137,   112,    37,     0,    38,
-      39,     0,     0,     0,    40,   132,   133,   134,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      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,     0,     0,     0,     0,

-       0,     0,   135,    73,     0,     0,    74
+       0,     0,     0,     0,     0,     0,   140,    71,     0,     0,
+      72

 };
 
 static const yytype_int16 yycheck[] =
 {
 };
 
 static const yytype_int16 yycheck[] =
 {

-      33,    51,    41,     3,     3,    42,    45,    99,    45,     0,
-     102,     0,     1,     3,    51,    48,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,     3,    52,     1,    17,    18,
-       3,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-       3,    30,    42,    17,    18,    45,    45,    92,    37,    46,
-      47,    51,    52,    53,    44,    88,    30,    46,    47,     3,
-      86,    94,    41,    37,    42,    54,    48,    45,    50,     3,
-       4,    44,    46,    41,    91,   120,    93,     4,     4,    41,
-      54,    44,     3,   116,    41,    41,     3,     3,    41,     3,
-      45,    51,     3,   126,    91,     3,    93,     3,    50,   132,
-      50,    43,     4,     4,   137,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,     3,    51,     2,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,   116,    47,    50,     3,   130,    81,    47,    -1,    49,
-      50,    -1,    -1,    -1,    54,    14,    15,    16,    -1,    -1,
+      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,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    41,    42,    -1,    -1,    45
+      -1,    -1,    -1,    -1,    -1,    -1,    40,    41,    -1,    -1,
+      44

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

-       0,    56,    57,     0,     5,     6,     7,     8,     9,    10,
+       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,
       11,    12,    13,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

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

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

-       0,    55,    56,    57,    57,    58,    58,    58,    58,    58,
-      58,    58,    58,    58,    58,    58,    58,    58,    58,    58,
-      58,    58,    58,    58,    58,    58,    58,    58,    58,    58,
-      58,    58,    59,    59,    59,    59,    59,    59,    59,    59,
-      59,    60,    60,    59,    62,    61,    63,    61,    61,    64,
-      65,    65,    65,    65,    66,    66,    67,    67,    68,    68,
-      69,    69,    70,    70,    71,    71,    71,    71,    72,    72,
-      72,    72,    72,    73,    73,    74,    74,    75,    75,    75,
-      77,    76,    78,    78,    78,    79,    79,    79,    79,    79,
-      79,    80,    80,    81,    81,    82,    83,    83,    84,    85,
-      85,    86,    87,    87
+       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

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

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

 };
 
 
 };
 
 


@@ -979,155 +1026,174 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     {
             case 3: // "string"
 
     {
             case 3: // "string"
 

-/* Line 647 of yacc.c  */
-#line 178 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 175 "src/parse-gram.y"

         { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
         { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }

-/* Line 647 of yacc.c  */
-#line 987 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1034 "src/parse-gram.c"

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

-/* Line 647 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 188 "src/parse-gram.y"

         { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
         { fprintf (stderr, "%d", ((*yyvaluep).integer)); }

-/* Line 647 of yacc.c  */
-#line 996 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1043 "src/parse-gram.c"

         break;
 
         break;
 

-            case 23: // "%<flag>"
+            case 24: // "%<flag>"

 
 

-/* Line 647 of yacc.c  */
-#line 186 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 184 "src/parse-gram.y"

         { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
         { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }

-/* Line 647 of yacc.c  */
-#line 1005 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1052 "src/parse-gram.c"

         break;
 
         break;
 

-            case 41: // "{...}"
+            case 40: // "{...}"

 
 

-/* Line 647 of yacc.c  */
-#line 180 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 177 "src/parse-gram.y"

         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }

-/* Line 647 of yacc.c  */
-#line 1014 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1061 "src/parse-gram.c"

         break;
 
         break;
 

-            case 42: // "char"
+            case 41: // "char"

 
 

-/* Line 647 of yacc.c  */
-#line 172 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 169 "src/parse-gram.y"

         { fputs (char_name (((*yyvaluep).character)), stderr); }
         { fputs (char_name (((*yyvaluep).character)), stderr); }

-/* Line 647 of yacc.c  */
-#line 1023 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1070 "src/parse-gram.c"

         break;
 
         break;
 

-            case 43: // "epilogue"
+            case 42: // "epilogue"

 
 

-/* Line 647 of yacc.c  */
-#line 180 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 177 "src/parse-gram.y"

         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }

-/* Line 647 of yacc.c  */
-#line 1032 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1079 "src/parse-gram.c"

         break;
 
         break;
 

-            case 45: // "identifier"
+            case 44: // "identifier"

 
 

-/* Line 647 of yacc.c  */
-#line 184 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 182 "src/parse-gram.y"

         { fputs (((*yyvaluep).uniqstr), stderr); }
         { fputs (((*yyvaluep).uniqstr), stderr); }

-/* Line 647 of yacc.c  */
-#line 1041 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1088 "src/parse-gram.c"

         break;
 
         break;
 

-            case 46: // "identifier:"
+            case 45: // "identifier:"

 
 

-/* Line 647 of yacc.c  */
-#line 185 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 183 "src/parse-gram.y"

         { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
         { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }

-/* Line 647 of yacc.c  */
-#line 1050 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1097 "src/parse-gram.c"

         break;
 
         break;
 

-            case 49: // "%{...%}"
+            case 48: // "%{...%}"

 
 

-/* Line 647 of yacc.c  */
-#line 180 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 177 "src/parse-gram.y"

         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }

-/* Line 647 of yacc.c  */
-#line 1059 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1106 "src/parse-gram.c"

         break;
 
         break;
 

-            case 51: // "<tag>"
+            case 50: // "<tag>"

 
 

-/* Line 647 of yacc.c  */
-#line 187 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 185 "src/parse-gram.y"

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

-/* Line 647 of yacc.c  */
-#line 1068 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1115 "src/parse-gram.c"

         break;
 
         break;
 

-            case 80: // variable
+            case 54: // "%param"

 
 

-/* Line 647 of yacc.c  */
-#line 184 "parse-gram.y"
+/* 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); }
         { fputs (((*yyvaluep).uniqstr), stderr); }

-/* Line 647 of yacc.c  */
-#line 1077 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1143 "src/parse-gram.c"

         break;
 
         break;
 

-            case 81: // content.opt
+            case 85: // content.opt

 
 

-/* Line 647 of yacc.c  */
-#line 180 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 177 "src/parse-gram.y"

         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }

-/* Line 647 of yacc.c  */
-#line 1086 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1152 "src/parse-gram.c"

         break;
 
         break;
 

-            case 82: // braceless
+            case 86: // braceless

 
 

-/* Line 647 of yacc.c  */
-#line 180 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 177 "src/parse-gram.y"

         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }

-/* Line 647 of yacc.c  */
-#line 1095 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1161 "src/parse-gram.c"

         break;
 
         break;
 

-            case 83: // id
+            case 87: // id

 
 

-/* Line 647 of yacc.c  */
-#line 193 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 191 "src/parse-gram.y"

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

-/* Line 647 of yacc.c  */
-#line 1104 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1170 "src/parse-gram.c"

         break;
 
         break;
 

-            case 84: // id_colon
+            case 88: // id_colon

 
 

-/* Line 647 of yacc.c  */
-#line 194 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 192 "src/parse-gram.y"

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

-/* Line 647 of yacc.c  */
-#line 1113 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1179 "src/parse-gram.c"

         break;
 
         break;
 

-            case 85: // symbol
+            case 89: // symbol

 
 

-/* Line 647 of yacc.c  */
-#line 193 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 191 "src/parse-gram.y"

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

-/* Line 647 of yacc.c  */
-#line 1122 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1188 "src/parse-gram.c"

         break;
 
         break;
 

-            case 86: // string_as_id
+            case 90: // string_as_id

 
 

-/* Line 647 of yacc.c  */
-#line 193 "parse-gram.y"
+/* Line 653 of yacc.c  */
+#line 191 "src/parse-gram.y"

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

-/* Line 647 of yacc.c  */
-#line 1131 "src/parse-gram.c"
+/* Line 653 of yacc.c  */
+#line 1197 "src/parse-gram.c"

         break;
 
       default:
         break;
 
       default:


@@ -1393,7 +1459,8 @@ yysyntax_error (char *yyresult, int yystate, int yytoken)
       char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
 
       /* Start YYX at -YYN if negative to avoid negative indexes in
       char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
 
       /* 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 yyxbegin = yyn < 0 ? -yyn : 0;
 
       /* Stay within bounds of both yycheck and yytname.  */


@@ -1407,7 +1474,8 @@ yysyntax_error (char *yyresult, int yystate, int yytoken)
       yyarg[yycount++] = yytname[yytoken];
 
       for (yyx = yyxbegin; yyx < yyxend; ++yyx)
       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)
              {
          {
            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
              {


@@ -1640,16 +1708,16 @@ YYLTYPE yylloc;
 #endif
 
 /* User initialization code.  */
 #endif
 
 /* User initialization code.  */

-/* Line 1173 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);
 }
 {
   /* 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 1173 of yacc.c  */
-#line 1653 "src/parse-gram.c"
+/* Line 1175 of yacc.c  */
+#line 1721 "src/parse-gram.c"

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


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

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

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


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

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

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


@@ -1835,8 +1903,8 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-/* Line 1380 of yacc.c  */
-#line 217 "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[0].chars), (yylsp[0]));
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));


@@ -1846,95 +1914,107 @@ yyreduce:
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }

-/* Line 1380 of yacc.c  */
-#line 1851 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 1919 "src/parse-gram.c"

     break;
 
   case 7:
     break;
 
   case 7:

-/* Line 1380 of yacc.c  */
-#line 227 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 275 "src/parse-gram.y"

     {
       muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
     }
     {
       muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
     }

-/* Line 1380 of yacc.c  */
-#line 1861 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 1929 "src/parse-gram.c"

     break;
 
   case 8:
     break;
 
   case 8:

-/* Line 1380 of yacc.c  */
-#line 231 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 279 "src/parse-gram.y"

     {
     {

-      muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars));
+      muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
+                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);

     }
     }

-/* Line 1380 of yacc.c  */
-#line 1871 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 1940 "src/parse-gram.c"

     break;
 
   case 9:
     break;
 
   case 9:

-/* Line 1380 of yacc.c  */
-#line 234 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 283 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 1879 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 1948 "src/parse-gram.c"

     break;
 
   case 10:
     break;
 
   case 10:

-/* Line 1380 of yacc.c  */
-#line 236 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 285 "src/parse-gram.y"

     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[0].chars));
     }
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[0].chars));
     }

-/* Line 1380 of yacc.c  */
-#line 1890 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 1959 "src/parse-gram.c"

     break;
 
   case 11:
     break;
 
   case 11:

-/* Line 1380 of yacc.c  */
-#line 240 "parse-gram.y"
-    { expected_sr_conflicts = (yyvsp[0].integer); }
-/* Line 1380 of yacc.c  */
-#line 1898 "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:
     break;
 
   case 12:

-/* Line 1380 of yacc.c  */
-#line 241 "parse-gram.y"
-    { expected_rr_conflicts = (yyvsp[0].integer); }
-/* Line 1380 of yacc.c  */
-#line 1906 "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:
     break;
 
   case 13:

-/* Line 1380 of yacc.c  */
-#line 242 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1380 of yacc.c  */
-#line 1914 "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:
     break;
 
   case 14:

-/* Line 1380 of yacc.c  */
-#line 243 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 296 "src/parse-gram.y"

     { spec_file_prefix = (yyvsp[0].chars); }
     { spec_file_prefix = (yyvsp[0].chars); }

-/* Line 1380 of yacc.c  */
-#line 1922 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 1994 "src/parse-gram.c"

     break;
 
   case 15:
     break;
 
   case 15:

-/* Line 1380 of yacc.c  */
-#line 245 "parse-gram.y"
+/* 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 1388 of yacc.c  */
+#line 299 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 1933 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2013 "src/parse-gram.c"

     break;
 
     break;
 

-  case 16:
-/* Line 1380 of yacc.c  */
-#line 250 "parse-gram.y"
+  case 17:
+/* Line 1388 of yacc.c  */
+#line 304 "src/parse-gram.y"

     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));
     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));


@@ -1943,93 +2023,93 @@ yyreduce:
       muscle_code_grow ("initial_action", action.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
       muscle_code_grow ("initial_action", action.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }

-/* Line 1380 of yacc.c  */
-#line 1948 "src/parse-gram.c"
-    break;
-
-  case 17:
-/* Line 1380 of yacc.c  */
-#line 258 "parse-gram.y"
-    { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
-/* Line 1380 of yacc.c  */
-#line 1956 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2028 "src/parse-gram.c"

     break;
 
   case 18:
     break;
 
   case 18:

-/* Line 1380 of yacc.c  */
-#line 259 "parse-gram.y"
-    { add_param ("lex_param", (yyvsp[0].code), (yylsp[0])); }
-/* Line 1380 of yacc.c  */
-#line 1964 "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:
     break;
 
   case 19:

-/* Line 1380 of yacc.c  */
-#line 260 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 313 "src/parse-gram.y"

     { spec_name_prefix = (yyvsp[0].chars); }
     { spec_name_prefix = (yyvsp[0].chars); }

-/* Line 1380 of yacc.c  */
-#line 1972 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2044 "src/parse-gram.c"

     break;
 
   case 20:
     break;
 
   case 20:

-/* Line 1380 of yacc.c  */
-#line 261 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 314 "src/parse-gram.y"

     { spec_name_prefix = (yyvsp[0].chars); }
     { spec_name_prefix = (yyvsp[0].chars); }

-/* Line 1380 of yacc.c  */
-#line 1980 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2052 "src/parse-gram.c"

     break;
 
   case 21:
     break;
 
   case 21:

-/* Line 1380 of yacc.c  */
-#line 262 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 315 "src/parse-gram.y"

     { no_lines_flag = true; }
     { no_lines_flag = true; }

-/* Line 1380 of yacc.c  */
-#line 1988 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2060 "src/parse-gram.c"

     break;
 
   case 22:
     break;
 
   case 22:

-/* Line 1380 of yacc.c  */
-#line 263 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 316 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 1996 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2068 "src/parse-gram.c"

     break;
 
   case 23:
     break;
 
   case 23:

-/* Line 1380 of yacc.c  */
-#line 264 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 317 "src/parse-gram.y"

     { spec_outfile = (yyvsp[0].chars); }
     { spec_outfile = (yyvsp[0].chars); }

-/* Line 1380 of yacc.c  */
-#line 2004 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2076 "src/parse-gram.c"

     break;
 
   case 24:
     break;
 
   case 24:

-/* Line 1380 of yacc.c  */
-#line 265 "parse-gram.y"
+/* Line 1388 of yacc.c  */
+#line 318 "src/parse-gram.y"

     { spec_outfile = (yyvsp[0].chars); }
     { spec_outfile = (yyvsp[0].chars); }

-/* Line 1380 of yacc.c  */
-#line 2012 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2084 "src/parse-gram.c"

     break;
 
   case 25:
     break;
 
   case 25:

-/* Line 1380 of yacc.c  */
-#line 266 "parse-gram.y"
-    { add_param ("parse_param", (yyvsp[0].code), (yylsp[0])); }
-/* Line 1380 of yacc.c  */
-#line 2020 "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:
     break;
 
   case 26:

-/* Line 1380 of yacc.c  */
-#line 267 "parse-gram.y"
-    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
-/* Line 1380 of yacc.c  */
-#line 2028 "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:
     break;
 
   case 27:

-/* Line 1380 of yacc.c  */
-#line 269 "parse-gram.y"
+/* 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 1388 of yacc.c  */
+#line 322 "src/parse-gram.y"

     {
       char const *skeleton_user = (yyvsp[0].chars);
       if (strchr (skeleton_user, '/'))
     {
       char const *skeleton_user = (yyvsp[0].chars);
       if (strchr (skeleton_user, '/'))


@@ -2053,183 +2133,199 @@ yyreduce:
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }

-/* Line 1380 of yacc.c  */
-#line 2058 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2138 "src/parse-gram.c"

     break;
 
     break;
 

-  case 28:
-/* Line 1380 of yacc.c  */
-#line 292 "parse-gram.y"
+  case 29:
+/* Line 1388 of yacc.c  */
+#line 345 "src/parse-gram.y"

     { token_table_flag = true; }
     { token_table_flag = true; }

-/* Line 1380 of yacc.c  */
-#line 2066 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2146 "src/parse-gram.c"

     break;
 
     break;
 

-  case 29:
-/* Line 1380 of yacc.c  */
-#line 293 "parse-gram.y"
+  case 30:
+/* Line 1388 of yacc.c  */
+#line 346 "src/parse-gram.y"

     { report_flag |= report_states; }
     { report_flag |= report_states; }

-/* Line 1380 of yacc.c  */
-#line 2074 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2154 "src/parse-gram.c"

     break;
 
     break;
 

-  case 30:
-/* Line 1380 of yacc.c  */
-#line 294 "parse-gram.y"
+  case 31:
+/* Line 1388 of yacc.c  */
+#line 347 "src/parse-gram.y"

     { yacc_flag = true; }
     { yacc_flag = true; }

-/* Line 1380 of yacc.c  */
-#line 2082 "src/parse-gram.c"
+/* 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;
 
   case 34:
     break;
 
   case 34:

-/* Line 1380 of yacc.c  */
-#line 302 "parse-gram.y"
+/* 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 1388 of yacc.c  */
+#line 365 "src/parse-gram.y"

     {
       grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
     }
     {
       grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
     }

-/* Line 1380 of yacc.c  */
-#line 2092 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2188 "src/parse-gram.c"

     break;
 
     break;
 

-  case 35:
-/* Line 1380 of yacc.c  */
-#line 306 "parse-gram.y"
+  case 38:
+/* Line 1388 of yacc.c  */
+#line 369 "src/parse-gram.y"

     {
       symbol_list *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));
     }
     {
       symbol_list *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 1380 of yacc.c  */
-#line 2105 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2201 "src/parse-gram.c"

     break;
 
     break;
 

-  case 36:
-/* Line 1380 of yacc.c  */
-#line 313 "parse-gram.y"
+  case 39:
+/* Line 1388 of yacc.c  */
+#line 376 "src/parse-gram.y"

     {
       symbol_list *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));
     }
     {
       symbol_list *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 1380 of yacc.c  */
-#line 2118 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2214 "src/parse-gram.c"

     break;
 
     break;
 

-  case 37:
-/* Line 1380 of yacc.c  */
-#line 320 "parse-gram.y"
+  case 40:
+/* Line 1388 of yacc.c  */
+#line 383 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2128 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2224 "src/parse-gram.c"

     break;
 
     break;
 

-  case 38:
-/* Line 1380 of yacc.c  */
-#line 324 "parse-gram.y"
+  case 41:
+/* Line 1388 of yacc.c  */
+#line 387 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2138 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2234 "src/parse-gram.c"

     break;
 
     break;
 

-  case 39:
-/* Line 1380 of yacc.c  */
-#line 328 "parse-gram.y"
+  case 42:
+/* 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[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }

-/* Line 1380 of yacc.c  */
-#line 2151 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2247 "src/parse-gram.c"

     break;
 
     break;
 

-  case 40:
-/* Line 1380 of yacc.c  */
-#line 335 "parse-gram.y"
+  case 43:
+/* Line 1388 of yacc.c  */
+#line 398 "src/parse-gram.y"

     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
     break;
 

-  case 41:
-/* Line 1380 of yacc.c  */
-#line 349 "parse-gram.y"
+  case 44:
+/* Line 1388 of yacc.c  */
+#line 412 "src/parse-gram.y"

     {}
     {}

-/* Line 1380 of yacc.c  */
-#line 2170 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2266 "src/parse-gram.c"

     break;
 
     break;
 

-  case 42:
-/* Line 1380 of yacc.c  */
-#line 350 "parse-gram.y"
+  case 45:
+/* Line 1388 of yacc.c  */
+#line 413 "src/parse-gram.y"

     { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
     { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }

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

     break;
 
     break;
 

-  case 43:
-/* Line 1380 of yacc.c  */
-#line 355 "parse-gram.y"
+  case 46:
+/* Line 1388 of yacc.c  */
+#line 418 "src/parse-gram.y"

     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
     break;
 

-  case 44:
-/* Line 1380 of yacc.c  */
-#line 366 "parse-gram.y"
+  case 47:
+/* Line 1388 of yacc.c  */
+#line 429 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2198 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2294 "src/parse-gram.c"

     break;
 
     break;
 

-  case 45:
-/* Line 1380 of yacc.c  */
-#line 367 "parse-gram.y"
+  case 48:
+/* Line 1388 of yacc.c  */
+#line 430 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2209 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2305 "src/parse-gram.c"

     break;
 
     break;
 

-  case 46:
-/* Line 1380 of yacc.c  */
-#line 371 "parse-gram.y"
+  case 49:
+/* Line 1388 of yacc.c  */
+#line 434 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2217 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2313 "src/parse-gram.c"

     break;
 
     break;
 

-  case 47:
-/* Line 1380 of yacc.c  */
-#line 372 "parse-gram.y"
+  case 50:
+/* Line 1388 of yacc.c  */
+#line 435 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2228 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2324 "src/parse-gram.c"

     break;
 
     break;
 

-  case 48:
-/* Line 1380 of yacc.c  */
-#line 377 "parse-gram.y"
+  case 51:
+/* Line 1388 of yacc.c  */
+#line 440 "src/parse-gram.y"

     {
       symbol_list *list;
       tag_seen = true;
     {
       symbol_list *list;
       tag_seen = true;


@@ -2237,13 +2333,13 @@ yyreduce:
        symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
        symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }

-/* Line 1380 of yacc.c  */
-#line 2242 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2338 "src/parse-gram.c"

     break;
 
     break;
 

-  case 49:
-/* Line 1380 of yacc.c  */
-#line 388 "parse-gram.y"
+  case 52:
+/* Line 1388 of yacc.c  */
+#line 451 "src/parse-gram.y"

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


@@ -2255,314 +2351,340 @@ yyreduce:
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }

-/* Line 1380 of yacc.c  */
-#line 2260 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2356 "src/parse-gram.c"

     break;
 
     break;
 

-  case 50:
-/* Line 1380 of yacc.c  */
-#line 402 "parse-gram.y"
+  case 53:
+/* Line 1388 of yacc.c  */
+#line 465 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 51:
-/* Line 1380 of yacc.c  */
-#line 403 "parse-gram.y"
+  case 54:
+/* Line 1388 of yacc.c  */
+#line 466 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 52:
-/* Line 1380 of yacc.c  */
-#line 404 "parse-gram.y"
+  case 55:
+/* Line 1388 of yacc.c  */
+#line 467 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2284 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2380 "src/parse-gram.c"

     break;
 
     break;
 

-  case 53:
-/* Line 1380 of yacc.c  */
-#line 405 "parse-gram.y"
+  case 56:
+/* Line 1388 of yacc.c  */
+#line 468 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2292 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2388 "src/parse-gram.c"

     break;
 
     break;
 

-  case 54:
-/* Line 1380 of yacc.c  */
-#line 409 "parse-gram.y"
+  case 57:
+/* Line 1388 of yacc.c  */
+#line 472 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2300 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2396 "src/parse-gram.c"

     break;
 
     break;
 

-  case 55:
-/* Line 1380 of yacc.c  */
-#line 410 "parse-gram.y"
+  case 58:
+/* Line 1388 of yacc.c  */
+#line 473 "src/parse-gram.y"

     { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
     { current_type = (yyvsp[0].uniqstr); tag_seen = true; }

-/* Line 1380 of yacc.c  */
-#line 2308 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2404 "src/parse-gram.c"

     break;
 
     break;
 

-  case 56:
-/* Line 1380 of yacc.c  */
-#line 416 "parse-gram.y"
+  case 59:
+/* Line 1388 of yacc.c  */
+#line 479 "src/parse-gram.y"

     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }

-/* Line 1380 of yacc.c  */
-#line 2316 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2412 "src/parse-gram.c"

     break;
 
     break;
 

-  case 57:
-/* Line 1380 of yacc.c  */
-#line 418 "parse-gram.y"
+  case 60:
+/* 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]))); }
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }

-/* Line 1380 of yacc.c  */
-#line 2324 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2420 "src/parse-gram.c"

     break;
 
     break;
 

-  case 58:
-/* Line 1380 of yacc.c  */
-#line 422 "parse-gram.y"
+  case 61:
+/* Line 1388 of yacc.c  */
+#line 485 "src/parse-gram.y"

     { (yyval.symbol) = (yyvsp[0].symbol); }
     { (yyval.symbol) = (yyvsp[0].symbol); }

-/* Line 1380 of yacc.c  */
-#line 2332 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2428 "src/parse-gram.c"

     break;
 
     break;
 

-  case 59:
-/* Line 1380 of yacc.c  */
-#line 423 "parse-gram.y"
+  case 62:
+/* 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])); }
     { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }

-/* Line 1380 of yacc.c  */
-#line 2340 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2436 "src/parse-gram.c"

     break;
 
     break;
 

-  case 60:
-/* Line 1380 of yacc.c  */
-#line 429 "parse-gram.y"
+  case 63:
+/* Line 1388 of yacc.c  */
+#line 492 "src/parse-gram.y"

     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }

-/* Line 1380 of yacc.c  */
-#line 2348 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2444 "src/parse-gram.c"

     break;
 
     break;
 

-  case 61:
-/* Line 1380 of yacc.c  */
-#line 431 "parse-gram.y"
+  case 64:
+/* 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]))); }
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }

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

     break;
 
     break;
 

-  case 62:
-/* Line 1380 of yacc.c  */
-#line 435 "parse-gram.y"
+  case 65:
+/* Line 1388 of yacc.c  */
+#line 498 "src/parse-gram.y"

     { (yyval.list) = (yyvsp[0].list); }
     { (yyval.list) = (yyvsp[0].list); }

-/* Line 1380 of yacc.c  */
-#line 2364 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2460 "src/parse-gram.c"

     break;
 
     break;
 

-  case 63:
-/* Line 1380 of yacc.c  */
-#line 436 "parse-gram.y"
+  case 66:
+/* Line 1388 of yacc.c  */
+#line 499 "src/parse-gram.y"

     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }

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

     break;
 
     break;
 

-  case 64:
-/* Line 1380 of yacc.c  */
-#line 440 "parse-gram.y"
+  case 67:
+/* Line 1388 of yacc.c  */
+#line 503 "src/parse-gram.y"

     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }

-/* Line 1380 of yacc.c  */
-#line 2380 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2476 "src/parse-gram.c"

     break;
 
     break;
 

-  case 65:
-/* Line 1380 of yacc.c  */
-#line 441 "parse-gram.y"
+  case 68:
+/* Line 1388 of yacc.c  */
+#line 504 "src/parse-gram.y"

     { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
     { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }

-/* Line 1380 of yacc.c  */
-#line 2388 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2484 "src/parse-gram.c"

     break;
 
     break;
 

-  case 66:
-/* Line 1380 of yacc.c  */
-#line 442 "parse-gram.y"
+  case 69:
+/* Line 1388 of yacc.c  */
+#line 505 "src/parse-gram.y"

     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }

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

     break;
 
     break;
 

-  case 67:
-/* Line 1380 of yacc.c  */
-#line 443 "parse-gram.y"
+  case 70:
+/* Line 1388 of yacc.c  */
+#line 506 "src/parse-gram.y"

     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }

-/* Line 1380 of yacc.c  */
-#line 2404 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2500 "src/parse-gram.c"

     break;
 
     break;
 

-  case 68:
-/* Line 1380 of yacc.c  */
-#line 449 "parse-gram.y"
+  case 71:
+/* Line 1388 of yacc.c  */
+#line 512 "src/parse-gram.y"

     {
        current_type = (yyvsp[0].uniqstr);
        tag_seen = true;
      }
     {
        current_type = (yyvsp[0].uniqstr);
        tag_seen = true;
      }

-/* Line 1380 of yacc.c  */
-#line 2415 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2511 "src/parse-gram.c"

     break;
 
     break;
 

-  case 69:
-/* Line 1380 of yacc.c  */
-#line 454 "parse-gram.y"
+  case 72:
+/* Line 1388 of yacc.c  */
+#line 517 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2426 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2522 "src/parse-gram.c"

     break;
 
     break;
 

-  case 70:
-/* Line 1380 of yacc.c  */
-#line 459 "parse-gram.y"
+  case 73:
+/* Line 1388 of yacc.c  */
+#line 522 "src/parse-gram.y"

     {
       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]));
     }
     {
       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 1380 of yacc.c  */
-#line 2438 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2534 "src/parse-gram.c"

     break;
 
     break;
 

-  case 71:
-/* Line 1380 of yacc.c  */
-#line 465 "parse-gram.y"
+  case 74:
+/* Line 1388 of yacc.c  */
+#line 528 "src/parse-gram.y"

     {
       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));
     }
     {
       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 1380 of yacc.c  */
-#line 2450 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2546 "src/parse-gram.c"

     break;
 
     break;
 

-  case 72:
-/* Line 1380 of yacc.c  */
-#line 471 "parse-gram.y"
+  case 75:
+/* Line 1388 of yacc.c  */
+#line 534 "src/parse-gram.y"

     {
       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));
     }
     {
       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 1380 of yacc.c  */
-#line 2463 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2559 "src/parse-gram.c"

     break;
 
     break;
 

-  case 79:
-/* Line 1380 of yacc.c  */
-#line 501 "parse-gram.y"
+  case 82:
+/* Line 1388 of yacc.c  */
+#line 564 "src/parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }

-/* Line 1380 of yacc.c  */
-#line 2473 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2569 "src/parse-gram.c"

     break;
 
     break;
 

-  case 80:
-/* Line 1380 of yacc.c  */
-#line 507 "parse-gram.y"
-    { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); }
-/* Line 1380 of yacc.c  */
-#line 2481 "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;
 
     break;
 

-  case 82:
-/* Line 1380 of yacc.c  */
-#line 511 "parse-gram.y"
+  case 85:
+/* Line 1388 of yacc.c  */
+#line 575 "src/parse-gram.y"

     { grammar_current_rule_end ((yylsp[0])); }
     { grammar_current_rule_end ((yylsp[0])); }

-/* Line 1380 of yacc.c  */
-#line 2489 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2586 "src/parse-gram.c"

     break;
 
     break;
 

-  case 83:
-/* Line 1380 of yacc.c  */
-#line 512 "parse-gram.y"
+  case 86:
+/* Line 1388 of yacc.c  */
+#line 576 "src/parse-gram.y"

     { grammar_current_rule_end ((yylsp[0])); }
     { grammar_current_rule_end ((yylsp[0])); }

-/* Line 1380 of yacc.c  */
-#line 2497 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2594 "src/parse-gram.c"

     break;
 
     break;
 

-  case 85:
-/* Line 1380 of yacc.c  */
-#line 518 "parse-gram.y"
-    { grammar_current_rule_begin (current_lhs, current_lhs_location); }
-/* Line 1380 of yacc.c  */
-#line 2505 "src/parse-gram.c"
+  case 88:
+/* 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;
 
     break;
 

-  case 86:
-/* Line 1380 of yacc.c  */
-#line 520 "parse-gram.y"
-    { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1380 of yacc.c  */
-#line 2513 "src/parse-gram.c"
+  case 89:
+/* 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;
 
     break;
 

-  case 87:
-/* Line 1380 of yacc.c  */
-#line 522 "parse-gram.y"
-    { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0])); }
-/* Line 1380 of yacc.c  */
-#line 2521 "src/parse-gram.c"
+  case 90:
+/* 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;
 
     break;
 

-  case 88:
-/* Line 1380 of yacc.c  */
-#line 524 "parse-gram.y"
+  case 91:
+/* Line 1388 of yacc.c  */
+#line 589 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2529 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2627 "src/parse-gram.c"

     break;
 
     break;
 

-  case 89:
-/* Line 1380 of yacc.c  */
-#line 526 "parse-gram.y"
+  case 92:
+/* Line 1388 of yacc.c  */
+#line 591 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 90:
-/* Line 1380 of yacc.c  */
-#line 528 "parse-gram.y"
+  case 93:
+/* Line 1388 of yacc.c  */
+#line 593 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 92:
-/* Line 1380 of yacc.c  */
-#line 540 "parse-gram.y"
+  case 94:
+/* 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;
+
+  case 97:
+/* Line 1388 of yacc.c  */
+#line 611 "src/parse-gram.y"

     { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }

-/* Line 1380 of yacc.c  */
-#line 2553 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2667 "src/parse-gram.c"

     break;
 
     break;
 

-  case 93:
-/* Line 1380 of yacc.c  */
-#line 545 "parse-gram.y"
+  case 98:
+/* Line 1388 of yacc.c  */
+#line 616 "src/parse-gram.y"

     { (yyval.chars) = ""; }
     { (yyval.chars) = ""; }

-/* Line 1380 of yacc.c  */
-#line 2561 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2675 "src/parse-gram.c"

     break;
 
     break;
 

-  case 95:
-/* Line 1380 of yacc.c  */
-#line 556 "parse-gram.y"
+  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;
+
+  case 101:
+/* Line 1388 of yacc.c  */
+#line 628 "src/parse-gram.y"

     {
       code_props plain_code;
       (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n';
     {
       code_props plain_code;
       (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n';


@@ -2571,52 +2693,52 @@ yyreduce:
       gram_scanner_last_string_free ();
       (yyval.chars) = plain_code.code;
     }
       gram_scanner_last_string_free ();
       (yyval.chars) = plain_code.code;
     }

-/* Line 1380 of yacc.c  */
-#line 2576 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2698 "src/parse-gram.c"

     break;
 
     break;
 

-  case 96:
-/* Line 1380 of yacc.c  */
-#line 576 "parse-gram.y"
+  case 102:
+/* Line 1388 of yacc.c  */
+#line 648 "src/parse-gram.y"

     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }

-/* Line 1380 of yacc.c  */
-#line 2584 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2706 "src/parse-gram.c"

     break;
 
     break;
 

-  case 97:
-/* Line 1380 of yacc.c  */
-#line 578 "parse-gram.y"
+  case 103:
+/* Line 1388 of yacc.c  */
+#line 650 "src/parse-gram.y"

     {
       (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]));
     }
     {
       (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 1380 of yacc.c  */
-#line 2596 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2718 "src/parse-gram.c"

     break;
 
     break;
 

-  case 98:
-/* Line 1380 of yacc.c  */
-#line 586 "parse-gram.y"
+  case 104:
+/* Line 1388 of yacc.c  */
+#line 658 "src/parse-gram.y"

     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }

-/* Line 1380 of yacc.c  */
-#line 2604 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2726 "src/parse-gram.c"

     break;
 
     break;
 

-  case 101:
-/* Line 1380 of yacc.c  */
-#line 598 "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[0].chars)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), 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 1380 of yacc.c  */
-#line 2615 "src/parse-gram.c"
+/* Line 1388 of yacc.c  */
+#line 2737 "src/parse-gram.c"

     break;
 
     break;
 

-  case 103:
-/* Line 1380 of yacc.c  */
-#line 607 "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[0].chars), (yylsp[0]));
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));


@@ -2625,13 +2747,13 @@ yyreduce:
       muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
       muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
 
     break;
 
 

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

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


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

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

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


@@ -2847,8 +2969,8 @@ yyreturn:
   return YYID (yyresult);
 }
 
   return YYID (yyresult);
 }
 

-/* Line 1599 of yacc.c  */
-#line 617 "parse-gram.y"
+/* Line 1607 of yacc.c  */
+#line 689 "src/parse-gram.y"

 
 
 
 
 
 


@@ -2882,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
 static void

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

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

+

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

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

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


@@ -2926,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';
       name = xmalloc (name_len + 1);
       memcpy (name, name_start, name_len);
       name[name_len] = '\0';

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

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