In impure push mode, don't allow more than one yypstate to be allocated

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 7759618e35b9548e3b312e77b35e5b7b17d735d9..0a92ba19ec0ea5429842cbb624d72a513a8280f5 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -6,10 +6,10 @@
       Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
    
       Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
    

-   This program is free software; you can redistribute it and/or modify
+   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
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

    
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -17,9 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work


@@ -77,7 +75,7 @@
 
 /* Copy the first part of user declarations.  */
 
 
 /* Copy the first part of user declarations.  */
 

-/* Line 1537 of yacc.c  */
+/* Line 1535 of yacc.c  */

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


@@ -86,9 +84,9 @@
 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 

-   This program is free software; you can redistribute it and/or modify
+   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
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -97,10 +95,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301  USA
-*/
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"


@@ -157,8 +152,8 @@ static int current_prec = 0;
 #define YYTYPE_UINT8 uint_fast8_t
 
 
 #define YYTYPE_UINT8 uint_fast8_t
 
 

-/* Line 1537 of yacc.c  */
-#line 162 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 157 "parse-gram.c"

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


@@ -310,8 +305,8 @@ static int current_prec = 0;
 typedef union YYSTYPE
 {
 
 typedef union YYSTYPE
 {
 

-/* Line 1537 of yacc.c  */
-#line 97 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 94 "parse-gram.y"

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


@@ -324,8 +319,8 @@ typedef union YYSTYPE
 
 
 
 
 
 

-/* Line 1537 of yacc.c  */
-#line 329 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 324 "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 */


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

-/* Line 1537 of yacc.c  */
-#line 354 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 349 "parse-gram.c"

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


@@ -675,17 +670,17 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {

-       0,   210,   210,   218,   220,   224,   225,   235,   236,   248,
-     249,   254,   255,   256,   257,   258,   259,   264,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   295,   296,   297,
-     301,   308,   315,   319,   323,   328,   349,   350,   354,   366,
-     366,   371,   371,   376,   387,   402,   403,   404,   408,   409,
-     414,   416,   421,   422,   426,   427,   428,   429,   434,   439,
-     444,   450,   456,   467,   468,   477,   478,   484,   485,   486,
-     493,   493,   497,   498,   499,   504,   505,   507,   509,   511,
-     513,   523,   524,   530,   534,   543,   563,   565,   574,   579,
-     580,   585,   592,   594
+       0,   207,   207,   215,   217,   221,   222,   232,   233,   237,
+     238,   243,   244,   245,   246,   247,   248,   253,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   300,   301,   302,   303,   307,   308,   309,
+     313,   320,   327,   331,   335,   342,   357,   358,   362,   374,
+     374,   379,   379,   384,   395,   410,   411,   412,   416,   417,
+     422,   424,   429,   430,   434,   435,   436,   437,   442,   447,
+     452,   458,   464,   475,   476,   485,   486,   492,   493,   494,
+     501,   501,   505,   506,   507,   512,   513,   515,   517,   519,
+     521,   531,   532,   538,   541,   550,   570,   572,   581,   586,
+     587,   592,   599,   601

 };
 #endif
 
 };
 #endif
 


@@ -1040,147 +1035,147 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     {
       case 3: /* "\"string\"" */
 
     {
       case 3: /* "\"string\"" */
 

-/* Line 1537 of yacc.c  */
-#line 188 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 185 "parse-gram.y"

        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 
        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 

-/* Line 1537 of yacc.c  */
-#line 1049 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1044 "parse-gram.c"

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

-/* Line 1537 of yacc.c  */
-#line 199 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 196 "parse-gram.y"

        { fprintf (stderr, "%d", (yyvaluep->integer)); };
 
        { fprintf (stderr, "%d", (yyvaluep->integer)); };
 

-/* Line 1537 of yacc.c  */
-#line 1058 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1053 "parse-gram.c"

        break;
       case 45: /* "\"{...}\"" */
 
        break;
       case 45: /* "\"{...}\"" */
 

-/* Line 1537 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 187 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 

-/* Line 1537 of yacc.c  */
-#line 1067 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1062 "parse-gram.c"

        break;
       case 46: /* "\"char\"" */
 
        break;
       case 46: /* "\"char\"" */
 

-/* Line 1537 of yacc.c  */
-#line 182 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 179 "parse-gram.y"

        { fputs (char_name ((yyvaluep->character)), stderr); };
 
        { fputs (char_name ((yyvaluep->character)), stderr); };
 

-/* Line 1537 of yacc.c  */
-#line 1076 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1071 "parse-gram.c"

        break;
       case 47: /* "\"epilogue\"" */
 
        break;
       case 47: /* "\"epilogue\"" */
 

-/* Line 1537 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 187 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 1537 of yacc.c  */
-#line 1085 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1080 "parse-gram.c"

        break;
       case 49: /* "\"identifier\"" */
 
        break;
       case 49: /* "\"identifier\"" */
 

-/* Line 1537 of yacc.c  */
-#line 195 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 192 "parse-gram.y"

        { fputs ((yyvaluep->uniqstr), stderr); };
 
        { fputs ((yyvaluep->uniqstr), stderr); };
 

-/* Line 1537 of yacc.c  */
-#line 1094 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1089 "parse-gram.c"

        break;
       case 50: /* "\"identifier:\"" */
 
        break;
       case 50: /* "\"identifier:\"" */
 

-/* Line 1537 of yacc.c  */
-#line 196 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 193 "parse-gram.y"

        { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 
        { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 

-/* Line 1537 of yacc.c  */
-#line 1103 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1098 "parse-gram.c"

        break;
       case 53: /* "\"%{...%}\"" */
 
        break;
       case 53: /* "\"%{...%}\"" */
 

-/* Line 1537 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 187 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 1537 of yacc.c  */
-#line 1112 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1107 "parse-gram.c"

        break;
       case 55: /* "\"type\"" */
 
        break;
       case 55: /* "\"type\"" */
 

-/* Line 1537 of yacc.c  */
-#line 194 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 191 "parse-gram.y"

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

-/* Line 1537 of yacc.c  */
-#line 1121 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1116 "parse-gram.c"

        break;
       case 82: /* "variable" */
 
        break;
       case 82: /* "variable" */
 

-/* Line 1537 of yacc.c  */
-#line 195 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 192 "parse-gram.y"

        { fputs ((yyvaluep->uniqstr), stderr); };
 
        { fputs ((yyvaluep->uniqstr), stderr); };
 

-/* Line 1537 of yacc.c  */
-#line 1130 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1125 "parse-gram.c"

        break;
       case 83: /* "content.opt" */
 
        break;
       case 83: /* "content.opt" */
 

-/* Line 1537 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 187 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 1537 of yacc.c  */
-#line 1139 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1134 "parse-gram.c"

        break;
       case 84: /* "braceless" */
 
        break;
       case 84: /* "braceless" */
 

-/* Line 1537 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 187 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 1537 of yacc.c  */
-#line 1148 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1143 "parse-gram.c"

        break;
       case 85: /* "id" */
 
        break;
       case 85: /* "id" */
 

-/* Line 1537 of yacc.c  */
-#line 202 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 199 "parse-gram.y"

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

-/* Line 1537 of yacc.c  */
-#line 1157 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1152 "parse-gram.c"

        break;
       case 86: /* "id_colon" */
 
        break;
       case 86: /* "id_colon" */
 

-/* Line 1537 of yacc.c  */
-#line 203 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 200 "parse-gram.y"

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

-/* Line 1537 of yacc.c  */
-#line 1166 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1161 "parse-gram.c"

        break;
       case 87: /* "symbol" */
 
        break;
       case 87: /* "symbol" */
 

-/* Line 1537 of yacc.c  */
-#line 202 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 199 "parse-gram.y"

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

-/* Line 1537 of yacc.c  */
-#line 1175 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1170 "parse-gram.c"

        break;
       case 88: /* "string_as_id" */
 
        break;
       case 88: /* "string_as_id" */
 

-/* Line 1537 of yacc.c  */
-#line 202 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 199 "parse-gram.y"

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

-/* Line 1537 of yacc.c  */
-#line 1184 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1179 "parse-gram.c"

        break;
       default:
        break;
        break;
       default:
        break;


@@ -1272,11 +1267,11 @@ yy_reduce_print (yyvsp, yylsp, yyrule)
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {

-      fprintf (stderr, "   $%d = ", yyi + 1);
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);

       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
                       &(yyvsp[(yyi + 1) - (yynrhs)])
                       , &(yylsp[(yyi + 1) - (yynrhs)])                );
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
                       &(yyvsp[(yyi + 1) - (yynrhs)])
                       , &(yylsp[(yyi + 1) - (yynrhs)])                );

-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "\n");

     }
 }
 
     }
 }
 


