Pass command line location to skeleton_arg and language_argmatch.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index c7595e7633966a4961f2b37905174df5b9c27531..516e4f4baba666f2bdd687f8d547c4cf839e7a71 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,5 +1,5 @@
 
 

-/* A Bison parser, made by GNU Bison 2.3a+.  */
+/* A Bison parser, made by GNU Bison 2.4.4-738cd.  */

 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    


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

-#define YYBISON_VERSION "2.3a+"
+#define YYBISON_VERSION "2.4.4-738cd"

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


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

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

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

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

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

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

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

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

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


@@ -94,8 +100,6 @@
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"
 

-#include <strverscmp.h>
-

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


@@ -146,8 +150,8 @@ static int current_prec = 0;
 #define YYTYPE_UINT8 uint_fast8_t
 
 
 #define YYTYPE_UINT8 uint_fast8_t
 
 

-/* Line 22 of yacc.c  */
-#line 151 "parse-gram.c"
+/* Line 189 of yacc.c  */
+#line 155 "parse-gram.c"

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


@@ -295,8 +299,8 @@ static int current_prec = 0;
 typedef union YYSTYPE
 {
 
 typedef union YYSTYPE
 {
 

-/* Line 22 of yacc.c  */
-#line 94 "parse-gram.y"
+/* Line 222 of yacc.c  */
+#line 92 "parse-gram.y"

 
   symbol *symbol;
   symbol_list *list;
 
   symbol *symbol;
   symbol_list *list;


@@ -309,8 +313,8 @@ typedef union YYSTYPE
 
 
 
 
 
 

-/* Line 22 of yacc.c  */
-#line 314 "parse-gram.c"
+/* Line 222 of yacc.c  */
+#line 318 "parse-gram.c"

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


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

-/* Line 22 of yacc.c  */
-#line 339 "parse-gram.c"
+/* Line 264 of yacc.c  */
+#line 343 "parse-gram.c"

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


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

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

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


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

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

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

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

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


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

-#define YYLAST   155
+#define YYLAST   156

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

-#define YYNNTS  31
+#define YYNNTS  33

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

-#define YYNRULES  101
+#define YYNRULES  105

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

-#define YYNSTATES  139
+#define YYNSTATES  143

 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2


@@ -618,58 +622,59 @@ static const yytype_uint16 yyprhs[] =
       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,
       81,    84,    86,    88,    90,    92,    94,    96,    99,   103,
      107,   109,   111,   114,   118,   119,   121,   125,   126,   130,
      131,   135,   139,   143,   145,   147,   149,   150,   152,   154,

-     157,   159,   162,   164,   166,   168,   170,   172,   174,   177,
-     180,   184,   186,   189,   191,   194,   196,   199,   202,   203,
-     207,   209,   213,   216,   217,   220,   223,   227,   231,   235,
-     237,   239,   240,   242,   244,   246,   248,   250,   252,   254,
-     256,   257
+     157,   159,   162,   164,   167,   169,   172,   174,   176,   178,
+     180,   182,   184,   187,   190,   194,   196,   199,   201,   204,
+     206,   209,   212,   213,   217,   219,   223,   226,   227,   230,
+     233,   237,   241,   245,   247,   249,   250,   252,   254,   256,
+     258,   260,   262,   264,   266,   267

 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {

-      58,     0,    -1,    59,    49,    74,    87,    -1,    -1,    59,
-      60,    -1,    61,    -1,    51,    -1,    17,    -1,    19,    80,
-      81,    -1,    20,    -1,    20,     3,    -1,    21,    -1,    22,
+      58,     0,    -1,    59,    49,    76,    89,    -1,    -1,    59,
+      60,    -1,    61,    -1,    51,    -1,    17,    -1,    19,    82,
+      83,    -1,    20,    -1,    20,     3,    -1,    21,    -1,    22,

        4,    -1,    23,     4,    -1,    24,     3,    -1,    24,    46,
        3,    -1,    25,    -1,    26,    43,    -1,    27,     3,    -1,
       28,    43,    -1,    29,    -1,    30,     3,    -1,    30,    46,
        3,    -1,    32,    -1,    33,    -1,    34,     3,    -1,    34,
       46,     3,    -1,    35,    43,    -1,    36,    -1,    37,     3,
       -1,    38,     3,    -1,    40,    -1,    41,    -1,    42,    -1,
        4,    -1,    23,     4,    -1,    24,     3,    -1,    24,    46,
        3,    -1,    25,    -1,    26,    43,    -1,    27,     3,    -1,
       28,    43,    -1,    29,    -1,    30,     3,    -1,    30,    46,
        3,    -1,    32,    -1,    33,    -1,    34,     3,    -1,    34,
       46,     3,    -1,    35,    43,    -1,    36,    -1,    37,     3,
       -1,    38,     3,    -1,    40,    -1,    41,    -1,    42,    -1,

-      52,    -1,    66,    -1,    63,    -1,    39,    85,    -1,     8,
-      43,    70,    -1,     9,    43,    70,    -1,    18,    -1,    31,
-      -1,    16,    82,    -1,    16,    47,    82,    -1,    -1,    47,
-      -1,    56,    62,    82,    -1,    -1,     6,    64,    73,    -1,
-      -1,     5,    65,    73,    -1,     7,    53,    69,    -1,    67,
+      52,    -1,    66,    -1,    63,    -1,    39,    87,    -1,     8,
+      43,    72,    -1,     9,    43,    72,    -1,    18,    -1,    31,
+      -1,    16,    84,    -1,    16,    47,    84,    -1,    -1,    47,
+      -1,    56,    62,    84,    -1,    -1,     6,    64,    75,    -1,
+      -1,     5,    65,    75,    -1,     7,    53,    71,    -1,    67,

       68,    69,    -1,    10,    -1,    11,    -1,    12,    -1,    -1,
       68,    69,    -1,    10,    -1,    11,    -1,    12,    -1,    -1,

-      53,    -1,    85,    -1,    69,    85,    -1,    71,    -1,    70,
-      71,    -1,    85,    -1,    53,    -1,    54,    -1,    55,    -1,
-      53,    -1,    83,    -1,    83,     4,    -1,    83,    86,    -1,
-      83,     4,    86,    -1,    72,    -1,    73,    72,    -1,    75,
-      -1,    74,    75,    -1,    76,    -1,    61,    52,    -1,     1,
-      52,    -1,    -1,    84,    77,    78,    -1,    79,    -1,    78,
-      50,    79,    -1,    78,    52,    -1,    -1,    79,    85,    -1,
-      79,    43,    -1,    79,    13,    85,    -1,    79,    14,     4,
-      -1,    79,    15,    53,    -1,    47,    -1,     3,    -1,    -1,
+      53,    -1,    70,    -1,    69,    70,    -1,    87,    -1,    87,
+       4,    -1,    87,    -1,    71,    87,    -1,    73,    -1,    72,
+      73,    -1,    87,    -1,    53,    -1,    54,    -1,    55,    -1,
+      53,    -1,    85,    -1,    85,     4,    -1,    85,    88,    -1,
+      85,     4,    88,    -1,    74,    -1,    75,    74,    -1,    77,
+      -1,    76,    77,    -1,    78,    -1,    61,    52,    -1,     1,
+      52,    -1,    -1,    86,    79,    80,    -1,    81,    -1,    80,
+      50,    81,    -1,    80,    52,    -1,    -1,    81,    87,    -1,
+      81,    43,    -1,    81,    13,    87,    -1,    81,    14,     4,
+      -1,    81,    15,    53,    -1,    47,    -1,     3,    -1,    -1,

        3,    -1,    43,    -1,    47,    -1,    44,    -1,    48,    -1,
        3,    -1,    43,    -1,    47,    -1,    44,    -1,    48,    -1,

-      83,    -1,    86,    -1,     3,    -1,    -1,    49,    45,    -1
+      85,    -1,    88,    -1,     3,    -1,    -1,    49,    45,    -1

 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {

-       0,   204,   204,   212,   214,   218,   219,   229,   230,   234,
-     235,   240,   241,   242,   243,   244,   245,   250,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   282,
-     283,   307,   308,   309,   310,   314,   315,   316,   320,   327,
-     334,   338,   342,   349,   364,   365,   369,   381,   381,   386,
-     386,   391,   402,   417,   418,   419,   423,   424,   429,   431,
-     436,   437,   441,   442,   443,   444,   449,   454,   459,   465,
-     471,   482,   483,   492,   493,   499,   500,   501,   508,   508,
-     512,   513,   514,   519,   520,   522,   524,   526,   528,   538,
-     539,   545,   548,   557,   577,   579,   588,   593,   594,   599,
-     606,   608
+       0,   202,   202,   210,   212,   216,   217,   227,   228,   232,
+     233,   238,   239,   240,   241,   242,   243,   248,   257,   258,
+     259,   260,   261,   262,   263,   264,   265,   266,   267,   280,
+     281,   305,   306,   307,   308,   312,   313,   314,   318,   325,
+     332,   336,   340,   347,   362,   363,   367,   379,   379,   384,
+     384,   389,   400,   415,   416,   417,   421,   422,   427,   429,
+     434,   435,   440,   442,   447,   448,   452,   453,   454,   455,
+     460,   465,   470,   476,   482,   493,   494,   503,   504,   510,
+     511,   512,   519,   519,   523,   524,   525,   530,   531,   533,
+     535,   537,   539,   549,   550,   556,   559,   568,   588,   590,
+     599,   604,   605,   610,   617,   619

 };
 #endif
 
 };
 #endif
 


@@ -695,10 +700,11 @@ static const char *const yytname[] =
   "prologue_declarations", "prologue_declaration", "grammar_declaration",
   "union_name", "symbol_declaration", "$@1", "$@2",
   "precedence_declaration", "precedence_declarator", "type.opt",
   "prologue_declarations", "prologue_declaration", "grammar_declaration",
   "union_name", "symbol_declaration", "$@1", "$@2",
   "precedence_declaration", "precedence_declarator", "type.opt",

-  "symbols.1", "generic_symlist", "generic_symlist_item", "symbol_def",
-  "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules",
-  "$@3", "rhses.1", "rhs", "variable", "content.opt", "braceless", "id",
-  "id_colon", "symbol", "string_as_id", "epilogue.opt", 0
+  "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",
+  "variable", "content.opt", "braceless", "id", "id_colon", "symbol",
+  "string_as_id", "epilogue.opt", 0

 };
 #endif
 
 };
 #endif
 


