Merge branch 'maint'

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 8720df133c0fb8174f071e0a913408f8eda5a198..3101c7eee3c84494715a872214d2023eab9d3e86 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.5.1.899-007c5.  */
+/* A Bison parser, made by GNU Bison 2.6.2.891-3f15-dirty.  */

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


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

-#define YYBISON_VERSION "2.5.1.899-007c5"
+#define YYBISON_VERSION "2.6.2.891-3f15-dirty"

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


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

-/* Line 337 of yacc.c  */
+/* Line 331 of yacc.c  */

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


@@ -94,6 +94,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"


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

-/* Line 337 of yacc.c  */
-#line 131 "src/parse-gram.c"
+/* Line 331 of yacc.c  */
+#line 132 "src/parse-gram.c"

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


@@ -147,8 +148,8 @@ static char const *char_name (char);
 
 /* In a future release of Bison, this section will be replaced
    by #include "src/parse-gram.h".  */
 
 /* In a future release of Bison, this section will be replaced
    by #include "src/parse-gram.h".  */

-#ifndef GRAM_SRC_PARSE_GRAM_H
-# define GRAM_SRC_PARSE_GRAM_H
+#ifndef YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED
+# define YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED

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


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

-/* Line 351 of yacc.c  */
-#line 222 "src/parse-gram.y"
+/* Line 347 of yacc.c  */
+#line 223 "src/parse-gram.y"

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


@@ -172,8 +173,8 @@ extern int gram_debug;
 # endif
 
 
 # endif
 
 

-/* Line 351 of yacc.c  */
-#line 177 "src/parse-gram.c"
+/* Line 347 of yacc.c  */
+#line 178 "src/parse-gram.c"

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


@@ -299,8 +300,8 @@ extern int gram_debug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {

-/* Line 351 of yacc.c  */
-#line 108 "src/parse-gram.y"
+/* Line 347 of yacc.c  */
+#line 109 "src/parse-gram.y"

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


@@ -312,17 +313,17 @@ typedef union YYSTYPE
   uniqstr uniqstr;
   unsigned char character;
 
   uniqstr uniqstr;
   unsigned char character;
 

-/* Line 351 of yacc.c  */
-#line 246 "src/parse-gram.y"
+/* Line 347 of yacc.c  */
+#line 247 "src/parse-gram.y"

 
   param_type param;
 
 
   param_type param;
 

-/* Line 351 of yacc.c  */
-#line 420 "src/parse-gram.y"
+/* Line 347 of yacc.c  */
+#line 426 "src/parse-gram.y"

 code_props_type code_type;
 
 code_props_type code_type;
 

-/* Line 351 of yacc.c  */
-#line 326 "src/parse-gram.c"
+/* Line 347 of yacc.c  */
+#line 327 "src/parse-gram.c"

 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1


@@ -341,31 +342,17 @@ typedef struct YYLTYPE
 #endif
 
 
 #endif
 
 

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

 int gram_parse (void);
 int gram_parse (void);

-#else
-int gram_parse ();
-#endif
-#endif /* ! YYPARSE_PARAM */

 
 

-#endif /* !GRAM_SRC_PARSE_GRAM_H  */
+#endif /* !YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED  */

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

-/* Line 354 of yacc.c  */
-#line 366 "src/parse-gram.c"
+/* Line 350 of yacc.c  */
+#line 353 "src/parse-gram.c"

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

-/* Line 355 of yacc.c  */
-#line 57 "src/parse-gram.y"
+/* Line 351 of yacc.c  */
+#line 58 "src/parse-gram.y"

 
   static int current_prec = 0;
   static location current_lhs_location;
 
   static int current_prec = 0;
   static location current_lhs_location;


@@ -397,8 +384,8 @@ int gram_parse ();
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t
 
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t
 

-/* Line 355 of yacc.c  */
-#line 235 "src/parse-gram.y"
+/* Line 351 of yacc.c  */
+#line 236 "src/parse-gram.y"

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


@@ -410,8 +397,8 @@ int gram_parse ();
   static param_type current_param = param_none;
 
 
   static param_type current_param = param_none;
 
 

-/* Line 355 of yacc.c  */
-#line 415 "src/parse-gram.c"
+/* Line 351 of yacc.c  */
+#line 402 "src/parse-gram.c"

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


@@ -425,11 +412,8 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;

-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;

 #else
 #else

-typedef short int yytype_int8;
+typedef signed char yytype_int8;

 #endif
 
 #ifdef YYTYPE_UINT16
 #endif
 
 #ifdef YYTYPE_UINT16


@@ -449,8 +433,7 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t

-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T

 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else


@@ -473,37 +456,19 @@ typedef short int yytype_int16;
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */

-#if ! defined lint || defined __GNUC__
+#ifdef __GNUC__

 # define YYUSE(e) ((void) (e))
 #else
 # define YYUSE(e) /* empty */
 #endif
 
 # define YYUSE(e) ((void) (e))
 #else
 # define YYUSE(e) /* empty */
 #endif
 

-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
-    int yyi;
-#endif
-{
-  return yyi;
-}
-#endif
-

 #if 1
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # ifdef YYSTACK_ALLOC
    /* Pacify GCC's `empty if-body' warning.  */
 #if 1
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # ifdef YYSTACK_ALLOC
    /* Pacify GCC's `empty if-body' warning.  */

-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)

 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely


