X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FPackage%2FStash%2FPP.pm;h=653eeafb9a23218a1b5a8ff11c4a902b8d260994;hb=eb53b1bd771d2bed902655654014680ea64cf8d4;hp=d6ca34bfacaafa04f8890c0bbf389d0f1cb24c81;hpb=e70564920d68b0b907952e3302aa08ccb201b080;p=gitmo%2FPackage-Stash.git diff --git a/lib/Package/Stash/PP.pm b/lib/Package/Stash/PP.pm index d6ca34b..653eeaf 100644 --- a/lib/Package/Stash/PP.pm +++ b/lib/Package/Stash/PP.pm @@ -4,7 +4,7 @@ use warnings; # ABSTRACT: pure perl implementation of the Package::Stash API use Carp qw(confess); -use Scalar::Util qw(blessed reftype); +use Scalar::Util qw(blessed reftype weaken); use Symbol; # before 5.12, assigning to the ISA glob would make it lose its magical ->isa # powers @@ -24,15 +24,8 @@ sub new { my $class = shift; my ($package) = @_; my $namespace; - { - no strict 'refs'; - # supposedly this caused a bug in earlier perls, but I can't reproduce - # it, so re-enabling the caching - $namespace = \%{$package . '::'}; - } return bless { - 'package' => $package, - 'namespace' => $namespace, + 'package' => $package, }, $class; } @@ -45,6 +38,17 @@ sub name { sub namespace { confess "Can't call namespace as a class method" unless blessed($_[0]); + return $_[0]->{namespace} if defined $_[0]->{namespace}; + + { + no strict 'refs'; + # supposedly this caused a bug in earlier perls, but I can't reproduce + # it, so re-enabling the caching + $_[0]->{namespace} = \%{$_[0]->name . '::'}; + } + + weaken($_[0]->{namespace}); + return $_[0]->{namespace}; }