[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 cf9cf5d..07437d7 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -17,19 +17,21 @@
 
 #ifndef DEBUGGING
 void
-dump_all()
+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()
+dump_all(void)
 {
     dTHR;
     PerlIO_setlinebuf(Perl_debug_log);
@@ -39,8 +41,7 @@ dump_all()
 }
 
 void
-dump_packsubs(stash)
-HV* stash;
+dump_packsubs(HV *stash)
 {
     dTHR;
     I32        i;
@@ -64,8 +65,7 @@ HV* stash;
 }
 
 void
-dump_sub(gv)
-GV* gv;
+dump_sub(GV *gv)
 {
     SV *sv = sv_newmortal();
 
@@ -82,8 +82,7 @@ GV* gv;
 }
 
 void
-dump_form(gv)
-GV* gv;
+dump_form(GV *gv)
 {
     SV *sv = sv_newmortal();
 
@@ -96,14 +95,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 +314,7 @@ register OP *o;
 }
 
 void
-dump_gv(gv)
-register GV *gv;
+dump_gv(GV *gv)
 {
     SV *sv;
 
@@ -340,8 +337,7 @@ register GV *gv;
 }
 
 void
-dump_pm(pm)
-register PMOP *pm;
+dump_pm(PMOP *pm)
 {
     char ch;
 
@@ -365,18 +361,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");
@@ -415,7 +410,7 @@ long arg2, arg3, arg4, arg5;
 #else
 
 #ifdef I_STDARG
-static void
+STATIC void
 dump(char *pat,...)
 #else
 /*VARARGS0*/