move the package_cache stuff back into ::HasMethods

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

diff --git a/lib/Class/MOP/Mixin/HasMethods.pm b/lib/Class/MOP/Mixin/HasMethods.pm
index d496ddf..d3ceaa8 100644 (file)
--- a/lib/Class/MOP/Mixin/HasMethods.pm
+++ b/lib/Class/MOP/Mixin/HasMethods.pm
@@ -3,7 +3,9 @@ package Class::MOP::Mixin::HasMethods;
 use strict;
 use warnings;
 
-our $VERSION   = '1.09';
+use Class::MOP::Method::Meta;
+
+our $VERSION   = '1.11';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -15,12 +17,24 @@ 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'             }
 
-# This doesn't always get initialized in a constructor because there is a
-# weird object construction path for subclasses of Class::MOP::Class. At one
-# point, this always got initialized by calling into the XS code first, but
-# that is no longer guaranteed to happen.
-sub _method_map { $_[0]->{'methods'} ||= {} }
+sub _add_meta_method {
+    my $self = shift;
+    my ($name) = @_;
+    my $existing_method = $self->can('find_method_by_name')
+                              ? $self->find_method_by_name($name)
+                              : $self->get_method($name);
+    return if $existing_method
+           && $existing_method->isa($self->_meta_method_class);
+    $self->add_method(
+        $name => $self->_meta_method_class->wrap(
+            name                 => $name,
+            package_name         => $self->name,
+            associated_metaclass => $self,
+        )
+    );
+}
 
 sub wrap_method_body {
     my ( $self, %args ) = @_;
@@ -142,7 +156,7 @@ sub remove_method {
     ( defined $method_name && length $method_name )
         || confess "You must define a method name";
 
-    my $removed_method = delete $self->_full_method_map->{$method_name};
+    my $removed_method = delete $self->_method_map->{$method_name};
 
     $self->remove_package_symbol(
         { sigil => '&', type => 'CODE', name => $method_name } );
@@ -194,25 +208,23 @@ sub _restore_metamethods_from {
     my ($old_meta) = @_;
 
     for my $method ($old_meta->_get_local_methods) {
-        # XXX: this is pretty gross. the issue here is that
-        # CMOP::Method::Wrapped objects are subclasses of CMOP::Method, but
-        # when we get to moose, they'll need to be compatible with
-        # Moose::Meta::Method, which isn't possible. the right solution here is
-        # to make ::Wrapped into a role that gets applied to whatever the
-        # method_metaclass happens to be and get rid of
-        # wrapped_method_metaclass entirely, but that's not going to happen
-        # until we ditch cmop and get roles into the bootstrapping, so.
-        # i'm not maintaining the previous behavior of turning them into
-        # instances of the new method_metaclass because that's equally broken,
-        # and at least this way any issues will at least be detectable and
-        # potentially fixable. -doy
-        if (!$method->isa($self->wrapped_method_metaclass)) {
-            $method->_make_compatible_with($self->method_metaclass);
-        }
+        $method->_make_compatible_with($self->method_metaclass);
         $self->add_method($method->name => $method);
     }
 }
 
+sub reset_package_cache_flag  { (shift)->{'_package_cache_flag'} = undef }
+sub update_package_cache_flag {
+    my $self = shift;
+    # NOTE:
+    # we can manually update the cache number
+    # since we are actually adding the method
+    # to our cache as well. This avoids us
+    # having to regenerate the method_map.
+    # - SL
+    $self->{'_package_cache_flag'} = Class::MOP::check_package_cache_flag($self->name);
+}
+
 1;
 
 __END__