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 c87bad87e03130aa51a5248391ef5fb6c9e059a6..2cf9e86c815a0df084a556679b7c6547508bc36f 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.7.1087-c21e-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
 


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

-#define YYBISON_VERSION "2.7.1087-c21e-dirty"
+#define YYBISON_VERSION "2.7.1127-02879-dirty"

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


@@ -70,7 +70,7 @@
 
 
 /* Copy the first part of user declarations.  */
 
 
 /* Copy the first part of user declarations.  */

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

 /* Bison Grammar Parser                             -*- C -*-
 
    Copyright (C) 2002-2013 Free Software Foundation, Inc.
 /* Bison Grammar Parser                             -*- C -*-
 
    Copyright (C) 2002-2013 Free Software Foundation, Inc.


@@ -99,7 +99,6 @@
 #include "files.h"
 #include "getargs.h"
 #include "gram.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 "named-ref.h"
 #include "quotearg.h"
 #include "reader.h"


@@ -122,7 +121,7 @@ static void gram_error (location const *, char const *);
 /* A string that describes a char (e.g., 'a' -> "'a'").  */
 static char const *char_name (char);
 
 /* A string that describes a char (e.g., 'a' -> "'a'").  */
 static char const *char_name (char);
 

-#line 126 "src/parse-gram.c" /* yacc.c:357  */
+#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


@@ -160,10 +159,8 @@ static char const *char_name (char);
 extern int gram_debug;
 #endif
 /* "%code requires" blocks.  */
 extern int gram_debug;
 #endif
 /* "%code requires" blocks.  */

-#line 219 "src/parse-gram.y" /* yacc.c:373  */
+#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,


@@ -171,10 +168,11 @@ 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 178 "src/parse-gram.c" /* yacc.c:373  */
+#line 176 "src/parse-gram.c" /* yacc.c:372  */

 
 /* Token type.  */
 #ifndef GRAM_TOKENTYPE
 
 /* Token type.  */
 #ifndef GRAM_TOKENTYPE


@@ -183,145 +181,101 @@ extern int gram_debug;
   {
     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_UNION = 311,
     PERCENT_EMPTY = 312
   };
 #endif
     PERCENT_PARAM = 310,
     PERCENT_UNION = 311,
     PERCENT_EMPTY = 312
   };
 #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
-#define PERCENT_EMPTY 312

 
 /* Value type.  */
 #if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED
 typedef union GRAM_STYPE GRAM_STYPE;
 union GRAM_STYPE
 {
 
 /* Value type.  */
 #if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED
 typedef union GRAM_STYPE GRAM_STYPE;
 union GRAM_STYPE
 {

-#line 105 "src/parse-gram.y" /* yacc.c:373  */
+#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 243 "src/parse-gram.y" /* yacc.c:373  */
+#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  */

 
 

-  param_type param;
+  struct
+  {
+    char const *chars;
+    muscle_kind kind;
+  } value;

 
 

-#line 419 "src/parse-gram.y" /* yacc.c:373  */
-code_props_type code_type;

 
 

-#line 325 "src/parse-gram.c" /* yacc.c:373  */
+#line 279 "src/parse-gram.c" /* yacc.c:372  */

 };
 # define GRAM_STYPE_IS_TRIVIAL 1
 # define GRAM_STYPE_IS_DECLARED 1
 };
 # define GRAM_STYPE_IS_TRIVIAL 1
 # define GRAM_STYPE_IS_DECLARED 1


@@ -349,9 +303,9 @@ int gram_parse (void);
 
 /* Copy the second part of user declarations.  */
 
 
 /* Copy the second part of user declarations.  */
 

-#line 353 "src/parse-gram.c" /* yacc.c:376  */
+#line 307 "src/parse-gram.c" /* yacc.c:375  */

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

-#line 54 "src/parse-gram.y" /* yacc.c:377  */
+#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;


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

-#line 232 "src/parse-gram.y" /* yacc.c:377  */
+#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.
    *


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

-#line 399 "src/parse-gram.c" /* yacc.c:377  */
+#line 353 "src/parse-gram.c" /* yacc.c:376  */

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


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

-#define YYLAST   158
+#define YYLAST   165

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

-#define YYNRULES  110
+#define YYNRULES  111

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

-#define YYNSTATES  144
+#define YYNSTATES  145

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


