tests: fix Java push failure when running with BISON_USE_PUSH_FOR_PULL

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 3101c7eee3c84494715a872214d2023eab9d3e86..17d04181bb5d6908cd4732f6768ab9d9d03cb838 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.6.2.891-3f15-dirty.  */
+/* A Bison parser, made by GNU Bison 2.7.90.  */

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

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

 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


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

-#define YYBISON_VERSION "2.6.2.891-3f15-dirty"
+#define YYBISON_VERSION "2.7.90"

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

-#define YYPURE 1
+#define YYPURE 2

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


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

+/* "%code top" blocks.  */
+#line 27 "src/parse-gram.y" /* yacc.c:333  */

 
 

+  /* On column 0 to please syntax-check.  */
+#include <config.h>
+
+#line 68 "src/parse-gram.c" /* yacc.c:333  */
+/* Substitute the type names.  */
+#define YYSTYPE         GRAM_STYPE
+#define YYLTYPE         GRAM_LTYPE

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

-#define yylval          gram_lval
-#define yychar          gram_char

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

-#define yylloc          gram_lloc
-
-/* Copy the first part of user declarations.  */
-/* Line 331 of yacc.c  */
-#line 1 "src/parse-gram.y"
-/* Bison Grammar Parser                             -*- C -*-
-
-   Copyright (C) 2002-2012 Free Software Foundation, Inc.
-
-   This file is part of Bison, the GNU Compiler Compiler.
-
-   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.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

-#include <config.h>
-#include "system.h"
-
-#include "c-ctype.h"
-#include "complain.h"
-#include "conflicts.h"
-#include "files.h"
-#include "getargs.h"
-#include "gram.h"
-#include "muscle-tab.h"
-#include "named-ref.h"
-#include "quotearg.h"
-#include "reader.h"
-#include "symlist.h"
-#include "symtab.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) \
-          location_print (File, Loc)
-
-static void version_check (location const *loc, char const *version);

 
 

-/* Request detailed syntax error messages, and pass them to GRAM_ERROR.
-   FIXME: depends on the undocumented availability of YYLLOC.  */
-#undef  yyerror
-#define yyerror(Msg) \
-        gram_error (&yylloc, Msg)
-static void gram_error (location const *, char const *);
-
-static char const *char_name (char);
+/* Copy the first part of user declarations.  */

 
 

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

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


@@ -150,19 +100,28 @@ static char const *char_name (char);
    by #include "src/parse-gram.h".  */
 #ifndef YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED
 # define YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED
    by #include "src/parse-gram.h".  */
 #ifndef YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED
 # define YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED

-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
+/* Debug traces.  */
+#ifndef GRAM_DEBUG
+# if defined YYDEBUG

 #if YYDEBUG
 #if YYDEBUG

+#   define GRAM_DEBUG 1
+#  else
+#   define GRAM_DEBUG 0
+#  endif
+# else /* ! defined YYDEBUG */
+#  define GRAM_DEBUG 1
+# endif /* ! defined YYDEBUG */
+#endif  /* ! defined GRAM_DEBUG */
+#if GRAM_DEBUG

 extern int gram_debug;
 #endif
 /* "%code requires" blocks.  */
 extern int gram_debug;
 #endif
 /* "%code requires" blocks.  */

-/* Line 347 of yacc.c  */
-#line 223 "src/parse-gram.y"
+#line 21 "src/parse-gram.y" /* yacc.c:372  */
+
+  #include "symlist.h"
+  #include "symtab.h"
+#line 221 "src/parse-gram.y" /* yacc.c:372  */

 
 

-# ifndef PARAM_TYPE
-#  define PARAM_TYPE

   typedef enum
   {
     param_none   = 0,
   typedef enum
   {
     param_none   = 0,


@@ -170,189 +129,154 @@ extern int gram_debug;
     param_parse  = 1 << 1,
     param_both   = param_lex | param_parse
   } param_type;
     param_parse  = 1 << 1,
     param_both   = param_lex | param_parse
   } param_type;

-# endif
-
+#line 645 "src/parse-gram.y" /* yacc.c:372  */
+#include "muscle-tab.h"

 
 

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

 
 

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

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

-    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_TOKEN = 259,
+    PERCENT_NTERM = 260,
+    PERCENT_TYPE = 261,
+    PERCENT_DESTRUCTOR = 262,
+    PERCENT_PRINTER = 263,
+    PERCENT_LEFT = 264,
+    PERCENT_RIGHT = 265,
+    PERCENT_NONASSOC = 266,
+    PERCENT_PRECEDENCE = 267,
+    PERCENT_PREC = 268,
+    PERCENT_DPREC = 269,
+    PERCENT_MERGE = 270,
+    PERCENT_CODE = 271,
+    PERCENT_DEFAULT_PREC = 272,
+    PERCENT_DEFINE = 273,
+    PERCENT_DEFINES = 274,
+    PERCENT_ERROR_VERBOSE = 275,
+    PERCENT_EXPECT = 276,
+    PERCENT_EXPECT_RR = 277,
+    PERCENT_FLAG = 278,
+    PERCENT_FILE_PREFIX = 279,
+    PERCENT_GLR_PARSER = 280,
+    PERCENT_INITIAL_ACTION = 281,
+    PERCENT_LANGUAGE = 282,
+    PERCENT_NAME_PREFIX = 283,
+    PERCENT_NO_DEFAULT_PREC = 284,
+    PERCENT_NO_LINES = 285,
+    PERCENT_NONDETERMINISTIC_PARSER = 286,
+    PERCENT_OUTPUT = 287,
+    PERCENT_REQUIRE = 288,
+    PERCENT_SKELETON = 289,
+    PERCENT_START = 290,
+    PERCENT_TOKEN_TABLE = 291,
+    PERCENT_VERBOSE = 292,
+    PERCENT_YACC = 293,
+    BRACED_CODE = 294,
+    BRACED_PREDICATE = 295,
+    BRACKETED_ID = 296,
+    CHAR = 297,
+    EPILOGUE = 298,
+    EQUAL = 299,
+    ID = 300,
+    ID_COLON = 301,
+    PERCENT_PERCENT = 302,
+    PIPE = 303,
+    PROLOGUE = 304,
+    SEMICOLON = 305,
+    TAG = 306,
+    TAG_ANY = 307,
+    TAG_NONE = 308,
+    INT = 309,

     PERCENT_PARAM = 310,
     PERCENT_PARAM = 310,

