maint: use *.texi.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 85d96e51a3c99068032e78972268723fda825d10..31d208545e6b04645ef0fdf21fdba165d3e1ad92 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.5.118-ae42b.  */
+/* A Bison parser, made by GNU Bison 2.5.1.19-ced26-dirty.  */

 
 /* Bison implementation for Yacc-like parsers in C
    
 
 /* Bison implementation for Yacc-like parsers in C
    


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

-#define YYBISON_VERSION "2.5.118-ae42b"
+#define YYBISON_VERSION "2.5.1.19-ced26-dirty"

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


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

-/* Line 268 of yacc.c  */
+/* Line 323 of yacc.c  */

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


@@ -109,6 +109,7 @@
 #include "symlist.h"
 #include "scan-gram.h"
 #include "scan-code.h"
 #include "symlist.h"
 #include "scan-gram.h"
 #include "scan-code.h"

+#include "xmemdup0.h"

 
 #define YYLLOC_DEFAULT(Current, Rhs, N)  (Current) = lloc_default (Rhs, N)
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YYLLOC_DEFAULT(Current, Rhs, N)  (Current) = lloc_default (Rhs, N)
 static YYLTYPE lloc_default (YYLTYPE const *, int);


@@ -168,8 +169,8 @@ current_lhs(symbol *sym, location loc, named_ref *ref)
 #define YYTYPE_UINT8 uint_fast8_t
 
 
 #define YYTYPE_UINT8 uint_fast8_t
 
 

-/* Line 268 of yacc.c  */
-#line 173 "parse-gram.c"
+/* Line 323 of yacc.c  */
+#line 174 "parse-gram.c"

 
 # ifndef YY_NULL
 #  if defined __cplusplus && 201103L <= __cplusplus
 
 # ifndef YY_NULL
 #  if defined __cplusplus && 201103L <= __cplusplus


@@ -179,11 +180,6 @@ current_lhs(symbol *sym, location loc, named_ref *ref)
 #  endif
 # endif
 
 #  endif
 # endif
 

-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-

 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
 # undef YYERROR_VERBOSE
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
 # undef YYERROR_VERBOSE


@@ -197,178 +193,13 @@ current_lhs(symbol *sym, location loc, named_ref *ref)
 # define YYTOKEN_TABLE 0
 #endif
 
 # define YYTOKEN_TABLE 0
 #endif
 

