c++: fix several issues with locations

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index f1d16c8dc7c617d2721b38bc0d3b6f325885b8eb..2cf9e86c815a0df084a556679b7c6547508bc36f 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,25 +1,21 @@
+/* A Bison parser, made by GNU Bison 2.7.1127-02879-dirty.  */

 
 

-/* A Bison parser, made by GNU Bison 2.3a+.  */
+/* Bison implementation for Yacc-like parsers in C

 
 

-/* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-   
-   This program is free software; you can redistribute it and/or modify
+   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
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-   
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-   
+

    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work


@@ -30,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.

-   
+

    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 


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

-#define YYBISON_VERSION "2.3a+"
+#define YYBISON_VERSION "2.7.1127-02879-dirty"

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

-#define YYPURE 1
+#define YYPURE 2

 
 /* Push parsers.  */
 #define YYPUSH 0
 
 /* Push parsers.  */
 #define YYPUSH 0


@@ -62,33 +58,28 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
 /* Pull parsers.  */
 #define YYPULL 1
 

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

 /* Substitute the variable and function names.  */
 /* 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 yylloc gram_lloc
+#define yyparse         gram_parse
+#define yylex           gram_lex
+#define yyerror         gram_error
+#define yydebug         gram_debug
+#define yynerrs         gram_nerrs

 
 

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

 
 

-/* Line 171 of yacc.c  */
-#line 1 "parse-gram.y"
+/* Copy the first part of user declarations.  */
+#line 1 "src/parse-gram.y" /* yacc.c:356  */

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

-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 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.
 

-   This program is free software; you can redistribute it and/or modify
+   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
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -97,73 +88,48 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301  USA
-*/
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include <config.h>
 #include "system.h"
 
 
 #include <config.h>
 #include "system.h"
 

-#include <strverscmp.h>
-
+#include "c-ctype.h"

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

-#include "muscle_tab.h"
+#include "named-ref.h"

 #include "quotearg.h"
 #include "reader.h"
 #include "symlist.h"
 #include "quotearg.h"
 #include "reader.h"
 #include "symlist.h"

+#include "symtab.h"

 #include "scan-gram.h"
 #include "scan-code.h"
 #include "scan-gram.h"
 #include "scan-code.h"

+#include "xmemdup0.h"

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

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

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

-/* Request detailed syntax error messages, and pass them to GRAM_ERROR.
-   FIXME: depends on the undocumented availability of YYLLOC.  */
-#undef  yyerror
-#define yyerror(Msg) \
-       gram_error (&yylloc, Msg)

 static void gram_error (location const *, char const *);
 
 static void gram_error (location const *, char const *);
 

+/* A string that describes a char (e.g., 'a' -> "'a'").  */

 static char const *char_name (char);
 
 static char const *char_name (char);
 

-/** Add a lex-param or a parse-param.
- *
- * \param type  \a lex_param or \a parse_param
- * \param decl  the formal argument
- * \param loc   the location in the source.
- */
-static void add_param (char const *type, char *decl, location loc);
-
-
-static symbol_class current_class = unknown_sym;
-static uniqstr current_type = NULL;
-static symbol *current_lhs;
-static location current_lhs_location;
-static int current_prec = 0;
-
-#define YYTYPE_INT16 int_fast16_t
-#define YYTYPE_INT8 int_fast8_t
-#define YYTYPE_UINT16 uint_fast16_t
-#define YYTYPE_UINT8 uint_fast8_t
+#line 125 "src/parse-gram.c" /* yacc.c:356  */

 
 

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

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


@@ -173,182 +139,217 @@ static int current_prec = 0;
 # define YYERROR_VERBOSE 1
 #endif
 
 # define YYERROR_VERBOSE 1
 #endif
 

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

 #endif
 #endif

-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     GRAM_EOF = 0,
-     STRING = 258,
-     INT = 259,
-     PERCENT_TOKEN = 260,
-     PERCENT_NTERM = 261,
-     PERCENT_TYPE = 262,
-     PERCENT_DESTRUCTOR = 263,
-     PERCENT_PRINTER = 264,
-     PERCENT_LEFT = 265,
-     PERCENT_RIGHT = 266,
-     PERCENT_NONASSOC = 267,
-     PERCENT_PREC = 268,
-     PERCENT_DPREC = 269,
-     PERCENT_MERGE = 270,
-     PERCENT_CODE = 271,
-     PERCENT_DEBUG = 272,
-     PERCENT_DEFAULT_PREC = 273,
-     PERCENT_DEFINE = 274,
-     PERCENT_DEFINES = 275,
-     PERCENT_ERROR_VERBOSE = 276,
-     PERCENT_EXPECT = 277,
-     PERCENT_EXPECT_RR = 278,
-     PERCENT_FILE_PREFIX = 279,
-     PERCENT_GLR_PARSER = 280,
-     PERCENT_INITIAL_ACTION = 281,
-     PERCENT_LANGUAGE = 282,
-     PERCENT_LEX_PARAM = 283,
-     PERCENT_LOCATIONS = 284,
-     PERCENT_NAME_PREFIX = 285,
-     PERCENT_NO_DEFAULT_PREC = 286,
-     PERCENT_NO_LINES = 287,
-     PERCENT_NONDETERMINISTIC_PARSER = 288,
-     PERCENT_OUTPUT = 289,
-     PERCENT_PARSE_PARAM = 290,
-     PERCENT_PURE_PARSER = 291,
-     PERCENT_PUSH_PARSER = 292,
-     PERCENT_PUSH_PULL_PARSER = 293,
-     PERCENT_REQUIRE = 294,
-     PERCENT_SKELETON = 295,
-     PERCENT_START = 296,
-     PERCENT_TOKEN_TABLE = 297,
-     PERCENT_VERBOSE = 298,
-     PERCENT_YACC = 299,
-     BRACED_CODE = 300,
-     CHAR = 301,
-     EPILOGUE = 302,
-     EQUAL = 303,
-     ID = 304,
-     ID_COLON = 305,
-     PERCENT_PERCENT = 306,
-     PIPE = 307,
-     PROLOGUE = 308,
-     SEMICOLON = 309,
-     TYPE = 310,
-     TYPE_TAG_ANY = 311,
-     TYPE_TAG_NONE = 312,
-     PERCENT_UNION = 313
-   };
+/* "%code requires" blocks.  */
+#line 218 "src/parse-gram.y" /* yacc.c:372  */
+
+  typedef enum
+  {
+    param_none   = 0,
+    param_lex    = 1 << 0,
+    param_parse  = 1 << 1,
+    param_both   = param_lex | param_parse
+  } param_type;
+
+#line 649 "src/parse-gram.y" /* yacc.c:372  */
+#include "muscle-tab.h"
+
+#line 176 "src/parse-gram.c" /* yacc.c:372  */
+
+/* Token type.  */
+#ifndef GRAM_TOKENTYPE
+# define GRAM_TOKENTYPE
+  enum gram_tokentype
+  {
+    GRAM_EOF = 0,
+    STRING = 258,
+    PERCENT_TOKEN = 259,
+    PERCENT_NTERM = 260,
+    PERCENT_TYPE = 261,
+    PERCENT_DESTRUCTOR = 262,
+    PERCENT_PRINTER = 263,
+    PERCENT_LEFT = 264,
+    PERCENT_RIGHT = 265,
+    PERCENT_NONASSOC = 266,
+    PERCENT_PRECEDENCE = 267,
+    PERCENT_PREC = 268,
+    PERCENT_DPREC = 269,
+    PERCENT_MERGE = 270,
+    PERCENT_CODE = 271,
+    PERCENT_DEFAULT_PREC = 272,
+    PERCENT_DEFINE = 273,
+    PERCENT_DEFINES = 274,
+    PERCENT_ERROR_VERBOSE = 275,
+    PERCENT_EXPECT = 276,
+    PERCENT_EXPECT_RR = 277,
+    PERCENT_FLAG = 278,
+    PERCENT_FILE_PREFIX = 279,
+    PERCENT_GLR_PARSER = 280,
+    PERCENT_INITIAL_ACTION = 281,
+    PERCENT_LANGUAGE = 282,
+    PERCENT_NAME_PREFIX = 283,
+    PERCENT_NO_DEFAULT_PREC = 284,
+    PERCENT_NO_LINES = 285,
+    PERCENT_NONDETERMINISTIC_PARSER = 286,
+    PERCENT_OUTPUT = 287,
+    PERCENT_REQUIRE = 288,
+    PERCENT_SKELETON = 289,
+    PERCENT_START = 290,
+    PERCENT_TOKEN_TABLE = 291,
+    PERCENT_VERBOSE = 292,
+    PERCENT_YACC = 293,
+    BRACED_CODE = 294,
+    BRACED_PREDICATE = 295,
+    BRACKETED_ID = 296,
+    CHAR = 297,
+    EPILOGUE = 298,
+    EQUAL = 299,
+    ID = 300,
+    ID_COLON = 301,
+    PERCENT_PERCENT = 302,
+    PIPE = 303,
+    PROLOGUE = 304,
+    SEMICOLON = 305,
+    TAG = 306,
+    TAG_ANY = 307,
+    TAG_NONE = 308,
+    INT = 309,
+    PERCENT_PARAM = 310,
+    PERCENT_UNION = 311,
+    PERCENT_EMPTY = 312
+  };

 #endif
 #endif

-/* Tokens.  */
-#define GRAM_EOF 0
-#define STRING 258
-#define INT 259
-#define PERCENT_TOKEN 260
-#define PERCENT_NTERM 261
-#define PERCENT_TYPE 262
-#define PERCENT_DESTRUCTOR 263
-#define PERCENT_PRINTER 264
-#define PERCENT_LEFT 265
-#define PERCENT_RIGHT 266
-#define PERCENT_NONASSOC 267
-#define PERCENT_PREC 268
-#define PERCENT_DPREC 269
-#define PERCENT_MERGE 270
-#define PERCENT_CODE 271
-#define PERCENT_DEBUG 272
-#define PERCENT_DEFAULT_PREC 273
-#define PERCENT_DEFINE 274
-#define PERCENT_DEFINES 275
-#define PERCENT_ERROR_VERBOSE 276
-#define PERCENT_EXPECT 277
-#define PERCENT_EXPECT_RR 278
-#define PERCENT_FILE_PREFIX 279
-#define PERCENT_GLR_PARSER 280
-#define PERCENT_INITIAL_ACTION 281
-#define PERCENT_LANGUAGE 282
-#define PERCENT_LEX_PARAM 283
-#define PERCENT_LOCATIONS 284
-#define PERCENT_NAME_PREFIX 285
-#define PERCENT_NO_DEFAULT_PREC 286
-#define PERCENT_NO_LINES 287
-#define PERCENT_NONDETERMINISTIC_PARSER 288
-#define PERCENT_OUTPUT 289
-#define PERCENT_PARSE_PARAM 290
-#define PERCENT_PURE_PARSER 291
-#define PERCENT_PUSH_PARSER 292
-#define PERCENT_PUSH_PULL_PARSER 293
-#define PERCENT_REQUIRE 294
-#define PERCENT_SKELETON 295
-#define PERCENT_START 296
-#define PERCENT_TOKEN_TABLE 297
-#define PERCENT_VERBOSE 298
-#define PERCENT_YACC 299
-#define BRACED_CODE 300
-#define CHAR 301
-#define EPILOGUE 302
-#define EQUAL 303
-#define ID 304
-#define ID_COLON 305
-#define PERCENT_PERCENT 306
-#define PIPE 307
-#define PROLOGUE 308
-#define SEMICOLON 309
-#define TYPE 310
-#define TYPE_TAG_ANY 311
-#define TYPE_TAG_NONE 312
-#define PERCENT_UNION 313
-
-
-
-
-#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 205 of yacc.c  */
-#line 98 "parse-gram.y"
+#line 170 "src/parse-gram.y" /* yacc.c:372  */
+unsigned char character;
+#line 177 "src/parse-gram.y" /* yacc.c:372  */

 
 

-  symbol *symbol;
-  symbol_list *list;
-  int integer;
-  char const *chars;

   char *code;
   char *code;

-  assoc assoc;
-  uniqstr uniqstr;
-  unsigned char character;
-}
+  char const *chars;

 
 

