Implement %define lr.default_rules.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 5613294e0dcb7817895a6a4d34a0ef99543d1a0a..fd22575ad46ae2bbf9f5aa79a5732fddb51c8c95 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,9 +1,9 @@
-/* A Bison parser, made by GNU Bison 2.4.149-dcb5-dirty.  */
+/* A Bison parser, made by GNU Bison 2.4.294-184e3.  */

 
 /* Implementation for Bison's Yacc-like parsers in C
 
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 
 /* Implementation for Bison's Yacc-like parsers in C
 
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,

-   2007, 2008 Free Software Foundation, Inc.
+   2007, 2008, 2009 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


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

-#define YYBISON_VERSION "2.4.149-dcb5-dirty"
+#define YYBISON_VERSION "2.4.294-184e3"

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


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

-

 /* Line 191 of yacc.c  */
 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
 /* Line 191 of yacc.c  */
 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 

-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software

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


@@ -104,7 +103,7 @@
 #include "files.h"
 #include "getargs.h"
 #include "gram.h"
 #include "files.h"
 #include "getargs.h"
 #include "gram.h"

-#include "muscle_tab.h"
+#include "muscle-tab.h"

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


@@ -148,9 +147,8 @@ static int current_prec = 0;
 #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 191 of yacc.c  */
 /* Line 191 of yacc.c  */

-#line 154 "../../../src/parse-gram.c"
+#line 152 "../../src/parse-gram.c"

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG


@@ -193,46 +191,43 @@ static int current_prec = 0;
      PERCENT_DPREC = 270,
      PERCENT_MERGE = 271,
      PERCENT_CODE = 272,
      PERCENT_DPREC = 270,
      PERCENT_MERGE = 271,
      PERCENT_CODE = 272,

-     PERCENT_DEBUG = 273,
-     PERCENT_DEFAULT_PREC = 274,
-     PERCENT_DEFINE = 275,
-     PERCENT_DEFINES = 276,
-     PERCENT_ERROR_VERBOSE = 277,
-     PERCENT_EXPECT = 278,
-     PERCENT_EXPECT_RR = 279,
-     PERCENT_FILE_PREFIX = 280,
-     PERCENT_GLR_PARSER = 281,
-     PERCENT_INITIAL_ACTION = 282,
-     PERCENT_LANGUAGE = 283,
-     PERCENT_LEX_PARAM = 284,
-     PERCENT_LOCATIONS = 285,
-     PERCENT_NAME_PREFIX = 286,
-     PERCENT_NO_DEFAULT_PREC = 287,
-     PERCENT_NO_LINES = 288,
-     PERCENT_NONDETERMINISTIC_PARSER = 289,
-     PERCENT_OUTPUT = 290,
-     PERCENT_PARSE_PARAM = 291,
-     PERCENT_PURE_PARSER = 292,
-     PERCENT_REQUIRE = 293,
-     PERCENT_SKELETON = 294,
-     PERCENT_START = 295,
-     PERCENT_TOKEN_TABLE = 296,
-     PERCENT_VERBOSE = 297,
-     PERCENT_YACC = 298,
-     BRACED_CODE = 299,
-     CHAR = 300,
-     EPILOGUE = 301,
-     EQUAL = 302,
-     ID = 303,
-     ID_COLON = 304,
-     PERCENT_PERCENT = 305,
-     PIPE = 306,
-     PROLOGUE = 307,
-     SEMICOLON = 308,
-     TYPE = 309,
-     TYPE_TAG_ANY = 310,
-     TYPE_TAG_NONE = 311,
-     PERCENT_UNION = 312
+     PERCENT_DEFAULT_PREC = 273,
+     PERCENT_DEFINE = 274,
+     PERCENT_DEFINES = 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_LEX_PARAM = 283,
+     PERCENT_NAME_PREFIX = 284,
+     PERCENT_NO_DEFAULT_PREC = 285,
+     PERCENT_NO_LINES = 286,
+     PERCENT_NONDETERMINISTIC_PARSER = 287,
+     PERCENT_OUTPUT = 288,
+     PERCENT_PARSE_PARAM = 289,
+     PERCENT_REQUIRE = 290,
+     PERCENT_SKELETON = 291,
+     PERCENT_START = 292,
+     PERCENT_TOKEN_TABLE = 293,
+     PERCENT_VERBOSE = 294,
+     PERCENT_YACC = 295,
+     BRACED_CODE = 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,
+     PERCENT_UNION = 309

    };
 #endif
 /* Tokens.  */
    };
 #endif
 /* Tokens.  */


@@ -252,46 +247,43 @@ static int current_prec = 0;
 #define PERCENT_DPREC 270
 #define PERCENT_MERGE 271
 #define PERCENT_CODE 272
 #define PERCENT_DPREC 270
 #define PERCENT_MERGE 271
 #define PERCENT_CODE 272

-#define PERCENT_DEBUG 273
-#define PERCENT_DEFAULT_PREC 274
-#define PERCENT_DEFINE 275
-#define PERCENT_DEFINES 276
-#define PERCENT_ERROR_VERBOSE 277
-#define PERCENT_EXPECT 278
-#define PERCENT_EXPECT_RR 279
-#define PERCENT_FILE_PREFIX 280
-#define PERCENT_GLR_PARSER 281
-#define PERCENT_INITIAL_ACTION 282
-#define PERCENT_LANGUAGE 283
-#define PERCENT_LEX_PARAM 284
-#define PERCENT_LOCATIONS 285
-#define PERCENT_NAME_PREFIX 286
-#define PERCENT_NO_DEFAULT_PREC 287
-#define PERCENT_NO_LINES 288
-#define PERCENT_NONDETERMINISTIC_PARSER 289
-#define PERCENT_OUTPUT 290
-#define PERCENT_PARSE_PARAM 291
-#define PERCENT_PURE_PARSER 292
-#define PERCENT_REQUIRE 293
-#define PERCENT_SKELETON 294
-#define PERCENT_START 295
-#define PERCENT_TOKEN_TABLE 296
-#define PERCENT_VERBOSE 297
-#define PERCENT_YACC 298
-#define BRACED_CODE 299
-#define CHAR 300
-#define EPILOGUE 301
-#define EQUAL 302
-#define ID 303
-#define ID_COLON 304
-#define PERCENT_PERCENT 305
-#define PIPE 306
-#define PROLOGUE 307
-#define SEMICOLON 308
-#define TYPE 309
-#define TYPE_TAG_ANY 310
-#define TYPE_TAG_NONE 311
-#define PERCENT_UNION 312
+#define PERCENT_DEFAULT_PREC 273
+#define PERCENT_DEFINE 274
+#define PERCENT_DEFINES 275
+#define PERCENT_EXPECT 276
+#define PERCENT_EXPECT_RR 277
+#define PERCENT_FLAG 278
+#define PERCENT_FILE_PREFIX 279
+#define PERCENT_GLR_PARSER 280
+#define PERCENT_INITIAL_ACTION 281
+#define PERCENT_LANGUAGE 282
+#define PERCENT_LEX_PARAM 283
+#define PERCENT_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_PARSE_PARAM 289
+#define PERCENT_REQUIRE 290
+#define PERCENT_SKELETON 291
+#define PERCENT_START 292
+#define PERCENT_TOKEN_TABLE 293
+#define PERCENT_VERBOSE 294
+#define PERCENT_YACC 295
+#define BRACED_CODE 296
+#define CHAR 297
+#define EPILOGUE 298
+#define EQUAL 299
+#define ID 300
+#define ID_COLON 301
+#define PERCENT_PERCENT 302
+#define PIPE 303
+#define PROLOGUE 304
+#define SEMICOLON 305
+#define TAG 306
+#define TAG_ANY 307
+#define TAG_NONE 308
+#define PERCENT_UNION 309

 
 
 
 
 
 


