X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMixin%2FHasMethods.pm;h=217e19d8767f0449d36a110ebd065623426b970d;hb=d004c8d565f9b314da7652e9368aeb4587ffaa3d;hp=e343d2099182b46235d05b30b6671a89a2263fde;hpb=5018df3eea5b6b41aa78a0d999903887c2873eca;p=gitmo%2FClass-MOP.git

diff --git a/lib/Class/MOP/Mixin/HasMethods.pm b/lib/Class/MOP/Mixin/HasMethods.pm
index e343d20..217e19d 100644
--- a/lib/Class/MOP/Mixin/HasMethods.pm
+++ b/lib/Class/MOP/Mixin/HasMethods.pm
@@ -5,7 +5,7 @@ use warnings;
 
 use Class::MOP::Method::Meta;
 
-our $VERSION   = '1.11';
+our $VERSION   = '1.12';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -15,9 +15,7 @@ use Sub::Name    'subname';
 
 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 _meta_method_class { 'Class::MOP::Method::Meta' }
 
 sub _add_meta_method {
     my $self = shift;
@@ -62,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);
@@ -75,17 +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(
-        { sigil => '&', type => 'CODE', name => $method_name },
-        $body,
-    );
+    $self->add_package_symbol("&$method_name", $body);
+
+    # we added the method to the method map too, so it's still valid
+    $self->update_package_cache_flag;
 }
 
 sub _code_is_mine {
@@ -93,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__' );
 }
 
@@ -133,33 +129,25 @@ sub _get_maybe_raw_method {
     my $map_entry = $self->_method_map->{$method_name};
     return $map_entry if defined $map_entry;
 
-    my $code = $self->get_package_symbol(
-        {
-            name  => $method_name,
-            sigil => '&',
-            type  => 'CODE',
-        }
-    );
+    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";
 
     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;
+        if blessed($removed_method);
 
     # still valid, since we just removed the method from the map
     $self->update_package_cache_flag;
@@ -173,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;