X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/107844a3eea478e1d61551e47a88ed73374724c9..c12aa01f82a03db044985513a878497e5ab58377:/src/parse-gram.c

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 55faee24..cbe09e4e 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.542-10bae.  */
+/* A Bison parser, made by GNU Bison 2.4.579-a4d1b.  */
 
-/* Implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2011 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
@@ -45,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.542-10bae"
+#define YYBISON_VERSION "2.4.579-a4d1b"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -77,8 +76,7 @@
 #line 1 "src/parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2002-2011 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -129,7 +127,7 @@ static void gram_error (location const *, char const *);
 static char const *char_name (char);
 
 /* Line 269 of yacc.c  */
-#line 133 "src/parse-gram.c"
+#line 131 "src/parse-gram.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -151,7 +149,7 @@ static char const *char_name (char);
 
 /* "%code requires" blocks.  */
 /* Line 289 of yacc.c  */
-#line 203 "src/parse-gram.y"
+#line 220 "src/parse-gram.y"
 
 # ifndef PARAM_TYPE
 #  define PARAM_TYPE
@@ -166,7 +164,7 @@ static char const *char_name (char);
 
 
 /* Line 289 of yacc.c  */
-#line 170 "src/parse-gram.c"
+#line 168 "src/parse-gram.c"
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -295,7 +293,7 @@ static char const *char_name (char);
 typedef union YYSTYPE
 {
 /* Line 294 of yacc.c  */
-#line 89 "src/parse-gram.y"
+#line 106 "src/parse-gram.y"
 
   assoc assoc;
   char *code;
@@ -308,13 +306,13 @@ typedef union YYSTYPE
   unsigned char character;
 
 /* Line 294 of yacc.c  */
-#line 227 "src/parse-gram.y"
+#line 244 "src/parse-gram.y"
 
   param_type param;
 
 
 /* Line 294 of yacc.c  */
-#line 318 "src/parse-gram.c"
+#line 316 "src/parse-gram.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -338,25 +336,43 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 /* Line 344 of yacc.c  */
-#line 342 "src/parse-gram.c"
+#line 340 "src/parse-gram.c"
 /* Unqualified %code blocks.  */
 /* Line 345 of yacc.c  */
-#line 56 "src/parse-gram.y"
+#line 55 "src/parse-gram.y"
 
   static int current_prec = 0;
   static location current_lhs_location;
   static named_ref *current_lhs_named_ref;
-  static symbol *current_lhs;
+  static symbol *current_lhs_symbol;
   static symbol_class current_class = unknown_sym;
   static uniqstr current_type = NULL;
 
+  /** Set the new current left-hand side symbol, possibly common
+   * to several right-hand side parts of rule.
+   */
+  static
+  void
+  current_lhs(symbol *sym, location loc, named_ref *ref)
+  {
+    current_lhs_symbol = sym;
+    current_lhs_location = loc;
+    /* In order to simplify memory management, named references for lhs
+       are always assigned by deep copy into the current symbol_list
+       node.  This is because a single named-ref in the grammar may
+       result in several uses when the user factors lhs between several
+       rules using "|".  Therefore free the parser's original copy.  */
+    free (current_lhs_named_ref);
+    current_lhs_named_ref = ref;
+  }
+
   #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 345 of yacc.c  */
-#line 216 "src/parse-gram.y"
+#line 233 "src/parse-gram.y"
 
   /** Add a lex-param and/or a parse-param.
    *
@@ -369,7 +385,7 @@ typedef struct YYLTYPE
 
 
 /* Line 345 of yacc.c  */
-#line 373 "src/parse-gram.c"
+#line 389 "src/parse-gram.c"
 
 #ifdef short
 # undef short
@@ -628,18 +644,18 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINEYYN -- Source line where rule number YYN was defined.    */
 static const yytype_uint16 yyrline[] =
 {
-       0,   252,   252,   260,   262,   266,   267,   277,   281,   286,
-     287,   292,   297,   298,   299,   300,   301,   306,   315,   316,
-     317,   318,   319,   320,   321,   322,   322,   323,   324,   348,
-     349,   350,   351,   355,   356,   365,   366,   367,   371,   378,
-     385,   389,   393,   400,   415,   416,   420,   432,   432,   437,
-     437,   442,   453,   468,   469,   470,   471,   475,   476,   481,
-     483,   488,   489,   494,   496,   501,   502,   506,   507,   508,
-     509,   514,   519,   524,   530,   536,   547,   548,   557,   558,
-     564,   565,   566,   573,   573,   578,   579,   580,   585,   587,
-     589,   591,   593,   595,   597,   602,   604,   614,   615,   620,
-     621,   622,   631,   651,   653,   662,   667,   668,   673,   680,
-     682
+       0,   269,   269,   277,   279,   283,   284,   294,   298,   303,
+     304,   309,   314,   315,   316,   317,   318,   323,   332,   333,
+     334,   335,   336,   337,   338,   339,   339,   340,   341,   365,
+     366,   367,   368,   372,   373,   382,   383,   384,   388,   395,
+     402,   406,   410,   417,   432,   433,   437,   449,   449,   454,
+     454,   459,   470,   485,   486,   487,   488,   492,   493,   498,
+     500,   505,   506,   511,   513,   518,   519,   523,   524,   525,
+     526,   531,   536,   541,   547,   553,   564,   565,   574,   575,
+     581,   582,   583,   590,   590,   598,   599,   600,   605,   607,
+     609,   611,   613,   615,   617,   622,   624,   634,   635,   640,
+     641,   642,   651,   671,   673,   682,   687,   688,   693,   700,
+     702
 };
 #endif
 
@@ -1016,106 +1032,106 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
             case 3: // "string"
 
 /* Line 751 of yacc.c  */
-#line 176 "src/parse-gram.y"
+#line 193 "src/parse-gram.y"
         { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
 /* Line 751 of yacc.c  */
-#line 1023 "src/parse-gram.c"
+#line 1039 "src/parse-gram.c"
         break;
 
             case 4: // "integer"
 
 /* Line 751 of yacc.c  */
-#line 189 "src/parse-gram.y"
+#line 206 "src/parse-gram.y"
         { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
 /* Line 751 of yacc.c  */
-#line 1032 "src/parse-gram.c"
+#line 1048 "src/parse-gram.c"
         break;
 
             case 24: // "%<flag>"
 
 /* Line 751 of yacc.c  */
-#line 185 "src/parse-gram.y"
+#line 202 "src/parse-gram.y"
         { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
 /* Line 751 of yacc.c  */
-#line 1041 "src/parse-gram.c"
+#line 1057 "src/parse-gram.c"
         break;
 
             case 40: // "{...}"
 
 /* Line 751 of yacc.c  */
-#line 178 "src/parse-gram.y"
+#line 195 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
 /* Line 751 of yacc.c  */
-#line 1050 "src/parse-gram.c"
+#line 1066 "src/parse-gram.c"
         break;
 
             case 42: // "[identifier]"
 
 /* Line 751 of yacc.c  */
-#line 183 "src/parse-gram.y"
+#line 200 "src/parse-gram.y"
         { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }
 /* Line 751 of yacc.c  */
-#line 1059 "src/parse-gram.c"
+#line 1075 "src/parse-gram.c"
         break;
 
             case 43: // "char"
 
 /* Line 751 of yacc.c  */
-#line 170 "src/parse-gram.y"
+#line 187 "src/parse-gram.y"
         { fputs (char_name (((*yyvaluep).character)), stderr); }
 /* Line 751 of yacc.c  */
-#line 1068 "src/parse-gram.c"
+#line 1084 "src/parse-gram.c"
         break;
 
             case 44: // "epilogue"
 
 /* Line 751 of yacc.c  */
-#line 178 "src/parse-gram.y"
+#line 195 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
 /* Line 751 of yacc.c  */
-#line 1077 "src/parse-gram.c"
+#line 1093 "src/parse-gram.c"
         break;
 
             case 46: // "identifier"
 
 /* Line 751 of yacc.c  */
-#line 182 "src/parse-gram.y"
+#line 199 "src/parse-gram.y"
         { fputs (((*yyvaluep).uniqstr), stderr); }
 /* Line 751 of yacc.c  */
-#line 1086 "src/parse-gram.c"
+#line 1102 "src/parse-gram.c"
         break;
 
             case 47: // "identifier:"
 
 /* Line 751 of yacc.c  */
-#line 184 "src/parse-gram.y"
+#line 201 "src/parse-gram.y"
         { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
 /* Line 751 of yacc.c  */
-#line 1095 "src/parse-gram.c"
+#line 1111 "src/parse-gram.c"
         break;
 
             case 50: // "%{...%}"
 
 /* Line 751 of yacc.c  */
-#line 178 "src/parse-gram.y"
+#line 195 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
 /* Line 751 of yacc.c  */
-#line 1104 "src/parse-gram.c"
+#line 1120 "src/parse-gram.c"
         break;
 
             case 52: // "<tag>"
 
 /* Line 751 of yacc.c  */
-#line 186 "src/parse-gram.y"
+#line 203 "src/parse-gram.y"
         { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
 /* Line 751 of yacc.c  */
-#line 1113 "src/parse-gram.c"
+#line 1129 "src/parse-gram.c"
         break;
 
             case 55: // "%param"
 
 /* Line 751 of yacc.c  */
-#line 232 "src/parse-gram.y"
+#line 249 "src/parse-gram.y"
         {
   switch (((*yyvaluep).param))
     {
@@ -1129,79 +1145,79 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     }
 }
 /* Line 751 of yacc.c  */
-#line 1133 "src/parse-gram.c"
+#line 1149 "src/parse-gram.c"
         break;
 
             case 72: // symbol.prec
 
 /* Line 751 of yacc.c  */
-#line 192 "src/parse-gram.y"
+#line 209 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
 /* Line 751 of yacc.c  */
-#line 1142 "src/parse-gram.c"
+#line 1158 "src/parse-gram.c"
         break;
 
             case 85: // variable
 
 /* Line 751 of yacc.c  */
-#line 182 "src/parse-gram.y"
+#line 199 "src/parse-gram.y"
         { fputs (((*yyvaluep).uniqstr), stderr); }
 /* Line 751 of yacc.c  */
-#line 1151 "src/parse-gram.c"
+#line 1167 "src/parse-gram.c"
         break;
 
             case 86: // content.opt
 
 /* Line 751 of yacc.c  */
-#line 178 "src/parse-gram.y"
+#line 195 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
 /* Line 751 of yacc.c  */
-#line 1160 "src/parse-gram.c"
+#line 1176 "src/parse-gram.c"
         break;
 
             case 87: // braceless
 
 /* Line 751 of yacc.c  */
-#line 178 "src/parse-gram.y"
+#line 195 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
 /* Line 751 of yacc.c  */
-#line 1169 "src/parse-gram.c"
+#line 1185 "src/parse-gram.c"
         break;
 
             case 88: // id
 
 /* Line 751 of yacc.c  */
-#line 192 "src/parse-gram.y"
+#line 209 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
 /* Line 751 of yacc.c  */
-#line 1178 "src/parse-gram.c"
+#line 1194 "src/parse-gram.c"
         break;
 
             case 89: // id_colon
 
 /* Line 751 of yacc.c  */
-#line 193 "src/parse-gram.y"
+#line 210 "src/parse-gram.y"
         { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
 /* Line 751 of yacc.c  */
-#line 1187 "src/parse-gram.c"
+#line 1203 "src/parse-gram.c"
         break;
 
             case 90: // symbol
 
 /* Line 751 of yacc.c  */
-#line 192 "src/parse-gram.y"
+#line 209 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
 /* Line 751 of yacc.c  */
-#line 1196 "src/parse-gram.c"
+#line 1212 "src/parse-gram.c"
         break;
 
             case 91: // string_as_id
 
 /* Line 751 of yacc.c  */
-#line 192 "src/parse-gram.y"
+#line 209 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
 /* Line 751 of yacc.c  */
-#line 1205 "src/parse-gram.c"
+#line 1221 "src/parse-gram.c"
         break;
 
       default:
@@ -1565,7 +1581,7 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
               }
             *++yyesp = yystate;
           }
-        YYDPRINTF ((stderr, " G%d", *yyesp));
+        YYDPRINTF ((stderr, " G%d", yystate));
       }
     }
 }
@@ -1995,16 +2011,16 @@ YYLTYPE yylloc;
 #endif
 
 /* User initialization code.  */
-/* Line 1525 of yacc.c  */
-#line 81 "src/parse-gram.y"
+/* Line 1524 of yacc.c  */
+#line 98 "src/parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
   boundary_set (&yylloc.start, current_file, 1, 1);
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
-/* Line 1525 of yacc.c  */
-#line 2008 "src/parse-gram.c"
+/* Line 1524 of yacc.c  */
+#line 2024 "src/parse-gram.c"
   yylsp[0] = yylloc;
 
   goto yysetstate;
@@ -2197,8 +2213,8 @@ yyreduce:
     switch (yyn)
       {
           case 6:
-/* Line 1741 of yacc.c  */
-#line 268 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 285 "src/parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
@@ -2208,107 +2224,107 @@ yyreduce:
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1741 of yacc.c  */
-#line 2213 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2229 "src/parse-gram.c"
     break;
 
   case 7:
-/* Line 1741 of yacc.c  */
-#line 278 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 295 "src/parse-gram.y"
     {
       muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
     }
-/* Line 1741 of yacc.c  */
-#line 2223 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2239 "src/parse-gram.c"
     break;
 
   case 8:
-/* Line 1741 of yacc.c  */
-#line 282 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 299 "src/parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
-/* Line 1741 of yacc.c  */
-#line 2234 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2250 "src/parse-gram.c"
     break;
 
   case 9:
-/* Line 1741 of yacc.c  */
-#line 286 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 303 "src/parse-gram.y"
     { defines_flag = true; }
-/* Line 1741 of yacc.c  */
-#line 2242 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2258 "src/parse-gram.c"
     break;
 
   case 10:
-/* Line 1741 of yacc.c  */
-#line 288 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 305 "src/parse-gram.y"
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[0].chars));
     }