@@ -725,11 +731,11 @@ static const yytype_uint8 yyr1[] =
       60,    60,    60,    60,    60,    61,    61,    61,    61,    61,
       61,    61,    61,    61,    62,    62,    61,    64,    63,    65,
       63,    63,    66,    67,    67,    67,    68,    68,    69,    69,
       60,    60,    60,    60,    60,    61,    61,    61,    61,    61,
       61,    61,    61,    61,    62,    62,    61,    64,    63,    65,
       63,    63,    66,    67,    67,    67,    68,    68,    69,    69,

-      70,    70,    71,    71,    71,    71,    72,    72,    72,    72,
-      72,    73,    73,    74,    74,    75,    75,    75,    77,    76,
-      78,    78,    78,    79,    79,    79,    79,    79,    79,    80,
-      80,    81,    81,    82,    83,    83,    84,    85,    85,    86,
-      87,    87
+      70,    70,    71,    71,    72,    72,    73,    73,    73,    73,
+      74,    74,    74,    74,    74,    75,    75,    76,    76,    77,
+      77,    77,    79,    78,    80,    80,    80,    81,    81,    81,
+      81,    81,    81,    82,    82,    83,    83,    84,    85,    85,
+      86,    87,    87,    88,    89,    89

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


@@ -741,11 +747,11 @@ static const yytype_uint8 yyr2[] =
        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,
        2,     1,     1,     1,     1,     1,     1,     2,     3,     3,
        1,     1,     2,     3,     0,     1,     3,     0,     3,     0,
        3,     3,     3,     1,     1,     1,     0,     1,     1,     2,

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

 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state


