maint: factor the handling of %printer and %destructor

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 81da516080ed093271a0ab21b5e6c5ced27a982f..0f247ff05a8cd009b66f164dde643bbb6d94c074 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.5.127-8555-dirty.  */
+/* A Bison parser, made by GNU Bison 2.5.1.779-71bff.  */

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

-   
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-   
+
+   Copyright (C) 1984, 1989-1990, 2000-2012 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/>.  */
 


@@ -26,7 +26,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.  */
 


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

-#define YYBISON_VERSION "2.5.127-8555-dirty"
+#define YYBISON_VERSION "2.5.1.779-71bff"

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


@@ -72,9 +72,8 @@
 #define yylloc          gram_lloc
 
 /* Copy the first part of user declarations.  */
 #define yylloc          gram_lloc
 
 /* Copy the first part of user declarations.  */

-
-/* Line 268 of yacc.c  */
-#line 1 "parse-gram.y"
+/* Line 324 of yacc.c  */
+#line 1 "src/parse-gram.y"

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


@@ -115,7 +114,7 @@
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YY_LOCATION_PRINT(File, Loc) \
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YY_LOCATION_PRINT(File, Loc) \

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

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


@@ -123,54 +122,13 @@ static void version_check (location const *loc, char const *version);
    FIXME: depends on the undocumented availability of YYLLOC.  */
 #undef  yyerror
 #define yyerror(Msg) \
    FIXME: depends on the undocumented availability of YYLLOC.  */
 #undef  yyerror
 #define yyerror(Msg) \

-       gram_error (&yylloc, Msg)
+        gram_error (&yylloc, Msg)

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

-/** Add a lex-param or a parse-param.
- *
- * \param type  \a lex_param or \a parse_param
- * \param decl  the formal argument
- * \param loc   the location in the source.
- */
-static void add_param (char const *type, char *decl, location loc);
-
-
-static symbol_class current_class = unknown_sym;
-static uniqstr current_type = NULL;
-static symbol *current_lhs_symbol;
-static location current_lhs_location;
-static named_ref *current_lhs_named_ref;
-static int current_prec = 0;
-
-/** Set the new current left-hand side symbol, possibly common
- * to several right-hand side parts of rule.
- */
-static
-void
-current_lhs(symbol *sym, location loc, named_ref *ref)
-{
-  current_lhs_symbol = sym;
-  current_lhs_location = loc;
-  /* In order to simplify memory management, named references for lhs
-     are always assigned by deep copy into the current symbol_list
-     node.  This is because a single named-ref in the grammar may
-     result in several uses when the user factors lhs between several
-     rules using "|".  Therefore free the parser's original copy.  */
-  free (current_lhs_named_ref);
-  current_lhs_named_ref = ref;
-}
-
-
-#define YYTYPE_INT16 int_fast16_t
-#define YYTYPE_INT8 int_fast8_t
-#define YYTYPE_UINT16 uint_fast16_t
-#define YYTYPE_UINT8 uint_fast8_t
-
-
-/* Line 268 of yacc.c  */
-#line 174 "parse-gram.c"
+/* Line 324 of yacc.c  */
+#line 132 "src/parse-gram.c"

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


@@ -180,11 +138,6 @@ current_lhs(symbol *sym, location loc, named_ref *ref)
 #  endif
 # endif
 
 #  endif
 # endif
 

-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-

 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
 # undef YYERROR_VERBOSE
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
 # undef YYERROR_VERBOSE


@@ -198,178 +151,61 @@ current_lhs(symbol *sym, location loc, named_ref *ref)
 # define YYTOKEN_TABLE 0
 #endif
 
 # define YYTOKEN_TABLE 0
 #endif
 

+#include "src/parse-gram.h"

 
 

-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     GRAM_EOF = 0,
-     STRING = 258,
-     INT = 259,
-     PERCENT_TOKEN = 260,
-     PERCENT_NTERM = 261,
-     PERCENT_TYPE = 262,
-     PERCENT_DESTRUCTOR = 263,
-     PERCENT_PRINTER = 264,
-     PERCENT_LEFT = 265,
-     PERCENT_RIGHT = 266,
-     PERCENT_NONASSOC = 267,
-     PERCENT_PREC = 268,
-     PERCENT_DPREC = 269,
-     PERCENT_MERGE = 270,
-     PERCENT_CODE = 271,
-     PERCENT_DEBUG = 272,
-     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_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,
-     BRACKETED_ID = 299,
-     CHAR = 300,
-     EPILOGUE = 301,
-     EQUAL = 302,
-     ID = 303,
-     ID_COLON = 304,
-     PERCENT_PERCENT = 305,
-     PIPE = 306,
-     PROLOGUE = 307,
-     SEMICOLON = 308,
-     TYPE = 309,
-     TYPE_TAG_ANY = 310,
-     TYPE_TAG_NONE = 311,
-     PERCENT_UNION = 312
-   };
-#endif
-/* Tokens.  */
-#define GRAM_EOF 0
-#define STRING 258
-#define INT 259
-#define PERCENT_TOKEN 260
-#define PERCENT_NTERM 261
-#define PERCENT_TYPE 262
-#define PERCENT_DESTRUCTOR 263
-#define PERCENT_PRINTER 264
-#define PERCENT_LEFT 265
-#define PERCENT_RIGHT 266
-#define PERCENT_NONASSOC 267
-#define PERCENT_PREC 268
-#define PERCENT_DPREC 269
-#define PERCENT_MERGE 270
-#define PERCENT_CODE 271
-#define PERCENT_DEBUG 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_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_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 BRACKETED_ID 299
-#define CHAR 300
-#define EPILOGUE 301
-#define EQUAL 302
-#define ID 303
-#define ID_COLON 304
-#define PERCENT_PERCENT 305
-#define PIPE 306
-#define PROLOGUE 307
-#define SEMICOLON 308
-#define TYPE 309
-#define TYPE_TAG_ANY 310
-#define TYPE_TAG_NONE 311
-#define PERCENT_UNION 312
-
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{
-
-/* Line 295 of yacc.c  */
-#line 114 "parse-gram.y"
-
-  symbol *symbol;
-  symbol_list *list;
-  int integer;
-  char const *chars;
-  char *code;
-  assoc assoc;
-  uniqstr uniqstr;
-  unsigned char character;
-  named_ref *named_ref;
-
-
+/* Copy the second part of user declarations.  */

 
 

-/* Line 295 of yacc.c  */
-#line 348 "parse-gram.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
+/* Line 345 of yacc.c  */
+#line 160 "src/parse-gram.c"
+/* Unqualified %code blocks.  */
+/* Line 346 of yacc.c  */
+#line 56 "src/parse-gram.y"
+
+  static int current_prec = 0;
+  static location current_lhs_location;
+  static named_ref *current_lhs_named_ref;
+  static symbol *current_lhs_symbol;
+  static symbol_class current_class = unknown_sym;
+  static uniqstr current_type = NULL;
+
+  /** Set the new current left-hand side symbol, possibly common
+   * to several right-hand side parts of rule.
+   */
+  static
+  void
+  current_lhs(symbol *sym, location loc, named_ref *ref)
+  {
+    current_lhs_symbol = sym;
+    current_lhs_location = loc;
+    /* In order to simplify memory management, named references for lhs
+       are always assigned by deep copy into the current symbol_list
+       node.  This is because a single named-ref in the grammar may
+       result in several uses when the user factors lhs between several
+       rules using "|".  Therefore free the parser's original copy.  */
+    free (current_lhs_named_ref);
+    current_lhs_named_ref = ref;
+  }

 
 

-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-} YYLTYPE;
-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
+  #define YYTYPE_INT16 int_fast16_t
+  #define YYTYPE_INT8 int_fast8_t
+  #define YYTYPE_UINT16 uint_fast16_t
+  #define YYTYPE_UINT8 uint_fast8_t

 
 

+/* Line 346 of yacc.c  */
+#line 234 "src/parse-gram.y"

 
 

-/* Copy the second part of user declarations.  */
+  /** Add a lex-param and/or a parse-param.
+   *
+   * \param type  where to push this formal argument.
+   * \param decl  the formal argument.  Destroyed.
+   * \param loc   the location in the source.
+   */
+  static void add_param (param_type type, char *decl, location loc);
+  static param_type current_param = param_none;

 
 
 
 

-/* Line 345 of yacc.c  */
-#line 373 "parse-gram.c"
+/* Line 346 of yacc.c  */
+#line 209 "src/parse-gram.c"

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


@@ -477,7 +313,7 @@ YYID (yyi)
 #  endif
 #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
 #  endif
 #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \

-            && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))

 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   ifndef EXIT_SUCCESS
 #    define EXIT_SUCCESS 0
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   ifndef EXIT_SUCCESS
 #    define EXIT_SUCCESS 0


@@ -504,8 +340,8 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \

-        || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
-            && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
+             && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))

 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc


@@ -531,15 +367,15 @@ 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_alloc, Stack)                          \
-    do                                                                 \
-      {                                                                        \
-       YYSIZE_T yynewbytes;                                            \
-       YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
-       Stack = &yyptr->Stack_alloc;                                    \
-       yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-       yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                        \
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \

     while (YYID (0))
 
 #endif
     while (YYID (0))
 
 #endif


@@ -567,25 +403,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   160
+#define YYLAST   163

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

-#define YYNTOKENS  58
+#define YYNTOKENS  57

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

-#define YYNNTS  34
+#define YYNNTS  36

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

-#define YYNRULES  108
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  148
+#define YYNRULES  110
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  149

 
 

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

 #define YYUNDEFTOK  2
 #define YYUNDEFTOK  2

-#define YYMAXUTOK   312
+#define YYMAXUTOK   311

 
 

-#define YYTRANSLATE(YYX)                                               \
+#define YYTRANSLATE(YYX)                                                \

   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
   ((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,


@@ -619,74 +457,25 @@ static const yytype_uint8 yytranslate[] =
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57
+      55,    56

 };
 
 #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,   167,   169,   172,   174,   176,   178,
-     180,   182,   184,   187,   190,   194,   196,   199,   201,   204,
-     206,   209,   212,   213,   218,   220,   224,   227,   228,   232,
-     236,   240,   244,   248,   249,   251,   253,   255,   256,   258,
-     260,   262,   264,   266,   268,   270,   272,   274,   275
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      59,     0,    -1,    60,    50,    77,    91,    -1,    -1,    60,
-      61,    -1,    62,    -1,    52,    -1,    17,    -1,    19,    84,
-      85,    -1,    20,    -1,    20,     3,    -1,    21,    -1,    22,
-       4,    -1,    23,     4,    -1,    24,     3,    -1,    24,    47,
-       3,    -1,    25,    -1,    26,    43,    -1,    27,     3,    -1,
-      28,    43,    -1,    29,    -1,    30,     3,    -1,    30,    47,
-       3,    -1,    32,    -1,    33,    -1,    34,     3,    -1,    34,
-      47,     3,    -1,    35,    43,    -1,    36,    -1,    37,     3,
-      -1,    38,     3,    -1,    40,    -1,    41,    -1,    42,    -1,
-      53,    -1,    67,    -1,    64,    -1,    39,    89,    -1,     8,
-      43,    73,    -1,     9,    43,    73,    -1,    18,    -1,    31,
-      -1,    16,    86,    -1,    16,    48,    86,    -1,    -1,    48,
-      -1,    57,    63,    86,    -1,    -1,     6,    65,    76,    -1,
-      -1,     5,    66,    76,    -1,     7,    54,    72,    -1,    68,
-      69,    70,    -1,    10,    -1,    11,    -1,    12,    -1,    -1,
-      54,    -1,    71,    -1,    70,    71,    -1,    89,    -1,    89,
-       4,    -1,    89,    -1,    72,    89,    -1,    74,    -1,    73,
-      74,    -1,    89,    -1,    54,    -1,    55,    -1,    56,    -1,
-      54,    -1,    87,    -1,    87,     4,    -1,    87,    90,    -1,
-      87,     4,    90,    -1,    75,    -1,    76,    75,    -1,    78,
-      -1,    77,    78,    -1,    79,    -1,    62,    53,    -1,     1,
-      53,    -1,    -1,    88,    83,    80,    81,    -1,    82,    -1,
-      81,    51,    82,    -1,    81,    53,    -1,    -1,    82,    89,
-      83,    -1,    82,    43,    83,    -1,    82,    13,    89,    -1,
-      82,    14,     4,    -1,    82,    15,    54,    -1,    -1,    44,
-      -1,    48,    -1,     3,    -1,    -1,    48,    -1,     3,    -1,
-      43,    -1,    48,    -1,    45,    -1,    49,    -1,    87,    -1,
-      90,    -1,     3,    -1,    -1,    50,    46,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINEYYN -- Source line where rule number YYN was defined.    */

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

-       0,   229,   229,   237,   239,   243,   244,   254,   255,   260,
-     261,   266,   267,   268,   269,   270,   271,   276,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   310,
-     311,   335,   336,   337,   338,   342,   343,   344,   348,   355,
-     362,   366,   370,   377,   392,   393,   397,   409,   409,   414,
-     414,   419,   430,   445,   446,   447,   451,   452,   457,   459,
-     464,   465,   470,   472,   477,   478,   482,   483,   484,   485,
-     490,   495,   500,   506,   512,   523,   524,   533,   534,   540,
-     541,   542,   549,   549,   557,   558,   559,   564,   566,   568,
-     570,   572,   574,   579,   581,   592,   593,   598,   599,   600,
-     609,   629,   631,   640,   645,   646,   651,   658,   660
+       0,   270,   270,   278,   280,   284,   285,   295,   299,   304,
+     305,   310,   315,   316,   317,   318,   319,   324,   333,   334,
+     335,   336,   337,   338,   339,   340,   340,   341,   342,   366,
+     367,   368,   369,   373,   374,   383,   384,   385,   389,   396,
+     403,   407,   411,   418,   433,   434,   438,   450,   450,   455,
+     455,   460,   471,   486,   487,   488,   489,   493,   494,   499,
+     501,   506,   507,   512,   514,   519,   520,   524,   525,   526,
+     527,   532,   537,   542,   548,   554,   565,   566,   575,   576,
+     582,   583,   584,   591,   591,   599,   600,   601,   606,   608,
+     610,   612,   614,   616,   618,   623,   625,   635,   636,   641,
+     642,   643,   652,   672,   674,   683,   688,   689,   694,   701,
+     703

 };
 #endif
 
 };
 #endif
 


@@ -697,32 +486,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\"",
-  "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"",
-  "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"",
-  "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"",
-  "\"{...}\"", "\"[identifier]\"", "\"char\"", "\"epilogue\"", "\"=\"",
-  "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"",
-  "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", "\"%union\"", "$accept",
-  "input", "prologue_declarations", "prologue_declaration",
-  "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2",
-  "precedence_declaration", "precedence_declarator", "type.opt",
+  "\"%expect\"", "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"",
+  "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"",
+  "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
+  "\"%nondeterministic-parser\"", "\"%output\"", "\"%require\"",
+  "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"",
+  "\"%yacc\"", "\"{...}\"", "\"%?{...}\"", "\"[identifier]\"", "\"char\"",
+  "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
+  "\"|\"", "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"",
+  "\"%param\"", "\"%union\"", "$accept", "input", "prologue_declarations",
+  "prologue_declaration", "$@1", "params", "grammar_declaration",
+  "union_name", "symbol_declaration", "$@2", "$@3",
+  "precedence_declaration", "precedence_declarator", "tag.opt",

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

   "named_ref.opt", "variable", "content.opt", "braceless", "id",
   "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL
 };
 #endif
 
 # ifdef YYPRINT
   "named_ref.opt", "variable", "content.opt", "braceless", "id",
   "id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL
 };
 #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,


@@ -730,185 +519,190 @@ static const yytype_uint16 yytoknum[] =
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
      295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
      295,   296,   297,   298,   299,   300,   301,   302,   303,   304,

-     305,   306,   307,   308,   309,   310,   311,   312
+     305,   306,   307,   308,   309,   310,   311

 };
 # endif
 
 };
 # endif
 

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

 
 

-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-50))
+
+#define YYTABLE_NINF -110
+
+#define yytable_value_is_error(yytable_value) \
+  YYID (0)
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.    */
+static const yytype_int16 yypact[] =

 {
 {

-       0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
-       2,     1,     2,     2,     2,     3,     1,     2,     2,     2,
-       1,     2,     3,     1,     1,     2,     3,     2,     1,     2,
-       2,     1,     1,     1,     1,     1,     1,     2,     3,     3,
-       1,     1,     2,     3,     0,     1,     3,     0,     3,     0,
-       3,     3,     3,     1,     1,     1,     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,     1,     0,     2
+     -50,     4,   107,   -50,   -50,   -50,   -20,     3,    11,   -50,
+     -50,   -50,   -50,    14,   -50,    12,    68,   -50,    72,    73,
+     -50,     0,   -50,    45,    86,     2,   -50,   -50,   -50,    17,
+      95,    96,    32,   -50,   -50,   -50,    16,   -50,   -50,   -50,
+      54,   -50,   -50,   -50,   -50,    49,    -2,    -2,    32,    27,
+      27,   -50,    63,   -50,   -50,   -50,    37,   -50,   -50,   -50,
+     -50,   101,   -50,   -50,   -50,   103,   -50,   104,   -50,   -50,
+     -50,   -50,   -50,   -50,   -50,   -50,    57,   -50,    58,     1,
+     -50,   -50,    79,    70,   -50,    63,   -50,    32,   -50,   -50,
+      -2,    64,    -2,    32,   -50,   -50,   -50,   -50,    27,   -50,
+     -50,    27,   -50,   -50,   -50,   -50,   -50,   -50,   -50,   -50,
+     -50,    78,   -50,   -50,   -50,   -50,   -50,    83,   -50,    32,
+     -50,   143,   -50,   145,   -50,   -50,   -50,   -50,   -50,   -50,
+     -50,   -50,   -50,    43,    50,   -50,   -50,    32,   146,    97,
+      79,   -50,    79,    50,   -50,   -50,   -50,   -50,   -50

 };
 
 };
 

-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
+  /* 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[] =
 {
        3,     0,     0,     1,    49,    47,     0,     0,     0,    53,
 static const yytype_uint8 yydefact[] =
 {
        3,     0,     0,     1,    49,    47,     0,     0,     0,    53,

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

 };
 
 };
 

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

 {
 {

-      -1,     1,     2,    43,    82,    88,    45,    49,    48,    46,
-      47,    90,   120,   121,    96,   101,   102,    92,    93,    83,
-      84,    85,   129,   133,   134,   118,    58,   108,    55,    77,
-      86,   103,    79,   116
+     -50,   -50,   -50,   -50,   -50,   -50,   149,   -50,   -50,   -50,
+     -50,   -50,   -50,   -50,   -50,    33,   -50,   106,   -42,    -4,
+     112,   -50,    74,   -50,   -50,   -50,    19,   -45,   -50,   -50,
+     -16,    -8,   -50,   -32,   -49,   -50

 };
 
 };
 

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

 {
 {

-     -91,     3,   103,   -91,   -91,   -91,   -36,     2,    10,   -91,
-     -91,   -91,     9,   -91,   -91,    32,    60,   -91,    65,    67,
-      27,   -91,    41,    73,    51,   -91,    39,   -91,   -91,   -91,
-      40,    52,   -91,    93,    95,    33,   -91,   -91,   -91,    15,
-     -91,   -91,    53,   -91,   -91,   -91,   -91,    46,    43,    43,
-      33,    11,    11,   -91,    61,   -91,   -91,   -91,    35,   -91,
-     -91,   -91,   -91,   100,   -91,   -91,   -91,   -91,   102,   -91,
-     113,   -91,   -91,   -91,   -91,   -91,   -91,   -91,   -91,   -91,
-      64,   -91,    94,     1,   -91,   -91,    62,   -91,    61,   -91,
-      33,   -91,   -91,    43,    86,    43,    33,   -91,   -91,   -91,
-     -91,    11,   -91,   -91,    11,   -91,   -91,   -91,   -91,   -91,
-     -91,   -91,   -91,   -91,    72,   -91,   -91,   -91,   -91,   -91,
-      33,   -91,   142,   -91,   145,   -91,   -91,   -91,   -91,   -91,
-     -91,   -91,   -91,    17,    34,   -91,   -91,    33,   146,    97,
-      62,    62,    34,   -91,   -91,   -91,   -91,   -91
+      -1,     1,     2,    41,    83,   117,    78,    85,    43,    47,
+      46,    44,    45,    87,   119,   120,    93,    98,    99,    89,
+      90,    79,    80,    81,   128,   133,   134,   115,    56,   105,
+      53,    73,    82,   100,    75,   113

 };
 
 };
 

-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
+  /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule which
+     number is the opposite.  If YYTABLE_NINF, syntax error.    */
+static const yytype_int16 yytable[] =

 {
 {

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

 };
 
 };
 

