[asperl] various changes to get asperl working under Borland

[p5sagit/p5-mst-13.2.git] / dump.c

diff --git a/dump.c b/dump.c
index 51fd157..07437d7 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -22,11 +22,13 @@ dump_all(void)
 }
 #else  /* Rest of file is for DEBUGGING */
 
+#ifndef PERL_OBJECT
 #ifdef I_STDARG
 static void dump(char *pat, ...);
 #else
 static void dump();
 #endif
+#endif /* PERL_OBJECT */
 
 void
 dump_all(void)
@@ -359,18 +361,17 @@ dump_pm(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");
@@ -409,7 +410,7 @@ long arg2, arg3, arg4, arg5;
 #else
 
 #ifdef I_STDARG
-static void
+STATIC void
 dump(char *pat,...)
 #else
 /*VARARGS0*/