regen

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 92bb62cf9de683dfafac36379931c4ab8bdb38cd..30e2a7819e4d5e4c9ed179dca039a6e2d4faee1f 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.6.2.873-d87e-dirty.  */
+/* A Bison parser, made by GNU Bison 2.7.1067-29fb-dirty.  */

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

-   Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2013 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.6.2.873-d87e-dirty"
+#define YYBISON_VERSION "2.7.1067-29fb-dirty"

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


@@ -58,23 +58,22 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
 /* Pull parsers.  */
 #define YYPULL 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
 #define yyerror         gram_error
 /* Substitute the variable and function names.  */
 #define yyparse         gram_parse
 #define yylex           gram_lex
 #define yyerror         gram_error

-#define yylval          gram_lval
-#define yychar          gram_char

 #define yydebug         gram_debug
 #define yynerrs         gram_nerrs
 #define yydebug         gram_debug
 #define yynerrs         gram_nerrs

-#define yylloc          gram_lloc
+

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

-/* Line 331 of yacc.c  */
-#line 1 "src/parse-gram.y"
+#line 1 "src/parse-gram.y" /* yacc.c:357  */

 /* Bison Grammar Parser                             -*- C -*-
 
 /* Bison Grammar Parser                             -*- C -*-
 

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

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


@@ -114,7 +113,7 @@
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YY_LOCATION_PRINT(File, Loc) \
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YY_LOCATION_PRINT(File, Loc) \

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

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


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

-/* Line 331 of yacc.c  */
-#line 132 "src/parse-gram.c"
+#line 130 "src/parse-gram.c" /* yacc.c:357  */

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


@@ -148,18 +146,25 @@ 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
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
+#ifndef YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED
+# define YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED
+/* Debug traces.  */
+#ifndef GRAM_DEBUG
+# if defined YYDEBUG

 #if 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
 /* "%code requires" blocks.  */
 extern int gram_debug;
 #endif
 /* "%code requires" blocks.  */

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

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


@@ -173,15 +178,12 @@ extern int gram_debug;
 # endif
 
 
 # endif
 
 

-/* Line 347 of yacc.c  */
-#line 178 "src/parse-gram.c"
+#line 182 "src/parse-gram.c" /* yacc.c:373  */

 
 

-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  /* Put the tokens into the symbol table, so that GDB and other debuggers
-     know about them.  */
-  enum yytokentype
+/* Token type.  */
+#ifndef GRAM_TOKENTYPE
+# define GRAM_TOKENTYPE
+  enum gram_tokentype

   {
     GRAM_EOF = 0,
     STRING = 258,
   {
     GRAM_EOF = 0,
     STRING = 258,


@@ -297,11 +299,12 @@ extern int gram_debug;
 #define PERCENT_PARAM 310
 #define PERCENT_UNION 311
 
 #define PERCENT_PARAM 310
 #define PERCENT_UNION 311
 

-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+/* Value type.  */
+#if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED
+typedef union GRAM_STYPE GRAM_STYPE;
+union GRAM_STYPE

 {
 {

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

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


@@ -313,46 +316,44 @@ typedef union YYSTYPE
   uniqstr uniqstr;
   unsigned char character;
 
   uniqstr uniqstr;
   unsigned char character;
 

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

 
   param_type param;
 
 
   param_type param;
 

-/* Line 347 of yacc.c  */
-#line 426 "src/parse-gram.y"
+#line 423 "src/parse-gram.y" /* yacc.c:373  */

 code_props_type code_type;
 
 code_props_type code_type;
 

-/* Line 347 of yacc.c  */
-#line 327 "src/parse-gram.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
+#line 327 "src/parse-gram.c" /* yacc.c:373  */
+};
+# define GRAM_STYPE_IS_TRIVIAL 1
+# define GRAM_STYPE_IS_DECLARED 1

 #endif
 
 #endif
 

-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE
+/* Location type.  */
+#if ! defined GRAM_LTYPE && ! defined GRAM_LTYPE_IS_DECLARED
+typedef struct GRAM_LTYPE GRAM_LTYPE;
+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_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
+};
+# define GRAM_LTYPE_IS_DECLARED 1
+# define GRAM_LTYPE_IS_TRIVIAL 1

 #endif
 
 
 #endif
 
 

+

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

-#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 350 of yacc.c  */
-#line 353 "src/parse-gram.c"
+#line 355 "src/parse-gram.c" /* yacc.c:376  */

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

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

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


@@ -384,8 +385,7 @@ int gram_parse (void);
   #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 351 of yacc.c  */
-#line 236 "src/parse-gram.y"
+#line 236 "src/parse-gram.y" /* yacc.c:377  */

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


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

-/* Line 351 of yacc.c  */
-#line 402 "src/parse-gram.c"
+#line 401 "src/parse-gram.c" /* yacc.c:377  */

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


@@ -447,19 +446,19 @@ 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.  */
 #ifdef __GNUC__
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #ifdef __GNUC__

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

 #else
 #else

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

 #endif
 
 #if 1
 #endif
 
 #if 1


@@ -509,8 +508,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


@@ -572,16 +571,16 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */

-#define YYLAST   163
+#define YYLAST   157

 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  57
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  38
 /* YYNRULES -- Number of rules.  */
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  57
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  38
 /* YYNRULES -- Number of rules.  */

-#define YYNRULES  112
+#define YYNRULES  109

 /* YYNSTATES -- Number of states.  */
 /* YYNSTATES -- Number of states.  */

-#define YYNSTATES  149
+#define YYNSTATES  143

 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */


@@ -629,26 +628,25 @@ static const yytype_uint8 yytranslate[] =
       55,    56
 };
 
       55,    56
 };
 

-#if YYDEBUG
-  /* YYRLINEYYN -- Source line where rule number YYN was defined.    */
+#if GRAM_DEBUG
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */

 static const yytype_uint16 yyrline[] =
 {
        0,   272,   272,   280,   282,   286,   287,   297,   301,   306,
 static const yytype_uint16 yyrline[] =
 {
        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
+     307,   312,   317,   318,   319,   320,   325,   334,   335,   336,
+     337,   338,   339,   339,   340,   341,   365,   366,   367,   368,
+     372,   373,   382,   383,   384,   388,   400,   404,   408,   415,
+     426,   427,   437,   438,   442,   454,   454,   459,   459,   464,
+     475,   490,   491,   492,   493,   497,   498,   503,   505,   510,
+     511,   516,   518,   523,   524,   528,   529,   533,   534,   535,
+     540,   545,   550,   556,   562,   573,   574,   583,   584,   590,
+     591,   592,   599,   599,   607,   608,   609,   614,   616,   618,
+     620,   622,   624,   626,   631,   633,   643,   644,   649,   650,
+     651,   660,   680,   682,   691,   696,   697,   702,   709,   711

 };
 #endif
 
 };
 #endif
 

-#if YYDEBUG || YYERROR_VERBOSE || 1
+#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[] =


@@ -692,124 +690,122 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
 };
 # endif
 

-#define YYPACT_NINF -88
+#define YYPACT_NINF -74

 
 

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

 
 

-#define YYTABLE_NINF -112
+#define YYTABLE_NINF -109

 
 

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

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