@@ -527,15 +492,13 @@ YYID (yyi)
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc

-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc && ! defined EXIT_SUCCESS

 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free

-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && ! defined EXIT_SUCCESS

 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif


@@ -582,7 +545,7 @@ union yyalloc
         yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
         yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                 \
         yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
         yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                 \

-    while (YYID (0))
+    while (0)

 
 #endif
 
 
 #endif
 


@@ -601,7 +564,7 @@ union yyalloc
           for (yyi = 0; yyi < (Count); yyi++)   \
             (Dst)[yyi] = (Src)[yyi];            \
         }                                       \
           for (yyi = 0; yyi < (Count); yyi++)   \
             (Dst)[yyi] = (Src)[yyi];            \
         }                                       \

-      while (YYID (0))
+      while (0)

 #  endif
 # endif
 #endif /* !YYCOPY_NEEDED */
 #  endif
 # endif
 #endif /* !YYCOPY_NEEDED */


@@ -670,18 +633,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,   271,   271,   279,   281,   285,   286,   296,   300,   305,
-     306,   311,   316,   317,   318,   319,   320,   325,   334,   335,
-     336,   337,   338,   339,   340,   341,   341,   342,   343,   367,
-     368,   369,   370,   374,   375,   384,   385,   386,   390,   397,
-     401,   405,   412,   423,   424,   434,   435,   439,   451,   451,
-     456,   456,   461,   472,   487,   488,   489,   490,   494,   495,
-     500,   502,   507,   508,   513,   515,   520,   521,   525,   526,
-     530,   531,   532,   537,   542,   547,   553,   559,   570,   571,
-     580,   581,   587,   588,   589,   596,   596,   604,   605,   606,
-     611,   613,   615,   617,   619,   621,   623,   628,   630,   640,
-     641,   646,   647,   648,   657,   677,   679,   688,   693,   694,
-     699,   706,   708
+       0,   272,   272,   280,   282,   286,   287,   297,   301,   306,
+     307,   312,   317,   318,   319,   320,   321,   326,   335,   336,
+     337,   338,   339,   340,   341,   342,   342,   343,   344,   368,
+     369,   370,   371,   375,   376,   385,   386,   387,   391,   403,
+     407,   411,   418,   429,   430,   440,   441,   445,   457,   457,
+     462,   462,   467,   478,   493,   494,   495,   496,   500,   501,
+     506,   508,   513,   514,   519,   521,   526,   527,   531,   532,
+     536,   537,   538,   543,   548,   553,   559,   565,   576,   577,
+     586,   587,   593,   594,   595,   602,   602,   610,   611,   612,
+     617,   619,   621,   623,   625,   627,   629,   634,   636,   646,
+     647,   652,   653,   654,   663,   683,   685,   694,   699,   700,
+     705,   712,   714

 };
 #endif
 
 };
 #endif
 


@@ -737,7 +700,7 @@ static const yytype_uint16 yytoknum[] =
 #define YYTABLE_NINF -112
 
 #define yytable_value_is_error(yytable_value) \
 #define YYTABLE_NINF -112
 
 #define yytable_value_is_error(yytable_value) \

-  YYID (0)
+  0

 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.    */
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.    */


@@ -929,7 +892,7 @@ do                                                              \
       yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;                                                  \
     }                                                           \
       yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;                                                  \
     }                                                           \

-while (YYID (0))
+while (0)

 
 
 #define YYTERROR        1
 
 
 #define YYTERROR        1


@@ -943,7 +906,7 @@ while (YYID (0))
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N)                                \
     do                                                                  \
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N)                                \
     do                                                                  \