@@ -630,18 +584,18 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {

-       0,   268,   268,   277,   278,   282,   283,   293,   297,   302,
-     303,   308,   313,   314,   315,   316,   321,   330,   331,   332,
-     333,   334,   335,   335,   336,   337,   361,   362,   363,   364,
-     368,   369,   378,   379,   380,   384,   396,   400,   404,   411,
-     422,   423,   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,   529,   530,   531,
-     536,   541,   546,   552,   558,   569,   570,   579,   580,   586,
-     587,   588,   595,   595,   603,   604,   605,   610,   613,   615,
-     617,   619,   621,   623,   625,   630,   631,   641,   642,   647,
-     648,   649,   658,   678,   680,   689,   694,   695,   700,   708,
-     709
+       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
 


@@ -650,10 +604,10 @@ static const yytype_uint16 yyrline[] =
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
    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\"",


@@ -663,16 +617,15 @@ static const char *const yytname[] =
   "\"%yacc\"", "\"{...}\"", "\"%?{...}\"", "\"[identifier]\"", "\"char\"",
   "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
   "\"|\"", "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"",
   "\"%yacc\"", "\"{...}\"", "\"%?{...}\"", "\"[identifier]\"", "\"char\"",
   "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
   "\"|\"", "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"",

-  "\"%param\"", "\"%union\"", "\"%empty\"", "$accept", "input",
-  "prologue_declarations", "prologue_declaration", "$@1", "params",
-  "grammar_declaration", "code_props_type", "union_name",
+  "\"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",
   "symbol_declaration", "$@2", "$@3", "precedence_declaration",
   "precedence_declarator", "tag.opt", "symbols.prec", "symbol.prec",
   "symbols.1", "generic_symlist", "generic_symlist_item", "tag",
   "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration",

-  "rules", "$@4", "rhses.1", "rhs", "named_ref.opt", "variable",
-  "content.opt", "braceless", "id", "id_colon", "symbol", "string_as_id",
-  "epilogue.opt", YY_NULL
+  "rules", "$@4", "rhses.1", "rhs", "named_ref.opt", "variable", "value",
+  "braceless", "id", "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL

 };
 #endif
 
 };
 #endif
 


@@ -690,35 +643,35 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
 };
 # endif
 

-#define YYPACT_NINF -99
+#define YYPACT_NINF -115

 
 #define yypact_value_is_default(Yystate) \
 
 #define yypact_value_is_default(Yystate) \

-  (!!((Yystate) == (-99)))
+  (!!((Yystate) == (-115)))

 
 

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

 
 #define yytable_value_is_error(Yytable_value) \
   0
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 
 #define yytable_value_is_error(Yytable_value) \
   0
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */

-static const yytype_int16 yypact[] =
+static const yytype_int8 yypact[] =

 {
 {

-     -99,     5,   102,   -99,   -99,   -99,   -48,   -99,   -99,   -99,
-     -99,   -99,   -99,    19,   -99,    27,    52,   -99,    56,    60,
-     -99,    67,   -99,    34,    73,    76,   -99,   -99,   -99,    86,
-      87,    88,     0,   -99,   -99,   -99,    15,   -99,   -99,   -99,
-      46,   -99,   -99,    54,   -99,   -99,    45,     4,     4,     0,
-     -99,    58,   -99,   -99,   -99,    31,   -99,   -99,   -99,   -99,
-     -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,
-     -99,   -99,    49,   -99,    50,     1,   -99,   -99,    61,    62,
-     -99,    58,    32,   -99,     0,   -99,   -99,     4,    84,     4,
-       0,   -99,   -99,   -99,   -99,   -99,   -99,   -99,    72,   -99,
-     -99,   -99,   -99,   -99,    64,   -99,   -99,   -99,   -99,    32,
-     -99,   -99,   -99,     0,   -99,   101,   -99,   114,   -99,   -99,
-     -99,   -99,   -99,   -99,   -99,   -99,   -99,    12,    26,   -99,
-     -99,     0,   138,    66,    61,   -99,   -99,    61,    26,   -99,
-     -99,   -99,   -99,   -99
+    -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[STATE-NUM] -- Default reduction number in state STATE-NUM.
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.


@@ -731,34 +684,34 @@ static const yytype_uint8 yydefact[] =
        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,
        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,

-     102,     0,    38,    98,    97,    99,    10,    12,    13,    14,
-      16,    17,    18,    21,    24,    25,   108,   104,   103,   106,
-      34,   107,     0,   105,     0,     0,    77,    79,    95,     0,
+     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,
       43,     0,     0,    56,     0,    70,    75,    48,    71,    46,

-      49,    61,    39,   101,   100,     8,    81,    80,     0,    78,
-       2,    96,    82,    31,    23,    44,    67,    68,    69,    35,
-      63,    66,    65,    50,    57,    59,    76,    72,    73,    62,
-     110,    87,    30,    64,    58,    60,    74,    83,    84,    87,
-      86,     0,     0,     0,    95,    90,    91,    95,    85,    92,
-      93,    94,    89,    88
+      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].  */
 };
 
   /* YYPGOTO[NTERM-NUM].  */

