doc: fix lalr1.cc documentation.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 7147828faef69e9e1a5193208c9ffd1a152a8ac8..4fef5a2fda283e6ff47ceaa3de6047bc7c5a34e2 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.403-43f2.  */
+/* A Bison parser, made by GNU Bison 2.4.483-4ad39-dirty.  */

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

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

 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


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

-#define YYBISON_VERSION "2.4.403-43f2"
+#define YYBISON_VERSION "2.4.483-4ad39-dirty"

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


@@ -73,12 +72,11 @@
 #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 252 of yacc.c  */

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

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

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


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

-/* Line 191 of yacc.c  */
-#line 133 "src/parse-gram.c"
+/* Line 252 of yacc.c  */
+#line 131 "src/parse-gram.c"

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


@@ -150,13 +148,14 @@ static char const *char_name (char);
 #endif
 
 /* "%code requires" blocks.  */
 #endif
 
 /* "%code requires" blocks.  */

-/* Line 211 of yacc.c  */
+/* Line 272 of yacc.c  */

 #line 201 "src/parse-gram.y"
 
 # ifndef PARAM_TYPE
 #  define PARAM_TYPE
   typedef enum
   {
 #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_lex    = 1 << 0,
     param_parse  = 1 << 1,
     param_both   = param_lex | param_parse


@@ -164,8 +163,8 @@ static char const *char_name (char);
 # endif
 
 
 # endif
 
 

-/* Line 211 of yacc.c  */
-#line 169 "src/parse-gram.c"
+/* Line 272 of yacc.c  */
+#line 168 "src/parse-gram.c"

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


@@ -212,19 +211,19 @@ static char const *char_name (char);
      PERCENT_VERBOSE = 293,
      PERCENT_YACC = 294,
      BRACED_CODE = 295,
      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,
+     BRACKETED_ID = 296,
+     CHAR = 297,
+     EPILOGUE = 298,
+     EQUAL = 299,
+     ID = 300,
+     ID_COLON = 301,
+     PERCENT_PERCENT = 302,
+     PIPE = 303,
+     PROLOGUE = 304,
+     SEMICOLON = 305,
+     TAG = 306,
+     TAG_ANY = 307,
+     TAG_NONE = 308,

      PERCENT_PARAM = 309,
      PERCENT_UNION = 310
    };
      PERCENT_PARAM = 309,
      PERCENT_UNION = 310
    };


@@ -269,19 +268,19 @@ static char const *char_name (char);
 #define PERCENT_VERBOSE 293
 #define PERCENT_YACC 294
 #define BRACED_CODE 295
 #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 BRACKETED_ID 296
+#define CHAR 297
+#define EPILOGUE 298
+#define EQUAL 299
+#define ID 300
+#define ID_COLON 301
+#define PERCENT_PERCENT 302
+#define PIPE 303
+#define PROLOGUE 304
+#define SEMICOLON 305
+#define TAG 306
+#define TAG_ANY 307
+#define TAG_NONE 308

 #define PERCENT_PARAM 309
 #define PERCENT_UNION 310
 
 #define PERCENT_PARAM 309
 #define PERCENT_UNION 310
 


@@ -291,8 +290,8 @@ static char const *char_name (char);
 #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 88 "src/parse-gram.y"
+/* Line 277 of yacc.c  */
+#line 87 "src/parse-gram.y"

 
   assoc assoc;
   char *code;
 
   assoc assoc;
   char *code;


@@ -304,14 +303,14 @@ typedef union YYSTYPE
   uniqstr uniqstr;
   unsigned char character;
 
   uniqstr uniqstr;
   unsigned char character;
 

-/* Line 216 of yacc.c  */
-#line 223 "src/parse-gram.y"
+/* Line 277 of yacc.c  */
+#line 225 "src/parse-gram.y"

 
   param_type param;
 
 
 
   param_type param;
 
 

-/* Line 216 of yacc.c  */
-#line 315 "src/parse-gram.c"
+/* Line 277 of yacc.c  */
+#line 314 "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 */


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

-/* Line 266 of yacc.c  */
-#line 339 "src/parse-gram.c"
+/* Line 327 of yacc.c  */
+#line 338 "src/parse-gram.c"

 /* Unqualified %code blocks.  */
 /* Unqualified %code blocks.  */

-/* Line 267 of yacc.c  */
-#line 56 "src/parse-gram.y"
+/* Line 328 of yacc.c  */
+#line 55 "src/parse-gram.y"

 
 

-  static symbol_class current_class = unknown_sym;
-  static uniqstr current_type = NULL;
-  static symbol *current_lhs;
+  static int current_prec = 0;

   static location current_lhs_location;
   static named_ref *current_lhs_named_ref;
   static location current_lhs_location;
   static named_ref *current_lhs_named_ref;

-  static int current_prec = 0;
+  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
 
 
   #define YYTYPE_INT16 int_fast16_t
   #define YYTYPE_INT8 int_fast8_t
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t
 

-/* Line 267 of yacc.c  */
-#line 213 "src/parse-gram.y"
+/* Line 328 of yacc.c  */
+#line 214 "src/parse-gram.y"

 
   /** Add a lex-param and/or a parse-param.
    *
 
   /** Add a lex-param and/or a parse-param.
    *


@@ -362,9 +361,10 @@ typedef struct YYLTYPE
    * \param loc   the location in the source.
    */
   static void add_param (param_type type, char *decl, location loc);
    * \param loc   the location in the source.
    */
   static void add_param (param_type type, char *decl, location loc);

