cosmetics: prettify names for compiled object for bison

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 643b20901eb65cc070bd57dbe0fdd9c3a78c9d58..8539085b69a9761d63f01c79f7fece22b2dd13f6 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.555-5c9e.  */
+/* A Bison parser, made by GNU Bison 2.5.1_rc2.741-bfd9.  */

 
 

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

 
 

-   Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.

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


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

-#define YYBISON_VERSION "2.4.555-5c9e"
+#define YYBISON_VERSION "2.5.1_rc2.741-bfd9"

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


@@ -76,7 +76,7 @@
 #line 1 "src/parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
 #line 1 "src/parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 

-   Copyright (C) 2002-2011 Free Software Foundation, Inc.
+   Copyright (C) 2002-2012 Free Software Foundation, Inc.

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


@@ -108,12 +108,13 @@
 #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 YY_LOCATION_PRINT(File, Loc) \
 
 #define YYLLOC_DEFAULT(Current, Rhs, N)  (Current) = lloc_default (Rhs, N)
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YY_LOCATION_PRINT(File, Loc) \

-         location_print (File, Loc)
+          location_print (File, Loc)

 
 static void version_check (location const *loc, char const *version);
 
 
 static void version_check (location const *loc, char const *version);
 


@@ -121,13 +122,21 @@ static void version_check (location const *loc, char const *version);
    FIXME: depends on the undocumented availability of YYLLOC.  */
 #undef  yyerror
 #define yyerror(Msg) \
    FIXME: depends on the undocumented availability of YYLLOC.  */
 #undef  yyerror
 #define yyerror(Msg) \

-       gram_error (&yylloc, Msg)
+        gram_error (&yylloc, Msg)

 static void gram_error (location const *, char const *);
 
 static char const *char_name (char);
 
 /* Line 269 of yacc.c  */
 static void gram_error (location const *, char const *);
 
 static char const *char_name (char);
 
 /* Line 269 of yacc.c  */

-#line 131 "src/parse-gram.c"
+#line 132 "src/parse-gram.c"
+
+# ifndef YY_NULL
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULL nullptr
+#  else
+#   define YY_NULL 0
+#  endif
+# endif

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


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

-/* Line 289 of yacc.c  */
-#line 202 "src/parse-gram.y"
+/* Line 291 of yacc.c  */
+#line 221 "src/parse-gram.y"

 
 # ifndef PARAM_TYPE
 #  define PARAM_TYPE
 
 # ifndef PARAM_TYPE
 #  define PARAM_TYPE


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

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

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


@@ -292,8 +301,8 @@ static char const *char_name (char);
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {

-/* Line 294 of yacc.c  */
-#line 88 "src/parse-gram.y"
+/* Line 296 of yacc.c  */
+#line 107 "src/parse-gram.y"

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


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

-/* Line 294 of yacc.c  */
-#line 226 "src/parse-gram.y"
+/* Line 296 of yacc.c  */
+#line 245 "src/parse-gram.y"

 
   param_type param;
 
 
 
   param_type param;
 
 

-/* Line 294 of yacc.c  */
-#line 316 "src/parse-gram.c"
+/* Line 296 of yacc.c  */
+#line 325 "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 */


@@ -335,26 +344,44 @@ typedef struct YYLTYPE
 
 /* Copy the second part of user declarations.  */
 
 
 /* Copy the second part of user declarations.  */
 

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

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

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

 
   static int current_prec = 0;
   static location current_lhs_location;
   static named_ref *current_lhs_named_ref;
 
   static int current_prec = 0;
   static location current_lhs_location;
   static named_ref *current_lhs_named_ref;

-  static symbol *current_lhs;
+  static symbol *current_lhs_symbol;

   static symbol_class current_class = unknown_sym;
   static uniqstr current_type = NULL;
 
   static symbol_class current_class = unknown_sym;
   static uniqstr current_type = NULL;
 

+  /** Set the new current left-hand side symbol, possibly common
+   * to several right-hand side parts of rule.
+   */
+  static
+  void
+  current_lhs(symbol *sym, location loc, named_ref *ref)
+  {
+    current_lhs_symbol = sym;
+    current_lhs_location = loc;
+    /* In order to simplify memory management, named references for lhs
+       are always assigned by deep copy into the current symbol_list
+       node.  This is because a single named-ref in the grammar may
+       result in several uses when the user factors lhs between several
+       rules using "|".  Therefore free the parser's original copy.  */
+    free (current_lhs_named_ref);
+    current_lhs_named_ref = ref;
+  }
+

   #define YYTYPE_INT16 int_fast16_t
   #define YYTYPE_INT8 int_fast8_t
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t
 
   #define YYTYPE_INT16 int_fast16_t
   #define YYTYPE_INT8 int_fast8_t
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t
 

-/* Line 345 of yacc.c  */
-#line 215 "src/parse-gram.y"
+/* Line 347 of yacc.c  */
+#line 234 "src/parse-gram.y"

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


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

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

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


@@ -475,7 +502,7 @@ YYID (yyi)
 #  endif
 #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
 #  endif
 #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \

-            && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))

 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   ifndef EXIT_SUCCESS
 #    define EXIT_SUCCESS 0
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   ifndef EXIT_SUCCESS
 #    define EXIT_SUCCESS 0


@@ -502,8 +529,8 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \

-        || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
-            && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
+             && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))

 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc


@@ -529,34 +556,34 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */

-# define YYSTACK_RELOCATE(Stack_alloc, Stack)                          \
-    do                                                                 \
-      {                                                                        \
-       YYSIZE_T yynewbytes;                                            \
-       YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
-       Stack = &yyptr->Stack_alloc;                                    \
-       yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-       yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                        \
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \

     while (YYID (0))
 
 #endif
 
 #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
     while (YYID (0))
 
 #endif
 
 #if defined YYCOPY_NEEDED && YYCOPY_NEEDED

-/* Copy COUNT objects from FROM to TO.  The source and destination do
+/* Copy COUNT objects from SRC to DST.  The source and destination do

    not overlap.  */
 # ifndef YYCOPY
 #  if defined __GNUC__ && 1 < __GNUC__
    not overlap.  */
 # ifndef YYCOPY
 #  if defined __GNUC__ && 1 < __GNUC__

-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))

 #  else
 #  else

-#   define YYCOPY(To, From, Count)             \
-      do                                       \
-       {                                       \
-         YYSIZE_T yyi;                         \
-         for (yyi = 0; yyi < (Count); yyi++)   \
-           (To)[yyi] = (From)[yyi];            \
-       }                                       \
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \

       while (YYID (0))
 #  endif
 # endif
       while (YYID (0))
 #  endif
 # endif


@@ -581,7 +608,7 @@ union yyalloc
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   311
 
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   311
 

-#define YYTRANSLATE(YYX)                                               \
+#define YYTRANSLATE(YYX)                                                \

   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM


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

-       0,   251,   251,   259,   261,   265,   266,   276,   280,   285,
-     286,   291,   296,   297,   298,   299,   300,   305,   314,   315,
-     316,   317,   318,   319,   320,   321,   321,   322,   323,   347,
-     348,   349,   350,   354,   355,   364,   365,   366,   370,   377,
-     384,   388,   392,   399,   414,   415,   419,   431,   431,   436,
-     436,   441,   452,   467,   468,   469,   470,   474,   475,   480,
-     482,   487,   488,   493,   495,   500,   501,   505,   506,   507,
-     508,   513,   518,   523,   529,   535,   546,   547,   556,   557,
-     563,   564,   565,   572,   572,   577,   578,   579,   584,   586,
-     588,   590,   592,   594,   596,   601,   603,   613,   614,   619,
-     620,   621,   630,   650,   652,   661,   666,   667,   672,   679,
-     681
+       0,   270,   270,   278,   280,   284,   285,   295,   299,   304,
+     305,   310,   315,   316,   317,   318,   319,   324,   333,   334,
+     335,   336,   337,   338,   339,   340,   340,   341,   342,   366,
+     367,   368,   369,   373,   374,   383,   384,   385,   389,   396,
+     403,   407,   411,   418,   433,   434,   438,   450,   450,   455,
+     455,   460,   471,   486,   487,   488,   489,   493,   494,   499,
+     501,   506,   507,   512,   514,   519,   520,   524,   525,   526,
+     527,   532,   537,   542,   548,   554,   565,   566,   575,   576,
+     582,   583,   584,   591,   591,   599,   600,   601,   606,   608,
+     610,   612,   614,   616,   618,   623,   625,   635,   636,   641,
+     642,   643,   652,   672,   674,   683,   688,   689,   694,   701,
+     703

 };
 #endif
 
 };
 #endif
 


@@ -667,7 +694,7 @@ static const char *const yytname[] =
   "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
   "rules_or_grammar_declaration", "rules", "$@4", "rhses.1", "rhs",
   "named_ref.opt", "variable", "content.opt", "braceless", "id",
   "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
   "rules_or_grammar_declaration", "rules", "$@4", "rhses.1", "rhs",
   "named_ref.opt", "variable", "content.opt", "braceless", "id",

-  "id_colon", "symbol", "string_as_id", "epilogue.opt", 0
+  "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL

 };
 #endif
 
 };
 #endif
 


@@ -857,14 +884,14 @@ static const yytype_uint8 yyr2[] =
 };
 
 
 };
 
 

-#define yyerrok                (yyerrstatus = 0)
-#define yyclearin      (yychar = YYEMPTY)
-#define YYEMPTY                (-2)
-#define YYEOF          0
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0

 
 

-#define YYACCEPT       goto yyacceptlab
-#define YYABORT                goto yyabortlab
-#define YYERROR                goto yyerrorlab
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab

 
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
 
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily


@@ -874,7 +901,7 @@ static const yytype_uint8 yyr2[] =
    in Bison 2.4.2's NEWS entry, where a plan to phase it out is
    discussed.  */
 
    in Bison 2.4.2's NEWS entry, where a plan to phase it out is
    discussed.  */
 