-/* Line 205 of yacc.c  */
-#line 327 "parse-gram.c"
-       YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+#line 188 "src/parse-gram.y" /* yacc.c:372  */
+uniqstr uniqstr;
+#line 196 "src/parse-gram.y" /* yacc.c:372  */
+int integer;
+#line 200 "src/parse-gram.y" /* yacc.c:372  */
+symbol *symbol;
+#line 205 "src/parse-gram.y" /* yacc.c:372  */
+assoc assoc;
+#line 208 "src/parse-gram.y" /* yacc.c:372  */
+symbol_list *list;
+#line 211 "src/parse-gram.y" /* yacc.c:372  */
+named_ref *named_ref;
+#line 238 "src/parse-gram.y" /* yacc.c:372  */
+param_type param;
+#line 413 "src/parse-gram.y" /* yacc.c:372  */
+code_props_type code_type;
+#line 651 "src/parse-gram.y" /* yacc.c:372  */
+
+  struct
+  {
+    char const *chars;
+    muscle_kind kind;
+  } value;
+
+
+#line 279 "src/parse-gram.c" /* yacc.c:372  */
+};
+# 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 YYLTYPE /* obsolescent; will be withdrawn */
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
+};
+# define GRAM_LTYPE_IS_DECLARED 1
+# define GRAM_LTYPE_IS_TRIVIAL 1

 #endif
 
 
 #endif
 
 

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

 
 

+int gram_parse (void);

 
 

-/* Line 228 of yacc.c  */
-#line 352 "parse-gram.c"
+#endif /* !YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+
+#line 307 "src/parse-gram.c" /* yacc.c:375  */
+/* Unqualified %code blocks.  */
+#line 53 "src/parse-gram.y" /* yacc.c:376  */
+
+  static int current_prec = 0;
+  static location current_lhs_location;
+  static named_ref *current_lhs_named_ref;
+  static symbol *current_lhs_symbol;
+  static symbol_class current_class = unknown_sym;
+  static uniqstr current_type = NULL;
+
+  /** Set the new current left-hand side symbol, possibly common
+   * to several right-hand side parts of rule.
+   */
+  static
+  void
+  current_lhs (symbol *sym, location loc, named_ref *ref)
+  {
+    current_lhs_symbol = sym;
+    current_lhs_location = loc;
+    /* In order to simplify memory management, named references for lhs
+       are always assigned by deep copy into the current symbol_list
+       node.  This is because a single named-ref in the grammar may
+       result in several uses when the user factors lhs between several
+       rules using "|".  Therefore free the parser's original copy.  */
+    free (current_lhs_named_ref);
+    current_lhs_named_ref = ref;
+  }
+
+  #define YYTYPE_INT16 int_fast16_t
+  #define YYTYPE_INT8 int_fast8_t
+  #define YYTYPE_UINT16 uint_fast16_t
+  #define YYTYPE_UINT8 uint_fast8_t
+
+#line 228 "src/parse-gram.y" /* yacc.c:376  */
+
+  /** Add a lex-param and/or a parse-param.
+   *
+   * \param type  where to push this formal argument.
+   * \param decl  the formal argument.  Destroyed.
+   * \param loc   the location in the source.
+   */
+  static void add_param (param_type type, char *decl, location loc);
+  static param_type current_param = param_none;
+
+
+#line 353 "src/parse-gram.c" /* yacc.c:376  */

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


@@ -362,11 +363,8 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;

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

 #else
 #else

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

 #endif
 
 #ifdef YYTYPE_UINT16
 #endif
 
 #ifdef YYTYPE_UINT16


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

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

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


@@ -398,73 +395,31 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_

-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS

 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #  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.  */
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */

-#if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
-#else
-# define YYUSE(e) /* empty */
-#endif
-
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
+#ifdef __GNUC__
+# define YYUSE(E) ((void) (E))

 #else
 #else

-static int
-YYID (yyi)
-    int yyi;
-#endif
-{
-  return yyi;
-}
+# define YYUSE(E) /* empty */

 #endif
 
 #endif
 

-#if ! defined yyoverflow || YYERROR_VERBOSE
+#if 1

 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 

-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   elif defined __BUILTIN_VA_ARG_INCR
-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#   elif defined _AIX
-#    define YYSTACK_ALLOC __alloca
-#   elif defined _MSC_VER
-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#    define alloca _alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
-#     endif
-#    endif
-#   endif
-#  endif
-# endif
-

 # ifdef YYSTACK_ALLOC
 # ifdef YYSTACK_ALLOC

-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)

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


@@ -478,43 +433,42 @@ YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif

-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \

        && ! ((defined YYMALLOC || defined malloc) \
        && ! ((defined YYMALLOC || defined malloc) \

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

 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */

-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0

 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc

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

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

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

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

-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+# define YYCOPY_NEEDED 1
+#endif

 
 
 #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
 {

-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-    YYLTYPE yyls;
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+  YYLTYPE yyls_alloc;

 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */


@@ -526,64 +480,70 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
       + 2 * YYSTACK_GAP_MAXIMUM)
 
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
       + 2 * YYSTACK_GAP_MAXIMUM)
 

-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)             \
-      do                                       \
-       {                                       \
-         YYSIZE_T yyi;                         \
-         for (yyi = 0; yyi < (Count); yyi++)   \
-           (To)[yyi] = (From)[yyi];            \
-       }                                       \
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1

 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */

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

 
 #endif
 
 
 #endif
 

+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+

 /* 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   187
+#define YYLAST   165

 
 /* YYNTOKENS -- Number of terminals.  */
 
 /* YYNTOKENS -- Number of terminals.  */

-#define YYNTOKENS  59
+#define YYNTOKENS  58

 /* YYNNTS -- Number of nonterminals.  */
 /* YYNNTS -- Number of nonterminals.  */

-#define YYNNTS  31
+#define YYNNTS  38

 /* YYNRULES -- Number of rules.  */
 /* YYNRULES -- Number of rules.  */

-#define YYNRULES  103
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  141
+#define YYNRULES  111
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  145

 
 

-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */

 #define YYUNDEFTOK  2
 #define YYUNDEFTOK  2

-#define YYMAXUTOK   313
+#define YYMAXUTOK   312

 
 

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

   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 

-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */

 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,


@@ -617,109 +577,61 @@ static const yytype_uint8 yytranslate[] =
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57,    58
+      55,    56,    57

 };
 
 };
 

-#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
-      24,    27,    29,    32,    35,    38,    42,    44,    47,    50,
-      53,    55,    58,    62,    64,    66,    69,    73,    76,    78,
-      80,    82,    85,    88,    90,    92,    94,    96,    98,   100,
-     103,   107,   111,   113,   115,   118,   122,   123,   125,   129,
-     130,   134,   135,   139,   143,   147,   149,   151,   153,   154,
-     156,   158,   161,   163,   166,   168,   170,   172,   174,   176,
-     178,   181,   184,   188,   190,   193,   195,   198,   200,   203,
-     206,   207,   211,   213,   217,   220,   221,   224,   227,   231,
-     235,   239,   241,   243,   244,   246,   248,   250,   252,   254,
-     256,   258,   260,   261
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      60,     0,    -1,    61,    51,    76,    89,    -1,    -1,    61,
-      62,    -1,    63,    -1,    53,    -1,    17,    -1,    19,     3,
-      83,    -1,    20,    -1,    20,     3,    -1,    21,    -1,    22,
-       4,    -1,    23,     4,    -1,    24,     3,    -1,    24,    48,
-       3,    -1,    25,    -1,    26,    45,    -1,    27,     3,    -1,
-      28,    45,    -1,    29,    -1,    30,     3,    -1,    30,    48,
-       3,    -1,    32,    -1,    33,    -1,    34,     3,    -1,    34,
-      48,     3,    -1,    35,    45,    -1,    36,    -1,    37,    -1,
-      38,    -1,    39,     3,    -1,    40,     3,    -1,    42,    -1,
-      43,    -1,    44,    -1,    54,    -1,    68,    -1,    65,    -1,
-      41,    87,    -1,     8,    45,    72,    -1,     9,    45,    72,
-      -1,    18,    -1,    31,    -1,    16,    84,    -1,    16,     3,
-      84,    -1,    -1,    49,    -1,    58,    64,    45,    -1,    -1,
-       6,    66,    75,    -1,    -1,     5,    67,    75,    -1,     7,
-      55,    71,    -1,    69,    70,    71,    -1,    10,    -1,    11,
-      -1,    12,    -1,    -1,    55,    -1,    87,    -1,    71,    87,
-      -1,    73,    -1,    72,    73,    -1,    87,    -1,    55,    -1,
-      56,    -1,    57,    -1,    55,    -1,    85,    -1,    85,     4,
-      -1,    85,    88,    -1,    85,     4,    88,    -1,    74,    -1,
-      75,    74,    -1,    77,    -1,    76,    77,    -1,    78,    -1,
-      63,    54,    -1,     1,    54,    -1,    -1,    86,    79,    80,
-      -1,    81,    -1,    80,    52,    81,    -1,    80,    54,    -1,
-      -1,    81,    87,    -1,    81,    45,    -1,    81,    13,    87,
-      -1,    81,    14,     4,    -1,    81,    15,    55,    -1,     3,
-      -1,    84,    -1,    -1,    82,    -1,    45,    -1,    49,    -1,
-      46,    -1,    50,    -1,    85,    -1,    88,    -1,     3,    -1,
-      -1,    51,    47,    -1
-};
-
-/* YYRLINE[YYN] -- 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[] =
 {
 static const yytype_uint16 yyrline[] =
 {

-       0,   211,   211,   219,   221,   225,   226,   235,   236,   237,
-     238,   243,   244,   245,   246,   247,   248,   253,   262,   263,
-     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
-     274,   275,   276,   277,   278,   279,   280,   284,   285,   286,
-     290,   297,   304,   308,   312,   317,   344,   345,   349,   378,
-     378,   383,   383,   388,   399,   414,   415,   416,   420,   421,
-     426,   428,   433,   434,   438,   439,   440,   441,   446,   451,
-     456,   462,   468,   479,   480,   489,   490,   496,   497,   498,
-     505,   505,   509,   510,   511,   516,   517,   519,   521,   523,
-     525,   535,   536,   542,   546,   551,   571,   573,   582,   587,
-     588,   593,   600,   602
+       0,   261,   261,   270,   271,   275,   276,   286,   290,   295,
+     296,   301,   307,   308,   309,   310,   315,   324,   325,   326,
+     327,   328,   329,   329,   330,   331,   355,   356,   357,   358,
+     362,   363,   372,   373,   374,   378,   390,   394,   398,   405,
+     416,   417,   427,   428,   432,   444,   444,   449,   449,   454,
+     465,   480,   481,   482,   483,   487,   488,   493,   495,   500,
+     505,   515,   517,   522,   523,   527,   528,   532,   533,   534,
+     539,   544,   549,   555,   561,   572,   573,   582,   583,   589,
+     590,   591,   598,   598,   606,   607,   608,   613,   616,   618,
+     620,   622,   624,   626,   628,   633,   634,   644,   645,   670,
+     671,   672,   673,   682,   702,   704,   713,   718,   719,   724,
+     732,   733

 };
 #endif
 
 };
 #endif
 

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

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

-  "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
-  "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
-  "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"",
-  "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%debug\"",
+  "\"end of file\"", "error", "$undefined", "\"string\"", "\"%token\"",
+  "\"%nterm\"", "\"%type\"", "\"%destructor\"", "\"%printer\"",
+  "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%precedence\"",
+  "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",

   "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
   "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",

-  "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
-  "\"%initial-action\"", "\"%language\"", "\"%lex-param\"",
-  "\"%locations\"", "\"%name-prefix\"", "\"%no-default-prec\"",
-  "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"",
-  "\"%parse-param\"", "\"%pure-parser\"", "\"%push-parser\"",
-  "\"%push-pull-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"",
-  "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"",
+  "\"%expect\"", "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"",
+  "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"",
+  "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
+  "\"%nondeterministic-parser\"", "\"%output\"", "\"%require\"",
+  "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"",
+  "\"%yacc\"", "\"{...}\"", "\"%?{...}\"", "\"[identifier]\"", "\"char\"",

   "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
   "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",

-  "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", "\"<*>\"", "\"<>\"",
-  "\"%union\"", "$accept", "input", "prologue_declarations",
-  "prologue_declaration", "grammar_declaration", "union_name",
-  "symbol_declaration", "$@1", "$@2", "precedence_declaration",
-  "precedence_declarator", "type.opt", "symbols.1", "generic_symlist",
-  "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
-  "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs",
-  "content", "content.opt", "braceless", "id", "id_colon", "symbol",
-  "string_as_id", "epilogue.opt", 0
+  "\"|\"", "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"",
+  "\"integer\"", "\"%param\"", "\"%union\"", "\"%empty\"", "$accept",
+  "input", "prologue_declarations", "prologue_declaration", "$@1",
+  "params", "grammar_declaration", "code_props_type", "union_name",
+  "symbol_declaration", "$@2", "$@3", "precedence_declaration",
+  "precedence_declarator", "tag.opt", "symbols.prec", "symbol.prec",
+  "symbols.1", "generic_symlist", "generic_symlist_item", "tag",
+  "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration",
+  "rules", "$@4", "rhses.1", "rhs", "named_ref.opt", "variable", "value",
+  "braceless", "id", "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL

 };
 #endif
 
 # ifdef YYPRINT
 };
 #endif
 
 # ifdef YYPRINT

-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */

 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,


