diff options
| -rw-r--r-- | dump.c | 5 | ||||
| -rwxr-xr-x | mad/Nomad.pm | 9 |
2 files changed, 7 insertions, 7 deletions
@@ -2822,6 +2822,7 @@ Perl_do_op_xmldump(pTHX_ I32 level, PerlIO *file, const OP *o) } if (PL_madskills && o->op_madprop) { + char prevkey = '\0'; SV *tmpsv = newSVpvn("", 0); MADPROP* mp = o->op_madprop; sv_utf8_upgrade(tmpsv); @@ -2836,6 +2837,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: diff --git a/mad/Nomad.pm b/mad/Nomad.pm index 49659a8f04..e425467038 100755 --- a/mad/Nomad.pm +++ b/mad/Nomad.pm @@ -519,13 +519,8 @@ sub hash { for my $kid (@{$$self{Kids}}) { my ($k,$v) = $kid->pair($self, @_); $firstthing ||= $k; - if ($k =~ /^[_#]$/) { # rekey whitespace according to preceding entry - $k .= $lastthing; # (which is actually the token the whitespace is before) - } - else { - $k .= 'x' while exists $hash{$k}; - $lastthing = $k; - } + $k .= 'x' while exists $hash{$k}; + $lastthing = $k; $hash{$k} = $v; } $hash{FIRST} = $firstthing; |