yacc.c: do not define location support when not using locations

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 84501d534da73ed45ef9d5ef65b3c80e1258b8af..56139fd6a31ece16e65a710592a8ed12686d168d 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.1.259-f52e1.  */
+/* A Bison parser, made by GNU Bison 2.6.4.4-8c79c-dirty.  */

 
 

-/* Skeleton 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.1.259-f52e1"
+#define YYBISON_VERSION "2.6.4.4-8c79c-dirty"

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


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

-/* Using locations.  */
-#define YYLSP_NEEDED 1
-
+/* Substitute the type names.  */
+#define YYSTYPE         GRAM_STYPE
+#define YYLTYPE         GRAM_LTYPE

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


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

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

 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
 #line 1 "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.
 


@@ -97,6 +96,7 @@
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"
 

+#include "c-ctype.h"

 #include "complain.h"
 #include "conflicts.h"
 #include "files.h"
 #include "complain.h"
 #include "conflicts.h"
 #include "files.h"


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

+#include "xmemdup0.h"

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


@@ -138,24 +139,45 @@ static void add_param (char const *type, char *decl, location loc);
 
 static symbol_class current_class = unknown_sym;
 static uniqstr current_type = NULL;
 
 static symbol_class current_class = unknown_sym;
 static uniqstr current_type = NULL;

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

 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 int current_prec = 0;
 

+/** 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 358 of yacc.c  */
+#line 173 "parse-gram.c"

 
 

-/* Line 268 of yacc.c  */
-#line 154 "parse-gram.c"
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
+# ifndef YY_NULL
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULL nullptr
+#  else
+#   define YY_NULL 0
+#  endif
+# endif

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


@@ -165,18 +187,32 @@ static int current_prec = 0;
 # define YYERROR_VERBOSE 1
 #endif
 
 # define YYERROR_VERBOSE 1
 #endif
 

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

 #endif
 
 #endif
 

-

 /* Tokens.  */
 /* Tokens.  */

-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
+#ifndef GRAM_TOKENTYPE
+# define GRAM_TOKENTYPE

    /* Put the tokens into the symbol table, so that GDB and other debuggers
       know about them.  */
    /* Put the tokens into the symbol table, so that GDB and other debuggers
       know about them.  */

-   enum yytokentype {
+   enum gram_tokentype {

      GRAM_EOF = 0,
      STRING = 258,
      INT = 259,
      GRAM_EOF = 0,
      STRING = 258,
      INT = 259,


@@ -295,13 +331,11 @@ static int current_prec = 0;
 
 
 
 
 
 

-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+#if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED
+typedef union GRAM_STYPE

 {
 {

-
-/* Line 293 of yacc.c  */
-#line 94 "parse-gram.y"
+/* Line 374 of yacc.c  */
+#line 115 "parse-gram.y"

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


@@ -314,34 +348,48 @@ typedef union YYSTYPE
   named_ref *named_ref;
 
 
   named_ref *named_ref;
 
 

-
-/* Line 293 of yacc.c  */
-#line 320 "parse-gram.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+/* Line 374 of yacc.c  */
+#line 353 "parse-gram.c"
+} GRAM_STYPE;
+# define GRAM_STYPE_IS_TRIVIAL 1
+# define gram_stype GRAM_STYPE /* obsolescent; will be withdrawn */
+# define GRAM_STYPE_IS_DECLARED 1

 #endif
 
 #endif
 

-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE
+#if ! defined GRAM_LTYPE && ! defined GRAM_LTYPE_IS_DECLARED
+typedef struct GRAM_LTYPE

 {
   int first_line;
   int first_column;
   int last_line;
   int last_column;
 {
   int first_line;
   int first_column;
   int last_line;
   int last_column;

-} YYLTYPE;
-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
+} GRAM_LTYPE;
+# define gram_ltype GRAM_LTYPE /* obsolescent; will be withdrawn */
+# define GRAM_LTYPE_IS_DECLARED 1
+# define GRAM_LTYPE_IS_TRIVIAL 1

 #endif
 
 
 #endif
 
 

-/* Copy the second part of user declarations.  */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int gram_parse (void *YYPARSE_PARAM);
+#else
+int gram_parse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int gram_parse (void);
+#else
+int gram_parse ();
+#endif
+#endif /* ! YYPARSE_PARAM */

 
 

+#endif /* !YY_GRAM_Y_TAB_H_INCLUDED  */
+
+/* Copy the second part of user declarations.  */

 
 

-/* Line 343 of yacc.c  */
-#line 345 "parse-gram.c"
+/* Line 377 of yacc.c  */
+#line 393 "parse-gram.c"

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


@@ -394,24 +442,24 @@ typedef short int yytype_int16;
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */

-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)

 #  endif
 # endif
 # ifndef YY_
 #  endif
 # endif
 # ifndef YY_

-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid

 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__

-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))

 #else
 #else

