c++: fix several issues with locations

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

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

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

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

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


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

-#define YYBISON_VERSION "2.5.1.885-485b-dirty"
+#define YYBISON_VERSION "2.7.1127-02879-dirty"

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

-#define YYPURE 1
+#define YYPURE 2

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


@@ -58,23 +58,22 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
 /* Pull parsers.  */
 #define YYPULL 1
 

-
+/* Substitute the type names.  */
+#define YYSTYPE         GRAM_STYPE
+#define YYLTYPE         GRAM_LTYPE

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

-#define yylval          gram_lval
-#define yychar          gram_char

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

-#define yylloc          gram_lloc
+

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

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

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

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

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


@@ -94,16 +93,17 @@
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"
 

+#include "c-ctype.h"

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

-#include "muscle-tab.h"

 #include "named-ref.h"
 #include "quotearg.h"
 #include "reader.h"
 #include "symlist.h"
 #include "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"
 #include "scan-gram.h"
 #include "scan-code.h"
 #include "xmemdup0.h"


@@ -112,21 +112,16 @@
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YY_LOCATION_PRINT(File, Loc) \
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YY_LOCATION_PRINT(File, Loc) \

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

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

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

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

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

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

-/* Line 337 of yacc.c  */
-#line 130 "src/parse-gram.c"
+#line 125 "src/parse-gram.c" /* yacc.c:356  */

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


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

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

 #if YYDEBUG
 #if YYDEBUG

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

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

-/* Line 351 of yacc.c  */
-#line 221 "src/parse-gram.y"
+#line 218 "src/parse-gram.y" /* yacc.c:372  */

 
 

-# ifndef PARAM_TYPE
-#  define PARAM_TYPE

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


@@ -168,202 +168,144 @@ 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 649 "src/parse-gram.y" /* yacc.c:372  */
+#include "muscle-tab.h"

 
 

-/* Line 351 of yacc.c  */
-#line 176 "src/parse-gram.c"
+#line 176 "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 351 of yacc.c  */
-#line 107 "src/parse-gram.y"
+#line 170 "src/parse-gram.y" /* yacc.c:372  */
+unsigned char character;
+#line 177 "src/parse-gram.y" /* yacc.c:372  */

 
 

-  assoc assoc;

   char *code;
   char const *chars;
   char *code;
   char const *chars;

-  int integer;
-  named_ref *named_ref;
-  symbol *symbol;
-  symbol_list *list;
-  uniqstr uniqstr;
-  unsigned char character;
-
-/* Line 351 of yacc.c  */
-#line 245 "src/parse-gram.y"

 
 

-  param_type param;
+#line 188 "src/parse-gram.y" /* yacc.c:372  */
+uniqstr uniqstr;
+#line 196 "src/parse-gram.y" /* yacc.c:372  */
+int integer;
+#line 200 "src/parse-gram.y" /* yacc.c:372  */
+symbol *symbol;
+#line 205 "src/parse-gram.y" /* yacc.c:372  */
+assoc assoc;
+#line 208 "src/parse-gram.y" /* yacc.c:372  */
+symbol_list *list;
+#line 211 "src/parse-gram.y" /* yacc.c:372  */
+named_ref *named_ref;
+#line 238 "src/parse-gram.y" /* yacc.c:372  */
+param_type param;
+#line 413 "src/parse-gram.y" /* yacc.c:372  */
+code_props_type code_type;
+#line 651 "src/parse-gram.y" /* yacc.c:372  */
+
+  struct
+  {
+    char const *chars;
+    muscle_kind kind;
+  } value;

 
 
 
 

-/* Line 351 of yacc.c  */
-#line 322 "src/parse-gram.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+#line 279 "src/parse-gram.c" /* yacc.c:372  */
+};
+# define GRAM_STYPE_IS_TRIVIAL 1
+# define GRAM_STYPE_IS_DECLARED 1

 #endif
 
 #endif
 

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

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

-} YYLTYPE;
-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
+};
+# define GRAM_LTYPE_IS_DECLARED 1
+# define GRAM_LTYPE_IS_TRIVIAL 1

 #endif
 
 
 #endif
 
 

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

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

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

 
 

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

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

-/* Line 354 of yacc.c  */
-#line 364 "src/parse-gram.c"
+#line 307 "src/parse-gram.c" /* yacc.c:375  */

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

-/* Line 355 of yacc.c  */
-#line 56 "src/parse-gram.y"
+#line 53 "src/parse-gram.y" /* yacc.c:376  */

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


@@ -377,7 +319,7 @@ int gram_parse ();
    */
   static
   void
    */
   static
   void