@@ -299,7 +291,6 @@ static int current_prec = 0;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {

-

 /* Line 216 of yacc.c  */
 #line 92 "parse-gram.y"
 
 /* Line 216 of yacc.c  */
 #line 92 "parse-gram.y"
 


@@ -313,9 +304,8 @@ typedef union YYSTYPE
   unsigned char character;
 
 
   unsigned char character;
 
 

-

 /* Line 216 of yacc.c  */
 /* Line 216 of yacc.c  */

-#line 319 "../../../src/parse-gram.c"
+#line 309 "../../src/parse-gram.c"

 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */


@@ -338,9 +328,8 @@ typedef struct YYLTYPE
 
 /* Copy the second part of user declarations.  */
 
 
 /* Copy the second part of user declarations.  */
 

-

 /* Line 266 of yacc.c  */
 /* Line 266 of yacc.c  */

-#line 344 "../../../src/parse-gram.c"
+#line 333 "../../src/parse-gram.c"

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


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

-#define YYLAST   203
+#define YYLAST   186

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

-#define YYNTOKENS  58
+#define YYNTOKENS  55

 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  33
 /* YYNRULES -- Number of rules.  */
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  33
 /* YYNRULES -- Number of rules.  */

-#define YYNRULES  106
+#define YYNRULES  103

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

-#define YYNSTATES  144
+#define YYNSTATES  141

 
 

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

 #define YYUNDEFTOK  2
 #define YYUNDEFTOK  2

-#define YYMAXUTOK   312
+#define YYMAXUTOK   309

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

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

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


@@ -608,75 +599,24 @@ static const yytype_uint8 yytranslate[] =
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG

-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
-      24,    27,    29,    32,    35,    38,    42,    44,    47,    50,
-      53,    55,    58,    62,    64,    66,    69,    73,    76,    78,
-      81,    84,    86,    88,    90,    92,    94,    96,    99,   103,
-     107,   109,   111,   114,   118,   119,   121,   125,   126,   130,
-     131,   135,   139,   143,   145,   147,   149,   151,   152,   154,
-     156,   159,   161,   164,   166,   169,   171,   174,   176,   178,
-     180,   182,   184,   186,   189,   192,   196,   198,   201,   203,
-     206,   208,   211,   214,   215,   219,   221,   225,   228,   229,
-     232,   235,   239,   243,   247,   249,   251,   252,   254,   256,
-     258,   260,   262,   264,   266,   268,   269
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      59,     0,    -1,    60,    50,    77,    90,    -1,    -1,    60,
-      61,    -1,    62,    -1,    52,    -1,    18,    -1,    20,    83,
-      84,    -1,    21,    -1,    21,     3,    -1,    22,    -1,    23,
-       4,    -1,    24,     4,    -1,    25,     3,    -1,    25,    47,
-       3,    -1,    26,    -1,    27,    44,    -1,    28,     3,    -1,
-      29,    44,    -1,    30,    -1,    31,     3,    -1,    31,    47,
-       3,    -1,    33,    -1,    34,    -1,    35,     3,    -1,    35,
-      47,     3,    -1,    36,    44,    -1,    37,    -1,    38,     3,
-      -1,    39,     3,    -1,    41,    -1,    42,    -1,    43,    -1,
-      53,    -1,    67,    -1,    64,    -1,    40,    88,    -1,     8,
-      44,    73,    -1,     9,    44,    73,    -1,    19,    -1,    32,
-      -1,    17,    85,    -1,    17,    48,    85,    -1,    -1,    48,
-      -1,    57,    63,    85,    -1,    -1,     6,    65,    76,    -1,
-      -1,     5,    66,    76,    -1,     7,    54,    72,    -1,    68,
-      69,    70,    -1,    10,    -1,    11,    -1,    12,    -1,    13,
-      -1,    -1,    54,    -1,    71,    -1,    70,    71,    -1,    88,
-      -1,    88,     4,    -1,    88,    -1,    72,    88,    -1,    74,
-      -1,    73,    74,    -1,    88,    -1,    54,    -1,    55,    -1,
-      56,    -1,    54,    -1,    86,    -1,    86,     4,    -1,    86,
-      89,    -1,    86,     4,    89,    -1,    75,    -1,    76,    75,
-      -1,    78,    -1,    77,    78,    -1,    79,    -1,    62,    53,
-      -1,     1,    53,    -1,    -1,    87,    80,    81,    -1,    82,
-      -1,    81,    51,    82,    -1,    81,    53,    -1,    -1,    82,
-      88,    -1,    82,    44,    -1,    82,    14,    88,    -1,    82,
-      15,     4,    -1,    82,    16,    54,    -1,    48,    -1,     3,
-      -1,    -1,     3,    -1,    44,    -1,    48,    -1,    45,    -1,
-      49,    -1,    86,    -1,    89,    -1,     3,    -1,    -1,    50,
-      46,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINEYYN -- Source line where rule number YYN was defined.    */

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

-       0,   203,   203,   211,   213,   217,   218,   228,   229,   233,
-     234,   239,   240,   241,   242,   243,   244,   249,   258,   259,
-     260,   261,   262,   263,   264,   265,   266,   267,   268,   281,
-     282,   306,   307,   308,   309,   313,   314,   315,   319,   326,
-     333,   337,   341,   348,   363,   364,   368,   380,   380,   385,
-     385,   390,   401,   416,   417,   418,   419,   423,   424,   429,
-     431,   436,   437,   442,   444,   449,   450,   454,   455,   456,
-     457,   462,   467,   472,   478,   484,   495,   496,   505,   506,
-     512,   513,   514,   521,   521,   525,   526,   527,   532,   533,
-     535,   537,   539,   541,   551,   552,   558,   561,   570,   590,
-     592,   601,   606,   607,   612,   619,   621
+       0,   201,   201,   209,   211,   215,   216,   226,   230,   234,
+     235,   240,   241,   242,   243,   244,   249,   258,   259,   260,
+     261,   262,   263,   264,   265,   266,   267,   268,   292,   293,
+     294,   295,   299,   300,   301,   305,   312,   319,   323,   327,
+     334,   349,   350,   354,   366,   366,   371,   371,   376,   387,
+     402,   403,   404,   405,   409,   410,   415,   417,   422,   423,
+     428,   430,   435,   436,   440,   441,   442,   443,   448,   453,
+     458,   464,   470,   481,   482,   491,   492,   498,   499,   500,
+     507,   507,   511,   512,   513,   518,   519,   521,   523,   525,
+     527,   537,   538,   543,   544,   553,   573,   575,   584,   589,
+     590,   595,   602,   604

 };
 #endif
 
 };
 #endif
 


@@ -689,19 +629,18 @@ static const char *const yytname[] =
   "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
   "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"",
   "\"%precedence\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",
   "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
   "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"",
   "\"%precedence\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",

-  "\"%debug\"", "\"%default-prec\"", "\"%define\"", "\"%defines\"",
-  "\"%error-verbose\"", "\"%expect\"", "\"%expect-rr\"",
-  "\"%file-prefix\"", "\"%glr-parser\"", "\"%initial-action\"",
-  "\"%language\"", "\"%lex-param\"", "\"%locations\"", "\"%name-prefix\"",
-  "\"%no-default-prec\"", "\"%no-lines\"", "\"%nondeterministic-parser\"",
-  "\"%output\"", "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"",
-  "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"",
-  "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"",
-  "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"",
-  "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", "\"%union\"", "$accept",
-  "input", "prologue_declarations", "prologue_declaration",
+  "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%expect\"",
+  "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"", "\"%glr-parser\"",
+  "\"%initial-action\"", "\"%language\"", "\"%lex-param\"",
+  "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
+  "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param\"",
+  "\"%require\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"",
+  "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"",
+  "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"",
+  "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"", "\"%union\"",
+  "$accept", "input", "prologue_declarations", "prologue_declaration",

   "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2",
   "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2",

-  "precedence_declaration", "precedence_declarator", "type.opt",
+  "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", "$@3", "rhses.1", "rhs",
   "symbols.prec", "symbol.prec", "symbols.1", "generic_symlist",
   "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
   "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs",


@@ -711,8 +650,8 @@ static const char *const yytname[] =
 #endif
 
 # ifdef YYPRINT
 #endif
 
 # ifdef YYPRINT

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

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


@@ -720,180 +659,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,   312
+     305,   306,   307,   308,   309

 };
 # endif
 
 };
 # endif
 

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

 
 

-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-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,
-       1,     2,     3,     1,     1,     2,     3,     2,     1,     2,
-       2,     1,     1,     1,     1,     1,     1,     2,     3,     3,
-       1,     1,     2,     3,     0,     1,     3,     0,     3,     0,
-       3,     3,     3,     1,     1,     1,     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,     3,     1,     3,     2,     0,     2,
-       2,     3,     3,     3,     1,     1,     0,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     2
-};
+#define YYTABLE_NINF -103

 
 

-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const yytype_uint8 yydefact[] =
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.    */
+static const yytype_int16 yypact[] =

 {
 {

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

 };
 
 };
 

-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
+  /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
+     does not specify something else to do.  Zero means the default is an
+     error.    */
+static const yytype_uint8 yydefact[] =

 {
 {

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

 };
 
 };
 