@@ -758,24 +764,25 @@ static const yytype_uint8 yydefact[] =
        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,    16,     0,     0,     0,    20,     0,    41,    23,    24,
        0,     0,    28,     0,     0,     0,    31,    32,    33,     0,
        6,    34,    44,     4,     5,    36,    35,    56,     0,     0,

-       0,     0,     0,    93,     0,    42,    90,    89,    91,    10,
+       0,     0,     0,    97,     0,    42,    94,    93,    95,    10,

       12,    13,    14,     0,    17,    18,    19,    21,     0,    25,
       12,    13,    14,     0,    17,    18,    19,    21,     0,    25,

-       0,    27,    29,    30,    99,    95,    94,    97,    37,    98,
-       0,    96,     0,     0,    73,    75,    78,    45,     0,    57,
-       0,    66,    71,    50,    67,    48,    51,    58,    63,    64,
-      65,    38,    60,    62,    39,    43,    92,     8,    15,    22,
-      26,    77,    76,     0,    74,     2,    83,    46,    52,    72,
-      68,    69,    59,    61,   101,    79,    80,    70,    83,    82,
-       0,     0,     0,    85,    84,    81,    86,    87,    88
+       0,    27,    29,    30,   103,    99,    98,   101,    37,   102,
+       0,   100,     0,     0,    77,    79,    82,    45,     0,    57,
+       0,    70,    75,    50,    71,    48,    51,    62,    67,    68,
+      69,    38,    64,    66,    39,    43,    96,     8,    15,    22,
+      26,    81,    80,     0,    78,     2,    87,    46,    52,    58,
+      60,    76,    72,    73,    63,    65,   105,    83,    84,    59,
+      61,    74,    87,    86,     0,     0,     0,    89,    88,    85,
+      90,    91,    92

 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */

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

 {
       -1,     1,     2,    43,    82,    88,    45,    49,    48,    46,
 {
       -1,     1,     2,    43,    82,    88,    45,    49,    48,    46,

-      47,    90,    96,   101,   102,    92,    93,    83,    84,    85,
-     116,   125,   126,    58,   107,    55,    77,    86,   103,    79,
-     115
+      47,    90,   118,   119,    96,   101,   102,    92,    93,    83,
+      84,    85,   116,   127,   128,    58,   107,    55,    77,    86,
+     103,    79,   115

 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing


@@ -783,54 +790,55 @@ static const yytype_int8 yydefgoto[] =
 #define YYPACT_NINF -60
 static const yytype_int16 yypact[] =
 {
 #define YYPACT_NINF -60
 static const yytype_int16 yypact[] =
 {

-     -60,    18,    96,   -60,   -60,   -60,   -16,    17,    24,   -60,
+     -60,    18,   100,   -60,   -60,   -60,   -16,    24,    27,   -60,

      -60,   -60,    -8,   -60,   -60,    11,    70,   -60,    71,    80,
      -60,   -60,    -8,   -60,   -60,    11,    70,   -60,    71,    80,

-       2,   -60,    46,    87,    49,   -60,    31,   -60,   -60,   -60,
-      40,    50,   -60,    91,    93,     0,   -60,   -60,   -60,    15,
-     -60,   -60,    51,   -60,   -60,   -60,   -60,    44,    12,    12,
-       0,    25,    25,   -60,    56,   -60,   -60,   -60,   106,   -60,
-     -60,   -60,   -60,   107,   -60,   -60,   -60,   -60,   108,   -60,
-     136,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,
-      88,   -60,    89,     1,   -60,   -60,   -60,   -60,    56,   -60,
+       2,   -60,    46,    87,    48,   -60,    31,   -60,   -60,   -60,
+      40,    49,   -60,    91,    92,     0,   -60,   -60,   -60,    15,
+     -60,   -60,    50,   -60,   -60,   -60,   -60,    43,    12,    12,
+       0,    25,    25,   -60,    55,   -60,   -60,   -60,    97,   -60,
+     -60,   -60,   -60,    98,   -60,   -60,   -60,   -60,    99,   -60,
+     110,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,
+      51,   -60,    62,     1,   -60,   -60,   -60,   -60,    55,   -60,

        0,   -60,   -60,    12,    84,    12,     0,   -60,   -60,   -60,
      -60,    25,   -60,   -60,    25,   -60,   -60,   -60,   -60,   -60,
        0,   -60,   -60,    12,    84,    12,     0,   -60,   -60,   -60,
      -60,    25,   -60,   -60,    25,   -60,   -60,   -60,   -60,   -60,

-     -60,   -60,   -60,    97,   -60,   -60,   -60,   -60,     0,   -60,
-     140,   -60,   -60,   -60,   -60,    14,    38,   -60,   -60,   -60,
-       0,   142,    98,   -60,   -60,    38,   -60,   -60,   -60
+     -60,   -60,   -60,   101,   -60,   -60,   -60,   -60,     0,   -60,
+     111,   -60,   140,   -60,   -60,   -60,   -60,    10,    38,   -60,
+     -60,   -60,   -60,   -60,     0,   141,    94,   -60,   -60,    38,
+     -60,   -60,   -60

 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {

-     -60,   -60,   -60,   -60,   147,   -60,   -60,   -60,   -60,   -60,
-     -60,   -60,    54,   101,   -59,   -25,   105,   -60,    67,   -60,
-     -60,   -60,    27,   -60,   -60,   -50,   -19,   -60,   -35,   -58,
-     -60
+     -60,   -60,   -60,   -60,   142,   -60,   -60,   -60,   -60,   -60,
+     -60,   -60,   -60,    30,   -60,   102,   -59,   -27,   104,   -60,
+      67,   -60,   -60,   -60,    23,   -60,   -60,   -50,   -19,   -60,
+     -35,   -58,   -60

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

-#define YYTABLE_NINF -101
+#define YYTABLE_NINF -105

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

-      78,  -100,    80,    74,   105,    62,     4,     5,     6,     7,
+      78,  -104,    80,    74,   105,    62,     4,     5,     6,     7,

        8,     9,    10,    11,    56,    97,    80,    12,     3,    14,
        4,     5,     6,     7,     8,     9,    10,    11,    74,    94,
        8,     9,    10,    11,    56,    97,    80,    12,     3,    14,
        4,     5,     6,     7,     8,     9,    10,    11,    74,    94,

-      94,    12,    27,    14,    67,    53,   121,    50,   117,    54,
-      35,    74,   123,    69,    75,   123,    27,    76,    63,    81,
-     113,   130,   131,   132,    35,    97,    75,    42,    57,    76,
-      51,   122,   127,    81,   128,    91,   129,    52,   119,    75,
-     119,    42,    76,    59,    94,    60,    94,    68,    98,    99,
-     100,   133,    75,   122,    61,    76,    70,    74,   120,    64,
-      65,   134,    66,    71,    72,   136,    73,    89,    87,    53,
-     134,     4,     5,     6,     7,     8,     9,    10,    11,   106,
-     108,   109,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,   110,
-     111,   112,   124,    74,   118,    39,   137,    40,    41,    44,
-     114,   138,    42,   104,    95,   135
+      94,    12,    27,    14,    67,    53,   123,    50,   117,    54,
+      35,    74,   125,    69,    75,   125,    27,    76,    63,    81,
+     113,   134,   135,   136,    35,   120,    75,    42,    57,    76,
+     132,   124,   133,    81,   131,    91,   121,    51,   121,    75,
+      52,    42,    76,    59,    94,    60,    94,    68,    98,    99,
+     100,   137,    75,   120,    61,    76,    70,    74,   122,    64,
+      65,    66,    71,   138,    72,    73,    89,    87,    53,   140,
+     106,   108,   109,   111,   138,     4,     5,     6,     7,     8,
+       9,    10,    11,   110,   112,   130,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    74,    44,   141,   126,   142,   129,    39,
+     114,    40,    41,    95,   104,   139,    42

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


@@ -841,16 +849,16 @@ static const yytype_uint8 yycheck[] =
       49,    16,    31,    18,     3,    43,    94,    53,    88,    47,
       39,     3,   101,     3,    44,   104,    31,    47,    46,    48,
       49,    13,    14,    15,    39,    90,    44,    56,    47,    47,
       49,    16,    31,    18,     3,    43,    94,    53,    88,    47,
       39,     3,   101,     3,    44,   104,    31,    47,    46,    48,
       49,    13,    14,    15,    39,    90,    44,    56,    47,    47,

-      43,    96,   120,    48,    50,    53,    52,    43,    93,    44,
-      95,    56,    47,     3,    93,     4,    95,    46,    53,    54,
+      50,    96,    52,    48,   122,    53,    93,    43,    95,    44,
+      43,    56,    47,     3,    93,     4,    95,    46,    53,    54,

       55,    43,    44,   118,     4,    47,    46,     3,     4,    43,
       55,    43,    44,   118,     4,    47,    46,     3,     4,    43,

-       3,   126,    43,    43,     3,   130,     3,    53,    47,    43,
-     135,     5,     6,     7,     8,     9,    10,    11,    12,     3,
-       3,     3,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,     3,
-      52,    52,    45,     3,    90,    49,     4,    51,    52,     2,
-      83,    53,    56,    52,    49,   128
+       3,    43,    43,   128,     3,     3,    53,    47,    43,   134,
+       3,     3,     3,    52,   139,     5,     6,     7,     8,     9,
+      10,    11,    12,     3,    52,     4,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,     3,     2,     4,    45,    53,   118,    49,
+      83,    51,    52,    49,    52,   132,    56

 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing


@@ -862,15 +870,16 @@ static const yytype_uint8 yystos[] =
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       34,    35,    36,    37,    38,    39,    40,    41,    42,    49,
       51,    52,    56,    60,    61,    63,    66,    67,    65,    64,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       34,    35,    36,    37,    38,    39,    40,    41,    42,    49,
       51,    52,    56,    60,    61,    63,    66,    67,    65,    64,

-      53,    43,    43,    43,    47,    82,     3,    47,    80,     3,
+      53,    43,    43,    43,    47,    84,     3,    47,    82,     3,

        4,     4,     3,    46,    43,     3,    43,     3,    46,     3,
        4,     4,     3,    46,    43,     3,    43,     3,    46,     3,

-      46,    43,     3,     3,     3,    44,    47,    83,    85,    86,
-       1,    48,    61,    74,    75,    76,    84,    47,    62,    53,
-      68,    53,    72,    73,    83,    73,    69,    85,    53,    54,
-      55,    70,    71,    85,    70,    82,     3,    81,     3,     3,
-       3,    52,    52,    49,    75,    87,    77,    82,    69,    72,
-       4,    86,    85,    71,    45,    78,    79,    86,    50,    52,
-      13,    14,    15,    43,    85,    79,    85,     4,    53
+      46,    43,     3,     3,     3,    44,    47,    85,    87,    88,
+       1,    48,    61,    76,    77,    78,    86,    47,    62,    53,
+      68,    53,    74,    75,    85,    75,    71,    87,    53,    54,
+      55,    72,    73,    87,    72,    84,     3,    83,     3,     3,
+       3,    52,    52,    49,    77,    89,    79,    84,    69,    70,
+      87,    74,     4,    88,    87,    73,    45,    80,    81,    70,
+       4,    88,    50,    52,    13,    14,    15,    43,    87,    81,
+      87,     4,    53

 };
 
 #define yyerrok                (yyerrstatus = 0)
 };
 
 #define yyerrok                (yyerrstatus = 0)


@@ -1020,147 +1029,147 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     {
       case 3: /* "\"string\"" */
 
     {
       case 3: /* "\"string\"" */
 

-/* Line 22 of yacc.c  */
-#line 182 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 180 "parse-gram.y"

        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 
        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 

-/* Line 22 of yacc.c  */
-#line 1029 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1038 "parse-gram.c"

        break;
       case 4: /* "\"integer\"" */
 
        break;
       case 4: /* "\"integer\"" */
 

-/* Line 22 of yacc.c  */
-#line 193 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 191 "parse-gram.y"

        { fprintf (stderr, "%d", (yyvaluep->integer)); };
 
        { fprintf (stderr, "%d", (yyvaluep->integer)); };
 

-/* Line 22 of yacc.c  */
-#line 1038 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1047 "parse-gram.c"

        break;
       case 43: /* "\"{...}\"" */
 
        break;
       case 43: /* "\"{...}\"" */
 

-/* Line 22 of yacc.c  */
-#line 184 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 182 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 

-/* Line 22 of yacc.c  */
-#line 1047 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1056 "parse-gram.c"

        break;
       case 44: /* "\"char\"" */
 
        break;
       case 44: /* "\"char\"" */
 

-/* Line 22 of yacc.c  */
-#line 176 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 174 "parse-gram.y"

        { fputs (char_name ((yyvaluep->character)), stderr); };
 
        { fputs (char_name ((yyvaluep->character)), stderr); };
 

-/* Line 22 of yacc.c  */
-#line 1056 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1065 "parse-gram.c"

        break;
       case 45: /* "\"epilogue\"" */
 
        break;
       case 45: /* "\"epilogue\"" */
 

-/* Line 22 of yacc.c  */
-#line 184 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 182 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 22 of yacc.c  */
-#line 1065 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1074 "parse-gram.c"

        break;
       case 47: /* "\"identifier\"" */
 
        break;
       case 47: /* "\"identifier\"" */
 

-/* Line 22 of yacc.c  */
-#line 189 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 187 "parse-gram.y"

        { fputs ((yyvaluep->uniqstr), stderr); };
 
        { fputs ((yyvaluep->uniqstr), stderr); };
 

-/* Line 22 of yacc.c  */
-#line 1074 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1083 "parse-gram.c"

        break;
       case 48: /* "\"identifier:\"" */
 
        break;
       case 48: /* "\"identifier:\"" */
 

-/* Line 22 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 188 "parse-gram.y"

        { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 
        { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 

-/* Line 22 of yacc.c  */
-#line 1083 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1092 "parse-gram.c"

        break;
       case 51: /* "\"%{...%}\"" */
 
        break;
       case 51: /* "\"%{...%}\"" */
 

-/* Line 22 of yacc.c  */
-#line 184 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 182 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 22 of yacc.c  */
-#line 1092 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1101 "parse-gram.c"

        break;
       case 53: /* "\"type\"" */
 
        break;
       case 53: /* "\"type\"" */
 

-/* Line 22 of yacc.c  */
-#line 188 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 186 "parse-gram.y"

        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
 
        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
 

-/* Line 22 of yacc.c  */
-#line 1101 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1110 "parse-gram.c"

        break;
        break;

-      case 80: /* "variable" */
+      case 82: /* "variable" */

 
 

-/* Line 22 of yacc.c  */
-#line 189 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 187 "parse-gram.y"

        { fputs ((yyvaluep->uniqstr), stderr); };
 
        { fputs ((yyvaluep->uniqstr), stderr); };
 

-/* Line 22 of yacc.c  */
-#line 1110 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1119 "parse-gram.c"

        break;
        break;

-      case 81: /* "content.opt" */
+      case 83: /* "content.opt" */

 
 

-/* Line 22 of yacc.c  */
-#line 184 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 182 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 22 of yacc.c  */
-#line 1119 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1128 "parse-gram.c"

        break;
        break;

-      case 82: /* "braceless" */
+      case 84: /* "braceless" */

 
 

-/* Line 22 of yacc.c  */
-#line 184 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 182 "parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 22 of yacc.c  */
-#line 1128 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1137 "parse-gram.c"

        break;
        break;

-      case 83: /* "id" */
+      case 85: /* "id" */

 
 

-/* Line 22 of yacc.c  */
-#line 196 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 194 "parse-gram.y"

        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 

-/* Line 22 of yacc.c  */
-#line 1137 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1146 "parse-gram.c"

        break;
        break;

-      case 84: /* "id_colon" */
+      case 86: /* "id_colon" */

 
 

-/* Line 22 of yacc.c  */
-#line 197 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 195 "parse-gram.y"

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

-/* Line 22 of yacc.c  */
-#line 1146 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1155 "parse-gram.c"

        break;
        break;

-      case 85: /* "symbol" */
+      case 87: /* "symbol" */

 
 

-/* Line 22 of yacc.c  */
-#line 196 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 194 "parse-gram.y"

        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 

-/* Line 22 of yacc.c  */
-#line 1155 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1164 "parse-gram.c"

        break;
        break;

-      case 86: /* "string_as_id" */
+      case 88: /* "string_as_id" */

 
 

-/* Line 22 of yacc.c  */
-#line 196 "parse-gram.y"
+/* Line 715 of yacc.c  */
+#line 194 "parse-gram.y"

        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 

-/* Line 22 of yacc.c  */
-#line 1164 "parse-gram.c"
+/* Line 715 of yacc.c  */
+#line 1173 "parse-gram.c"

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


@@ -1538,10 +1547,8 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
        break;
     }
 }
        break;
     }
 }

-\f

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

-

 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);


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

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

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