-      if (YYID (N))                                                     \
+      if (N)                                                            \

         {                                                               \
           (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
           (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
         {                                                               \
           (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
           (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \


@@ -957,7 +920,7 @@ while (YYID (0))
           (Current).first_column = (Current).last_column =              \
             YYRHSLOC (Rhs, 0).last_column;                              \
         }                                                               \
           (Current).first_column = (Current).last_column =              \
             YYRHSLOC (Rhs, 0).last_column;                              \
         }                                                               \

-    while (YYID (0))
+    while (0)

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


@@ -998,7 +961,7 @@ while (YYID (0))
 do {                                            \
   if (yydebug)                                  \
     YYFPRINTF Args;                             \
 do {                                            \
   if (yydebug)                                  \
     YYFPRINTF Args;                             \

-} while (YYID (0))
+} while (0)

 
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
 do {                                                                      \
 
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
 do {                                                                      \


@@ -1009,26 +972,15 @@ do {                                                                      \
                   Type, Value, Location); \
       YYFPRINTF (stderr, "\n");                                           \
     }                                                                     \
                   Type, Value, Location); \
       YYFPRINTF (stderr, "\n");                                           \
     }                                                                     \

-} while (YYID (0))
+} while (0)

 
 
 /*--------------------------------.
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
 
 
 /*--------------------------------.
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 

-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)

 static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
 static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)

-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-    YYLTYPE const * const yylocationp;
-#endif

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


@@ -1042,96 +994,96 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
   switch (yytype)
     {
             case 3: // "string"
   switch (yytype)
     {
             case 3: // "string"

-/* Line 725 of yacc.c  */
-#line 195 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 196 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1050 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1002 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 208 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 209 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1058 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1010 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 204 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 205 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1066 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1018 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 197 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 198 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1074 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1026 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 202 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 203 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1082 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1034 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 189 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 190 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1090 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1042 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 197 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 198 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1098 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1050 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 201 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 202 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1106 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1058 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 203 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 204 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1114 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1066 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 197 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 198 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1122 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1074 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 205 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 206 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1130 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1082 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 251 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 252 "src/parse-gram.y"

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


@@ -1144,88 +1096,88 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
       case param_none: aver (false); break;
     }
 }
       case param_none: aver (false); break;
     }
 }

-/* Line 725 of yacc.c  */
-#line 1149 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1101 "src/parse-gram.c"

         break;
 
             case 64: // code_props_type
         break;
 
             case 64: // code_props_type

-/* Line 725 of yacc.c  */
-#line 421 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 427 "src/parse-gram.y"

         { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); }
         { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); }

-/* Line 725 of yacc.c  */
-#line 1157 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1109 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 211 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 212 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1165 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1117 "src/parse-gram.c"

         break;
 
             case 77: // tag
         break;
 
             case 77: // tag

-/* Line 725 of yacc.c  */
-#line 205 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 206 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1173 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1125 "src/parse-gram.c"

         break;
 
             case 87: // variable
         break;
 
             case 87: // variable

-/* Line 725 of yacc.c  */
-#line 201 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 202 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1181 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1133 "src/parse-gram.c"

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

-/* Line 725 of yacc.c  */
-#line 197 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 198 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1189 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1141 "src/parse-gram.c"

         break;
 
             case 89: // braceless
         break;
 
             case 89: // braceless

-/* Line 725 of yacc.c  */
-#line 197 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 198 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1197 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1149 "src/parse-gram.c"

         break;
 
             case 90: // id
         break;
 
             case 90: // id

-/* Line 725 of yacc.c  */
-#line 211 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 212 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1205 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1157 "src/parse-gram.c"

         break;
 
             case 91: // id_colon
         break;
 
             case 91: // id_colon

-/* Line 725 of yacc.c  */
-#line 212 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 213 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1213 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1165 "src/parse-gram.c"

         break;
 
             case 92: // symbol
         break;
 
             case 92: // symbol

-/* Line 725 of yacc.c  */
-#line 211 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 212 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1221 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1173 "src/parse-gram.c"

         break;
 
             case 93: // string_as_id
         break;
 
             case 93: // string_as_id

-/* Line 725 of yacc.c  */
-#line 211 "src/parse-gram.y"
+/* Line 709 of yacc.c  */
+#line 212 "src/parse-gram.y"

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

-/* Line 725 of yacc.c  */
-#line 1229 "src/parse-gram.c"
+/* Line 709 of yacc.c  */
+#line 1181 "src/parse-gram.c"

         break;
 
       default:
         break;
 
       default:


@@ -1238,18 +1190,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 

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

 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)

-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-    YYLTYPE const * const yylocationp;
-#endif

 {
   if (yytype < YYNTOKENS)
     YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
 {
   if (yytype < YYNTOKENS)
     YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);


@@ -1267,16 +1209,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 

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

 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)

-#else
-static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
-#endif

 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)


@@ -1291,25 +1225,15 @@ yy_stack_print (yybottom, yytop)
 do {                                                            \
   if (yydebug)                                                  \
     yy_stack_print ((Bottom), (Top));                           \
 do {                                                            \
   if (yydebug)                                                  \
     yy_stack_print ((Bottom), (Top));                           \

-} while (YYID (0))
+} while (0)

 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 

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

 static void
 yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
 static void
 yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)