-     STATE-NUM.    */
+     STATE-NUM.  */

 static const yytype_int16 yypact[] =
 {
 static const yytype_int16 yypact[] =
 {

-     -88,    42,   107,   -88,   -88,   -88,     8,   -88,   -88,   -88,
-     -88,   -88,   -88,    19,   -88,    12,    60,   -88,    66,    72,
-     -88,     2,   -88,    39,    83,    35,   -88,   -88,   -88,    36,
-      87,    88,    32,   -88,   -88,   -88,    15,   -88,   -88,   -88,
-      46,   -88,   -88,    55,   -88,   -88,    45,    -2,    -2,    32,
-     -88,    58,   -88,   -88,   -88,    31,   -88,   -88,   -88,   -88,
-      97,   -88,   -88,   -88,    98,   -88,   100,   -88,   -88,   -88,
-     -88,   -88,   -88,   -88,   -88,    56,   -88,    57,     1,   -88,
-     -88,    62,    69,   -88,    58,     0,   -88,    32,   -88,   -88,
-      -2,    85,    -2,    32,   -88,   -88,   -88,   -88,   -88,   -88,
-     -88,   -88,   -88,   -88,    77,   -88,   -88,   -88,   -88,   -88,
-      70,   -88,   -88,   -88,   -88,     0,   -88,   -88,   -88,    32,
-     -88,   102,   -88,   119,   -88,   -88,   -88,   -88,   -88,   -88,
-     -88,   -88,   -88,    33,    53,   -88,   -88,    32,   143,    71,
-      62,   -88,    62,    53,   -88,   -88,   -88,   -88,   -88
+     -74,    40,   101,   -74,   -74,   -74,   -48,   -74,   -74,   -74,
+     -74,   -74,   -74,    19,   -74,     0,    52,   -74,    56,    79,
+     -74,    81,   -74,    45,    83,    84,   -74,   -74,   -74,    85,
+      86,    87,    31,   -74,   -74,   -74,    15,   -74,   -74,   -74,
+      46,   -74,   -74,    51,   -74,   -74,    42,     4,     4,    31,
+     -74,    57,   -74,   -74,   -74,    36,   -74,   -74,   -74,   -74,
+     -74,   -74,   -74,   -74,   -74,   -74,   -74,   -74,   -74,   -74,
+     -74,   -74,    47,   -74,    49,     1,   -74,   -74,    59,    62,
+     -74,    57,    26,   -74,    31,   -74,   -74,     4,    72,     4,
+      31,   -74,   -74,   -74,   -74,   -74,   -74,   -74,    60,   -74,
+     -74,   -74,   -74,   -74,    63,   -74,   -74,   -74,   -74,    26,
+     -74,   -74,   -74,    31,   -74,   111,   -74,   113,   -74,   -74,
+     -74,   -74,   -74,   -74,   -74,   -74,   -74,   -13,    27,   -74,
+     -74,    31,   137,    65,    59,   -74,    59,    27,   -74,   -74,
+     -74,   -74,   -74

 };
 
 };
 

-  /* YYDEFACT[S] -- default reduction number in state S.  Performed when
-     YYTABLE does not specify something else to do.  Zero means the default
-     is an error.    */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */

 static const yytype_uint8 yydefact[] =
 {
 static const yytype_uint8 yydefact[] =
 {

-       3,     0,     0,     1,    50,    48,     0,    43,    44,    54,
-      55,    56,    57,     0,    39,     0,     9,    11,     0,     0,
-       7,     0,    16,     0,     0,     0,    40,    21,    22,     0,
-       0,     0,     0,    29,    30,    31,     0,     6,    32,    25,
-      45,     4,     5,     0,    36,    35,    58,     0,     0,     0,
-     104,     0,    41,   100,    99,   101,    10,    12,    13,    14,
-       0,    17,    18,    19,     0,    23,     0,    27,    28,   110,
-     106,   105,   108,    37,   109,     0,   107,     0,     0,    80,
-      82,    97,     0,    46,     0,     0,    59,     0,    73,    78,
-      51,    74,    49,    52,    64,    42,   103,   102,     8,    15,
-      20,    24,    84,    83,     0,    81,     2,    98,    85,    34,
-      26,    47,    70,    71,    72,    38,    66,    69,    68,    53,
-      60,    62,    79,    75,    76,    65,   112,    90,    33,    67,
-      61,    63,    77,    86,    87,    90,    89,     0,     0,     0,
-      97,    93,    97,    88,    94,    95,    96,    92,    91
+       3,     0,     0,     1,    47,    45,     0,    40,    41,    51,
+      52,    53,    54,     0,    36,     0,     9,    11,     0,     0,
+       7,     0,    15,     0,     0,     0,    37,    19,    20,     0,
+       0,     0,     0,    26,    27,    28,     0,     6,    29,    22,
+      42,     4,     5,     0,    33,    32,    55,     0,     0,     0,
+     101,     0,    38,    97,    96,    98,    10,    12,    13,    14,
+      16,    17,    18,    21,    24,    25,   107,   103,   102,   105,
+      34,   106,     0,   104,     0,     0,    77,    79,    94,     0,
+      43,     0,     0,    56,     0,    70,    75,    48,    71,    46,
+      49,    61,    39,   100,    99,     8,    81,    80,     0,    78,
+       2,    95,    82,    31,    23,    44,    67,    68,    69,    35,
+      63,    66,    65,    50,    57,    59,    76,    72,    73,    62,
+     109,    87,    30,    64,    58,    60,    74,    83,    84,    87,
+      86,     0,     0,     0,    94,    90,    94,    85,    91,    92,
+      93,    89,    88

 };
 
 };
 

-  /* YYPGOTO[NTERM-NUM].    */
+  /* YYPGOTO[NTERM-NUM].  */

 static const yytype_int16 yypgoto[] =
 {
 static const yytype_int16 yypgoto[] =
 {

-     -88,   -88,   -88,   -88,   -88,   -88,   146,   -88,   -88,   -88,
-     -88,   -88,   -88,   -88,   -88,   -88,    30,   -88,   -88,    37,
-     -88,   -26,   103,   -88,    75,   -88,   -88,   -88,    21,   -57,
-     -88,   -88,   -11,   -18,   -88,   -32,   -87,   -88
+     -74,   -74,   -74,   -74,   -74,   -74,   140,   -74,   -74,   -74,
+     -74,   -74,   -74,   -74,   -74,   -74,    30,   -74,   -74,    35,
+     -74,   -26,    97,   -74,    71,   -74,   -74,   -74,    18,   -70,
+     -74,   -74,   -46,     6,   -74,   -32,   -73,   -74

 };
 
 };
 

-  /* YYDEFGOTO[NTERM-NUM].    */
+  /* YYDEFGOTO[NTERM-NUM].  */

 static const yytype_int16 yydefgoto[] =
 {
 static const yytype_int16 yydefgoto[] =
 {

-      -1,     1,     2,    41,    82,   110,    77,    43,    84,    44,
-      48,    47,    45,    46,    87,   119,   120,    93,   115,   116,
-     117,    89,    90,    78,    79,    80,   127,   133,   134,   108,
-      55,    98,    52,    72,    81,   118,    74,   106
+      -1,     1,     2,    41,    79,   104,    74,    43,    81,    44,
+      48,    47,    45,    46,    84,   113,   114,    90,   109,   110,
+     111,    86,    87,    75,    76,    77,   121,   127,   128,   102,
+      55,    95,    52,    69,    78,   112,    71,   100

 };
 
 };
 