-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -81
-static const yytype_int16 yypact[] =
+  /* YYPGOTO[NTERM-NUM].    */
+static const yytype_int8 yypgoto[] =

 {
 {

-     -81,    23,   111,   -81,   -81,   -81,   -28,   -12,    -8,   -81,
-     -81,   -81,   -81,   -13,   -81,   -81,    14,    43,   -81,    48,
-      49,     2,   -81,    10,    53,    34,   -81,    13,   -81,   -81,
-     -81,    26,    36,   -81,    54,    78,     0,   -81,   -81,   -81,
-      58,   -81,   -81,    41,   -81,   -81,   -81,   -81,    28,   -24,
-     -24,     0,    31,    31,   -81,    44,   -81,   -81,   -81,    81,
-     -81,   -81,   -81,   -81,    88,   -81,   -81,   -81,   -81,    89,
-     -81,    91,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
-     -81,    42,   -81,    47,     1,   -81,   -81,   -81,   -81,    44,
-     -81,     0,   -81,   -81,   -24,    40,   -24,     0,   -81,   -81,
-     -81,   -81,    31,   -81,   -81,    31,   -81,   -81,   -81,   -81,
-     -81,   -81,   -81,   -81,    50,   -81,   -81,   -81,   -81,     0,
-     -81,    93,   -81,    98,   -81,   -81,   -81,   -81,   -14,   155,
-     -81,   -81,   -81,   -81,   -81,     0,    99,    51,   -81,   -81,
-     155,   -81,   -81,   -81
+     -93,   -93,   -93,   -93,   114,   -93,   -93,   -93,   -93,   -93,
+     -93,   -93,   -93,    25,   -93,    93,   -92,   -17,    95,   -93,
+      65,   -93,   -93,   -93,    15,   -93,   -93,   -26,     3,   -93,
+     -33,   -45,   -93

 };
 
 };
 

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

 {
 {

-     -81,   -81,   -81,   -81,   100,   -81,   -81,   -81,   -81,   -81,
-     -81,   -81,   -81,   -11,   -81,    56,   -80,   -54,    60,   -81,
-      22,   -81,   -81,   -81,   -21,   -81,   -81,   -51,   -22,   -81,
-     -36,   -76,   -81
+      -1,     1,     2,    41,    80,    86,    43,    47,    46,    44,
+      45,    88,   116,   117,    94,    99,   100,    90,    91,    81,
+      82,    83,   114,   125,   126,    56,   105,    53,    75,    84,
+     101,    77,   113

 };
 
 };
 

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

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

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

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,   138,
-      76,     0,     0,    77
+       0,     0,   135,    73,     0,     0,    74

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

-      36,     0,     1,     3,    55,     3,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    51,     3,     3,    17,    95,
-      19,    45,   102,     0,    48,   105,    54,    49,    50,     3,
-      54,    44,    44,    32,     3,    48,    44,    51,    89,    53,
-      94,    40,    96,     3,     4,    45,     3,   123,    48,    47,
-      49,    50,     4,     4,    44,    91,     3,     3,    57,     1,
-      47,    97,    48,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    94,    47,    96,    17,    45,    19,    44,    48,
-      44,     3,    54,   119,     3,    54,    55,    56,    44,    48,
-      32,     3,     3,   129,     3,    53,    46,     4,    40,   135,
-      53,     3,     2,     4,   140,    54,    84,    49,   119,    53,
-      50,    -1,   133,    -1,    -1,    57,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    -1,    -1,    -1,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    -1,    -1,    -1,     3,    -1,
-      -1,    50,    -1,    52,    53,    -1,    -1,    -1,    57,    14,
-      15,    16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      33,    51,    41,     3,     3,    42,    45,    99,    45,     0,
+     102,     0,     1,     3,    51,    48,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,     3,    52,     1,    17,    18,
+       3,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+       3,    30,    42,    17,    18,    45,    45,    92,    37,    46,
+      47,    51,    52,    53,    44,    88,    30,    46,    47,     3,
+      86,    94,    41,    37,    42,    54,    48,    45,    50,     3,
+       4,    44,    46,    41,    91,   120,    93,     4,     4,    41,
+      54,    44,     3,   116,    41,    41,     3,     3,    41,     3,
+      45,    51,     3,   126,    91,     3,    93,     3,    50,   132,
+      50,    43,     4,     4,   137,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,     3,    51,     2,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,   116,    47,    50,     3,   130,    81,    47,    -1,    49,
+      50,    -1,    -1,    -1,    54,    14,    15,    16,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    44,
-      45,    -1,    -1,    48
+      -1,    -1,    41,    42,    -1,    -1,    45

 };
 
 };
 

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

 static const yytype_uint8 yystos[] =
 {
 static const yytype_uint8 yystos[] =
 {

-       0,    59,    60,     0,     5,     6,     7,     8,     9,    10,
+       0,    56,    57,     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,
       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,    40,    41,    42,    43,
-      50,    52,    53,    57,    61,    62,    64,    67,    68,    66,
-      65,    54,    44,    44,    44,    48,    85,     3,    48,    83,
-       3,     4,     4,     3,    47,    44,     3,    44,     3,    47,
-       3,    47,    44,     3,     3,     3,    45,    48,    86,    88,
-      89,     1,    49,    62,    77,    78,    79,    87,    48,    63,
-      54,    69,    54,    75,    76,    86,    76,    72,    88,    54,
-      55,    56,    73,    74,    88,    73,    85,     3,    84,     3,
-       3,     3,    53,    53,    50,    78,    90,    80,    85,    70,
-      71,    88,    75,     4,    89,    88,    74,    46,    81,    82,
-      71,     4,    89,    51,    53,    14,    15,    16,    44,    88,
-      82,    88,     4,    54
+      34,    35,    36,    37,    38,    39,    40,    47,    49,    50,
+      54,    58,    59,    61,    64,    65,    63,    62,    51,    41,
+      41,    41,    45,    82,     3,    45,    80,     3,     4,     4,
+       3,    44,    41,     3,    41,     3,    44,     3,    44,    41,
+       3,     3,     3,    42,    45,    83,    85,    86,     1,    46,
+      59,    74,    75,    76,    84,    45,    60,    51,    66,    51,
+      72,    73,    83,    73,    69,    85,    51,    52,    53,    70,
+      71,    85,    70,    82,     3,    81,     3,     3,     3,    50,
+      50,    47,    75,    87,    77,    82,    67,    68,    85,    72,
+       4,    86,    85,    71,    43,    78,    79,    68,     4,    86,
+      48,    50,    14,    15,    16,    41,    85,    79,    85,     4,
+      51

 };
 
 };
 

+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.    */
+static const yytype_uint8 yyr1[] =
+{
+       0,    55,    56,    57,    57,    58,    58,    58,    58,    58,
+      58,    58,    58,    58,    58,    58,    58,    58,    58,    58,
+      58,    58,    58,    58,    58,    58,    58,    58,    58,    58,
+      58,    58,    59,    59,    59,    59,    59,    59,    59,    59,
+      59,    60,    60,    59,    62,    61,    63,    61,    61,    64,
+      65,    65,    65,    65,    66,    66,    67,    67,    68,    68,
+      69,    69,    70,    70,    71,    71,    71,    71,    72,    72,
+      72,    72,    72,    73,    73,    74,    74,    75,    75,    75,
+      77,    76,    78,    78,    78,    79,    79,    79,    79,    79,
+      79,    80,    80,    81,    81,    82,    83,    83,    84,    85,
+      85,    86,    87,    87
+};
+
+  /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.    */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
+       2,     2,     2,     2,     3,     1,     2,     2,     2,     2,
+       3,     1,     1,     2,     3,     2,     2,     2,     1,     1,
+       1,     1,     1,     1,     2,     3,     3,     1,     1,     2,
+       3,     0,     1,     3,     0,     3,     0,     3,     3,     3,
+       1,     1,     1,     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,     3,     1,     3,     2,     0,     2,     2,     3,     3,
+       3,     1,     1,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     0,     2
+};
+
+

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


