From 1625df5b18bc1ad696f149f059e6677ca0759dfc Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Mon, 21 Dec 2009 14:51:40 -0500 Subject: [PATCH 1/1] YYFAIL: deprecate. * NEWS (2.4.2): Document deprecation and the phase-out plan. * data/lalr1.java (parser::YYStack::YYFAIL): Add comment about deprecation. * data/yacc.c (YYFAIL): Likewise, and suppress warnings about YYFAIL from GCC cpp's -Wunused-macros. * doc/bison.texinfo (Java Action Features): Remove YYFAIL documentation. (LocalWords): Remove YYFAIL. --- ChangeLog | 12 + NEWS | 39 +++ data/lalr1.java | 3 +- data/yacc.c | 11 +- doc/bison.texinfo | 7 +- src/parse-gram.c | 681 +++++++++++++++++++++++----------------------- src/parse-gram.h | 12 +- 7 files changed, 415 insertions(+), 350 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9845692..2c9f3beb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2009-12-21 Joel E. Denny + + YYFAIL: deprecate. + * NEWS (2.4.2): Document deprecation and the phase-out plan. + * data/lalr1.java (parser::YYStack::YYFAIL): Add comment about + deprecation. + * data/yacc.c (YYFAIL): Likewise, and suppress warnings about + YYFAIL from GCC cpp's -Wunused-macros. + * doc/bison.texinfo (Java Action Features): Remove YYFAIL + documentation. + (LocalWords): Remove YYFAIL. + 2009-12-20 Joel E. Denny tests: cleanup. diff --git a/NEWS b/NEWS index 92567dd8..5bd64cc1 100644 --- a/NEWS +++ b/NEWS @@ -243,6 +243,45 @@ Bison News Bison's Java feature as a whole including its current usage of %code is still considered experimental. +** YYFAIL is deprecated and will eventually be removed. + + YYFAIL has existed for many years as an undocumented feature of + deterministic parsers in C generated by Bison. Previously, it was + documented for Bison's experimental Java parsers. YYFAIL is no longer + documented for Java parsers and is formally deprecated in both cases. + Users are strongly encouraged to migrate to YYERROR, which is + specified by POSIX. + + Like YYERROR, you can invoke YYFAIL from a semantic action in order to + induce a syntax error. The most obvious difference from YYERROR is + that YYFAIL will automatically invoke yyerror to report the syntax + error so that you don't have to. However, there are several other + subtle differences between YYERROR and YYFAIL, and YYFAIL suffers from + inherent flaws when %error-verbose or `#define YYERROR_VERBOSE' is + used. For a more detailed discussion, see: + + http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html + + The upcoming Bison 2.5 will remove YYFAIL from Java parsers, but + deterministic parsers in C will continue to implement it. However, + because YYFAIL is already flawed, it seems futile to try to make new + Bison features compatible with it. Thus, during parser generation, + Bison 2.5 will produce a warning whenever it discovers YYFAIL in a + rule action. In a later release, YYFAIL will be disabled for + %error-verbose and `#define YYERROR_VERBOSE'. Eventually, YYFAIL will + be removed altogether. + + There exists at least one case where Bison 2.5's YYFAIL warning will + be a false positive. Some projects add phony uses of YYFAIL and other + Bison-defined macros for the sole purpose of suppressing C + preprocessor warnings (from GCC cpp's -Wunused-macros, for example). + To avoid Bison's future warning, such YYFAIL uses can be moved to the + epilogue (that is, after the second `%%') in the Bison input file. In + this release (2.4.2), Bison already generates its own code to suppress + C preprocessor warnings for YYFAIL, so projects can remove their own + phony uses of YYFAIL if compatibility with Bison releases prior to + 2.4.2 is not necessary. + ** Internationalization. Fix a regression introduced in Bison 2.4: Under some circumstances, diff --git a/data/lalr1.java b/data/lalr1.java index 6637c3a2..a9ae873b 100644 --- a/data/lalr1.java +++ b/data/lalr1.java @@ -352,7 +352,8 @@ b4_lexer_if([[ /** * Returned by a Bison action in order to print an error message and start - * error recovery. */ + * error recovery. Formally deprecated in Bison 2.4.2's NEWS entry, where + * a plan to phase it out is discussed. */ public static final int YYFAIL = 3; private static final int YYNEWSTATE = 4; diff --git a/data/yacc.c b/data/yacc.c index 11ebbf16..5e7b55fc 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -609,9 +609,18 @@ static const ]b4_int_type_for([b4_toknum])[ yytoknum[] = /* 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) diff --git a/doc/bison.texinfo b/doc/bison.texinfo index 2af89175..ab2cd6c5 100644 --- a/doc/bison.texinfo +++ b/doc/bison.texinfo @@ -9925,11 +9925,6 @@ Start error recovery without printing an error message. @xref{Error Recovery}. @end deffn -@deffn {Statement} {return YYFAIL;} -Print an error message and start error recovery. -@xref{Error Recovery}. -@end deffn - @deftypefn {Function} {boolean} recovering () Return whether error recovery is being done. In this state, the parser reads token until it reaches a known state, and then restarts normal @@ -11330,5 +11325,5 @@ grammatically indivisible. The piece of text it represents is a token. @c LocalWords: superclasses boolean getErrorVerbose setErrorVerbose deftypecv @c LocalWords: getDebugStream setDebugStream getDebugLevel setDebugLevel url @c LocalWords: bisonVersion deftypecvx bisonSkeleton getStartPos getEndPos -@c LocalWords: getLVal defvar YYFAIL deftypefn deftypefnx gotos msgfmt +@c LocalWords: getLVal defvar deftypefn deftypefnx gotos msgfmt @c LocalWords: subdirectory Solaris nonassociativity diff --git a/src/parse-gram.c b/src/parse-gram.c index 4b6d5590..03495f6d 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.4.434-7439c. */ +/* A Bison parser, made by GNU Bison 2.4.456-ea2e. */ /* Implementation for Bison's Yacc-like parsers in C @@ -45,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.434-7439c" +#define YYBISON_VERSION "2.4.456-ea2e" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -417,7 +417,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 /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -885,9 +885,18 @@ static const yytype_uint8 yyr2[] = /* 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) @@ -944,7 +953,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, \ @@ -1020,106 +1029,106 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) { case 3: // "string" -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 175 "src/parse-gram.y" { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); } -/* Line 715 of yacc.c */ -#line 1028 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1037 "src/parse-gram.c" break; case 4: // "integer" -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 188 "src/parse-gram.y" { fprintf (stderr, "%d", ((*yyvaluep).integer)); } -/* Line 715 of yacc.c */ -#line 1037 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1046 "src/parse-gram.c" break; case 24: // "%" -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 184 "src/parse-gram.y" { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); } -/* Line 715 of yacc.c */ -#line 1046 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1055 "src/parse-gram.c" break; case 40: // "{...}" -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 177 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); } -/* Line 715 of yacc.c */ -#line 1055 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1064 "src/parse-gram.c" break; case 41: // "[identifier]" -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 182 "src/parse-gram.y" { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); } -/* Line 715 of yacc.c */ -#line 1064 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1073 "src/parse-gram.c" break; case 42: // "char" -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 169 "src/parse-gram.y" { fputs (char_name (((*yyvaluep).character)), stderr); } -/* Line 715 of yacc.c */ -#line 1073 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1082 "src/parse-gram.c" break; case 43: // "epilogue" -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 177 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 715 of yacc.c */ -#line 1082 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1091 "src/parse-gram.c" break; case 45: // "identifier" -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 181 "src/parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 715 of yacc.c */ -#line 1091 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1100 "src/parse-gram.c" break; case 46: // "identifier:" -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 183 "src/parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); } -/* Line 715 of yacc.c */ -#line 1100 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1109 "src/parse-gram.c" break; case 49: // "%{...%}" -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 177 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 715 of yacc.c */ -#line 1109 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1118 "src/parse-gram.c" break; case 51: // "" -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 185 "src/parse-gram.y" { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 715 of yacc.c */ -#line 1118 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1127 "src/parse-gram.c" break; case 54: // "%param" -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 231 "src/parse-gram.y" { switch (((*yyvaluep).param)) @@ -1133,80 +1142,80 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) case param_none: aver (false); break; } } -/* Line 715 of yacc.c */ -#line 1138 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1147 "src/parse-gram.c" break; case 71: // symbol.prec -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 191 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 715 of yacc.c */ -#line 1147 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1156 "src/parse-gram.c" break; case 84: // variable -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 181 "src/parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 715 of yacc.c */ -#line 1156 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1165 "src/parse-gram.c" break; case 85: // content.opt -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 177 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 715 of yacc.c */ -#line 1165 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1174 "src/parse-gram.c" break; case 86: // braceless -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 177 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 715 of yacc.c */ -#line 1174 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1183 "src/parse-gram.c" break; case 87: // id -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 191 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 715 of yacc.c */ -#line 1183 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1192 "src/parse-gram.c" break; case 88: // id_colon -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 192 "src/parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); } -/* Line 715 of yacc.c */ -#line 1192 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1201 "src/parse-gram.c" break; case 89: // symbol -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 191 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 715 of yacc.c */ -#line 1201 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1210 "src/parse-gram.c" break; case 90: // string_as_id -/* Line 715 of yacc.c */ +/* Line 731 of yacc.c */ #line 191 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 715 of yacc.c */ -#line 1210 "src/parse-gram.c" +/* Line 731 of yacc.c */ +#line 1219 "src/parse-gram.c" break; default: @@ -1729,14 +1738,14 @@ 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; #endif /* User initialization code. */ -/* Line 1200 of yacc.c */ +/* Line 1216 of yacc.c */ #line 80 "src/parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default @@ -1744,8 +1753,8 @@ YYLTYPE yylloc; boundary_set (&yylloc.start, current_file, 1, 1); boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1200 of yacc.c */ -#line 1749 "src/parse-gram.c" +/* Line 1216 of yacc.c */ +#line 1758 "src/parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1931,7 +1940,7 @@ yyreduce: switch (yyn) { case 6: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 267 "src/parse-gram.y" { code_props plain_code; @@ -1942,106 +1951,106 @@ yyreduce: plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1413 of yacc.c */ -#line 1947 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 1956 "src/parse-gram.c" break; case 7: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 277 "src/parse-gram.y" { muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true); } -/* Line 1413 of yacc.c */ -#line 1957 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 1966 "src/parse-gram.c" break; case 8: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 281 "src/parse-gram.y" { muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1413 of yacc.c */ -#line 1968 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 1977 "src/parse-gram.c" break; case 9: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 285 "src/parse-gram.y" { defines_flag = true; } -/* Line 1413 of yacc.c */ -#line 1976 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 1985 "src/parse-gram.c" break; case 10: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 287 "src/parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[0].chars)); } -/* Line 1413 of yacc.c */ -#line 1987 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 1996 "src/parse-gram.c" break; case 11: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 292 "src/parse-gram.y" { muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose", MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1413 of yacc.c */ -#line 1998 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2007 "src/parse-gram.c" break; case 12: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 296 "src/parse-gram.y" { expected_sr_conflicts = (yyvsp[0].integer); } -/* Line 1413 of yacc.c */ -#line 2006 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2015 "src/parse-gram.c" break; case 13: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 297 "src/parse-gram.y" { expected_rr_conflicts = (yyvsp[0].integer); } -/* Line 1413 of yacc.c */ -#line 2014 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2023 "src/parse-gram.c" break; case 14: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 298 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1413 of yacc.c */ -#line 2022 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2031 "src/parse-gram.c" break; case 15: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 299 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1413 of yacc.c */ -#line 2030 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2039 "src/parse-gram.c" break; case 16: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 301 "src/parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } -/* Line 1413 of yacc.c */ -#line 2041 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2050 "src/parse-gram.c" break; case 17: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 306 "src/parse-gram.y" { code_props action; @@ -2051,92 +2060,92 @@ yyreduce: muscle_code_grow ("initial_action", action.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1413 of yacc.c */ -#line 2056 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2065 "src/parse-gram.c" break; case 18: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 314 "src/parse-gram.y" { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } -/* Line 1413 of yacc.c */ -#line 2064 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2073 "src/parse-gram.c" break; case 19: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 315 "src/parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1413 of yacc.c */ -#line 2072 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2081 "src/parse-gram.c" break; case 20: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 316 "src/parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1413 of yacc.c */ -#line 2080 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2089 "src/parse-gram.c" break; case 21: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 317 "src/parse-gram.y" { no_lines_flag = true; } -/* Line 1413 of yacc.c */ -#line 2088 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2097 "src/parse-gram.c" break; case 22: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 318 "src/parse-gram.y" { nondeterministic_parser = true; } -/* Line 1413 of yacc.c */ -#line 2096 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2105 "src/parse-gram.c" break; case 23: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 319 "src/parse-gram.y" { spec_outfile = (yyvsp[0].chars); } -/* Line 1413 of yacc.c */ -#line 2104 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2113 "src/parse-gram.c" break; case 24: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 320 "src/parse-gram.y" { spec_outfile = (yyvsp[0].chars); } -/* Line 1413 of yacc.c */ -#line 2112 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2121 "src/parse-gram.c" break; case 25: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 321 "src/parse-gram.y" { current_param = (yyvsp[0].param); } -/* Line 1413 of yacc.c */ -#line 2120 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2129 "src/parse-gram.c" break; case 26: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 321 "src/parse-gram.y" { current_param = param_none; } -/* Line 1413 of yacc.c */ -#line 2128 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2137 "src/parse-gram.c" break; case 27: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 322 "src/parse-gram.y" { version_check (&(yylsp[0]), (yyvsp[0].chars)); } -/* Line 1413 of yacc.c */ -#line 2136 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2145 "src/parse-gram.c" break; case 28: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 324 "src/parse-gram.y" { char const *skeleton_user = (yyvsp[0].chars); @@ -2161,62 +2170,62 @@ yyreduce: } skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1])); } -/* Line 1413 of yacc.c */ -#line 2166 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2175 "src/parse-gram.c" break; case 29: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 347 "src/parse-gram.y" { token_table_flag = true; } -/* Line 1413 of yacc.c */ -#line 2174 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2183 "src/parse-gram.c" break; case 30: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 348 "src/parse-gram.y" { report_flag |= report_states; } -/* Line 1413 of yacc.c */ -#line 2182 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2191 "src/parse-gram.c" break; case 31: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 349 "src/parse-gram.y" { yacc_flag = true; } -/* Line 1413 of yacc.c */ -#line 2190 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2199 "src/parse-gram.c" break; case 33: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 354 "src/parse-gram.y" { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2198 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2207 "src/parse-gram.c" break; case 34: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 355 "src/parse-gram.y" { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2206 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2215 "src/parse-gram.c" break; case 37: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 367 "src/parse-gram.y" { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2216 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2225 "src/parse-gram.c" break; case 38: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 371 "src/parse-gram.y" { symbol_list *list; @@ -2224,12 +2233,12 @@ yyreduce: symbol_list_destructor_set (list, (yyvsp[-1].code), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1413 of yacc.c */ -#line 2229 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2238 "src/parse-gram.c" break; case 39: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 378 "src/parse-gram.y" { symbol_list *list; @@ -2237,32 +2246,32 @@ yyreduce: symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1413 of yacc.c */ -#line 2242 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2251 "src/parse-gram.c" break; case 40: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 385 "src/parse-gram.y" { default_prec = true; } -/* Line 1413 of yacc.c */ -#line 2252 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2261 "src/parse-gram.c" break; case 41: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 389 "src/parse-gram.y" { default_prec = false; } -/* Line 1413 of yacc.c */ -#line 2262 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2271 "src/parse-gram.c" break; case 42: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 393 "src/parse-gram.y" { /* Do not invoke muscle_percent_code_grow here since it invokes @@ -2270,89 +2279,89 @@ yyreduce: muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1413 of yacc.c */ -#line 2275 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2284 "src/parse-gram.c" break; case 43: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 400 "src/parse-gram.y" { muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1413 of yacc.c */ -#line 2286 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2295 "src/parse-gram.c" break; case 44: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 414 "src/parse-gram.y" {} -/* Line 1413 of yacc.c */ -#line 2294 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2303 "src/parse-gram.c" break; case 45: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 415 "src/parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2302 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2311 "src/parse-gram.c" break; case 46: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 420 "src/parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1413 of yacc.c */ -#line 2314 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2323 "src/parse-gram.c" break; case 47: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 431 "src/parse-gram.y" { current_class = nterm_sym; } -/* Line 1413 of yacc.c */ -#line 2322 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2331 "src/parse-gram.c" break; case 48: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 432 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1413 of yacc.c */ -#line 2333 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2342 "src/parse-gram.c" break; case 49: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 436 "src/parse-gram.y" { current_class = token_sym; } -/* Line 1413 of yacc.c */ -#line 2341 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2350 "src/parse-gram.c" break; case 50: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 437 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1413 of yacc.c */ -#line 2352 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2361 "src/parse-gram.c" break; case 51: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 442 "src/parse-gram.y" { symbol_list *list; @@ -2361,12 +2370,12 @@ yyreduce: symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1413 of yacc.c */ -#line 2366 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2375 "src/parse-gram.c" break; case 52: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 453 "src/parse-gram.y" { symbol_list *list; @@ -2379,202 +2388,202 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); current_type = NULL; } -/* Line 1413 of yacc.c */ -#line 2384 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2393 "src/parse-gram.c" break; case 53: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 467 "src/parse-gram.y" { (yyval.assoc) = left_assoc; } -/* Line 1413 of yacc.c */ -#line 2392 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2401 "src/parse-gram.c" break; case 54: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 468 "src/parse-gram.y" { (yyval.assoc) = right_assoc; } -/* Line 1413 of yacc.c */ -#line 2400 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2409 "src/parse-gram.c" break; case 55: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 469 "src/parse-gram.y" { (yyval.assoc) = non_assoc; } -/* Line 1413 of yacc.c */ -#line 2408 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2417 "src/parse-gram.c" break; case 56: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 470 "src/parse-gram.y" { (yyval.assoc) = precedence_assoc; } -/* Line 1413 of yacc.c */ -#line 2416 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2425 "src/parse-gram.c" break; case 57: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 474 "src/parse-gram.y" { current_type = NULL; } -/* Line 1413 of yacc.c */ -#line 2424 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2433 "src/parse-gram.c" break; case 58: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 475 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1413 of yacc.c */ -#line 2432 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2441 "src/parse-gram.c" break; case 59: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 481 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2440 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2449 "src/parse-gram.c" break; case 60: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 483 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1413 of yacc.c */ -#line 2448 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2457 "src/parse-gram.c" break; case 61: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 487 "src/parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } -/* Line 1413 of yacc.c */ -#line 2456 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2465 "src/parse-gram.c" break; case 62: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 488 "src/parse-gram.y" { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2464 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2473 "src/parse-gram.c" break; case 63: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 494 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2472 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2481 "src/parse-gram.c" break; case 64: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 496 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1413 of yacc.c */ -#line 2480 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2489 "src/parse-gram.c" break; case 65: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 500 "src/parse-gram.y" { (yyval.list) = (yyvsp[0].list); } -/* Line 1413 of yacc.c */ -#line 2488 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2497 "src/parse-gram.c" break; case 66: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 501 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); } -/* Line 1413 of yacc.c */ -#line 2496 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2505 "src/parse-gram.c" break; case 67: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 505 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2504 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2513 "src/parse-gram.c" break; case 68: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 506 "src/parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2512 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2521 "src/parse-gram.c" break; case 69: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 507 "src/parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2520 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2529 "src/parse-gram.c" break; case 70: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 508 "src/parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2528 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2537 "src/parse-gram.c" break; case 71: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 514 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1413 of yacc.c */ -#line 2539 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2548 "src/parse-gram.c" break; case 72: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 519 "src/parse-gram.y" { symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true); symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2550 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2559 "src/parse-gram.c" break; case 73: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 524 "src/parse-gram.y" { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2562 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2571 "src/parse-gram.c" break; case 74: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 530 "src/parse-gram.y" { symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true); symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc)); } -/* Line 1413 of yacc.c */ -#line 2574 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2583 "src/parse-gram.c" break; case 75: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 536 "src/parse-gram.y" { symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true); @@ -2582,136 +2591,136 @@ yyreduce: symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1])); symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc)); } -/* Line 1413 of yacc.c */ -#line 2587 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2596 "src/parse-gram.c" break; case 82: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 566 "src/parse-gram.y" { yyerrok; } -/* Line 1413 of yacc.c */ -#line 2597 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2606 "src/parse-gram.c" break; case 83: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 572 "src/parse-gram.y" { current_lhs = (yyvsp[-1].symbol); current_lhs_location = (yylsp[-1]); current_lhs_named_ref = (yyvsp[0].named_ref); } -/* Line 1413 of yacc.c */ -#line 2606 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2615 "src/parse-gram.c" break; case 85: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 577 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2614 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2623 "src/parse-gram.c" break; case 86: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 578 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2622 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2631 "src/parse-gram.c" break; case 88: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 584 "src/parse-gram.y" { grammar_current_rule_begin (current_lhs, current_lhs_location, current_lhs_named_ref); } -/* Line 1413 of yacc.c */ -#line 2631 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2640 "src/parse-gram.c" break; case 89: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 587 "src/parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1413 of yacc.c */ -#line 2639 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2648 "src/parse-gram.c" break; case 90: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 589 "src/parse-gram.y" { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1413 of yacc.c */ -#line 2647 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2656 "src/parse-gram.c" break; case 91: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 591 "src/parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2655 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2664 "src/parse-gram.c" break; case 92: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 593 "src/parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2663 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2672 "src/parse-gram.c" break; case 93: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 595 "src/parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2671 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2680 "src/parse-gram.c" break; case 94: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 599 "src/parse-gram.y" { (yyval.named_ref) = 0; } -/* Line 1413 of yacc.c */ -#line 2679 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2688 "src/parse-gram.c" break; case 95: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 601 "src/parse-gram.y" { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2687 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2696 "src/parse-gram.c" break; case 97: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 613 "src/parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } -/* Line 1413 of yacc.c */ -#line 2695 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2704 "src/parse-gram.c" break; case 98: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 618 "src/parse-gram.y" { (yyval.chars) = ""; } -/* Line 1413 of yacc.c */ -#line 2703 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2712 "src/parse-gram.c" break; case 99: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 619 "src/parse-gram.y" { (yyval.chars) = (yyvsp[0].uniqstr); } -/* Line 1413 of yacc.c */ -#line 2711 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2720 "src/parse-gram.c" break; case 101: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 630 "src/parse-gram.y" { code_props plain_code; @@ -2721,51 +2730,51 @@ yyreduce: gram_scanner_last_string_free (); (yyval.chars) = plain_code.code; } -/* Line 1413 of yacc.c */ -#line 2726 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2735 "src/parse-gram.c" break; case 102: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 650 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2734 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2743 "src/parse-gram.c" break; case 103: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 652 "src/parse-gram.y" { (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false); symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2746 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2755 "src/parse-gram.c" break; case 104: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 660 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1413 of yacc.c */ -#line 2754 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2763 "src/parse-gram.c" break; case 107: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 672 "src/parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false); } -/* Line 1413 of yacc.c */ -#line 2765 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2774 "src/parse-gram.c" break; case 109: -/* Line 1413 of yacc.c */ +/* Line 1429 of yacc.c */ #line 681 "src/parse-gram.y" { code_props plain_code; @@ -2775,13 +2784,13 @@ yyreduce: muscle_code_grow ("epilogue", plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1413 of yacc.c */ -#line 2780 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2789 "src/parse-gram.c" break; -/* Line 1413 of yacc.c */ -#line 2785 "src/parse-gram.c" +/* Line 1429 of yacc.c */ +#line 2794 "src/parse-gram.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2988,7 +2997,7 @@ yyreturn: return YYID (yyresult); } -/* Line 1623 of yacc.c */ +/* Line 1639 of yacc.c */ #line 691 "src/parse-gram.y" diff --git a/src/parse-gram.h b/src/parse-gram.h index 894b5dd4..e5b88b76 100644 --- a/src/parse-gram.h +++ b/src/parse-gram.h @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.4.434-7439c. */ +/* A Bison parser, made by GNU Bison 2.4.456-ea2e. */ /* Interface for Bison's Yacc-like parsers in C @@ -31,7 +31,7 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ /* "%code requires" blocks. */ -/* Line 1624 of yacc.c */ +/* Line 1640 of yacc.c */ #line 202 "src/parse-gram.y" # ifndef PARAM_TYPE @@ -46,7 +46,7 @@ # endif -/* Line 1624 of yacc.c */ +/* Line 1640 of yacc.c */ #line 51 "src/parse-gram.h" /* Tokens. */ @@ -173,7 +173,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 1624 of yacc.c */ +/* Line 1640 of yacc.c */ #line 88 "src/parse-gram.y" assoc assoc; @@ -186,13 +186,13 @@ typedef union YYSTYPE uniqstr uniqstr; unsigned char character; -/* Line 1624 of yacc.c */ +/* Line 1640 of yacc.c */ #line 226 "src/parse-gram.y" param_type param; -/* Line 1624 of yacc.c */ +/* Line 1640 of yacc.c */ #line 197 "src/parse-gram.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 -- 2.45.2