-    PERCENT_UNION = 311
+    PERCENT_UNION = 311,
+    PERCENT_EMPTY = 312

   };
 #endif
   };
 #endif

-/* Tokens.  */
-#define GRAM_EOF 0
-#define STRING 258
-#define INT 259
-#define PERCENT_TOKEN 260
-#define PERCENT_NTERM 261
-#define PERCENT_TYPE 262
-#define PERCENT_DESTRUCTOR 263
-#define PERCENT_PRINTER 264
-#define PERCENT_LEFT 265
-#define PERCENT_RIGHT 266
-#define PERCENT_NONASSOC 267
-#define PERCENT_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_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
+
+/* Value type.  */
+#if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED
+typedef union GRAM_STYPE GRAM_STYPE;
+union GRAM_STYPE

 {
 {

-/* Line 347 of yacc.c  */
-#line 109 "src/parse-gram.y"
-
-  assoc assoc;
-  char *code;
-  char const *chars;
-  int integer;
-  named_ref *named_ref;
-  symbol *symbol;
-  symbol_list *list;
-  uniqstr uniqstr;
-  unsigned char character;
-
-/* Line 347 of yacc.c  */
-#line 247 "src/parse-gram.y"
-
-  param_type param;
-
-/* Line 347 of yacc.c  */
-#line 426 "src/parse-gram.y"
+#line 182 "src/parse-gram.y" /* yacc.c:372  */
+unsigned char character;
+#line 186 "src/parse-gram.y" /* yacc.c:372  */
+char *code;
+#line 191 "src/parse-gram.y" /* yacc.c:372  */
+uniqstr uniqstr;
+#line 199 "src/parse-gram.y" /* yacc.c:372  */
+int integer;
+#line 203 "src/parse-gram.y" /* yacc.c:372  */
+symbol *symbol;
+#line 208 "src/parse-gram.y" /* yacc.c:372  */
+assoc assoc;
+#line 211 "src/parse-gram.y" /* yacc.c:372  */
+symbol_list *list;
+#line 214 "src/parse-gram.y" /* yacc.c:372  */
+named_ref *named_ref;
+#line 241 "src/parse-gram.y" /* yacc.c:372  */
+param_type param;
+#line 409 "src/parse-gram.y" /* yacc.c:372  */

 code_props_type code_type;
 code_props_type code_type;

+#line 647 "src/parse-gram.y" /* yacc.c:372  */

 
 

-/* Line 347 of yacc.c  */
-#line 327 "src/parse-gram.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
+  struct
+  {
+    char const *chars;
+    muscle_kind kind;
+  } value;
+
+#line 235 "src/parse-gram.c" /* yacc.c:372  */
+};
+# define GRAM_STYPE_IS_TRIVIAL 1
+# define GRAM_STYPE_IS_DECLARED 1

 #endif
 
 #endif
 

-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE
+/* Location type.  */
+#if ! defined GRAM_LTYPE && ! defined GRAM_LTYPE_IS_DECLARED
+typedef struct GRAM_LTYPE GRAM_LTYPE;
+struct GRAM_LTYPE

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

-} YYLTYPE;
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
+};
+# define GRAM_LTYPE_IS_DECLARED 1
+# define GRAM_LTYPE_IS_TRIVIAL 1

 #endif
 
 
 #endif
 
 

+

 int gram_parse (void);
 
 #endif /* !YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
 int gram_parse (void);
 
 #endif /* !YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 

-/* Line 350 of yacc.c  */
-#line 353 "src/parse-gram.c"
+#line 263 "src/parse-gram.c" /* yacc.c:375  */

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

-/* Line 351 of yacc.c  */
-#line 58 "src/parse-gram.y"
+#line 33 "src/parse-gram.y" /* yacc.c:376  */
+
+  #include "system.h"
+
+  #include "c-ctype.h"
+  #include "complain.h"
+  #include "conflicts.h"
+  #include "files.h"
+  #include "getargs.h"
+  #include "gram.h"
+  #include "named-ref.h"
+  #include "quotearg.h"
+  #include "reader.h"
+  #include "scan-gram.h"
+  #include "scan-code.h"
+  #include "xmemdup0.h"

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


@@ -364,28 +288,43 @@ int gram_parse (void);
   /** Set the new current left-hand side symbol, possibly common
    * to several right-hand side parts of rule.
    */
   /** 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;
-  }
+  static void current_lhs (symbol *sym, location loc, named_ref *ref);
+
+  #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 (Loc, File)
+
+  /* Strip initial '{' and final '}' (must be first and last characters).
+     Return the result.  */
+  static char *strip_braces (char *code);
+
+  /* Convert CODE by calling code_props_plain_init if PLAIN, otherwise
+     code_props_symbol_action_init.  Call
+     gram_scanner_last_string_free to release the latest string from
+     the scanner (should be CODE). */
+  static char const *translate_code (char *code, location loc, bool plain);
+
+  /* Convert CODE by calling code_props_plain_init after having
+     stripped the first and last characters (expected to be '{', and
+     '}').  Call gram_scanner_last_string_free to release the latest
+     string from the scanner (should be CODE). */
+  static char const *translate_code_braceless (char *code, location loc);
+
+  static void version_check (location const *loc, char const *version);
+
+  static void gram_error (location const *, char const *);
+
+  /* A string that describes a char (e.g., 'a' -> "'a'").  */
+  static char const *char_name (char);

 
   #define YYTYPE_INT16 int_fast16_t
   #define YYTYPE_INT8 int_fast8_t
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t
 
   #define YYTYPE_INT16 int_fast16_t
   #define YYTYPE_INT8 int_fast8_t
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t

-
-/* Line 351 of yacc.c  */
-#line 236 "src/parse-gram.y"
+#line 231 "src/parse-gram.y" /* yacc.c:376  */

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


@@ -396,9 +335,7 @@ int gram_parse (void);
   static void add_param (param_type type, char *decl, location loc);
   static param_type current_param = param_none;
 
   static void add_param (param_type type, char *decl, location loc);
   static param_type current_param = param_none;
 

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

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


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

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

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

-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if (! defined __GNUC__ || __GNUC__ < 2 \
+      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
+#  define __attribute__(Spec) /* empty */

 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */

-#ifdef __GNUC__
-# define YYUSE(e) ((void) (e))
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))

 #else
 #else

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

 #endif
 
 #endif
 

+

 #if 1
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # ifdef YYSTACK_ALLOC
 #if 1
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # ifdef YYSTACK_ALLOC

-   /* Pacify GCC's `empty if-body' warning.  */
+   /* Pacify GCC's 'empty if-body' warning.  */

 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
 #  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,


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

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

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


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

-#define YYLAST   163
+#define YYLAST   164

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

-#define YYNTOKENS  57
+#define YYNTOKENS  58

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

-#define YYNNTS  38
+#define YYNNTS  37

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

-#define YYNRULES  112
+#define YYNRULES  110

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

-#define YYNSTATES  149
+#define YYNSTATES  144

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

-#define YYMAXUTOK   311
+#define YYMAXUTOK   312

 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)


@@ -626,37 +572,37 @@ 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
+      55,    56,    57

 };
 
 };
 

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

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

-       0,   272,   272,   280,   282,   286,   287,   297,   301,   306,
-     307,   312,   317,   318,   319,   320,   321,   326,   335,   336,
-     337,   338,   339,   340,   341,   342,   342,   343,   344,   368,
-     369,   370,   371,   375,   376,   385,   386,   387,   391,   403,
-     407,   411,   418,   429,   430,   440,   441,   445,   457,   457,
-     462,   462,   467,   478,   493,   494,   495,   496,   500,   501,
-     506,   508,   513,   514,   519,   521,   526,   527,   531,   532,
-     536,   537,   538,   543,   548,   553,   559,   565,   576,   577,
-     586,   587,   593,   594,   595,   602,   602,   610,   611,   612,
-     617,   619,   621,   623,   625,   627,   629,   634,   636,   646,
-     647,   652,   653,   654,   663,   683,   685,   694,   699,   700,
-     705,   712,   714
+       0,   264,   264,   273,   274,   278,   279,   285,   289,   294,
+     295,   300,   306,   307,   308,   309,   314,   319,   320,   321,
+     322,   323,   324,   324,   325,   326,   350,   351,   352,   353,
+     357,   358,   367,   368,   369,   373,   385,   389,   393,   401,
+     412,   413,   423,   424,   428,   440,   440,   445,   445,   450,
+     461,   476,   477,   478,   479,   483,   484,   489,   491,   496,
+     501,   511,   513,   518,   519,   523,   524,   528,   529,   530,
+     535,   540,   545,   551,   557,   568,   569,   578,   579,   585,
+     586,   587,   594,   594,   602,   603,   604,   609,   612,   614,
+     616,   618,   620,   622,   624,   629,   630,   640,   641,   666,
+     667,   668,   669,   681,   683,   692,   697,   698,   703,   711,
+     712

 };
 #endif
 
 };
 #endif
 

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

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

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

   "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
   "\"%expect\"", "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"",
   "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"",
   "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
   "\"%expect\"", "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"",
   "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"",


@@ -666,15 +612,15 @@ static const char *const yytname[] =
   "\"%yacc\"", "\"{...}\"", "\"%?{...}\"", "\"[identifier]\"", "\"char\"",
   "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
   "\"|\"", "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"",
   "\"%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",
-  "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",
-  "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL
+  "\"integer\"", "\"%param\"", "\"%union\"", "\"%empty\"", "$accept",
+  "input", "prologue_declarations", "prologue_declaration", "$@1",
+  "params", "grammar_declaration", "code_props_type", "union_name",
+  "symbol_declaration", "$@2", "$@3", "precedence_declaration",
+  "precedence_declarator", "tag.opt", "symbols.prec", "symbol.prec",
+  "symbols.1", "generic_symlist", "generic_symlist_item", "tag",
+  "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration",
+  "rules", "$@4", "rhses.1", "rhs", "named_ref.opt", "variable", "value",
+  "id", "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL

 };
 #endif
 
 };
 #endif
 


@@ -688,179 +634,179 @@ 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
+     305,   306,   307,   308,   309,   310,   311,   312

 };
 # endif
 
 };
 # endif
 

-#define YYPACT_NINF -88
+#define YYPACT_NINF -113

 
 

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

 
 

-#define YYTABLE_NINF -112
+#define YYTABLE_NINF -110

 
 

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

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

-     STATE-NUM.    */
-static const yytype_int16 yypact[] =
+     STATE-NUM.  */
+static const yytype_int8 yypact[] =

 {
 {

-     -88,    42,   107,   -88,   -88,   -88,     8,   -88,   -88,   -88,
-     -88,   -88,   -88,    19,   -88,    12,    60,   -88,    66,    72,
-     -88,     2,   -88,    39,    83,    35,   -88,   -88,   -88,    36,
-      87,    88,    32,   -88,   -88,   -88,    15,   -88,   -88,   -88,
-      46,   -88,   -88,    55,   -88,   -88,    45,    -2,    -2,    32,
-     -88,    58,   -88,   -88,   -88,    31,   -88,   -88,   -88,   -88,
-      97,   -88,   -88,   -88,    98,   -88,   100,   -88,   -88,   -88,
-     -88,   -88,   -88,   -88,   -88,    56,   -88,    57,     1,   -88,
-     -88,    62,    69,   -88,    58,     0,   -88,    32,   -88,   -88,
-      -2,    85,    -2,    32,   -88,   -88,   -88,   -88,   -88,   -88,
-     -88,   -88,   -88,   -88,    77,   -88,   -88,   -88,   -88,   -88,
-      70,   -88,   -88,   -88,   -88,     0,   -88,   -88,   -88,    32,
-     -88,   102,   -88,   119,   -88,   -88,   -88,   -88,   -88,   -88,
-     -88,   -88,   -88,    33,    53,   -88,   -88,    32,   143,    71,
-      62,   -88,    62,    53,   -88,   -88,   -88,   -88,   -88
+    -113,    16,   108,  -113,  -113,  -113,   -27,  -113,  -113,  -113,
+    -113,  -113,  -113,   -24,  -113,    23,    24,  -113,   -21,   -15,
+    -113,    29,  -113,     3,    38,    42,  -113,  -113,  -113,    44,
+      47,    71,    31,  -113,  -113,  -113,    55,  -113,  -113,  -113,
+      30,  -113,  -113,    39,  -113,  -113,    26,   -22,   -22,    31,
+    -113,    48,  -113,  -113,     1,  -113,  -113,  -113,  -113,  -113,
+    -113,  -113,  -113,  -113,  -113,  -113,  -113,  -113,  -113,  -113,
+    -113,    45,  -113,    50,     2,  -113,  -113,    57,    49,  -113,
+      52,    41,  -113,    31,  -113,  -113,   -22,    -2,   -22,    31,
+    -113,  -113,  -113,  -113,  -113,  -113,  -113,  -113,    46,  -113,
+    -113,  -113,  -113,  -113,    63,  -113,  -113,  -113,  -113,    41,
+    -113,  -113,  -113,    31,  -113,    51,  -113,   100,  -113,  -113,
+    -113,  -113,  -113,  -113,  -113,  -113,  -113,   -20,    40,  -113,
+    -113,    31,    53,    58,    57,  -113,  -113,    57,    40,  -113,
+    -113,  -113,  -113,  -113

 };
 
 };
 

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

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

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

 };
 
 };
 

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

 {
 {

-     -88,   -88,   -88,   -88,   -88,   -88,   146,   -88,   -88,   -88,
-     -88,   -88,   -88,   -88,   -88,   -88,    30,   -88,   -88,    37,
-     -88,   -26,   103,   -88,    75,   -88,   -88,   -88,    21,   -57,
-     -88,   -88,   -11,   -18,   -88,   -32,   -87,   -88
+    -113,  -113,  -113,  -113,  -113,  -113,   102,  -113,  -113,  -113,
+    -113,  -113,  -113,  -113,  -113,  -113,     8,  -113,  -113,    13,
+    -113,   -50,    75,  -113,    73,  -113,  -113,  -113,    19,  -112,
+    -113,  -113,    22,  -113,   -32,   -82,  -113

 };
 
 };
 

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

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

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

 };
 
 };
 

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

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

-      73,  -111,    75,    69,   124,    59,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    53,    75,    94,    13,    14,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    91,
-      91,    26,    13,    14,    96,    69,   132,    32,    63,    65,
-      95,    70,     3,    70,    71,    26,    71,    60,    76,   104,
-      88,    32,   112,   113,   114,   121,    69,    40,    54,    50,
-      49,   125,    76,    56,   122,    51,   122,   137,   138,   139,
-      57,    40,    91,   111,    91,    70,    58,    97,    71,    61,
-      64,    66,   135,   147,   136,   148,    62,   121,    69,   123,
-      67,    68,    83,   140,   141,    85,    70,    86,    50,    71,
-      99,   100,   142,   101,   107,   144,   131,   102,   103,   109,
-     128,   142,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,   126,    69,   146,    13,    14,    15,    16,    17,    18,
+      69,    65,  -109,    71,    92,   118,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    50,     3,    90,    13,    14,
+      66,    51,   142,    67,    49,   143,    52,    55,   129,    84,
+     130,    26,    58,    56,    65,   126,   116,    32,   116,    57,
+      93,    60,    59,    65,    65,    61,    94,    62,    72,    98,
+      63,   115,   117,   131,   132,   133,    71,   119,    40,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    53,    87,
+      87,    13,    14,    66,    64,    79,    67,    82,    81,   134,
+     135,   115,    66,    66,    26,    67,    67,    91,   103,   120,
+      32,   105,   106,   107,   108,    96,   137,   136,   101,   139,
+      97,    72,   122,    65,    42,   125,   137,   140,    87,   141,
+      87,    40,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,   124,   123,    88,    13,    14,    15,    16,    17,    18,

       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
       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
+      29,    30,    31,    32,    33,    34,    35,    99,   138,     0,
+       0,     0,     0,     0,     0,    36,     0,    37,    38,     0,
+       0,     0,     0,    39,    40

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

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

 };
 
 };
 

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

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

 };
 
 };
 

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

 static const yytype_uint8 yyr1[] =
 {
 static const yytype_uint8 yyr1[] =
 {

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

 };
 
 };
 

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

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

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

 };
 
 
 };
 
 


@@ -889,12 +835,12 @@ do                                                              \
     }                                                           \
   else                                                          \
     {                                                           \
     }                                                           \
   else                                                          \
     {                                                           \

-      yyerror (YY_("syntax error: cannot back up")); \
+      yyerror (&yylloc, YY_("syntax error: cannot back up")); \

       YYERROR;                                                  \
     }                                                           \
 while (0)
 
       YYERROR;                                                  \
     }                                                           \
 while (0)
 

-
+/* Error token number */

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


@@ -925,32 +871,9 @@ while (0)
 
 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
 
 
 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
 

