Oops. Fix bad #! lines when not using userelocatableinc

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

diff --git a/dump.c b/dump.c
index e475a0f..0fcb0a6 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -423,11 +423,7 @@ STATIC void
 S_sequence(pTHX_ register const OP *o)
 {
     dVAR;
-    SV      *op;
-    const char *key;
-    STRLEN   len;
     const OP *oldop = NULL;
-    OP      *l;
 
     if (!o)
        return;
@@ -441,8 +437,10 @@ S_sequence(pTHX_ register const OP *o)
        Sequence = newHV();
 
     for (; o; o = o->op_next) {
-       op = newSVuv(PTR2UV(o));
-       key = SvPV_const(op, len);
+       STRLEN len;
+       SV * const op = newSVuv(PTR2UV(o));
+       const char * const key = SvPV_const(op, len);
+
        if (hv_exists(Sequence, key, len))
            break;
 
@@ -481,32 +479,22 @@ S_sequence(pTHX_ register const OP *o)
        case OP_COND_EXPR:
        case OP_RANGE:
            hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0);
-           for (l = cLOGOPo->op_other; l && l->op_type == OP_NULL; l = l->op_next)
-               ;
-           sequence(l);
+           sequence_tail(cLOGOPo->op_other);
            break;
 
        case OP_ENTERLOOP:
        case OP_ENTERITER:
            hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0);
-           for (l = cLOOPo->op_redoop; l && l->op_type == OP_NULL; l = l->op_next)
-               ;
-           sequence(l);
-           for (l = cLOOPo->op_nextop; l && l->op_type == OP_NULL; l = l->op_next)
-               ;
-           sequence(l);
-           for (l = cLOOPo->op_lastop; l && l->op_type == OP_NULL; l = l->op_next)
-               ;
-           sequence(l);
+           sequence_tail(cLOOPo->op_redoop);
+           sequence_tail(cLOOPo->op_nextop);
+           sequence_tail(cLOOPo->op_lastop);
            break;
 
        case OP_QR:
        case OP_MATCH:
        case OP_SUBST:
            hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0);
-           for (l = cPMOPo->op_pmreplstart; l && l->op_type == OP_NULL; l = l->op_next)
-               ;
-           sequence(l);
+           sequence_tail(cPMOPo->op_pmreplstart);
            break;
 
        case OP_HELEM:
@@ -520,6 +508,14 @@ S_sequence(pTHX_ register const OP *o)
     }
 }
 
+static void
+S_sequence_tail(pTHX_ const OP *o)
+{
+    while (o && (o->op_type == OP_NULL))
+       o = o->op_next;
+    sequence(o);
+}
+
 STATIC UV
 S_sequence_num(pTHX_ const OP *o)
 {
@@ -1241,15 +1237,19 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo
        if (HvREHASH(sv))       sv_catpv(d, "REHASH,");
        if (flags & SVphv_CLONEABLE) sv_catpv(d, "CLONEABLE,");
        break;
-    case SVt_PVGV: case SVt_PVLV:
-       if (GvINTRO(sv))        sv_catpv(d, "INTRO,");
-       if (GvMULTI(sv))        sv_catpv(d, "MULTI,");
-       if (GvUNIQUE(sv))       sv_catpv(d, "UNIQUE,");
-       if (GvASSUMECV(sv))     sv_catpv(d, "ASSUMECV,");
-       if (GvIN_PAD(sv))       sv_catpv(d, "IN_PAD,");
+    case SVt_PVGV:
+    case SVt_PVLV:
+       if (isGV_with_GP(sv)) {
+           if (GvINTRO(sv))    sv_catpv(d, "INTRO,");
+           if (GvMULTI(sv))    sv_catpv(d, "MULTI,");
+           if (GvUNIQUE(sv))   sv_catpv(d, "UNIQUE,");
+           if (GvASSUMECV(sv)) sv_catpv(d, "ASSUMECV,");
+           if (GvIN_PAD(sv))   sv_catpv(d, "IN_PAD,");
+       }
        if (SvPAD_OUR(sv))      sv_catpv(d, "OUR,");
+       if (SvPAD_STATE(sv))    sv_catpv(d, "STATE,");
        if (SvPAD_TYPED(sv))    sv_catpv(d, "TYPED,");
-       if (GvIMPORTED(sv)) {
+       if (isGV_with_GP(sv) && GvIMPORTED(sv)) {
            sv_catpv(d, "IMPORT");
            if (GvIMPORTED(sv) == GVf_IMPORTED)
                sv_catpv(d, "ALL,");
@@ -1613,7 +1613,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo
        if (nest < maxnest && (CvCLONE(sv) || CvCLONED(sv)))
            do_sv_dump(level+1, file, (SV*)CvOUTSIDE(sv), nest+1, maxnest, dumpops, pvlim);
        break;
-    case SVt_PVGV: case SVt_PVLV:
+    case SVt_PVGV:
+    case SVt_PVLV:
     if (type == SVt_PVLV) {
         Perl_dump_indent(aTHX_ level, file, "  TYPE = %c\n", LvTYPE(sv));
         Perl_dump_indent(aTHX_ level, file, "  TARGOFF = %"IVdf"\n", (IV)LvTARGOFF(sv));
@@ -1623,11 +1624,11 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo
             do_sv_dump(level+1, file, LvTARG(sv), nest+1, maxnest,
                 dumpops, pvlim);
     }
+       if (!isGV_with_GP(sv))
+           break;
        Perl_dump_indent(aTHX_ level, file, "  NAME = \"%s\"\n", GvNAME(sv));
        Perl_dump_indent(aTHX_ level, file, "  NAMELEN = %"IVdf"\n", (IV)GvNAMELEN(sv));
        do_hv_dump (level, file, "  GvSTASH", GvSTASH(sv));
-       if (!isGV_with_GP(sv))
-           break;
        Perl_dump_indent(aTHX_ level, file, "  GP = 0x%"UVxf"\n", PTR2UV(GvGP(sv)));
        if (!GvGP(sv))
            break;