Merge remote-tracking branch 'origin/maint'

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 24ff8f0f80dd7c22b03fd858169f962bf445d8ed..0af5eb85e025f8c5108ebfd17c82fcd61df6a76a 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.1_rc2.741-bfd9.  */
+/* A Bison parser, made by GNU Bison 2.5.1.815-22b0.  */

 
 /* 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.1_rc2.741-bfd9"
+#define YYBISON_VERSION "2.5.1.815-22b0"

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


@@ -58,9 +58,6 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
 /* Pull parsers.  */
 #define YYPULL 1
 

-/* Using locations.  */
-#define YYLSP_NEEDED 1
-

 /* Substitute the variable and function names.  */
 #define yyparse         gram_parse
 #define yylex           gram_lex
 /* Substitute the variable and function names.  */
 #define yyparse         gram_parse
 #define yylex           gram_lex


@@ -72,7 +69,7 @@
 #define yylloc          gram_lloc
 
 /* Copy the first part of user declarations.  */
 #define yylloc          gram_lloc
 
 /* Copy the first part of user declarations.  */

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

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


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

-/* Line 269 of yacc.c  */
-#line 132 "src/parse-gram.c"
+/* Line 328 of yacc.c  */
+#line 129 "src/parse-gram.c"

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


@@ -138,11 +135,6 @@ static char const *char_name (char);
 #  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


@@ -151,13 +143,19 @@ static char const *char_name (char);
 # define YYERROR_VERBOSE 1
 #endif
 
 # define YYERROR_VERBOSE 1
 #endif
 

-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+   by #include "src/parse-gram.h".  */
+#ifndef GRAM_Y_TAB_H
+# define GRAM_Y_TAB_H
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int gram_debug;

 #endif
 #endif

-

 /* "%code requires" blocks.  */
 /* "%code requires" blocks.  */

-/* Line 291 of yacc.c  */
+/* Line 342 of yacc.c  */

 #line 221 "src/parse-gram.y"
 
 # ifndef PARAM_TYPE
 #line 221 "src/parse-gram.y"
 
 # ifndef PARAM_TYPE


@@ -172,8 +170,8 @@ static char const *char_name (char);
 # endif
 
 
 # endif
 
 

-/* Line 291 of yacc.c  */
-#line 177 "src/parse-gram.c"
+/* Line 342 of yacc.c  */
+#line 175 "src/parse-gram.c"

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


@@ -297,11 +295,10 @@ static char const *char_name (char);
 
 
 
 
 
 

-

 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {

-/* Line 296 of yacc.c  */
+/* Line 342 of yacc.c  */

 #line 107 "src/parse-gram.y"
 
   assoc assoc;
 #line 107 "src/parse-gram.y"
 
   assoc assoc;


@@ -314,14 +311,14 @@ typedef union YYSTYPE
   uniqstr uniqstr;
   unsigned char character;
 
   uniqstr uniqstr;
   unsigned char character;
 

-/* Line 296 of yacc.c  */
+/* Line 342 of yacc.c  */

 #line 245 "src/parse-gram.y"
 
   param_type param;
 
 
 #line 245 "src/parse-gram.y"
 
   param_type param;
 
 

-/* Line 296 of yacc.c  */
-#line 325 "src/parse-gram.c"
+/* Line 342 of yacc.c  */
+#line 322 "src/parse-gram.c"

 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */


@@ -342,12 +339,30 @@ typedef struct YYLTYPE
 #endif
 
 
 #endif
 
 

+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int gram_parse (void *YYPARSE_PARAM);
+#else
+int gram_parse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int gram_parse (void);
+#else
+int gram_parse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+#endif /* !GRAM_Y_TAB_H  */
+

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

-/* Line 346 of yacc.c  */
-#line 349 "src/parse-gram.c"
+/* Line 345 of yacc.c  */
+#line 364 "src/parse-gram.c"

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

-/* Line 347 of yacc.c  */
+/* Line 346 of yacc.c  */

 #line 56 "src/parse-gram.y"
 
   static int current_prec = 0;
 #line 56 "src/parse-gram.y"
 
   static int current_prec = 0;


@@ -380,7 +395,7 @@ typedef struct YYLTYPE
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t
 
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t
 

-/* Line 347 of yacc.c  */
+/* Line 346 of yacc.c  */

 #line 234 "src/parse-gram.y"
 
   /** Add a lex-param and/or a parse-param.
 #line 234 "src/parse-gram.y"
 
   /** Add a lex-param and/or a parse-param.


@@ -393,8 +408,8 @@ typedef struct YYLTYPE
   static param_type current_param = param_none;
 
 
   static param_type current_param = param_none;
 
 

-/* Line 347 of yacc.c  */
-#line 398 "src/parse-gram.c"
+/* Line 346 of yacc.c  */
+#line 413 "src/parse-gram.c"

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


@@ -668,7 +683,7 @@ static const yytype_uint16 yyrline[] =
 };
 #endif
 
 };
 #endif
 

-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 1

 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =


@@ -1041,106 +1056,106 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     {
             case 3: // "string"
 
     {
             case 3: // "string"
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 194 "src/parse-gram.y"
         { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
 #line 194 "src/parse-gram.y"
         { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }

-/* Line 755 of yacc.c  */
-#line 1049 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1064 "src/parse-gram.c"

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

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 207 "src/parse-gram.y"
         { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
 #line 207 "src/parse-gram.y"
         { fprintf (stderr, "%d", ((*yyvaluep).integer)); }

-/* Line 755 of yacc.c  */
-#line 1058 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1073 "src/parse-gram.c"

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

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 203 "src/parse-gram.y"
         { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
 #line 203 "src/parse-gram.y"
         { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }

-/* Line 755 of yacc.c  */
-#line 1067 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1082 "src/parse-gram.c"

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

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 196 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
 #line 196 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }

-/* Line 755 of yacc.c  */
-#line 1076 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1091 "src/parse-gram.c"

         break;
 
             case 42: // "[identifier]"
 
         break;
 
             case 42: // "[identifier]"
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 201 "src/parse-gram.y"
         { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }
 #line 201 "src/parse-gram.y"
         { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }

-/* Line 755 of yacc.c  */
-#line 1085 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1100 "src/parse-gram.c"

         break;
 
             case 43: // "char"
 
         break;
 
             case 43: // "char"
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 188 "src/parse-gram.y"
         { fputs (char_name (((*yyvaluep).character)), stderr); }
 #line 188 "src/parse-gram.y"
         { fputs (char_name (((*yyvaluep).character)), stderr); }

-/* Line 755 of yacc.c  */
-#line 1094 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1109 "src/parse-gram.c"

         break;
 
             case 44: // "epilogue"
 
         break;
 
             case 44: // "epilogue"
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 196 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
 #line 196 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }

-/* Line 755 of yacc.c  */
-#line 1103 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1118 "src/parse-gram.c"

         break;
 
             case 46: // "identifier"
 
         break;
 
             case 46: // "identifier"
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 200 "src/parse-gram.y"
         { fputs (((*yyvaluep).uniqstr), stderr); }
 #line 200 "src/parse-gram.y"
         { fputs (((*yyvaluep).uniqstr), stderr); }

-/* Line 755 of yacc.c  */
-#line 1112 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1127 "src/parse-gram.c"

         break;
 
             case 47: // "identifier:"
 
         break;
 
             case 47: // "identifier:"
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 202 "src/parse-gram.y"
         { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
 #line 202 "src/parse-gram.y"
         { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }

-/* Line 755 of yacc.c  */
-#line 1121 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1136 "src/parse-gram.c"

         break;
 
             case 50: // "%{...%}"
 
         break;
 
             case 50: // "%{...%}"
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 196 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
 #line 196 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }

-/* Line 755 of yacc.c  */
-#line 1130 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1145 "src/parse-gram.c"

         break;
 
             case 52: // "<tag>"
 
         break;
 
             case 52: // "<tag>"
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 204 "src/parse-gram.y"
         { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
 #line 204 "src/parse-gram.y"
         { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }

-/* Line 755 of yacc.c  */
-#line 1139 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1154 "src/parse-gram.c"

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

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 250 "src/parse-gram.y"
         {
   switch (((*yyvaluep).param))
 #line 250 "src/parse-gram.y"
         {
   switch (((*yyvaluep).param))


@@ -1154,80 +1169,80 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
       case param_none: aver (false); break;
     }
 }
       case param_none: aver (false); break;
     }
 }

-/* Line 755 of yacc.c  */
-#line 1159 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1174 "src/parse-gram.c"

         break;
 
             case 72: // symbol.prec
 
         break;
 
             case 72: // symbol.prec
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 210 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
 #line 210 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }

-/* Line 755 of yacc.c  */
-#line 1168 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1183 "src/parse-gram.c"

         break;
 
             case 85: // variable
 
         break;
 
             case 85: // variable
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 200 "src/parse-gram.y"
         { fputs (((*yyvaluep).uniqstr), stderr); }
 #line 200 "src/parse-gram.y"
         { fputs (((*yyvaluep).uniqstr), stderr); }

-/* Line 755 of yacc.c  */
-#line 1177 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1192 "src/parse-gram.c"

         break;
 
             case 86: // content.opt
 
         break;
 
             case 86: // content.opt
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 196 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
 #line 196 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }

-/* Line 755 of yacc.c  */
-#line 1186 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1201 "src/parse-gram.c"

         break;
 
             case 87: // braceless
 
         break;
 
             case 87: // braceless
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 196 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
 #line 196 "src/parse-gram.y"
         { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }

-/* Line 755 of yacc.c  */
-#line 1195 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1210 "src/parse-gram.c"

         break;
 
             case 88: // id
 
         break;
 
             case 88: // id
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 210 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
 #line 210 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }

-/* Line 755 of yacc.c  */
-#line 1204 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1219 "src/parse-gram.c"

         break;
 
             case 89: // id_colon
 
         break;
 
             case 89: // id_colon
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 211 "src/parse-gram.y"
         { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
 #line 211 "src/parse-gram.y"
         { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }

-/* Line 755 of yacc.c  */
-#line 1213 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1228 "src/parse-gram.c"

         break;
 
             case 90: // symbol
 
         break;
 
             case 90: // symbol
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 210 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
 #line 210 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }

-/* Line 755 of yacc.c  */
-#line 1222 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1237 "src/parse-gram.c"

         break;
 
             case 91: // string_as_id
 
         break;
 
             case 91: // string_as_id
 

-/* Line 755 of yacc.c  */
+/* Line 754 of yacc.c  */

 #line 210 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
 #line 210 "src/parse-gram.y"
         { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }

-/* Line 755 of yacc.c  */
-#line 1231 "src/parse-gram.c"
+/* Line 754 of yacc.c  */
+#line 1246 "src/parse-gram.c"

         break;
 
       default:
         break;
 
       default:


@@ -1872,22 +1887,6 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 }
 
 
 }
 
 

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

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


@@ -1937,7 +1936,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.  */


@@ -2020,7 +2019,7 @@ YYLTYPE yylloc;
 #endif
 
 /* User initialization code.  */
 #endif
 
 /* User initialization code.  */

-/* Line 1528 of yacc.c  */
+/* Line 1519 of yacc.c  */

 #line 99 "src/parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
 #line 99 "src/parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default


@@ -2028,8 +2027,8 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.start, current_file, 1, 1);
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
   boundary_set (&yylloc.start, current_file, 1, 1);
   boundary_set (&yylloc.end, current_file, 1, 1);
 }

-/* Line 1528 of yacc.c  */
-#line 2033 "src/parse-gram.c"
+/* Line 1519 of yacc.c  */
+#line 2032 "src/parse-gram.c"

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


@@ -2222,7 +2221,7 @@ yyreduce:
     switch (yyn)
       {
           case 6:
     switch (yyn)
       {
           case 6:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 286 "src/parse-gram.y"
     {
       code_props plain_code;
 #line 286 "src/parse-gram.y"
     {
       code_props plain_code;


@@ -2233,106 +2232,106 @@ yyreduce:
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }

-/* Line 1744 of yacc.c  */
-#line 2238 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2237 "src/parse-gram.c"

     break;
 
   case 7:
     break;
 
   case 7:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 296 "src/parse-gram.y"
     {
       muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
     }
 #line 296 "src/parse-gram.y"
     {
       muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
     }

-/* Line 1744 of yacc.c  */
-#line 2248 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2247 "src/parse-gram.c"

     break;
 
   case 8:
     break;
 
   case 8:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 300 "src/parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
 #line 300 "src/parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }

-/* Line 1744 of yacc.c  */
-#line 2259 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2258 "src/parse-gram.c"

     break;
 
   case 9:
     break;
 
   case 9:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 304 "src/parse-gram.y"
     { defines_flag = true; }
 #line 304 "src/parse-gram.y"
     { defines_flag = true; }

-/* Line 1744 of yacc.c  */
-#line 2267 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2266 "src/parse-gram.c"

     break;
 
   case 10:
     break;
 
   case 10:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 306 "src/parse-gram.y"
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[0].chars));
     }
 #line 306 "src/parse-gram.y"
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[0].chars));
     }