@@ -727,467 +639,485 @@ static const yytype_uint16 yytoknum[] =
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
      295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
      295,   296,   297,   298,   299,   300,   301,   302,   303,   304,

-     305,   306,   307,   308,   309,   310,   311,   312,   313
+     305,   306,   307,   308,   309,   310,   311,   312

 };
 # endif
 
 };
 # endif
 

-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
+#define YYPACT_NINF -115
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-115)))
+
+#define YYTABLE_NINF -111
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int8 yypact[] =

 {
 {

-       0,    59,    60,    61,    61,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    62,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    62,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    62,    62,    62,    63,    63,    63,
-      63,    63,    63,    63,    63,    63,    64,    64,    63,    66,
-      65,    67,    65,    65,    68,    69,    69,    69,    70,    70,
-      71,    71,    72,    72,    73,    73,    73,    73,    74,    74,
-      74,    74,    74,    75,    75,    76,    76,    77,    77,    77,
-      79,    78,    80,    80,    80,    81,    81,    81,    81,    81,
-      81,    82,    82,    83,    83,    84,    85,    85,    86,    87,
-      87,    88,    89,    89
+    -115,    16,   109,  -115,  -115,  -115,   -28,  -115,  -115,  -115,
+    -115,  -115,  -115,   -14,  -115,    25,    23,  -115,   -27,   -20,
+    -115,    39,  -115,     7,    48,    71,  -115,  -115,  -115,    72,
+      73,    74,    -2,  -115,  -115,  -115,    56,  -115,  -115,  -115,
+      33,  -115,  -115,    40,  -115,  -115,    37,    54,    54,    -2,
+    -115,    50,  -115,  -115,  -115,     2,  -115,  -115,  -115,  -115,
+    -115,  -115,  -115,  -115,  -115,  -115,  -115,  -115,  -115,  -115,
+    -115,  -115,    51,  -115,    53,     3,  -115,  -115,    49,    65,
+    -115,    50,    42,  -115,    -2,  -115,  -115,    54,    -1,    54,
+      -2,  -115,  -115,  -115,  -115,  -115,  -115,  -115,  -115,    63,
+    -115,  -115,  -115,  -115,  -115,    69,  -115,  -115,  -115,  -115,
+      42,  -115,  -115,  -115,    -2,  -115,    38,  -115,   106,  -115,
+    -115,  -115,  -115,  -115,  -115,  -115,  -115,  -115,   -15,    41,
+    -115,  -115,    -2,    57,    59,    49,  -115,  -115,    49,    41,
+    -115,  -115,  -115,  -115,  -115

 };
 
 };
 

-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+  /* 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[] =

 {
 {

-       0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
-       2,     1,     2,     2,     2,     3,     1,     2,     2,     2,
-       1,     2,     3,     1,     1,     2,     3,     2,     1,     1,
-       1,     2,     2,     1,     1,     1,     1,     1,     1,     2,
-       3,     3,     1,     1,     2,     3,     0,     1,     3,     0,
-       3,     0,     3,     3,     3,     1,     1,     1,     0,     1,
-       1,     2,     1,     2,     1,     1,     1,     1,     1,     1,
-       2,     2,     3,     1,     2,     1,     2,     1,     2,     2,
-       0,     3,     1,     3,     2,     0,     2,     2,     3,     3,
-       3,     1,     1,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     2
+       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,
+     103,     0,    38,    98,    97,    99,    10,    12,    13,    14,
+      16,    17,    18,    21,    24,    25,   109,   105,   104,   107,
+      34,   108,     0,   106,     0,     0,    77,    79,    95,     0,
+      43,     0,     0,    56,     0,    70,    75,    48,    71,    46,
+      49,    61,    39,   101,   100,     8,   102,    81,    80,     0,
+      78,     2,    96,    82,    31,    23,    44,    67,    68,    69,
+      35,    63,    66,    65,    50,    57,    59,    76,    72,    73,
+      62,   111,    87,    30,    64,    58,    60,    74,    83,    84,
+      87,    86,     0,     0,     0,    95,    90,    91,    95,    85,
+      92,    93,    94,    89,    88

 };
 
 };
 

-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const yytype_uint8 yydefact[] =
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =

 {
 {

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

 };
 
 };
 

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

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

-      -1,     1,     2,    45,    82,    88,    47,    51,    50,    48,
-      49,    90,    96,   101,   102,    92,    93,    83,    84,    85,
-     118,   127,   128,   107,   108,    57,    77,    86,   103,    79,
-     117
+      -1,     1,     2,    41,    79,   105,    74,    43,    81,    44,
+      48,    47,    45,    46,    84,   114,   115,    90,   110,   111,
+     112,    86,    87,    75,    76,    77,   122,   128,   129,   103,
+      55,    95,    52,    69,    78,   113,    71,   101

 };
 
 };
 

-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -93
-static const yytype_int16 yypact[] =
+  /* 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[] =

 {
 {

-     -93,    14,    96,   -93,   -93,   -93,    -4,    20,    30,   -93,
-     -93,   -93,    21,   -93,   -93,    73,    75,   -93,    76,    77,
-       6,   -93,    34,    79,    39,   -93,    22,   -93,   -93,   -93,
-      23,    41,   -93,   -93,   -93,    84,    85,    -2,   -93,   -93,
-     -93,    27,   -93,   -93,    40,   -93,   -93,   -93,   -93,    35,
-     -42,   -42,    -2,     0,     0,    47,   -93,   -93,    28,   -93,
-     -93,   -93,   -93,    90,   -93,   -93,   -93,   -93,    91,   -93,
-      93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,
-      43,   -93,    44,    11,   -93,   -93,   -93,   -93,    54,   -93,
-      -2,   -93,   -93,   -42,    37,   -42,    -2,   -93,   -93,   -93,
-     -93,     0,   -93,   -93,     0,   -93,   -93,   -93,   -93,   -93,
-     -93,   -93,   -93,   -93,   -93,    62,   -93,   -93,   -93,   -93,
-      -2,   -93,   107,   -93,   -93,   -93,   -93,   -44,   138,   -93,
-     -93,   -93,    -2,   139,    56,   -93,   -93,   138,   -93,   -93,
-     -93
+      70,    66,    66,  -110,    72,    93,   119,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,     3,    91,    92,    13,
+      14,   143,    96,    49,   144,    50,    56,    57,    53,    88,
+      88,    51,    26,   130,    58,   131,   127,   117,    32,   117,
+      67,    50,    59,    68,    66,    66,    60,    94,   106,    73,
+      99,    61,   116,   118,   132,   133,   134,    72,   120,    40,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    88,
+      54,    88,    13,    14,    62,    63,    64,    65,    80,    82,
+     135,   136,   116,    67,    67,    26,    68,    68,    83,    50,
+     102,    32,   126,   107,   108,   109,    67,   138,   137,    68,
+     140,    97,    73,    98,   104,    85,   121,   138,   123,    66,
+     142,   141,    40,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    42,   125,   124,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    89,   139,
+     100,     0,     0,     0,     0,     0,    36,     0,    37,    38,
+       0,     0,     0,     0,    39,    40

 };
 
 };
 

-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
+static const yytype_int16 yycheck[] =

 {
 {

-     -93,   -93,   -93,   -93,   140,   -93,   -93,   -93,   -93,   -93,
-     -93,   -93,    55,    92,   -41,   -21,    97,   -93,    61,   -93,
-     -93,   -93,    25,   -93,   -93,     9,   -45,   -93,   -37,   -92,
-     -93
+      32,     3,     3,     0,     1,     3,    88,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,     0,    49,    51,    16,
+      17,   135,    55,    51,   138,    39,     3,    54,     3,    47,
+      48,    45,    29,    48,    54,    50,   118,    87,    35,    89,
+      42,    39,     3,    45,     3,     3,    39,    45,    81,    46,
+      47,     3,    84,    54,    13,    14,    15,     1,    90,    56,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    87,
+      45,    89,    16,    17,     3,     3,     3,     3,    45,    39,
+      39,    40,   114,    42,    42,    29,    45,    45,    51,    39,
+      41,    35,    54,    51,    52,    53,    42,   129,    57,    45,
+     132,    50,    46,    50,    39,    51,    43,   139,    39,     3,
+      51,    54,    56,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,     2,   114,   110,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    38,    48,   130,
+      75,    -1,    -1,    -1,    -1,    -1,    47,    -1,    49,    50,
+      -1,    -1,    -1,    -1,    55,    56

 };
 
 };
 

-/* 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 zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -103
-static const yytype_int16 yytable[] =
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =

 {
 {

-      78,    74,   123,    74,    75,    94,    94,    76,   130,    62,
-     131,  -102,    80,    91,     3,    97,     4,     5,     6,     7,
-       8,     9,    10,    11,    55,    67,    69,    12,    80,    14,
-     129,   106,     4,     5,     6,     7,     8,     9,    10,    11,
-      74,   122,    27,    12,    75,    14,    75,    76,    94,    76,
-      94,    52,    37,    97,    63,    98,    99,   100,    27,   124,
-     125,    81,   115,   125,   105,    53,    56,   109,    37,    44,
-      68,    70,   121,    56,   121,    54,    58,    81,    59,    64,
-      60,    61,    65,   124,    66,    44,    71,    72,    73,    87,
-      89,   136,    56,   110,   111,   138,   112,   113,   114,   119,
-     136,     4,     5,     6,     7,     8,     9,    10,    11,   126,
-      74,   140,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    74,    46,   139,   116,   120,   104,    41,    95,    42,
-      43,   132,   133,   134,    44,   137,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   135,    75,     0,     0,    76
+       0,    59,    60,     0,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      33,    34,    35,    36,    37,    38,    47,    49,    50,    55,
+      56,    61,    64,    65,    67,    70,    71,    69,    68,    51,
+      39,    45,    90,     3,    45,    88,     3,    54,    54,     3,
+      39,     3,     3,     3,     3,     3,     3,    42,    45,    91,
+      93,    94,     1,    46,    64,    81,    82,    83,    92,    62,
+      45,    66,    39,    51,    72,    51,    79,    80,    91,    80,
+      75,    93,    90,     3,    45,    89,    90,    50,    50,    47,
+      82,    95,    41,    87,    39,    63,    90,    51,    52,    53,
+      76,    77,    78,    93,    73,    74,    93,    79,    54,    94,
+      93,    43,    84,    39,    77,    74,    54,    94,    85,    86,
+      48,    50,    13,    14,    15,    39,    40,    57,    93,    86,
+      93,    54,    51,    87,    87

 };
 
 };
 

-static const yytype_int16 yycheck[] =
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =

 {
 {

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

 };
 
 };
 

-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =

 {
 {

-       0,    60,    61,     0,     5,     6,     7,     8,     9,    10,
-      11,    12,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    51,    53,    54,    58,    62,    63,    65,    68,    69,
-      67,    66,    55,    45,    45,     3,    45,    84,     3,     3,
-       4,     4,     3,    48,    45,     3,    45,     3,    48,     3,
-      48,    45,     3,     3,     3,    46,    49,    85,    87,    88,
-       1,    50,    63,    76,    77,    78,    86,    49,    64,    55,
-      70,    55,    74,    75,    85,    75,    71,    87,    55,    56,
-      57,    72,    73,    87,    72,    84,     3,    82,    83,    84,
-       3,     3,     3,    54,    54,    51,    77,    89,    79,    45,
-      71,    74,     4,    88,    87,    73,    47,    80,    81,    88,
-      52,    54,    13,    14,    15,    45,    87,    81,    87,     4,
-      55
+       0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
+       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,     2,     3,     3,     3,     0,     1,     1,     1,     0,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       0,     2

 };
 
 };
 

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

 
 

-#define YYACCEPT       goto yyacceptlab
-#define YYABORT                goto yyabortlab
-#define YYERROR                goto yyerrorlab
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0

 
 

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

 
 

-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-
-#define YYFAIL         goto yyerrlab

 
 #define YYRECOVERING()  (!!yyerrstatus)
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
 

-#define YYBACKUP(Token, Value)                                 \
-do                                                             \
-  if (yychar == YYEMPTY && yylen == 1)                         \
-    {                                                          \
-      yychar = (Token);                                                \
-      yylval = (Value);                                                \
-      yytoken = YYTRANSLATE (yychar);                          \
-      YYPOPSTACK (1);                                          \
-      goto yybackup;                                           \
-    }                                                          \
-  else                                                         \
-    {                                                          \
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;                                                 \
-    }                                                          \
-while (YYID (0))
-
-
-#define YYTERROR       1
-#define YYERRCODE      256
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      YY_LAC_DISCARD ("YYBACKUP");                              \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (&yylloc, YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256

 
 
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 
 
 
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 

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

 #ifndef YYLLOC_DEFAULT
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
-    do                                                                 \
-      if (YYID (N))                                                    \
-       {                                                               \
-         (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
-         (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
-         (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
-         (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
-       }                                                               \
-      else                                                             \
-       {                                                               \
-         (Current).first_line   = (Current).last_line   =              \
-           YYRHSLOC (Rhs, 0).last_line;                                \
-         (Current).first_column = (Current).last_column =              \
-           YYRHSLOC (Rhs, 0).last_column;                              \
-       }                                                               \
-    while (YYID (0))
+# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
+    do                                                                  \
+      if (N)                                                            \
+        {                                                               \
+          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
+          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
+          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
+          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).first_line   = (Current).last_line   =              \
+            YYRHSLOC (Rhs, 0).last_line;                                \
+          (Current).first_column = (Current).last_column =              \
+            YYRHSLOC (Rhs, 0).last_column;                              \
+        }                                                               \
+    while (0)

 #endif
 
 #endif
 

+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+
+
+/* Enable debugging if requested.  */
+#if GRAM_DEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    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
 
 /* 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 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
+# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL

 
 

+/* Print *YYLOCP on YYO.  Private, do not rely on its existence. */

 
 

