Special mkdir() for VMS

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

diff --git a/dump.c b/dump.c
index e461d69..af75cf7 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.
@@ -25,25 +25,13 @@ dump_all()
 #ifdef I_STDARG
 static void dump(char *pat, ...);
 #else
-#  if defined(I_VARARGS)
-/*VARARGS0*/
-static void
-dump(pat, va_alist)
-    char *pat;
-    va_dcl
-#  else
 static void dump();
-#  endif
 #endif
 
 void
 dump_all()
 {
-#ifdef HAS_SETLINEBUF
-    setlinebuf(Perl_debug_log);
-#else
-    setvbuf(Perl_debug_log, Nullch, _IOLBF, 0);
-#endif
+    PerlIO_setlinebuf(Perl_debug_log);
     if (main_root)
        dump_op(main_root);
     dump_packsubs(defstash);
@@ -62,7 +50,7 @@ HV* stash;
        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);
@@ -79,7 +67,7 @@ GV* gv;
 {
     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",
@@ -97,7 +85,7 @@ GV* gv;
 {
     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)));
@@ -119,18 +107,18 @@ register OP *op;
 
     dump("{\n");
     if (op->op_seq)
-       fprintf(Perl_debug_log, "%-4d", op->op_seq);
+       PerlIO_printf(Perl_debug_log, "%-4d", op->op_seq);
     else
