clean up ::HasMethods a bunch

diff --git a/lib/Class/MOP/Mixin/HasMethods.pm b/lib/Class/MOP/Mixin/HasMethods.pm
index 141bfa7..2e2c9f1 100644 (file)
--- a/lib/Class/MOP/Mixin/HasMethods.pm
+++ b/lib/Class/MOP/Mixin/HasMethods.pm
@@ -15,7 +15,7 @@ use Sub::Name    'subname';
 
 use base 'Class::MOP::Mixin';
 
-sub _meta_method_class       { 'Class::MOP::Method::Meta'             }
+sub _meta_method_class { 'Class::MOP::Method::Meta' }
 
 sub _add_meta_method {
     my $self = shift;
@@ -60,7 +60,7 @@ sub add_method {
             $method = $method->clone(
                 package_name => $package_name,
                 name         => $method_name,
-            ) if $method->can('clone');
+            );
         }
 
         $method->attach_to_class($self);
@@ -73,18 +73,15 @@ sub add_method {
 
     $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("&$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);
+    # we added the method to the method map too, so it's still valid
+    $self->update_package_cache_flag;
 }
 
 sub _code_is_mine {
@@ -92,7 +89,7 @@ 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__' );
 }
 
@@ -134,15 +131,14 @@ sub _get_maybe_raw_method {
 
     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";
 
@@ -151,7 +147,7 @@ sub remove_method {
     $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;
@@ -165,9 +161,6 @@ sub get_method_list {
     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;