+  static param_type current_param = param_none;

 
 
 
 

-/* Line 267 of yacc.c  */
+/* Line 328 of yacc.c  */

 #line 369 "src/parse-gram.c"
 
 #ifdef short
 #line 369 "src/parse-gram.c"
 
 #ifdef short


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

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

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


@@ -582,16 +582,16 @@ 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   190
+#define YYLAST   162

 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  56
 /* YYNNTS -- Number of nonterminals.  */
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  56
 /* 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  145
+#define YYNSTATES  148

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


@@ -643,17 +643,17 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINEYYN -- Source line where rule number YYN was defined.    */
 static const yytype_uint16 yyrline[] =
 {
   /* YYRLINEYYN -- Source line where rule number YYN was defined.    */
 static const yytype_uint16 yyrline[] =
 {

-       0,   244,   244,   252,   254,   258,   259,   269,   273,   278,
-     279,   284,   289,   290,   291,   292,   293,   298,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   340,   341,
-     342,   343,   352,   353,   354,   358,   365,   372,   376,   380,
-     387,   402,   403,   407,   419,   419,   424,   424,   429,   440,
-     455,   456,   457,   458,   462,   463,   468,   470,   475,   476,
-     481,   483,   488,   489,   493,   494,   495,   496,   501,   506,
-     511,   517,   523,   534,   535,   544,   545,   551,   552,   553,
-     560,   560,   565,   566,   567,   572,   574,   576,   578,   580,
-     582,   587,   589,   600,   601,   606,   607,   608,   617,   637,
-     639,   648,   653,   654,   659,   666,   668
+       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
 


@@ -672,17 +672,18 @@ static const char *const yytname[] =
   "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
   "\"%nondeterministic-parser\"", "\"%output\"", "\"%require\"",
   "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"",
   "\"%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", "grammar_declaration", "union_name",
-  "symbol_declaration", "$@1", "$@2", "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", "named_ref.opt", "variable", "content.opt",
-  "braceless", "id", "id_colon", "symbol", "string_as_id", "epilogue.opt", 0
+  "\"%yacc\"", "\"{...}\"", "\"[identifier]\"", "\"char\"", "\"epilogue\"",
+  "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"",
+  "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"", "\"%param\"",
+  "\"%union\"", "$accept", "input", "prologue_declarations",
+  "prologue_declaration", "$@1", "params", "grammar_declaration",
+  "union_name", "symbol_declaration", "$@2", "$@3",
+  "precedence_declaration", "precedence_declarator", "tag.opt",
+  "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist",
+  "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
+  "rules_or_grammar_declaration", "rules", "$@4", "rhses.1", "rhs",
+  "named_ref.opt", "variable", "content.opt", "braceless", "id",
+  "id_colon", "symbol", "string_as_id", "epilogue.opt", 0

 };
 #endif
 
 };
 #endif
 


@@ -700,12 +701,12 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
 };
 # endif
 

-#define YYPACT_NINF -88
+#define YYPACT_NINF -137

 
 #define yypact_value_is_default(yystate) \
 
 #define yypact_value_is_default(yystate) \

-  ((yystate) == (-88))
+  ((yystate) == (-137))

 
 

-#define YYTABLE_NINF -106
+#define YYTABLE_NINF -109

 
 #define yytable_value_is_error(yytable_value) \
   YYID (0)
 
 #define yytable_value_is_error(yytable_value) \
   YYID (0)