-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     GRAM_EOF = 0,
-     STRING = 258,
-     INT = 259,
-     PERCENT_TOKEN = 260,
-     PERCENT_NTERM = 261,
-     PERCENT_TYPE = 262,
-     PERCENT_DESTRUCTOR = 263,
-     PERCENT_PRINTER = 264,
-     PERCENT_LEFT = 265,
-     PERCENT_RIGHT = 266,
-     PERCENT_NONASSOC = 267,
-     PERCENT_PREC = 268,
-     PERCENT_DPREC = 269,
-     PERCENT_MERGE = 270,
-     PERCENT_CODE = 271,
-     PERCENT_DEBUG = 272,
-     PERCENT_DEFAULT_PREC = 273,
-     PERCENT_DEFINE = 274,
-     PERCENT_DEFINES = 275,
-     PERCENT_ERROR_VERBOSE = 276,
-     PERCENT_EXPECT = 277,
-     PERCENT_EXPECT_RR = 278,
-     PERCENT_FILE_PREFIX = 279,
-     PERCENT_GLR_PARSER = 280,
-     PERCENT_INITIAL_ACTION = 281,
-     PERCENT_LANGUAGE = 282,
-     PERCENT_LEX_PARAM = 283,
-     PERCENT_LOCATIONS = 284,
-     PERCENT_NAME_PREFIX = 285,
-     PERCENT_NO_DEFAULT_PREC = 286,
-     PERCENT_NO_LINES = 287,
-     PERCENT_NONDETERMINISTIC_PARSER = 288,
-     PERCENT_OUTPUT = 289,
-     PERCENT_PARSE_PARAM = 290,
-     PERCENT_PURE_PARSER = 291,
-     PERCENT_REQUIRE = 292,
-     PERCENT_SKELETON = 293,
-     PERCENT_START = 294,
-     PERCENT_TOKEN_TABLE = 295,
-     PERCENT_VERBOSE = 296,
-     PERCENT_YACC = 297,
-     BRACED_CODE = 298,
-     BRACKETED_ID = 299,
-     CHAR = 300,
-     EPILOGUE = 301,
-     EQUAL = 302,
-     ID = 303,
-     ID_COLON = 304,
-     PERCENT_PERCENT = 305,
-     PIPE = 306,
-     PROLOGUE = 307,
-     SEMICOLON = 308,
-     TYPE = 309,
-     TYPE_TAG_ANY = 310,
-     TYPE_TAG_NONE = 311,
-     PERCENT_UNION = 312
-   };
-#endif
-/* Tokens.  */
-#define GRAM_EOF 0
-#define STRING 258
-#define INT 259
-#define PERCENT_TOKEN 260
-#define PERCENT_NTERM 261
-#define PERCENT_TYPE 262
-#define PERCENT_DESTRUCTOR 263
-#define PERCENT_PRINTER 264
-#define PERCENT_LEFT 265
-#define PERCENT_RIGHT 266
-#define PERCENT_NONASSOC 267
-#define PERCENT_PREC 268
-#define PERCENT_DPREC 269
-#define PERCENT_MERGE 270
-#define PERCENT_CODE 271
-#define PERCENT_DEBUG 272
-#define PERCENT_DEFAULT_PREC 273
-#define PERCENT_DEFINE 274
-#define PERCENT_DEFINES 275
-#define PERCENT_ERROR_VERBOSE 276
-#define PERCENT_EXPECT 277
-#define PERCENT_EXPECT_RR 278
-#define PERCENT_FILE_PREFIX 279
-#define PERCENT_GLR_PARSER 280
-#define PERCENT_INITIAL_ACTION 281
-#define PERCENT_LANGUAGE 282
-#define PERCENT_LEX_PARAM 283
-#define PERCENT_LOCATIONS 284
-#define PERCENT_NAME_PREFIX 285
-#define PERCENT_NO_DEFAULT_PREC 286
-#define PERCENT_NO_LINES 287
-#define PERCENT_NONDETERMINISTIC_PARSER 288
-#define PERCENT_OUTPUT 289
-#define PERCENT_PARSE_PARAM 290
-#define PERCENT_PURE_PARSER 291
-#define PERCENT_REQUIRE 292
-#define PERCENT_SKELETON 293
-#define PERCENT_START 294
-#define PERCENT_TOKEN_TABLE 295
-#define PERCENT_VERBOSE 296
-#define PERCENT_YACC 297
-#define BRACED_CODE 298
-#define BRACKETED_ID 299
-#define CHAR 300
-#define EPILOGUE 301
-#define EQUAL 302
-#define ID 303
-#define ID_COLON 304
-#define PERCENT_PERCENT 305
-#define PIPE 306
-#define PROLOGUE 307
-#define SEMICOLON 308
-#define TYPE 309
-#define TYPE_TAG_ANY 310
-#define TYPE_TAG_NONE 311
-#define PERCENT_UNION 312
-
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{
-
-/* Line 295 of yacc.c  */
-#line 113 "parse-gram.y"
-
-  symbol *symbol;
-  symbol_list *list;
-  int integer;
-  char const *chars;
-  char *code;
-  assoc assoc;
-  uniqstr uniqstr;
-  unsigned char character;
-  named_ref *named_ref;
-
-
-
-/* Line 295 of yacc.c  */
-#line 347 "parse-gram.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-} YYLTYPE;
-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-
+#include "parse-gram.h"

 
 /* Copy the second part of user declarations.  */
 
 
 
 /* Copy the second part of user declarations.  */
 
 

-/* Line 345 of yacc.c  */
-#line 372 "parse-gram.c"
+/* Line 344 of yacc.c  */
+#line 203 "parse-gram.c"

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


@@ -675,17 +506,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,   228,   228,   236,   238,   242,   243,   253,   254,   259,
-     260,   265,   266,   267,   268,   269,   270,   275,   284,   285,
-     286,   287,   288,   289,   290,   291,   292,   293,   294,   309,
-     310,   334,   335,   336,   337,   341,   342,   343,   347,   354,
-     361,   365,   369,   376,   391,   392,   396,   408,   408,   413,
-     413,   418,   429,   444,   445,   446,   450,   451,   456,   458,
-     463,   464,   469,   471,   476,   477,   481,   482,   483,   484,
-     489,   494,   499,   505,   511,   522,   523,   532,   533,   539,
-     540,   541,   548,   548,   556,   557,   558,   563,   565,   567,
-     569,   571,   573,   578,   580,   591,   592,   597,   598,   599,
-     608,   628,   630,   639,   644,   645,   650,   657,   659
+       0,   229,   229,   237,   239,   243,   244,   254,   255,   260,
+     261,   266,   267,   268,   269,   270,   271,   276,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   310,
+     311,   335,   336,   337,   338,   342,   343,   344,   348,   355,
+     362,   366,   370,   377,   392,   393,   397,   409,   409,   414,
+     414,   419,   430,   445,   446,   447,   451,   452,   457,   459,
+     464,   465,   470,   472,   477,   478,   482,   483,   484,   485,
+     490,   495,   500,   506,   512,   523,   524,   533,   534,   540,
+     541,   542,   549,   549,   557,   558,   559,   564,   566,   568,
+     570,   572,   574,   579,   581,   592,   593,   598,   599,   600,
+     609,   629,   631,   640,   645,   646,   651,   658,   660

 };
 #endif
 
 };
 #endif
 