@@ -1694,8 +1689,8 @@ YYLTYPE yylloc;
 
   /* User initialization code.  */
   
 
   /* User initialization code.  */
   

-/* Line 1537 of yacc.c  */
-#line 89 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 86 "parse-gram.y"

 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */


@@ -1703,8 +1698,8 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 

-/* Line 1537 of yacc.c  */
-#line 1708 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 1703 "parse-gram.c"

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


@@ -1889,8 +1884,8 @@ yyreduce:
     {
         case 6:
 
     {
         case 6:
 

-/* Line 1537 of yacc.c  */
-#line 226 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 223 "parse-gram.y"

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


@@ -1904,39 +1899,31 @@ yyreduce:
 
   case 7:
 
 
   case 7:
 

-/* Line 1537 of yacc.c  */
-#line 235 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 232 "parse-gram.y"

     { debug_flag = true; }
     break;
 
   case 8:
 
     { debug_flag = true; }
     break;
 
   case 8:
 

-/* Line 1537 of yacc.c  */
-#line 237 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 234 "parse-gram.y"

     {
     {

-      char const name_prefix[] = "percent_define_";
-      char *name = xmalloc (sizeof name_prefix + strlen ((yyvsp[(2) - (3)].uniqstr)));
-      strcpy (name, name_prefix);
-      strcpy (name + sizeof name_prefix - 1, (yyvsp[(2) - (3)].uniqstr));
-      if (muscle_find_const (name))
-        warn_at ((yylsp[(2) - (3)]), _("%s `%s' redefined"), "%define variable", (yyvsp[(2) - (3)].uniqstr));
-      MUSCLE_INSERT_STRING (uniqstr_new (name), (yyvsp[(3) - (3)].chars));
-      free (name);
-      muscle_grow_user_name_list ("user_percent_define_variables", (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]));
+      muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars));

     }
     break;
 
   case 9:
 
     }
     break;
 
   case 9:
 