-#else
-static void
-yy_reduce_print (yyssp, yyvsp, yylsp, yyrule)
-    yytype_int16 *yyssp;
-    YYSTYPE *yyvsp;
-    YYLTYPE *yylsp;
-    int yyrule;
-#endif

 {
   unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
 {
   unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];


@@ -1332,7 +1256,7 @@ yy_reduce_print (yyssp, yyvsp, yylsp, yyrule)
 do {                                    \
   if (yydebug)                          \
     yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \
 do {                                    \
   if (yydebug)                          \
     yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \

-} while (YYID (0))
+} while (0)

 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */


@@ -1463,7 +1387,7 @@ do {                                                             \
           goto yyerrlab;                                         \
       }                                                          \
     }                                                            \
           goto yyerrlab;                                         \
       }                                                          \
     }                                                            \

-} while (YYID (0))
+} while (0)

 
 /* Discard any previous initial lookahead context because of Event,
    which may be a lookahead change or an invalidation of the currently
 
 /* Discard any previous initial lookahead context because of Event,
    which may be a lookahead change or an invalidation of the currently


@@ -1486,7 +1410,7 @@ do {                                                                     \
                    Event "\n");                                          \
       yy_lac_established = 0;                                            \
     }                                                                    \
                    Event "\n");                                          \
       yy_lac_established = 0;                                            \
     }                                                                    \

-} while (YYID (0))
+} while (0)

 #else
 # define YY_LAC_DISCARD(Event) yy_lac_established = 0
 #endif
 #else
 # define YY_LAC_DISCARD(Event) yy_lac_established = 0
 #endif


@@ -1602,15 +1526,8 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */

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

 static YYSIZE_T
 yystrlen (const char *yystr)
 static YYSIZE_T
 yystrlen (const char *yystr)