@@ -1039,150 +977,159 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
 # endif
   switch (yytype)
     {
 # endif
   switch (yytype)
     {

-      case 3: /* "\"string\"" */
-
-/* Line 717 of yacc.c  */
-#line 181 "parse-gram.y"
-       { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); };
-
-/* Line 717 of yacc.c  */
-#line 1050 "../../../src/parse-gram.c"
-       break;
-      case 4: /* "\"integer\"" */
-
-/* Line 717 of yacc.c  */
-#line 192 "parse-gram.y"
-       { fprintf (stderr, "%d", ((*yyvaluep).integer)); };
-
-/* Line 717 of yacc.c  */
-#line 1059 "../../../src/parse-gram.c"
-       break;
-      case 44: /* "\"{...}\"" */
-
-/* Line 717 of yacc.c  */
-#line 183 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); };
-
-/* Line 717 of yacc.c  */
-#line 1068 "../../../src/parse-gram.c"
-       break;
-      case 45: /* "\"char\"" */
-
-/* Line 717 of yacc.c  */
-#line 175 "parse-gram.y"
-       { fputs (char_name (((*yyvaluep).character)), stderr); };
-
-/* Line 717 of yacc.c  */
-#line 1077 "../../../src/parse-gram.c"
-       break;
-      case 46: /* "\"epilogue\"" */
-
-/* Line 717 of yacc.c  */
-#line 183 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
-
-/* Line 717 of yacc.c  */
-#line 1086 "../../../src/parse-gram.c"
-       break;
-      case 48: /* "\"identifier\"" */
-
-/* Line 717 of yacc.c  */
-#line 188 "parse-gram.y"
-       { fputs (((*yyvaluep).uniqstr), stderr); };
-
-/* Line 717 of yacc.c  */
-#line 1095 "../../../src/parse-gram.c"
-       break;
-      case 49: /* "\"identifier:\"" */
-
-/* Line 717 of yacc.c  */
-#line 189 "parse-gram.y"
-       { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); };
-
-/* Line 717 of yacc.c  */
-#line 1104 "../../../src/parse-gram.c"
-       break;
-      case 52: /* "\"%{...%}\"" */
-
-/* Line 717 of yacc.c  */
-#line 183 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
-
-/* Line 717 of yacc.c  */
-#line 1113 "../../../src/parse-gram.c"
-       break;
-      case 54: /* "\"type\"" */
-
-/* Line 717 of yacc.c  */
+            case 3: // "string"
+
+/* Line 647 of yacc.c  */
+#line 178 "parse-gram.y"
+        { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
+/* Line 647 of yacc.c  */
+#line 987 "../../src/parse-gram.c"
+        break;
+
+            case 4: // "integer"
+
+/* Line 647 of yacc.c  */
+#line 190 "parse-gram.y"
+        { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
+/* Line 647 of yacc.c  */
+#line 996 "../../src/parse-gram.c"
+        break;
+
+            case 23: // "%<flag>"
+
+/* Line 647 of yacc.c  */
+#line 186 "parse-gram.y"
+        { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
+/* Line 647 of yacc.c  */
+#line 1005 "../../src/parse-gram.c"
+        break;
+
+            case 41: // "{...}"
+
+/* Line 647 of yacc.c  */
+#line 180 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
+/* Line 647 of yacc.c  */
+#line 1014 "../../src/parse-gram.c"
+        break;
+
+            case 42: // "char"
+
+/* Line 647 of yacc.c  */
+#line 172 "parse-gram.y"
+        { fputs (char_name (((*yyvaluep).character)), stderr); }
+/* Line 647 of yacc.c  */
+#line 1023 "../../src/parse-gram.c"
+        break;
+
+            case 43: // "epilogue"
+
+/* Line 647 of yacc.c  */
+#line 180 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 647 of yacc.c  */
+#line 1032 "../../src/parse-gram.c"
+        break;
+
+            case 45: // "identifier"
+
+/* Line 647 of yacc.c  */
+#line 184 "parse-gram.y"
+        { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 647 of yacc.c  */
+#line 1041 "../../src/parse-gram.c"
+        break;
+
+            case 46: // "identifier:"
+
+/* Line 647 of yacc.c  */
+#line 185 "parse-gram.y"
+        { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
+/* Line 647 of yacc.c  */
+#line 1050 "../../src/parse-gram.c"
+        break;
+
+            case 49: // "%{...%}"
+
+/* Line 647 of yacc.c  */
+#line 180 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 647 of yacc.c  */
+#line 1059 "../../src/parse-gram.c"
+        break;
+
+            case 51: // "<tag>"
+
+/* Line 647 of yacc.c  */

 #line 187 "parse-gram.y"
 #line 187 "parse-gram.y"

-       { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); };
-
-/* Line 717 of yacc.c  */
-#line 1122 "../../../src/parse-gram.c"
-       break;
-      case 83: /* "variable" */
-
-/* Line 717 of yacc.c  */
-#line 188 "parse-gram.y"
-       { fputs (((*yyvaluep).uniqstr), stderr); };
-
-/* Line 717 of yacc.c  */
-#line 1131 "../../../src/parse-gram.c"
-       break;
-      case 84: /* "content.opt" */
-
-/* Line 717 of yacc.c  */
-#line 183 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
-
-/* Line 717 of yacc.c  */
-#line 1140 "../../../src/parse-gram.c"
-       break;
-      case 85: /* "braceless" */
-
-/* Line 717 of yacc.c  */
-#line 183 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
-
-/* Line 717 of yacc.c  */
-#line 1149 "../../../src/parse-gram.c"
-       break;
-      case 86: /* "id" */
-
-/* Line 717 of yacc.c  */
-#line 195 "parse-gram.y"
-       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
-
-/* Line 717 of yacc.c  */
-#line 1158 "../../../src/parse-gram.c"
-       break;
-      case 87: /* "id_colon" */
-
-/* Line 717 of yacc.c  */
-#line 196 "parse-gram.y"
-       { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); };
-
-/* Line 717 of yacc.c  */
-#line 1167 "../../../src/parse-gram.c"
-       break;
-      case 88: /* "symbol" */
-
-/* Line 717 of yacc.c  */
-#line 195 "parse-gram.y"
-       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
-
-/* Line 717 of yacc.c  */
-#line 1176 "../../../src/parse-gram.c"
-       break;
-      case 89: /* "string_as_id" */
-
-/* Line 717 of yacc.c  */
-#line 195 "parse-gram.y"
-       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
+        { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
+/* Line 647 of yacc.c  */
+#line 1068 "../../src/parse-gram.c"
+        break;
+
+            case 80: // variable
+
+/* Line 647 of yacc.c  */
+#line 184 "parse-gram.y"
+        { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 647 of yacc.c  */
+#line 1077 "../../src/parse-gram.c"
+        break;
+
+            case 81: // content.opt
+
+/* Line 647 of yacc.c  */
+#line 180 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 647 of yacc.c  */
+#line 1086 "../../src/parse-gram.c"
+        break;
+
+            case 82: // braceless
+
+/* Line 647 of yacc.c  */
+#line 180 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 647 of yacc.c  */
+#line 1095 "../../src/parse-gram.c"
+        break;
+
+            case 83: // id
+
+/* Line 647 of yacc.c  */
+#line 193 "parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 647 of yacc.c  */
+#line 1104 "../../src/parse-gram.c"
+        break;
+
+            case 84: // id_colon
+
+/* Line 647 of yacc.c  */
+#line 194 "parse-gram.y"
+        { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
+/* Line 647 of yacc.c  */
+#line 1113 "../../src/parse-gram.c"
+        break;
+
+            case 85: // symbol
+
+/* Line 647 of yacc.c  */
+#line 193 "parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 647 of yacc.c  */
+#line 1122 "../../src/parse-gram.c"
+        break;
+
+            case 86: // string_as_id
+
+/* Line 647 of yacc.c  */
+#line 193 "parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 647 of yacc.c  */
+#line 1131 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1185 "../../../src/parse-gram.c"
-       break;

       default:
        break;
     }
       default:
        break;
     }


@@ -1256,27 +1203,29 @@ do {                                                            \
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void

-yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)

 #else
 static void
 #else
 static void

-yy_reduce_print (yyvsp, yylsp, yyrule)
+yy_reduce_print (yyssp, yyvsp, yylsp, yyrule)
+    yytype_int16 *yyssp;

     YYSTYPE *yyvsp;
     YYLTYPE *yylsp;
     int yyrule;
 #endif
 {
     YYSTYPE *yyvsp;
     YYLTYPE *yylsp;
     int yyrule;
 #endif
 {

+  unsigned long int yylno = yyrline[yyrule];

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

-  unsigned long int yylno = yyrline[yyrule];

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

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

   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);

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

       YYFPRINTF (stderr, "\n");
     }
 }
       YYFPRINTF (stderr, "\n");
     }
 }


@@ -1284,7 +1233,7 @@ yy_reduce_print (yyvsp, yylsp, yyrule)
 # define YY_REDUCE_PRINT(Rule)         \
 do {                                   \
   if (yydebug)                         \
 # define YY_REDUCE_PRINT(Rule)         \
 do {                                   \
   if (yydebug)                         \

-    yy_reduce_print (yyvsp, yylsp, Rule); \
+    yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \

 } while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
 } while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that


@@ -1418,14 +1367,14 @@ yytnamerr (char *yyres, const char *yystr)
 # endif
 
 /* Copy into YYRESULT an error message about the unexpected token
 # endif
 
 /* Copy into YYRESULT an error message about the unexpected token

-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   YYTOKEN while in state YYSTATE.  Return the number of bytes copied,

    including the terminating null byte.  If YYRESULT is null, do not
    copy anything; just return the number of bytes that would be
    copied.  As a special case, return 0 if an ordinary "syntax error"
    message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
    size calculation.  */
 static YYSIZE_T
    including the terminating null byte.  If YYRESULT is null, do not
    copy anything; just return the number of bytes that would be
    copied.  As a special case, return 0 if an ordinary "syntax error"
    message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
    size calculation.  */
 static YYSIZE_T

-yysyntax_error (char *yyresult, int yystate, int yychar)
+yysyntax_error (char *yyresult, int yystate, int yytoken)

 {
   int yyn = yypact[yystate];
 
 {
   int yyn = yypact[yystate];
 


@@ -1433,34 +1382,15 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
     return 0;
   else
     {
     return 0;
   else
     {

-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);

       YYSIZE_T yysize = yysize0;
       YYSIZE_T yysize1;
       int yysize_overflow = 0;
       enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
       YYSIZE_T yysize = yysize0;
       YYSIZE_T yysize1;
       int yysize_overflow = 0;
       enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };

+      /* Internationalized format string. */
+      const char *yyformat = 0;
+      /* Arguments of yyformat. */

       char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
       char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];

-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-        constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-                   + sizeof yyexpecting - 1
-                   + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-                      * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;

 
       /* Start YYX at -YYN if negative to avoid negative indexes in
         YYCHECK.  */
 
       /* Start YYX at -YYN if negative to avoid negative indexes in
         YYCHECK.  */


@@ -1469,10 +1399,12 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
       /* Stay within bounds of both yycheck and yytname.  */
       int yychecklim = YYLAST - yyn + 1;
       int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
       /* Stay within bounds of both yycheck and yytname.  */
       int yychecklim = YYLAST - yyn + 1;
       int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;

-      int yycount = 1;
+      /* Number of reported tokens (one for the "unexpected", one per
+         "expected"). */
+      int yycount = 0;
+      int yyx;

 
 

-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
+      yyarg[yycount++] = yytname[yytoken];

 
       for (yyx = yyxbegin; yyx < yyxend; ++yyx)
        if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 
       for (yyx = yyxbegin; yyx < yyxend; ++yyx)
        if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)


@@ -1481,19 +1413,29 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
              {
                yycount = 1;
                yysize = yysize0;
              {
                yycount = 1;
                yysize = yysize0;

-               yyformat[sizeof yyunexpected - 1] = '\0';

                break;
              }
            yyarg[yycount++] = yytname[yyx];
            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
            yysize_overflow |= (yysize1 < yysize);
            yysize = yysize1;
                break;
              }
            yyarg[yycount++] = yytname[yyx];
            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
            yysize_overflow |= (yysize1 < yysize);
            yysize = yysize1;

-           yyfmt = yystpcpy (yyfmt, yyprefix);
-           yyprefix = yyor;

          }
 
          }
 

