tests: check that parse-gram.y's IELR and LALR are identical.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 2f9e10eb8a09ea3f19f5ced8a6b664097a12d568..b083a20d9de4eded1762b5cf089694a0edf8f395 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.343-83ea.  */
+/* A Bison parser, made by GNU Bison 2.4.404-c6ab.  */

 
 /* 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.343-83ea"
+#define YYBISON_VERSION "2.4.404-c6ab"

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


@@ -73,8 +73,8 @@
 #define yylloc          gram_lloc
 
 /* Copy the first part of user declarations.  */
 #define yylloc          gram_lloc
 
 /* Copy the first part of user declarations.  */

-/* Line 191 of yacc.c  */
-#line 1 "parse-gram.y"
+/* Line 253 of yacc.c  */
+#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


@@ -128,29 +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 named_ref *current_lhs_named_ref;
-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 "../master/src/parse-gram.c"
+/* Line 253 of yacc.c  */
+#line 133 "src/parse-gram.c"

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


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

+/* "%code requires" blocks.  */
+/* Line 273 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 273 of yacc.c  */
+#line 170 "src/parse-gram.c"

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


@@ -204,34 +201,33 @@ static int current_prec = 0;
      PERCENT_GLR_PARSER = 281,
      PERCENT_INITIAL_ACTION = 282,
      PERCENT_LANGUAGE = 283,
      PERCENT_GLR_PARSER = 281,
      PERCENT_INITIAL_ACTION = 282,
      PERCENT_LANGUAGE = 283,

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


@@ -262,34 +258,33 @@ static int current_prec = 0;
 #define PERCENT_GLR_PARSER 281
 #define PERCENT_INITIAL_ACTION 282
 #define PERCENT_LANGUAGE 283
 #define PERCENT_GLR_PARSER 281
 #define PERCENT_INITIAL_ACTION 282
 #define PERCENT_LANGUAGE 283

-#define PERCENT_LEX_PARAM 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_REQUIRE 291
-#define PERCENT_SKELETON 292
-#define PERCENT_START 293
-#define PERCENT_TOKEN_TABLE 294
-#define PERCENT_VERBOSE 295
-#define PERCENT_YACC 296
-#define BRACED_CODE 297
-#define CHAR 298
-#define EPILOGUE 299
-#define EQUAL 300
-#define ID 301
-#define ID_COLON 302
-#define PERCENT_PERCENT 303
-#define PIPE 304
-#define PROLOGUE 305
-#define SEMICOLON 306
-#define TAG 307
-#define TAG_ANY 308
-#define TAG_NONE 309
-#define BRACKETED_ID 310
-#define PERCENT_UNION 311
+#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,22 +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 216 of yacc.c  */
-#line 94 "parse-gram.y"
+/* Line 278 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;

-  named_ref *named_ref;

 
 

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

 
 

-/* Line 216 of yacc.c  */
-#line 316 "../master/src/parse-gram.c"
+
+/* Line 278 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 */


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

-/* Line 266 of yacc.c  */
-#line 340 "../master/src/parse-gram.c"
+/* Line 328 of yacc.c  */
+#line 340 "src/parse-gram.c"
+/* Unqualified %code blocks.  */
+/* Line 329 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 329 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 329 of yacc.c  */
+#line 371 "src/parse-gram.c"

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


@@ -553,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   160
+#define YYLAST   190

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

-#define YYNTOKENS  57
+#define YYNTOKENS  56

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

-#define YYNNTS  34
+#define YYNNTS  36

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

-#define YYNRULES  106
+#define YYNRULES  109

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

-#define YYNSTATES  146
+#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   311
+#define YYMAXUTOK   310

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