-#define YYFAIL         goto yyerrlab
+#define YYFAIL          goto yyerrlab

 #if defined YYFAIL
   /* This is here to suppress warnings from the GCC cpp's
      -Wunused-macros.  Normally we don't worry about that warning, but
 #if defined YYFAIL
   /* This is here to suppress warnings from the GCC cpp's
      -Wunused-macros.  Normally we don't worry about that warning, but


@@ -884,26 +911,27 @@ static const yytype_uint8 yyr2[] =
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
 

-#define YYBACKUP(Token, Value)                                 \
-do                                                             \
-  if (yychar == YYEMPTY && yylen == 1)                         \
-    {                                                          \
-      yychar = (Token);                                                \
-      yylval = (Value);                                                \
-      YYPOPSTACK (1);                                          \
-      YY_LAC_DISCARD ("YYBACKUP");                             \
-      goto yybackup;                                           \
-    }                                                          \
-  else                                                         \
-    {                                                          \
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      YY_LAC_DISCARD ("YYBACKUP");                              \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \

       yyerror (YY_("syntax error: cannot back up")); \
       yyerror (YY_("syntax error: cannot back up")); \

-      YYERROR;                                                 \
-    }                                                          \
+      YYERROR;                                                  \
+    }                                                           \

 while (YYID (0))
 
 
 while (YYID (0))
 
 

-#define YYTERROR       1
-#define YYERRCODE      256
+#define YYTERROR        1
+#define YYERRCODE       256

 
 
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
 
 
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].


@@ -912,22 +940,22 @@ while (YYID (0))
 
 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
 
 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
-    do                                                                 \
+# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
+    do                                                                  \

       if (YYID (N))                                                    \
       if (YYID (N))                                                    \

-       {                                                               \
-         (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
-         (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
-         (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
-         (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
-       }                                                               \
-      else                                                             \
-       {                                                               \
-         (Current).first_line   = (Current).last_line   =              \
-           YYRHSLOC (Rhs, 0).last_line;                                \
-         (Current).first_column = (Current).last_column =              \
-           YYRHSLOC (Rhs, 0).last_column;                              \
-       }                                                               \
+        {                                                               \
+          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
+          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
+          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
+          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).first_line   = (Current).last_line   =              \
+            YYRHSLOC (Rhs, 0).last_line;                                \
+          (Current).first_column = (Current).last_column =              \
+            YYRHSLOC (Rhs, 0).last_column;                              \
+        }                                                               \

     while (YYID (0))
 #endif
 
     while (YYID (0))
 #endif
 


@@ -938,10 +966,10 @@ while (YYID (0))
 
 #ifndef YY_LOCATION_PRINT
 # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 
 #ifndef YY_LOCATION_PRINT
 # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL

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

 # else
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 # endif
 # else
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 # endif


@@ -964,21 +992,21 @@ while (YYID (0))
 #  define YYFPRINTF fprintf
 # endif
 
 #  define YYFPRINTF fprintf
 # endif
 

-# define YYDPRINTF(Args)                       \
-do {                                           \
-  if (yydebug)                                 \
-    YYFPRINTF Args;                            \
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \

 } while (YYID (0))
 
 } while (YYID (0))
 

-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                   \
-do {                                                                     \
-  if (yydebug)                                                           \
-    {                                                                    \
-      YYFPRINTF (stderr, "%s ", Title);                                          \
-      yy_symbol_print (stderr,                                           \
-                 Type, Value, Location); \
-      YYFPRINTF (stderr, "\n");                                                  \
-    }                                                                    \
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value, Location); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \

 } while (YYID (0))
 
 
 } while (YYID (0))
 
 


@@ -1000,120 +1028,120 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     YYLTYPE const * const yylocationp;
 #endif
 {
     YYLTYPE const * const yylocationp;
 #endif
 {

+  FILE *yyo = yyoutput;
+  YYUSE(yyo);
+  YYUSE (yylocationp);

   if (!yyvaluep)
     return;
   if (!yyvaluep)
     return;

-  YYUSE (yylocationp);

 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);

-# else
-  YYUSE (yyoutput);

 # endif
   switch (yytype)
     {
             case 3: // "string"
 
 # endif
   switch (yytype)
     {
             case 3: // "string"
 

-/* Line 751 of yacc.c  */
-#line 175 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 194 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 188 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 207 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 184 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 203 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 177 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 196 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 182 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 201 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 169 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 188 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 177 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 196 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 181 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 200 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 183 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 202 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 177 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 196 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 185 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 204 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 231 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 250 "src/parse-gram.y"

         {
   switch (((*yyvaluep).param))
     {
         {
   switch (((*yyvaluep).param))
     {


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

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

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

-/* Line 751 of yacc.c  */
-#line 191 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 210 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 181 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 200 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 177 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 196 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 177 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 196 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 191 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 210 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 192 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 211 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 191 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 210 "src/parse-gram.y"

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

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

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

-/* Line 751 of yacc.c  */
-#line 191 "src/parse-gram.y"
+/* Line 755 of yacc.c  */
+#line 210 "src/parse-gram.y"

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

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

         break;
 
       default:
         break;
 
       default:

-       break;
+        break;

     }
 }
 
     }
 }
 


@@ -1261,10 +1289,10 @@ yy_stack_print (yybottom, yytop)
   YYFPRINTF (stderr, "\n");
 }
 
   YYFPRINTF (stderr, "\n");
 }
 

-# define YY_STACK_PRINT(Bottom, Top)                           \
-do {                                                           \
-  if (yydebug)                                                 \
-    yy_stack_print ((Bottom), (Top));                          \
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \

 } while (YYID (0))
 
 
 } while (YYID (0))
 
 


@@ -1302,9 +1330,9 @@ yy_reduce_print (yyssp, yyvsp, yylsp, yyrule)
     }
 }
 
     }
 }
 

-# define YY_REDUCE_PRINT(Rule)         \
-do {                                   \
-  if (yydebug)                         \
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \

     yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \
 } while (YYID (0))
 
     yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \
 } while (YYID (0))
 


@@ -1320,7 +1348,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */

-#ifndef        YYINITDEPTH
+#ifndef YYINITDEPTH

 # define YYINITDEPTH 200
 #endif
 
 # define YYINITDEPTH 200
 #endif
 


@@ -1639,27 +1667,27 @@ yytnamerr (char *yyres, const char *yystr)
       char const *yyp = yystr;
 
       for (;;)
       char const *yyp = yystr;
 
       for (;;)

-       switch (*++yyp)
-         {
-         case '\'':
-         case ',':
-           goto do_not_strip_quotes;
-
-         case '\\':
-           if (*++yyp != '\\')
-             goto do_not_strip_quotes;
-           /* Fall through.  */
-         default:
-           if (yyres)
-             yyres[yyn] = *yyp;
-           yyn++;
-           break;
-
-         case '"':
-           if (yyres)
-             yyres[yyn] = '\0';
-           return yyn;
-         }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }

     do_not_strip_quotes: ;
     }
 
     do_not_strip_quotes: ;
     }
 


