X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=24602e9477dbc1063ec548fa4c6306ce72b105f7;hb=0a5d5e8be390bda2f9b7684490082d428228d28f;hp=cf9cf5deb083725cf67485fe1fdae9b1084400c6;hpb=5dc0d6134ebb76636f69238201dde15cec972fd0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/dump.c b/dump.c
index cf9cf5d..24602e9 100644
--- a/dump.c
+++ b/dump.c
@@ -17,7 +17,7 @@
 
 #ifndef DEBUGGING
 void
-dump_all()
+dump_all(void)
 {
 }
 #else  /* Rest of file is for DEBUGGING */
@@ -29,7 +29,7 @@ static void dump();
 #endif
 
 void
-dump_all()
+dump_all(void)
 {
     dTHR;
     PerlIO_setlinebuf(Perl_debug_log);
@@ -39,8 +39,7 @@ dump_all()
 }
 
 void
-dump_packsubs(stash)
-HV* stash;
+dump_packsubs(HV *stash)
 {
     dTHR;
     I32	i;
@@ -64,8 +63,7 @@ HV* stash;
 }
 
 void
-dump_sub(gv)
-GV* gv;
+dump_sub(GV *gv)
 {
     SV *sv = sv_newmortal();
 
@@ -82,8 +80,7 @@ GV* gv;
 }
 
 void
-dump_form(gv)
-GV* gv;
+dump_form(GV *gv)
 {
     SV *sv = sv_newmortal();
 
@@ -96,14 +93,13 @@ GV* gv;
 }
 
 void
-dump_eval()
+dump_eval(void)
 {
     dump_op(eval_root);
 }
 
 void
-dump_op(o)
-register OP *o;
+dump_op(OP *o)
 {
     dump("{\n");
     if (o->op_seq)
@@ -316,8 +312,7 @@ register OP *o;
 }
 
 void
-dump_gv(gv)
-register GV *gv;
+dump_gv(GV *gv)
 {
     SV *sv;
 
@@ -340,8 +335,7 @@ register GV *gv;
 }
 
 void
-dump_pm(pm)
-register PMOP *pm;
+dump_pm(PMOP *pm)
 {
     char ch;
 
@@ -365,18 +359,17 @@ register PMOP *pm;
 	dump("PMf_REPL = ");
 	dump_op(pm->op_pmreplroot);
     }
-    if (pm->op_pmshort) {
-	dump("PMf_SHORT = %s\n",SvPEEK(pm->op_pmshort));
-    }
-    if (pm->op_pmflags) {
+    if (pm->op_pmflags || (pm->op_pmregexp && pm->op_pmregexp->check_substr)) {
 	SV *tmpsv = newSVpv("", 0);
 	if (pm->op_pmflags & PMf_USED)
 	    sv_catpv(tmpsv, ",USED");
 	if (pm->op_pmflags & PMf_ONCE)
 	    sv_catpv(tmpsv, ",ONCE");
-	if (pm->op_pmflags & PMf_SCANFIRST)
+	if (pm->op_pmregexp && pm->op_pmregexp->check_substr
+	    && !(pm->op_pmregexp->reganch & ROPT_NOSCAN))
 	    sv_catpv(tmpsv, ",SCANFIRST");
-	if (pm->op_pmflags & PMf_ALL)
+	if (pm->op_pmregexp && pm->op_pmregexp->check_substr
+	    && pm->op_pmregexp->reganch & ROPT_CHECK_ALL)
 	    sv_catpv(tmpsv, ",ALL");
 	if (pm->op_pmflags & PMf_SKIPWHITE)
 	    sv_catpv(tmpsv, ",SKIPWHITE");