Warn about character literals not of length one.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index c7595e7633966a4961f2b37905174df5b9c27531..2f9e10eb8a09ea3f19f5ced8a6b664097a12d568 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,21 +1,20 @@
+/* A Bison parser, made by GNU Bison 2.4.343-83ea.  */

 
 

-/* A Bison parser, made by GNU Bison 2.3a+.  */
+/* Implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008, 2009 Free Software Foundation, Inc.

 
 

-/* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   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
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

-   
+

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-   
+

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 


@@ -28,7 +27,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.

-   
+

    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 


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

-#define YYBISON_VERSION "2.3a+"
+#define YYBISON_VERSION "2.4.343-83ea"

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


@@ -54,27 +53,32 @@
 /* Pure parsers.  */
 #define YYPURE 1
 
 /* Pure parsers.  */
 #define YYPURE 1
 

+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+

 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* Substitute the variable and function names.  */
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* Substitute the variable and function names.  */

-#define yyparse gram_parse
-#define yylex   gram_lex
-#define yyerror gram_error
-#define yylval  gram_lval
-#define yychar  gram_char
-#define yydebug gram_debug
-#define yynerrs gram_nerrs
-#define yylloc gram_lloc
+#define yyparse         gram_parse
+#define yylex           gram_lex
+#define yyerror         gram_error
+#define yylval          gram_lval
+#define yychar          gram_char
+#define yydebug         gram_debug
+#define yynerrs         gram_nerrs
+#define yylloc          gram_lloc

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

-
-/* Line 22 of yacc.c  */
+/* Line 191 of yacc.c  */

 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 

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

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


@@ -94,14 +98,13 @@
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"
 

-#include <strverscmp.h>
-

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

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

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


@@ -138,6 +141,7 @@ static symbol_class current_class = unknown_sym;
 static uniqstr current_type = NULL;
 static symbol *current_lhs;
 static location current_lhs_location;
 static uniqstr current_type = NULL;
 static symbol *current_lhs;
 static location current_lhs_location;

+static named_ref *current_lhs_named_ref;

 static int current_prec = 0;
 
 #define YYTYPE_INT16 int_fast16_t
 static int current_prec = 0;
 
 #define YYTYPE_INT16 int_fast16_t


@@ -145,9 +149,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 22 of yacc.c  */
-#line 151 "parse-gram.c"
+/* Line 191 of yacc.c  */
+#line 154 "../master/src/parse-gram.c"

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


@@ -185,49 +188,49 @@ static int current_prec = 0;
      PERCENT_LEFT = 265,
      PERCENT_RIGHT = 266,
      PERCENT_NONASSOC = 267,
      PERCENT_LEFT = 265,
      PERCENT_RIGHT = 266,
      PERCENT_NONASSOC = 267,

-     PERCENT_PREC = 268,
-     PERCENT_DPREC = 269,
-     PERCENT_MERGE = 270,
-     PERCENT_CODE = 271,
-     PERCENT_DEBUG = 272,
+     PERCENT_PRECEDENCE = 268,
+     PERCENT_PREC = 269,
+     PERCENT_DPREC = 270,
+     PERCENT_MERGE = 271,
+     PERCENT_CODE = 272,

      PERCENT_DEFAULT_PREC = 273,
      PERCENT_DEFINE = 274,
      PERCENT_DEFINES = 275,
      PERCENT_ERROR_VERBOSE = 276,
      PERCENT_EXPECT = 277,
      PERCENT_EXPECT_RR = 278,
      PERCENT_DEFAULT_PREC = 273,
      PERCENT_DEFINE = 274,
      PERCENT_DEFINES = 275,
      PERCENT_ERROR_VERBOSE = 276,
      PERCENT_EXPECT = 277,
      PERCENT_EXPECT_RR = 278,

-     PERCENT_FILE_PREFIX = 279,
-     PERCENT_GLR_PARSER = 280,
-     PERCENT_INITIAL_ACTION = 281,
-     PERCENT_LANGUAGE = 282,
-     PERCENT_LEX_PARAM = 283,
-     PERCENT_LOCATIONS = 284,
+     PERCENT_FLAG = 279,
+     PERCENT_FILE_PREFIX = 280,
+     PERCENT_GLR_PARSER = 281,
+     PERCENT_INITIAL_ACTION = 282,
+     PERCENT_LANGUAGE = 283,
+     PERCENT_LEX_PARAM = 284,

      PERCENT_NAME_PREFIX = 285,
      PERCENT_NO_DEFAULT_PREC = 286,
      PERCENT_NO_LINES = 287,
      PERCENT_NONDETERMINISTIC_PARSER = 288,
      PERCENT_OUTPUT = 289,
      PERCENT_PARSE_PARAM = 290,
      PERCENT_NAME_PREFIX = 285,
      PERCENT_NO_DEFAULT_PREC = 286,
      PERCENT_NO_LINES = 287,
      PERCENT_NONDETERMINISTIC_PARSER = 288,
      PERCENT_OUTPUT = 289,
      PERCENT_PARSE_PARAM = 290,

-     PERCENT_PURE_PARSER = 291,
-     PERCENT_REQUIRE = 292,
-     PERCENT_SKELETON = 293,
-     PERCENT_START = 294,
-     PERCENT_TOKEN_TABLE = 295,
-     PERCENT_VERBOSE = 296,
-     PERCENT_YACC = 297,
-     BRACED_CODE = 298,
-     CHAR = 299,
-     EPILOGUE = 300,
-     EQUAL = 301,
-     ID = 302,
-     ID_COLON = 303,
-     PERCENT_PERCENT = 304,
-     PIPE = 305,
-     PROLOGUE = 306,
-     SEMICOLON = 307,
-     TYPE = 308,
-     TYPE_TAG_ANY = 309,
-     TYPE_TAG_NONE = 310,
+     PERCENT_REQUIRE = 291,
+     PERCENT_SKELETON = 292,
+     PERCENT_START = 293,
+     PERCENT_TOKEN_TABLE = 294,
+     PERCENT_VERBOSE = 295,
+     PERCENT_YACC = 296,
+     BRACED_CODE = 297,
+     CHAR = 298,
+     EPILOGUE = 299,
+     EQUAL = 300,
+     ID = 301,
+     ID_COLON = 302,
+     PERCENT_PERCENT = 303,
+     PIPE = 304,
+     PROLOGUE = 305,
+     SEMICOLON = 306,
+     TAG = 307,
+     TAG_ANY = 308,
+     TAG_NONE = 309,
+     BRACKETED_ID = 310,

      PERCENT_UNION = 311
    };
 #endif
      PERCENT_UNION = 311
    };
 #endif


@@ -243,49 +246,49 @@ static int current_prec = 0;
 #define PERCENT_LEFT 265
 #define PERCENT_RIGHT 266
 #define PERCENT_NONASSOC 267
 #define PERCENT_LEFT 265
 #define PERCENT_RIGHT 266
 #define PERCENT_NONASSOC 267

-#define PERCENT_PREC 268
-#define PERCENT_DPREC 269
-#define PERCENT_MERGE 270
-#define PERCENT_CODE 271
-#define PERCENT_DEBUG 272
+#define PERCENT_PRECEDENCE 268
+#define PERCENT_PREC 269
+#define PERCENT_DPREC 270
+#define PERCENT_MERGE 271
+#define PERCENT_CODE 272

 #define PERCENT_DEFAULT_PREC 273
 #define PERCENT_DEFINE 274
 #define PERCENT_DEFINES 275
 #define PERCENT_ERROR_VERBOSE 276
 #define PERCENT_EXPECT 277
 #define PERCENT_EXPECT_RR 278
 #define PERCENT_DEFAULT_PREC 273
 #define PERCENT_DEFINE 274
 #define PERCENT_DEFINES 275
 #define PERCENT_ERROR_VERBOSE 276
 #define PERCENT_EXPECT 277
 #define PERCENT_EXPECT_RR 278

