use Class::MOP::Method::Meta;
-our $VERSION = '1.11';
+our $VERSION = '1.12';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
use base 'Class::MOP::Mixin';
-sub method_metaclass { $_[0]->{'method_metaclass'} }
-sub wrapped_method_metaclass { $_[0]->{'wrapped_method_metaclass'} }
-sub _meta_method_class { 'Class::MOP::Method::Meta' }
+sub _meta_method_class { 'Class::MOP::Method::Meta' }
sub _add_meta_method {
my $self = shift;
$method = $method->clone(
package_name => $package_name,
name => $method_name,
- ) if $method->can('clone');
+ );
}
$method->attach_to_class($self);
$self->_method_map->{$method_name} = $method;
- my ( $current_package, $current_name ) = Class::MOP::get_code_info($body);
+ my ($current_package, $current_name) = Class::MOP::get_code_info($body);
- if ( !defined $current_name || $current_name =~ /^__ANON__/ ) {
- my $full_method_name = ( $package_name . '::' . $method_name );
- subname( $full_method_name => $body );
- }
+ subname($package_name . '::' . $method_name, $body)
+ unless defined $current_name && $current_name !~ /^__ANON__/;
- $self->add_package_symbol(
- { sigil => '&', type => 'CODE', name => $method_name },
- $body,
- );
+ $self->add_package_symbol("&$method_name", $body);
+
+ # we added the method to the method map too, so it's still valid
+ $self->update_package_cache_flag;
}
sub _code_is_mine {
my ( $code_package, $code_name ) = Class::MOP::get_code_info($code);
- return $code_package && $code_package eq $self->name
+ return ( $code_package && $code_package eq $self->name )
|| ( $code_package eq 'constant' && $code_name eq '__ANON__' );
}
( defined $method_name && length $method_name )
|| confess "You must define a method name";
- return defined( $self->_get_maybe_raw_method($method_name) );
+ my $method = $self->_get_maybe_raw_method($method_name)
+ or return;
+
+ return defined($self->_method_map->{$method_name} = $method);
}
sub get_method {
sub _get_maybe_raw_method {
my ( $self, $method_name ) = @_;
- my $method_map = $self->_method_map;
- my $map_entry = $method_map->{$method_name};
- my $code = $self->get_package_symbol(
- {
- name => $method_name,
- sigil => '&',
- type => 'CODE',
- }
- );
+ my $map_entry = $self->_method_map->{$method_name};
+ return $map_entry if defined $map_entry;
- # The !$code case seems to happen in some weird cases where methods
- # modifiers are added via roles or some other such bizareness. Honestly, I
- # don't totally understand this, but returning the entry works, and keeps
- # various MX modules from blowing up. - DR
- return $map_entry
- if blessed $map_entry && ( !$code || $map_entry->body == $code );
+ my $code = $self->get_package_symbol("&$method_name");
- unless ($map_entry) {
- return unless $code && $self->_code_is_mine($code);
- }
+ return unless $code && $self->_code_is_mine($code);
return $code;
}
sub remove_method {
my ( $self, $method_name ) = @_;
+
( defined $method_name && length $method_name )
|| confess "You must define a method name";
my $removed_method = delete $self->_method_map->{$method_name};
- $self->remove_package_symbol(
- { sigil => '&', type => 'CODE', name => $method_name } );
+ $self->remove_package_symbol("&$method_name");
$removed_method->detach_from_class
- if $removed_method && blessed $removed_method;
+ if blessed($removed_method);
# still valid, since we just removed the method from the map
$self->update_package_cache_flag;
sub get_method_list {
my $self = shift;
- my $namespace = $self->namespace;
-
- # Constants may show up as some sort of non-GLOB reference in the
- # namespace hash ref, depending on the Perl version.
- return grep {
- defined $namespace->{$_}
- && ( ref( \$namespace->{$_} ) ne 'GLOB'
- || *{ $namespace->{$_} }{CODE} )
- && $self->has_method($_)
- }
- keys %{$namespace};
+ return keys %{ $self->_full_method_map };
}
-# This should probably be what get_method_list actually does, instead of just
-# returning names. This was created as a much faster alternative to
-# $meta->get_method($_) for $meta->get_method_list
sub _get_local_methods {
my $self = shift;
- my $namespace = $self->namespace;
-
- return map { $self->get_method($_) }
- grep {
- defined $namespace->{$_}
- && ( ref $namespace->{$_}
- || *{ $namespace->{$_} }{CODE} )
- }
- keys %{$namespace};
+ return values %{ $self->_full_method_map };
}
sub _restore_metamethods_from {
}
}
+sub reset_package_cache_flag { (shift)->{'_package_cache_flag'} = undef }
+sub update_package_cache_flag {
+ my $self = shift;
+ # NOTE:
+ # we can manually update the cache number
+ # since we are actually adding the method
+ # to our cache as well. This avoids us
+ # having to regenerate the method_map.
+ # - SL
+ $self->{'_package_cache_flag'} = Class::MOP::check_package_cache_flag($self->name);
+}
+
+sub _full_method_map {
+ my $self = shift;
+
+ my $pkg_gen = Class::MOP::check_package_cache_flag($self->name);
+
+ if (($self->{_package_cache_flag_full} || -1) != $pkg_gen) {
+ # forcibly reify all method map entries
+ $self->get_method($_)
+ for $self->list_all_package_symbols('CODE');
+ $self->{_package_cache_flag_full} = $pkg_gen;
+ }
+
+ return $self->_method_map;
+}
+
1;
__END__
projects / gitmo/Class-MOP.git / blobdiff