-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */

 #endif
 
 /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint
 #endif
 
 /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint

-# define YYID(n) (n)
+# define YYID(N) (N)

 #else
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #else
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)


@@ -476,8 +524,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 GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL \
+            && defined GRAM_STYPE_IS_TRIVIAL && GRAM_STYPE_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


@@ -517,20 +565,20 @@ union yyalloc
 #endif
 
 #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
 #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


@@ -594,7 +642,7 @@ static const yytype_uint8 yytranslate[] =
       55,    56,    57
 };
 
       55,    56,    57
 };
 

-#if YYDEBUG
+#if GRAM_DEBUG

 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
 static const yytype_uint16 yyprhs[] =
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
 static const yytype_uint16 yyprhs[] =


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

-       0,   209,   209,   217,   219,   223,   224,   234,   235,   240,
-     241,   246,   247,   248,   249,   250,   251,   256,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   290,
-     291,   315,   316,   317,   318,   322,   323,   324,   328,   335,
-     342,   346,   350,   357,   372,   373,   377,   389,   389,   394,
-     394,   399,   410,   425,   426,   427,   431,   432,   437,   439,
-     444,   445,   450,   452,   457,   458,   462,   463,   464,   465,
-     470,   475,   480,   486,   492,   503,   504,   513,   514,   520,
-     521,   522,   529,   529,   534,   535,   536,   541,   543,   545,
-     547,   549,   551,   556,   558,   569,   570,   575,   576,   577,
-     586,   606,   608,   617,   622,   623,   628,   635,   637
+       0,   230,   230,   238,   240,   244,   245,   255,   256,   261,
+     262,   267,   268,   269,   270,   271,   272,   277,   286,   287,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   311,
+     312,   336,   337,   338,   339,   343,   344,   345,   349,   361,
+     373,   377,   381,   388,   403,   404,   408,   420,   420,   425,
+     425,   430,   441,   456,   457,   458,   462,   463,   468,   470,
+     475,   476,   481,   483,   488,   489,   493,   494,   495,   496,
+     501,   506,   511,   517,   523,   534,   535,   544,   545,   551,
+     552,   553,   560,   560,   568,   569,   570,   575,   577,   579,
+     581,   583,   585,   590,   592,   603,   604,   609,   610,   611,
+     620,   640,   642,   651,   656,   657,   662,   669,   671

 };
 #endif
 
 };
 #endif
 

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

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


@@ -688,7 +736,7 @@ static const char *const yytname[] =
   "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
   "rules_or_grammar_declaration", "rules", "$@3", "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", "$@3", "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
 


@@ -825,10 +873,10 @@ static const yytype_int16 yytable[] =
       42
 };
 
       42
 };
 

-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-91))
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-91)))

 
 

-#define yytable_value_is_error(yytable_value) \
+#define yytable_value_is_error(Yytable_value) \

   YYID (0)
 
 static const yytype_uint8 yycheck[] =
   YYID (0)
 
 static const yytype_uint8 yycheck[] =


@@ -900,18 +948,19 @@ static const yytype_uint8 yystos[] =
 
 #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;                                                 \
     }                                                          \
       yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;                                                 \
     }                                                          \


@@ -921,39 +970,40 @@ 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].
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 

-#define YYRHSLOC(Rhs, K) ((Rhs)[K])

 #ifndef YYLLOC_DEFAULT
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
-    do                                                                 \
-      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;                              \
-       }                                                               \
+# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
+    do                                                                  \
+      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;                              \
+        }                                                               \

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

+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+
+

 
 /* YY_LOCATION_PRINT -- Print the location on the stream.
    This macro was not mandated originally: define only if we know
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
 
 /* YY_LOCATION_PRINT -- Print the location on the stream.
    This macro was not mandated originally: define only if we know
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT

-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL

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


@@ -973,7 +1023,7 @@ while (YYID (0))
 #endif
 
 /* Enable debugging if requested.  */
 #endif
 
 /* Enable debugging if requested.  */

