Regen.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 4622f1f0607b95418f1289528339aee4d4085888..aaba454e77a53ebc36c51a5b274c042525a3cde8 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.79-c85be.  */
+/* A Bison parser, made by GNU Bison 2.4.266-78f6.  */

 
 /* 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.79-c85be"
+#define YYBISON_VERSION "2.4.266-78f6"

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


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


@@ -229,9 +227,9 @@ static int current_prec = 0;
      PIPE = 306,
      PROLOGUE = 307,
      SEMICOLON = 308,
      PIPE = 306,
      PROLOGUE = 307,
      SEMICOLON = 308,

-     TYPE = 309,
-     TYPE_TAG_ANY = 310,
-     TYPE_TAG_NONE = 311,
+     TAG = 309,
+     TAG_ANY = 310,
+     TAG_NONE = 311,

      PERCENT_UNION = 312
    };
 #endif
      PERCENT_UNION = 312
    };
 #endif


@@ -288,9 +286,9 @@ static int current_prec = 0;
 #define PIPE 306
 #define PROLOGUE 307
 #define SEMICOLON 308
 #define PIPE 306
 #define PROLOGUE 307
 #define SEMICOLON 308

-#define TYPE 309
-#define TYPE_TAG_ANY 310
-#define TYPE_TAG_NONE 311
+#define TAG 309
+#define TAG_ANY 310
+#define TAG_NONE 311

 #define PERCENT_UNION 312
 
 
 #define PERCENT_UNION 312
 
 


@@ -299,7 +297,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 +310,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 315 "../../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 +334,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 339 "../../src/parse-gram.c"

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


@@ -565,17 +560,19 @@ union yyalloc
 #define YYNNTS  33
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  106
 #define YYNNTS  33
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  106

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

 #define YYNSTATES  144
 
 #define YYNSTATES  144
 

-/* 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 YYMAXUTOK   312
 
 #define YYTRANSLATE(YYX)                                               \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   312
 
 #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,


@@ -613,70 +610,20 @@ static const yytype_uint8 yytranslate[] =
 };
 
 #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,   203,   203,   211,   213,   217,   218,   228,   232,   236,
+     237,   242,   246,   247,   248,   249,   250,   255,   264,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   287,
+     288,   312,   313,   314,   315,   319,   320,   321,   325,   332,
+     339,   343,   347,   354,   369,   370,   374,   386,   386,   391,
+     391,   396,   407,   422,   423,   424,   425,   429,   430,   435,
+     437,   442,   443,   448,   450,   455,   456,   460,   461,   462,
+     463,   468,   473,   478,   484,   490,   501,   502,   511,   512,
+     518,   519,   520,   527,   527,   531,   532,   533,   538,   539,
+     541,   543,   545,   547,   557,   558,   564,   567,   576,   596,
+     598,   607,   612,   613,   618,   625,   627

 };
 #endif
 
 };
 #endif
 


@@ -698,10 +645,10 @@ static const char *const yytname[] =
   "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"",
   "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"",
   "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"",
   "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"",
   "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"",
   "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"",

-  "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", "\"%union\"", "$accept",
+  "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"", "\"%union\"", "$accept",

   "input", "prologue_declarations", "prologue_declaration",
   "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2",
   "input", "prologue_declarations", "prologue_declaration",
   "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 +658,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,


@@ -724,41 +671,34 @@ static const yytype_uint16 yytoknum[] =
 };
 # 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 -81

 
 

-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+#define YYTABLE_NINF -106
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.    */
+static const yytype_int16 yypact[] =

 {
 {

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

 };
 
 };
 

