X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=run.c;h=04302dbc836c0c7618a1976866ecfb40000d6a71;hb=c0393c90932dfbd5778207b0f3f2e6f99dc7fdb2;hp=06dc3f230f15764d4d504981f4826f74c986957d;hpb=bc89e66f06f2a92e37ea7c110f66788fcfbe6847;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/run.c b/run.c
index 06dc3f2..04302db 100644
--- a/run.c
+++ b/run.c
@@ -63,6 +63,8 @@ I32
 Perl_debop(pTHX_ OP *o)
 {
 #ifdef DEBUGGING
+    AV *padlist, *comppad;
+    CV *cv;
     SV *sv;
     STRLEN n_a;
     Perl_deb(aTHX_ "%s", PL_op_name[o->op_type]);
@@ -81,6 +83,22 @@ Perl_debop(pTHX_ OP *o)
 	else
 	    PerlIO_printf(Perl_debug_log, "(NULL)");
 	break;
+    case OP_PADSV:
+    case OP_PADAV:
+    case OP_PADHV:
+	/* print the lexical's name */
+        cv = deb_curcv(cxstack_ix);
+        if (cv) {
+            padlist = CvPADLIST(cv);
+            comppad = (AV*)(*av_fetch(padlist, 0, FALSE));
+            sv = *av_fetch(comppad, o->op_targ, FALSE);
+        } else
+            sv = Nullsv;
+        if (sv)
+           PerlIO_printf(Perl_debug_log, "(%s)", SvPV_nolen(sv));
+        else
+           PerlIO_printf(Perl_debug_log, "[%"UVuf"]", (UV)o->op_targ);
+        break;
     default:
 	break;
     }
@@ -89,6 +107,26 @@ Perl_debop(pTHX_ OP *o)
     return 0;
 }
 
+STATIC CV*
+S_deb_curcv(pTHX_ I32 ix)
+{
+#ifdef DEBUGGING
+    PERL_CONTEXT *cx = &cxstack[ix];
+    if (CxTYPE(cx) == CXt_SUB || CxTYPE(cx) == CXt_FORMAT)
+        return cx->blk_sub.cv;
+    else if (CxTYPE(cx) == CXt_EVAL && !CxTRYBLOCK(cx))
+        return PL_compcv;
+    else if (ix == 0 && PL_curstackinfo->si_type == PERLSI_MAIN)
+        return PL_main_cv;
+    else if (ix <= 0)
+        return Nullcv;
+    else
+        return deb_curcv(ix - 1);
+#else
+    return Nullcv;
+#endif  /* DEBUGGING */
+}
+
 void
 Perl_watch(pTHX_ char **addr)
 {