use Class::MOP::Method::Meta;
-our $VERSION = '1.09';
+our $VERSION = '1.11';
$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 _add_meta_method {
my $self = shift;
+ my ($name) = @_;
my $existing_method = $self->can('find_method_by_name')
- ? $self->find_method_by_name('meta')
- : $self->get_method('meta');
+ ? $self->find_method_by_name($name)
+ : $self->get_method($name);
return if $existing_method
&& $existing_method->isa($self->_meta_method_class);
$self->add_method(
- 'meta' => $self->_meta_method_class->wrap(
- name => 'meta',
+ $name => $self->_meta_method_class->wrap(
+ name => $name,
package_name => $self->name,
associated_metaclass => $self,
)
);
}
-# This doesn't always get initialized in a constructor because there is a
-# weird object construction path for subclasses of Class::MOP::Class. At one
-# point, this always got initialized by calling into the XS code first, but
-# that is no longer guaranteed to happen.
-sub _method_map { $_[0]->{'methods'} ||= {} }
-
sub wrap_method_body {
my ( $self, %args ) = @_;
subname( $full_method_name => $body );
}
- $self->add_package_symbol(
- { sigil => '&', type => 'CODE', name => $method_name },
- $body,
- );
+ $self->add_package_symbol("&$method_name", $body);
+
+ # if we added the actual method object to the method map, we're still valid
+ $self->update_package_cache_flag
+ if blessed($method);
}
sub _code_is_mine {
( 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);
( defined $method_name && length $method_name )
|| confess "You must define a method name";
- my $removed_method = delete $self->_full_method_map->{$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;
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
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 {
my ($old_meta) = @_;
for my $method ($old_meta->_get_local_methods) {
- # XXX: this is pretty gross. the issue here is that
- # CMOP::Method::Wrapped objects are subclasses of CMOP::Method, but
- # when we get to moose, they'll need to be compatible with
- # Moose::Meta::Method, which isn't possible. the right solution here is
- # to make ::Wrapped into a role that gets applied to whatever the
- # method_metaclass happens to be and get rid of
- # wrapped_method_metaclass entirely, but that's not going to happen
- # until we ditch cmop and get roles into the bootstrapping, so.
- # i'm not maintaining the previous behavior of turning them into
- # instances of the new method_metaclass because that's equally broken,
- # and at least this way any issues will at least be detectable and
- # potentially fixable. -doy
- if (!$method->isa($self->wrapped_method_metaclass)
- # and the same issue occurs with CMOP::Method::Meta objects/:
- && !$method->isa($self->_meta_method_class)) {
- $method->_make_compatible_with($self->method_metaclass);
- }
+ $method->_make_compatible_with($self->method_metaclass);
$self->add_method($method->name => $method);
}
}
+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