-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif

 {
   YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
 {
   YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)


@@ -1626,16 +1543,8 @@ yystrlen (yystr)
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */

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

 static char *
 yystpcpy (char *yydest, const char *yysrc)
 static char *
 yystpcpy (char *yydest, const char *yysrc)

-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif

 {
   char *yyd = yydest;
   const char *yys = yysrc;
 {
   char *yyd = yydest;
   const char *yys = yysrc;


@@ -1838,19 +1747,8 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 

-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)

 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)

-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep, yylocationp)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-    YYLTYPE *yylocationp;
-#endif

 {
   YYUSE(yyvaluep);
   YYUSE (yylocationp);
 {
   YYUSE(yyvaluep);
   YYUSE (yylocationp);


@@ -1872,27 +1770,8 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 | yyparse.  |
 `----------*/
 
 | yyparse.  |
 `----------*/
 

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

 int
 yyparse (void)
 int
 yyparse (void)

-#else
-int
-yyparse ()
-
-#endif
-#endif

 {
 /* The lookahead symbol.  */
 int yychar;
 {
 /* The lookahead symbol.  */
 int yychar;


@@ -1946,7 +1825,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;


@@ -1965,7 +1844,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;


@@ -1998,18 +1876,17 @@ YYLTYPE yylloc;
 #endif
 
 /* User initialization code.  */
 #endif
 
 /* User initialization code.  */

-/* Line 1486 of yacc.c  */
-#line 100 "src/parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 101 "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 1486 of yacc.c  */
-#line 2011 "src/parse-gram.c"
+/* Line 1464 of yacc.c  */
+#line 1889 "src/parse-gram.c"

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

-

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


@@ -2200,8 +2077,8 @@ yyreduce:
     switch (yyn)
       {
           case 6:
     switch (yyn)
       {
           case 6:

-/* Line 1702 of yacc.c  */
-#line 287 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 288 "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]));


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

-/* Line 1702 of yacc.c  */
-#line 2216 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2093 "src/parse-gram.c"

     break;
 
   case 7:
     break;
 
   case 7:

-/* Line 1702 of yacc.c  */
-#line 297 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 298 "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 1702 of yacc.c  */
-#line 2226 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2103 "src/parse-gram.c"

     break;
 
   case 8:
     break;
 
   case 8:

-/* Line 1702 of yacc.c  */
-#line 301 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 302 "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 1702 of yacc.c  */
-#line 2237 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2114 "src/parse-gram.c"

     break;
 
   case 9:
     break;
 
   case 9:

-/* Line 1702 of yacc.c  */
-#line 305 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 306 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2245 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2122 "src/parse-gram.c"

     break;
 
   case 10:
     break;
 
   case 10:

-/* Line 1702 of yacc.c  */
-#line 307 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 308 "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 1702 of yacc.c  */
-#line 2256 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2133 "src/parse-gram.c"

     break;
 
   case 11:
     break;
 
   case 11:

-/* Line 1702 of yacc.c  */
-#line 312 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 313 "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 1702 of yacc.c  */
-#line 2267 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2144 "src/parse-gram.c"

     break;
 
   case 12:
     break;
 
   case 12:

-/* Line 1702 of yacc.c  */
-#line 316 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 317 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2275 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2152 "src/parse-gram.c"

     break;
 
   case 13:
     break;
 
   case 13:

-/* Line 1702 of yacc.c  */
-#line 317 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 318 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2283 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2160 "src/parse-gram.c"

     break;
 
   case 14:
     break;
 
   case 14:

-/* Line 1702 of yacc.c  */
-#line 318 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 319 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2291 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2168 "src/parse-gram.c"

     break;
 
   case 15:
     break;
 
   case 15:

-/* Line 1702 of yacc.c  */
-#line 319 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 320 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2299 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2176 "src/parse-gram.c"

     break;
 
   case 16:
     break;
 
   case 16:

-/* Line 1702 of yacc.c  */
-#line 321 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 322 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2310 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2187 "src/parse-gram.c"

     break;
 
   case 17:
     break;
 
   case 17:

-/* Line 1702 of yacc.c  */
-#line 326 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 327 "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]));


@@ -2320,93 +2197,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 1702 of yacc.c  */
-#line 2325 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2202 "src/parse-gram.c"

     break;
 
   case 18:
     break;
 
   case 18:

-/* Line 1702 of yacc.c  */
-#line 334 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 335 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2333 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2210 "src/parse-gram.c"

     break;
 
   case 19:
     break;
 
   case 19:

-/* Line 1702 of yacc.c  */
-#line 335 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 336 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2341 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2218 "src/parse-gram.c"

     break;
 
   case 20:
     break;
 
   case 20:

-/* Line 1702 of yacc.c  */
-#line 336 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 337 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2349 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2226 "src/parse-gram.c"

     break;
 
   case 21:
     break;
 
   case 21:

-/* Line 1702 of yacc.c  */
-#line 337 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 338 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2357 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2234 "src/parse-gram.c"

     break;
 
   case 22:
     break;
 
   case 22:

-/* Line 1702 of yacc.c  */
-#line 338 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 339 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2365 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2242 "src/parse-gram.c"

     break;
 
   case 23:
     break;
 
   case 23:

-/* Line 1702 of yacc.c  */
-#line 339 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 340 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2373 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2250 "src/parse-gram.c"

     break;
 
   case 24:
     break;
 
   case 24:

-/* Line 1702 of yacc.c  */
-#line 340 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 341 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2381 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2258 "src/parse-gram.c"

     break;
 
   case 25:
     break;
 
   case 25:

-/* Line 1702 of yacc.c  */
-#line 341 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 342 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2389 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2266 "src/parse-gram.c"

     break;
 
   case 26:
     break;
 
   case 26:

-/* Line 1702 of yacc.c  */
-#line 341 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 342 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2397 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2274 "src/parse-gram.c"

     break;
 
   case 27:
     break;
 
   case 27:

-/* Line 1702 of yacc.c  */
-#line 342 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 343 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2405 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2282 "src/parse-gram.c"

     break;
 
   case 28:
     break;
 
   case 28:

-/* Line 1702 of yacc.c  */
-#line 344 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 345 "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, '/'))


@@ -2430,202 +2307,207 @@ yyreduce:
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }

-/* Line 1702 of yacc.c  */
-#line 2435 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2312 "src/parse-gram.c"

     break;
 
   case 29:
     break;
 
   case 29:

-/* Line 1702 of yacc.c  */
-#line 367 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 368 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2443 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2320 "src/parse-gram.c"

     break;
 
   case 30:
     break;
 
   case 30:

-/* Line 1702 of yacc.c  */
-#line 368 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 369 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2451 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2328 "src/parse-gram.c"

     break;
 
   case 31:
     break;
 
   case 31:

-/* Line 1702 of yacc.c  */
-#line 369 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 370 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2459 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2336 "src/parse-gram.c"

     break;
 
   case 33:
     break;
 
   case 33:

-/* Line 1702 of yacc.c  */
-#line 374 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 375 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2467 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2344 "src/parse-gram.c"

     break;
 
   case 34:
     break;
 
   case 34:

-/* Line 1702 of yacc.c  */
-#line 375 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 376 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2475 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2352 "src/parse-gram.c"

     break;
 
   case 37:
     break;
 
   case 37:

-/* Line 1702 of yacc.c  */
-#line 387 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 388 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2485 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2362 "src/parse-gram.c"

     break;
 
   case 38:
     break;
 
   case 38:

-/* Line 1702 of yacc.c  */
-#line 391 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 392 "src/parse-gram.y"

     {
     {

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

     }
     }

-/* Line 1702 of yacc.c  */
-#line 2498 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2380 "src/parse-gram.c"

     break;
 
   case 39:
     break;
 
   case 39:

-/* Line 1702 of yacc.c  */
-#line 398 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 404 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2508 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2390 "src/parse-gram.c"

     break;
 
   case 40:
     break;
 
   case 40:

-/* Line 1702 of yacc.c  */
-#line 402 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 408 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2518 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2400 "src/parse-gram.c"

     break;
 
   case 41:
     break;
 
   case 41:

-/* Line 1702 of yacc.c  */
-#line 406 "src/parse-gram.y"
+/* Line 1679 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 1702 of yacc.c  */
-#line 2531 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2413 "src/parse-gram.c"

     break;
 
   case 42:
     break;
 
   case 42:

-/* Line 1702 of yacc.c  */
-#line 413 "src/parse-gram.y"
+/* Line 1679 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 1702 of yacc.c  */
-#line 2542 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2424 "src/parse-gram.c"

     break;
 
   case 43:
     break;
 
   case 43:

-/* Line 1702 of yacc.c  */
-#line 423 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 429 "src/parse-gram.y"

     { (yyval.code_type) = destructor; }
     { (yyval.code_type) = destructor; }

-/* Line 1702 of yacc.c  */
-#line 2550 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2432 "src/parse-gram.c"

     break;
 
   case 44:
     break;
 
   case 44:

-/* Line 1702 of yacc.c  */
-#line 424 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 430 "src/parse-gram.y"

     { (yyval.code_type) = printer; }
     { (yyval.code_type) = printer; }

-/* Line 1702 of yacc.c  */
-#line 2558 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2440 "src/parse-gram.c"

     break;
 
   case 45:
     break;
 
   case 45:

-/* Line 1702 of yacc.c  */
-#line 434 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 440 "src/parse-gram.y"

     {}
     {}

-/* Line 1702 of yacc.c  */
-#line 2566 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2448 "src/parse-gram.c"

     break;
 
   case 46:
     break;
 
   case 46:

-/* Line 1702 of yacc.c  */
-#line 435 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 441 "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 1702 of yacc.c  */
-#line 2574 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2456 "src/parse-gram.c"

     break;
 
   case 47:
     break;
 
   case 47:

-/* Line 1702 of yacc.c  */
-#line 440 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 446 "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 1702 of yacc.c  */
-#line 2586 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2468 "src/parse-gram.c"

     break;
 
   case 48:
     break;
 
   case 48:

-/* Line 1702 of yacc.c  */
-#line 451 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 457 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2594 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2476 "src/parse-gram.c"

     break;
 
   case 49:
     break;
 
   case 49:

-/* Line 1702 of yacc.c  */
-#line 452 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 458 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2605 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2487 "src/parse-gram.c"

     break;
 
   case 50:
     break;
 
   case 50:

-/* Line 1702 of yacc.c  */
-#line 456 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 462 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2613 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2495 "src/parse-gram.c"

     break;
 
   case 51:
     break;
 
   case 51:

-/* Line 1702 of yacc.c  */
-#line 457 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 463 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2624 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2506 "src/parse-gram.c"

     break;
 
   case 52:
     break;
 
   case 52:

-/* Line 1702 of yacc.c  */
-#line 462 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 468 "src/parse-gram.y"

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


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

-/* Line 1702 of yacc.c  */
-#line 2638 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2520 "src/parse-gram.c"

     break;
 
   case 53:
     break;
 
   case 53:

-/* Line 1702 of yacc.c  */
-#line 473 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 479 "src/parse-gram.y"

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


@@ -2651,358 +2533,358 @@ yyreduce:
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }

-/* Line 1702 of yacc.c  */
-#line 2656 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2538 "src/parse-gram.c"

     break;
 
   case 54:
     break;
 
   case 54:

-/* Line 1702 of yacc.c  */
-#line 487 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 493 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2664 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2546 "src/parse-gram.c"

     break;
 
   case 55:
     break;
 
   case 55:

-/* Line 1702 of yacc.c  */
-#line 488 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 494 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2672 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2554 "src/parse-gram.c"

     break;
 
   case 56:
     break;
 
   case 56:

-/* Line 1702 of yacc.c  */
-#line 489 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 495 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2680 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2562 "src/parse-gram.c"

     break;
 
   case 57:
     break;
 
   case 57:

-/* Line 1702 of yacc.c  */
-#line 490 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 496 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2688 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2570 "src/parse-gram.c"

     break;
 
   case 58:
     break;
 
   case 58:

-/* Line 1702 of yacc.c  */
-#line 494 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 500 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2696 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2578 "src/parse-gram.c"

     break;
 
   case 59:
     break;
 
   case 59:

-/* Line 1702 of yacc.c  */
-#line 495 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 501 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2704 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2586 "src/parse-gram.c"

     break;
 
   case 60:
     break;
 
   case 60:

-/* Line 1702 of yacc.c  */
-#line 501 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 507 "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 1702 of yacc.c  */
-#line 2712 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2594 "src/parse-gram.c"

     break;
 
   case 61:
     break;
 
   case 61:

-/* Line 1702 of yacc.c  */
-#line 503 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 509 "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 1702 of yacc.c  */
-#line 2720 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2602 "src/parse-gram.c"

     break;
 
   case 62:
     break;
 
   case 62:

-/* Line 1702 of yacc.c  */
-#line 507 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 513 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2728 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2610 "src/parse-gram.c"

     break;
 
   case 63:
     break;
 
   case 63:

-/* Line 1702 of yacc.c  */
-#line 508 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 514 "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 1702 of yacc.c  */
-#line 2736 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2618 "src/parse-gram.c"

     break;
 
   case 64:
     break;
 
   case 64:

-/* Line 1702 of yacc.c  */
-#line 514 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 520 "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 1702 of yacc.c  */
-#line 2744 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2626 "src/parse-gram.c"

     break;
 
   case 65:
     break;
 
   case 65:

-/* Line 1702 of yacc.c  */
-#line 516 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 522 "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 1702 of yacc.c  */
-#line 2752 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2634 "src/parse-gram.c"

     break;
 
   case 66:
     break;
 
   case 66:

-/* Line 1702 of yacc.c  */
-#line 520 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 526 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2760 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2642 "src/parse-gram.c"

     break;
 
   case 67:
     break;
 
   case 67:

-/* Line 1702 of yacc.c  */
-#line 521 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 527 "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 1702 of yacc.c  */
-#line 2768 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2650 "src/parse-gram.c"

     break;
 
   case 68:
     break;
 
   case 68:

-/* Line 1702 of yacc.c  */
-#line 525 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 531 "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 1702 of yacc.c  */
-#line 2776 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2658 "src/parse-gram.c"

     break;
 
   case 69:
     break;
 
   case 69:

-/* Line 1702 of yacc.c  */
-#line 526 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 532 "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 1702 of yacc.c  */
-#line 2784 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2666 "src/parse-gram.c"

     break;
 
   case 71:
     break;
 
   case 71:

-/* Line 1702 of yacc.c  */
-#line 531 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 537 "src/parse-gram.y"

     { (yyval.uniqstr) = uniqstr_new ("*"); }
     { (yyval.uniqstr) = uniqstr_new ("*"); }

-/* Line 1702 of yacc.c  */
-#line 2792 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2674 "src/parse-gram.c"

     break;
 
   case 72:
     break;
 
   case 72:

-/* Line 1702 of yacc.c  */
-#line 532 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 538 "src/parse-gram.y"

     { (yyval.uniqstr) = uniqstr_new (""); }
     { (yyval.uniqstr) = uniqstr_new (""); }

-/* Line 1702 of yacc.c  */
-#line 2800 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2682 "src/parse-gram.c"

     break;
 
   case 73:
     break;
 
   case 73:

-/* Line 1702 of yacc.c  */
-#line 538 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 544 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2811 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2693 "src/parse-gram.c"

     break;
 
   case 74:
     break;
 
   case 74:

-/* Line 1702 of yacc.c  */
-#line 543 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 549 "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 1702 of yacc.c  */
-#line 2822 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2704 "src/parse-gram.c"

     break;
 
   case 75:
     break;
 
   case 75:

-/* Line 1702 of yacc.c  */
-#line 548 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 554 "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 1702 of yacc.c  */
-#line 2834 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2716 "src/parse-gram.c"

     break;
 
   case 76:
     break;
 
   case 76:

-/* Line 1702 of yacc.c  */
-#line 554 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 560 "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 1702 of yacc.c  */
-#line 2846 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2728 "src/parse-gram.c"

     break;
 
   case 77:
     break;
 
   case 77:

-/* Line 1702 of yacc.c  */
-#line 560 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 566 "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 1702 of yacc.c  */
-#line 2859 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2741 "src/parse-gram.c"

     break;
 
   case 84:
     break;
 
   case 84:

-/* Line 1702 of yacc.c  */
-#line 590 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 596 "src/parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }

-/* Line 1702 of yacc.c  */
-#line 2869 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2751 "src/parse-gram.c"

     break;
 
   case 85:
     break;
 
   case 85:

-/* Line 1702 of yacc.c  */
-#line 596 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 602 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2877 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2759 "src/parse-gram.c"

     break;
 
   case 86:
     break;
 
   case 86:

-/* Line 1702 of yacc.c  */
-#line 597 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 603 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2888 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2770 "src/parse-gram.c"

     break;
 
   case 87:
     break;
 
   case 87:

-/* Line 1702 of yacc.c  */
-#line 604 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 610 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2896 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2778 "src/parse-gram.c"

     break;
 
   case 88:
     break;
 
   case 88:

-/* Line 1702 of yacc.c  */
-#line 605 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 611 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2904 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2786 "src/parse-gram.c"

     break;
 
   case 90:
     break;
 
   case 90:

-/* Line 1702 of yacc.c  */
-#line 611 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 617 "src/parse-gram.y"

     { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
                                   current_lhs_named_ref); }
     { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
                                   current_lhs_named_ref); }

-/* Line 1702 of yacc.c  */
-#line 2913 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2795 "src/parse-gram.c"

     break;
 
   case 91:
     break;
 
   case 91:

-/* Line 1702 of yacc.c  */
-#line 614 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 620 "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 1702 of yacc.c  */
-#line 2921 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2803 "src/parse-gram.c"

     break;
 
   case 92:
     break;
 
   case 92:

-/* Line 1702 of yacc.c  */
-#line 616 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 622 "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 1702 of yacc.c  */
-#line 2929 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2811 "src/parse-gram.c"

     break;
 
   case 93:
     break;
 
   case 93:

-/* Line 1702 of yacc.c  */
-#line 618 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 624 "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 1702 of yacc.c  */
-#line 2937 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2819 "src/parse-gram.c"

     break;
 
   case 94:
     break;
 
   case 94:

-/* Line 1702 of yacc.c  */
-#line 620 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 626 "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 1702 of yacc.c  */
-#line 2945 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2827 "src/parse-gram.c"

     break;
 
   case 95:
     break;
 
   case 95:

-/* Line 1702 of yacc.c  */
-#line 622 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 628 "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 1702 of yacc.c  */
-#line 2953 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2835 "src/parse-gram.c"

     break;
 
   case 96:
     break;
 
   case 96:

-/* Line 1702 of yacc.c  */
-#line 624 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 630 "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 1702 of yacc.c  */
-#line 2961 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2843 "src/parse-gram.c"

     break;
 
   case 97:
     break;
 
   case 97:

-/* Line 1702 of yacc.c  */
-#line 628 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 634 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2969 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2851 "src/parse-gram.c"

     break;
 
   case 98:
     break;
 
   case 98:

-/* Line 1702 of yacc.c  */
-#line 630 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 636 "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 1702 of yacc.c  */
-#line 2977 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2859 "src/parse-gram.c"

     break;
 
   case 100:
     break;
 
   case 100:

-/* Line 1702 of yacc.c  */
-#line 641 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 647 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2985 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2867 "src/parse-gram.c"

     break;
 
   case 101:
     break;
 
   case 101:

-/* Line 1702 of yacc.c  */
-#line 646 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 652 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 2993 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2875 "src/parse-gram.c"

     break;
 
   case 102:
     break;
 
   case 102:

-/* Line 1702 of yacc.c  */
-#line 647 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 653 "src/parse-gram.y"

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

-/* Line 1702 of yacc.c  */
-#line 3001 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2883 "src/parse-gram.c"

     break;
 
   case 104:
     break;
 
   case 104:

-/* Line 1702 of yacc.c  */
-#line 658 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 664 "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';


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

-/* Line 1702 of yacc.c  */
-#line 3016 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2898 "src/parse-gram.c"

     break;
 
   case 105:
     break;
 
   case 105:

-/* Line 1702 of yacc.c  */
-#line 678 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 684 "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 1702 of yacc.c  */
-#line 3024 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2906 "src/parse-gram.c"

     break;
 
   case 106:
     break;
 
   case 106:

-/* Line 1702 of yacc.c  */
-#line 680 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 686 "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 1702 of yacc.c  */
-#line 3036 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2918 "src/parse-gram.c"

     break;
 
   case 107:
     break;
 
   case 107:

-/* Line 1702 of yacc.c  */
-#line 688 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 694 "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 1702 of yacc.c  */
-#line 3044 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2926 "src/parse-gram.c"

     break;
 
   case 110:
     break;
 
   case 110:

-/* Line 1702 of yacc.c  */
-#line 700 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 706 "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 1702 of yacc.c  */
-#line 3055 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2937 "src/parse-gram.c"

     break;
 
   case 112:
     break;
 
   case 112:

-/* Line 1702 of yacc.c  */
-#line 709 "src/parse-gram.y"
+/* Line 1679 of yacc.c  */
+#line 715 "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]));


@@ -3065,13 +2947,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 1702 of yacc.c  */
-#line 3070 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2952 "src/parse-gram.c"

     break;
 
 
     break;
 
 

-/* Line 1702 of yacc.c  */
-#line 3075 "src/parse-gram.c"
+/* Line 1679 of yacc.c  */
+#line 2957 "src/parse-gram.c"

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


@@ -3314,12 +3196,10 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif

-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;

 }
 }

-
-/* Line 1962 of yacc.c  */
-#line 719 "src/parse-gram.y"
+/* Line 1937 of yacc.c  */
+#line 725 "src/parse-gram.y"

 
 
 
 
 
 


@@ -3374,16 +3254,17 @@ add_param (param_type 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)
   }
 
   if (! name_start)

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

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


@@ -3403,8 +3284,8 @@ version_check (location const *loc, char const *version)
 {
   if (strverscmp (version, PACKAGE_VERSION) > 0)
     {
 {
   if (strverscmp (version, PACKAGE_VERSION) > 0)
     {

-      complain_at (*loc, complaint, "require bison %s, but have %s",
-                   version, PACKAGE_VERSION);
+      complain (loc, complaint, "require bison %s, but have %s",
+                version, PACKAGE_VERSION);

       exit (EX_MISMATCH);
     }
 }
       exit (EX_MISMATCH);
     }
 }


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

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

 }
 
 char const *
 }
 
 char const *