X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FPackage.pm;h=c21e979c7e62b89dca4e35e404f2018366427888;hb=c16a3087fabac823b511ab1fcfa10d0f64f53bf6;hp=a95d29bd14b6c3c82552368bb839d9c39fe2cadb;hpb=92af7fdfbd3e03c2cbef0bf0513430b53e2c4960;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Package.pm b/lib/Class/MOP/Package.pm index a95d29b..c21e979 100644 --- a/lib/Class/MOP/Package.pm +++ b/lib/Class/MOP/Package.pm @@ -4,40 +4,73 @@ package Class::MOP::Package; use strict; use warnings; +use B; use Scalar::Util 'blessed'; use Carp 'confess'; -our $VERSION = '0.06'; +our $VERSION = '0.74'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Class::MOP::Object'; -# introspection - -sub meta { - require Class::MOP::Class; - Class::MOP::Class->initialize(blessed($_[0]) || $_[0]); -} - # creation ... sub initialize { - my $class = shift; - my $package_name = shift; + my ( $class, @args ) = @_; + + unshift @args, "package" if @args % 2; + + my %options = @args; + my $package_name = $options{package}; + + # we hand-construct the class # until we can bootstrap it - no strict 'refs'; - return bless { - '$!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; + if ( my $meta = Class::MOP::get_metaclass_by_name($package_name) ) { + return $meta; + } else { + my $meta = ( ref $class || $class )->_new({ + 'package' => $package_name, + %options, + }); + + Class::MOP::store_metaclass_by_name($package_name, $meta); + + return $meta; + } +} + +sub reinitialize { + my ( $class, @args ) = @_; + + unshift @args, "package" if @args % 2; + + my %options = @args; + 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_name, %options); # call with first arg form for compat +} + +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 @@ -46,7 +79,7 @@ sub initialize { # all these attribute readers will be bootstrapped # away in the Class::MOP bootstrap section -sub name { $_[0]->{'$!package'} } +sub name { $_[0]->{'package'} } sub namespace { # NOTE: # because of issues with the Perl API @@ -56,7 +89,7 @@ sub namespace { # we could just store a ref and it would # Just Work, but oh well :\ no strict 'refs'; - \%{$_[0]->name . '::'} + \%{$_[0]->{'package'} . '::'} } # utility methods @@ -75,7 +108,7 @@ sub namespace { (defined $variable) || confess "You must pass a variable name"; - my ($sigil, $name) = ($variable =~ /^(.)(.*)$/); + my $sigil = substr($variable, 0, 1, ''); (defined $sigil) || confess "The variable name must include a sigil"; @@ -83,7 +116,7 @@ sub namespace { (exists $SIGIL_MAP{$sigil}) || confess "I do not recognize that sigil '$sigil'"; - return ($name, $sigil, $SIGIL_MAP{$sigil}); + return ($variable, $sigil, $SIGIL_MAP{$sigil}); } } @@ -94,11 +127,15 @@ sub namespace { sub add_package_symbol { my ($self, $variable, $initial_value) = @_; - my ($name, $sigil, $type) = $self->_deconstruct_variable_name($variable); + my ($name, $sigil, $type) = ref $variable eq 'HASH' + ? @{$variable}{qw[name sigil type]} + : $self->_deconstruct_variable_name($variable); + + my $pkg = $self->{'package'}; no strict 'refs'; no warnings 'redefine', 'misc'; - *{$self->name . '::' . $name} = ref $initial_value ? $initial_value : \$initial_value; + *{$pkg . '::' . $name} = ref $initial_value ? $initial_value : \$initial_value; } sub remove_package_glob { @@ -112,9 +149,13 @@ sub remove_package_glob { sub has_package_symbol { my ($self, $variable) = @_; - my ($name, $sigil, $type) = $self->_deconstruct_variable_name($variable); + my ($name, $sigil, $type) = ref $variable eq 'HASH' + ? @{$variable}{qw[name sigil type]} + : $self->_deconstruct_variable_name($variable); - return 0 unless exists $self->namespace->{$name}; + my $namespace = $self->namespace; + + return 0 unless exists $namespace->{$name}; # FIXME: # For some really stupid reason @@ -125,27 +166,31 @@ sub has_package_symbol { # if you put \undef in your scalar # then this is broken. - if (ref($self->namespace->{$name}) eq 'SCALAR') { - return ($type eq 'CODE' ? 1 : 0); + if (ref($namespace->{$name}) eq 'SCALAR') { + return ($type eq 'CODE'); } elsif ($type eq 'SCALAR') { - my $val = *{$self->namespace->{$name}}{$type}; - return defined(${$val}) ? 1 : 0; + my $val = *{$namespace->{$name}}{$type}; + return defined(${$val}); } else { - defined(*{$self->namespace->{$name}}{$type}) ? 1 : 0; + defined(*{$namespace->{$name}}{$type}); } } sub get_package_symbol { my ($self, $variable) = @_; - my ($name, $sigil, $type) = $self->_deconstruct_variable_name($variable); + my ($name, $sigil, $type) = ref $variable eq 'HASH' + ? @{$variable}{qw[name sigil type]} + : $self->_deconstruct_variable_name($variable); + + my $namespace = $self->namespace; $self->add_package_symbol($variable) - unless exists $self->namespace->{$name}; + unless exists $namespace->{$name}; - if (ref($self->namespace->{$name}) eq 'SCALAR') { + if (ref($namespace->{$name}) eq 'SCALAR') { if ($type eq 'CODE') { no strict 'refs'; return \&{$self->name.'::'.$name}; @@ -155,39 +200,48 @@ sub get_package_symbol { } } else { - return *{$self->namespace->{$name}}{$type}; + return *{$namespace->{$name}}{$type}; } } sub remove_package_symbol { my ($self, $variable) = @_; - my ($name, $sigil, $type) = $self->_deconstruct_variable_name($variable); + my ($name, $sigil, $type) = ref $variable eq 'HASH' + ? @{$variable}{qw[name sigil type]} + : $self->_deconstruct_variable_name($variable); # FIXME: # no doubt this is grossly inefficient and # could be done much easier and faster in XS + my ($scalar_desc, $array_desc, $hash_desc, $code_desc) = ( + { sigil => '$', type => 'SCALAR', name => $name }, + { sigil => '@', type => 'ARRAY', name => $name }, + { sigil => '%', type => 'HASH', name => $name }, + { sigil => '&', type => 'CODE', name => $name }, + ); + my ($scalar, $array, $hash, $code); if ($type eq 'SCALAR') { - $array = $self->get_package_symbol('@' . $name) if $self->has_package_symbol('@' . $name); - $hash = $self->get_package_symbol('%' . $name) if $self->has_package_symbol('%' . $name); - $code = $self->get_package_symbol('&' . $name) if $self->has_package_symbol('&' . $name); + $array = $self->get_package_symbol($array_desc) if $self->has_package_symbol($array_desc); + $hash = $self->get_package_symbol($hash_desc) if $self->has_package_symbol($hash_desc); + $code = $self->get_package_symbol($code_desc) if $self->has_package_symbol($code_desc); } elsif ($type eq 'ARRAY') { - $scalar = $self->get_package_symbol('$' . $name) if $self->has_package_symbol('$' . $name); - $hash = $self->get_package_symbol('%' . $name) if $self->has_package_symbol('%' . $name); - $code = $self->get_package_symbol('&' . $name) if $self->has_package_symbol('&' . $name); + $scalar = $self->get_package_symbol($scalar_desc) if $self->has_package_symbol($scalar_desc); + $hash = $self->get_package_symbol($hash_desc) if $self->has_package_symbol($hash_desc); + $code = $self->get_package_symbol($code_desc) if $self->has_package_symbol($code_desc); } elsif ($type eq 'HASH') { - $scalar = $self->get_package_symbol('$' . $name) if $self->has_package_symbol('$' . $name); - $array = $self->get_package_symbol('@' . $name) if $self->has_package_symbol('@' . $name); - $code = $self->get_package_symbol('&' . $name) if $self->has_package_symbol('&' . $name); + $scalar = $self->get_package_symbol($scalar_desc) if $self->has_package_symbol($scalar_desc); + $array = $self->get_package_symbol($array_desc) if $self->has_package_symbol($array_desc); + $code = $self->get_package_symbol($code_desc) if $self->has_package_symbol($code_desc); } elsif ($type eq 'CODE') { - $scalar = $self->get_package_symbol('$' . $name) if $self->has_package_symbol('$' . $name); - $array = $self->get_package_symbol('@' . $name) if $self->has_package_symbol('@' . $name); - $hash = $self->get_package_symbol('%' . $name) if $self->has_package_symbol('%' . $name); + $scalar = $self->get_package_symbol($scalar_desc) if $self->has_package_symbol($scalar_desc); + $array = $self->get_package_symbol($array_desc) if $self->has_package_symbol($array_desc); + $hash = $self->get_package_symbol($hash_desc) if $self->has_package_symbol($hash_desc); } else { confess "This should never ever ever happen"; @@ -195,25 +249,74 @@ sub remove_package_symbol { $self->remove_package_glob($name); - $self->add_package_symbol(('$' . $name) => $scalar) if defined $scalar; - $self->add_package_symbol(('@' . $name) => $array) if defined $array; - $self->add_package_symbol(('%' . $name) => $hash) if defined $hash; - $self->add_package_symbol(('&' . $name) => $code) if defined $code; + $self->add_package_symbol($scalar_desc => $scalar) if defined $scalar; + $self->add_package_symbol($array_desc => $array) if defined $array; + $self->add_package_symbol($hash_desc => $hash) if defined $hash; + $self->add_package_symbol($code_desc => $code) if defined $code; } sub list_all_package_symbols { my ($self, $type_filter) = @_; - return keys %{$self->namespace} unless defined $type_filter; + + my $namespace = $self->namespace; + return keys %{$namespace} unless defined $type_filter; + # NOTE: # or we can filter based on # type (SCALAR|ARRAY|HASH|CODE) - my $namespace = $self->namespace; - return grep { + if ( $type_filter eq 'CODE' ) { + return grep { (ref($namespace->{$_}) - ? (ref($namespace->{$_}) eq 'SCALAR' && $type_filter eq 'CODE') - : (ref(\$namespace->{$_}) eq 'GLOB' - && defined(*{$namespace->{$_}}{$type_filter}))); - } keys %{$namespace}; + ? (ref($namespace->{$_}) eq 'SCALAR') + : (ref(\$namespace->{$_}) eq 'GLOB' + && defined(*{$namespace->{$_}}{CODE}))); + } keys %{$namespace}; + } else { + return grep { *{$namespace->{$_}}{$type_filter} } keys %{$namespace}; + } +} + +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; + + if (wantarray) { + warn 'Class::MOP::Package::get_all_package_symbols in list context is deprecated. use scalar context instead.'; + } + + return (wantarray ? %$namespace : $namespace) unless defined $type_filter; + + my %ret; + # 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'; + %ret = map { + (ref($namespace->{$_}) + ? ( $_ => \&{$pkg ||= $self->name . "::$_"} ) + : ( ref \$namespace->{$_} eq 'GLOB' # don't use {CODE} unless it's really a glob to prevent stringification of stubs + && (*{$namespace->{$_}}{CODE}) # the extra parents prevent breakage on 5.8.2 + ? ( $_ => *{$namespace->{$_}}{CODE} ) + : (do { + my $sym = B::svref_2object(\$namespace->{$_}); + my $svt = ref $sym if $sym; + ($sym && ($svt eq 'B::PV' || $svt eq 'B::IV')) + ? ($_ => ($pkg ||= $self->name)->can($_)) + : () }) ) ) + } keys %$namespace; + } else { + %ret = map { + $_ => *{$namespace->{$_}}{$type_filter} + } grep { + !ref($namespace->{$_}) && *{$namespace->{$_}}{$type_filter} + } keys %$namespace; + } + + return wantarray ? %ret : \%ret; } 1; @@ -226,18 +329,35 @@ __END__ Class::MOP::Package - Package Meta Object -=head1 SYNOPSIS - =head1 DESCRIPTION +This is an abstraction of a Perl 5 package, it is a superclass of +L and provides all of the symbol table +introspection methods. + +=head1 INHERITANCE + +B is a subclass of L + =head1 METHODS =over 4 =item B +Returns a metaclass for this package. + =item B +This will initialize a Class::MOP::Package instance which represents +the package of C<$package_name>. + +=item B + +This removes the old metaclass, and creates a new one in it's place. +Do B use this unless you really know what you are doing, it could +very easily make a very large mess of your program. + =item B This is a read-only attribute which returns the package name for the @@ -284,6 +404,11 @@ the package. By passing a C<$type_filter>, you can limit the list to only those which match the filter (either SCALAR, ARRAY, HASH or CODE). +=item B + +Works exactly like C but returns a HASH of +name => thing mapping instead of just an ARRAY of names. + =back =head1 AUTHORS @@ -292,7 +417,7 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006, 2007 by Infinity Interactive, Inc. +Copyright 2006-2008 by Infinity Interactive, Inc. L