@@ -607,24 +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,
       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
   /* 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,   207,   207,   215,   217,   221,   222,   232,   236,   241,
-     242,   247,   252,   253,   254,   255,   256,   261,   270,   271,
-     272,   273,   274,   275,   276,   277,   278,   279,   280,   304,
-     305,   306,   307,   311,   312,   313,   317,   324,   331,   335,
-     339,   346,   361,   362,   366,   378,   378,   383,   383,   388,
-     399,   414,   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,   524,   525,   526,   531,   533,   535,   537,
-     539,   541,   546,   548,   559,   560,   565,   566,   575,   595,
-     597,   606,   611,   612,   617,   624,   626
+       0,   250,   250,   258,   260,   264,   265,   275,   279,   284,
+     285,   290,   295,   296,   297,   298,   299,   304,   313,   314,
+     315,   316,   317,   318,   319,   320,   320,   321,   322,   346,
+     347,   348,   349,   353,   354,   363,   364,   365,   369,   376,
+     383,   387,   391,   398,   413,   414,   418,   430,   430,   435,
+     435,   440,   451,   466,   467,   468,   469,   473,   474,   479,
+     481,   486,   487,   492,   494,   499,   500,   504,   505,   506,
+     507,   512,   517,   522,   528,   534,   545,   546,   555,   556,
+     562,   563,   564,   571,   571,   576,   577,   578,   583,   585,
+     587,   589,   591,   593,   598,   600,   611,   612,   617,   618,
+     619,   628,   648,   650,   659,   664,   665,   670,   677,   679

 };
 #endif
 
 };
 #endif
 


@@ -640,19 +671,19 @@ static const char *const yytname[] =
   "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
   "\"%expect\"", "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"",
   "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"",
   "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
   "\"%expect\"", "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"",
   "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"",

-  "\"%lex-param\"", "\"%name-prefix\"", "\"%no-default-prec\"",
-  "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"",
-  "\"%parse-param\"", "\"%require\"", "\"%skeleton\"", "\"%start\"",
-  "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"",
-  "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
-  "\"|\"", "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"",
-  "\"[identifier]\"", "\"%union\"", "$accept", "input",
-  "prologue_declarations", "prologue_declaration", "grammar_declaration",
-  "union_name", "symbol_declaration", "$@1", "$@2",
+  "\"%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",
   "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",
+  "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
 };
   "named_ref.opt", "variable", "content.opt", "braceless", "id",
   "id_colon", "symbol", "string_as_id", "epilogue.opt", 0
 };


@@ -668,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,   310,   311
+     305,   306,   307,   308,   309,   310

 };
 # endif
 
 };
 # endif
 

-#define YYPACT_NINF -53
+#define YYPACT_NINF -88

 
 

-#define YYTABLE_NINF -106
+#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[] =
 {

-     -53,     5,   102,   -53,   -53,   -53,   -10,     8,    27,   -53,
-     -53,   -53,   -53,    18,   -53,    32,    55,   -53,    70,    77,
-     -53,    17,   -53,    43,    91,    53,    41,   -53,   -53,   -53,
-      42,    54,    94,    96,     0,   -53,   -53,   -53,    16,   -53,
-     -53,    56,   -53,   -53,   -53,   -53,    48,    30,    30,     0,
-      13,    13,   -53,    61,   -53,   -53,   -53,   101,   -53,   -53,
-     -53,   -53,   113,   -53,   -53,   -53,   -53,   114,   -53,   115,
-     -53,   -53,   -53,   -53,   -53,   -53,   -53,   -53,   -53,    93,
-     -53,    95,     1,   -53,   -53,    50,   -53,    61,   -53,     0,
-     -53,   -53,    30,    33,    30,     0,   -53,   -53,   -53,   -53,
-      13,   -53,   -53,    13,   -53,   -53,   -53,   -53,   -53,   -53,
-     -53,   -53,   103,   -53,   -53,   -53,   -53,   -53,     0,   -53,
-     141,   -53,   145,   -53,   -53,   -53,   -53,   -53,   -53,   -53,
-     -53,    39,    37,   -53,   -53,     0,   147,    97,    50,    50,
-      37,   -53,   -53,   -53,   -53,   -53
+     -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


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

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

 {
 {

-     -53,   -53,   -53,   -53,   152,   -53,   -53,   -53,   -53,   -53,
-     -53,   -53,   -53,    38,   -53,   104,   -32,    -3,   109,   -53,
-      78,   -53,   -53,   -53,    26,   -46,   -53,   -53,   -49,   -17,
-     -53,   -34,   -52,   -53
+     -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].    */
 static const yytype_int16 yydefgoto[] =
 {
 };
 
   /* YYDEFGOTO[NTERM-NUM].    */
 static const yytype_int16 yydefgoto[] =
 {

-      -1,     1,     2,    42,    81,    87,    44,    48,    47,    45,
-      46,    89,   118,   119,    95,   100,   101,    91,    92,    82,
-      83,    84,   127,   131,   132,   116,    57,   106,    54,    76,
-      85,   102,    78,   114
+      -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[] =
 {

-      77,  -105,    79,    73,   104,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    96,    73,    79,    13,    14,
-      61,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      93,    93,    27,    13,    14,    55,    73,   122,   117,    34,
-      73,   123,    49,    74,    66,    68,    75,    27,    80,   112,
-      50,   135,   136,   137,    34,   120,    74,    41,    58,    75,
-      52,   124,    62,    80,    53,    97,    98,    99,   125,    51,
-     130,   125,    41,    74,    59,    93,    75,    93,    56,   138,
-      74,    60,    90,    75,   120,    63,    67,    69,   133,   121,
-     134,   121,   144,   145,    64,    65,    70,    71,   139,    72,
-      88,   141,    86,    52,   105,   115,   139,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,   107,   108,   109,    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,   110,   129,   111,   126,    73,   143,
-      38,   142,    39,    40,    43,   103,   128,    94,    41,   140,
-     113
+      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

 };
 
 };
 

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

 {
 {

-      34,     0,     1,     3,    53,     0,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    49,     3,     1,    17,    18,
-       3,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      47,    48,    31,    17,    18,     3,     3,     4,    87,    38,
-       3,    93,    52,    43,     3,     3,    46,    31,    47,    48,
-      42,    14,    15,    16,    38,    89,    43,    56,     3,    46,
-      42,    95,    45,    47,    46,    52,    53,    54,   100,    42,
-     122,   103,    56,    43,     4,    92,    46,    94,    46,    42,
-      43,     4,    52,    46,   118,    42,    45,    45,    49,    92,
-      51,    94,   138,   139,     3,    42,    42,     3,   132,     3,
-      52,   135,    46,    42,     3,    55,   140,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,     3,     3,     3,    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,    51,     4,    51,    44,     3,    52,
-      48,     4,    50,    51,     2,    51,   118,    48,    56,   133,
-      82
+      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

 };
 
   /* 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,    58,    59,     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,    41,    48,    50,
-      51,    56,    60,    61,    63,    66,    67,    65,    64,    52,
-      42,    42,    42,    46,    85,     3,    46,    83,     3,     4,
-       4,     3,    45,    42,     3,    42,     3,    45,     3,    45,
-      42,     3,     3,     3,    43,    46,    86,    88,    89,     1,
-      47,    61,    76,    77,    78,    87,    46,    62,    52,    68,
-      52,    74,    75,    86,    75,    71,    88,    52,    53,    54,
-      72,    73,    88,    72,    85,     3,    84,     3,     3,     3,
-      51,    51,    48,    77,    90,    55,    82,    85,    69,    70,
-      88,    74,     4,    89,    88,    73,    44,    79,    70,     4,
-      89,    80,    81,    49,    51,    14,    15,    16,    42,    88,
-      81,    88,     4,    52,    82,    82
+      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,    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,    61,    61,    61,    61,    61,    61,    61,
-      61,    61,    62,    62,    61,    64,    63,    65,    63,    63,
-      66,    67,    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,    84,    85,    86,
-      86,    87,    88,    88,    89,    90,    90
+       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.    */
 };
 
   /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.    */


