From: Stevan Little <stevan.little@iinteractive.com>
Date: Fri, 18 Aug 2006 23:19:24 +0000 (+0000)
Subject: cleaned up the package problem
X-Git-Tag: 0_33~2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=56dcfc1a4c9bad679dab6dedf274d2e3b0c20eb5;p=gitmo%2FClass-MOP.git

cleaned up the package problem
---

diff --git a/Changes b/Changes
index c7fd2c5..c955d5f 100644
--- a/Changes
+++ b/Changes
@@ -11,6 +11,10 @@ Revision history for Perl extension Class-MOP.
         - added tests for this
 
     ~ lots of misc. documentation cleanup 
+    
+    * Class::MOP::Package
+      - fixed an issue with perl 5.8.1 and how it deals 
+        with symbol tables.    
 
 0.32 Sat. Aug. 12, 2006
     + added Class::MOP::Object so that the 
diff --git a/lib/Class/MOP.pm b/lib/Class/MOP.pm
index 7ae48cc..ed30abf 100644
--- a/lib/Class/MOP.pm
+++ b/lib/Class/MOP.pm
@@ -83,12 +83,17 @@ Class::MOP::Package->meta->add_attribute(
 Class::MOP::Package->meta->add_attribute(
     Class::MOP::Attribute->new('%:namespace' => (
         reader => {
-            'namespace' => sub { (shift)->{'%:namespace'} }
-        },
-        default => sub {
-            my ($class) = @_;
-            no strict 'refs';
-            return \%{$class->name . '::'};
+            # NOTE:
+            # because of issues with the Perl API 
+            # to the typeglob in some versions, we 
+            # need to just always grab a new 
+            # reference to the hash here. Ideally 
+            # we could just store a ref and it would
+            # Just Work, but oh well :\
+            'namespace' => sub { 
+                no strict 'refs';
+                \%{$_[0]->name . '::'} 
+            }
         },
         # NOTE:
         # protect this from silliness 
diff --git a/lib/Class/MOP/Attribute.pm b/lib/Class/MOP/Attribute.pm
index 6fafa5d..d4f822f 100644
--- a/lib/Class/MOP/Attribute.pm
+++ b/lib/Class/MOP/Attribute.pm
@@ -7,7 +7,7 @@ use warnings;
 use Carp         'confess';
 use Scalar::Util 'blessed', 'reftype', 'weaken';
 
-our $VERSION   = '0.13';
+our $VERSION   = '0.12';
 our $AUTHORITY = 'cpan:STEVAN';
 
 sub meta { 
diff --git a/lib/Class/MOP/Package.pm b/lib/Class/MOP/Package.pm
index d1dec75..c932fdc 100644
--- a/lib/Class/MOP/Package.pm
+++ b/lib/Class/MOP/Package.pm
@@ -7,7 +7,7 @@ use warnings;
 use Scalar::Util 'blessed';
 use Carp         'confess';
 
-our $VERSION   = '0.02';
+our $VERSION   = '0.03';
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Class::MOP::Object';
@@ -29,7 +29,14 @@ sub initialize {
     no strict 'refs';
     return bless { 
         '$:package'   => $package_name,
-        '%:namespace' => \%{$package_name . '::'},
+        # NOTE:
+        # because of issues with the Perl API 
+        # to the typeglob in some versions, we 
+        # need to just always grab a new 
+        # reference to the hash in the accessor. 
+        # Ideally we could just store a ref and 
+        # it would Just Work, but oh well :\
+        #'%:namespace' => \%{$package_name . '::'},
     } => $class;
 }
 
@@ -40,7 +47,17 @@ sub initialize {
 # away in the Class::MOP bootstrap section
 
 sub name      { $_[0]->{'$:package'}   }
-sub namespace { $_[0]->{'%:namespace'} }
+sub namespace { 
+    # NOTE:
+    # because of issues with the Perl API 
+    # to the typeglob in some versions, we 
+    # need to just always grab a new 
+    # reference to the hash here. Ideally 
+    # we could just store a ref and it would
+    # Just Work, but oh well :\    
+    no strict 'refs';    
+    \%{$_[0]->name . '::'} 
+}
 
 # utility methods
 
@@ -80,8 +97,8 @@ sub add_package_symbol {
     my ($name, $sigil, $type) = $self->_deconstruct_variable_name($variable); 
 
     no strict 'refs';
-    no warnings 'redefine', 'misc';
-    *{$self->name . '::' . $name} = ref $initial_value ? $initial_value : \$initial_value;    
+    no warnings 'redefine', 'misc';    
+    *{$self->name . '::' . $name} = ref $initial_value ? $initial_value : \$initial_value;      
 }
 
 sub remove_package_glob {
@@ -96,7 +113,7 @@ sub has_package_symbol {
     my ($self, $variable) = @_;
 
     my ($name, $sigil, $type) = $self->_deconstruct_variable_name($variable); 
-
+    
     return 0 unless exists $self->namespace->{$name};   
     
     # FIXME:
@@ -110,10 +127,10 @@ sub has_package_symbol {
     
     if ($type eq 'SCALAR') {    
         my $val = *{$self->namespace->{$name}}{$type};
-        defined $$val ? 1 : 0;        
+        defined(${$val}) ? 1 : 0;        
     }
     else {
-        defined *{$self->namespace->{$name}}{$type} ? 1 : 0;
+        defined(*{$self->namespace->{$name}}{$type}) ? 1 : 0;
     }
 }
 
diff --git a/t/081_meta_package_extension.t b/t/081_meta_package_extension.t
index e8ead5c..409cdac 100644
--- a/t/081_meta_package_extension.t
+++ b/t/081_meta_package_extension.t
@@ -23,6 +23,7 @@ BEGIN {
     
     __PACKAGE__->meta->add_attribute(
         '%:namespace' => (
+            reader  => 'namespace',
             default => sub { {} }
         )
     );