-  /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-     positive, shift that token.  If negative, reduce the rule which
-     number is the opposite.  If YYTABLE_NINF, syntax error.    */
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */

 static const yytype_int16 yytable[] =
 {
 static const yytype_int16 yytable[] =
 {

-      73,  -111,    75,    69,   124,    59,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    53,    75,    94,    13,    14,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    91,
-      91,    26,    13,    14,    96,    69,   132,    32,    63,    65,
-      95,    70,     3,    70,    71,    26,    71,    60,    76,   104,
-      88,    32,   112,   113,   114,   121,    69,    40,    54,    50,
-      49,   125,    76,    56,   122,    51,   122,   137,   138,   139,
-      57,    40,    91,   111,    91,    70,    58,    97,    71,    61,
-      64,    66,   135,   147,   136,   148,    62,   121,    69,   123,
-      67,    68,    83,   140,   141,    85,    70,    86,    50,    71,
-      99,   100,   142,   101,   107,   144,   131,   102,   103,   109,
-     128,   142,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,   126,    69,   146,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,   145,    42,   130,
-       0,    92,   129,   105,     0,    36,   143,    37,    38,     0,
-       0,     0,    39,    40
+      70,  -108,    72,    53,    49,    92,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,   118,    72,    91,    13,    14,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    66,
+      66,    26,    13,    14,    66,   105,   129,    32,   130,    93,
+       3,   131,   132,   133,   126,    26,    54,    67,    73,    98,
+      68,    32,   115,    88,    88,    56,    85,    40,   119,    50,
+      57,   116,    73,   116,   141,    51,   142,   134,   135,    67,
+      67,    40,    68,    68,    67,    66,   117,    68,   106,   107,
+     108,   115,    94,    58,    59,    60,    61,    62,    63,    64,
+      65,    82,    80,    88,    83,    88,   136,    50,    96,   138,
+      97,   101,   103,   122,   120,   136,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,   125,    66,   140,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,   139,    42,   124,   123,    89,    99,   137,     0,    36,
+       0,    37,    38,     0,     0,     0,    39,    40

 };
 
 static const yytype_int16 yycheck[] =
 {
 };
 
 static const yytype_int16 yycheck[] =
 {

-      32,     0,     1,     3,    91,     3,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,     3,     1,    49,    17,    18,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    47,
-      48,    30,    17,    18,     3,     3,   123,    36,     3,     3,
-      51,    43,     0,    43,    46,    30,    46,    45,    47,    48,
-      52,    36,    52,    53,    54,    87,     3,    56,    46,    40,
-      52,    93,    47,     3,    90,    46,    92,    14,    15,    16,
-       4,    56,    90,    84,    92,    43,     4,    46,    46,    40,
-      45,    45,    49,   140,    51,   142,     3,   119,     3,     4,
-       3,     3,    46,    40,    41,    40,    43,    52,    40,    46,
-       3,     3,   134,     3,    42,   137,     4,    51,    51,    40,
-      40,   143,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    44,     3,    52,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,     4,     2,   119,
-      -1,    48,   115,    78,    -1,    48,   135,    50,    51,    -1,
-      -1,    -1,    55,    56
+      32,     0,     1,     3,    52,    51,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    88,     1,    49,    17,    18,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,     3,
+       3,    30,    17,    18,     3,    81,    49,    36,    51,     3,
+       0,    14,    15,    16,   117,    30,    46,    43,    47,    48,
+      46,    36,    84,    47,    48,     3,    52,    56,    90,    40,
+       4,    87,    47,    89,   134,    46,   136,    40,    41,    43,
+      43,    56,    46,    46,    43,     3,     4,    46,    52,    53,
+      54,   113,    46,     4,     3,    40,     3,     3,     3,     3,
+       3,    40,    46,    87,    52,    89,   128,    40,    51,   131,
+      51,    42,    40,    40,    44,   137,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,     4,     3,    52,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,     4,     2,   113,   109,    48,    75,   129,    -1,    48,
+      -1,    50,    51,    -1,    -1,    -1,    55,    56

 };
 
 };
 

-  /* STOS_[STATE-NUM] -- The (internal number of the) accessing
-     symbol of state STATE-NUM.    */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */

 static const yytype_uint8 yystos[] =
 {
        0,    58,    59,     0,     5,     6,     7,     8,     9,    10,
 static const yytype_uint8 yystos[] =
 {
        0,    58,    59,     0,     5,     6,     7,     8,     9,    10,


@@ -818,49 +814,47 @@ static const yytype_uint8 yystos[] =
       34,    35,    36,    37,    38,    39,    48,    50,    51,    55,
       56,    60,    63,    64,    66,    69,    70,    68,    67,    52,
       40,    46,    89,     3,    46,    87,     3,     4,     4,     3,
       34,    35,    36,    37,    38,    39,    48,    50,    51,    55,
       56,    60,    63,    64,    66,    69,    70,    68,    67,    52,
       40,    46,    89,     3,    46,    87,     3,     4,     4,     3,

-      45,    40,     3,     3,    45,     3,    45,     3,     3,     3,
-      43,    46,    90,    92,    93,     1,    47,    63,    80,    81,
-      82,    91,    61,    46,    65,    40,    52,    71,    52,    78,
-      79,    90,    79,    74,    92,    89,     3,    46,    88,     3,
-       3,     3,    51,    51,    48,    81,    94,    42,    86,    40,
-      62,    89,    52,    53,    54,    75,    76,    77,    92,    72,
-      73,    92,    78,     4,    93,    92,    44,    83,    40,    76,
-      73,     4,    93,    84,    85,    49,    51,    14,    15,    16,
-      40,    41,    92,    85,    92,     4,    52,    86,    86
+      40,     3,     3,     3,     3,     3,     3,    43,    46,    90,
+      92,    93,     1,    47,    63,    80,    81,    82,    91,    61,
+      46,    65,    40,    52,    71,    52,    78,    79,    90,    79,
+      74,    92,    89,     3,    46,    88,    51,    51,    48,    81,
+      94,    42,    86,    40,    62,    89,    52,    53,    54,    75,
+      76,    77,    92,    72,    73,    92,    78,     4,    93,    92,
+      44,    83,    40,    76,    73,     4,    93,    84,    85,    49,
+      51,    14,    15,    16,    40,    41,    92,    85,    92,     4,
+      52,    86,    86

 };
 
 };
 

-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.    */
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */

 static const yytype_uint8 yyr1[] =
 {
        0,    57,    58,    59,    59,    60,    60,    60,    60,    60,
       60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
 static const yytype_uint8 yyr1[] =
 {
        0,    57,    58,    59,    59,    60,    60,    60,    60,    60,
       60,    60,    60,    60,    60,    60,    60,    60,    60,    60,

-      60,    60,    60,    60,    60,    61,    60,    60,    60,    60,
-      60,    60,    60,    62,    62,    63,    63,    63,    63,    63,
-      63,    63,    63,    64,    64,    65,    65,    63,    67,    66,
-      68,    66,    66,    69,    70,    70,    70,    70,    71,    71,
-      72,    72,    73,    73,    74,    74,    75,    75,    76,    76,
-      77,    77,    77,    78,    78,    78,    78,    78,    79,    79,
-      80,    80,    81,    81,    81,    83,    82,    84,    84,    84,
-      85,    85,    85,    85,    85,    85,    85,    86,    86,    87,
-      87,    88,    88,    88,    89,    90,    90,    91,    92,    92,
-      93,    94,    94
+      60,    60,    61,    60,    60,    60,    60,    60,    60,    60,
+      62,    62,    63,    63,    63,    63,    63,    63,    63,    63,
+      64,    64,    65,    65,    63,    67,    66,    68,    66,    66,
+      69,    70,    70,    70,    70,    71,    71,    72,    72,    73,
+      73,    74,    74,    75,    75,    76,    76,    77,    77,    77,
+      78,    78,    78,    78,    78,    79,    79,    80,    80,    81,
+      81,    81,    83,    82,    84,    84,    84,    85,    85,    85,
+      85,    85,    85,    85,    86,    86,    87,    87,    88,    88,
+      88,    89,    90,    90,    91,    92,    92,    93,    94,    94

 };
 
 };
 

