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

yacc.c: style: avoid macros

Browse Source 
* data/skeletons/yacc.c (YYSYNTAX_ERROR): Remove, the call is now
sufficiently small so that we can afford to duplicate it.
This commit is contained in:
Akim Demaille
2020-01-03 09:09:17 +01:00
parent 135d0336d5
commit 5b883180e6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
data/skeletons/yacc.c
View File

@@ -1789,25 +1789,26 @@ yyerrlab:
[simple], [simple],
[[ yyerror (]b4_yyerror_args[YY_("syntax error"));]], [[ yyerror (]b4_yyerror_args[YY_("syntax error"));]],
[verbose], [verbose],
[[# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, &yyctx) [[ {
{
char const *yymsgp = YY_("syntax error"); char const *yymsgp = YY_("syntax error");
yyparse_context_t yyctx yyparse_context_t yyctx
= {yyssp, yytoken]b4_lac_if([[, yyesa, &yyes, &yyes_capacity]])[}; = {yyssp, yytoken]b4_lac_if([[, yyesa, &yyes, &yyes_capacity]])[};
int yysyntax_error_status;]b4_lac_if([[ int yysyntax_error_status;]b4_lac_if([[
if (yychar != YYEMPTY) if (yychar != YYEMPTY)
YY_LAC_ESTABLISH;]])[ YY_LAC_ESTABLISH;]])[
yysyntax_error_status = YYSYNTAX_ERROR; yysyntax_error_status = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx);
if (yysyntax_error_status == 0) if (yysyntax_error_status == 0)
yymsgp = yymsg; yymsgp = yymsg;
else if (yysyntax_error_status == 1) else if (yysyntax_error_status == 1)
{ {
if (yymsg != yymsgbuf) if (yymsg != yymsgbuf)
YYSTACK_FREE (yymsg); YYSTACK_FREE (yymsg);
yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc))); yymsg = YY_CAST (char *,
YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc)));
if (yymsg) if (yymsg)
{ {
yysyntax_error_status = YYSYNTAX_ERROR; yysyntax_error_status
= yysyntax_error (&yymsg_alloc, &yymsg, &yyctx);
yymsgp = yymsg; yymsgp = yymsg;
} }
else else
@@ -1820,8 +1821,7 @@ yyerrlab:
yyerror (]b4_yyerror_args[yymsgp); yyerror (]b4_yyerror_args[yymsgp);
if (yysyntax_error_status == 2) if (yysyntax_error_status == 2)
goto yyexhaustedlab; goto yyexhaustedlab;
} }]])[
# undef YYSYNTAX_ERROR]])[
} }
]b4_locations_if([[ yyerror_range[1] = yylloc;]])[ ]b4_locations_if([[ yyerror_range[1] = yylloc;]])[