S_clear_yystack(pTHX_ const yy_parser *parser)
{
yy_stack_frame *ps = parser->ps;
- int i;
+ int i = 0;
if (!parser->stack || ps == parser->stack)
return;
/* clear any reducing ops (1st pass) */
for (i=0; i< parser->yylen; i++) {
+ LEAVE_SCOPE(ps[-i].savestack_ix);
if (yy_type_tab[yystos[ps[-i].state]] == toketype_opval
&& ps[-i].val.opval) {
if ( ! (ps[-i].val.opval->op_attached
/* now free whole the stack, including the just-reduced ops */
while (ps > parser->stack) {
+ LEAVE_SCOPE(ps->savestack_ix);
if (yy_type_tab[yystos[ps->state]] == toketype_opval
&& ps->val.opval)
{
}
}
-/* delete a parser object */
-
-#ifndef PERL_IN_MADLY_C
-void
-Perl_parser_free(pTHX_ const yy_parser *parser)
-{
- S_clear_yystack(aTHX_ parser);
- Safefree(parser->stack);
- Safefree(parser->lex_brackstack);
- Safefree(parser->lex_casestack);
- PL_parser = parser->old_parser;
- Safefree(parser);
-}
-#endif
/*----------.
| yyparse. |
parser = PL_parser;
ps = parser->ps;
- ENTER; /* force parser free before we return */
- SAVEPARSER(parser);
+ ENTER; /* force parser stack cleanup before we return */
+ SAVEDESTRUCTOR_X(S_clear_yystack, parser);
/*------------------------------------------------------------.
| yynewstate -- Push a new state, which is found in yystate. |
ps->state = yyn;
ps->val = parser->yylval;
ps->comppad = PL_comppad;
+ ps->savestack_ix = PL_savestack_ix;
#ifdef DEBUGGING
ps->name = (const char *)(yytname[yytoken]);
#endif
ps->val = yyval;
ps->comppad = PL_comppad;
+ ps->savestack_ix = PL_savestack_ix;
#ifdef DEBUGGING
ps->name = (const char *)(yytname [yyr1[yyn]]);
#endif
/* Pop the rest of the stack. */
while (ps > parser->stack) {
YYDSYMPRINTF ("Error: popping", yystos[ps->state], &ps->val);
+ LEAVE_SCOPE(ps->savestack_ix);
if (yy_type_tab[yystos[ps->state]] == toketype_opval
&& ps->val.opval)
{
YYABORT;
YYDSYMPRINTF ("Error: popping", yystos[ps->state], &ps->val);
+ LEAVE_SCOPE(ps->savestack_ix);
if (yy_type_tab[yystos[ps->state]] == toketype_opval && ps->val.opval) {
YYDPRINTF ((Perl_debug_log, "(freeing op)\n"));
if (ps->comppad != PL_comppad) {
ps->state = yyn;
ps->val = parser->yylval;
ps->comppad = PL_comppad;
+ ps->savestack_ix = PL_savestack_ix;
#ifdef DEBUGGING
ps->name ="<err>";
#endif
goto yyreturn;
yyreturn:
- LEAVE; /* force parser free before we return */
+ LEAVE; /* force parser stack cleanup before we return */
return yyresult;
}