-/* Line 1741 of yacc.c  */
-#line 2253 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2269 "src/parse-gram.c"
     break;
 
   case 11:
-/* Line 1741 of yacc.c  */
-#line 293 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 310 "src/parse-gram.y"
     {
       muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
-/* Line 1741 of yacc.c  */
-#line 2264 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2280 "src/parse-gram.c"
     break;
 
   case 12:
-/* Line 1741 of yacc.c  */
-#line 297 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 314 "src/parse-gram.y"
     { expected_sr_conflicts = (yyvsp[0].integer); }
-/* Line 1741 of yacc.c  */
-#line 2272 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2288 "src/parse-gram.c"
     break;
 
   case 13:
-/* Line 1741 of yacc.c  */
-#line 298 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 315 "src/parse-gram.y"
     { expected_rr_conflicts = (yyvsp[0].integer); }
-/* Line 1741 of yacc.c  */
-#line 2280 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2296 "src/parse-gram.c"
     break;
 
   case 14:
-/* Line 1741 of yacc.c  */
-#line 299 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 316 "src/parse-gram.y"
     { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1741 of yacc.c  */
-#line 2288 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2304 "src/parse-gram.c"
     break;
 
   case 15:
-/* Line 1741 of yacc.c  */
-#line 300 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 317 "src/parse-gram.y"
     { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1741 of yacc.c  */
-#line 2296 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2312 "src/parse-gram.c"
     break;
 
   case 16:
-/* Line 1741 of yacc.c  */
-#line 302 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 319 "src/parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
     }
-/* Line 1741 of yacc.c  */
-#line 2307 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2323 "src/parse-gram.c"
     break;
 
   case 17:
-/* Line 1741 of yacc.c  */
-#line 307 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 324 "src/parse-gram.y"
     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));