-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval, &yylloc)
-#endif
+__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;
+ }

 
 

-/* Enable debugging if requested.  */
-#if YYDEBUG
+#  define YY_LOCATION_PRINT(File, Loc)          \
+  yy_location_print_ (File, &(Loc))

 
 

-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)

 # endif
 # endif

+#endif

 
 

-# define YYDPRINTF(Args)                       \
-do {                                           \
-  if (yydebug)                                 \
-    YYFPRINTF Args;                            \
-} while (YYID (0))

 
 

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

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

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

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

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

 {
 {

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

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

-  YYUSE (yylocationp);

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

-# else
-  YYUSE (yyoutput);

 # endif
   switch (yytype)
     {
 # endif
   switch (yytype)
     {

-      case 3: /* "\"string\"" */
-
-/* Line 681 of yacc.c  */
-#line 189 "parse-gram.y"
-       { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-
-/* Line 681 of yacc.c  */
-#line 1053 "parse-gram.c"
-       break;
-      case 4: /* "\"integer\"" */
-
-/* Line 681 of yacc.c  */
-#line 200 "parse-gram.y"
-       { fprintf (stderr, "%d", (yyvaluep->integer)); };
-
-/* Line 681 of yacc.c  */
-#line 1062 "parse-gram.c"
-       break;
-      case 45: /* "\"{...}\"" */
-
-/* Line 681 of yacc.c  */
-#line 191 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
-
-/* Line 681 of yacc.c  */
-#line 1071 "parse-gram.c"
-       break;
-      case 46: /* "\"char\"" */
-
-/* Line 681 of yacc.c  */
-#line 183 "parse-gram.y"
-       { fputs (char_name ((yyvaluep->character)), stderr); };
-
-/* Line 681 of yacc.c  */
-#line 1080 "parse-gram.c"
-       break;
-      case 47: /* "\"epilogue\"" */
-
-/* Line 681 of yacc.c  */
-#line 191 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 681 of yacc.c  */
-#line 1089 "parse-gram.c"
-       break;
-      case 49: /* "\"identifier\"" */
-
-/* Line 681 of yacc.c  */
-#line 196 "parse-gram.y"
-       { fputs ((yyvaluep->uniqstr), stderr); };
-
-/* Line 681 of yacc.c  */
-#line 1098 "parse-gram.c"
-       break;
-      case 50: /* "\"identifier:\"" */
-
-/* Line 681 of yacc.c  */
-#line 197 "parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-
-/* Line 681 of yacc.c  */
-#line 1107 "parse-gram.c"
-       break;
-      case 53: /* "\"%{...%}\"" */
-
-/* Line 681 of yacc.c  */
-#line 191 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 681 of yacc.c  */
-#line 1116 "parse-gram.c"
-       break;
-      case 55: /* "\"type\"" */
-
-/* Line 681 of yacc.c  */
-#line 195 "parse-gram.y"
-       { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-
-/* Line 681 of yacc.c  */
-#line 1125 "parse-gram.c"
-       break;
-      case 82: /* "content" */
-
-/* Line 681 of yacc.c  */
-#line 191 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 681 of yacc.c  */
-#line 1134 "parse-gram.c"
-       break;
-      case 83: /* "content.opt" */
-
-/* Line 681 of yacc.c  */
-#line 191 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 681 of yacc.c  */
-#line 1143 "parse-gram.c"
-       break;
-      case 84: /* "braceless" */
-
-/* Line 681 of yacc.c  */
-#line 191 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 681 of yacc.c  */
-#line 1152 "parse-gram.c"
-       break;
-      case 85: /* "id" */
-
-/* Line 681 of yacc.c  */
-#line 203 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 681 of yacc.c  */
-#line 1161 "parse-gram.c"
-       break;
-      case 86: /* "id_colon" */
-
-/* Line 681 of yacc.c  */
-#line 204 "parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-
-/* Line 681 of yacc.c  */
-#line 1170 "parse-gram.c"
-       break;
-      case 87: /* "symbol" */
-
-/* Line 681 of yacc.c  */
-#line 203 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 681 of yacc.c  */
-#line 1179 "parse-gram.c"
-       break;
-      case 88: /* "string_as_id" */
-
-/* Line 681 of yacc.c  */
-#line 203 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 681 of yacc.c  */
-#line 1188 "parse-gram.c"
-       break;
+    case 3: /* "string"  */
+#line 183 "src/parse-gram.y" /* yacc.c:706  */
+      { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); }
+#line 973 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 23: /* "%<flag>"  */
+#line 193 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); }
+#line 979 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 39: /* "{...}"  */
+#line 185 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
+#line 985 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 41: /* "[identifier]"  */
+#line 191 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); }
+#line 991 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 42: /* "char"  */
+#line 172 "src/parse-gram.y" /* yacc.c:706  */
+      { fputs (char_name (((*yyvaluep).character)), yyo); }
+#line 997 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 43: /* "epilogue"  */
+#line 185 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1003 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 45: /* "identifier"  */
+#line 190 "src/parse-gram.y" /* yacc.c:706  */
+      { fputs (((*yyvaluep).uniqstr), yyo); }
+#line 1009 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 46: /* "identifier:"  */
+#line 192 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); }
+#line 1015 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 49: /* "%{...%}"  */
+#line 185 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1021 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 51: /* "<tag>"  */
+#line 194 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
+#line 1027 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 54: /* "integer"  */
+#line 198 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
+#line 1033 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 55: /* "%param"  */
+#line 241 "src/parse-gram.y" /* yacc.c:706  */
+      {
+  switch (((*yyvaluep).param))
+    {
+#define CASE(In, Out)                                           \
+      case param_ ## In: fputs ("%" #Out, yyo); break
+      CASE (lex,   lex-param);
+      CASE (parse, parse-param);
+      CASE (both,  param);
+#undef CASE
+      case param_none: aver (false); break;
+    }
+}
+#line 1050 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 65: /* code_props_type  */
+#line 414 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); }
+#line 1056 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 74: /* symbol.prec  */
+#line 202 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1062 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 78: /* tag  */
+#line 194 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
+#line 1068 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 88: /* variable  */
+#line 190 "src/parse-gram.y" /* yacc.c:706  */
+      { fputs (((*yyvaluep).uniqstr), yyo); }
+#line 1074 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 89: /* value  */
+#line 660 "src/parse-gram.y" /* yacc.c:706  */
+      {
+  switch (((*yyvaluep).value).kind)
+    {
+    case muscle_code:    fprintf (yyo,  "{%s}",  ((*yyvaluep).value).chars); break;
+    case muscle_keyword: fprintf (yyo,   "%s",   ((*yyvaluep).value).chars); break;
+    case muscle_string:  fprintf (yyo, "\"%s\"", ((*yyvaluep).value).chars); break;
+    }
+}
+#line 1087 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 90: /* braceless  */
+#line 185 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1093 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 91: /* id  */
+#line 202 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1099 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 92: /* id_colon  */
+#line 203 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); }
+#line 1105 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 93: /* symbol  */
+#line 202 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1111 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 94: /* string_as_id  */
+#line 202 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1117 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+

       default:
       default:

-       break;
+        break;

     }
 }
 
     }
 }
 


@@ -1196,23 +1126,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 

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

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

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

 {
 {

-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  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, ": ");


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

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

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

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

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


@@ -1245,64 +1155,56 @@ yy_stack_print (yybottom, yytop)
   YYFPRINTF (stderr, "\n");
 }
 
   YYFPRINTF (stderr, "\n");
 }
 

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

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

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

 static void
 static void

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

 {
 {

+  unsigned long int yylno = yyrline[yyrule];

   int yynrhs = yyr2[yyrule];
   int yyi;
   int yynrhs = yyr2[yyrule];
   int yyi;

-  unsigned long int yylno = yyrline[yyrule];

   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",

-            yyrule - 1, yylno);
+             yyrule - 1, yylno);

   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {

-      fprintf (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-                      &(yyvsp[(yyi + 1) - (yynrhs)])
-                      , &(yylsp[(yyi + 1) - (yynrhs)])                );
-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                       , &(yylsp[(yyi + 1) - (yynrhs)])                       );
+      YYFPRINTF (stderr, "\n");

     }
 }
 
     }
 }
 

