/* scope.c
*
* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- * 2000, 2001, 2002, 2003, 2004, 2005, 2006, by Larry Wall and others
+ * 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by Larry Wall and others
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
SV * const osv = *sptr;
register SV * const sv = *sptr = newSV(0);
-#ifdef PERL_MAD
- /* FIXME for MAD - this is causing ext/Safe/t/safeops.t to abort. */
- if (PL_formfeed && sv == PL_formfeed)
- abort();
-#endif
-
if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv) && SvTYPE(osv) != SVt_PVGV) {
if (SvGMAGICAL(osv)) {
const bool oldtainted = PL_tainted;
{
dVAR;
SV ** const sptr = &GvSVn(gv);
-#ifdef PERL_MAD
- if (PL_formfeed && *sptr == PL_formfeed)
- abort();
-#endif
PL_localizing = 1;
SvGETMAGIC(*sptr);
PL_localizing = 0;
Perl_save_generic_svref(pTHX_ SV **sptr)
{
dVAR;
-#ifdef PERL_MAD
- if (PL_formfeed && *sptr == PL_formfeed)
- abort();
-#endif
SSCHECK(3);
SSPUSHPTR(sptr);
SSPUSHPTR(SvREFCNT_inc(*sptr));
GP *gp = Perl_newGP(aTHX_ gv);
if (GvCVu(gv))
- PL_sub_generation++; /* taking a method out of circulation */
+ mro_method_changed_in(GvSTASH(gv)); /* taking a method out of circulation ("local")*/
if (GvIOp(gv) && (IoFLAGS(GvIOp(gv)) & IOf_ARGV)) {
gp->gp_io = newIO();
IoFLAGS(gp->gp_io) |= IOf_ARGV|IOf_START;
dVAR;
register SV * const sv = newSVsv(item);
-#ifdef PERL_MAD
- if (PL_formfeed && item == PL_formfeed)
- abort();
-#endif
-
SSCHECK(3);
SSPUSHPTR(item); /* remember the pointer */
SSPUSHPTR(sv); /* remember the value */
}
void
+Perl_save_I8(pTHX_ I8 *bytep)
+{
+ dVAR;
+ SSCHECK(3);
+ SSPUSHINT(*bytep);
+ SSPUSHPTR(bytep);
+ SSPUSHINT(SAVEt_I8);
+}
+
+void
+Perl_save_I16(pTHX_ I16 *intp)
+{
+ dVAR;
+ SSCHECK(3);
+ SSPUSHINT(*intp);
+ SSPUSHPTR(intp);
+ SSPUSHINT(SAVEt_I16);
+}
+
+void
Perl_save_I32(pTHX_ I32 *intp)
{
dVAR;
}
void
+Perl_save_destructor(pTHX_ DESTRUCTORFUNC_NOCONTEXT_t f, void* p)
+{
+ dVAR;
+ SSCHECK(3);
+ SSPUSHDPTR(f);
+ SSPUSHPTR(p);
+ SSPUSHINT(SAVEt_DESTRUCTOR);
+}
+
+void
Perl_save_destructor_x(pTHX_ DESTRUCTORFUNC_t f, void* p)
{
dVAR;
SvGETMAGIC(*sptr);
SSCHECK(4);
SSPUSHPTR(SvREFCNT_inc_simple(hv));
- SSPUSHPTR(SvREFCNT_inc_simple(key));
+ SSPUSHPTR(newSVsv(key));
SSPUSHPTR(SvREFCNT_inc(*sptr));
SSPUSHINT(SAVEt_HELEM);
save_scalar_at(sptr);
Perl_save_svref(pTHX_ SV **sptr)
{
dVAR;
-#ifdef PERL_MAD
- if (PL_formfeed && *sptr == PL_formfeed)
- abort();
-#endif
SvGETMAGIC(*sptr);
SSCHECK(3);
SSPUSHPTR(sptr);
sv = *(SV**)ptr;
DEBUG_S(PerlIO_printf(Perl_debug_log,
"restore svref: %p %p:%s -> %p:%s\n",
- ptr, sv, SvPEEK(sv), value, SvPEEK(value)));
+ (void*)ptr, (void*)sv, SvPEEK(sv),
+ (void*)value, SvPEEK(value)));
*(SV**)ptr = value;
SvREFCNT_dec(sv);
PL_localizing = 2;
break;
case SAVEt_I32: /* I32 reference */
ptr = SSPOPPTR;
+#ifdef PERL_DEBUG_READONLY_OPS
+ {
+ const I32 val = SSPOPINT;
+ if (*(I32*)ptr != val)
+ *(I32*)ptr = val;
+ }
+#else
*(I32*)ptr = (I32)SSPOPINT;
+#endif
break;
case SAVEt_SPTR: /* SV* reference */
ptr = SSPOPPTR;
gv = (GV*)SSPOPPTR;
gp_free(gv);
GvGP(gv) = (GP*)ptr;
- if (GvCVu(gv))
- PL_sub_generation++; /* putting a method back into circulation */
+ /* putting a method back into circulation ("local")*/
+ if (GvCVu(gv) && (hv=GvSTASH(gv)) && HvNAME_get(hv))
+ mro_method_changed_in(hv);
SvREFCNT_dec(gv);
break;
case SAVEt_FREESV:
i = SSPOPINT;
PL_stack_sp = PL_stack_base + i;
break;
+ case SAVEt_STACK_CXPOS: /* blk_oldsp on context stack */
+ i = SSPOPINT;
+ cxstack[i].blk_oldsp = SSPOPINT;
+ break;
case SAVEt_AELEM: /* array element */
value = (SV*)SSPOPPTR;
i = SSPOPINT;
Copy(state, &PL_reg_state, 1, struct re_save_state);
}
break;
+ case SAVEt_PARSER:
+ ptr = SSPOPPTR;
+ parser_free((yy_parser *) ptr);
+ break;
default:
Perl_croak(aTHX_ "panic: leave_scope inconsistency");
}
PerlIO_printf(Perl_debug_log, "BLK_SUB.DFOUTGV = 0x%"UVxf"\n",
PTR2UV(cx->blk_sub.dfoutgv));
PerlIO_printf(Perl_debug_log, "BLK_SUB.HASARGS = %d\n",
- (int)CX_SUB_HASARGS_GET(cx));
+ (int)cx->blk_sub.hasargs);
PerlIO_printf(Perl_debug_log, "BLK_SUB.RETOP = 0x%"UVxf"\n",
PTR2UV(cx->blk_sub.retop));
break;
PerlIO_printf(Perl_debug_log, "BLK_SUB.OLDDEPTH = %ld\n",
(long)cx->blk_sub.olddepth);
PerlIO_printf(Perl_debug_log, "BLK_SUB.HASARGS = %d\n",
- (int)CX_SUB_HASARGS_GET(cx));
+ (int)cx->blk_sub.hasargs);
PerlIO_printf(Perl_debug_log, "BLK_SUB.LVAL = %d\n",
(int)cx->blk_sub.lval);
PerlIO_printf(Perl_debug_log, "BLK_SUB.RETOP = 0x%"UVxf"\n",
cx->blk_loop.label);
PerlIO_printf(Perl_debug_log, "BLK_LOOP.RESETSP = %ld\n",
(long)cx->blk_loop.resetsp);
- PerlIO_printf(Perl_debug_log, "BLK_LOOP.REDO_OP = 0x%"UVxf"\n",
- PTR2UV(cx->blk_loop.redo_op));
+ PerlIO_printf(Perl_debug_log, "BLK_LOOP.MY_OP = 0x%"UVxf"\n",
+ PTR2UV(cx->blk_loop.my_op));
PerlIO_printf(Perl_debug_log, "BLK_LOOP.NEXT_OP = 0x%"UVxf"\n",
- PTR2UV(cx->blk_loop.next_op));
- PerlIO_printf(Perl_debug_log, "BLK_LOOP.LAST_OP = 0x%"UVxf"\n",
- PTR2UV(cx->blk_loop.last_op));
+ PTR2UV(CX_LOOP_NEXTOP_GET(cx)));
PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERIX = %ld\n",
(long)cx->blk_loop.iterix);
PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERARY = 0x%"UVxf"\n",