-/* 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.  */
+  /* 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[] =
 {
        3,     0,     0,     1,    49,    47,     0,     0,     0,    53,
 static const yytype_uint8 yydefact[] =
 {
        3,     0,     0,     1,    49,    47,     0,     0,     0,    53,


@@ -778,38 +718,7 @@ static const yytype_uint8 yydefact[] =
       86,    91,    92,    93
 };
 
       86,    91,    92,    93
 };
 

-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -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
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -81
-static const yytype_int16 yypact[] =
-{
-     -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
-};
-
-/* YYPGOTO[NTERM-NUM].  */
+  /* YYPGOTO[NTERM-NUM].    */

 static const yytype_int8 yypgoto[] =
 {
      -81,   -81,   -81,   -81,   100,   -81,   -81,   -81,   -81,   -81,
 static const yytype_int8 yypgoto[] =
 {
      -81,   -81,   -81,   -81,   100,   -81,   -81,   -81,   -81,   -81,


@@ -818,11 +727,19 @@ static const yytype_int8 yypgoto[] =
      -36,   -76,   -81
 };
 
      -36,   -76,   -81
 };
 

-/* 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
+  /* YYDEFGOTO[NTERM-NUM].    */
+static const yytype_int16 yydefgoto[] =
+{
+      -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
+};
+
+  /* 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[] =
 {
       79,  -105,    81,    75,   106,    63,     4,     5,     6,     7,
 static const yytype_int16 yytable[] =
 {
       79,  -105,    81,    75,   106,    63,     4,     5,     6,     7,


@@ -873,8 +790,8 @@ static const yytype_int16 yycheck[] =
       45,    -1,    -1,    48
 };
 
       45,    -1,    -1,    48
 };
 

-/* 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[] =
 {
        0,    59,    60,     0,     5,     6,     7,     8,     9,    10,
 static const yytype_uint8 yystos[] =
 {
        0,    59,    60,     0,     5,     6,     7,     8,     9,    10,


@@ -894,6 +811,39 @@ static const yytype_uint8 yystos[] =
       82,    88,     4,    54
 };
 
       82,    88,     4,    54
 };
 

+  /* 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
+};
+
+  /* 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 yyerrok                (yyerrstatus = 0)
 #define yyclearin      (yychar = YYEMPTY)
 #define YYEMPTY                (-2)
 #define yyerrok                (yyerrstatus = 0)
 #define yyclearin      (yychar = YYEMPTY)
 #define YYEMPTY                (-2)


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

-      case 3: /* "\"string\"" */
+            case 3: // "string"

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); };
+        { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
+/* Line 647 of yacc.c  */
+#line 999 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1050 "../../../src/parse-gram.c"
-       break;
-      case 4: /* "\"integer\"" */
+            case 4: // "integer"

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "%d", ((*yyvaluep).integer)); };
+        { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
+/* Line 647 of yacc.c  */
+#line 1008 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1059 "../../../src/parse-gram.c"
-       break;
-      case 44: /* "\"{...}\"" */
+            case 44: // "{...}"

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); };
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
+/* Line 647 of yacc.c  */
+#line 1017 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1068 "../../../src/parse-gram.c"
-       break;
-      case 45: /* "\"char\"" */
+            case 45: // "char"

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fputs (char_name (((*yyvaluep).character)), stderr); };
+        { fputs (char_name (((*yyvaluep).character)), stderr); }
+/* Line 647 of yacc.c  */
+#line 1026 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1077 "../../../src/parse-gram.c"
-       break;
-      case 46: /* "\"epilogue\"" */
+            case 46: // "epilogue"

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 647 of yacc.c  */
+#line 1035 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1086 "../../../src/parse-gram.c"
-       break;
-      case 48: /* "\"identifier\"" */
+            case 48: // "identifier"

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fputs (((*yyvaluep).uniqstr), stderr); };
+        { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 647 of yacc.c  */
+#line 1044 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1095 "../../../src/parse-gram.c"
-       break;
-      case 49: /* "\"identifier:\"" */
+            case 49: // "identifier:"

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); };
+        { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
+/* Line 647 of yacc.c  */
+#line 1053 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1104 "../../../src/parse-gram.c"
-       break;
-      case 52: /* "\"%{...%}\"" */
+            case 52: // "%{...%}"

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 647 of yacc.c  */
+#line 1062 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1113 "../../../src/parse-gram.c"
-       break;
-      case 54: /* "\"type\"" */
+            case 54: // "<tag>"

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); };
+        { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
+/* Line 647 of yacc.c  */
+#line 1071 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1122 "../../../src/parse-gram.c"
-       break;
-      case 83: /* "variable" */
+            case 83: // variable

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fputs (((*yyvaluep).uniqstr), stderr); };
+        { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 647 of yacc.c  */
+#line 1080 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1131 "../../../src/parse-gram.c"
-       break;
-      case 84: /* "content.opt" */
+            case 84: // content.opt

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 647 of yacc.c  */
+#line 1089 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1140 "../../../src/parse-gram.c"
-       break;
-      case 85: /* "braceless" */
+            case 85: // braceless

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 647 of yacc.c  */
+#line 1098 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1149 "../../../src/parse-gram.c"
-       break;
-      case 86: /* "id" */
+            case 86: // id

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 647 of yacc.c  */
+#line 1107 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1158 "../../../src/parse-gram.c"
-       break;
-      case 87: /* "id_colon" */
+            case 87: // id_colon

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); };
+        { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
+/* Line 647 of yacc.c  */
+#line 1116 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1167 "../../../src/parse-gram.c"
-       break;
-      case 88: /* "symbol" */
+            case 88: // symbol

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 647 of yacc.c  */
+#line 1125 "../../src/parse-gram.c"
+        break;

 
 

-/* Line 717 of yacc.c  */
-#line 1176 "../../../src/parse-gram.c"
-       break;
-      case 89: /* "string_as_id" */
+            case 89: // string_as_id

 
 

-/* Line 717 of yacc.c  */
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 647 of yacc.c  */
+#line 1134 "../../src/parse-gram.c"
+        break;

 
 

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

       default:
        break;
     }
       default:
        break;
     }


