diff options
| author | Chip Salzenberg <chip@atlantic.net> | 1996-12-24 16:22:19 +1200 |
|---|---|---|
| committer | Chip Salzenberg <chip@atlantic.net> | 1996-12-25 11:25:00 +1200 |
| commit | ab50184ab8a0eb38660598afeb797a30730b248c (patch) | |
| tree | 5630988090bc880fb503ea3b26a6d3fa3dab7e6e | |
| parent | aca050d61a9a8f2ca11ad0c6e24afacfe00d41ec (diff) | |
| download | perl-ab50184ab8a0eb38660598afeb797a30730b248c.tar.gz | |
Fix closures that are not in subroutines
| -rw-r--r-- | op.c | 27 |
1 files changed, 19 insertions, 8 deletions
@@ -195,8 +195,8 @@ pad_findlex(char *name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix) depth = CvDEPTH(cv); if (!depth) { - if (newoff) - return 0; /* don't clone inactive stack frame */ + if (newoff && (CvANON(cv) || CvGV(cv))) + return 0; /* don't clone inactive sub's stack frame */ depth = 1; } oldpad = (AV*)*av_fetch(curlist, depth, FALSE); @@ -2795,13 +2795,22 @@ CV* cv; I32 ix; PerlIO_printf(Perl_debug_log, "\tCV=0x%p (%s), OUTSIDE=0x%p (%s)\n", - cv, CvANON(cv) ? "ANON" : GvNAME(CvGV(cv)), - outside, CvANON(outside) ? "ANON" : GvNAME(CvGV(outside))); + cv, + (CvANON(cv) ? "ANON" + : (cv == main_cv) ? "MAIN" + : CvGV(cv) ? GvNAME(CvGV(cv)) : "?mystery?"), + outside, + (!outside ? "null" + : CvANON(outside) ? "ANON" + : (outside == main_cv) ? "MAIN" + : CvGV(outside) ? GvNAME(CvGV(outside)) : "?mystery?")); for (ix = 1; ix <= AvFILL(pad); ix++) { if (SvPOK(pname[ix])) - PerlIO_printf(Perl_debug_log, "\t%4d. 0x%p (\"%s\")\n", - ix, ppad[ix], SvPVX(pname[ix])) + PerlIO_printf(Perl_debug_log, "\t%4d. 0x%p (\"%s\" %ld-%ld)\n", + ix, ppad[ix], SvPVX(pname[ix]), + (long)I_32(SvNVX(pname[ix])), + (long)SvIVX(pname[ix])); } } #endif /* DEBUG_CLOSURES */ @@ -2907,9 +2916,11 @@ CV* outside; } #ifdef DEBUG_CLOSURES - PerlIO_printf(Perl_debug_log, "Cloned from:\n"); + PerlIO_printf(Perl_debug_log, "Cloned inside:\n"); + cv_dump(outside); + PerlIO_printf(Perl_debug_log, " from:\n"); cv_dump(proto); - PerlIO_printf(Perl_debug_log, " to:\n"); + PerlIO_printf(Perl_debug_log, " to:\n"); cv_dump(cv); #endif |