/* 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.
Perl_stack_grow(pTHX_ SV **sp, SV **p, int n)
{
dVAR;
+
+ PERL_ARGS_ASSERT_STACK_GROW;
+
PL_stack_sp = sp;
#ifndef STRESS_REALLOC
av_extend(PL_curstack, (p - PL_stack_base) + (n) + 128);
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
+ PERL_ARGS_ASSERT_SAVE_SCALAR_AT;
if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv) && SvTYPE(osv) != SVt_PVGV) {
if (SvGMAGICAL(osv)) {
{
dVAR;
SV ** const sptr = &GvSVn(gv);
-#ifdef PERL_MAD
- if (PL_formfeed && *sptr == PL_formfeed)
- abort();
-#endif
+
+ PERL_ARGS_ASSERT_SAVE_SCALAR;
+
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
+
+ PERL_ARGS_ASSERT_SAVE_GENERIC_SVREF;
+
SSCHECK(3);
SSPUSHPTR(sptr);
SSPUSHPTR(SvREFCNT_inc(*sptr));
Perl_save_generic_pvref(pTHX_ char **str)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_GENERIC_PVREF;
+
SSCHECK(3);
- SSPUSHPTR(str);
SSPUSHPTR(*str);
+ SSPUSHPTR(str);
SSPUSHINT(SAVEt_GENERIC_PVREF);
}
Perl_save_shared_pvref(pTHX_ char **str)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_SHARED_PVREF;
+
SSCHECK(3);
SSPUSHPTR(str);
SSPUSHPTR(*str);
Perl_save_set_svflags(pTHX_ SV* sv, U32 mask, U32 val)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_SET_SVFLAGS;
+
SSCHECK(4);
SSPUSHPTR(sv);
SSPUSHINT(mask);
Perl_save_gp(pTHX_ GV *gv, I32 empty)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_GP;
+
SSGROW(3);
SSPUSHPTR(SvREFCNT_inc(gv));
SSPUSHPTR(GvGP(gv));
SSPUSHINT(SAVEt_GP);
if (empty) {
- register GP *gp;
-
- Newxz(gp, 1, GP);
+ 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;
}
- GvGP(gv) = gp_ref(gp);
-#ifndef PERL_DONT_CREATE_GVSV
- GvSV(gv) = newSV(0);
+#ifdef PERL_DONT_CREATE_GVSV
+ if (gv == PL_errgv) {
+ /* We could scatter this logic everywhere by changing the
+ definition of ERRSV from GvSV() to GvSVn(), but it seems more
+ efficient to do this check once here. */
+ gp->gp_sv = newSV(0);
+ }
#endif
- GvLINE(gv) = CopLINE(PL_curcop);
- /* XXX Ideally this cast would be replaced with a change to const char*
- in the struct. */
- GvFILE(gv) = CopFILE(PL_curcop) ? CopFILE(PL_curcop) : (char *) "";
- GvEGV(gv) = gv;
+ GvGP(gv) = gp;
}
else {
gp_ref(GvGP(gv));
AV * const oav = GvAVn(gv);
AV *av;
+ PERL_ARGS_ASSERT_SAVE_ARY;
+
if (!AvREAL(oav) && AvREIFY(oav))
av_reify(oav);
SSCHECK(3);
dVAR;
HV *ohv, *hv;
+ PERL_ARGS_ASSERT_SAVE_HASH;
+
SSCHECK(3);
SSPUSHPTR(gv);
SSPUSHPTR(ohv = GvHVn(gv));
dVAR;
register SV * const sv = newSVsv(item);
-#ifdef PERL_MAD
- if (PL_formfeed && item == PL_formfeed)
- abort();
-#endif
+ PERL_ARGS_ASSERT_SAVE_ITEM;
SSCHECK(3);
SSPUSHPTR(item); /* remember the pointer */
Perl_save_int(pTHX_ int *intp)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_INT;
+
SSCHECK(3);
SSPUSHINT(*intp);
SSPUSHPTR(intp);
Perl_save_bool(pTHX_ bool *boolp)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_BOOL;
+
SSCHECK(3);
SSPUSHBOOL(*boolp);
SSPUSHPTR(boolp);
}
void
+Perl_save_I8(pTHX_ I8 *bytep)
+{
+ dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_I8;
+
+ SSCHECK(3);
+ SSPUSHINT(*bytep);
+ SSPUSHPTR(bytep);
+ SSPUSHINT(SAVEt_I8);
+}
+
+void
+Perl_save_I16(pTHX_ I16 *intp)
+{
+ dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_I16;
+
+ SSCHECK(3);
+ SSPUSHINT(*intp);
+ SSPUSHPTR(intp);
+ SSPUSHINT(SAVEt_I16);
+}
+
+void
Perl_save_I32(pTHX_ I32 *intp)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_I32;
+
SSCHECK(3);
SSPUSHINT(*intp);
SSPUSHPTR(intp);
Perl_save_pptr(pTHX_ char **pptr)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_PPTR;
+
SSCHECK(3);
SSPUSHPTR(*pptr);
SSPUSHPTR(pptr);
Perl_save_vptr(pTHX_ void *ptr)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_VPTR;
+
SSCHECK(3);
SSPUSHPTR(*(char**)ptr);
SSPUSHPTR(ptr);
Perl_save_sptr(pTHX_ SV **sptr)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_SPTR;
+
SSCHECK(3);
SSPUSHPTR(*sptr);
SSPUSHPTR(sptr);
}
void
-Perl_save_padsv(pTHX_ PADOFFSET off)
+Perl_save_padsv_and_mortalize(pTHX_ PADOFFSET off)
{
dVAR;
SSCHECK(4);
ASSERT_CURPAD_ACTIVE("save_padsv");
- SSPUSHPTR(PL_curpad[off]);
+ SSPUSHPTR(SvREFCNT_inc_simple_NN(PL_curpad[off]));
SSPUSHPTR(PL_comppad);
SSPUSHLONG((long)off);
- SSPUSHINT(SAVEt_PADSV);
+ SSPUSHINT(SAVEt_PADSV_AND_MORTALIZE);
}
void
Perl_save_hptr(pTHX_ HV **hptr)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_HPTR;
+
SSCHECK(3);
SSPUSHPTR(*hptr);
SSPUSHPTR(hptr);
Perl_save_aptr(pTHX_ AV **aptr)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_APTR;
+
SSCHECK(3);
SSPUSHPTR(*aptr);
SSPUSHPTR(aptr);
Perl_save_mortalizesv(pTHX_ SV *sv)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_MORTALIZESV;
+
SSCHECK(2);
SSPUSHPTR(sv);
SSPUSHINT(SAVEt_MORTALIZESV);
Perl_save_clearsv(pTHX_ SV **svp)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_CLEARSV;
+
ASSERT_CURPAD_ACTIVE("save_clearsv");
SSCHECK(2);
SSPUSHLONG((long)(svp-PL_curpad));
Perl_save_delete(pTHX_ HV *hv, char *key, I32 klen)
{
dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_DELETE;
+
SSCHECK(4);
SSPUSHINT(klen);
SSPUSHPTR(key);
}
void
+Perl_save_destructor(pTHX_ DESTRUCTORFUNC_NOCONTEXT_t f, void* p)
+{
+ dVAR;
+
+ PERL_ARGS_ASSERT_SAVE_DESTRUCTOR;
+
+ SSCHECK(3);
+ SSPUSHDPTR(f);
+ SSPUSHPTR(p);
+ SSPUSHINT(SAVEt_DESTRUCTOR);
+}
+
+void
Perl_save_destructor_x(pTHX_ DESTRUCTORFUNC_t f, void* p)
{
dVAR;
{
dVAR;
SV *sv;
+
+ PERL_ARGS_ASSERT_SAVE_AELEM;
+
SvGETMAGIC(*sptr);
SSCHECK(4);
SSPUSHPTR(SvREFCNT_inc_simple(av));
{
dVAR;
SV *sv;
+
+ PERL_ARGS_ASSERT_SAVE_HELEM;
+
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
+
+ PERL_ARGS_ASSERT_SAVE_SVREF;
+
SvGETMAGIC(*sptr);
SSCHECK(3);
SSPUSHPTR(sptr);
av = (AV*)gv; /* what to refcnt_dec */
restore_sv:
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)));
*(SV**)ptr = value;
SvREFCNT_dec(sv);
PL_localizing = 2;
SvREFCNT_dec(av);
break;
case SAVEt_GENERIC_PVREF: /* generic pv */
- str = (char*)SSPOPPTR;
ptr = SSPOPPTR;
+ str = (char*)SSPOPPTR;
if (*(char**)ptr != str) {
Safefree(*(char**)ptr);
*(char**)ptr = str;
av = (AV*)SSPOPPTR;
gv = (GV*)SSPOPPTR;
if (GvAV(gv)) {
- AV * const goner = GvAV(gv);
- /* FIXME - this is a temporary hack until we work out what
- the correct behaviour for magic should be. */
- sv_unmagic((SV*)goner, PERL_MAGIC_arylen_p);
- SvMAGIC_set(av, SvMAGIC(goner));
- SvFLAGS((SV*)av) |= SvMAGICAL(goner);
- SvMAGICAL_off(goner);
- SvMAGIC_set(goner, NULL);
- SvREFCNT_dec(goner);
+ SvREFCNT_dec(GvAV(gv));
}
GvAV(gv) = av;
if (SvMAGICAL(av)) {
hv = (HV*)SSPOPPTR;
gv = (GV*)SSPOPPTR;
if (GvHV(gv)) {
- HV * const goner = GvHV(gv);
- SvMAGIC_set(hv, SvMAGIC(goner));
- SvFLAGS(hv) |= SvMAGICAL(goner);
- SvMAGICAL_off(goner);
- SvMAGIC_set(goner, NULL);
- SvREFCNT_dec(goner);
+ SvREFCNT_dec(GvHV(gv));
}
GvHV(gv) = hv;
if (SvMAGICAL(hv)) {
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;
av = (AV*)SSPOPPTR;
+ ptr = av_fetch(av,i,1);
if (!AvREAL(av) && AvREIFY(av)) /* undo reify guard */
SvREFCNT_dec(value);
- ptr = av_fetch(av,i,1);
if (ptr) {
sv = *(SV**)ptr;
if (sv && sv != &PL_sv_undef) {
GvHV(PL_hintgv) = NULL;
}
*(I32*)&PL_hints = (I32)SSPOPINT;
- Perl_refcounted_he_free(aTHX_ PL_compiling.cop_hints);
- PL_compiling.cop_hints = (struct refcounted_he *) SSPOPPTR;
+ Perl_refcounted_he_free(aTHX_ PL_compiling.cop_hints_hash);
+ PL_compiling.cop_hints_hash = (struct refcounted_he *) SSPOPPTR;
if (PL_hints & HINT_LOCALIZE_HH) {
SvREFCNT_dec((SV*)GvHV(PL_hintgv));
GvHV(PL_hintgv) = (HV*)SSPOPPTR;
else
PL_curpad = NULL;
break;
- case SAVEt_PADSV:
+ case SAVEt_PADSV_AND_MORTALIZE:
{
const PADOFFSET off = (PADOFFSET)SSPOPLONG;
+ SV **svp;
ptr = SSPOPPTR;
- if (ptr)
- AvARRAY((PAD*)ptr)[off] = (SV*)SSPOPPTR;
+ assert (ptr);
+ svp = AvARRAY((PAD*)ptr) + off;
+ /* This mortalizing used to be done by POPLOOP() via itersave.
+ But as we have all the information here, we can do it here,
+ save even having to have itersave in the struct. */
+ sv_2mortal(*svp);
+ *svp = (SV*)SSPOPPTR;
}
break;
case SAVEt_SAVESWITCHSTACK:
i = SSPOPINT;
CopARYBASE_set((COP *)ptr, i);
break;
+ case SAVEt_COMPILE_WARNINGS:
+ ptr = SSPOPPTR;
+
+ if (!specialWARN(PL_compiling.cop_warnings))
+ PerlMemShared_free(PL_compiling.cop_warnings);
+
+ PL_compiling.cop_warnings = (STRLEN*)ptr;
+ break;
case SAVEt_RE_STATE:
{
const struct re_save_state *const state
- SAVESTACK_ALLOC_FOR_RE_SAVE_STATE);
PL_savestack_ix -= SAVESTACK_ALLOC_FOR_RE_SAVE_STATE;
- PL_reg_flags = state->re_state_reg_flags;
- PL_bostr = state->re_state_bostr;
- PL_reginput = state->re_state_reginput;
- PL_regbol = state->re_state_regbol;
- PL_regeol = state->re_state_regeol;
- PL_regstartp = state->re_state_regstartp;
- PL_regendp = state->re_state_regendp;
- PL_reglastparen = state->re_state_reglastparen;
- PL_reglastcloseparen = state->re_state_reglastcloseparen;
- PL_regtill = state->re_state_regtill;
if (PL_reg_start_tmp != state->re_state_reg_start_tmp) {
Safefree(PL_reg_start_tmp);
- PL_reg_start_tmp = state->re_state_reg_start_tmp;
}
- PL_reg_start_tmpl = state->re_state_reg_start_tmpl;
- PL_reg_eval_set = state->re_state_reg_eval_set;
- PL_regnarrate = state->re_state_regnarrate;
- PL_regindent = state->re_state_regindent;
- PL_reg_call_cc = state->re_state_reg_call_cc;
- PL_reg_re = state->re_state_reg_re;
- PL_reg_ganch = state->re_state_reg_ganch;
- PL_reg_sv = state->re_state_reg_sv;
- PL_reg_match_utf8 = state->re_state_reg_match_utf8;
- PL_reg_magic = state->re_state_reg_magic;
- PL_reg_oldpos = state->re_state_reg_oldpos;
- PL_reg_oldcurpm = state->re_state_reg_oldcurpm;
- PL_reg_curpm = state->re_state_reg_curpm;
- PL_reg_oldsaved = state->re_state_reg_oldsaved;
- PL_reg_oldsavedlen = state->re_state_reg_oldsavedlen;
- PL_reg_maxiter = state->re_state_reg_maxiter;
- PL_reg_leftiter = state->re_state_reg_leftiter;
if (PL_reg_poscache != state->re_state_reg_poscache) {
Safefree(PL_reg_poscache);
- PL_reg_poscache = state->re_state_reg_poscache;
}
- PL_reg_poscache_size = state->re_state_reg_poscache_size;
- PL_regsize = state->re_state_regsize;
-#ifdef DEBUGGING
- PL_reg_starttry = state->re_state_reg_starttry;
-#endif
-#ifdef PERL_OLD_COPY_ON_WRITE
- PL_nrs = state->re_state_nrs;
-#endif
+ 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");
}
Perl_cx_dump(pTHX_ PERL_CONTEXT *cx)
{
dVAR;
+
+ PERL_ARGS_ASSERT_CX_DUMP;
+
#ifdef DEBUGGING
PerlIO_printf(Perl_debug_log, "CX %ld = %s\n", (long)(cx - cxstack), PL_block_type[CxTYPE(cx)]);
if (CxTYPE(cx) != CXt_SUBST) {
case CXt_BLOCK:
break;
case CXt_FORMAT:
- PerlIO_printf(Perl_debug_log, "BLK_SUB.CV = 0x%"UVxf"\n",
- PTR2UV(cx->blk_sub.cv));
- PerlIO_printf(Perl_debug_log, "BLK_SUB.GV = 0x%"UVxf"\n",
- PTR2UV(cx->blk_sub.gv));
- 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->blk_sub.hasargs);
- PerlIO_printf(Perl_debug_log, "BLK_SUB.RETOP = 0x%"UVxf"\n",
- PTR2UV(cx->blk_sub.retop));
+ PerlIO_printf(Perl_debug_log, "BLK_FORMAT.CV = 0x%"UVxf"\n",
+ PTR2UV(cx->blk_format.cv));
+ PerlIO_printf(Perl_debug_log, "BLK_FORMAT.GV = 0x%"UVxf"\n",
+ PTR2UV(cx->blk_format.gv));
+ PerlIO_printf(Perl_debug_log, "BLK_FORMAT.DFOUTGV = 0x%"UVxf"\n",
+ PTR2UV(cx->blk_format.dfoutgv));
+ PerlIO_printf(Perl_debug_log, "BLK_FORMAT.HASARGS = %d\n",
+ (int)CxHASARGS(cx));
+ PerlIO_printf(Perl_debug_log, "BLK_FORMAT.RETOP = 0x%"UVxf"\n",
+ PTR2UV(cx->blk_format.retop));
break;
case CXt_SUB:
PerlIO_printf(Perl_debug_log, "BLK_SUB.CV = 0x%"UVxf"\n",
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->blk_sub.hasargs);
- PerlIO_printf(Perl_debug_log, "BLK_SUB.LVAL = %d\n",
- (int)cx->blk_sub.lval);
+ (int)CxHASARGS(cx));
+ PerlIO_printf(Perl_debug_log, "BLK_SUB.LVAL = %d\n", (int)CxLVAL(cx));
PerlIO_printf(Perl_debug_log, "BLK_SUB.RETOP = 0x%"UVxf"\n",
PTR2UV(cx->blk_sub.retop));
break;
case CXt_EVAL:
PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_IN_EVAL = %ld\n",
- (long)cx->blk_eval.old_in_eval);
+ (long)CxOLD_IN_EVAL(cx));
PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_OP_TYPE = %s (%s)\n",
- PL_op_name[cx->blk_eval.old_op_type],
- PL_op_desc[cx->blk_eval.old_op_type]);
+ PL_op_name[CxOLD_OP_TYPE(cx)],
+ PL_op_desc[CxOLD_OP_TYPE(cx)]);
if (cx->blk_eval.old_namesv)
PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_NAME = %s\n",
SvPVX_const(cx->blk_eval.old_namesv));
PTR2UV(cx->blk_eval.retop));
break;
- case CXt_LOOP:
- PerlIO_printf(Perl_debug_log, "BLK_LOOP.LABEL = %s\n",
- cx->blk_loop.label);
+ case CXt_LOOP_LAZYIV:
+ case CXt_LOOP_LAZYSV:
+ case CXt_LOOP_FOR:
+ case CXt_LOOP_PLAIN:
+ PerlIO_printf(Perl_debug_log, "BLK_LOOP.LABEL = %s\n", CxLABEL(cx));
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));
- PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERIX = %ld\n",
- (long)cx->blk_loop.iterix);
+ PTR2UV(CX_LOOP_NEXTOP_GET(cx)));
+ /* XXX: not accurate for LAZYSV/IV */
PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERARY = 0x%"UVxf"\n",
- PTR2UV(cx->blk_loop.iterary));
+ PTR2UV(cx->blk_loop.state_u.ary.ary));
+ PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERIX = %ld\n",
+ (long)cx->blk_loop.state_u.ary.ix);
PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERVAR = 0x%"UVxf"\n",
PTR2UV(CxITERVAR(cx)));
- if (CxITERVAR(cx))
- PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERSAVE = 0x%"UVxf"\n",
- PTR2UV(cx->blk_loop.itersave));
- PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERLVAL = 0x%"UVxf"\n",
- PTR2UV(cx->blk_loop.iterlval));
break;
case CXt_SUBST:
PerlIO_printf(Perl_debug_log, "SB_RFLAGS = %ld\n",
(long)cx->sb_rflags);
PerlIO_printf(Perl_debug_log, "SB_ONCE = %ld\n",
- (long)cx->sb_once);
+ (long)CxONCE(cx));
PerlIO_printf(Perl_debug_log, "SB_ORIG = %s\n",
cx->sb_orig);
PerlIO_printf(Perl_debug_log, "SB_DSTR = 0x%"UVxf"\n",
https://perl5.git.perl.org / perl5.git / blobdiff