-  /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.    */
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */

 static const yytype_uint8 yyr2[] =
 {
        0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     4,     0,     2,     1,     1,     1,     3,     1,

-       2,     1,     2,     2,     2,     3,     1,     2,     2,     2,
-       3,     1,     1,     2,     3,     0,     3,     2,     2,     1,
-       1,     1,     1,     2,     1,     1,     1,     2,     3,     1,
-       1,     2,     3,     1,     1,     0,     1,     3,     0,     3,
-       0,     3,     3,     3,     1,     1,     1,     1,     0,     1,
-       1,     2,     1,     2,     1,     2,     1,     2,     1,     1,
-       1,     1,     1,     1,     1,     2,     2,     3,     1,     2,
-       1,     2,     1,     2,     2,     0,     4,     1,     3,     2,
-       0,     3,     3,     2,     3,     3,     3,     0,     1,     1,
-       1,     0,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     0,     2
+       2,     1,     2,     2,     2,     1,     2,     2,     2,     1,
+       1,     2,     0,     3,     2,     2,     1,     1,     1,     1,
+       2,     1,     1,     1,     2,     3,     1,     1,     2,     3,
+       1,     1,     0,     1,     3,     0,     3,     0,     3,     3,
+       3,     1,     1,     1,     1,     0,     1,     1,     2,     1,
+       2,     1,     2,     1,     2,     1,     1,     1,     1,     1,
+       1,     1,     2,     2,     3,     1,     2,     1,     2,     1,
+       2,     2,     0,     4,     1,     3,     2,     0,     3,     3,
+       2,     3,     3,     3,     0,     1,     1,     1,     0,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     0,     2

 };
 
 
 };
 
 


@@ -894,7 +888,7 @@ do                                                              \
     }                                                           \
 while (0)
 
     }                                                           \
 while (0)
 

-
+/* Error token number */

 #define YYTERROR        1
 #define YYERRCODE       256
 
 #define YYTERROR        1
 #define YYERRCODE       256
 


@@ -925,32 +919,9 @@ while (0)
 
 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
 
 
 #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
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)                  \
-     fprintf (File, "%d.%d-%d.%d",                      \
-              (Loc).first_line, (Loc).first_column,     \
-              (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval, &yylloc)
-#endif

 
 /* Enable debugging if requested.  */
 
 /* 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 */


@@ -963,6 +934,51 @@ do {                                            \
     YYFPRINTF Args;                             \
 } while (0)
 
     YYFPRINTF Args;                             \
 } while (0)
 

+
+/* 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 GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL
+
+/* Print *YYLOCP on YYO.  Private, do not rely on its existence. */
+
+__attribute__((__unused__))
+static unsigned
+yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
+{
+  unsigned res = 0;
+  int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0;
+  if (0 <= yylocp->first_line)
+    {
+      res += YYFPRINTF (yyo, "%d", yylocp->first_line);
+      if (0 <= yylocp->first_column)
+        res += YYFPRINTF (yyo, ".%d", yylocp->first_column);
+    }
+  if (0 <= yylocp->last_line)
+    {
+      if (yylocp->first_line < yylocp->last_line)
+        {
+          res += YYFPRINTF (yyo, "-%d", yylocp->last_line);
+          if (0 <= end_col)
+            res += YYFPRINTF (yyo, ".%d", end_col);
+        }
+      else if (0 <= end_col && yylocp->first_column < end_col)
+        res += YYFPRINTF (yyo, "-%d", end_col);
+    }
+  return res;
+ }
+
+#  define YY_LOCATION_PRINT(File, Loc)          \
+  yy_location_print_ (File, &(Loc))
+
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+

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