-/* Line 1537 of yacc.c  */
-#line 248 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 237 "parse-gram.y"

     { defines_flag = true; }
     break;
 
   case 10:
 
     { defines_flag = true; }
     break;
 
   case 10:
 

-/* Line 1537 of yacc.c  */
-#line 250 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 239 "parse-gram.y"

     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));


@@ -1945,43 +1932,43 @@ yyreduce:
 
   case 11:
 
 
   case 11:
 

-/* Line 1537 of yacc.c  */
-#line 254 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 243 "parse-gram.y"

     { error_verbose = true; }
     break;
 
   case 12:
 
     { error_verbose = true; }
     break;
 
   case 12:
 

-/* Line 1537 of yacc.c  */
-#line 255 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 244 "parse-gram.y"

     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 
     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 

-/* Line 1537 of yacc.c  */
-#line 256 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 245 "parse-gram.y"

     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 
     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 

-/* Line 1537 of yacc.c  */
-#line 257 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 246 "parse-gram.y"

     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 
     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 

-/* Line 1537 of yacc.c  */
-#line 258 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 247 "parse-gram.y"

     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 
     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 

-/* Line 1537 of yacc.c  */
-#line 260 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 249 "parse-gram.y"

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


@@ -1990,8 +1977,8 @@ yyreduce:
 
   case 17:
 
 
   case 17:
 