-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -108
-static const yytype_int16 yytable[] =
+static const yytype_int16 yycheck[] =

 {
 {

-      78,  -107,    80,     3,   125,   105,     4,     5,     6,     7,
-       8,     9,    10,    11,    74,    97,    80,    12,    50,    14,
-       4,     5,     6,     7,     8,     9,    10,    11,    94,    94,
-      62,    12,    27,    14,   132,    56,    74,    74,   106,   119,
-      35,   127,    67,    69,   127,    51,    27,   137,   138,   139,
-      81,   114,    53,    52,    35,   122,    75,    54,    42,    76,
-     123,   126,   123,    59,    81,    98,    99,   100,   135,    60,
-     136,    61,    42,    94,    63,    94,    65,   140,    75,    75,
-      57,    76,    76,   107,    64,   122,    68,    70,    75,    74,
-     124,    76,   146,   147,    66,    71,    72,    91,    73,   141,
-      89,    87,   143,   109,    53,   110,   117,   141,     4,     5,
-       6,     7,     8,     9,    10,    11,   111,   112,   128,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      32,     0,     1,     3,     0,     3,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,     3,    48,     1,    17,    18,
+       3,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+       3,    30,    52,    17,    18,     3,    52,    36,    46,    47,
+       3,    43,    91,    40,    46,    45,    30,    45,    47,    48,
+      52,    40,    36,     3,    40,    87,    98,    56,    46,   101,
+      46,    93,    45,    47,    14,    15,    16,     3,     4,    85,
+      43,     3,    56,    46,   123,    43,     4,     4,    46,    52,
+      53,    54,    90,    46,    92,    40,    90,   119,    92,     3,
+      40,    41,    49,    43,    51,   140,    46,   142,     3,     3,
+      46,    52,   134,    40,     3,   137,     3,     3,    51,    51,
+      40,   143,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    42,    44,    40,    17,    18,    19,    20,    21,    22,

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

-      33,    34,    35,    36,    37,    38,   131,   113,    74,    44,
-     144,   145,   115,    39,    95,    40,    41,   130,   104,   142,
-      42
+      33,    34,    35,    36,    37,    38,    39,     4,     3,    52,
+       4,     2,   119,    79,   135,    48,    50,    50,    51,    47,
+      -1,    -1,    55,    56

 };
 
 };
 

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

 
 

-static const yytype_uint8 yycheck[] =
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.    */
+static const yytype_uint8 yyr1[] =

 {
 {

-      35,     0,     1,     0,    94,    54,     5,     6,     7,     8,
-       9,    10,    11,    12,     3,    50,     1,    16,    54,    18,
-       5,     6,     7,     8,     9,    10,    11,    12,    48,    49,
-       3,    16,    31,    18,   124,     3,     3,     3,     3,    88,
-      39,   101,     3,     3,   104,    43,    31,    13,    14,    15,
-      49,    50,    43,    43,    39,    90,    45,    48,    57,    48,
-      93,    96,    95,     3,    49,    54,    55,    56,    51,     4,
-      53,     4,    57,    93,    47,    95,     3,    43,    45,    45,
-      48,    48,    48,    48,    43,   120,    47,    47,    45,     3,
-       4,    48,   140,   141,    43,    43,     3,    54,     3,   134,
-      54,    48,   137,     3,    43,     3,    44,   142,     5,     6,
-       7,     8,     9,    10,    11,    12,     3,    53,    46,    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,     4,    53,     3,     2,
-       4,    54,    83,    50,    49,    52,    53,   120,    52,   135,
-      57
+       0,    57,    58,    59,    59,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    60,    61,    60,    60,    60,    60,
+      60,    60,    60,    62,    62,    63,    63,    63,    63,    63,
+      63,    63,    63,    63,    64,    64,    63,    66,    65,    67,
+      65,    65,    68,    69,    69,    69,    69,    70,    70,    71,
+      71,    72,    72,    73,    73,    74,    74,    75,    75,    75,
+      75,    76,    76,    76,    76,    76,    77,    77,    78,    78,
+      79,    79,    79,    81,    80,    82,    82,    82,    83,    83,
+      83,    83,    83,    83,    83,    84,    84,    85,    85,    86,
+      86,    86,    87,    88,    88,    89,    90,    90,    91,    92,
+      92

 };
 
 };
 

-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
+  /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.    */
+static const yytype_uint8 yyr2[] =

 {
 {

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

 };
 
 };
 

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

 
 

-#define YYACCEPT       goto yyacceptlab
-#define YYABORT                goto yyabortlab
-#define YYERROR                goto yyerrorlab
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab

 
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
 
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily


@@ -918,7 +712,7 @@ static const yytype_uint8 yystos[] =
    in Bison 2.4.2's NEWS entry, where a plan to phase it out is
    discussed.  */
 
    in Bison 2.4.2's NEWS entry, where a plan to phase it out is
    discussed.  */
 

