Make sure method is returned

Alternate implementation of PR #3403, without using return. Bartolin++ for spotting and making the PR
rakudo · Jan 3, 2020 · abcf37f · abcf37f
1 parent f602c02
commit abcf37f
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/Perl6/Metamodel/ConcreteRoleHOW.nqp b/src/Perl6/Metamodel/ConcreteRoleHOW.nqp
@@ -146,14 +146,18 @@ class Perl6::Metamodel::ConcreteRoleHOW
                     $found-role := $candidate;
                 }
             }
-            return nqp::null() if nqp::isnull($found-role);
-            return $found-role.HOW.method_table($found-role){$name}
-                    || $found-role.HOW.submethod_table($found-role){$name}
-                    || nqp::null();
-        } elsif nqp::istype($obj, $qtype) {
+            nqp::isnull($found-role)
+              ?? nqp::null()
+              !! $found-role.HOW.method_table($found-role){$name}
+                   || $found-role.HOW.submethod_table($found-role){$name}
+                   || nqp::null()
+        }
+        elsif nqp::istype($obj, $qtype) {
             # Non-parametric, so just locate it from the already concrete type.
             nqp::findmethod($qtype, $name)
         }
-        nqp::null()
+        else {
+            nqp::null()
+        }
     }
 }