-  current_lhs(symbol *sym, location loc, named_ref *ref)
+  current_lhs (symbol *sym, location loc, named_ref *ref)

   {
     current_lhs_symbol = sym;
     current_lhs_location = loc;
   {
     current_lhs_symbol = sym;
     current_lhs_location = loc;


@@ -395,8 +337,7 @@ int gram_parse ();
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t
 
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t
 

-/* Line 355 of yacc.c  */
-#line 234 "src/parse-gram.y"
+#line 228 "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.
    *


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

-/* Line 355 of yacc.c  */
-#line 413 "src/parse-gram.c"
+#line 353 "src/parse-gram.c" /* yacc.c:376  */

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


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

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

 #else
 #else

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

 #endif
 
 #ifdef YYTYPE_UINT16
 #endif
 
 #ifdef YYTYPE_UINT16


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

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

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


@@ -462,37 +398,19 @@ typedef short int yytype_int16;
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */

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

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

-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid

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

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

 #else
 #else

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

 #endif
 
 #if 1
 #endif
 
 #if 1


@@ -500,8 +418,8 @@ YYID (yyi)
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # ifdef YYSTACK_ALLOC
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # ifdef YYSTACK_ALLOC

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

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


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

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

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

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

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


@@ -544,8 +460,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


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

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

 
 #endif
 
 
 #endif
 


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

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

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


@@ -607,21 +523,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   165

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

-#define YYNTOKENS  57
+#define YYNTOKENS  58

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

-#define YYNNTS  36
+#define YYNNTS  38

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

-#define YYNRULES  110
+#define YYNRULES  111

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

-#define YYNSTATES  149
+#define YYNSTATES  145

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


@@ -661,37 +577,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,   270,   270,   278,   280,   284,   285,   295,   299,   304,
-     305,   310,   315,   316,   317,   318,   319,   324,   333,   334,
-     335,   336,   337,   338,   339,   340,   340,   341,   342,   366,
-     367,   368,   369,   373,   374,   383,   384,   385,   389,   396,
-     403,   407,   411,   418,   433,   434,   438,   450,   450,   455,
-     455,   460,   471,   486,   487,   488,   489,   493,   494,   499,
-     501,   506,   507,   512,   514,   519,   520,   524,   525,   526,
-     527,   532,   537,   542,   548,   554,   565,   566,   575,   576,
-     582,   583,   584,   591,   591,   599,   600,   601,   606,   608,
-     610,   612,   614,   616,   618,   623,   625,   635,   636,   641,
-     642,   643,   652,   672,   674,   683,   688,   689,   694,   701,
-     703
+       0,   261,   261,   270,   271,   275,   276,   286,   290,   295,
+     296,   301,   307,   308,   309,   310,   315,   324,   325,   326,
+     327,   328,   329,   329,   330,   331,   355,   356,   357,   358,
+     362,   363,   372,   373,   374,   378,   390,   394,   398,   405,
+     416,   417,   427,   428,   432,   444,   444,   449,   449,   454,
+     465,   480,   481,   482,   483,   487,   488,   493,   495,   500,
+     505,   515,   517,   522,   523,   527,   528,   532,   533,   534,
+     539,   544,   549,   555,   561,   572,   573,   582,   583,   589,
+     590,   591,   598,   598,   606,   607,   608,   613,   616,   618,
+     620,   622,   624,   626,   628,   633,   634,   644,   645,   670,
+     671,   672,   673,   682,   702,   704,   713,   718,   719,   724,
+     732,   733

 };
 #endif
 
 };
 #endif
 

-#if YYDEBUG || YYERROR_VERBOSE || 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\"",


@@ -701,15 +617,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",
-  "union_name", "symbol_declaration", "$@2", "$@3",
-  "precedence_declaration", "precedence_declarator", "tag.opt",
-  "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist",
-  "generic_symlist_item", "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",
+  "braceless", "id", "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL

 };
 #endif
 
 };
 #endif
 


@@ -723,179 +639,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 -50
+#define YYPACT_NINF -115

 
 

-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-50))
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-115)))

 
 

-#define YYTABLE_NINF -110
+#define YYTABLE_NINF -111

 
 

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

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

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

 {
 {

-     -50,     4,   107,   -50,   -50,   -50,   -20,     3,    11,   -50,
-     -50,   -50,   -50,    14,   -50,    12,    68,   -50,    72,    73,
-     -50,     0,   -50,    45,    86,     2,   -50,   -50,   -50,    17,
-      95,    96,    32,   -50,   -50,   -50,    16,   -50,   -50,   -50,
-      54,   -50,   -50,   -50,   -50,    49,    -2,    -2,    32,    27,
-      27,   -50,    63,   -50,   -50,   -50,    37,   -50,   -50,   -50,
-     -50,   101,   -50,   -50,   -50,   103,   -50,   104,   -50,   -50,
-     -50,   -50,   -50,   -50,   -50,   -50,    57,   -50,    58,     1,
-     -50,   -50,    79,    70,   -50,    63,   -50,    32,   -50,   -50,
-      -2,    64,    -2,    32,   -50,   -50,   -50,   -50,    27,   -50,
-     -50,    27,   -50,   -50,   -50,   -50,   -50,   -50,   -50,   -50,
-     -50,    78,   -50,   -50,   -50,   -50,   -50,    83,   -50,    32,
-     -50,   143,   -50,   145,   -50,   -50,   -50,   -50,   -50,   -50,
-     -50,   -50,   -50,    43,    50,   -50,   -50,    32,   146,    97,
-      79,   -50,    79,    50,   -50,   -50,   -50,   -50,   -50
+    -115,    16,   109,  -115,  -115,  -115,   -28,  -115,  -115,  -115,
+    -115,  -115,  -115,   -14,  -115,    25,    23,  -115,   -27,   -20,
+    -115,    39,  -115,     7,    48,    71,  -115,  -115,  -115,    72,
+      73,    74,    -2,  -115,  -115,  -115,    56,  -115,  -115,  -115,
+      33,  -115,  -115,    40,  -115,  -115,    37,    54,    54,    -2,
+    -115,    50,  -115,  -115,  -115,     2,  -115,  -115,  -115,  -115,
+    -115,  -115,  -115,  -115,  -115,  -115,  -115,  -115,  -115,  -115,
+    -115,  -115,    51,  -115,    53,     3,  -115,  -115,    49,    65,
+    -115,    50,    42,  -115,    -2,  -115,  -115,    54,    -1,    54,
+      -2,  -115,  -115,  -115,  -115,  -115,  -115,  -115,  -115,    63,
+    -115,  -115,  -115,  -115,  -115,    69,  -115,  -115,  -115,  -115,
+      42,  -115,  -115,  -115,    -2,  -115,    38,  -115,   106,  -115,
+    -115,  -115,  -115,  -115,  -115,  -115,  -115,  -115,   -15,    41,
+    -115,  -115,    -2,    57,    59,    49,  -115,  -115,    49,    41,
+    -115,  -115,  -115,  -115,  -115

 };
 
 };
 

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

 };
 
 };
 

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

 {
 {

-     -50,   -50,   -50,   -50,   -50,   -50,   149,   -50,   -50,   -50,
-     -50,   -50,   -50,   -50,   -50,    33,   -50,   106,   -42,    -4,
-     112,   -50,    74,   -50,   -50,   -50,    19,   -45,   -50,   -50,
-     -16,    -8,   -50,   -32,   -49,   -50
+    -115,  -115,  -115,  -115,  -115,  -115,   120,  -115,  -115,  -115,
+    -115,  -115,  -115,  -115,  -115,  -115,     9,  -115,  -115,    14,
+    -115,   -50,   100,  -115,    75,  -115,  -115,  -115,    19,  -114,
+    -115,  -115,   -33,   -18,  -115,   -32,   -82,  -115

 };
 
 };
 

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

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