-#define YYFAIL         goto yyerrlab
+#define YYFAIL          goto yyerrlab

 #if defined YYFAIL
   /* This is here to suppress warnings from the GCC cpp's
      -Wunused-macros.  Normally we don't worry about that warning, but
 #if defined YYFAIL
   /* This is here to suppress warnings from the GCC cpp's
      -Wunused-macros.  Normally we don't worry about that warning, but


@@ -942,13 +736,13 @@ do                                                              \
   else                                                          \
     {                                                           \
       yyerror (YY_("syntax error: cannot back up")); \
   else                                                          \
     {                                                           \
       yyerror (YY_("syntax error: cannot back up")); \

-      YYERROR;                                                 \
-    }                                                          \
+      YYERROR;                                                  \
+    }                                                           \

 while (YYID (0))
 
 
 while (YYID (0))
 
 

-#define YYTERROR       1
-#define YYERRCODE      256
+#define YYTERROR        1
+#define YYERRCODE       256

 
 
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
 
 
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].


@@ -957,22 +751,22 @@ while (YYID (0))
 
 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
 
 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
-    do                                                                 \
+# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
+    do                                                                  \

       if (YYID (N))                                                    \
       if (YYID (N))                                                    \

-       {                                                               \
-         (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
-         (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
-         (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
-         (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
-       }                                                               \
-      else                                                             \
-       {                                                               \
-         (Current).first_line   = (Current).last_line   =              \
-           YYRHSLOC (Rhs, 0).last_line;                                \
-         (Current).first_column = (Current).last_column =              \
-           YYRHSLOC (Rhs, 0).last_column;                              \
-       }                                                               \
+        {                                                               \
+          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
+          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
+          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
+          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).first_line   = (Current).last_line   =              \
+            YYRHSLOC (Rhs, 0).last_line;                                \
+          (Current).first_column = (Current).last_column =              \
+            YYRHSLOC (Rhs, 0).last_column;                              \
+        }                                                               \

     while (YYID (0))
 #endif
 
     while (YYID (0))
 #endif
 


@@ -983,10 +777,10 @@ while (YYID (0))
 
 #ifndef YY_LOCATION_PRINT
 # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 
 #ifndef YY_LOCATION_PRINT
 # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL

-#  define YY_LOCATION_PRINT(File, Loc)                 \
-     fprintf (File, "%d.%d-%d.%d",                     \
-             (Loc).first_line, (Loc).first_column,     \
-             (Loc).last_line,  (Loc).last_column)
+#  define YY_LOCATION_PRINT(File, Loc)                  \
+     fprintf (File, "%d.%d-%d.%d",                      \
+              (Loc).first_line, (Loc).first_column,     \
+              (Loc).last_line,  (Loc).last_column)

 # else
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 # endif
 # else
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 # endif


@@ -1009,21 +803,21 @@ while (YYID (0))
 #  define YYFPRINTF fprintf
 # endif
 
 #  define YYFPRINTF fprintf
 # endif
 

-# define YYDPRINTF(Args)                       \
-do {                                           \
-  if (yydebug)                                 \
-    YYFPRINTF Args;                            \
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \

 } while (YYID (0))
 
 } while (YYID (0))
 

-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                   \
-do {                                                                     \
-  if (yydebug)                                                           \
-    {                                                                    \
-      YYFPRINTF (stderr, "%s ", Title);                                          \
-      yy_symbol_print (stderr,                                           \
-                 Type, Value, Location); \
-      YYFPRINTF (stderr, "\n");                                                  \
-    }                                                                    \
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value, Location); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \

 } while (YYID (0))
 
 
 } while (YYID (0))
 
 


@@ -1046,182 +840,209 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
 #endif
 {
   FILE *yyo = yyoutput;
 #endif
 {
   FILE *yyo = yyoutput;

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

   if (!yyvaluep)
     return;
   if (!yyvaluep)
     return;

-  YYUSE (yylocationp);

 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);

-# else
-  YYUSE (yyoutput);

 # endif
   switch (yytype)
     {
 # endif
   switch (yytype)
     {

-      case 3: /* "\"string\"" */
-
-/* Line 823 of yacc.c  */
-#line 204 "parse-gram.y"
-       { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-
-/* Line 823 of yacc.c  */
-#line 1069 "parse-gram.c"
-       break;
-      case 4: /* "\"integer\"" */
-
-/* Line 823 of yacc.c  */
-#line 216 "parse-gram.y"
-       { fprintf (stderr, "%d", (yyvaluep->integer)); };
-
-/* Line 823 of yacc.c  */
-#line 1078 "parse-gram.c"
-       break;
-      case 43: /* "\"{...}\"" */
-
-/* Line 823 of yacc.c  */
-#line 206 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
-
-/* Line 823 of yacc.c  */
-#line 1087 "parse-gram.c"
-       break;
-      case 44: /* "\"[identifier]\"" */
-
-/* Line 823 of yacc.c  */
-#line 211 "parse-gram.y"
-       { fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); };
-
-/* Line 823 of yacc.c  */
-#line 1096 "parse-gram.c"
-       break;
-      case 45: /* "\"char\"" */
-
-/* Line 823 of yacc.c  */
-#line 198 "parse-gram.y"
-       { fputs (char_name ((yyvaluep->character)), stderr); };
-
-/* Line 823 of yacc.c  */
-#line 1105 "parse-gram.c"
-       break;
-      case 46: /* "\"epilogue\"" */
-
-/* Line 823 of yacc.c  */
-#line 206 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 823 of yacc.c  */
-#line 1114 "parse-gram.c"
-       break;
-      case 48: /* "\"identifier\"" */
-
-/* Line 823 of yacc.c  */
-#line 210 "parse-gram.y"
-       { fputs ((yyvaluep->uniqstr), stderr); };
-
-/* Line 823 of yacc.c  */
-#line 1123 "parse-gram.c"
-       break;
-      case 49: /* "\"identifier:\"" */
-
-/* Line 823 of yacc.c  */
-#line 212 "parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-
-/* Line 823 of yacc.c  */
-#line 1132 "parse-gram.c"
-       break;
-      case 52: /* "\"%{...%}\"" */
-
-/* Line 823 of yacc.c  */
-#line 206 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 823 of yacc.c  */
-#line 1141 "parse-gram.c"
-       break;
-      case 54: /* "\"type\"" */
-
-/* Line 823 of yacc.c  */
-#line 213 "parse-gram.y"
-       { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-
-/* Line 823 of yacc.c  */
-#line 1150 "parse-gram.c"
-       break;
-      case 71: /* "symbol.prec" */
-
-/* Line 823 of yacc.c  */
-#line 219 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 823 of yacc.c  */
-#line 1159 "parse-gram.c"
-       break;
-      case 84: /* "variable" */
-
-/* Line 823 of yacc.c  */
-#line 210 "parse-gram.y"
-       { fputs ((yyvaluep->uniqstr), stderr); };
-
-/* Line 823 of yacc.c  */
-#line 1168 "parse-gram.c"
-       break;
-      case 85: /* "content.opt" */
-
-/* Line 823 of yacc.c  */
-#line 206 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 823 of yacc.c  */
-#line 1177 "parse-gram.c"
-       break;
-      case 86: /* "braceless" */
-
-/* Line 823 of yacc.c  */
-#line 206 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 823 of yacc.c  */
-#line 1186 "parse-gram.c"
-       break;
-      case 87: /* "id" */
-
-/* Line 823 of yacc.c  */
-#line 219 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 823 of yacc.c  */
-#line 1195 "parse-gram.c"
-       break;
-      case 88: /* "id_colon" */
-
-/* Line 823 of yacc.c  */
-#line 220 "parse-gram.y"
-       { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-
-/* Line 823 of yacc.c  */
-#line 1204 "parse-gram.c"
-       break;
-      case 89: /* "symbol" */
-
-/* Line 823 of yacc.c  */
-#line 219 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 823 of yacc.c  */
-#line 1213 "parse-gram.c"
-       break;
-      case 90: /* "string_as_id" */
-
-/* Line 823 of yacc.c  */
-#line 219 "parse-gram.y"
-       { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 823 of yacc.c  */
-#line 1222 "parse-gram.c"
-       break;
+            case 3: // "string"
+
+/* Line 754 of yacc.c  */
+#line 194 "src/parse-gram.y"
+        { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
+/* Line 754 of yacc.c  */
+#line 860 "src/parse-gram.c"
+        break;
+
+            case 4: // "integer"
+
+/* Line 754 of yacc.c  */
+#line 207 "src/parse-gram.y"
+        { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
+/* Line 754 of yacc.c  */
+#line 869 "src/parse-gram.c"
+        break;
+
+            case 24: // "%<flag>"
+
+/* Line 754 of yacc.c  */
+#line 203 "src/parse-gram.y"
+        { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
+/* Line 754 of yacc.c  */
+#line 878 "src/parse-gram.c"
+        break;
+
+            case 40: // "{...}"
+
+/* Line 754 of yacc.c  */
+#line 196 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
+/* Line 754 of yacc.c  */
+#line 887 "src/parse-gram.c"
+        break;
+
+            case 42: // "[identifier]"
+
+/* Line 754 of yacc.c  */
+#line 201 "src/parse-gram.y"
+        { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }
+/* Line 754 of yacc.c  */
+#line 896 "src/parse-gram.c"
+        break;
+
+            case 43: // "char"
+
+/* Line 754 of yacc.c  */
+#line 188 "src/parse-gram.y"
+        { fputs (char_name (((*yyvaluep).character)), stderr); }
+/* Line 754 of yacc.c  */
+#line 905 "src/parse-gram.c"
+        break;
+
+            case 44: // "epilogue"
+
+/* Line 754 of yacc.c  */
+#line 196 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 754 of yacc.c  */
+#line 914 "src/parse-gram.c"
+        break;
+
+            case 46: // "identifier"
+
+/* Line 754 of yacc.c  */
+#line 200 "src/parse-gram.y"
+        { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 754 of yacc.c  */
+#line 923 "src/parse-gram.c"
+        break;
+
+            case 47: // "identifier:"
+
+/* Line 754 of yacc.c  */
+#line 202 "src/parse-gram.y"
+        { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
+/* Line 754 of yacc.c  */
+#line 932 "src/parse-gram.c"
+        break;
+
+            case 50: // "%{...%}"
+
+/* Line 754 of yacc.c  */
+#line 196 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 754 of yacc.c  */
+#line 941 "src/parse-gram.c"
+        break;
+
+            case 52: // "<tag>"
+
+/* Line 754 of yacc.c  */
+#line 204 "src/parse-gram.y"
+        { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
+/* Line 754 of yacc.c  */
+#line 950 "src/parse-gram.c"
+        break;
+
+            case 55: // "%param"
+
+/* Line 754 of yacc.c  */
+#line 250 "src/parse-gram.y"
+        {
+  switch (((*yyvaluep).param))
+    {
+#define CASE(In, Out)                                           \
+      case param_ ## In: fputs ("%" #Out, stderr); break
+      CASE(lex,   lex-param);
+      CASE(parse, parse-param);
+      CASE(both,  param);
+#undef CASE
+      case param_none: aver (false); break;
+    }
+}
+/* Line 754 of yacc.c  */
+#line 970 "src/parse-gram.c"
+        break;
+
+            case 72: // symbol.prec
+
+/* Line 754 of yacc.c  */
+#line 210 "src/parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 754 of yacc.c  */
+#line 979 "src/parse-gram.c"
+        break;
+
+            case 85: // variable
+
+/* Line 754 of yacc.c  */
+#line 200 "src/parse-gram.y"
+        { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 754 of yacc.c  */
+#line 988 "src/parse-gram.c"
+        break;
+
+            case 86: // content.opt
+
+/* Line 754 of yacc.c  */
+#line 196 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 754 of yacc.c  */
+#line 997 "src/parse-gram.c"
+        break;
+
+            case 87: // braceless
+
+/* Line 754 of yacc.c  */
+#line 196 "src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 754 of yacc.c  */
+#line 1006 "src/parse-gram.c"
+        break;
+
+            case 88: // id
+
+/* Line 754 of yacc.c  */
+#line 210 "src/parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 754 of yacc.c  */
+#line 1015 "src/parse-gram.c"
+        break;
+
+            case 89: // id_colon
+
+/* Line 754 of yacc.c  */
+#line 211 "src/parse-gram.y"
+        { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
+/* Line 754 of yacc.c  */
+#line 1024 "src/parse-gram.c"
+        break;
+
+            case 90: // symbol
+
+/* Line 754 of yacc.c  */
+#line 210 "src/parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 754 of yacc.c  */
+#line 1033 "src/parse-gram.c"
+        break;
+
+            case 91: // string_as_id
+
+/* Line 754 of yacc.c  */
+#line 210 "src/parse-gram.y"
+        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 754 of yacc.c  */
+#line 1042 "src/parse-gram.c"
+        break;
+

       default:
       default:

-       break;
+        break;

     }
 }
 
     }
 }
 


@@ -1279,10 +1100,10 @@ yy_stack_print (yybottom, yytop)
   YYFPRINTF (stderr, "\n");
 }
 
   YYFPRINTF (stderr, "\n");
 }
 

-# define YY_STACK_PRINT(Bottom, Top)                           \
-do {                                                           \
-  if (yydebug)                                                 \
-    yy_stack_print ((Bottom), (Top));                          \
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \

 } while (YYID (0))
 
 
 } while (YYID (0))
 
 


@@ -1293,35 +1114,37 @@ 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");
     }
 }
 

-# define YY_REDUCE_PRINT(Rule)         \
-do {                                   \
-  if (yydebug)                         \
-    yy_reduce_print (yyvsp, yylsp, Rule); \
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    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


@@ -1336,7 +1159,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */

-#ifndef        YYINITDEPTH
+#ifndef YYINITDEPTH

 # define YYINITDEPTH 200
 #endif
 
 # define YYINITDEPTH 200
 #endif
 


@@ -1655,27 +1478,27 @@ yytnamerr (char *yyres, const char *yystr)
       char const *yyp = yystr;
 
       for (;;)
       char const *yyp = yystr;
 
       for (;;)

-       switch (*++yyp)
-         {
-         case '\'':
-         case ',':
-           goto do_not_strip_quotes;
-
-         case '\\':
-           if (*++yyp != '\\')
-             goto do_not_strip_quotes;
-           /* Fall through.  */
-         default:
-           if (yyres)
-             yyres[yyn] = *yyp;
-           yyn++;
-           break;
-
-         case '"':
-           if (yyres)
-             yyres[yyn] = '\0';
-           return yyn;
-         }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }

     do_not_strip_quotes: ;
     }
 
     do_not_strip_quotes: ;
     }
 


