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

Fix impure push parser compile error reported by Bob Rossi at

Browse Source 
<http://lists.gnu.org/archive/html/help-bison/2008-02/msg00023.html>.
* data/yacc.c: Clean up whitespace in the output a little.
(yypstate_allocated): Define for impure push parsers regardless of
whether the pull interface is also requested.
* tests/push.at (Push Parsing: Multiple impure instances): Extend to
check impure push parsers without the pull interface.

* data/yacc.c (yypstate_new): Don't try to invoke yyerror since
yyerror takes arguments specified by %parse-param while yypstate_new
does not.
* doc/bison.texinfo (Parser Create Function): Document that
yypstate_new returns 0 for multiple impure parser instances.
* tests/push.at (Push Parsing: Multiple impure instances): Update
expected stderr output.
This commit is contained in:
Joel E. Denny
2008-02-20 18:23:21 +00:00
parent 798096e1de
commit 333e670c85
4 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
data/yacc.c
View File

@@ -1079,26 +1079,25 @@ b4_push_if(
/* Used to determine if this is the first time this instance has
been used. */
int yynew;
};
};]b4_pure_if([], [[
]b4_pull_if([b4_c_function_def([[yyparse]], [[int]], b4_parse_param)[
static char yypstate_allocated = 0;]])b4_pull_if([
b4_c_function_def([[yyparse]], [[int]], b4_parse_param)[
{
return yypull_parse (0]m4_ifset([b4_parse_param],
[[, ]b4_c_args(b4_parse_param)])[);
}]b4_pure_if([], [[
static char yypstate_allocated = 0;]])[
}
]b4_c_function_def([[yypull_parse]], [[int]],
[[[yypstate *yyps]], [[yyps]]]m4_ifset([b4_parse_param], [,
b4_parse_param]))[
{
int yystatus;
yypstate *yyps_local;
]b4_pure_if([[ int yychar;
YYSTYPE yylval;
]b4_locations_if([[ YYLTYPE yylloc;
]])])[
yypstate *yyps_local;]b4_pure_if([[
int yychar;
YYSTYPE yylval;]b4_locations_if([[
YYLTYPE yylloc;]])])[
if (yyps == 0)
{
yyps_local = yypstate_new ();
@@ -1120,17 +1119,14 @@ static char yypstate_allocated = 0;]])[
if (yyps == 0)
yypstate_delete (yyps_local);
return yystatus;
}
]])[
}]])[
/* Initialize the parser data structure. */
]b4_c_function_def([[yypstate_new]], [[yypstate *]])[
{
yypstate *yyps;]b4_pure_if([], [[
if (yypstate_allocated)
{
yyerror (]b4_yyerror_args[YY_("cannot allocate multiple impure push-parser instances"));
return 0;
}]])[
return 0;]])[
yyps = (yypstate *) malloc (sizeof *yyps);
if (!yyps)
return 0;