X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b4bbc4a03c6f4799a4442c912b71a28c3a986e54..59420cd7162dee87e098360e3b1a86eff83835e3:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 5072a8eb..637cc35b 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,9 +1,9 @@ -/* A Bison parser, made by GNU Bison 2.4.537-34db. */ +/* A Bison parser, made by GNU Bison 2.4.579-a4d1b. */ -/* Implementation for Bison's Yacc-like parsers in C +/* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2012 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 @@ -45,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.537-34db" +#define YYBISON_VERSION "2.4.579-a4d1b" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -73,12 +73,11 @@ #define yylloc gram_lloc /* Copy the first part of user declarations. */ -/* Line 252 of yacc.c */ +/* Line 269 of yacc.c */ #line 1 "src/parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. + Copyright (C) 2002-2011 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -115,7 +114,7 @@ static YYLTYPE lloc_default (YYLTYPE const *, int); #define YY_LOCATION_PRINT(File, Loc) \ - location_print (File, Loc) + location_print (File, Loc) static void version_check (location const *loc, char const *version); @@ -123,13 +122,13 @@ static void version_check (location const *loc, char const *version); FIXME: depends on the undocumented availability of YYLLOC. */ #undef yyerror #define yyerror(Msg) \ - gram_error (&yylloc, Msg) + gram_error (&yylloc, Msg) static void gram_error (location const *, char const *); static char const *char_name (char); -/* Line 252 of yacc.c */ -#line 133 "src/parse-gram.c" +/* Line 269 of yacc.c */ +#line 131 "src/parse-gram.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -150,8 +149,8 @@ static char const *char_name (char); #endif /* "%code requires" blocks. */ -/* Line 272 of yacc.c */ -#line 202 "src/parse-gram.y" +/* Line 289 of yacc.c */ +#line 220 "src/parse-gram.y" # ifndef PARAM_TYPE # define PARAM_TYPE @@ -165,8 +164,8 @@ static char const *char_name (char); # endif -/* Line 272 of yacc.c */ -#line 170 "src/parse-gram.c" +/* Line 289 of yacc.c */ +#line 168 "src/parse-gram.c" /* Tokens. */ #ifndef YYTOKENTYPE @@ -294,8 +293,8 @@ static char const *char_name (char); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 277 of yacc.c */ -#line 88 "src/parse-gram.y" +/* Line 294 of yacc.c */ +#line 106 "src/parse-gram.y" assoc assoc; char *code; @@ -307,14 +306,14 @@ typedef union YYSTYPE uniqstr uniqstr; unsigned char character; -/* Line 277 of yacc.c */ -#line 226 "src/parse-gram.y" +/* Line 294 of yacc.c */ +#line 244 "src/parse-gram.y" param_type param; -/* Line 277 of yacc.c */ -#line 318 "src/parse-gram.c" +/* Line 294 of yacc.c */ +#line 316 "src/parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -337,26 +336,44 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 327 of yacc.c */ -#line 342 "src/parse-gram.c" +/* Line 344 of yacc.c */ +#line 340 "src/parse-gram.c" /* Unqualified %code blocks. */ -/* Line 328 of yacc.c */ -#line 56 "src/parse-gram.y" +/* Line 345 of yacc.c */ +#line 55 "src/parse-gram.y" static int current_prec = 0; static location current_lhs_location; static named_ref *current_lhs_named_ref; - static symbol *current_lhs; + static symbol *current_lhs_symbol; static symbol_class current_class = unknown_sym; static uniqstr current_type = NULL; + /** Set the new current left-hand side symbol, possibly common + * to several right-hand side parts of rule. + */ + static + void + current_lhs(symbol *sym, location loc, named_ref *ref) + { + current_lhs_symbol = sym; + current_lhs_location = loc; + /* In order to simplify memory management, named references for lhs + are always assigned by deep copy into the current symbol_list + node. This is because a single named-ref in the grammar may + result in several uses when the user factors lhs between several + rules using "|". Therefore free the parser's original copy. */ + free (current_lhs_named_ref); + current_lhs_named_ref = ref; + } + #define YYTYPE_INT16 int_fast16_t #define YYTYPE_INT8 int_fast8_t #define YYTYPE_UINT16 uint_fast16_t #define YYTYPE_UINT8 uint_fast8_t -/* Line 328 of yacc.c */ -#line 215 "src/parse-gram.y" +/* Line 345 of yacc.c */ +#line 233 "src/parse-gram.y" /** Add a lex-param and/or a parse-param. * @@ -368,8 +385,8 @@ typedef struct YYLTYPE static param_type current_param = param_none; -/* Line 328 of yacc.c */ -#line 373 "src/parse-gram.c" +/* Line 345 of yacc.c */ +#line 389 "src/parse-gram.c" #ifdef short # undef short @@ -455,34 +472,10 @@ YYID (yyi) } #endif -#if ! defined yyoverflow || YYERROR_VERBOSE +#if 1 /* The parser invokes alloca or malloc; define the necessary symbols. */ -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 -# endif -# endif -# endif -# endif -# endif - # ifdef YYSTACK_ALLOC /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) @@ -501,7 +494,7 @@ YYID (yyi) # endif # if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 @@ -522,13 +515,14 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ +# define YYCOPY_NEEDED 1 +#endif #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ - && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ + && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -547,6 +541,27 @@ union yyalloc ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + 2 * YYSTACK_GAP_MAXIMUM) +# define YYCOPY_NEEDED 1 + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (YYID (0)) + +#endif + +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ # ifndef YYCOPY @@ -554,34 +569,17 @@ union yyalloc # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ while (YYID (0)) # endif # endif - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) - -#endif +#endif /* !YYCOPY_NEEDED */ /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 @@ -602,7 +600,7 @@ union yyalloc #define YYUNDEFTOK 2 #define YYMAXUTOK 311 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM @@ -647,18 +645,18 @@ static const yytype_uint8 yytranslate[] = /* YYRLINEYYN -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 251, 251, 259, 261, 265, 266, 276, 280, 285, - 286, 291, 296, 297, 298, 299, 300, 305, 314, 315, - 316, 317, 318, 319, 320, 321, 321, 322, 323, 347, - 348, 349, 350, 354, 355, 364, 365, 366, 370, 377, - 384, 388, 392, 399, 414, 415, 419, 431, 431, 436, - 436, 441, 452, 467, 468, 469, 470, 474, 475, 480, - 482, 487, 488, 493, 495, 500, 501, 505, 506, 507, - 508, 513, 518, 523, 529, 535, 546, 547, 556, 557, - 563, 564, 565, 572, 572, 577, 578, 579, 584, 586, - 588, 590, 592, 594, 596, 601, 603, 613, 614, 619, - 620, 621, 630, 650, 652, 661, 666, 667, 672, 679, - 681 + 0, 269, 269, 277, 279, 283, 284, 294, 298, 303, + 304, 309, 314, 315, 316, 317, 318, 323, 332, 333, + 334, 335, 336, 337, 338, 339, 339, 340, 341, 365, + 366, 367, 368, 372, 373, 382, 383, 384, 388, 395, + 402, 406, 410, 417, 432, 433, 437, 449, 449, 454, + 454, 459, 470, 485, 486, 487, 488, 492, 493, 498, + 500, 505, 506, 511, 513, 518, 519, 523, 524, 525, + 526, 531, 536, 541, 547, 553, 564, 565, 574, 575, + 581, 582, 583, 590, 590, 598, 599, 600, 605, 607, + 609, 611, 613, 615, 617, 622, 624, 634, 635, 640, + 641, 642, 651, 671, 673, 682, 687, 688, 693, 700, + 702 }; #endif @@ -878,14 +876,14 @@ static const yytype_uint8 yyr2[] = }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab /* Like YYERROR except do call yyerror. This remains here temporarily @@ -895,7 +893,7 @@ static const yytype_uint8 yyr2[] = in Bison 2.4.2's NEWS entry, where a plan to phase it out is discussed. */ -#define YYFAIL goto yyerrlab +#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 @@ -905,25 +903,26 @@ static const yytype_uint8 yyr2[] = #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY && yylen == 1) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (1); \ + YY_LAC_DISCARD ("YYBACKUP"); \ + goto yybackup; \ + } \ + else \ + { \ yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ + YYERROR; \ + } \ while (YYID (0)) -#define YYTERROR 1 -#define YYERRCODE 256 +#define YYTERROR 1 +#define YYERRCODE 256 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. @@ -932,22 +931,22 @@ while (YYID (0)) #define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ while (YYID (0)) #endif @@ -958,10 +957,10 @@ while (YYID (0)) #ifndef YY_LOCATION_PRINT # 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, \ - (Loc).last_line, (Loc).last_column) +# 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 @@ -984,21 +983,21 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ } while (YYID (0)) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value, Location); \ - YYFPRINTF (stderr, "\n"); \ - } \ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value, Location); \ + YYFPRINTF (stderr, "\n"); \ + } \ } while (YYID (0)) @@ -1033,107 +1032,107 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) { case 3: // "string" -/* Line 729 of yacc.c */ -#line 175 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 193 "src/parse-gram.y" { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); } -/* Line 729 of yacc.c */ -#line 1041 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1039 "src/parse-gram.c" break; case 4: // "integer" -/* Line 729 of yacc.c */ -#line 188 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 206 "src/parse-gram.y" { fprintf (stderr, "%d", ((*yyvaluep).integer)); } -/* Line 729 of yacc.c */ -#line 1050 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1048 "src/parse-gram.c" break; case 24: // "%" -/* Line 729 of yacc.c */ -#line 184 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 202 "src/parse-gram.y" { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); } -/* Line 729 of yacc.c */ -#line 1059 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1057 "src/parse-gram.c" break; case 40: // "{...}" -/* Line 729 of yacc.c */ -#line 177 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 195 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); } -/* Line 729 of yacc.c */ -#line 1068 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1066 "src/parse-gram.c" break; case 42: // "[identifier]" -/* Line 729 of yacc.c */ -#line 182 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 200 "src/parse-gram.y" { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); } -/* Line 729 of yacc.c */ -#line 1077 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1075 "src/parse-gram.c" break; case 43: // "char" -/* Line 729 of yacc.c */ -#line 169 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 187 "src/parse-gram.y" { fputs (char_name (((*yyvaluep).character)), stderr); } -/* Line 729 of yacc.c */ -#line 1086 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1084 "src/parse-gram.c" break; case 44: // "epilogue" -/* Line 729 of yacc.c */ -#line 177 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 195 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 729 of yacc.c */ -#line 1095 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1093 "src/parse-gram.c" break; case 46: // "identifier" -/* Line 729 of yacc.c */ -#line 181 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 199 "src/parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 729 of yacc.c */ -#line 1104 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1102 "src/parse-gram.c" break; case 47: // "identifier:" -/* Line 729 of yacc.c */ -#line 183 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 201 "src/parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); } -/* Line 729 of yacc.c */ -#line 1113 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1111 "src/parse-gram.c" break; case 50: // "%{...%}" -/* Line 729 of yacc.c */ -#line 177 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 195 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 729 of yacc.c */ -#line 1122 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1120 "src/parse-gram.c" break; case 52: // "" -/* Line 729 of yacc.c */ -#line 185 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 203 "src/parse-gram.y" { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); } -/* Line 729 of yacc.c */ -#line 1131 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1129 "src/parse-gram.c" break; case 55: // "%param" -/* Line 729 of yacc.c */ -#line 231 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 249 "src/parse-gram.y" { switch (((*yyvaluep).param)) { @@ -1146,84 +1145,84 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) case param_none: aver (false); break; } } -/* Line 729 of yacc.c */ -#line 1151 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1149 "src/parse-gram.c" break; case 72: // symbol.prec -/* Line 729 of yacc.c */ -#line 191 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 209 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 729 of yacc.c */ -#line 1160 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1158 "src/parse-gram.c" break; case 85: // variable -/* Line 729 of yacc.c */ -#line 181 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 199 "src/parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); } -/* Line 729 of yacc.c */ -#line 1169 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1167 "src/parse-gram.c" break; case 86: // content.opt -/* Line 729 of yacc.c */ -#line 177 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 195 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 729 of yacc.c */ -#line 1178 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1176 "src/parse-gram.c" break; case 87: // braceless -/* Line 729 of yacc.c */ -#line 177 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 195 "src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); } -/* Line 729 of yacc.c */ -#line 1187 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1185 "src/parse-gram.c" break; case 88: // id -/* Line 729 of yacc.c */ -#line 191 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 209 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 729 of yacc.c */ -#line 1196 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1194 "src/parse-gram.c" break; case 89: // id_colon -/* Line 729 of yacc.c */ -#line 192 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 210 "src/parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); } -/* Line 729 of yacc.c */ -#line 1205 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1203 "src/parse-gram.c" break; case 90: // symbol -/* Line 729 of yacc.c */ -#line 191 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 209 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 729 of yacc.c */ -#line 1214 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1212 "src/parse-gram.c" break; case 91: // string_as_id -/* Line 729 of yacc.c */ -#line 191 "src/parse-gram.y" +/* Line 751 of yacc.c */ +#line 209 "src/parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); } -/* Line 729 of yacc.c */ -#line 1223 "src/parse-gram.c" +/* Line 751 of yacc.c */ +#line 1221 "src/parse-gram.c" break; default: - break; + break; } } @@ -1281,10 +1280,10 @@ yy_stack_print (yybottom, yytop) YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ } while (YYID (0)) @@ -1322,9 +1321,9 @@ yy_reduce_print (yyssp, yyvsp, yylsp, yyrule) } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \ } while (YYID (0)) @@ -1340,7 +1339,7 @@ int yydebug; /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1355,7 +1354,239 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - +/* Given a state stack such that *YYBOTTOM is its bottom, such that + *YYTOP is either its top or is YYTOP_EMPTY to indicate an empty + stack, and such that *YYCAPACITY is the maximum number of elements it + can hold without a reallocation, make sure there is enough room to + store YYADD more elements. If not, allocate a new stack using + YYSTACK_ALLOC, copy the existing elements, and adjust *YYBOTTOM, + *YYTOP, and *YYCAPACITY to reflect the new capacity and memory + location. If *YYBOTTOM != YYBOTTOM_NO_FREE, then free the old stack + using YYSTACK_FREE. Return 0 if successful or if no reallocation is + required. Return 1 if memory is exhausted. */ +static int +yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd, +#if YYDEBUG + char const *yydebug_prefix, + char const *yydebug_suffix, +#endif + yytype_int16 **yybottom, + yytype_int16 *yybottom_no_free, + yytype_int16 **yytop, yytype_int16 *yytop_empty) +{ + YYSIZE_T yysize_old = + *yytop == yytop_empty ? 0 : *yytop - *yybottom + 1; + YYSIZE_T yysize_new = yysize_old + yyadd; + if (*yycapacity < yysize_new) + { + YYSIZE_T yyalloc = 2 * yysize_new; + yytype_int16 *yybottom_new; + /* Use YYMAXDEPTH for maximum stack size given that the stack + should never need to grow larger than the main state stack + needs to grow without LAC. */ + if (YYMAXDEPTH < yysize_new) + { + YYDPRINTF ((stderr, "%smax size exceeded%s", yydebug_prefix, + yydebug_suffix)); + return 1; + } + if (YYMAXDEPTH < yyalloc) + yyalloc = YYMAXDEPTH; + yybottom_new = + (yytype_int16*) YYSTACK_ALLOC (yyalloc * sizeof *yybottom_new); + if (!yybottom_new) + { + YYDPRINTF ((stderr, "%srealloc failed%s", yydebug_prefix, + yydebug_suffix)); + return 1; + } + if (*yytop != yytop_empty) + { + YYCOPY (yybottom_new, *yybottom, yysize_old); + *yytop = yybottom_new + (yysize_old - 1); + } + if (*yybottom != yybottom_no_free) + YYSTACK_FREE (*yybottom); + *yybottom = yybottom_new; + *yycapacity = yyalloc; + } + return 0; +} + +/* Establish the initial context for the current lookahead if no initial + context is currently established. + + We define a context as a snapshot of the parser stacks. We define + the initial context for a lookahead as the context in which the + parser initially examines that lookahead in order to select a + syntactic action. Thus, if the lookahead eventually proves + syntactically unacceptable (possibly in a later context reached via a + series of reductions), the initial context can be used to determine + the exact set of tokens that would be syntactically acceptable in the + lookahead's place. Moreover, it is the context after which any + further semantic actions would be erroneous because they would be + determined by a syntactically unacceptable token. + + YY_LAC_ESTABLISH should be invoked when a reduction is about to be + performed in an inconsistent state (which, for the purposes of LAC, + includes consistent states that don't know they're consistent because + their default reductions have been disabled). Iff there is a + lookahead token, it should also be invoked before reporting a syntax + error. This latter case is for the sake of the debugging output. + + For parse.lac=full, the implementation of YY_LAC_ESTABLISH is as + follows. If no initial context is currently established for the + current lookahead, then check if that lookahead can eventually be + shifted if syntactic actions continue from the current context. + Report a syntax error if it cannot. */ +#define YY_LAC_ESTABLISH \ +do { \ + if (!yy_lac_established) \ + { \ + YYDPRINTF ((stderr, \ + "LAC: initial context established for %s\n", \ + yytname[yytoken])); \ + yy_lac_established = 1; \ + { \ + int yy_lac_status = \ + yy_lac (yyesa, &yyes, &yyes_capacity, yyssp, yytoken); \ + if (yy_lac_status == 2) \ + goto yyexhaustedlab; \ + if (yy_lac_status == 1) \ + goto yyerrlab; \ + } \ + } \ +} while (YYID (0)) + +/* Discard any previous initial lookahead context because of Event, + which may be a lookahead change or an invalidation of the currently + established initial context for the current lookahead. + + The most common example of a lookahead change is a shift. An example + of both cases is syntax error recovery. That is, a syntax error + occurs when the lookahead is syntactically erroneous for the + currently established initial context, so error recovery manipulates + the parser stacks to try to find a new initial context in which the + current lookahead is syntactically acceptable. If it fails to find + such a context, it discards the lookahead. */ +#if YYDEBUG +# define YY_LAC_DISCARD(Event) \ +do { \ + if (yy_lac_established) \ + { \ + if (yydebug) \ + YYFPRINTF (stderr, "LAC: initial context discarded due to " \ + Event "\n"); \ + yy_lac_established = 0; \ + } \ +} while (YYID (0)) +#else +# define YY_LAC_DISCARD(Event) yy_lac_established = 0 +#endif + +/* Given the stack whose top is *YYSSP, return 0 iff YYTOKEN can + eventually (after perhaps some reductions) be shifted, return 1 if + not, or return 2 if memory is exhausted. As preconditions and + postconditions: *YYES_CAPACITY is the allocated size of the array to + which *YYES points, and either *YYES = YYESA or *YYES points to an + array allocated with YYSTACK_ALLOC. yy_lac may overwrite the + contents of either array, alter *YYES and *YYES_CAPACITY, and free + any old *YYES other than YYESA. */ +static int +yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes, + YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken) +{ + yytype_int16 *yyes_prev = yyssp; + yytype_int16 *yyesp = yyes_prev; + YYDPRINTF ((stderr, "LAC: checking lookahead %s:", yytname[yytoken])); + if (yytoken == YYUNDEFTOK) + { + YYDPRINTF ((stderr, " Always Err\n")); + return 1; + } + while (1) + { + int yyrule = yypact[*yyesp]; + if (yypact_value_is_default (yyrule) + || (yyrule += yytoken) < 0 || YYLAST < yyrule + || yycheck[yyrule] != yytoken) + { + yyrule = yydefact[*yyesp]; + if (yyrule == 0) + { + YYDPRINTF ((stderr, " Err\n")); + return 1; + } + } + else + { + yyrule = yytable[yyrule]; + if (yytable_value_is_error (yyrule)) + { + YYDPRINTF ((stderr, " Err\n")); + return 1; + } + if (0 < yyrule) + { + YYDPRINTF ((stderr, " S%d\n", yyrule)); + return 0; + } + yyrule = -yyrule; + } + { + YYSIZE_T yylen = yyr2[yyrule]; + YYDPRINTF ((stderr, " R%d", yyrule - 1)); + if (yyesp != yyes_prev) + { + YYSIZE_T yysize = yyesp - *yyes + 1; + if (yylen < yysize) + { + yyesp -= yylen; + yylen = 0; + } + else + { + yylen -= yysize; + yyesp = yyes_prev; + } + } + if (yylen) + yyesp = yyes_prev -= yylen; + } + { + int yystate; + { + int yylhs = yyr1[yyrule] - YYNTOKENS; + yystate = yypgoto[yylhs] + *yyesp; + if (yystate < 0 || YYLAST < yystate + || yycheck[yystate] != *yyesp) + yystate = yydefgoto[yylhs]; + else + yystate = yytable[yystate]; + } + if (yyesp == yyes_prev) + { + yyesp = *yyes; + *yyesp = yystate; + } + else + { + if (yy_lac_stack_realloc (yyes_capacity, 1, +#if YYDEBUG + " (", ")", +#endif + yyes, yyesa, &yyesp, yyes_prev)) + { + YYDPRINTF ((stderr, "\n")); + return 2; + } + *++yyesp = yystate; + } + YYDPRINTF ((stderr, " G%d", yystate)); + } + } +} + #if YYERROR_VERBOSE @@ -1427,27 +1658,27 @@ yytnamerr (char *yyres, const char *yystr) char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -1459,22 +1690,19 @@ yytnamerr (char *yyres, const char *yystr) # endif /* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message - about the unexpected token YYTOKEN while in state YYSTATE. - - Return 0 if *YYMSG was successfully written. Return 1 if an ordinary - "syntax error" message will suffice instead. Return 2 if *YYMSG is - not large enough to hold the message. In the last case, also set - *YYMSG_ALLOC to either (a) the required number of bytes or (b) zero - if the required number of bytes is too large to store. */ + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. In order to see if a particular token T is a + valid looakhead, invoke yy_lac (YYESA, YYES, YYES_CAPACITY, YYSSP, T). + + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store or if + yy_lac returned 2. */ static int yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, - int yystate, int yytoken) -{ - int yyn = yypact[yystate]; - - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 1; - else + yytype_int16 *yyesa, yytype_int16 **yyes, + YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken) { YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); YYSIZE_T yysize = yysize0; @@ -1484,26 +1712,54 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, const char *yyformat = 0; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. In other words, skip the first -YYN actions for - this state because they are default actions. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; /* Number of reported tokens (one for the "unexpected", one per "expected"). */ int yycount = 0; - int yyx; - yyarg[yycount++] = yytname[yytoken]; + /* There are many possibilities here to consider: + - Assume YYFAIL is not used. It's too flawed to consider. See + + for details. YYERROR is fine as it does not invoke this + function. + - If this state is a consistent state with a default action, then + the only way this function was invoked is if the default action + is an error action. In that case, don't check for expected + tokens because there are none. + - The only way there can be no lookahead present (in yychar) is if + this state is a consistent state with a default action. Thus, + detecting the absence of a lookahead is sufficient to determine + that there is no unexpected or expected token to report. In that + case, just report a simple "syntax error". + - Don't assume there isn't a lookahead just because this state is a + consistent state with a default action. There might have been a + previous inconsistent state, consistent state with a non-default + action, or user semantic action that manipulated yychar. + In the first two cases, it might appear that the current syntax + error should have been detected in the previous state when yy_lac + was invoked. However, at that time, there might have been a + different syntax error that discarded a different initial context + during error recovery, leaving behind the current lookahead. + */ + if (yytoken != YYEMPTY) + { + int yyn = yypact[*yyssp]; + YYDPRINTF ((stderr, "Constructing syntax error message\n")); + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + int yyx; - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR - && !yytable_value_is_error (yytable[yyx + yyn])) + for (yyx = 0; yyx < YYNTOKENS; ++yyx) + if (yyx != YYTERROR && yyx != YYUNDEFTOK) { + { + int yy_lac_status = yy_lac (yyesa, yyes, yyes_capacity, + yyssp, yyx); + if (yy_lac_status == 2) + return 2; + if (yy_lac_status == 1) + continue; + } if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) { yycount = 1; @@ -1512,36 +1768,36 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, } yyarg[yycount++] = yytname[yyx]; yysize1 = yysize + yytnamerr (0, yytname[yyx]); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - { - /* Overflow. */ - *yymsg_alloc = 0; - return 2; - } + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; yysize = yysize1; } + } +# if YYDEBUG + else if (yydebug) + YYFPRINTF (stderr, "No expected tokens.\n"); +# endif + } switch (yycount) { -#define YYCASE_(N, S) \ +# define YYCASE_(N, S) \ case N: \ yyformat = S; \ break + YYCASE_(0, YY_("syntax error")); YYCASE_(1, YY_("syntax error, unexpected %s")); YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -#undef YYCASE_ +# undef YYCASE_ } yysize1 = yysize + yystrlen (yyformat); if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - { - /* Overflow. */ - *yymsg_alloc = 0; - return 2; - } + return 2; yysize = yysize1; if (*yymsg_alloc < yysize) @@ -1550,7 +1806,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, if (! (yysize <= *yymsg_alloc && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; - return 2; + return 1; } /* Avoid sprintf, as that infringes on the user's name space. @@ -1573,9 +1829,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, } return 0; } -} #endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | @@ -1605,7 +1859,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) switch (yytype) { default: - break; + break; } } @@ -1698,6 +1952,11 @@ YYLTYPE yylloc; YYSIZE_T yystacksize; + yytype_int16 yyesa[20]; + yytype_int16 *yyes; + YYSIZE_T yyes_capacity; + + int yy_lac_established = 0; int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ @@ -1726,6 +1985,11 @@ YYLTYPE yylloc; yyls = yylsa; yystacksize = YYINITDEPTH; + yyes = yyesa; + yyes_capacity = sizeof yyesa / sizeof *yyes; + if (YYMAXDEPTH < yyes_capacity) + yyes_capacity = YYMAXDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; @@ -1748,16 +2012,16 @@ YYLTYPE yylloc; #endif /* User initialization code. */ -/* Line 1213 of yacc.c */ -#line 80 "src/parse-gram.y" +/* Line 1524 of yacc.c */ +#line 98 "src/parse-gram.y" { /* 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 1213 of yacc.c */ -#line 1761 "src/parse-gram.c" +/* Line 1524 of yacc.c */ +#line 2024 "src/parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1780,26 +2044,26 @@ YYLTYPE yylloc; #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - YYLTYPE *yyls1 = yyls; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yyls1, yysize * sizeof (*yylsp), - &yystacksize); - - yyls = yyls1; - yyss = yyss1; - yyvs = yyvs1; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + YYLTYPE *yyls1 = yyls; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yyls1, yysize * sizeof (*yylsp), + &yystacksize); + + yyls = yyls1; + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -1807,23 +2071,23 @@ YYLTYPE yylloc; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); - YYSTACK_RELOCATE (yyls_alloc, yyls); + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); + YYSTACK_RELOCATE (yyls_alloc, yyls); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -1833,10 +2097,10 @@ YYLTYPE yylloc; yylsp = yyls + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -1883,12 +2147,16 @@ yybackup: detect an error, take that action. */ yyn += yytoken; if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) - goto yydefault; + { + YY_LAC_ESTABLISH; + goto yydefault; + } yyn = yytable[yyn]; if (yyn <= 0) { if (yytable_value_is_error (yyn)) - goto yyerrlab; + goto yyerrlab; + YY_LAC_ESTABLISH; yyn = -yyn; goto yyreduce; } @@ -1903,6 +2171,7 @@ yybackup: /* Discard the shifted token. */ yychar = YYEMPTY; + YY_LAC_DISCARD ("shift"); yystate = yyn; *++yyvsp = yylval; @@ -1940,11 +2209,13 @@ yyreduce: /* Default location. */ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 6: -/* Line 1426 of yacc.c */ -#line 267 "src/parse-gram.y" + { + int yychar_backup = yychar; + switch (yyn) + { + case 6: +/* Line 1740 of yacc.c */ +#line 285 "src/parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -1954,107 +2225,107 @@ yyreduce: plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1426 of yacc.c */ -#line 1959 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2229 "src/parse-gram.c" break; case 7: -/* Line 1426 of yacc.c */ -#line 277 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 295 "src/parse-gram.y" { muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true); } -/* Line 1426 of yacc.c */ -#line 1969 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2239 "src/parse-gram.c" break; case 8: -/* Line 1426 of yacc.c */ -#line 281 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 299 "src/parse-gram.y" { muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1426 of yacc.c */ -#line 1980 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2250 "src/parse-gram.c" break; case 9: -/* Line 1426 of yacc.c */ -#line 285 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 303 "src/parse-gram.y" { defines_flag = true; } -/* Line 1426 of yacc.c */ -#line 1988 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2258 "src/parse-gram.c" break; case 10: -/* Line 1426 of yacc.c */ -#line 287 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 305 "src/parse-gram.y" { defines_flag = true; spec_defines_file = xstrdup ((yyvsp[0].chars)); } -/* Line 1426 of yacc.c */ -#line 1999 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2269 "src/parse-gram.c" break; case 11: -/* Line 1426 of yacc.c */ -#line 292 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 310 "src/parse-gram.y" { muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose", MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } -/* Line 1426 of yacc.c */ -#line 2010 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2280 "src/parse-gram.c" break; case 12: -/* Line 1426 of yacc.c */ -#line 296 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 314 "src/parse-gram.y" { expected_sr_conflicts = (yyvsp[0].integer); } -/* Line 1426 of yacc.c */ -#line 2018 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2288 "src/parse-gram.c" break; case 13: -/* Line 1426 of yacc.c */ -#line 297 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 315 "src/parse-gram.y" { expected_rr_conflicts = (yyvsp[0].integer); } -/* Line 1426 of yacc.c */ -#line 2026 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2296 "src/parse-gram.c" break; case 14: -/* Line 1426 of yacc.c */ -#line 298 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 316 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1426 of yacc.c */ -#line 2034 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2304 "src/parse-gram.c" break; case 15: -/* Line 1426 of yacc.c */ -#line 299 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 317 "src/parse-gram.y" { spec_file_prefix = (yyvsp[0].chars); } -/* Line 1426 of yacc.c */ -#line 2042 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2312 "src/parse-gram.c" break; case 16: -/* Line 1426 of yacc.c */ -#line 301 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 319 "src/parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } -/* Line 1426 of yacc.c */ -#line 2053 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2323 "src/parse-gram.c" break; case 17: -/* Line 1426 of yacc.c */ -#line 306 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 324 "src/parse-gram.y" { code_props action; code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0])); @@ -2063,96 +2334,96 @@ yyreduce: muscle_code_grow ("initial_action", action.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1426 of yacc.c */ -#line 2068 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2338 "src/parse-gram.c" break; case 18: -/* Line 1426 of yacc.c */ -#line 314 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 332 "src/parse-gram.y" { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); } -/* Line 1426 of yacc.c */ -#line 2076 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2346 "src/parse-gram.c" break; case 19: -/* Line 1426 of yacc.c */ -#line 315 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 333 "src/parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1426 of yacc.c */ -#line 2084 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2354 "src/parse-gram.c" break; case 20: -/* Line 1426 of yacc.c */ -#line 316 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 334 "src/parse-gram.y" { spec_name_prefix = (yyvsp[0].chars); } -/* Line 1426 of yacc.c */ -#line 2092 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2362 "src/parse-gram.c" break; case 21: -/* Line 1426 of yacc.c */ -#line 317 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 335 "src/parse-gram.y" { no_lines_flag = true; } -/* Line 1426 of yacc.c */ -#line 2100 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2370 "src/parse-gram.c" break; case 22: -/* Line 1426 of yacc.c */ -#line 318 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 336 "src/parse-gram.y" { nondeterministic_parser = true; } -/* Line 1426 of yacc.c */ -#line 2108 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2378 "src/parse-gram.c" break; case 23: -/* Line 1426 of yacc.c */ -#line 319 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 337 "src/parse-gram.y" { spec_outfile = (yyvsp[0].chars); } -/* Line 1426 of yacc.c */ -#line 2116 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2386 "src/parse-gram.c" break; case 24: -/* Line 1426 of yacc.c */ -#line 320 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 338 "src/parse-gram.y" { spec_outfile = (yyvsp[0].chars); } -/* Line 1426 of yacc.c */ -#line 2124 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2394 "src/parse-gram.c" break; case 25: -/* Line 1426 of yacc.c */ -#line 321 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 339 "src/parse-gram.y" { current_param = (yyvsp[0].param); } -/* Line 1426 of yacc.c */ -#line 2132 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2402 "src/parse-gram.c" break; case 26: -/* Line 1426 of yacc.c */ -#line 321 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 339 "src/parse-gram.y" { current_param = param_none; } -/* Line 1426 of yacc.c */ -#line 2140 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2410 "src/parse-gram.c" break; case 27: -/* Line 1426 of yacc.c */ -#line 322 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 340 "src/parse-gram.y" { version_check (&(yylsp[0]), (yyvsp[0].chars)); } -/* Line 1426 of yacc.c */ -#line 2148 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2418 "src/parse-gram.c" break; case 28: -/* Line 1426 of yacc.c */ -#line 324 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 342 "src/parse-gram.y" { char const *skeleton_user = (yyvsp[0].chars); - if (strchr (skeleton_user, '/')) + if (mbschr (skeleton_user, '/')) { size_t dir_length = strlen (current_file); char *skeleton_build; @@ -2173,566 +2444,576 @@ yyreduce: } skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1])); } -/* Line 1426 of yacc.c */ -#line 2178 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2448 "src/parse-gram.c" break; case 29: -/* Line 1426 of yacc.c */ -#line 347 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 365 "src/parse-gram.y" { token_table_flag = true; } -/* Line 1426 of yacc.c */ -#line 2186 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2456 "src/parse-gram.c" break; case 30: -/* Line 1426 of yacc.c */ -#line 348 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 366 "src/parse-gram.y" { report_flag |= report_states; } -/* Line 1426 of yacc.c */ -#line 2194 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2464 "src/parse-gram.c" break; case 31: -/* Line 1426 of yacc.c */ -#line 349 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 367 "src/parse-gram.y" { yacc_flag = true; } -/* Line 1426 of yacc.c */ -#line 2202 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2472 "src/parse-gram.c" break; case 33: -/* Line 1426 of yacc.c */ -#line 354 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 372 "src/parse-gram.y" { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2210 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2480 "src/parse-gram.c" break; case 34: -/* Line 1426 of yacc.c */ -#line 355 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 373 "src/parse-gram.y" { add_param (current_param, (yyvsp[0].code), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2218 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2488 "src/parse-gram.c" break; case 37: -/* Line 1426 of yacc.c */ -#line 367 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 385 "src/parse-gram.y" { grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2228 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2498 "src/parse-gram.c" break; case 38: -/* Line 1426 of yacc.c */ -#line 371 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 389 "src/parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) - symbol_list_destructor_set (list, (yyvsp[-1].code), (yylsp[-1])); + symbol_list_destructor_set (list, (yyvsp[-1].code), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1426 of yacc.c */ -#line 2241 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2511 "src/parse-gram.c" break; case 39: -/* Line 1426 of yacc.c */ -#line 378 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 396 "src/parse-gram.y" { symbol_list *list; for (list = (yyvsp[0].list); list; list = list->next) - symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1])); + symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1426 of yacc.c */ -#line 2254 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2524 "src/parse-gram.c" break; case 40: -/* Line 1426 of yacc.c */ -#line 385 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 403 "src/parse-gram.y" { default_prec = true; } -/* Line 1426 of yacc.c */ -#line 2264 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2534 "src/parse-gram.c" break; case 41: -/* Line 1426 of yacc.c */ -#line 389 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 407 "src/parse-gram.y" { default_prec = false; } -/* Line 1426 of yacc.c */ -#line 2274 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2544 "src/parse-gram.c" break; case 42: -/* Line 1426 of yacc.c */ -#line 393 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 411 "src/parse-gram.y" { /* 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 1426 of yacc.c */ -#line 2287 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2557 "src/parse-gram.c" break; case 43: -/* Line 1426 of yacc.c */ -#line 400 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 418 "src/parse-gram.y" { muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1426 of yacc.c */ -#line 2298 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2568 "src/parse-gram.c" break; case 44: -/* Line 1426 of yacc.c */ -#line 414 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 432 "src/parse-gram.y" {} -/* Line 1426 of yacc.c */ -#line 2306 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2576 "src/parse-gram.c" break; case 45: -/* Line 1426 of yacc.c */ -#line 415 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 433 "src/parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2314 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2584 "src/parse-gram.c" break; case 46: -/* Line 1426 of yacc.c */ -#line 420 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 438 "src/parse-gram.y" { union_seen = true; muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1426 of yacc.c */ -#line 2326 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2596 "src/parse-gram.c" break; case 47: -/* Line 1426 of yacc.c */ -#line 431 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 449 "src/parse-gram.y" { current_class = nterm_sym; } -/* Line 1426 of yacc.c */ -#line 2334 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2604 "src/parse-gram.c" break; case 48: -/* Line 1426 of yacc.c */ -#line 432 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 450 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1426 of yacc.c */ -#line 2345 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2615 "src/parse-gram.c" break; case 49: -/* Line 1426 of yacc.c */ -#line 436 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 454 "src/parse-gram.y" { current_class = token_sym; } -/* Line 1426 of yacc.c */ -#line 2353 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2623 "src/parse-gram.c" break; case 50: -/* Line 1426 of yacc.c */ -#line 437 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 455 "src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } -/* Line 1426 of yacc.c */ -#line 2364 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2634 "src/parse-gram.c" break; case 51: -/* Line 1426 of yacc.c */ -#line 442 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 460 "src/parse-gram.y" { symbol_list *list; tag_seen = true; for (list = (yyvsp[0].list); list; list = list->next) - symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); + symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1])); symbol_list_free ((yyvsp[0].list)); } -/* Line 1426 of yacc.c */ -#line 2378 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2648 "src/parse-gram.c" break; case 52: -/* Line 1426 of yacc.c */ -#line 453 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 471 "src/parse-gram.y" { symbol_list *list; ++current_prec; for (list = (yyvsp[0].list); list; list = list->next) - { - symbol_type_set (list->content.sym, current_type, (yylsp[-1])); - symbol_precedence_set (list->content.sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2])); - } + { + symbol_type_set (list->content.sym, current_type, (yylsp[-1])); + symbol_precedence_set (list->content.sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2])); + } symbol_list_free ((yyvsp[0].list)); current_type = NULL; } -/* Line 1426 of yacc.c */ -#line 2396 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2666 "src/parse-gram.c" break; case 53: -/* Line 1426 of yacc.c */ -#line 467 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 485 "src/parse-gram.y" { (yyval.assoc) = left_assoc; } -/* Line 1426 of yacc.c */ -#line 2404 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2674 "src/parse-gram.c" break; case 54: -/* Line 1426 of yacc.c */ -#line 468 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 486 "src/parse-gram.y" { (yyval.assoc) = right_assoc; } -/* Line 1426 of yacc.c */ -#line 2412 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2682 "src/parse-gram.c" break; case 55: -/* Line 1426 of yacc.c */ -#line 469 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 487 "src/parse-gram.y" { (yyval.assoc) = non_assoc; } -/* Line 1426 of yacc.c */ -#line 2420 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2690 "src/parse-gram.c" break; case 56: -/* Line 1426 of yacc.c */ -#line 470 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 488 "src/parse-gram.y" { (yyval.assoc) = precedence_assoc; } -/* Line 1426 of yacc.c */ -#line 2428 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2698 "src/parse-gram.c" break; case 57: -/* Line 1426 of yacc.c */ -#line 474 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 492 "src/parse-gram.y" { current_type = NULL; } -/* Line 1426 of yacc.c */ -#line 2436 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2706 "src/parse-gram.c" break; case 58: -/* Line 1426 of yacc.c */ -#line 475 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 493 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1426 of yacc.c */ -#line 2444 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2714 "src/parse-gram.c" break; case 59: -/* Line 1426 of yacc.c */ -#line 481 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 499 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2452 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2722 "src/parse-gram.c" break; case 60: -/* Line 1426 of yacc.c */ -#line 483 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 501 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1426 of yacc.c */ -#line 2460 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2730 "src/parse-gram.c" break; case 61: -/* Line 1426 of yacc.c */ -#line 487 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 505 "src/parse-gram.y" { (yyval.symbol) = (yyvsp[0].symbol); } -/* Line 1426 of yacc.c */ -#line 2468 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2738 "src/parse-gram.c" break; case 62: -/* Line 1426 of yacc.c */ -#line 488 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 506 "src/parse-gram.y" { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2476 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2746 "src/parse-gram.c" break; case 63: -/* Line 1426 of yacc.c */ -#line 494 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 512 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2484 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2754 "src/parse-gram.c" break; case 64: -/* Line 1426 of yacc.c */ -#line 496 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 514 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); } -/* Line 1426 of yacc.c */ -#line 2492 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2762 "src/parse-gram.c" break; case 65: -/* Line 1426 of yacc.c */ -#line 500 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 518 "src/parse-gram.y" { (yyval.list) = (yyvsp[0].list); } -/* Line 1426 of yacc.c */ -#line 2500 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2770 "src/parse-gram.c" break; case 66: -/* Line 1426 of yacc.c */ -#line 501 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 519 "src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); } -/* Line 1426 of yacc.c */ -#line 2508 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2778 "src/parse-gram.c" break; case 67: -/* Line 1426 of yacc.c */ -#line 505 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 523 "src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2516 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2786 "src/parse-gram.c" break; case 68: -/* Line 1426 of yacc.c */ -#line 506 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 524 "src/parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2524 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2794 "src/parse-gram.c" break; case 69: -/* Line 1426 of yacc.c */ -#line 507 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 525 "src/parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2532 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2802 "src/parse-gram.c" break; case 70: -/* Line 1426 of yacc.c */ -#line 508 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 526 "src/parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2540 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2810 "src/parse-gram.c" break; case 71: -/* Line 1426 of yacc.c */ -#line 514 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 532 "src/parse-gram.y" { current_type = (yyvsp[0].uniqstr); tag_seen = true; } -/* Line 1426 of yacc.c */ -#line 2551 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2821 "src/parse-gram.c" break; case 72: -/* Line 1426 of yacc.c */ -#line 519 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 537 "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 1426 of yacc.c */ -#line 2562 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2832 "src/parse-gram.c" break; case 73: -/* Line 1426 of yacc.c */ -#line 524 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 542 "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 1426 of yacc.c */ -#line 2574 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2844 "src/parse-gram.c" break; case 74: -/* Line 1426 of yacc.c */ -#line 530 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 548 "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 1426 of yacc.c */ -#line 2586 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2856 "src/parse-gram.c" break; case 75: -/* Line 1426 of yacc.c */ -#line 536 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 554 "src/parse-gram.y" { 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 1426 of yacc.c */ -#line 2599 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2869 "src/parse-gram.c" break; case 82: -/* Line 1426 of yacc.c */ -#line 566 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 584 "src/parse-gram.y" { yyerrok; } -/* Line 1426 of yacc.c */ -#line 2609 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2879 "src/parse-gram.c" break; case 83: -/* Line 1426 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 1426 of yacc.c */ -#line 2618 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 590 "src/parse-gram.y" + { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } +/* Line 1740 of yacc.c */ +#line 2887 "src/parse-gram.c" + break; + + case 84: +/* Line 1740 of yacc.c */ +#line 591 "src/parse-gram.y" + { + /* Free the current lhs. */ + current_lhs (0, (yylsp[-3]), 0); + } +/* Line 1740 of yacc.c */ +#line 2898 "src/parse-gram.c" break; case 85: -/* Line 1426 of yacc.c */ -#line 577 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 598 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2626 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2906 "src/parse-gram.c" break; case 86: -/* Line 1426 of yacc.c */ -#line 578 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 599 "src/parse-gram.y" { grammar_current_rule_end ((yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2634 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2914 "src/parse-gram.c" break; case 88: -/* Line 1426 of yacc.c */ -#line 584 "src/parse-gram.y" - { grammar_current_rule_begin (current_lhs, current_lhs_location, - current_lhs_named_ref); } -/* Line 1426 of yacc.c */ -#line 2643 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 605 "src/parse-gram.y" + { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, + current_lhs_named_ref); } +/* Line 1740 of yacc.c */ +#line 2923 "src/parse-gram.c" break; case 89: -/* Line 1426 of yacc.c */ -#line 587 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 608 "src/parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); } -/* Line 1426 of yacc.c */ -#line 2651 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2931 "src/parse-gram.c" break; case 90: -/* Line 1426 of yacc.c */ -#line 589 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 610 "src/parse-gram.y" { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); } -/* Line 1426 of yacc.c */ -#line 2659 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2939 "src/parse-gram.c" break; case 91: -/* Line 1426 of yacc.c */ -#line 591 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 612 "src/parse-gram.y" { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); } -/* Line 1426 of yacc.c */ -#line 2667 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2947 "src/parse-gram.c" break; case 92: -/* Line 1426 of yacc.c */ -#line 593 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 614 "src/parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2675 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2955 "src/parse-gram.c" break; case 93: -/* Line 1426 of yacc.c */ -#line 595 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 616 "src/parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2683 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2963 "src/parse-gram.c" break; case 94: -/* Line 1426 of yacc.c */ -#line 597 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 618 "src/parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2691 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2971 "src/parse-gram.c" break; case 95: -/* Line 1426 of yacc.c */ -#line 601 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 622 "src/parse-gram.y" { (yyval.named_ref) = 0; } -/* Line 1426 of yacc.c */ -#line 2699 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2979 "src/parse-gram.c" break; case 96: -/* Line 1426 of yacc.c */ -#line 603 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 624 "src/parse-gram.y" { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2707 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2987 "src/parse-gram.c" break; case 98: -/* Line 1426 of yacc.c */ -#line 614 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 635 "src/parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); } -/* Line 1426 of yacc.c */ -#line 2715 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 2995 "src/parse-gram.c" break; case 99: -/* Line 1426 of yacc.c */ -#line 619 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 640 "src/parse-gram.y" { (yyval.chars) = ""; } -/* Line 1426 of yacc.c */ -#line 2723 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3003 "src/parse-gram.c" break; case 100: -/* Line 1426 of yacc.c */ -#line 620 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 641 "src/parse-gram.y" { (yyval.chars) = (yyvsp[0].uniqstr); } -/* Line 1426 of yacc.c */ -#line 2731 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3011 "src/parse-gram.c" break; case 102: -/* Line 1426 of yacc.c */ -#line 631 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 652 "src/parse-gram.y" { code_props plain_code; (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n'; @@ -2741,52 +3022,52 @@ yyreduce: gram_scanner_last_string_free (); (yyval.chars) = plain_code.code; } -/* Line 1426 of yacc.c */ -#line 2746 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3026 "src/parse-gram.c" break; case 103: -/* Line 1426 of yacc.c */ -#line 651 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 672 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2754 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3034 "src/parse-gram.c" break; case 104: -/* Line 1426 of yacc.c */ -#line 653 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 674 "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 1426 of yacc.c */ -#line 2766 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3046 "src/parse-gram.c" break; case 105: -/* Line 1426 of yacc.c */ -#line 661 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 682 "src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); } -/* Line 1426 of yacc.c */ -#line 2774 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3054 "src/parse-gram.c" break; case 108: -/* Line 1426 of yacc.c */ -#line 673 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 694 "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 1426 of yacc.c */ -#line 2785 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3065 "src/parse-gram.c" break; case 110: -/* Line 1426 of yacc.c */ -#line 682 "src/parse-gram.y" +/* Line 1740 of yacc.c */ +#line 703 "src/parse-gram.y" { code_props plain_code; code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0])); @@ -2795,15 +3076,18 @@ yyreduce: muscle_code_grow ("epilogue", plain_code.code, (yylsp[0])); code_scanner_last_string_free (); } -/* Line 1426 of yacc.c */ -#line 2800 "src/parse-gram.c" +/* Line 1740 of yacc.c */ +#line 3080 "src/parse-gram.c" break; -/* Line 1426 of yacc.c */ -#line 2805 "src/parse-gram.c" - default: break; - } +/* Line 1740 of yacc.c */ +#line 3085 "src/parse-gram.c" + default: break; + } + if (yychar_backup != yychar) + YY_LAC_DISCARD ("yychar change"); + } /* User semantic actions sometimes alter yychar, and that requires that yytoken be updated with the new translation. We take the approach of translating immediately before every use of yytoken. @@ -2845,7 +3129,7 @@ yyreduce: yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ - yytoken = YYTRANSLATE (yychar); + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); /* If not already recovering from an error, report this error. */ if (!yyerrstatus) @@ -2854,14 +3138,18 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); #else -# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, yystate, \ - yytoken) +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyesa, &yyes, &yyes_capacity, \ + yyssp, yytoken) { char const *yymsgp = YY_("syntax error"); - int yysyntax_error_status = YYSYNTAX_ERROR; + int yysyntax_error_status; + if (yychar != YYEMPTY) + YY_LAC_ESTABLISH; + yysyntax_error_status = YYSYNTAX_ERROR; if (yysyntax_error_status == 0) yymsgp = yymsg; - else if (yysyntax_error_status == 2 && 0 < yymsg_alloc) + else if (yysyntax_error_status == 1) { if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); @@ -2870,6 +3158,7 @@ yyerrlab: { yymsg = yymsgbuf; yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; } else { @@ -2890,20 +3179,20 @@ yyerrlab: if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval, &yylloc); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval, &yylloc); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error @@ -2936,34 +3225,38 @@ yyerrorlab: | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yyerror_range[1] = *yylsp; yydestruct ("Error: popping", - yystos[yystate], yyvsp, yylsp); + yystos[yystate], yyvsp, yylsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } + /* If the stack popping above didn't lose the initial context for the + current lookahead token, the shift below will for sure. */ + YY_LAC_DISCARD ("error recovery"); + *++yyvsp = yylval; yyerror_range[2] = yylloc; @@ -2993,7 +3286,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if 1 /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -3019,13 +3312,15 @@ yyreturn: while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp, yylsp); + yystos[*yyssp], yyvsp, yylsp); YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif + if (yyes != yyesa) + YYSTACK_FREE (yyes); #if YYERROR_VERBOSE if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); @@ -3034,8 +3329,8 @@ yyreturn: return YYID (yyresult); } -/* Line 1662 of yacc.c */ -#line 692 "src/parse-gram.y" +/* Line 2000 of yacc.c */ +#line 713 "src/parse-gram.y" @@ -3055,14 +3350,14 @@ lloc_default (YYLTYPE const *rhs, int n) loc.start = rhs[n].end; loc.end = rhs[n].end; - /* Ignore empty nonterminals the start of the the right-hand side. + /* Ignore empty nonterminals the start of the right-hand side. Do not bother to ignore them at the end of the right-hand side, since empty nonterminals have the same end as their predecessors. */ for (i = 1; i <= n; i++) if (! equal_boundaries (rhs[i].start, rhs[i].end)) { - loc.start = rhs[i].start; - break; + loc.start = rhs[i].start; + break; } return loc; @@ -3105,9 +3400,9 @@ add_param (param_type type, char *decl, location loc) size_t name_len; for (name_len = 1; - memchr (alphanum, name_start[name_len], sizeof alphanum); - name_len++) - continue; + memchr (alphanum, name_start[name_len], sizeof alphanum); + name_len++) + continue; name = xmalloc (name_len + 1); memcpy (name, name_start, name_len); @@ -3129,7 +3424,7 @@ version_check (location const *loc, char const *version) if (strverscmp (version, PACKAGE_VERSION) > 0) { complain_at (*loc, "require bison %s, but have %s", - version, PACKAGE_VERSION); + version, PACKAGE_VERSION); exit (63); } }