X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8d9cffffeda10c91230e60026fbf7ecfc33a32ae..219458e22f163ede84daa71dfa98bab82a766954:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index c06a03b4..8215a943 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.6.2.957-b074-dirty. */ +/* A Bison parser, made by GNU Bison 2.7.1081-93af. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 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 @@ -44,13 +44,13 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.6.2.957-b074-dirty" +#define YYBISON_VERSION "2.7.1081-93af" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" /* Pure parsers. */ -#define YYPURE 1 +#define YYPURE 2 /* Push parsers. */ #define YYPUSH 0 @@ -65,18 +65,15 @@ #define yyparse gram_parse #define yylex gram_lex #define yyerror gram_error -#define yylval gram_lval -#define yychar gram_char #define yydebug gram_debug #define yynerrs gram_nerrs -#define yylloc gram_lloc + /* Copy the first part of user declarations. */ -/* Line 353 of yacc.c */ -#line 1 "src/parse-gram.y" +#line 1 "src/parse-gram.y" /* yacc.c:357 */ /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -116,21 +113,16 @@ static YYLTYPE lloc_default (YYLTYPE const *, int); #define YY_LOCATION_PRINT(File, Loc) \ - location_print (File, Loc) + location_print (Loc, File) static void version_check (location const *loc, char const *version); -/* Request detailed syntax error messages, and pass them to GRAM_ERROR. - FIXME: depends on the undocumented availability of YYLLOC. */ -#undef yyerror -#define yyerror(Msg) \ - gram_error (&yylloc, Msg) static void gram_error (location const *, char const *); +/* A string that describes a char (e.g., 'a' -> "'a'"). */ static char const *char_name (char); -/* Line 353 of yacc.c */ -#line 134 "src/parse-gram.c" +#line 126 "src/parse-gram.c" /* yacc.c:357 */ # ifndef YY_NULL # if defined __cplusplus && 201103L <= __cplusplus @@ -152,7 +144,7 @@ static char const *char_name (char); by #include "src/parse-gram.h". */ #ifndef YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED # define YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED -/* Enabling traces. */ +/* Debug traces. */ #ifndef GRAM_DEBUG # if defined YYDEBUG #if YYDEBUG @@ -168,8 +160,7 @@ static char const *char_name (char); extern int gram_debug; #endif /* "%code requires" blocks. */ -/* Line 369 of yacc.c */ -#line 223 "src/parse-gram.y" +#line 219 "src/parse-gram.y" /* yacc.c:373 */ # ifndef PARAM_TYPE # define PARAM_TYPE @@ -183,14 +174,11 @@ extern int gram_debug; # endif -/* Line 369 of yacc.c */ -#line 188 "src/parse-gram.c" +#line 178 "src/parse-gram.c" /* yacc.c:373 */ -/* Tokens. */ +/* Token type. */ #ifndef GRAM_TOKENTYPE # define GRAM_TOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ enum gram_tokentype { GRAM_EOF = 0, @@ -307,11 +295,12 @@ extern int gram_debug; #define PERCENT_PARAM 310 #define PERCENT_UNION 311 +/* Value type. */ #if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED -typedef union GRAM_STYPE +typedef union GRAM_STYPE GRAM_STYPE; +union GRAM_STYPE { -/* Line 369 of yacc.c */ -#line 109 "src/parse-gram.y" +#line 105 "src/parse-gram.y" /* yacc.c:373 */ assoc assoc; char *code; @@ -323,46 +312,44 @@ typedef union GRAM_STYPE uniqstr uniqstr; unsigned char character; -/* Line 369 of yacc.c */ -#line 247 "src/parse-gram.y" +#line 243 "src/parse-gram.y" /* yacc.c:373 */ param_type param; -/* Line 369 of yacc.c */ -#line 423 "src/parse-gram.y" +#line 419 "src/parse-gram.y" /* yacc.c:373 */ code_props_type code_type; -/* Line 369 of yacc.c */ -#line 337 "src/parse-gram.c" -} GRAM_STYPE; +#line 323 "src/parse-gram.c" /* yacc.c:373 */ +}; # define GRAM_STYPE_IS_TRIVIAL 1 # define GRAM_STYPE_IS_DECLARED 1 #endif +/* Location type. */ #if ! defined GRAM_LTYPE && ! defined GRAM_LTYPE_IS_DECLARED -typedef struct GRAM_LTYPE +typedef struct GRAM_LTYPE GRAM_LTYPE; +struct GRAM_LTYPE { int first_line; int first_column; int last_line; int last_column; -} GRAM_LTYPE; +}; # define GRAM_LTYPE_IS_DECLARED 1 # define GRAM_LTYPE_IS_TRIVIAL 1 #endif + int gram_parse (void); #endif /* !YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED */ /* Copy the second part of user declarations. */ -/* Line 372 of yacc.c */ -#line 363 "src/parse-gram.c" +#line 351 "src/parse-gram.c" /* yacc.c:376 */ /* Unqualified %code blocks. */ -/* Line 373 of yacc.c */ -#line 58 "src/parse-gram.y" +#line 54 "src/parse-gram.y" /* yacc.c:377 */ static int current_prec = 0; static location current_lhs_location; @@ -376,7 +363,7 @@ int gram_parse (void); */ static void - current_lhs(symbol *sym, location loc, named_ref *ref) + current_lhs (symbol *sym, location loc, named_ref *ref) { current_lhs_symbol = sym; current_lhs_location = loc; @@ -394,8 +381,7 @@ int gram_parse (void); #define YYTYPE_UINT16 uint_fast16_t #define YYTYPE_UINT8 uint_fast8_t -/* Line 373 of yacc.c */ -#line 236 "src/parse-gram.y" +#line 232 "src/parse-gram.y" /* yacc.c:377 */ /** Add a lex-param and/or a parse-param. * @@ -407,8 +393,7 @@ int gram_parse (void); static param_type current_param = param_none; -/* Line 373 of yacc.c */ -#line 412 "src/parse-gram.c" +#line 397 "src/parse-gram.c" /* yacc.c:377 */ #ifdef short # undef short @@ -640,20 +625,20 @@ static const yytype_uint8 yytranslate[] = }; #if GRAM_DEBUG - /* YYRLINEYYN -- Source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 272, 272, 280, 282, 286, 287, 297, 301, 306, - 307, 312, 317, 318, 319, 320, 325, 334, 335, 336, - 337, 338, 339, 339, 340, 341, 365, 366, 367, 368, - 372, 373, 382, 383, 384, 388, 400, 404, 408, 415, - 426, 427, 437, 438, 442, 454, 454, 459, 459, 464, - 475, 490, 491, 492, 493, 497, 498, 503, 505, 510, - 511, 516, 518, 523, 524, 528, 529, 533, 534, 535, - 540, 545, 550, 556, 562, 573, 574, 583, 584, 590, - 591, 592, 599, 599, 607, 608, 609, 614, 616, 618, - 620, 622, 624, 626, 631, 633, 643, 644, 649, 650, - 651, 660, 680, 682, 691, 696, 697, 702, 709, 711 + 0, 268, 268, 276, 278, 282, 283, 293, 297, 302, + 303, 308, 313, 314, 315, 316, 321, 330, 331, 332, + 333, 334, 335, 335, 336, 337, 361, 362, 363, 364, + 368, 369, 378, 379, 380, 384, 396, 400, 404, 411, + 422, 423, 433, 434, 438, 450, 450, 455, 455, 460, + 471, 486, 487, 488, 489, 493, 494, 499, 501, 506, + 507, 512, 514, 519, 520, 524, 525, 529, 530, 531, + 536, 541, 546, 552, 558, 569, 570, 579, 580, 586, + 587, 588, 595, 595, 603, 604, 605, 610, 612, 614, + 616, 618, 620, 622, 627, 629, 639, 640, 645, 646, + 647, 656, 676, 678, 687, 692, 693, 698, 705, 707 }; #endif @@ -712,7 +697,7 @@ static const yytype_uint16 yytoknum[] = 0 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ + STATE-NUM. */ static const yytype_int16 yypact[] = { -74, 40, 101, -74, -74, -74, -48, -74, -74, -74, @@ -732,9 +717,9 @@ static const yytype_int16 yypact[] = -74, -74, -74 }; - /* YYDEFACT[S] -- default reduction number in state S. Performed when - YYTABLE does not specify something else to do. Zero means the default - is an error. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ static const yytype_uint8 yydefact[] = { 3, 0, 0, 1, 47, 45, 0, 40, 41, 51, @@ -754,7 +739,7 @@ static const yytype_uint8 yydefact[] = 93, 89, 88 }; - /* YYPGOTO[NTERM-NUM]. */ + /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { -74, -74, -74, -74, -74, -74, 140, -74, -74, -74, @@ -763,7 +748,7 @@ static const yytype_int16 yypgoto[] = -74, -74, -46, 6, -74, -32, -73, -74 }; - /* YYDEFGOTO[NTERM-NUM]. */ + /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 1, 2, 41, 79, 104, 74, 43, 81, 44, @@ -772,9 +757,9 @@ static const yytype_int16 yydefgoto[] = 55, 95, 52, 69, 78, 112, 71, 100 }; - /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If YYTABLE_NINF, syntax error. */ + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { 70, -108, 72, 53, 49, 92, 4, 5, 6, 7, @@ -815,8 +800,8 @@ static const yytype_int16 yycheck[] = -1, 50, 51, -1, -1, -1, 55, 56 }; - /* STOS_[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { 0, 58, 59, 0, 5, 6, 7, 8, 9, 10, @@ -836,7 +821,7 @@ static const yytype_uint8 yystos[] = 52, 86, 86 }; - /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { 0, 57, 58, 59, 59, 60, 60, 60, 60, 60, @@ -852,7 +837,7 @@ static const yytype_uint8 yyr1[] = 88, 89, 90, 90, 91, 92, 92, 93, 94, 94 }; - /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 4, 0, 2, 1, 1, 1, 3, 1, @@ -894,12 +879,12 @@ do \ } \ else \ { \ - yyerror (YY_("syntax error: cannot back up")); \ + yyerror (&yylloc, YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (0) - +/* Error token number */ #define YYTERROR 1 #define YYERRCODE 256 @@ -930,28 +915,6 @@ while (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) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ -#ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) -#else -# define YYLEX yylex (&yylval, &yylloc) -#endif /* Enable debugging if requested. */ #if GRAM_DEBUG @@ -967,6 +930,51 @@ do { \ YYFPRINTF Args; \ } while (0) + +/* 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 + +/* Print *YYLOCP on YYO. Private, do not rely on its existence. */ + +__attribute__((__unused__)) +static unsigned +yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp) +{ + unsigned res = 0; + int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0; + if (0 <= yylocp->first_line) + { + res += YYFPRINTF (yyo, "%d", yylocp->first_line); + if (0 <= yylocp->first_column) + res += YYFPRINTF (yyo, ".%d", yylocp->first_column); + } + if (0 <= yylocp->last_line) + { + if (yylocp->first_line < yylocp->last_line) + { + res += YYFPRINTF (yyo, "-%d", yylocp->last_line); + if (0 <= end_col) + res += YYFPRINTF (yyo, ".%d", end_col); + } + else if (0 <= end_col && yylocp->first_column < end_col) + res += YYFPRINTF (yyo, "-%d", end_col); + } + return res; + } + +# define YY_LOCATION_PRINT(File, Loc) \ + yy_location_print_ (File, &(Loc)) + +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif + + # define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ if (yydebug) \ @@ -987,7 +995,7 @@ static void yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) { FILE *yyo = yyoutput; - YYUSE(yyo); + YYUSE (yyo); YYUSE (yylocationp); if (!yyvaluep) return; @@ -997,191 +1005,147 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue # endif switch (yytype) { - case 3: // "string" -/* Line 727 of yacc.c */ -#line 196 "src/parse-gram.y" - { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); } -/* Line 727 of yacc.c */ -#line 1006 "src/parse-gram.c" + case 3: /* "string" */ +#line 192 "src/parse-gram.y" /* yacc.c:707 */ + { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); } +#line 1012 "src/parse-gram.c" /* yacc.c:707 */ break; - case 4: // "integer" -/* Line 727 of yacc.c */ -#line 209 "src/parse-gram.y" - { fprintf (yyo, "%d", ((*yyvaluep).integer)); } -/* Line 727 of yacc.c */ -#line 1014 "src/parse-gram.c" + case 4: /* "integer" */ +#line 205 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "%d", ((*yyvaluep).integer)); } +#line 1018 "src/parse-gram.c" /* yacc.c:707 */ break; - case 24: // "%" -/* Line 727 of yacc.c */ -#line 205 "src/parse-gram.y" - { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); } -/* Line 727 of yacc.c */ -#line 1022 "src/parse-gram.c" + case 24: /* "%" */ +#line 201 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); } +#line 1024 "src/parse-gram.c" /* yacc.c:707 */ break; - case 40: // "{...}" -/* Line 727 of yacc.c */ -#line 198 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } -/* Line 727 of yacc.c */ -#line 1030 "src/parse-gram.c" + case 40: /* "{...}" */ +#line 194 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); } +#line 1030 "src/parse-gram.c" /* yacc.c:707 */ break; - case 42: // "[identifier]" -/* Line 727 of yacc.c */ -#line 203 "src/parse-gram.y" - { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); } -/* Line 727 of yacc.c */ -#line 1038 "src/parse-gram.c" + case 42: /* "[identifier]" */ +#line 199 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); } +#line 1036 "src/parse-gram.c" /* yacc.c:707 */ break; - case 43: // "char" -/* Line 727 of yacc.c */ -#line 190 "src/parse-gram.y" - { fputs (char_name (((*yyvaluep).character)), yyo); } -/* Line 727 of yacc.c */ -#line 1046 "src/parse-gram.c" + case 43: /* "char" */ +#line 186 "src/parse-gram.y" /* yacc.c:707 */ + { fputs (char_name (((*yyvaluep).character)), yyo); } +#line 1042 "src/parse-gram.c" /* yacc.c:707 */ break; - case 44: // "epilogue" -/* Line 727 of yacc.c */ -#line 198 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 727 of yacc.c */ -#line 1054 "src/parse-gram.c" + case 44: /* "epilogue" */ +#line 194 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } +#line 1048 "src/parse-gram.c" /* yacc.c:707 */ break; - case 46: // "identifier" -/* Line 727 of yacc.c */ -#line 202 "src/parse-gram.y" - { fputs (((*yyvaluep).uniqstr), yyo); } -/* Line 727 of yacc.c */ -#line 1062 "src/parse-gram.c" + case 46: /* "identifier" */ +#line 198 "src/parse-gram.y" /* yacc.c:707 */ + { fputs (((*yyvaluep).uniqstr), yyo); } +#line 1054 "src/parse-gram.c" /* yacc.c:707 */ break; - case 47: // "identifier:" -/* Line 727 of yacc.c */ -#line 204 "src/parse-gram.y" - { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); } -/* Line 727 of yacc.c */ -#line 1070 "src/parse-gram.c" + case 47: /* "identifier:" */ +#line 200 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); } +#line 1060 "src/parse-gram.c" /* yacc.c:707 */ break; - case 50: // "%{...%}" -/* Line 727 of yacc.c */ -#line 198 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 727 of yacc.c */ -#line 1078 "src/parse-gram.c" + case 50: /* "%{...%}" */ +#line 194 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } +#line 1066 "src/parse-gram.c" /* yacc.c:707 */ break; - case 52: // "" -/* Line 727 of yacc.c */ -#line 206 "src/parse-gram.y" - { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 727 of yacc.c */ -#line 1086 "src/parse-gram.c" + case 52: /* "" */ +#line 202 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } +#line 1072 "src/parse-gram.c" /* yacc.c:707 */ break; - case 55: // "%param" -/* Line 727 of yacc.c */ -#line 252 "src/parse-gram.y" - { + case 55: /* "%param" */ +#line 248 "src/parse-gram.y" /* yacc.c:707 */ + { switch (((*yyvaluep).param)) { #define CASE(In, Out) \ case param_ ## In: fputs ("%" #Out, stderr); break - CASE(lex, lex-param); - CASE(parse, parse-param); - CASE(both, param); + CASE (lex, lex-param); + CASE (parse, parse-param); + CASE (both, param); #undef CASE case param_none: aver (false); break; } } -/* Line 727 of yacc.c */ -#line 1105 "src/parse-gram.c" +#line 1089 "src/parse-gram.c" /* yacc.c:707 */ break; - case 64: // code_props_type -/* Line 727 of yacc.c */ -#line 424 "src/parse-gram.y" - { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); } -/* Line 727 of yacc.c */ -#line 1113 "src/parse-gram.c" + case 64: /* code_props_type */ +#line 420 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); } +#line 1095 "src/parse-gram.c" /* yacc.c:707 */ break; - case 73: // symbol.prec -/* Line 727 of yacc.c */ -#line 212 "src/parse-gram.y" - { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 727 of yacc.c */ -#line 1121 "src/parse-gram.c" + case 73: /* symbol.prec */ +#line 208 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1101 "src/parse-gram.c" /* yacc.c:707 */ break; - case 77: // tag -/* Line 727 of yacc.c */ -#line 206 "src/parse-gram.y" - { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 727 of yacc.c */ -#line 1129 "src/parse-gram.c" + case 77: /* tag */ +#line 202 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); } +#line 1107 "src/parse-gram.c" /* yacc.c:707 */ break; - case 87: // variable -/* Line 727 of yacc.c */ -#line 202 "src/parse-gram.y" - { fputs (((*yyvaluep).uniqstr), yyo); } -/* Line 727 of yacc.c */ -#line 1137 "src/parse-gram.c" + case 87: /* variable */ +#line 198 "src/parse-gram.y" /* yacc.c:707 */ + { fputs (((*yyvaluep).uniqstr), yyo); } +#line 1113 "src/parse-gram.c" /* yacc.c:707 */ break; - case 88: // content.opt -/* Line 727 of yacc.c */ -#line 198 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 727 of yacc.c */ -#line 1145 "src/parse-gram.c" + case 88: /* content.opt */ +#line 194 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } +#line 1119 "src/parse-gram.c" /* yacc.c:707 */ break; - case 89: // braceless -/* Line 727 of yacc.c */ -#line 198 "src/parse-gram.y" - { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 727 of yacc.c */ -#line 1153 "src/parse-gram.c" + case 89: /* braceless */ +#line 194 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); } +#line 1125 "src/parse-gram.c" /* yacc.c:707 */ break; - case 90: // id -/* Line 727 of yacc.c */ -#line 212 "src/parse-gram.y" - { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 727 of yacc.c */ -#line 1161 "src/parse-gram.c" + case 90: /* id */ +#line 208 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1131 "src/parse-gram.c" /* yacc.c:707 */ break; - case 91: // id_colon -/* Line 727 of yacc.c */ -#line 213 "src/parse-gram.y" - { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); } -/* Line 727 of yacc.c */ -#line 1169 "src/parse-gram.c" + case 91: /* id_colon */ +#line 209 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); } +#line 1137 "src/parse-gram.c" /* yacc.c:707 */ break; - case 92: // symbol -/* Line 727 of yacc.c */ -#line 212 "src/parse-gram.y" - { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 727 of yacc.c */ -#line 1177 "src/parse-gram.c" + case 92: /* symbol */ +#line 208 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1143 "src/parse-gram.c" /* yacc.c:707 */ break; - case 93: // string_as_id -/* Line 727 of yacc.c */ -#line 212 "src/parse-gram.y" - { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 727 of yacc.c */ -#line 1185 "src/parse-gram.c" + case 93: /* string_as_id */ +#line 208 "src/parse-gram.y" /* yacc.c:707 */ + { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); } +#line 1149 "src/parse-gram.c" /* yacc.c:707 */ break; default: @@ -1197,10 +1161,8 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue static void yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); YY_LOCATION_PRINT (yyoutput, *yylocationp); YYFPRINTF (yyoutput, ": "); @@ -1626,7 +1588,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, { YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ const char *yyformat = YY_NULL; @@ -1683,11 +1644,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } } } # if GRAM_DEBUG @@ -1711,10 +1674,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, # undef YYCASE_ } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } if (*yymsg_alloc < yysize) { @@ -1754,7 +1719,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) { - YYUSE(yyvaluep); + YYUSE (yyvaluep); YYUSE (yylocationp); if (!yymsg) yymsg = "Deleting"; @@ -1781,10 +1746,11 @@ yyparse (void) int yychar; -#if defined __GNUC__ && (4 < __GNUC__ + (6 <= __GNUC_MINOR__)) +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* 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") @@ -1792,21 +1758,27 @@ int yychar; /* Default value used for initialization, for pacifying older GCCs or non-GCC compilers. */ static YYSTYPE yyval_default; -# define YYLVAL_INITIALIZE() (yylval = yyval_default) -#endif -#ifndef YYLVAL_INITIALIZE -# define YYLVAL_INITIALIZE() +# define YY_INITIAL_VALUE(Value) = Value #endif +static YYLTYPE yyloc_default +# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } +# endif +; #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN # define YY_IGNORE_MAYBE_UNINITIALIZED_END #endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); /* Location data for the lookahead symbol. */ -YYLTYPE yylloc; +YYLTYPE yylloc = yyloc_default; + /* Number of syntax errors so far. */ int yynerrs; @@ -1870,9 +1842,9 @@ YYLTYPE yylloc; 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; @@ -1887,32 +1859,15 @@ YYLTYPE yylloc; 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; - - YYLVAL_INITIALIZE (); -#if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_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 1483 of yacc.c */ -#line 101 "src/parse-gram.y" +#line 97 "src/parse-gram.y" /* yacc.c:1452 */ { /* Bison's grammar can initial empty locations, hence a default location is needed. */ boundary_set (&yylloc.start, current_file, 1, 1); boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1483 of yacc.c */ -#line 1916 "src/parse-gram.c" +#line 1871 "src/parse-gram.c" /* yacc.c:1452 */ yylsp[0] = yylloc; goto yysetstate; @@ -2019,7 +1974,7 @@ yybackup: if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (&yylval, &yylloc); } if (yychar <= YYEOF) @@ -2106,8 +2061,7 @@ yyreduce: switch (yyn) { case 6: -/* Line 1700 of yacc.c */ -#line 288 "src/parse-gram.y" +#line 284 "src/parse-gram.y" /* yacc.c:1669 */ { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -2117,99 +2071,79 @@ yyreduce: plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1700 of yacc.c */ -#line 2122 "src/parse-gram.c" +#line 2075 "src/parse-gram.c" /* yacc.c:1669 */ break; case 7: -/* Line 1700 of yacc.c */ -#line 298 "src/parse-gram.y" +#line 294 "src/parse-gram.y" /* yacc.c:1669 */ { muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true); } -/* Line 1700 of yacc.c */ -#line 2132 "src/parse-gram.c" +#line 2083 "src/parse-gram.c" /* yacc.c:1669 */ break; case 8: -/* Line 1700 of yacc.c */ -#line 302 "src/parse-gram.y" +#line 298 "src/parse-gram.y" /* yacc.c:1669 */ { muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1700 of yacc.c */ -#line 2143 "src/parse-gram.c" +#line 2092 "src/parse-gram.c" /* yacc.c:1669 */ break; case 9: -/* Line 1700 of yacc.c */ -#line 306 "src/parse-gram.y" +#line 302 "src/parse-gram.y" /* yacc.c:1669 */ { defines_flag = true; } -/* Line 1700 of yacc.c */ -#line 2151 "src/parse-gram.c" +#line 2098 "src/parse-gram.c" /* yacc.c:1669 */ break; case 10: -/* Line 1700 of yacc.c */ -#line 308 "src/parse-gram.y" +#line 304 "src/parse-gram.y" /* yacc.c:1669 */ { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[0].chars)); } -/* Line 1700 of yacc.c */ -#line 2162 "src/parse-gram.c" +#line 2107 "src/parse-gram.c" /* yacc.c:1669 */ break; case 11: -/* Line 1700 of yacc.c */ -#line 313 "src/parse-gram.y" +#line 309 "src/parse-gram.y" /* yacc.c:1669 */ { muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose", MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1700 of yacc.c */ -#line 2173 "src/parse-gram.c" +#line 2116 "src/parse-gram.c" /* yacc.c:1669 */ break; case 12: -/* Line 1700 of yacc.c */ -#line 317 "src/parse-gram.y" +#line 313 "src/parse-gram.y" /* yacc.c:1669 */ { expected_sr_conflicts = (yyvsp[0].integer); } -/* Line 1700 of yacc.c */ -#line 2181 "src/parse-gram.c" +#line 2122 "src/parse-gram.c" /* yacc.c:1669 */ break; case 13: -/* Line 1700 of yacc.c */ -#line 318 "src/parse-gram.y" +#line 314 "src/parse-gram.y" /* yacc.c:1669 */ { expected_rr_conflicts = (yyvsp[0].integer); } -/* Line 1700 of yacc.c */ -#line 2189 "src/parse-gram.c" +#line 2128 "src/parse-gram.c" /* yacc.c:1669 */ break; case 14: -/* Line 1700 of yacc.c */ -#line 319 "src/parse-gram.y" +#line 315 "src/parse-gram.y" /* yacc.c:1669 */ { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1700 of yacc.c */ -#line 2197 "src/parse-gram.c" +#line 2134 "src/parse-gram.c" /* yacc.c:1669 */ break; case 15: -/* Line 1700 of yacc.c */ -#line 321 "src/parse-gram.y" +#line 317 "src/parse-gram.y" /* yacc.c:1669 */ { nondeterministic_parser = true; glr_parser = true; } -/* Line 1700 of yacc.c */ -#line 2208 "src/parse-gram.c" +#line 2143 "src/parse-gram.c" /* yacc.c:1669 */ break; case 16: -/* Line 1700 of yacc.c */ -#line 326 "src/parse-gram.y" +#line 322 "src/parse-gram.y" /* yacc.c:1669 */ { code_props action; code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0])); @@ -2218,77 +2152,59 @@ yyreduce: muscle_code_grow ("initial_action", action.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1700 of yacc.c */ -#line 2223 "src/parse-gram.c" +#line 2156 "src/parse-gram.c" /* yacc.c:1669 */ break; case 17: -/* Line 1700 of yacc.c */ -#line 334 "src/parse-gram.y" +#line 330 "src/parse-gram.y" /* yacc.c:1669 */ { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } -/* Line 1700 of yacc.c */ -#line 2231 "src/parse-gram.c" +#line 2162 "src/parse-gram.c" /* yacc.c:1669 */ break; case 18: -/* Line 1700 of yacc.c */ -#line 335 "src/parse-gram.y" +#line 331 "src/parse-gram.y" /* yacc.c:1669 */ { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1700 of yacc.c */ -#line 2239 "src/parse-gram.c" +#line 2168 "src/parse-gram.c" /* yacc.c:1669 */ break; case 19: -/* Line 1700 of yacc.c */ -#line 336 "src/parse-gram.y" +#line 332 "src/parse-gram.y" /* yacc.c:1669 */ { no_lines_flag = true; } -/* Line 1700 of yacc.c */ -#line 2247 "src/parse-gram.c" +#line 2174 "src/parse-gram.c" /* yacc.c:1669 */ break; case 20: -/* Line 1700 of yacc.c */ -#line 337 "src/parse-gram.y" +#line 333 "src/parse-gram.y" /* yacc.c:1669 */ { nondeterministic_parser = true; } -/* Line 1700 of yacc.c */ -#line 2255 "src/parse-gram.c" +#line 2180 "src/parse-gram.c" /* yacc.c:1669 */ break; case 21: -/* Line 1700 of yacc.c */ -#line 338 "src/parse-gram.y" +#line 334 "src/parse-gram.y" /* yacc.c:1669 */ { spec_outfile = (yyvsp[0].chars); } -/* Line 1700 of yacc.c */ -#line 2263 "src/parse-gram.c" +#line 2186 "src/parse-gram.c" /* yacc.c:1669 */ break; case 22: -/* Line 1700 of yacc.c */ -#line 339 "src/parse-gram.y" +#line 335 "src/parse-gram.y" /* yacc.c:1669 */ { current_param = (yyvsp[0].param); } -/* Line 1700 of yacc.c */ -#line 2271 "src/parse-gram.c" +#line 2192 "src/parse-gram.c" /* yacc.c:1669 */ break; case 23: -/* Line 1700 of yacc.c */ -#line 339 "src/parse-gram.y" +#line 335 "src/parse-gram.y" /* yacc.c:1669 */ { current_param = param_none; } -/* Line 1700 of yacc.c */ -#line 2279 "src/parse-gram.c" +#line 2198 "src/parse-gram.c" /* yacc.c:1669 */ break; case 24: -/* Line 1700 of yacc.c */ -#line 340 "src/parse-gram.y" +#line 336 "src/parse-gram.y" /* yacc.c:1669 */ { version_check (&(yylsp[0]), (yyvsp[0].chars)); } -/* Line 1700 of yacc.c */ -#line 2287 "src/parse-gram.c" +#line 2204 "src/parse-gram.c" /* yacc.c:1669 */ break; case 25: -/* Line 1700 of yacc.c */ -#line 342 "src/parse-gram.y" +#line 338 "src/parse-gram.y" /* yacc.c:1669 */ { char const *skeleton_user = (yyvsp[0].chars); if (strchr (skeleton_user, '/')) @@ -2312,63 +2228,49 @@ yyreduce: } skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1])); } -/* Line 1700 of yacc.c */ -#line 2317 "src/parse-gram.c" +#line 2232 "src/parse-gram.c" /* yacc.c:1669 */ break; case 26: -/* Line 1700 of yacc.c */ -#line 365 "src/parse-gram.y" +#line 361 "src/parse-gram.y" /* yacc.c:1669 */ { token_table_flag = true; } -/* Line 1700 of yacc.c */ -#line 2325 "src/parse-gram.c" +#line 2238 "src/parse-gram.c" /* yacc.c:1669 */ break; case 27: -/* Line 1700 of yacc.c */ -#line 366 "src/parse-gram.y" +#line 362 "src/parse-gram.y" /* yacc.c:1669 */ { report_flag |= report_states; } -/* Line 1700 of yacc.c */ -#line 2333 "src/parse-gram.c" +#line 2244 "src/parse-gram.c" /* yacc.c:1669 */ break; case 28: -/* Line 1700 of yacc.c */ -#line 367 "src/parse-gram.y" +#line 363 "src/parse-gram.y" /* yacc.c:1669 */ { yacc_flag = true; } -/* Line 1700 of yacc.c */ -#line 2341 "src/parse-gram.c" +#line 2250 "src/parse-gram.c" /* yacc.c:1669 */ break; case 30: -/* Line 1700 of yacc.c */ -#line 372 "src/parse-gram.y" +#line 368 "src/parse-gram.y" /* yacc.c:1669 */ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2349 "src/parse-gram.c" +#line 2256 "src/parse-gram.c" /* yacc.c:1669 */ break; case 31: -/* Line 1700 of yacc.c */ -#line 373 "src/parse-gram.y" +#line 369 "src/parse-gram.y" /* yacc.c:1669 */ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2357 "src/parse-gram.c" +#line 2262 "src/parse-gram.c" /* yacc.c:1669 */ break; case 34: -/* Line 1700 of yacc.c */ -#line 385 "src/parse-gram.y" +#line 381 "src/parse-gram.y" /* yacc.c:1669 */ { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2367 "src/parse-gram.c" +#line 2270 "src/parse-gram.c" /* yacc.c:1669 */ break; case 35: -/* Line 1700 of yacc.c */ -#line 389 "src/parse-gram.y" +#line 385 "src/parse-gram.y" /* yacc.c:1669 */ { code_props code; code_props_symbol_action_init (&code, (yyvsp[-1].code), (yylsp[-1])); @@ -2380,139 +2282,111 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); } } -/* Line 1700 of yacc.c */ -#line 2385 "src/parse-gram.c" +#line 2286 "src/parse-gram.c" /* yacc.c:1669 */ break; case 36: -/* Line 1700 of yacc.c */ -#line 401 "src/parse-gram.y" +#line 397 "src/parse-gram.y" /* yacc.c:1669 */ { default_prec = true; } -/* Line 1700 of yacc.c */ -#line 2395 "src/parse-gram.c" +#line 2294 "src/parse-gram.c" /* yacc.c:1669 */ break; case 37: -/* Line 1700 of yacc.c */ -#line 405 "src/parse-gram.y" +#line 401 "src/parse-gram.y" /* yacc.c:1669 */ { default_prec = false; } -/* Line 1700 of yacc.c */ -#line 2405 "src/parse-gram.c" +#line 2302 "src/parse-gram.c" /* yacc.c:1669 */ break; case 38: -/* Line 1700 of yacc.c */ -#line 409 "src/parse-gram.y" +#line 405 "src/parse-gram.y" /* yacc.c:1669 */ { /* Do not invoke muscle_percent_code_grow here since it invokes muscle_user_name_list_grow. */ muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1700 of yacc.c */ -#line 2418 "src/parse-gram.c" +#line 2313 "src/parse-gram.c" /* yacc.c:1669 */ break; case 39: -/* Line 1700 of yacc.c */ -#line 416 "src/parse-gram.y" +#line 412 "src/parse-gram.y" /* yacc.c:1669 */ { muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1700 of yacc.c */ -#line 2429 "src/parse-gram.c" +#line 2322 "src/parse-gram.c" /* yacc.c:1669 */ break; case 40: -/* Line 1700 of yacc.c */ -#line 426 "src/parse-gram.y" +#line 422 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.code_type) = destructor; } -/* Line 1700 of yacc.c */ -#line 2437 "src/parse-gram.c" +#line 2328 "src/parse-gram.c" /* yacc.c:1669 */ break; case 41: -/* Line 1700 of yacc.c */ -#line 427 "src/parse-gram.y" +#line 423 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.code_type) = printer; } -/* Line 1700 of yacc.c */ -#line 2445 "src/parse-gram.c" +#line 2334 "src/parse-gram.c" /* yacc.c:1669 */ break; case 42: -/* Line 1700 of yacc.c */ -#line 437 "src/parse-gram.y" +#line 433 "src/parse-gram.y" /* yacc.c:1669 */ {} -/* Line 1700 of yacc.c */ -#line 2453 "src/parse-gram.c" +#line 2340 "src/parse-gram.c" /* yacc.c:1669 */ break; case 43: -/* Line 1700 of yacc.c */ -#line 438 "src/parse-gram.y" +#line 434 "src/parse-gram.y" /* yacc.c:1669 */ { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2461 "src/parse-gram.c" +#line 2346 "src/parse-gram.c" /* yacc.c:1669 */ break; case 44: -/* Line 1700 of yacc.c */ -#line 443 "src/parse-gram.y" +#line 439 "src/parse-gram.y" /* yacc.c:1669 */ { union_seen = true; - muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0])); + muscle_code_grow ("union_members", (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1700 of yacc.c */ -#line 2473 "src/parse-gram.c" +#line 2356 "src/parse-gram.c" /* yacc.c:1669 */ break; case 45: -/* Line 1700 of yacc.c */ -#line 454 "src/parse-gram.y" +#line 450 "src/parse-gram.y" /* yacc.c:1669 */ { current_class = nterm_sym; } -/* Line 1700 of yacc.c */ -#line 2481 "src/parse-gram.c" +#line 2362 "src/parse-gram.c" /* yacc.c:1669 */ break; case 46: -/* Line 1700 of yacc.c */ -#line 455 "src/parse-gram.y" +#line 451 "src/parse-gram.y" /* yacc.c:1669 */ { current_class = unknown_sym; current_type = NULL; } -/* Line 1700 of yacc.c */ -#line 2492 "src/parse-gram.c" +#line 2371 "src/parse-gram.c" /* yacc.c:1669 */ break; case 47: -/* Line 1700 of yacc.c */ -#line 459 "src/parse-gram.y" +#line 455 "src/parse-gram.y" /* yacc.c:1669 */ { current_class = token_sym; } -/* Line 1700 of yacc.c */ -#line 2500 "src/parse-gram.c" +#line 2377 "src/parse-gram.c" /* yacc.c:1669 */ break; case 48: -/* Line 1700 of yacc.c */ -#line 460 "src/parse-gram.y" +#line 456 "src/parse-gram.y" /* yacc.c:1669 */ { current_class = unknown_sym; current_type = NULL; } -/* Line 1700 of yacc.c */ -#line 2511 "src/parse-gram.c" +#line 2386 "src/parse-gram.c" /* yacc.c:1669 */ break; case 49: -/* Line 1700 of yacc.c */ -#line 465 "src/parse-gram.y" +#line 461 "src/parse-gram.y" /* yacc.c:1669 */ { symbol_list *list; tag_seen = true; @@ -2520,13 +2394,11 @@ yyreduce: symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1700 of yacc.c */ -#line 2525 "src/parse-gram.c" +#line 2398 "src/parse-gram.c" /* yacc.c:1669 */ break; case 50: -/* Line 1700 of yacc.c */ -#line 476 "src/parse-gram.y" +#line 472 "src/parse-gram.y" /* yacc.c:1669 */ { symbol_list *list; ++current_prec; @@ -2538,358 +2410,276 @@ yyreduce: symbol_list_free ((yyvsp[0].list)); current_type = NULL; } -/* Line 1700 of yacc.c */ -#line 2543 "src/parse-gram.c" +#line 2414 "src/parse-gram.c" /* yacc.c:1669 */ break; case 51: -/* Line 1700 of yacc.c */ -#line 490 "src/parse-gram.y" +#line 486 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.assoc) = left_assoc; } -/* Line 1700 of yacc.c */ -#line 2551 "src/parse-gram.c" +#line 2420 "src/parse-gram.c" /* yacc.c:1669 */ break; case 52: -/* Line 1700 of yacc.c */ -#line 491 "src/parse-gram.y" +#line 487 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.assoc) = right_assoc; } -/* Line 1700 of yacc.c */ -#line 2559 "src/parse-gram.c" +#line 2426 "src/parse-gram.c" /* yacc.c:1669 */ break; case 53: -/* Line 1700 of yacc.c */ -#line 492 "src/parse-gram.y" +#line 488 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.assoc) = non_assoc; } -/* Line 1700 of yacc.c */ -#line 2567 "src/parse-gram.c" +#line 2432 "src/parse-gram.c" /* yacc.c:1669 */ break; case 54: -/* Line 1700 of yacc.c */ -#line 493 "src/parse-gram.y" +#line 489 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.assoc) = precedence_assoc; } -/* Line 1700 of yacc.c */ -#line 2575 "src/parse-gram.c" +#line 2438 "src/parse-gram.c" /* yacc.c:1669 */ break; case 55: -/* Line 1700 of yacc.c */ -#line 497 "src/parse-gram.y" +#line 493 "src/parse-gram.y" /* yacc.c:1669 */ { current_type = NULL; } -/* Line 1700 of yacc.c */ -#line 2583 "src/parse-gram.c" +#line 2444 "src/parse-gram.c" /* yacc.c:1669 */ break; case 56: -/* Line 1700 of yacc.c */ -#line 498 "src/parse-gram.y" +#line 494 "src/parse-gram.y" /* yacc.c:1669 */ { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1700 of yacc.c */ -#line 2591 "src/parse-gram.c" +#line 2450 "src/parse-gram.c" /* yacc.c:1669 */ break; case 57: -/* Line 1700 of yacc.c */ -#line 504 "src/parse-gram.y" +#line 500 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2599 "src/parse-gram.c" +#line 2456 "src/parse-gram.c" /* yacc.c:1669 */ break; case 58: -/* Line 1700 of yacc.c */ -#line 506 "src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1700 of yacc.c */ -#line 2607 "src/parse-gram.c" +#line 502 "src/parse-gram.y" /* yacc.c:1669 */ + { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } +#line 2462 "src/parse-gram.c" /* yacc.c:1669 */ break; case 59: -/* Line 1700 of yacc.c */ -#line 510 "src/parse-gram.y" +#line 506 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.symbol) = (yyvsp[0].symbol); } -/* Line 1700 of yacc.c */ -#line 2615 "src/parse-gram.c" +#line 2468 "src/parse-gram.c" /* yacc.c:1669 */ break; case 60: -/* Line 1700 of yacc.c */ -#line 511 "src/parse-gram.y" +#line 507 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2623 "src/parse-gram.c" +#line 2474 "src/parse-gram.c" /* yacc.c:1669 */ break; case 61: -/* Line 1700 of yacc.c */ -#line 517 "src/parse-gram.y" +#line 513 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2631 "src/parse-gram.c" +#line 2480 "src/parse-gram.c" /* yacc.c:1669 */ break; case 62: -/* Line 1700 of yacc.c */ -#line 519 "src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1700 of yacc.c */ -#line 2639 "src/parse-gram.c" +#line 515 "src/parse-gram.y" /* yacc.c:1669 */ + { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } +#line 2486 "src/parse-gram.c" /* yacc.c:1669 */ break; case 63: -/* Line 1700 of yacc.c */ -#line 523 "src/parse-gram.y" +#line 519 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.list) = (yyvsp[0].list); } -/* Line 1700 of yacc.c */ -#line 2647 "src/parse-gram.c" +#line 2492 "src/parse-gram.c" /* yacc.c:1669 */ break; case 64: -/* Line 1700 of yacc.c */ -#line 524 "src/parse-gram.y" - { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); } -/* Line 1700 of yacc.c */ -#line 2655 "src/parse-gram.c" +#line 520 "src/parse-gram.y" /* yacc.c:1669 */ + { (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); } +#line 2498 "src/parse-gram.c" /* yacc.c:1669 */ break; case 65: -/* Line 1700 of yacc.c */ -#line 528 "src/parse-gram.y" +#line 524 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2663 "src/parse-gram.c" +#line 2504 "src/parse-gram.c" /* yacc.c:1669 */ break; case 66: -/* Line 1700 of yacc.c */ -#line 529 "src/parse-gram.y" +#line 525 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2671 "src/parse-gram.c" +#line 2510 "src/parse-gram.c" /* yacc.c:1669 */ break; case 68: -/* Line 1700 of yacc.c */ -#line 534 "src/parse-gram.y" +#line 530 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.uniqstr) = uniqstr_new ("*"); } -/* Line 1700 of yacc.c */ -#line 2679 "src/parse-gram.c" +#line 2516 "src/parse-gram.c" /* yacc.c:1669 */ break; case 69: -/* Line 1700 of yacc.c */ -#line 535 "src/parse-gram.y" +#line 531 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.uniqstr) = uniqstr_new (""); } -/* Line 1700 of yacc.c */ -#line 2687 "src/parse-gram.c" +#line 2522 "src/parse-gram.c" /* yacc.c:1669 */ break; case 70: -/* Line 1700 of yacc.c */ -#line 541 "src/parse-gram.y" +#line 537 "src/parse-gram.y" /* yacc.c:1669 */ { - current_type = (yyvsp[0].uniqstr); - tag_seen = true; - } -/* Line 1700 of yacc.c */ -#line 2698 "src/parse-gram.c" + current_type = (yyvsp[0].uniqstr); + tag_seen = true; + } +#line 2531 "src/parse-gram.c" /* yacc.c:1669 */ break; case 71: -/* Line 1700 of yacc.c */ -#line 546 "src/parse-gram.y" +#line 542 "src/parse-gram.y" /* yacc.c:1669 */ { - symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true); - symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); - } -/* Line 1700 of yacc.c */ -#line 2709 "src/parse-gram.c" + symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true); + symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); + } +#line 2540 "src/parse-gram.c" /* yacc.c:1669 */ break; case 72: -/* Line 1700 of yacc.c */ -#line 551 "src/parse-gram.y" +#line 547 "src/parse-gram.y" /* yacc.c:1669 */ { 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 1700 of yacc.c */ -#line 2721 "src/parse-gram.c" +#line 2550 "src/parse-gram.c" /* yacc.c:1669 */ break; case 73: -/* Line 1700 of yacc.c */ -#line 557 "src/parse-gram.y" +#line 553 "src/parse-gram.y" /* yacc.c:1669 */ { 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 1700 of yacc.c */ -#line 2733 "src/parse-gram.c" +#line 2560 "src/parse-gram.c" /* yacc.c:1669 */ break; case 74: -/* Line 1700 of yacc.c */ -#line 563 "src/parse-gram.y" +#line 559 "src/parse-gram.y" /* yacc.c:1669 */ { symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true); symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2])); symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1])); symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc)); } -/* Line 1700 of yacc.c */ -#line 2746 "src/parse-gram.c" +#line 2571 "src/parse-gram.c" /* yacc.c:1669 */ break; case 81: -/* Line 1700 of yacc.c */ -#line 593 "src/parse-gram.y" +#line 589 "src/parse-gram.y" /* yacc.c:1669 */ { yyerrok; } -/* Line 1700 of yacc.c */ -#line 2756 "src/parse-gram.c" +#line 2579 "src/parse-gram.c" /* yacc.c:1669 */ break; case 82: -/* Line 1700 of yacc.c */ -#line 599 "src/parse-gram.y" +#line 595 "src/parse-gram.y" /* yacc.c:1669 */ { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1700 of yacc.c */ -#line 2764 "src/parse-gram.c" +#line 2585 "src/parse-gram.c" /* yacc.c:1669 */ break; case 83: -/* Line 1700 of yacc.c */ -#line 600 "src/parse-gram.y" +#line 596 "src/parse-gram.y" /* yacc.c:1669 */ { /* Free the current lhs. */ current_lhs (0, (yylsp[-3]), 0); } -/* Line 1700 of yacc.c */ -#line 2775 "src/parse-gram.c" +#line 2594 "src/parse-gram.c" /* yacc.c:1669 */ break; case 84: -/* Line 1700 of yacc.c */ -#line 607 "src/parse-gram.y" +#line 603 "src/parse-gram.y" /* yacc.c:1669 */ { grammar_current_rule_end ((yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2783 "src/parse-gram.c" +#line 2600 "src/parse-gram.c" /* yacc.c:1669 */ break; case 85: -/* Line 1700 of yacc.c */ -#line 608 "src/parse-gram.y" +#line 604 "src/parse-gram.y" /* yacc.c:1669 */ { grammar_current_rule_end ((yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2791 "src/parse-gram.c" +#line 2606 "src/parse-gram.c" /* yacc.c:1669 */ break; case 87: -/* Line 1700 of yacc.c */ -#line 614 "src/parse-gram.y" +#line 610 "src/parse-gram.y" /* yacc.c:1669 */ { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, current_lhs_named_ref); } -/* Line 1700 of yacc.c */ -#line 2800 "src/parse-gram.c" +#line 2613 "src/parse-gram.c" /* yacc.c:1669 */ break; case 88: -/* Line 1700 of yacc.c */ -#line 617 "src/parse-gram.y" +#line 613 "src/parse-gram.y" /* yacc.c:1669 */ { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1700 of yacc.c */ -#line 2808 "src/parse-gram.c" +#line 2619 "src/parse-gram.c" /* yacc.c:1669 */ break; case 89: -/* Line 1700 of yacc.c */ -#line 619 "src/parse-gram.y" +#line 615 "src/parse-gram.y" /* yacc.c:1669 */ { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); } -/* Line 1700 of yacc.c */ -#line 2816 "src/parse-gram.c" +#line 2625 "src/parse-gram.c" /* yacc.c:1669 */ break; case 90: -/* Line 1700 of yacc.c */ -#line 621 "src/parse-gram.y" +#line 617 "src/parse-gram.y" /* yacc.c:1669 */ { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); } -/* Line 1700 of yacc.c */ -#line 2824 "src/parse-gram.c" +#line 2631 "src/parse-gram.c" /* yacc.c:1669 */ break; case 91: -/* Line 1700 of yacc.c */ -#line 623 "src/parse-gram.y" +#line 619 "src/parse-gram.y" /* yacc.c:1669 */ { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2832 "src/parse-gram.c" +#line 2637 "src/parse-gram.c" /* yacc.c:1669 */ break; case 92: -/* Line 1700 of yacc.c */ -#line 625 "src/parse-gram.y" +#line 621 "src/parse-gram.y" /* yacc.c:1669 */ { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2840 "src/parse-gram.c" +#line 2643 "src/parse-gram.c" /* yacc.c:1669 */ break; case 93: -/* Line 1700 of yacc.c */ -#line 627 "src/parse-gram.y" +#line 623 "src/parse-gram.y" /* yacc.c:1669 */ { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2848 "src/parse-gram.c" +#line 2649 "src/parse-gram.c" /* yacc.c:1669 */ break; case 94: -/* Line 1700 of yacc.c */ -#line 631 "src/parse-gram.y" +#line 627 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.named_ref) = 0; } -/* Line 1700 of yacc.c */ -#line 2856 "src/parse-gram.c" +#line 2655 "src/parse-gram.c" /* yacc.c:1669 */ break; case 95: -/* Line 1700 of yacc.c */ -#line 633 "src/parse-gram.y" - { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2864 "src/parse-gram.c" +#line 629 "src/parse-gram.y" /* yacc.c:1669 */ + { (yyval.named_ref) = named_ref_new ((yyvsp[0].uniqstr), (yylsp[0])); } +#line 2661 "src/parse-gram.c" /* yacc.c:1669 */ break; case 97: -/* Line 1700 of yacc.c */ -#line 644 "src/parse-gram.y" +#line 640 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } -/* Line 1700 of yacc.c */ -#line 2872 "src/parse-gram.c" +#line 2667 "src/parse-gram.c" /* yacc.c:1669 */ break; case 98: -/* Line 1700 of yacc.c */ -#line 649 "src/parse-gram.y" +#line 645 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.chars) = ""; } -/* Line 1700 of yacc.c */ -#line 2880 "src/parse-gram.c" +#line 2673 "src/parse-gram.c" /* yacc.c:1669 */ break; case 99: -/* Line 1700 of yacc.c */ -#line 650 "src/parse-gram.y" +#line 646 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.chars) = (yyvsp[0].uniqstr); } -/* Line 1700 of yacc.c */ -#line 2888 "src/parse-gram.c" +#line 2679 "src/parse-gram.c" /* yacc.c:1669 */ break; case 101: -/* Line 1700 of yacc.c */ -#line 661 "src/parse-gram.y" +#line 657 "src/parse-gram.y" /* yacc.c:1669 */ { code_props plain_code; (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n'; @@ -2898,52 +2688,42 @@ yyreduce: gram_scanner_last_string_free (); (yyval.chars) = plain_code.code; } -/* Line 1700 of yacc.c */ -#line 2903 "src/parse-gram.c" +#line 2692 "src/parse-gram.c" /* yacc.c:1669 */ break; case 102: -/* Line 1700 of yacc.c */ -#line 681 "src/parse-gram.y" +#line 677 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2911 "src/parse-gram.c" +#line 2698 "src/parse-gram.c" /* yacc.c:1669 */ break; case 103: -/* Line 1700 of yacc.c */ -#line 683 "src/parse-gram.y" +#line 679 "src/parse-gram.y" /* yacc.c:1669 */ { (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 1700 of yacc.c */ -#line 2923 "src/parse-gram.c" +#line 2708 "src/parse-gram.c" /* yacc.c:1669 */ break; case 104: -/* Line 1700 of yacc.c */ -#line 691 "src/parse-gram.y" +#line 687 "src/parse-gram.y" /* yacc.c:1669 */ { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1700 of yacc.c */ -#line 2931 "src/parse-gram.c" +#line 2714 "src/parse-gram.c" /* yacc.c:1669 */ break; case 107: -/* Line 1700 of yacc.c */ -#line 703 "src/parse-gram.y" +#line 699 "src/parse-gram.y" /* yacc.c:1669 */ { (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 1700 of yacc.c */ -#line 2942 "src/parse-gram.c" +#line 2723 "src/parse-gram.c" /* yacc.c:1669 */ break; case 109: -/* Line 1700 of yacc.c */ -#line 712 "src/parse-gram.y" +#line 708 "src/parse-gram.y" /* yacc.c:1669 */ { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -2952,13 +2732,11 @@ yyreduce: muscle_code_grow ("epilogue", plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1700 of yacc.c */ -#line 2957 "src/parse-gram.c" +#line 2736 "src/parse-gram.c" /* yacc.c:1669 */ break; -/* Line 1700 of yacc.c */ -#line 2962 "src/parse-gram.c" +#line 2740 "src/parse-gram.c" /* yacc.c:1669 */ default: break; } if (yychar_backup != yychar) @@ -3012,7 +2790,7 @@ yyerrlab: { ++yynerrs; #if ! YYERROR_VERBOSE - yyerror (YY_("syntax error")); + yyerror (&yylloc, YY_("syntax error")); #else # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ yyesa, &yyes, &yyes_capacity, \ @@ -3042,7 +2820,7 @@ yyerrlab: yymsgp = yymsg; } } - yyerror (yymsgp); + yyerror (&yylloc, yymsgp); if (yysyntax_error_status == 2) goto yyexhaustedlab; } @@ -3088,7 +2866,7 @@ yyerrorlab: goto yyerrorlab; yyerror_range[1] = yylsp[1-yylen]; - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -3169,7 +2947,7 @@ yyabortlab: | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ yyexhaustedlab: - yyerror (YY_("memory exhausted")); + yyerror (&yylloc, YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif @@ -3183,7 +2961,7 @@ yyreturn: yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc); } - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); @@ -3205,8 +2983,7 @@ yyreturn: #endif return yyresult; } -/* Line 1960 of yacc.c */ -#line 722 "src/parse-gram.y" +#line 718 "src/parse-gram.y" /* yacc.c:1929 */ /* Return the location of the left-hand side of a rule whose