applied patch, tweaked wording
[p5sagit/p5-mst-13.2.git] / dump.c
diff --git a/dump.c b/dump.c
index df3de9b..b34b5d4 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -1,6 +1,6 @@
 /*    dump.c
  *
- *    Copyright (c) 1991-1994, Larry Wall
+ *    Copyright (c) 1991-1997, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
 #include "EXTERN.h"
 #include "perl.h"
 
-#ifndef DEBUGGING
-void
-dump_all()
-{
-}
-#else  /* Rest of file is for DEBUGGING */
-
-static void dump();
+#ifndef PERL_OBJECT
+static void dump(char *pat, ...);
+#endif /* PERL_OBJECT */
 
 void
-dump_all()
+dump_all(void)
 {
+#ifdef DEBUGGING
     dTHR;
-#ifdef HAS_SETLINEBUF
-    setlinebuf(stderr);
-#else
-    setvbuf(stderr, Nullch, _IOLBF, 0);
-#endif
+    PerlIO_setlinebuf(Perl_debug_log);
     if (main_root)
        dump_op(main_root);
     dump_packsubs(defstash);
+#endif /* DEBUGGING */
 }
 
 void
-dump_packsubs(stash)
-HV* stash;
+dump_packsubs(HV *stash)
 {
+#ifdef DEBUGGING
     dTHR;
     I32        i;
     HE *entry;
@@ -49,27 +42,28 @@ HV* stash;
     if (!HvARRAY(stash))
        return;
     for (i = 0; i <= (I32) HvMAX(stash); i++) {
-       for (entry = HvARRAY(stash)[i]; entry; entry = entry->hent_next) {
-           GV *gv = (GV*)entry->hent_val;
+       for (entry = HvARRAY(stash)[i]; entry; entry = HeNEXT(entry)) {
+           GV *gv = (GV*)HeVAL(entry);
            HV *hv;
-           if (GvCV(gv))
+           if (GvCVu(gv))
                dump_sub(gv);
            if (GvFORM(gv))
                dump_form(gv);
-           if (entry->hent_key[entry->hent_klen-1] == ':' &&
+           if (HeKEY(entry)[HeKLEN(entry)-1] == ':' &&
              (hv = GvHV(gv)) && HvNAME(hv) && hv != defstash)
                dump_packsubs(hv);              /* nested package */
        }
     }
+#endif /* DEBUGGING */
 }
 
 void
-dump_sub(gv)
-GV* gv;
+dump_sub(GV *gv)
 {
+#ifdef DEBUGGING
     SV *sv = sv_newmortal();
 
-    gv_fullname(sv,gv);
+    gv_fullname3(sv, gv, Nullch);
     dump("\nSUB %s = ", SvPVX(sv));
     if (CvXSUB(GvCV(gv)))
        dump("(xsub 0x%x %d)\n",
@@ -79,48 +73,50 @@ GV* gv;
        dump_op(CvROOT(GvCV(gv)));
     else
        dump("<undef>\n");
+#endif /* DEBUGGING */
 }
 
 void
-dump_form(gv)
-GV* gv;
+dump_form(GV *gv)
 {
+#ifdef DEBUGGING
     SV *sv = sv_newmortal();
 
-    gv_fullname(sv,gv);
+    gv_fullname3(sv, gv, Nullch);
     dump("\nFORMAT %s = ", SvPVX(sv));
     if (CvROOT(GvFORM(gv)))
        dump_op(CvROOT(GvFORM(gv)));
     else
        dump("<undef>\n");
+#endif /* DEBUGGING */
 }
 
 void
-dump_eval()
+dump_eval(void)
 {
+#ifdef DEBUGGING
     dump_op(eval_root);
+#endif /* DEBUGGING */
 }
 
 void
-dump_op(o)
-register OP *o;
+dump_op(OP *o)
 {
-    SV *tmpsv;
-
+#ifdef DEBUGGING
     dump("{\n");
     if (o->op_seq)
-       fprintf(stderr, "%-4d", o->op_seq);
+       PerlIO_printf(Perl_debug_log, "%-4d", o->op_seq);
     else
-       fprintf(stderr, "    ");
+       PerlIO_printf(Perl_debug_log, "    ");
     dump("TYPE = %s  ===> ", op_name[o->op_type]);
     if (o->op_next) {
        if (o->op_seq)
-           fprintf(stderr, "%d\n", o->op_next->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", o->op_next->op_seq);
        else
-           fprintf(stderr, "(%d)\n", o->op_next->op_seq);
+           PerlIO_printf(Perl_debug_log, "(%d)\n", o->op_next->op_seq);
     }
     else
-       fprintf(stderr, "DONE\n");
+       PerlIO_printf(Perl_debug_log, "DONE\n");
     dumplvl++;
     if (o->op_targ) {
        if (o->op_type == OP_NULL)
@@ -132,52 +128,57 @@ register OP *o;
     dump("ADDR = 0x%lx => 0x%lx\n",o, o->op_next);
 #endif
     if (o->op_flags) {
-       *buf = '\0';
-       if (o->op_flags & OPf_KNOW) {
-           if (o->op_flags & OPf_LIST)
-               (void)strcat(buf,"LIST,");
-           else
-               (void)strcat(buf,"SCALAR,");
+       SV *tmpsv = newSVpv("", 0);
+       switch (o->op_flags & OPf_WANT) {
+       case OPf_WANT_VOID:
+           sv_catpv(tmpsv, ",VOID");
+           break;
+       case OPf_WANT_SCALAR:
+           sv_catpv(tmpsv, ",SCALAR");
+           break;
+       case OPf_WANT_LIST:
+           sv_catpv(tmpsv, ",LIST");
+           break;
+       default:
+           sv_catpv(tmpsv, ",UNKNOWN");
+           break;
        }
-       else
-           (void)strcat(buf,"UNKNOWN,");
        if (o->op_flags & OPf_KIDS)
-           (void)strcat(buf,"KIDS,");
+           sv_catpv(tmpsv, ",KIDS");
        if (o->op_flags & OPf_PARENS)
-           (void)strcat(buf,"PARENS,");
+           sv_catpv(tmpsv, ",PARENS");
        if (o->op_flags & OPf_STACKED)
-           (void)strcat(buf,"STACKED,");
+           sv_catpv(tmpsv, ",STACKED");
        if (o->op_flags & OPf_REF)
-           (void)strcat(buf,"REF,");
+           sv_catpv(tmpsv, ",REF");
        if (o->op_flags & OPf_MOD)
-           (void)strcat(buf,"MOD,");
+           sv_catpv(tmpsv, ",MOD");
        if (o->op_flags & OPf_SPECIAL)
-           (void)strcat(buf,"SPECIAL,");
-       if (*buf)
-           buf[strlen(buf)-1] = '\0';
-       dump("FLAGS = (%s)\n",buf);
+           sv_catpv(tmpsv, ",SPECIAL");
+       dump("FLAGS = (%s)\n", SvCUR(tmpsv) ? SvPVX(tmpsv) + 1 : "");
+       SvREFCNT_dec(tmpsv);
     }
     if (o->op_private) {
-       *buf = '\0';
+       SV *tmpsv = newSVpv("", 0);
        if (o->op_type == OP_AASSIGN) {
            if (o->op_private & OPpASSIGN_COMMON)
-               (void)strcat(buf,"COMMON,");
+               sv_catpv(tmpsv, ",COMMON");
        }
        else if (o->op_type == OP_SASSIGN) {
            if (o->op_private & OPpASSIGN_BACKWARDS)
-               (void)strcat(buf,"BACKWARDS,");
+               sv_catpv(tmpsv, ",BACKWARDS");
        }
        else if (o->op_type == OP_TRANS) {
            if (o->op_private & OPpTRANS_SQUASH)
-               (void)strcat(buf,"SQUASH,");
+               sv_catpv(tmpsv, ",SQUASH");
            if (o->op_private & OPpTRANS_DELETE)
-               (void)strcat(buf,"DELETE,");
+               sv_catpv(tmpsv, ",DELETE");
            if (o->op_private & OPpTRANS_COMPLEMENT)
-               (void)strcat(buf,"COMPLEMENT,");
+               sv_catpv(tmpsv, ",COMPLEMENT");
        }
        else if (o->op_type == OP_REPEAT) {
            if (o->op_private & OPpREPEAT_DOLIST)
-               (void)strcat(buf,"DOLIST,");
+               sv_catpv(tmpsv, ",DOLIST");
        }
        else if (o->op_type == OP_ENTERSUB ||
                 o->op_type == OP_RV2SV ||
@@ -187,45 +188,59 @@ register OP *o;
                 o->op_type == OP_AELEM ||
                 o->op_type == OP_HELEM )
        {
-           if (o->op_private & OPpENTERSUB_AMPER)
-               (void)strcat(buf,"AMPER,");
-           if (o->op_private & OPpENTERSUB_DB)
-               (void)strcat(buf,"DB,");
-           if (o->op_private & OPpDEREF_AV)
-               (void)strcat(buf,"AV,");
-           if (o->op_private & OPpDEREF_HV)
-               (void)strcat(buf,"HV,");
-           if (o->op_private & HINT_STRICT_REFS)
-               (void)strcat(buf,"STRICT_REFS,");
+           if (o->op_type == OP_ENTERSUB) {
+               if (o->op_private & OPpENTERSUB_AMPER)
+                   sv_catpv(tmpsv, ",AMPER");
+               if (o->op_private & OPpENTERSUB_DB)
+                   sv_catpv(tmpsv, ",DB");
+           }
+           switch (o->op_private & OPpDEREF) {
+           case OPpDEREF_SV:
+               sv_catpv(tmpsv, ",SV");
+               break;
+           case OPpDEREF_AV:
+               sv_catpv(tmpsv, ",AV");
+               break;
+           case OPpDEREF_HV:
+               sv_catpv(tmpsv, ",HV");
+               break;
+           }
+           if (o->op_type == OP_AELEM || o->op_type == OP_HELEM) {
+               if (o->op_private & OPpLVAL_DEFER)
+                   sv_catpv(tmpsv, ",LVAL_DEFER");
+           }
+           else {
+               if (o->op_private & HINT_STRICT_REFS)
+                   sv_catpv(tmpsv, ",STRICT_REFS");
+           }
        }
        else if (o->op_type == OP_CONST) {
            if (o->op_private & OPpCONST_BARE)
-               (void)strcat(buf,"BARE,");
+               sv_catpv(tmpsv, ",BARE");
        }
        else if (o->op_type == OP_FLIP) {
            if (o->op_private & OPpFLIP_LINENUM)
-               (void)strcat(buf,"LINENUM,");
+               sv_catpv(tmpsv, ",LINENUM");
        }
        else if (o->op_type == OP_FLOP) {
            if (o->op_private & OPpFLIP_LINENUM)
-               (void)strcat(buf,"LINENUM,");
+               sv_catpv(tmpsv, ",LINENUM");
        }
        if (o->op_flags & OPf_MOD && o->op_private & OPpLVAL_INTRO)
-           (void)strcat(buf,"INTRO,");
-       if (*buf) {
-           buf[strlen(buf)-1] = '\0';
-           dump("PRIVATE = (%s)\n",buf);
-       }
+           sv_catpv(tmpsv, ",INTRO");
+       if (SvCUR(tmpsv))
+           dump("PRIVATE = (%s)\n", SvPVX(tmpsv) + 1);
+       SvREFCNT_dec(tmpsv);
     }
 
     switch (o->op_type) {
     case OP_GVSV:
     case OP_GV:
        if (cGVOPo->op_gv) {
+           SV *tmpsv = NEWSV(0,0);
            ENTER;
-           tmpsv = NEWSV(0,0);
            SAVEFREESV(tmpsv);
-           gv_fullname(tmpsv,cGVOPo->op_gv);
+           gv_fullname3(tmpsv, cGVOPo->op_gv, Nullch);
            dump("GV = %s\n", SvPV(tmpsv, na));
            LEAVE;
        }
@@ -245,31 +260,31 @@ register OP *o;
     case OP_ENTERLOOP:
        dump("REDO ===> ");
        if (cLOOPo->op_redoop)
-           fprintf(stderr, "%d\n", cLOOPo->op_redoop->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", cLOOPo->op_redoop->op_seq);
        else
-           fprintf(stderr, "DONE\n");
+           PerlIO_printf(Perl_debug_log, "DONE\n");
        dump("NEXT ===> ");
        if (cLOOPo->op_nextop)
-           fprintf(stderr, "%d\n", cLOOPo->op_nextop->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", cLOOPo->op_nextop->op_seq);
        else
-           fprintf(stderr, "DONE\n");
+           PerlIO_printf(Perl_debug_log, "DONE\n");
        dump("LAST ===> ");
        if (cLOOPo->op_lastop)
-           fprintf(stderr, "%d\n", cLOOPo->op_lastop->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", cLOOPo->op_lastop->op_seq);
        else
-           fprintf(stderr, "DONE\n");
+           PerlIO_printf(Perl_debug_log, "DONE\n");
        break;
     case OP_COND_EXPR:
        dump("TRUE ===> ");
        if (cCONDOPo->op_true)
-           fprintf(stderr, "%d\n", cCONDOPo->op_true->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", cCONDOPo->op_true->op_seq);
        else
-           fprintf(stderr, "DONE\n");
+           PerlIO_printf(Perl_debug_log, "DONE\n");
        dump("FALSE ===> ");
        if (cCONDOPo->op_false)
-           fprintf(stderr, "%d\n", cCONDOPo->op_false->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", cCONDOPo->op_false->op_seq);
        else
-           fprintf(stderr, "DONE\n");
+           PerlIO_printf(Perl_debug_log, "DONE\n");
        break;
     case OP_MAPWHILE:
     case OP_GREPWHILE:
@@ -277,9 +292,9 @@ register OP *o;
     case OP_AND:
        dump("OTHER ===> ");
        if (cLOGOPo->op_other)
-           fprintf(stderr, "%d\n", cLOGOPo->op_other->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", cLOGOPo->op_other->op_seq);
        else
-           fprintf(stderr, "DONE\n");
+           PerlIO_printf(Perl_debug_log, "DONE\n");
        break;
     case OP_PUSHRE:
     case OP_MATCH:
@@ -296,36 +311,38 @@ register OP *o;
     }
     dumplvl--;
     dump("}\n");
+#endif /* DEBUGGING */
 }
 
 void
-dump_gv(gv)
-register GV *gv;
+dump_gv(GV *gv)
 {
+#ifdef DEBUGGING
     SV *sv;
 
     if (!gv) {
-       fprintf(stderr,"{}\n");
+       PerlIO_printf(Perl_debug_log, "{}\n");
        return;
     }
     sv = sv_newmortal();
     dumplvl++;
-    fprintf(stderr,"{\n");
-    gv_fullname(sv,gv);
+    PerlIO_printf(Perl_debug_log, "{\n");
+    gv_fullname3(sv, gv, Nullch);
     dump("GV_NAME = %s", SvPVX(sv));
     if (gv != GvEGV(gv)) {
-       gv_efullname(sv,GvEGV(gv));
+       gv_efullname3(sv, GvEGV(gv), Nullch);
        dump("-> %s", SvPVX(sv));
     }
     dump("\n");
     dumplvl--;
     dump("}\n");
+#endif /* DEBUGGING */
 }
 
 void
-dump_pm(pm)
-register PMOP *pm;
+dump_pm(PMOP *pm)
 {
+#ifdef DEBUGGING
     char ch;
 
     if (!pm) {
@@ -339,56 +356,62 @@ register PMOP *pm;
     else
        ch = '/';
     if (pm->op_pmregexp)
-       dump("PMf_PRE %c%s%c\n",ch,pm->op_pmregexp->precomp,ch);
+       dump("PMf_PRE %c%s%c%s\n",
+            ch, pm->op_pmregexp->precomp, ch,
+            (pm->op_private & OPpRUNTIME) ? " (RUNTIME)" : "");
+    else
+       dump("PMf_PRE (RUNTIME)\n");
     if (pm->op_type != OP_PUSHRE && pm->op_pmreplroot) {
        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) {
-       *buf = '\0';
-       if (pm->op_pmflags & PMf_USED)
-           (void)strcat(buf,"USED,");
+    if (pm->op_pmflags || (pm->op_pmregexp && pm->op_pmregexp->check_substr)) {
+       SV *tmpsv = newSVpv("", 0);
+       if (pm->op_pmdynflags & PMdf_USED)
+           sv_catpv(tmpsv, ",USED");
        if (pm->op_pmflags & PMf_ONCE)
-           (void)strcat(buf,"ONCE,");
-       if (pm->op_pmflags & PMf_SCANFIRST)
-           (void)strcat(buf,"SCANFIRST,");
-       if (pm->op_pmflags & PMf_ALL)
-           (void)strcat(buf,"ALL,");
+           sv_catpv(tmpsv, ",ONCE");
+       if (pm->op_pmregexp && pm->op_pmregexp->check_substr
+           && !(pm->op_pmregexp->reganch & ROPT_NOSCAN))
+           sv_catpv(tmpsv, ",SCANFIRST");
+       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)
-           (void)strcat(buf,"SKIPWHITE,");
-       if (pm->op_pmflags & PMf_FOLD)
-           (void)strcat(buf,"FOLD,");
+           sv_catpv(tmpsv, ",SKIPWHITE");
        if (pm->op_pmflags & PMf_CONST)
-           (void)strcat(buf,"CONST,");
+           sv_catpv(tmpsv, ",CONST");
        if (pm->op_pmflags & PMf_KEEP)
-           (void)strcat(buf,"KEEP,");
+           sv_catpv(tmpsv, ",KEEP");
        if (pm->op_pmflags & PMf_GLOBAL)
-           (void)strcat(buf,"GLOBAL,");
-       if (pm->op_pmflags & PMf_RUNTIME)
-           (void)strcat(buf,"RUNTIME,");
+           sv_catpv(tmpsv, ",GLOBAL");
+       if (pm->op_pmflags & PMf_CONTINUE)
+           sv_catpv(tmpsv, ",CONTINUE");
+       if (pm->op_pmflags & PMf_TAINTMEM)
+           sv_catpv(tmpsv, ",TAINTMEM");
        if (pm->op_pmflags & PMf_EVAL)
-           (void)strcat(buf,"EVAL,");
-       if (*buf)
-           buf[strlen(buf)-1] = '\0';
-       dump("PMFLAGS = (%s)\n",buf);
+           sv_catpv(tmpsv, ",EVAL");
+       dump("PMFLAGS = (%s)\n", SvCUR(tmpsv) ? SvPVX(tmpsv) + 1 : "");
+       SvREFCNT_dec(tmpsv);
     }
 
     dumplvl--;
     dump("}\n");
+#endif /* DEBUGGING */
 }
 
-/* VARARGS1 */
-static void dump(arg1,arg2,arg3,arg4,arg5)
-char *arg1;
-long arg2, arg3, arg4, arg5;
+
+STATIC void
+dump(char *pat,...)
 {
+#ifdef DEBUGGING
     I32 i;
+    va_list args;
 
+    va_start(args, pat);
     for (i = dumplvl*4; i; i--)
-       (void)putc(' ',stderr);
-    fprintf(stderr,arg1, arg2, arg3, arg4, arg5);
+       (void)PerlIO_putc(Perl_debug_log,' ');
+    PerlIO_vprintf(Perl_debug_log,pat,args);
+    va_end(args);
+#endif /* DEBUGGING */
 }
-#endif