-/* Line 1744 of yacc.c  */
-#line 2278 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2277 "src/parse-gram.c"

     break;
 
   case 11:
     break;
 
   case 11:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 311 "src/parse-gram.y"
     {
       muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
 #line 311 "src/parse-gram.y"
     {
       muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }

-/* Line 1744 of yacc.c  */
-#line 2289 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2288 "src/parse-gram.c"

     break;
 
   case 12:
     break;
 
   case 12:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 315 "src/parse-gram.y"
     { expected_sr_conflicts = (yyvsp[0].integer); }
 #line 315 "src/parse-gram.y"
     { expected_sr_conflicts = (yyvsp[0].integer); }

-/* Line 1744 of yacc.c  */
-#line 2297 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2296 "src/parse-gram.c"

     break;
 
   case 13:
     break;
 
   case 13:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 316 "src/parse-gram.y"
     { expected_rr_conflicts = (yyvsp[0].integer); }
 #line 316 "src/parse-gram.y"
     { expected_rr_conflicts = (yyvsp[0].integer); }

-/* Line 1744 of yacc.c  */
-#line 2305 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2304 "src/parse-gram.c"

     break;
 
   case 14:
     break;
 
   case 14:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 317 "src/parse-gram.y"
     { spec_file_prefix = (yyvsp[0].chars); }
 #line 317 "src/parse-gram.y"
     { spec_file_prefix = (yyvsp[0].chars); }

-/* Line 1744 of yacc.c  */
-#line 2313 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2312 "src/parse-gram.c"

     break;
 
   case 15:
     break;
 
   case 15:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 318 "src/parse-gram.y"
     { spec_file_prefix = (yyvsp[0].chars); }
 #line 318 "src/parse-gram.y"
     { spec_file_prefix = (yyvsp[0].chars); }

-/* Line 1744 of yacc.c  */
-#line 2321 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2320 "src/parse-gram.c"

     break;
 
   case 16:
     break;
 
   case 16:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 320 "src/parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
     }
 #line 320 "src/parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
     }

-/* Line 1744 of yacc.c  */
-#line 2332 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2331 "src/parse-gram.c"

     break;
 
   case 17:
     break;
 
   case 17:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 325 "src/parse-gram.y"
     {
       code_props action;
 #line 325 "src/parse-gram.y"
     {
       code_props action;


@@ -2342,96 +2341,96 @@ yyreduce:
       muscle_code_grow ("initial_action", action.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
       muscle_code_grow ("initial_action", action.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }

-/* Line 1744 of yacc.c  */
-#line 2347 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2346 "src/parse-gram.c"

     break;
 
   case 18:
     break;
 
   case 18:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 333 "src/parse-gram.y"
     { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
 #line 333 "src/parse-gram.y"
     { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }

-/* Line 1744 of yacc.c  */
-#line 2355 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2354 "src/parse-gram.c"

     break;
 
   case 19:
     break;
 
   case 19:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 334 "src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }
 #line 334 "src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }

-/* Line 1744 of yacc.c  */
-#line 2363 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2362 "src/parse-gram.c"

     break;
 
   case 20:
     break;
 
   case 20:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 335 "src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }
 #line 335 "src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }

-/* Line 1744 of yacc.c  */
-#line 2371 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2370 "src/parse-gram.c"

     break;
 
   case 21:
     break;
 
   case 21:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 336 "src/parse-gram.y"
     { no_lines_flag = true; }
 #line 336 "src/parse-gram.y"
     { no_lines_flag = true; }

-/* Line 1744 of yacc.c  */
-#line 2379 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2378 "src/parse-gram.c"

     break;
 
   case 22:
     break;
 
   case 22:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 337 "src/parse-gram.y"
     { nondeterministic_parser = true; }
 #line 337 "src/parse-gram.y"
     { nondeterministic_parser = true; }

-/* Line 1744 of yacc.c  */
-#line 2387 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2386 "src/parse-gram.c"

     break;
 
   case 23:
     break;
 
   case 23:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 338 "src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }
 #line 338 "src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }

-/* Line 1744 of yacc.c  */
-#line 2395 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2394 "src/parse-gram.c"

     break;
 
   case 24:
     break;
 
   case 24:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 339 "src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }
 #line 339 "src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }

-/* Line 1744 of yacc.c  */
-#line 2403 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2402 "src/parse-gram.c"

     break;
 
   case 25:
     break;
 
   case 25:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 340 "src/parse-gram.y"
     { current_param = (yyvsp[0].param); }
 #line 340 "src/parse-gram.y"
     { current_param = (yyvsp[0].param); }

-/* Line 1744 of yacc.c  */
-#line 2411 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2410 "src/parse-gram.c"

     break;
 
   case 26:
     break;
 
   case 26:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 340 "src/parse-gram.y"
     { current_param = param_none; }
 #line 340 "src/parse-gram.y"
     { current_param = param_none; }

-/* Line 1744 of yacc.c  */
-#line 2419 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2418 "src/parse-gram.c"

     break;
 
   case 27:
     break;
 
   case 27:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 341 "src/parse-gram.y"
     { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
 #line 341 "src/parse-gram.y"
     { version_check (&(yylsp[0]), (yyvsp[0].chars)); }

-/* Line 1744 of yacc.c  */
-#line 2427 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2426 "src/parse-gram.c"

     break;
 
   case 28:
     break;
 
   case 28:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 343 "src/parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[0].chars);
 #line 343 "src/parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[0].chars);

-      if (mbschr (skeleton_user, '/'))
+      if (strchr (skeleton_user, '/'))

         {
           size_t dir_length = strlen (current_file);
           char *skeleton_build;
         {
           size_t dir_length = strlen (current_file);
           char *skeleton_build;


@@ -2452,108 +2451,108 @@ yyreduce:
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }

-/* Line 1744 of yacc.c  */
-#line 2457 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2456 "src/parse-gram.c"

     break;
 
   case 29:
     break;
 
   case 29:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 366 "src/parse-gram.y"
     { token_table_flag = true; }
 #line 366 "src/parse-gram.y"
     { token_table_flag = true; }

-/* Line 1744 of yacc.c  */
-#line 2465 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2464 "src/parse-gram.c"

     break;
 
   case 30:
     break;
 
   case 30:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 367 "src/parse-gram.y"
     { report_flag |= report_states; }
 #line 367 "src/parse-gram.y"
     { report_flag |= report_states; }

-/* Line 1744 of yacc.c  */
-#line 2473 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2472 "src/parse-gram.c"

     break;
 
   case 31:
     break;
 
   case 31:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 368 "src/parse-gram.y"
     { yacc_flag = true; }
 #line 368 "src/parse-gram.y"
     { yacc_flag = true; }

-/* Line 1744 of yacc.c  */
-#line 2481 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2480 "src/parse-gram.c"

     break;
 
   case 33:
     break;
 
   case 33:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 373 "src/parse-gram.y"
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
 #line 373 "src/parse-gram.y"
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2489 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2488 "src/parse-gram.c"

     break;
 
   case 34:
     break;
 
   case 34:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 374 "src/parse-gram.y"
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
 #line 374 "src/parse-gram.y"
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2497 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2496 "src/parse-gram.c"

     break;
 
   case 37:
     break;
 
   case 37:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 386 "src/parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
     }
 #line 386 "src/parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
     }

-/* Line 1744 of yacc.c  */
-#line 2507 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2506 "src/parse-gram.c"

     break;
 
   case 38:
     break;
 
   case 38:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 390 "src/parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[0].list); list; list = list->next)
 #line 390 "src/parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[0].list); list; list = list->next)

-        symbol_list_destructor_set (list, (yyvsp[-1].code), (yylsp[-1]));
+        symbol_list_code_props_set (list, destructor, (yylsp[-1]), (yyvsp[-1].code));

       symbol_list_free ((yyvsp[0].list));
     }
       symbol_list_free ((yyvsp[0].list));
     }

-/* Line 1744 of yacc.c  */
-#line 2520 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2519 "src/parse-gram.c"

     break;
 
   case 39:
     break;
 
   case 39:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 397 "src/parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[0].list); list; list = list->next)
 #line 397 "src/parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[0].list); list; list = list->next)

-        symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1]));
+        symbol_list_code_props_set (list, printer, (yylsp[-1]), (yyvsp[-1].code));

       symbol_list_free ((yyvsp[0].list));
     }
       symbol_list_free ((yyvsp[0].list));
     }