@@ -1587,95 +1593,103 @@ yyparse ()
 #endif
 #endif
 {
 #endif
 #endif
 {

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

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

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

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

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

-  YYSIZE_T yystacksize = YYINITDEPTH;
+    YYSIZE_T yystacksize;

 
 

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

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

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

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

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

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

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

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

-

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

+

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

+/* User initialization code.  */

 
 

-  /* User initialization code.  */
-  
-/* Line 22 of yacc.c  */
-#line 86 "parse-gram.y"
+/* Line 1248 of yacc.c  */
+#line 84 "parse-gram.y"

 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */


@@ -1683,9 +1697,10 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 

-/* Line 22 of yacc.c  */
-#line 1688 "parse-gram.c"
+/* Line 1248 of yacc.c  */
+#line 1702 "parse-gram.c"

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

+

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


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

+

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


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

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

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


@@ -1869,8 +1885,8 @@ yyreduce:
     {
         case 6:
 
     {
         case 6:
 

-/* Line 22 of yacc.c  */
-#line 220 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 218 "parse-gram.y"

     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));


@@ -1884,15 +1900,15 @@ yyreduce:
 
   case 7:
 
 
   case 7:
 

-/* Line 22 of yacc.c  */
-#line 229 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 227 "parse-gram.y"

     { debug_flag = true; }
     break;
 
   case 8:
 
     { debug_flag = true; }
     break;
 
   case 8:
 

-/* Line 22 of yacc.c  */
-#line 231 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 229 "parse-gram.y"

     {
       muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars));
     }
     {
       muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars));
     }


@@ -1900,15 +1916,15 @@ yyreduce:
 
   case 9:
 
 
   case 9:
 

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

     { defines_flag = true; }
     break;
 
   case 10:
 
     { defines_flag = true; }
     break;
 
   case 10:
 

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

     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));


@@ -1917,43 +1933,43 @@ yyreduce:
 
   case 11:
 
 
   case 11:
 

-/* Line 22 of yacc.c  */
-#line 240 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 238 "parse-gram.y"

     { error_verbose = true; }
     break;
 
   case 12:
 
     { error_verbose = true; }
     break;
 
   case 12:
 

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

     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 
     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 

-/* Line 22 of yacc.c  */
-#line 242 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 240 "parse-gram.y"

     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 
     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 

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

     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 
     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 

-/* Line 22 of yacc.c  */
-#line 244 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 242 "parse-gram.y"

     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 
     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 

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

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


@@ -1962,8 +1978,8 @@ yyreduce:
 
   case 17:
 
 
   case 17:
 

-/* Line 22 of yacc.c  */
-#line 251 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 249 "parse-gram.y"

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


@@ -1976,78 +1992,81 @@ yyreduce:
 
   case 18:
 
 
   case 18:
 

-/* Line 22 of yacc.c  */
-#line 259 "parse-gram.y"
-    { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
+/* Line 1455 of yacc.c  */
+#line 257 "parse-gram.y"
+    { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2036 "../../../src/parse-gram.c"

     break;
 
   case 19:
 
     break;
 
   case 19:
 

-/* Line 22 of yacc.c  */
-#line 260 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 258 "parse-gram.y"

     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 
     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 

-/* Line 22 of yacc.c  */
-#line 261 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 259 "parse-gram.y"

     { locations_flag = true; }
     break;
 
   case 21:
 
     { locations_flag = true; }
     break;
 
   case 21:
 

-/* Line 22 of yacc.c  */
-#line 262 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 260 "parse-gram.y"

     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 
     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 

-/* Line 22 of yacc.c  */
-#line 263 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 261 "parse-gram.y"

     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 
     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 

-/* Line 22 of yacc.c  */
-#line 264 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 262 "parse-gram.y"

     { no_lines_flag = true; }
     break;
 
   case 24:
 
     { no_lines_flag = true; }
     break;
 
   case 24:
 

-/* Line 22 of yacc.c  */
-#line 265 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 263 "parse-gram.y"

     { nondeterministic_parser = true; }
     break;
 
   case 25:
 
     { nondeterministic_parser = true; }
     break;
 
   case 25:
 

-/* Line 22 of yacc.c  */
-#line 266 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 264 "parse-gram.y"

     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 
     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 

-/* Line 22 of yacc.c  */
-#line 267 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 265 "parse-gram.y"

     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 
     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 

-/* Line 22 of yacc.c  */
-#line 268 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 266 "parse-gram.y"

     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 
     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 

-/* Line 22 of yacc.c  */
-#line 270 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 268 "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
     {
       /* %pure-parser is deprecated in favor of `%define api.pure', so use
          `%define api.pure' in a backward-compatible manner here.  First, don't


@@ -2064,15 +2083,15 @@ yyreduce:
 
   case 29:
 
 
   case 29:
 

-/* Line 22 of yacc.c  */
-#line 282 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 280 "parse-gram.y"

     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
   case 30:
 
     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
   case 30:
 

-/* Line 22 of yacc.c  */
-#line 284 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 282 "parse-gram.y"

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


@@ -2094,35 +2113,35 @@ yyreduce:
           skeleton_user = uniqstr_new (skeleton_build);
           free (skeleton_build);
         }
           skeleton_user = uniqstr_new (skeleton_build);
           free (skeleton_build);
         }

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

     }
     break;
 
   case 31:
 
     }
     break;
 
   case 31:
 