-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
-#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)                  \
-     fprintf (File, "%d.%d-%d.%d",                      \
-              (Loc).first_line, (Loc).first_column,     \
-              (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval, &yylloc)
-#endif

 
 /* Enable debugging if requested.  */
 
 /* Enable debugging if requested.  */

-#if YYDEBUG
+#if GRAM_DEBUG

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


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

+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL
+
+/* Print *YYLOCP on YYO.  Private, do not rely on its existence. */
+
+__attribute__((__unused__))
+static unsigned
+yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
+{
+  unsigned res = 0;
+  int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0;
+  if (0 <= yylocp->first_line)
+    {
+      res += YYFPRINTF (yyo, "%d", yylocp->first_line);
+      if (0 <= yylocp->first_column)
+        res += YYFPRINTF (yyo, ".%d", yylocp->first_column);
+    }
+  if (0 <= yylocp->last_line)
+    {
+      if (yylocp->first_line < yylocp->last_line)
+        {
+          res += YYFPRINTF (yyo, "-%d", yylocp->last_line);
+          if (0 <= end_col)
+            res += YYFPRINTF (yyo, ".%d", end_col);
+        }
+      else if (0 <= end_col && yylocp->first_column < end_col)
+        res += YYFPRINTF (yyo, "-%d", end_col);
+    }
+  return res;
+ }
+
+#  define YY_LOCATION_PRINT(File, Loc)          \
+  yy_location_print_ (File, &(Loc))
+
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+

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


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

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

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


@@ -993,192 +961,156 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
 # endif
   switch (yytype)
     {
 # endif
   switch (yytype)
     {

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

         break;
 
         break;
 

-            case 4: // "integer"
-/* Line 709 of yacc.c  */
-#line 209 "src/parse-gram.y"
-        { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
-/* Line 709 of yacc.c  */
-#line 1010 "src/parse-gram.c"
+    case 23: /* "%<flag>"  */
+#line 196 "src/parse-gram.y" /* yacc.c:701  */
+      { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); }
+#line 974 "src/parse-gram.c" /* yacc.c:701  */

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

-            case 55: // "%param"
-/* Line 709 of yacc.c  */
-#line 252 "src/parse-gram.y"
-        {
+    case 54: /* "integer"  */
+#line 201 "src/parse-gram.y" /* yacc.c:701  */
+      { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
+#line 1034 "src/parse-gram.c" /* yacc.c:701  */
+        break;
+
+    case 55: /* "%param"  */
+#line 244 "src/parse-gram.y" /* yacc.c:701  */
+      {

   switch (((*yyvaluep).param))
     {
 #define CASE(In, Out)                                           \
   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);
+      case param_ ## In: fputs ("%" #Out, yyo); break
+      CASE (lex,   lex-param);
+      CASE (parse, parse-param);
+      CASE (both,  param);

 #undef CASE
       case param_none: aver (false); break;
     }
 }
 #undef CASE
       case param_none: aver (false); break;
     }
 }

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

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

-            case 88: // content.opt
-/* Line 709 of yacc.c  */
-#line 198 "src/parse-gram.y"
-        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 709 of yacc.c  */
-#line 1141 "src/parse-gram.c"
+    case 89: /* value  */
+#line 656 "src/parse-gram.y" /* yacc.c:701  */
+      {
+  switch (((*yyvaluep).value).kind)
+    {
+    case muscle_code:    fprintf (yyo,  "{%s}",  ((*yyvaluep).value).chars); break;
+    case muscle_keyword: fprintf (yyo,   "%s",   ((*yyvaluep).value).chars); break;
+    case muscle_string:  fprintf (yyo, "\"%s\"", ((*yyvaluep).value).chars); break;
+    }
+}
+#line 1088 "src/parse-gram.c" /* yacc.c:701  */

         break;
 
         break;
 

-            case 89: // braceless
-/* Line 709 of yacc.c  */
-#line 198 "src/parse-gram.y"
-        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 709 of yacc.c  */
-#line 1149 "src/parse-gram.c"
+    case 90: /* id  */
+#line 205 "src/parse-gram.y" /* yacc.c:701  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1094 "src/parse-gram.c" /* yacc.c:701  */

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

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

         break;
 
         break;
 

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

 
       default:
         break;
 
       default:
         break;


@@ -1193,10 +1125,8 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
 {
 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
 {

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

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


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

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

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

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

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


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

-#if YYDEBUG
+#if GRAM_DEBUG

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


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

-#if YYDEBUG
+#if GRAM_DEBUG

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


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

-#if YYDEBUG
+#if GRAM_DEBUG

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


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

-  YYSIZE_T yysize1;

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


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

-                yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-                if (! (yysize <= yysize1
-                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                  return 2;
-                yysize = yysize1;
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }

               }
         }
               }
         }

-# if YYDEBUG
+# if GRAM_DEBUG

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


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

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

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


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

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

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

-  switch (yytype)
-    {
-      default:
-        break;
-    }
+  YYUSE (yytype);

 }
 
 
 }
 
 


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

+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+/* Default value used for initialization, for pacifying older GCCs
+   or non-GCC compilers.  */
+static YYSTYPE yyval_default;
+# define YY_INITIAL_VALUE(Value) = Value
+#endif
+static YYLTYPE yyloc_default
+# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL
+  = { 1, 1, 1, 1 }
+# endif
+;
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+

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

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

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

-YYLTYPE yylloc;
+YYLTYPE yylloc = yyloc_default;
+

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


@@ -1790,9 +1748,9 @@ YYLTYPE yylloc;
     int yyerrstatus;
 
     /* The stacks and their tools:
     int yyerrstatus;
 
     /* The stacks and their tools:

-       `yyss': related to states.
-       `yyvs': related to semantic values.
-       `yyls': related to locations.
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+       'yyls': related to locations.

 
        Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
        Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */


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

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

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


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

-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
-  yylsp = yyls;
-
-#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-  /* Initialize the default location before parsing starts.  */
-  yylloc.first_line   = yylloc.last_line   = 1;
-  yylloc.first_column = yylloc.last_column = 1;
-#endif
-

 /* User initialization code.  */
 /* User initialization code.  */

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

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

-/* Line 1464 of yacc.c  */
-#line 1889 "src/parse-gram.c"
+
+#line 1832 "src/parse-gram.c" /* yacc.c:1446  */

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


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

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

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


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

+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN

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

+  YY_IGNORE_MAYBE_UNINITIALIZED_END

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


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

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

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


