let the method subclasses take care of their own hackery

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

diff --git a/lib/Class/MOP/Method/Meta.pm b/lib/Class/MOP/Method/Meta.pm
index 1a14fe4..92ac2c1 100644 (file)
--- a/lib/Class/MOP/Method/Meta.pm
+++ b/lib/Class/MOP/Method/Meta.pm
@@ -7,32 +7,34 @@ use warnings;
 use Carp         'confess';
 use Scalar::Util 'blessed';
 
-our $VERSION   = '1.08';
+our $VERSION   = '1.09';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
-use constant DEBUG_NO_META => $ENV{DEBUG_NO_META};
+use constant DEBUG_NO_META => $ENV{DEBUG_NO_META} ? 1 : 0;
 
 use base 'Class::MOP::Method';
 
+sub _is_caller_mop_internal {
+    my $self = shift;
+    my ($caller) = @_;
+    return $caller =~ /^(?:Class::MOP|metaclass)(?:::|$)/;
+}
+
 sub _generate_meta_method {
     my $method_self = shift;
     my $metaclass   = shift;
     sub {
         # this will be compiled out if the env var wasn't set
         if (DEBUG_NO_META) {
-            my ($self) = @_;
-            # it's okay if we installed a meta method in a subclass of a class
-            # with a legitimate meta method (we'll still die if we install a
-            # meta method in a subclass of a class we installed a meta method
-            # in, since this function is itself defined in Class::MOP)
-            #if (my $meta = try { $self->SUPER::meta }) {
-                #return $meta if $meta->isa('Class::MOP::Class');
-            #}
-            # it's okay if the test itself calls ->meta, we only care about if
-            # the mop internals call ->meta
             confess "'meta' method called by MOP internals"
-                if caller =~ /^(?:Class::MOP|metaclass)(?:::|$)/;
+                # it's okay to call meta methods on metaclasses, since we
+                # explicitly ask for them
+                if !$_[0]->isa('Class::MOP::Object')
+                && !$_[0]->isa('Class::MOP::Mixin')
+                # it's okay if the test itself calls ->meta, we only care about
+                # if the mop internals call ->meta
+                && $method_self->_is_caller_mop_internal(scalar caller);
         }
         # we must re-initialize so that it
         # works as expected in subclasses,
@@ -56,6 +58,25 @@ sub wrap {
     return $class->SUPER::wrap(%params);
 }
 
+sub _make_compatible_with {
+    my $self = shift;
+    my ($other) = @_;
+
+    # XXX: this is pretty gross. the issue here is that CMOP::Method::Meta
+    # 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 ::Meta into a role that gets applied to
+    # whatever the method_metaclass happens to be and get rid of
+    # _meta_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
+    return $self unless $other->_is_compatible_with($self->_real_ref_name);
+
+    return $self->SUPER::_make_compatible_with(@_);
+}
+
 1;
 
 __END__