@@ -983,7 +999,7 @@ static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
 {
   FILE *yyo = yyoutput;
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
 {
   FILE *yyo = yyoutput;

-  YYUSE(yyo);
+  YYUSE (yyo);

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


@@ -993,98 +1009,75 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
 # endif
   switch (yytype)
     {
 # endif
   switch (yytype)
     {

-            case 3: // "string"
-/* Line 709 of yacc.c  */
-#line 196 "src/parse-gram.y"
-        { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); }
-/* Line 709 of yacc.c  */
-#line 1002 "src/parse-gram.c"
+    case 3: /* "string"  */
+#line 196 "src/parse-gram.y" /* yacc.c:707  */
+      { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); }
+#line 1016 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 4: // "integer"
-/* Line 709 of yacc.c  */
-#line 209 "src/parse-gram.y"
-        { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
-/* Line 709 of yacc.c  */
-#line 1010 "src/parse-gram.c"
+    case 4: /* "integer"  */
+#line 209 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
+#line 1022 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 24: // "%<flag>"
-/* Line 709 of yacc.c  */
-#line 205 "src/parse-gram.y"
-        { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); }
-/* Line 709 of yacc.c  */
-#line 1018 "src/parse-gram.c"
+    case 24: /* "%<flag>"  */
+#line 205 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); }
+#line 1028 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 40: // "{...}"
-/* Line 709 of yacc.c  */
-#line 198 "src/parse-gram.y"
-        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
-/* Line 709 of yacc.c  */
-#line 1026 "src/parse-gram.c"
+    case 40: /* "{...}"  */
+#line 198 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
+#line 1034 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 42: // "[identifier]"
-/* Line 709 of yacc.c  */
-#line 203 "src/parse-gram.y"
-        { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); }
-/* Line 709 of yacc.c  */
-#line 1034 "src/parse-gram.c"
+    case 42: /* "[identifier]"  */
+#line 203 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); }
+#line 1040 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 43: // "char"
-/* Line 709 of yacc.c  */
-#line 190 "src/parse-gram.y"
-        { fputs (char_name (((*yyvaluep).character)), yyo); }
-/* Line 709 of yacc.c  */
-#line 1042 "src/parse-gram.c"
+    case 43: /* "char"  */
+#line 190 "src/parse-gram.y" /* yacc.c:707  */
+      { fputs (char_name (((*yyvaluep).character)), yyo); }
+#line 1046 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 44: // "epilogue"
-/* Line 709 of yacc.c  */
-#line 198 "src/parse-gram.y"
-        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 709 of yacc.c  */
-#line 1050 "src/parse-gram.c"
+    case 44: /* "epilogue"  */
+#line 198 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1052 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 46: // "identifier"
-/* Line 709 of yacc.c  */
-#line 202 "src/parse-gram.y"
-        { fputs (((*yyvaluep).uniqstr), yyo); }
-/* Line 709 of yacc.c  */
-#line 1058 "src/parse-gram.c"
+    case 46: /* "identifier"  */
+#line 202 "src/parse-gram.y" /* yacc.c:707  */
+      { fputs (((*yyvaluep).uniqstr), yyo); }
+#line 1058 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 47: // "identifier:"
-/* Line 709 of yacc.c  */
-#line 204 "src/parse-gram.y"
-        { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); }
-/* Line 709 of yacc.c  */
-#line 1066 "src/parse-gram.c"
+    case 47: /* "identifier:"  */
+#line 204 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); }
+#line 1064 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 50: // "%{...%}"
-/* Line 709 of yacc.c  */
-#line 198 "src/parse-gram.y"
-        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 709 of yacc.c  */
-#line 1074 "src/parse-gram.c"
+    case 50: /* "%{...%}"  */
+#line 198 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1070 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 52: // "<tag>"
-/* Line 709 of yacc.c  */
-#line 206 "src/parse-gram.y"
-        { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
-/* Line 709 of yacc.c  */
-#line 1082 "src/parse-gram.c"
+    case 52: /* "<tag>"  */
+#line 206 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
+#line 1076 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 55: // "%param"
-/* Line 709 of yacc.c  */
-#line 252 "src/parse-gram.y"
-        {
+    case 55: /* "%param"  */
+#line 252 "src/parse-gram.y" /* yacc.c:707  */
+      {

   switch (((*yyvaluep).param))
     {
 #define CASE(In, Out)                                           \
   switch (((*yyvaluep).param))
     {
 #define CASE(In, Out)                                           \


@@ -1096,88 +1089,67 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
       case param_none: aver (false); break;
     }
 }
       case param_none: aver (false); break;
     }
 }

-/* Line 709 of yacc.c  */
-#line 1101 "src/parse-gram.c"
+#line 1093 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 64: // code_props_type
-/* Line 709 of yacc.c  */
-#line 427 "src/parse-gram.y"
-        { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); }
-/* Line 709 of yacc.c  */
-#line 1109 "src/parse-gram.c"
+    case 64: /* code_props_type  */
+#line 424 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); }
+#line 1099 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 73: // symbol.prec
-/* Line 709 of yacc.c  */
-#line 212 "src/parse-gram.y"
-        { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 709 of yacc.c  */
-#line 1117 "src/parse-gram.c"
+    case 73: /* symbol.prec  */
+#line 212 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1105 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 77: // tag
-/* Line 709 of yacc.c  */
-#line 206 "src/parse-gram.y"
-        { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
-/* Line 709 of yacc.c  */
-#line 1125 "src/parse-gram.c"
+    case 77: /* tag  */
+#line 206 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
+#line 1111 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 87: // variable
-/* Line 709 of yacc.c  */
-#line 202 "src/parse-gram.y"
-        { fputs (((*yyvaluep).uniqstr), yyo); }
-/* Line 709 of yacc.c  */
-#line 1133 "src/parse-gram.c"
+    case 87: /* variable  */
+#line 202 "src/parse-gram.y" /* yacc.c:707  */
+      { fputs (((*yyvaluep).uniqstr), yyo); }
+#line 1117 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 88: // content.opt
-/* Line 709 of yacc.c  */
-#line 198 "src/parse-gram.y"
-        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 709 of yacc.c  */
-#line 1141 "src/parse-gram.c"
+    case 88: /* content.opt  */
+#line 198 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1123 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 89: // braceless
-/* Line 709 of yacc.c  */
-#line 198 "src/parse-gram.y"
-        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 709 of yacc.c  */
-#line 1149 "src/parse-gram.c"
+    case 89: /* braceless  */
+#line 198 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1129 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 90: // id
-/* Line 709 of yacc.c  */
-#line 212 "src/parse-gram.y"
-        { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 709 of yacc.c  */
-#line 1157 "src/parse-gram.c"
+    case 90: /* id  */
+#line 212 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1135 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 91: // id_colon
-/* Line 709 of yacc.c  */
-#line 213 "src/parse-gram.y"
-        { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); }
-/* Line 709 of yacc.c  */
-#line 1165 "src/parse-gram.c"
+    case 91: /* id_colon  */
+#line 213 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); }
+#line 1141 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 92: // symbol
-/* Line 709 of yacc.c  */
-#line 212 "src/parse-gram.y"
-        { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 709 of yacc.c  */
-#line 1173 "src/parse-gram.c"
+    case 92: /* symbol  */
+#line 212 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1147 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
         break;
 

-            case 93: // string_as_id
-/* Line 709 of yacc.c  */
-#line 212 "src/parse-gram.y"
-        { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 709 of yacc.c  */
-#line 1181 "src/parse-gram.c"
+    case 93: /* string_as_id  */
+#line 212 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1153 "src/parse-gram.c" /* yacc.c:707  */

         break;
 
       default:
         break;
 
       default:


@@ -1193,10 +1165,8 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
 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)
 {

-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);

 
   YY_LOCATION_PRINT (yyoutput, *yylocationp);
   YYFPRINTF (yyoutput, ": ");
 
   YY_LOCATION_PRINT (yyoutput, *yylocationp);
   YYFPRINTF (yyoutput, ": ");


@@ -1261,12 +1231,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.  */


@@ -1297,7 +1267,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


@@ -1400,7 +1370,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)                                                \


@@ -1503,7 +1473,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))


@@ -1622,7 +1592,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 {
   YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
 {
   YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;

-  YYSIZE_T yysize1;

   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
   const char *yyformat = YY_NULL;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
   const char *yyformat = YY_NULL;


@@ -1679,14 +1648,16 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                     break;
                   }
                 yyarg[yycount++] = yytname[yyx];
                     break;
                   }
                 yyarg[yycount++] = yytname[yyx];

-                yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-                if (! (yysize <= yysize1
-                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                  return 2;
-                yysize = yysize1;
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                  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


@@ -1707,10 +1678,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 # undef YYCASE_
     }
 
 # undef YYCASE_
     }
 

-  yysize1 = yysize + yystrlen (yyformat);
-  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-    return 2;
-  yysize = yysize1;
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }

 
   if (*yymsg_alloc < yysize)
     {
 
   if (*yymsg_alloc < yysize)
     {


@@ -1750,7 +1723,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
 {
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
 {

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

   YYUSE (yylocationp);
   if (!yymsg)
     yymsg = "Deleting";
   YYUSE (yylocationp);
   if (!yymsg)
     yymsg = "Deleting";


@@ -1776,11 +1749,40 @@ yyparse (void)
 /* The lookahead symbol.  */
 int yychar;
 
 /* The lookahead symbol.  */
 int yychar;
 

+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _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 YY_INITIAL_VALUE(Value) = Value
+#endif
+static YYLTYPE yyloc_default
+# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL
+  = { 1, 1, 1, 1 }
+# endif
+;
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+

 /* The semantic value of the lookahead symbol.  */
 /* The semantic value of the lookahead symbol.  */

-YYSTYPE yylval;
+YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);

 
 /* Location data for the lookahead symbol.  */
 
 /* Location data for the lookahead symbol.  */

-YYLTYPE yylloc;
+YYLTYPE yylloc = yyloc_default;
+

 
     /* Number of syntax errors so far.  */
     int yynerrs;
 
     /* Number of syntax errors so far.  */
     int yynerrs;


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

-  yyss = yyssa;
-  yyvs = yyvsa;
-  yyls = yylsa;
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yylsp = yyls = yylsa;

   yystacksize = YYINITDEPTH;
 
   yyes = yyesa;
   yystacksize = YYINITDEPTH;
 
   yyes = yyesa;


@@ -1861,31 +1863,15 @@ YYLTYPE yylloc;
   yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
 
   yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
 

-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
-  yylsp = yyls;
-
-#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_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.  */
 /* User initialization code.  */

-/* Line 1464 of yacc.c  */
-#line 101 "src/parse-gram.y"
+#line 101 "src/parse-gram.y" /* yacc.c:1452  */

 {
   /* 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 1464 of yacc.c  */
-#line 1889 "src/parse-gram.c"
+#line 1875 "src/parse-gram.c" /* yacc.c:1452  */

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


@@ -1992,7 +1978,7 @@ yybackup:
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));

-      yychar = YYLEX;
+      yychar = yylex (&yylval, &yylloc);

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


@@ -2037,7 +2023,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;
 


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

-/* Line 1679 of yacc.c  */
-#line 288 "src/parse-gram.y"
+#line 288 "src/parse-gram.y" /* yacc.c:1669  */

     {
       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]));


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

-/* Line 1679 of yacc.c  */
-#line 2093 "src/parse-gram.c"
+#line 2079 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
   case 7:
     break;
 
   case 7:

-/* Line 1679 of yacc.c  */
-#line 298 "src/parse-gram.y"
+#line 298 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2103 "src/parse-gram.c"
+#line 2087 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
   case 8:
     break;
 
   case 8:

-/* Line 1679 of yacc.c  */
-#line 302 "src/parse-gram.y"
+#line 302 "src/parse-gram.y" /* yacc.c:1669  */

     {
       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 1679 of yacc.c  */
-#line 2114 "src/parse-gram.c"
+#line 2096 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
   case 9:
     break;
 
   case 9:

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

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

-/* Line 1679 of yacc.c  */
-#line 2122 "src/parse-gram.c"
+#line 2102 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
   case 10:
     break;
 
   case 10:

-/* Line 1679 of yacc.c  */
-#line 308 "src/parse-gram.y"
+#line 308 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2133 "src/parse-gram.c"
+#line 2111 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
   case 11:
     break;
 
   case 11:

-/* Line 1679 of yacc.c  */
-#line 313 "src/parse-gram.y"
+#line 313 "src/parse-gram.y" /* yacc.c:1669  */

     {
       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 1679 of yacc.c  */
-#line 2144 "src/parse-gram.c"
+#line 2120 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
   case 12:
     break;
 
   case 12:

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

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

-/* Line 1679 of yacc.c  */
-#line 2152 "src/parse-gram.c"
+#line 2126 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
   case 13:
     break;
 
   case 13:

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

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

-/* Line 1679 of yacc.c  */
-#line 2160 "src/parse-gram.c"
+#line 2132 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
   case 14:
     break;
 
   case 14:

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

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

-/* Line 1679 of yacc.c  */
-#line 2168 "src/parse-gram.c"
+#line 2138 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
   case 15:
     break;
 
   case 15:

-/* Line 1679 of yacc.c  */
-#line 320 "src/parse-gram.y"
-    { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1679 of yacc.c  */
-#line 2176 "src/parse-gram.c"
-    break;
-
-  case 16:
-/* Line 1679 of yacc.c  */
-#line 322 "src/parse-gram.y"
+#line 321 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2187 "src/parse-gram.c"
+#line 2147 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 17:
-/* Line 1679 of yacc.c  */
-#line 327 "src/parse-gram.y"
+  case 16:
+#line 326 "src/parse-gram.y" /* yacc.c:1669  */

     {
       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]));


@@ -2197,93 +2156,59 @@ 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 1679 of yacc.c  */
-#line 2202 "src/parse-gram.c"
+#line 2160 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 18:
-/* Line 1679 of yacc.c  */
-#line 335 "src/parse-gram.y"
+  case 17:
+#line 334 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2210 "src/parse-gram.c"
-    break;
-
-  case 19:
-/* Line 1679 of yacc.c  */
-#line 336 "src/parse-gram.y"
-    { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1679 of yacc.c  */
-#line 2218 "src/parse-gram.c"
+#line 2166 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 20:
-/* Line 1679 of yacc.c  */
-#line 337 "src/parse-gram.y"
+  case 18:
+#line 335 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2226 "src/parse-gram.c"
+#line 2172 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 21:
-/* Line 1679 of yacc.c  */
-#line 338 "src/parse-gram.y"
+  case 19:
+#line 336 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2234 "src/parse-gram.c"
+#line 2178 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 22:
-/* Line 1679 of yacc.c  */
-#line 339 "src/parse-gram.y"
+  case 20:
+#line 337 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2242 "src/parse-gram.c"
+#line 2184 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 23:
-/* Line 1679 of yacc.c  */
-#line 340 "src/parse-gram.y"
-    { spec_outfile = (yyvsp[0].chars); }
-/* Line 1679 of yacc.c  */
-#line 2250 "src/parse-gram.c"
-    break;
-
-  case 24:
-/* Line 1679 of yacc.c  */
-#line 341 "src/parse-gram.y"
+  case 21:
+#line 338 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2258 "src/parse-gram.c"
+#line 2190 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 25:
-/* Line 1679 of yacc.c  */
-#line 342 "src/parse-gram.y"
+  case 22:
+#line 339 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2266 "src/parse-gram.c"
+#line 2196 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 26:
-/* Line 1679 of yacc.c  */
-#line 342 "src/parse-gram.y"
+  case 23:
+#line 339 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2274 "src/parse-gram.c"
+#line 2202 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 27:
-/* Line 1679 of yacc.c  */
-#line 343 "src/parse-gram.y"
+  case 24:
+#line 340 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2282 "src/parse-gram.c"
+#line 2208 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 28:
-/* Line 1679 of yacc.c  */
-#line 345 "src/parse-gram.y"
+  case 25:
+#line 342 "src/parse-gram.y" /* yacc.c:1669  */

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


@@ -2307,63 +2232,49 @@ yyreduce:
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }

-/* Line 1679 of yacc.c  */
-#line 2312 "src/parse-gram.c"
+#line 2236 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 29:
-/* Line 1679 of yacc.c  */
-#line 368 "src/parse-gram.y"
+  case 26:
+#line 365 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2320 "src/parse-gram.c"
+#line 2242 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 30:
-/* Line 1679 of yacc.c  */
-#line 369 "src/parse-gram.y"
+  case 27:
+#line 366 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2328 "src/parse-gram.c"
+#line 2248 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 31:
-/* Line 1679 of yacc.c  */
-#line 370 "src/parse-gram.y"
+  case 28:
+#line 367 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2336 "src/parse-gram.c"
+#line 2254 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 33:
-/* Line 1679 of yacc.c  */
-#line 375 "src/parse-gram.y"
+  case 30:
+#line 372 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2344 "src/parse-gram.c"
+#line 2260 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 34:
-/* Line 1679 of yacc.c  */
-#line 376 "src/parse-gram.y"
+  case 31:
+#line 373 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2352 "src/parse-gram.c"
+#line 2266 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 37:
-/* Line 1679 of yacc.c  */
-#line 388 "src/parse-gram.y"
+  case 34:
+#line 385 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2362 "src/parse-gram.c"
+#line 2274 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 38:
-/* Line 1679 of yacc.c  */
-#line 392 "src/parse-gram.y"
+  case 35:
+#line 389 "src/parse-gram.y" /* yacc.c:1669  */

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


@@ -2375,139 +2286,111 @@ yyreduce:
         symbol_list_free ((yyvsp[0].list));
       }
     }
         symbol_list_free ((yyvsp[0].list));
       }
     }

