Merge remote-tracking branch 'origin/maint'

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 6d01e0c05fc25fe55f4cb84e2f5827ff46579921..39dbe314245c82b64e2bd68b76e216d665722f31 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.4.1.302-e8fa.  */
+/* A Bison parser, made by GNU Bison 2.6.2.847-e4c0-dirty.  */

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

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

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    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
    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
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 


@@ -26,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.  */
 


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

-#define YYBISON_VERSION "2.4.1.302-e8fa"
+#define YYBISON_VERSION "2.6.2.847-e4c0-dirty"

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


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

-/* Using locations.  */
-#define YYLSP_NEEDED 1

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


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

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

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

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

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


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

+#include "c-ctype.h"

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


@@ -107,14 +105,16 @@
 #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 (File, Loc)

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


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

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

 static void gram_error (location const *, char const *);
 
 static char const *char_name (char);
 
 static void gram_error (location const *, char const *);
 
 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_symbol;
-static location current_lhs_location;
-static named_ref *current_lhs_named_ref;
-static int current_prec = 0;
-
-/** Set the new current left-hand side symbol, possibly common
- * to several right-hand side parts of rule.
- */
-static
-void
-current_lhs(symbol *sym, location loc, named_ref *ref)
-{
-  current_lhs_symbol = sym;
-  current_lhs_location = loc;
-  /* In order to simplify memory management, named references for lhs
-     are always assigned by deep copy into the current symbol_list
-     node.  This is because a single named-ref in the grammar may
-     result in several uses when the user factors lhs between several
-     rules using "|".  Therefore free the parser's original copy.  */
-  free (current_lhs_named_ref);
-  current_lhs_named_ref = ref;
-}
-
-
-#define YYTYPE_INT16 int_fast16_t
-#define YYTYPE_INT8 int_fast8_t
-#define YYTYPE_UINT16 uint_fast16_t
-#define YYTYPE_UINT8 uint_fast8_t
-
-
-/* Line 268 of yacc.c  */
-#line 173 "parse-gram.c"
+/* Line 331 of yacc.c  */
+#line 132 "src/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


@@ -184,75 +146,99 @@ current_lhs(symbol *sym, location loc, named_ref *ref)
 # 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 GRAM_SRC_PARSE_GRAM_H
+# define GRAM_SRC_PARSE_GRAM_H
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int gram_debug;

 #endif
 #endif

+/* "%code requires" blocks.  */
+/* Line 345 of yacc.c  */
+#line 223 "src/parse-gram.y"
+
+# ifndef PARAM_TYPE
+#  define PARAM_TYPE
+  typedef enum
+  {
+    param_none   = 0,
+    param_lex    = 1 << 0,
+    param_parse  = 1 << 1,
+    param_both   = param_lex | param_parse
+  } param_type;
+# endif

 
 
 
 

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

 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
 /* 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_REQUIRE = 292,
-     PERCENT_SKELETON = 293,
-     PERCENT_START = 294,
-     PERCENT_TOKEN_TABLE = 295,
-     PERCENT_VERBOSE = 296,
-     PERCENT_YACC = 297,
-     BRACED_CODE = 298,
-     BRACKETED_ID = 299,
-     CHAR = 300,
-     EPILOGUE = 301,
-     EQUAL = 302,
-     ID = 303,
-     ID_COLON = 304,
-     PERCENT_PERCENT = 305,
-     PIPE = 306,
-     PROLOGUE = 307,
-     SEMICOLON = 308,
-     TYPE = 309,
-     TYPE_TAG_ANY = 310,
-     TYPE_TAG_NONE = 311,
-     PERCENT_UNION = 312
-   };
+  /* 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_PRECEDENCE = 268,
+    PERCENT_PREC = 269,
+    PERCENT_DPREC = 270,
+    PERCENT_MERGE = 271,
+    PERCENT_CODE = 272,
+    PERCENT_DEFAULT_PREC = 273,
+    PERCENT_DEFINE = 274,
+    PERCENT_DEFINES = 275,
+    PERCENT_ERROR_VERBOSE = 276,
+    PERCENT_EXPECT = 277,
+    PERCENT_EXPECT_RR = 278,
+    PERCENT_FLAG = 279,
+    PERCENT_FILE_PREFIX = 280,
+    PERCENT_GLR_PARSER = 281,
+    PERCENT_INITIAL_ACTION = 282,
+    PERCENT_LANGUAGE = 283,
+    PERCENT_NAME_PREFIX = 284,
+    PERCENT_NO_DEFAULT_PREC = 285,
+    PERCENT_NO_LINES = 286,
+    PERCENT_NONDETERMINISTIC_PARSER = 287,
+    PERCENT_OUTPUT = 288,
+    PERCENT_REQUIRE = 289,
+    PERCENT_SKELETON = 290,
+    PERCENT_START = 291,
+    PERCENT_TOKEN_TABLE = 292,
+    PERCENT_VERBOSE = 293,
+    PERCENT_YACC = 294,
+    BRACED_CODE = 295,
+    BRACED_PREDICATE = 296,
+    BRACKETED_ID = 297,
+    CHAR = 298,
+    EPILOGUE = 299,
+    EQUAL = 300,
+    ID = 301,
+    ID_COLON = 302,
+    PERCENT_PERCENT = 303,
+    PIPE = 304,
+    PROLOGUE = 305,
+    SEMICOLON = 306,
+    TAG = 307,
+    TAG_ANY = 308,
+    TAG_NONE = 309,
+    PERCENT_PARAM = 310,
+    PERCENT_UNION = 311
+  };

 #endif
 /* Tokens.  */
 #define GRAM_EOF 0
 #endif
 /* Tokens.  */
 #define GRAM_EOF 0


@@ -266,79 +252,80 @@ current_lhs(symbol *sym, location loc, named_ref *ref)
 #define PERCENT_LEFT 265
 #define PERCENT_RIGHT 266
 #define PERCENT_NONASSOC 267
 #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_PRECEDENCE 268
+#define PERCENT_PREC 269
+#define PERCENT_DPREC 270
+#define PERCENT_MERGE 271
+#define PERCENT_CODE 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_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_REQUIRE 292
-#define PERCENT_SKELETON 293
-#define PERCENT_START 294
-#define PERCENT_TOKEN_TABLE 295
-#define PERCENT_VERBOSE 296
-#define PERCENT_YACC 297
-#define BRACED_CODE 298
-#define BRACKETED_ID 299
-#define CHAR 300
-#define EPILOGUE 301
-#define EQUAL 302
-#define ID 303
-#define ID_COLON 304
-#define PERCENT_PERCENT 305
-#define PIPE 306
-#define PROLOGUE 307
-#define SEMICOLON 308
-#define TYPE 309
-#define TYPE_TAG_ANY 310
-#define TYPE_TAG_NONE 311
-#define PERCENT_UNION 312
-
-
-
+#define PERCENT_FLAG 279
+#define PERCENT_FILE_PREFIX 280
+#define PERCENT_GLR_PARSER 281
+#define PERCENT_INITIAL_ACTION 282
+#define PERCENT_LANGUAGE 283
+#define PERCENT_NAME_PREFIX 284
+#define PERCENT_NO_DEFAULT_PREC 285
+#define PERCENT_NO_LINES 286
+#define PERCENT_NONDETERMINISTIC_PARSER 287
+#define PERCENT_OUTPUT 288
+#define PERCENT_REQUIRE 289
+#define PERCENT_SKELETON 290
+#define PERCENT_START 291
+#define PERCENT_TOKEN_TABLE 292
+#define PERCENT_VERBOSE 293
+#define PERCENT_YACC 294
+#define BRACED_CODE 295
+#define BRACED_PREDICATE 296
+#define BRACKETED_ID 297
+#define CHAR 298
+#define EPILOGUE 299
+#define EQUAL 300
+#define ID 301
+#define ID_COLON 302
+#define PERCENT_PERCENT 303
+#define PIPE 304
+#define PROLOGUE 305
+#define SEMICOLON 306
+#define TAG 307
+#define TAG_ANY 308
+#define TAG_NONE 309
+#define PERCENT_PARAM 310
+#define PERCENT_UNION 311

 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {

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

 
 

-/* Line 293 of yacc.c  */
-#line 113 "parse-gram.y"
-
+  assoc assoc;
+  char *code;
+  char const *chars;
+  int integer;
+  named_ref *named_ref;

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

-  int integer;
-  char const *chars;
-  char *code;
-  assoc assoc;

   uniqstr uniqstr;
   unsigned char character;
   uniqstr uniqstr;
   unsigned char character;

-  named_ref *named_ref;

 
 

+/* Line 345 of yacc.c  */
+#line 247 "src/parse-gram.y"
+
+  param_type param;

 
 

+/* Line 345 of yacc.c  */
+#line 426 "src/parse-gram.y"
+code_props_type code_type;

 
 

-/* Line 293 of yacc.c  */
-#line 339 "parse-gram.c"
+/* Line 345 of yacc.c  */
+#line 327 "src/parse-gram.c"

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

-# define yystype YYSTYPE /* obsolescent; will be withdrawn */

 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 # define YYSTYPE_IS_DECLARED 1
 #endif
 


@@ -350,17 +337,68 @@ typedef struct YYLTYPE
   int last_line;
   int last_column;
 } YYLTYPE;
   int last_line;
   int last_column;
 } YYLTYPE;

-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */

 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 

+int gram_parse (void);
+
+#endif /* !GRAM_SRC_PARSE_GRAM_H  */
+

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