-#define PERCENT_FILE_PREFIX 279
-#define PERCENT_GLR_PARSER 280
-#define PERCENT_INITIAL_ACTION 281
-#define PERCENT_LANGUAGE 282
-#define PERCENT_LEX_PARAM 283
-#define PERCENT_LOCATIONS 284
+#define PERCENT_FLAG 279
+#define PERCENT_FILE_PREFIX 280
+#define PERCENT_GLR_PARSER 281
+#define PERCENT_INITIAL_ACTION 282
+#define PERCENT_LANGUAGE 283
+#define PERCENT_LEX_PARAM 284

 #define PERCENT_NAME_PREFIX 285
 #define PERCENT_NO_DEFAULT_PREC 286
 #define PERCENT_NO_LINES 287
 #define PERCENT_NONDETERMINISTIC_PARSER 288
 #define PERCENT_OUTPUT 289
 #define PERCENT_PARSE_PARAM 290
 #define PERCENT_NAME_PREFIX 285
 #define PERCENT_NO_DEFAULT_PREC 286
 #define PERCENT_NO_LINES 287
 #define PERCENT_NONDETERMINISTIC_PARSER 288
 #define PERCENT_OUTPUT 289
 #define PERCENT_PARSE_PARAM 290

-#define PERCENT_PURE_PARSER 291
-#define PERCENT_REQUIRE 292
-#define PERCENT_SKELETON 293
-#define PERCENT_START 294
-#define PERCENT_TOKEN_TABLE 295
-#define PERCENT_VERBOSE 296
-#define PERCENT_YACC 297
-#define BRACED_CODE 298
-#define CHAR 299
-#define EPILOGUE 300
-#define EQUAL 301
-#define ID 302
-#define ID_COLON 303
-#define PERCENT_PERCENT 304
-#define PIPE 305
-#define PROLOGUE 306
-#define SEMICOLON 307
-#define TYPE 308
-#define TYPE_TAG_ANY 309
-#define TYPE_TAG_NONE 310
+#define PERCENT_REQUIRE 291
+#define PERCENT_SKELETON 292
+#define PERCENT_START 293
+#define PERCENT_TOKEN_TABLE 294
+#define PERCENT_VERBOSE 295
+#define PERCENT_YACC 296
+#define BRACED_CODE 297
+#define CHAR 298
+#define EPILOGUE 299
+#define EQUAL 300
+#define ID 301
+#define ID_COLON 302
+#define PERCENT_PERCENT 303
+#define PIPE 304
+#define PROLOGUE 305
+#define SEMICOLON 306
+#define TAG 307
+#define TAG_ANY 308
+#define TAG_NONE 309
+#define BRACKETED_ID 310

 #define PERCENT_UNION 311
 
 
 #define PERCENT_UNION 311
 
 


@@ -294,8 +297,7 @@ 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 22 of yacc.c  */
+/* Line 216 of yacc.c  */

 #line 94 "parse-gram.y"
 
   symbol *symbol;
 #line 94 "parse-gram.y"
 
   symbol *symbol;


@@ -306,11 +308,11 @@ typedef union YYSTYPE
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;

+  named_ref *named_ref;

 
 
 
 

-
-/* Line 22 of yacc.c  */
-#line 314 "parse-gram.c"
+/* Line 216 of yacc.c  */
+#line 316 "../master/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 */


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

-
-/* Line 22 of yacc.c  */
-#line 339 "parse-gram.c"
+/* Line 266 of yacc.c  */
+#line 340 "../master/src/parse-gram.c"

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