-# define YY_REDUCE_PRINT(Rule)         \
-do {                                   \
-  if (yydebug)                         \
-    yy_reduce_print (yyvsp, yylsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \
+} while (0)

 
 /* 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.  */

-#ifndef        YYINITDEPTH
+#ifndef YYINITDEPTH

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


@@ -1317,7 +1219,239 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
 # define YYMAXDEPTH 10000
 #endif
 

-\f
+/* Given a state stack such that *YYBOTTOM is its bottom, such that
+   *YYTOP is either its top or is YYTOP_EMPTY to indicate an empty
+   stack, and such that *YYCAPACITY is the maximum number of elements it
+   can hold without a reallocation, make sure there is enough room to
+   store YYADD more elements.  If not, allocate a new stack using
+   YYSTACK_ALLOC, copy the existing elements, and adjust *YYBOTTOM,
+   *YYTOP, and *YYCAPACITY to reflect the new capacity and memory
+   location.  If *YYBOTTOM != YYBOTTOM_NO_FREE, then free the old stack
+   using YYSTACK_FREE.  Return 0 if successful or if no reallocation is
+   required.  Return 1 if memory is exhausted.  */
+static int
+yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd,
+#if GRAM_DEBUG
+                      char const *yydebug_prefix,
+                      char const *yydebug_suffix,
+#endif
+                      yytype_int16 **yybottom,
+                      yytype_int16 *yybottom_no_free,
+                      yytype_int16 **yytop, yytype_int16 *yytop_empty)
+{
+  YYSIZE_T yysize_old =
+    *yytop == yytop_empty ? 0 : *yytop - *yybottom + 1;
+  YYSIZE_T yysize_new = yysize_old + yyadd;
+  if (*yycapacity < yysize_new)
+    {
+      YYSIZE_T yyalloc = 2 * yysize_new;
+      yytype_int16 *yybottom_new;
+      /* Use YYMAXDEPTH for maximum stack size given that the stack
+         should never need to grow larger than the main state stack
+         needs to grow without LAC.  */
+      if (YYMAXDEPTH < yysize_new)
+        {
+          YYDPRINTF ((stderr, "%smax size exceeded%s", yydebug_prefix,
+                      yydebug_suffix));
+          return 1;
+        }
+      if (YYMAXDEPTH < yyalloc)
+        yyalloc = YYMAXDEPTH;
+      yybottom_new =
+        (yytype_int16*) YYSTACK_ALLOC (yyalloc * sizeof *yybottom_new);
+      if (!yybottom_new)
+        {
+          YYDPRINTF ((stderr, "%srealloc failed%s", yydebug_prefix,
+                      yydebug_suffix));
+          return 1;
+        }
+      if (*yytop != yytop_empty)
+        {
+          YYCOPY (yybottom_new, *yybottom, yysize_old);
+          *yytop = yybottom_new + (yysize_old - 1);
+        }
+      if (*yybottom != yybottom_no_free)
+        YYSTACK_FREE (*yybottom);
+      *yybottom = yybottom_new;
+      *yycapacity = yyalloc;
+    }
+  return 0;
+}
+
+/* Establish the initial context for the current lookahead if no initial
+   context is currently established.
+
+   We define a context as a snapshot of the parser stacks.  We define
+   the initial context for a lookahead as the context in which the
+   parser initially examines that lookahead in order to select a
+   syntactic action.  Thus, if the lookahead eventually proves
+   syntactically unacceptable (possibly in a later context reached via a
+   series of reductions), the initial context can be used to determine
+   the exact set of tokens that would be syntactically acceptable in the
+   lookahead's place.  Moreover, it is the context after which any
+   further semantic actions would be erroneous because they would be
+   determined by a syntactically unacceptable token.
+
+   YY_LAC_ESTABLISH should be invoked when a reduction is about to be
+   performed in an inconsistent state (which, for the purposes of LAC,
+   includes consistent states that don't know they're consistent because
+   their default reductions have been disabled).  Iff there is a
+   lookahead token, it should also be invoked before reporting a syntax
+   error.  This latter case is for the sake of the debugging output.
+
+   For parse.lac=full, the implementation of YY_LAC_ESTABLISH is as
+   follows.  If no initial context is currently established for the
+   current lookahead, then check if that lookahead can eventually be
+   shifted if syntactic actions continue from the current context.
+   Report a syntax error if it cannot.  */
+#define YY_LAC_ESTABLISH                                         \
+do {                                                             \
+  if (!yy_lac_established)                                       \
+    {                                                            \
+      YYDPRINTF ((stderr,                                        \
+                  "LAC: initial context established for %s\n",   \
+                  yytname[yytoken]));                            \
+      yy_lac_established = 1;                                    \
+      {                                                          \
+        int yy_lac_status =                                      \
+          yy_lac (yyesa, &yyes, &yyes_capacity, yyssp, yytoken); \
+        if (yy_lac_status == 2)                                  \
+          goto yyexhaustedlab;                                   \
+        if (yy_lac_status == 1)                                  \
+          goto yyerrlab;                                         \
+      }                                                          \
+    }                                                            \
+} while (0)
+
+/* Discard any previous initial lookahead context because of Event,
+   which may be a lookahead change or an invalidation of the currently
+   established initial context for the current lookahead.
+
+   The most common example of a lookahead change is a shift.  An example
+   of both cases is syntax error recovery.  That is, a syntax error
+   occurs when the lookahead is syntactically erroneous for the
+   currently established initial context, so error recovery manipulates
+   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 GRAM_DEBUG
+# define YY_LAC_DISCARD(Event)                                           \
+do {                                                                     \
+  if (yy_lac_established)                                                \
+    {                                                                    \
+      if (yydebug)                                                       \
+        YYFPRINTF (stderr, "LAC: initial context discarded due to "      \
+                   Event "\n");                                          \
+      yy_lac_established = 0;                                            \
+    }                                                                    \
+} while (0)
+#else
+# define YY_LAC_DISCARD(Event) yy_lac_established = 0
+#endif
+
+/* Given the stack whose top is *YYSSP, return 0 iff YYTOKEN can
+   eventually (after perhaps some reductions) be shifted, return 1 if
+   not, or return 2 if memory is exhausted.  As preconditions and
+   postconditions: *YYES_CAPACITY is the allocated size of the array to
+   which *YYES points, and either *YYES = YYESA or *YYES points to an
+   array allocated with YYSTACK_ALLOC.  yy_lac may overwrite the
+   contents of either array, alter *YYES and *YYES_CAPACITY, and free
+   any old *YYES other than YYESA.  */
+static int
+yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
+        YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken)
+{
+  yytype_int16 *yyes_prev = yyssp;
+  yytype_int16 *yyesp = yyes_prev;
+  YYDPRINTF ((stderr, "LAC: checking lookahead %s:", yytname[yytoken]));
+  if (yytoken == YYUNDEFTOK)
+    {
+      YYDPRINTF ((stderr, " Always Err\n"));
+      return 1;
+    }
+  while (1)
+    {
+      int yyrule = yypact[*yyesp];
+      if (yypact_value_is_default (yyrule)
+          || (yyrule += yytoken) < 0 || YYLAST < yyrule
+          || yycheck[yyrule] != yytoken)
+        {
+          yyrule = yydefact[*yyesp];
+          if (yyrule == 0)
+            {
+              YYDPRINTF ((stderr, " Err\n"));
+              return 1;
+            }
+        }
+      else
+        {
+          yyrule = yytable[yyrule];
+          if (yytable_value_is_error (yyrule))
+            {
+              YYDPRINTF ((stderr, " Err\n"));
+              return 1;
+            }
+          if (0 < yyrule)
+            {
+              YYDPRINTF ((stderr, " S%d\n", yyrule));
+              return 0;
+            }
+          yyrule = -yyrule;
+        }
+      {
+        YYSIZE_T yylen = yyr2[yyrule];
+        YYDPRINTF ((stderr, " R%d", yyrule - 1));
+        if (yyesp != yyes_prev)
+          {
+            YYSIZE_T yysize = yyesp - *yyes + 1;
+            if (yylen < yysize)
+              {
+                yyesp -= yylen;
+                yylen = 0;
+              }
+            else
+              {
+                yylen -= yysize;
+                yyesp = yyes_prev;
+              }
+          }
+        if (yylen)
+          yyesp = yyes_prev -= yylen;
+      }
+      {
+        int yystate;
+        {
+          int yylhs = yyr1[yyrule] - YYNTOKENS;
+          yystate = yypgoto[yylhs] + *yyesp;
+          if (yystate < 0 || YYLAST < yystate
+              || yycheck[yystate] != *yyesp)
+            yystate = yydefgoto[yylhs];
+          else
+            yystate = yytable[yystate];
+        }
+        if (yyesp == yyes_prev)
+          {
+            yyesp = *yyes;
+            *yyesp = yystate;
+          }
+        else
+          {
+            if (yy_lac_stack_realloc (yyes_capacity, 1,
+#if GRAM_DEBUG
+                                      " (", ")",
+#endif
+                                      yyes, yyesa, &yyesp, yyes_prev))
+              {
+                YYDPRINTF ((stderr, "\n"));
+                return 2;
+              }
+            *++yyesp = yystate;
+          }
+        YYDPRINTF ((stderr, " G%d", yystate));
+      }
+    }
+}
+

 
 #if YYERROR_VERBOSE
 
 
 #if YYERROR_VERBOSE
 


@@ -1326,15 +1460,8 @@ int yydebug;
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */

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

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

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

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


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

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

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

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

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


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

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

     do_not_strip_quotes: ;
     }
 
     do_not_strip_quotes: ;
     }
 


@@ -1420,167 +1539,166 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
 }
 # endif
 

-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.  In order to see if a particular token T is a
+   valid looakhead, invoke yy_lac (YYESA, YYES, YYES_CAPACITY, YYSSP, T).

 
 

-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store or if
+   yy_lac returned 2.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyesa, yytype_int16 **yyes,
+                YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULL;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+       In the first two cases, it might appear that the current syntax
+       error should have been detected in the previous state when yy_lac
+       was invoked.  However, at that time, there might have been a
+       different syntax error that discarded a different initial context
+       during error recovery, leaving behind the current lookahead.
+  */
+  if (yytoken != YYEMPTY)

     {
     {

-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-        constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+      int yyn = yypact[*yyssp];
+      YYDPRINTF ((stderr, "Constructing syntax error message\n"));
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          int yyx;
+
+          for (yyx = 0; yyx < YYNTOKENS; ++yyx)
+            if (yyx != YYTERROR && yyx != YYUNDEFTOK)
+              {
+                {
+                  int yy_lac_status = yy_lac (yyesa, yyes, yyes_capacity,
+                                              yyssp, yyx);
+                  if (yy_lac_status == 2)
+                    return 2;
+                  if (yy_lac_status == 1)
+                    continue;
+                }
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+# if GRAM_DEBUG
+      else if (yydebug)
+        YYFPRINTF (stderr, "No expected tokens.\n");

 # endif
 # endif

-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-                   + sizeof yyexpecting - 1
-                   + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-                      * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-        YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-       if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-         {
-           if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-             {
-               yycount = 1;
-               yysize = yysize0;
-               yyformat[sizeof yyunexpected - 1] = '\0';
-               break;
-             }
-           yyarg[yycount++] = yytname[yyx];
-           yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-           yysize_overflow |= (yysize1 < yysize);
-           yysize = yysize1;
-           yyfmt = yystpcpy (yyfmt, yyprefix);
-           yyprefix = yyor;
-         }
-
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
-
-      if (yysize_overflow)
-       return YYSIZE_MAXIMUM;
-
-      if (yyresult)
-       {
-         /* Avoid sprintf, as that infringes on the user's name space.
-            Don't have undefined behavior even if the translation
-            produced a string with the wrong number of "%s"s.  */
-         char *yyp = yyresult;
-         int yyi = 0;
-         while ((*yyp = *yyf) != '\0')
-           {
-             if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-               {
-                 yyp += yytnamerr (yyp, yyarg[yyi++]);
-                 yyf += 2;
-               }
-             else
-               {
-                 yyp++;
-                 yyf++;
-               }
-           }
-       }
-      return yysize;

     }
     }

+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;

 }
 #endif /* YYERROR_VERBOSE */
 }
 #endif /* YYERROR_VERBOSE */

-\f

 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 

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

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

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

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

-

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

-

       default:
       default:

-       break;
+        break;

     }
 }
     }
 }

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

 
 
 
 
 
 


@@ -1589,126 +1707,135 @@ int yyparse ();
 | yyparse.  |
 `----------*/
 
 | yyparse.  |
 `----------*/
 

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

 int
 yyparse (void)
 int
 yyparse (void)