@@ -1059,165 +890,165 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     {
       case 3: /* "\"string\"" */
 
     {
       case 3: /* "\"string\"" */
 

-/* Line 823 of yacc.c  */
-#line 203 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 204 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1068 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 899 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 215 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 216 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1077 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 908 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 205 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 206 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1086 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 917 "parse-gram.c"

        break;
       case 44: /* "\"[identifier]\"" */
 
        break;
       case 44: /* "\"[identifier]\"" */
 

-/* Line 823 of yacc.c  */
-#line 210 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 211 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1095 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 926 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 197 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 198 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1104 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 935 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 205 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 206 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1113 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 944 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 209 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 210 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1122 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 953 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 211 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 212 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1131 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 962 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 205 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 206 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1140 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 971 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 212 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 213 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1149 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 980 "parse-gram.c"

        break;
       case 71: /* "symbol.prec" */
 
        break;
       case 71: /* "symbol.prec" */
 

-/* Line 823 of yacc.c  */
-#line 218 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 219 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1158 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 989 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 209 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 210 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1167 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 998 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 205 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 206 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1176 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 1007 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 205 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 206 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1185 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 1016 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 218 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 219 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1194 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 1025 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 219 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 220 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1203 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 1034 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 218 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 219 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1212 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 1043 "parse-gram.c"

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

-/* Line 823 of yacc.c  */
-#line 218 "parse-gram.y"
+/* Line 822 of yacc.c  */
+#line 219 "parse-gram.y"

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

-/* Line 823 of yacc.c  */
-#line 1221 "parse-gram.c"
+/* Line 822 of yacc.c  */
+#line 1052 "parse-gram.c"

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


@@ -1861,20 +1692,6 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 }
 
 
 }
 
 

-/* Prevent warnings from -Wmissing-prototypes.  */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */

 
 
 /*----------.
 
 
 /*----------.


@@ -1924,7 +1741,7 @@ YYLTYPE yylloc;
        `yyvs': related to semantic values.
        `yyls': related to locations.
 
        `yyvs': related to semantic values.
        `yyls': related to locations.
 

-       Refer to the stacks thru separate pointers, to allow yyoverflow
+       Refer to the stacks through separate pointers, to allow yyoverflow

        to reallocate them elsewhere.  */
 
     /* The state stack.  */
        to reallocate them elsewhere.  */
 
     /* The state stack.  */