-/* Line 1679 of yacc.c  */
-#line 2380 "src/parse-gram.c"
+#line 2290 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 39:
-/* Line 1679 of yacc.c  */
-#line 404 "src/parse-gram.y"
+  case 36:
+#line 401 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2390 "src/parse-gram.c"
+#line 2298 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 40:
-/* Line 1679 of yacc.c  */
-#line 408 "src/parse-gram.y"
+  case 37:
+#line 405 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2400 "src/parse-gram.c"
+#line 2306 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 41:
-/* Line 1679 of yacc.c  */
-#line 412 "src/parse-gram.y"
+  case 38:
+#line 409 "src/parse-gram.y" /* yacc.c:1669  */

     {
       /* 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 1679 of yacc.c  */
-#line 2413 "src/parse-gram.c"
+#line 2317 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 42:
-/* Line 1679 of yacc.c  */
-#line 419 "src/parse-gram.y"
+  case 39:
+#line 416 "src/parse-gram.y" /* yacc.c:1669  */

     {
       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 1679 of yacc.c  */
-#line 2424 "src/parse-gram.c"
+#line 2326 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 43:
-/* Line 1679 of yacc.c  */
-#line 429 "src/parse-gram.y"
+  case 40:
+#line 426 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2432 "src/parse-gram.c"
+#line 2332 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 44:
-/* Line 1679 of yacc.c  */
-#line 430 "src/parse-gram.y"
+  case 41:
+#line 427 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2440 "src/parse-gram.c"
+#line 2338 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 45:
-/* Line 1679 of yacc.c  */
-#line 440 "src/parse-gram.y"
+  case 42:
+#line 437 "src/parse-gram.y" /* yacc.c:1669  */

     {}
     {}

-/* Line 1679 of yacc.c  */
-#line 2448 "src/parse-gram.c"
+#line 2344 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 46:
-/* Line 1679 of yacc.c  */
-#line 441 "src/parse-gram.y"
+  case 43:
+#line 438 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2456 "src/parse-gram.c"
+#line 2350 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 47:
-/* Line 1679 of yacc.c  */
-#line 446 "src/parse-gram.y"
+  case 44:
+#line 443 "src/parse-gram.y" /* yacc.c:1669  */

     {
       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 1679 of yacc.c  */
-#line 2468 "src/parse-gram.c"
+#line 2360 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 48:
-/* Line 1679 of yacc.c  */
-#line 457 "src/parse-gram.y"
+  case 45:
+#line 454 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2476 "src/parse-gram.c"
+#line 2366 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 49:
-/* Line 1679 of yacc.c  */
-#line 458 "src/parse-gram.y"
+  case 46:
+#line 455 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2487 "src/parse-gram.c"
+#line 2375 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 50:
-/* Line 1679 of yacc.c  */
-#line 462 "src/parse-gram.y"
+  case 47:
+#line 459 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2495 "src/parse-gram.c"
+#line 2381 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 51:
-/* Line 1679 of yacc.c  */
-#line 463 "src/parse-gram.y"
+  case 48:
+#line 460 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2506 "src/parse-gram.c"
+#line 2390 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 52:
-/* Line 1679 of yacc.c  */
-#line 468 "src/parse-gram.y"
+  case 49:
+#line 465 "src/parse-gram.y" /* yacc.c:1669  */

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


@@ -2515,13 +2398,11 @@ 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 1679 of yacc.c  */
-#line 2520 "src/parse-gram.c"
+#line 2402 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 53:
-/* Line 1679 of yacc.c  */
-#line 479 "src/parse-gram.y"
+  case 50:
+#line 476 "src/parse-gram.y" /* yacc.c:1669  */

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


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

-/* Line 1679 of yacc.c  */
-#line 2538 "src/parse-gram.c"
+#line 2418 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 54:
-/* Line 1679 of yacc.c  */
-#line 493 "src/parse-gram.y"
+  case 51:
+#line 490 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2546 "src/parse-gram.c"
+#line 2424 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 55:
-/* Line 1679 of yacc.c  */
-#line 494 "src/parse-gram.y"
+  case 52:
+#line 491 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2554 "src/parse-gram.c"
+#line 2430 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 56:
-/* Line 1679 of yacc.c  */
-#line 495 "src/parse-gram.y"
+  case 53:
+#line 492 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2562 "src/parse-gram.c"
+#line 2436 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 57:
-/* Line 1679 of yacc.c  */
-#line 496 "src/parse-gram.y"
+  case 54:
+#line 493 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2570 "src/parse-gram.c"
+#line 2442 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 58:
-/* Line 1679 of yacc.c  */
-#line 500 "src/parse-gram.y"
+  case 55:
+#line 497 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2578 "src/parse-gram.c"
+#line 2448 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 59:
-/* Line 1679 of yacc.c  */
-#line 501 "src/parse-gram.y"
+  case 56:
+#line 498 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2586 "src/parse-gram.c"
+#line 2454 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 60:
-/* Line 1679 of yacc.c  */
-#line 507 "src/parse-gram.y"
+  case 57:
+#line 504 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2594 "src/parse-gram.c"
+#line 2460 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 61:
-/* 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]))); }
-/* Line 1679 of yacc.c  */
-#line 2602 "src/parse-gram.c"
+  case 58:
+#line 506 "src/parse-gram.y" /* yacc.c:1669  */
+    { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+#line 2466 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 62:
-/* Line 1679 of yacc.c  */
-#line 513 "src/parse-gram.y"
+  case 59:
+#line 510 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2610 "src/parse-gram.c"
+#line 2472 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 63:
-/* Line 1679 of yacc.c  */
-#line 514 "src/parse-gram.y"
+  case 60:
+#line 511 "src/parse-gram.y" /* yacc.c:1669  */

     { (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 1679 of yacc.c  */
-#line 2618 "src/parse-gram.c"
+#line 2478 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 64:
-/* Line 1679 of yacc.c  */
-#line 520 "src/parse-gram.y"
+  case 61:
+#line 517 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2626 "src/parse-gram.c"
+#line 2484 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 65:
-/* 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]))); }
-/* Line 1679 of yacc.c  */
-#line 2634 "src/parse-gram.c"
+  case 62:
+#line 519 "src/parse-gram.y" /* yacc.c:1669  */
+    { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+#line 2490 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 66:
-/* Line 1679 of yacc.c  */
-#line 526 "src/parse-gram.y"
+  case 63:
+#line 523 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2642 "src/parse-gram.c"
+#line 2496 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 67:
-/* Line 1679 of yacc.c  */
-#line 527 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
-/* Line 1679 of yacc.c  */
-#line 2650 "src/parse-gram.c"
+  case 64:
+#line 524 "src/parse-gram.y" /* yacc.c:1669  */
+    { (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); }
+#line 2502 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 68:
-/* Line 1679 of yacc.c  */
-#line 531 "src/parse-gram.y"
+  case 65:
+#line 528 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2658 "src/parse-gram.c"
+#line 2508 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 69:
-/* Line 1679 of yacc.c  */
-#line 532 "src/parse-gram.y"
+  case 66:
+#line 529 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2666 "src/parse-gram.c"
+#line 2514 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 71:
-/* Line 1679 of yacc.c  */
-#line 537 "src/parse-gram.y"
+  case 68:
+#line 534 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2674 "src/parse-gram.c"
+#line 2520 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 72:
-/* Line 1679 of yacc.c  */
-#line 538 "src/parse-gram.y"
+  case 69:
+#line 535 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2682 "src/parse-gram.c"
+#line 2526 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 73:
-/* Line 1679 of yacc.c  */
-#line 544 "src/parse-gram.y"
+  case 70:
+#line 541 "src/parse-gram.y" /* yacc.c:1669  */

     {
     {

-       current_type = (yyvsp[0].uniqstr);
-       tag_seen = true;
-     }
-/* Line 1679 of yacc.c  */
-#line 2693 "src/parse-gram.c"
+      current_type = (yyvsp[0].uniqstr);
+      tag_seen = true;
+    }
+#line 2535 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 74:
-/* Line 1679 of yacc.c  */
-#line 549 "src/parse-gram.y"
+  case 71:
+#line 546 "src/parse-gram.y" /* yacc.c:1669  */

     {
     {

-       symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
-       symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
-     }
-/* Line 1679 of yacc.c  */
-#line 2704 "src/parse-gram.c"
+      symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
+      symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
+    }
+#line 2544 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 75:
-/* Line 1679 of yacc.c  */
-#line 554 "src/parse-gram.y"
+  case 72:
+#line 551 "src/parse-gram.y" /* yacc.c:1669  */

     {
       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 1679 of yacc.c  */
-#line 2716 "src/parse-gram.c"
+#line 2554 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 76:
-/* Line 1679 of yacc.c  */
-#line 560 "src/parse-gram.y"
+  case 73:
+#line 557 "src/parse-gram.y" /* yacc.c:1669  */

     {
       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 1679 of yacc.c  */
-#line 2728 "src/parse-gram.c"
+#line 2564 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 77:
-/* Line 1679 of yacc.c  */
-#line 566 "src/parse-gram.y"
+  case 74:
+#line 563 "src/parse-gram.y" /* yacc.c:1669  */

     {
       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 1679 of yacc.c  */
-#line 2741 "src/parse-gram.c"
+#line 2575 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 84:
-/* Line 1679 of yacc.c  */
-#line 596 "src/parse-gram.y"
+  case 81:
+#line 593 "src/parse-gram.y" /* yacc.c:1669  */

     {
       yyerrok;
     }
     {
       yyerrok;
     }

-/* Line 1679 of yacc.c  */
-#line 2751 "src/parse-gram.c"
+#line 2583 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 85:
-/* Line 1679 of yacc.c  */
-#line 602 "src/parse-gram.y"
+  case 82:
+#line 599 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2759 "src/parse-gram.c"
+#line 2589 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 86:
-/* Line 1679 of yacc.c  */
-#line 603 "src/parse-gram.y"
+  case 83:
+#line 600 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2770 "src/parse-gram.c"
+#line 2598 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 87:
-/* Line 1679 of yacc.c  */
-#line 610 "src/parse-gram.y"
+  case 84:
+#line 607 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2778 "src/parse-gram.c"
+#line 2604 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 88:
-/* Line 1679 of yacc.c  */
-#line 611 "src/parse-gram.y"
+  case 85:
+#line 608 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2786 "src/parse-gram.c"
+#line 2610 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 90:
-/* Line 1679 of yacc.c  */
-#line 617 "src/parse-gram.y"
+  case 87:
+#line 614 "src/parse-gram.y" /* yacc.c:1669  */

     { 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 1679 of yacc.c  */
-#line 2795 "src/parse-gram.c"
+#line 2617 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 91:
-/* Line 1679 of yacc.c  */
-#line 620 "src/parse-gram.y"
+  case 88:
+#line 617 "src/parse-gram.y" /* yacc.c:1669  */

     { 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 1679 of yacc.c  */
-#line 2803 "src/parse-gram.c"
+#line 2623 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 92:
-/* Line 1679 of yacc.c  */
-#line 622 "src/parse-gram.y"
+  case 89:
+#line 619 "src/parse-gram.y" /* yacc.c:1669  */

     { 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 1679 of yacc.c  */
-#line 2811 "src/parse-gram.c"
+#line 2629 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 93:
-/* Line 1679 of yacc.c  */
-#line 624 "src/parse-gram.y"
+  case 90:
+#line 621 "src/parse-gram.y" /* yacc.c:1669  */

     { 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 1679 of yacc.c  */
-#line 2819 "src/parse-gram.c"
+#line 2635 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 94:
-/* Line 1679 of yacc.c  */
-#line 626 "src/parse-gram.y"
+  case 91:
+#line 623 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2827 "src/parse-gram.c"
+#line 2641 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 95:
-/* Line 1679 of yacc.c  */
-#line 628 "src/parse-gram.y"
+  case 92:
+#line 625 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2835 "src/parse-gram.c"
+#line 2647 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 96:
-/* Line 1679 of yacc.c  */
-#line 630 "src/parse-gram.y"
+  case 93:
+#line 627 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2843 "src/parse-gram.c"
+#line 2653 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 97:
-/* Line 1679 of yacc.c  */
-#line 634 "src/parse-gram.y"
+  case 94:
+#line 631 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2851 "src/parse-gram.c"
+#line 2659 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 98:
-/* Line 1679 of yacc.c  */
-#line 636 "src/parse-gram.y"
+  case 95:
+#line 633 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2859 "src/parse-gram.c"
+#line 2665 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 100:
-/* Line 1679 of yacc.c  */
-#line 647 "src/parse-gram.y"
+  case 97:
+#line 644 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2867 "src/parse-gram.c"
+#line 2671 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 101:
-/* Line 1679 of yacc.c  */
-#line 652 "src/parse-gram.y"
+  case 98:
+#line 649 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2875 "src/parse-gram.c"
+#line 2677 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 102:
-/* Line 1679 of yacc.c  */
-#line 653 "src/parse-gram.y"
+  case 99:
+#line 650 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2883 "src/parse-gram.c"
+#line 2683 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 104:
-/* Line 1679 of yacc.c  */
-#line 664 "src/parse-gram.y"
+  case 101:
+#line 661 "src/parse-gram.y" /* yacc.c:1669  */

     {
       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';


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

-/* Line 1679 of yacc.c  */
-#line 2898 "src/parse-gram.c"
+#line 2696 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 105:
-/* Line 1679 of yacc.c  */
-#line 684 "src/parse-gram.y"
+  case 102:
+#line 681 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2906 "src/parse-gram.c"
+#line 2702 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 106:
-/* Line 1679 of yacc.c  */
-#line 686 "src/parse-gram.y"
+  case 103:
+#line 683 "src/parse-gram.y" /* yacc.c:1669  */

     {
       (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 1679 of yacc.c  */
-#line 2918 "src/parse-gram.c"
+#line 2712 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 107:
-/* Line 1679 of yacc.c  */
-#line 694 "src/parse-gram.y"
+  case 104:
+#line 691 "src/parse-gram.y" /* yacc.c:1669  */

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

-/* Line 1679 of yacc.c  */
-#line 2926 "src/parse-gram.c"
+#line 2718 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 110:
-/* Line 1679 of yacc.c  */
-#line 706 "src/parse-gram.y"
+  case 107:
+#line 703 "src/parse-gram.y" /* yacc.c:1669  */

     {
       (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 1679 of yacc.c  */
-#line 2937 "src/parse-gram.c"
+#line 2727 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
     break;
 

-  case 112:
-/* Line 1679 of yacc.c  */
-#line 715 "src/parse-gram.y"
+  case 109:
+#line 712 "src/parse-gram.y" /* yacc.c:1669  */

     {
       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]));


@@ -2947,13 +2736,11 @@ 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 1679 of yacc.c  */
-#line 2952 "src/parse-gram.c"
+#line 2740 "src/parse-gram.c" /* yacc.c:1669  */

     break;
 
 
     break;
 
 

-/* Line 1679 of yacc.c  */
-#line 2957 "src/parse-gram.c"
+#line 2744 "src/parse-gram.c" /* yacc.c:1669  */

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


@@ -3083,7 +2870,7 @@ yyerrorlab:
      goto yyerrorlab;
 
   yyerror_range[1] = yylsp[1-yylen];
      goto yyerrorlab;
 
   yyerror_range[1] = yylsp[1-yylen];

-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered

      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;


@@ -3128,7 +2915,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


@@ -3176,7 +2965,7 @@ yyreturn:
       yydestruct ("Cleanup: discarding lookahead",
                   yytoken, &yylval, &yylloc);
     }
       yydestruct ("Cleanup: discarding lookahead",
                   yytoken, &yylval, &yylloc);
     }

-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered

      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);


@@ -3198,9 +2987,7 @@ yyreturn:
 #endif
   return yyresult;
 }
 #endif
   return yyresult;
 }

-/* Line 1937 of yacc.c  */
-#line 725 "src/parse-gram.y"
-
+#line 722 "src/parse-gram.y" /* yacc.c:1929  */

 
 
 /* Return the location of the left-hand side of a rule whose
 
 
 /* Return the location of the left-hand side of a rule whose


@@ -3264,8 +3051,7 @@ add_param (param_type type, char *decl, location loc)
   }
 
   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));


@@ -3285,8 +3071,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);
     }
 }


@@ -3294,7 +3080,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 *