diff options
| author | Dave Mitchell <davem@fdisolutions.com> | 2007-07-16 13:15:37 +0000 |
|---|---|---|
| committer | Dave Mitchell <davem@fdisolutions.com> | 2007-07-16 13:15:37 +0000 |
| commit | 503de4705ff6537018ae94e9179e16636748b2a6 (patch) | |
| tree | d022d6d730a079eac8721ce355c9ae08c781a689 /perly.c | |
| parent | 4629c4f60ec83d0f102cd8ac641c8eefa2bb4a6f (diff) | |
| download | perl-503de4705ff6537018ae94e9179e16636748b2a6.tar.gz | |
[perl #43425] local $[: fix scoping during parser error handling.
Change 22306# inadvertently made 'local $[' statement-scoped
rather than block-scoped; so revert that change and add a
different fix. The problem was to ensure that the savestack got
popped correctly while popping errored tokens. We how record the
current value of PL_savestack_ix with each pushed parser state.
p4raw-id: //depot/perl@31615
Diffstat (limited to 'perly.c')
| -rw-r--r-- | perly.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -272,6 +272,7 @@ S_clear_yystack(pTHX_ const yy_parser *parser) /* 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 @@ -289,6 +290,7 @@ S_clear_yystack(pTHX_ const yy_parser *parser) /* 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) { @@ -450,6 +452,7 @@ Perl_yyparse (pTHX) 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 @@ -547,6 +550,7 @@ Perl_yyparse (pTHX) ps->val = yyval; ps->comppad = PL_comppad; + ps->savestack_ix = PL_savestack_ix; #ifdef DEBUGGING ps->name = (const char *)(yytname [yyr1[yyn]]); #endif @@ -584,6 +588,7 @@ Perl_yyparse (pTHX) /* 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) { @@ -631,6 +636,7 @@ Perl_yyparse (pTHX) 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) { @@ -654,6 +660,7 @@ Perl_yyparse (pTHX) ps->state = yyn; ps->val = parser->yylval; ps->comppad = PL_comppad; + ps->savestack_ix = PL_savestack_ix; #ifdef DEBUGGING ps->name ="<err>"; #endif |