X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/c737faaf63999e5a68ef536d362cea408ab990b7..95b611b0bba585b54c6e7623440a11b1268968e2:/dump.c diff --git a/dump.c b/dump.c index 76aec2b..c9c9bb4 100644 --- a/dump.c +++ b/dump.c @@ -106,17 +106,18 @@ Perl_dump_packsubs(pTHX_ const HV *stash) for (i = 0; i <= (I32) HvMAX(stash); i++) { const HE *entry; for (entry = HvARRAY(stash)[i]; entry; entry = HeNEXT(entry)) { - const GV *gv = (GV*)HeVAL(entry); - const HV *hv; + const GV * const gv = (GV*)HeVAL(entry); if (SvTYPE(gv) != SVt_PVGV || !GvGP(gv)) continue; if (GvCVu(gv)) dump_sub(gv); if (GvFORM(gv)) dump_form(gv); - if (HeKEY(entry)[HeKLEN(entry)-1] == ':' - && (hv = GvHV(gv)) && hv != PL_defstash) - dump_packsubs(hv); /* nested package */ + if (HeKEY(entry)[HeKLEN(entry)-1] == ':') { + const HV * const hv = GvHV(gv); + if (hv && (hv != PL_defstash)) + dump_packsubs(hv); /* nested package */ + } } } } @@ -174,9 +175,9 @@ will also be escaped. Normally the SV will be cleared before the escaped string is prepared, but when PERL_PV_ESCAPE_NOCLEAR is set this will not occur. -If PERL_PV_ESCAPE_UNI is set then the input string is treated as unicode, +If PERL_PV_ESCAPE_UNI is set then the input string is treated as Unicode, if PERL_PV_ESCAPE_UNI_DETECT is set then the input string is scanned -using C to determine if it is unicode. +using C to determine if it is Unicode. If PERL_PV_ESCAPE_ALL is set then all input chars will be output using C<\x01F1> style escapes, otherwise only chars above 255 will be @@ -207,15 +208,15 @@ Perl_pv_escape( pTHX_ SV *dsv, char const * const str, const STRLEN count, const STRLEN max, STRLEN * const escaped, const U32 flags ) { - char esc = (flags & PERL_PV_ESCAPE_RE) ? '%' : '\\'; - char dq = (flags & PERL_PV_ESCAPE_QUOTE) ? '"' : esc; + const char esc = (flags & PERL_PV_ESCAPE_RE) ? '%' : '\\'; + const char dq = (flags & PERL_PV_ESCAPE_QUOTE) ? '"' : esc; char octbuf[PV_ESCAPE_OCTBUFSIZE] = "%123456789ABCDF"; STRLEN wrote = 0; /* chars written so far */ STRLEN chsize = 0; /* size of data to be written */ STRLEN readsize = 1; /* size of data just read */ - bool isuni= flags & PERL_PV_ESCAPE_UNI ? 1 : 0; /* is this unicode */ + bool isuni= flags & PERL_PV_ESCAPE_UNI ? 1 : 0; /* is this Unicode */ const char *pv = str; - const char *end = pv + count; /* end of string */ + const char * const end = pv + count; /* end of string */ octbuf[0] = esc; if (!flags & PERL_PV_ESCAPE_NOCLEAR) @@ -295,21 +296,21 @@ Perl_pv_escape( pTHX_ SV *dsv, char const * const str, |const U32 flags Converts a string into something presentable, handling escaping via -pv_escape() and supporting quoting and elipses. +pv_escape() and supporting quoting and ellipses. If the PERL_PV_PRETTY_QUOTE flag is set then the result will be double quoted with any double quotes in the string escaped. Otherwise if the PERL_PV_PRETTY_LTGT flag is set then the result be wrapped in angle brackets. -If the PERL_PV_PRETTY_ELIPSES flag is set and not all characters in -string were output then an elipses C<...> will be appended to the +If the PERL_PV_PRETTY_ELLIPSES flag is set and not all characters in +string were output then an ellipsis C<...> will be appended to the string. Note that this happens AFTER it has been quoted. If start_color is non-null then it will be inserted after the opening quote (if there is one) but before the escaped text. If end_color is non-null then it will be inserted after the escaped text but before -any quotes or elipses. +any quotes or ellipses. Returns a pointer to the prettified text as held by dsv. @@ -321,7 +322,7 @@ Perl_pv_pretty( pTHX_ SV *dsv, char const * const str, const STRLEN count, const STRLEN max, char const * const start_color, char const * const end_color, const U32 flags ) { - U8 dq = (flags & PERL_PV_PRETTY_QUOTE) ? '"' : '%'; + const U8 dq = (flags & PERL_PV_PRETTY_QUOTE) ? '"' : '%'; STRLEN escaped; if ( dq == '"' ) @@ -344,7 +345,7 @@ Perl_pv_pretty( pTHX_ SV *dsv, char const * const str, const STRLEN count, else if ( flags & PERL_PV_PRETTY_LTGT ) sv_catpvn( dsv, ">", 1); - if ( (flags & PERL_PV_PRETTY_ELIPSES) && ( escaped < count ) ) + if ( (flags & PERL_PV_PRETTY_ELLIPSES) && ( escaped < count ) ) sv_catpvn( dsv, "...", 3 ); return SvPVX(dsv); @@ -490,7 +491,7 @@ Perl_sv_peek(pTHX_ SV *sv) Perl_sv_catpvf(aTHX_ t, "%s)", pv_display(tmp, SvPVX_const(sv), SvCUR(sv), SvLEN(sv), 127)); if (SvUTF8(sv)) Perl_sv_catpvf(aTHX_ t, " [UTF8 \"%s\"]", - sv_uni_display(tmp, sv, 8 * sv_len_utf8(sv), + sv_uni_display(tmp, sv, 6 * SvCUR(sv), UNI_DISPLAY_QQ)); SvREFCNT_dec(tmp); } @@ -510,10 +511,8 @@ Perl_sv_peek(pTHX_ SV *sv) sv_catpv(t, "()"); finish: - if (unref) { - while (unref--) - sv_catpv(t, ")"); - } + while (unref--) + sv_catpv(t, ")"); return SvPV_nolen(t); } @@ -538,9 +537,9 @@ Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, const PMOP *pm) (pm->op_private & OPpRUNTIME) ? " (RUNTIME)" : ""); else Perl_dump_indent(aTHX_ level, file, "PMf_PRE (RUNTIME)\n"); - if (pm->op_type != OP_PUSHRE && pm->op_pmreplroot) { + if (pm->op_type != OP_PUSHRE && pm->op_pmreplrootu.op_pmreplroot) { Perl_dump_indent(aTHX_ level, file, "PMf_REPL = "); - op_dump(pm->op_pmreplroot); + op_dump(pm->op_pmreplrootu.op_pmreplroot); } if (pm->op_pmflags || (PM_GETRE(pm) && PM_GETRE(pm)->check_substr)) { SV * const tmpsv = pm_description(pm); @@ -555,7 +554,7 @@ static SV * S_pm_description(pTHX_ const PMOP *pm) { SV * const desc = newSVpvs(""); - const REGEXP * regex = PM_GETRE(pm); + const REGEXP * const regex = PM_GETRE(pm); const U32 pmflags = pm->op_pmflags; if (pmflags & PMf_ONCE) @@ -567,18 +566,20 @@ S_pm_description(pTHX_ const PMOP *pm) if (pmflags & PMf_USED) sv_catpv(desc, ":USED"); #endif - if (regex->extflags & RXf_TAINTED) - sv_catpv(desc, ",TAINTED"); - - if (regex && regex->check_substr) { - if (!(regex->extflags & RXf_NOSCAN)) - sv_catpv(desc, ",SCANFIRST"); - if (regex->extflags & RXf_CHECK_ALL) - sv_catpv(desc, ",ALL"); + if (regex) { + if (regex->extflags & RXf_TAINTED) + sv_catpv(desc, ",TAINTED"); + if (regex->check_substr) { + if (!(regex->extflags & RXf_NOSCAN)) + sv_catpv(desc, ",SCANFIRST"); + if (regex->extflags & RXf_CHECK_ALL) + sv_catpv(desc, ",ALL"); + } + if (regex->extflags & RXf_SKIPWHITE) + sv_catpv(desc, ",SKIPWHITE"); } - if (regex->extflags & RXf_SKIPWHITE) - sv_catpv(desc, ",SKIPWHITE"); + if (pmflags & PMf_CONST) sv_catpv(desc, ",CONST"); if (pmflags & PMf_KEEP) @@ -630,7 +631,7 @@ S_sequence(pTHX_ register const OP *o) switch (o->op_type) { case OP_STUB: if ((o->op_flags & OPf_WANT) != OPf_WANT_LIST) { - hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0); + (void)hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0); break; } goto nothin; @@ -648,7 +649,7 @@ S_sequence(pTHX_ register const OP *o) nothin: if (oldop && o->op_next) continue; - hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0); + (void)hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0); break; case OP_MAPWHILE: @@ -661,30 +662,30 @@ S_sequence(pTHX_ register const OP *o) case OP_DORASSIGN: case OP_COND_EXPR: case OP_RANGE: - hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0); + (void)hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0); sequence_tail(cLOGOPo->op_other); break; case OP_ENTERLOOP: case OP_ENTERITER: - hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0); + (void)hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0); 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); - sequence_tail(cPMOPo->op_pmreplstart); + (void)hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0); + sequence_tail(cPMOPo->op_pmstashstartu.op_pmreplstart); break; + case OP_QR: + case OP_MATCH: case OP_HELEM: break; default: - hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0); + (void)hv_store(Sequence, key, len, newSVuv(++PL_op_seq), 0); break; } oldop = o; @@ -969,7 +970,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) Perl_dump_indent(aTHX_ level, file, "MADPROPS = {\n"); level++; while (mp) { - char tmp = mp->mad_key; + const char tmp = mp->mad_key; sv_setpvn(tmpsv,"'",1); if (tmp) sv_catpvn(tmpsv, &tmp, 1); @@ -1169,7 +1170,6 @@ static const struct { const char type; const char *name; } magic_names[] = { { PERL_MAGIC_isaelem, "isaelem(i)" }, { PERL_MAGIC_nkeys, "nkeys(k)" }, { PERL_MAGIC_dbline, "dbline(l)" }, - { PERL_MAGIC_mutex, "mutex(m)" }, { PERL_MAGIC_shared_scalar, "shared_scalar(n)" }, { PERL_MAGIC_collxfrm, "collxfrm(o)" }, { PERL_MAGIC_tiedelem, "tiedelem(p)" }, @@ -1272,11 +1272,11 @@ Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 Perl_dump_indent(aTHX_ level, file, " MG_OBJ = 0x%"UVxf"\n", PTR2UV(mg->mg_obj)); if (mg->mg_type == PERL_MAGIC_qr) { - regexp *re=(regexp *)mg->mg_obj; - SV *dsv= sv_newmortal(); + const regexp * const re = (regexp *)mg->mg_obj; + SV * const dsv = sv_newmortal(); const char * const s = pv_pretty(dsv, re->wrapped, re->wraplen, 60, NULL, NULL, - ( PERL_PV_PRETTY_QUOTE | PERL_PV_ESCAPE_RE | PERL_PV_PRETTY_ELIPSES | + ( PERL_PV_PRETTY_QUOTE | PERL_PV_ESCAPE_RE | PERL_PV_PRETTY_ELLIPSES | ((re->extflags & RXf_UTF8) ? PERL_PV_ESCAPE_UNI : 0)) ); Perl_dump_indent(aTHX_ level+1, file, " PAT = %s\n", s); @@ -1292,7 +1292,7 @@ Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 Perl_dump_indent(aTHX_ level, file, " MG_PTR = 0x%"UVxf, PTR2UV(mg->mg_ptr)); if (mg->mg_len >= 0) { if (mg->mg_type != PERL_MAGIC_utf8) { - SV *sv = newSVpvs(""); + SV * const sv = newSVpvs(""); PerlIO_printf(file, " %s", pv_display(sv, mg->mg_ptr, mg->mg_len, 0, pvlim)); SvREFCNT_dec(sv); } @@ -1307,7 +1307,7 @@ Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 PerlIO_putc(file, '\n'); } if (mg->mg_type == PERL_MAGIC_utf8) { - STRLEN *cache = (STRLEN *) mg->mg_ptr; + const STRLEN * const cache = (STRLEN *) mg->mg_ptr; if (cache) { IV i; for (i = 0; i < PERL_MAGIC_UTF8_CACHESIZE; i++) @@ -1436,7 +1436,6 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo if (CvMETHOD(sv)) sv_catpv(d, "METHOD,"); if (CvLOCKED(sv)) sv_catpv(d, "LOCKED,"); if (CvWEAKOUTSIDE(sv)) sv_catpv(d, "WEAKOUTSIDE,"); - if (CvASSERTION(sv)) sv_catpv(d, "ASSERTION,"); break; case SVt_PVHV: if (HvSHAREKEYS(sv)) sv_catpv(d, "SHAREKEYS,"); @@ -1571,8 +1570,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo if (SvOOK(sv)) PerlIO_printf(file, "( %s . ) ", pv_display(d, SvPVX_const(sv)-SvIVX(sv), SvIVX(sv), 0, pvlim)); PerlIO_printf(file, "%s", pv_display(d, SvPVX_const(sv), SvCUR(sv), SvLEN(sv), pvlim)); - if (SvUTF8(sv)) /* the 8? \x{....} */ - PerlIO_printf(file, " [UTF8 \"%s\"]", sv_uni_display(d, sv, 8 * sv_len_utf8(sv), UNI_DISPLAY_QQ)); + if (SvUTF8(sv)) /* the 6? \x{....} */ + PerlIO_printf(file, " [UTF8 \"%s\"]", sv_uni_display(d, sv, 6 * SvCUR(sv), UNI_DISPLAY_QQ)); PerlIO_printf(file, "\n"); Perl_dump_indent(aTHX_ level, file, " CUR = %"IVdf"\n", (IV)SvCUR(sv)); Perl_dump_indent(aTHX_ level, file, " LEN = %"IVdf"\n", (IV)SvLEN(sv)); @@ -1582,7 +1581,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo } if (type >= SVt_PVMG) { if (type == SVt_PVMG && SvPAD_OUR(sv)) { - HV *ost = SvOURSTASH(sv); + HV * const ost = SvOURSTASH(sv); if (ost) do_hv_dump(level, file, " OURSTASH", ost); } else { @@ -1612,7 +1611,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo if (nest < maxnest && av_len((AV*)sv) >= 0) { int count; for (count = 0; count <= av_len((AV*)sv) && count < maxnest; count++) { - SV** elt = av_fetch((AV*)sv,count,0); + SV** const elt = av_fetch((AV*)sv,count,0); Perl_dump_indent(aTHX_ level + 1, file, "Elt No. %"IVdf"\n", (IV)count); if (elt) @@ -1709,17 +1708,15 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo hv_iterinit(hv); while ((he = hv_iternext_flags(hv, HV_ITERNEXT_WANTPLACEHOLDERS)) && count--) { - SV *elt, *keysv; - const char *keypv; STRLEN len; const U32 hash = HeHASH(he); + SV * const keysv = hv_iterkeysv(he); + const char * const keypv = SvPV_const(keysv, len); + SV * const elt = hv_iterval(hv, he); - keysv = hv_iterkeysv(he); - keypv = SvPV_const(keysv, len); - elt = hv_iterval(hv, he); Perl_dump_indent(aTHX_ level+1, file, "Elt %s ", pv_display(d, keypv, len, 0, pvlim)); if (SvUTF8(keysv)) - PerlIO_printf(file, "[UTF8 \"%s\"] ", sv_uni_display(d, keysv, 8 * sv_len_utf8(keysv), UNI_DISPLAY_QQ)); + PerlIO_printf(file, "[UTF8 \"%s\"] ", sv_uni_display(d, keysv, 6 * SvCUR(keysv), UNI_DISPLAY_QQ)); if (HeKREHASH(he)) PerlIO_printf(file, "[REHASH] "); PerlIO_printf(file, "HASH = 0x%"UVxf"\n", (UV)hash); @@ -1751,7 +1748,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo do_op_dump(level+1, file, CvROOT(sv)); } } else { - SV *constant = cv_const_sv((CV *)sv); + SV * const constant = cv_const_sv((CV *)sv); Perl_dump_indent(aTHX_ level, file, " XSUB = 0x%"UVxf"\n", PTR2UV(CvXSUB(sv))); @@ -1980,7 +1977,7 @@ Perl_debop(pTHX_ const OP *o) } STATIC CV* -S_deb_curcv(pTHX_ I32 ix) +S_deb_curcv(pTHX_ const I32 ix) { dVAR; const PERL_CONTEXT * const cx = &cxstack[ix]; @@ -2010,7 +2007,7 @@ STATIC void S_debprof(pTHX_ const OP *o) { dVAR; - if (CopSTASH_eq(PL_curcop, PL_debstash) && !DEBUG_J_TEST_) + if (!DEBUG_J_TEST_ && CopSTASH_eq(PL_curcop, PL_debstash)) return; if (!PL_profiledata) Newxz(PL_profiledata, MAXO, U32); @@ -2037,8 +2034,7 @@ Perl_debprofdump(pTHX) * XML variants of most of the above routines */ -STATIC -void +STATIC void S_xmldump_attr(pTHX_ I32 level, PerlIO *file, const char* pat, ...) { va_list args; @@ -2104,7 +2100,7 @@ Perl_xmldump_packsubs(pTHX_ const HV *stash) void Perl_xmldump_sub(pTHX_ const GV *gv) { - SV *sv = sv_newmortal(); + SV * const sv = sv_newmortal(); gv_fullname3(sv, gv, Nullch); Perl_xmldump_indent(aTHX_ 0, PL_xmlfp, "\nSUB %s = ", SvPVX(sv)); @@ -2121,7 +2117,7 @@ Perl_xmldump_sub(pTHX_ const GV *gv) void Perl_xmldump_form(pTHX_ const GV *gv) { - SV *sv = sv_newmortal(); + SV * const sv = sv_newmortal(); gv_fullname3(sv, gv, Nullch); Perl_xmldump_indent(aTHX_ 0, PL_xmlfp, "\nFORMAT %s = ", SvPVX(sv)); @@ -2144,11 +2140,11 @@ Perl_sv_catxmlsv(pTHX_ SV *dsv, SV *ssv) } char * -Perl_sv_catxmlpvn(pTHX_ SV *dsv, char* pv, STRLEN len, int utf8) +Perl_sv_catxmlpvn(pTHX_ SV *dsv, const char *pv, STRLEN len, int utf8) { unsigned int c; - char *e = pv + len; - char *start = pv; + const char * const e = pv + len; + const char * const start = pv; STRLEN dsvcur; STRLEN cl; @@ -2270,7 +2266,7 @@ Perl_sv_catxmlpvn(pTHX_ SV *dsv, char* pv, STRLEN len, int utf8) char * Perl_sv_xmlpeek(pTHX_ SV *sv) { - SV *t = sv_newmortal(); + SV * const t = sv_newmortal(); STRLEN n_a; int unref = 0; @@ -2426,10 +2422,8 @@ Perl_sv_xmlpeek(pTHX_ SV *sv) sv_catpv(t, "\""); finish: - if (unref) { - while (unref--) - sv_catpv(t, ")"); - } + while (unref--) + sv_catpv(t, ")"); return SvPV(t, n_a); } @@ -2443,8 +2437,8 @@ Perl_do_pmop_xmldump(pTHX_ I32 level, PerlIO *file, const PMOP *pm) Perl_xmldump_indent(aTHX_ level, file, "precomp; - SV *tmpsv = newSVpvn("",0); + const char * const s = PM_GETRE(pm)->precomp; + SV * const tmpsv = newSVpvn("",0); SvUTF8_on(tmpsv); sv_catxmlpvn(tmpsv, s, strlen(s), 1); Perl_xmldump_indent(aTHX_ level, file, "pre=\"%s\"\n", @@ -2462,10 +2456,10 @@ Perl_do_pmop_xmldump(pTHX_ I32 level, PerlIO *file, const PMOP *pm) } level--; - if (pm->op_type != OP_PUSHRE && pm->op_pmreplroot) { + if (pm->op_type != OP_PUSHRE && pm->op_pmreplrootu.op_pmreplroot) { Perl_xmldump_indent(aTHX_ level, file, ">\n"); Perl_xmldump_indent(aTHX_ level+1, file, "\n"); - do_op_xmldump(level+2, file, pm->op_pmreplroot); + do_op_xmldump(level+2, file, pm->op_pmreplrootu.op_pmreplroot); Perl_xmldump_indent(aTHX_ level+1, file, "\n"); Perl_xmldump_indent(aTHX_ level, file, "\n"); } @@ -2523,7 +2517,7 @@ Perl_do_op_xmldump(pTHX_ I32 level, PerlIO *file, const OP *o) PerlIO_printf(file, " addr=\"0x%"UVxf" => 0x%"UVxf"\"", (UV)o, (UV)o->op_next); #endif if (o->op_flags) { - SV *tmpsv = newSVpvn("", 0); + SV * const tmpsv = newSVpvn("", 0); switch (o->op_flags & OPf_WANT) { case OPf_WANT_VOID: sv_catpv(tmpsv, ",VOID"); @@ -2554,7 +2548,7 @@ Perl_do_op_xmldump(pTHX_ I32 level, PerlIO *file, const OP *o) SvREFCNT_dec(tmpsv); } if (o->op_private) { - SV *tmpsv = newSVpvn("", 0); + SV * const tmpsv = newSVpvn("", 0); if (PL_opargs[o->op_type] & OA_TARGLEX) { if (o->op_private & OPpTARGET_MY) sv_catpv(tmpsv, ",TARGET_MY"); @@ -2731,8 +2725,8 @@ Perl_do_op_xmldump(pTHX_ I32 level, PerlIO *file, const OP *o) S_xmldump_attr(aTHX_ level, file, "padix=\"%" IVdf "\"", (IV)cPADOPo->op_padix); #else if (cSVOPo->op_sv) { - SV *tmpsv1 = newSV(0); - SV *tmpsv2 = newSVpvn("",0); + SV * const tmpsv1 = newSV(0); + SV * const tmpsv2 = newSVpvn("",0); char *s; STRLEN len; SvUTF8_on(tmpsv1); @@ -2821,8 +2815,10 @@ Perl_do_op_xmldump(pTHX_ I32 level, PerlIO *file, const OP *o) } if (PL_madskills && o->op_madprop) { - SV *tmpsv = newSVpvn("", 0); - MADPROP* mp = o->op_madprop; + char prevkey = '\0'; + SV * const tmpsv = newSVpvn("", 0); + const MADPROP* mp = o->op_madprop; + sv_utf8_upgrade(tmpsv); if (!contents) { contents = 1; @@ -2835,6 +2831,10 @@ Perl_do_op_xmldump(pTHX_ I32 level, PerlIO *file, const OP *o) sv_setpvn(tmpsv,"\"",1); if (tmp) sv_catxmlpvn(tmpsv, &tmp, 1, 0); + if ((tmp == '_') || (tmp == '#')) /* '_' '#' whitespace belong to the previous token. */ + sv_catxmlpvn(tmpsv, &prevkey, 1, 0); + else + prevkey = tmp; sv_catpv(tmpsv, "\""); switch (mp->mad_type) { case MAD_NULL: