add associated_metaclass to Method

[gitmo/Class-MOP.git] / lib / Class / MOP / Class.pm

diff --git a/lib/Class/MOP/Class.pm b/lib/Class/MOP/Class.pm
index c80b00c..63636ba 100644 (file)
--- a/lib/Class/MOP/Class.pm
+++ b/lib/Class/MOP/Class.pm
@@ -360,8 +360,9 @@ sub get_method_map {
 
         $map->{$symbol} = $method_metaclass->wrap(
             $code,
-            package_name => $class_name,
-            name         => $symbol,
+            associated_metaclass => $self,
+            package_name         => $class_name,
+            name                 => $symbol,
         );
     }
 
@@ -635,6 +636,9 @@ sub add_method {
             )
         );
     }
+
+    $method->attach_to_class($self);
+
     $self->get_method_map->{$method_name} = $method;
     
     my $full_method_name = ($self->name . '::' . $method_name);    
@@ -764,6 +768,8 @@ sub remove_method {
         { sigil => '&', type => 'CODE', name => $method_name }
     );
 
+    $removed_method->detach_from_class if $removed_method;
+
     $self->update_package_cache_flag; # still valid, since we just removed the method from the map
 
     return $removed_method;