-#if YYDEBUG
+#if GRAM_DEBUG

 
 # ifndef YYFPRINTF
 #  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
 
 # ifndef YYFPRINTF
 #  include <stdio.h> /* INFRINGES ON USER NAME SPACE */


@@ -1016,6 +1066,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     YYLTYPE const * const yylocationp;
 #endif
 {
     YYLTYPE const * const yylocationp;
 #endif
 {

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

   if (!yyvaluep)
     return;
   YYUSE (yylocationp);
   if (!yyvaluep)
     return;
   YYUSE (yylocationp);


@@ -1027,167 +1079,131 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
 # endif
   switch (yytype)
     {
 # endif
   switch (yytype)
     {

-      case 3: /* "\"string\"" */
-
-/* Line 819 of yacc.c  */
-#line 184 "parse-gram.y"
-       { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-
-/* Line 819 of yacc.c  */
-#line 1038 "parse-gram.c"
+      case 3: /* "string" */
+/* Line 833 of yacc.c  */
+#line 205 "parse-gram.y"
+       { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); };
+/* Line 833 of yacc.c  */
+#line 1088 "parse-gram.c"

        break;
        break;

-      case 4: /* "\"integer\"" */
-
-/* Line 819 of yacc.c  */
-#line 196 "parse-gram.y"
-       { fprintf (stderr, "%d", (yyvaluep->integer)); };
-
-/* Line 819 of yacc.c  */
-#line 1047 "parse-gram.c"
+      case 4: /* "integer" */
+/* Line 833 of yacc.c  */
+#line 217 "parse-gram.y"
+       { fprintf (stderr, "%d", ((*yyvaluep).integer)); };
+/* Line 833 of yacc.c  */
+#line 1095 "parse-gram.c"

        break;
        break;

-      case 43: /* "\"{...}\"" */
-
-/* Line 819 of yacc.c  */
-#line 186 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
-
-/* Line 819 of yacc.c  */
-#line 1056 "parse-gram.c"
+      case 43: /* "{...}" */
+/* Line 833 of yacc.c  */
+#line 207 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); };
+/* Line 833 of yacc.c  */
+#line 1102 "parse-gram.c"

        break;
        break;

-      case 44: /* "\"[identifier]\"" */
-
-/* Line 819 of yacc.c  */
-#line 191 "parse-gram.y"
-       { fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); };
-
-/* Line 819 of yacc.c  */
-#line 1065 "parse-gram.c"
+      case 44: /* "[identifier]" */
+/* Line 833 of yacc.c  */
+#line 212 "parse-gram.y"
+       { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); };
+/* Line 833 of yacc.c  */
+#line 1109 "parse-gram.c"

        break;
        break;

-      case 45: /* "\"char\"" */
-
-/* Line 819 of yacc.c  */
-#line 178 "parse-gram.y"
-       { fputs (char_name ((yyvaluep->character)), stderr); };
-
-/* Line 819 of yacc.c  */
-#line 1074 "parse-gram.c"
+      case 45: /* "char" */
+/* Line 833 of yacc.c  */
+#line 199 "parse-gram.y"
+       { fputs (char_name (((*yyvaluep).character)), stderr); };
+/* Line 833 of yacc.c  */
+#line 1116 "parse-gram.c"

        break;
        break;

-      case 46: /* "\"epilogue\"" */
-
-/* Line 819 of yacc.c  */
-#line 186 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 819 of yacc.c  */
-#line 1083 "parse-gram.c"
+      case 46: /* "epilogue" */
+/* Line 833 of yacc.c  */
+#line 207 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
+/* Line 833 of yacc.c  */
+#line 1123 "parse-gram.c"

        break;
        break;

-      case 48: /* "\"identifier\"" */
-
-/* Line 819 of yacc.c  */
-#line 190 "parse-gram.y"
-       { fputs ((yyvaluep->uniqstr), stderr); };
-
-/* Line 819 of yacc.c  */
-#line 1092 "parse-gram.c"
+      case 48: /* "identifier" */
+/* Line 833 of yacc.c  */
+#line 211 "parse-gram.y"
+       { fputs (((*yyvaluep).uniqstr), stderr); };
+/* Line 833 of yacc.c  */
+#line 1130 "parse-gram.c"

        break;
        break;

-      case 49: /* "\"identifier:\"" */
-
-/* Line 819 of yacc.c  */
-#line 192 "parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-
-/* Line 819 of yacc.c  */
-#line 1101 "parse-gram.c"
+      case 49: /* "identifier:" */
+/* Line 833 of yacc.c  */
+#line 213 "parse-gram.y"
+       { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); };
+/* Line 833 of yacc.c  */
+#line 1137 "parse-gram.c"

        break;
        break;

-      case 52: /* "\"%{...%}\"" */
-
-/* Line 819 of yacc.c  */
-#line 186 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 819 of yacc.c  */
-#line 1110 "parse-gram.c"
+      case 52: /* "%{...%}" */
+/* Line 833 of yacc.c  */
+#line 207 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
+/* Line 833 of yacc.c  */
+#line 1144 "parse-gram.c"

        break;
        break;

-      case 54: /* "\"type\"" */
-
-/* Line 819 of yacc.c  */
-#line 193 "parse-gram.y"
-       { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-
-/* Line 819 of yacc.c  */
-#line 1119 "parse-gram.c"
+      case 54: /* "type" */
+/* Line 833 of yacc.c  */
+#line 214 "parse-gram.y"
+       { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); };
+/* Line 833 of yacc.c  */
+#line 1151 "parse-gram.c"

        break;
        break;

-      case 71: /* "symbol.prec" */
-
-/* Line 819 of yacc.c  */
-#line 199 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 819 of yacc.c  */
-#line 1128 "parse-gram.c"
+      case 71: /* symbol.prec */
+/* Line 833 of yacc.c  */
+#line 220 "parse-gram.y"
+       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
+/* Line 833 of yacc.c  */
+#line 1158 "parse-gram.c"

        break;
        break;

-      case 84: /* "variable" */
-
-/* Line 819 of yacc.c  */
-#line 190 "parse-gram.y"
-       { fputs ((yyvaluep->uniqstr), stderr); };
-
-/* Line 819 of yacc.c  */
-#line 1137 "parse-gram.c"
+      case 84: /* variable */
+/* Line 833 of yacc.c  */
+#line 211 "parse-gram.y"
+       { fputs (((*yyvaluep).uniqstr), stderr); };
+/* Line 833 of yacc.c  */
+#line 1165 "parse-gram.c"

        break;
        break;

-      case 85: /* "content.opt" */
-
-/* Line 819 of yacc.c  */
-#line 186 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 819 of yacc.c  */
-#line 1146 "parse-gram.c"
+      case 85: /* content.opt */
+/* Line 833 of yacc.c  */
+#line 207 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
+/* Line 833 of yacc.c  */
+#line 1172 "parse-gram.c"

        break;
        break;

-      case 86: /* "braceless" */
-
-/* Line 819 of yacc.c  */
-#line 186 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 819 of yacc.c  */
-#line 1155 "parse-gram.c"
+      case 86: /* braceless */
+/* Line 833 of yacc.c  */
+#line 207 "parse-gram.y"
+       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
+/* Line 833 of yacc.c  */
+#line 1179 "parse-gram.c"

        break;
        break;

-      case 87: /* "id" */
-
-/* Line 819 of yacc.c  */
-#line 199 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 819 of yacc.c  */
-#line 1164 "parse-gram.c"
+      case 87: /* id */
+/* Line 833 of yacc.c  */
+#line 220 "parse-gram.y"
+       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
+/* Line 833 of yacc.c  */
+#line 1186 "parse-gram.c"

        break;
        break;

-      case 88: /* "id_colon" */
-
-/* Line 819 of yacc.c  */
-#line 200 "parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-
-/* Line 819 of yacc.c  */
-#line 1173 "parse-gram.c"
+      case 88: /* id_colon */
+/* Line 833 of yacc.c  */
+#line 221 "parse-gram.y"
+       { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); };
+/* Line 833 of yacc.c  */
+#line 1193 "parse-gram.c"

        break;
        break;