-/* Line 1537 of yacc.c  */
-#line 265 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 254 "parse-gram.y"

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


@@ -2004,134 +1991,156 @@ yyreduce:
 
   case 18:
 
 
   case 18:
 

-/* Line 1537 of yacc.c  */
-#line 273 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 262 "parse-gram.y"

     { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
     break;
 
   case 19:
 
     { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
     break;
 
   case 19:
 

-/* Line 1537 of yacc.c  */
-#line 274 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 263 "parse-gram.y"

     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 
     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 

-/* Line 1537 of yacc.c  */
-#line 275 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 264 "parse-gram.y"

     { locations_flag = true; }
     break;
 
   case 21:
 
     { locations_flag = true; }
     break;
 
   case 21:
 

-/* Line 1537 of yacc.c  */
-#line 276 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 265 "parse-gram.y"

     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 
     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 

-/* Line 1537 of yacc.c  */
-#line 277 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 266 "parse-gram.y"

     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 
     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 

-/* Line 1537 of yacc.c  */
-#line 278 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 267 "parse-gram.y"

     { no_lines_flag = true; }
     break;
 
   case 24:
 
     { no_lines_flag = true; }
     break;
 
   case 24:
 

-/* Line 1537 of yacc.c  */
-#line 279 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 268 "parse-gram.y"

     { nondeterministic_parser = true; }
     break;
 
   case 25:
 
     { nondeterministic_parser = true; }
     break;
 
   case 25:
 

-/* Line 1537 of yacc.c  */
-#line 280 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 269 "parse-gram.y"

     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 
     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 

-/* Line 1537 of yacc.c  */
-#line 281 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 270 "parse-gram.y"

     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 
     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 

-/* Line 1537 of yacc.c  */
-#line 282 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 271 "parse-gram.y"

     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 
     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 

-/* Line 1537 of yacc.c  */
-#line 283 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 272 "parse-gram.y"

     { pure_parser = true; }
     break;
 
   case 29:
 
     { pure_parser = true; }
     break;
 
   case 29:
 

-/* Line 1537 of yacc.c  */
-#line 284 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 273 "parse-gram.y"

     { push_parser = true; pull_parser = false; }
     break;
 
   case 30:
 
     { push_parser = true; pull_parser = false; }
     break;
 
   case 30:
 

-/* Line 1537 of yacc.c  */
-#line 285 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 274 "parse-gram.y"

     { push_parser = true; pull_parser = true; }
     break;
 
   case 31:
 
     { push_parser = true; pull_parser = true; }
     break;
 
   case 31:
 

-/* Line 1537 of yacc.c  */
-#line 286 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 275 "parse-gram.y"

     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
   case 32:
 
     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
   case 32:
 

-/* Line 1537 of yacc.c  */
-#line 287 "parse-gram.y"
-    { skeleton_arg ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
+/* Line 1535 of yacc.c  */
+#line 277 "parse-gram.y"
+    {
+      char const *skeleton_user = (yyvsp[(2) - (2)].chars);
+      if (strchr (skeleton_user, '/'))
+        {
+          size_t dir_length = strlen (current_file);
+          char *skeleton_build;
+          while (dir_length && current_file[dir_length - 1] != '/')
+            --dir_length;
+          while (dir_length && current_file[dir_length - 1] == '/')
+            --dir_length;
+          skeleton_build =
+            xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
+          if (dir_length > 0)
+            {
+              strncpy (skeleton_build, current_file, dir_length);
+              skeleton_build[dir_length++] = '/';
+            }
+          strcpy (skeleton_build + dir_length, skeleton_user);
+          skeleton_user = uniqstr_new (skeleton_build);
+          free (skeleton_build);
+        }
+      skeleton_arg (skeleton_user, 1, &(yylsp[(1) - (2)]));
+    }

     break;
 
   case 33:
 
     break;
 
   case 33:
 

-/* Line 1537 of yacc.c  */
-#line 288 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 300 "parse-gram.y"

     { token_table_flag = true; }
     break;
 
   case 34:
 
     { token_table_flag = true; }
     break;
 
   case 34:
 

-/* Line 1537 of yacc.c  */
-#line 289 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 301 "parse-gram.y"

     { report_flag = report_states; }
     break;
 
   case 35:
 
     { report_flag = report_states; }
     break;
 
   case 35:
 

-/* Line 1537 of yacc.c  */
-#line 290 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 302 "parse-gram.y"

     { yacc_flag = true; }
     break;
 
   case 39:
 
     { yacc_flag = true; }
     break;
 
   case 39:
 

-/* Line 1537 of yacc.c  */
-#line 298 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 310 "parse-gram.y"

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


@@ -2139,8 +2148,8 @@ yyreduce:
 
   case 40:
 
 
   case 40:
 

-/* Line 1537 of yacc.c  */
-#line 302 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 314 "parse-gram.y"

     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)


@@ -2151,8 +2160,8 @@ yyreduce:
 
   case 41:
 
 
   case 41:
 

-/* Line 1537 of yacc.c  */
-#line 309 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 321 "parse-gram.y"

     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)


@@ -2163,8 +2172,8 @@ yyreduce:
 
   case 42:
 
 
   case 42:
 

-/* Line 1537 of yacc.c  */
-#line 316 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 328 "parse-gram.y"

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


@@ -2172,8 +2181,8 @@ yyreduce:
 
   case 43:
 
 
   case 43:
 

-/* Line 1537 of yacc.c  */
-#line 320 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 332 "parse-gram.y"

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


@@ -2181,48 +2190,44 @@ yyreduce:
 
   case 44:
 
 
   case 44:
 

-/* Line 1537 of yacc.c  */
-#line 324 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 336 "parse-gram.y"

     {
     {

-      muscle_code_grow ("percent_code", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
+      /* Do not invoke muscle_percent_code_grow here since it invokes
+         muscle_user_name_list_grow.  */
+      muscle_code_grow ("percent_code()", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));

       code_scanner_last_string_free ();
     }
     break;
 
   case 45:
 
       code_scanner_last_string_free ();
     }
     break;
 
   case 45:
 

-/* Line 1537 of yacc.c  */
-#line 329 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 343 "parse-gram.y"

     {
     {

-      char const name_prefix[] = "percent_code_";
-      char *name = xmalloc (sizeof name_prefix + strlen ((yyvsp[(2) - (3)].uniqstr)));
-      strcpy (name, name_prefix);
-      strcpy (name + sizeof name_prefix - 1, (yyvsp[(2) - (3)].uniqstr));
-      muscle_code_grow (uniqstr_new (name), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
-      free (name);
+      muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));

       code_scanner_last_string_free ();
       code_scanner_last_string_free ();

-      muscle_grow_user_name_list ("user_percent_code_qualifiers", (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]));

     }
     break;
 
   case 46:
 
     }
     break;
 
   case 46:
 

