Integrate perlio:

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

diff --git a/dump.c b/dump.c
index 0e11589..bbbcec3 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -60,8 +60,8 @@ Perl_dump_packsubs(pTHX_ HV *stash)
                dump_sub(gv);
            if (GvFORM(gv))
                dump_form(gv);
-           if (HeKEY(entry)[HeKLEN(entry)-1] == ':' &&
-             (hv = GvHV(gv)) && HvNAME(hv) && hv != PL_defstash)
+           if (HeKEY(entry)[HeKLEN(entry)-1] == ':'
+               && (hv = GvHV(gv)) && hv != PL_defstash)
                dump_packsubs(hv);              /* nested package */
        }
     }
@@ -712,41 +712,42 @@ Perl_gv_dump(pTHX_ GV *gv)
  */
 
 static struct { char type; char *name; } magic_names[] = {
-       PERL_MAGIC_sv,             "sv(\\0)",
-       PERL_MAGIC_arylen,         "arylen(#)",
-       PERL_MAGIC_glob,           "glob(*)",
-       PERL_MAGIC_pos,            "pos(.)",
-       PERL_MAGIC_backref,        "backref(<)",
-       PERL_MAGIC_overload,       "overload(A)",
-       PERL_MAGIC_bm,             "bm(B)",
-       PERL_MAGIC_regdata,        "regdata(D)",
-       PERL_MAGIC_env,            "env(E)",
-       PERL_MAGIC_isa,            "isa(I)",
-       PERL_MAGIC_dbfile,         "dbfile(L)",
-       PERL_MAGIC_tied,           "tied(P)",
-       PERL_MAGIC_sig,            "sig(S)",
-       PERL_MAGIC_uvar,           "uvar(U)",
-       PERL_MAGIC_overload_elem,  "overload_elem(a)",
-       PERL_MAGIC_overload_table, "overload_table(c)",
-       PERL_MAGIC_regdatum,       "regdatum(d)",
-       PERL_MAGIC_envelem,        "envelem(e)",
-       PERL_MAGIC_fm,             "fm(f)",
-       PERL_MAGIC_regex_global,   "regex_global(g)",
-       PERL_MAGIC_isaelem,        "isaelem(i)",
-       PERL_MAGIC_nkeys,          "nkeys(k)",
-       PERL_MAGIC_dbline,         "dbline(l)",
-       PERL_MAGIC_mutex,          "mutex(m)",
-       PERL_MAGIC_collxfrm,       "collxfrm(o)",
-       PERL_MAGIC_tiedelem,       "tiedelem(p)",
-       PERL_MAGIC_tiedscalar,     "tiedscalar(q)",
-       PERL_MAGIC_qr,             "qr(r)",
-       PERL_MAGIC_sigelem,        "sigelem(s)",
-       PERL_MAGIC_taint,          "taint(t)",
-       PERL_MAGIC_vec,            "vec(v)",
-       PERL_MAGIC_substr,         "substr(x)",
-       PERL_MAGIC_defelem,        "defelem(y)",
-       PERL_MAGIC_ext,            "ext(~)",
-       0,                         0 /* this null string terminates the list */
+       { PERL_MAGIC_sv,             "sv(\\0)" },
+       { PERL_MAGIC_arylen,         "arylen(#)" },
+       { PERL_MAGIC_glob,           "glob(*)" },
+       { PERL_MAGIC_pos,            "pos(.)" },
+       { PERL_MAGIC_backref,        "backref(<)" },
+       { PERL_MAGIC_overload,       "overload(A)" },
+       { PERL_MAGIC_bm,             "bm(B)" },
+       { PERL_MAGIC_regdata,        "regdata(D)" },
+       { PERL_MAGIC_env,            "env(E)" },
+       { PERL_MAGIC_isa,            "isa(I)" },
+       { PERL_MAGIC_dbfile,         "dbfile(L)" },
+       { PERL_MAGIC_tied,           "tied(P)" },
+       { PERL_MAGIC_sig,            "sig(S)" },
+       { PERL_MAGIC_uvar,           "uvar(U)" },
+       { PERL_MAGIC_overload_elem,  "overload_elem(a)" },
+       { PERL_MAGIC_overload_table, "overload_table(c)" },
+       { PERL_MAGIC_regdatum,       "regdatum(d)" },
+       { PERL_MAGIC_envelem,        "envelem(e)" },
+       { PERL_MAGIC_fm,             "fm(f)" },
+       { PERL_MAGIC_regex_global,   "regex_global(g)" },
+       { PERL_MAGIC_isaelem,        "isaelem(i)" },
+       { PERL_MAGIC_nkeys,          "nkeys(k)" },
+       { PERL_MAGIC_dbline,         "dbline(l)" },
+       { PERL_MAGIC_mutex,          "mutex(m)" },
+       { PERL_MAGIC_collxfrm,       "collxfrm(o)" },
+       { PERL_MAGIC_tiedelem,       "tiedelem(p)" },
+       { PERL_MAGIC_tiedscalar,     "tiedscalar(q)" },
+       { PERL_MAGIC_qr,             "qr(r)" },
+       { PERL_MAGIC_sigelem,        "sigelem(s)" },
+       { PERL_MAGIC_taint,          "taint(t)" },
+       { PERL_MAGIC_vec,            "vec(v)" },
+       { PERL_MAGIC_substr,         "substr(x)" },
+       { PERL_MAGIC_defelem,        "defelem(y)" },
+       { PERL_MAGIC_ext,            "ext(~)" },
+       /* this null string terminates the list */
+       { 0,                         0 },
 };
 
 void
@@ -882,7 +883,7 @@ Perl_do_gvgv_dump(pTHX_ I32 level, PerlIO *file, char *name, GV *sv)
     Perl_dump_indent(aTHX_ level, file, "%s = 0x%"UVxf, name, PTR2UV(sv));
     if (sv && GvNAME(sv)) {
        PerlIO_printf(file, "\t\"");
-       if (GvSTASH(sv) && HvNAME(GvSTASH(sv)))
+       if (GvSTASH(sv))
            PerlIO_printf(file, "%s\" :: \"", HvNAME(GvSTASH(sv)));
        PerlIO_printf(file, "%s\"\n", GvNAME(sv));
     }