X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=b1e984bcadef4aba09fbdab8556619be365bb638;hb=7ee8c957e643df1e9e47d243c3269eb47c2da591;hp=8735585a554524a7ed9e3a0a6cd25fbf51cc9b19;hpb=b3eb6a9ba72c92b7decf330d8d63b32ba5499629;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/dump.c b/dump.c
index 8735585..b1e984b 100644
--- a/dump.c
+++ b/dump.c
@@ -25,9 +25,9 @@ dump_all(void)
 #ifdef DEBUGGING
     dTHR;
     PerlIO_setlinebuf(Perl_debug_log);
-    if (main_root)
-	dump_op(main_root);
-    dump_packsubs(defstash);
+    if (PL_main_root)
+	dump_op(PL_main_root);
+    dump_packsubs(PL_defstash);
 #endif	/* DEBUGGING */
 }
 
@@ -45,12 +45,14 @@ dump_packsubs(HV *stash)
 	for (entry = HvARRAY(stash)[i]; entry; entry = HeNEXT(entry)) {
 	    GV *gv = (GV*)HeVAL(entry);
 	    HV *hv;
+	    if (SvTYPE(gv) != SVt_PVGV || !GvGP(gv))
+		continue;
 	    if (GvCVu(gv))
 		dump_sub(gv);
 	    if (GvFORM(gv))
 		dump_form(gv);
 	    if (HeKEY(entry)[HeKLEN(entry)-1] == ':' &&
-	      (hv = GvHV(gv)) && HvNAME(hv) && hv != defstash)
+	      (hv = GvHV(gv)) && HvNAME(hv) && hv != PL_defstash)
 		dump_packsubs(hv);		/* nested package */
 	}
     }
@@ -95,7 +97,7 @@ void
 dump_eval(void)
 {
 #ifdef DEBUGGING
-    dump_op(eval_root);
+    dump_op(PL_eval_root);
 #endif	/* DEBUGGING */
 }
 
@@ -117,7 +119,7 @@ dump_op(OP *o)
     }
     else
 	PerlIO_printf(Perl_debug_log, "DONE\n");
-    dumplvl++;
+    PL_dumplvl++;
     if (o->op_targ) {
 	if (o->op_type == OP_NULL)
 	    dump("  (was %s)\n", op_name[o->op_targ]);
@@ -241,7 +243,7 @@ dump_op(OP *o)
 	    ENTER;
 	    SAVEFREESV(tmpsv);
 	    gv_fullname3(tmpsv, cGVOPo->op_gv, Nullch);
-	    dump("GV = %s\n", SvPV(tmpsv, na));
+	    dump("GV = %s\n", SvPV(tmpsv, PL_na));
 	    LEAVE;
 	}
 	else
@@ -298,6 +300,7 @@ dump_op(OP *o)
 	break;
     case OP_PUSHRE:
     case OP_MATCH:
+    case OP_QR:
     case OP_SUBST:
 	dump_pm(cPMOPo);
 	break;
@@ -309,7 +312,7 @@ dump_op(OP *o)
 	for (kid = cUNOPo->op_first; kid; kid = kid->op_sibling)
 	    dump_op(kid);
     }
-    dumplvl--;
+    PL_dumplvl--;
     dump("}\n");
 #endif	/* DEBUGGING */
 }
@@ -325,7 +328,7 @@ dump_gv(GV *gv)
 	return;
     }
     sv = sv_newmortal();
-    dumplvl++;
+    PL_dumplvl++;
     PerlIO_printf(Perl_debug_log, "{\n");
     gv_fullname3(sv, gv, Nullch);
     dump("GV_NAME = %s", SvPVX(sv));
@@ -334,7 +337,7 @@ dump_gv(GV *gv)
 	dump("-> %s", SvPVX(sv));
     }
     dump("\n");
-    dumplvl--;
+    PL_dumplvl--;
     dump("}\n");
 #endif	/* DEBUGGING */
 }
@@ -350,7 +353,7 @@ dump_pm(PMOP *pm)
 	return;
     }
     dump("{\n");
-    dumplvl++;
+    PL_dumplvl++;
     if (pm->op_pmflags & PMf_ONCE)
 	ch = '?';
     else
@@ -397,7 +400,7 @@ dump_pm(PMOP *pm)
 	SvREFCNT_dec(tmpsv);
     }
 
-    dumplvl--;
+    PL_dumplvl--;
     dump("}\n");
 #endif	/* DEBUGGING */
 }
@@ -411,7 +414,7 @@ dump(char *pat,...)
     va_list args;
 
     va_start(args, pat);
-    for (i = dumplvl*4; i; i--)
+    for (i = PL_dumplvl*4; i; i--)
 	(void)PerlIO_putc(Perl_debug_log,' ');
     PerlIO_vprintf(Perl_debug_log,pat,args);
     va_end(args);