-#else
-int
-yyparse ()
+{
+/* 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
 #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
 #endif

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

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

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

 
 

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

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

-YYLTYPE yylloc;
+YYLTYPE yylloc = yyloc_default;

 
 

-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif

 
 

-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
+    /* Number of syntax errors so far.  */
+    int yynerrs;

 
 

-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;

 
 

-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+       'yyls': related to locations.

 
 

-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */

 
 

-  /* The location stack.  */
-  YYLTYPE yylsa[YYINITDEPTH];
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-  /* The locations where the error started and ended.  */
-  YYLTYPE yyerror_range[2];
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;

 
 

-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;

 
 

-  YYSIZE_T yystacksize = YYINITDEPTH;
+    /* The location stack.  */
+    YYLTYPE yylsa[YYINITDEPTH];
+    YYLTYPE *yyls;
+    YYLTYPE *yylsp;
+
+    /* The locations where the error started and ended.  */
+    YYLTYPE yyerror_range[3];
+
+    YYSIZE_T yystacksize;
+
+    yytype_int16 yyesa[20];
+    yytype_int16 *yyes;
+    YYSIZE_T yyes_capacity;

 
 

+  int yy_lac_established = 0;
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;

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

+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+

   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 

+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yylsp = yyls = yylsa;
+  yystacksize = YYINITDEPTH;
+
+  yyes = yyesa;
+  yyes_capacity = sizeof yyesa / sizeof *yyes;
+  if (YYMAXDEPTH < yyes_capacity)
+    yyes_capacity = YYMAXDEPTH;
+

   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   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 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
-
+  yychar = YYEMPTY; /* Cause a token to be read.  */

 
 

-  /* User initialization code.  */
-  
-/* Line 1093 of yacc.c  */
-#line 90 "parse-gram.y"
+/* User initialization code.  */
+#line 96 "src/parse-gram.y" /* yacc.c:1451  */

 {
   /* 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 1093 of yacc.c  */
-#line 1712 "parse-gram.c"
+#line 1839 "src/parse-gram.c" /* yacc.c:1451  */

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


@@ -1730,25 +1857,26 @@ YYLTYPE yylloc;
 
 #ifdef yyoverflow
       {
 
 #ifdef yyoverflow
       {

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

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


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

-       goto yyexhaustedlab;
+        goto yyexhaustedlab;

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

-       yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;

 
       {
 
       {

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

 #  undef YYSTACK_RELOCATE
 #  undef YYSTACK_RELOCATE

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

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


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

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

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

-       YYABORT;
+        YYABORT;

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


@@ -1805,7 +1933,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];

-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))

     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */


@@ -1814,7 +1942,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)


@@ -1832,12 +1960,16 @@ yybackup:
      detect an error, take that action.  */
   yyn += yytoken;
   if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
      detect an error, take that action.  */
   yyn += yytoken;
   if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)

-    goto yydefault;
+    {
+      YY_LAC_ESTABLISH;
+      goto yydefault;
+    }

   yyn = yytable[yyn];
   if (yyn <= 0)
     {
   yyn = yytable[yyn];
   if (yyn <= 0)
     {

-      if (yyn == 0 || yyn == YYTABLE_NINF)
-       goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      YY_LAC_ESTABLISH;

       yyn = -yyn;
       goto yyreduce;
     }
       yyn = -yyn;
       goto yyreduce;
     }


@@ -1852,9 +1984,12 @@ yybackup:
 
   /* Discard the shifted token.  */
   yychar = YYEMPTY;
 
   /* Discard the shifted token.  */
   yychar = YYEMPTY;

+  YY_LAC_DISCARD ("shift");

 
   yystate = yyn;
 
   yystate = yyn;

+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN

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

+  YY_IGNORE_MAYBE_UNINITIALIZED_END

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


@@ -1877,7 +2012,7 @@ yyreduce:
   yylen = yyr2[yyn];
 
   /* If YYLEN is nonzero, implement the default value of the action:
   yylen = yyr2[yyn];
 
   /* If YYLEN is nonzero, implement the default value of the action:

-     `$$ = $1'.
+     '$$ = $1'.

 
      Otherwise, the following line sets YYVAL to garbage.
      This behavior is undocumented and Bison
 
      Otherwise, the following line sets YYVAL to garbage.
      This behavior is undocumented and Bison


@@ -1889,723 +2024,729 @@ yyreduce:
   /* Default location.  */
   YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
   YY_REDUCE_PRINT (yyn);
   /* Default location.  */
   YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
   YY_REDUCE_PRINT (yyn);

-  switch (yyn)
-    {
-        case 6:
-
-/* Line 1280 of yacc.c  */
-#line 227 "parse-gram.y"
+  {
+    int yychar_backup = yychar;
+    switch (yyn)
+      {
+          case 6:
+#line 277 "src/parse-gram.y" /* yacc.c:1668  */

     {
       code_props plain_code;
     {
       code_props plain_code;

-      code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
+      code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));

       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();

-      prologue_augment (plain_code.code, (yylsp[(1) - (1)]), union_seen);
+      muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
+                        plain_code.code, (yylsp[0]));

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

+#line 2043 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 7:
     break;
 
   case 7:

-
-/* Line 1280 of yacc.c  */
-#line 235 "parse-gram.y"
-    { debug_flag = true; }
+#line 287 "src/parse-gram.y" /* yacc.c:1668  */
+    {
+      muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
+    }
+#line 2051 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 8:
     break;
 
   case 8:

-
-/* Line 1280 of yacc.c  */
-#line 236 "parse-gram.y"
-    { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }
+#line 291 "src/parse-gram.y" /* yacc.c:1668  */
+    {
+      muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].value).kind, (yyvsp[0].value).chars,
+                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+    }
+#line 2060 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 9:
     break;
 
   case 9:

-
-/* Line 1280 of yacc.c  */
-#line 237 "parse-gram.y"
+#line 295 "src/parse-gram.y" /* yacc.c:1668  */

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

+#line 2066 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 10:
     break;
 
   case 10:

-
-/* Line 1280 of yacc.c  */
-#line 239 "parse-gram.y"
+#line 297 "src/parse-gram.y" /* yacc.c:1668  */

     {
       defines_flag = true;
     {
       defines_flag = true;

-      spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
+      spec_defines_file = xstrdup ((yyvsp[0].chars));

     }
     }

+#line 2075 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 11:
     break;
 
   case 11:

-
-/* Line 1280 of yacc.c  */
-#line 243 "parse-gram.y"
-    { error_verbose = true; }
+#line 302 "src/parse-gram.y" /* yacc.c:1668  */
+    {
+      muscle_percent_define_insert ("parse.error", (yylsp[0]), muscle_keyword,
+                                    "verbose",
+                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+    }
+#line 2085 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 12:
     break;
 
   case 12:

-
-/* Line 1280 of yacc.c  */
-#line 244 "parse-gram.y"
-    { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
+#line 307 "src/parse-gram.y" /* yacc.c:1668  */
+    { expected_sr_conflicts = (yyvsp[0].integer); }
+#line 2091 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 13:
     break;
 
   case 13:

-
-/* Line 1280 of yacc.c  */
-#line 245 "parse-gram.y"
-    { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
+#line 308 "src/parse-gram.y" /* yacc.c:1668  */
+    { expected_rr_conflicts = (yyvsp[0].integer); }
+#line 2097 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 14:
     break;
 
   case 14:

-
-/* Line 1280 of yacc.c  */
-#line 246 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
+#line 309 "src/parse-gram.y" /* yacc.c:1668  */
+    { spec_file_prefix = (yyvsp[0].chars); }
+#line 2103 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 15:
     break;
 
   case 15:

-
-/* Line 1280 of yacc.c  */
-#line 247 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
-    break;
-
-  case 16:
-
-/* Line 1280 of yacc.c  */
-#line 249 "parse-gram.y"
+#line 311 "src/parse-gram.y" /* yacc.c:1668  */

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

+#line 2112 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 17:
-
-/* Line 1280 of yacc.c  */
-#line 254 "parse-gram.y"
+  case 16:
+#line 316 "src/parse-gram.y" /* yacc.c:1668  */

     {
       code_props action;
     {
       code_props action;

-      code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
+      code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));

       code_props_translate_code (&action);
       gram_scanner_last_string_free ();
       code_props_translate_code (&action);
       gram_scanner_last_string_free ();

-      muscle_code_grow ("initial_action", action.code, (yylsp[(2) - (2)]));
+      muscle_code_grow ("initial_action", action.code, (yylsp[0]));

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

+#line 2125 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 18:
+  case 17:
+#line 324 "src/parse-gram.y" /* yacc.c:1668  */
+    { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
+#line 2131 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 262 "parse-gram.y"
-    { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
+  case 18:
+#line 325 "src/parse-gram.y" /* yacc.c:1668  */
+    { spec_name_prefix = (yyvsp[0].chars); }
+#line 2137 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 19:
     break;
 
   case 19:

-
-/* Line 1280 of yacc.c  */
-#line 263 "parse-gram.y"
-    { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+#line 326 "src/parse-gram.y" /* yacc.c:1668  */
+    { no_lines_flag = true; }
+#line 2143 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 20:
     break;
 
   case 20:

-
-/* Line 1280 of yacc.c  */
-#line 264 "parse-gram.y"
-    { locations_flag = true; }
+#line 327 "src/parse-gram.y" /* yacc.c:1668  */
+    { nondeterministic_parser = true; }
+#line 2149 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 21:
     break;
 
   case 21:

-
-/* Line 1280 of yacc.c  */
-#line 265 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
+#line 328 "src/parse-gram.y" /* yacc.c:1668  */
+    { spec_outfile = (yyvsp[0].chars); }
+#line 2155 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 22:
     break;
 
   case 22:

-
-/* Line 1280 of yacc.c  */
-#line 266 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
+#line 329 "src/parse-gram.y" /* yacc.c:1668  */
+    { current_param = (yyvsp[0].param); }
+#line 2161 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 23:
     break;
 
   case 23:

-
-/* Line 1280 of yacc.c  */
-#line 267 "parse-gram.y"
-    { no_lines_flag = true; }
+#line 329 "src/parse-gram.y" /* yacc.c:1668  */
+    { current_param = param_none; }
+#line 2167 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 24:
     break;
 
   case 24:

-
-/* Line 1280 of yacc.c  */
-#line 268 "parse-gram.y"
-    { nondeterministic_parser = true; }
+#line 330 "src/parse-gram.y" /* yacc.c:1668  */
+    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
+#line 2173 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 25:
     break;
 
   case 25:

-
-/* Line 1280 of yacc.c  */
-#line 269 "parse-gram.y"
-    { spec_outfile = (yyvsp[(2) - (2)].chars); }
+#line 332 "src/parse-gram.y" /* yacc.c:1668  */
+    {
+      char const *skeleton_user = (yyvsp[0].chars);
+      if (strchr (skeleton_user, '/'))
+        {
+          size_t dir_length = strlen (current_file);
+          char *skeleton_build;
+          while (dir_length && current_file[dir_length - 1] != '/')
+            --dir_length;
+          while (dir_length && current_file[dir_length - 1] == '/')
+            --dir_length;
+          skeleton_build =
+            xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
+          if (dir_length > 0)
+            {
+              memcpy (skeleton_build, current_file, dir_length);
+              skeleton_build[dir_length++] = '/';
+            }
+          strcpy (skeleton_build + dir_length, skeleton_user);
+          skeleton_user = uniqstr_new (skeleton_build);
+          free (skeleton_build);
+        }
+      skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
+    }
+#line 2201 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 26:
     break;
 
   case 26:

-
-/* Line 1280 of yacc.c  */
-#line 270 "parse-gram.y"
-    { spec_outfile = (yyvsp[(3) - (3)].chars); }
+#line 355 "src/parse-gram.y" /* yacc.c:1668  */
+    { token_table_flag = true; }
+#line 2207 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 27:
     break;
 
   case 27:

-
-/* Line 1280 of yacc.c  */
-#line 271 "parse-gram.y"
-    { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+#line 356 "src/parse-gram.y" /* yacc.c:1668  */
+    { report_flag |= report_states; }
+#line 2213 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 28:
     break;
 
   case 28:

-
-/* Line 1280 of yacc.c  */
-#line 272 "parse-gram.y"
-    { pure_parser = true; }
-    break;
-
-  case 29:
-
-/* Line 1280 of yacc.c  */
-#line 273 "parse-gram.y"
-    { push_parser = true; pull_parser = false; }
+#line 357 "src/parse-gram.y" /* yacc.c:1668  */
+    { yacc_flag = true; }
+#line 2219 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 30:
     break;
 
   case 30:

-
-/* Line 1280 of yacc.c  */
-#line 274 "parse-gram.y"
-    { push_parser = true; pull_parser = true; }
+#line 362 "src/parse-gram.y" /* yacc.c:1668  */
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+#line 2225 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 31:
     break;
 
   case 31:

-
-/* Line 1280 of yacc.c  */
-#line 275 "parse-gram.y"
-    { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
-    break;
-
-  case 32:
-
-/* Line 1280 of yacc.c  */
-#line 276 "parse-gram.y"
-    { skeleton_arg ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
-    break;
-
-  case 33:
-
-/* Line 1280 of yacc.c  */
-#line 277 "parse-gram.y"
-    { token_table_flag = true; }
+#line 363 "src/parse-gram.y" /* yacc.c:1668  */
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+#line 2231 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 34:
     break;
 
   case 34:

-
-/* Line 1280 of yacc.c  */
-#line 278 "parse-gram.y"
-    { report_flag = report_states; }
-    break;
-
-  case 35:
-
-/* Line 1280 of yacc.c  */
-#line 279 "parse-gram.y"
-    { yacc_flag = true; }
-    break;
-
-  case 39:
-
-/* Line 1280 of yacc.c  */
-#line 287 "parse-gram.y"
+#line 375 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

-      grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
+      grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));

     }
     }

+#line 2239 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 40:
-
-/* Line 1280 of yacc.c  */
-#line 291 "parse-gram.y"
-    {
-      symbol_list *list;
-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
-       symbol_list_destructor_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
-    }
-    break;
-
-  case 41:
-
-/* Line 1280 of yacc.c  */
-#line 298 "parse-gram.y"
+  case 35:
+#line 379 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

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

     }
     }

+#line 2255 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 42:
-
-/* Line 1280 of yacc.c  */
-#line 305 "parse-gram.y"
+  case 36:
+#line 391 "src/parse-gram.y" /* yacc.c:1668  */

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

+#line 2263 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 43:
-
-/* Line 1280 of yacc.c  */
-#line 309 "parse-gram.y"
+  case 37:
+#line 395 "src/parse-gram.y" /* yacc.c:1668  */

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

+#line 2271 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 44:
-
-/* Line 1280 of yacc.c  */
-#line 313 "parse-gram.y"
+  case 38:
+#line 399 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

-      muscle_code_grow ("percent_code", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
+      /* 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 ();
     }
       code_scanner_last_string_free ();
     }

+#line 2282 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 45:
-
-/* Line 1280 of yacc.c  */
-#line 318 "parse-gram.y"
+  case 39:
+#line 406 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

-      char const name_prefix[] = "percent_code_";
-      char *name = xmalloc (sizeof name_prefix + strlen ((yyvsp[(2) - (3)].chars)));
-      strcpy (name, name_prefix);
-      strcpy (name + sizeof name_prefix - 1, (yyvsp[(2) - (3)].chars));
-      muscle_code_grow (uniqstr_new (name), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
-      free (name);
+      muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));

       code_scanner_last_string_free ();
       code_scanner_last_string_free ();

-      muscle_grow ("used_percent_code_qualifiers", "[[[[", ",");
-      muscle_grow ("used_percent_code_qualifiers", (yyvsp[(2) - (3)].chars), "");
-      muscle_grow ("used_percent_code_qualifiers", "]], [[", "");
-      muscle_boundary_grow ("used_percent_code_qualifiers", (yylsp[(2) - (3)]).start);
-      muscle_grow ("used_percent_code_qualifiers", "]], [[", "");
-      muscle_boundary_grow ("used_percent_code_qualifiers", (yylsp[(2) - (3)]).end);
-      muscle_grow ("used_percent_code_qualifiers", "]]]]", "");

     }
     }

+#line 2291 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 46:
-
-/* Line 1280 of yacc.c  */
-#line 344 "parse-gram.y"
-    {}
+  case 40:
+#line 416 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.code_type) = destructor; }
+#line 2297 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 47:
+  case 41:
+#line 417 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.code_type) = printer; }
+#line 2303 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 345 "parse-gram.y"
-    { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 42:
+#line 427 "src/parse-gram.y" /* yacc.c:1668  */
+    {}
+#line 2309 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 48:
+  case 43:
+#line 428 "src/parse-gram.y" /* yacc.c:1668  */
+    { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
+#line 2315 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 350 "parse-gram.y"
+  case 44:
+#line 433 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

-      char const *body = (yyvsp[(3) - (3)].code);
-
-      /* Concatenate the %union bodies.  If this is the first %union, make sure
-        the synchronization line appears after the opening '{' so as not to
-        confuse Doxygen.  Otherwise, turn the previous %union's trailing '}'
-        into '\n', and omit the new %union's leading '{'.  */
-      if (!union_seen)
-       {
-         muscle_grow ("stype", "{", "");
-       }
-      else
-       {
-         char *code = muscle_find ("stype");
-         code[strlen (code) - 1] = '\n';
-       }
-      body++;
-

       union_seen = true;
       union_seen = true;

-      muscle_code_grow ("stype", body, (yylsp[(3) - (3)]));
-      gram_scanner_last_string_free ();
+      muscle_code_grow ("union_members", (yyvsp[0].chars), (yylsp[0]));
+      code_scanner_last_string_free ();

     }
     }

+#line 2325 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 49:
-
-/* Line 1280 of yacc.c  */
-#line 378 "parse-gram.y"
+  case 45:
+#line 444 "src/parse-gram.y" /* yacc.c:1668  */

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

+#line 2331 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 50:
-
-/* Line 1280 of yacc.c  */
-#line 379 "parse-gram.y"
+  case 46:
+#line 445 "src/parse-gram.y" /* yacc.c:1668  */

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

+#line 2340 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 51:
-
-/* Line 1280 of yacc.c  */
-#line 383 "parse-gram.y"
+  case 47:
+#line 449 "src/parse-gram.y" /* yacc.c:1668  */

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

+#line 2346 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 52:
-
-/* Line 1280 of yacc.c  */
-#line 384 "parse-gram.y"
+  case 48:
+#line 450 "src/parse-gram.y" /* yacc.c:1668  */

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

+#line 2355 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 53:
-
-/* Line 1280 of yacc.c  */
-#line 389 "parse-gram.y"
+  case 49:
+#line 455 "src/parse-gram.y" /* yacc.c:1668  */

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

-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
-       symbol_type_set (list->content.sym, (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      for (list = (yyvsp[0].list); list; list = list->next)
+        symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
+      symbol_list_free ((yyvsp[0].list));

     }
     }

+#line 2367 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 54:
-
-/* Line 1280 of yacc.c  */
-#line 400 "parse-gram.y"
+  case 50:
+#line 466 "src/parse-gram.y" /* yacc.c:1668  */

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

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

       current_type = NULL;
     }
       current_type = NULL;
     }

