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

* data/push.c (yypushparse, yypvarsinit, yypvars): Wrap in b4_push_if.

Browse Source 
(b4_yyssa, b4_yyerror_range): New macros.
(struct yypvars): Remove yyssa_ptr and yyerror_range_ptr fields.
(yypvarsinit): Remove init of removed fields.
(yypushparse): Remove use of removed fields; use new macros instead.
This commit is contained in:
Paul Eggert
2006-10-12 05:47:58 +00:00
parent f317f99734
commit efdd742137
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2006-10-11 Bob Rossi <bob@brasko.net>
* data/push.c (yypushparse, yypvarsinit, yypvars): Wrap in b4_push_if.
(b4_yyssa, b4_yyerror_range): New macros.
(struct yypvars): Remove yyssa_ptr and yyerror_range_ptr fields.
(yypvarsinit): Remove init of removed fields.
(yypushparse): Remove use of removed fields; use new macros instead.
2006-10-11 Paul Eggert <eggert@cs.ucla.edu> 2006-10-11 Paul Eggert <eggert@cs.ucla.edu>
* data/push.c (yypushparse): Fix memory leak if yymsg is malloced * data/push.c (yypushparse): Fix memory leak if yymsg is malloced

37
data/push.c
View File

@@ -152,9 +152,9 @@ b4_copyright([Skeleton implementation for Bison's Yacc-like parsers in C],dnl '
m4_if(b4_prefix, [yy], [], m4_if(b4_prefix, [yy], [],
[/* Substitute the variable and function names. */ [/* Substitute the variable and function names. */
#define yyparse b4_prefix[]parse #define yyparse b4_prefix[]parse
#define yypushparse b4_prefix[]pushparse ]b4_push_if([#define yypushparse b4_prefix[]pushparse
#define yypvarsinit b4_prefix[]pvarsinit #define yypvarsinit b4_prefix[]pvarsinit
#define yypvars b4_prefix[]pvars #define yypvars b4_prefix[]pvars])[
#define yylex b4_prefix[]lex #define yylex b4_prefix[]lex
#define yyerror b4_prefix[]error #define yyerror b4_prefix[]error
#define yylval b4_prefix[]lval #define yylval b4_prefix[]lval
@@ -1002,6 +1002,9 @@ int yynerrs;b4_locations_if([
YYLTYPE yylloc;]) YYLTYPE yylloc;])
]) ])
m4_define([b4_yyssa],b4_push_if([pv->yyssa],[yyssa]))
m4_define([b4_yyerror_range],b4_push_if([pv->yyerror_range],[yyerror_range]))
# b4_declare_yyparse_variables # b4_declare_yyparse_variables
# ---------------------------- # ----------------------------
# Declare all the variables that are needed local to YYPARSE # Declare all the variables that are needed local to YYPARSE
@@ -1027,7 +1030,6 @@ m4_define([b4_declare_yyparse_variables],
/* The state stack. */ /* The state stack. */
yytype_int16 yyssa[YYINITDEPTH]; yytype_int16 yyssa[YYINITDEPTH];
yytype_int16 *yyssa_ptr;
yytype_int16 *yyss; yytype_int16 *yyss;
yytype_int16 *yyssp; yytype_int16 *yyssp;
@@ -1040,8 +1042,7 @@ m4_define([b4_declare_yyparse_variables],
YYLTYPE *yyls; YYLTYPE *yyls;
YYLTYPE *yylsp; YYLTYPE *yylsp;
/* The locations where the error started and ended. */ /* The locations where the error started and ended. */
YYLTYPE yyerror_range[2]; YYLTYPE yyerror_range[2];]]])[
YYLTYPE *yyerror_range_ptr;]]])[
YYSIZE_T yystacksize; YYSIZE_T yystacksize;
int yylen; int yylen;
/* The variables used to return semantic value and location from the /* The variables used to return semantic value and location from the
@@ -1062,7 +1063,6 @@ yypvarsinit (void)
pv->yyerrstatus = 0; pv->yyerrstatus = 0;
pv->yytoken = 0; pv->yytoken = 0;
pv->yyssa_ptr = pv->yyssa;
pv->yyss = pv->yyssa; pv->yyss = pv->yyssa;
pv->yyvs = pv->yyvsa; pv->yyvs = pv->yyvsa;
@@ -1153,7 +1153,6 @@ b4_c_function_def([yyparse], [int], b4_parse_param)
/* The state stack. */ /* The state stack. */
yytype_int16 yyssa[YYINITDEPTH]; yytype_int16 yyssa[YYINITDEPTH];
yytype_int16 *yyssa_ptr = yyssa;
yytype_int16 *yyss = yyssa; yytype_int16 *yyss = yyssa;
yytype_int16 *yyssp; yytype_int16 *yyssp;
@@ -1169,7 +1168,6 @@ b4_c_function_def([yyparse], [int], b4_parse_param)
YYLTYPE *yylsp; YYLTYPE *yylsp;
/* The locations where the error started and ended. */ /* The locations where the error started and ended. */
YYLTYPE yyerror_range[2]; YYLTYPE yyerror_range[2];
YYLTYPE *yyerror_range_ptr = yyerror_range;
]])[ ]])[
#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)]b4_locations_if([, yylsp -= (N)])[) #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)]b4_locations_if([, yylsp -= (N)])[)
@@ -1234,7 +1232,6 @@ m4_ifdef([b4_at_dollar_used], [[ yylsp[0] = yylloc;
yyerrstatus = pv->yyerrstatus; yyerrstatus = pv->yyerrstatus;
yytoken = pv->yytoken; yytoken = pv->yytoken;
yyssa_ptr = pv->yyssa_ptr;
yyss = pv->yyss; yyss = pv->yyss;
yyssp = pv->yyssp; yyssp = pv->yyssp;
@@ -1243,9 +1240,7 @@ m4_ifdef([b4_at_dollar_used], [[ yylsp[0] = yylloc;
]b4_locations_if([[ /* The location stack. */ ]b4_locations_if([[ /* The location stack. */
yyls = pv->yyls; yyls = pv->yyls;
yylsp = pv->yylsp; yylsp = pv->yylsp;]])[
yyerror_range_ptr = pv->yyerror_range_ptr;]])[
yystacksize = pv->yystacksize; yystacksize = pv->yystacksize;
yylen = pv->yylen; yylen = pv->yylen;
@@ -1317,7 +1312,7 @@ m4_ifdef([b4_at_dollar_used], [[ yylsp[0] = yylloc;
YYSTACK_RELOCATE (yyvs); YYSTACK_RELOCATE (yyvs);
]b4_locations_if([ YYSTACK_RELOCATE (yyls);])[ ]b4_locations_if([ YYSTACK_RELOCATE (yyls);])[
# undef YYSTACK_RELOCATE # undef YYSTACK_RELOCATE
if (yyss1 != yyssa_ptr) if (yyss1 != ]b4_yyssa[)
YYSTACK_FREE (yyss1); YYSTACK_FREE (yyss1);
} }
# endif # endif
@@ -1374,7 +1369,6 @@ yybackup:
pv->yyerrstatus = yyerrstatus; pv->yyerrstatus = yyerrstatus;
pv->yytoken = yytoken; pv->yytoken = yytoken;
pv->yyssa_ptr = yyssa_ptr;
pv->yyss = yyss; pv->yyss = yyss;
pv->yyssp = yyssp; pv->yyssp = yyssp;
@@ -1383,8 +1377,7 @@ yybackup:
]b4_locations_if([[ /* The location stack. */ ]b4_locations_if([[ /* The location stack. */
pv->yyls = yyls; pv->yyls = yyls;
pv->yylsp = yylsp; pv->yylsp = yylsp;]])[
pv->yyerror_range_ptr = yyerror_range_ptr;]])[
pv->yystacksize = yystacksize; pv->yystacksize = yystacksize;
pv->yylen = yylen; pv->yylen = yylen;
@@ -1543,7 +1536,7 @@ yyerrlab:
#endif #endif
} }
]b4_locations_if([[ yyerror_range[0] = yylloc;]])[ ]b4_locations_if([[ ]b4_yyerror_range[[0] = yylloc;]])[
if (yyerrstatus == 3) if (yyerrstatus == 3)
{ {
@@ -1580,7 +1573,7 @@ yyerrorlab:
if (/*CONSTCOND*/ 0) if (/*CONSTCOND*/ 0)
goto yyerrorlab; goto yyerrorlab;
]b4_locations_if([[ yyerror_range[0] = yylsp[1-yylen]; ]b4_locations_if([[ ]b4_yyerror_range[[0] = yylsp[1-yylen];
]])[ /* Do not reclaim the symbols of the rule which action triggered ]])[ /* Do not reclaim the symbols of the rule which action triggered
this YYERROR. */ this YYERROR. */
YYPOPSTACK (yylen); YYPOPSTACK (yylen);
@@ -1614,7 +1607,7 @@ yyerrlab1:
if (yyssp == yyss) if (yyssp == yyss)
YYABORT; YYABORT;
]b4_locations_if([[ yyerror_range[0] = *yylsp;]])[ ]b4_locations_if([[ ]b4_yyerror_range[[0] = *yylsp;]])[
yydestruct ("Error: popping", yydestruct ("Error: popping",
yystos[yystate], yyvsp]b4_locations_if([, yylsp])[]b4_user_args[); yystos[yystate], yyvsp]b4_locations_if([, yylsp])[]b4_user_args[);
YYPOPSTACK (1); YYPOPSTACK (1);
@@ -1624,10 +1617,10 @@ yyerrlab1:
*++yyvsp = yylval; *++yyvsp = yylval;
]b4_locations_if([[ ]b4_locations_if([[
yyerror_range[1] = yylloc; ]b4_yyerror_range[[1] = yylloc;
/* Using YYLLOC is tempting, but would change the location of /* Using YYLLOC is tempting, but would change the location of
the lookahead. YYLOC is available though. */ the lookahead. YYLOC is available though. */
YYLLOC_DEFAULT (yyloc, (yyerror_range- 1), 2); YYLLOC_DEFAULT (yyloc, (]b4_yyerror_range[- 1), 2);
*++yylsp = yyloc;]])[ *++yylsp = yyloc;]])[
/* Shift the error token. */ /* Shift the error token. */
@@ -1676,7 +1669,7 @@ yyreturn:
YYPOPSTACK (1); YYPOPSTACK (1);
} }
#ifndef yyoverflow #ifndef yyoverflow
if (yyss != yyssa_ptr) if (yyss != ]b4_yyssa[)
YYSTACK_FREE (yyss); YYSTACK_FREE (yyss);
#endif #endif
]b4_push_if([yypushreturn:])[ ]b4_push_if([yypushreturn:])[