-/* Line 1744 of yacc.c  */
-#line 2533 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2532 "src/parse-gram.c"

     break;
 
   case 40:
     break;
 
   case 40:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 404 "src/parse-gram.y"
     {
       default_prec = true;
     }
 #line 404 "src/parse-gram.y"
     {
       default_prec = true;
     }

-/* Line 1744 of yacc.c  */
-#line 2543 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2542 "src/parse-gram.c"

     break;
 
   case 41:
     break;
 
   case 41:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 408 "src/parse-gram.y"
     {
       default_prec = false;
     }
 #line 408 "src/parse-gram.y"
     {
       default_prec = false;
     }

-/* Line 1744 of yacc.c  */
-#line 2553 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2552 "src/parse-gram.c"

     break;
 
   case 42:
     break;
 
   case 42:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 412 "src/parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
 #line 412 "src/parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes


@@ -2561,89 +2560,89 @@ yyreduce:
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }

-/* Line 1744 of yacc.c  */
-#line 2566 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2565 "src/parse-gram.c"

     break;
 
   case 43:
     break;
 
   case 43:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 419 "src/parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
 #line 419 "src/parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }

-/* Line 1744 of yacc.c  */
-#line 2577 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2576 "src/parse-gram.c"

     break;
 
   case 44:
     break;
 
   case 44:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 433 "src/parse-gram.y"
     {}
 #line 433 "src/parse-gram.y"
     {}

