X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FPackage.pm;h=78f0d9650103fd004cfcd673425dd4712e761fb5;hb=c808e3d5c3b5fa953d6b9a3ee7ce4cd2b7925f6c;hp=193934a914d076765fcb1fcab15457d97fad3c71;hpb=3be6bc1cd2696af20ddf45679ca3cb5930eab371;p=gitmo%2FClass-MOP.git

diff --git a/lib/Class/MOP/Package.pm b/lib/Class/MOP/Package.pm
index 193934a..78f0d96 100644
--- a/lib/Class/MOP/Package.pm
+++ b/lib/Class/MOP/Package.pm
@@ -7,7 +7,8 @@ use warnings;
 use Scalar::Util 'blessed';
 use Carp         'confess';
 
-our $VERSION   = '0.65';
+our $VERSION   = '0.67';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Class::MOP::Object';
@@ -26,15 +27,15 @@ sub initialize {
     # we hand-construct the class 
     # until we can bootstrap it
     if ( my $meta = Class::MOP::get_metaclass_by_name($package_name) ) {
-       return $meta;
+        return $meta;
     } else {
-       my $meta = ( ref $class || $class )->_new({
-           'package'   => $package_name,
-       });
+        my $meta = ( ref $class || $class )->_new({
+            'package'   => $package_name,
+        });
 
-       Class::MOP::store_metaclass_by_name($package_name, $meta);
+        Class::MOP::store_metaclass_by_name($package_name, $meta);
 
-       return $meta;
+        return $meta;
     }
 }
 
@@ -44,14 +45,14 @@ sub reinitialize {
     unshift @args, "package" if @args % 2;
 
     my %options = @args;
-    my $package_name = $options{package};
+    my $package_name = delete $options{package};
 
     (defined $package_name && $package_name && !blessed($package_name))
         || confess "You must pass a package name and it cannot be blessed";
 
     Class::MOP::remove_metaclass_by_name($package_name);
 
-    $class->initialize('package' => $package_name, @_);
+    $class->initialize($package_name, %options); # call with first arg form for compat
 }
 
 sub _new {
@@ -275,20 +276,24 @@ sub list_all_package_symbols {
 
 sub get_all_package_symbols {
     my ($self, $type_filter) = @_;
+
+    die "Cannot call get_all_package_symbols as a class method"
+        unless ref $self;
+
     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
+    # for some reason this nasty impl is orders of magnitude faster than a clean version
     if ( $type_filter eq 'CODE' ) {
         my $pkg;
         no strict 'refs';
         return map {
             (ref($namespace->{$_})
                 ? ( $_ => \&{$pkg ||= $self->name . "::$_"} )
-                : ( *{$namespace->{$_}}{CODE}
-                    ? ( $_ => *{$namespace->{$_}}{$type_filter} )
-                    : ()))
+                : ( (*{$namespace->{$_}}{CODE}) # the extra parents prevent breakage on 5.8.2
+                    ? ( $_ => *{$namespace->{$_}}{CODE} )
+                    : () ) )
         } keys %$namespace;
     } else {
         return map {