X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/72c5b9828e08091a2e3d567bbcd0b4004749f5f9..c76f5dfb03f6d2dbffe80e2d9438dfda74d84ebf:/src/parse-gram.c

diff --git a/src/parse-gram.c b/src/parse-gram.c
index e0a3e854..04a934ef 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.3b.  */
+/* A Bison parser, made by GNU Bison 2.4.1.61-f1ce.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 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
@@ -46,7 +45,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3b"
+#define YYBISON_VERSION "2.4.1.61-f1ce"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -79,8 +78,7 @@
 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-   Foundation, Inc.
+   Copyright (C) 2002-2010 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -100,8 +98,6 @@
 #include <config.h>
 #include "system.h"
 
-#include <strverscmp.h>
-
 #include "complain.h"
 #include "conflicts.h"
 #include "files.h"
@@ -153,7 +149,7 @@ static int current_prec = 0;
 
 
 /* Line 189 of yacc.c  */
-#line 157 "parse-gram.c"
+#line 153 "parse-gram.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -302,7 +298,7 @@ typedef union YYSTYPE
 {
 
 /* Line 214 of yacc.c  */
-#line 94 "parse-gram.y"
+#line 91 "parse-gram.y"
 
   symbol *symbol;
   symbol_list *list;
@@ -316,7 +312,7 @@ typedef union YYSTYPE
 
 
 /* Line 214 of yacc.c  */
-#line 320 "parse-gram.c"
+#line 316 "parse-gram.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -341,7 +337,7 @@ typedef struct YYLTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 345 "parse-gram.c"
+#line 341 "parse-gram.c"
 
 #ifdef short
 # undef short
@@ -391,7 +387,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -666,17 +662,17 @@ static const yytype_int8 yyrhs[] =
 /* 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,   442,   444,   449,   450,   454,   455,   456,   457,
-     462,   467,   472,   478,   484,   495,   496,   505,   506,   512,
-     513,   514,   521,   521,   525,   526,   527,   532,   533,   535,
-     537,   539,   541,   551,   552,   558,   561,   570,   590,   592,
-     601,   606,   607,   612,   619,   621
+       0,   201,   201,   209,   211,   215,   216,   226,   227,   231,
+     232,   237,   238,   239,   240,   241,   242,   247,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   266,   279,
+     280,   304,   305,   306,   307,   311,   312,   313,   317,   324,
+     331,   335,   339,   346,   361,   362,   366,   378,   378,   383,
+     383,   388,   399,   414,   415,   416,   420,   421,   426,   428,
+     433,   434,   439,   441,   446,   447,   451,   452,   453,   454,
+     459,   464,   469,   475,   481,   492,   493,   502,   503,   509,
+     510,   511,   518,   518,   522,   523,   524,   529,   530,   532,
+     534,   536,   538,   548,   549,   555,   558,   567,   587,   589,
+     598,   603,   604,   609,   616,   618
 };
 #endif
 
@@ -896,9 +892,18 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */
 
 #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
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -955,7 +960,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# 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,	\
@@ -1031,147 +1036,147 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     {
       case 3: /* "\"string\"" */
 
-/* Line 715 of yacc.c  */
-#line 182 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 179 "parse-gram.y"
 	{ fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 
-/* Line 715 of yacc.c  */
-#line 1040 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1045 "parse-gram.c"
 	break;
       case 4: /* "\"integer\"" */
 
-/* Line 715 of yacc.c  */
-#line 193 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 190 "parse-gram.y"
 	{ fprintf (stderr, "%d", (yyvaluep->integer)); };
 
-/* Line 715 of yacc.c  */
-#line 1049 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1054 "parse-gram.c"
 	break;
       case 43: /* "\"{...}\"" */
 
-/* Line 715 of yacc.c  */
-#line 184 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 181 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 
-/* Line 715 of yacc.c  */
-#line 1058 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1063 "parse-gram.c"
 	break;
       case 44: /* "\"char\"" */
 
-/* Line 715 of yacc.c  */
-#line 176 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 173 "parse-gram.y"
 	{ fputs (char_name ((yyvaluep->character)), stderr); };
 
-/* Line 715 of yacc.c  */
-#line 1067 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1072 "parse-gram.c"
 	break;
       case 45: /* "\"epilogue\"" */
 
-/* Line 715 of yacc.c  */
-#line 184 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 181 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
-/* Line 715 of yacc.c  */
-#line 1076 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1081 "parse-gram.c"
 	break;
       case 47: /* "\"identifier\"" */
 
-/* Line 715 of yacc.c  */
-#line 189 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 186 "parse-gram.y"
 	{ fputs ((yyvaluep->uniqstr), stderr); };
 
-/* Line 715 of yacc.c  */
-#line 1085 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1090 "parse-gram.c"
 	break;
       case 48: /* "\"identifier:\"" */
 
-/* Line 715 of yacc.c  */
-#line 190 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 187 "parse-gram.y"
 	{ fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 
-/* Line 715 of yacc.c  */
-#line 1094 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1099 "parse-gram.c"
 	break;
       case 51: /* "\"%{...%}\"" */
 
-/* Line 715 of yacc.c  */
-#line 184 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 181 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
-/* Line 715 of yacc.c  */
-#line 1103 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1108 "parse-gram.c"
 	break;
       case 53: /* "\"type\"" */
 
-/* Line 715 of yacc.c  */
-#line 188 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 185 "parse-gram.y"
 	{ fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
 
-/* Line 715 of yacc.c  */
-#line 1112 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1117 "parse-gram.c"
 	break;
       case 82: /* "variable" */
 
-/* Line 715 of yacc.c  */
-#line 189 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 186 "parse-gram.y"
 	{ fputs ((yyvaluep->uniqstr), stderr); };
 
-/* Line 715 of yacc.c  */
-#line 1121 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1126 "parse-gram.c"
 	break;
       case 83: /* "content.opt" */
 
-/* Line 715 of yacc.c  */
-#line 184 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 181 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
-/* Line 715 of yacc.c  */
-#line 1130 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1135 "parse-gram.c"
 	break;
       case 84: /* "braceless" */
 
-/* Line 715 of yacc.c  */
-#line 184 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 181 "parse-gram.y"
 	{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
-/* Line 715 of yacc.c  */
-#line 1139 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1144 "parse-gram.c"
 	break;
       case 85: /* "id" */
 
-/* Line 715 of yacc.c  */
-#line 196 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 193 "parse-gram.y"
 	{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
-/* Line 715 of yacc.c  */
-#line 1148 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1153 "parse-gram.c"
 	break;
       case 86: /* "id_colon" */
 
-/* Line 715 of yacc.c  */
-#line 197 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 194 "parse-gram.y"
 	{ fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
 
-/* Line 715 of yacc.c  */
-#line 1157 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1162 "parse-gram.c"
 	break;
       case 87: /* "symbol" */
 
-/* Line 715 of yacc.c  */
-#line 196 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 193 "parse-gram.y"
 	{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
-/* Line 715 of yacc.c  */
-#line 1166 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1171 "parse-gram.c"
 	break;
       case 88: /* "string_as_id" */
 
-/* Line 715 of yacc.c  */
-#line 196 "parse-gram.y"
+/* Line 724 of yacc.c  */
+#line 193 "parse-gram.y"
 	{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
-/* Line 715 of yacc.c  */
-#line 1175 "parse-gram.c"
+/* Line 724 of yacc.c  */
+#line 1180 "parse-gram.c"
 	break;
       default:
 	break;
@@ -1682,7 +1687,7 @@ YYLTYPE yylloc;
   yyvsp = yyvs;
   yylsp = yyls;
 
-#if YYLTYPE_IS_TRIVIAL
+#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
   /* Initialize the default location before parsing starts.  */
   yylloc.first_line   = yylloc.last_line   = 1;
   yylloc.first_column = yylloc.last_column = 1;
@@ -1690,8 +1695,8 @@ YYLTYPE yylloc;
 
 /* User initialization code.  */
 
-/* Line 1242 of yacc.c  */
-#line 86 "parse-gram.y"
+/* Line 1251 of yacc.c  */
+#line 83 "parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
@@ -1699,8 +1704,8 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 
-/* Line 1242 of yacc.c  */
-#line 1704 "parse-gram.c"
+/* Line 1251 of yacc.c  */
+#line 1709 "parse-gram.c"
   yylsp[0] = yylloc;
 
   goto yysetstate;
@@ -1887,8 +1892,8 @@ yyreduce:
     {
         case 6:
 
-/* Line 1455 of yacc.c  */
-#line 220 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 217 "parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
@@ -1902,15 +1907,15 @@ yyreduce:
 
   case 7:
 
-/* Line 1455 of yacc.c  */
-#line 229 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 226 "parse-gram.y"
     { debug_flag = true; }
     break;
 
   case 8:
 
-/* Line 1455 of yacc.c  */
-#line 231 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 228 "parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars));
     }
@@ -1918,15 +1923,15 @@ yyreduce:
 
   case 9:
 
-/* Line 1455 of yacc.c  */
-#line 234 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 231 "parse-gram.y"
     { defines_flag = true; }
     break;
 
   case 10:
 
-/* Line 1455 of yacc.c  */
-#line 236 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 233 "parse-gram.y"
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
@@ -1935,43 +1940,43 @@ yyreduce:
 
   case 11:
 
-/* Line 1455 of yacc.c  */
-#line 240 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 237 "parse-gram.y"
     { error_verbose = true; }
     break;
 
   case 12:
 
-/* Line 1455 of yacc.c  */
-#line 241 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 238 "parse-gram.y"
     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 
-/* Line 1455 of yacc.c  */
-#line 242 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 239 "parse-gram.y"
     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 
-/* Line 1455 of yacc.c  */
-#line 243 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 240 "parse-gram.y"
     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 
-/* Line 1455 of yacc.c  */
-#line 244 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 241 "parse-gram.y"
     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 
-/* Line 1455 of yacc.c  */
-#line 246 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 243 "parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
@@ -1980,8 +1985,8 @@ yyreduce:
 
   case 17:
 
-/* Line 1455 of yacc.c  */
-#line 251 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 248 "parse-gram.y"
     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
@@ -1994,78 +1999,78 @@ yyreduce:
 
   case 18:
 
-/* Line 1455 of yacc.c  */
-#line 259 "parse-gram.y"
-    { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
+/* Line 1464 of yacc.c  */
+#line 256 "parse-gram.y"
+    { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, &(yylsp[(1) - (2)])); }
     break;
 
   case 19:
 
-/* Line 1455 of yacc.c  */
-#line 260 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 257 "parse-gram.y"
     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 
-/* Line 1455 of yacc.c  */
-#line 261 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 258 "parse-gram.y"
     { locations_flag = true; }
     break;
 
   case 21:
 
-/* Line 1455 of yacc.c  */
-#line 262 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 259 "parse-gram.y"
     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 
-/* Line 1455 of yacc.c  */
-#line 263 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 260 "parse-gram.y"
     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 
-/* Line 1455 of yacc.c  */
-#line 264 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 261 "parse-gram.y"
     { no_lines_flag = true; }
     break;
 
   case 24:
 
-/* Line 1455 of yacc.c  */
-#line 265 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 262 "parse-gram.y"
     { nondeterministic_parser = true; }
     break;
 
   case 25:
 
-/* Line 1455 of yacc.c  */
-#line 266 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 263 "parse-gram.y"
     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 
-/* Line 1455 of yacc.c  */
-#line 267 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 264 "parse-gram.y"
     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 
-/* Line 1455 of yacc.c  */
-#line 268 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 265 "parse-gram.y"
     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 
-/* Line 1455 of yacc.c  */
-#line 270 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 267 "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
@@ -2082,15 +2087,15 @@ yyreduce:
 
   case 29:
 
-/* Line 1455 of yacc.c  */
-#line 282 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 279 "parse-gram.y"
     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
   case 30:
 
-/* Line 1455 of yacc.c  */
-#line 284 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 281 "parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[(2) - (2)].chars);
       if (strchr (skeleton_user, '/'))
@@ -2112,35 +2117,35 @@ yyreduce:
           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:
 
-/* Line 1455 of yacc.c  */
-#line 307 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 304 "parse-gram.y"
     { token_table_flag = true; }
     break;
 
   case 32:
 
-/* Line 1455 of yacc.c  */
-#line 308 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 305 "parse-gram.y"
     { report_flag |= report_states; }
     break;
 
   case 33:
 
-/* Line 1455 of yacc.c  */
-#line 309 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 306 "parse-gram.y"
     { yacc_flag = true; }
     break;
 
   case 37:
 
-/* Line 1455 of yacc.c  */
-#line 317 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 314 "parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
     }
@@ -2148,8 +2153,8 @@ yyreduce:
 
   case 38:
 
-/* Line 1455 of yacc.c  */
-#line 321 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 318 "parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
@@ -2160,8 +2165,8 @@ yyreduce:
 
   case 39:
 
-/* Line 1455 of yacc.c  */
-#line 328 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 325 "parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
@@ -2172,8 +2177,8 @@ yyreduce:
 
   case 40:
 
-/* Line 1455 of yacc.c  */
-#line 335 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 332 "parse-gram.y"
     {
       default_prec = true;
     }
@@ -2181,8 +2186,8 @@ yyreduce:
 
   case 41:
 
-/* Line 1455 of yacc.c  */
-#line 339 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 336 "parse-gram.y"
     {
       default_prec = false;
     }
@@ -2190,8 +2195,8 @@ yyreduce:
 
   case 42:
 
-/* Line 1455 of yacc.c  */
-#line 343 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 340 "parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
@@ -2202,8 +2207,8 @@ yyreduce:
 
   case 43:
 
-/* Line 1455 of yacc.c  */
-#line 350 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 347 "parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
       code_scanner_last_string_free ();
@@ -2212,22 +2217,22 @@ yyreduce:
 
   case 44:
 
-/* Line 1455 of yacc.c  */
-#line 364 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 361 "parse-gram.y"
     {}
     break;
 
   case 45:
 
-/* Line 1455 of yacc.c  */
-#line 365 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 362 "parse-gram.y"
     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 46:
 
-/* Line 1455 of yacc.c  */
-#line 370 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 367 "parse-gram.y"
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
@@ -2237,15 +2242,15 @@ yyreduce:
 
   case 47:
 
-/* Line 1455 of yacc.c  */
-#line 381 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 378 "parse-gram.y"
     { current_class = nterm_sym; }
     break;
 
   case 48:
 
-/* Line 1455 of yacc.c  */
-#line 382 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 379 "parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
@@ -2254,15 +2259,15 @@ yyreduce:
 
   case 49:
 
-/* Line 1455 of yacc.c  */
-#line 386 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 383 "parse-gram.y"
     { current_class = token_sym; }
     break;
 
   case 50:
 
-/* Line 1455 of yacc.c  */
-#line 387 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 384 "parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
@@ -2271,8 +2276,8 @@ yyreduce:
 
   case 51:
 
-/* Line 1455 of yacc.c  */
-#line 392 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 389 "parse-gram.y"
     {
       symbol_list *list;
       tag_seen = true;
@@ -2284,8 +2289,8 @@ yyreduce:
 
   case 52:
 
-/* Line 1455 of yacc.c  */
-#line 403 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 400 "parse-gram.y"
     {
       symbol_list *list;
       ++current_prec;
@@ -2301,127 +2306,127 @@ yyreduce:
 
   case 53:
 
-/* Line 1455 of yacc.c  */
-#line 417 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 414 "parse-gram.y"
     { (yyval.assoc) = left_assoc; }
     break;
 
   case 54:
 
-/* Line 1455 of yacc.c  */
-#line 418 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 415 "parse-gram.y"
     { (yyval.assoc) = right_assoc; }
     break;
 
   case 55:
 
-/* Line 1455 of yacc.c  */
-#line 419 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 416 "parse-gram.y"
     { (yyval.assoc) = non_assoc; }
     break;
 
   case 56:
 
-/* Line 1455 of yacc.c  */
-#line 423 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 420 "parse-gram.y"
     { current_type = NULL; }
     break;
 
   case 57:
 
-/* Line 1455 of yacc.c  */
-#line 424 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 421 "parse-gram.y"
     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
   case 58:
 
-/* Line 1455 of yacc.c  */
-#line 430 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 427 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 59:
 
-/* Line 1455 of yacc.c  */
-#line 432 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 429 "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:
 
-/* Line 1455 of yacc.c  */
-#line 436 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 433 "parse-gram.y"
     { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
     break;
 
   case 61:
 
-/* Line 1455 of yacc.c  */
-#line 437 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 434 "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:
 
-/* Line 1455 of yacc.c  */
-#line 443 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 440 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 63:
 
-/* Line 1455 of yacc.c  */
-#line 445 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 442 "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:
 
-/* Line 1455 of yacc.c  */
-#line 449 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 446 "parse-gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); }
     break;
 
   case 65:
 
-/* Line 1455 of yacc.c  */
-#line 450 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 447 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
     break;
 
   case 66:
 
-/* Line 1455 of yacc.c  */
-#line 454 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 451 "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 455 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 452 "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 456 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 453 "parse-gram.y"
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
     break;
 
   case 69:
 
-/* Line 1455 of yacc.c  */
-#line 457 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 454 "parse-gram.y"
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
     break;
 
   case 70:
 
-/* Line 1455 of yacc.c  */
-#line 463 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 460 "parse-gram.y"
     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
        tag_seen = true;
@@ -2430,8 +2435,8 @@ yyreduce:
 
   case 71:
 
-/* Line 1455 of yacc.c  */
-#line 468 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 465 "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)]));
@@ -2440,8 +2445,8 @@ yyreduce:
 
   case 72:
 
-/* Line 1455 of yacc.c  */
-#line 473 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 470 "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)]));
@@ -2451,8 +2456,8 @@ yyreduce:
 
   case 73:
 
-/* Line 1455 of yacc.c  */
-#line 479 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 476 "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)]));
@@ -2462,8 +2467,8 @@ yyreduce:
 
   case 74:
 
-/* Line 1455 of yacc.c  */
-#line 485 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 482 "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)]));
@@ -2474,8 +2479,8 @@ yyreduce:
 
   case 81:
 
-/* Line 1455 of yacc.c  */
-#line 515 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 512 "parse-gram.y"
     {
       yyerrok;
     }
@@ -2483,78 +2488,78 @@ yyreduce:
 
   case 82:
 
-/* Line 1455 of yacc.c  */
-#line 521 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 518 "parse-gram.y"
     { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
     break;
 
   case 84:
 
-/* Line 1455 of yacc.c  */
-#line 525 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 522 "parse-gram.y"
     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 
   case 85:
 
-/* Line 1455 of yacc.c  */
-#line 526 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 523 "parse-gram.y"
     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 
   case 87:
 
-/* Line 1455 of yacc.c  */
-#line 532 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 529 "parse-gram.y"
     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 88:
 
-/* Line 1455 of yacc.c  */
-#line 534 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 531 "parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
     break;
 
   case 89:
 
-/* Line 1455 of yacc.c  */
-#line 536 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 533 "parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 90:
 
-/* Line 1455 of yacc.c  */
-#line 538 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 535 "parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
   case 91:
 
-/* Line 1455 of yacc.c  */
-#line 540 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 537 "parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
   case 92:
 
-/* Line 1455 of yacc.c  */
-#line 542 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 539 "parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 
   case 94:
 
-/* Line 1455 of yacc.c  */
-#line 552 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 549 "parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 
   case 95:
 
-/* Line 1455 of yacc.c  */
-#line 558 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 555 "parse-gram.y"
     {
       (yyval.chars) = "";
     }
@@ -2562,8 +2567,8 @@ yyreduce:
 
   case 97:
 
-/* Line 1455 of yacc.c  */
-#line 571 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 568 "parse-gram.y"
     {
       code_props plain_code;
       (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
@@ -2576,15 +2581,15 @@ yyreduce:
 
   case 98:
 
-/* Line 1455 of yacc.c  */
-#line 591 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 588 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 99:
 
-/* Line 1455 of yacc.c  */
-#line 593 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 590 "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);
@@ -2594,15 +2599,15 @@ yyreduce:
 
   case 100:
 
-/* Line 1455 of yacc.c  */
-#line 601 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 598 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 103:
 
-/* Line 1455 of yacc.c  */
-#line 613 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 610 "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);
@@ -2611,8 +2616,8 @@ yyreduce:
 
   case 105:
 
-/* Line 1455 of yacc.c  */
-#line 622 "parse-gram.y"
+/* Line 1464 of yacc.c  */
+#line 619 "parse-gram.y"
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
@@ -2625,8 +2630,8 @@ yyreduce:
 
 
 
-/* Line 1455 of yacc.c  */
-#line 2630 "parse-gram.c"
+/* Line 1464 of yacc.c  */
+#line 2635 "parse-gram.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2844,8 +2849,8 @@ yyreturn:
 
 
 
-/* Line 1675 of yacc.c  */
-#line 632 "parse-gram.y"
+/* Line 1684 of yacc.c  */
+#line 629 "parse-gram.y"