@@ -499,9 +500,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {

-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-    YYLTYPE yyls;
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+  YYLTYPE yyls_alloc;

 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */


@@ -536,12 +537,12 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */

-# define YYSTACK_RELOCATE(Stack)                                       \
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                          \

     do                                                                 \
       {                                                                        \
        YYSIZE_T yynewbytes;                                            \
     do                                                                 \
       {                                                                        \
        YYSIZE_T yynewbytes;                                            \

-       YYCOPY (&yyptr->Stack, Stack, yysize);                          \
-       Stack = &yyptr->Stack;                                          \
+       YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+       Stack = &yyptr->Stack_alloc;                                    \

        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
        yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                        \
        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
        yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                        \


@@ -552,25 +553,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   155
+#define YYLAST   160

 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  57
 /* YYNNTS -- Number of nonterminals.  */
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  57
 /* YYNNTS -- Number of nonterminals.  */

-#define YYNNTS  31
+#define YYNNTS  34

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

-#define YYNRULES  101
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  139
+#define YYNRULES  106
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  146

 
 

-/* 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   311
 
 #define YYTRANSLATE(YYX)                                               \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   311
 
 #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,68 +611,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,   150,   152,   154,
-     157,   159,   162,   164,   166,   168,   170,   172,   174,   177,
-     180,   184,   186,   189,   191,   194,   196,   199,   202,   203,
-     207,   209,   213,   216,   217,   220,   223,   227,   231,   235,
-     237,   239,   240,   242,   244,   246,   248,   250,   252,   254,
-     256,   257
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      58,     0,    -1,    59,    49,    74,    87,    -1,    -1,    59,
-      60,    -1,    61,    -1,    51,    -1,    17,    -1,    19,    80,
-      81,    -1,    20,    -1,    20,     3,    -1,    21,    -1,    22,
-       4,    -1,    23,     4,    -1,    24,     3,    -1,    24,    46,
-       3,    -1,    25,    -1,    26,    43,    -1,    27,     3,    -1,
-      28,    43,    -1,    29,    -1,    30,     3,    -1,    30,    46,
-       3,    -1,    32,    -1,    33,    -1,    34,     3,    -1,    34,
-      46,     3,    -1,    35,    43,    -1,    36,    -1,    37,     3,
-      -1,    38,     3,    -1,    40,    -1,    41,    -1,    42,    -1,
-      52,    -1,    66,    -1,    63,    -1,    39,    85,    -1,     8,
-      43,    70,    -1,     9,    43,    70,    -1,    18,    -1,    31,
-      -1,    16,    82,    -1,    16,    47,    82,    -1,    -1,    47,
-      -1,    56,    62,    82,    -1,    -1,     6,    64,    73,    -1,
-      -1,     5,    65,    73,    -1,     7,    53,    69,    -1,    67,
-      68,    69,    -1,    10,    -1,    11,    -1,    12,    -1,    -1,
-      53,    -1,    85,    -1,    69,    85,    -1,    71,    -1,    70,
-      71,    -1,    85,    -1,    53,    -1,    54,    -1,    55,    -1,
-      53,    -1,    83,    -1,    83,     4,    -1,    83,    86,    -1,
-      83,     4,    86,    -1,    72,    -1,    73,    72,    -1,    75,
-      -1,    74,    75,    -1,    76,    -1,    61,    52,    -1,     1,
-      52,    -1,    -1,    84,    77,    78,    -1,    79,    -1,    78,
-      50,    79,    -1,    78,    52,    -1,    -1,    79,    85,    -1,
-      79,    43,    -1,    79,    13,    85,    -1,    79,    14,     4,
-      -1,    79,    15,    53,    -1,    47,    -1,     3,    -1,    -1,
-       3,    -1,    43,    -1,    47,    -1,    44,    -1,    48,    -1,
-      83,    -1,    86,    -1,     3,    -1,    -1,    49,    45,    -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,   204,   204,   212,   214,   218,   219,   229,   230,   234,
-     235,   240,   241,   242,   243,   244,   245,   250,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   282,
-     283,   307,   308,   309,   310,   314,   315,   316,   320,   327,
-     334,   338,   342,   349,   364,   365,   369,   381,   381,   386,
-     386,   391,   402,   417,   418,   419,   423,   424,   429,   431,
-     436,   437,   441,   442,   443,   444,   449,   454,   459,   465,
-     471,   482,   483,   492,   493,   499,   500,   501,   508,   508,
-     512,   513,   514,   519,   520,   522,   524,   526,   528,   538,
-     539,   545,   548,   557,   577,   579,   588,   593,   594,   599,
-     606,   608
+       0,   207,   207,   215,   217,   221,   222,   232,   236,   241,
+     242,   247,   252,   253,   254,   255,   256,   261,   270,   271,
+     272,   273,   274,   275,   276,   277,   278,   279,   280,   304,
+     305,   306,   307,   311,   312,   313,   317,   324,   331,   335,
+     339,   346,   361,   362,   366,   378,   378,   383,   383,   388,
+     399,   414,   415,   416,   417,   421,   422,   427,   429,   434,
+     435,   440,   442,   447,   448,   452,   453,   454,   455,   460,
+     465,   470,   476,   482,   493,   494,   503,   504,   510,   511,
+     512,   519,   519,   524,   525,   526,   531,   533,   535,   537,
+     539,   541,   546,   548,   559,   560,   565,   566,   575,   595,
+     597,   606,   611,   612,   617,   624,   626

 };
 #endif
 
 };
 #endif
 


@@ -680,31 +635,32 @@ static const char *const yytname[] =
 {
   "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
   "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
 {
   "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
   "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",

-  "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"",
-  "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%debug\"",
+  "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"",
+  "\"%precedence\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",

   "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
   "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",

-  "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
-  "\"%initial-action\"", "\"%language\"", "\"%lex-param\"",
-  "\"%locations\"", "\"%name-prefix\"", "\"%no-default-prec\"",
+  "\"%expect\"", "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"",
+  "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"",
+  "\"%lex-param\"", "\"%name-prefix\"", "\"%no-default-prec\"",

   "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"",
   "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"",

-  "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"",
-  "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"",
-  "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"",
-  "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"",
-  "\"<*>\"", "\"<>\"", "\"%union\"", "$accept", "input",
+  "\"%parse-param\"", "\"%require\"", "\"%skeleton\"", "\"%start\"",
+  "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"",
+  "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
+  "\"|\"", "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"",
+  "\"[identifier]\"", "\"%union\"", "$accept", "input",

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

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

   "id_colon", "symbol", "string_as_id", "epilogue.opt", 0
 };
 #endif
 
 # ifdef YYPRINT
   "id_colon", "symbol", "string_as_id", "epilogue.opt", 0
 };
 #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,


@@ -716,163 +672,171 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
 };
 # endif
 

-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    57,    58,    59,    59,    60,    60,    60,    60,    60,
-      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
-      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
-      60,    60,    60,    60,    60,    61,    61,    61,    61,    61,
-      61,    61,    61,    61,    62,    62,    61,    64,    63,    65,
-      63,    63,    66,    67,    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
-};
+#define YYPACT_NINF -53

 
 

-/* 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,     0,     1,     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 -106

 
 

-/* 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,     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,    56,     0,     0,
-       0,     0,     0,    93,     0,    42,    90,    89,    91,    10,
-      12,    13,    14,     0,    17,    18,    19,    21,     0,    25,
-       0,    27,    29,    30,    99,    95,    94,    97,    37,    98,
-       0,    96,     0,     0,    73,    75,    78,    45,     0,    57,
-       0,    66,    71,    50,    67,    48,    51,    58,    63,    64,
-      65,    38,    60,    62,    39,    43,    92,     8,    15,    22,
-      26,    77,    76,     0,    74,     2,    83,    46,    52,    72,
-      68,    69,    59,    61,   101,    79,    80,    70,    83,    82,
-       0,     0,     0,    85,    84,    81,    86,    87,    88
+     -53,     5,   102,   -53,   -53,   -53,   -10,     8,    27,   -53,
+     -53,   -53,   -53,    18,   -53,    32,    55,   -53,    70,    77,
+     -53,    17,   -53,    43,    91,    53,    41,   -53,   -53,   -53,
+      42,    54,    94,    96,     0,   -53,   -53,   -53,    16,   -53,
+     -53,    56,   -53,   -53,   -53,   -53,    48,    30,    30,     0,
+      13,    13,   -53,    61,   -53,   -53,   -53,   101,   -53,   -53,
+     -53,   -53,   113,   -53,   -53,   -53,   -53,   114,   -53,   115,
+     -53,   -53,   -53,   -53,   -53,   -53,   -53,   -53,   -53,    93,
+     -53,    95,     1,   -53,   -53,    50,   -53,    61,   -53,     0,
+     -53,   -53,    30,    33,    30,     0,   -53,   -53,   -53,   -53,
+      13,   -53,   -53,    13,   -53,   -53,   -53,   -53,   -53,   -53,
+     -53,   -53,   103,   -53,   -53,   -53,   -53,   -53,     0,   -53,
+     141,   -53,   145,   -53,   -53,   -53,   -53,   -53,   -53,   -53,
+     -53,    39,    37,   -53,   -53,     0,   147,    97,    50,    50,
+      37,   -53,   -53,   -53,   -53,   -53

 };
 
 };
 

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

 {
 {

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

 };
 
 };
 

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

 {
 {

-     -60,    18,    96,   -60,   -60,   -60,   -16,    17,    24,   -60,
-     -60,   -60,    -8,   -60,   -60,    11,    70,   -60,    71,    80,
-       2,   -60,    46,    87,    49,   -60,    31,   -60,   -60,   -60,
-      40,    50,   -60,    91,    93,     0,   -60,   -60,   -60,    15,
-     -60,   -60,    51,   -60,   -60,   -60,   -60,    44,    12,    12,
-       0,    25,    25,   -60,    56,   -60,   -60,   -60,   106,   -60,
-     -60,   -60,   -60,   107,   -60,   -60,   -60,   -60,   108,   -60,
-     136,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,
-      88,   -60,    89,     1,   -60,   -60,   -60,   -60,    56,   -60,
-       0,   -60,   -60,    12,    84,    12,     0,   -60,   -60,   -60,
-     -60,    25,   -60,   -60,    25,   -60,   -60,   -60,   -60,   -60,
-     -60,   -60,   -60,    97,   -60,   -60,   -60,   -60,     0,   -60,
-     140,   -60,   -60,   -60,   -60,    14,    38,   -60,   -60,   -60,
-       0,   142,    98,   -60,   -60,    38,   -60,   -60,   -60
+     -53,   -53,   -53,   -53,   152,   -53,   -53,   -53,   -53,   -53,
+     -53,   -53,   -53,    38,   -53,   104,   -32,    -3,   109,   -53,
+      78,   -53,   -53,   -53,    26,   -46,   -53,   -53,   -49,   -17,
+     -53,   -34,   -52,   -53

 };
 
 };
 

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

 {
 {

-     -60,   -60,   -60,   -60,   147,   -60,   -60,   -60,   -60,   -60,
-     -60,   -60,    54,   101,   -59,   -25,   105,   -60,    67,   -60,
-     -60,   -60,    27,   -60,   -60,   -50,   -19,   -60,   -35,   -58,
-     -60
+      -1,     1,     2,    42,    81,    87,    44,    48,    47,    45,
+      46,    89,   118,   119,    95,   100,   101,    91,    92,    82,
+      83,    84,   127,   131,   132,   116,    57,   106,    54,    76,
+      85,   102,    78,   114

 };
 
 };
 

-/* 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 -101
+  /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule which
+     number is the opposite.  If zero, do what YYDEFACT says.
+     If YYTABLE_NINF, syntax error.    */

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

-      78,  -100,    80,    74,   105,    62,     4,     5,     6,     7,
-       8,     9,    10,    11,    56,    97,    80,    12,     3,    14,
-       4,     5,     6,     7,     8,     9,    10,    11,    74,    94,
-      94,    12,    27,    14,    67,    53,   121,    50,   117,    54,
-      35,    74,   123,    69,    75,   123,    27,    76,    63,    81,
-     113,   130,   131,   132,    35,    97,    75,    42,    57,    76,
-      51,   122,   127,    81,   128,    91,   129,    52,   119,    75,
-     119,    42,    76,    59,    94,    60,    94,    68,    98,    99,
-     100,   133,    75,   122,    61,    76,    70,    74,   120,    64,
-      65,   134,    66,    71,    72,   136,    73,    89,    87,    53,
-     134,     4,     5,     6,     7,     8,     9,    10,    11,   106,
-     108,   109,    12,    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,   110,
-     111,   112,   124,    74,   118,    39,   137,    40,    41,    44,
-     114,   138,    42,   104,    95,   135
+      77,  -105,    79,    73,   104,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    96,    73,    79,    13,    14,
+      61,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      93,    93,    27,    13,    14,    55,    73,   122,   117,    34,
+      73,   123,    49,    74,    66,    68,    75,    27,    80,   112,
+      50,   135,   136,   137,    34,   120,    74,    41,    58,    75,
+      52,   124,    62,    80,    53,    97,    98,    99,   125,    51,
+     130,   125,    41,    74,    59,    93,    75,    93,    56,   138,
+      74,    60,    90,    75,   120,    63,    67,    69,   133,   121,
+     134,   121,   144,   145,    64,    65,    70,    71,   139,    72,
+      88,   141,    86,    52,   105,   115,   139,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,   107,   108,   109,    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,   110,   129,   111,   126,    73,   143,
+      38,   142,    39,    40,    43,   103,   128,    94,    41,   140,
+     113

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

-      35,     0,     1,     3,    54,     3,     5,     6,     7,     8,
-       9,    10,    11,    12,     3,    50,     1,    16,     0,    18,
-       5,     6,     7,     8,     9,    10,    11,    12,     3,    48,
-      49,    16,    31,    18,     3,    43,    94,    53,    88,    47,
-      39,     3,   101,     3,    44,   104,    31,    47,    46,    48,
-      49,    13,    14,    15,    39,    90,    44,    56,    47,    47,
-      43,    96,   120,    48,    50,    53,    52,    43,    93,    44,
-      95,    56,    47,     3,    93,     4,    95,    46,    53,    54,
-      55,    43,    44,   118,     4,    47,    46,     3,     4,    43,
-       3,   126,    43,    43,     3,   130,     3,    53,    47,    43,
-     135,     5,     6,     7,     8,     9,    10,    11,    12,     3,
-       3,     3,    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,     3,
-      52,    52,    45,     3,    90,    49,     4,    51,    52,     2,
-      83,    53,    56,    52,    49,   128
+      34,     0,     1,     3,    53,     0,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    49,     3,     1,    17,    18,
+       3,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      47,    48,    31,    17,    18,     3,     3,     4,    87,    38,
+       3,    93,    52,    43,     3,     3,    46,    31,    47,    48,
+      42,    14,    15,    16,    38,    89,    43,    56,     3,    46,
+      42,    95,    45,    47,    46,    52,    53,    54,   100,    42,
+     122,   103,    56,    43,     4,    92,    46,    94,    46,    42,
+      43,     4,    52,    46,   118,    42,    45,    45,    49,    92,
+      51,    94,   138,   139,     3,    42,    42,     3,   132,     3,
+      52,   135,    46,    42,     3,    55,   140,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,     3,     3,     3,    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,    51,     4,    51,    44,     3,    52,
+      48,     4,    50,    51,     2,    51,   118,    48,    56,   133,
+      82

 };
 
 };
 

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

-      11,    12,    16,    17,    18,    19,    20,    21,    22,    23,
+      11,    12,    13,    17,    18,    19,    20,    21,    22,    23,

       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    36,    37,    38,    39,    40,    41,    42,    49,
-      51,    52,    56,    60,    61,    63,    66,    67,    65,    64,
-      53,    43,    43,    43,    47,    82,     3,    47,    80,     3,
-       4,     4,     3,    46,    43,     3,    43,     3,    46,     3,
-      46,    43,     3,     3,     3,    44,    47,    83,    85,    86,
-       1,    48,    61,    74,    75,    76,    84,    47,    62,    53,
-      68,    53,    72,    73,    83,    73,    69,    85,    53,    54,
-      55,    70,    71,    85,    70,    82,     3,    81,     3,     3,
-       3,    52,    52,    49,    75,    87,    77,    82,    69,    72,
-       4,    86,    85,    71,    45,    78,    79,    86,    50,    52,
-      13,    14,    15,    43,    85,    79,    85,     4,    53
+      34,    35,    36,    37,    38,    39,    40,    41,    48,    50,
+      51,    56,    60,    61,    63,    66,    67,    65,    64,    52,
+      42,    42,    42,    46,    85,     3,    46,    83,     3,     4,
+       4,     3,    45,    42,     3,    42,     3,    45,     3,    45,
+      42,     3,     3,     3,    43,    46,    86,    88,    89,     1,
+      47,    61,    76,    77,    78,    87,    46,    62,    52,    68,
+      52,    74,    75,    86,    75,    71,    88,    52,    53,    54,
+      72,    73,    88,    72,    85,     3,    84,     3,     3,     3,
+      51,    51,    48,    77,    90,    55,    82,    85,    69,    70,
+      88,    74,     4,    89,    88,    73,    44,    79,    70,     4,
+      89,    80,    81,    49,    51,    14,    15,    16,    42,    88,
+      81,    88,     4,    52,    82,    82
+};
+
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.    */
+static const yytype_uint8 yyr1[] =
+{
+       0,    57,    58,    59,    59,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
+      60,    60,    60,    61,    61,    61,    61,    61,    61,    61,
+      61,    61,    62,    62,    61,    64,    63,    65,    63,    63,
+      66,    67,    67,    67,    67,    68,    68,    69,    69,    70,
+      70,    71,    71,    72,    72,    73,    73,    73,    73,    74,
+      74,    74,    74,    74,    75,    75,    76,    76,    77,    77,
+      77,    79,    78,    80,    80,    80,    81,    81,    81,    81,
+      81,    81,    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,
+       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,     4,     1,     3,     2,     0,     3,     3,     3,
+       3,     3,     0,     1,     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)


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