@@ -1256,27 +1206,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 +1236,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 +1370,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 +1385,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 +1402,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 +1416,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 +1452,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 +1497,6 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 
   switch (yytype)
     {
 
   switch (yytype)
     {

-

       default:
        break;
     }
       default:
        break;
     }


@@ -1562,13 +1504,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 +1643,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 +1651,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 1656 "../../src/parse-gram.c"

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


@@ -1896,285 +1838,240 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-
-/* Line 1457 of yacc.c  */
+/* Line 1380 of yacc.c  */

 #line 219 "parse-gram.y"
     {
       code_props plain_code;
 #line 219 "parse-gram.y"
     {
       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 1854 "../../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 229 "parse-gram.y"
+    {
+      muscle_percent_define_insert ("debug", (yyloc), "");
+    }
+/* Line 1380 of yacc.c  */
+#line 1864 "../../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 233 "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 1874 "../../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 236 "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 1882 "../../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 238 "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 1893 "../../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"
+/* Line 1380 of yacc.c  */
+#line 243 "parse-gram.y"
+    {
+      muscle_percent_define_insert ("error_verbose", (yyloc), "");
+    }
+/* Line 1380 of yacc.c  */
+#line 1903 "../../src/parse-gram.c"

     break;
 
   case 12:
     break;
 
   case 12:

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

     break;
 
   case 13:
     break;
 
   case 13:

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

     break;
 
   case 14:
     break;
 
   case 14:

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

     break;
 
   case 15:
     break;
 
   case 15:

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

     break;
 
   case 16:
     break;
 
   case 16:

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

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

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

     break;
 
   case 17:
     break;
 
   case 17:

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

     {
       code_props action;
     {
       code_props action;

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

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

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

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

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

     break;
 
   case 18:
     break;
 
   case 18:

-
-/* Line 1457 of yacc.c  */
-#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"
+/* Line 1380 of yacc.c  */
+#line 264 "parse-gram.y"
+    { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
+/* Line 1380 of yacc.c  */
+#line 1969 "../../src/parse-gram.c"

     break;
 
   case 19:
     break;
 
   case 19:

-
-/* Line 1457 of yacc.c  */
-#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"
+/* Line 1380 of yacc.c  */
+#line 265 "parse-gram.y"
+    { add_param ("lex_param", (yyvsp[0].code), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 1977 "../../src/parse-gram.c"

     break;
 
   case 20:
     break;
 
   case 20:

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

     { locations_flag = true; }
     { locations_flag = true; }

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

     break;
 
   case 21:
     break;
 
   case 21:

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

     break;
 
   case 22:
     break;
 
   case 22:

-
-/* Line 1457 of yacc.c  */
-#line 262 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 2089 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 268 "parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 2001 "../../src/parse-gram.c"

     break;
 
   case 23:
     break;
 
   case 23:

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

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

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

     break;
 
   case 24:
     break;
 
   case 24:

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

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

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

     break;
 
   case 25:
     break;
 
   case 25:

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

     break;
 
   case 26:
     break;
 
   case 26:

-
-/* Line 1457 of yacc.c  */
-#line 266 "parse-gram.y"
-    { spec_outfile = (yyvsp[(3) - (3)].chars); }
-
-/* Line 1457 of yacc.c  */
-#line 2129 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 272 "parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 2033 "../../src/parse-gram.c"

     break;
 
   case 27:
     break;
 
   case 27:

-
-/* Line 1457 of yacc.c  */
-#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"
+/* Line 1380 of yacc.c  */
+#line 273 "parse-gram.y"
+    { add_param ("parse_param", (yyvsp[0].code), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2041 "../../src/parse-gram.c"

     break;
 
   case 28:
     break;
 
   case 28:

-
-/* Line 1457 of yacc.c  */
-#line 269 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 275 "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)"))
     {
       /* %pure-parser is deprecated in favor of `%define api.pure', so use
          `%define api.pure' in a backward-compatible manner here.  First, don't
          complain if %pure-parser is specified multiple times.  */
       if (!muscle_find_const ("percent_define(api.pure)"))

-        muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "");
+        muscle_percent_define_insert ("api.pure", (yylsp[0]), "");

       /* 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"))
       /* In all cases, use api.pure now so that the backend doesn't complain if
          the skeleton ignores api.pure, but do warn now if there's a previous
          conflicting definition from an actual %define.  */
       if (!muscle_percent_define_flag_if ("api.pure"))

-        muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "");
+        muscle_percent_define_insert ("api.pure", (yylsp[0]), "");

     }
     }

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

     break;
 
   case 29:
     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"
+/* Line 1380 of yacc.c  */
+#line 287 "parse-gram.y"
+    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
+/* Line 1380 of yacc.c  */
+#line 2068 "../../src/parse-gram.c"

     break;
 
   case 30:
     break;
 
   case 30:

-
-/* Line 1457 of yacc.c  */
-#line 283 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 289 "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 +2091,589 @@ 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 2098 "../../src/parse-gram.c"

     break;
 
   case 31:
     break;
 
   case 31:

-
-/* Line 1457 of yacc.c  */
-#line 306 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 312 "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 2106 "../../src/parse-gram.c"

     break;
 
   case 32:
     break;
 
   case 32:

-
-/* Line 1457 of yacc.c  */
-#line 307 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 313 "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 2114 "../../src/parse-gram.c"

     break;
 
   case 33:
     break;
 
   case 33:

-
-/* Line 1457 of yacc.c  */
-#line 308 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 314 "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 2122 "../../src/parse-gram.c"

     break;
 
   case 37:
     break;
 
   case 37:

-
-/* Line 1457 of yacc.c  */
-#line 316 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 322 "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 2132 "../../src/parse-gram.c"

     break;
 
   case 38:
     break;
 
   case 38:

-
-/* Line 1457 of yacc.c  */
-#line 320 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 326 "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 2145 "../../src/parse-gram.c"

     break;
 
   case 39:
     break;
 
   case 39:

-
-/* Line 1457 of yacc.c  */
-#line 327 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 333 "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 2158 "../../src/parse-gram.c"

     break;
 
   case 40:
     break;
 
   case 40:

-
-/* Line 1457 of yacc.c  */
-#line 334 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 340 "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 2168 "../../src/parse-gram.c"

     break;
 
   case 41:
     break;
 
   case 41:

-
-/* Line 1457 of yacc.c  */
-#line 338 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 344 "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 2178 "../../src/parse-gram.c"

     break;
 
   case 42:
     break;
 
   case 42:

-
-/* Line 1457 of yacc.c  */
-#line 342 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 348 "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 2191 "../../src/parse-gram.c"

     break;
 
   case 43:
     break;
 
   case 43:

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

     break;
 
   case 44:
     break;
 
   case 44:

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

     {}
     {}

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

     break;
 
   case 45:
     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"
+/* Line 1380 of yacc.c  */
+#line 370 "parse-gram.y"
+    { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2218 "../../src/parse-gram.c"

     break;
 
   case 46:
     break;
 
   case 46:

-
-/* Line 1457 of yacc.c  */
-#line 369 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 375 "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 2230 "../../src/parse-gram.c"

     break;
 
   case 47:
     break;
 
   case 47:

-
-/* Line 1457 of yacc.c  */
-#line 380 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 386 "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 2238 "../../src/parse-gram.c"

     break;
 
   case 48:
     break;
 
   case 48:

-
-/* Line 1457 of yacc.c  */
-#line 381 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 387 "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 2249 "../../src/parse-gram.c"

     break;
 
   case 49:
     break;
 
   case 49:

-
-/* Line 1457 of yacc.c  */
-#line 385 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 391 "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 2257 "../../src/parse-gram.c"

     break;
 
   case 50:
     break;
 
   case 50:

-
-/* Line 1457 of yacc.c  */
-#line 386 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 392 "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 2268 "../../src/parse-gram.c"

     break;
 
   case 51:
     break;
 
   case 51:

-
-/* Line 1457 of yacc.c  */
-#line 391 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 397 "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 2282 "../../src/parse-gram.c"

     break;
 
   case 52:
     break;
 
   case 52:

-
-/* Line 1457 of yacc.c  */
-#line 402 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 408 "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 2300 "../../src/parse-gram.c"

     break;
 
   case 53:
     break;
 
   case 53:

-
-/* Line 1457 of yacc.c  */
-#line 416 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 422 "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 2308 "../../src/parse-gram.c"

     break;
 
   case 54:
     break;
 
   case 54:

-
-/* Line 1457 of yacc.c  */
-#line 417 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 423 "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 2316 "../../src/parse-gram.c"

     break;
 
   case 55:
     break;
 
   case 55:

-
-/* Line 1457 of yacc.c  */
-#line 418 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 424 "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 2324 "../../src/parse-gram.c"

     break;
 
   case 56:
     break;
 
   case 56:

-
-/* Line 1457 of yacc.c  */
-#line 419 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 425 "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 2332 "../../src/parse-gram.c"

     break;
 
   case 57:
     break;
 
   case 57:

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

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

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

     break;
 
   case 58:
     break;
 
   case 58:

-
-/* Line 1457 of yacc.c  */
-#line 424 "parse-gram.y"
-    { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
-
-/* Line 1457 of yacc.c  */
-#line 2502 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 430 "parse-gram.y"
+    { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
+/* Line 1380 of yacc.c  */
+#line 2348 "../../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 436 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2356 "../../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 438 "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 2364 "../../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 442 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }
+/* Line 1380 of yacc.c  */
+#line 2372 "../../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 443 "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 2380 "../../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 449 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2388 "../../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 451 "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 2396 "../../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 455 "parse-gram.y"
+    { (yyval.list) = (yyvsp[0].list); }
+/* Line 1380 of yacc.c  */
+#line 2404 "../../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 456 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
+/* Line 1380 of yacc.c  */
+#line 2412 "../../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 460 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2420 "../../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"
+/* Line 1380 of yacc.c  */
+#line 461 "parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2428 "../../src/parse-gram.c"

     break;
 
   case 69:
     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"
+/* Line 1380 of yacc.c  */
+#line 462 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2436 "../../src/parse-gram.c"

     break;
 
   case 70:
     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"
+/* Line 1380 of yacc.c  */
+#line 463 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2444 "../../src/parse-gram.c"

     break;
 
   case 71:
     break;
 
   case 71:

-
-/* Line 1457 of yacc.c  */
-#line 463 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 469 "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 2455 "../../src/parse-gram.c"

     break;
 
   case 72:
     break;
 
   case 72:

-
-/* Line 1457 of yacc.c  */
-#line 468 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 474 "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 2466 "../../src/parse-gram.c"

     break;
 
   case 73:
     break;
 
   case 73:

-
-/* Line 1457 of yacc.c  */
-#line 473 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 479 "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 2478 "../../src/parse-gram.c"

     break;
 
   case 74:
     break;
 
   case 74:

-
-/* Line 1457 of yacc.c  */
-#line 479 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 485 "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 2490 "../../src/parse-gram.c"

     break;
 
   case 75:
     break;
 
   case 75:

-
-/* Line 1457 of yacc.c  */
-#line 485 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 491 "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 2503 "../../src/parse-gram.c"

     break;
 
   case 82:
     break;
 
   case 82:

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

     {
       yyerrok;
     }
     {
       yyerrok;
     }

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

     break;
 
   case 83:
     break;
 
   case 83:

-
-/* Line 1457 of yacc.c  */
-#line 521 "parse-gram.y"
-    { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
-
-/* Line 1457 of yacc.c  */
-#line 2713 "../../../src/parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 527 "parse-gram.y"
+    { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); }
+/* Line 1380 of yacc.c  */
+#line 2521 "../../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 531 "parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2529 "../../src/parse-gram.c"

     break;
 
   case 86:
     break;
 
   case 86:

-
-/* 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"
+/* Line 1380 of yacc.c  */
+#line 532 "parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2537 "../../src/parse-gram.c"

     break;
 
   case 88:
     break;
 
   case 88:

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

     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     { 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 2545 "../../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 540 "parse-gram.y"
+    { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2553 "../../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"
+/* Line 1380 of yacc.c  */
+#line 542 "parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2561 "../../src/parse-gram.c"

     break;
 
   case 91:
     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 544 "parse-gram.y"
+    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2569 "../../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 546 "parse-gram.y"
+    { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2577 "../../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 548 "parse-gram.y"
+    { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2585 "../../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"
+/* Line 1380 of yacc.c  */
+#line 558 "parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
+/* Line 1380 of yacc.c  */
+#line 2593 "../../src/parse-gram.c"

     break;
 
   case 96:
     break;
 
   case 96:

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

     {
       (yyval.chars) = "";
     }
     {
       (yyval.chars) = "";
     }

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

     break;
 
   case 98:
     break;
 
   case 98:

-
-/* Line 1457 of yacc.c  */
-#line 571 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 577 "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 2618 "../../src/parse-gram.c"

     break;
 
   case 99:
     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"
+/* Line 1380 of yacc.c  */
+#line 597 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2626 "../../src/parse-gram.c"

     break;
 
   case 100:
     break;
 
   case 100:

-
-/* Line 1457 of yacc.c  */
-#line 593 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 599 "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 2638 "../../src/parse-gram.c"

     break;
 
   case 101:
     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"
+/* Line 1380 of yacc.c  */
+#line 607 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2646 "../../src/parse-gram.c"

     break;
 
   case 104:
     break;
 
   case 104:

-
-/* Line 1457 of yacc.c  */
-#line 613 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 619 "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 2657 "../../src/parse-gram.c"

     break;
 
   case 106:
     break;
 
   case 106:

-
-/* Line 1457 of yacc.c  */
-#line 622 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 628 "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 2672 "../../src/parse-gram.c"

     break;
 
 
     break;
 
 

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

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


@@ -2937,7 +2712,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 +2732,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 +2889,8 @@ yyreturn:
   return YYID (yyresult);
 }
 
   return YYID (yyresult);
 }
 

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