-      -1,     1,     2,    41,    83,   117,    78,    85,    43,    47,
-      46,    44,    45,    87,   119,   120,    93,    98,    99,    89,
-      90,    79,    80,    81,   128,   133,   134,   115,    56,   105,
-      53,    73,    82,   100,    75,   113
+      -1,     1,     2,    41,    79,   105,    74,    43,    81,    44,
+      48,    47,    45,    46,    84,   114,   115,    90,   110,   111,
+     112,    86,    87,    75,    76,    77,   122,   128,   129,   103,
+      55,    95,    52,    69,    78,   113,    71,   101

 };
 
 };
 

-  /* 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[] =
 {

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

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

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

 };
 
 };
 

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

 };
 
 };
 

-  /* 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,    63,    64,    64,    63,    66,    65,    67,
-      65,    65,    68,    69,    69,    69,    69,    70,    70,    71,
-      71,    72,    72,    73,    73,    74,    74,    75,    75,    75,
-      75,    76,    76,    76,    76,    76,    77,    77,    78,    78,
-      79,    79,    79,    81,    80,    82,    82,    82,    83,    83,
-      83,    83,    83,    83,    83,    84,    84,    85,    85,    86,
-      86,    86,    87,    88,    88,    89,    90,    90,    91,    92,
-      92
+       0,    58,    59,    60,    60,    61,    61,    61,    61,    61,
+      61,    61,    61,    61,    61,    61,    61,    61,    61,    61,
+      61,    61,    62,    61,    61,    61,    61,    61,    61,    61,
+      63,    63,    64,    64,    64,    64,    64,    64,    64,    64,
+      65,    65,    66,    66,    64,    68,    67,    69,    67,    67,
+      70,    71,    71,    71,    71,    72,    72,    73,    73,    74,
+      74,    75,    75,    76,    76,    77,    77,    78,    78,    78,
+      79,    79,    79,    79,    79,    80,    80,    81,    81,    82,
+      82,    82,    84,    83,    85,    85,    85,    86,    86,    86,
+      86,    86,    86,    86,    86,    87,    87,    88,    88,    89,
+      89,    89,    89,    90,    91,    91,    92,    93,    93,    94,
+      95,    95

 };
 
 };
 

-  /* 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,     3,
-       1,     1,     2,     3,     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,     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,     1,
+       0,     2

 };
 
 
 };
 
 


@@ -909,21 +825,6 @@ static const yytype_uint8 yyr2[] =
 #define YYERROR         goto yyerrorlab
 
 
 #define YYERROR         goto yyerrorlab
 
 

-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
-
-#define YYFAIL          goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
-

 #define YYRECOVERING()  (!!yyerrstatus)
 
 #define YYBACKUP(Token, Value)                                  \
 #define YYRECOVERING()  (!!yyerrstatus)
 
 #define YYBACKUP(Token, Value)                                  \


@@ -939,12 +840,12 @@ do                                                              \
     }                                                           \
   else                                                          \
     {                                                           \
     }                                                           \
   else                                                          \
     {                                                           \

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

       YYERROR;                                                  \
     }                                                           \
       YYERROR;                                                  \
     }                                                           \

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

 
 

+/* Error token number */

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


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

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

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


@@ -970,37 +871,14 @@ while (YYID (0))
           (Current).first_column = (Current).last_column =              \
             YYRHSLOC (Rhs, 0).last_column;                              \
         }                                                               \
           (Current).first_column = (Current).last_column =              \
             YYRHSLOC (Rhs, 0).last_column;                              \
         }                                                               \

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

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

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


