X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FPackage%2FStash%2FPP.pm;h=f60ac4a3aa77bf0b0260a283a71730b38a1ada67;hb=50419d916de6240d6dd8ea2af69b628db0c287ba;hp=b3a8a52c5584c142993f8dbba97a5d60b3c0b35a;hpb=6a42a16cb522209edd5a0674c3a9cd35a9b45beb;p=gitmo%2FPackage-Stash.git

diff --git a/lib/Package/Stash/PP.pm b/lib/Package/Stash/PP.pm
index b3a8a52..f60ac4a 100644
--- a/lib/Package/Stash/PP.pm
+++ b/lib/Package/Stash/PP.pm
@@ -135,8 +135,6 @@ sub add_symbol {
 
     my ($name, $sigil, $type) = $self->_deconstruct_variable_name($variable);
 
-    my $pkg = $self->name;
-
     if (@_ > 2) {
         $self->_valid_for_type($initial_value, $type)
             || confess "$initial_value is not of type $type";
@@ -152,13 +150,14 @@ sub add_symbol {
             my $last_line_num = $opts{last_line_num} || ($first_line_num ||= 0);
 
             # http://perldoc.perl.org/perldebguts.html#Debugger-Internals
-            $DB::sub{$pkg . '::' . $name} = "$filename:$first_line_num-$last_line_num";
+            $DB::sub{$self->name . '::' . $name} = "$filename:$first_line_num-$last_line_num";
         }
     }
 
-    no strict 'refs';
-    no warnings 'redefine', 'misc', 'prototype';
-    *{$pkg . '::' . $name} = ref $initial_value ? $initial_value : \$initial_value;
+    my $namespace = $self->namespace;
+    my $gv = $namespace->{$name} || Symbol::gensym;
+    *$gv = ref $initial_value ? $initial_value : \$initial_value;
+    $namespace->{$name} = *$gv;
 }
 
 sub remove_glob {