+#line 2383 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 55:
-
-/* Line 1280 of yacc.c  */
-#line 414 "parse-gram.y"
+  case 51:
+#line 480 "src/parse-gram.y" /* yacc.c:1668  */

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

+#line 2389 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 56:
-
-/* Line 1280 of yacc.c  */
-#line 415 "parse-gram.y"
+  case 52:
+#line 481 "src/parse-gram.y" /* yacc.c:1668  */

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

+#line 2395 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 57:
-
-/* Line 1280 of yacc.c  */
-#line 416 "parse-gram.y"
+  case 53:
+#line 482 "src/parse-gram.y" /* yacc.c:1668  */

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

+#line 2401 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 58:
+  case 54:
+#line 483 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.assoc) = precedence_assoc; }
+#line 2407 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 420 "parse-gram.y"
+  case 55:
+#line 487 "src/parse-gram.y" /* yacc.c:1668  */

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

+#line 2413 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 59:
+  case 56:
+#line 488 "src/parse-gram.y" /* yacc.c:1668  */
+    { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
+#line 2419 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 421 "parse-gram.y"
-    { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
+  case 57:
+#line 494 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+#line 2425 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 60:
+  case 58:
+#line 496 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+#line 2431 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 427 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+  case 59:
+#line 501 "src/parse-gram.y" /* yacc.c:1668  */
+    {
+      (yyval.symbol) = (yyvsp[0].symbol);
+      symbol_class_set ((yyvsp[0].symbol), token_sym, (yylsp[0]), false);
+    }
+#line 2440 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 61:
+  case 60:
+#line 506 "src/parse-gram.y" /* yacc.c:1668  */
+    {
+      (yyval.symbol) = (yyvsp[-1].symbol);
+      symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
+      symbol_class_set ((yyvsp[-1].symbol), token_sym, (yylsp[-1]), false);
+    }
+#line 2450 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 429 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
+  case 61:
+#line 516 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+#line 2456 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 62:
     break;
 
   case 62:

-
-/* Line 1280 of yacc.c  */
-#line 433 "parse-gram.y"
-    { (yyval.list) = (yyvsp[(1) - (1)].list); }
+#line 518 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+#line 2462 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 63:
     break;
 
   case 63:

-
-/* Line 1280 of yacc.c  */
-#line 434 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+#line 522 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.list) = (yyvsp[0].list); }
+#line 2468 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 64:
     break;
 
   case 64:

-
-/* Line 1280 of yacc.c  */
-#line 438 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+#line 523 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); }
+#line 2474 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 65:
     break;
 
   case 65:

-
-/* Line 1280 of yacc.c  */
-#line 439 "parse-gram.y"
-    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+#line 527 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+#line 2480 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 66:
     break;
 
   case 66:

-
-/* Line 1280 of yacc.c  */
-#line 440 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
-    break;
-
-  case 67:
-
-/* Line 1280 of yacc.c  */
-#line 441 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+#line 528 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
+#line 2486 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 68:
     break;
 
   case 68:

-
-/* Line 1280 of yacc.c  */
-#line 447 "parse-gram.y"
-    {
-       current_type = (yyvsp[(1) - (1)].uniqstr);
-       tag_seen = true;
-     }
+#line 533 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.uniqstr) = uniqstr_new ("*"); }
+#line 2492 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 69:
     break;
 
   case 69:

-
-/* Line 1280 of yacc.c  */
-#line 452 "parse-gram.y"
-    {
-       symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
-       symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)]));
-     }
+#line 534 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.uniqstr) = uniqstr_new (""); }
+#line 2498 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 70:
     break;
 
   case 70:

-
-/* Line 1280 of yacc.c  */
-#line 457 "parse-gram.y"
+#line 540 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

-      symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
-      symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
-      symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)]));
+      current_type = (yyvsp[0].uniqstr);
+      tag_seen = true;

     }
     }

+#line 2507 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 71:
     break;
 
   case 71:

-
-/* Line 1280 of yacc.c  */
-#line 463 "parse-gram.y"
+#line 545 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

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

     }
     }

+#line 2516 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 72:
     break;
 
   case 72:

-
-/* Line 1280 of yacc.c  */
-#line 469 "parse-gram.y"
+#line 550 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

-      symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
-      symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));
-      symbol_user_token_number_set ((yyvsp[(1) - (3)].symbol), (yyvsp[(2) - (3)].integer), (yylsp[(2) - (3)]));
-      symbol_make_alias ((yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol), (yyloc));
+      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 2526 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 79:
-
-/* Line 1280 of yacc.c  */
-#line 499 "parse-gram.y"
+  case 73:
+#line 556 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

