X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FPackage%2FStash.pm;fp=lib%2FPackage%2FStash.pm;h=b990f558b789c49ab15849d79b4fa70f27cadd9c;hb=f8e7797c12671e47664c32b6c00b5ee4c8993504;hp=32e5d30f8dc8ec5bd78062531dd744cccfcc724d;hpb=0a5166afdae1044a3722b5d241ecdc3228dbd370;p=gitmo%2FPackage-Stash.git diff --git a/lib/Package/Stash.pm b/lib/Package/Stash.pm index 32e5d30..b990f55 100644 --- a/lib/Package/Stash.pm +++ b/lib/Package/Stash.pm @@ -229,17 +229,16 @@ sub get_package_symbol { my $namespace = $self->namespace; - if (!exists $namespace->{$name}) { - # assigning to the result of this function like - # @{$stash->get_package_symbol('@ISA')} = @new_ISA - # makes the result not visible until the variable is explicitly - # accessed... in the case of @ISA, this might never happen - # for instance, assigning like that and then calling $obj->isa - # will fail. see t/005-isa.t - if ($opts{vivify} && $type eq 'ARRAY' && $name ne 'ISA') { - $self->add_package_symbol($variable, []); + if ($opts{vivify} && !exists $namespace->{$name}) { + if ($type eq 'ARRAY') { + $self->add_package_symbol( + $variable, + # setting our own arrayref manually loses the magicalness or + # something + $name eq 'ISA' ? () : ([]) + ); } - elsif ($opts{vivify} && $type eq 'HASH') { + elsif ($type eq 'HASH') { $self->add_package_symbol($variable, {}); } else {