-static const yytype_int16 yypgoto[] =
+static const yytype_int8 yypgoto[] =

 {
 {

-     -99,   -99,   -99,   -99,   -99,   -99,   141,   -99,   -99,   -99,
-     -99,   -99,   -99,   -99,   -99,   -99,    33,   -99,   -99,    35,
-     -99,    -7,    97,   -99,    74,   -99,   -99,   -99,    18,   -98,
-     -99,   -99,   -13,     6,   -99,   -32,   -73,   -99
+    -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].  */
 static const yytype_int16 yydefgoto[] =
 {
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {

-      -1,     1,     2,    41,    79,   104,    74,    43,    81,    44,
-      48,    47,    45,    46,    84,   113,   114,    90,   109,   110,
-     111,    86,    87,    75,    76,    77,   121,   127,   128,   102,
-      55,    95,    52,    69,    78,   112,    71,   100
+      -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
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If


@@ -766,63 +719,65 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {

-      70,  -109,    72,    66,    49,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,   118,    72,    91,    13,    14,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    66,
-      53,    26,    13,    14,    93,    66,   142,    32,    92,   143,
-     131,   132,   133,    67,   126,    26,    68,    67,    73,    98,
-      68,    32,   115,    88,    88,    56,    85,    40,   119,    50,
-      57,   129,    73,   130,    58,    51,   134,   135,   105,    67,
-      59,    40,    68,    54,    60,    67,    61,    94,    68,    62,
-     116,   115,   116,   136,   106,   107,   108,    66,   117,    63,
-      64,    65,    80,    88,    82,    88,   137,    83,    50,   139,
-      96,    97,   103,   101,   122,   125,   137,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,   120,    66,   141,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,   140,    42,   123,    89,   124,   138,     0,    99,
-      36,     0,    37,    38,     0,     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,    52,     0,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    88,     1,    49,    17,    18,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,     3,
-       3,    30,    17,    18,     3,     3,   134,    36,    51,   137,
-      14,    15,    16,    43,   117,    30,    46,    43,    47,    48,
-      46,    36,    84,    47,    48,     3,    52,    56,    90,    40,
-       4,    49,    47,    51,     4,    46,    40,    41,    81,    43,
-       3,    56,    46,    46,    40,    43,     3,    46,    46,     3,
-      87,   113,    89,    57,    52,    53,    54,     3,     4,     3,
-       3,     3,    46,    87,    40,    89,   128,    52,    40,   131,
-      51,    51,    40,    42,    40,     4,   138,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    44,     3,    52,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,     4,     2,   109,    48,   113,   129,    -1,    75,
-      48,    -1,    50,    51,    -1,    -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

 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {

-       0,    59,    60,     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,    61,    64,    65,    67,    70,    71,    69,    68,    52,
-      40,    46,    90,     3,    46,    88,     3,     4,     4,     3,
-      40,     3,     3,     3,     3,     3,     3,    43,    46,    91,
-      93,    94,     1,    47,    64,    81,    82,    83,    92,    62,
-      46,    66,    40,    52,    72,    52,    79,    80,    91,    80,
-      75,    93,    90,     3,    46,    89,    51,    51,    48,    82,
-      95,    42,    87,    40,    63,    90,    52,    53,    54,    76,
-      77,    78,    93,    73,    74,    93,    79,     4,    94,    93,
-      44,    84,    40,    77,    74,     4,    94,    85,    86,    49,
-      51,    14,    15,    16,    40,    41,    57,    93,    86,    93,
-       4,    52,    87,    87
+       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.  */


@@ -838,8 +793,8 @@ static const yytype_uint8 yyr1[] =
       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,
       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,    90,    91,    91,    92,    93,    93,    94,    95,
-      95
+      89,    89,    89,    90,    91,    91,    92,    93,    93,    94,
+      95,    95

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


@@ -855,8 +810,8 @@ static const yytype_uint8 yyr2[] =
        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,     2,     2,     3,     1,     2,     1,     2,     1,
        2,     2,     0,     4,     1,     3,     2,     0,     3,     3,
        2,     2,     3,     3,     3,     0,     1,     1,     1,     0,

-       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
-       2
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       0,     2

 };
 
 
 };
 
 


@@ -1012,78 +967,78 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
   switch (yytype)
     {
     case 3: /* "string"  */
   switch (yytype)
     {
     case 3: /* "string"  */

-#line 192 "src/parse-gram.y" /* yacc.c:707  */
+#line 183 "src/parse-gram.y" /* yacc.c:706  */

       { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); }
       { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); }

-#line 1018 "src/parse-gram.c" /* yacc.c:707  */
-        break;
-
-    case 4: /* "integer"  */
-#line 205 "src/parse-gram.y" /* yacc.c:707  */
-      { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
-#line 1024 "src/parse-gram.c" /* yacc.c:707  */
+#line 973 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-    case 24: /* "%<flag>"  */
-#line 201 "src/parse-gram.y" /* yacc.c:707  */
+    case 23: /* "%<flag>"  */
+#line 193 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); }
       { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); }

-#line 1030 "src/parse-gram.c" /* yacc.c:707  */
+#line 979 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-    case 40: /* "{...}"  */
-#line 194 "src/parse-gram.y" /* yacc.c:707  */
+    case 39: /* "{...}"  */
+#line 185 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
       { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }

-#line 1036 "src/parse-gram.c" /* yacc.c:707  */
+#line 985 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-    case 42: /* "[identifier]"  */
-#line 199 "src/parse-gram.y" /* yacc.c:707  */
+    case 41: /* "[identifier]"  */
+#line 191 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); }
       { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); }

-#line 1042 "src/parse-gram.c" /* yacc.c:707  */
+#line 991 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-    case 43: /* "char"  */
-#line 186 "src/parse-gram.y" /* yacc.c:707  */
+    case 42: /* "char"  */
+#line 172 "src/parse-gram.y" /* yacc.c:706  */

       { fputs (char_name (((*yyvaluep).character)), yyo); }
       { fputs (char_name (((*yyvaluep).character)), yyo); }

-#line 1048 "src/parse-gram.c" /* yacc.c:707  */
+#line 997 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-    case 44: /* "epilogue"  */
-#line 194 "src/parse-gram.y" /* yacc.c:707  */
+    case 43: /* "epilogue"  */
+#line 185 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
       { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }

-#line 1054 "src/parse-gram.c" /* yacc.c:707  */
+#line 1003 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-    case 46: /* "identifier"  */
-#line 198 "src/parse-gram.y" /* yacc.c:707  */
+    case 45: /* "identifier"  */
+#line 190 "src/parse-gram.y" /* yacc.c:706  */

       { fputs (((*yyvaluep).uniqstr), yyo); }
       { fputs (((*yyvaluep).uniqstr), yyo); }

-#line 1060 "src/parse-gram.c" /* yacc.c:707  */
+#line 1009 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-    case 47: /* "identifier:"  */
-#line 200 "src/parse-gram.y" /* yacc.c:707  */
+    case 46: /* "identifier:"  */
+#line 192 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); }
       { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); }

-#line 1066 "src/parse-gram.c" /* yacc.c:707  */
+#line 1015 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-    case 50: /* "%{...%}"  */
-#line 194 "src/parse-gram.y" /* yacc.c:707  */
+    case 49: /* "%{...%}"  */
+#line 185 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
       { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }

-#line 1072 "src/parse-gram.c" /* yacc.c:707  */
+#line 1021 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-    case 52: /* "<tag>"  */
-#line 202 "src/parse-gram.y" /* yacc.c:707  */
+    case 51: /* "<tag>"  */
+#line 194 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
       { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }

-#line 1078 "src/parse-gram.c" /* yacc.c:707  */
+#line 1027 "src/parse-gram.c" /* yacc.c:706  */
+        break;
+
+    case 54: /* "integer"  */
+#line 198 "src/parse-gram.y" /* yacc.c:706  */
+      { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
+#line 1033 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
     case 55: /* "%param"  */
         break;
 
     case 55: /* "%param"  */

-#line 248 "src/parse-gram.y" /* yacc.c:707  */
+#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 param_ ## In: fputs ("%" #Out, yyo); break

       CASE (lex,   lex-param);
       CASE (parse, parse-param);
       CASE (both,  param);
       CASE (lex,   lex-param);
       CASE (parse, parse-param);
       CASE (both,  param);


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

-#line 1095 "src/parse-gram.c" /* yacc.c:707  */
+#line 1050 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
     case 65: /* code_props_type  */
         break;
 
     case 65: /* code_props_type  */

-#line 420 "src/parse-gram.y" /* yacc.c:707  */
+#line 414 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); }
       { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); }

-#line 1101 "src/parse-gram.c" /* yacc.c:707  */
+#line 1056 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
     case 74: /* symbol.prec  */
         break;
 
     case 74: /* symbol.prec  */

-#line 208 "src/parse-gram.y" /* yacc.c:707  */
+#line 202 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
       { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }

-#line 1107 "src/parse-gram.c" /* yacc.c:707  */
+#line 1062 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
     case 78: /* tag  */
         break;
 
     case 78: /* tag  */

-#line 202 "src/parse-gram.y" /* yacc.c:707  */
+#line 194 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
       { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }

-#line 1113 "src/parse-gram.c" /* yacc.c:707  */
+#line 1068 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
     case 88: /* variable  */
         break;
 
     case 88: /* variable  */

-#line 198 "src/parse-gram.y" /* yacc.c:707  */
+#line 190 "src/parse-gram.y" /* yacc.c:706  */

       { fputs (((*yyvaluep).uniqstr), yyo); }
       { fputs (((*yyvaluep).uniqstr), yyo); }

-#line 1119 "src/parse-gram.c" /* yacc.c:707  */
+#line 1074 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
         break;
 

-    case 89: /* content.opt  */
-#line 194 "src/parse-gram.y" /* yacc.c:707  */
-      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-#line 1125 "src/parse-gram.c" /* yacc.c:707  */
+    case 89: /* value  */
+#line 660 "src/parse-gram.y" /* yacc.c:706  */
+      {
+  switch (((*yyvaluep).value).kind)
+    {
+    case muscle_code:    fprintf (yyo,  "{%s}",  ((*yyvaluep).value).chars); break;
+    case muscle_keyword: fprintf (yyo,   "%s",   ((*yyvaluep).value).chars); break;
+    case muscle_string:  fprintf (yyo, "\"%s\"", ((*yyvaluep).value).chars); break;
+    }
+}
+#line 1087 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
     case 90: /* braceless  */
         break;
 
     case 90: /* braceless  */

-#line 194 "src/parse-gram.y" /* yacc.c:707  */
+#line 185 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
       { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }

-#line 1131 "src/parse-gram.c" /* yacc.c:707  */
+#line 1093 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
     case 91: /* id  */
         break;
 
     case 91: /* id  */

-#line 208 "src/parse-gram.y" /* yacc.c:707  */
+#line 202 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
       { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }

-#line 1137 "src/parse-gram.c" /* yacc.c:707  */
+#line 1099 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
     case 92: /* id_colon  */
         break;
 
     case 92: /* id_colon  */

-#line 209 "src/parse-gram.y" /* yacc.c:707  */
+#line 203 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); }
       { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); }