-/* Line 1744 of yacc.c  */
-#line 2585 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2584 "src/parse-gram.c"

     break;
 
   case 45:
     break;
 
   case 45:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 434 "src/parse-gram.y"
     { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
 #line 434 "src/parse-gram.y"
     { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2593 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2592 "src/parse-gram.c"

     break;
 
   case 46:
     break;
 
   case 46:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 439 "src/parse-gram.y"
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
 #line 439 "src/parse-gram.y"
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }

-/* Line 1744 of yacc.c  */
-#line 2605 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2604 "src/parse-gram.c"

     break;
 
   case 47:
     break;
 
   case 47:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 450 "src/parse-gram.y"
     { current_class = nterm_sym; }
 #line 450 "src/parse-gram.y"
     { current_class = nterm_sym; }

-/* Line 1744 of yacc.c  */
-#line 2613 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2612 "src/parse-gram.c"

     break;
 
   case 48:
     break;
 
   case 48:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 451 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
 #line 451 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }

-/* Line 1744 of yacc.c  */
-#line 2624 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2623 "src/parse-gram.c"

     break;
 
   case 49:
     break;
 
   case 49:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 455 "src/parse-gram.y"
     { current_class = token_sym; }
 #line 455 "src/parse-gram.y"
     { current_class = token_sym; }

-/* Line 1744 of yacc.c  */
-#line 2632 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2631 "src/parse-gram.c"

     break;
 
   case 50:
     break;
 
   case 50:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 456 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
 #line 456 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }

-/* Line 1744 of yacc.c  */
-#line 2643 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2642 "src/parse-gram.c"

     break;
 
   case 51:
     break;
 
   case 51:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 461 "src/parse-gram.y"
     {
       symbol_list *list;
 #line 461 "src/parse-gram.y"
     {
       symbol_list *list;


@@ -2652,12 +2651,12 @@ yyreduce:
         symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
         symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }

-/* Line 1744 of yacc.c  */
-#line 2657 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2656 "src/parse-gram.c"

     break;
 
   case 52:
     break;
 
   case 52:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 472 "src/parse-gram.y"
     {
       symbol_list *list;
 #line 472 "src/parse-gram.y"
     {
       symbol_list *list;


@@ -2670,202 +2669,202 @@ yyreduce:
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }

-/* Line 1744 of yacc.c  */
-#line 2675 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2674 "src/parse-gram.c"

     break;
 
   case 53:
     break;
 
   case 53:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 486 "src/parse-gram.y"
     { (yyval.assoc) = left_assoc; }
 #line 486 "src/parse-gram.y"
     { (yyval.assoc) = left_assoc; }

-/* Line 1744 of yacc.c  */
-#line 2683 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2682 "src/parse-gram.c"

     break;
 
   case 54:
     break;
 
   case 54:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 487 "src/parse-gram.y"
     { (yyval.assoc) = right_assoc; }
 #line 487 "src/parse-gram.y"
     { (yyval.assoc) = right_assoc; }

-/* Line 1744 of yacc.c  */
-#line 2691 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2690 "src/parse-gram.c"

     break;
 
   case 55:
     break;
 
   case 55:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 488 "src/parse-gram.y"
     { (yyval.assoc) = non_assoc; }
 #line 488 "src/parse-gram.y"
     { (yyval.assoc) = non_assoc; }

-/* Line 1744 of yacc.c  */
-#line 2699 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2698 "src/parse-gram.c"

     break;
 
   case 56:
     break;
 
   case 56:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 489 "src/parse-gram.y"
     { (yyval.assoc) = precedence_assoc; }
 #line 489 "src/parse-gram.y"
     { (yyval.assoc) = precedence_assoc; }

-/* Line 1744 of yacc.c  */
-#line 2707 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2706 "src/parse-gram.c"

     break;
 
   case 57:
     break;
 
   case 57:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 493 "src/parse-gram.y"
     { current_type = NULL; }
 #line 493 "src/parse-gram.y"
     { current_type = NULL; }

-/* Line 1744 of yacc.c  */
-#line 2715 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2714 "src/parse-gram.c"

     break;
 
   case 58:
     break;
 
   case 58:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 494 "src/parse-gram.y"
     { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
 #line 494 "src/parse-gram.y"
     { current_type = (yyvsp[0].uniqstr); tag_seen = true; }

-/* Line 1744 of yacc.c  */
-#line 2723 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2722 "src/parse-gram.c"

     break;
 
   case 59:
     break;
 
   case 59:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 500 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
 #line 500 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2731 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2730 "src/parse-gram.c"

     break;
 
   case 60:
     break;
 
   case 60:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 502 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
 #line 502 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }

-/* Line 1744 of yacc.c  */
-#line 2739 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2738 "src/parse-gram.c"

     break;
 
   case 61:
     break;
 
   case 61:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 506 "src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[0].symbol); }
 #line 506 "src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[0].symbol); }

-/* Line 1744 of yacc.c  */
-#line 2747 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2746 "src/parse-gram.c"

     break;
 
   case 62:
     break;
 
   case 62:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 507 "src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
 #line 507 "src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2755 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2754 "src/parse-gram.c"

     break;
 
   case 63:
     break;
 
   case 63:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 513 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
 #line 513 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2763 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2762 "src/parse-gram.c"

     break;
 
   case 64:
     break;
 
   case 64:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 515 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
 #line 515 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }

-/* Line 1744 of yacc.c  */
-#line 2771 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2770 "src/parse-gram.c"

     break;
 
   case 65:
     break;
 
   case 65:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 519 "src/parse-gram.y"
     { (yyval.list) = (yyvsp[0].list); }
 #line 519 "src/parse-gram.y"
     { (yyval.list) = (yyvsp[0].list); }

-/* Line 1744 of yacc.c  */
-#line 2779 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2778 "src/parse-gram.c"

     break;
 
   case 66:
     break;
 
   case 66:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 520 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
 #line 520 "src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }

-/* Line 1744 of yacc.c  */
-#line 2787 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2786 "src/parse-gram.c"

     break;
 
   case 67:
     break;
 
   case 67:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 524 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
 #line 524 "src/parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2795 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2794 "src/parse-gram.c"

     break;
 
   case 68:
     break;
 
   case 68:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 525 "src/parse-gram.y"
     { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
 #line 525 "src/parse-gram.y"
     { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2803 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2802 "src/parse-gram.c"

     break;
 
   case 69:
     break;
 
   case 69:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 526 "src/parse-gram.y"
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
 #line 526 "src/parse-gram.y"
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2811 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2810 "src/parse-gram.c"

     break;
 
   case 70:
     break;
 
   case 70:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 527 "src/parse-gram.y"
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
 #line 527 "src/parse-gram.y"
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2819 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2818 "src/parse-gram.c"

     break;
 
   case 71:
     break;
 
   case 71:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 533 "src/parse-gram.y"
     {
        current_type = (yyvsp[0].uniqstr);
        tag_seen = true;
      }
 #line 533 "src/parse-gram.y"
     {
        current_type = (yyvsp[0].uniqstr);
        tag_seen = true;
      }

-/* Line 1744 of yacc.c  */
-#line 2830 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2829 "src/parse-gram.c"

     break;
 
   case 72:
     break;
 
   case 72:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 538 "src/parse-gram.y"
     {
        symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
        symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
      }
 #line 538 "src/parse-gram.y"
     {
        symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
        symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
      }

-/* Line 1744 of yacc.c  */
-#line 2841 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2840 "src/parse-gram.c"

     break;
 
   case 73:
     break;
 
   case 73:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 543 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
       symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
     }
 #line 543 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
       symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
     }

-/* Line 1744 of yacc.c  */
-#line 2853 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2852 "src/parse-gram.c"

     break;
 
   case 74:
     break;
 
   case 74:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 549 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
       symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));
     }
 #line 549 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
       symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));
     }