-      yyerrok;
+      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 2536 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 80:
+  case 74:
+#line 562 "src/parse-gram.y" /* yacc.c:1668  */
+    {
+      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 2547 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 505 "parse-gram.y"
-    { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
+  case 81:
+#line 592 "src/parse-gram.y" /* yacc.c:1668  */
+    {
+      yyerrok;
+    }
+#line 2555 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 82:
     break;
 
   case 82:

-
-/* Line 1280 of yacc.c  */
-#line 509 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(1) - (1)])); }
+#line 598 "src/parse-gram.y" /* yacc.c:1668  */
+    { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+#line 2561 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 83:
     break;
 
   case 83:

+#line 599 "src/parse-gram.y" /* yacc.c:1668  */
+    {
+    /* Free the current lhs. */
+    current_lhs (0, (yylsp[-3]), 0);
+  }
+#line 2570 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 510 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(3) - (3)])); }
+  case 84:
+#line 606 "src/parse-gram.y" /* yacc.c:1668  */
+    { grammar_current_rule_end ((yylsp[0])); }
+#line 2576 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 85:
     break;
 
   case 85:

+#line 607 "src/parse-gram.y" /* yacc.c:1668  */
+    { grammar_current_rule_end ((yylsp[0])); }
+#line 2582 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 516 "parse-gram.y"
-    { grammar_current_rule_begin (current_lhs, current_lhs_location); }
+  case 87:
+#line 614 "src/parse-gram.y" /* yacc.c:1668  */
+    { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
+                                  current_lhs_named_ref); }
+#line 2589 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 86:
+  case 88:
+#line 617 "src/parse-gram.y" /* yacc.c:1668  */
+    { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+#line 2595 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 518 "parse-gram.y"
-    { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
+  case 89:
+#line 619 "src/parse-gram.y" /* yacc.c:1668  */
+    { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }
+#line 2601 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 87:
+  case 90:
+#line 621 "src/parse-gram.y" /* yacc.c:1668  */
+    { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
+#line 2607 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 520 "parse-gram.y"
-    { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+  case 91:
+#line 623 "src/parse-gram.y" /* yacc.c:1668  */
+    { grammar_current_rule_empty_set ((yylsp[0])); }
+#line 2613 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 88:
+  case 92:
+#line 625 "src/parse-gram.y" /* yacc.c:1668  */
+    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
+#line 2619 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 522 "parse-gram.y"
-    { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
+  case 93:
+#line 627 "src/parse-gram.y" /* yacc.c:1668  */
+    { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
+#line 2625 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 89:
+  case 94:
+#line 629 "src/parse-gram.y" /* yacc.c:1668  */
+    { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
+#line 2631 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 524 "parse-gram.y"
-    { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
+  case 95:
+#line 633 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.named_ref) = 0; }
+#line 2637 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 90:
+  case 96:
+#line 634 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
+#line 2643 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 526 "parse-gram.y"
-    { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
+  case 98:
+#line 645 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
+#line 2649 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 93:
+  case 99:
+#line 670 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; }
+#line 2655 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 542 "parse-gram.y"
-    {
-      static char one[] = "1";
-      (yyval.chars) = one;
-    }
+  case 100:
+#line 671 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.value).kind = muscle_keyword; (yyval.value).chars = (yyvsp[0].uniqstr); }
+#line 2661 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 95:
+  case 101:
+#line 672 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.value).kind = muscle_string;  (yyval.value).chars = (yyvsp[0].chars); }
+#line 2667 "src/parse-gram.c" /* yacc.c:1668  */
+    break;
+
+  case 102:
+#line 673 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.value).kind = muscle_code;    (yyval.value).chars = (yyvsp[0].chars); }
+#line 2673 "src/parse-gram.c" /* yacc.c:1668  */
+    break;

 
 

-/* Line 1280 of yacc.c  */
-#line 552 "parse-gram.y"
+  case 103:
+#line 683 "src/parse-gram.y" /* yacc.c:1668  */

     {
       code_props plain_code;
     {
       code_props plain_code;

-      (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
-      code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].code)+1, (yylsp[(1) - (1)]));
+      (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\0';
+      code_props_plain_init (&plain_code, (yyvsp[0].code)+1, (yylsp[0]));

       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
       (yyval.chars) = plain_code.code;
     }
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
       (yyval.chars) = plain_code.code;
     }

+#line 2686 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 96:
-
-/* Line 1280 of yacc.c  */
-#line 572 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 104:
+#line 703 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+#line 2692 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 97:
-
-/* Line 1280 of yacc.c  */
-#line 574 "parse-gram.y"
+  case 105:
+#line 705 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

-      (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
-      symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
-      symbol_user_token_number_set ((yyval.symbol), (yyvsp[(1) - (1)].character), (yylsp[(1) - (1)]));
+      (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 2702 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 98:
-
-/* Line 1280 of yacc.c  */
-#line 582 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 106:
+#line 713 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+#line 2708 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 101:
-
-/* Line 1280 of yacc.c  */
-#line 594 "parse-gram.y"
+  case 109:
+#line 725 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

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

     }
     }

+#line 2717 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 103:
-
-/* Line 1280 of yacc.c  */
-#line 603 "parse-gram.y"
+  case 111:
+#line 734 "src/parse-gram.y" /* yacc.c:1668  */

     {
       code_props plain_code;
     {
       code_props plain_code;

-      code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
+      code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));

       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();

-      muscle_code_grow ("epilogue", plain_code.code, (yylsp[(2) - (2)]));
+      muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

+#line 2730 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
 
     break;
 
 

-
-/* Line 1280 of yacc.c  */
-#line 2607 "parse-gram.c"
-      default: break;
-    }
+#line 2734 "src/parse-gram.c" /* yacc.c:1668  */
+        default: break;
+      }
+    if (yychar_backup != yychar)
+      YY_LAC_DISCARD ("yychar change");
+  }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */

   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);


@@ -2615,7 +2756,7 @@ yyreduce:
   *++yyvsp = yyval;
   *++yylsp = yyloc;
 
   *++yyvsp = yyval;
   *++yylsp = yyloc;
 

-  /* Now `shift' the result of the reduction.  Determine what state
+  /* Now 'shift' the result of the reduction.  Determine what state

      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
 
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
 


@@ -2630,70 +2771,76 @@ yyreduce:
   goto yynewstate;
 
 
   goto yynewstate;
 
 

-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/

 yyerrlab:
 yyerrlab:

+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+

   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
       ++yynerrs;
 #if ! YYERROR_VERBOSE
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
       ++yynerrs;
 #if ! YYERROR_VERBOSE

-      yyerror (YY_("syntax error"));
+      yyerror (&yylloc, YY_("syntax error"));

 #else
 #else

+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyesa, &yyes, &yyes_capacity, \
+                                        yyssp, yytoken)

       {
       {

-       YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-       if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-         {
-           YYSIZE_T yyalloc = 2 * yysize;
-           if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-             yyalloc = YYSTACK_ALLOC_MAXIMUM;
-           if (yymsg != yymsgbuf)
-             YYSTACK_FREE (yymsg);
-           yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-           if (yymsg)
-             yymsg_alloc = yyalloc;
-           else
-             {
-               yymsg = yymsgbuf;
-               yymsg_alloc = sizeof yymsgbuf;
-             }
-         }
-
-       if (0 < yysize && yysize <= yymsg_alloc)
-         {
-           (void) yysyntax_error (yymsg, yystate, yychar);
-           yyerror (yymsg);
-         }
-       else
-         {
-           yyerror (YY_("syntax error"));
-           if (yysize != 0)
-             goto yyexhaustedlab;
-         }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        if (yychar != YYEMPTY)
+          YY_LAC_ESTABLISH;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (&yylloc, yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;

       }
       }

+# undef YYSYNTAX_ERROR

 #endif
     }
 
 #endif
     }
 

-  yyerror_range[0] = yylloc;
+  yyerror_range[1] = yylloc;

 
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
 
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an

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

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

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

       else
       else

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

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


@@ -2712,8 +2859,8 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 

-  yyerror_range[0] = yylsp[1-yylen];
-  /* Do not reclaim the symbols of the rule which action triggered
+  yyerror_range[1] = yylsp[1-yylen];
+  /* Do not reclaim the symbols of the rule whose action triggered

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


@@ -2726,40 +2873,46 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:

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

 
   for (;;)
     {
       yyn = yypact[yystate];
 
   for (;;)
     {
       yyn = yypact[yystate];

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

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

-       YYABORT;
+        YYABORT;

 
 

-      yyerror_range[0] = *yylsp;
+      yyerror_range[1] = *yylsp;

       yydestruct ("Error: popping",
       yydestruct ("Error: popping",

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

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

+  /* If the stack popping above didn't lose the initial context for the
+     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[1] = yylloc;
+  yyerror_range[2] = yylloc;

   /* Using YYLLOC is tempting, but would change the location of
      the lookahead.  YYLOC is available though.  */
   /* Using YYLLOC is tempting, but would change the location of
      the lookahead.  YYLOC is available though.  */

-  YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
+  YYLLOC_DEFAULT (yyloc, yyerror_range, 2);

   *++yylsp = yyloc;
 
   /* Shift the error token.  */
   *++yylsp = yyloc;
 
   /* Shift the error token.  */


@@ -2783,47 +2936,48 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
   yyresult = 1;
   goto yyreturn;
 

-#ifndef yyoverflow
+#if 1

 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 yyexhaustedlab:
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 yyexhaustedlab:

-  yyerror (YY_("memory exhausted"));
+  yyerror (&yylloc, YY_("memory exhausted"));

   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
   if (yychar != YYEMPTY)
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
   if (yychar != YYEMPTY)

-     yydestruct ("Cleanup: discarding lookahead",
-                yytoken, &yylval, &yylloc);
-  /* Do not reclaim the symbols of the rule which action triggered
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval, &yylloc);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered

      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",

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

       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif

+  if (yyes != yyesa)
+    YYSTACK_FREE (yyes);

 #if YYERROR_VERBOSE
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
 #if YYERROR_VERBOSE
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif

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

 }
 }

-
-
-
-/* Line 1497 of yacc.c  */
-#line 613 "parse-gram.y"
-
+#line 744 "src/parse-gram.y" /* yacc.c:1928  */

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


@@ -2842,65 +2996,59 @@ lloc_default (YYLTYPE const *rhs, int n)
   loc.start = rhs[n].end;
   loc.end = rhs[n].end;
 
   loc.start = rhs[n].end;
   loc.end = rhs[n].end;
 

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

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

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

       }
 
   return loc;
 }
 
 
       }
 
   return loc;
 }
 
 

-/* Add a lex-param or a parse-param (depending on TYPE) with
-   declaration DECL and location LOC.  */
-

 static void
 static void

-add_param (char const *type, char *decl, location loc)
+add_param (param_type type, char *decl, location loc)

 {
   static char const alphanum[26 + 26 + 1 + 10] =
     "abcdefghijklmnopqrstuvwxyz"
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "_"
     "0123456789";
 {
   static char const alphanum[26 + 26 + 1 + 10] =
     "abcdefghijklmnopqrstuvwxyz"
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "_"
     "0123456789";

+

   char const *name_start = NULL;
   char const *name_start = NULL;

-  char *p;
-
-  /* Stop on last actual character.  */
-  for (p = decl; p[1]; p++)
-    if ((p == decl
-        || ! memchr (alphanum, p[-1], sizeof alphanum))
-       && memchr (alphanum, p[0], sizeof alphanum - 10))
-      name_start = p;
-
-  /* Strip the surrounding '{' and '}', and any blanks just inside
-     the braces.  */
-  while (*--p == ' ' || *p == '\t')
-    continue;
-  p[1] = '\0';
-  while (*++decl == ' ' || *decl == '\t')
-    continue;
+  {
+    char *p;
+    /* Stop on last actual character.  */
+    for (p = decl; p[1]; p++)
+      if ((p == decl
+           || ! memchr (alphanum, p[-1], sizeof alphanum))
+          && memchr (alphanum, p[0], sizeof alphanum - 10))
+        name_start = p;
+
+    /* Strip the surrounding '{' and '}', and any blanks just inside
+       the braces.  */
+    --p;
+  while (c_isspace ((unsigned char) *p))
+      --p;
+    p[1] = '\0';
+    ++decl;
+  while (c_isspace ((unsigned char) *decl))
+      ++decl;
+  }

 
   if (! name_start)
 
   if (! name_start)

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

   else
     {
   else
     {

-      char *name;
-      size_t name_len;
-
-      for (name_len = 1;
-          memchr (alphanum, name_start[name_len], sizeof alphanum);
-          name_len++)
-       continue;
-
-      name = xmalloc (name_len + 1);
-      memcpy (name, name_start, name_len);
-      name[name_len] = '\0';
-      muscle_pair_list_grow (type, decl, name);
+      char *name = xmemdup0 (name_start, strspn (name_start, alphanum));
+      if (type & param_lex)
+        muscle_pair_list_grow ("lex_param", decl, name);
+      if (type & param_parse)
+        muscle_pair_list_grow ("parse_param", decl, name);

       free (name);
     }
 
       free (name);
     }
 


@@ -2913,16 +3061,16 @@ version_check (location const *loc, char const *version)
 {
   if (strverscmp (version, PACKAGE_VERSION) > 0)
     {
 {
   if (strverscmp (version, PACKAGE_VERSION) > 0)
     {

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

     }
 }
 
 static void
 gram_error (location const *loc, char const *msg)
 {
     }
 }
 
 static void
 gram_error (location const *loc, char const *msg)
 {

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

 }
 
 char const *
 }
 
 char const *


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

-