package Mouse::Meta::Module;
use Mouse::Util qw/:meta get_code_package get_code_ref load_class not_supported/; # enables strict and warnings
-use Mouse::Util::TypeConstraints ();
-
use Carp ();
use Scalar::Util ();
# XXX: for backward compatibility
my %foreign = map{ $_ => undef } qw(
Mouse Mouse::Role Mouse::Util Mouse::Util::TypeConstraints
- Carp Scalar::Util
+ Carp Scalar::Util List::Util
);
sub _code_is_mine{
- my($self, $code) = @_;
-
- my $package = get_code_package($code);
+# my($self, $code) = @_;
- return !exists $foreign{$package};
+ return !exists $foreign{ get_code_package($_[1]) };
}
sub add_method;
defined($method_name)
or $self->throw_error('You must define a method name');
- return 1 if $self->{methods}{$method_name};
-
- my $code = get_code_ref($self->{package}, $method_name);
-
- return $code && $self->_code_is_mine($code);
+ return defined($self->{methods}{$method_name}) || do{
+ my $code = get_code_ref($self->{package}, $method_name);
+ $code && $self->_code_is_mine($code);
+ };
}
-sub get_method_body{
+sub get_method_body {
my($self, $method_name) = @_;
defined($method_name)
return $self->{methods}{$method_name} ||= do{
my $code = get_code_ref($self->{package}, $method_name);
- ($code && $self->_code_is_mine($code)) ? $code : undef;
+ $code && $self->_code_is_mine($code) ? $code : undef;
};
}
sub get_method{
my($self, $method_name) = @_;
- if($self->has_method($method_name)){
+ if(my $code = $self->get_method_body($method_name)){
my $method_metaclass = $self->method_metaclass;
load_class($method_metaclass);
return $method_metaclass->wrap(
- body => $self->get_method_body($method_name),
+ body => $code,
name => $method_name,
package => $self->name,
associated_metaclass => $self,
my $superclasses;
if(exists $options{superclasses}){
- if(Mouse::Util::TypeConstraints::_is_a_metarole($self)){
+ if(Mouse::Util::is_a_metarole($self)){
delete $options{superclasses};
}
else{
=head1 VERSION
-This document describes Mouse version 0.40_01
+This document describes Mouse version 0.40_05
=head1 SEE ALSO