-/* Line 1744 of yacc.c  */
-#line 2865 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2864 "src/parse-gram.c"

     break;
 
   case 75:
     break;
 
   case 75:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 555 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
 #line 555 "src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);


@@ -2873,154 +2872,154 @@ yyreduce:
       symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
       symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));
     }
       symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
       symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));
     }

-/* Line 1744 of yacc.c  */
-#line 2878 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2877 "src/parse-gram.c"

     break;
 
   case 82:
     break;
 
   case 82:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 585 "src/parse-gram.y"
     {
       yyerrok;
     }
 #line 585 "src/parse-gram.y"
     {
       yyerrok;
     }

-/* Line 1744 of yacc.c  */
-#line 2888 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2887 "src/parse-gram.c"

     break;
 
   case 83:
     break;
 
   case 83:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 591 "src/parse-gram.y"
     { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
 #line 591 "src/parse-gram.y"
     { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }

-/* Line 1744 of yacc.c  */
-#line 2896 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2895 "src/parse-gram.c"

     break;
 
   case 84:
     break;
 
   case 84:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 592 "src/parse-gram.y"
     {
     /* Free the current lhs. */
     current_lhs (0, (yylsp[-3]), 0);
   }
 #line 592 "src/parse-gram.y"
     {
     /* Free the current lhs. */
     current_lhs (0, (yylsp[-3]), 0);
   }

-/* Line 1744 of yacc.c  */
-#line 2907 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2906 "src/parse-gram.c"

     break;
 
   case 85:
     break;
 
   case 85:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 599 "src/parse-gram.y"
     { grammar_current_rule_end ((yylsp[0])); }
 #line 599 "src/parse-gram.y"
     { grammar_current_rule_end ((yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2915 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2914 "src/parse-gram.c"

     break;
 
   case 86:
     break;
 
   case 86:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 600 "src/parse-gram.y"
     { grammar_current_rule_end ((yylsp[0])); }
 #line 600 "src/parse-gram.y"
     { grammar_current_rule_end ((yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2923 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2922 "src/parse-gram.c"

     break;
 
   case 88:
     break;
 
   case 88:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 606 "src/parse-gram.y"
     { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
                                   current_lhs_named_ref); }
 #line 606 "src/parse-gram.y"
     { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
                                   current_lhs_named_ref); }

-/* Line 1744 of yacc.c  */
-#line 2932 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2931 "src/parse-gram.c"

     break;
 
   case 89:
     break;
 
   case 89:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 609 "src/parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
 #line 609 "src/parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }

-/* Line 1744 of yacc.c  */
-#line 2940 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2939 "src/parse-gram.c"

     break;
 
   case 90:
     break;
 
   case 90:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 611 "src/parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }
 #line 611 "src/parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }

-/* Line 1744 of yacc.c  */
-#line 2948 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2947 "src/parse-gram.c"

     break;
 
   case 91:
     break;
 
   case 91:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 613 "src/parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
 #line 613 "src/parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }

-/* Line 1744 of yacc.c  */
-#line 2956 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2955 "src/parse-gram.c"

     break;
 
   case 92:
     break;
 
   case 92:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 615 "src/parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
 #line 615 "src/parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2964 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2963 "src/parse-gram.c"

     break;
 
   case 93:
     break;
 
   case 93:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 617 "src/parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
 #line 617 "src/parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2972 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2971 "src/parse-gram.c"

     break;
 
   case 94:
     break;
 
   case 94:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 619 "src/parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
 #line 619 "src/parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2980 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2979 "src/parse-gram.c"

     break;
 
   case 95:
     break;
 
   case 95:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 623 "src/parse-gram.y"
     { (yyval.named_ref) = 0; }
 #line 623 "src/parse-gram.y"
     { (yyval.named_ref) = 0; }

-/* Line 1744 of yacc.c  */
-#line 2988 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2987 "src/parse-gram.c"

     break;
 
   case 96:
     break;
 
   case 96:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 625 "src/parse-gram.y"
     { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
 #line 625 "src/parse-gram.y"
     { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 2996 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2995 "src/parse-gram.c"

     break;
 
   case 98:
     break;
 
   case 98:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 636 "src/parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
 #line 636 "src/parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }

-/* Line 1744 of yacc.c  */
-#line 3004 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 3003 "src/parse-gram.c"

     break;
 
   case 99:
     break;
 
   case 99:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 641 "src/parse-gram.y"
     { (yyval.chars) = ""; }
 #line 641 "src/parse-gram.y"
     { (yyval.chars) = ""; }

-/* Line 1744 of yacc.c  */
-#line 3012 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 3011 "src/parse-gram.c"

     break;
 
   case 100:
     break;
 
   case 100:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 642 "src/parse-gram.y"
     { (yyval.chars) = (yyvsp[0].uniqstr); }
 #line 642 "src/parse-gram.y"
     { (yyval.chars) = (yyvsp[0].uniqstr); }

-/* Line 1744 of yacc.c  */
-#line 3020 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 3019 "src/parse-gram.c"

     break;
 
   case 102:
     break;
 
   case 102:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 653 "src/parse-gram.y"
     {
       code_props plain_code;
 #line 653 "src/parse-gram.y"
     {
       code_props plain_code;


@@ -3030,51 +3029,51 @@ yyreduce:
       gram_scanner_last_string_free ();
       (yyval.chars) = plain_code.code;
     }
       gram_scanner_last_string_free ();
       (yyval.chars) = plain_code.code;
     }

-/* Line 1744 of yacc.c  */
-#line 3035 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 3034 "src/parse-gram.c"

     break;
 
   case 103:
     break;
 
   case 103:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 673 "src/parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
 #line 673 "src/parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 3043 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 3042 "src/parse-gram.c"

     break;
 
   case 104:
     break;
 
   case 104:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 675 "src/parse-gram.y"
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
       symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0]));
     }
 #line 675 "src/parse-gram.y"
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
       symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0]));
     }