@@ -825,15 +867,15 @@ static const yytype_uint8 yyr2[] =
 {
        0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
        2,     1,     2,     2,     2,     3,     1,     2,     2,     2,
 {
        0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
        2,     1,     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,     4,     1,     3,     2,     0,     3,     3,     3,
-       3,     3,     0,     1,     1,     1,     0,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     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

 };
 
 
 };
 
 


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

-/* Line 647 of yacc.c  */
-#line 183 "parse-gram.y"
+/* Line 715 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 992 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1034 "src/parse-gram.c"

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

-/* Line 647 of yacc.c  */
-#line 196 "parse-gram.y"
+/* Line 715 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 1001 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1043 "src/parse-gram.c"

         break;
 
             case 24: // "%<flag>"
 
         break;
 
             case 24: // "%<flag>"
 

-/* Line 647 of yacc.c  */
-#line 192 "parse-gram.y"
+/* Line 715 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 1010 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1052 "src/parse-gram.c"

         break;
 
         break;
 

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

 
 

-/* Line 647 of yacc.c  */
-#line 185 "parse-gram.y"
+/* Line 715 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 1019 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1061 "src/parse-gram.c"

         break;
 
         break;
 

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

 
 

-/* Line 647 of yacc.c  */
-#line 177 "parse-gram.y"
+/* Line 715 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 1028 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1070 "src/parse-gram.c"

         break;
 
         break;
 

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

 
 

-/* Line 647 of yacc.c  */
-#line 185 "parse-gram.y"
+/* Line 715 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 1037 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1079 "src/parse-gram.c"

         break;
 
         break;
 

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

 
 

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

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

-/* Line 647 of yacc.c  */
-#line 1046 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1088 "src/parse-gram.c"

         break;
 
         break;
 

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

 
 

-/* Line 647 of yacc.c  */
-#line 191 "parse-gram.y"
+/* Line 715 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 1055 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1097 "src/parse-gram.c"

         break;
 
         break;
 

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

 
 

-/* Line 647 of yacc.c  */
-#line 185 "parse-gram.y"
+/* Line 715 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 1064 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1106 "src/parse-gram.c"

         break;
 
         break;
 

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

 
 

-/* Line 647 of yacc.c  */
-#line 193 "parse-gram.y"
+/* Line 715 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 1073 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1115 "src/parse-gram.c"
+        break;
+
+            case 54: // "%param"
+
+/* Line 715 of yacc.c  */
+#line 230 "src/parse-gram.y"
+        {
+  switch (((*yyvaluep).param))
+    {
+#define CASE(In, Out)                                           \
+      case param_ ## In: fputs ("%" #Out, stderr); break
+      CASE(lex,   lex-param);
+      CASE(parse, parse-param);
+      CASE(both,  param);
+#undef CASE
+      case param_none: aver (false); break;
+    }
+}
+/* Line 715 of yacc.c  */
+#line 1135 "src/parse-gram.c"

         break;
 
         break;
 

-            case 83: // variable
+            case 84: // variable

 
 

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

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

-/* Line 647 of yacc.c  */
-#line 1082 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1144 "src/parse-gram.c"

         break;
 
         break;
 

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

 
 

-/* Line 647 of yacc.c  */
-#line 185 "parse-gram.y"
+/* Line 715 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 1091 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1153 "src/parse-gram.c"

         break;
 
         break;
 

-            case 85: // braceless
+            case 86: // braceless

 
 

-/* Line 647 of yacc.c  */
-#line 185 "parse-gram.y"
+/* Line 715 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 1100 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1162 "src/parse-gram.c"

         break;
 
         break;
 

-            case 86: // id
+            case 87: // id

 
 

-/* Line 647 of yacc.c  */
-#line 199 "parse-gram.y"
+/* Line 715 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 1109 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1171 "src/parse-gram.c"

         break;
 
         break;
 

-            case 87: // id_colon
+            case 88: // id_colon

 
 

-/* Line 647 of yacc.c  */
-#line 200 "parse-gram.y"
+/* Line 715 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 1118 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1180 "src/parse-gram.c"

         break;
 
         break;
 

-            case 88: // symbol
+            case 89: // symbol

 
 

-/* Line 647 of yacc.c  */
-#line 199 "parse-gram.y"
+/* Line 715 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 1127 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1189 "src/parse-gram.c"

         break;
 
         break;
 

-            case 89: // string_as_id
+            case 90: // string_as_id

 
 

-/* Line 647 of yacc.c  */
-#line 199 "parse-gram.y"
+/* Line 715 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 1136 "../master/src/parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1198 "src/parse-gram.c"

         break;
 
       default:
         break;
 
       default:


@@ -1398,7 +1460,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.  */


