use hash refs with _new

[gitmo/Class-MOP.git] / lib / Class / MOP / Package.pm

diff --git a/lib/Class/MOP/Package.pm b/lib/Class/MOP/Package.pm
index a712143..5b42565 100644 (file)
--- a/lib/Class/MOP/Package.pm
+++ b/lib/Class/MOP/Package.pm
@@ -19,18 +19,25 @@ sub initialize {
     my $package_name = shift;
     # we hand-construct the class 
     # until we can bootstrap it
-    no strict 'refs';
-    return bless { 
+    $class->_new({
         'package'   => $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' => \undef,
-    } => $class;
+    });
+}
+
+sub _new {
+    my $class = shift;
+    my $options = @_ == 1 ? $_[0] : {@_};
+
+    # 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 :\
+    $options->{namespace} ||= \undef;
+
+    bless $options, $class;
 }
 
 # Attributes
@@ -127,14 +134,14 @@ sub has_package_symbol {
     # then this is broken.
 
     if (ref($namespace->{$name}) eq 'SCALAR') {
-        return ($type eq 'CODE' ? 1 : 0);
+        return ($type eq 'CODE');
     }
     elsif ($type eq 'SCALAR') {    
         my $val = *{$namespace->{$name}}{$type};
-        return defined(${$val}) ? 1 : 0;        
+        return defined(${$val});
     }
     else {
-        defined(*{$namespace->{$name}}{$type}) ? 1 : 0;
+        defined(*{$namespace->{$name}}{$type});
     }
 }
 
@@ -239,16 +246,17 @@ sub list_all_package_symbols {
 sub get_all_package_symbols {
     my ($self, $type_filter) = @_;
     my $namespace = $self->namespace;
+
     return %$namespace unless defined $type_filter;
 
     # for some reason this nasty impl is orders of magnitude aster than a clean version
     if ( $type_filter eq 'CODE' ) {
-        my $pkg = $self->name;
+        my $pkg;
         no strict 'refs';
         return map {
             (ref($namespace->{$_})
-                 ? ( $_ => \&{"${pkg}::$_"} )
-                 : ( *{$namespace->{$_}}{CODE}
+                ? ( $_ => \&{$pkg ||= $self->name . "::$_"} )
+                : ( *{$namespace->{$_}}{CODE}
                     ? ( $_ => *{$namespace->{$_}}{$type_filter} )
                     : ()))
         } keys %$namespace;