-      case 89: /* "symbol" */
-
-/* Line 819 of yacc.c  */
-#line 199 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 819 of yacc.c  */
-#line 1182 "parse-gram.c"
+      case 89: /* symbol */
+/* Line 833 of yacc.c  */
+#line 220 "parse-gram.y"
+       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
+/* Line 833 of yacc.c  */
+#line 1200 "parse-gram.c"

        break;
        break;

-      case 90: /* "string_as_id" */
-
-/* Line 819 of yacc.c  */
-#line 199 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 819 of yacc.c  */
-#line 1191 "parse-gram.c"
+      case 90: /* string_as_id */
+/* Line 833 of yacc.c  */
+#line 220 "parse-gram.y"
+       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
+/* Line 833 of yacc.c  */
+#line 1207 "parse-gram.c"

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


@@ -1296,12 +1312,12 @@ do {                                    \
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;

-#else /* !YYDEBUG */
+#else /* !GRAM_DEBUG */

 # define YYDPRINTF(Args)
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 # define YYDPRINTF(Args)
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)

-#endif /* !YYDEBUG */
+#endif /* !GRAM_DEBUG */

 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */


@@ -1332,7 +1348,7 @@ int yydebug;
    required.  Return 1 if memory is exhausted.  */
 static int
 yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd,
    required.  Return 1 if memory is exhausted.  */
 static int
 yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd,