@@ -1412,7 +1475,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)
              {


@@ -1504,6 +1568,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
     }
 }
 
     }
 }
 

+

 /* Prevent warnings from -Wmissing-prototypes.  */
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
 /* Prevent warnings from -Wmissing-prototypes.  */
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \


@@ -1522,12 +1587,9 @@ int yyparse ();
 #endif /* ! YYPARSE_PARAM */
 
 
 #endif /* ! YYPARSE_PARAM */
 
 

-
-
-
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/

 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \


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

-/* Line 1167 of yacc.c  */
-#line 86 "parse-gram.y"
+/* Line 1183 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 1167 of yacc.c  */
-#line 1658 "../master/src/parse-gram.c"
+/* Line 1183 of yacc.c  */
+#line 1720 "src/parse-gram.c"

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


@@ -1753,7 +1815,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.  */


@@ -1784,7 +1846,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;


@@ -1840,8 +1902,8 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-/* Line 1380 of yacc.c  */
-#line 223 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 266 "src/parse-gram.y"

     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));


@@ -1851,107 +1913,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 1856 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 1918 "src/parse-gram.c"

     break;
 
   case 7:
     break;
 
   case 7:

-/* Line 1380 of yacc.c  */
-#line 233 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 276 "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 1866 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 1928 "src/parse-gram.c"

     break;
 
   case 8:
     break;
 
   case 8:

-/* Line 1380 of yacc.c  */
-#line 237 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 280 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 1877 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 1939 "src/parse-gram.c"

     break;
 
   case 9:
     break;
 
   case 9:

-/* Line 1380 of yacc.c  */
-#line 241 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 284 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 1885 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 1947 "src/parse-gram.c"

     break;
 
   case 10:
     break;
 
   case 10:

-/* Line 1380 of yacc.c  */
-#line 243 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 286 "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 1896 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 1958 "src/parse-gram.c"

     break;
 
   case 11:
     break;
 
   case 11:

-/* Line 1380 of yacc.c  */
-#line 248 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 291 "src/parse-gram.y"

     {
       muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
     {
       muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }

-/* Line 1380 of yacc.c  */
-#line 1907 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 1969 "src/parse-gram.c"

     break;
 
   case 12:
     break;
 
   case 12:

-/* Line 1380 of yacc.c  */
-#line 252 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 295 "src/parse-gram.y"

     { expected_sr_conflicts = (yyvsp[0].integer); }
     { expected_sr_conflicts = (yyvsp[0].integer); }

-/* Line 1380 of yacc.c  */
-#line 1915 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 1977 "src/parse-gram.c"

     break;
 
   case 13:
     break;
 
   case 13:

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

     { expected_rr_conflicts = (yyvsp[0].integer); }
     { expected_rr_conflicts = (yyvsp[0].integer); }

-/* Line 1380 of yacc.c  */
-#line 1923 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 1985 "src/parse-gram.c"

     break;
 
   case 14:
     break;
 
   case 14:

-/* Line 1380 of yacc.c  */
-#line 254 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 297 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 1931 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 1993 "src/parse-gram.c"

     break;
 
   case 15:
     break;
 
   case 15:

-/* Line 1380 of yacc.c  */
-#line 255 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 298 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 1939 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2001 "src/parse-gram.c"

     break;
 
   case 16:
     break;
 
   case 16:

-/* Line 1380 of yacc.c  */
-#line 257 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 300 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 1950 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2012 "src/parse-gram.c"

     break;
 
   case 17:
     break;
 
   case 17:

-/* Line 1380 of yacc.c  */
-#line 262 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 305 "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]));


@@ -1960,93 +2022,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 1965 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2027 "src/parse-gram.c"

     break;
 
   case 18:
     break;
 
   case 18:

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

     { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
     { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }

-/* Line 1380 of yacc.c  */
-#line 1973 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2035 "src/parse-gram.c"

     break;
 
   case 19:
     break;
 
   case 19:

-/* Line 1380 of yacc.c  */
-#line 271 "parse-gram.y"
-    { add_param ("lex_param", (yyvsp[0].code), (yylsp[0])); }
-/* Line 1380 of yacc.c  */
-#line 1981 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 314 "src/parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1396 of yacc.c  */
+#line 2043 "src/parse-gram.c"

     break;
 
   case 20:
     break;
 
   case 20:

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

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

-/* Line 1380 of yacc.c  */
-#line 1989 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2051 "src/parse-gram.c"

     break;
 
   case 21:
     break;
 
   case 21:

-/* Line 1380 of yacc.c  */
-#line 273 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1380 of yacc.c  */
-#line 1997 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 316 "src/parse-gram.y"
+    { no_lines_flag = true; }
+/* Line 1396 of yacc.c  */
+#line 2059 "src/parse-gram.c"

     break;
 
   case 22:
     break;
 
   case 22:

-/* Line 1380 of yacc.c  */
-#line 274 "parse-gram.y"
-    { no_lines_flag = true; }
-/* Line 1380 of yacc.c  */
-#line 2005 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 317 "src/parse-gram.y"
+    { nondeterministic_parser = true; }
+/* Line 1396 of yacc.c  */
+#line 2067 "src/parse-gram.c"

     break;
 
   case 23:
     break;
 
   case 23:

-/* Line 1380 of yacc.c  */
-#line 275 "parse-gram.y"
-    { nondeterministic_parser = true; }
-/* Line 1380 of yacc.c  */
-#line 2013 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 318 "src/parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1396 of yacc.c  */
+#line 2075 "src/parse-gram.c"

     break;
 
   case 24:
     break;
 
   case 24:

-/* Line 1380 of yacc.c  */
-#line 276 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 319 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2021 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2083 "src/parse-gram.c"

     break;
 
   case 25:
     break;
 
   case 25:

-/* Line 1380 of yacc.c  */
-#line 277 "parse-gram.y"
-    { spec_outfile = (yyvsp[0].chars); }
-/* Line 1380 of yacc.c  */
-#line 2029 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 320 "src/parse-gram.y"
+    { current_param = (yyvsp[0].param); }
+/* Line 1396 of yacc.c  */
+#line 2091 "src/parse-gram.c"

     break;
 
   case 26:
     break;
 
   case 26:

-/* Line 1380 of yacc.c  */
-#line 278 "parse-gram.y"
-    { add_param ("parse_param", (yyvsp[0].code), (yylsp[0])); }
-/* Line 1380 of yacc.c  */
-#line 2037 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 320 "src/parse-gram.y"
+    { current_param = param_none; }
+/* Line 1396 of yacc.c  */
+#line 2099 "src/parse-gram.c"

     break;
 
   case 27:
     break;
 
   case 27:

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

     { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
     { version_check (&(yylsp[0]), (yyvsp[0].chars)); }

-/* Line 1380 of yacc.c  */
-#line 2045 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2107 "src/parse-gram.c"

     break;
 
   case 28:
     break;
 
   case 28:

-/* Line 1380 of yacc.c  */
-#line 281 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 323 "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, '/'))


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

-/* Line 1380 of yacc.c  */
-#line 2075 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2137 "src/parse-gram.c"

     break;
 
   case 29:
     break;
 
   case 29:

-/* Line 1380 of yacc.c  */
-#line 304 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 346 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2083 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2145 "src/parse-gram.c"

     break;
 
   case 30:
     break;
 
   case 30:

-/* Line 1380 of yacc.c  */
-#line 305 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 347 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2091 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2153 "src/parse-gram.c"

     break;
 
   case 31:
     break;
 
   case 31:

-/* Line 1380 of yacc.c  */
-#line 306 "parse-gram.y"
+/* Line 1396 of yacc.c  */
+#line 348 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2099 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2161 "src/parse-gram.c"
+    break;
+
+  case 33:
+/* Line 1396 of yacc.c  */
+#line 353 "src/parse-gram.y"
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1396 of yacc.c  */
+#line 2169 "src/parse-gram.c"
+    break;
+
+  case 34:
+/* Line 1396 of yacc.c  */
+#line 354 "src/parse-gram.y"
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1396 of yacc.c  */
+#line 2177 "src/parse-gram.c"

     break;
 
     break;
 

-  case 35:
-/* Line 1380 of yacc.c  */
-#line 314 "parse-gram.y"
+  case 37:
+/* Line 1396 of yacc.c  */
+#line 366 "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 2109 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2187 "src/parse-gram.c"

     break;
 
     break;
 

-  case 36:
-/* Line 1380 of yacc.c  */
-#line 318 "parse-gram.y"
+  case 38:
+/* Line 1396 of yacc.c  */
+#line 370 "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 2122 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2200 "src/parse-gram.c"

     break;
 
     break;
 

-  case 37:
-/* Line 1380 of yacc.c  */
-#line 325 "parse-gram.y"
+  case 39:
+/* Line 1396 of yacc.c  */
+#line 377 "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 2135 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2213 "src/parse-gram.c"

     break;
 
     break;
 

-  case 38:
-/* Line 1380 of yacc.c  */
-#line 332 "parse-gram.y"
+  case 40:
+/* Line 1396 of yacc.c  */
+#line 384 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2145 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2223 "src/parse-gram.c"

     break;
 
     break;
 

-  case 39:
-/* Line 1380 of yacc.c  */
-#line 336 "parse-gram.y"
+  case 41:
+/* Line 1396 of yacc.c  */
+#line 388 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2155 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2233 "src/parse-gram.c"

     break;
 
     break;
 

-  case 40:
-/* Line 1380 of yacc.c  */
-#line 340 "parse-gram.y"
+  case 42:
+/* Line 1396 of yacc.c  */
+#line 392 "src/parse-gram.y"

     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
     {
       /* 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 2168 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2246 "src/parse-gram.c"

     break;
 
     break;
 

-  case 41:
-/* Line 1380 of yacc.c  */
-#line 347 "parse-gram.y"
+  case 43:
+/* Line 1396 of yacc.c  */
+#line 399 "src/parse-gram.y"

     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
     {
       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 2179 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2257 "src/parse-gram.c"

     break;
 
     break;
 

-  case 42:
-/* Line 1380 of yacc.c  */
-#line 361 "parse-gram.y"
+  case 44:
+/* Line 1396 of yacc.c  */
+#line 413 "src/parse-gram.y"

     {}
     {}

-/* Line 1380 of yacc.c  */
-#line 2187 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2265 "src/parse-gram.c"

     break;
 
     break;
 

-  case 43:
-/* Line 1380 of yacc.c  */
-#line 362 "parse-gram.y"
+  case 45:
+/* Line 1396 of yacc.c  */
+#line 414 "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 2195 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2273 "src/parse-gram.c"

     break;
 
     break;
 

-  case 44:
-/* Line 1380 of yacc.c  */
-#line 367 "parse-gram.y"
+  case 46:
+/* Line 1396 of yacc.c  */
+#line 419 "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 2207 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2285 "src/parse-gram.c"

     break;
 
     break;
 

-  case 45:
-/* Line 1380 of yacc.c  */
-#line 378 "parse-gram.y"
+  case 47:
+/* Line 1396 of yacc.c  */
+#line 430 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2215 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2293 "src/parse-gram.c"

     break;
 
     break;
 

-  case 46:
-/* Line 1380 of yacc.c  */
-#line 379 "parse-gram.y"
+  case 48:
+/* Line 1396 of yacc.c  */
+#line 431 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2226 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2304 "src/parse-gram.c"

     break;
 
     break;
 

-  case 47:
-/* Line 1380 of yacc.c  */
-#line 383 "parse-gram.y"
+  case 49:
+/* Line 1396 of yacc.c  */
+#line 435 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2234 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2312 "src/parse-gram.c"

     break;
 
     break;
 

-  case 48:
-/* Line 1380 of yacc.c  */
-#line 384 "parse-gram.y"
+  case 50:
+/* Line 1396 of yacc.c  */
+#line 436 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2245 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2323 "src/parse-gram.c"

     break;
 
     break;
 

-  case 49:
-/* Line 1380 of yacc.c  */
-#line 389 "parse-gram.y"
+  case 51:
+/* Line 1396 of yacc.c  */
+#line 441 "src/parse-gram.y"

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


@@ -2254,13 +2332,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 2259 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2337 "src/parse-gram.c"

     break;
 
     break;
 

-  case 50:
-/* Line 1380 of yacc.c  */
-#line 400 "parse-gram.y"
+  case 52:
+/* Line 1396 of yacc.c  */
+#line 452 "src/parse-gram.y"

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


@@ -2272,332 +2350,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 2277 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2355 "src/parse-gram.c"

     break;
 
     break;
 

-  case 51:
-/* Line 1380 of yacc.c  */
-#line 414 "parse-gram.y"
+  case 53:
+/* Line 1396 of yacc.c  */
+#line 466 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2285 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2363 "src/parse-gram.c"

     break;
 
     break;
 

-  case 52:
-/* Line 1380 of yacc.c  */
-#line 415 "parse-gram.y"
+  case 54:
+/* Line 1396 of yacc.c  */
+#line 467 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2293 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2371 "src/parse-gram.c"

     break;
 
     break;
 

-  case 53:
-/* Line 1380 of yacc.c  */
-#line 416 "parse-gram.y"
+  case 55:
+/* Line 1396 of yacc.c  */
+#line 468 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2301 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2379 "src/parse-gram.c"

     break;
 
     break;
 

-  case 54:
-/* Line 1380 of yacc.c  */
-#line 417 "parse-gram.y"
+  case 56:
+/* Line 1396 of yacc.c  */
+#line 469 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2309 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2387 "src/parse-gram.c"

     break;
 
     break;
 

-  case 55:
-/* Line 1380 of yacc.c  */
-#line 421 "parse-gram.y"
+  case 57:
+/* Line 1396 of yacc.c  */
+#line 473 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2317 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2395 "src/parse-gram.c"

     break;
 
     break;
 

-  case 56:
-/* Line 1380 of yacc.c  */
-#line 422 "parse-gram.y"
+  case 58:
+/* Line 1396 of yacc.c  */
+#line 474 "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 2325 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2403 "src/parse-gram.c"

     break;
 
     break;
 

-  case 57:
-/* Line 1380 of yacc.c  */
-#line 428 "parse-gram.y"
+  case 59:
+/* Line 1396 of yacc.c  */
+#line 480 "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 2333 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2411 "src/parse-gram.c"

     break;
 
     break;
 

-  case 58:
-/* Line 1380 of yacc.c  */
-#line 430 "parse-gram.y"
+  case 60:
+/* Line 1396 of yacc.c  */
+#line 482 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2341 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2419 "src/parse-gram.c"

     break;
 
     break;
 

-  case 59:
-/* Line 1380 of yacc.c  */
-#line 434 "parse-gram.y"
+  case 61:
+/* Line 1396 of yacc.c  */
+#line 486 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2349 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2427 "src/parse-gram.c"

     break;
 
     break;
 

-  case 60:
-/* Line 1380 of yacc.c  */
-#line 435 "parse-gram.y"
+  case 62:
+/* Line 1396 of yacc.c  */
+#line 487 "src/parse-gram.y"

     { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
     { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }

-/* Line 1380 of yacc.c  */
-#line 2357 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2435 "src/parse-gram.c"

     break;
 
     break;
 

-  case 61:
-/* Line 1380 of yacc.c  */
-#line 441 "parse-gram.y"
+  case 63:
+/* Line 1396 of yacc.c  */
+#line 493 "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 2365 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2443 "src/parse-gram.c"

     break;
 
     break;
 

-  case 62:
-/* Line 1380 of yacc.c  */
-#line 443 "parse-gram.y"
+  case 64:
+/* Line 1396 of yacc.c  */
+#line 495 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2373 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2451 "src/parse-gram.c"

     break;
 
     break;
 

-  case 63:
-/* Line 1380 of yacc.c  */
-#line 447 "parse-gram.y"
+  case 65:
+/* Line 1396 of yacc.c  */
+#line 499 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2381 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2459 "src/parse-gram.c"

     break;
 
     break;
 

-  case 64:
-/* Line 1380 of yacc.c  */
-#line 448 "parse-gram.y"
+  case 66:
+/* Line 1396 of yacc.c  */
+#line 500 "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 2389 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2467 "src/parse-gram.c"

     break;
 
     break;
 

-  case 65:
-/* Line 1380 of yacc.c  */
-#line 452 "parse-gram.y"
+  case 67:
+/* Line 1396 of yacc.c  */
+#line 504 "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 2397 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2475 "src/parse-gram.c"

     break;
 
     break;
 

-  case 66:
-/* Line 1380 of yacc.c  */
-#line 453 "parse-gram.y"
+  case 68:
+/* Line 1396 of yacc.c  */
+#line 505 "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 2405 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2483 "src/parse-gram.c"

     break;
 
     break;
 

-  case 67:
-/* Line 1380 of yacc.c  */
-#line 454 "parse-gram.y"
+  case 69:
+/* Line 1396 of yacc.c  */
+#line 506 "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 2413 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2491 "src/parse-gram.c"

     break;
 
     break;
 

-  case 68:
-/* Line 1380 of yacc.c  */
-#line 455 "parse-gram.y"
+  case 70:
+/* Line 1396 of yacc.c  */
+#line 507 "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 2421 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2499 "src/parse-gram.c"

     break;
 
     break;
 

-  case 69:
-/* Line 1380 of yacc.c  */
-#line 461 "parse-gram.y"
+  case 71:
+/* Line 1396 of yacc.c  */
+#line 513 "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 2432 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2510 "src/parse-gram.c"

     break;
 
     break;
 

-  case 70:
-/* Line 1380 of yacc.c  */
-#line 466 "parse-gram.y"
+  case 72:
+/* Line 1396 of yacc.c  */
+#line 518 "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 2443 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2521 "src/parse-gram.c"

     break;
 
     break;
 

-  case 71:
-/* Line 1380 of yacc.c  */
-#line 471 "parse-gram.y"
+  case 73:
+/* Line 1396 of yacc.c  */
+#line 523 "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 2455 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2533 "src/parse-gram.c"

     break;
 
     break;
 

-  case 72:
-/* Line 1380 of yacc.c  */
-#line 477 "parse-gram.y"
+  case 74:
+/* Line 1396 of yacc.c  */
+#line 529 "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 2467 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2545 "src/parse-gram.c"

     break;
 
     break;
 

-  case 73:
-/* Line 1380 of yacc.c  */
-#line 483 "parse-gram.y"
+  case 75:
+/* Line 1396 of yacc.c  */
+#line 535 "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 2480 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2558 "src/parse-gram.c"

     break;
 
     break;
 

-  case 80:
-/* Line 1380 of yacc.c  */
-#line 513 "parse-gram.y"
+  case 82:
+/* Line 1396 of yacc.c  */
+#line 565 "src/parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }

-/* Line 1380 of yacc.c  */
-#line 2490 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2568 "src/parse-gram.c"

     break;
 
     break;
 

-  case 81:
-/* Line 1380 of yacc.c  */
-#line 519 "parse-gram.y"
+  case 83:
+/* Line 1396 of yacc.c  */
+#line 571 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2499 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2577 "src/parse-gram.c"

     break;
 
     break;
 

-  case 83:
-/* Line 1380 of yacc.c  */
-#line 524 "parse-gram.y"
+  case 85:
+/* Line 1396 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 2507 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2585 "src/parse-gram.c"

     break;
 
     break;
 

-  case 84:
-/* Line 1380 of yacc.c  */
-#line 525 "parse-gram.y"
+  case 86:
+/* Line 1396 of yacc.c  */
+#line 577 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2515 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2593 "src/parse-gram.c"

     break;
 
     break;
 

-  case 86:
-/* Line 1380 of yacc.c  */
-#line 531 "parse-gram.y"
+  case 88:
+/* Line 1396 of yacc.c  */
+#line 583 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2524 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2602 "src/parse-gram.c"

     break;
 
     break;
 

-  case 87:
-/* Line 1380 of yacc.c  */
-#line 534 "parse-gram.y"
+  case 89:
+/* Line 1396 of yacc.c  */
+#line 586 "src/parse-gram.y"

     { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
     { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }

-/* Line 1380 of yacc.c  */
-#line 2532 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2610 "src/parse-gram.c"

     break;
 
     break;
 

-  case 88:
-/* Line 1380 of yacc.c  */
-#line 536 "parse-gram.y"
+  case 90:
+/* Line 1396 of yacc.c  */
+#line 588 "src/parse-gram.y"

     { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref)); }
     { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref)); }

-/* Line 1380 of yacc.c  */
-#line 2540 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2618 "src/parse-gram.c"

     break;
 
     break;
 

-  case 89:
-/* Line 1380 of yacc.c  */
-#line 538 "parse-gram.y"
+  case 91:
+/* Line 1396 of yacc.c  */
+#line 590 "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 2548 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2626 "src/parse-gram.c"

     break;
 
     break;
 

-  case 90:
-/* Line 1380 of yacc.c  */
-#line 540 "parse-gram.y"
+  case 92:
+/* Line 1396 of yacc.c  */
+#line 592 "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 2556 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2634 "src/parse-gram.c"

     break;
 
     break;
 

-  case 91:
-/* Line 1380 of yacc.c  */
-#line 542 "parse-gram.y"
+  case 93:
+/* Line 1396 of yacc.c  */
+#line 594 "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 2564 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2642 "src/parse-gram.c"

     break;
 
     break;
 

-  case 92:
-/* Line 1380 of yacc.c  */
-#line 546 "parse-gram.y"
+  case 94:
+/* Line 1396 of yacc.c  */
+#line 598 "src/parse-gram.y"

     { (yyval.named_ref) = 0; }
     { (yyval.named_ref) = 0; }

-/* Line 1380 of yacc.c  */
-#line 2572 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2650 "src/parse-gram.c"

     break;
 
     break;
 

-  case 93:
-/* Line 1380 of yacc.c  */
-#line 548 "parse-gram.y"
+  case 95:
+/* Line 1396 of yacc.c  */
+#line 600 "src/parse-gram.y"

     { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
     { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }

-/* Line 1380 of yacc.c  */
-#line 2580 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2658 "src/parse-gram.c"

     break;
 
     break;
 

-  case 95:
-/* Line 1380 of yacc.c  */
-#line 560 "parse-gram.y"
+  case 97:
+/* Line 1396 of yacc.c  */
+#line 612 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2588 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2666 "src/parse-gram.c"

     break;
 
     break;
 

-  case 96:
-/* Line 1380 of yacc.c  */
-#line 565 "parse-gram.y"
+  case 98:
+/* Line 1396 of yacc.c  */
+#line 617 "src/parse-gram.y"

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

-/* Line 1380 of yacc.c  */
-#line 2596 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2674 "src/parse-gram.c"

     break;
 
     break;
 

-  case 98:
-/* Line 1380 of yacc.c  */
-#line 576 "parse-gram.y"
+  case 99:
+/* Line 1396 of yacc.c  */
+#line 618 "src/parse-gram.y"
+    { (yyval.chars) = (yyvsp[0].uniqstr); }
+/* Line 1396 of yacc.c  */
+#line 2682 "src/parse-gram.c"
+    break;
+
+  case 101:
+/* Line 1396 of yacc.c  */
+#line 629 "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';


@@ -2606,52 +2692,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 2611 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2697 "src/parse-gram.c"

     break;
 
     break;
 

-  case 99:
-/* Line 1380 of yacc.c  */
-#line 596 "parse-gram.y"
+  case 102:
+/* Line 1396 of yacc.c  */
+#line 649 "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 2619 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2705 "src/parse-gram.c"

     break;
 
     break;
 

-  case 100:
-/* Line 1380 of yacc.c  */
-#line 598 "parse-gram.y"
+  case 103:
+/* Line 1396 of yacc.c  */
+#line 651 "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 2631 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2717 "src/parse-gram.c"

     break;
 
     break;
 

-  case 101:
-/* Line 1380 of yacc.c  */
-#line 606 "parse-gram.y"
+  case 104:
+/* Line 1396 of yacc.c  */
+#line 659 "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 2639 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2725 "src/parse-gram.c"

     break;
 
     break;
 

-  case 104:
-/* Line 1380 of yacc.c  */
-#line 618 "parse-gram.y"
+  case 107:
+/* Line 1396 of yacc.c  */
+#line 671 "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 2650 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2736 "src/parse-gram.c"

     break;
 
     break;
 

-  case 106:
-/* Line 1380 of yacc.c  */
-#line 627 "parse-gram.y"
+  case 109:
+/* Line 1396 of yacc.c  */
+#line 680 "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]));


@@ -2660,13 +2746,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 2665 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2751 "src/parse-gram.c"

     break;
 
 
     break;
 
 

-/* Line 1380 of yacc.c  */
-#line 2670 "../master/src/parse-gram.c"
+/* Line 1396 of yacc.c  */
+#line 2756 "src/parse-gram.c"

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


@@ -2794,7 +2880,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)


@@ -2882,8 +2968,8 @@ yyreturn:
   return YYID (yyresult);
 }
 
   return YYID (yyresult);
 }
 

-/* Line 1599 of yacc.c  */
-#line 637 "parse-gram.y"
+/* Line 1615 of yacc.c  */
+#line 690 "src/parse-gram.y"

 
 
 
 
 
 


@@ -2917,34 +3003,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"));


@@ -2961,7 +3046,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);
     }