Storing PL_sv_yes over itself is as cheap as calling hv_exists(), so

[p5sagit/p5-mst-13.2.git] / perly.c

diff --git a/perly.c b/perly.c
index a9e569d..95779a0 100644 (file)
--- a/perly.c
+++ b/perly.c
@@ -258,8 +258,17 @@ S_clear_yystack(pTHX_  const yy_parser *parser)
      *   * a CV
      * but this would involve reworking all code (core and external) that
      * manipulate op trees.
-     */
+     *
+     * XXX DAPM 17/1/07 I've decided its too fragile for now, and so have
+     * disabled it */
+
+#define DISABLE_STACK_FREE
 
+
+#ifdef DISABLE_STACK_FREE
+    ps -= parser->yylen;
+    PERL_UNUSED_VAR(i);
+#else
     /* clear any reducing ops (1st pass) */
 
     for (i=0; i< parser->yylen; i++) {
@@ -275,6 +284,7 @@ S_clear_yystack(pTHX_  const yy_parser *parser)
            }
        }
     }
+#endif
 
     /* now free whole the stack, including the just-reduced ops */
 
@@ -286,28 +296,16 @@ S_clear_yystack(pTHX_  const yy_parser *parser)
                PAD_RESTORE_LOCAL(ps->comppad);
            }
            YYDPRINTF ((Perl_debug_log, "(freeing op)\n"));
+#ifndef DISABLE_STACK_FREE
            ps->val.opval->op_latefree  = 0;
            if (!(ps->val.opval->op_attached && !ps->val.opval->op_latefreed))
+#endif
                op_free(ps->val.opval);
        }
        ps--;
     }
 }
 
-/* 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.  |
@@ -350,8 +348,8 @@ Perl_yyparse (pTHX)
     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.  |
@@ -362,10 +360,12 @@ Perl_yyparse (pTHX)
 
     YYDPRINTF ((Perl_debug_log, "Entering state %d\n", yystate));
 
+#ifndef DISABLE_STACK_FREE
     if (yy_type_tab[yystos[yystate]] == toketype_opval && ps->val.opval) {
        ps->val.opval->op_latefree  = 1;
        ps->val.opval->op_latefreed = 0;
     }
+#endif
 
     parser->yylen = 0;
 
@@ -522,6 +522,7 @@ Perl_yyparse (pTHX)
 
     }
 
+#ifndef DISABLE_STACK_FREE
     /* any just-reduced ops with the op_latefreed flag cleared need to be
      * freed; the rest need the flag resetting */
     {
@@ -536,6 +537,7 @@ Perl_yyparse (pTHX)
            }
        }
     }
+#endif
 
     parser->ps = ps -= (parser->yylen-1);
 
@@ -675,7 +677,7 @@ Perl_yyparse (pTHX)
     goto yyreturn;
 
   yyreturn:
-    LEAVE;                     /* force parser free before we return */
+    LEAVE;     /* force parser stack cleanup before we return */
     return yyresult;
 }