Move accessors into XS

[gitmo/Mouse.git] / lib / Mouse / Meta / Module.pm

diff --git a/lib/Mouse/Meta/Module.pm b/lib/Mouse/Meta/Module.pm
index 3069250..9f2c7f8 100755 (executable)
--- a/lib/Mouse/Meta/Module.pm
+++ b/lib/Mouse/Meta/Module.pm
@@ -39,8 +39,7 @@ sub get_metaclass_by_name       { $METAS{$_[0]}         }
 #sub remove_metaclass_by_name    { delete $METAS{$_[0]}  }
 
 
-
-sub name { $_[0]->{package} }
+sub name;
 
 # The followings are Class::MOP specific methods
 
@@ -91,7 +90,7 @@ sub add_method {
 
     my $pkg = $self->name;
     no strict 'refs';
-    no warnings 'redefine';
+    no warnings 'redefine', 'once';
     *{ $pkg . '::' . $name } = $code;
 }
 
@@ -114,9 +113,13 @@ sub has_method {
     defined($method_name)
         or $self->throw_error('You must define a method name');
 
-    return 1 if $self->{methods}->{$method_name};
+    return 1 if $self->{methods}{$method_name};
 
-    my $code = do{ no strict 'refs'; *{$self->{package} . '::' . $method_name}{CODE} };
+    my $code = do{
+        no strict 'refs';
+        no warnings 'once';
+        *{ $self->{package} . '::' . $method_name }{CODE};
+    };
 
     return $code && $self->_code_is_mine($code);
 }
@@ -128,9 +131,13 @@ sub get_method_body{
         or $self->throw_error('You must define a method name');
 
     return $self->{methods}{$method_name} ||= do{
-        my $code = do{ no strict 'refs'; *{$self->{package} . '::' . $method_name}{CODE} };
+        my $code = do{
+            no strict 'refs';
+            no warnings 'once';
+            *{$self->{package} . '::' . $method_name}{CODE};
+        };
 
-        $code && $self->_code_is_mine($code) && $code;
+        ($code && $self->_code_is_mine($code)) ? $code : undef;
     };
 }
 
@@ -141,11 +148,11 @@ sub get_method{
         my $method_metaclass = $self->method_metaclass;
         load_class($method_metaclass);
 
-        my $package = $self->name;
-        return $method_metaclass->new(
-            body    => $package->can($method_name),
-            name    => $method_name,
-            package => $package,
+        return $method_metaclass->wrap(
+            body                 => $self->get_method_body($method_name),
+            name                 => $method_name,
+            package              => $self->name,
+            associated_metaclass => $self,
         );
     }
 
@@ -316,6 +323,10 @@ __END__
 
 Mouse::Meta::Module - The base class for Mouse::Meta::Class and Mouse::Meta::Role
 
+=head1 VERSION
+
+This document describes Mouse version 0.40
+
 =head1 SEE ALSO
 
 L<Class::MOP::Class>