regen

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index a02e68b669a2a290c415a8c223a3878c48330951..c2711ac37ece1d9e174bd9268636820bb384de8d 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.6.4.15-c3a5a-dirty.  */
+/* A Bison parser, made by GNU Bison 2.6.4.37-63951.  */
 
 /* Bison implementation for Yacc-like parsers in C
    
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.6.4.15-c3a5a-dirty"
+#define YYBISON_VERSION "2.6.4.37-63951"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -72,7 +72,7 @@
 #define yylloc          gram_lloc
 
 /* Copy the first part of user declarations.  */
-/* Line 359 of yacc.c  */
+/* Line 360 of yacc.c  */
 #line 1 "parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
@@ -168,7 +168,7 @@ current_lhs(symbol *sym, location loc, named_ref *ref)
 #define YYTYPE_UINT16 uint_fast16_t
 #define YYTYPE_UINT8 uint_fast8_t
 
-/* Line 359 of yacc.c  */
+/* Line 360 of yacc.c  */
 #line 173 "parse-gram.c"
 
 # ifndef YY_NULL
@@ -334,7 +334,7 @@ extern int gram_debug;
 #if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED
 typedef union GRAM_STYPE
 {
-/* Line 375 of yacc.c  */
+/* Line 376 of yacc.c  */
 #line 115 "parse-gram.y"
 
   symbol *symbol;
@@ -348,7 +348,7 @@ typedef union GRAM_STYPE
   named_ref *named_ref;
 
 
-/* Line 375 of yacc.c  */
+/* Line 376 of yacc.c  */
 #line 353 "parse-gram.c"
 } GRAM_STYPE;
 # define GRAM_STYPE_IS_TRIVIAL 1
@@ -388,7 +388,7 @@ int gram_parse ();
 
 /* Copy the second part of user declarations.  */
 
-/* Line 378 of yacc.c  */
+/* Line 379 of yacc.c  */
 #line 393 "parse-gram.c"
 
 #ifdef short
@@ -966,7 +966,7 @@ do                                                              \
     }                                                          \
 while (YYID (0))
 
-
+/* Error token number */
 #define YYTERROR       1
 #define YYERRCODE      256
 
@@ -997,16 +997,21 @@ while (YYID (0))
 
 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
 
+
 /* YY_LOCATION_PRINT -- Print the location on the stream.
    This macro was not mandated originally: define only if we know
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
 # if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)                 \
-     fprintf (File, "%d.%d-%d.%d",                     \
-             (Loc).first_line, (Loc).first_column,     \
-             (Loc).last_line,  (Loc).last_column)
+#  define YY_LOCATION_PRINT(File, Loc)                                   \
+  do {                                                                   \
+    fprintf (File, "%d.%d", (Loc).first_line, (Loc).first_column);       \
+    if ((Loc).first_line < (Loc).last_line)                              \
+      fprintf (File, "-%d.%d", (Loc).last_line,  (Loc).last_column - 1); \
+    else if ((Loc).first_column < (Loc).last_column - 1)                 \
+      fprintf (File, "-%d", (Loc).last_column - 1);                      \
+  } while (0)
 # else
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 # endif
@@ -1078,130 +1083,130 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
   switch (yytype)
     {
       case 3: /* "string" */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 205 "parse-gram.y"
        { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); };
-/* Line 829 of yacc.c  */
-#line 1086 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1091 "parse-gram.c"
        break;
       case 4: /* "integer" */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 217 "parse-gram.y"
        { fprintf (stderr, "%d", ((*yyvaluep).integer)); };
-/* Line 829 of yacc.c  */
-#line 1093 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1098 "parse-gram.c"
        break;
       case 43: /* "{...}" */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 207 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); };
-/* Line 829 of yacc.c  */
-#line 1100 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1105 "parse-gram.c"
        break;
       case 44: /* "[identifier]" */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 212 "parse-gram.y"
        { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); };
-/* Line 829 of yacc.c  */
-#line 1107 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1112 "parse-gram.c"
        break;
       case 45: /* "char" */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 199 "parse-gram.y"
        { fputs (char_name (((*yyvaluep).character)), stderr); };
-/* Line 829 of yacc.c  */
-#line 1114 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1119 "parse-gram.c"
        break;
       case 46: /* "epilogue" */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 207 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
