X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FPackage.pm;h=23785e8486c78658a73250e7dc97f17c72cc7610;hb=52c685d33a36910371f8265346d0030934ba6b95;hp=06b88d2e5b4cf5c2b2e95e6dc050d1e94cd415b5;hpb=650e83227574b3c6ca6cfbcbaca643b913741bee;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Package.pm b/lib/Class/MOP/Package.pm index 06b88d2..23785e8 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.64_02'; +our $VERSION = '0.69'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -27,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; } } @@ -276,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 {