-#line 1143 "src/parse-gram.c" /* yacc.c:707  */
+#line 1105 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
     case 93: /* symbol  */
         break;
 
     case 93: /* symbol  */

-#line 208 "src/parse-gram.y" /* yacc.c:707  */
+#line 202 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
       { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }

-#line 1149 "src/parse-gram.c" /* yacc.c:707  */
+#line 1111 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
     case 94: /* string_as_id  */
         break;
 
     case 94: /* string_as_id  */

-#line 208 "src/parse-gram.y" /* yacc.c:707  */
+#line 202 "src/parse-gram.y" /* yacc.c:706  */

       { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
       { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }

-#line 1155 "src/parse-gram.c" /* yacc.c:707  */
+#line 1117 "src/parse-gram.c" /* yacc.c:706  */

         break;
 
       default:
         break;
 
       default:


@@ -1866,14 +1828,14 @@ YYLTYPE yylloc = yyloc_default;
   yychar = YYEMPTY; /* Cause a token to be read.  */
 
 /* User initialization code.  */
   yychar = YYEMPTY; /* Cause a token to be read.  */
 
 /* User initialization code.  */

-#line 97 "src/parse-gram.y" /* yacc.c:1452  */
+#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 1877 "src/parse-gram.c" /* yacc.c:1452  */
+#line 1839 "src/parse-gram.c" /* yacc.c:1451  */

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


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

-#line 284 "src/parse-gram.y" /* yacc.c:1669  */
+#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]));


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

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

     break;
 
   case 7:
     break;
 
   case 7:

-#line 294 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2089 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2051 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 8:
     break;
 
   case 8:

-#line 298 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2098 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2060 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 9:
     break;
 
   case 9:

-#line 302 "src/parse-gram.y" /* yacc.c:1669  */
+#line 295 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 10:
     break;
 
   case 10:

-#line 304 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2113 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2075 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 11:
     break;
 
   case 11:

-#line 309 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2122 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2085 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 12:
     break;
 
   case 12:

-#line 313 "src/parse-gram.y" /* yacc.c:1669  */
+#line 307 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2128 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2091 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 13:
     break;
 
   case 13:

-#line 314 "src/parse-gram.y" /* yacc.c:1669  */
+#line 308 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2134 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2097 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 14:
     break;
 
   case 14:

-#line 315 "src/parse-gram.y" /* yacc.c:1669  */
+#line 309 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2140 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2103 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 15:
     break;
 
   case 15:

-#line 317 "src/parse-gram.y" /* yacc.c:1669  */
+#line 311 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 16:
     break;
 
   case 16:

-#line 322 "src/parse-gram.y" /* yacc.c:1669  */
+#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]));


@@ -2158,59 +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 2162 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2125 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 17:
     break;
 
   case 17:

-#line 330 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2168 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2131 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 18:
     break;
 
   case 18:

-#line 331 "src/parse-gram.y" /* yacc.c:1669  */
+#line 325 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2174 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2137 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 19:
     break;
 
   case 19:

-#line 332 "src/parse-gram.y" /* yacc.c:1669  */
+#line 326 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2180 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2143 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 20:
     break;
 
   case 20:

-#line 333 "src/parse-gram.y" /* yacc.c:1669  */
+#line 327 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2186 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2149 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 21:
     break;
 
   case 21:

-#line 334 "src/parse-gram.y" /* yacc.c:1669  */
+#line 328 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2192 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2155 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 22:
     break;
 
   case 22:

-#line 335 "src/parse-gram.y" /* yacc.c:1669  */
+#line 329 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2198 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2161 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 23:
     break;
 
   case 23:

-#line 335 "src/parse-gram.y" /* yacc.c:1669  */
+#line 329 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2204 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2167 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 24:
     break;
 
   case 24:

-#line 336 "src/parse-gram.y" /* yacc.c:1669  */
+#line 330 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2210 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2173 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 25:
     break;
 
   case 25:

-#line 338 "src/parse-gram.y" /* yacc.c:1669  */
+#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, '/'))


@@ -2234,49 +2197,49 @@ yyreduce:
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }

-#line 2238 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2201 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 26:
     break;
 
   case 26:

-#line 361 "src/parse-gram.y" /* yacc.c:1669  */
+#line 355 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2244 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2207 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 27:
     break;
 
   case 27:

-#line 362 "src/parse-gram.y" /* yacc.c:1669  */
+#line 356 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2250 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2213 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 28:
     break;
 
   case 28:

-#line 363 "src/parse-gram.y" /* yacc.c:1669  */
+#line 357 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2256 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2219 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 30:
     break;
 
   case 30:

-#line 368 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2262 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2225 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 31:
     break;
 
   case 31:

-#line 369 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2268 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2231 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 34:
     break;
 
   case 34:

-#line 381 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2276 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2239 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 35:
     break;
 
   case 35:

-#line 385 "src/parse-gram.y" /* yacc.c:1669  */
+#line 379 "src/parse-gram.y" /* yacc.c:1668  */

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


@@ -2288,111 +2251,111 @@ yyreduce:
         symbol_list_free ((yyvsp[0].list));
       }
     }
         symbol_list_free ((yyvsp[0].list));
       }
     }

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

     break;
 
   case 36:
     break;
 
   case 36:

-#line 397 "src/parse-gram.y" /* yacc.c:1669  */
+#line 391 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 37:
     break;
 
   case 37:

-#line 401 "src/parse-gram.y" /* yacc.c:1669  */
+#line 395 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 38:
     break;
 
   case 38:

-#line 405 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2319 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2282 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 39:
     break;
 
   case 39:

-#line 412 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2328 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2291 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 40:
     break;
 
   case 40:

-#line 422 "src/parse-gram.y" /* yacc.c:1669  */
+#line 416 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2334 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2297 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 41:
     break;
 
   case 41:

-#line 423 "src/parse-gram.y" /* yacc.c:1669  */
+#line 417 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 42:
     break;
 
   case 42:

-#line 433 "src/parse-gram.y" /* yacc.c:1669  */
+#line 427 "src/parse-gram.y" /* yacc.c:1668  */

     {}
     {}

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

     break;
 
   case 43:
     break;
 
   case 43:

-#line 434 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2352 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2315 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 44:
     break;
 
   case 44:

-#line 439 "src/parse-gram.y" /* yacc.c:1669  */
+#line 433 "src/parse-gram.y" /* yacc.c:1668  */

     {
       union_seen = true;
       muscle_code_grow ("union_members", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
     {
       union_seen = true;
       muscle_code_grow ("union_members", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }

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

     break;
 
   case 45:
     break;
 
   case 45:

-#line 450 "src/parse-gram.y" /* yacc.c:1669  */
+#line 444 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 46:
     break;
 
   case 46:

-#line 451 "src/parse-gram.y" /* yacc.c:1669  */
+#line 445 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 47:
     break;
 
   case 47:

-#line 455 "src/parse-gram.y" /* yacc.c:1669  */
+#line 449 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 48:
     break;
 
   case 48:

-#line 456 "src/parse-gram.y" /* yacc.c:1669  */
+#line 450 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 49:
     break;
 
   case 49:

-#line 461 "src/parse-gram.y" /* yacc.c:1669  */
+#line 455 "src/parse-gram.y" /* yacc.c:1668  */

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


@@ -2400,11 +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 2404 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2367 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 50:
     break;
 
   case 50:

-#line 472 "src/parse-gram.y" /* yacc.c:1669  */
+#line 466 "src/parse-gram.y" /* yacc.c:1668  */

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


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

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

     break;
 
   case 51:
     break;
 
   case 51:

-#line 486 "src/parse-gram.y" /* yacc.c:1669  */
+#line 480 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 52:
     break;
 
   case 52:

-#line 487 "src/parse-gram.y" /* yacc.c:1669  */
+#line 481 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 53:
     break;
 
   case 53:

-#line 488 "src/parse-gram.y" /* yacc.c:1669  */
+#line 482 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 54:
     break;
 
   case 54:

-#line 489 "src/parse-gram.y" /* yacc.c:1669  */
+#line 483 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2444 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2407 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 55:
     break;
 
   case 55:

-#line 493 "src/parse-gram.y" /* yacc.c:1669  */
+#line 487 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 56:
     break;
 
   case 56:

-#line 494 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2456 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2419 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 57:
     break;
 
   case 57:

-#line 500 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2462 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2425 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 58:
     break;
 
   case 58:

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

-#line 2468 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2431 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 59:
     break;
 
   case 59:

-#line 506 "src/parse-gram.y" /* yacc.c:1669  */
-    { (yyval.symbol) = (yyvsp[0].symbol); }
-#line 2474 "src/parse-gram.c" /* yacc.c:1669  */
+#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 507 "src/parse-gram.y" /* yacc.c:1669  */
-    { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
-#line 2480 "src/parse-gram.c" /* yacc.c:1669  */
+#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 513 "src/parse-gram.y" /* yacc.c:1669  */
+#line 516 "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 2486 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2456 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 62:
     break;
 
   case 62:

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

-#line 2492 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2462 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 63:
     break;
 
   case 63:

-#line 519 "src/parse-gram.y" /* yacc.c:1669  */
+#line 522 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2498 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2468 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 64:
     break;
 
   case 64:

-#line 520 "src/parse-gram.y" /* yacc.c:1669  */
+#line 523 "src/parse-gram.y" /* yacc.c:1668  */

     { (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); }
     { (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); }

-#line 2504 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2474 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 65:
     break;
 
   case 65:

-#line 524 "src/parse-gram.y" /* yacc.c:1669  */
+#line 527 "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 2510 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2480 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 66:
     break;
 
   case 66:

-#line 525 "src/parse-gram.y" /* yacc.c:1669  */
+#line 528 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 68:
     break;
 
   case 68:

-#line 530 "src/parse-gram.y" /* yacc.c:1669  */
+#line 533 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2522 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2492 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 69:
     break;
 
   case 69:

-#line 531 "src/parse-gram.y" /* yacc.c:1669  */
+#line 534 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2528 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2498 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 70:
     break;
 
   case 70:

-#line 537 "src/parse-gram.y" /* yacc.c:1669  */
+#line 540 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 71:
     break;
 
   case 71:

-#line 542 "src/parse-gram.y" /* yacc.c:1669  */
+#line 545 "src/parse-gram.y" /* yacc.c:1668  */

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

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

     break;
 
   case 72:
     break;
 
   case 72:

-#line 547 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2556 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2526 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 73:
     break;
 
   case 73:

-#line 553 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2566 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2536 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 74:
     break;
 
   case 74:

-#line 559 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2577 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2547 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 81:
     break;
 
   case 81:

-#line 589 "src/parse-gram.y" /* yacc.c:1669  */
+#line 592 "src/parse-gram.y" /* yacc.c:1668  */

     {
       yyerrok;
     }
     {
       yyerrok;
     }

-#line 2585 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2555 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 82:
     break;
 
   case 82:

-#line 595 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2591 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2561 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 83:
     break;
 
   case 83:

-#line 596 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2600 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2570 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 84:
     break;
 
   case 84:

-#line 603 "src/parse-gram.y" /* yacc.c:1669  */
+#line 606 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2606 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2576 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 85:
     break;
 
   case 85:

-#line 604 "src/parse-gram.y" /* yacc.c:1669  */
+#line 607 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2612 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2582 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 87:
     break;
 
   case 87:

-#line 611 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2619 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2589 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 88:
     break;
 
   case 88:

-#line 614 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2625 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2595 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 89:
     break;
 
   case 89:

-#line 616 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2631 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2601 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 90:
     break;
 
   case 90:

-#line 618 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2637 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2607 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 91:
     break;
 
   case 91:

-#line 620 "src/parse-gram.y" /* yacc.c:1669  */
+#line 623 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2643 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2613 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 92:
     break;
 
   case 92:

-#line 622 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2649 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2619 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 93:
     break;
 
   case 93:

-#line 624 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2655 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2625 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 94:
     break;
 
   case 94:

-#line 626 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2661 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2631 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 95:
     break;
 
   case 95:

-#line 630 "src/parse-gram.y" /* yacc.c:1669  */
+#line 633 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2667 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2637 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 96:
     break;
 
   case 96:

-#line 631 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2673 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2643 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 98:
     break;
 
   case 98:

-#line 642 "src/parse-gram.y" /* yacc.c:1669  */
+#line 645 "src/parse-gram.y" /* yacc.c:1668  */

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

-#line 2679 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2649 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
   case 99:
     break;
 
   case 99:

-#line 647 "src/parse-gram.y" /* yacc.c:1669  */
-    { (yyval.chars) = ""; }
-#line 2685 "src/parse-gram.c" /* yacc.c:1669  */
+#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 648 "src/parse-gram.y" /* yacc.c:1669  */
-    { (yyval.chars) = (yyvsp[0].uniqstr); }
-#line 2691 "src/parse-gram.c" /* yacc.c:1669  */
+#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:
     break;
 
   case 101:

-#line 649 "src/parse-gram.y" /* yacc.c:1669  */
-    { (yyval.chars) = (yyvsp[0].chars); }
-#line 2697 "src/parse-gram.c" /* yacc.c:1669  */
+#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 659 "src/parse-gram.y" /* yacc.c:1669  */
+#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 2710 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2686 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 103:
-#line 679 "src/parse-gram.y" /* yacc.c:1669  */
+  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 2716 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2692 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 104:
-#line 681 "src/parse-gram.y" /* yacc.c:1669  */
+  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 2726 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2702 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 105:
-#line 689 "src/parse-gram.y" /* yacc.c:1669  */
+  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 2732 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2708 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 108:
-#line 701 "src/parse-gram.y" /* yacc.c:1669  */
+  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 2741 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2717 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
     break;
 

-  case 110:
-#line 710 "src/parse-gram.y" /* yacc.c:1669  */
+  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]));


@@ -2750,11 +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 2754 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2730 "src/parse-gram.c" /* yacc.c:1668  */

     break;
 
 
     break;
 
 

-#line 2758 "src/parse-gram.c" /* yacc.c:1669  */
+#line 2734 "src/parse-gram.c" /* yacc.c:1668  */

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


@@ -3001,7 +2977,7 @@ yyreturn:
 #endif
   return yyresult;
 }
 #endif
   return yyresult;
 }

-#line 720 "src/parse-gram.y" /* yacc.c:1929  */
+#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