@@ -2077,215 +2022,145 @@ yyreduce:
     switch (yyn)
       {
           case 6:
     switch (yyn)
       {
           case 6:

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

     {
     {

-      code_props plain_code;
-      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",
       muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",

-                        plain_code.code, (yylsp[0]));
+                        translate_code ((yyvsp[0].code), (yylsp[0]), true), (yylsp[0]));

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

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

     break;
 
   case 7:
     break;
 
   case 7:

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

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

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

     break;
 
   case 8:
     break;
 
   case 8:

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

     {
     {

-      muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
+      muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].value).kind, (yyvsp[0].value).chars,

                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }

-/* Line 1679 of yacc.c  */
-#line 2114 "src/parse-gram.c"
+#line 2049 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 9:
     break;
 
   case 9:

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

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

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

     break;
 
   case 10:
     break;
 
   case 10:

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

     {
       defines_flag = true;
     {
       defines_flag = true;

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

     }
     }

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

     break;
 
   case 11:
     break;
 
   case 11:

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

     {
     {

-      muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
+      muscle_percent_define_insert ("parse.error", (yylsp[0]), muscle_keyword,
+                                    "verbose",

                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }

-/* Line 1679 of yacc.c  */
-#line 2144 "src/parse-gram.c"
+#line 2074 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 12:
     break;
 
   case 12:

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

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

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

     break;
 
   case 13:
     break;
 
   case 13:

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

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

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

     break;
 
   case 14:
     break;
 
   case 14:

-/* Line 1679 of yacc.c  */
-#line 319 "src/parse-gram.y"
-    { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1679 of yacc.c  */
-#line 2168 "src/parse-gram.c"
+#line 308 "src/parse-gram.y" /* yacc.c:1663  */
+    { spec_file_prefix = (yyvsp[0].code); }
+#line 2092 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 15:
     break;
 
   case 15:

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

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

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

     break;
 
     break;
 

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

     {
     {

-      code_props action;
-      code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));
-      code_props_translate_code (&action);
-      gram_scanner_last_string_free ();
-      muscle_code_grow ("initial_action", action.code, (yylsp[0]));
+      muscle_code_grow ("initial_action", translate_code ((yyvsp[0].code), (yylsp[0]), false), (yylsp[0]));

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

-/* Line 1679 of yacc.c  */
-#line 2202 "src/parse-gram.c"
+#line 2110 "src/parse-gram.c" /* yacc.c:1663  */
+    break;
+
+  case 17:
+#line 319 "src/parse-gram.y" /* yacc.c:1663  */
+    { language_argmatch ((yyvsp[0].code), grammar_prio, (yylsp[-1])); }
+#line 2116 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 18:
     break;
 
   case 18:

-/* Line 1679 of yacc.c  */
-#line 335 "src/parse-gram.y"
-    { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
-/* Line 1679 of yacc.c  */
-#line 2210 "src/parse-gram.c"
+#line 320 "src/parse-gram.y" /* yacc.c:1663  */
+    { spec_name_prefix = (yyvsp[0].code); }
+#line 2122 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 19:
     break;
 
   case 19:

-/* Line 1679 of yacc.c  */
-#line 336 "src/parse-gram.y"
-    { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1679 of yacc.c  */
-#line 2218 "src/parse-gram.c"
+#line 321 "src/parse-gram.y" /* yacc.c:1663  */
+    { no_lines_flag = true; }
+#line 2128 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 20:
     break;
 
   case 20:

-/* Line 1679 of yacc.c  */
-#line 337 "src/parse-gram.y"
-    { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1679 of yacc.c  */
-#line 2226 "src/parse-gram.c"
+#line 322 "src/parse-gram.y" /* yacc.c:1663  */
+    { nondeterministic_parser = true; }
+#line 2134 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 21:
     break;
 
   case 21:

-/* Line 1679 of yacc.c  */
-#line 338 "src/parse-gram.y"
-    { no_lines_flag = true; }
-/* Line 1679 of yacc.c  */
-#line 2234 "src/parse-gram.c"
+#line 323 "src/parse-gram.y" /* yacc.c:1663  */
+    { spec_outfile = (yyvsp[0].code); }
+#line 2140 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 22:
     break;
 
   case 22:

-/* Line 1679 of yacc.c  */
-#line 339 "src/parse-gram.y"
-    { nondeterministic_parser = true; }
-/* Line 1679 of yacc.c  */
-#line 2242 "src/parse-gram.c"
+#line 324 "src/parse-gram.y" /* yacc.c:1663  */
+    { current_param = (yyvsp[0].param); }
+#line 2146 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 23:
     break;
 
   case 23:

-/* Line 1679 of yacc.c  */
-#line 340 "src/parse-gram.y"
-    { spec_outfile = (yyvsp[0].chars); }
-/* Line 1679 of yacc.c  */
-#line 2250 "src/parse-gram.c"
+#line 324 "src/parse-gram.y" /* yacc.c:1663  */
+    { current_param = param_none; }
+#line 2152 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 24:
     break;
 
   case 24:

-/* Line 1679 of yacc.c  */
-#line 341 "src/parse-gram.y"
-    { spec_outfile = (yyvsp[0].chars); }
-/* Line 1679 of yacc.c  */
-#line 2258 "src/parse-gram.c"
+#line 325 "src/parse-gram.y" /* yacc.c:1663  */
+    { version_check (&(yylsp[0]), (yyvsp[0].code)); }
+#line 2158 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 25:
     break;
 
   case 25:

-/* Line 1679 of yacc.c  */
-#line 342 "src/parse-gram.y"
-    { current_param = (yyvsp[0].param); }
-/* Line 1679 of yacc.c  */
-#line 2266 "src/parse-gram.c"
-    break;
-
-  case 26:
-/* Line 1679 of yacc.c  */
-#line 342 "src/parse-gram.y"
-    { current_param = param_none; }
-/* Line 1679 of yacc.c  */
-#line 2274 "src/parse-gram.c"
-    break;
-
-  case 27:
-/* Line 1679 of yacc.c  */
-#line 343 "src/parse-gram.y"
-    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
-/* Line 1679 of yacc.c  */
-#line 2282 "src/parse-gram.c"
-    break;
-
-  case 28:
-/* Line 1679 of yacc.c  */
-#line 345 "src/parse-gram.y"
+#line 327 "src/parse-gram.y" /* yacc.c:1663  */

     {
     {

-      char const *skeleton_user = (yyvsp[0].chars);
+      char const *skeleton_user = (yyvsp[0].code);

       if (strchr (skeleton_user, '/'))
         {
           size_t dir_length = strlen (current_file);
       if (strchr (skeleton_user, '/'))
         {
           size_t dir_length = strlen (current_file);


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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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


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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

-      muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
+      muscle_code_grow ("percent_code()",
+                        translate_code_braceless ((yyvsp[0].code), (yylsp[0])), (yylsp[0]));

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

-/* Line 1679 of yacc.c  */
-#line 2413 "src/parse-gram.c"
+#line 2268 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

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

     {
     {

-      muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
+      muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), translate_code_braceless ((yyvsp[0].code), (yylsp[0])), (yylsp[0]));

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

     {}
     {}

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

     {
       union_seen = true;
     {
       union_seen = true;

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

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

-/* Line 1679 of yacc.c  */
-#line 2468 "src/parse-gram.c"
+#line 2311 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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


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

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

     break;
 
     break;
 

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

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


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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

-  case 61:
-/* Line 1679 of yacc.c  */
-#line 509 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1679 of yacc.c  */
-#line 2602 "src/parse-gram.c"
+  case 58:
+#line 492 "src/parse-gram.y" /* yacc.c:1663  */
+    { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+#line 2417 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

-  case 62:
-/* Line 1679 of yacc.c  */
-#line 513 "src/parse-gram.y"
-    { (yyval.symbol) = (yyvsp[0].symbol); }
-/* Line 1679 of yacc.c  */
-#line 2610 "src/parse-gram.c"
+  case 59:
+#line 497 "src/parse-gram.y" /* yacc.c:1663  */
+    {
+      (yyval.symbol) = (yyvsp[0].symbol);
+      symbol_class_set ((yyvsp[0].symbol), token_sym, (yylsp[0]), false);
+    }
+#line 2426 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

-  case 63:
-/* Line 1679 of yacc.c  */
-#line 514 "src/parse-gram.y"
-    { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
-/* Line 1679 of yacc.c  */
-#line 2618 "src/parse-gram.c"
+  case 60:
+#line 502 "src/parse-gram.y" /* yacc.c:1663  */
+    {
+      (yyval.symbol) = (yyvsp[-1].symbol);
+      symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
+      symbol_class_set ((yyvsp[-1].symbol), token_sym, (yylsp[-1]), false);
+    }
+#line 2436 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

-  case 65:
-/* Line 1679 of yacc.c  */
-#line 522 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1679 of yacc.c  */
-#line 2634 "src/parse-gram.c"
+  case 62:
+#line 514 "src/parse-gram.y" /* yacc.c:1663  */
+    { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+#line 2448 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

     {
     {

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

     break;
 
     break;
 

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

     {
     {

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

     break;
 
     break;
 

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

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

-/* Line 1679 of yacc.c  */
-#line 2716 "src/parse-gram.c"
+#line 2512 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

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

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

-/* Line 1679 of yacc.c  */
-#line 2728 "src/parse-gram.c"
+#line 2522 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

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

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

-/* Line 1679 of yacc.c  */
-#line 2741 "src/parse-gram.c"
+#line 2533 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

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

     {
       yyerrok;
     }
     {
       yyerrok;
     }

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

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

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

-/* Line 1679 of yacc.c  */
-#line 2795 "src/parse-gram.c"
+#line 2575 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

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

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

-/* Line 1679 of yacc.c  */
-#line 2803 "src/parse-gram.c"
+#line 2581 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

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

     { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }
     { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }

-/* Line 1679 of yacc.c  */
-#line 2811 "src/parse-gram.c"
+#line 2587 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

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

     { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
     { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }

-/* Line 1679 of yacc.c  */
-#line 2819 "src/parse-gram.c"
+#line 2593 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

-  case 94:
-/* Line 1679 of yacc.c  */
-#line 626 "src/parse-gram.y"
+  case 91:
+#line 619 "src/parse-gram.y" /* yacc.c:1663  */
+    { grammar_current_rule_empty_set ((yylsp[0])); }
+#line 2599 "src/parse-gram.c" /* yacc.c:1663  */
+    break;
+
+  case 92:
+#line 621 "src/parse-gram.y" /* yacc.c:1663  */

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

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

     break;
 
     break;
 

-  case 95:
-/* Line 1679 of yacc.c  */
-#line 628 "src/parse-gram.y"
+  case 93:
+#line 623 "src/parse-gram.y" /* yacc.c:1663  */

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

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

     break;
 
     break;
 

-  case 96:
-/* Line 1679 of yacc.c  */
-#line 630 "src/parse-gram.y"
+  case 94:
+#line 625 "src/parse-gram.y" /* yacc.c:1663  */

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

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

     break;
 
     break;
 

-  case 97:
-/* Line 1679 of yacc.c  */
-#line 634 "src/parse-gram.y"
+  case 95:
+#line 629 "src/parse-gram.y" /* yacc.c:1663  */

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

-/* Line 1679 of yacc.c  */
-#line 2851 "src/parse-gram.c"
+#line 2623 "src/parse-gram.c" /* yacc.c:1663  */
+    break;
+
+  case 96:
+#line 630 "src/parse-gram.y" /* yacc.c:1663  */
+    { (yyval.named_ref) = named_ref_new ((yyvsp[0].uniqstr), (yylsp[0])); }
+#line 2629 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 98:
     break;
 
   case 98:

-/* Line 1679 of yacc.c  */
-#line 636 "src/parse-gram.y"
-    { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1679 of yacc.c  */
-#line 2859 "src/parse-gram.c"
+#line 641 "src/parse-gram.y" /* yacc.c:1663  */
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].code)); }
+#line 2635 "src/parse-gram.c" /* yacc.c:1663  */
+    break;
+
+  case 99:
+#line 666 "src/parse-gram.y" /* yacc.c:1663  */
+    { (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; }
+#line 2641 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 100:
     break;
 
   case 100:

-/* Line 1679 of yacc.c  */
-#line 647 "src/parse-gram.y"
-    { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
-/* Line 1679 of yacc.c  */
-#line 2867 "src/parse-gram.c"
+#line 667 "src/parse-gram.y" /* yacc.c:1663  */
+    { (yyval.value).kind = muscle_keyword; (yyval.value).chars = (yyvsp[0].uniqstr); }
+#line 2647 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 101:
     break;
 
   case 101:

-/* Line 1679 of yacc.c  */
-#line 652 "src/parse-gram.y"
-    { (yyval.chars) = ""; }
-/* Line 1679 of yacc.c  */
-#line 2875 "src/parse-gram.c"
+#line 668 "src/parse-gram.y" /* yacc.c:1663  */
+    { (yyval.value).kind = muscle_string;  (yyval.value).chars = (yyvsp[0].code); }
+#line 2653 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
   case 102:
     break;
 
   case 102:

-/* Line 1679 of yacc.c  */
-#line 653 "src/parse-gram.y"
-    { (yyval.chars) = (yyvsp[0].uniqstr); }
-/* Line 1679 of yacc.c  */
-#line 2883 "src/parse-gram.c"
+#line 669 "src/parse-gram.y" /* yacc.c:1663  */
+    { (yyval.value).kind = muscle_code;    (yyval.value).chars = strip_braces ((yyvsp[0].code)); }
+#line 2659 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

-  case 104:
-/* Line 1679 of yacc.c  */
-#line 664 "src/parse-gram.y"
-    {
-      code_props plain_code;
-      (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n';
-      code_props_plain_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;
-    }
-/* Line 1679 of yacc.c  */
-#line 2898 "src/parse-gram.c"
-    break;
-
-  case 105:
-/* Line 1679 of yacc.c  */
-#line 684 "src/parse-gram.y"
+  case 103:
+#line 682 "src/parse-gram.y" /* yacc.c:1663  */

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

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

     break;
 
     break;
 

-  case 106:
-/* Line 1679 of yacc.c  */
-#line 686 "src/parse-gram.y"
+  case 104:
+#line 684 "src/parse-gram.y" /* yacc.c:1663  */

     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
       symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0]));
     }
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
       symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0]));
     }

-/* Line 1679 of yacc.c  */
-#line 2918 "src/parse-gram.c"
+#line 2675 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

-  case 107:
-/* Line 1679 of yacc.c  */
-#line 694 "src/parse-gram.y"
+  case 105:
+#line 692 "src/parse-gram.y" /* yacc.c:1663  */

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

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

     break;
 
     break;
 

-  case 110:
-/* Line 1679 of yacc.c  */
-#line 706 "src/parse-gram.y"
+  case 108:
+#line 704 "src/parse-gram.y" /* yacc.c:1663  */

     {
     {

-      (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0]));
+      (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].code)), (yylsp[0]));

       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
     }
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
     }

-/* Line 1679 of yacc.c  */
-#line 2937 "src/parse-gram.c"
+#line 2690 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
     break;
 

-  case 112:
-/* Line 1679 of yacc.c  */
-#line 715 "src/parse-gram.y"
+  case 110:
+#line 713 "src/parse-gram.y" /* yacc.c:1663  */

     {
     {

-      code_props plain_code;
-      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 ("epilogue", plain_code.code, (yylsp[0]));
+      muscle_code_grow ("epilogue", translate_code ((yyvsp[0].code), (yylsp[0]), true), (yylsp[0]));

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

-/* Line 1679 of yacc.c  */
-#line 2952 "src/parse-gram.c"
+#line 2699 "src/parse-gram.c" /* yacc.c:1663  */

     break;
 
 
     break;
 
 

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

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


@@ -2979,7 +2725,7 @@ yyreduce:
   *++yyvsp = yyval;
   *++yylsp = yyloc;
 
   *++yyvsp = yyval;
   *++yylsp = yyloc;
 

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

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


@@ -3007,7 +2753,7 @@ yyerrlab:
     {
       ++yynerrs;
 #if ! YYERROR_VERBOSE
     {
       ++yynerrs;
 #if ! YYERROR_VERBOSE

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

 #else
 # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
                                         yyesa, &yyes, &yyes_capacity, \
 #else
 # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
                                         yyesa, &yyes, &yyes_capacity, \


@@ -3037,7 +2783,7 @@ yyerrlab:
                 yymsgp = yymsg;
               }
           }
                 yymsgp = yymsg;
               }
           }

-        yyerror (yymsgp);
+        yyerror (&yylloc, yymsgp);

         if (yysyntax_error_status == 2)
           goto yyexhaustedlab;
       }
         if (yysyntax_error_status == 2)
           goto yyexhaustedlab;
       }


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

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

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


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

+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN

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

+  YY_IGNORE_MAYBE_UNINITIALIZED_END

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


@@ -3162,7 +2910,7 @@ yyabortlab:
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 yyexhaustedlab:
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 yyexhaustedlab:

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

   yyresult = 2;
   /* Fall through.  */
 #endif
   yyresult = 2;
   /* Fall through.  */
 #endif


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

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

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


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

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

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


@@ -3232,6 +2978,33 @@ lloc_default (YYLTYPE const *rhs, int n)
   return loc;
 }
 
   return loc;
 }
 

+static
+char *strip_braces (char *code)
+{
+  code[strlen (code) - 1] = 0;
+  return code + 1;
+}
+
+static
+char const *
+translate_code (char *code, location loc, bool plain)
+{
+  code_props plain_code;
+  if (plain)
+    code_props_plain_init (&plain_code, code, loc);
+  else
+    code_props_symbol_action_init (&plain_code, code, loc);
+  code_props_translate_code (&plain_code);
+  gram_scanner_last_string_free ();
+  return plain_code.code;
+}
+
+static
+char const *
+translate_code_braceless (char *code, location loc)
+{
+  return translate_code (strip_braces (code), loc, true);
+}

 
 static void
 add_param (param_type type, char *decl, location loc)
 
 static void
 add_param (param_type type, char *decl, location loc)


@@ -3314,3 +3087,18 @@ char_name (char c)
       return quotearg_style (escape_quoting_style, buf);
     }
 }
       return quotearg_style (escape_quoting_style, buf);
     }
 }

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