-/* Line 1537 of yacc.c  */
-#line 349 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 357 "parse-gram.y"

     {}
     break;
 
   case 47:
 
     {}
     break;
 
   case 47:
 

-/* Line 1537 of yacc.c  */
-#line 350 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 358 "parse-gram.y"

     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 48:
 
     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 48:
 

-/* Line 1537 of yacc.c  */
-#line 355 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 363 "parse-gram.y"

     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));


@@ -2232,15 +2237,15 @@ yyreduce:
 
   case 49:
 
 
   case 49:
 

-/* Line 1537 of yacc.c  */
-#line 366 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 374 "parse-gram.y"

     { current_class = nterm_sym; }
     break;
 
   case 50:
 
     { current_class = nterm_sym; }
     break;
 
   case 50:
 

-/* Line 1537 of yacc.c  */
-#line 367 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 375 "parse-gram.y"

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


@@ -2249,15 +2254,15 @@ yyreduce:
 
   case 51:
 
 
   case 51:
 

-/* Line 1537 of yacc.c  */
-#line 371 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 379 "parse-gram.y"

     { current_class = token_sym; }
     break;
 
   case 52:
 
     { current_class = token_sym; }
     break;
 
   case 52:
 

-/* Line 1537 of yacc.c  */
-#line 372 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 380 "parse-gram.y"

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