@@ -2008,8 +1825,8 @@ YYLTYPE yylloc;
 
 /* User initialization code.  */
 
 
 /* User initialization code.  */
 

-/* Line 1594 of yacc.c  */
-#line 105 "parse-gram.y"
+/* Line 1585 of yacc.c  */
+#line 106 "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. */


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

-/* Line 1594 of yacc.c  */
-#line 2022 "parse-gram.c"
+/* Line 1585 of yacc.c  */
+#line 1839 "parse-gram.c"

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


@@ -2212,8 +2029,8 @@ yyreduce:
       {
           case 6:
 
       {
           case 6:
 

-/* Line 1810 of yacc.c  */
-#line 244 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 245 "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)]));


@@ -2227,15 +2044,15 @@ yyreduce:
 
   case 7:
 
 
   case 7:
 

-/* Line 1810 of yacc.c  */
-#line 253 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 254 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 255 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 256 "parse-gram.y"

     {
       muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars),
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     {
       muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars),
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);


@@ -2244,15 +2061,15 @@ yyreduce:
 
   case 9:
 
 
   case 9:
 

-/* Line 1810 of yacc.c  */
-#line 259 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 260 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 261 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 262 "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));


@@ -2261,43 +2078,43 @@ yyreduce:
 
   case 11:
 
 
   case 11:
 

-/* Line 1810 of yacc.c  */
-#line 265 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 266 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 266 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 267 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 267 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 268 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 268 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 269 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 269 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 270 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 271 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 272 "parse-gram.y"

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


@@ -2306,8 +2123,8 @@ yyreduce:
 
   case 17:
 
 
   case 17:
 

-/* Line 1810 of yacc.c  */
-#line 276 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 277 "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)]));


@@ -2320,78 +2137,78 @@ yyreduce:
 
   case 18:
 
 
   case 18:
 

-/* Line 1810 of yacc.c  */
-#line 284 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 285 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 285 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 286 "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 1810 of yacc.c  */
-#line 286 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 287 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 287 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 288 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 288 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 289 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 289 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 290 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 290 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 291 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 291 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 292 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 292 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 293 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 293 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 294 "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 1810 of yacc.c  */
-#line 295 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 296 "parse-gram.y"

     {
       /* %pure-parser is deprecated in favor of `%define api.pure', so use
          `%define api.pure' in a backward-compatible manner here.  First, don't
     {
       /* %pure-parser is deprecated in favor of `%define api.pure', so use
          `%define api.pure' in a backward-compatible manner here.  First, don't


@@ -2410,15 +2227,15 @@ yyreduce:
 
   case 29:
 
 
   case 29:
 

-/* Line 1810 of yacc.c  */
-#line 309 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 310 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 311 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 312 "parse-gram.y"

     {
       char const *skeleton_user = (yyvsp[(2) - (2)].chars);
       if (mbschr (skeleton_user, '/'))
     {
       char const *skeleton_user = (yyvsp[(2) - (2)].chars);
       if (mbschr (skeleton_user, '/'))


@@ -2446,29 +2263,29 @@ yyreduce:
 
   case 31:
 
 
   case 31:
 

-/* Line 1810 of yacc.c  */
-#line 334 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 335 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 335 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 336 "parse-gram.y"

     { report_flag |= report_states; }
     break;
 
   case 33:
 
     { report_flag |= report_states; }
     break;
 
   case 33:
 

-/* Line 1810 of yacc.c  */
-#line 336 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 337 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 344 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 345 "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)]));
     }


@@ -2476,8 +2293,8 @@ yyreduce:
 
   case 38:
 
 
   case 38:
 

-/* Line 1810 of yacc.c  */
-#line 348 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 349 "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)


@@ -2488,8 +2305,8 @@ yyreduce:
 
   case 39:
 
 
   case 39:
 

-/* Line 1810 of yacc.c  */
-#line 355 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 356 "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)


@@ -2500,8 +2317,8 @@ yyreduce:
 
   case 40:
 
 
   case 40:
 

-/* Line 1810 of yacc.c  */
-#line 362 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 363 "parse-gram.y"

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


@@ -2509,8 +2326,8 @@ yyreduce:
 
   case 41:
 
 
   case 41:
 

-/* Line 1810 of yacc.c  */
-#line 366 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 367 "parse-gram.y"

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


@@ -2518,8 +2335,8 @@ yyreduce:
 
   case 42:
 
 
   case 42:
 

-/* Line 1810 of yacc.c  */
-#line 370 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 371 "parse-gram.y"

     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */


@@ -2530,8 +2347,8 @@ yyreduce:
 
   case 43:
 
 
   case 43:
 

-/* Line 1810 of yacc.c  */
-#line 377 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 378 "parse-gram.y"

     {
       muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
       code_scanner_last_string_free ();
     {
       muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
       code_scanner_last_string_free ();


@@ -2540,22 +2357,22 @@ yyreduce:
 
   case 44:
 
 
   case 44:
 

-/* Line 1810 of yacc.c  */
-#line 391 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 392 "parse-gram.y"

     {}
     break;
 
   case 45:
 
     {}
     break;
 
   case 45:
 

-/* Line 1810 of yacc.c  */
-#line 392 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 393 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 397 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 398 "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)]));


@@ -2565,15 +2382,15 @@ yyreduce:
 
   case 47:
 
 
   case 47:
 

-/* Line 1810 of yacc.c  */
-#line 408 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 409 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 409 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 410 "parse-gram.y"

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


@@ -2582,15 +2399,15 @@ yyreduce:
 
   case 49:
 
 
   case 49:
 

-/* Line 1810 of yacc.c  */
-#line 413 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 414 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 414 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 415 "parse-gram.y"

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


@@ -2599,8 +2416,8 @@ yyreduce:
 
   case 51:
 
 
   case 51:
 

-/* Line 1810 of yacc.c  */
-#line 419 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 420 "parse-gram.y"

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


@@ -2612,8 +2429,8 @@ yyreduce:
 
   case 52:
 
 
   case 52:
 

-/* Line 1810 of yacc.c  */
-#line 430 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 431 "parse-gram.y"

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


@@ -2629,127 +2446,127 @@ yyreduce:
 
   case 53:
 
 
   case 53:
 

-/* Line 1810 of yacc.c  */
-#line 444 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 445 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 445 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 446 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 446 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 447 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 450 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 451 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 451 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 452 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 457 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 458 "parse-gram.y"

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

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

-/* Line 1810 of yacc.c  */
-#line 463 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 464 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 464 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 465 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 470 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 471 "parse-gram.y"

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

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

-/* Line 1810 of yacc.c  */
-#line 476 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 477 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 477 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 478 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 481 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 482 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 482 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 483 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 483 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 484 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 484 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 485 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 490 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 491 "parse-gram.y"

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


@@ -2758,8 +2575,8 @@ yyreduce:
 
   case 71:
 
 
   case 71:
 

-/* Line 1810 of yacc.c  */
-#line 495 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 496 "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)]));


@@ -2768,8 +2585,8 @@ yyreduce:
 
   case 72:
 
 
   case 72:
 

-/* Line 1810 of yacc.c  */
-#line 500 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 501 "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)]));


@@ -2779,8 +2596,8 @@ yyreduce:
 
   case 73:
 
 
   case 73:
 

-/* Line 1810 of yacc.c  */
-#line 506 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 507 "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)]));


@@ -2790,8 +2607,8 @@ yyreduce:
 
   case 74:
 
 
   case 74:
 

-/* Line 1810 of yacc.c  */
-#line 512 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 513 "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)]));


@@ -2802,8 +2619,8 @@ yyreduce:
 
   case 81:
 
 
   case 81:
 

-/* Line 1810 of yacc.c  */
-#line 542 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 543 "parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }


@@ -2811,15 +2628,15 @@ yyreduce:
 
   case 82:
 
 
   case 82:
 

-/* Line 1810 of yacc.c  */
-#line 548 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 549 "parse-gram.y"

     { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); }
     break;
 
   case 83:
 
     { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); }
     break;
 
   case 83:
 

-/* Line 1810 of yacc.c  */
-#line 549 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 550 "parse-gram.y"

     {
     /* Free the current lhs. */
     current_lhs (0, (yylsp[(1) - (4)]), 0);
     {
     /* Free the current lhs. */
     current_lhs (0, (yylsp[(1) - (4)]), 0);


@@ -2828,100 +2645,100 @@ yyreduce:
 
   case 84:
 
 
   case 84:
 

-/* Line 1810 of yacc.c  */
-#line 556 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 557 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 557 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 558 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 563 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 564 "parse-gram.y"

     { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
                                  current_lhs_named_ref); }
     break;
 
   case 88:
 
     { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
                                  current_lhs_named_ref); }
     break;
 
   case 88:
 

-/* Line 1810 of yacc.c  */
-#line 566 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 567 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 568 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 569 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 570 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 571 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 572 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 573 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 574 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 575 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 578 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 579 "parse-gram.y"

     { (yyval.named_ref) = 0; }
     break;
 
   case 94:
 
     { (yyval.named_ref) = 0; }
     break;
 
   case 94:
 

-/* Line 1810 of yacc.c  */
-#line 580 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 581 "parse-gram.y"

     { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 96:
 
     { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 96:
 

-/* Line 1810 of yacc.c  */
-#line 592 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 593 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 597 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 598 "parse-gram.y"

     { (yyval.chars) = ""; }
     break;
 
   case 98:
 
     { (yyval.chars) = ""; }
     break;
 
   case 98:
 

-/* Line 1810 of yacc.c  */
-#line 598 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 599 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 609 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 610 "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';


@@ -2934,15 +2751,15 @@ yyreduce:
 
   case 101:
 
 
   case 101:
 

-/* Line 1810 of yacc.c  */
-#line 629 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 630 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 631 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 632 "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);


@@ -2952,15 +2769,15 @@ yyreduce:
 
   case 103:
 
 
   case 103:
 

-/* Line 1810 of yacc.c  */
-#line 639 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 640 "parse-gram.y"

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

-/* Line 1810 of yacc.c  */
-#line 651 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 652 "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);


@@ -2969,8 +2786,8 @@ yyreduce:
 
   case 108:
 
 
   case 108:
 

-/* Line 1810 of yacc.c  */
-#line 660 "parse-gram.y"
+/* Line 1801 of yacc.c  */
+#line 661 "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)]));


@@ -2983,8 +2800,8 @@ yyreduce:
 
 
 
 
 
 

-/* Line 1810 of yacc.c  */
-#line 2988 "parse-gram.c"
+/* Line 1801 of yacc.c  */
+#line 2805 "parse-gram.c"

         default: break;
       }
     if (yychar_backup != yychar)
         default: break;
       }
     if (yychar_backup != yychar)


@@ -3233,8 +3050,8 @@ yyreturn:
 
 
 
 
 
 

-/* Line 2071 of yacc.c  */
-#line 670 "parse-gram.y"
+/* Line 2062 of yacc.c  */
+#line 671 "parse-gram.y"

 
 
 
 
 
 


@@ -3301,9 +3118,7 @@ add_param (char const *type, char *decl, location loc)
     complain_at (loc, _("missing identifier in parameter declaration"));
   else
     {
     complain_at (loc, _("missing identifier in parameter declaration"));
   else
     {

-      size_t name_len = strspn (name_start, alphanum);
-      char *name = xmemdup (name_start, name_len + 1);
-      name[name_len] = '\0';
+      char *name = xmemdup0 (name_start, strspn (name_start, alphanum));

       muscle_pair_list_grow (type, decl, name);
       free (name);
     }
       muscle_pair_list_grow (type, decl, name);
       free (name);
     }