-#if YYDEBUG
+#if GRAM_DEBUG

                       char const *yydebug_prefix,
                       char const *yydebug_suffix,
 #endif
                       char const *yydebug_prefix,
                       char const *yydebug_suffix,
 #endif


@@ -1435,7 +1451,7 @@ do {                                                             \
    the parser stacks to try to find a new initial context in which the
    current lookahead is syntactically acceptable.  If it fails to find
    such a context, it discards the lookahead.  */
    the parser stacks to try to find a new initial context in which the
    current lookahead is syntactically acceptable.  If it fails to find
    such a context, it discards the lookahead.  */

-#if YYDEBUG
+#if GRAM_DEBUG

 # define YY_LAC_DISCARD(Event)                                           \
 do {                                                                     \
   if (yy_lac_established)                                                \
 # define YY_LAC_DISCARD(Event)                                           \
 do {                                                                     \
   if (yy_lac_established)                                                \


@@ -1538,7 +1554,7 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
         else
           {
             if (yy_lac_stack_realloc (yyes_capacity, 1,
         else
           {
             if (yy_lac_stack_realloc (yyes_capacity, 1,

-#if YYDEBUG
+#if GRAM_DEBUG

                                       " (", ")",
 #endif
                                       yyes, yyesa, &yyesp, yyes_prev))
                                       " (", ")",
 #endif
                                       yyes, yyesa, &yyesp, yyes_prev))


@@ -1548,7 +1564,7 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
               }
             *++yyesp = yystate;
           }
               }
             *++yyesp = yystate;
           }

-        YYDPRINTF ((stderr, " G%d", *yyesp));
+        YYDPRINTF ((stderr, " G%d", yystate));

       }
     }
 }
       }
     }
 }


@@ -1670,12 +1686,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


@@ -1733,14 +1749,14 @@ 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;
                 yysize = yysize1;
               }
         }
                 if (! (yysize <= yysize1
                        && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
                   return 2;
                 yysize = yysize1;
               }
         }

-# if YYDEBUG
+# if GRAM_DEBUG

       else if (yydebug)
         YYFPRINTF (stderr, "No expected tokens.\n");
 # endif
       else if (yydebug)
         YYFPRINTF (stderr, "No expected tokens.\n");
 # endif


@@ -1831,20 +1847,6 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 }
 
 
 }
 
 

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

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


@@ -1876,6 +1878,28 @@ yyparse ()
 /* The lookahead symbol.  */
 int yychar;
 
 /* The lookahead symbol.  */
 int yychar;
 

+
+#if defined __GNUC__ && (4 < __GNUC__ + (6 <= __GNUC_MINOR__))
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+/* Default value used for initialization, for pacifying older GCCs
+   or non-GCC compilers.  */
+static YYSTYPE yyval_default;
+# define YYLVAL_INITIALIZE() (yylval = yyval_default)
+#endif
+#ifndef YYLVAL_INITIALIZE
+# define YYLVAL_INITIALIZE()
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+

 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 


@@ -1894,7 +1918,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.  */


@@ -1925,7 +1949,7 @@ YYLTYPE yylloc;
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */

-  int yytoken;
+  int yytoken = 0;

   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;


@@ -1944,7 +1968,6 @@ YYLTYPE yylloc;
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 

-  yytoken = 0;

   yyss = yyssa;
   yyvs = yyvsa;
   yyls = yylsa;
   yyss = yyssa;
   yyvs = yyvsa;
   yyls = yylsa;


@@ -1970,27 +1993,25 @@ YYLTYPE yylloc;
   yyvsp = yyvs;
   yylsp = yyls;
 
   yyvsp = yyvs;
   yylsp = yyls;
 