@@ -2266,8 +2271,8 @@ yyreduce:
 
   case 53:
 
 
   case 53:
 

-/* Line 1537 of yacc.c  */
-#line 377 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 385 "parse-gram.y"

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


@@ -2279,8 +2284,8 @@ yyreduce:
 
   case 54:
 
 
   case 54:
 

-/* Line 1537 of yacc.c  */
-#line 388 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 396 "parse-gram.y"

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


@@ -2296,99 +2301,99 @@ yyreduce:
 
   case 55:
 
 
   case 55:
 

-/* Line 1537 of yacc.c  */
-#line 402 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 410 "parse-gram.y"

     { (yyval.assoc) = left_assoc; }
     break;
 
   case 56:
 
     { (yyval.assoc) = left_assoc; }
     break;
 
   case 56:
 

-/* Line 1537 of yacc.c  */
-#line 403 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 411 "parse-gram.y"

     { (yyval.assoc) = right_assoc; }
     break;
 
   case 57:
 
     { (yyval.assoc) = right_assoc; }
     break;
 
   case 57:
 

-/* Line 1537 of yacc.c  */
-#line 404 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 412 "parse-gram.y"

     { (yyval.assoc) = non_assoc; }
     break;
 
   case 58:
 
     { (yyval.assoc) = non_assoc; }
     break;
 
   case 58:
 

-/* Line 1537 of yacc.c  */
-#line 408 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 416 "parse-gram.y"

     { current_type = NULL; }
     break;
 
   case 59:
 
     { current_type = NULL; }
     break;
 
   case 59:
 

-/* Line 1537 of yacc.c  */
-#line 409 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 417 "parse-gram.y"

     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
   case 60:
 
     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
   case 60:
 

-/* Line 1537 of yacc.c  */
-#line 415 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 423 "parse-gram.y"

     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 61:
 
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 61:
 

-/* Line 1537 of yacc.c  */
-#line 417 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 425 "parse-gram.y"

     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 62:
 
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 62:
 

-/* Line 1537 of yacc.c  */
-#line 421 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 429 "parse-gram.y"

     { (yyval.list) = (yyvsp[(1) - (1)].list); }
     break;
 
   case 63:
 
     { (yyval.list) = (yyvsp[(1) - (1)].list); }
     break;
 
   case 63:
 

-/* Line 1537 of yacc.c  */
-#line 422 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 430 "parse-gram.y"

     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
     break;
 
   case 64:
 
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
     break;
 
   case 64:
 

-/* Line 1537 of yacc.c  */
-#line 426 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 434 "parse-gram.y"

     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 65:
 
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 65:
 

-/* Line 1537 of yacc.c  */
-#line 427 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 435 "parse-gram.y"

     { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 66:
 
     { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 66:
 

-/* Line 1537 of yacc.c  */
-#line 428 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 436 "parse-gram.y"

     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
     break;
 
   case 67:
 
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
     break;
 
   case 67:
 

-/* Line 1537 of yacc.c  */
-#line 429 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 437 "parse-gram.y"

     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
     break;
 
   case 68:
 
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
     break;
 
   case 68:
 

-/* Line 1537 of yacc.c  */
-#line 435 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 443 "parse-gram.y"

     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
        tag_seen = true;
     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
        tag_seen = true;


@@ -2397,8 +2402,8 @@ yyreduce:
 
   case 69:
 
 
   case 69:
 

-/* Line 1537 of yacc.c  */
-#line 440 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 448 "parse-gram.y"

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


@@ -2407,8 +2412,8 @@ yyreduce:
 
   case 70:
 
 
   case 70:
 

-/* Line 1537 of yacc.c  */
-#line 445 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 453 "parse-gram.y"

     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));


@@ -2418,8 +2423,8 @@ yyreduce:
 
   case 71:
 
 
   case 71:
 

-/* Line 1537 of yacc.c  */
-#line 451 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 459 "parse-gram.y"

     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));


@@ -2429,8 +2434,8 @@ yyreduce:
 
   case 72:
 
 
   case 72:
 