@@ -1011,7 +889,52 @@ while (YYID (0))
 do {                                            \
   if (yydebug)                                  \
     YYFPRINTF Args;                             \
 do {                                            \
   if (yydebug)                                  \
     YYFPRINTF Args;                             \

-} while (YYID (0))
+} 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 {                                                                      \
 
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
 do {                                                                      \


@@ -1022,29 +945,18 @@ do {                                                                      \
                   Type, Value, Location); \
       YYFPRINTF (stderr, "\n");                                           \
     }                                                                     \
                   Type, Value, Location); \
       YYFPRINTF (stderr, "\n");                                           \
     }                                                                     \

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

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

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

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

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

 {
   FILE *yyo = yyoutput;
 {
   FILE *yyo = yyoutput;

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

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


@@ -1054,195 +966,154 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
 # endif
   switch (yytype)
     {
 # endif
   switch (yytype)
     {

-            case 3: // "string"
-
-/* Line 740 of yacc.c  */
-#line 194 "src/parse-gram.y"
-        { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
-/* Line 740 of yacc.c  */
-#line 1064 "src/parse-gram.c"
+    case 3: /* "string"  */
+#line 183 "src/parse-gram.y" /* yacc.c:706  */
+      { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); }
+#line 973 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 4: // "integer"
-
-/* Line 740 of yacc.c  */
-#line 207 "src/parse-gram.y"
-        { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
-/* Line 740 of yacc.c  */
-#line 1073 "src/parse-gram.c"
+    case 23: /* "%<flag>"  */
+#line 193 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); }
+#line 979 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 24: // "%<flag>"
-
-/* Line 740 of yacc.c  */
-#line 203 "src/parse-gram.y"
-        { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
-/* Line 740 of yacc.c  */
-#line 1082 "src/parse-gram.c"
+    case 39: /* "{...}"  */
+#line 185 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
+#line 985 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 40: // "{...}"
-
-/* Line 740 of yacc.c  */
-#line 196 "src/parse-gram.y"
-        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
-/* Line 740 of yacc.c  */
-#line 1091 "src/parse-gram.c"
+    case 41: /* "[identifier]"  */
+#line 191 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); }
+#line 991 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 42: // "[identifier]"
-
-/* Line 740 of yacc.c  */
-#line 201 "src/parse-gram.y"
-        { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }
-/* Line 740 of yacc.c  */
-#line 1100 "src/parse-gram.c"
+    case 42: /* "char"  */
+#line 172 "src/parse-gram.y" /* yacc.c:706  */
+      { fputs (char_name (((*yyvaluep).character)), yyo); }
+#line 997 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 43: // "char"
-
-/* Line 740 of yacc.c  */
-#line 188 "src/parse-gram.y"
-        { fputs (char_name (((*yyvaluep).character)), stderr); }
-/* Line 740 of yacc.c  */
-#line 1109 "src/parse-gram.c"
+    case 43: /* "epilogue"  */
+#line 185 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1003 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 44: // "epilogue"
-
-/* Line 740 of yacc.c  */
-#line 196 "src/parse-gram.y"
-        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 740 of yacc.c  */
-#line 1118 "src/parse-gram.c"
+    case 45: /* "identifier"  */
+#line 190 "src/parse-gram.y" /* yacc.c:706  */
+      { fputs (((*yyvaluep).uniqstr), yyo); }
+#line 1009 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 46: // "identifier"
-
-/* Line 740 of yacc.c  */
-#line 200 "src/parse-gram.y"
-        { fputs (((*yyvaluep).uniqstr), stderr); }
-/* Line 740 of yacc.c  */
-#line 1127 "src/parse-gram.c"
+    case 46: /* "identifier:"  */
+#line 192 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); }
+#line 1015 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 47: // "identifier:"
-
-/* Line 740 of yacc.c  */
-#line 202 "src/parse-gram.y"
-        { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
-/* Line 740 of yacc.c  */
-#line 1136 "src/parse-gram.c"
+    case 49: /* "%{...%}"  */
+#line 185 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1021 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 50: // "%{...%}"
-
-/* Line 740 of yacc.c  */
-#line 196 "src/parse-gram.y"
-        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 740 of yacc.c  */
-#line 1145 "src/parse-gram.c"
+    case 51: /* "<tag>"  */
+#line 194 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
+#line 1027 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 52: // "<tag>"
-
-/* Line 740 of yacc.c  */
-#line 204 "src/parse-gram.y"
-        { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
-/* Line 740 of yacc.c  */
-#line 1154 "src/parse-gram.c"
+    case 54: /* "integer"  */
+#line 198 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
+#line 1033 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 55: // "%param"
-
-/* Line 740 of yacc.c  */
-#line 250 "src/parse-gram.y"
-        {
+    case 55: /* "%param"  */
+#line 241 "src/parse-gram.y" /* yacc.c:706  */
+      {

   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 740 of yacc.c  */
-#line 1174 "src/parse-gram.c"
+#line 1050 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 72: // symbol.prec
-
-/* Line 740 of yacc.c  */
-#line 210 "src/parse-gram.y"
-        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 740 of yacc.c  */
-#line 1183 "src/parse-gram.c"
+    case 65: /* code_props_type  */
+#line 414 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); }
+#line 1056 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 85: // variable
-
-/* Line 740 of yacc.c  */
-#line 200 "src/parse-gram.y"
-        { fputs (((*yyvaluep).uniqstr), stderr); }
-/* Line 740 of yacc.c  */
-#line 1192 "src/parse-gram.c"
+    case 74: /* symbol.prec  */
+#line 202 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1062 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 86: // content.opt
-
-/* Line 740 of yacc.c  */
-#line 196 "src/parse-gram.y"
-        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 740 of yacc.c  */
-#line 1201 "src/parse-gram.c"
+    case 78: /* tag  */
+#line 194 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
+#line 1068 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 87: // braceless
-
-/* Line 740 of yacc.c  */
-#line 196 "src/parse-gram.y"
-        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 740 of yacc.c  */
-#line 1210 "src/parse-gram.c"
+    case 88: /* variable  */
+#line 190 "src/parse-gram.y" /* yacc.c:706  */
+      { fputs (((*yyvaluep).uniqstr), yyo); }
+#line 1074 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 88: // id
-
-/* Line 740 of yacc.c  */
-#line 210 "src/parse-gram.y"
-        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 740 of yacc.c  */
-#line 1219 "src/parse-gram.c"
+    case 89: /* value  */
+#line 660 "src/parse-gram.y" /* yacc.c:706  */
+      {
+  switch (((*yyvaluep).value).kind)
+    {
+    case muscle_code:    fprintf (yyo,  "{%s}",  ((*yyvaluep).value).chars); break;
+    case muscle_keyword: fprintf (yyo,   "%s",   ((*yyvaluep).value).chars); break;
+    case muscle_string:  fprintf (yyo, "\"%s\"", ((*yyvaluep).value).chars); break;
+    }
+}
+#line 1087 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 89: // id_colon
-
-/* Line 740 of yacc.c  */
-#line 211 "src/parse-gram.y"
-        { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
-/* Line 740 of yacc.c  */
-#line 1228 "src/parse-gram.c"
+    case 90: /* braceless  */
+#line 185 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1093 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 90: // symbol
+    case 91: /* id  */
+#line 202 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1099 "src/parse-gram.c" /* yacc.c:706  */
+        break;

 
 

-/* Line 740 of yacc.c  */
-#line 210 "src/parse-gram.y"
-        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 740 of yacc.c  */
-#line 1237 "src/parse-gram.c"
+    case 92: /* id_colon  */
+#line 203 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); }
+#line 1105 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-            case 91: // string_as_id
+    case 93: /* symbol  */
+#line 202 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1111 "src/parse-gram.c" /* yacc.c:706  */
+        break;

 
 

-/* Line 740 of yacc.c  */
-#line 210 "src/parse-gram.y"
-        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 740 of yacc.c  */
-#line 1246 "src/parse-gram.c"
+    case 94: /* string_as_id  */
+#line 202 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1117 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
       default:
         break;
 
       default:


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

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

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

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

 {
 {

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

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


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

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

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

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

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


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

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

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

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

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

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

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


@@ -1349,17 +1190,17 @@ yy_reduce_print (yyssp, yyvsp, yylsp, yyrule)
 do {                                    \
   if (yydebug)                          \
     yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \
 do {                                    \
   if (yydebug)                          \
     yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \

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

 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 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.  */


@@ -1390,7 +1231,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


@@ -1480,7 +1321,7 @@ do {                                                             \
           goto yyerrlab;                                         \
       }                                                          \
     }                                                            \
           goto yyerrlab;                                         \
       }                                                          \
     }                                                            \

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

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


@@ -1493,7 +1334,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 +1344,7 @@ do {                                                                     \
                    Event "\n");                                          \
       yy_lac_established = 0;                                            \
     }                                                                    \
                    Event "\n");                                          \
       yy_lac_established = 0;                                            \
     }                                                                    \

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

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


@@ -1596,7 +1437,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))


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

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

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

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

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


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

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

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

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

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


@@ -1730,7 +1556,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;


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

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

      - If this state is a consistent state with a default action, then
        the only way this function was invoked is if the default action
        is an error action.  In that case, don't check for expected
      - If this state is a consistent state with a default action, then
        the only way this function was invoked is if the default action
        is an error action.  In that case, don't check for expected


@@ -1791,14 +1612,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


@@ -1819,10 +1642,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)
     {


@@ -1859,21 +1684,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 

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

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

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

 {
 {

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

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


@@ -1893,36 +1707,46 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 | yyparse.  |
 `----------*/
 
 | yyparse.  |
 `----------*/
 

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

 int
 yyparse (void)
 int
 yyparse (void)

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

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

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


@@ -1932,9 +1756,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.  */


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

-  int yytoken;
+  int yytoken = 0;

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


@@ -1986,10 +1810,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;
 

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

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


@@ -2004,33 +1827,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 1505 of yacc.c  */
-#line 99 "src/parse-gram.y"
+#line 96 "src/parse-gram.y" /* yacc.c:1451  */

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

-/* Line 1505 of yacc.c  */
-#line 2032 "src/parse-gram.c"
+#line 1839 "src/parse-gram.c" /* yacc.c:1451  */

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

-

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


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

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

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


@@ -2181,7 +1987,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;
 


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

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

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


@@ -2221,8 +2029,7 @@ yyreduce:
     switch (yyn)
       {
           case 6:
     switch (yyn)
       {
           case 6:

-/* Line 1721 of yacc.c  */
-#line 286 "src/parse-gram.y"
+#line 277 "src/parse-gram.y" /* yacc.c:1668  */

     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));


@@ -2232,107 +2039,80 @@ yyreduce:
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
   case 7:
     break;
 
   case 7:

-/* Line 1721 of yacc.c  */
-#line 296 "src/parse-gram.y"
+#line 287 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2247 "src/parse-gram.c"
+#line 2051 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 8:
     break;
 
   case 8:

-/* Line 1721 of yacc.c  */
-#line 300 "src/parse-gram.y"
+#line 291 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

-      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 1721 of yacc.c  */
-#line 2258 "src/parse-gram.c"
+#line 2060 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 9:
     break;
 
   case 9:

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

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

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

     break;
 
   case 10:
     break;
 
   case 10:

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

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

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

     break;
 
   case 11:
     break;
 
   case 11:

-/* Line 1721 of yacc.c  */
-#line 311 "src/parse-gram.y"
+#line 302 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

-      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 1721 of yacc.c  */
-#line 2288 "src/parse-gram.c"
+#line 2085 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 12:
     break;
 
   case 12:

-/* Line 1721 of yacc.c  */
-#line 315 "src/parse-gram.y"
+#line 307 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2296 "src/parse-gram.c"
+#line 2091 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 13:
     break;
 
   case 13:

-/* Line 1721 of yacc.c  */
-#line 316 "src/parse-gram.y"
+#line 308 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2304 "src/parse-gram.c"
+#line 2097 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 14:
     break;
 
   case 14:

-/* Line 1721 of yacc.c  */
-#line 317 "src/parse-gram.y"
+#line 309 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2312 "src/parse-gram.c"
+#line 2103 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 15:
     break;
 
   case 15:

-/* Line 1721 of yacc.c  */
-#line 318 "src/parse-gram.y"
-    { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1721 of yacc.c  */
-#line 2320 "src/parse-gram.c"
-    break;
-
-  case 16:
-/* Line 1721 of yacc.c  */
-#line 320 "src/parse-gram.y"
+#line 311 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
     break;
 

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

     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));
     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));


@@ -2341,93 +2121,59 @@ yyreduce:
       muscle_code_grow ("initial_action", action.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
       muscle_code_grow ("initial_action", action.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
     break;
 

-  case 18:
-/* Line 1721 of yacc.c  */
-#line 333 "src/parse-gram.y"
+  case 17:
+#line 324 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2354 "src/parse-gram.c"
-    break;
-
-  case 19:
-/* Line 1721 of yacc.c  */
-#line 334 "src/parse-gram.y"
-    { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1721 of yacc.c  */
-#line 2362 "src/parse-gram.c"
+#line 2131 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 20:
-/* Line 1721 of yacc.c  */
-#line 335 "src/parse-gram.y"
+  case 18:
+#line 325 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2370 "src/parse-gram.c"
+#line 2137 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 21:
-/* Line 1721 of yacc.c  */
-#line 336 "src/parse-gram.y"
+  case 19:
+#line 326 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2378 "src/parse-gram.c"
+#line 2143 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 22:
-/* Line 1721 of yacc.c  */
-#line 337 "src/parse-gram.y"
+  case 20:
+#line 327 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2386 "src/parse-gram.c"
-    break;
-
-  case 23:
-/* Line 1721 of yacc.c  */
-#line 338 "src/parse-gram.y"
-    { spec_outfile = (yyvsp[0].chars); }
-/* Line 1721 of yacc.c  */
-#line 2394 "src/parse-gram.c"
+#line 2149 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 24:
-/* Line 1721 of yacc.c  */
-#line 339 "src/parse-gram.y"
+  case 21:
+#line 328 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2402 "src/parse-gram.c"
+#line 2155 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 25:
-/* Line 1721 of yacc.c  */
-#line 340 "src/parse-gram.y"
+  case 22:
+#line 329 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2410 "src/parse-gram.c"
+#line 2161 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 26:
-/* Line 1721 of yacc.c  */
-#line 340 "src/parse-gram.y"
+  case 23:
+#line 329 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2418 "src/parse-gram.c"
+#line 2167 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 27:
-/* Line 1721 of yacc.c  */
-#line 341 "src/parse-gram.y"
+  case 24:
+#line 330 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2426 "src/parse-gram.c"
+#line 2173 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 28:
-/* Line 1721 of yacc.c  */
-#line 343 "src/parse-gram.y"
+  case 25:
+#line 332 "src/parse-gram.y" /* yacc.c:1668  */

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


@@ -2451,199 +2197,165 @@ yyreduce:
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }

-/* Line 1721 of yacc.c  */
-#line 2456 "src/parse-gram.c"
+#line 2201 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 29:
-/* Line 1721 of yacc.c  */
-#line 366 "src/parse-gram.y"
+  case 26:
+#line 355 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2464 "src/parse-gram.c"
+#line 2207 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 30:
-/* Line 1721 of yacc.c  */
-#line 367 "src/parse-gram.y"
+  case 27:
+#line 356 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2472 "src/parse-gram.c"
+#line 2213 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 31:
-/* Line 1721 of yacc.c  */
-#line 368 "src/parse-gram.y"
+  case 28:
+#line 357 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2480 "src/parse-gram.c"
+#line 2219 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 33:
-/* Line 1721 of yacc.c  */
-#line 373 "src/parse-gram.y"
+  case 30:
+#line 362 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2488 "src/parse-gram.c"
+#line 2225 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 34:
-/* Line 1721 of yacc.c  */
-#line 374 "src/parse-gram.y"
+  case 31:
+#line 363 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2496 "src/parse-gram.c"
+#line 2231 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 37:
-/* Line 1721 of yacc.c  */
-#line 386 "src/parse-gram.y"
+  case 34:
+#line 375 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
     break;
 

-  case 38:
-/* Line 1721 of yacc.c  */
-#line 390 "src/parse-gram.y"
+  case 35:
+#line 379 "src/parse-gram.y" /* yacc.c:1668  */

     {
     {

-      symbol_list *list;
-      for (list = (yyvsp[0].list); list; list = list->next)
-        symbol_list_code_props_set (list, destructor, (yylsp[-1]), (yyvsp[-1].code));
-      symbol_list_free ((yyvsp[0].list));
-    }
-/* Line 1721 of yacc.c  */
-#line 2519 "src/parse-gram.c"
-    break;
-
-  case 39:
-/* Line 1721 of yacc.c  */
-#line 397 "src/parse-gram.y"
-    {
-      symbol_list *list;
-      for (list = (yyvsp[0].list); list; list = list->next)
-        symbol_list_code_props_set (list, printer, (yylsp[-1]), (yyvsp[-1].code));
-      symbol_list_free ((yyvsp[0].list));
+      code_props code;
+      code_props_symbol_action_init (&code, (yyvsp[-1].code), (yylsp[-1]));
+      code_props_translate_code (&code);
+      {
+        symbol_list *list;
+        for (list = (yyvsp[0].list); list; list = list->next)
+          symbol_list_code_props_set (list, (yyvsp[-2].code_type), &code);
+        symbol_list_free ((yyvsp[0].list));
+      }

     }
     }

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

     break;
 
     break;
 

-  case 40:
-/* Line 1721 of yacc.c  */
-#line 404 "src/parse-gram.y"
+  case 36:
+#line 391 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
     break;
 

-  case 41:
-/* Line 1721 of yacc.c  */
-#line 408 "src/parse-gram.y"
+  case 37:
+#line 395 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
     break;
 

-  case 42:
-/* Line 1721 of yacc.c  */
-#line 412 "src/parse-gram.y"
+  case 38:
+#line 399 "src/parse-gram.y" /* yacc.c:1668  */

     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
     break;
 

-  case 43:
-/* Line 1721 of yacc.c  */
-#line 419 "src/parse-gram.y"
+  case 39:
+#line 406 "src/parse-gram.y" /* yacc.c:1668  */

     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
     break;
 

-  case 44:
-/* Line 1721 of yacc.c  */
-#line 433 "src/parse-gram.y"
+  case 40:
+#line 416 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.code_type) = destructor; }
+#line 2297 "src/parse-gram.c" /* yacc.c:1668  */
+    break;
+
+  case 41:
+#line 417 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.code_type) = printer; }
+#line 2303 "src/parse-gram.c" /* yacc.c:1668  */
+    break;
+
+  case 42:
+#line 427 "src/parse-gram.y" /* yacc.c:1668  */

     {}
     {}

-/* Line 1721 of yacc.c  */
-#line 2584 "src/parse-gram.c"
+#line 2309 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 45:
-/* Line 1721 of yacc.c  */
-#line 434 "src/parse-gram.y"
+  case 43:
+#line 428 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2592 "src/parse-gram.c"
+#line 2315 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

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

     {
       union_seen = true;
     {
       union_seen = true;

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

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

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

     break;
 
     break;
 

-  case 47:
-/* Line 1721 of yacc.c  */
-#line 450 "src/parse-gram.y"
+  case 45:
+#line 444 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
     break;
 

-  case 48:
-/* Line 1721 of yacc.c  */
-#line 451 "src/parse-gram.y"
+  case 46:
+#line 445 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
     break;
 

-  case 49:
-/* Line 1721 of yacc.c  */
-#line 455 "src/parse-gram.y"
+  case 47:
+#line 449 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
     break;
 

-  case 50:
-/* Line 1721 of yacc.c  */
-#line 456 "src/parse-gram.y"
+  case 48:
+#line 450 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
     break;
 

-  case 51:
-/* Line 1721 of yacc.c  */
-#line 461 "src/parse-gram.y"
+  case 49:
+#line 455 "src/parse-gram.y" /* yacc.c:1668  */

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


@@ -2651,13 +2363,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 1721 of yacc.c  */
-#line 2656 "src/parse-gram.c"
+#line 2367 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 52:
-/* Line 1721 of yacc.c  */
-#line 472 "src/parse-gram.y"
+  case 50:
+#line 466 "src/parse-gram.y" /* yacc.c:1668  */

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


@@ -2669,412 +2379,345 @@ yyreduce:
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }

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

     break;
 
     break;
 

-  case 53:
-/* Line 1721 of yacc.c  */
-#line 486 "src/parse-gram.y"
+  case 51:
+#line 480 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
     break;
 

-  case 54:
-/* Line 1721 of yacc.c  */
-#line 487 "src/parse-gram.y"
+  case 52:
+#line 481 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
     break;
 

-  case 55:
-/* Line 1721 of yacc.c  */
-#line 488 "src/parse-gram.y"
+  case 53:
+#line 482 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
     break;
 

-  case 56:
-/* Line 1721 of yacc.c  */
-#line 489 "src/parse-gram.y"
+  case 54:
+#line 483 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2706 "src/parse-gram.c"
+#line 2407 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

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

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

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

     break;
 
     break;
 

-  case 58:
-/* Line 1721 of yacc.c  */
-#line 494 "src/parse-gram.y"
+  case 56:
+#line 488 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2722 "src/parse-gram.c"
+#line 2419 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 59:
-/* Line 1721 of yacc.c  */
-#line 500 "src/parse-gram.y"
+  case 57:
+#line 494 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 60:
     break;
 
   case 60:

-/* Line 1721 of yacc.c  */
-#line 502 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1721 of yacc.c  */
-#line 2738 "src/parse-gram.c"
+#line 506 "src/parse-gram.y" /* yacc.c:1668  */
+    {
+      (yyval.symbol) = (yyvsp[-1].symbol);
+      symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
+      symbol_class_set ((yyvsp[-1].symbol), token_sym, (yylsp[-1]), false);
+    }
+#line 2450 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 61:
     break;
 
   case 61:

-/* Line 1721 of yacc.c  */
-#line 506 "src/parse-gram.y"
-    { (yyval.symbol) = (yyvsp[0].symbol); }
-/* Line 1721 of yacc.c  */
-#line 2746 "src/parse-gram.c"
+#line 516 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+#line 2456 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 62:
     break;
 
   case 62:

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

     break;
 
   case 63:
     break;
 
   case 63:

-/* Line 1721 of yacc.c  */
-#line 513 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1721 of yacc.c  */
-#line 2762 "src/parse-gram.c"
+#line 522 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.list) = (yyvsp[0].list); }
+#line 2468 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 64:
     break;
 
   case 64:

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

     break;
 
   case 65:
     break;
 
   case 65:

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

     break;
 
   case 66:
     break;
 
   case 66:

-/* Line 1721 of yacc.c  */
-#line 520 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
-/* Line 1721 of yacc.c  */
-#line 2786 "src/parse-gram.c"
-    break;
-
-  case 67:
-/* Line 1721 of yacc.c  */
-#line 524 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1721 of yacc.c  */
-#line 2794 "src/parse-gram.c"
+#line 528 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
+#line 2486 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 68:
     break;
 
   case 68:

-/* Line 1721 of yacc.c  */
-#line 525 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1721 of yacc.c  */
-#line 2802 "src/parse-gram.c"
+#line 533 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.uniqstr) = uniqstr_new ("*"); }
+#line 2492 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 69:
     break;
 
   case 69:

-/* Line 1721 of yacc.c  */
-#line 526 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
-/* Line 1721 of yacc.c  */
-#line 2810 "src/parse-gram.c"
+#line 534 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.uniqstr) = uniqstr_new (""); }
+#line 2498 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 70:
     break;
 
   case 70:

-/* Line 1721 of yacc.c  */
-#line 527 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
-/* Line 1721 of yacc.c  */
-#line 2818 "src/parse-gram.c"
+#line 540 "src/parse-gram.y" /* yacc.c:1668  */
+    {
+      current_type = (yyvsp[0].uniqstr);
+      tag_seen = true;
+    }
+#line 2507 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 71:
     break;
 
   case 71:

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

     {
     {

-       current_type = (yyvsp[0].uniqstr);
-       tag_seen = true;
-     }
-/* Line 1721 of yacc.c  */
-#line 2829 "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 2516 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 72:
     break;
 
   case 72:

-/* Line 1721 of yacc.c  */
-#line 538 "src/parse-gram.y"
-    {
-       symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
-       symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
-     }
-/* Line 1721 of yacc.c  */
-#line 2840 "src/parse-gram.c"
-    break;
-
-  case 73:
-/* Line 1721 of yacc.c  */
-#line 543 "src/parse-gram.y"
+#line 550 "src/parse-gram.y" /* yacc.c:1668  */

     {
       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 1721 of yacc.c  */
-#line 2852 "src/parse-gram.c"
+#line 2526 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 74:
-/* Line 1721 of yacc.c  */
-#line 549 "src/parse-gram.y"
+  case 73:
+#line 556 "src/parse-gram.y" /* yacc.c:1668  */

     {
       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 1721 of yacc.c  */
-#line 2864 "src/parse-gram.c"
+#line 2536 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 75:
-/* Line 1721 of yacc.c  */
-#line 555 "src/parse-gram.y"
+  case 74:
+#line 562 "src/parse-gram.y" /* yacc.c:1668  */

     {
       symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
       symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
       symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
       symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));
     }
     {
       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 1721 of yacc.c  */
-#line 2877 "src/parse-gram.c"
+#line 2547 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 82:
-/* Line 1721 of yacc.c  */
-#line 585 "src/parse-gram.y"
+  case 81:
+#line 592 "src/parse-gram.y" /* yacc.c:1668  */

     {
       yyerrok;
     }
     {
       yyerrok;
     }

-/* Line 1721 of yacc.c  */
-#line 2887 "src/parse-gram.c"
+#line 2555 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 83:
-/* Line 1721 of yacc.c  */
-#line 591 "src/parse-gram.y"
+  case 82:
+#line 598 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2895 "src/parse-gram.c"
+#line 2561 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 84:
-/* Line 1721 of yacc.c  */
-#line 592 "src/parse-gram.y"
+  case 83:
+#line 599 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2906 "src/parse-gram.c"
+#line 2570 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 85:
-/* Line 1721 of yacc.c  */
-#line 599 "src/parse-gram.y"
+  case 84:
+#line 606 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2914 "src/parse-gram.c"
+#line 2576 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 86:
-/* Line 1721 of yacc.c  */
-#line 600 "src/parse-gram.y"
+  case 85:
+#line 607 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2922 "src/parse-gram.c"
+#line 2582 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 88:
-/* Line 1721 of yacc.c  */
-#line 606 "src/parse-gram.y"
+  case 87:
+#line 614 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2931 "src/parse-gram.c"
+#line 2589 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 89:
-/* Line 1721 of yacc.c  */
-#line 609 "src/parse-gram.y"
+  case 88:
+#line 617 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2939 "src/parse-gram.c"
+#line 2595 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 90:
-/* Line 1721 of yacc.c  */
-#line 611 "src/parse-gram.y"
+  case 89:
+#line 619 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2947 "src/parse-gram.c"
+#line 2601 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 91:
-/* Line 1721 of yacc.c  */
-#line 613 "src/parse-gram.y"
+  case 90:
+#line 621 "src/parse-gram.y" /* yacc.c:1668  */

     { 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 1721 of yacc.c  */
-#line 2955 "src/parse-gram.c"
+#line 2607 "src/parse-gram.c" /* yacc.c:1668  */
+    break;
+
+  case 91:
+#line 623 "src/parse-gram.y" /* yacc.c:1668  */
+    { grammar_current_rule_empty_set ((yylsp[0])); }
+#line 2613 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 92:
     break;
 
   case 92:

-/* Line 1721 of yacc.c  */
-#line 615 "src/parse-gram.y"
+#line 625 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2963 "src/parse-gram.c"
+#line 2619 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 93:
     break;
 
   case 93:

-/* Line 1721 of yacc.c  */
-#line 617 "src/parse-gram.y"
+#line 627 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2971 "src/parse-gram.c"
+#line 2625 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 94:
     break;
 
   case 94:

-/* Line 1721 of yacc.c  */
-#line 619 "src/parse-gram.y"
+#line 629 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2979 "src/parse-gram.c"
+#line 2631 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 95:
     break;
 
   case 95:

-/* Line 1721 of yacc.c  */
-#line 623 "src/parse-gram.y"
+#line 633 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2987 "src/parse-gram.c"
+#line 2637 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 96:
     break;
 
   case 96:

-/* Line 1721 of yacc.c  */
-#line 625 "src/parse-gram.y"
+#line 634 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 2995 "src/parse-gram.c"
+#line 2643 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 98:
     break;
 
   case 98:

-/* Line 1721 of yacc.c  */
-#line 636 "src/parse-gram.y"
+#line 645 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 3003 "src/parse-gram.c"
+#line 2649 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 99:
     break;
 
   case 99:

-/* Line 1721 of yacc.c  */
-#line 641 "src/parse-gram.y"
-    { (yyval.chars) = ""; }
-/* Line 1721 of yacc.c  */
-#line 3011 "src/parse-gram.c"
+#line 670 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; }
+#line 2655 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 100:
     break;
 
   case 100:

-/* Line 1721 of yacc.c  */
-#line 642 "src/parse-gram.y"
-    { (yyval.chars) = (yyvsp[0].uniqstr); }
-/* Line 1721 of yacc.c  */
-#line 3019 "src/parse-gram.c"
+#line 671 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.value).kind = muscle_keyword; (yyval.value).chars = (yyvsp[0].uniqstr); }
+#line 2661 "src/parse-gram.c" /* yacc.c:1668  */
+    break;
+
+  case 101:
+#line 672 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.value).kind = muscle_string;  (yyval.value).chars = (yyvsp[0].chars); }
+#line 2667 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 102:
     break;
 
   case 102:

-/* Line 1721 of yacc.c  */
-#line 653 "src/parse-gram.y"
+#line 673 "src/parse-gram.y" /* yacc.c:1668  */
+    { (yyval.value).kind = muscle_code;    (yyval.value).chars = (yyvsp[0].chars); }
+#line 2673 "src/parse-gram.c" /* yacc.c:1668  */
+    break;
+
+  case 103:
+#line 683 "src/parse-gram.y" /* yacc.c:1668  */

     {
       code_props plain_code;
     {
       code_props plain_code;

-      (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n';
+      (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\0';

       code_props_plain_init (&plain_code, (yyvsp[0].code)+1, (yylsp[0]));
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
       (yyval.chars) = plain_code.code;
     }
       code_props_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 1721 of yacc.c  */
-#line 3034 "src/parse-gram.c"
+#line 2686 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 103:
-/* Line 1721 of yacc.c  */
-#line 673 "src/parse-gram.y"
+  case 104:
+#line 703 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 3042 "src/parse-gram.c"
+#line 2692 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 104:
-/* Line 1721 of yacc.c  */
-#line 675 "src/parse-gram.y"
+  case 105:
+#line 705 "src/parse-gram.y" /* yacc.c:1668  */

     {
       (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 1721 of yacc.c  */
-#line 3054 "src/parse-gram.c"
+#line 2702 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 105:
-/* Line 1721 of yacc.c  */
-#line 683 "src/parse-gram.y"
+  case 106:
+#line 713 "src/parse-gram.y" /* yacc.c:1668  */

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

-/* Line 1721 of yacc.c  */
-#line 3062 "src/parse-gram.c"
+#line 2708 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 108:
-/* Line 1721 of yacc.c  */
-#line 695 "src/parse-gram.y"
+  case 109:
+#line 725 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
     break;
 

-  case 110:
-/* Line 1721 of yacc.c  */
-#line 704 "src/parse-gram.y"
+  case 111:
+#line 734 "src/parse-gram.y" /* yacc.c:1668  */

     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));


@@ -3083,13 +2726,11 @@ yyreduce:
       muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
       muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
 
     break;
 
 

-/* Line 1721 of yacc.c  */
-#line 3093 "src/parse-gram.c"
+#line 2734 "src/parse-gram.c" /* yacc.c:1668  */

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


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

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

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


@@ -3130,9 +2771,9 @@ yyreduce:
   goto yynewstate;
 
 
   goto yynewstate;
 
 

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

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


@@ -3143,7 +2784,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, \


@@ -3173,7 +2814,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;
       }


@@ -3219,7 +2860,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;


@@ -3264,7 +2905,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


@@ -3298,7 +2941,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


@@ -3312,7 +2955,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);


@@ -3332,13 +2975,9 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif

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

 }
 }

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

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


@@ -3392,16 +3031,17 @@ add_param (param_type type, char *decl, location loc)
 
     /* Strip the surrounding '{' and '}', and any blanks just inside
        the braces.  */
 
     /* Strip the surrounding '{' and '}', and any blanks just inside
        the braces.  */

-    while (*--p == ' ' || *p == '\t')
-      continue;
+    --p;
+  while (c_isspace ((unsigned char) *p))
+      --p;

     p[1] = '\0';
     p[1] = '\0';

-    while (*++decl == ' ' || *decl == '\t')
-      continue;
+    ++decl;
+  while (c_isspace ((unsigned char) *decl))
+      ++decl;

   }
 
   if (! name_start)
   }
 
   if (! name_start)

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

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


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

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

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


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

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

 }
 
 char const *
 }
 
 char const *