-#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+  YYLVAL_INITIALIZE ();
+#if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL

   /* Initialize the default location before parsing starts.  */
   yylloc.first_line   = yylloc.last_line   = 1;
   yylloc.first_column = yylloc.last_column = 1;
 #endif
 
 /* User initialization code.  */
   /* Initialize the default location before parsing starts.  */
   yylloc.first_line   = yylloc.last_line   = 1;
   yylloc.first_column = yylloc.last_column = 1;
 #endif
 
 /* User initialization code.  */

-
-/* Line 1590 of yacc.c  */
-#line 86 "parse-gram.y"
+/* Line 1596 of yacc.c  */
+#line 107 "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 1590 of yacc.c  */
-#line 1992 "parse-gram.c"
+/* Line 1596 of yacc.c  */
+#line 2014 "parse-gram.c"

   yylsp[0] = yylloc;
   yylsp[0] = yylloc;

-

   goto yysetstate;
 
 /*------------------------------------------------------------.
   goto yysetstate;
 
 /*------------------------------------------------------------.


@@ -2141,7 +2162,9 @@ yybackup:
   YY_LAC_DISCARD ("shift");
 
   yystate = yyn;
   YY_LAC_DISCARD ("shift");
 
   yystate = yyn;

+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN

   *++yyvsp = yylval;
   *++yyvsp = yylval;

+  YY_IGNORE_MAYBE_UNINITIALIZED_END

   *++yylsp = yylloc;
   goto yynewstate;
 
   *++yylsp = yylloc;
   goto yynewstate;
 


@@ -2181,9 +2204,8 @@ yyreduce:
     switch (yyn)
       {
           case 6:
     switch (yyn)
       {
           case 6:

-
-/* Line 1806 of yacc.c  */
-#line 225 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 246 "parse-gram.y"

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


@@ -2196,16 +2218,14 @@ yyreduce:
     break;
 
   case 7:
     break;
 
   case 7:

-
-/* Line 1806 of yacc.c  */
-#line 234 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 255 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 236 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 257 "parse-gram.y"

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


@@ -2213,16 +2233,14 @@ yyreduce:
     break;
 
   case 9:
     break;
 
   case 9:

-
-/* Line 1806 of yacc.c  */
-#line 240 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 261 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 242 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 263 "parse-gram.y"

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


@@ -2230,44 +2248,38 @@ yyreduce:
     break;
 
   case 11:
     break;
 
   case 11:

-
-/* Line 1806 of yacc.c  */
-#line 246 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 267 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 247 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 268 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 248 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 269 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 249 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 270 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 250 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 271 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 252 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 273 "parse-gram.y"

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


@@ -2275,9 +2287,8 @@ yyreduce:
     break;
 
   case 17:
     break;
 
   case 17:

-
-/* Line 1806 of yacc.c  */
-#line 257 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 278 "parse-gram.y"

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


@@ -2289,79 +2300,68 @@ yyreduce:
     break;
 
   case 18:
     break;
 
   case 18:

-
-/* Line 1806 of yacc.c  */
-#line 265 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 286 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 266 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 287 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 267 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 288 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 268 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 289 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 269 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 290 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 270 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 291 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 271 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 292 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 272 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 293 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 273 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 294 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 274 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 295 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 276 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 297 "parse-gram.y"

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


@@ -2379,19 +2379,17 @@ yyreduce:
     break;
 
   case 29:
     break;
 
   case 29:

-
-/* Line 1806 of yacc.c  */
-#line 290 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 311 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 292 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 313 "parse-gram.y"

     {
       char const *skeleton_user = (yyvsp[(2) - (2)].chars);
     {
       char const *skeleton_user = (yyvsp[(2) - (2)].chars);

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

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


@@ -2403,7 +2401,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);


@@ -2415,81 +2413,82 @@ yyreduce:
     break;
 
   case 31:
     break;
 
   case 31:

-
-/* Line 1806 of yacc.c  */
-#line 315 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 336 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 316 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 337 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 317 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 338 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 325 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 346 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 329 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 350 "parse-gram.y"

     {
     {

-      symbol_list *list;
-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
-       symbol_list_destructor_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      code_props code;
+      code_props_symbol_action_init (&code, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
+      code_props_translate_code (&code);
+      {
+        symbol_list *list;
+        for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
+          symbol_list_destructor_set (list, &code);
+        symbol_list_free ((yyvsp[(3) - (3)].list));
+      }

     }
     break;
 
   case 39:
     }
     break;
 
   case 39:

-
-/* Line 1806 of yacc.c  */
-#line 336 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 362 "parse-gram.y"

     {
     {

-      symbol_list *list;
-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
-       symbol_list_printer_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      code_props code;
+      code_props_symbol_action_init (&code, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
+      code_props_translate_code (&code);
+      {
+        symbol_list *list;
+        for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
+          symbol_list_printer_set (list, &code);
+        symbol_list_free ((yyvsp[(3) - (3)].list));
+      }

     }
     break;
 
   case 40:
     }
     break;
 
   case 40:

-
-/* Line 1806 of yacc.c  */
-#line 343 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 374 "parse-gram.y"

     {
       default_prec = true;
     }
     break;
 
   case 41:
     {
       default_prec = true;
     }
     break;
 
   case 41:

-
-/* Line 1806 of yacc.c  */
-#line 347 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 378 "parse-gram.y"

     {
       default_prec = false;
     }
     break;
 
   case 42:
     {
       default_prec = false;
     }
     break;
 
   case 42:

-
-/* Line 1806 of yacc.c  */
-#line 351 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 382 "parse-gram.y"

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


@@ -2499,9 +2498,8 @@ yyreduce:
     break;
 
   case 43:
     break;
 
   case 43:

-
-/* Line 1806 of yacc.c  */
-#line 358 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 389 "parse-gram.y"

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


@@ -2509,23 +2507,20 @@ yyreduce:
     break;
 
   case 44:
     break;
 
   case 44:

-
-/* Line 1806 of yacc.c  */
-#line 372 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 403 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 373 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 404 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 378 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 409 "parse-gram.y"

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


@@ -2534,16 +2529,14 @@ yyreduce:
     break;
 
   case 47:
     break;
 
   case 47:

-
-/* Line 1806 of yacc.c  */
-#line 389 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 420 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 390 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 421 "parse-gram.y"

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


@@ -2551,16 +2544,14 @@ yyreduce:
     break;
 
   case 49:
     break;
 
   case 49:

-
-/* Line 1806 of yacc.c  */
-#line 394 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 425 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 395 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 426 "parse-gram.y"

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


@@ -2568,9 +2559,8 @@ yyreduce:
     break;
 
   case 51:
     break;
 
   case 51:

-
-/* Line 1806 of yacc.c  */
-#line 400 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 431 "parse-gram.y"

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


@@ -2581,9 +2571,8 @@ yyreduce:
     break;
 
   case 52:
     break;
 
   case 52:

-
-/* Line 1806 of yacc.c  */
-#line 411 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 442 "parse-gram.y"

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


@@ -2598,128 +2587,110 @@ yyreduce:
     break;
 
   case 53:
     break;
 
   case 53:

-
-/* Line 1806 of yacc.c  */
-#line 425 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 456 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 426 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 457 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 427 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 458 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 431 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 462 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 432 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 463 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 438 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 469 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 440 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 471 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 444 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 475 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 445 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 476 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 451 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 482 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 453 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 484 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 457 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 488 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 458 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 489 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 462 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 493 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 463 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 494 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 464 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 495 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 465 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 496 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 471 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 502 "parse-gram.y"

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


@@ -2727,9 +2698,8 @@ yyreduce:
     break;
 
   case 71:
     break;
 
   case 71:

-
-/* Line 1806 of yacc.c  */
-#line 476 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 507 "parse-gram.y"

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


@@ -2737,9 +2707,8 @@ yyreduce:
     break;
 
   case 72:
     break;
 
   case 72:

-
-/* Line 1806 of yacc.c  */
-#line 481 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 512 "parse-gram.y"

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


@@ -2748,9 +2717,8 @@ yyreduce:
     break;
 
   case 73:
     break;
 
   case 73:

-
-/* Line 1806 of yacc.c  */
-#line 487 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 518 "parse-gram.y"

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


@@ -2759,9 +2727,8 @@ yyreduce:
     break;
 
   case 74:
     break;
 
   case 74:

-
-/* Line 1806 of yacc.c  */
-#line 493 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 524 "parse-gram.y"

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


@@ -2771,118 +2738,110 @@ yyreduce:
     break;
 
   case 81:
     break;
 
   case 81:

-
-/* Line 1806 of yacc.c  */
-#line 523 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 554 "parse-gram.y"

     {
       yyerrok;
     }
     break;
 
   case 82:
     {
       yyerrok;
     }
     break;
 
   case 82:

+/* Line 1813 of yacc.c  */
+#line 560 "parse-gram.y"
+    { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); }
+    break;

 
 

-/* Line 1806 of yacc.c  */
-#line 529 "parse-gram.y"
-    { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]);
-    current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); }
+  case 83:
+/* Line 1813 of yacc.c  */
+#line 561 "parse-gram.y"
+    {
+    /* Free the current lhs. */
+    current_lhs (0, (yylsp[(1) - (4)]), 0);
+  }

     break;
 
   case 84:
     break;
 
   case 84:

-
-/* Line 1806 of yacc.c  */
-#line 534 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 568 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 535 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 569 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 541 "parse-gram.y"
-    { grammar_current_rule_begin (current_lhs, current_lhs_location,
+/* Line 1813 of yacc.c  */
+#line 575 "parse-gram.y"
+    { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,

                                  current_lhs_named_ref); }
     break;
 
   case 88:
                                  current_lhs_named_ref); }
     break;
 
   case 88:

-
-/* Line 1806 of yacc.c  */
-#line 544 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 578 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 546 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 580 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 548 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 582 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 550 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 584 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 552 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 586 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 556 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 590 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 558 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 592 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 570 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 604 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 575 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 609 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 576 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 610 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 587 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 621 "parse-gram.y"

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


@@ -2894,16 +2853,14 @@ yyreduce:
     break;
 
   case 101:
     break;
 
   case 101:

-
-/* Line 1806 of yacc.c  */
-#line 607 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 641 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 609 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 643 "parse-gram.y"

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


@@ -2912,16 +2869,14 @@ yyreduce:
     break;
 
   case 103:
     break;
 
   case 103:

-
-/* Line 1806 of yacc.c  */
-#line 617 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 651 "parse-gram.y"

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

-
-/* Line 1806 of yacc.c  */
-#line 629 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 663 "parse-gram.y"

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


@@ -2929,9 +2884,8 @@ yyreduce:
     break;
 
   case 108:
     break;
 
   case 108:

-
-/* Line 1806 of yacc.c  */
-#line 638 "parse-gram.y"
+/* Line 1813 of yacc.c  */
+#line 672 "parse-gram.y"

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


@@ -2943,9 +2897,8 @@ yyreduce:
     break;
 
 
     break;
 
 

-
-/* Line 1806 of yacc.c  */
-#line 2949 "parse-gram.c"
+/* Line 1813 of yacc.c  */
+#line 2902 "parse-gram.c"

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


@@ -3120,7 +3073,9 @@ yyerrlab1:
      current lookahead token, the shift below will for sure.  */
   YY_LAC_DISCARD ("error recovery");
 
      current lookahead token, the shift below will for sure.  */
   YY_LAC_DISCARD ("error recovery");
 

+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN

   *++yyvsp = yylval;
   *++yyvsp = yylval;

+  YY_IGNORE_MAYBE_UNINITIALIZED_END

 
   yyerror_range[2] = yylloc;
   /* Using YYLLOC is tempting, but would change the location of
 
   yyerror_range[2] = yylloc;
   /* Using YYLLOC is tempting, but would change the location of


@@ -3193,9 +3148,8 @@ yyreturn:
 }
 
 
 }
 
 

-
-/* Line 2067 of yacc.c  */
-#line 648 "parse-gram.y"
+/* Line 2076 of yacc.c  */
+#line 682 "parse-gram.y"

 
 
 
 
 
 


@@ -3215,7 +3169,7 @@ 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++)
      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++)


@@ -3252,27 +3206,19 @@ add_param (char const *type, char *decl, location loc)
 
   /* Strip the surrounding '{' and '}', and any blanks just inside
      the braces.  */
 
   /* Strip the surrounding '{' and '}', and any blanks just inside
      the braces.  */

-  while (*--p == ' ' || *p == '\t')
-    continue;
+  --p;
+  while (c_isspace ((unsigned char) *p))
+    --p;

   p[1] = '\0';
   p[1] = '\0';

-  while (*++decl == ' ' || *decl == '\t')
-    continue;
+  ++decl;
+  while (c_isspace ((unsigned char) *decl))
+    ++decl;

 
   if (! name_start)
     complain_at (loc, _("missing identifier in parameter declaration"));
   else
     {
 
   if (! name_start)
     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));

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


@@ -3287,8 +3233,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);

     }
 }
 
     }
 }
 


@@ -3316,4 +3262,3 @@ char_name (char c)
       return quotearg_style (escape_quoting_style, buf);
     }
 }
       return quotearg_style (escape_quoting_style, buf);
     }
 }

-