this is only going to work on 5.14

[gitmo/Package-Stash.git] / lib / Package / Stash / PP.pm

diff --git a/lib/Package/Stash/PP.pm b/lib/Package/Stash/PP.pm
index 98b86b8..4996c39 100644 (file)
--- a/lib/Package/Stash/PP.pm
+++ b/lib/Package/Stash/PP.pm
@@ -16,6 +16,9 @@ use constant BROKEN_WEAK_STASH     => ($] < 5.010);
 # before 5.10, the scalar slot was always treated as existing if the
 # glob existed
 use constant BROKEN_SCALAR_INITIALIZATION => ($] < 5.010);
+# add_method on anon stashes triggers rt.perl #1804 otherwise
+# fixed in perl commit v5.13.3-70-g0fe688f
+use constant BROKEN_GLOB_ASSIGNMENT => ($] < 5.013004);
 
 =head1 SYNOPSIS
 
@@ -31,27 +34,35 @@ sub new {
     my $class = shift;
     my ($package) = @_;
 
-    if (!defined($package) || (ref($package) && ref($package) ne 'HASH')) {
+    if (!defined($package) || (ref($package) && reftype($package) ne 'HASH')) {
         confess "Package::Stash->new must be passed the name of the "
               . "package to access";
     }
-    elsif (ref($package) eq 'HASH') {
-        confess "The pure perl implementation of Package::Stash doesn't "
-              . "currently support anonymous stashes. You should install "
-              . "Package::Stash::XS";
+    elsif (ref($package) && reftype($package) eq 'HASH') {
+        confess "The PP implementation of Package::Stash does not support "
+              . "anonymous stashes before perl 5.14"
+            if BROKEN_GLOB_ASSIGNMENT;
+
+        return bless {
+            'namespace' => $package,
+        }, $class;
     }
-    elsif ($package !~ /\A[0-9A-Z_a-z]+(?:::[0-9A-Z_a-z]+)*\z/) {
+    elsif ($package =~ /\A[0-9A-Z_a-z]+(?:::[0-9A-Z_a-z]+)*\z/) {
+        return bless {
+            'package' => $package,
+        }, $class;
+    }
+    else {
         confess "$package is not a module name";
     }
 
-    return bless {
-        'package' => $package,
-    }, $class;
 }
 
 sub name {
     confess "Can't call name as a class method"
         unless blessed($_[0]);
+    confess "Can't get the name of an anonymous package"
+        unless defined($_[0]->{package});
     return $_[0]->{package};
 }
 
@@ -154,10 +165,26 @@ sub add_symbol {
         }
     }
 
-    my $namespace = $self->namespace;
-    my $gv = $namespace->{$name} || Symbol::gensym;
-    *$gv = ref $initial_value ? $initial_value : \$initial_value;
-    $namespace->{$name} = *$gv;
+    if (BROKEN_GLOB_ASSIGNMENT) {
+        if (@_ > 2) {
+            no strict 'refs';
+            *{ $self->name . '::' . $name } = ref $initial_value
+                ? $initial_value : \$initial_value;
+        }
+        else {
+            no strict 'refs';
+            *{ $self->name . '::' . $name };
+        }
+    }
+    else {
+        my $namespace = $self->namespace;
+        $namespace->{$name} ||= *{ Symbol::gensym() };
+
+        if (@_ > 2) {
+            *{ $namespace->{$name} } = ref $initial_value
+                ? $initial_value : \$initial_value;
+        }
+    }
 }
 
 sub remove_glob {
@@ -245,7 +272,9 @@ sub get_symbol {
         if ($type eq 'CODE') {
             # XXX we should really be able to support arbitrary anonymous
             # stashes here... (not just via Package::Anon)
-            if (blessed($namespace) && $namespace->isa('Package::Anon')) {
+            if (!BROKEN_GLOB_ASSIGNMENT
+                && blessed($namespace)
+                && $namespace->isa('Package::Anon')) {
                 # ->can will call gv_init for us
                 $namespace->bless(\(my $foo))->can($name);
                 return *{ $namespace->{$name} }{CODE};