-       fprintf(Perl_debug_log, "    ");
+       PerlIO_printf(Perl_debug_log, "    ");
     dump("TYPE = %s  ===> ", op_name[op->op_type]);
     if (op->op_next) {
        if (op->op_seq)
-           fprintf(Perl_debug_log, "%d\n", op->op_next->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", op->op_next->op_seq);
        else
-           fprintf(Perl_debug_log, "(%d)\n", op->op_next->op_seq);
+           PerlIO_printf(Perl_debug_log, "(%d)\n", op->op_next->op_seq);
     }
     else
-       fprintf(Perl_debug_log, "DONE\n");
+       PerlIO_printf(Perl_debug_log, "DONE\n");
     dumplvl++;
     if (op->op_targ) {
        if (op->op_type == OP_NULL)
@@ -197,16 +185,31 @@ register OP *op;
                 op->op_type == OP_AELEM ||
                 op->op_type == OP_HELEM )
        {
-           if (op->op_private & OPpENTERSUB_AMPER)
-               (void)strcat(buf,"AMPER,");
-           if (op->op_private & OPpENTERSUB_DB)
-               (void)strcat(buf,"DB,");
-           if (op->op_private & OPpDEREF_AV)
-               (void)strcat(buf,"AV,");
-           if (op->op_private & OPpDEREF_HV)
-               (void)strcat(buf,"HV,");
-           if (op->op_private & HINT_STRICT_REFS)
-               (void)strcat(buf,"STRICT_REFS,");
+           if (op->op_type == OP_ENTERSUB) {
+               if (op->op_private & OPpENTERSUB_AMPER)
+                   (void)strcat(buf,"AMPER,");
+               if (op->op_private & OPpENTERSUB_DB)
+                   (void)strcat(buf,"DB,");
+           }
+           switch (op->op_private & OPpDEREF) {
+           case OPpDEREF_SV:
+               (void)strcat(buf, "SV,");
+               break;
+           case OPpDEREF_AV:
+               (void)strcat(buf, "AV,");
+               break;
+           case OPpDEREF_HV:
+               (void)strcat(buf, "HV,");
+               break;
+           }
+           if (op->op_type == OP_AELEM || op->op_type == OP_HELEM) {
+               if (op->op_private & OPpLVAL_DEFER)
+                   (void)strcat(buf,"LVAL_DEFER,");
+           }
+           else {
+               if (op->op_private & HINT_STRICT_REFS)
+                   (void)strcat(buf,"STRICT_REFS,");
+           }
        }
        else if (op->op_type == OP_CONST) {
            if (op->op_private & OPpCONST_BARE)
@@ -235,7 +238,7 @@ register OP *op;
            ENTER;
            tmpsv = NEWSV(0,0);
            SAVEFREESV(tmpsv);
-           gv_fullname(tmpsv,cGVOP->op_gv);
+           gv_fullname3(tmpsv, cGVOP->op_gv, Nullch);
            dump("GV = %s\n", SvPV(tmpsv, na));
            LEAVE;
        }
@@ -255,31 +258,31 @@ register OP *op;
     case OP_ENTERLOOP:
        dump("REDO ===> ");
        if (cLOOP->op_redoop)
-           fprintf(Perl_debug_log, "%d\n", cLOOP->op_redoop->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", cLOOP->op_redoop->op_seq);
        else
-           fprintf(Perl_debug_log, "DONE\n");
+           PerlIO_printf(Perl_debug_log, "DONE\n");
        dump("NEXT ===> ");
        if (cLOOP->op_nextop)
-           fprintf(Perl_debug_log, "%d\n", cLOOP->op_nextop->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", cLOOP->op_nextop->op_seq);
        else
-           fprintf(Perl_debug_log, "DONE\n");
+           PerlIO_printf(Perl_debug_log, "DONE\n");
        dump("LAST ===> ");
        if (cLOOP->op_lastop)
-           fprintf(Perl_debug_log, "%d\n", cLOOP->op_lastop->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", cLOOP->op_lastop->op_seq);
        else
-           fprintf(Perl_debug_log, "DONE\n");
+           PerlIO_printf(Perl_debug_log, "DONE\n");
        break;
     case OP_COND_EXPR:
        dump("TRUE ===> ");
        if (cCONDOP->op_true)
-           fprintf(Perl_debug_log, "%d\n", cCONDOP->op_true->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", cCONDOP->op_true->op_seq);
        else
-           fprintf(Perl_debug_log, "DONE\n");
+           PerlIO_printf(Perl_debug_log, "DONE\n");
        dump("FALSE ===> ");
        if (cCONDOP->op_false)
-           fprintf(Perl_debug_log, "%d\n", cCONDOP->op_false->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", cCONDOP->op_false->op_seq);
        else
-           fprintf(Perl_debug_log, "DONE\n");
+           PerlIO_printf(Perl_debug_log, "DONE\n");
        break;
     case OP_MAPWHILE:
     case OP_GREPWHILE:
@@ -287,9 +290,9 @@ register OP *op;
     case OP_AND:
        dump("OTHER ===> ");
        if (cLOGOP->op_other)
-           fprintf(Perl_debug_log, "%d\n", cLOGOP->op_other->op_seq);
+           PerlIO_printf(Perl_debug_log, "%d\n", cLOGOP->op_other->op_seq);
        else
-           fprintf(Perl_debug_log, "DONE\n");
+           PerlIO_printf(Perl_debug_log, "DONE\n");
        break;
     case OP_PUSHRE:
     case OP_MATCH:
@@ -315,16 +318,16 @@ register GV *gv;
     SV *sv;
 
     if (!gv) {
-       fprintf(Perl_debug_log,"{}\n");
+       PerlIO_printf(Perl_debug_log, "{}\n");
        return;
     }
     sv = sv_newmortal();
     dumplvl++;
-    fprintf(Perl_debug_log,"{\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");
@@ -369,8 +372,6 @@ register PMOP *pm;
            (void)strcat(buf,"ALL,");
        if (pm->op_pmflags & PMf_SKIPWHITE)
            (void)strcat(buf,"SKIPWHITE,");
-       if (pm->op_pmflags & PMf_FOLD)
-           (void)strcat(buf,"FOLD,");
        if (pm->op_pmflags & PMf_CONST)
            (void)strcat(buf,"CONST,");
        if (pm->op_pmflags & PMf_KEEP)
@@ -400,8 +401,8 @@ long arg2, arg3, arg4, arg5;
     I32 i;
 
     for (i = dumplvl*4; i; i--)
-       (void)putc(' ',Perl_debug_log);
-    fprintf(Perl_debug_log,arg1, arg2, arg3, arg4, arg5);
+       (void)PerlIO_putc(Perl_debug_log,' ');
+    PerlIO_printf(Perl_debug_log, arg1, arg2, arg3, arg4, arg5);
 }
 
 #else
@@ -419,9 +420,6 @@ dump(pat,va_alist)
 {
     I32 i;
     va_list args;
-#ifndef HAS_VPRINTF
-    int vfprintf();
-#endif
 
 #ifdef I_STDARG
     va_start(args, pat);
@@ -429,8 +427,8 @@ dump(pat,va_alist)
     va_start(args);
 #endif
     for (i = dumplvl*4; i; i--)
-       (void)putc(' ',stderr);
-    vfprintf(Perl_debug_log,pat,args);
+       (void)PerlIO_putc(Perl_debug_log,' ');
+    PerlIO_vprintf(Perl_debug_log,pat,args);
     va_end(args);
 }
 #endif