X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2873fdf8b1f91a9cbc8d258367c920eb637a0099..a0ffc1751e712e55b27aa7349ec7db302557476b:/data/lalr1.cc diff --git a/data/lalr1.cc b/data/lalr1.cc index 4915caa2..bacdf37c 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -53,6 +53,12 @@ b4_variant_if([ ]) # b4_variant_if +# b4_lex_symbol_if([IF-YYLEX-RETURNS-A-COMPLETE-SYMBOL], [IF-NOT]) +# ---------------------------------------------------------------- +m4_define([b4_lex_symbol_if], +[b4_percent_define_ifdef([[lex_symbol]], [$1], [$2])]) + + # b4_assert_if([IF-ASSERTIONS-ARE-USED], [IF-NOT]) # ------------------------------------------------ m4_define([b4_assert_if], @@ -815,12 +821,12 @@ b4_percent_code_get[]dnl #endif /* !YYDEBUG */ -#define yyerrok (yyerrstatus_ = 0) -#define yyclearin (yychar = yyempty_) +#define yyerrok (yyerrstatus_ = 0) +#define yyclearin (yyempty = true) -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab #define YYRECOVERING() (!!yyerrstatus_) ]b4_namespace_open[ @@ -1080,8 +1086,8 @@ b4_percent_code_get[]dnl int ]b4_parser_class_name[::parse () { - /// Coded type of the lookahead. - int yychar = yyempty_; + /// Whether yyla contains a lookahead. + bool yyempty = true; /* State. */ int yyn; @@ -1142,26 +1148,18 @@ m4_popdef([b4_at_dollar])])dnl goto yydefault; /* Read a lookahead token. */ - if (yychar == yyempty_) + if (yyempty) { - YYCDEBUG << "Reading a token: "; - yychar = ]b4_c_function_call([yylex], [int], + YYCDEBUG << "Reading a token: "; +]b4_lex_symbol_if( +[ yyla = yylex();], +[ yyla.type = yytranslate_ (b4_c_function_call([yylex], [int], [[YYSTYPE*], [&yyla.value]][]dnl b4_locations_if([, [[location*], [&yyla.location]]])dnl -m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; - } - - /* Convert token to internal form. */ - if (yychar <= yyeof_) - { - yychar = yyla.type = yyeof_; - YYCDEBUG << "Now at end of input." << std::endl; - } - else - { - yyla.type = yytranslate_ (yychar); - YY_SYMBOL_PRINT ("Next token is", yyla); +m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[ + yyempty = false; } + YY_SYMBOL_PRINT ("Next token is", yyla); /* If the proper action on seeing token YYLA.TYPE is to reduce or to detect an error, take that action. */ @@ -1180,7 +1178,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; } /* Discard the token being shifted. */ - yychar = yyempty_; + yyempty = true; /* Count tokens shifted since error; after three, turn off error status. */ @@ -1281,18 +1279,15 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; if (yyerrstatus_ == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ - - if (yychar <= yyeof_) - { - /* Return failure if at end of input. */ - if (yychar == yyeof_) - YYABORT; - } - else - { - yy_destroy_ ("Error: discarding", yyla); - yychar = yyempty_; + error, discard it. */ + + /* Return failure if at end of input. */ + if (yyla.type == yyeof_) + YYABORT; + else + { + yy_destroy_ ("Error: discarding", yyla); + yyempty = true; } } @@ -1372,7 +1367,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; goto yyreturn; yyreturn: - if (yychar != yyempty_) + if (!yyempty) yy_destroy_ ("Cleanup: discarding lookahead", yyla); /* Do not reclaim the symbols of the rule which action triggered @@ -1390,9 +1385,9 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; // Generate an error message. std::string ]b4_parser_class_name[::yysyntax_error_ (int yystate, int]dnl -b4_error_verbose_if([ tok])[) +b4_error_verbose_if([ yytoken])[) { - std::string res; + std::string yyres; YYUSE (yystate); #if YYERROR_VERBOSE int yyn = yypact_[yystate]; @@ -1405,36 +1400,55 @@ b4_error_verbose_if([ tok])[) /* Stay within bounds of both yycheck and yytname. */ int yychecklim = yylast_ - yyn + 1; int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_; - int count = 0; - for (int x = yyxbegin; x < yyxend; ++x) - if (yycheck_[x + yyn] == x && x != yyterror_) - ++count; - - // FIXME: This method of building the message is not compatible - // with internationalization. It should work like yacc.c does it. - // That is, first build a string that looks like this: - // "syntax error, unexpected %s or %s or %s" - // Then, invoke YY_ on this string. - // Finally, use the string as a format to output - // yytname_[tok], etc. - // Until this gets fixed, this message appears in English only. - res = "syntax error, unexpected "; - res += yytnamerr_ (yytname_[tok]); - if (count < 5) - { - count = 0; - for (int x = yyxbegin; x < yyxend; ++x) - if (yycheck_[x + yyn] == x && x != yyterror_) - { - res += (!count++) ? ", expecting " : " or "; - res += yytnamerr_ (yytname_[x]); - } - } + + // Number of "expected" tokens. + size_t yycount = 0; + // Its maximum. + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + // Arguments of yyformat. + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + yyarg[yycount++] = yytname_[yytoken]; + for (int yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck_[yyx + yyn] == yyx && yyx != yyterror_) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + break; + } + else + yyarg[yycount++] = yytname_[yyx]; + } + + char const* yyformat = 0; + switch (yycount) + { +#define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + 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_ + } + // Argument number. + size_t yyi = 0; + for (char const* yyp = yyformat; *yyp; ++yyp) + if (yyp[0] == '%' && yyp[1] == 's' && yyi < yycount) + { + yyres += yytnamerr_ (yyarg[yyi++]); + ++yyp; + } + else + yyres += *yyp; } else #endif - res = YY_("syntax error"); - return res; + yyres = YY_("syntax error"); + return yyres; } @@ -1535,7 +1549,9 @@ b4_error_verbose_if([ tok])[) const unsigned int user_token_number_max_ = ]b4_user_token_number_max[; const token_number_type undef_token_ = ]b4_undef_token_number[; - if (static_cast (t) <= user_token_number_max_) + if (t <= yyeof_) + return yyeof_; + else if (static_cast (t) <= user_token_number_max_) return translate_table[t]; else return undef_token_;