-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
+        switch (yycount)
+        {
+#define YYCASE_(N, S)                           \
+          case N:                               \
+            yyformat = S;                       \
+          break
+          YYCASE_(1, YY_("syntax error, unexpected %s"));
+          YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+          YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+          YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+          YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+#undef YYCASE_
+        }
+
+      yysize1 = yysize + yystrlen (yyformat);

       yysize_overflow |= (yysize1 < yysize);
       yysize = yysize1;
 
       yysize_overflow |= (yysize1 < yysize);
       yysize = yysize1;
 


@@ -1507,19 +1449,17 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
             produced a string with the wrong number of "%s"s.  */
          char *yyp = yyresult;
          int yyi = 0;
             produced a string with the wrong number of "%s"s.  */
          char *yyp = yyresult;
          int yyi = 0;

-         while ((*yyp = *yyf) != '\0')
-           {
-             if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-               {
-                 yyp += yytnamerr (yyp, yyarg[yyi++]);
-                 yyf += 2;
-               }
-             else
-               {
-                 yyp++;
-                 yyf++;
-               }
-           }
+         while ((*yyp = *yyformat) != '\0')
+            if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+              {
+                yyp += yytnamerr (yyp, yyarg[yyi++]);
+                yyformat += 2;
+              }
+            else
+              {
+                yyp++;
+                yyformat++;
+              }

        }
       return yysize;
     }
        }
       return yysize;
     }


@@ -1554,7 +1494,6 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 
   switch (yytype)
     {
 
   switch (yytype)
     {

-

       default:
        break;
     }
       default:
        break;
     }


@@ -1562,13 +1501,15 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 
 /* Prevent warnings from -Wmissing-prototypes.  */
 #ifdef YYPARSE_PARAM
 
 /* Prevent warnings from -Wmissing-prototypes.  */
 #ifdef YYPARSE_PARAM

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

 int yyparse (void *YYPARSE_PARAM);
 #else
 int yyparse ();
 #endif
 #else /* ! YYPARSE_PARAM */
 int yyparse (void *YYPARSE_PARAM);
 #else
 int yyparse ();
 #endif
 #else /* ! YYPARSE_PARAM */

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

 int yyparse (void);
 #else
 int yyparse ();
 int yyparse (void);
 #else
 int yyparse ();


@@ -1699,8 +1640,7 @@ YYLTYPE yylloc;
 #endif
 
 /* User initialization code.  */
 #endif
 
 /* User initialization code.  */

-
-/* Line 1244 of yacc.c  */
+/* Line 1167 of yacc.c  */

 #line 84 "parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
 #line 84 "parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default


@@ -1708,9 +1648,8 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.start, current_file, 1, 1);
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
   boundary_set (&yylloc.start, current_file, 1, 1);
   boundary_set (&yylloc.end, current_file, 1, 1);
 }

-
-/* Line 1244 of yacc.c  */
-#line 1714 "../../../src/parse-gram.c"
+/* Line 1167 of yacc.c  */
+#line 1653 "../../src/parse-gram.c"

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


