Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

glr2.cc: get rid of the C indirection for yy_symbol_print

Browse Source 
* data/skeletons/glr2.cc (yy_symbol_print): Remove.
Just use yyparser.yy_symbol_print_ directly.
This commit is contained in:
Akim Demaille
2020-09-12 14:39:32 +02:00
parent 146a8eb101
commit 3ae2a22a05
1 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
data/skeletons/glr2.cc
View File

@@ -62,25 +62,6 @@ m4_define([b4_parser_class],
# Save the parse parameters. # Save the parse parameters.
m4_define([b4_parse_param_orig], m4_defn([b4_parse_param])) m4_define([b4_parse_param_orig], m4_defn([b4_parse_param]))
# b4_yy_symbol_print_define
# -------------------------
# Bypass the default implementation to generate the "yy_symbol_print"
# and "yy_symbol_value_print" functions.
m4_define([b4_yy_symbol_print_define],
[[/*--------------------.
| Print this symbol. |
`--------------------*/
static void
yy_symbol_print (FILE *, ]b4_namespace_ref[::]b4_parser_class[& yyparser, ]b4_namespace_ref::b4_parser_class[::symbol_kind_type yytoken,
const ]b4_namespace_ref::b4_parser_class[::semantic_type *yyvaluep]b4_locations_if([[,
const ]b4_namespace_ref::b4_parser_class[::location_type *yylocationp]])[]b4_user_formals[)
{
]b4_parse_param_use[]dnl
[ yyparser.yy_symbol_print_ (yytoken, yyvaluep]b4_locations_if([, yylocationp])[);
}
]])[
# Hijack the initial action to initialize the locations. # Hijack the initial action to initialize the locations.
]b4_bison_locations_if([m4_define([b4_initial_action], ]b4_bison_locations_if([m4_define([b4_initial_action],
[yylloc.initialize ();]m4_ifdef([b4_initial_action], [ [yylloc.initialize ();]m4_ifdef([b4_initial_action], [
@@ -719,14 +700,12 @@ typedef enum { yyok, yyaccept, yyabort, yyerr } YYRESULTTAG;
#define YY_DEBUG_STREAM if (!yydebug) {} else std::cerr #define YY_DEBUG_STREAM if (!yydebug) {} else std::cerr
]b4_yy_symbol_print_define[
# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ # define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
do { \ do { \
if (yydebug) \ if (yydebug) \
{ \ { \
std::cerr << Title << ' '; \ std::cerr << Title << ' '; \
yy_symbol_print (stderr, yyparser, Type, Value]b4_locuser_args([Location])[);\ yyparser.yy_symbol_print_ (Type, Value]b4_locuser_args([Location])[);\
std::cerr << '\n'; \ std::cerr << '\n'; \
} \ } \
} while (0) } while (0)
@@ -1348,16 +1327,8 @@ void glr_state::destroy (char const *yymsg, ]b4_namespace_ref[::]b4_parser_class
&semanticVal()]b4_locations_if([, &yyloc])[); &semanticVal()]b4_locations_if([, &yyloc])[);
else else
{ {
#if ]b4_api_PREFIX[DEBUG YY_SYMBOL_PRINT (yymsg << (firstVal() ? " unresolved" : " incomplete"),
if (yydebug) static_cast<]b4_namespace_ref::b4_parser_class[::symbol_kind_type>(yystos[yylrState]), YY_NULLPTR, &yyloc);
{
if (firstVal() != YY_NULLPTR)
std::cerr << yymsg << " unresolved";
else
std::cerr << yymsg << " incomplete";
YY_SYMBOL_PRINT ("", static_cast<]b4_namespace_ref::b4_parser_class[::symbol_kind_type>(yystos[yylrState]), YY_NULLPTR, &yyloc);
}
#endif
if (firstVal() != YY_NULLPTR) if (firstVal() != YY_NULLPTR)
{ {
@@ -1649,12 +1620,11 @@ class state_stack {
for (yyi = 0; yyi < yynrhs; yyi++) for (yyi = 0; yyi < yynrhs; yyi++)
{ {
std::cerr << " $" << yyi + 1 << " = "; std::cerr << " $" << yyi + 1 << " = ";
yy_symbol_print (stderr, yyparser.yy_symbol_print_
yyparser, (static_cast<]b4_namespace_ref::b4_parser_class[::symbol_kind_type>(yystos[yyvsp[yyi - yynrhs + 1].getState().yylrState]),
static_cast<]b4_namespace_ref::b4_parser_class[::symbol_kind_type>(yystos[yyvsp[yyi - yynrhs + 1].getState().yylrState]), &yyvsp[yyi - yynrhs + 1].getState().semanticVal()]b4_locations_if([,
&yyvsp[yyi - yynrhs + 1].getState().semanticVal()]b4_locations_if([, &]b4_rhs_location(yynrhs, yyi + 1))[]dnl
&]b4_rhs_location(yynrhs, yyi + 1))[]dnl b4_user_args[);
b4_user_args[);
if (!yyvsp[yyi - yynrhs + 1].getState().yyresolved) if (!yyvsp[yyi - yynrhs + 1].getState().yyresolved)
std::cerr << " (unresolved)"; std::cerr << " (unresolved)";
std::cerr << '\n'; std::cerr << '\n';