@@ -714,21 +715,21 @@ static const yytype_uint16 yytoknum[] =
      STATE-NUM.    */
 static const yytype_int16 yypact[] =
 {
      STATE-NUM.    */
 static const yytype_int16 yypact[] =
 {

-     -88,    23,   109,   -88,   -88,   -88,   -15,    -8,     3,   -88,
-     -88,   -88,   -88,    -2,   -88,    14,    37,   -88,    45,    53,
-     -88,     2,   -88,    38,    81,    17,   -88,   -88,   -88,    30,
-      83,    84,    36,   -88,   -88,   -88,    58,   -88,   -88,    49,
-      46,   -88,   -88,   -88,   -88,    41,   -14,   -14,    36,     0,
-       0,   -88,    52,   -88,   -88,   -88,    18,   -88,   -88,   -88,
-     -88,    90,   -88,   -88,   -88,    92,   -88,    93,   -88,   -88,
-     -88,   -88,   -88,   -88,   -88,   -88,    48,   -88,    51,     1,
-     -88,   -88,    55,   -88,   -88,    52,   -88,    36,   -88,   -88,
-     -14,    50,   -14,    36,   -88,   -88,   -88,   -88,     0,   -88,
-     -88,     0,   -88,   -88,   -88,   -88,   -88,   -88,   -88,   -88,
-     -88,    56,   -88,   -88,   -88,   -88,   -88,    36,   -88,    97,
-     -88,   101,   -88,   -88,   -88,   -88,   -88,   -88,   -88,   -88,
-     -23,   146,   -88,   -88,    36,   102,    59,    55,    55,   146,
-     -88,   -88,   -88,   -88,   -88
+    -137,    20,   106,  -137,  -137,  -137,    19,    -1,    36,  -137,
+    -137,  -137,  -137,    13,  -137,     0,    79,  -137,    89,    90,
+    -137,    41,  -137,    55,    93,    46,  -137,  -137,  -137,    47,
+      94,    95,    35,  -137,  -137,  -137,    16,  -137,  -137,  -137,
+      54,  -137,  -137,  -137,  -137,    49,    33,    33,    35,    12,
+      12,  -137,    61,  -137,  -137,  -137,    29,  -137,  -137,  -137,
+    -137,   100,  -137,  -137,  -137,   101,  -137,   103,  -137,  -137,
+    -137,  -137,  -137,  -137,  -137,  -137,    57,  -137,    58,     1,
+    -137,  -137,    68,    80,  -137,    61,  -137,    35,  -137,  -137,
+      33,    56,    33,    35,  -137,  -137,  -137,  -137,    12,  -137,
+    -137,    12,  -137,  -137,  -137,  -137,  -137,  -137,  -137,  -137,
+    -137,    78,  -137,  -137,  -137,  -137,  -137,    82,  -137,    35,
+    -137,   142,  -137,   144,  -137,  -137,  -137,  -137,  -137,  -137,
+    -137,  -137,  -137,    18,    27,  -137,  -137,    35,   145,    97,
+      68,    68,    27,  -137,  -137,  -137,  -137,  -137

 };
 
   /* YYDEFACT[S] -- default reduction number in state S.  Performed when
 };
 
   /* YYDEFACT[S] -- default reduction number in state S.  Performed when


@@ -736,39 +737,39 @@ static const yytype_int16 yypact[] =
      is an error.    */
 static const yytype_uint8 yydefact[] =
 {
      is an error.    */
 static const yytype_uint8 yydefact[] =
 {

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

 {
 {

-     -88,   -88,   -88,   -88,   103,   -88,   -88,   -88,   -88,   -88,
-     -88,   -88,   -88,    -7,   -88,    61,   -76,   -11,    65,   -88,
-      44,   -88,   -88,   -88,    19,   -55,   -88,   -88,   -37,   -18,
-     -88,   -32,   -87,   -88
+    -137,  -137,  -137,  -137,  -137,  -137,   148,  -137,  -137,  -137,
+    -137,  -137,  -137,  -137,  -137,    32,  -137,   102,    -9,    -4,
+     107,  -137,    83,  -137,  -137,  -137,    22,  -136,  -137,  -137,
+     -12,   -11,  -137,   -32,   -40,  -137

 };
 
   /* YYDEFGOTO[NTERM-NUM].    */
 static const yytype_int16 yydefgoto[] =
 {
 };
 
   /* YYDEFGOTO[NTERM-NUM].    */
 static const yytype_int16 yydefgoto[] =
 {

-      -1,     1,     2,    41,    78,    85,    43,    47,    46,    44,
-      45,    87,   117,   118,    93,    98,    99,    89,    90,    79,
-      80,    81,   126,   130,   131,   115,    56,   105,    53,    73,
-      82,   100,    75,   113
+      -1,     1,     2,    41,    83,   117,    78,    85,    43,    47,
+      46,    44,    45,    87,   119,   120,    93,    98,    99,    89,
+      90,    79,    80,    81,   128,   133,   134,   115,    56,   105,
+      53,    73,    82,   100,    75,   113

 };
 
   /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If


@@ -776,50 +777,44 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.    */
 static const yytype_int16 yytable[] =
 {
      number is the opposite.  If YYTABLE_NINF, syntax error.    */
 static const yytype_int16 yytable[] =
 {

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

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

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

 };
 
   /* STOS_[STATE-NUM] -- The (internal number of the) accessing
 };
 
   /* STOS_[STATE-NUM] -- The (internal number of the) accessing


@@ -829,18 +824,18 @@ static const yytype_uint8 yystos[] =
        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,
        0,    57,    58,     0,     5,     6,     7,     8,     9,    10,
       11,    12,    13,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

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

 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.    */
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.    */


@@ -848,15 +843,15 @@ static const yytype_uint8 yyr1[] =
 {
        0,    56,    57,    58,    58,    59,    59,    59,    59,    59,
       59,    59,    59,    59,    59,    59,    59,    59,    59,    59,
 {
        0,    56,    57,    58,    58,    59,    59,    59,    59,    59,
       59,    59,    59,    59,    59,    59,    59,    59,    59,    59,

-      59,    59,    59,    59,    59,    59,    59,    59,    59,    59,
-      59,    59,    60,    60,    60,    60,    60,    60,    60,    60,
-      60,    61,    61,    60,    63,    62,    64,    62,    62,    65,
-      66,    66,    66,    66,    67,    67,    68,    68,    69,    69,
-      70,    70,    71,    71,    72,    72,    72,    72,    73,    73,
-      73,    73,    73,    74,    74,    75,    75,    76,    76,    76,
-      78,    77,    79,    79,    79,    80,    80,    80,    80,    80,
-      80,    81,    81,    82,    82,    83,    83,    83,    84,    85,
-      85,    86,    87,    87,    88,    89,    89
+      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.    */


@@ -864,15 +859,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,

-       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,     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

 };
 
 
 };
 
 


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

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

 
 #define YYFAIL         goto yyerrlab
 
 #define YYFAIL         goto yyerrlab

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

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


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

-      yytoken = YYTRANSLATE (yychar);                          \

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


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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

         break;
 
             case 40: // "{...}"
 
         break;
 
             case 40: // "{...}"
 

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

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

-/* Line 653 of yacc.c  */
-#line 1058 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1061 "src/parse-gram.c"
+        break;
+
+            case 41: // "[identifier]"
+
+/* Line 729 of yacc.c  */
+#line 181 "src/parse-gram.y"
+        { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }
+/* Line 729 of yacc.c  */
+#line 1070 "src/parse-gram.c"

         break;
 
         break;
 

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

 
 

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

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

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

         break;
 
         break;
 

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

 
 

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

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

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

         break;
 
         break;
 

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

 
 

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

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

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

         break;
 
         break;
 

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

 
 

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

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

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

         break;
 
         break;
 

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

 
 

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

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

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

         break;
 
         break;
 

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

 
 

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

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

-/* Line 653 of yacc.c  */
-#line 1112 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1124 "src/parse-gram.c"

         break;
 
             case 54: // "%param"
 
         break;
 
             case 54: // "%param"
 

-/* Line 653 of yacc.c  */
-#line 228 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 230 "src/parse-gram.y"

         {
   switch (((*yyvaluep).param))
     {
 #define CASE(In, Out)                                           \
         {
   switch (((*yyvaluep).param))
     {
 #define CASE(In, Out)                                           \

-      case param_ ## In:   fputs ("%" #Out, stderr); break
-
+      case param_ ## In: fputs ("%" #Out, stderr); break

       CASE(lex,   lex-param);
       CASE(parse, parse-param);
       CASE(both,  param);
       CASE(lex,   lex-param);
       CASE(parse, parse-param);
       CASE(both,  param);

-    }

 #undef CASE
 #undef CASE

+      case param_none: aver (false); break;
+    }

 }
 }

-/* Line 653 of yacc.c  */
-#line 1132 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1144 "src/parse-gram.c"

         break;
 
         break;
 

-            case 82: // variable
+            case 71: // symbol.prec

 
 

-/* Line 653 of yacc.c  */
-#line 182 "src/parse-gram.y"
+/* Line 729 of yacc.c  */
+#line 190 "src/parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 729 of yacc.c  */
+#line 1153 "src/parse-gram.c"
+        break;
+
+            case 84: // variable
+
+/* Line 729 of yacc.c  */
+#line 180 "src/parse-gram.y"

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

-/* Line 653 of yacc.c  */
-#line 1141 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1162 "src/parse-gram.c"

         break;
 
         break;
 

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

 
 

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

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

-/* Line 653 of yacc.c  */
-#line 1150 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1171 "src/parse-gram.c"

         break;
 
         break;
 

-            case 84: // braceless
+            case 86: // braceless

 
 

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

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

-/* Line 653 of yacc.c  */
-#line 1159 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1180 "src/parse-gram.c"

         break;
 
         break;
 

-            case 85: // id
+            case 87: // id

 
 

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

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

-/* Line 653 of yacc.c  */
-#line 1168 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1189 "src/parse-gram.c"

         break;
 
         break;
 

-            case 86: // id_colon
+            case 88: // id_colon

 
 

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

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

-/* Line 653 of yacc.c  */
-#line 1177 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1198 "src/parse-gram.c"

         break;
 
         break;
 

-            case 87: // symbol
+            case 89: // symbol

 
 

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

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

-/* Line 653 of yacc.c  */
-#line 1186 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1207 "src/parse-gram.c"

         break;
 
         break;
 

-            case 88: // string_as_id
+            case 90: // string_as_id

 
 

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

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

-/* Line 653 of yacc.c  */
-#line 1195 "src/parse-gram.c"
+/* Line 729 of yacc.c  */
+#line 1216 "src/parse-gram.c"

         break;
 
       default:
         break;
 
       default:


@@ -1430,26 +1451,27 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
 }
 # endif
 

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

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

-    return 0;
+    return 1;

   else
     {
       YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
       YYSIZE_T yysize = yysize0;
       YYSIZE_T yysize1;
   else
     {
       YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
       YYSIZE_T yysize = yysize0;
       YYSIZE_T yysize1;

-      int yysize_overflow = 0;

       enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
       /* Internationalized format string. */
       const char *yyformat = 0;
       enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
       /* Internationalized format string. */
       const char *yyformat = 0;


@@ -1483,11 +1505,17 @@ yysyntax_error (char *yyresult, int yystate, int yytoken)
              }
            yyarg[yycount++] = yytname[yyx];
            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
              }
            yyarg[yycount++] = yytname[yyx];
            yysize1 = yysize + yytnamerr (0, yytname[yyx]);

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

            yysize = yysize1;
          }
 
            yysize = yysize1;
          }
 

-        switch (yycount)
+      switch (yycount)

         {
 #define YYCASE_(N, S)                           \
           case N:                               \
         {
 #define YYCASE_(N, S)                           \
           case N:                               \


@@ -1502,32 +1530,42 @@ yysyntax_error (char *yyresult, int yystate, int yytoken)
         }
 
       yysize1 = yysize + yystrlen (yyformat);
         }
 
       yysize1 = yysize + yystrlen (yyformat);

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

       yysize = yysize1;
 
       yysize = yysize1;
 

-      if (yysize_overflow)
-       return YYSIZE_MAXIMUM;
+      if (*yymsg_alloc < yysize)
+        {
+          *yymsg_alloc = 2 * yysize;
+          if (! (yysize <= *yymsg_alloc
+                 && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+            *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+          return 2;
+        }

 
 

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

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


@@ -1565,6 +1603,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__ \


@@ -1583,12 +1622,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__ \


@@ -1652,7 +1688,7 @@ YYLTYPE yylloc;
     YYLTYPE *yylsp;
 
     /* The locations where the error started and ended.  */
     YYLTYPE *yylsp;
 
     /* The locations where the error started and ended.  */

-    YYLTYPE yyerror_range[2];
+    YYLTYPE yyerror_range[3];

 
     YYSIZE_T yystacksize;
 
 
     YYSIZE_T yystacksize;
 


@@ -1699,23 +1735,23 @@ YYLTYPE yylloc;
   yyvsp = yyvs;
   yylsp = yyls;
 
   yyvsp = yyvs;
   yylsp = yyls;
 

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

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

-/* Line 1175 of yacc.c  */
-#line 80 "src/parse-gram.y"
+/* Line 1214 of yacc.c  */
+#line 79 "src/parse-gram.y"

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

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

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


@@ -1901,8 +1937,8 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

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

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


@@ -1912,107 +1948,107 @@ yyreduce:
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
   case 7:
     break;
 
   case 7:

-/* Line 1388 of yacc.c  */
-#line 270 "src/parse-gram.y"
+/* Line 1427 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 1388 of yacc.c  */
-#line 1927 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 1963 "src/parse-gram.c"

     break;
 
   case 8:
     break;
 
   case 8:

-/* Line 1388 of yacc.c  */
-#line 274 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 280 "src/parse-gram.y"

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

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

     break;
 
   case 9:
     break;
 
   case 9:

-/* Line 1388 of yacc.c  */
-#line 278 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 284 "src/parse-gram.y"

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

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

     break;
 
   case 10:
     break;
 
   case 10:

-/* Line 1388 of yacc.c  */
-#line 280 "src/parse-gram.y"
+/* Line 1427 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 1388 of yacc.c  */
-#line 1957 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 1993 "src/parse-gram.c"

     break;
 
   case 11:
     break;
 
   case 11:

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

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

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

     break;
 
   case 12:
     break;
 
   case 12:

-/* Line 1388 of yacc.c  */
-#line 289 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 295 "src/parse-gram.y"

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

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

     break;
 
   case 13:
     break;
 
   case 13:

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

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

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

     break;
 
   case 14:
     break;
 
   case 14:

-/* Line 1388 of yacc.c  */
-#line 291 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 297 "src/parse-gram.y"

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

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

     break;
 
   case 15:
     break;
 
   case 15:

-/* Line 1388 of yacc.c  */
-#line 292 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 298 "src/parse-gram.y"

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

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

     break;
 
   case 16:
     break;
 
   case 16:

-/* Line 1388 of yacc.c  */
-#line 294 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 300 "src/parse-gram.y"

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

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

     break;
 
   case 17:
     break;
 
   case 17:

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


@@ -2021,85 +2057,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 1388 of yacc.c  */
-#line 2026 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2062 "src/parse-gram.c"

     break;
 
   case 18:
     break;
 
   case 18:

-/* Line 1388 of yacc.c  */
-#line 307 "src/parse-gram.y"
+/* Line 1427 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 1388 of yacc.c  */
-#line 2034 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2070 "src/parse-gram.c"

     break;
 
   case 19:
     break;
 
   case 19:

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

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

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

     break;
 
   case 20:
     break;
 
   case 20:

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

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

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

     break;
 
   case 21:
     break;
 
   case 21:

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

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

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

     break;
 
   case 22:
     break;
 
   case 22:

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

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

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

     break;
 
   case 23:
     break;
 
   case 23:

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

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

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

     break;
 
   case 24:
     break;
 
   case 24:

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

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

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

     break;
 
   case 25:
     break;
 
   case 25:

-/* Line 1388 of yacc.c  */
-#line 314 "src/parse-gram.y"
-    { add_param ((yyvsp[-1].param), (yyvsp[0].code), (yylsp[0])); }
-/* Line 1388 of yacc.c  */
-#line 2090 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 320 "src/parse-gram.y"
+    { current_param = (yyvsp[0].param); }
+/* Line 1427 of yacc.c  */
+#line 2126 "src/parse-gram.c"

     break;
 
   case 26:
     break;
 
   case 26:

-/* Line 1388 of yacc.c  */
-#line 315 "src/parse-gram.y"
-    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
-/* Line 1388 of yacc.c  */
-#line 2098 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 320 "src/parse-gram.y"
+    { current_param = param_none; }
+/* Line 1427 of yacc.c  */
+#line 2134 "src/parse-gram.c"

     break;
 
   case 27:
     break;
 
   case 27:

-/* Line 1388 of yacc.c  */
-#line 317 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 321 "src/parse-gram.y"
+    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
+/* Line 1427 of yacc.c  */
+#line 2142 "src/parse-gram.c"
+    break;
+
+  case 28:
+/* Line 1427 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, '/'))


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

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

     break;
 
     break;
 

-  case 28:
-/* Line 1388 of yacc.c  */
-#line 340 "src/parse-gram.y"
+  case 29:
+/* Line 1427 of yacc.c  */
+#line 346 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 29:
-/* Line 1388 of yacc.c  */
-#line 341 "src/parse-gram.y"
+  case 30:
+/* Line 1427 of yacc.c  */
+#line 347 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 30:
-/* Line 1388 of yacc.c  */
-#line 342 "src/parse-gram.y"
+  case 31:
+/* Line 1427 of yacc.c  */
+#line 348 "src/parse-gram.y"

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

-/* Line 1388 of yacc.c  */
-#line 2152 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2196 "src/parse-gram.c"
+    break;
+
+  case 33:
+/* Line 1427 of yacc.c  */
+#line 353 "src/parse-gram.y"
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2204 "src/parse-gram.c"

     break;
 
   case 34:
     break;
 
   case 34:

-/* Line 1388 of yacc.c  */
-#line 355 "src/parse-gram.y"
+/* Line 1427 of yacc.c  */
+#line 354 "src/parse-gram.y"
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1427 of yacc.c  */
+#line 2212 "src/parse-gram.c"
+    break;
+
+  case 37:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2162 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2222 "src/parse-gram.c"

     break;
 
     break;
 

-  case 35:
-/* Line 1388 of yacc.c  */
-#line 359 "src/parse-gram.y"
+  case 38:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2175 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2235 "src/parse-gram.c"

     break;
 
     break;
 

-  case 36:
-/* Line 1388 of yacc.c  */
-#line 366 "src/parse-gram.y"
+  case 39:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2188 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2248 "src/parse-gram.c"

     break;
 
     break;
 

-  case 37:
-/* Line 1388 of yacc.c  */
-#line 373 "src/parse-gram.y"
+  case 40:
+/* Line 1427 of yacc.c  */
+#line 384 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 38:
-/* Line 1388 of yacc.c  */
-#line 377 "src/parse-gram.y"
+  case 41:
+/* Line 1427 of yacc.c  */
+#line 388 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 39:
-/* Line 1388 of yacc.c  */
-#line 381 "src/parse-gram.y"
+  case 42:
+/* Line 1427 of yacc.c  */
+#line 392 "src/parse-gram.y"

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

     break;
 
     break;
 

-  case 40:
-/* Line 1388 of yacc.c  */
-#line 388 "src/parse-gram.y"
+  case 43:
+/* Line 1427 of yacc.c  */
+#line 399 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 41:
-/* Line 1388 of yacc.c  */
-#line 402 "src/parse-gram.y"
+  case 44:
+/* Line 1427 of yacc.c  */
+#line 413 "src/parse-gram.y"

     {}
     {}

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

     break;
 
     break;
 

-  case 42:
-/* Line 1388 of yacc.c  */
-#line 403 "src/parse-gram.y"
+  case 45:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2248 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2308 "src/parse-gram.c"

     break;
 
     break;
 

-  case 43:
-/* Line 1388 of yacc.c  */
-#line 408 "src/parse-gram.y"
+  case 46:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2260 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2320 "src/parse-gram.c"

     break;
 
     break;
 

-  case 44:
-/* Line 1388 of yacc.c  */
-#line 419 "src/parse-gram.y"
+  case 47:
+/* Line 1427 of yacc.c  */
+#line 430 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 45:
-/* Line 1388 of yacc.c  */
-#line 420 "src/parse-gram.y"
+  case 48:
+/* Line 1427 of yacc.c  */
+#line 431 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 46:
-/* Line 1388 of yacc.c  */
-#line 424 "src/parse-gram.y"
+  case 49:
+/* Line 1427 of yacc.c  */
+#line 435 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 47:
-/* Line 1388 of yacc.c  */
-#line 425 "src/parse-gram.y"
+  case 50:
+/* Line 1427 of yacc.c  */
+#line 436 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 48:
-/* Line 1388 of yacc.c  */
-#line 430 "src/parse-gram.y"
+  case 51:
+/* Line 1427 of yacc.c  */
+#line 441 "src/parse-gram.y"

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


@@ -2307,13 +2367,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 1388 of yacc.c  */
-#line 2312 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2372 "src/parse-gram.c"

     break;
 
     break;
 

-  case 49:
-/* Line 1388 of yacc.c  */
-#line 441 "src/parse-gram.y"
+  case 52:
+/* Line 1427 of yacc.c  */
+#line 452 "src/parse-gram.y"

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


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

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

     break;
 
     break;
 

-  case 50:
-/* Line 1388 of yacc.c  */
-#line 455 "src/parse-gram.y"
+  case 53:
+/* Line 1427 of yacc.c  */
+#line 466 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 51:
-/* Line 1388 of yacc.c  */
-#line 456 "src/parse-gram.y"
+  case 54:
+/* Line 1427 of yacc.c  */
+#line 467 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 52:
-/* Line 1388 of yacc.c  */
-#line 457 "src/parse-gram.y"
+  case 55:
+/* Line 1427 of yacc.c  */
+#line 468 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 53:
-/* Line 1388 of yacc.c  */
-#line 458 "src/parse-gram.y"
+  case 56:
+/* Line 1427 of yacc.c  */
+#line 469 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 54:
-/* Line 1388 of yacc.c  */
-#line 462 "src/parse-gram.y"
+  case 57:
+/* Line 1427 of yacc.c  */
+#line 473 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 55:
-/* Line 1388 of yacc.c  */
-#line 463 "src/parse-gram.y"
+  case 58:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2378 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2438 "src/parse-gram.c"

     break;
 
     break;
 

-  case 56:
-/* Line 1388 of yacc.c  */
-#line 469 "src/parse-gram.y"
+  case 59:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2386 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2446 "src/parse-gram.c"

     break;
 
     break;
 

-  case 57:
-/* Line 1388 of yacc.c  */
-#line 471 "src/parse-gram.y"
+  case 60:
+/* Line 1427 of yacc.c  */
+#line 482 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 58:
-/* Line 1388 of yacc.c  */
-#line 475 "src/parse-gram.y"
+  case 61:
+/* Line 1427 of yacc.c  */
+#line 486 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 59:
-/* Line 1388 of yacc.c  */
-#line 476 "src/parse-gram.y"
+  case 62:
+/* Line 1427 of yacc.c  */
+#line 487 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 60:
-/* Line 1388 of yacc.c  */
-#line 482 "src/parse-gram.y"
+  case 63:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2418 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2478 "src/parse-gram.c"

     break;
 
     break;
 

-  case 61:
-/* Line 1388 of yacc.c  */
-#line 484 "src/parse-gram.y"
+  case 64:
+/* Line 1427 of yacc.c  */
+#line 495 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 62:
-/* Line 1388 of yacc.c  */
-#line 488 "src/parse-gram.y"
+  case 65:
+/* Line 1427 of yacc.c  */
+#line 499 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 63:
-/* Line 1388 of yacc.c  */
-#line 489 "src/parse-gram.y"
+  case 66:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2442 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2502 "src/parse-gram.c"

     break;
 
     break;
 

-  case 64:
-/* Line 1388 of yacc.c  */
-#line 493 "src/parse-gram.y"
+  case 67:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2450 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2510 "src/parse-gram.c"

     break;
 
     break;
 

-  case 65:
-/* Line 1388 of yacc.c  */
-#line 494 "src/parse-gram.y"
+  case 68:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2458 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2518 "src/parse-gram.c"

     break;
 
     break;
 

-  case 66:
-/* Line 1388 of yacc.c  */
-#line 495 "src/parse-gram.y"
+  case 69:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2466 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2526 "src/parse-gram.c"

     break;
 
     break;
 

-  case 67:
-/* Line 1388 of yacc.c  */
-#line 496 "src/parse-gram.y"
+  case 70:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2474 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2534 "src/parse-gram.c"

     break;
 
     break;
 

-  case 68:
-/* Line 1388 of yacc.c  */
-#line 502 "src/parse-gram.y"
+  case 71:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2485 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2545 "src/parse-gram.c"

     break;
 
     break;
 

-  case 69:
-/* Line 1388 of yacc.c  */
-#line 507 "src/parse-gram.y"
+  case 72:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2496 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2556 "src/parse-gram.c"

     break;
 
     break;
 

-  case 70:
-/* Line 1388 of yacc.c  */
-#line 512 "src/parse-gram.y"
+  case 73:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2508 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2568 "src/parse-gram.c"

     break;
 
     break;
 

-  case 71:
-/* Line 1388 of yacc.c  */
-#line 518 "src/parse-gram.y"
+  case 74:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2520 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2580 "src/parse-gram.c"

     break;
 
     break;
 

-  case 72:
-/* Line 1388 of yacc.c  */
-#line 524 "src/parse-gram.y"
+  case 75:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2533 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2593 "src/parse-gram.c"

     break;
 
     break;
 

-  case 79:
-/* Line 1388 of yacc.c  */
-#line 554 "src/parse-gram.y"
+  case 82:
+/* Line 1427 of yacc.c  */
+#line 565 "src/parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }

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

     break;
 
     break;
 

-  case 80:
-/* Line 1388 of yacc.c  */
-#line 560 "src/parse-gram.y"
+  case 83:
+/* Line 1427 of yacc.c  */
+#line 571 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 82:
-/* Line 1388 of yacc.c  */
-#line 565 "src/parse-gram.y"
+  case 85:
+/* Line 1427 of yacc.c  */
+#line 576 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 83:
-/* Line 1388 of yacc.c  */
-#line 566 "src/parse-gram.y"
+  case 86:
+/* Line 1427 of yacc.c  */
+#line 577 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 85:
-/* Line 1388 of yacc.c  */
-#line 572 "src/parse-gram.y"
+  case 88:
+/* Line 1427 of yacc.c  */
+#line 583 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 86:
-/* Line 1388 of yacc.c  */
-#line 575 "src/parse-gram.y"
+  case 89:
+/* Line 1427 of yacc.c  */
+#line 586 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 87:
-/* Line 1388 of yacc.c  */
-#line 577 "src/parse-gram.y"
+  case 90:
+/* Line 1427 of yacc.c  */
+#line 588 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 88:
-/* Line 1388 of yacc.c  */
-#line 579 "src/parse-gram.y"
+  case 91:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2601 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2661 "src/parse-gram.c"

     break;
 
     break;
 

-  case 89:
-/* Line 1388 of yacc.c  */
-#line 581 "src/parse-gram.y"
+  case 92:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2609 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2669 "src/parse-gram.c"

     break;
 
     break;
 

-  case 90:
-/* Line 1388 of yacc.c  */
-#line 583 "src/parse-gram.y"
+  case 93:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2617 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2677 "src/parse-gram.c"

     break;
 
     break;
 

-  case 91:
-/* Line 1388 of yacc.c  */
-#line 587 "src/parse-gram.y"
+  case 94:
+/* Line 1427 of yacc.c  */
+#line 598 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 92:
-/* Line 1388 of yacc.c  */
-#line 589 "src/parse-gram.y"
+  case 95:
+/* Line 1427 of yacc.c  */
+#line 600 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 94:
-/* Line 1388 of yacc.c  */
-#line 601 "src/parse-gram.y"
+  case 97:
+/* Line 1427 of yacc.c  */
+#line 612 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 95:
-/* Line 1388 of yacc.c  */
-#line 606 "src/parse-gram.y"
+  case 98:
+/* Line 1427 of yacc.c  */
+#line 617 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 96:
-/* Line 1388 of yacc.c  */
-#line 607 "src/parse-gram.y"
+  case 99:
+/* Line 1427 of yacc.c  */
+#line 618 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 98:
-/* Line 1388 of yacc.c  */
-#line 618 "src/parse-gram.y"
+  case 101:
+/* Line 1427 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';


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

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

     break;
 
     break;
 

-  case 99:
-/* Line 1388 of yacc.c  */
-#line 638 "src/parse-gram.y"
+  case 102:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2680 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2740 "src/parse-gram.c"

     break;
 
     break;
 

-  case 100:
-/* Line 1388 of yacc.c  */
-#line 640 "src/parse-gram.y"
+  case 103:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2692 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2752 "src/parse-gram.c"

     break;
 
     break;
 

-  case 101:
-/* Line 1388 of yacc.c  */
-#line 648 "src/parse-gram.y"
+  case 104:
+/* Line 1427 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 1388 of yacc.c  */
-#line 2700 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2760 "src/parse-gram.c"

     break;
 
     break;
 

-  case 104:
-/* Line 1388 of yacc.c  */
-#line 660 "src/parse-gram.y"
+  case 107:
+/* Line 1427 of yacc.c  */
+#line 671 "src/parse-gram.y"

     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[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 1388 of yacc.c  */
-#line 2711 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2771 "src/parse-gram.c"

     break;
 
     break;
 

-  case 106:
-/* Line 1388 of yacc.c  */
-#line 669 "src/parse-gram.y"
+  case 109:
+/* Line 1427 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]));


@@ -2721,15 +2781,26 @@ 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 1388 of yacc.c  */
-#line 2726 "src/parse-gram.c"
+/* Line 1427 of yacc.c  */
+#line 2786 "src/parse-gram.c"

     break;
 
 
     break;
 
 

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

       default: break;
     }
       default: break;
     }

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

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


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

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

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


@@ -2765,41 +2840,32 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else

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

 #endif
     }
 
 #endif
     }
 

-  yyerror_range[0] = yylloc;
+  yyerror_range[1] = yylloc;

 
   if (yyerrstatus == 3)
     {
 
   if (yyerrstatus == 3)
     {


@@ -2836,7 +2902,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 

-  yyerror_range[0] = yylsp[1-yylen];
+  yyerror_range[1] = yylsp[1-yylen];

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


@@ -2870,7 +2936,7 @@ yyerrlab1:
       if (yyssp == yyss)
        YYABORT;
 
       if (yyssp == yyss)
        YYABORT;
 

-      yyerror_range[0] = *yylsp;
+      yyerror_range[1] = *yylsp;

       yydestruct ("Error: popping",
                  yystos[yystate], yyvsp, yylsp);
       YYPOPSTACK (1);
       yydestruct ("Error: popping",
                  yystos[yystate], yyvsp, yylsp);
       YYPOPSTACK (1);


@@ -2880,10 +2946,10 @@ yyerrlab1:
 
   *++yyvsp = yylval;
 
 
   *++yyvsp = yylval;
 

-  yyerror_range[1] = yylloc;
+  yyerror_range[2] = yylloc;

   /* Using YYLLOC is tempting, but would change the location of
      the lookahead.  YYLOC is available though.  */
   /* Using YYLLOC is tempting, but would change the location of
      the lookahead.  YYLOC is available though.  */

-  YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
+  YYLLOC_DEFAULT (yyloc, yyerror_range, 2);

   *++yylsp = yyloc;
 
   /* Shift the error token.  */
   *++yylsp = yyloc;
 
   /* Shift the error token.  */


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

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

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


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

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

 
 
 
 
 
 


@@ -2986,23 +3057,25 @@ add_param (param_type type, char *decl, location loc)
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "_"
     "0123456789";
     "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"));