-/* Line 22 of yacc.c  */
-#line 307 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 305 "parse-gram.y"

     { token_table_flag = true; }
     break;
 
   case 32:
 
     { token_table_flag = true; }
     break;
 
   case 32:
 

-/* Line 22 of yacc.c  */
-#line 308 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 306 "parse-gram.y"

     { report_flag |= report_states; }
     break;
 
   case 33:
 
     { report_flag |= report_states; }
     break;
 
   case 33:
 

-/* Line 22 of yacc.c  */
-#line 309 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 307 "parse-gram.y"

     { yacc_flag = true; }
     break;
 
   case 37:
 
     { yacc_flag = true; }
     break;
 
   case 37:
 

-/* Line 22 of yacc.c  */
-#line 317 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 315 "parse-gram.y"

     {
       grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
     }
     {
       grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
     }


@@ -2130,8 +2149,8 @@ yyreduce:
 
   case 38:
 
 
   case 38:
 

-/* Line 22 of yacc.c  */
-#line 321 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 319 "parse-gram.y"

     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)


@@ -2142,8 +2161,8 @@ yyreduce:
 
   case 39:
 
 
   case 39:
 

-/* Line 22 of yacc.c  */
-#line 328 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 326 "parse-gram.y"

     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)


@@ -2154,8 +2173,8 @@ yyreduce:
 
   case 40:
 
 
   case 40:
 

-/* Line 22 of yacc.c  */
-#line 335 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 333 "parse-gram.y"

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


@@ -2163,8 +2182,8 @@ yyreduce:
 
   case 41:
 
 
   case 41:
 

-/* Line 22 of yacc.c  */
-#line 339 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 337 "parse-gram.y"

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


@@ -2172,8 +2191,8 @@ yyreduce:
 
   case 42:
 
 
   case 42:
 

-/* Line 22 of yacc.c  */
-#line 343 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 341 "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.  */


@@ -2184,8 +2203,8 @@ yyreduce:
 
   case 43:
 
 
   case 43:
 

-/* Line 22 of yacc.c  */
-#line 350 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 348 "parse-gram.y"

     {
       muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
       code_scanner_last_string_free ();
     {
       muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
       code_scanner_last_string_free ();


@@ -2194,22 +2213,22 @@ yyreduce:
 
   case 44:
 
 
   case 44:
 

-/* Line 22 of yacc.c  */
-#line 364 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 362 "parse-gram.y"

     {}
     break;
 
   case 45:
 
     {}
     break;
 
   case 45:
 

-/* Line 22 of yacc.c  */
-#line 365 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 363 "parse-gram.y"

     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 46:
 
     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 46:
 

-/* Line 22 of yacc.c  */
-#line 370 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 368 "parse-gram.y"

     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));


@@ -2219,15 +2238,15 @@ yyreduce:
 
   case 47:
 
 
   case 47:
 

-/* Line 22 of yacc.c  */
-#line 381 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 379 "parse-gram.y"

     { current_class = nterm_sym; }
     break;
 
   case 48:
 
     { current_class = nterm_sym; }
     break;
 
   case 48:
 

-/* Line 22 of yacc.c  */
-#line 382 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 380 "parse-gram.y"

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


@@ -2236,15 +2255,15 @@ yyreduce:
 
   case 49:
 
 
   case 49:
 

-/* Line 22 of yacc.c  */
-#line 386 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 384 "parse-gram.y"

     { current_class = token_sym; }
     break;
 
   case 50:
 
     { current_class = token_sym; }
     break;
 
   case 50:
 

-/* Line 22 of yacc.c  */
-#line 387 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 385 "parse-gram.y"

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


@@ -2253,8 +2272,8 @@ yyreduce:
 
   case 51:
 
 
   case 51:
 

-/* Line 22 of yacc.c  */
-#line 392 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 390 "parse-gram.y"

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


@@ -2266,8 +2285,8 @@ yyreduce:
 
   case 52:
 
 
   case 52:
 

-/* Line 22 of yacc.c  */
-#line 403 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 401 "parse-gram.y"

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


@@ -2283,119 +2302,147 @@ yyreduce:
 
   case 53:
 
 
   case 53:
 

-/* Line 22 of yacc.c  */
-#line 417 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 415 "parse-gram.y"

     { (yyval.assoc) = left_assoc; }
     break;
 
   case 54:
 
     { (yyval.assoc) = left_assoc; }
     break;
 
   case 54:
 

-/* Line 22 of yacc.c  */
-#line 418 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 416 "parse-gram.y"

     { (yyval.assoc) = right_assoc; }
     break;
 
   case 55:
 
     { (yyval.assoc) = right_assoc; }
     break;
 
   case 55:
 

-/* Line 22 of yacc.c  */
-#line 419 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 417 "parse-gram.y"

     { (yyval.assoc) = non_assoc; }
     break;
 
   case 56:
 
     { (yyval.assoc) = non_assoc; }
     break;
 
   case 56:
 

-/* Line 22 of yacc.c  */
-#line 423 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 421 "parse-gram.y"

     { current_type = NULL; }
     break;
 
   case 57:
 
     { current_type = NULL; }
     break;
 
   case 57:
 

-/* Line 22 of yacc.c  */
-#line 424 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 422 "parse-gram.y"

     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
   case 58:
 
     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
   case 58:
 

-/* Line 22 of yacc.c  */
-#line 430 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 428 "parse-gram.y"

     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 59:
 
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 59:
 

-/* Line 22 of yacc.c  */
-#line 432 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 430 "parse-gram.y"

     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 60:
 
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 60:
 

-/* Line 22 of yacc.c  */
-#line 436 "parse-gram.y"
-    { (yyval.list) = (yyvsp[(1) - (1)].list); }
+/* Line 1455 of yacc.c  */
+#line 434 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }

     break;
 
   case 61:
 
     break;
 
   case 61:
 

-/* Line 22 of yacc.c  */
-#line 437 "parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+/* Line 1455 of yacc.c  */
+#line 435 "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)])); }

     break;
 
   case 62:
 
     break;
 
   case 62:
 

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

 #line 441 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 63:
 
 #line 441 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 63:
 

-/* Line 22 of yacc.c  */
-#line 442 "parse-gram.y"
-    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1455 of yacc.c  */
+#line 443 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }

     break;
 
   case 64:
 
     break;
 
   case 64:
 

-/* Line 22 of yacc.c  */
-#line 443 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+/* Line 1455 of yacc.c  */
+#line 447 "parse-gram.y"
+    { (yyval.list) = (yyvsp[(1) - (1)].list); }

     break;
 
   case 65:
 
     break;
 
   case 65:
 

-/* Line 22 of yacc.c  */
-#line 444 "parse-gram.y"
-    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+/* Line 1455 of yacc.c  */
+#line 448 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }

     break;
 
   case 66:
 
     break;
 
   case 66:
 

-/* Line 22 of yacc.c  */
-#line 450 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 452 "parse-gram.y"
+    { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+    break;
+
+  case 67:
+
+/* Line 1455 of yacc.c  */
+#line 453 "parse-gram.y"
+    { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+    break;
+
+  case 68:
+
+/* Line 1455 of yacc.c  */
+#line 454 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+    break;
+
+  case 69:
+
+/* Line 1455 of yacc.c  */
+#line 455 "parse-gram.y"
+    { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+    break;
+
+  case 70:
+
+/* Line 1455 of yacc.c  */
+#line 461 "parse-gram.y"

     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
        tag_seen = true;
      }
     break;
 
     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
        tag_seen = true;
      }
     break;
 

-  case 67:
+  case 71:

 
 

-/* Line 22 of yacc.c  */
-#line 455 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 466 "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)]));
      }
     break;
 
     {
        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)]));
      }
     break;
 

-  case 68:
+  case 72:

 
 

-/* Line 22 of yacc.c  */
-#line 460 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 471 "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_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));


@@ -2403,10 +2450,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 69:
+  case 73:

 
 

-/* Line 22 of yacc.c  */
-#line 466 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 477 "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_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));


@@ -2414,10 +2461,10 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 70:
+  case 74:

 
 

-/* Line 22 of yacc.c  */
-#line 472 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 483 "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_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
       symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));


@@ -2426,98 +2473,98 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 77:
+  case 81:

 
 

-/* Line 22 of yacc.c  */
-#line 502 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 513 "parse-gram.y"

     {
       yyerrok;
     }
     break;
 
     {
       yyerrok;
     }
     break;
 

-  case 78:
+  case 82:

 
 

-/* Line 22 of yacc.c  */
-#line 508 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 519 "parse-gram.y"

     { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
     break;
 
     { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
     break;
 

-  case 80:
+  case 84:

 
 

-/* Line 22 of yacc.c  */
-#line 512 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 523 "parse-gram.y"

     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 
     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 

-  case 81:
+  case 85:

 
 

-/* Line 22 of yacc.c  */
-#line 513 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 524 "parse-gram.y"

     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 
     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 

-  case 83:
+  case 87:

 
 

-/* Line 22 of yacc.c  */
-#line 519 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 530 "parse-gram.y"

     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     break;
 
     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     break;
 

-  case 84:
+  case 88:

 
 

-/* Line 22 of yacc.c  */
-#line 521 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 532 "parse-gram.y"

     { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
     break;
 
     { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
     break;
 

-  case 85:
+  case 89:

 
 

-/* Line 22 of yacc.c  */
-#line 523 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 534 "parse-gram.y"

     { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
     { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 

-  case 86:
+  case 90:

 
 

-/* Line 22 of yacc.c  */
-#line 525 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 536 "parse-gram.y"

     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 

-  case 87:
+  case 91:

 
 

-/* Line 22 of yacc.c  */
-#line 527 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 538 "parse-gram.y"

     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 

-  case 88:
+  case 92:

 
 

-/* Line 22 of yacc.c  */
-#line 529 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 540 "parse-gram.y"

     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 
     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 

-  case 90:
+  case 94:

 
 

-/* Line 22 of yacc.c  */
-#line 539 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 550 "parse-gram.y"

     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 

-  case 91:
+  case 95:

 
 

-/* Line 22 of yacc.c  */
-#line 545 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 556 "parse-gram.y"

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

-  case 93:
+  case 97:

 
 

-/* Line 22 of yacc.c  */
-#line 558 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 569 "parse-gram.y"

     {
       code_props plain_code;
       (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
     {
       code_props plain_code;
       (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';


@@ -2528,17 +2575,17 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 94:
+  case 98:

 
 

-/* Line 22 of yacc.c  */
-#line 578 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 589 "parse-gram.y"

     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 

-  case 95:
+  case 99:

 
 

-/* Line 22 of yacc.c  */
-#line 580 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 591 "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);
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);


@@ -2546,27 +2593,27 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 96:
+  case 100:

 
 

-/* Line 22 of yacc.c  */
-#line 588 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 599 "parse-gram.y"

     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 

-  case 99:
+  case 103:

 
 

-/* Line 22 of yacc.c  */
-#line 600 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 611 "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);
     }
     break;
 
     {
       (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);
     }
     break;
 

-  case 101:
+  case 105:

 
 

-/* Line 22 of yacc.c  */
-#line 609 "parse-gram.y"
+/* Line 1455 of yacc.c  */
+#line 620 "parse-gram.y"

     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));


@@ -2579,8 +2626,8 @@ yyreduce:
 
 
 
 
 
 

-/* Line 22 of yacc.c  */
-#line 2584 "parse-gram.c"
+/* Line 1455 of yacc.c  */
+#line 2628 "parse-gram.c"

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


@@ -2798,8 +2845,8 @@ yyreturn:
 
 
 
 
 
 

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