use strict;
use Config;
use B qw(peekop class comppadlist main_start svref_2object walksymtable
- OPpLVAL_INTRO SVf_POK
+ OPpLVAL_INTRO SVf_POK OPpOUR_INTRO
);
sub UNKNOWN { ["?", "?", "?"] }
sub pp_padhv { pp_padsv(@_) }
sub deref {
- my ($var, $as) = @_;
+ my ($op, $var, $as) = @_;
$var->[1] = $as . $var->[1];
- process($var, "used");
+ process($var, $op->private & OPpOUR_INTRO ? "intro" : "used");
}
-sub pp_rv2cv { deref($top, "&"); }
-sub pp_rv2hv { deref($top, "%"); }
-sub pp_rv2sv { deref($top, "\$"); }
-sub pp_rv2av { deref($top, "\@"); }
-sub pp_rv2gv { deref($top, "*"); }
+sub pp_rv2cv { deref(shift, $top, "&"); }
+sub pp_rv2hv { deref(shift, $top, "%"); }
+sub pp_rv2sv { deref(shift, $top, "\$"); }
+sub pp_rv2av { deref(shift, $top, "\@"); }
+sub pp_rv2gv { deref(shift, $top, "*"); }
sub pp_gvsv {
my $op = shift;
}
else {
$gv = $op->gv;
- $top = [$gv->STASH->NAME, '$', $gv->NAME];
+ $top = [$gv->STASH->NAME, '$', $gv->SAFENAME];
}
- process($top, $op->private & OPpLVAL_INTRO ? "intro" : "used");
+ process($top, $op->private & OPpLVAL_INTRO ||
+ $op->private & OPpOUR_INTRO ? "intro" : "used");
}
sub pp_gv {
}
else {
$gv = $op->gv;
- $top = [$gv->STASH->NAME, "*", $gv->NAME];
+ $top = [$gv->STASH->NAME, "*", $gv->SAFENAME];
}
process($top, $op->private & OPpLVAL_INTRO ? "intro" : "used");
}
}
else {
$top = $pad[$op->targ];
+ $top = UNKNOWN unless $top;
}
}
return if $nodefs;
$subname = "(definitions)";
foreach $pack (qw(B O AutoLoader DynaLoader XSLoader Config DB VMS
- strict vars FileHandle Exporter Carp)) {
+ strict vars FileHandle Exporter Carp PerlIO::Layer
+ attributes utf8 warnings)) {
$exclude{$pack."::"} = 1;
}
no strict qw(vars refs);