Merge branch 'stable'

[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 e339832..d9573cf 100644 (file)
--- a/lib/Class/MOP/Method/Meta.pm
+++ b/lib/Class/MOP/Method/Meta.pm
@@ -7,11 +7,11 @@ use warnings;
 use Carp         'confess';
 use Scalar::Util 'blessed';
 
-our $VERSION   = '1.08';
+our $VERSION   = '1.12';
 $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';
 
@@ -31,6 +31,7 @@ sub _generate_meta_method {
                 # 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);
@@ -57,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__