-/* Line 1537 of yacc.c  */
-#line 457 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 465 "parse-gram.y"

     {
       symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
       symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));
     {
       symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
       symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));


@@ -2441,8 +2446,8 @@ yyreduce:
 
   case 79:
 
 
   case 79:
 

-/* Line 1537 of yacc.c  */
-#line 487 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 495 "parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }


@@ -2450,88 +2455,87 @@ yyreduce:
 
   case 80:
 
 
   case 80:
 

-/* Line 1537 of yacc.c  */
-#line 493 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 501 "parse-gram.y"

     { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
     break;
 
   case 82:
 
     { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
     break;
 
   case 82:
 

-/* Line 1537 of yacc.c  */
-#line 497 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 505 "parse-gram.y"

     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 
   case 83:
 
     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 
   case 83:
 

-/* Line 1537 of yacc.c  */
-#line 498 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 506 "parse-gram.y"

     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 
   case 85:
 
     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 
   case 85:
 

-/* Line 1537 of yacc.c  */
-#line 504 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 512 "parse-gram.y"

     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 86:
 
     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 86:
 

-/* Line 1537 of yacc.c  */
-#line 506 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 514 "parse-gram.y"

     { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
     break;
 
   case 87:
 
     { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
     break;
 
   case 87:
 

-/* Line 1537 of yacc.c  */
-#line 508 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 516 "parse-gram.y"

     { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 88:
 
     { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 88:
 

-/* Line 1537 of yacc.c  */
-#line 510 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 518 "parse-gram.y"

     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
   case 89:
 
     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
   case 89:
 

-/* Line 1537 of yacc.c  */
-#line 512 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 520 "parse-gram.y"

     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
   case 90:
 
     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
   case 90:
 

-/* Line 1537 of yacc.c  */
-#line 514 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 522 "parse-gram.y"

     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 
   case 92:
 
     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 
   case 92:
 

-/* Line 1537 of yacc.c  */
-#line 524 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 532 "parse-gram.y"

     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 
   case 93:
 
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 
   case 93:
 

-/* Line 1537 of yacc.c  */
-#line 530 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 538 "parse-gram.y"

     {
     {

-      static char one[] = "1";
-      (yyval.chars) = one;
+      (yyval.chars) = "";

     }
     break;
 
   case 95:
 
     }
     break;
 
   case 95:
 

-/* Line 1537 of yacc.c  */
-#line 544 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 551 "parse-gram.y"

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


@@ -2544,15 +2548,15 @@ yyreduce:
 
   case 96:
 
 
   case 96:
 

-/* Line 1537 of yacc.c  */
-#line 564 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 571 "parse-gram.y"

     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 97:
 
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 97:
 

-/* Line 1537 of yacc.c  */
-#line 566 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 573 "parse-gram.y"

     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);


@@ -2562,15 +2566,15 @@ yyreduce:
 
   case 98:
 
 
   case 98:
 

-/* Line 1537 of yacc.c  */
-#line 574 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 581 "parse-gram.y"

     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 101:
 
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 101:
 

-/* Line 1537 of yacc.c  */
-#line 586 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 593 "parse-gram.y"

     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);


@@ -2579,8 +2583,8 @@ yyreduce:
 
   case 103:
 
 
   case 103:
 

-/* Line 1537 of yacc.c  */
-#line 595 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 602 "parse-gram.y"

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


@@ -2593,8 +2597,8 @@ yyreduce:
 
 
 
 
 
 

-/* Line 1537 of yacc.c  */
-#line 2598 "parse-gram.c"
+/* Line 1535 of yacc.c  */
+#line 2602 "parse-gram.c"

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


@@ -2774,7 +2778,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
   yyresult = 1;
   goto yyreturn;
 

-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE

 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/


@@ -2812,8 +2816,8 @@ yyreturn:
 
 
 
 
 
 

-/* Line 1537 of yacc.c  */
-#line 605 "parse-gram.y"
+/* Line 1535 of yacc.c  */
+#line 612 "parse-gram.y"