From: Yuval Kogman <nothingmuch@woobling.org>
Date: Fri, 24 Apr 2009 01:51:25 +0000 (+0200)
Subject: warn if expected metaclass's constructor doesn't exist
X-Git-Tag: 0.82_02~5
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a828455d79d02cb9e825aff57ac81d18dca0e660;p=gitmo%2FClass-MOP.git

warn if expected metaclass's constructor doesn't exist
---

diff --git a/lib/Class/MOP/Method/Inlined.pm b/lib/Class/MOP/Method/Inlined.pm
index e6af08a..e7fb013 100644
--- a/lib/Class/MOP/Method/Inlined.pm
+++ b/lib/Class/MOP/Method/Inlined.pm
@@ -39,62 +39,72 @@ sub can_be_inlined {
 
     # if we are shadowing a method we first verify that it is
     # compatible with the definition we are replacing it with
-    my $expected_method = $expected_class->can( $self->name );
-
-    my $actual_method = $class->can( $self->name )
-        or return 1;
-
-    # the method is what we wanted (probably Moose::Object::new)
-    return 1
-        if refaddr($expected_method) == refaddr($actual_method);
-
-    # If we don't find an inherited method, this is a rather weird
-    # case where we have no method in the inheritance chain even
-    # though we're expecting one to be there
-    #
-    # this returns 1 for backwards compatibility for now
-     my $inherited_method
-         = $metaclass->find_next_method_by_name( $self->name )
-             or return 1;
-
-    # otherwise we have to check that the actual method is an inlined
-    # version of what we're expecting
-    if ( $inherited_method->isa(__PACKAGE__) ) {
-        if ( refaddr( $inherited_method->_uninlined_body )
-             == refaddr($expected_method) ) {
+    if ( my $expected_method = $expected_class->can( $self->name ) ) {
+
+        my $actual_method = $class->can( $self->name )
+            or return 1;
+
+        # the method is what we wanted (probably Moose::Object::new)
+        return 1
+            if refaddr($expected_method) == refaddr($actual_method);
+
+        # If we don't find an inherited method, this is a rather weird
+        # case where we have no method in the inheritance chain even
+        # though we're expecting one to be there
+        #
+        # this returns 1 for backwards compatibility for now
+         my $inherited_method
+             = $metaclass->find_next_method_by_name( $self->name )
+                 or return 1;
+
+        # otherwise we have to check that the actual method is an inlined
+        # version of what we're expecting
+        if ( $inherited_method->isa(__PACKAGE__) ) {
+            if ( refaddr( $inherited_method->_uninlined_body )
+                 == refaddr($expected_method) ) {
+                return 1;
+            }
+        }
+        elsif ( refaddr( $inherited_method->body )
+                == refaddr($expected_method) ) {
             return 1;
         }
-    }
-    elsif ( refaddr( $inherited_method->body )
-            == refaddr($expected_method) ) {
-        return 1;
-    }
 
-    my $warning
-        = "Not inlining '"
-        . $self->name
-        . "' for $class since it is not"
-        . " inheriting the default ${expected_class}::"
-        . $self->name . "\n";
+        my $warning
+            = "Not inlining '"
+            . $self->name
+            . "' for $class since it is not"
+            . " inheriting the default ${expected_class}::"
+            . $self->name . "\n";
 
-    if ( $self->isa("Class::MOP::Method::Constructor") ) {
+        if ( $self->isa("Class::MOP::Method::Constructor") ) {
+
+            # FIXME kludge, refactor warning generation to a method
+            $warning
+                .= "If you are certain you don't need to inline your"
+                . " constructor, specify inline_constructor => 0 in your"
+                . " call to $class->meta->make_immutable\n";
+        }
 
-        # FIXME kludge, refactor warning generation to a method
         $warning
-            .= "If you are certain you don't need to inline your"
-            . " constructor, specify inline_constructor => 0 in your"
-            . " call to $class->meta->make_immutable\n";
-    }
+            .= " ('"
+            . $self->name
+            . "' has method modifiers which would be lost if it were inlined)\n"
+            if $inherited_method->isa('Class::MOP::Method::Wrapped');
 
-    $warning
-        .= " ('"
-        . $self->name
-        . "' has method modifiers which would be lost if it were inlined)\n"
-        if $inherited_method->isa('Class::MOP::Method::Wrapped');
+        warn $warning;
 
-    warn $warning;
+        return 0;
+    }
+    else {
+        warn "Not inlining '"
+            . $self->name
+            . "' for $class since ${expected_class}::"
+            . $self->name
+            . " is not defined\n";
 
-    return 0;
+        return 0;
+    }
 }
 
 1;