@@ -2317,96 +2333,96 @@ yyreduce:
       muscle_code_grow ("initial_action", action.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1741 of yacc.c  */
-#line 2322 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2338 "src/parse-gram.c"
     break;
 
   case 18:
-/* Line 1741 of yacc.c  */
-#line 315 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 332 "src/parse-gram.y"
     { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
-/* Line 1741 of yacc.c  */
-#line 2330 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2346 "src/parse-gram.c"
     break;
 
   case 19:
-/* Line 1741 of yacc.c  */
-#line 316 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 333 "src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1741 of yacc.c  */
-#line 2338 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2354 "src/parse-gram.c"
     break;
 
   case 20:
-/* Line 1741 of yacc.c  */
-#line 317 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 334 "src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1741 of yacc.c  */
-#line 2346 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2362 "src/parse-gram.c"
     break;
 
   case 21:
-/* Line 1741 of yacc.c  */
-#line 318 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 335 "src/parse-gram.y"
     { no_lines_flag = true; }
-/* Line 1741 of yacc.c  */
-#line 2354 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2370 "src/parse-gram.c"
     break;
 
   case 22:
-/* Line 1741 of yacc.c  */
-#line 319 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 336 "src/parse-gram.y"
     { nondeterministic_parser = true; }
-/* Line 1741 of yacc.c  */
-#line 2362 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2378 "src/parse-gram.c"
     break;
 
   case 23:
-/* Line 1741 of yacc.c  */
-#line 320 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 337 "src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }
-/* Line 1741 of yacc.c  */
-#line 2370 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2386 "src/parse-gram.c"
     break;
 
   case 24:
-/* Line 1741 of yacc.c  */
-#line 321 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 338 "src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }
-/* Line 1741 of yacc.c  */
-#line 2378 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2394 "src/parse-gram.c"
     break;
 
   case 25:
-/* Line 1741 of yacc.c  */
-#line 322 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 339 "src/parse-gram.y"
     { current_param = (yyvsp[0].param); }
-/* Line 1741 of yacc.c  */
-#line 2386 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2402 "src/parse-gram.c"
     break;
 
   case 26:
-/* Line 1741 of yacc.c  */
-#line 322 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 339 "src/parse-gram.y"
     { current_param = param_none; }
-/* Line 1741 of yacc.c  */
-#line 2394 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2410 "src/parse-gram.c"
     break;
 
   case 27:
-/* Line 1741 of yacc.c  */
-#line 323 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 340 "src/parse-gram.y"
     { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
-/* Line 1741 of yacc.c  */
-#line 2402 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2418 "src/parse-gram.c"
     break;
 
   case 28:
-/* Line 1741 of yacc.c  */
-#line 325 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 342 "src/parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[0].chars);
-      if (strchr (skeleton_user, '/'))
+      if (mbschr (skeleton_user, '/'))
         {
           size_t dir_length = strlen (current_file);
           char *skeleton_build;
@@ -2427,199 +2443,199 @@ yyreduce:
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
-/* Line 1741 of yacc.c  */
-#line 2432 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2448 "src/parse-gram.c"
     break;
 
   case 29:
-/* Line 1741 of yacc.c  */
-#line 348 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 365 "src/parse-gram.y"
     { token_table_flag = true; }
-/* Line 1741 of yacc.c  */
-#line 2440 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2456 "src/parse-gram.c"
     break;
 
   case 30:
-/* Line 1741 of yacc.c  */
-#line 349 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 366 "src/parse-gram.y"
     { report_flag |= report_states; }
-/* Line 1741 of yacc.c  */
-#line 2448 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2464 "src/parse-gram.c"
     break;
 
   case 31:
-/* Line 1741 of yacc.c  */
-#line 350 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 367 "src/parse-gram.y"
     { yacc_flag = true; }
-/* Line 1741 of yacc.c  */
-#line 2456 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2472 "src/parse-gram.c"
     break;
 
   case 33:
-/* Line 1741 of yacc.c  */
-#line 355 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 372 "src/parse-gram.y"
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2464 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2480 "src/parse-gram.c"
     break;
 
   case 34:
-/* Line 1741 of yacc.c  */
-#line 356 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 373 "src/parse-gram.y"
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2472 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2488 "src/parse-gram.c"
     break;
 
   case 37:
-/* Line 1741 of yacc.c  */
-#line 368 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 385 "src/parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
     }
-/* Line 1741 of yacc.c  */
-#line 2482 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2498 "src/parse-gram.c"
     break;
 
   case 38:
-/* Line 1741 of yacc.c  */
-#line 372 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 389 "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));
     }
-/* Line 1741 of yacc.c  */
-#line 2495 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2511 "src/parse-gram.c"
     break;
 
   case 39:
-/* Line 1741 of yacc.c  */
-#line 379 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 396 "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));
     }
-/* Line 1741 of yacc.c  */
-#line 2508 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2524 "src/parse-gram.c"
     break;
 
   case 40:
-/* Line 1741 of yacc.c  */
-#line 386 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 403 "src/parse-gram.y"
     {
       default_prec = true;
     }
-/* Line 1741 of yacc.c  */
-#line 2518 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2534 "src/parse-gram.c"
     break;
 
   case 41:
-/* Line 1741 of yacc.c  */
-#line 390 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 407 "src/parse-gram.y"
     {
       default_prec = false;
     }
-/* Line 1741 of yacc.c  */
-#line 2528 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2544 "src/parse-gram.c"
     break;
 
   case 42:
-/* Line 1741 of yacc.c  */
-#line 394 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 411 "src/parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1741 of yacc.c  */
-#line 2541 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2557 "src/parse-gram.c"
     break;
 
   case 43:
-/* Line 1741 of yacc.c  */
-#line 401 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 418 "src/parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1741 of yacc.c  */
-#line 2552 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2568 "src/parse-gram.c"
     break;
 
   case 44:
-/* Line 1741 of yacc.c  */
-#line 415 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 432 "src/parse-gram.y"
     {}
-/* Line 1741 of yacc.c  */
-#line 2560 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2576 "src/parse-gram.c"
     break;
 
   case 45:
-/* Line 1741 of yacc.c  */
-#line 416 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 433 "src/parse-gram.y"
     { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2568 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2584 "src/parse-gram.c"
     break;
 
   case 46:
-/* Line 1741 of yacc.c  */
-#line 421 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 438 "src/parse-gram.y"
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1741 of yacc.c  */
-#line 2580 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2596 "src/parse-gram.c"
     break;
 
   case 47:
-/* Line 1741 of yacc.c  */
-#line 432 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 449 "src/parse-gram.y"
     { current_class = nterm_sym; }
-/* Line 1741 of yacc.c  */
-#line 2588 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2604 "src/parse-gram.c"
     break;
 
   case 48:
-/* Line 1741 of yacc.c  */
-#line 433 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 450 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
-/* Line 1741 of yacc.c  */
-#line 2599 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2615 "src/parse-gram.c"
     break;
 
   case 49:
-/* Line 1741 of yacc.c  */
-#line 437 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 454 "src/parse-gram.y"
     { current_class = token_sym; }
-/* Line 1741 of yacc.c  */
-#line 2607 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2623 "src/parse-gram.c"
     break;
 
   case 50:
-/* Line 1741 of yacc.c  */
-#line 438 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 455 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
-/* Line 1741 of yacc.c  */
-#line 2618 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2634 "src/parse-gram.c"
     break;
 
   case 51:
-/* Line 1741 of yacc.c  */
-#line 443 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 460 "src/parse-gram.y"
     {
       symbol_list *list;
       tag_seen = true;
@@ -2627,13 +2643,13 @@ yyreduce:
 	symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
-/* Line 1741 of yacc.c  */
-#line 2632 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2648 "src/parse-gram.c"
     break;
 
   case 52:
-/* Line 1741 of yacc.c  */
-#line 454 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 471 "src/parse-gram.y"
     {
       symbol_list *list;
       ++current_prec;
@@ -2645,348 +2661,358 @@ yyreduce:
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }
-/* Line 1741 of yacc.c  */
-#line 2650 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2666 "src/parse-gram.c"
     break;
 
   case 53:
-/* Line 1741 of yacc.c  */
-#line 468 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 485 "src/parse-gram.y"
     { (yyval.assoc) = left_assoc; }
-/* Line 1741 of yacc.c  */
-#line 2658 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2674 "src/parse-gram.c"
     break;
 
   case 54:
-/* Line 1741 of yacc.c  */
-#line 469 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 486 "src/parse-gram.y"
     { (yyval.assoc) = right_assoc; }
-/* Line 1741 of yacc.c  */
-#line 2666 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2682 "src/parse-gram.c"
     break;
 
   case 55:
-/* Line 1741 of yacc.c  */
-#line 470 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 487 "src/parse-gram.y"
     { (yyval.assoc) = non_assoc; }
-/* Line 1741 of yacc.c  */
-#line 2674 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2690 "src/parse-gram.c"
     break;
 
   case 56:
-/* Line 1741 of yacc.c  */
-#line 471 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 488 "src/parse-gram.y"
     { (yyval.assoc) = precedence_assoc; }
-/* Line 1741 of yacc.c  */
-#line 2682 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2698 "src/parse-gram.c"
     break;
 
   case 57:
-/* Line 1741 of yacc.c  */
-#line 475 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 492 "src/parse-gram.y"
     { current_type = NULL; }
-/* Line 1741 of yacc.c  */
-#line 2690 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2706 "src/parse-gram.c"
     break;
 
   case 58:
-/* Line 1741 of yacc.c  */
-#line 476 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 493 "src/parse-gram.y"
     { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
-/* Line 1741 of yacc.c  */
-#line 2698 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2714 "src/parse-gram.c"
     break;
 
   case 59:
-/* Line 1741 of yacc.c  */
-#line 482 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 499 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2706 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2722 "src/parse-gram.c"
     break;
 
   case 60:
-/* Line 1741 of yacc.c  */
-#line 484 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 501 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1741 of yacc.c  */
-#line 2714 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2730 "src/parse-gram.c"
     break;
 
   case 61:
-/* Line 1741 of yacc.c  */
-#line 488 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 505 "src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[0].symbol); }
-/* Line 1741 of yacc.c  */
-#line 2722 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2738 "src/parse-gram.c"
     break;
 
   case 62:
-/* Line 1741 of yacc.c  */
-#line 489 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 506 "src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2730 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2746 "src/parse-gram.c"
     break;
 
   case 63:
-/* Line 1741 of yacc.c  */
-#line 495 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 512 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2738 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2754 "src/parse-gram.c"
     break;
 
   case 64:
-/* Line 1741 of yacc.c  */
-#line 497 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 514 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1741 of yacc.c  */
-#line 2746 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2762 "src/parse-gram.c"
     break;
 
   case 65:
-/* Line 1741 of yacc.c  */
-#line 501 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 518 "src/parse-gram.y"
     { (yyval.list) = (yyvsp[0].list); }
-/* Line 1741 of yacc.c  */
-#line 2754 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2770 "src/parse-gram.c"
     break;
 
   case 66:
-/* Line 1741 of yacc.c  */
-#line 502 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 519 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
-/* Line 1741 of yacc.c  */
-#line 2762 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2778 "src/parse-gram.c"
     break;
 
   case 67:
-/* Line 1741 of yacc.c  */
-#line 506 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 523 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2770 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2786 "src/parse-gram.c"
     break;
 
   case 68:
-/* Line 1741 of yacc.c  */
-#line 507 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 524 "src/parse-gram.y"
     { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2778 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2794 "src/parse-gram.c"
     break;
 
   case 69:
-/* Line 1741 of yacc.c  */
-#line 508 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 525 "src/parse-gram.y"
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2786 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2802 "src/parse-gram.c"
     break;
 
   case 70:
-/* Line 1741 of yacc.c  */
-#line 509 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 526 "src/parse-gram.y"
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2794 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2810 "src/parse-gram.c"
     break;
 
   case 71:
-/* Line 1741 of yacc.c  */
-#line 515 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 532 "src/parse-gram.y"
     {
        current_type = (yyvsp[0].uniqstr);
        tag_seen = true;
      }
-/* Line 1741 of yacc.c  */
-#line 2805 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2821 "src/parse-gram.c"
     break;
 
   case 72:
-/* Line 1741 of yacc.c  */
-#line 520 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 537 "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]));
      }
-/* Line 1741 of yacc.c  */
-#line 2816 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2832 "src/parse-gram.c"
     break;
 
   case 73:
-/* Line 1741 of yacc.c  */
-#line 525 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 542 "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]));
     }
-/* Line 1741 of yacc.c  */
-#line 2828 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2844 "src/parse-gram.c"
     break;
 
   case 74:
-/* Line 1741 of yacc.c  */
-#line 531 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 548 "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));
     }
-/* Line 1741 of yacc.c  */
-#line 2840 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2856 "src/parse-gram.c"
     break;
 
   case 75:
-/* Line 1741 of yacc.c  */
-#line 537 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 554 "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));
     }
-/* Line 1741 of yacc.c  */
-#line 2853 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2869 "src/parse-gram.c"
     break;
 
   case 82:
-/* Line 1741 of yacc.c  */
-#line 567 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 584 "src/parse-gram.y"
     {
       yyerrok;
     }
-/* Line 1741 of yacc.c  */
-#line 2863 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2879 "src/parse-gram.c"
     break;
 
   case 83:
-/* Line 1741 of yacc.c  */
-#line 573 "src/parse-gram.y"
-    { current_lhs = (yyvsp[-1].symbol); current_lhs_location = (yylsp[-1]);
-    current_lhs_named_ref = (yyvsp[0].named_ref); }
-/* Line 1741 of yacc.c  */
-#line 2872 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 590 "src/parse-gram.y"
+    { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1740 of yacc.c  */
+#line 2887 "src/parse-gram.c"
+    break;
+
+  case 84:
+/* Line 1740 of yacc.c  */
+#line 591 "src/parse-gram.y"
+    {
+    /* Free the current lhs. */
+    current_lhs (0, (yylsp[-3]), 0);
+  }
+/* Line 1740 of yacc.c  */
+#line 2898 "src/parse-gram.c"
     break;
 
   case 85:
-/* Line 1741 of yacc.c  */
-#line 578 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 598 "src/parse-gram.y"
     { grammar_current_rule_end ((yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2880 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2906 "src/parse-gram.c"
     break;
 
   case 86:
-/* Line 1741 of yacc.c  */
-#line 579 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 599 "src/parse-gram.y"
     { grammar_current_rule_end ((yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2888 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2914 "src/parse-gram.c"
     break;
 
   case 88:
-/* Line 1741 of yacc.c  */
-#line 585 "src/parse-gram.y"
-    { grammar_current_rule_begin (current_lhs, current_lhs_location,
+/* Line 1740 of yacc.c  */
+#line 605 "src/parse-gram.y"
+    { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
 				  current_lhs_named_ref); }
-/* Line 1741 of yacc.c  */
-#line 2897 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2923 "src/parse-gram.c"
     break;
 
   case 89:
-/* Line 1741 of yacc.c  */
-#line 588 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 608 "src/parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
-/* Line 1741 of yacc.c  */
-#line 2905 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2931 "src/parse-gram.c"
     break;
 
   case 90:
-/* Line 1741 of yacc.c  */
-#line 590 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 610 "src/parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }
-/* Line 1741 of yacc.c  */
-#line 2913 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2939 "src/parse-gram.c"
     break;
 
   case 91:
-/* Line 1741 of yacc.c  */
-#line 592 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 612 "src/parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
-/* Line 1741 of yacc.c  */
-#line 2921 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2947 "src/parse-gram.c"
     break;
 
   case 92:
-/* Line 1741 of yacc.c  */
-#line 594 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 614 "src/parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2929 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2955 "src/parse-gram.c"
     break;
 
   case 93:
-/* Line 1741 of yacc.c  */
-#line 596 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 616 "src/parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2937 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2963 "src/parse-gram.c"
     break;
 
   case 94:
-/* Line 1741 of yacc.c  */
-#line 598 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 618 "src/parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2945 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2971 "src/parse-gram.c"
     break;
 
   case 95:
-/* Line 1741 of yacc.c  */
-#line 602 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 622 "src/parse-gram.y"
     { (yyval.named_ref) = 0; }
-/* Line 1741 of yacc.c  */
-#line 2953 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2979 "src/parse-gram.c"
     break;
 
   case 96:
-/* Line 1741 of yacc.c  */
-#line 604 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 624 "src/parse-gram.y"
     { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 2961 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2987 "src/parse-gram.c"
     break;
 
   case 98:
-/* Line 1741 of yacc.c  */
-#line 615 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 635 "src/parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
-/* Line 1741 of yacc.c  */
-#line 2969 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 2995 "src/parse-gram.c"
     break;
 
   case 99:
-/* Line 1741 of yacc.c  */
-#line 620 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 640 "src/parse-gram.y"
     { (yyval.chars) = ""; }
-/* Line 1741 of yacc.c  */
-#line 2977 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3003 "src/parse-gram.c"
     break;
 
   case 100:
-/* Line 1741 of yacc.c  */
-#line 621 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 641 "src/parse-gram.y"
     { (yyval.chars) = (yyvsp[0].uniqstr); }
-/* Line 1741 of yacc.c  */
-#line 2985 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3011 "src/parse-gram.c"
     break;
 
   case 102:
-/* Line 1741 of yacc.c  */
-#line 632 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 652 "src/parse-gram.y"
     {
       code_props plain_code;
       (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n';
@@ -2995,52 +3021,52 @@ yyreduce:
       gram_scanner_last_string_free ();
       (yyval.chars) = plain_code.code;
     }
-/* Line 1741 of yacc.c  */
-#line 3000 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3026 "src/parse-gram.c"
     break;
 
   case 103:
-/* Line 1741 of yacc.c  */
-#line 652 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 672 "src/parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 3008 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3034 "src/parse-gram.c"
     break;
 
   case 104:
-/* Line 1741 of yacc.c  */
-#line 654 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 674 "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]));
     }
-/* Line 1741 of yacc.c  */
-#line 3020 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3046 "src/parse-gram.c"
     break;
 
   case 105:
-/* Line 1741 of yacc.c  */
-#line 662 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 682 "src/parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1741 of yacc.c  */
-#line 3028 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3054 "src/parse-gram.c"
     break;
 
   case 108:
-/* Line 1741 of yacc.c  */
-#line 674 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 694 "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);
     }
-/* Line 1741 of yacc.c  */
-#line 3039 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3065 "src/parse-gram.c"
     break;
 
   case 110:
-/* Line 1741 of yacc.c  */
-#line 683 "src/parse-gram.y"
+/* Line 1740 of yacc.c  */
+#line 703 "src/parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
@@ -3049,13 +3075,13 @@ yyreduce:
       muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1741 of yacc.c  */
-#line 3054 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3080 "src/parse-gram.c"
     break;
 
 
-/* Line 1741 of yacc.c  */
-#line 3059 "src/parse-gram.c"
+/* Line 1740 of yacc.c  */
+#line 3085 "src/parse-gram.c"
         default: break;
       }
     if (yychar_backup != yychar)
@@ -3302,8 +3328,8 @@ yyreturn:
   return YYID (yyresult);
 }
 
-/* Line 2001 of yacc.c  */
-#line 693 "src/parse-gram.y"
+/* Line 2000 of yacc.c  */
+#line 713 "src/parse-gram.y"