@@ -1846,36 +1669,20 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
     YYLTYPE *yylocationp;
 #endif
 {
     YYLTYPE *yylocationp;
 #endif
 {

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

   YYUSE (yylocationp);
   YYUSE (yylocationp);

-

   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
   switch (yytype)
     {
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
   switch (yytype)
     {

-

       default:
       default:

-       break;
+        break;

     }
 }
 
 
     }
 }
 
 

-/* Prevent warnings from -Wmissing-prototypes.  */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */

 
 
 /*----------.
 
 
 /*----------.


@@ -1925,7 +1732,7 @@ YYLTYPE yylloc;
        `yyvs': related to semantic values.
        `yyls': related to locations.
 
        `yyvs': related to semantic values.
        `yyls': related to locations.
 

-       Refer to the stacks thru separate pointers, to allow yyoverflow
+       Refer to the stacks through separate pointers, to allow yyoverflow

        to reallocate them elsewhere.  */
 
     /* The state stack.  */
        to reallocate them elsewhere.  */
 
     /* The state stack.  */


@@ -2008,18 +1815,16 @@ YYLTYPE yylloc;
 #endif
 
 /* User initialization code.  */
 #endif
 
 /* User initialization code.  */

-
-/* Line 1594 of yacc.c  */
-#line 106 "parse-gram.y"
+/* Line 1519 of yacc.c  */
+#line 99 "src/parse-gram.y"

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

-
-/* Line 1594 of yacc.c  */
-#line 2023 "parse-gram.c"
+/* Line 1519 of yacc.c  */
+#line 1828 "src/parse-gram.c"

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


@@ -2042,26 +1847,26 @@ YYLTYPE yylloc;
 
 #ifdef yyoverflow
       {
 
 #ifdef yyoverflow
       {

-       /* Give user a chance to reallocate the stack.  Use copies of
-          these so that the &'s don't force the real ones into
-          memory.  */
-       YYSTYPE *yyvs1 = yyvs;
-       yytype_int16 *yyss1 = yyss;
-       YYLTYPE *yyls1 = yyls;
-
-       /* Each stack pointer address is followed by the size of the
-          data in use in that stack, in bytes.  This used to be a
-          conditional around just the two extra args, but that might
-          be undefined if yyoverflow is a macro.  */
-       yyoverflow (YY_("memory exhausted"),
-                   &yyss1, yysize * sizeof (*yyssp),
-                   &yyvs1, yysize * sizeof (*yyvsp),
-                   &yyls1, yysize * sizeof (*yylsp),
-                   &yystacksize);
-
-       yyls = yyls1;
-       yyss = yyss1;
-       yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+        YYLTYPE *yyls1 = yyls;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yyls1, yysize * sizeof (*yylsp),
+                    &yystacksize);
+
+        yyls = yyls1;
+        yyss = yyss1;
+        yyvs = yyvs1;

       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE


@@ -2069,23 +1874,23 @@ YYLTYPE yylloc;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)

-       goto yyexhaustedlab;
+        goto yyexhaustedlab;

       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)

-       yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;

 
       {
 
       {

-       yytype_int16 *yyss1 = yyss;
-       union yyalloc *yyptr =
-         (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-       if (! yyptr)
-         goto yyexhaustedlab;
-       YYSTACK_RELOCATE (yyss_alloc, yyss);
-       YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-       YYSTACK_RELOCATE (yyls_alloc, yyls);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+        YYSTACK_RELOCATE (yyls_alloc, yyls);

 #  undef YYSTACK_RELOCATE
 #  undef YYSTACK_RELOCATE

-       if (yyss1 != yyssa)
-         YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);

       }
 # endif
 #endif /* no yyoverflow */
       }
 # endif
 #endif /* no yyoverflow */


@@ -2095,10 +1900,10 @@ YYLTYPE yylloc;
       yylsp = yyls + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
       yylsp = yyls + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",

-                 (unsigned long int) yystacksize));
+                  (unsigned long int) yystacksize));

 
       if (yyss + yystacksize - 1 <= yyssp)
 
       if (yyss + yystacksize - 1 <= yyssp)

-       YYABORT;
+        YYABORT;

     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));


@@ -2212,217 +2017,216 @@ yyreduce:
     switch (yyn)
       {
           case 6:
     switch (yyn)
       {
           case 6:

-
-/* Line 1810 of yacc.c  */
-#line 245 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 286 "src/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 1735 of yacc.c  */
+#line 2033 "src/parse-gram.c"

     break;
 
   case 7:
     break;
 
   case 7:

-
-/* Line 1810 of yacc.c  */
-#line 254 "parse-gram.y"
-    { debug_flag = true; }
+/* Line 1735 of yacc.c  */
+#line 296 "src/parse-gram.y"
+    {
+      muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
+    }
+/* Line 1735 of yacc.c  */
+#line 2043 "src/parse-gram.c"

     break;
 
   case 8:
     break;
 
   case 8:

-
-/* Line 1810 of yacc.c  */
-#line 256 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 300 "src/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);
     }
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }

+/* Line 1735 of yacc.c  */
+#line 2054 "src/parse-gram.c"

     break;
 
   case 9:
     break;
 
   case 9:

-
-/* Line 1810 of yacc.c  */
-#line 260 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 304 "src/parse-gram.y"

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

+/* Line 1735 of yacc.c  */
+#line 2062 "src/parse-gram.c"

     break;
 
   case 10:
     break;
 
   case 10:

-
-/* Line 1810 of yacc.c  */
-#line 262 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 306 "src/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 1735 of yacc.c  */
+#line 2073 "src/parse-gram.c"

     break;
 
   case 11:
     break;
 
   case 11:

-
-/* Line 1810 of yacc.c  */
-#line 266 "parse-gram.y"
-    { error_verbose = true; }
+/* Line 1735 of yacc.c  */
+#line 311 "src/parse-gram.y"
+    {
+      muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
+                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+    }
+/* Line 1735 of yacc.c  */
+#line 2084 "src/parse-gram.c"

     break;
 
   case 12:
     break;
 
   case 12:

-
-/* Line 1810 of yacc.c  */
-#line 267 "parse-gram.y"
-    { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1735 of yacc.c  */
+#line 315 "src/parse-gram.y"
+    { expected_sr_conflicts = (yyvsp[0].integer); }
+/* Line 1735 of yacc.c  */
+#line 2092 "src/parse-gram.c"

     break;
 
   case 13:
     break;
 
   case 13:

-
-/* Line 1810 of yacc.c  */
-#line 268 "parse-gram.y"
-    { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1735 of yacc.c  */
+#line 316 "src/parse-gram.y"
+    { expected_rr_conflicts = (yyvsp[0].integer); }
+/* Line 1735 of yacc.c  */
+#line 2100 "src/parse-gram.c"

     break;
 
   case 14:
     break;
 
   case 14:

-
-/* Line 1810 of yacc.c  */
-#line 269 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
+/* Line 1735 of yacc.c  */
+#line 317 "src/parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1735 of yacc.c  */
+#line 2108 "src/parse-gram.c"

     break;
 
   case 15:
     break;
 
   case 15:

-
-/* Line 1810 of yacc.c  */
-#line 270 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1735 of yacc.c  */
+#line 318 "src/parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1735 of yacc.c  */
+#line 2116 "src/parse-gram.c"

     break;
 
   case 16:
     break;
 
   case 16:

-
-/* Line 1810 of yacc.c  */
-#line 272 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 320 "src/parse-gram.y"

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

+/* Line 1735 of yacc.c  */
+#line 2127 "src/parse-gram.c"

     break;
 
   case 17:
     break;
 
   case 17:

-
-/* Line 1810 of yacc.c  */
-#line 277 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 325 "src/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 1735 of yacc.c  */
+#line 2142 "src/parse-gram.c"

     break;
 
   case 18:
     break;
 
   case 18:

-
-/* Line 1810 of yacc.c  */
-#line 285 "parse-gram.y"
-    { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
+/* Line 1735 of yacc.c  */
+#line 333 "src/parse-gram.y"
+    { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
+/* Line 1735 of yacc.c  */
+#line 2150 "src/parse-gram.c"

     break;
 
   case 19:
     break;
 
   case 19:

-
-/* Line 1810 of yacc.c  */
-#line 286 "parse-gram.y"
-    { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1735 of yacc.c  */
+#line 334 "src/parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1735 of yacc.c  */
+#line 2158 "src/parse-gram.c"

     break;
 
   case 20:
     break;
 
   case 20:

-
-/* Line 1810 of yacc.c  */
-#line 287 "parse-gram.y"
-    { locations_flag = true; }
+/* Line 1735 of yacc.c  */
+#line 335 "src/parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1735 of yacc.c  */
+#line 2166 "src/parse-gram.c"

     break;
 
   case 21:
     break;
 
   case 21:

-
-/* Line 1810 of yacc.c  */
-#line 288 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
+/* Line 1735 of yacc.c  */
+#line 336 "src/parse-gram.y"
+    { no_lines_flag = true; }
+/* Line 1735 of yacc.c  */
+#line 2174 "src/parse-gram.c"

     break;
 
   case 22:
     break;
 
   case 22:

-
-/* Line 1810 of yacc.c  */
-#line 289 "parse-gram.y"
-    { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1735 of yacc.c  */
+#line 337 "src/parse-gram.y"
+    { nondeterministic_parser = true; }
+/* Line 1735 of yacc.c  */
+#line 2182 "src/parse-gram.c"

     break;
 
   case 23:
     break;
 
   case 23:

-
-/* Line 1810 of yacc.c  */
-#line 290 "parse-gram.y"
-    { no_lines_flag = true; }
+/* Line 1735 of yacc.c  */
+#line 338 "src/parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1735 of yacc.c  */
+#line 2190 "src/parse-gram.c"

     break;
 
   case 24:
     break;
 
   case 24:

-
-/* Line 1810 of yacc.c  */
-#line 291 "parse-gram.y"
-    { nondeterministic_parser = true; }
+/* Line 1735 of yacc.c  */
+#line 339 "src/parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }
+/* Line 1735 of yacc.c  */
+#line 2198 "src/parse-gram.c"

     break;
 
   case 25:
     break;
 
   case 25:

-
-/* Line 1810 of yacc.c  */
-#line 292 "parse-gram.y"
-    { spec_outfile = (yyvsp[(2) - (2)].chars); }
+/* Line 1735 of yacc.c  */
+#line 340 "src/parse-gram.y"
+    { current_param = (yyvsp[0].param); }
+/* Line 1735 of yacc.c  */
+#line 2206 "src/parse-gram.c"

     break;
 
   case 26:
     break;
 
   case 26:

-
-/* Line 1810 of yacc.c  */
-#line 293 "parse-gram.y"
-    { spec_outfile = (yyvsp[(3) - (3)].chars); }
+/* Line 1735 of yacc.c  */
+#line 340 "src/parse-gram.y"
+    { current_param = param_none; }
+/* Line 1735 of yacc.c  */
+#line 2214 "src/parse-gram.c"

     break;
 
   case 27:
     break;
 
   case 27:

-
-/* Line 1810 of yacc.c  */
-#line 294 "parse-gram.y"
-    { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1735 of yacc.c  */
+#line 341 "src/parse-gram.y"
+    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
+/* Line 1735 of yacc.c  */
+#line 2222 "src/parse-gram.c"

     break;
 
   case 28:
     break;
 
   case 28:

-
-/* Line 1810 of yacc.c  */
-#line 296 "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)]), "",
-                                      MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
-      /* In all cases, use api.pure now so that the backend doesn't complain if
-         the skeleton ignores api.pure, but do warn now if there's a previous
-         conflicting definition from an actual %define.  */
-      if (!muscle_percent_define_flag_if ("api.pure"))
-        muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "",
-                                      MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
-    }
-    break;
-
-  case 29:
-
-/* Line 1810 of yacc.c  */
-#line 310 "parse-gram.y"
-    { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
-    break;
-
-  case 30:
-
-/* Line 1810 of yacc.c  */
-#line 312 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 343 "src/parse-gram.y"

     {
     {

-      char const *skeleton_user = (yyvsp[(2) - (2)].chars);
-      if (mbschr (skeleton_user, '/'))
+      char const *skeleton_user = (yyvsp[0].chars);
+      if (strchr (skeleton_user, '/'))

         {
           size_t dir_length = strlen (current_file);
           char *skeleton_build;
         {
           size_t dir_length = strlen (current_file);
           char *skeleton_build;


@@ -2441,551 +2245,647 @@ yyreduce:
           skeleton_user = uniqstr_new (skeleton_build);
           free (skeleton_build);
         }
           skeleton_user = uniqstr_new (skeleton_build);
           free (skeleton_build);
         }

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

     }
     }

+/* Line 1735 of yacc.c  */
+#line 2252 "src/parse-gram.c"

     break;
 
     break;
 

-  case 31:
-
-/* Line 1810 of yacc.c  */
-#line 335 "parse-gram.y"
+  case 29:
+/* Line 1735 of yacc.c  */
+#line 366 "src/parse-gram.y"

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

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

     break;
 
     break;
 

-  case 32:
-
-/* Line 1810 of yacc.c  */
-#line 336 "parse-gram.y"
+  case 30:
+/* Line 1735 of yacc.c  */
+#line 367 "src/parse-gram.y"

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

+/* Line 1735 of yacc.c  */
+#line 2268 "src/parse-gram.c"
+    break;
+
+  case 31:
+/* Line 1735 of yacc.c  */
+#line 368 "src/parse-gram.y"
+    { yacc_flag = true; }
+/* Line 1735 of yacc.c  */
+#line 2276 "src/parse-gram.c"

     break;
 
   case 33:
     break;
 
   case 33:

+/* Line 1735 of yacc.c  */
+#line 373 "src/parse-gram.y"
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2284 "src/parse-gram.c"
+    break;

 
 

-/* Line 1810 of yacc.c  */
-#line 337 "parse-gram.y"
-    { yacc_flag = true; }
+  case 34:
+/* Line 1735 of yacc.c  */
+#line 374 "src/parse-gram.y"
+    { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2292 "src/parse-gram.c"

     break;
 
   case 37:
     break;
 
   case 37:

-
-/* Line 1810 of yacc.c  */
-#line 345 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 386 "src/parse-gram.y"

     {
     {

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

     }
     }

+/* Line 1735 of yacc.c  */
+#line 2302 "src/parse-gram.c"

     break;
 
   case 38:
     break;
 
   case 38:

-
-/* Line 1810 of yacc.c  */
-#line 349 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 390 "src/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_code_props_set (list, destructor, (yylsp[-1]), (yyvsp[-1].code));
+      symbol_list_free ((yyvsp[0].list));

     }
     }

+/* Line 1735 of yacc.c  */
+#line 2315 "src/parse-gram.c"

     break;
 
   case 39:
     break;
 
   case 39:

-
-/* Line 1810 of yacc.c  */
-#line 356 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 397 "src/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_code_props_set (list, printer, (yylsp[-1]), (yyvsp[-1].code));
+      symbol_list_free ((yyvsp[0].list));

     }
     }

+/* Line 1735 of yacc.c  */
+#line 2328 "src/parse-gram.c"

     break;
 
   case 40:
     break;
 
   case 40:

-
-/* Line 1810 of yacc.c  */
-#line 363 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 404 "src/parse-gram.y"

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

+/* Line 1735 of yacc.c  */
+#line 2338 "src/parse-gram.c"

     break;
 
   case 41:
     break;
 
   case 41:

-
-/* Line 1810 of yacc.c  */
-#line 367 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 408 "src/parse-gram.y"

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

+/* Line 1735 of yacc.c  */
+#line 2348 "src/parse-gram.c"

     break;
 
   case 42:
     break;
 
   case 42:

-
-/* Line 1810 of yacc.c  */
-#line 371 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 412 "src/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 1735 of yacc.c  */
+#line 2361 "src/parse-gram.c"

     break;
 
   case 43:
     break;
 
   case 43:

-
-/* Line 1810 of yacc.c  */
-#line 378 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 419 "src/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 1735 of yacc.c  */
+#line 2372 "src/parse-gram.c"

     break;
 
   case 44:
     break;
 
   case 44:

-
-/* Line 1810 of yacc.c  */
-#line 392 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 433 "src/parse-gram.y"

     {}
     {}

+/* Line 1735 of yacc.c  */
+#line 2380 "src/parse-gram.c"

     break;
 
   case 45:
     break;
 
   case 45:

-
-/* Line 1810 of yacc.c  */
-#line 393 "parse-gram.y"
-    { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1735 of yacc.c  */
+#line 434 "src/parse-gram.y"
+    { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2388 "src/parse-gram.c"

     break;
 
   case 46:
     break;
 
   case 46:

-
-/* Line 1810 of yacc.c  */
-#line 398 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 439 "src/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 1735 of yacc.c  */
+#line 2400 "src/parse-gram.c"

     break;
 
   case 47:
     break;
 
   case 47:

-
-/* Line 1810 of yacc.c  */
-#line 409 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 450 "src/parse-gram.y"

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

+/* Line 1735 of yacc.c  */
+#line 2408 "src/parse-gram.c"

     break;
 
   case 48:
     break;
 
   case 48:

-
-/* Line 1810 of yacc.c  */
-#line 410 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 451 "src/parse-gram.y"

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

+/* Line 1735 of yacc.c  */
+#line 2419 "src/parse-gram.c"

     break;
 
   case 49:
     break;
 
   case 49:

-
-/* Line 1810 of yacc.c  */
-#line 414 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 455 "src/parse-gram.y"

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

+/* Line 1735 of yacc.c  */
+#line 2427 "src/parse-gram.c"

     break;
 
   case 50:
     break;
 
   case 50:

-
-/* Line 1810 of yacc.c  */
-#line 415 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 456 "src/parse-gram.y"

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

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

     break;
 
   case 51:
     break;
 
   case 51:

-
-/* Line 1810 of yacc.c  */
-#line 420 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 461 "src/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 1735 of yacc.c  */
+#line 2452 "src/parse-gram.c"

     break;
 
   case 52:
     break;
 
   case 52:

-
-/* Line 1810 of yacc.c  */
-#line 431 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 472 "src/parse-gram.y"

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

-      for (list = (yyvsp[(3) - (3)].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_list_free ((yyvsp[(3) - (3)].list));
+      for (list = (yyvsp[0].list); list; list = list->next)
+        {
+          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[0].list));

       current_type = NULL;
     }
       current_type = NULL;
     }

+/* Line 1735 of yacc.c  */
+#line 2470 "src/parse-gram.c"

     break;
 
   case 53:
     break;
 
   case 53:

-
-/* Line 1810 of yacc.c  */
-#line 445 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 486 "src/parse-gram.y"

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

+/* Line 1735 of yacc.c  */
+#line 2478 "src/parse-gram.c"

     break;
 
   case 54:
     break;
 
   case 54:

-
-/* Line 1810 of yacc.c  */
-#line 446 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 487 "src/parse-gram.y"

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

+/* Line 1735 of yacc.c  */
+#line 2486 "src/parse-gram.c"

     break;
 
   case 55:
     break;
 
   case 55:

-
-/* Line 1810 of yacc.c  */
-#line 447 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 488 "src/parse-gram.y"

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

+/* Line 1735 of yacc.c  */
+#line 2494 "src/parse-gram.c"

     break;
 
   case 56:
     break;
 
   case 56:

-
-/* Line 1810 of yacc.c  */
-#line 451 "parse-gram.y"
-    { current_type = NULL; }
+/* Line 1735 of yacc.c  */
+#line 489 "src/parse-gram.y"
+    { (yyval.assoc) = precedence_assoc; }
+/* Line 1735 of yacc.c  */
+#line 2502 "src/parse-gram.c"

     break;
 
   case 57:
     break;
 
   case 57:

-
-/* Line 1810 of yacc.c  */
-#line 452 "parse-gram.y"
-    { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
+/* Line 1735 of yacc.c  */
+#line 493 "src/parse-gram.y"
+    { current_type = NULL; }
+/* Line 1735 of yacc.c  */
+#line 2510 "src/parse-gram.c"

     break;
 
   case 58:
     break;
 
   case 58:

-
-/* Line 1810 of yacc.c  */
-#line 458 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1735 of yacc.c  */
+#line 494 "src/parse-gram.y"
+    { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
+/* Line 1735 of yacc.c  */
+#line 2518 "src/parse-gram.c"

     break;
 
   case 59:
     break;
 
   case 59:

-
-/* Line 1810 of yacc.c  */
-#line 460 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
+/* Line 1735 of yacc.c  */
+#line 500 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2526 "src/parse-gram.c"

     break;
 
   case 60:
     break;
 
   case 60:

-
-/* Line 1810 of yacc.c  */
-#line 464 "parse-gram.y"
-    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+/* Line 1735 of yacc.c  */
+#line 502 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1735 of yacc.c  */
+#line 2534 "src/parse-gram.c"

     break;
 
   case 61:
     break;
 
   case 61:

-
-/* Line 1810 of yacc.c  */
-#line 465 "parse-gram.y"
-    { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
+/* Line 1735 of yacc.c  */
+#line 506 "src/parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }
+/* Line 1735 of yacc.c  */
+#line 2542 "src/parse-gram.c"

     break;
 
   case 62:
     break;
 
   case 62:

-
-/* Line 1810 of yacc.c  */
-#line 471 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1735 of yacc.c  */
+#line 507 "src/parse-gram.y"
+    { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2550 "src/parse-gram.c"

     break;
 
   case 63:
     break;
 
   case 63:

-
-/* Line 1810 of yacc.c  */
-#line 473 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
+/* Line 1735 of yacc.c  */
+#line 513 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2558 "src/parse-gram.c"

     break;
 
   case 64:
     break;
 
   case 64:

-
-/* Line 1810 of yacc.c  */
-#line 477 "parse-gram.y"
-    { (yyval.list) = (yyvsp[(1) - (1)].list); }
+/* Line 1735 of yacc.c  */
+#line 515 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1735 of yacc.c  */
+#line 2566 "src/parse-gram.c"

     break;
 
   case 65:
     break;
 
   case 65:

-
-/* Line 1810 of yacc.c  */
-#line 478 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+/* Line 1735 of yacc.c  */
+#line 519 "src/parse-gram.y"
+    { (yyval.list) = (yyvsp[0].list); }
+/* Line 1735 of yacc.c  */
+#line 2574 "src/parse-gram.c"

     break;
 
   case 66:
     break;
 
   case 66:

-
-/* Line 1810 of yacc.c  */
-#line 482 "parse-gram.y"
-    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1735 of yacc.c  */
+#line 520 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
+/* Line 1735 of yacc.c  */
+#line 2582 "src/parse-gram.c"

     break;
 
   case 67:
     break;
 
   case 67:

-
-/* Line 1810 of yacc.c  */
-#line 483 "parse-gram.y"
-    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1735 of yacc.c  */
+#line 524 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2590 "src/parse-gram.c"

     break;
 
   case 68:
     break;
 
   case 68:

-
-/* Line 1810 of yacc.c  */
-#line 484 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+/* Line 1735 of yacc.c  */
+#line 525 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2598 "src/parse-gram.c"

     break;
 
   case 69:
     break;
 
   case 69:

-
-/* Line 1810 of yacc.c  */
-#line 485 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+/* Line 1735 of yacc.c  */
+#line 526 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2606 "src/parse-gram.c"

     break;
 
   case 70:
     break;
 
   case 70:

-
-/* Line 1810 of yacc.c  */
-#line 491 "parse-gram.y"
-    {
-       current_type = (yyvsp[(1) - (1)].uniqstr);
-       tag_seen = true;
-     }
+/* Line 1735 of yacc.c  */
+#line 527 "src/parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2614 "src/parse-gram.c"

     break;
 
   case 71:
     break;
 
   case 71:

-
-/* Line 1810 of yacc.c  */
-#line 496 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 533 "src/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)]));
+       current_type = (yyvsp[0].uniqstr);
+       tag_seen = true;

      }
      }

+/* Line 1735 of yacc.c  */
+#line 2625 "src/parse-gram.c"

     break;
 
   case 72:
     break;
 
   case 72:

-
-/* Line 1810 of yacc.c  */
-#line 501 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 538 "src/parse-gram.y"

     {
     {

-      symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
-      symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
-      symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)]));
-    }
+       symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
+       symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
+     }
+/* Line 1735 of yacc.c  */
+#line 2636 "src/parse-gram.c"

     break;
 
   case 73:
     break;
 
   case 73:

-
-/* Line 1810 of yacc.c  */
-#line 507 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 543 "src/parse-gram.y"

     {
     {

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

     }
     }

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

     break;
 
   case 74:
     break;
 
   case 74:

-
-/* Line 1810 of yacc.c  */
-#line 513 "parse-gram.y"
+/* Line 1735 of yacc.c  */
+#line 549 "src/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_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));

     }
     }

+/* Line 1735 of yacc.c  */
+#line 2660 "src/parse-gram.c"

     break;
 
     break;
 

-  case 81:
-
-/* Line 1810 of yacc.c  */
-#line 543 "parse-gram.y"
+  case 75:
+/* Line 1735 of yacc.c  */
+#line 555 "src/parse-gram.y"

     {
     {

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

     break;
 
   case 82:
     break;
 
   case 82:

-
-/* Line 1810 of yacc.c  */
-#line 549 "parse-gram.y"
-    { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); }
+/* Line 1735 of yacc.c  */
+#line 585 "src/parse-gram.y"
+    {
+      yyerrok;
+    }
+/* Line 1735 of yacc.c  */
+#line 2683 "src/parse-gram.c"

     break;
 
   case 83:
     break;
 
   case 83:

+/* Line 1735 of yacc.c  */
+#line 591 "src/parse-gram.y"
+    { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1735 of yacc.c  */
+#line 2691 "src/parse-gram.c"
+    break;

 
 

-/* Line 1810 of yacc.c  */
-#line 550 "parse-gram.y"
+  case 84:
+/* Line 1735 of yacc.c  */
+#line 592 "src/parse-gram.y"

     {
     /* Free the current lhs. */
     {
     /* Free the current lhs. */

-    current_lhs (0, (yylsp[(1) - (4)]), 0);
+    current_lhs (0, (yylsp[-3]), 0);

   }
   }

-    break;
-
-  case 84:
-
-/* Line 1810 of yacc.c  */
-#line 557 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(1) - (1)])); }
+/* Line 1735 of yacc.c  */
+#line 2702 "src/parse-gram.c"

     break;
 
   case 85:
     break;
 
   case 85:

-
-/* Line 1810 of yacc.c  */
-#line 558 "parse-gram.y"
-    { grammar_current_rule_end ((yylsp[(3) - (3)])); }
+/* Line 1735 of yacc.c  */
+#line 599 "src/parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2710 "src/parse-gram.c"

     break;
 
     break;
 

-  case 87:
-
-/* Line 1810 of yacc.c  */
-#line 564 "parse-gram.y"
-    { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
-                                 current_lhs_named_ref); }
+  case 86:
+/* Line 1735 of yacc.c  */
+#line 600 "src/parse-gram.y"
+    { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2718 "src/parse-gram.c"

     break;
 
   case 88:
     break;
 
   case 88:

-
-/* Line 1810 of yacc.c  */
-#line 567 "parse-gram.y"
-    { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
+/* Line 1735 of yacc.c  */
+#line 606 "src/parse-gram.y"
+    { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
+                                  current_lhs_named_ref); }
+/* Line 1735 of yacc.c  */
+#line 2727 "src/parse-gram.c"

     break;
 
   case 89:
     break;
 
   case 89:

-
-/* Line 1810 of yacc.c  */
-#line 569 "parse-gram.y"
-    { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
+/* Line 1735 of yacc.c  */
+#line 609 "src/parse-gram.y"
+    { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1735 of yacc.c  */
+#line 2735 "src/parse-gram.c"

     break;
 
   case 90:
     break;
 
   case 90:

-
-/* Line 1810 of yacc.c  */
-#line 571 "parse-gram.y"
-    { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
+/* Line 1735 of yacc.c  */
+#line 611 "src/parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }
+/* Line 1735 of yacc.c  */
+#line 2743 "src/parse-gram.c"

     break;
 
   case 91:
     break;
 
   case 91:

-
-/* Line 1810 of yacc.c  */
-#line 573 "parse-gram.y"
-    { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
+/* Line 1735 of yacc.c  */
+#line 613 "src/parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
+/* Line 1735 of yacc.c  */
+#line 2751 "src/parse-gram.c"

     break;
 
   case 92:
     break;
 
   case 92:

-
-/* Line 1810 of yacc.c  */
-#line 575 "parse-gram.y"
-    { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
+/* Line 1735 of yacc.c  */
+#line 615 "src/parse-gram.y"
+    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2759 "src/parse-gram.c"

     break;
 
   case 93:
     break;
 
   case 93:

-
-/* Line 1810 of yacc.c  */
-#line 579 "parse-gram.y"
-    { (yyval.named_ref) = 0; }
+/* Line 1735 of yacc.c  */
+#line 617 "src/parse-gram.y"
+    { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2767 "src/parse-gram.c"

     break;
 
   case 94:
     break;
 
   case 94:

-
-/* Line 1810 of yacc.c  */
-#line 581 "parse-gram.y"
-    { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1735 of yacc.c  */
+#line 619 "src/parse-gram.y"
+    { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2775 "src/parse-gram.c"

     break;
 
     break;
 

-  case 96:
-
-/* Line 1810 of yacc.c  */
-#line 593 "parse-gram.y"
-    { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+  case 95:
+/* Line 1735 of yacc.c  */
+#line 623 "src/parse-gram.y"
+    { (yyval.named_ref) = 0; }
+/* Line 1735 of yacc.c  */
+#line 2783 "src/parse-gram.c"

     break;
 
     break;
 

-  case 97:
-
-/* Line 1810 of yacc.c  */
-#line 598 "parse-gram.y"
-    { (yyval.chars) = ""; }
+  case 96:
+/* Line 1735 of yacc.c  */
+#line 625 "src/parse-gram.y"
+    { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2791 "src/parse-gram.c"

     break;
 
   case 98:
     break;
 
   case 98:

+/* Line 1735 of yacc.c  */
+#line 636 "src/parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
+/* Line 1735 of yacc.c  */
+#line 2799 "src/parse-gram.c"
+    break;

 
 

-/* Line 1810 of yacc.c  */
-#line 599 "parse-gram.y"
-    { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); }
+  case 99:
+/* Line 1735 of yacc.c  */
+#line 641 "src/parse-gram.y"
+    { (yyval.chars) = ""; }
+/* Line 1735 of yacc.c  */
+#line 2807 "src/parse-gram.c"

     break;
 
   case 100:
     break;
 
   case 100:

+/* Line 1735 of yacc.c  */
+#line 642 "src/parse-gram.y"
+    { (yyval.chars) = (yyvsp[0].uniqstr); }
+/* Line 1735 of yacc.c  */
+#line 2815 "src/parse-gram.c"
+    break;

 
 

-/* Line 1810 of yacc.c  */
-#line 610 "parse-gram.y"
+  case 102:
+/* Line 1735 of yacc.c  */
+#line 653 "src/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 1735 of yacc.c  */
+#line 2830 "src/parse-gram.c"

     break;
 
     break;
 

-  case 101:
-
-/* Line 1810 of yacc.c  */
-#line 630 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 103:
+/* Line 1735 of yacc.c  */
+#line 673 "src/parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2838 "src/parse-gram.c"

     break;
 
     break;
 

-  case 102:
-
-/* Line 1810 of yacc.c  */
-#line 632 "parse-gram.y"
+  case 104:
+/* Line 1735 of yacc.c  */
+#line 675 "src/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 1735 of yacc.c  */
+#line 2850 "src/parse-gram.c"

     break;
 
     break;
 

-  case 103:
-
-/* Line 1810 of yacc.c  */
-#line 640 "parse-gram.y"
-    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+  case 105:
+/* Line 1735 of yacc.c  */
+#line 683 "src/parse-gram.y"
+    { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1735 of yacc.c  */
+#line 2858 "src/parse-gram.c"

     break;
 
     break;
 

-  case 106:
-
-/* Line 1810 of yacc.c  */
-#line 652 "parse-gram.y"
+  case 108:
+/* Line 1735 of yacc.c  */
+#line 695 "src/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 1735 of yacc.c  */
+#line 2869 "src/parse-gram.c"

     break;
 
     break;
 

-  case 108:
-
-/* Line 1810 of yacc.c  */
-#line 661 "parse-gram.y"
+  case 110:
+/* Line 1735 of yacc.c  */
+#line 704 "src/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 1735 of yacc.c  */
+#line 2884 "src/parse-gram.c"

     break;
 
 
     break;
 
 

-
-/* Line 1810 of yacc.c  */
-#line 2989 "parse-gram.c"
+/* Line 1735 of yacc.c  */
+#line 2889 "src/parse-gram.c"

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


@@ -3082,20 +2982,20 @@ yyerrlab:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an

-        error, discard it.  */
+         error, discard it.  */

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

-       {
-         /* Return failure if at end of input.  */
-         if (yychar == YYEOF)
-           YYABORT;
-       }
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }

       else
       else

-       {
-         yydestruct ("Error: discarding",
-                     yytoken, &yylval, &yylloc);
-         yychar = YYEMPTY;
-       }
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval, &yylloc);
+          yychar = YYEMPTY;
+        }

     }
 
   /* Else will try to reuse lookahead token after shifting the error
     }
 
   /* Else will try to reuse lookahead token after shifting the error


@@ -3128,29 +3028,29 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:

-  yyerrstatus = 3;     /* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */

 
   for (;;)
     {
       yyn = yypact[yystate];
       if (!yypact_value_is_default (yyn))
 
   for (;;)
     {
       yyn = yypact[yystate];
       if (!yypact_value_is_default (yyn))

-       {
-         yyn += YYTERROR;
-         if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-           {
-             yyn = yytable[yyn];
-             if (0 < yyn)
-               break;
-           }
-       }
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }

 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)

-       YYABORT;
+        YYABORT;

 
       yyerror_range[1] = *yylsp;
       yydestruct ("Error: popping",
 
       yyerror_range[1] = *yylsp;
       yydestruct ("Error: popping",

-                 yystos[yystate], yyvsp, yylsp);
+                  yystos[yystate], yyvsp, yylsp);

       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);


@@ -3215,7 +3115,7 @@ yyreturn:
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",

-                 yystos[*yyssp], yyvsp, yylsp);
+                  yystos[*yyssp], yyvsp, yylsp);

       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow


@@ -3232,10 +3132,8 @@ yyreturn:
   return YYID (yyresult);
 }
 
   return YYID (yyresult);
 }
 

-
-
-/* Line 2071 of yacc.c  */
-#line 671 "parse-gram.y"
+/* Line 1995 of yacc.c  */
+#line 714 "src/parse-gram.y"

 
 
 
 
 
 


@@ -3261,49 +3159,51 @@ lloc_default (YYLTYPE const *rhs, int n)
   for (i = 1; i <= n; i++)
     if (! equal_boundaries (rhs[i].start, rhs[i].end))
       {
   for (i = 1; i <= n; i++)
     if (! equal_boundaries (rhs[i].start, rhs[i].end))
       {

-       loc.start = rhs[i].start;
-       break;
+        loc.start = rhs[i].start;
+        break;

       }
 
   return loc;
 }
 
 
       }
 
   return loc;
 }
 
 

-/* Add a lex-param or a parse-param (depending on TYPE) with
-   declaration DECL and location LOC.  */
-

 static void
 static void

-add_param (char const *type, char *decl, location loc)
+add_param (param_type type, char *decl, location loc)

 {
   static char const alphanum[26 + 26 + 1 + 10] =
     "abcdefghijklmnopqrstuvwxyz"
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "_"
     "0123456789";
 {
   static char const alphanum[26 + 26 + 1 + 10] =
     "abcdefghijklmnopqrstuvwxyz"
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "_"
     "0123456789";

+

   char const *name_start = NULL;
   char const *name_start = NULL;

-  char *p;
-
-  /* Stop on last actual character.  */
-  for (p = decl; p[1]; p++)
-    if ((p == decl
-        || ! memchr (alphanum, p[-1], sizeof alphanum))
-       && memchr (alphanum, p[0], sizeof alphanum - 10))
-      name_start = p;
-
-  /* Strip the surrounding '{' and '}', and any blanks just inside
-     the braces.  */
-  while (*--p == ' ' || *p == '\t')
-    continue;
-  p[1] = '\0';
-  while (*++decl == ' ' || *decl == '\t')
-    continue;
+  {
+    char *p;
+    /* Stop on last actual character.  */
+    for (p = decl; p[1]; p++)
+      if ((p == decl
+           || ! memchr (alphanum, p[-1], sizeof alphanum))
+          && memchr (alphanum, p[0], sizeof alphanum - 10))
+        name_start = p;
+
+    /* Strip the surrounding '{' and '}', and any blanks just inside
+       the braces.  */
+    while (*--p == ' ' || *p == '\t')
+      continue;
+    p[1] = '\0';
+    while (*++decl == ' ' || *decl == '\t')
+      continue;
+  }

 
   if (! name_start)
     complain_at (loc, _("missing identifier in parameter declaration"));
   else
     {
       char *name = xmemdup0 (name_start, strspn (name_start, alphanum));
 
   if (! name_start)
     complain_at (loc, _("missing identifier in parameter declaration"));
   else
     {
       char *name = xmemdup0 (name_start, strspn (name_start, alphanum));

-      muscle_pair_list_grow (type, decl, name);
+      if (type & param_lex)
+        muscle_pair_list_grow ("lex_param", decl, name);
+      if (type & param_parse)
+        muscle_pair_list_grow ("parse_param", decl, name);

       free (name);
     }
 
       free (name);
     }
 


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

-