From: Dave Rolsky <autarch@urth.org>
Date: Mon, 20 Apr 2009 15:20:00 +0000 (-0500)
Subject: Reduce nested if-ness by short-circuiting and returning as soon as possible
X-Git-Tag: 0.82_01~11^2~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c298d62e8da1de920bf77577e04b4a345be03db2;p=gitmo%2FClass-MOP.git

Reduce nested if-ness by short-circuiting and returning as soon as possible
---

diff --git a/lib/Class/MOP/Method/Inlined.pm b/lib/Class/MOP/Method/Inlined.pm
index 82bae4c..73de4da 100644
--- a/lib/Class/MOP/Method/Inlined.pm
+++ b/lib/Class/MOP/Method/Inlined.pm
@@ -17,18 +17,15 @@ sub _expected_method_class { $_[0]{_expected_method_class} }
 sub _uninlined_body {
     my $self = shift;
 
-    if ( my $super_method
+    my $super_method
         = $self->associated_metaclass->find_next_method_by_name( $self->name )
-        ) {
-        if ( $super_method->isa(__PACKAGE__) ) {
-            return $super_method->_uninlined_body;
-        }
-        else {
-            return $super_method->body;
-        }
+        or return;
+
+    if ( $super_method->isa(__PACKAGE__) ) {
+        return $super_method->_uninlined_body;
     }
     else {
-        return;
+        return $super_method->body;
     }
 }
 
@@ -37,77 +34,67 @@ sub can_be_inlined {
     my $metaclass = $self->associated_metaclass;
     my $class     = $metaclass->name;
 
-    if ( my $expected_class = $self->_expected_method_class ) {
-
-        # 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 $expected_class = $self->_expected_method_class
+        or return 1;
 
-        my $warning
-            = "Not inlining '"
-            . $self->name
-            . "' for $class since it is not"
-            . " inheriting the default ${expected_class}::"
-            . $self->name . "\n"
-            . "If you are certain you don't need to inline your";
+    # 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 );
 
-        if ( $self->isa("Class::MOP::Method::Constructor") ) {
+    my $warning
+        = "Not inlining '"
+        . $self->name
+        . "' for $class since it is not"
+        . " inheriting the default ${expected_class}::"
+        . $self->name . "\n";
 
-            # FIXME kludge, refactor warning generation to a method
-            $warning
-                .= " constructor, specify inline_constructor => 0 in your"
-                . " call to $class->meta->make_immutable\n";
-        }
-
-        if ( my $actual_method = $class->can( $self->name ) ) {
-            if ( refaddr($expected_method) == refaddr($actual_method) ) {
-
-                # the method is what we wanted (probably Moose::Object::new)
-                return 1;
-            }
-            elsif ( my $inherited_method
-                = $metaclass->find_next_method_by_name( $self->name ) ) {
-
-                # 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;
-                }
-
-                # FIXME we can just rewrap them =P
-                $warning
-                    .= " ('"
-                    . $self->name
-                    . "' has method modifiers which would be lost if it were inlined)\n"
-                    if $inherited_method->isa('Class::MOP::Method::Wrapped');
-            }
-        }
-        else {
+    if ( $self->isa("Class::MOP::Method::Constructor") ) {
 
-            # This would be a rather weird case where we have no method
-            # in the inheritance chain even though we're expecting one to be
-            # there
+        # 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";
+    }
 
-            # this returns 1 for backwards compatibility for now
+    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;
         }
-
-        warn $warning;
-
-        return 0;
     }
-    else {
-
-        # there is no expected class so we just install the constructor as a
-        # new method
+    elsif ( refaddr( $inherited_method->body )
+            == refaddr($expected_method) ) {
         return 1;
     }
+
+    $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;
+
+    return 0;
 }
 
+1;