@@ -1896,285 +1835,203 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-
-/* Line 1457 of yacc.c  */
-#line 219 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 217 "parse-gram.y"

     {
       code_props plain_code;
     {
       code_props plain_code;

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

       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
       muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
       muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",

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

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

-
-/* Line 1457 of yacc.c  */
-#line 1914 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 1851 "../../src/parse-gram.c"

     break;
 
   case 7:
     break;
 
   case 7:

-
-/* Line 1457 of yacc.c  */
-#line 228 "parse-gram.y"
-    { debug_flag = true; }
-
-/* Line 1457 of yacc.c  */
-#line 1924 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 227 "parse-gram.y"
+    {
+      muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
+    }
+/* Line 1380 of yacc.c  */
+#line 1861 "../../src/parse-gram.c"

     break;
 
   case 8:
     break;
 
   case 8:

-
-/* Line 1457 of yacc.c  */
-#line 230 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 231 "parse-gram.y"

     {
     {

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

     }
     }

-
-/* Line 1457 of yacc.c  */
-#line 1936 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 1871 "../../src/parse-gram.c"

     break;
 
   case 9:
     break;
 
   case 9:

-
-/* Line 1457 of yacc.c  */
-#line 233 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 234 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 1946 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 1879 "../../src/parse-gram.c"

     break;
 
   case 10:
     break;
 
   case 10:

-
-/* Line 1457 of yacc.c  */
-#line 235 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 236 "parse-gram.y"

     {
       defines_flag = true;
     {
       defines_flag = true;

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

     }
     }

-
-/* Line 1457 of yacc.c  */
-#line 1959 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 1890 "../../src/parse-gram.c"

     break;
 
   case 11:
     break;
 
   case 11:

-
-/* Line 1457 of yacc.c  */
-#line 239 "parse-gram.y"
-    { error_verbose = true; }
-
-/* Line 1457 of yacc.c  */
-#line 1969 "../../../src/parse-gram.c"
-    break;
-
-  case 12:
-
-/* Line 1457 of yacc.c  */
+/* Line 1380 of yacc.c  */

 #line 240 "parse-gram.y"
 #line 240 "parse-gram.y"

-    { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
-
-/* Line 1457 of yacc.c  */
-#line 1979 "../../../src/parse-gram.c"
+    { expected_sr_conflicts = (yyvsp[0].integer); }
+/* Line 1380 of yacc.c  */
+#line 1898 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 13:
-
-/* Line 1457 of yacc.c  */
+  case 12:
+/* Line 1380 of yacc.c  */

 #line 241 "parse-gram.y"
 #line 241 "parse-gram.y"

-    { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
-
-/* Line 1457 of yacc.c  */
-#line 1989 "../../../src/parse-gram.c"
+    { expected_rr_conflicts = (yyvsp[0].integer); }
+/* Line 1380 of yacc.c  */
+#line 1906 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 14:
-
-/* Line 1457 of yacc.c  */
+  case 13:
+/* Line 1380 of yacc.c  */

 #line 242 "parse-gram.y"
 #line 242 "parse-gram.y"

-    { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 1999 "../../../src/parse-gram.c"
+    { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 1914 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 15:
-
-/* Line 1457 of yacc.c  */
+  case 14:
+/* Line 1380 of yacc.c  */

 #line 243 "parse-gram.y"
 #line 243 "parse-gram.y"

-    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 2009 "../../../src/parse-gram.c"
+    { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 1922 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 16:
-
-/* Line 1457 of yacc.c  */
+  case 15:
+/* Line 1380 of yacc.c  */

 #line 245 "parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
     }
 #line 245 "parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
     }

-
-/* Line 1457 of yacc.c  */
-#line 2022 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 1933 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 17:
-
-/* Line 1457 of yacc.c  */
+  case 16:
+/* Line 1380 of yacc.c  */

 #line 250 "parse-gram.y"
     {
       code_props action;
 #line 250 "parse-gram.y"
     {
       code_props action;

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

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

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

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

-
-/* Line 1457 of yacc.c  */
-#line 2039 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 1948 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 18:
-
-/* Line 1457 of yacc.c  */
+  case 17:
+/* Line 1380 of yacc.c  */

 #line 258 "parse-gram.y"
 #line 258 "parse-gram.y"

-    { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2049 "../../../src/parse-gram.c"
+    { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
+/* Line 1380 of yacc.c  */
+#line 1956 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 19:
-
-/* Line 1457 of yacc.c  */
+  case 18:
+/* Line 1380 of yacc.c  */

 #line 259 "parse-gram.y"
 #line 259 "parse-gram.y"

-    { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2059 "../../../src/parse-gram.c"
+    { add_param ("lex_param", (yyvsp[0].code), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 1964 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 20:
-
-/* Line 1457 of yacc.c  */
+  case 19:
+/* Line 1380 of yacc.c  */

 #line 260 "parse-gram.y"
 #line 260 "parse-gram.y"

-    { locations_flag = true; }
-
-/* Line 1457 of yacc.c  */
-#line 2069 "../../../src/parse-gram.c"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 1972 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 21:
-
-/* Line 1457 of yacc.c  */
+  case 20:
+/* Line 1380 of yacc.c  */

 #line 261 "parse-gram.y"
 #line 261 "parse-gram.y"

-    { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 2079 "../../../src/parse-gram.c"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 1980 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 22:
-
-/* Line 1457 of yacc.c  */
+  case 21:
+/* Line 1380 of yacc.c  */

 #line 262 "parse-gram.y"
 #line 262 "parse-gram.y"

-    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 2089 "../../../src/parse-gram.c"
+    { no_lines_flag = true; }
+/* Line 1380 of yacc.c  */
+#line 1988 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 23:
-
-/* Line 1457 of yacc.c  */
+  case 22:
+/* Line 1380 of yacc.c  */

 #line 263 "parse-gram.y"
 #line 263 "parse-gram.y"

-    { no_lines_flag = true; }
-
-/* Line 1457 of yacc.c  */
-#line 2099 "../../../src/parse-gram.c"
+    { nondeterministic_parser = true; }
+/* Line 1380 of yacc.c  */
+#line 1996 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 24:
-
-/* Line 1457 of yacc.c  */
+  case 23:
+/* Line 1380 of yacc.c  */

 #line 264 "parse-gram.y"
 #line 264 "parse-gram.y"

-    { nondeterministic_parser = true; }
-
-/* Line 1457 of yacc.c  */
-#line 2109 "../../../src/parse-gram.c"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 2004 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 25:
-
-/* Line 1457 of yacc.c  */
+  case 24:
+/* Line 1380 of yacc.c  */

 #line 265 "parse-gram.y"
 #line 265 "parse-gram.y"

-    { spec_outfile = (yyvsp[(2) - (2)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 2119 "../../../src/parse-gram.c"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 2012 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 26:
-
-/* Line 1457 of yacc.c  */
+  case 25:
+/* Line 1380 of yacc.c  */

 #line 266 "parse-gram.y"
 #line 266 "parse-gram.y"

-    { spec_outfile = (yyvsp[(3) - (3)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 2129 "../../../src/parse-gram.c"
+    { add_param ("parse_param", (yyvsp[0].code), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2020 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 27:
-
-/* Line 1457 of yacc.c  */
+  case 26:
+/* Line 1380 of yacc.c  */

 #line 267 "parse-gram.y"
 #line 267 "parse-gram.y"

-    { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2139 "../../../src/parse-gram.c"
+    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
+/* Line 1380 of yacc.c  */
+#line 2028 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 28:
-
-/* Line 1457 of yacc.c  */
+  case 27:
+/* Line 1380 of yacc.c  */

 #line 269 "parse-gram.y"
     {
 #line 269 "parse-gram.y"
     {

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

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


@@ -2194,711 +2051,587 @@ yyreduce:
           skeleton_user = uniqstr_new (skeleton_build);
           free (skeleton_build);
         }
           skeleton_user = uniqstr_new (skeleton_build);
           free (skeleton_build);
         }

-      skeleton_arg (skeleton_user, grammar_prio, (yylsp[(1) - (2)]));
+      skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));

     }
     }

-
-/* Line 1457 of yacc.c  */
-#line 2202 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2058 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 31:
-
-/* Line 1457 of yacc.c  */
-#line 306 "parse-gram.y"
+  case 28:
+/* Line 1380 of yacc.c  */
+#line 292 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2212 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2066 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 32:
-
-/* Line 1457 of yacc.c  */
-#line 307 "parse-gram.y"
+  case 29:
+/* Line 1380 of yacc.c  */
+#line 293 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2222 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2074 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 33:
-
-/* Line 1457 of yacc.c  */
-#line 308 "parse-gram.y"
+  case 30:
+/* Line 1380 of yacc.c  */
+#line 294 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2232 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2082 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 37:
-
-/* Line 1457 of yacc.c  */
-#line 316 "parse-gram.y"
+  case 34:
+/* Line 1380 of yacc.c  */
+#line 302 "parse-gram.y"

     {
     {

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

     }
     }

-
-/* Line 1457 of yacc.c  */
-#line 2244 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2092 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 38:
-
-/* Line 1457 of yacc.c  */
-#line 320 "parse-gram.y"
+  case 35:
+/* Line 1380 of yacc.c  */
+#line 306 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
-       symbol_list_destructor_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      for (list = (yyvsp[0].list); list; list = list->next)
+       symbol_list_destructor_set (list, (yyvsp[-1].code), (yylsp[-1]));
+      symbol_list_free ((yyvsp[0].list));

     }
     }

-
-/* Line 1457 of yacc.c  */
-#line 2259 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2105 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 39:
-
-/* Line 1457 of yacc.c  */
-#line 327 "parse-gram.y"
+  case 36:
+/* Line 1380 of yacc.c  */
+#line 313 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
-       symbol_list_printer_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      for (list = (yyvsp[0].list); list; list = list->next)
+       symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1]));
+      symbol_list_free ((yyvsp[0].list));

     }
     }

-
-/* Line 1457 of yacc.c  */
-#line 2274 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2118 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 40:
-
-/* Line 1457 of yacc.c  */
-#line 334 "parse-gram.y"
+  case 37:
+/* Line 1380 of yacc.c  */
+#line 320 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2286 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2128 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 41:
-
-/* Line 1457 of yacc.c  */
-#line 338 "parse-gram.y"
+  case 38:
+/* Line 1380 of yacc.c  */
+#line 324 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2298 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2138 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 42:
-
-/* Line 1457 of yacc.c  */
-#line 342 "parse-gram.y"
+  case 39:
+/* Line 1380 of yacc.c  */
+#line 328 "parse-gram.y"

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

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

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

-
-/* Line 1457 of yacc.c  */
-#line 2313 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2151 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 43:
-
-/* Line 1457 of yacc.c  */
-#line 349 "parse-gram.y"
+  case 40:
+/* Line 1380 of yacc.c  */
+#line 335 "parse-gram.y"

     {
     {

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

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

-
-/* Line 1457 of yacc.c  */
-#line 2326 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2162 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 44:
-
-/* Line 1457 of yacc.c  */
-#line 363 "parse-gram.y"
+  case 41:
+/* Line 1380 of yacc.c  */
+#line 349 "parse-gram.y"

     {}
     {}

-
-/* Line 1457 of yacc.c  */
-#line 2336 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2170 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 45:
-
-/* Line 1457 of yacc.c  */
-#line 364 "parse-gram.y"
-    { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2346 "../../../src/parse-gram.c"
+  case 42:
+/* Line 1380 of yacc.c  */
+#line 350 "parse-gram.y"
+    { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2178 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 46:
-
-/* Line 1457 of yacc.c  */
-#line 369 "parse-gram.y"
+  case 43:
+/* Line 1380 of yacc.c  */
+#line 355 "parse-gram.y"

     {
       union_seen = true;
     {
       union_seen = true;

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

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

-
-/* Line 1457 of yacc.c  */
-#line 2360 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2190 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 47:
-
-/* Line 1457 of yacc.c  */
-#line 380 "parse-gram.y"
+  case 44:
+/* Line 1380 of yacc.c  */
+#line 366 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2370 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2198 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 48:
-
-/* Line 1457 of yacc.c  */
-#line 381 "parse-gram.y"
+  case 45:
+/* Line 1380 of yacc.c  */
+#line 367 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2383 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2209 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 49:
-
-/* Line 1457 of yacc.c  */
-#line 385 "parse-gram.y"
+  case 46:
+/* Line 1380 of yacc.c  */
+#line 371 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2393 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2217 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 50:
-
-/* Line 1457 of yacc.c  */
-#line 386 "parse-gram.y"
+  case 47:
+/* Line 1380 of yacc.c  */
+#line 372 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2406 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2228 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 51:
-
-/* Line 1457 of yacc.c  */
-#line 391 "parse-gram.y"
+  case 48:
+/* Line 1380 of yacc.c  */
+#line 377 "parse-gram.y"

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

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

     }
     }

-
-/* Line 1457 of yacc.c  */
-#line 2422 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2242 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 52:
-
-/* Line 1457 of yacc.c  */
-#line 402 "parse-gram.y"
+  case 49:
+/* Line 1380 of yacc.c  */
+#line 388 "parse-gram.y"

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

-      for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
+      for (list = (yyvsp[0].list); list; list = list->next)

        {
        {

-         symbol_type_set (list->content.sym, current_type, (yylsp[(2) - (3)]));
-         symbol_precedence_set (list->content.sym, current_prec, (yyvsp[(1) - (3)].assoc), (yylsp[(1) - (3)]));
+         symbol_type_set (list->content.sym, current_type, (yylsp[-1]));
+         symbol_precedence_set (list->content.sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2]));

        }
        }

-      symbol_list_free ((yyvsp[(3) - (3)].list));
+      symbol_list_free ((yyvsp[0].list));

       current_type = NULL;
     }
       current_type = NULL;
     }

-
-/* Line 1457 of yacc.c  */
-#line 2442 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2260 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 53:
-
-/* Line 1457 of yacc.c  */
-#line 416 "parse-gram.y"
+  case 50:
+/* Line 1380 of yacc.c  */
+#line 402 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2452 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2268 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 54:
-
-/* Line 1457 of yacc.c  */
-#line 417 "parse-gram.y"
+  case 51:
+/* Line 1380 of yacc.c  */
+#line 403 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2462 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2276 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 55:
-
-/* Line 1457 of yacc.c  */
-#line 418 "parse-gram.y"
+  case 52:
+/* Line 1380 of yacc.c  */
+#line 404 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2472 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2284 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 56:
-
-/* Line 1457 of yacc.c  */
-#line 419 "parse-gram.y"
+  case 53:
+/* Line 1380 of yacc.c  */
+#line 405 "parse-gram.y"

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

-
-/* Line 1457 of yacc.c  */
-#line 2482 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2292 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 57:
-
-/* Line 1457 of yacc.c  */
-#line 423 "parse-gram.y"
+  case 54:
+/* Line 1380 of yacc.c  */
+#line 409 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2300 "../../src/parse-gram.c"
+    break;

 
 

-/* Line 1457 of yacc.c  */
-#line 2492 "../../../src/parse-gram.c"
+  case 55:
+/* Line 1380 of yacc.c  */
+#line 410 "parse-gram.y"
+    { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
+/* Line 1380 of yacc.c  */
+#line 2308 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 58:
+  case 56:
+/* Line 1380 of yacc.c  */
+#line 416 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2316 "../../src/parse-gram.c"
+    break;

 
 

-/* Line 1457 of yacc.c  */
-#line 424 "parse-gram.y"
-    { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
+  case 57:
+/* Line 1380 of yacc.c  */
+#line 418 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1380 of yacc.c  */
+#line 2324 "../../src/parse-gram.c"
+    break;

 
 

-/* Line 1457 of yacc.c  */
-#line 2502 "../../../src/parse-gram.c"
+  case 58:
+/* Line 1380 of yacc.c  */
+#line 422 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }
+/* Line 1380 of yacc.c  */
+#line 2332 "../../src/parse-gram.c"

     break;
 
   case 59:
     break;
 
   case 59:

-
-/* Line 1457 of yacc.c  */
-#line 430 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2512 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 423 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2340 "../../src/parse-gram.c"

     break;
 
   case 60:
     break;
 
   case 60:

-
-/* Line 1457 of yacc.c  */
-#line 432 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
-
-/* Line 1457 of yacc.c  */
-#line 2522 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 429 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2348 "../../src/parse-gram.c"

     break;
 
   case 61:
     break;
 
   case 61:

-
-/* Line 1457 of yacc.c  */
-#line 436 "parse-gram.y"
-    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
-
-/* Line 1457 of yacc.c  */
-#line 2532 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 431 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1380 of yacc.c  */
+#line 2356 "../../src/parse-gram.c"

     break;
 
   case 62:
     break;
 
   case 62:

-
-/* Line 1457 of yacc.c  */
-#line 437 "parse-gram.y"
-    { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2542 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 435 "parse-gram.y"
+    { (yyval.list) = (yyvsp[0].list); }
+/* Line 1380 of yacc.c  */
+#line 2364 "../../src/parse-gram.c"

     break;
 
   case 63:
     break;
 
   case 63:

-
-/* Line 1457 of yacc.c  */
-#line 443 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2552 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 436 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
+/* Line 1380 of yacc.c  */
+#line 2372 "../../src/parse-gram.c"

     break;
 
   case 64:
     break;
 
   case 64:

-
-/* Line 1457 of yacc.c  */
-#line 445 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
-
-/* Line 1457 of yacc.c  */
-#line 2562 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 440 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2380 "../../src/parse-gram.c"

     break;
 
   case 65:
     break;
 
   case 65:

-
-/* Line 1457 of yacc.c  */
-#line 449 "parse-gram.y"
-    { (yyval.list) = (yyvsp[(1) - (1)].list); }
-
-/* Line 1457 of yacc.c  */
-#line 2572 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 441 "parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2388 "../../src/parse-gram.c"

     break;
 
   case 66:
     break;
 
   case 66:

-
-/* Line 1457 of yacc.c  */
-#line 450 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
-
-/* Line 1457 of yacc.c  */
-#line 2582 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 442 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2396 "../../src/parse-gram.c"

     break;
 
   case 67:
     break;
 
   case 67:

-
-/* Line 1457 of yacc.c  */
-#line 454 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2592 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 443 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2404 "../../src/parse-gram.c"

     break;
 
   case 68:
     break;
 
   case 68:

-
-/* Line 1457 of yacc.c  */
-#line 455 "parse-gram.y"
-    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2602 "../../../src/parse-gram.c"
-    break;
-
-  case 69:
-
-/* Line 1457 of yacc.c  */
-#line 456 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2612 "../../../src/parse-gram.c"
-    break;
-
-  case 70:
-
-/* Line 1457 of yacc.c  */
-#line 457 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2622 "../../../src/parse-gram.c"
-    break;
-
-  case 71:
-
-/* Line 1457 of yacc.c  */
-#line 463 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 449 "parse-gram.y"

     {
     {

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

        tag_seen = true;
      }
        tag_seen = true;
      }

-
-/* Line 1457 of yacc.c  */
-#line 2635 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2415 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 72:
-
-/* Line 1457 of yacc.c  */
-#line 468 "parse-gram.y"
+  case 69:
+/* Line 1380 of yacc.c  */
+#line 454 "parse-gram.y"

     {
     {

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

      }
      }

-
-/* Line 1457 of yacc.c  */
-#line 2648 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2426 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 73:
-
-/* Line 1457 of yacc.c  */
-#line 473 "parse-gram.y"
+  case 70:
+/* Line 1380 of yacc.c  */
+#line 459 "parse-gram.y"

     {
     {

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

     }
     }

-
-/* Line 1457 of yacc.c  */
-#line 2662 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2438 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 74:
-
-/* Line 1457 of yacc.c  */
-#line 479 "parse-gram.y"
+  case 71:
+/* Line 1380 of yacc.c  */
+#line 465 "parse-gram.y"

     {
     {

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

     }
     }

-
-/* Line 1457 of yacc.c  */
-#line 2676 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2450 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 75:
-
-/* Line 1457 of yacc.c  */
-#line 485 "parse-gram.y"
+  case 72:
+/* Line 1380 of yacc.c  */
+#line 471 "parse-gram.y"

     {
     {

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

     }
     }

-
-/* Line 1457 of yacc.c  */
-#line 2691 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2463 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 82:
-
-/* Line 1457 of yacc.c  */
-#line 515 "parse-gram.y"
+  case 79:
+/* Line 1380 of yacc.c  */
+#line 501 "parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }

-
-/* Line 1457 of yacc.c  */
-#line 2703 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2473 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 83:
+  case 80:
+/* Line 1380 of yacc.c  */
+#line 507 "parse-gram.y"
+    { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); }
+/* Line 1380 of yacc.c  */
+#line 2481 "../../src/parse-gram.c"
+    break;

 
 

-/* Line 1457 of yacc.c  */
-#line 521 "parse-gram.y"
-    { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
+  case 82:
+/* Line 1380 of yacc.c  */
+#line 511 "parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2489 "../../src/parse-gram.c"
+    break;

 
 

-/* Line 1457 of yacc.c  */
-#line 2713 "../../../src/parse-gram.c"
+  case 83:
+/* Line 1380 of yacc.c  */
+#line 512 "parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2497 "../../src/parse-gram.c"

     break;
 
   case 85:
     break;
 
   case 85:

-
-/* Line 1457 of yacc.c  */
-#line 525 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2723 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 518 "parse-gram.y"
+    { grammar_current_rule_begin (current_lhs, current_lhs_location); }
+/* Line 1380 of yacc.c  */
+#line 2505 "../../src/parse-gram.c"

     break;
 
   case 86:
     break;
 
   case 86:

+/* Line 1380 of yacc.c  */
+#line 520 "parse-gram.y"
+    { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2513 "../../src/parse-gram.c"
+    break;

 
 

-/* Line 1457 of yacc.c  */
-#line 526 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(3) - (3)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2733 "../../../src/parse-gram.c"
+  case 87:
+/* Line 1380 of yacc.c  */
+#line 522 "parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2521 "../../src/parse-gram.c"

     break;
 
   case 88:
     break;
 
   case 88:

-
-/* Line 1457 of yacc.c  */
-#line 532 "parse-gram.y"
-    { grammar_current_rule_begin (current_lhs, current_lhs_location); }
-
-/* Line 1457 of yacc.c  */
-#line 2743 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 524 "parse-gram.y"
+    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2529 "../../src/parse-gram.c"

     break;
 
   case 89:
     break;
 
   case 89:

-
-/* Line 1457 of yacc.c  */
-#line 534 "parse-gram.y"
-    { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2753 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 526 "parse-gram.y"
+    { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2537 "../../src/parse-gram.c"

     break;
 
   case 90:
     break;
 
   case 90:

-
-/* Line 1457 of yacc.c  */
-#line 536 "parse-gram.y"
-    { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2763 "../../../src/parse-gram.c"
-    break;
-
-  case 91:
-
-/* Line 1457 of yacc.c  */
-#line 538 "parse-gram.y"
-    { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2773 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 528 "parse-gram.y"
+    { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2545 "../../src/parse-gram.c"

     break;
 
   case 92:
     break;
 
   case 92:

-
-/* Line 1457 of yacc.c  */
-#line 540 "parse-gram.y"
-    { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2783 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 538 "parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
+/* Line 1380 of yacc.c  */
+#line 2553 "../../src/parse-gram.c"

     break;
 
   case 93:
     break;
 
   case 93:

-
-/* Line 1457 of yacc.c  */
-#line 542 "parse-gram.y"
-    { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2793 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 543 "parse-gram.y"
+    { (yyval.chars) = ""; }
+/* Line 1380 of yacc.c  */
+#line 2561 "../../src/parse-gram.c"

     break;
 
   case 95:
     break;
 
   case 95:

-
-/* Line 1457 of yacc.c  */
-#line 552 "parse-gram.y"
-    { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
-
-/* Line 1457 of yacc.c  */
-#line 2803 "../../../src/parse-gram.c"
-    break;
-
-  case 96:
-
-/* Line 1457 of yacc.c  */
-#line 558 "parse-gram.y"
-    {
-      (yyval.chars) = "";
-    }
-
-/* Line 1457 of yacc.c  */
-#line 2815 "../../../src/parse-gram.c"
-    break;
-
-  case 98:
-
-/* Line 1457 of yacc.c  */
-#line 571 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 554 "parse-gram.y"

     {
       code_props plain_code;
     {
       code_props plain_code;

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

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

-
-/* Line 1457 of yacc.c  */
-#line 2832 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2576 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 99:
-
-/* Line 1457 of yacc.c  */
-#line 591 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2842 "../../../src/parse-gram.c"
+  case 96:
+/* Line 1380 of yacc.c  */
+#line 574 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2584 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 100:
-
-/* Line 1457 of yacc.c  */
-#line 593 "parse-gram.y"
+  case 97:
+/* Line 1380 of yacc.c  */
+#line 576 "parse-gram.y"

     {
     {

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

     }
     }

-
-/* Line 1457 of yacc.c  */
-#line 2856 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2596 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 101:
-
-/* Line 1457 of yacc.c  */
-#line 601 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
-
-/* Line 1457 of yacc.c  */
-#line 2866 "../../../src/parse-gram.c"
+  case 98:
+/* Line 1380 of yacc.c  */
+#line 584 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2604 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 104:
-
-/* Line 1457 of yacc.c  */
-#line 613 "parse-gram.y"
+  case 101:
+/* Line 1380 of yacc.c  */
+#line 596 "parse-gram.y"

     {
     {

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

     }
     }

-
-/* Line 1457 of yacc.c  */
-#line 2879 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2615 "../../src/parse-gram.c"

     break;
 
     break;
 

-  case 106:
-
-/* Line 1457 of yacc.c  */
-#line 622 "parse-gram.y"
+  case 103:
+/* Line 1380 of yacc.c  */
+#line 605 "parse-gram.y"

     {
       code_props plain_code;
     {
       code_props plain_code;

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

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

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

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

-
-/* Line 1457 of yacc.c  */
-#line 2896 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2630 "../../src/parse-gram.c"

     break;
 
 
     break;
 
 

-
-/* Line 1457 of yacc.c  */
-#line 2902 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2635 "../../src/parse-gram.c"

       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);


@@ -2937,7 +2670,7 @@ yyerrlab:
       yyerror (YY_("syntax error"));
 #else
       {
       yyerror (YY_("syntax error"));
 #else
       {

-       YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+       YYSIZE_T yysize = yysyntax_error (0, yystate, yytoken);

        if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
          {
            YYSIZE_T yyalloc = 2 * yysize;
        if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
          {
            YYSIZE_T yyalloc = 2 * yysize;


@@ -2957,7 +2690,7 @@ yyerrlab:
 
        if (0 < yysize && yysize <= yymsg_alloc)
          {
 
        if (0 < yysize && yysize <= yymsg_alloc)
          {

-           (void) yysyntax_error (yymsg, yystate, yychar);
+           (void) yysyntax_error (yymsg, yystate, yytoken);

            yyerror (yymsg);
          }
        else
            yyerror (yymsg);
          }
        else


@@ -3114,10 +2847,8 @@ yyreturn:
   return YYID (yyresult);
 }
 
   return YYID (yyresult);
 }
 

-
-
-/* Line 1677 of yacc.c  */
-#line 632 "parse-gram.y"
+/* Line 1599 of yacc.c  */
+#line 615 "parse-gram.y"

 
 
 
 
 
 


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

-