-      case 3: /* "\"string\"" */
-
-/* Line 22 of yacc.c  */
-#line 182 "parse-gram.y"
-       { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-
-/* Line 22 of yacc.c  */
-#line 1029 "parse-gram.c"
-       break;
-      case 4: /* "\"integer\"" */
-
-/* Line 22 of yacc.c  */
-#line 193 "parse-gram.y"
-       { fprintf (stderr, "%d", (yyvaluep->integer)); };
-
-/* Line 22 of yacc.c  */
-#line 1038 "parse-gram.c"
-       break;
-      case 43: /* "\"{...}\"" */
-
-/* Line 22 of yacc.c  */
-#line 184 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
-
-/* Line 22 of yacc.c  */
-#line 1047 "parse-gram.c"
-       break;
-      case 44: /* "\"char\"" */
-
-/* Line 22 of yacc.c  */
-#line 176 "parse-gram.y"
-       { fputs (char_name ((yyvaluep->character)), stderr); };
-
-/* Line 22 of yacc.c  */
-#line 1056 "parse-gram.c"
-       break;
-      case 45: /* "\"epilogue\"" */
-
-/* Line 22 of yacc.c  */
-#line 184 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 22 of yacc.c  */
-#line 1065 "parse-gram.c"
-       break;
-      case 47: /* "\"identifier\"" */
+            case 3: // "string"

 
 

-/* Line 22 of yacc.c  */
-#line 189 "parse-gram.y"
-       { fputs ((yyvaluep->uniqstr), stderr); };
+/* Line 647 of yacc.c  */
+#line 183 "parse-gram.y"
+        { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
+/* Line 647 of yacc.c  */
+#line 992 "../master/src/parse-gram.c"
+        break;

 
 

-/* Line 22 of yacc.c  */
-#line 1074 "parse-gram.c"
-       break;
-      case 48: /* "\"identifier:\"" */
+            case 4: // "integer"

 
 

-/* Line 22 of yacc.c  */
+/* Line 647 of yacc.c  */
+#line 196 "parse-gram.y"
+        { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
+/* Line 647 of yacc.c  */
+#line 1001 "../master/src/parse-gram.c"
+        break;
+
+            case 24: // "%<flag>"
+
+/* Line 647 of yacc.c  */
+#line 192 "parse-gram.y"
+        { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
+/* Line 647 of yacc.c  */
+#line 1010 "../master/src/parse-gram.c"
+        break;
+
+            case 42: // "{...}"
+
+/* Line 647 of yacc.c  */
+#line 185 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
+/* Line 647 of yacc.c  */
+#line 1019 "../master/src/parse-gram.c"
+        break;
+
+            case 43: // "char"
+
+/* Line 647 of yacc.c  */
+#line 177 "parse-gram.y"
+        { fputs (char_name (((*yyvaluep).character)), stderr); }
+/* Line 647 of yacc.c  */
+#line 1028 "../master/src/parse-gram.c"
+        break;
+
+            case 44: // "epilogue"
+
+/* Line 647 of yacc.c  */
+#line 185 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 647 of yacc.c  */
+#line 1037 "../master/src/parse-gram.c"
+        break;
+
+            case 46: // "identifier"
+
+/* Line 647 of yacc.c  */

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

-       { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-
-/* Line 22 of yacc.c  */
-#line 1083 "parse-gram.c"
-       break;
-      case 51: /* "\"%{...%}\"" */
-
-/* Line 22 of yacc.c  */
-#line 184 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 22 of yacc.c  */
-#line 1092 "parse-gram.c"
-       break;
-      case 53: /* "\"type\"" */
-
-/* Line 22 of yacc.c  */
-#line 188 "parse-gram.y"
-       { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-
-/* Line 22 of yacc.c  */
-#line 1101 "parse-gram.c"
-       break;
-      case 80: /* "variable" */
+        { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 647 of yacc.c  */
+#line 1046 "../master/src/parse-gram.c"
+        break;

 
 

-/* Line 22 of yacc.c  */
-#line 189 "parse-gram.y"
-       { fputs ((yyvaluep->uniqstr), stderr); };
+            case 47: // "identifier:"

 
 

-/* Line 22 of yacc.c  */
-#line 1110 "parse-gram.c"
-       break;
-      case 81: /* "content.opt" */
-
-/* Line 22 of yacc.c  */
-#line 184 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 22 of yacc.c  */
-#line 1119 "parse-gram.c"
-       break;
-      case 82: /* "braceless" */
+/* Line 647 of yacc.c  */
+#line 191 "parse-gram.y"
+        { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
+/* Line 647 of yacc.c  */
+#line 1055 "../master/src/parse-gram.c"
+        break;

 
 

-/* Line 22 of yacc.c  */
-#line 184 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+            case 50: // "%{...%}"

 
 

-/* Line 22 of yacc.c  */
-#line 1128 "parse-gram.c"
-       break;
-      case 83: /* "id" */
+/* Line 647 of yacc.c  */
+#line 185 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 647 of yacc.c  */
+#line 1064 "../master/src/parse-gram.c"
+        break;

 
 

-/* Line 22 of yacc.c  */
-#line 196 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 22 of yacc.c  */
-#line 1137 "parse-gram.c"
-       break;
-      case 84: /* "id_colon" */
-
-/* Line 22 of yacc.c  */
-#line 197 "parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-
-/* Line 22 of yacc.c  */
-#line 1146 "parse-gram.c"
-       break;
-      case 85: /* "symbol" */
+            case 52: // "<tag>"

 
 

-/* Line 22 of yacc.c  */
-#line 196 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+/* Line 647 of yacc.c  */
+#line 193 "parse-gram.y"
+        { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
+/* Line 647 of yacc.c  */
+#line 1073 "../master/src/parse-gram.c"
+        break;

 
 

-/* Line 22 of yacc.c  */
-#line 1155 "parse-gram.c"
-       break;
-      case 86: /* "string_as_id" */
+            case 83: // variable

 
 

-/* Line 22 of yacc.c  */
-#line 196 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+/* Line 647 of yacc.c  */
+#line 190 "parse-gram.y"
+        { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 647 of yacc.c  */
+#line 1082 "../master/src/parse-gram.c"
+        break;
+
+            case 84: // content.opt
+
+/* Line 647 of yacc.c  */
+#line 185 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 647 of yacc.c  */
+#line 1091 "../master/src/parse-gram.c"
+        break;
+
+            case 85: // braceless
+
+/* Line 647 of yacc.c  */
+#line 185 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 647 of yacc.c  */
+#line 1100 "../master/src/parse-gram.c"
+        break;
+
+            case 86: // id
+
+/* Line 647 of yacc.c  */
+#line 199 "parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 647 of yacc.c  */
+#line 1109 "../master/src/parse-gram.c"
+        break;
+
+            case 87: // id_colon
+
+/* Line 647 of yacc.c  */
+#line 200 "parse-gram.y"
+        { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
+/* Line 647 of yacc.c  */
+#line 1118 "../master/src/parse-gram.c"
+        break;
+
+            case 88: // symbol
+
+/* Line 647 of yacc.c  */
+#line 199 "parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 647 of yacc.c  */
+#line 1127 "../master/src/parse-gram.c"
+        break;
+
+            case 89: // string_as_id
+
+/* Line 647 of yacc.c  */
+#line 199 "parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 647 of yacc.c  */
+#line 1136 "../master/src/parse-gram.c"
+        break;

 
 

-/* Line 22 of yacc.c  */
-#line 1164 "parse-gram.c"
-       break;

       default:
        break;
     }
       default:
        break;
     }


@@ -1235,27 +1208,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");
     }
 }


@@ -1263,7 +1238,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


@@ -1397,14 +1372,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];
 


@@ -1412,34 +1387,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.  */


@@ -1448,10 +1404,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)


@@ -1460,19 +1418,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;
 


@@ -1486,19 +1454,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;
     }


@@ -1533,23 +1499,22 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 
   switch (yytype)
     {
 
   switch (yytype)
     {

-

       default:
        break;
     }
 }
       default:
        break;
     }
 }

-\f

 
 /* Prevent warnings from -Wmissing-prototypes.  */
 
 /* Prevent warnings from -Wmissing-prototypes.  */

-

 #ifdef YYPARSE_PARAM
 #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 ();


@@ -1560,10 +1525,9 @@ int yyparse ();
 
 
 
 
 
 

-
-/*----------.
-| yyparse.  |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/

 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \


@@ -1587,94 +1551,101 @@ yyparse ()
 #endif
 #endif
 {
 #endif
 #endif
 {

-  /* The lookahead symbol.  */
+/* The lookahead symbol.  */

 int yychar;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
 int yychar;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 

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

 /* Location data for the lookahead symbol.  */
 YYLTYPE yylloc;
 
 /* Location data for the lookahead symbol.  */
 YYLTYPE yylloc;
 

-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
+    /* Number of syntax errors so far.  */
+    int yynerrs;

 
 

-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;

 
 

-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
+       `yyls': related to locations.

 
 

-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */

 
 

-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;

 
 

-  /* The location stack.  */
-  YYLTYPE yylsa[YYINITDEPTH];
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-  /* The locations where the error started and ended.  */
-  YYLTYPE yyerror_range[2];
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;

 
 

-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+    /* The location stack.  */
+    YYLTYPE yylsa[YYINITDEPTH];
+    YYLTYPE *yyls;
+    YYLTYPE *yylsp;
+
+    /* The locations where the error started and ended.  */
+    YYLTYPE yyerror_range[2];

 
 

-  YYSIZE_T yystacksize = YYINITDEPTH;
+    YYSIZE_T yystacksize;

 
 

+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;

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

+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+

   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 

+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yyls = yylsa;
+  yystacksize = YYINITDEPTH;
+

   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;

-  yychar = YYEMPTY;            /* Cause a token to be read.  */
+  yychar = YYEMPTY; /* Cause a token to be read.  */

 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */

-

   yyssp = yyss;
   yyvsp = yyvs;
   yylsp = yyls;
   yyssp = yyss;
   yyvsp = yyvs;
   yylsp = yyls;

+

 #if YYLTYPE_IS_TRIVIAL
   /* Initialize the default location before parsing starts.  */
   yylloc.first_line   = yylloc.last_line   = 1;
   yylloc.first_column = yylloc.last_column = 1;
 #endif
 
 #if YYLTYPE_IS_TRIVIAL
   /* Initialize the default location before parsing starts.  */
   yylloc.first_line   = yylloc.last_line   = 1;
   yylloc.first_column = yylloc.last_column = 1;
 #endif
 

-
-  /* User initialization code.  */
-  
-/* Line 22 of yacc.c  */
+/* User initialization code.  */
+/* Line 1167 of yacc.c  */

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


@@ -1682,10 +1653,10 @@ 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 22 of yacc.c  */
-#line 1688 "parse-gram.c"
+/* Line 1167 of yacc.c  */
+#line 1658 "../master/src/parse-gram.c"

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

+

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


@@ -1722,6 +1693,7 @@ YYLTYPE yylloc;
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),
                    &yystacksize);
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),
                    &yystacksize);

+

        yyls = yyls1;
        yyss = yyss1;
        yyvs = yyvs1;
        yyls = yyls1;
        yyss = yyss1;
        yyvs = yyvs1;


@@ -1743,9 +1715,9 @@ YYLTYPE yylloc;
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)
          goto yyexhaustedlab;
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)
          goto yyexhaustedlab;

-       YYSTACK_RELOCATE (yyss);
-       YYSTACK_RELOCATE (yyvs);
-       YYSTACK_RELOCATE (yyls);
+       YYSTACK_RELOCATE (yyss_alloc, yyss);
+       YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+       YYSTACK_RELOCATE (yyls_alloc, yyls);

 #  undef YYSTACK_RELOCATE
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);
 #  undef YYSTACK_RELOCATE
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);


@@ -1868,213 +1840,215 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-
-/* Line 22 of yacc.c  */
-#line 220 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 223 "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 1380 of yacc.c  */
+#line 1856 "../master/src/parse-gram.c"

     break;
 
   case 7:
     break;
 
   case 7:

-
-/* Line 22 of yacc.c  */
-#line 229 "parse-gram.y"
-    { debug_flag = true; }
+/* Line 1380 of yacc.c  */
+#line 233 "parse-gram.y"
+    {
+      muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
+    }
+/* Line 1380 of yacc.c  */
+#line 1866 "../master/src/parse-gram.c"

     break;
 
   case 8:
     break;
 
   case 8:

-
-/* Line 22 of yacc.c  */
-#line 231 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 237 "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),
+                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);

     }
     }

+/* Line 1380 of yacc.c  */
+#line 1877 "../master/src/parse-gram.c"

     break;
 
   case 9:
     break;
 
   case 9:

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

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

+/* Line 1380 of yacc.c  */
+#line 1885 "../master/src/parse-gram.c"

     break;
 
   case 10:
     break;
 
   case 10:

-
-/* Line 22 of yacc.c  */
-#line 236 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 243 "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 1380 of yacc.c  */
+#line 1896 "../master/src/parse-gram.c"

     break;
 
   case 11:
     break;
 
   case 11:

-
-/* Line 22 of yacc.c  */
-#line 240 "parse-gram.y"
-    { error_verbose = true; }
+/* Line 1380 of yacc.c  */
+#line 248 "parse-gram.y"
+    {
+      muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
+                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+    }
+/* Line 1380 of yacc.c  */
+#line 1907 "../master/src/parse-gram.c"

     break;
 
   case 12:
     break;
 
   case 12:

-
-/* Line 22 of yacc.c  */
-#line 241 "parse-gram.y"
-    { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1380 of yacc.c  */
+#line 252 "parse-gram.y"
+    { expected_sr_conflicts = (yyvsp[0].integer); }
+/* Line 1380 of yacc.c  */
+#line 1915 "../master/src/parse-gram.c"

     break;
 
   case 13:
     break;
 
   case 13:

-
-/* Line 22 of yacc.c  */
-#line 242 "parse-gram.y"
-    { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1380 of yacc.c  */
+#line 253 "parse-gram.y"
+    { expected_rr_conflicts = (yyvsp[0].integer); }
+/* Line 1380 of yacc.c  */
+#line 1923 "../master/src/parse-gram.c"

     break;
 
   case 14:
     break;
 
   case 14:

-
-/* Line 22 of yacc.c  */
-#line 243 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
+/* Line 1380 of yacc.c  */
+#line 254 "parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 1931 "../master/src/parse-gram.c"

     break;
 
   case 15:
     break;
 
   case 15:

-
-/* Line 22 of yacc.c  */
-#line 244 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1380 of yacc.c  */
+#line 255 "parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 1939 "../master/src/parse-gram.c"

     break;
 
   case 16:
     break;
 
   case 16:

-
-/* Line 22 of yacc.c  */
-#line 246 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 257 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 1950 "../master/src/parse-gram.c"

     break;
 
   case 17:
     break;
 
   case 17:

-
-/* Line 22 of yacc.c  */
-#line 251 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 262 "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 1380 of yacc.c  */
+#line 1965 "../master/src/parse-gram.c"

     break;
 
   case 18:
     break;
 
   case 18:

-
-/* Line 22 of yacc.c  */
-#line 259 "parse-gram.y"
-    { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
+/* Line 1380 of yacc.c  */
+#line 270 "parse-gram.y"
+    { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
+/* Line 1380 of yacc.c  */
+#line 1973 "../master/src/parse-gram.c"

     break;
 
   case 19:
     break;
 
   case 19:

-
-/* Line 22 of yacc.c  */
-#line 260 "parse-gram.y"
-    { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1380 of yacc.c  */
+#line 271 "parse-gram.y"
+    { add_param ("lex_param", (yyvsp[0].code), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 1981 "../master/src/parse-gram.c"

     break;
 
   case 20:
     break;
 
   case 20:

-
-/* Line 22 of yacc.c  */
-#line 261 "parse-gram.y"
-    { locations_flag = true; }
+/* Line 1380 of yacc.c  */
+#line 272 "parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 1989 "../master/src/parse-gram.c"

     break;
 
   case 21:
     break;
 
   case 21:

-
-/* Line 22 of yacc.c  */
-#line 262 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
+/* Line 1380 of yacc.c  */
+#line 273 "parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 1997 "../master/src/parse-gram.c"

     break;
 
   case 22:
     break;
 
   case 22:

-
-/* Line 22 of yacc.c  */
-#line 263 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1380 of yacc.c  */
+#line 274 "parse-gram.y"
+    { no_lines_flag = true; }
+/* Line 1380 of yacc.c  */
+#line 2005 "../master/src/parse-gram.c"

     break;
 
   case 23:
     break;
 
   case 23:

-
-/* Line 22 of yacc.c  */
-#line 264 "parse-gram.y"
-    { no_lines_flag = true; }
+/* Line 1380 of yacc.c  */
+#line 275 "parse-gram.y"
+    { nondeterministic_parser = true; }
+/* Line 1380 of yacc.c  */
+#line 2013 "../master/src/parse-gram.c"

     break;
 
   case 24:
     break;
 
   case 24:

-
-/* Line 22 of yacc.c  */
-#line 265 "parse-gram.y"
-    { nondeterministic_parser = true; }
+/* Line 1380 of yacc.c  */
+#line 276 "parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 2021 "../master/src/parse-gram.c"

     break;
 
   case 25:
     break;
 
   case 25:

-
-/* Line 22 of yacc.c  */
-#line 266 "parse-gram.y"
-    { spec_outfile = (yyvsp[(2) - (2)].chars); }
+/* Line 1380 of yacc.c  */
+#line 277 "parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1380 of yacc.c  */
+#line 2029 "../master/src/parse-gram.c"

     break;
 
   case 26:
     break;
 
   case 26:

-
-/* Line 22 of yacc.c  */
-#line 267 "parse-gram.y"
-    { spec_outfile = (yyvsp[(3) - (3)].chars); }
+/* Line 1380 of yacc.c  */
+#line 278 "parse-gram.y"
+    { add_param ("parse_param", (yyvsp[0].code), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2037 "../master/src/parse-gram.c"

     break;
 
   case 27:
     break;
 
   case 27:

-
-/* Line 22 of yacc.c  */
-#line 268 "parse-gram.y"
-    { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1380 of yacc.c  */
+#line 279 "parse-gram.y"
+    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
+/* Line 1380 of yacc.c  */
+#line 2045 "../master/src/parse-gram.c"

     break;
 
   case 28:
     break;
 
   case 28:

-
-/* Line 22 of yacc.c  */
-#line 270 "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)]), "");
-    }
-    break;
-
-  case 29:
-
-/* Line 22 of yacc.c  */
-#line 282 "parse-gram.y"
-    { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
-    break;
-
-  case 30:
-
-/* Line 22 of yacc.c  */
-#line 284 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 281 "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);


@@ -2094,493 +2068,605 @@ yyreduce:
           skeleton_user = uniqstr_new (skeleton_build);
           free (skeleton_build);
         }
           skeleton_user = uniqstr_new (skeleton_build);
           free (skeleton_build);
         }

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

     }
     }

+/* Line 1380 of yacc.c  */
+#line 2075 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 31:
-
-/* Line 22 of yacc.c  */
-#line 307 "parse-gram.y"
+  case 29:
+/* Line 1380 of yacc.c  */
+#line 304 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2083 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 32:
-
-/* Line 22 of yacc.c  */
-#line 308 "parse-gram.y"
+  case 30:
+/* Line 1380 of yacc.c  */
+#line 305 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2091 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 33:
-
-/* Line 22 of yacc.c  */
-#line 309 "parse-gram.y"
+  case 31:
+/* Line 1380 of yacc.c  */
+#line 306 "parse-gram.y"

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

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

     break;
 
     break;
 

-  case 37:
-
-/* Line 22 of yacc.c  */
-#line 317 "parse-gram.y"
+  case 35:
+/* Line 1380 of yacc.c  */
+#line 314 "parse-gram.y"

     {
     {

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

     }
     }

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

     break;
 
     break;
 

-  case 38:
-
-/* Line 22 of yacc.c  */
-#line 321 "parse-gram.y"
+  case 36:
+/* Line 1380 of yacc.c  */
+#line 318 "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 1380 of yacc.c  */
+#line 2122 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 39:
-
-/* Line 22 of yacc.c  */
-#line 328 "parse-gram.y"
+  case 37:
+/* Line 1380 of yacc.c  */
+#line 325 "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 1380 of yacc.c  */
+#line 2135 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 40:
-
-/* Line 22 of yacc.c  */
-#line 335 "parse-gram.y"
+  case 38:
+/* Line 1380 of yacc.c  */
+#line 332 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2145 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 41:
-
-/* Line 22 of yacc.c  */
-#line 339 "parse-gram.y"
+  case 39:
+/* Line 1380 of yacc.c  */
+#line 336 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2155 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 42:
-
-/* Line 22 of yacc.c  */
-#line 343 "parse-gram.y"
+  case 40:
+/* Line 1380 of yacc.c  */
+#line 340 "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 1380 of yacc.c  */
+#line 2168 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 43:
-
-/* Line 22 of yacc.c  */
-#line 350 "parse-gram.y"
+  case 41:
+/* Line 1380 of yacc.c  */
+#line 347 "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 1380 of yacc.c  */
+#line 2179 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 44:
-
-/* Line 22 of yacc.c  */
-#line 364 "parse-gram.y"
+  case 42:
+/* Line 1380 of yacc.c  */
+#line 361 "parse-gram.y"

     {}
     {}

+/* Line 1380 of yacc.c  */
+#line 2187 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 45:
-
-/* Line 22 of yacc.c  */
-#line 365 "parse-gram.y"
-    { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 43:
+/* Line 1380 of yacc.c  */
+#line 362 "parse-gram.y"
+    { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2195 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 46:
-
-/* Line 22 of yacc.c  */
-#line 370 "parse-gram.y"
+  case 44:
+/* Line 1380 of yacc.c  */
+#line 367 "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 1380 of yacc.c  */
+#line 2207 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 47:
-
-/* Line 22 of yacc.c  */
-#line 381 "parse-gram.y"
+  case 45:
+/* Line 1380 of yacc.c  */
+#line 378 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2215 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 48:
-
-/* Line 22 of yacc.c  */
-#line 382 "parse-gram.y"
+  case 46:
+/* Line 1380 of yacc.c  */
+#line 379 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2226 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 49:
-
-/* Line 22 of yacc.c  */
-#line 386 "parse-gram.y"
+  case 47:
+/* Line 1380 of yacc.c  */
+#line 383 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2234 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 50:
-
-/* Line 22 of yacc.c  */
-#line 387 "parse-gram.y"
+  case 48:
+/* Line 1380 of yacc.c  */
+#line 384 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2245 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 51:
-
-/* Line 22 of yacc.c  */
-#line 392 "parse-gram.y"
+  case 49:
+/* Line 1380 of yacc.c  */
+#line 389 "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 1380 of yacc.c  */
+#line 2259 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 52:
-
-/* Line 22 of yacc.c  */
-#line 403 "parse-gram.y"
+  case 50:
+/* Line 1380 of yacc.c  */
+#line 400 "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 1380 of yacc.c  */
+#line 2277 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 53:
-
-/* Line 22 of yacc.c  */
-#line 417 "parse-gram.y"
+  case 51:
+/* Line 1380 of yacc.c  */
+#line 414 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2285 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 54:
-
-/* Line 22 of yacc.c  */
-#line 418 "parse-gram.y"
+  case 52:
+/* Line 1380 of yacc.c  */
+#line 415 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2293 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 55:
-
-/* Line 22 of yacc.c  */
-#line 419 "parse-gram.y"
+  case 53:
+/* Line 1380 of yacc.c  */
+#line 416 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2301 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 56:
+  case 54:
+/* Line 1380 of yacc.c  */
+#line 417 "parse-gram.y"
+    { (yyval.assoc) = precedence_assoc; }
+/* Line 1380 of yacc.c  */
+#line 2309 "../master/src/parse-gram.c"
+    break;

 
 

-/* Line 22 of yacc.c  */
-#line 423 "parse-gram.y"
+  case 55:
+/* Line 1380 of yacc.c  */
+#line 421 "parse-gram.y"

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

+/* Line 1380 of yacc.c  */
+#line 2317 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 57:
+  case 56:
+/* Line 1380 of yacc.c  */
+#line 422 "parse-gram.y"
+    { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
+/* Line 1380 of yacc.c  */
+#line 2325 "../master/src/parse-gram.c"
+    break;

 
 

-/* Line 22 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 428 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2333 "../master/src/parse-gram.c"

     break;
 
   case 58:
     break;
 
   case 58:

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

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

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

     break;
 
   case 59:
     break;
 
   case 59:

-
-/* Line 22 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 1380 of yacc.c  */
+#line 434 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }
+/* Line 1380 of yacc.c  */
+#line 2349 "../master/src/parse-gram.c"

     break;
 
   case 60:
     break;
 
   case 60:

-
-/* Line 22 of yacc.c  */
-#line 436 "parse-gram.y"
-    { (yyval.list) = (yyvsp[(1) - (1)].list); }
+/* Line 1380 of yacc.c  */
+#line 435 "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 2357 "../master/src/parse-gram.c"

     break;
 
   case 61:
     break;
 
   case 61:

-
-/* Line 22 of yacc.c  */
-#line 437 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+/* Line 1380 of yacc.c  */
+#line 441 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2365 "../master/src/parse-gram.c"

     break;
 
   case 62:
     break;
 
   case 62:

-
-/* Line 22 of yacc.c  */
-#line 441 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1380 of yacc.c  */
+#line 443 "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 2373 "../master/src/parse-gram.c"

     break;
 
   case 63:
     break;
 
   case 63:

-
-/* Line 22 of yacc.c  */
-#line 442 "parse-gram.y"
-    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1380 of yacc.c  */
+#line 447 "parse-gram.y"
+    { (yyval.list) = (yyvsp[0].list); }
+/* Line 1380 of yacc.c  */
+#line 2381 "../master/src/parse-gram.c"

     break;
 
   case 64:
     break;
 
   case 64:

-
-/* Line 22 of yacc.c  */
-#line 443 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+/* Line 1380 of yacc.c  */
+#line 448 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
+/* Line 1380 of yacc.c  */
+#line 2389 "../master/src/parse-gram.c"

     break;
 
   case 65:
     break;
 
   case 65:

-
-/* Line 22 of yacc.c  */
-#line 444 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+/* Line 1380 of yacc.c  */
+#line 452 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2397 "../master/src/parse-gram.c"

     break;
 
   case 66:
     break;
 
   case 66:

-
-/* Line 22 of yacc.c  */
-#line 450 "parse-gram.y"
-    {
-       current_type = (yyvsp[(1) - (1)].uniqstr);
-       tag_seen = true;
-     }
+/* Line 1380 of yacc.c  */
+#line 453 "parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2405 "../master/src/parse-gram.c"

     break;
 
   case 67:
     break;
 
   case 67:

-
-/* Line 22 of yacc.c  */
-#line 455 "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)]));
-     }
+/* Line 1380 of yacc.c  */
+#line 454 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2413 "../master/src/parse-gram.c"

     break;
 
   case 68:
     break;
 
   case 68:

-
-/* Line 22 of yacc.c  */
-#line 460 "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)]));
-    }
+/* Line 1380 of yacc.c  */
+#line 455 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2421 "../master/src/parse-gram.c"

     break;
 
   case 69:
     break;
 
   case 69:

-
-/* Line 22 of yacc.c  */
-#line 466 "parse-gram.y"
+/* Line 1380 of yacc.c  */
+#line 461 "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));
-    }
+       current_type = (yyvsp[0].uniqstr);
+       tag_seen = true;
+     }
+/* Line 1380 of yacc.c  */
+#line 2432 "../master/src/parse-gram.c"

     break;
 
   case 70:
     break;
 
   case 70:

+/* Line 1380 of yacc.c  */
+#line 466 "parse-gram.y"
+    {
+       symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
+       symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
+     }
+/* Line 1380 of yacc.c  */
+#line 2443 "../master/src/parse-gram.c"
+    break;

 
 

-/* Line 22 of yacc.c  */
-#line 472 "parse-gram.y"
+  case 71:
+/* 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[-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 1380 of yacc.c  */
+#line 2455 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 77:
-
-/* Line 22 of yacc.c  */
-#line 502 "parse-gram.y"
+  case 72:
+/* Line 1380 of yacc.c  */
+#line 477 "parse-gram.y"

     {
     {

-      yyerrok;
+      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 1380 of yacc.c  */
+#line 2467 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 78:
-
-/* Line 22 of yacc.c  */
-#line 508 "parse-gram.y"
-    { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
+  case 73:
+/* Line 1380 of yacc.c  */
+#line 483 "parse-gram.y"
+    {
+      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 1380 of yacc.c  */
+#line 2480 "../master/src/parse-gram.c"

     break;
 
   case 80:
     break;
 
   case 80:

-
-/* Line 22 of yacc.c  */
-#line 512 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(1) - (1)])); }
+/* Line 1380 of yacc.c  */
+#line 513 "parse-gram.y"
+    {
+      yyerrok;
+    }
+/* Line 1380 of yacc.c  */
+#line 2490 "../master/src/parse-gram.c"

     break;
 
   case 81:
     break;
 
   case 81:

-
-/* Line 22 of yacc.c  */
-#line 513 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(3) - (3)])); }
+/* Line 1380 of yacc.c  */
+#line 519 "parse-gram.y"
+    { current_lhs = (yyvsp[-1].symbol); current_lhs_location = (yylsp[-1]);
+    current_lhs_named_ref = (yyvsp[0].named_ref); }
+/* Line 1380 of yacc.c  */
+#line 2499 "../master/src/parse-gram.c"

     break;
 
   case 83:
     break;
 
   case 83:

-
-/* Line 22 of yacc.c  */
-#line 519 "parse-gram.y"
-    { grammar_current_rule_begin (current_lhs, current_lhs_location); }
+/* Line 1380 of yacc.c  */
+#line 524 "parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2507 "../master/src/parse-gram.c"

     break;
 
   case 84:
     break;
 
   case 84:

-
-/* Line 22 of yacc.c  */
-#line 521 "parse-gram.y"
-    { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
-    break;
-
-  case 85:
-
-/* Line 22 of yacc.c  */
-#line 523 "parse-gram.y"
-    { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1380 of yacc.c  */
+#line 525 "parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2515 "../master/src/parse-gram.c"

     break;
 
   case 86:
     break;
 
   case 86:

-
-/* Line 22 of yacc.c  */
-#line 525 "parse-gram.y"
-    { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
+/* Line 1380 of yacc.c  */
+#line 531 "parse-gram.y"
+    { grammar_current_rule_begin (current_lhs, current_lhs_location,
+                                 current_lhs_named_ref); }
+/* Line 1380 of yacc.c  */
+#line 2524 "../master/src/parse-gram.c"

     break;
 
   case 87:
     break;
 
   case 87:

-
-/* Line 22 of yacc.c  */
-#line 527 "parse-gram.y"
-    { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
+/* Line 1380 of yacc.c  */
+#line 534 "parse-gram.y"
+    { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1380 of yacc.c  */
+#line 2532 "../master/src/parse-gram.c"

     break;
 
   case 88:
     break;
 
   case 88:

+/* Line 1380 of yacc.c  */
+#line 536 "parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1380 of yacc.c  */
+#line 2540 "../master/src/parse-gram.c"
+    break;

 
 

-/* Line 22 of yacc.c  */
-#line 529 "parse-gram.y"
-    { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
+  case 89:
+/* Line 1380 of yacc.c  */
+#line 538 "parse-gram.y"
+    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2548 "../master/src/parse-gram.c"

     break;
 
   case 90:
     break;
 
   case 90:

-
-/* Line 22 of yacc.c  */
-#line 539 "parse-gram.y"
-    { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+/* Line 1380 of yacc.c  */
+#line 540 "parse-gram.y"
+    { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2556 "../master/src/parse-gram.c"

     break;
 
   case 91:
     break;
 
   case 91:

+/* Line 1380 of yacc.c  */
+#line 542 "parse-gram.y"
+    { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2564 "../master/src/parse-gram.c"
+    break;

 
 

-/* Line 22 of yacc.c  */
-#line 545 "parse-gram.y"
-    {
-      (yyval.chars) = "";
-    }
+  case 92:
+/* Line 1380 of yacc.c  */
+#line 546 "parse-gram.y"
+    { (yyval.named_ref) = 0; }
+/* Line 1380 of yacc.c  */
+#line 2572 "../master/src/parse-gram.c"

     break;
 
   case 93:
     break;
 
   case 93:

+/* Line 1380 of yacc.c  */
+#line 548 "parse-gram.y"
+    { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2580 "../master/src/parse-gram.c"
+    break;

 
 

-/* Line 22 of yacc.c  */
-#line 558 "parse-gram.y"
+  case 95:
+/* Line 1380 of yacc.c  */
+#line 560 "parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
+/* Line 1380 of yacc.c  */
+#line 2588 "../master/src/parse-gram.c"
+    break;
+
+  case 96:
+/* Line 1380 of yacc.c  */
+#line 565 "parse-gram.y"
+    { (yyval.chars) = ""; }
+/* Line 1380 of yacc.c  */
+#line 2596 "../master/src/parse-gram.c"
+    break;
+
+  case 98:
+/* Line 1380 of yacc.c  */
+#line 576 "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 1380 of yacc.c  */
+#line 2611 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 94:
-
-/* Line 22 of yacc.c  */
-#line 578 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 99:
+/* Line 1380 of yacc.c  */
+#line 596 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2619 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 95:
-
-/* Line 22 of yacc.c  */
-#line 580 "parse-gram.y"
+  case 100:
+/* Line 1380 of yacc.c  */
+#line 598 "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 1380 of yacc.c  */
+#line 2631 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 96:
-
-/* Line 22 of yacc.c  */
-#line 588 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 101:
+/* Line 1380 of yacc.c  */
+#line 606 "parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1380 of yacc.c  */
+#line 2639 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 99:
-
-/* Line 22 of yacc.c  */
-#line 600 "parse-gram.y"
+  case 104:
+/* Line 1380 of yacc.c  */
+#line 618 "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 1380 of yacc.c  */
+#line 2650 "../master/src/parse-gram.c"

     break;
 
     break;
 

-  case 101:
-
-/* Line 22 of yacc.c  */
-#line 609 "parse-gram.y"
+  case 106:
+/* Line 1380 of yacc.c  */
+#line 627 "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 1380 of yacc.c  */
+#line 2665 "../master/src/parse-gram.c"

     break;
 
 
     break;
 
 

-
-/* Line 22 of yacc.c  */
-#line 2584 "parse-gram.c"
+/* Line 1380 of yacc.c  */
+#line 2670 "../master/src/parse-gram.c"

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


@@ -2619,7 +2705,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;


@@ -2639,7 +2725,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


@@ -2796,10 +2882,8 @@ yyreturn:
   return YYID (yyresult);
 }
 
   return YYID (yyresult);
 }
 

-
-
-/* Line 22 of yacc.c  */
-#line 619 "parse-gram.y"
+/* Line 1599 of yacc.c  */
+#line 637 "parse-gram.y"

 
 
 
 
 
 


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

-