use strict;
use warnings;
-our $VERSION = '0.98';
+use Class::MOP::Method::Meta;
+
+our $VERSION = '1.09';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
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 $existing_method = $self->can('find_method_by_name')
+ ? $self->find_method_by_name('meta')
+ : $self->get_method('meta');
+ return if $existing_method
+ && $existing_method->isa($self->_meta_method_class);
+ $self->add_method(
+ 'meta' => $self->_meta_method_class->wrap(
+ name => 'meta',
+ 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
( defined $method_name && length $method_name )
|| confess "You must define a method name";
+ my $package_name = $self->name;
+
my $body;
if ( blessed($method) ) {
$body = $method->body;
- if ( $method->package_name ne $self->name ) {
+ if ( $method->package_name ne $package_name ) {
$method = $method->clone(
- package_name => $self->name,
+ package_name => $package_name,
name => $method_name,
) if $method->can('clone');
}
my ( $current_package, $current_name ) = Class::MOP::get_code_info($body);
if ( !defined $current_name || $current_name =~ /^__ANON__/ ) {
- my $full_method_name = ( $self->name . '::' . $method_name );
+ my $full_method_name = ( $package_name . '::' . $method_name );
subname( $full_method_name => $body );
}
( defined $method_name && length $method_name )
|| confess "You must define a method name";
- return defined( $self->get_method($method_name) );
+ return defined( $self->_get_maybe_raw_method($method_name) );
}
sub get_method {
( defined $method_name && length $method_name )
|| confess "You must define a method name";
+ my $method = $self->_get_maybe_raw_method($method_name)
+ or return;
+
+ return $method if blessed $method;
+
+ return $self->_method_map->{$method_name} = $self->wrap_method_body(
+ body => $method,
+ name => $method_name,
+ associated_metaclass => $self,
+ );
+}
+
+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(
}
);
- # This 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;
-
- return $map_entry if blessed $map_entry && $map_entry->body == $code;
+ # 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 );
unless ($map_entry) {
return unless $code && $self->_code_is_mine($code);
}
- $code ||= $map_entry;
-
- return $method_map->{$method_name} = $self->wrap_method_body(
- body => $code,
- name => $method_name,
- associated_metaclass => $self,
- );
+ return $code;
}
sub remove_method {
sub get_method_list {
my $self = shift;
- return grep { $self->has_method($_) } keys %{ $self->namespace };
+
+ 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};
+}
+
+# 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};
+}
+
+sub _restore_metamethods_from {
+ my $self = shift;
+ 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)) {
+ $method->_make_compatible_with($self->method_metaclass);
+ }
+ $self->add_method($method->name => $method);
+ }
}
1;
projects / gitmo/Class-MOP.git / blobdiff