+/* Line 348 of yacc.c  */
+#line 353 "src/parse-gram.c"
+/* Unqualified %code blocks.  */
+/* Line 349 of yacc.c  */
+#line 58 "src/parse-gram.y"
+
+  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 349 of yacc.c  */
+#line 236 "src/parse-gram.y"

 
 

-/* Line 343 of yacc.c  */
-#line 364 "parse-gram.c"
+  /** 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 349 of yacc.c  */
+#line 402 "src/parse-gram.c"

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


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

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

 #else
 #else

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

 #endif
 
 #ifdef YYTYPE_UINT16
 #endif
 
 #ifdef YYTYPE_UINT16


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

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

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


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

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

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

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

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

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

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


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

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

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


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

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

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

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

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


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

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

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


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

-# define YYSTACK_RELOCATE(Stack_alloc, Stack)                          \
-    do                                                                 \
-      {                                                                        \
-       YYSIZE_T yynewbytes;                                            \
-       YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
-       Stack = &yyptr->Stack_alloc;                                    \
-       yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-       yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                        \
-    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
 
 #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
 
 #endif
 
 #if defined YYCOPY_NEEDED && YYCOPY_NEEDED

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

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

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

 #  else
 #  else

-#   define YYCOPY(To, From, Count)             \
-      do                                       \
-       {                                       \
-         YYSIZE_T yyi;                         \
-         for (yyi = 0; yyi < (Count); yyi++)   \
-           (To)[yyi] = (From)[yyi];            \
-       }                                       \
-      while (YYID (0))
+#   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 */
 #  endif
 # endif
 #endif /* !YYCOPY_NEEDED */


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

-#define YYLAST   160
+#define YYLAST   163

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

-#define YYNTOKENS  58
+#define YYNTOKENS  57

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

-#define YYNNTS  34
+#define YYNNTS  38

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

-#define YYNRULES  108
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  148
+#define YYNRULES  112
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  149

 
 

-/* 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   312
+#define YYMAXUTOK   311

 
 

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


@@ -610,110 +626,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
+      55,    56

 };
 
 #if YYDEBUG
 };
 
 #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,
-      81,    84,    86,    88,    90,    92,    94,    96,    99,   103,
-     107,   109,   111,   114,   118,   119,   121,   125,   126,   130,
-     131,   135,   139,   143,   145,   147,   149,   150,   152,   154,
-     157,   159,   162,   164,   167,   169,   172,   174,   176,   178,
-     180,   182,   184,   187,   190,   194,   196,   199,   201,   204,
-     206,   209,   212,   213,   218,   220,   224,   227,   228,   232,
-     236,   240,   244,   248,   249,   251,   253,   255,   256,   258,
-     260,   262,   264,   266,   268,   270,   272,   274,   275
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      59,     0,    -1,    60,    50,    77,    91,    -1,    -1,    60,
-      61,    -1,    62,    -1,    52,    -1,    17,    -1,    19,    84,
-      85,    -1,    20,    -1,    20,     3,    -1,    21,    -1,    22,
-       4,    -1,    23,     4,    -1,    24,     3,    -1,    24,    47,
-       3,    -1,    25,    -1,    26,    43,    -1,    27,     3,    -1,
-      28,    43,    -1,    29,    -1,    30,     3,    -1,    30,    47,
-       3,    -1,    32,    -1,    33,    -1,    34,     3,    -1,    34,
-      47,     3,    -1,    35,    43,    -1,    36,    -1,    37,     3,
-      -1,    38,     3,    -1,    40,    -1,    41,    -1,    42,    -1,
-      53,    -1,    67,    -1,    64,    -1,    39,    89,    -1,     8,
-      43,    73,    -1,     9,    43,    73,    -1,    18,    -1,    31,
-      -1,    16,    86,    -1,    16,    48,    86,    -1,    -1,    48,
-      -1,    57,    63,    86,    -1,    -1,     6,    65,    76,    -1,
-      -1,     5,    66,    76,    -1,     7,    54,    72,    -1,    68,
-      69,    70,    -1,    10,    -1,    11,    -1,    12,    -1,    -1,
-      54,    -1,    71,    -1,    70,    71,    -1,    89,    -1,    89,
-       4,    -1,    89,    -1,    72,    89,    -1,    74,    -1,    73,
-      74,    -1,    89,    -1,    54,    -1,    55,    -1,    56,    -1,
-      54,    -1,    87,    -1,    87,     4,    -1,    87,    90,    -1,
-      87,     4,    90,    -1,    75,    -1,    76,    75,    -1,    78,
-      -1,    77,    78,    -1,    79,    -1,    62,    53,    -1,     1,
-      53,    -1,    -1,    88,    83,    80,    81,    -1,    82,    -1,
-      81,    51,    82,    -1,    81,    53,    -1,    -1,    82,    89,
-      83,    -1,    82,    43,    83,    -1,    82,    13,    89,    -1,
-      82,    14,     4,    -1,    82,    15,    54,    -1,    -1,    44,
-      -1,    48,    -1,     3,    -1,    -1,    48,    -1,     3,    -1,
-      43,    -1,    48,    -1,    45,    -1,    49,    -1,    87,    -1,
-      90,    -1,     3,    -1,    -1,    50,    46,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINEYYN -- Source line where rule number YYN was defined.    */

 static const yytype_uint16 yyrline[] =
 {
 static const yytype_uint16 yyrline[] =
 {

-       0,   228,   228,   236,   238,   242,   243,   253,   254,   259,
-     260,   265,   266,   267,   268,   269,   270,   275,   284,   285,
-     286,   287,   288,   289,   290,   291,   292,   293,   294,   309,
-     310,   334,   335,   336,   337,   341,   342,   343,   347,   354,
-     361,   365,   369,   376,   391,   392,   396,   408,   408,   413,
-     413,   418,   429,   444,   445,   446,   450,   451,   456,   458,
-     463,   464,   469,   471,   476,   477,   481,   482,   483,   484,
-     489,   494,   499,   505,   511,   522,   523,   532,   533,   539,
-     540,   541,   548,   548,   556,   557,   558,   563,   565,   567,
-     569,   571,   573,   578,   580,   591,   592,   597,   598,   599,
-     608,   628,   630,   639,   644,   645,   650,   657,   659
+       0,   272,   272,   280,   282,   286,   287,   297,   301,   306,
+     307,   312,   317,   318,   319,   320,   321,   326,   335,   336,
+     337,   338,   339,   340,   341,   342,   342,   343,   344,   368,
+     369,   370,   371,   375,   376,   385,   386,   387,   391,   403,
+     407,   411,   418,   429,   430,   440,   441,   445,   457,   457,
+     462,   462,   467,   478,   493,   494,   495,   496,   500,   501,
+     506,   508,   513,   514,   519,   521,   526,   527,   531,   532,
+     536,   537,   538,   543,   548,   553,   559,   565,   576,   577,
+     586,   587,   593,   594,   595,   602,   602,   610,   611,   612,
+     617,   619,   621,   623,   625,   627,   629,   634,   636,   646,
+     647,   652,   653,   654,   663,   683,   685,   694,   699,   700,
+     705,   712,   714

 };
 #endif
 
 };
 #endif
 

-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || 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[] =
 {
   "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
   "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
 /* 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\"",
+  "\"%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\"", "\"%require\"", "\"%skeleton\"",
-  "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"",
-  "\"{...}\"", "\"[identifier]\"", "\"char\"", "\"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",
+  "\"%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:\"", "\"%%\"",
+  "\"|\"", "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"",
+  "\"%param\"", "\"%union\"", "$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",
   "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist",

-  "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
-  "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs",
+  "generic_symlist_item", "tag", "symbol_def", "symbol_defs.1", "grammar",
+  "rules_or_grammar_declaration", "rules", "$@4", "rhses.1", "rhs",

   "named_ref.opt", "variable", "content.opt", "braceless", "id",
   "named_ref.opt", "variable", "content.opt", "braceless", "id",

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

 };
 #endif
 
 # 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,


@@ -721,251 +688,242 @@ 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
+     305,   306,   307,   308,   309,   310,   311

 };
 # endif
 
 };
 # endif
 

-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    58,    59,    60,    60,    61,    61,    61,    61,    61,
-      61,    61,    61,    61,    61,    61,    61,    61,    61,    61,
-      61,    61,    61,    61,    61,    61,    61,    61,    61,    61,
-      61,    61,    61,    61,    61,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    63,    63,    62,    65,    64,    66,
-      64,    64,    67,    68,    68,    68,    69,    69,    70,    70,
-      71,    71,    72,    72,    73,    73,    74,    74,    74,    74,
-      75,    75,    75,    75,    75,    76,    76,    77,    77,    78,
-      78,    78,    80,    79,    81,    81,    81,    82,    82,    82,
-      82,    82,    82,    83,    83,    84,    84,    85,    85,    85,
-      86,    87,    87,    88,    89,    89,    90,    91,    91
-};
+#define YYPACT_NINF -88

 
 

-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-88))
+
+#define YYTABLE_NINF -112
+
+#define yytable_value_is_error(yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.    */
+static const yytype_int16 yypact[] =

 {
 {

-       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,     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,     2,     1,     2,     1,     1,     1,     1,
-       1,     1,     2,     2,     3,     1,     2,     1,     2,     1,
-       2,     2,     0,     4,     1,     3,     2,     0,     3,     3,
-       3,     3,     3,     0,     1,     1,     1,     0,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     0,     2
+     -88,    42,   107,   -88,   -88,   -88,     8,   -88,   -88,   -88,
+     -88,   -88,   -88,    19,   -88,    12,    60,   -88,    66,    72,
+     -88,     2,   -88,    39,    83,    35,   -88,   -88,   -88,    36,
+      87,    88,    32,   -88,   -88,   -88,    15,   -88,   -88,   -88,
+      46,   -88,   -88,    55,   -88,   -88,    45,    -2,    -2,    32,
+     -88,    58,   -88,   -88,   -88,    31,   -88,   -88,   -88,   -88,
+      97,   -88,   -88,   -88,    98,   -88,   100,   -88,   -88,   -88,
+     -88,   -88,   -88,   -88,   -88,    56,   -88,    57,     1,   -88,
+     -88,    62,    69,   -88,    58,     0,   -88,    32,   -88,   -88,
+      -2,    85,    -2,    32,   -88,   -88,   -88,   -88,   -88,   -88,
+     -88,   -88,   -88,   -88,    77,   -88,   -88,   -88,   -88,   -88,
+      70,   -88,   -88,   -88,   -88,     0,   -88,   -88,   -88,    32,
+     -88,   102,   -88,   119,   -88,   -88,   -88,   -88,   -88,   -88,
+     -88,   -88,   -88,    33,    53,   -88,   -88,    32,   143,    71,
+      62,   -88,    62,    53,   -88,   -88,   -88,   -88,   -88

 };
 
 };
 

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

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

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

 };
 
 };
 

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

 {
 {

-      -1,     1,     2,    43,    82,    88,    45,    49,    48,    46,
-      47,    90,   120,   121,    96,   101,   102,    92,    93,    83,
-      84,    85,   129,   133,   134,   118,    58,   108,    55,    77,
-      86,   103,    79,   116
+     -88,   -88,   -88,   -88,   -88,   -88,   146,   -88,   -88,   -88,
+     -88,   -88,   -88,   -88,   -88,   -88,    30,   -88,   -88,    37,
+     -88,   -26,   103,   -88,    75,   -88,   -88,   -88,    21,   -57,
+     -88,   -88,   -11,   -18,   -88,   -32,   -87,   -88

 };
 
 };
 

-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -91
-static const yytype_int16 yypact[] =
+  /* YYDEFGOTO[NTERM-NUM].    */
+static const yytype_int16 yydefgoto[] =

 {
 {

-     -91,     3,   103,   -91,   -91,   -91,   -36,     2,    10,   -91,
-     -91,   -91,     9,   -91,   -91,    32,    60,   -91,    65,    67,
-      27,   -91,    41,    73,    51,   -91,    39,   -91,   -91,   -91,
-      40,    52,   -91,    93,    95,    33,   -91,   -91,   -91,    15,
-     -91,   -91,    53,   -91,   -91,   -91,   -91,    46,    43,    43,
-      33,    11,    11,   -91,    61,   -91,   -91,   -91,    35,   -91,
-     -91,   -91,   -91,   100,   -91,   -91,   -91,   -91,   102,   -91,
-     113,   -91,   -91,   -91,   -91,   -91,   -91,   -91,   -91,   -91,
-      64,   -91,    94,     1,   -91,   -91,    62,   -91,    61,   -91,
-      33,   -91,   -91,    43,    86,    43,    33,   -91,   -91,   -91,
-     -91,    11,   -91,   -91,    11,   -91,   -91,   -91,   -91,   -91,
-     -91,   -91,   -91,   -91,    72,   -91,   -91,   -91,   -91,   -91,
-      33,   -91,   142,   -91,   145,   -91,   -91,   -91,   -91,   -91,
-     -91,   -91,   -91,    17,    34,   -91,   -91,    33,   146,    97,
-      62,    62,    34,   -91,   -91,   -91,   -91,   -91
+      -1,     1,     2,    41,    82,   110,    77,    43,    84,    44,
+      48,    47,    45,    46,    87,   119,   120,    93,   115,   116,
+     117,    89,    90,    78,    79,    80,   127,   133,   134,   108,
+      55,    98,    52,    72,    81,   118,    74,   106

 };
 
 };
 

-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
+  /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule which
+     number is the opposite.  If YYTABLE_NINF, syntax error.    */
+static const yytype_int16 yytable[] =

 {
 {

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

 };
 
 };
 

-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -108
-static const yytype_int16 yytable[] =
+static const yytype_int16 yycheck[] =

 {
 {

-      78,  -107,    80,     3,   125,   105,     4,     5,     6,     7,
-       8,     9,    10,    11,    74,    97,    80,    12,    50,    14,
-       4,     5,     6,     7,     8,     9,    10,    11,    94,    94,
-      62,    12,    27,    14,   132,    56,    74,    74,   106,   119,
-      35,   127,    67,    69,   127,    51,    27,   137,   138,   139,
-      81,   114,    53,    52,    35,   122,    75,    54,    42,    76,
-     123,   126,   123,    59,    81,    98,    99,   100,   135,    60,
-     136,    61,    42,    94,    63,    94,    65,   140,    75,    75,
-      57,    76,    76,   107,    64,   122,    68,    70,    75,    74,
-     124,    76,   146,   147,    66,    71,    72,    91,    73,   141,
-      89,    87,   143,   109,    53,   110,   117,   141,     4,     5,
-       6,     7,     8,     9,    10,    11,   111,   112,   128,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      32,     0,     1,     3,    91,     3,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,     3,     1,    49,    17,    18,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    47,
+      48,    30,    17,    18,     3,     3,   123,    36,     3,     3,
+      51,    43,     0,    43,    46,    30,    46,    45,    47,    48,
+      52,    36,    52,    53,    54,    87,     3,    56,    46,    40,
+      52,    93,    47,     3,    90,    46,    92,    14,    15,    16,
+       4,    56,    90,    84,    92,    43,     4,    46,    46,    40,
+      45,    45,    49,   140,    51,   142,     3,   119,     3,     4,
+       3,     3,    46,    40,    41,    40,    43,    52,    40,    46,
+       3,     3,   134,     3,    42,   137,     4,    51,    51,    40,
+      40,   143,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    44,     3,    52,    17,    18,    19,    20,    21,    22,

       23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
       23,    24,    25,    26,    27,    28,    29,    30,    31,    32,

-      33,    34,    35,    36,    37,    38,   131,   113,    74,    44,
-     144,   145,   115,    39,    95,    40,    41,   130,   104,   142,
-      42
+      33,    34,    35,    36,    37,    38,    39,     4,     2,   119,
+      -1,    48,   115,    78,    -1,    48,   135,    50,    51,    -1,
+      -1,    -1,    55,    56

 };
 
 };
 

-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-91))
-
-#define yytable_value_is_error(yytable_value) \
-  YYID (0)
+  /* STOS_[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.    */
+static const yytype_uint8 yystos[] =
+{
+       0,    58,    59,     0,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    48,    50,    51,    55,
+      56,    60,    63,    64,    66,    69,    70,    68,    67,    52,
+      40,    46,    89,     3,    46,    87,     3,     4,     4,     3,
+      45,    40,     3,     3,    45,     3,    45,     3,     3,     3,
+      43,    46,    90,    92,    93,     1,    47,    63,    80,    81,
+      82,    91,    61,    46,    65,    40,    52,    71,    52,    78,
+      79,    90,    79,    74,    92,    89,     3,    46,    88,     3,
+       3,     3,    51,    51,    48,    81,    94,    42,    86,    40,
+      62,    89,    52,    53,    54,    75,    76,    77,    92,    72,
+      73,    92,    78,     4,    93,    92,    44,    83,    40,    76,
+      73,     4,    93,    84,    85,    49,    51,    14,    15,    16,
+      40,    41,    92,    85,    92,     4,    52,    86,    86
+};

 
 

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

 {
 {

-      35,     0,     1,     0,    94,    54,     5,     6,     7,     8,
-       9,    10,    11,    12,     3,    50,     1,    16,    54,    18,
-       5,     6,     7,     8,     9,    10,    11,    12,    48,    49,
-       3,    16,    31,    18,   124,     3,     3,     3,     3,    88,
-      39,   101,     3,     3,   104,    43,    31,    13,    14,    15,
-      49,    50,    43,    43,    39,    90,    45,    48,    57,    48,
-      93,    96,    95,     3,    49,    54,    55,    56,    51,     4,
-      53,     4,    57,    93,    47,    95,     3,    43,    45,    45,
-      48,    48,    48,    48,    43,   120,    47,    47,    45,     3,
-       4,    48,   140,   141,    43,    43,     3,    54,     3,   134,
-      54,    48,   137,     3,    43,     3,    44,   142,     5,     6,
-       7,     8,     9,    10,    11,    12,     3,    53,    46,    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,     4,    53,     3,     2,
-       4,    54,    83,    50,    49,    52,    53,   120,    52,   135,
-      57
+       0,    57,    58,    59,    59,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    60,    61,    60,    60,    60,    60,
+      60,    60,    60,    62,    62,    63,    63,    63,    63,    63,
+      63,    63,    63,    64,    64,    65,    65,    63,    67,    66,
+      68,    66,    66,    69,    70,    70,    70,    70,    71,    71,
+      72,    72,    73,    73,    74,    74,    75,    75,    76,    76,
+      77,    77,    77,    78,    78,    78,    78,    78,    79,    79,
+      80,    80,    81,    81,    81,    83,    82,    84,    84,    84,
+      85,    85,    85,    85,    85,    85,    85,    86,    86,    87,
+      87,    88,    88,    88,    89,    90,    90,    91,    92,    92,
+      93,    94,    94

 };
 
 };
 

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

 {
 {

-       0,    59,    60,     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,    50,
-      52,    53,    57,    61,    62,    64,    67,    68,    66,    65,
-      54,    43,    43,    43,    48,    86,     3,    48,    84,     3,
-       4,     4,     3,    47,    43,     3,    43,     3,    47,     3,
-      47,    43,     3,     3,     3,    45,    48,    87,    89,    90,
-       1,    49,    62,    77,    78,    79,    88,    48,    63,    54,
-      69,    54,    75,    76,    87,    76,    72,    89,    54,    55,
-      56,    73,    74,    89,    73,    86,     3,    48,    85,     3,
-       3,     3,    53,    53,    50,    78,    91,    44,    83,    86,
-      70,    71,    89,    75,     4,    90,    89,    74,    46,    80,
-      71,     4,    90,    81,    82,    51,    53,    13,    14,    15,
-      43,    89,    82,    89,     4,    54,    83,    83
+       0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
+       2,     1,     2,     2,     2,     3,     1,     2,     2,     2,
+       3,     1,     1,     2,     3,     0,     3,     2,     2,     1,
+       1,     1,     1,     2,     1,     1,     1,     2,     3,     1,
+       1,     2,     3,     1,     1,     0,     1,     3,     0,     3,
+       0,     3,     3,     3,     1,     1,     1,     1,     0,     1,
+       1,     2,     1,     2,     1,     2,     1,     2,     1,     1,
+       1,     1,     1,     1,     1,     2,     2,     3,     1,     2,
+       1,     2,     1,     2,     2,     0,     4,     1,     3,     2,
+       0,     3,     3,     2,     3,     3,     3,     0,     1,     1,
+       1,     0,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     0,     2

 };
 
 };
 

