diff options
Diffstat (limited to 'Master/tlpkg/tlperl/lib/B/Concise.pm')
-rw-r--r-- | Master/tlpkg/tlperl/lib/B/Concise.pm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Master/tlpkg/tlperl/lib/B/Concise.pm b/Master/tlpkg/tlperl/lib/B/Concise.pm index 26996058941..014a4df84d1 100644 --- a/Master/tlpkg/tlperl/lib/B/Concise.pm +++ b/Master/tlpkg/tlperl/lib/B/Concise.pm @@ -14,7 +14,7 @@ use warnings; # uses #3 and #4, since warnings uses Carp use Exporter (); # use #5 -our $VERSION = "0.78"; +our $VERSION = "0.83"; our @ISA = qw(Exporter); our @EXPORT_OK = qw( set_style set_style_standard add_callback concise_subref concise_cv concise_main @@ -306,7 +306,7 @@ sub compileOpts { if (!$Config::Config{usedl} && keys %{$pkg.'::'} == 1 && $pkg->can('bootstrap')) { - # It is something that we're staticly linked to, but hasn't + # It is something that we're statically linked to, but hasn't # yet been used. eval "require $pkg"; } @@ -462,7 +462,7 @@ sub walk_topdown { walk_topdown($kid, $sub, $level + 1); } } - elsif (class($op) eq "PMOP") { + if (class($op) eq "PMOP") { my $maybe_root = $op->pmreplroot; if (ref($maybe_root) and $maybe_root->isa("B::OP")) { # It really is the root of the replacement, not something @@ -586,7 +586,7 @@ sub fmt_line { # generate text-line for op. $text = "# $hr->{src}\n$text" if $show_src and $hr->{src}; chomp $text; - return "$text\n" if $text ne ""; + return "$text\n" if $text ne "" and $order ne "tree"; return $text; # suppress empty lines } @@ -604,8 +604,10 @@ $priv{"sassign"}{64} = "BKWARD"; $priv{$_}{64} = "RTIME" for ("match", "subst", "substcont", "qr"); @{$priv{"trans"}}{1,2,4,8,16,64} = ("<UTF", ">UTF", "IDENT", "SQUASH", "DEL", "COMPL", "GROWS"); +$priv{transr} = $priv{trans}; $priv{"repeat"}{64} = "DOLIST"; $priv{"leaveloop"}{64} = "CONT"; +$priv{$_}{4} = "DREFed" for (qw(rv2sv rv2av rv2hv)); @{$priv{$_}}{32,64,96} = ("DREFAV", "DREFHV", "DREFSV") for (qw(rv2gv rv2sv padsv aelem helem)); $priv{$_}{16} = "STATE" for ("padav", "padhv", "padsv"); @@ -835,7 +837,7 @@ sub concise_op { } else { $h{arg} = "($precomp)"; } - } elsif ($h{class} eq "PVOP" and $h{name} ne "trans") { + } elsif ($h{class} eq "PVOP" and $h{name} !~ '^transr?\z') { $h{arg} = '("' . $op->pv . '")'; $h{svval} = '"' . $op->pv . '"'; } elsif ($h{class} eq "COP") { |