-/* Line 829 of yacc.c  */
-#line 1121 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1126 "parse-gram.c"
        break;
       case 48: /* "identifier" */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 211 "parse-gram.y"
        { fputs (((*yyvaluep).uniqstr), stderr); };
-/* Line 829 of yacc.c  */
-#line 1128 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1133 "parse-gram.c"
        break;
       case 49: /* "identifier:" */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 213 "parse-gram.y"
        { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); };
-/* Line 829 of yacc.c  */
-#line 1135 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1140 "parse-gram.c"
        break;
       case 52: /* "%{...%}" */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 207 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
-/* Line 829 of yacc.c  */
-#line 1142 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1147 "parse-gram.c"
        break;
       case 54: /* "type" */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 214 "parse-gram.y"
        { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); };
-/* Line 829 of yacc.c  */
-#line 1149 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1154 "parse-gram.c"
        break;
       case 71: /* symbol.prec */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 220 "parse-gram.y"
        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
-/* Line 829 of yacc.c  */
-#line 1156 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1161 "parse-gram.c"
        break;
       case 84: /* variable */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 211 "parse-gram.y"
        { fputs (((*yyvaluep).uniqstr), stderr); };
-/* Line 829 of yacc.c  */
-#line 1163 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1168 "parse-gram.c"
        break;
       case 85: /* content.opt */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 207 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
-/* Line 829 of yacc.c  */
-#line 1170 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1175 "parse-gram.c"
        break;
       case 86: /* braceless */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 207 "parse-gram.y"
        { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); };
-/* Line 829 of yacc.c  */
-#line 1177 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1182 "parse-gram.c"
        break;
       case 87: /* id */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 220 "parse-gram.y"
        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
-/* Line 829 of yacc.c  */
-#line 1184 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1189 "parse-gram.c"
        break;
       case 88: /* id_colon */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 221 "parse-gram.y"
        { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); };
-/* Line 829 of yacc.c  */
-#line 1191 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1196 "parse-gram.c"
        break;
       case 89: /* symbol */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 220 "parse-gram.y"
        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
-/* Line 829 of yacc.c  */
-#line 1198 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1203 "parse-gram.c"
        break;
       case 90: /* string_as_id */
-/* Line 829 of yacc.c  */
+/* Line 812 of yacc.c  */
 #line 220 "parse-gram.y"
        { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); };
-/* Line 829 of yacc.c  */
-#line 1205 "parse-gram.c"
+/* Line 812 of yacc.c  */
+#line 1210 "parse-gram.c"
        break;
       default:
        break;
@@ -1881,6 +1886,7 @@ int yychar;
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
 # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
     _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END \
     _Pragma ("GCC diagnostic pop")
@@ -1888,11 +1894,6 @@ int yychar;
 /* Default value used for initialization, for pacifying older GCCs
    or non-GCC compilers.  */
 static YYSTYPE yyval_default;
-static YYLTYPE yyloc_default
-# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL
-  = { 1, 1, 1, 1 }
-# endif
-  ;
 # define YY_INITIAL_VALUE(Value) = Value
 #endif
 #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
@@ -1907,7 +1908,12 @@ static YYLTYPE yyloc_default
 YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
 
 /* Location data for the lookahead symbol.  */
-YYLTYPE yylloc YY_INITIAL_VALUE(yyloc_default);
+YYLTYPE yylloc
+# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL
+  = { 1, 1, 1, 1 }
+# endif
+;
+
 
     /* Number of syntax errors so far.  */
     int yynerrs;
@@ -1971,9 +1977,9 @@ YYLTYPE yylloc YY_INITIAL_VALUE(yyloc_default);
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yyls = yylsa;
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yylsp = yyls = yylsa;
   yystacksize = YYINITDEPTH;
 
   yyes = yyesa;
@@ -1988,16 +1994,8 @@ YYLTYPE yylloc YY_INITIAL_VALUE(yyloc_default);
   yynerrs = 0;
   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.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
-  yylsp = yyls;
-
 /* User initialization code.  */
-/* Line 1585 of yacc.c  */
+/* Line 1560 of yacc.c  */
 #line 107 "parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
@@ -2005,8 +2003,8 @@ YYLTYPE yylloc YY_INITIAL_VALUE(yyloc_default);
   boundary_set (&yylloc.start, current_file, 1, 1);
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
-/* Line 1585 of yacc.c  */
-#line 2010 "parse-gram.c"
+/* Line 1560 of yacc.c  */
+#line 2008 "parse-gram.c"
   yylsp[0] = yylloc;
   goto yysetstate;
 