-#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.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
-
-#define YYFAIL         goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
+
+#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 YYRECOVERING()  (!!yyerrstatus)
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
 

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

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

-      YYERROR;                                                 \
-    }                                                          \
-while (YYID (0))
+      YYERROR;                                                  \
+    }                                                           \
+while (0)

 
 
 
 

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

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

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

 #ifndef YYLLOC_DEFAULT
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
-    do                                                                 \
-      if (YYID (N))                                                    \
-       {                                                               \
-         (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
-         (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
-         (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
-         (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
-       }                                                               \
-      else                                                             \
-       {                                                               \
-         (Current).first_line   = (Current).last_line   =              \
-           YYRHSLOC (Rhs, 0).last_line;                                \
-         (Current).first_column = (Current).last_column =              \
-           YYRHSLOC (Rhs, 0).last_column;                              \
-       }                                                               \
-    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])

 
 /* YY_LOCATION_PRINT -- Print the location on the stream.
    This macro was not mandated originally: define only if we know
 
 /* YY_LOCATION_PRINT -- Print the location on the stream.
    This macro was not mandated originally: define only if we know


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

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

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


@@ -999,217 +957,231 @@ while (YYID (0))
 #  define YYFPRINTF fprintf
 # endif
 
 #  define YYFPRINTF fprintf
 # endif
 

-# define YYDPRINTF(Args)                       \
-do {                                           \
-  if (yydebug)                                 \
-    YYFPRINTF Args;                            \
-} while (YYID (0))
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (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 819 of yacc.c  */
-#line 203 "parse-gram.y"
-       { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-
-/* Line 819 of yacc.c  */
-#line 1057 "parse-gram.c"
-       break;
-      case 4: /* "\"integer\"" */
-
-/* Line 819 of yacc.c  */
-#line 215 "parse-gram.y"
-       { fprintf (stderr, "%d", (yyvaluep->integer)); };
-
-/* Line 819 of yacc.c  */
-#line 1066 "parse-gram.c"
-       break;
-      case 43: /* "\"{...}\"" */
-
-/* Line 819 of yacc.c  */
-#line 205 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
-
-/* Line 819 of yacc.c  */
-#line 1075 "parse-gram.c"
-       break;
-      case 44: /* "\"[identifier]\"" */
-
-/* Line 819 of yacc.c  */
-#line 210 "parse-gram.y"
-       { fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); };
-
-/* Line 819 of yacc.c  */
-#line 1084 "parse-gram.c"
-       break;
-      case 45: /* "\"char\"" */
-
-/* Line 819 of yacc.c  */
-#line 197 "parse-gram.y"
-       { fputs (char_name ((yyvaluep->character)), stderr); };
-
-/* Line 819 of yacc.c  */
-#line 1093 "parse-gram.c"
-       break;
-      case 46: /* "\"epilogue\"" */
-
-/* Line 819 of yacc.c  */
-#line 205 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 819 of yacc.c  */
-#line 1102 "parse-gram.c"
-       break;
-      case 48: /* "\"identifier\"" */
-
-/* Line 819 of yacc.c  */
-#line 209 "parse-gram.y"
-       { fputs ((yyvaluep->uniqstr), stderr); };
-
-/* Line 819 of yacc.c  */
-#line 1111 "parse-gram.c"
-       break;
-      case 49: /* "\"identifier:\"" */
-
-/* Line 819 of yacc.c  */
-#line 211 "parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-
-/* Line 819 of yacc.c  */
-#line 1120 "parse-gram.c"
-       break;
-      case 52: /* "\"%{...%}\"" */
-
-/* Line 819 of yacc.c  */
-#line 205 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 819 of yacc.c  */
-#line 1129 "parse-gram.c"
-       break;
-      case 54: /* "\"type\"" */
-
-/* Line 819 of yacc.c  */
-#line 212 "parse-gram.y"
-       { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-
-/* Line 819 of yacc.c  */
-#line 1138 "parse-gram.c"
-       break;
-      case 71: /* "symbol.prec" */
-
-/* Line 819 of yacc.c  */
-#line 218 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 819 of yacc.c  */
-#line 1147 "parse-gram.c"
-       break;
-      case 84: /* "variable" */
-
-/* Line 819 of yacc.c  */
-#line 209 "parse-gram.y"
-       { fputs ((yyvaluep->uniqstr), stderr); };
-
-/* Line 819 of yacc.c  */
-#line 1156 "parse-gram.c"
-       break;
-      case 85: /* "content.opt" */
-
-/* Line 819 of yacc.c  */
-#line 205 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 819 of yacc.c  */
-#line 1165 "parse-gram.c"
-       break;
-      case 86: /* "braceless" */
-
-/* Line 819 of yacc.c  */
-#line 205 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 819 of yacc.c  */
-#line 1174 "parse-gram.c"
-       break;
-      case 87: /* "id" */
-
-/* Line 819 of yacc.c  */
-#line 218 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 819 of yacc.c  */
-#line 1183 "parse-gram.c"
-       break;
-      case 88: /* "id_colon" */
-
-/* Line 819 of yacc.c  */
-#line 219 "parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-
-/* Line 819 of yacc.c  */
-#line 1192 "parse-gram.c"
-       break;
-      case 89: /* "symbol" */
-
-/* Line 819 of yacc.c  */
-#line 218 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 819 of yacc.c  */
-#line 1201 "parse-gram.c"
-       break;
-      case 90: /* "string_as_id" */
-
-/* Line 819 of yacc.c  */
-#line 218 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 819 of yacc.c  */
-#line 1210 "parse-gram.c"
-       break;
+            case 3: // "string"
+/* Line 707 of yacc.c  */
+#line 196 "src/parse-gram.y"
+        { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); }
+/* Line 707 of yacc.c  */
+#line 1002 "src/parse-gram.c"
+        break;
+
+            case 4: // "integer"
+/* Line 707 of yacc.c  */
+#line 209 "src/parse-gram.y"
+        { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
+/* Line 707 of yacc.c  */
+#line 1010 "src/parse-gram.c"
+        break;
+
+            case 24: // "%<flag>"
+/* Line 707 of yacc.c  */
+#line 205 "src/parse-gram.y"
+        { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); }
+/* Line 707 of yacc.c  */
+#line 1018 "src/parse-gram.c"
+        break;
+
+            case 40: // "{...}"
+/* Line 707 of yacc.c  */
+#line 198 "src/parse-gram.y"
+        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
+/* Line 707 of yacc.c  */
+#line 1026 "src/parse-gram.c"
+        break;
+
+            case 42: // "[identifier]"
+/* Line 707 of yacc.c  */
+#line 203 "src/parse-gram.y"
+        { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); }
+/* Line 707 of yacc.c  */
+#line 1034 "src/parse-gram.c"
+        break;
+
+            case 43: // "char"
+/* Line 707 of yacc.c  */
+#line 190 "src/parse-gram.y"
+        { fputs (char_name (((*yyvaluep).character)), yyo); }
+/* Line 707 of yacc.c  */
+#line 1042 "src/parse-gram.c"
+        break;
+
+            case 44: // "epilogue"
+/* Line 707 of yacc.c  */
+#line 198 "src/parse-gram.y"
+        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 707 of yacc.c  */
+#line 1050 "src/parse-gram.c"
+        break;
+
+            case 46: // "identifier"
+/* Line 707 of yacc.c  */
+#line 202 "src/parse-gram.y"
+        { fputs (((*yyvaluep).uniqstr), yyo); }
+/* Line 707 of yacc.c  */
+#line 1058 "src/parse-gram.c"
+        break;
+
+            case 47: // "identifier:"
+/* Line 707 of yacc.c  */
+#line 204 "src/parse-gram.y"
+        { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); }
+/* Line 707 of yacc.c  */
+#line 1066 "src/parse-gram.c"
+        break;
+
+            case 50: // "%{...%}"
+/* Line 707 of yacc.c  */
+#line 198 "src/parse-gram.y"
+        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 707 of yacc.c  */
+#line 1074 "src/parse-gram.c"
+        break;
+
+            case 52: // "<tag>"
+/* Line 707 of yacc.c  */
+#line 206 "src/parse-gram.y"
+        { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
+/* Line 707 of yacc.c  */
+#line 1082 "src/parse-gram.c"
+        break;
+
+            case 55: // "%param"
+/* Line 707 of yacc.c  */
+#line 252 "src/parse-gram.y"
+        {
+  switch (((*yyvaluep).param))
+    {
+#define CASE(In, Out)                                           \
+      case param_ ## In: fputs ("%" #Out, stderr); break
+      CASE(lex,   lex-param);
+      CASE(parse, parse-param);
+      CASE(both,  param);
+#undef CASE
+      case param_none: aver (false); break;
+    }
+}
+/* Line 707 of yacc.c  */
+#line 1101 "src/parse-gram.c"
+        break;
+
+            case 64: // code_props_type
+/* Line 707 of yacc.c  */
+#line 427 "src/parse-gram.y"
+        { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); }
+/* Line 707 of yacc.c  */
+#line 1109 "src/parse-gram.c"
+        break;
+
+            case 73: // symbol.prec
+/* Line 707 of yacc.c  */
+#line 212 "src/parse-gram.y"
+        { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 707 of yacc.c  */
+#line 1117 "src/parse-gram.c"
+        break;
+
+            case 77: // tag
+/* Line 707 of yacc.c  */
+#line 206 "src/parse-gram.y"
+        { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
+/* Line 707 of yacc.c  */
+#line 1125 "src/parse-gram.c"
+        break;
+
+            case 87: // variable
+/* Line 707 of yacc.c  */
+#line 202 "src/parse-gram.y"
+        { fputs (((*yyvaluep).uniqstr), yyo); }
+/* Line 707 of yacc.c  */
+#line 1133 "src/parse-gram.c"
+        break;
+
+            case 88: // content.opt
+/* Line 707 of yacc.c  */
+#line 198 "src/parse-gram.y"
+        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 707 of yacc.c  */
+#line 1141 "src/parse-gram.c"
+        break;
+
+            case 89: // braceless
+/* Line 707 of yacc.c  */
+#line 198 "src/parse-gram.y"
+        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 707 of yacc.c  */
+#line 1149 "src/parse-gram.c"
+        break;
+
+            case 90: // id
+/* Line 707 of yacc.c  */
+#line 212 "src/parse-gram.y"
+        { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 707 of yacc.c  */
+#line 1157 "src/parse-gram.c"
+        break;
+
+            case 91: // id_colon
+/* Line 707 of yacc.c  */
+#line 213 "src/parse-gram.y"
+        { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); }
+/* Line 707 of yacc.c  */
+#line 1165 "src/parse-gram.c"
+        break;
+
+            case 92: // symbol
+/* Line 707 of yacc.c  */
+#line 212 "src/parse-gram.y"
+        { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 707 of yacc.c  */
+#line 1173 "src/parse-gram.c"
+        break;
+
+            case 93: // string_as_id
+/* Line 707 of yacc.c  */
+#line 212 "src/parse-gram.y"
+        { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 707 of yacc.c  */
+#line 1181 "src/parse-gram.c"
+        break;
+

       default:
       default:

-       break;
+        break;

     }
 }
 
     }
 }
 


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

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

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

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

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


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

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

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

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

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