-/* Line 1744 of yacc.c  */
-#line 3055 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 3054 "src/parse-gram.c"

     break;
 
   case 105:
     break;
 
   case 105:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 683 "src/parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
 #line 683 "src/parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }

-/* Line 1744 of yacc.c  */
-#line 3063 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 3062 "src/parse-gram.c"

     break;
 
   case 108:
     break;
 
   case 108:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 695 "src/parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
     }
 #line 695 "src/parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
     }

-/* Line 1744 of yacc.c  */
-#line 3074 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 3073 "src/parse-gram.c"

     break;
 
   case 110:
     break;
 
   case 110:

-/* Line 1744 of yacc.c  */
+/* Line 1735 of yacc.c  */

 #line 704 "src/parse-gram.y"
     {
       code_props plain_code;
 #line 704 "src/parse-gram.y"
     {
       code_props plain_code;


@@ -3084,13 +3083,13 @@ yyreduce:
       muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
       muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }

-/* Line 1744 of yacc.c  */
-#line 3089 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 3088 "src/parse-gram.c"

     break;
 
 
     break;
 
 

-/* Line 1744 of yacc.c  */
-#line 3094 "src/parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 3093 "src/parse-gram.c"

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


@@ -3337,7 +3336,7 @@ yyreturn:
   return YYID (yyresult);
 }
 
   return YYID (yyresult);
 }
 

-/* Line 2004 of yacc.c  */
+/* Line 1995 of yacc.c  */

 #line 714 "src/parse-gram.y"
 
 
 #line 714 "src/parse-gram.y"
 
 


@@ -3401,7 +3400,8 @@ add_param (param_type type, char *decl, location loc)
   }
 
   if (! name_start)
   }
 
   if (! name_start)

-    complain_at (loc, _("missing identifier in parameter declaration"));
+    complain_at (loc, complaint,
+                 _("missing identifier in parameter declaration"));

   else
     {
       char *name = xmemdup0 (name_start, strspn (name_start, alphanum));
   else
     {
       char *name = xmemdup0 (name_start, strspn (name_start, alphanum));


@@ -3421,7 +3421,7 @@ version_check (location const *loc, char const *version)
 {
   if (strverscmp (version, PACKAGE_VERSION) > 0)
     {
 {
   if (strverscmp (version, PACKAGE_VERSION) > 0)
     {

-      complain_at (*loc, "require bison %s, but have %s",
+      complain_at (*loc, complaint, "require bison %s, but have %s",

                    version, PACKAGE_VERSION);
       exit (EX_MISMATCH);
     }
                    version, PACKAGE_VERSION);
       exit (EX_MISMATCH);
     }


@@ -3430,7 +3430,7 @@ version_check (location const *loc, char const *version)
 static void
 gram_error (location const *loc, char const *msg)
 {
 static void
 gram_error (location const *loc, char const *msg)
 {

-  complain_at (*loc, "%s", msg);
+  complain_at (*loc, complaint, "%s", msg);

 }
 
 char const *
 }
 
 char const *