@@ -2200,7 +2198,7 @@ yyreduce:
     switch (yyn)
       {
           case 6:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 246 "parse-gram.y"
     {
       code_props plain_code;
@@ -2214,13 +2212,13 @@ yyreduce:
     break;
 
   case 7:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 255 "parse-gram.y"
     { debug = true; }
     break;
 
   case 8:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 257 "parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars),
@@ -2229,13 +2227,13 @@ yyreduce:
     break;
 
   case 9:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 261 "parse-gram.y"
     { defines_flag = true; }
     break;
 
   case 10:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 263 "parse-gram.y"
     {
       defines_flag = true;
@@ -2244,37 +2242,37 @@ yyreduce:
     break;
 
   case 11:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 267 "parse-gram.y"
     { error_verbose = true; }
     break;
 
   case 12:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 268 "parse-gram.y"
     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 269 "parse-gram.y"
     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 270 "parse-gram.y"
     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 271 "parse-gram.y"
     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 273 "parse-gram.y"
     {
       nondeterministic_parser = true;
@@ -2283,7 +2281,7 @@ yyreduce:
     break;
 
   case 17:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 278 "parse-gram.y"
     {
       code_props action;
@@ -2296,67 +2294,67 @@ yyreduce:
     break;
 
   case 18:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 286 "parse-gram.y"
     { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
     break;
 
   case 19:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 287 "parse-gram.y"
     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 288 "parse-gram.y"
     { locations_flag = true; }
     break;
 
   case 21:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 289 "parse-gram.y"
     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 290 "parse-gram.y"
     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 291 "parse-gram.y"
     { no_lines_flag = true; }
     break;
 
   case 24:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 292 "parse-gram.y"
     { nondeterministic_parser = true; }
     break;
 
   case 25:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 293 "parse-gram.y"
     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 294 "parse-gram.y"
     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 295 "parse-gram.y"
     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 297 "parse-gram.y"
     {
       /* %pure-parser is deprecated in favor of `%define api.pure', so use
@@ -2375,13 +2373,13 @@ yyreduce:
     break;
 
   case 29:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 311 "parse-gram.y"
     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
   case 30:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 313 "parse-gram.y"
     {
       char const *skeleton_user = (yyvsp[(2) - (2)].chars);
@@ -2409,25 +2407,25 @@ yyreduce:
     break;
 
   case 31:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 336 "parse-gram.y"
     { token_table_flag = true; }
     break;
 
   case 32:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 337 "parse-gram.y"
     { report_flag |= report_states; }
     break;
 
   case 33:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 338 "parse-gram.y"
     { yacc_flag = true; }
     break;
 
   case 37:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 346 "parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
@@ -2435,7 +2433,7 @@ yyreduce:
     break;
 
   case 38:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 350 "parse-gram.y"
     {
       code_props code;
@@ -2451,7 +2449,7 @@ yyreduce:
     break;
 
   case 39:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 362 "parse-gram.y"
     {
       code_props code;
@@ -2467,7 +2465,7 @@ yyreduce:
     break;
 
   case 40:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 374 "parse-gram.y"
     {
       default_prec = true;
@@ -2475,7 +2473,7 @@ yyreduce:
     break;
 
   case 41:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 378 "parse-gram.y"
     {
       default_prec = false;
@@ -2483,7 +2481,7 @@ yyreduce:
     break;
 
   case 42:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 382 "parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
@@ -2494,7 +2492,7 @@ yyreduce:
     break;
 
   case 43:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 389 "parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
@@ -2503,19 +2501,19 @@ yyreduce:
     break;
 
   case 44:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 403 "parse-gram.y"
     {}
     break;
 
   case 45:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 404 "parse-gram.y"
     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 46:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 409 "parse-gram.y"
     {
       union_seen = true;
@@ -2525,13 +2523,13 @@ yyreduce:
     break;
 
   case 47:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 420 "parse-gram.y"
     { current_class = nterm_sym; }
     break;
 
   case 48:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 421 "parse-gram.y"
     {
       current_class = unknown_sym;
@@ -2540,13 +2538,13 @@ yyreduce:
     break;
 
   case 49:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 425 "parse-gram.y"
     { current_class = token_sym; }
     break;
 
   case 50:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 426 "parse-gram.y"
     {
       current_class = unknown_sym;
@@ -2555,7 +2553,7 @@ yyreduce:
     break;
 
   case 51:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 431 "parse-gram.y"
     {
       symbol_list *list;
@@ -2567,7 +2565,7 @@ yyreduce:
     break;
 
   case 52:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 442 "parse-gram.y"
     {
       symbol_list *list;
@@ -2583,109 +2581,109 @@ yyreduce:
     break;
 
   case 53:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 456 "parse-gram.y"
     { (yyval.assoc) = left_assoc; }
     break;
 
   case 54:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 457 "parse-gram.y"
     { (yyval.assoc) = right_assoc; }
     break;
 
   case 55:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 458 "parse-gram.y"
     { (yyval.assoc) = non_assoc; }
     break;
 
   case 56:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 462 "parse-gram.y"
     { current_type = NULL; }
     break;
 
   case 57:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 463 "parse-gram.y"
     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
   case 58:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 469 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 59:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 471 "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 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 475 "parse-gram.y"
     { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
     break;
 
   case 61:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 476 "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 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 482 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 63:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 484 "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 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 488 "parse-gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); }
     break;
 
   case 65:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 489 "parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
     break;
 
   case 66:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 493 "parse-gram.y"
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 67:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 494 "parse-gram.y"
     { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 68:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 495 "parse-gram.y"
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
     break;
 
   case 69:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 496 "parse-gram.y"
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
     break;
 
   case 70:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 502 "parse-gram.y"
     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
@@ -2694,7 +2692,7 @@ yyreduce:
     break;
 
   case 71:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 507 "parse-gram.y"
     {
        symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
@@ -2703,7 +2701,7 @@ yyreduce:
     break;
 
   case 72:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 512 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
@@ -2713,7 +2711,7 @@ yyreduce:
     break;
 
   case 73:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 518 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
@@ -2723,7 +2721,7 @@ yyreduce:
     break;
 
   case 74:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 524 "parse-gram.y"
     {
       symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
@@ -2734,7 +2732,7 @@ yyreduce:
     break;
 
   case 81:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 554 "parse-gram.y"
     {
       yyerrok;
@@ -2742,13 +2740,13 @@ yyreduce:
     break;
 
   case 82:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 560 "parse-gram.y"
     { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); }
     break;
 
   case 83:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 561 "parse-gram.y"
     {
     /* Free the current lhs. */
@@ -2757,86 +2755,86 @@ yyreduce:
     break;
 
   case 84:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 568 "parse-gram.y"
     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 
   case 85:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 569 "parse-gram.y"
     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 
   case 87:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 575 "parse-gram.y"
     { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
                                  current_lhs_named_ref); }
     break;
 
   case 88:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 578 "parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
     break;
 
   case 89:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 580 "parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
     break;
 
   case 90:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 582 "parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
   case 91:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 584 "parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
   case 92:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 586 "parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 
   case 93:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 590 "parse-gram.y"
     { (yyval.named_ref) = 0; }
     break;
 
   case 94:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 592 "parse-gram.y"
     { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 96:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 604 "parse-gram.y"
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
     break;
 
   case 97:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 609 "parse-gram.y"
     { (yyval.chars) = ""; }
     break;
 
   case 98:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 610 "parse-gram.y"
     { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); }
     break;
 
   case 100:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 621 "parse-gram.y"
     {
       code_props plain_code;
@@ -2849,13 +2847,13 @@ yyreduce:
     break;
 
   case 101:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 641 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 102:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 643 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
@@ -2865,13 +2863,13 @@ yyreduce:
     break;
 
   case 103:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 651 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 106:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 663 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
@@ -2880,7 +2878,7 @@ yyreduce:
     break;
 
   case 108:
-/* Line 1802 of yacc.c  */
+/* Line 1778 of yacc.c  */
 #line 672 "parse-gram.y"
     {
       code_props plain_code;
@@ -2893,8 +2891,8 @@ yyreduce:
     break;
 
 
-/* Line 1802 of yacc.c  */
-#line 2898 "parse-gram.c"
+/* Line 1778 of yacc.c  */
+#line 2896 "parse-gram.c"
         default: break;
       }
     if (yychar_backup != yychar)
@@ -3144,7 +3142,7 @@ yyreturn:
 }
 
 
-/* Line 2065 of yacc.c  */
+/* Line 2041 of yacc.c  */
 #line 682 "parse-gram.y"