@@ -1267,50 +1221,42 @@ 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
-yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
-#else

 static void
 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++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);

-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-                      &(yyvsp[(yyi + 1) - (yynrhs)])
-                      , &(yylsp[(yyi + 1) - (yynrhs)])                );
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                       , &(yylsp[(yyi + 1) - (yynrhs)])                       );

       YYFPRINTF (stderr, "\n");
     }
 }
 
       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.  */
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */


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

-#ifndef        YYINITDEPTH
+#ifndef YYINITDEPTH

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


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

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

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


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

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

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


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

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

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

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

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


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

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

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

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

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


@@ -1643,27 +1574,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: ;
     }
 


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

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

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

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

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


@@ -1702,10 +1633,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
   int yycount = 0;
 
   /* There are many possibilities here to consider:
   int yycount = 0;
 
   /* There are many possibilities here to consider:

-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.

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


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

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

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


@@ -1820,77 +1747,31 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 

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

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

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

 {
 {

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

   YYUSE (yylocationp);
   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;

     }
 }
 
 
     }
 }
 
 

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

 
 
 /*----------.
 | yyparse.  |
 `----------*/
 
 
 
 /*----------.
 | yyparse.  |
 `----------*/
 

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

 int
 yyparse (void)
 int
 yyparse (void)

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

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


@@ -1913,7 +1794,7 @@ YYLTYPE yylloc;
        `yyvs': related to semantic values.
        `yyls': related to locations.
 
        `yyvs': related to semantic values.
        `yyls': related to locations.
 

-       Refer to the stacks thru separate pointers, to allow yyoverflow
+       Refer to the stacks through separate pointers, to allow yyoverflow

        to reallocate them elsewhere.  */
 
     /* The state stack.  */
        to reallocate them elsewhere.  */
 
     /* The state stack.  */


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

-  int yytoken;
+  int yytoken = 0;

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


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

-  yytoken = 0;

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


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

-
-/* Line 1590 of yacc.c  */
-#line 105 "parse-gram.y"
+/* Line 1462 of yacc.c  */
+#line 101 "src/parse-gram.y"

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

-
-/* Line 1590 of yacc.c  */
-#line 2011 "parse-gram.c"
+/* Line 1462 of yacc.c  */
+#line 1889 "src/parse-gram.c"

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

-

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


@@ -2030,26 +1907,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


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

-       goto yyexhaustedlab;
+        goto yyexhaustedlab;

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

-       yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;

 
       {
 
       {

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

 #  undef YYSTACK_RELOCATE
 #  undef YYSTACK_RELOCATE

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

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


@@ -2083,10 +1960,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));


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

-
-/* Line 1806 of yacc.c  */
-#line 244 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 288 "src/parse-gram.y"

     {
       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 ();
       muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
       muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",

-                        plain_code.code, (yylsp[(1) - (1)]));
+                        plain_code.code, (yylsp[0]));

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

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

     break;
 
   case 7:
     break;
 
   case 7:

-
-/* Line 1806 of yacc.c  */
-#line 253 "parse-gram.y"
-    { debug_flag = true; }
+/* Line 1677 of yacc.c  */
+#line 298 "src/parse-gram.y"
+    {
+      muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
+    }
+/* Line 1677 of yacc.c  */
+#line 2103 "src/parse-gram.c"

     break;
 
   case 8:
     break;
 
   case 8:

-
-/* Line 1806 of yacc.c  */
-#line 255 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 302 "src/parse-gram.y"

     {
     {

-      muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars),
+      muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),

                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }

+/* Line 1677 of yacc.c  */
+#line 2114 "src/parse-gram.c"

     break;
 
   case 9:
     break;
 
   case 9:

-
-/* Line 1806 of yacc.c  */
-#line 259 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 306 "src/parse-gram.y"

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

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

     break;
 
   case 10:
     break;
 
   case 10:

-
-/* Line 1806 of yacc.c  */
-#line 261 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 308 "src/parse-gram.y"

     {
       defines_flag = true;
     {
       defines_flag = true;

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

     }
     }

+/* Line 1677 of yacc.c  */
+#line 2133 "src/parse-gram.c"

     break;
 
   case 11:
     break;
 
   case 11:

-
-/* Line 1806 of yacc.c  */
-#line 265 "parse-gram.y"
-    { error_verbose = true; }
+/* Line 1677 of yacc.c  */
+#line 313 "src/parse-gram.y"
+    {
+      muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
+                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+    }
+/* Line 1677 of yacc.c  */
+#line 2144 "src/parse-gram.c"

     break;
 
   case 12:
     break;
 
   case 12:

-
-/* Line 1806 of yacc.c  */
-#line 266 "parse-gram.y"
-    { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1677 of yacc.c  */
+#line 317 "src/parse-gram.y"
+    { expected_sr_conflicts = (yyvsp[0].integer); }
+/* Line 1677 of yacc.c  */
+#line 2152 "src/parse-gram.c"

     break;
 
   case 13:
     break;
 
   case 13:

-
-/* Line 1806 of yacc.c  */
-#line 267 "parse-gram.y"
-    { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1677 of yacc.c  */
+#line 318 "src/parse-gram.y"
+    { expected_rr_conflicts = (yyvsp[0].integer); }
+/* Line 1677 of yacc.c  */
+#line 2160 "src/parse-gram.c"

     break;
 
   case 14:
     break;
 
   case 14:

-
-/* Line 1806 of yacc.c  */
-#line 268 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
+/* Line 1677 of yacc.c  */
+#line 319 "src/parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1677 of yacc.c  */
+#line 2168 "src/parse-gram.c"

     break;
 
   case 15:
     break;
 
   case 15:

-
-/* Line 1806 of yacc.c  */
-#line 269 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1677 of yacc.c  */
+#line 320 "src/parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1677 of yacc.c  */
+#line 2176 "src/parse-gram.c"

     break;
 
   case 16:
     break;
 
   case 16:

-
-/* Line 1806 of yacc.c  */
-#line 271 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 322 "src/parse-gram.y"

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

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

     break;
 
   case 17:
     break;
 
   case 17:

-
-/* Line 1806 of yacc.c  */
-#line 276 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 327 "src/parse-gram.y"

     {
       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 1677 of yacc.c  */
+#line 2202 "src/parse-gram.c"

     break;
 
   case 18:
     break;
 
   case 18:

-
-/* Line 1806 of yacc.c  */
-#line 284 "parse-gram.y"
-    { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
+/* Line 1677 of yacc.c  */
+#line 335 "src/parse-gram.y"
+    { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
+/* Line 1677 of yacc.c  */
+#line 2210 "src/parse-gram.c"

     break;
 
   case 19:
     break;
 
   case 19:

-
-/* Line 1806 of yacc.c  */
-#line 285 "parse-gram.y"
-    { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1677 of yacc.c  */
+#line 336 "src/parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1677 of yacc.c  */
+#line 2218 "src/parse-gram.c"

     break;
 
   case 20:
     break;
 
   case 20:

-
-/* Line 1806 of yacc.c  */
-#line 286 "parse-gram.y"
-    { locations_flag = true; }
+/* Line 1677 of yacc.c  */
+#line 337 "src/parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1677 of yacc.c  */
+#line 2226 "src/parse-gram.c"

     break;
 
   case 21:
     break;
 
   case 21:

-
-/* Line 1806 of yacc.c  */
-#line 287 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
+/* Line 1677 of yacc.c  */
+#line 338 "src/parse-gram.y"
+    { no_lines_flag = true; }
+/* Line 1677 of yacc.c  */
+#line 2234 "src/parse-gram.c"

     break;
 
   case 22:
     break;
 
   case 22:

-
-/* Line 1806 of yacc.c  */
-#line 288 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1677 of yacc.c  */
+#line 339 "src/parse-gram.y"
+    { nondeterministic_parser = true; }
+/* Line 1677 of yacc.c  */
+#line 2242 "src/parse-gram.c"

     break;
 
   case 23:
     break;
 
   case 23:

-
-/* Line 1806 of yacc.c  */
-#line 289 "parse-gram.y"
-    { no_lines_flag = true; }
+/* Line 1677 of yacc.c  */
+#line 340 "src/parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1677 of yacc.c  */
+#line 2250 "src/parse-gram.c"

     break;
 
   case 24:
     break;
 
   case 24:

-
-/* Line 1806 of yacc.c  */
-#line 290 "parse-gram.y"
-    { nondeterministic_parser = true; }
+/* Line 1677 of yacc.c  */
+#line 341 "src/parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1677 of yacc.c  */
+#line 2258 "src/parse-gram.c"

     break;
 
   case 25:
     break;
 
   case 25:

-
-/* Line 1806 of yacc.c  */
-#line 291 "parse-gram.y"
-    { spec_outfile = (yyvsp[(2) - (2)].chars); }
+/* Line 1677 of yacc.c  */
+#line 342 "src/parse-gram.y"
+    { current_param = (yyvsp[0].param); }
+/* Line 1677 of yacc.c  */
+#line 2266 "src/parse-gram.c"

     break;
 
   case 26:
     break;
 
   case 26:

-
-/* Line 1806 of yacc.c  */
-#line 292 "parse-gram.y"
-    { spec_outfile = (yyvsp[(3) - (3)].chars); }
+/* Line 1677 of yacc.c  */
+#line 342 "src/parse-gram.y"
+    { current_param = param_none; }
+/* Line 1677 of yacc.c  */
+#line 2274 "src/parse-gram.c"

     break;
 
   case 27:
     break;
 
   case 27:

-
-/* Line 1806 of yacc.c  */
-#line 293 "parse-gram.y"
-    { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1677 of yacc.c  */
+#line 343 "src/parse-gram.y"
+    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
+/* Line 1677 of yacc.c  */
+#line 2282 "src/parse-gram.c"

     break;
 
   case 28:
     break;
 
   case 28:

-
-/* Line 1806 of yacc.c  */
-#line 295 "parse-gram.y"
-    {
-      /* %pure-parser is deprecated in favor of `%define api.pure', so use
-         `%define api.pure' in a backward-compatible manner here.  First, don't
-         complain if %pure-parser is specified multiple times.  */
-      if (!muscle_find_const ("percent_define(api.pure)"))
-        muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "",
-                                      MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
-      /* In all cases, use api.pure now so that the backend doesn't complain if
-         the skeleton ignores api.pure, but do warn now if there's a previous
-         conflicting definition from an actual %define.  */
-      if (!muscle_percent_define_flag_if ("api.pure"))
-        muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "",
-                                      MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
-    }
-    break;
-
-  case 29:
-
-/* Line 1806 of yacc.c  */
-#line 309 "parse-gram.y"
-    { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
-    break;
-
-  case 30:
-
-/* Line 1806 of yacc.c  */
-#line 311 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 345 "src/parse-gram.y"

     {
     {

-      char const *skeleton_user = (yyvsp[(2) - (2)].chars);
-      if (mbschr (skeleton_user, '/'))
+      char const *skeleton_user = (yyvsp[0].chars);
+      if (strchr (skeleton_user, '/'))

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


@@ -2422,558 +2298,662 @@ yyreduce:
             xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
           if (dir_length > 0)
             {
             xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
           if (dir_length > 0)
             {

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

               skeleton_build[dir_length++] = '/';
             }
           strcpy (skeleton_build + dir_length, skeleton_user);
           skeleton_user = uniqstr_new (skeleton_build);
           free (skeleton_build);
         }
               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) - (2)]));
+      skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));

     }
     }

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

     break;
 
     break;
 

-  case 31:
-
-/* Line 1806 of yacc.c  */
-#line 334 "parse-gram.y"
+  case 29:
+/* Line 1677 of yacc.c  */
+#line 368 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 32:
-
-/* Line 1806 of yacc.c  */
-#line 335 "parse-gram.y"
+  case 30:
+/* Line 1677 of yacc.c  */
+#line 369 "src/parse-gram.y"

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

+/* Line 1677 of yacc.c  */
+#line 2328 "src/parse-gram.c"
+    break;
+
+  case 31:
+/* Line 1677 of yacc.c  */
+#line 370 "src/parse-gram.y"
+    { yacc_flag = true; }
+/* Line 1677 of yacc.c  */
+#line 2336 "src/parse-gram.c"

     break;
 
   case 33:
     break;
 
   case 33:

+/* Line 1677 of yacc.c  */
+#line 375 "src/parse-gram.y"
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2344 "src/parse-gram.c"
+    break;

 
 

-/* Line 1806 of yacc.c  */
-#line 336 "parse-gram.y"
-    { yacc_flag = true; }
+  case 34:
+/* Line 1677 of yacc.c  */
+#line 376 "src/parse-gram.y"
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2352 "src/parse-gram.c"

     break;
 
   case 37:
     break;
 
   case 37:

-
-/* Line 1806 of yacc.c  */
-#line 344 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 388 "src/parse-gram.y"

     {
     {

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

     }
     }

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

     break;
 
   case 38:
     break;
 
   case 38:

-
-/* Line 1806 of yacc.c  */
-#line 348 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 392 "src/parse-gram.y"

     {
     {

-      symbol_list *list;
-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
-       symbol_list_destructor_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      code_props code;
+      code_props_symbol_action_init (&code, (yyvsp[-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 1677 of yacc.c  */
+#line 2380 "src/parse-gram.c"

     break;
 
   case 39:
     break;
 
   case 39:

-
-/* Line 1806 of yacc.c  */
-#line 355 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 404 "src/parse-gram.y"

     {
     {

-      symbol_list *list;
-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
-       symbol_list_printer_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      default_prec = true;

     }
     }

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

     break;
 
   case 40:
     break;
 
   case 40:

-
-/* Line 1806 of yacc.c  */
-#line 362 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 408 "src/parse-gram.y"

     {
     {

-      default_prec = true;
+      default_prec = false;

     }
     }

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

     break;
 
   case 41:
     break;
 
   case 41:

-
-/* Line 1806 of yacc.c  */
-#line 366 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 412 "src/parse-gram.y"

     {
     {

-      default_prec = false;
+      /* Do not invoke muscle_percent_code_grow here since it invokes
+         muscle_user_name_list_grow.  */
+      muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
+      code_scanner_last_string_free ();

     }
     }

+/* Line 1677 of yacc.c  */
+#line 2413 "src/parse-gram.c"

     break;
 
   case 42:
     break;
 
   case 42:

-
-/* Line 1806 of yacc.c  */
-#line 370 "parse-gram.y"
+/* Line 1677 of yacc.c  */
+#line 419 "src/parse-gram.y"

     {
     {

-      /* Do not invoke muscle_percent_code_grow here since it invokes
-         muscle_user_name_list_grow.  */
-      muscle_code_grow ("percent_code()", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
+      muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

+/* Line 1677 of yacc.c  */
+#line 2424 "src/parse-gram.c"

     break;
 
   case 43:
     break;
 
   case 43:

-
-/* Line 1806 of yacc.c  */
-#line 377 "parse-gram.y"
-    {
-      muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
-      code_scanner_last_string_free ();
-    }
+/* Line 1677 of yacc.c  */
+#line 429 "src/parse-gram.y"
+    { (yyval.code_type) = destructor; }
+/* Line 1677 of yacc.c  */
+#line 2432 "src/parse-gram.c"

     break;
 
   case 44:
     break;
 
   case 44:

-
-/* Line 1806 of yacc.c  */
-#line 391 "parse-gram.y"
-    {}
+/* Line 1677 of yacc.c  */
+#line 430 "src/parse-gram.y"
+    { (yyval.code_type) = printer; }
+/* Line 1677 of yacc.c  */
+#line 2440 "src/parse-gram.c"

     break;
 
   case 45:
     break;
 
   case 45:

-
-/* Line 1806 of yacc.c  */
-#line 392 "parse-gram.y"
-    { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1677 of yacc.c  */
+#line 440 "src/parse-gram.y"
+    {}
+/* Line 1677 of yacc.c  */
+#line 2448 "src/parse-gram.c"

     break;
 
   case 46:
     break;
 
   case 46:

+/* Line 1677 of yacc.c  */
+#line 441 "src/parse-gram.y"
+    { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2456 "src/parse-gram.c"
+    break;

 
 

-/* Line 1806 of yacc.c  */
-#line 397 "parse-gram.y"
+  case 47:
+/* Line 1677 of yacc.c  */
+#line 446 "src/parse-gram.y"

     {
       union_seen = true;
     {
       union_seen = true;

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

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

+/* Line 1677 of yacc.c  */
+#line 2468 "src/parse-gram.c"

     break;
 
     break;
 

-  case 47:
-
-/* Line 1806 of yacc.c  */
-#line 408 "parse-gram.y"
+  case 48:
+/* Line 1677 of yacc.c  */
+#line 457 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 48:
-
-/* Line 1806 of yacc.c  */
-#line 409 "parse-gram.y"
+  case 49:
+/* Line 1677 of yacc.c  */
+#line 458 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 49:
-
-/* Line 1806 of yacc.c  */
-#line 413 "parse-gram.y"
+  case 50:
+/* Line 1677 of yacc.c  */
+#line 462 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 50:
-
-/* Line 1806 of yacc.c  */
-#line 414 "parse-gram.y"
+  case 51:
+/* Line 1677 of yacc.c  */
+#line 463 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 51:
-
-/* Line 1806 of yacc.c  */
-#line 419 "parse-gram.y"
+  case 52:
+/* Line 1677 of yacc.c  */
+#line 468 "src/parse-gram.y"

     {
       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 1677 of yacc.c  */
+#line 2520 "src/parse-gram.c"

     break;
 
     break;
 

-  case 52:
-
-/* Line 1806 of yacc.c  */
-#line 430 "parse-gram.y"
+  case 53:
+/* Line 1677 of yacc.c  */
+#line 479 "src/parse-gram.y"

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

-    break;
-
-  case 53:
-
-/* Line 1806 of yacc.c  */
-#line 444 "parse-gram.y"
-    { (yyval.assoc) = left_assoc; }
+/* Line 1677 of yacc.c  */
+#line 2538 "src/parse-gram.c"

     break;
 
   case 54:
     break;
 
   case 54:

-
-/* Line 1806 of yacc.c  */
-#line 445 "parse-gram.y"
-    { (yyval.assoc) = right_assoc; }
+/* Line 1677 of yacc.c  */
+#line 493 "src/parse-gram.y"
+    { (yyval.assoc) = left_assoc; }
+/* Line 1677 of yacc.c  */
+#line 2546 "src/parse-gram.c"

     break;
 
   case 55:
     break;
 
   case 55:

-
-/* Line 1806 of yacc.c  */
-#line 446 "parse-gram.y"
-    { (yyval.assoc) = non_assoc; }
+/* Line 1677 of yacc.c  */
+#line 494 "src/parse-gram.y"
+    { (yyval.assoc) = right_assoc; }
+/* Line 1677 of yacc.c  */
+#line 2554 "src/parse-gram.c"

     break;
 
   case 56:
     break;
 
   case 56:

-
-/* Line 1806 of yacc.c  */
-#line 450 "parse-gram.y"
-    { current_type = NULL; }
+/* Line 1677 of yacc.c  */
+#line 495 "src/parse-gram.y"
+    { (yyval.assoc) = non_assoc; }
+/* Line 1677 of yacc.c  */
+#line 2562 "src/parse-gram.c"

     break;
 
   case 57:
     break;
 
   case 57:

-
-/* Line 1806 of yacc.c  */
-#line 451 "parse-gram.y"
-    { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
+/* Line 1677 of yacc.c  */
+#line 496 "src/parse-gram.y"
+    { (yyval.assoc) = precedence_assoc; }
+/* Line 1677 of yacc.c  */
+#line 2570 "src/parse-gram.c"

     break;
 
   case 58:
     break;
 
   case 58:

-
-/* Line 1806 of yacc.c  */
-#line 457 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1677 of yacc.c  */
+#line 500 "src/parse-gram.y"
+    { current_type = NULL; }
+/* Line 1677 of yacc.c  */
+#line 2578 "src/parse-gram.c"

     break;
 
   case 59:
     break;
 
   case 59:

-
-/* Line 1806 of yacc.c  */
-#line 459 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
+/* Line 1677 of yacc.c  */
+#line 501 "src/parse-gram.y"
+    { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
+/* Line 1677 of yacc.c  */
+#line 2586 "src/parse-gram.c"

     break;
 
   case 60:
     break;
 
   case 60:

-
-/* Line 1806 of yacc.c  */
-#line 463 "parse-gram.y"
-    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+/* Line 1677 of yacc.c  */
+#line 507 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2594 "src/parse-gram.c"

     break;
 
   case 61:
     break;
 
   case 61:

-
-/* Line 1806 of yacc.c  */
-#line 464 "parse-gram.y"
-    { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
+/* Line 1677 of yacc.c  */
+#line 509 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1677 of yacc.c  */
+#line 2602 "src/parse-gram.c"

     break;
 
   case 62:
     break;
 
   case 62:

-
-/* Line 1806 of yacc.c  */
-#line 470 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1677 of yacc.c  */
+#line 513 "src/parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }
+/* Line 1677 of yacc.c  */
+#line 2610 "src/parse-gram.c"

     break;
 
   case 63:
     break;
 
   case 63:

-
-/* Line 1806 of yacc.c  */
-#line 472 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
+/* Line 1677 of yacc.c  */
+#line 514 "src/parse-gram.y"
+    { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2618 "src/parse-gram.c"

     break;
 
   case 64:
     break;
 
   case 64:

-
-/* Line 1806 of yacc.c  */
-#line 476 "parse-gram.y"
-    { (yyval.list) = (yyvsp[(1) - (1)].list); }
+/* Line 1677 of yacc.c  */
+#line 520 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2626 "src/parse-gram.c"

     break;
 
   case 65:
     break;
 
   case 65:

-
-/* Line 1806 of yacc.c  */
-#line 477 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+/* Line 1677 of yacc.c  */
+#line 522 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1677 of yacc.c  */
+#line 2634 "src/parse-gram.c"

     break;
 
   case 66:
     break;
 
   case 66:

-
-/* Line 1806 of yacc.c  */
-#line 481 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1677 of yacc.c  */
+#line 526 "src/parse-gram.y"
+    { (yyval.list) = (yyvsp[0].list); }
+/* Line 1677 of yacc.c  */
+#line 2642 "src/parse-gram.c"

     break;
 
   case 67:
     break;
 
   case 67:

-
-/* Line 1806 of yacc.c  */
-#line 482 "parse-gram.y"
-    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1677 of yacc.c  */
+#line 527 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
+/* Line 1677 of yacc.c  */
+#line 2650 "src/parse-gram.c"

     break;
 
   case 68:
     break;
 
   case 68:

-
-/* Line 1806 of yacc.c  */
-#line 483 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+/* Line 1677 of yacc.c  */
+#line 531 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2658 "src/parse-gram.c"

     break;
 
   case 69:
     break;
 
   case 69:

+/* Line 1677 of yacc.c  */
+#line 532 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2666 "src/parse-gram.c"
+    break;

 
 

-/* Line 1806 of yacc.c  */
-#line 484 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+  case 71:
+/* Line 1677 of yacc.c  */
+#line 537 "src/parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ("*"); }
+/* Line 1677 of yacc.c  */
+#line 2674 "src/parse-gram.c"

     break;
 
     break;
 

-  case 70:
+  case 72:
+/* Line 1677 of yacc.c  */
+#line 538 "src/parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new (""); }
+/* Line 1677 of yacc.c  */
+#line 2682 "src/parse-gram.c"
+    break;

 
 

-/* Line 1806 of yacc.c  */
-#line 490 "parse-gram.y"
+  case 73:
+/* Line 1677 of yacc.c  */
+#line 544 "src/parse-gram.y"

     {
     {

-       current_type = (yyvsp[(1) - (1)].uniqstr);
+       current_type = (yyvsp[0].uniqstr);

        tag_seen = true;
      }
        tag_seen = true;
      }

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

     break;
 
     break;
 

-  case 71:
-
-/* Line 1806 of yacc.c  */
-#line 495 "parse-gram.y"
+  case 74:
+/* Line 1677 of yacc.c  */
+#line 549 "src/parse-gram.y"

     {
     {

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

      }
      }

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

     break;
 
     break;
 

-  case 72:
-
-/* Line 1806 of yacc.c  */
-#line 500 "parse-gram.y"
+  case 75:
+/* Line 1677 of yacc.c  */
+#line 554 "src/parse-gram.y"

     {
     {

-      symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
-      symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
-      symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)]));
+      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 1677 of yacc.c  */
+#line 2716 "src/parse-gram.c"

     break;
 
     break;
 

-  case 73:
-
-/* Line 1806 of yacc.c  */
-#line 506 "parse-gram.y"
+  case 76:
+/* Line 1677 of yacc.c  */
+#line 560 "src/parse-gram.y"

     {
     {

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

     }
     }

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

     break;
 
     break;
 

-  case 74:
-
-/* Line 1806 of yacc.c  */
-#line 512 "parse-gram.y"
+  case 77:
+/* Line 1677 of yacc.c  */
+#line 566 "src/parse-gram.y"

     {
     {

-      symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
-      symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));
-      symbol_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[-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 1677 of yacc.c  */
+#line 2741 "src/parse-gram.c"

     break;
 
     break;
 

-  case 81:
-
-/* Line 1806 of yacc.c  */
-#line 542 "parse-gram.y"
+  case 84:
+/* Line 1677 of yacc.c  */
+#line 596 "src/parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }

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

     break;
 
     break;
 

-  case 82:
-
-/* Line 1806 of yacc.c  */
-#line 548 "parse-gram.y"
-    { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); }
+  case 85:
+/* Line 1677 of yacc.c  */
+#line 602 "src/parse-gram.y"
+    { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1677 of yacc.c  */
+#line 2759 "src/parse-gram.c"

     break;
 
     break;
 

-  case 83:
-
-/* Line 1806 of yacc.c  */
-#line 549 "parse-gram.y"
+  case 86:
+/* Line 1677 of yacc.c  */
+#line 603 "src/parse-gram.y"

     {
     /* Free the current lhs. */
     {
     /* Free the current lhs. */

-    current_lhs (0, (yylsp[(1) - (4)]), 0);
+    current_lhs (0, (yylsp[-3]), 0);

   }
   }

-    break;
-
-  case 84:
-
-/* Line 1806 of yacc.c  */
-#line 556 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(1) - (1)])); }
-    break;
-
-  case 85:
-
-/* Line 1806 of yacc.c  */
-#line 557 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(3) - (3)])); }
+/* Line 1677 of yacc.c  */
+#line 2770 "src/parse-gram.c"

     break;
 
   case 87:
     break;
 
   case 87:

-
-/* Line 1806 of yacc.c  */
-#line 563 "parse-gram.y"
-    { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
-                                 current_lhs_named_ref); }
+/* Line 1677 of yacc.c  */
+#line 610 "src/parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2778 "src/parse-gram.c"

     break;
 
   case 88:
     break;
 
   case 88:

-
-/* Line 1806 of yacc.c  */
-#line 566 "parse-gram.y"
-    { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
-    break;
-
-  case 89:
-
-/* Line 1806 of yacc.c  */
-#line 568 "parse-gram.y"
-    { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
+/* Line 1677 of yacc.c  */
+#line 611 "src/parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2786 "src/parse-gram.c"

     break;
 
   case 90:
     break;
 
   case 90:

-
-/* Line 1806 of yacc.c  */
-#line 570 "parse-gram.y"
-    { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
+/* Line 1677 of yacc.c  */
+#line 617 "src/parse-gram.y"
+    { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
+                                  current_lhs_named_ref); }
+/* Line 1677 of yacc.c  */
+#line 2795 "src/parse-gram.c"

     break;
 
   case 91:
     break;
 
   case 91:

-
-/* Line 1806 of yacc.c  */
-#line 572 "parse-gram.y"
-    { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
+/* Line 1677 of yacc.c  */
+#line 620 "src/parse-gram.y"
+    { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1677 of yacc.c  */
+#line 2803 "src/parse-gram.c"

     break;
 
   case 92:
     break;
 
   case 92:

-
-/* Line 1806 of yacc.c  */
-#line 574 "parse-gram.y"
-    { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
+/* Line 1677 of yacc.c  */
+#line 622 "src/parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }
+/* Line 1677 of yacc.c  */
+#line 2811 "src/parse-gram.c"

     break;
 
   case 93:
     break;
 
   case 93:

-
-/* Line 1806 of yacc.c  */
-#line 578 "parse-gram.y"
-    { (yyval.named_ref) = 0; }
+/* Line 1677 of yacc.c  */
+#line 624 "src/parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
+/* Line 1677 of yacc.c  */
+#line 2819 "src/parse-gram.c"

     break;
 
   case 94:
     break;
 
   case 94:

+/* Line 1677 of yacc.c  */
+#line 626 "src/parse-gram.y"
+    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2827 "src/parse-gram.c"
+    break;

 
 

-/* Line 1806 of yacc.c  */
-#line 580 "parse-gram.y"
-    { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 95:
+/* Line 1677 of yacc.c  */
+#line 628 "src/parse-gram.y"
+    { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2835 "src/parse-gram.c"

     break;
 
   case 96:
     break;
 
   case 96:

-
-/* Line 1806 of yacc.c  */
-#line 592 "parse-gram.y"
-    { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+/* Line 1677 of yacc.c  */
+#line 630 "src/parse-gram.y"
+    { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2843 "src/parse-gram.c"

     break;
 
   case 97:
     break;
 
   case 97:

-
-/* Line 1806 of yacc.c  */
-#line 597 "parse-gram.y"
-    { (yyval.chars) = ""; }
+/* Line 1677 of yacc.c  */
+#line 634 "src/parse-gram.y"
+    { (yyval.named_ref) = 0; }
+/* Line 1677 of yacc.c  */
+#line 2851 "src/parse-gram.c"

     break;
 
   case 98:
     break;
 
   case 98:

-
-/* Line 1806 of yacc.c  */
-#line 598 "parse-gram.y"
-    { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); }
+/* Line 1677 of yacc.c  */
+#line 636 "src/parse-gram.y"
+    { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2859 "src/parse-gram.c"

     break;
 
   case 100:
     break;
 
   case 100:

+/* Line 1677 of yacc.c  */
+#line 647 "src/parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
+/* Line 1677 of yacc.c  */
+#line 2867 "src/parse-gram.c"
+    break;

 
 

-/* Line 1806 of yacc.c  */
-#line 609 "parse-gram.y"
+  case 101:
+/* Line 1677 of yacc.c  */
+#line 652 "src/parse-gram.y"
+    { (yyval.chars) = ""; }
+/* Line 1677 of yacc.c  */
+#line 2875 "src/parse-gram.c"
+    break;
+
+  case 102:
+/* Line 1677 of yacc.c  */
+#line 653 "src/parse-gram.y"
+    { (yyval.chars) = (yyvsp[0].uniqstr); }
+/* Line 1677 of yacc.c  */
+#line 2883 "src/parse-gram.c"
+    break;
+
+  case 104:
+/* Line 1677 of yacc.c  */
+#line 664 "src/parse-gram.y"

     {
       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] = '\n';
+      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 1677 of yacc.c  */
+#line 2898 "src/parse-gram.c"

     break;
 
     break;
 

-  case 101:
-
-/* Line 1806 of yacc.c  */
-#line 629 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 105:
+/* Line 1677 of yacc.c  */
+#line 684 "src/parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2906 "src/parse-gram.c"

     break;
 
     break;
 

-  case 102:
-
-/* Line 1806 of yacc.c  */
-#line 631 "parse-gram.y"
+  case 106:
+/* Line 1677 of yacc.c  */
+#line 686 "src/parse-gram.y"

     {
     {

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

     break;
 
     break;
 

-  case 103:
-
-/* Line 1806 of yacc.c  */
-#line 639 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 107:
+/* Line 1677 of yacc.c  */
+#line 694 "src/parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1677 of yacc.c  */
+#line 2926 "src/parse-gram.c"

     break;
 
     break;
 

-  case 106:
-
-/* Line 1806 of yacc.c  */
-#line 651 "parse-gram.y"
+  case 110:
+/* Line 1677 of yacc.c  */
+#line 706 "src/parse-gram.y"

     {
     {

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

     }
     }

+/* Line 1677 of yacc.c  */
+#line 2937 "src/parse-gram.c"

     break;
 
     break;
 

-  case 108:
-
-/* Line 1806 of yacc.c  */
-#line 660 "parse-gram.y"
+  case 112:
+/* Line 1677 of yacc.c  */
+#line 715 "src/parse-gram.y"

     {
       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 1677 of yacc.c  */
+#line 2952 "src/parse-gram.c"

     break;
 
 
     break;
 
 

-
-/* Line 1806 of yacc.c  */
-#line 2977 "parse-gram.c"
+/* Line 1677 of yacc.c  */
+#line 2957 "src/parse-gram.c"

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


@@ -3014,9 +2994,9 @@ yyreduce:
   goto yynewstate;
 
 
   goto yynewstate;
 
 

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

 yyerrlab:
   /* Make sure we have latest lookahead translation.  See comments at
      user semantic actions for why this is necessary.  */
 yyerrlab:
   /* Make sure we have latest lookahead translation.  See comments at
      user semantic actions for why this is necessary.  */


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

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

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

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

       else
       else

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

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


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

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

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

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

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

-       YYABORT;
+        YYABORT;

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

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

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


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

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

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


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

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

 }
 }

-
-
-
-/* Line 2067 of yacc.c  */
-#line 670 "parse-gram.y"
+/* Line 1935 of yacc.c  */
+#line 725 "src/parse-gram.y"

 
 
 
 
 
 


@@ -3243,65 +3219,60 @@ 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_at (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);
     }
 


@@ -3314,16 +3285,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_at (*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_at (*loc, complaint, "%s", msg);

 }
 
 char const *
 }
 
 char const *


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

-