@@ -1685,12 +1713,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                 yytype_int16 *yyesa, yytype_int16 **yyes,
                 YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken)
 {
                 yytype_int16 *yyesa, yytype_int16 **yyes,
                 YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken)
 {

-  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);

   YYSIZE_T yysize = yysize0;
   YYSIZE_T yysize1;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
   YYSIZE_T yysize = yysize0;
   YYSIZE_T yysize1;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */

-  const char *yyformat = 0;
+  const char *yyformat = YY_NULL;

   /* Arguments of yyformat. */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
   /* Number of reported tokens (one for the "unexpected", one per
   /* Arguments of yyformat. */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
   /* Number of reported tokens (one for the "unexpected", one per


@@ -1748,7 +1776,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                     break;
                   }
                 yyarg[yycount++] = yytname[yyx];
                     break;
                   }
                 yyarg[yycount++] = yytname[yyx];

-                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+                yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);

                 if (! (yysize <= yysize1
                        && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
                   return 2;
                 if (! (yysize <= yysize1
                        && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
                   return 2;


@@ -1830,9 +1858,8 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
     YYLTYPE *yylocationp;
 #endif
 {
     YYLTYPE *yylocationp;
 #endif
 {

-  YYUSE (yyvaluep);
+  YYUSE(yyvaluep);

   YYUSE (yylocationp);
   YYUSE (yylocationp);

-

   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);


@@ -1840,7 +1867,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
   switch (yytype)
     {
       default:
   switch (yytype)
     {
       default:

-       break;
+        break;

     }
 }
 
     }
 }
 


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


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

-/* Line 1524 of yacc.c  */
-#line 80 "src/parse-gram.y"
+/* Line 1528 of yacc.c  */
+#line 99 "src/parse-gram.y"

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

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

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


@@ -2025,26 +2052,26 @@ YYLTYPE yylloc;
 
 #ifdef yyoverflow
       {
 
 #ifdef yyoverflow
       {

-       /* Give user a chance to reallocate the stack.  Use copies of
-          these so that the &'s don't force the real ones into
-          memory.  */
-       YYSTYPE *yyvs1 = yyvs;
-       yytype_int16 *yyss1 = yyss;
-       YYLTYPE *yyls1 = yyls;
-
-       /* Each stack pointer address is followed by the size of the
-          data in use in that stack, in bytes.  This used to be a
-          conditional around just the two extra args, but that might
-          be undefined if yyoverflow is a macro.  */
-       yyoverflow (YY_("memory exhausted"),
-                   &yyss1, yysize * sizeof (*yyssp),
-                   &yyvs1, yysize * sizeof (*yyvsp),
-                   &yyls1, yysize * sizeof (*yylsp),
-                   &yystacksize);
-
-       yyls = yyls1;
-       yyss = yyss1;
-       yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+        YYLTYPE *yyls1 = yyls;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yyls1, yysize * sizeof (*yylsp),
+                    &yystacksize);
+
+        yyls = yyls1;
+        yyss = yyss1;
+        yyvs = yyvs1;

       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE


@@ -2052,23 +2079,23 @@ YYLTYPE yylloc;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)

-       goto yyexhaustedlab;
+        goto yyexhaustedlab;

       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)

-       yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;

 
       {
 
       {

-       yytype_int16 *yyss1 = yyss;
-       union yyalloc *yyptr =
-         (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-       if (! yyptr)
-         goto yyexhaustedlab;
-       YYSTACK_RELOCATE (yyss_alloc, yyss);
-       YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-       YYSTACK_RELOCATE (yyls_alloc, yyls);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+        YYSTACK_RELOCATE (yyls_alloc, yyls);

 #  undef YYSTACK_RELOCATE
 #  undef YYSTACK_RELOCATE

-       if (yyss1 != yyssa)
-         YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);

       }
 # endif
 #endif /* no yyoverflow */
       }
 # endif
 #endif /* no yyoverflow */


@@ -2078,10 +2105,10 @@ YYLTYPE yylloc;
       yylsp = yyls + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
       yylsp = yyls + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",

-                 (unsigned long int) yystacksize));
+                  (unsigned long int) yystacksize));

 
       if (yyss + yystacksize - 1 <= yyssp)
 
       if (yyss + yystacksize - 1 <= yyssp)

-       YYABORT;
+        YYABORT;

     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));


@@ -2195,8 +2222,8 @@ yyreduce:
     switch (yyn)
       {
           case 6:
     switch (yyn)
       {
           case 6:

-/* Line 1740 of yacc.c  */
-#line 267 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 286 "src/parse-gram.y"

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


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

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

     break;
 
   case 7:
     break;
 
   case 7:

-/* Line 1740 of yacc.c  */
-#line 277 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 296 "src/parse-gram.y"

     {
       muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
     }
     {
       muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
     }

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

     break;
 
   case 8:
     break;
 
   case 8:

-/* Line 1740 of yacc.c  */
-#line 281 "src/parse-gram.y"
+/* Line 1744 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);
     }
     {
       muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }

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

     break;
 
   case 9:
     break;
 
   case 9:

-/* Line 1740 of yacc.c  */
-#line 285 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 304 "src/parse-gram.y"

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

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

     break;
 
   case 10:
     break;
 
   case 10:

-/* Line 1740 of yacc.c  */
-#line 287 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 306 "src/parse-gram.y"

     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[0].chars));
     }
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[0].chars));
     }

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

     break;
 
   case 11:
     break;
 
   case 11:

-/* Line 1740 of yacc.c  */
-#line 292 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 311 "src/parse-gram.y"

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

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

     break;
 
   case 12:
     break;
 
   case 12:

-/* Line 1740 of yacc.c  */
-#line 296 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 315 "src/parse-gram.y"

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

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

     break;
 
   case 13:
     break;
 
   case 13:

-/* Line 1740 of yacc.c  */
-#line 297 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 316 "src/parse-gram.y"

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

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

     break;
 
   case 14:
     break;
 
   case 14:

-/* Line 1740 of yacc.c  */
-#line 298 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 317 "src/parse-gram.y"

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

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

     break;
 
   case 15:
     break;
 
   case 15:

-/* Line 1740 of yacc.c  */
-#line 299 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 318 "src/parse-gram.y"

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

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

     break;
 
   case 16:
     break;
 
   case 16:

-/* Line 1740 of yacc.c  */
-#line 301 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 320 "src/parse-gram.y"

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

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

     break;
 
   case 17:
     break;
 
   case 17:

-/* Line 1740 of yacc.c  */
-#line 306 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 325 "src/parse-gram.y"

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


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

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

     break;
 
   case 18:
     break;
 
   case 18:

-/* Line 1740 of yacc.c  */
-#line 314 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 333 "src/parse-gram.y"

     { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
     { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }

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

     break;
 
   case 19:
     break;
 
   case 19:

-/* Line 1740 of yacc.c  */
-#line 315 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 334 "src/parse-gram.y"

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

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

     break;
 
   case 20:
     break;
 
   case 20:

-/* Line 1740 of yacc.c  */
-#line 316 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 335 "src/parse-gram.y"

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

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

     break;
 
   case 21:
     break;
 
   case 21:

-/* Line 1740 of yacc.c  */
-#line 317 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 336 "src/parse-gram.y"

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

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

     break;
 
   case 22:
     break;
 
   case 22:

-/* Line 1740 of yacc.c  */
-#line 318 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 337 "src/parse-gram.y"

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

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

     break;
 
   case 23:
     break;
 
   case 23:

-/* Line 1740 of yacc.c  */
-#line 319 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 338 "src/parse-gram.y"

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

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

     break;
 
   case 24:
     break;
 
   case 24:

-/* Line 1740 of yacc.c  */
-#line 320 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 339 "src/parse-gram.y"

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

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

     break;
 
   case 25:
     break;
 
   case 25:

-/* Line 1740 of yacc.c  */
-#line 321 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 340 "src/parse-gram.y"

     { current_param = (yyvsp[0].param); }
     { current_param = (yyvsp[0].param); }

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

     break;
 
   case 26:
     break;
 
   case 26:

-/* Line 1740 of yacc.c  */
-#line 321 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 340 "src/parse-gram.y"

     { current_param = param_none; }
     { current_param = param_none; }

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

     break;
 
   case 27:
     break;
 
   case 27:

-/* Line 1740 of yacc.c  */
-#line 322 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 341 "src/parse-gram.y"

     { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
     { version_check (&(yylsp[0]), (yyvsp[0].chars)); }

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

     break;
 
   case 28:
     break;
 
   case 28:

-/* Line 1740 of yacc.c  */
-#line 324 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 343 "src/parse-gram.y"

     {
       char const *skeleton_user = (yyvsp[0].chars);
       if (strchr (skeleton_user, '/'))
     {
       char const *skeleton_user = (yyvsp[0].chars);
       if (strchr (skeleton_user, '/'))


@@ -2416,7 +2443,7 @@ yyreduce:
             xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
           if (dir_length > 0)
             {
             xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
           if (dir_length > 0)
             {

-              strncpy (skeleton_build, current_file, dir_length);
+              memcpy (skeleton_build, current_file, dir_length);

               skeleton_build[dir_length++] = '/';
             }
           strcpy (skeleton_build + dir_length, skeleton_user);
               skeleton_build[dir_length++] = '/';
             }
           strcpy (skeleton_build + dir_length, skeleton_user);


@@ -2425,566 +2452,576 @@ yyreduce:
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }

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

     break;
 
   case 29:
     break;
 
   case 29:

-/* Line 1740 of yacc.c  */
-#line 347 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 366 "src/parse-gram.y"

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

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

     break;
 
   case 30:
     break;
 
   case 30:

-/* Line 1740 of yacc.c  */
-#line 348 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 367 "src/parse-gram.y"

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

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

     break;
 
   case 31:
     break;
 
   case 31:

-/* Line 1740 of yacc.c  */
-#line 349 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 368 "src/parse-gram.y"

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

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

     break;
 
   case 33:
     break;
 
   case 33:

-/* Line 1740 of yacc.c  */
-#line 354 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 373 "src/parse-gram.y"

     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }

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

     break;
 
   case 34:
     break;
 
   case 34:

-/* Line 1740 of yacc.c  */
-#line 355 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 374 "src/parse-gram.y"

     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }

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

     break;
 
   case 37:
     break;
 
   case 37:

-/* Line 1740 of yacc.c  */
-#line 367 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 386 "src/parse-gram.y"

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

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

     break;
 
   case 38:
     break;
 
   case 38:

-/* Line 1740 of yacc.c  */
-#line 371 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 390 "src/parse-gram.y"

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

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

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

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

     break;
 
   case 39:
     break;
 
   case 39:

-/* Line 1740 of yacc.c  */
-#line 378 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 397 "src/parse-gram.y"

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

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

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

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

     break;
 
   case 40:
     break;
 
   case 40:

-/* Line 1740 of yacc.c  */
-#line 385 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 404 "src/parse-gram.y"

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

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

     break;
 
   case 41:
     break;
 
   case 41:

-/* Line 1740 of yacc.c  */
-#line 389 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 408 "src/parse-gram.y"

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

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

     break;
 
   case 42:
     break;
 
   case 42:

-/* Line 1740 of yacc.c  */
-#line 393 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 412 "src/parse-gram.y"

     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
   case 43:
     break;
 
   case 43:

-/* Line 1740 of yacc.c  */
-#line 400 "src/parse-gram.y"
+/* Line 1744 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 ();
     }
     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
   case 44:
     break;
 
   case 44:

-/* Line 1740 of yacc.c  */
-#line 414 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 433 "src/parse-gram.y"

     {}
     {}

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

     break;
 
   case 45:
     break;
 
   case 45:

-/* Line 1740 of yacc.c  */
-#line 415 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 434 "src/parse-gram.y"

     { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
     { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }

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

     break;
 
   case 46:
     break;
 
   case 46:

-/* Line 1740 of yacc.c  */
-#line 420 "src/parse-gram.y"
+/* Line 1744 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 ();
     }
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
   case 47:
     break;
 
   case 47:

-/* Line 1740 of yacc.c  */
-#line 431 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 450 "src/parse-gram.y"

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

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

     break;
 
   case 48:
     break;
 
   case 48:

-/* Line 1740 of yacc.c  */
-#line 432 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 451 "src/parse-gram.y"

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

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

     break;
 
   case 49:
     break;
 
   case 49:

-/* Line 1740 of yacc.c  */
-#line 436 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 455 "src/parse-gram.y"

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

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

     break;
 
   case 50:
     break;
 
   case 50:

-/* Line 1740 of yacc.c  */
-#line 437 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 456 "src/parse-gram.y"

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

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

     break;
 
   case 51:
     break;
 
   case 51:

-/* Line 1740 of yacc.c  */
-#line 442 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 461 "src/parse-gram.y"

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

-       symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
+        symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));

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

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

     break;
 
   case 52:
     break;
 
   case 52:

-/* Line 1740 of yacc.c  */
-#line 453 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 472 "src/parse-gram.y"

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

-       {
-         symbol_type_set (list->content.sym, current_type, (yylsp[-1]));
-         symbol_precedence_set (list->content.sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2]));
-       }
+        {
+          symbol_type_set (list->content.sym, current_type, (yylsp[-1]));
+          symbol_precedence_set (list->content.sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2]));
+        }

       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }

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

     break;
 
   case 53:
     break;
 
   case 53:

-/* Line 1740 of yacc.c  */
-#line 467 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 486 "src/parse-gram.y"

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

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

     break;
 
   case 54:
     break;
 
   case 54:

-/* Line 1740 of yacc.c  */
-#line 468 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 487 "src/parse-gram.y"

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

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

     break;
 
   case 55:
     break;
 
   case 55:

-/* Line 1740 of yacc.c  */
-#line 469 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 488 "src/parse-gram.y"

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

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

     break;
 
   case 56:
     break;
 
   case 56:

-/* Line 1740 of yacc.c  */
-#line 470 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 489 "src/parse-gram.y"

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

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

     break;
 
   case 57:
     break;
 
   case 57:

-/* Line 1740 of yacc.c  */
-#line 474 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 493 "src/parse-gram.y"

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

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

     break;
 
   case 58:
     break;
 
   case 58:

-/* Line 1740 of yacc.c  */
-#line 475 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 494 "src/parse-gram.y"

     { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
     { current_type = (yyvsp[0].uniqstr); tag_seen = true; }

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

     break;
 
   case 59:
     break;
 
   case 59:

-/* Line 1740 of yacc.c  */
-#line 481 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 500 "src/parse-gram.y"

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

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

     break;
 
   case 60:
     break;
 
   case 60:

-/* Line 1740 of yacc.c  */
-#line 483 "src/parse-gram.y"
+/* Line 1744 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]))); }
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }

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

     break;
 
   case 61:
     break;
 
   case 61:

-/* Line 1740 of yacc.c  */
-#line 487 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 506 "src/parse-gram.y"

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

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

     break;
 
   case 62:
     break;
 
   case 62:

-/* Line 1740 of yacc.c  */
-#line 488 "src/parse-gram.y"
+/* Line 1744 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])); }
     { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }

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

     break;
 
   case 63:
     break;
 
   case 63:

-/* Line 1740 of yacc.c  */
-#line 494 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 513 "src/parse-gram.y"

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

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

     break;
 
   case 64:
     break;
 
   case 64:

-/* Line 1740 of yacc.c  */
-#line 496 "src/parse-gram.y"
+/* Line 1744 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]))); }
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }

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

     break;
 
   case 65:
     break;
 
   case 65:

-/* Line 1740 of yacc.c  */
-#line 500 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 519 "src/parse-gram.y"

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

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

     break;
 
   case 66:
     break;
 
   case 66:

-/* Line 1740 of yacc.c  */
-#line 501 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 520 "src/parse-gram.y"

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

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

     break;
 
   case 67:
     break;
 
   case 67:

-/* Line 1740 of yacc.c  */
-#line 505 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 524 "src/parse-gram.y"

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

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

     break;
 
   case 68:
     break;
 
   case 68:

-/* Line 1740 of yacc.c  */
-#line 506 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 525 "src/parse-gram.y"

     { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
     { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }

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

     break;
 
   case 69:
     break;
 
   case 69:

-/* Line 1740 of yacc.c  */
-#line 507 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 526 "src/parse-gram.y"

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

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

     break;
 
   case 70:
     break;
 
   case 70:

-/* Line 1740 of yacc.c  */
-#line 508 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 527 "src/parse-gram.y"

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

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

     break;
 
   case 71:
     break;
 
   case 71:

-/* Line 1740 of yacc.c  */
-#line 514 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 533 "src/parse-gram.y"

     {
        current_type = (yyvsp[0].uniqstr);
        tag_seen = true;
      }
     {
        current_type = (yyvsp[0].uniqstr);
        tag_seen = true;
      }

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

     break;
 
   case 72:
     break;
 
   case 72:

-/* Line 1740 of yacc.c  */
-#line 519 "src/parse-gram.y"
+/* Line 1744 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]));
      }
     {
        symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
        symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
      }

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

     break;
 
   case 73:
     break;
 
   case 73:

-/* Line 1740 of yacc.c  */
-#line 524 "src/parse-gram.y"
+/* Line 1744 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]));
     }
     {
       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 1740 of yacc.c  */
-#line 2826 "src/parse-gram.c"
+/* Line 1744 of yacc.c  */
+#line 2853 "src/parse-gram.c"

     break;
 
   case 74:
     break;
 
   case 74:

-/* Line 1740 of yacc.c  */
-#line 530 "src/parse-gram.y"
+/* Line 1744 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));
     }
     {
       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 1740 of yacc.c  */
-#line 2838 "src/parse-gram.c"
+/* Line 1744 of yacc.c  */
+#line 2865 "src/parse-gram.c"

     break;
 
   case 75:
     break;
 
   case 75:

-/* Line 1740 of yacc.c  */
-#line 536 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 555 "src/parse-gram.y"

     {
       symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
       symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
       symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
       symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));
     }
     {
       symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
       symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
       symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
       symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));
     }

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

     break;
 
   case 82:
     break;
 
   case 82:

-/* Line 1740 of yacc.c  */
-#line 566 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 585 "src/parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }

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

     break;
 
   case 83:
     break;
 
   case 83:

-/* Line 1740 of yacc.c  */
-#line 572 "src/parse-gram.y"
-    { current_lhs = (yyvsp[-1].symbol); current_lhs_location = (yylsp[-1]);
-    current_lhs_named_ref = (yyvsp[0].named_ref); }
-/* Line 1740 of yacc.c  */
-#line 2870 "src/parse-gram.c"
+/* Line 1744 of yacc.c  */
+#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"
+    break;
+
+  case 84:
+/* Line 1744 of yacc.c  */
+#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"

     break;
 
   case 85:
     break;
 
   case 85:

-/* Line 1740 of yacc.c  */
-#line 577 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 599 "src/parse-gram.y"

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

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

     break;
 
   case 86:
     break;
 
   case 86:

-/* Line 1740 of yacc.c  */
-#line 578 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 600 "src/parse-gram.y"

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

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

     break;
 
   case 88:
     break;
 
   case 88:

-/* Line 1740 of yacc.c  */
-#line 584 "src/parse-gram.y"
-    { grammar_current_rule_begin (current_lhs, current_lhs_location,
-                                 current_lhs_named_ref); }
-/* Line 1740 of yacc.c  */
-#line 2895 "src/parse-gram.c"
+/* Line 1744 of yacc.c  */
+#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"

     break;
 
   case 89:
     break;
 
   case 89:

-/* Line 1740 of yacc.c  */
-#line 587 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 609 "src/parse-gram.y"

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

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

     break;
 
   case 90:
     break;
 
   case 90:

-/* Line 1740 of yacc.c  */
-#line 589 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 611 "src/parse-gram.y"

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

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

     break;
 
   case 91:
     break;
 
   case 91:

-/* Line 1740 of yacc.c  */
-#line 591 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 613 "src/parse-gram.y"

     { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
     { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }

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

     break;
 
   case 92:
     break;
 
   case 92:

-/* Line 1740 of yacc.c  */
-#line 593 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 615 "src/parse-gram.y"

     { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
     { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }

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

     break;
 
   case 93:
     break;
 
   case 93:

-/* Line 1740 of yacc.c  */
-#line 595 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 617 "src/parse-gram.y"

     { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
     { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }

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

     break;
 
   case 94:
     break;
 
   case 94:

-/* Line 1740 of yacc.c  */
-#line 597 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 619 "src/parse-gram.y"

     { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
     { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }

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

     break;
 
   case 95:
     break;
 
   case 95:

-/* Line 1740 of yacc.c  */
-#line 601 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 623 "src/parse-gram.y"

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

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

     break;
 
   case 96:
     break;
 
   case 96:

-/* Line 1740 of yacc.c  */
-#line 603 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 625 "src/parse-gram.y"

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

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

     break;
 
   case 98:
     break;
 
   case 98:

-/* Line 1740 of yacc.c  */
-#line 614 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 636 "src/parse-gram.y"

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

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

     break;
 
   case 99:
     break;
 
   case 99:

-/* Line 1740 of yacc.c  */
-#line 619 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 641 "src/parse-gram.y"

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

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

     break;
 
   case 100:
     break;
 
   case 100:

-/* Line 1740 of yacc.c  */
-#line 620 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 642 "src/parse-gram.y"

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

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

     break;
 
   case 102:
     break;
 
   case 102:

-/* Line 1740 of yacc.c  */
-#line 631 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 653 "src/parse-gram.y"

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


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

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

     break;
 
   case 103:
     break;
 
   case 103:

-/* Line 1740 of yacc.c  */
-#line 651 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 673 "src/parse-gram.y"

     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }

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

     break;
 
   case 104:
     break;
 
   case 104:

-/* Line 1740 of yacc.c  */
-#line 653 "src/parse-gram.y"
+/* Line 1744 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]));
     }
     {
       (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 1740 of yacc.c  */
-#line 3018 "src/parse-gram.c"
+/* Line 1744 of yacc.c  */
+#line 3055 "src/parse-gram.c"

     break;
 
   case 105:
     break;
 
   case 105:

-/* Line 1740 of yacc.c  */
-#line 661 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 683 "src/parse-gram.y"

     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }

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

     break;
 
   case 108:
     break;
 
   case 108:

-/* Line 1740 of yacc.c  */
-#line 673 "src/parse-gram.y"
+/* Line 1744 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);
     }
     {
       (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 1740 of yacc.c  */
-#line 3037 "src/parse-gram.c"
+/* Line 1744 of yacc.c  */
+#line 3074 "src/parse-gram.c"

     break;
 
   case 110:
     break;
 
   case 110:

-/* Line 1740 of yacc.c  */
-#line 682 "src/parse-gram.y"
+/* Line 1744 of yacc.c  */
+#line 704 "src/parse-gram.y"

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


@@ -3047,13 +3084,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 1740 of yacc.c  */
-#line 3052 "src/parse-gram.c"
+/* Line 1744 of yacc.c  */
+#line 3089 "src/parse-gram.c"

     break;
 
 
     break;
 
 

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

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


@@ -3150,20 +3187,20 @@ yyerrlab:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an

-        error, discard it.  */
+         error, discard it.  */

 
       if (yychar <= YYEOF)
 
       if (yychar <= YYEOF)

-       {
-         /* Return failure if at end of input.  */
-         if (yychar == YYEOF)
-           YYABORT;
-       }
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }

       else
       else

-       {
-         yydestruct ("Error: discarding",
-                     yytoken, &yylval, &yylloc);
-         yychar = YYEMPTY;
-       }
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval, &yylloc);
+          yychar = YYEMPTY;
+        }

     }
 
   /* Else will try to reuse lookahead token after shifting the error
     }
 
   /* Else will try to reuse lookahead token after shifting the error


@@ -3196,29 +3233,29 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:

-  yyerrstatus = 3;     /* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */

 
   for (;;)
     {
       yyn = yypact[yystate];
       if (!yypact_value_is_default (yyn))
 
   for (;;)
     {
       yyn = yypact[yystate];
       if (!yypact_value_is_default (yyn))

-       {
-         yyn += YYTERROR;
-         if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-           {
-             yyn = yytable[yyn];
-             if (0 < yyn)
-               break;
-           }
-       }
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }

 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)

-       YYABORT;
+        YYABORT;

 
       yyerror_range[1] = *yylsp;
       yydestruct ("Error: popping",
 
       yyerror_range[1] = *yylsp;
       yydestruct ("Error: popping",

-                 yystos[yystate], yyvsp, yylsp);
+                  yystos[yystate], yyvsp, yylsp);

       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);


@@ -3283,7 +3320,7 @@ yyreturn:
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",

-                 yystos[*yyssp], yyvsp, yylsp);
+                  yystos[*yyssp], yyvsp, yylsp);

       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow


@@ -3300,8 +3337,8 @@ yyreturn:
   return YYID (yyresult);
 }
 
   return YYID (yyresult);
 }
 

-/* Line 2000 of yacc.c  */
-#line 692 "src/parse-gram.y"
+/* Line 2004 of yacc.c  */
+#line 714 "src/parse-gram.y"

 
 
 
 
 
 


@@ -3321,14 +3358,14 @@ lloc_default (YYLTYPE const *rhs, int n)
   loc.start = rhs[n].end;
   loc.end = rhs[n].end;
 
   loc.start = rhs[n].end;
   loc.end = rhs[n].end;
 

-  /* Ignore empty nonterminals the start of the the right-hand side.
+  /* Ignore empty nonterminals the start of the right-hand side.

      Do not bother to ignore them at the end of the right-hand side,
      since empty nonterminals have the same end as their predecessors.  */
   for (i = 1; i <= n; i++)
     if (! equal_boundaries (rhs[i].start, rhs[i].end))
       {
      Do not bother to ignore them at the end of the right-hand side,
      since empty nonterminals have the same end as their predecessors.  */
   for (i = 1; i <= n; i++)
     if (! equal_boundaries (rhs[i].start, rhs[i].end))
       {

-       loc.start = rhs[i].start;
-       break;
+        loc.start = rhs[i].start;
+        break;

       }
 
   return loc;
       }
 
   return loc;


@@ -3367,17 +3404,7 @@ add_param (param_type type, char *decl, location loc)
     complain_at (loc, _("missing identifier in parameter declaration"));
   else
     {
     complain_at (loc, _("missing identifier in parameter declaration"));
   else
     {

-      char *name;
-      size_t name_len;
-
-      for (name_len = 1;
-          memchr (alphanum, name_start[name_len], sizeof alphanum);
-          name_len++)
-       continue;
-
-      name = xmalloc (name_len + 1);
-      memcpy (name, name_start, name_len);
-      name[name_len] = '\0';
+      char *name = xmemdup0 (name_start, strspn (name_start, alphanum));

       if (type & param_lex)
         muscle_pair_list_grow ("lex_param", decl, name);
       if (type & param_parse)
       if (type & param_lex)
         muscle_pair_list_grow ("lex_param", decl, name);
       if (type & param_parse)


@@ -3395,8 +3422,8 @@ version_check (location const *loc, char const *version)
   if (strverscmp (version, PACKAGE_VERSION) > 0)
     {
       complain_at (*loc, "require bison %s, but have %s",
   if (strverscmp (version, PACKAGE_VERSION) > 0)
     {
       complain_at (*loc, "require bison %s, but have %s",

-                  version, PACKAGE_VERSION);
-      exit (63);
+                   version, PACKAGE_VERSION);
+      exit (EX_MISMATCH);

     }
 }
 
     }
 }