Make is nodal check a bit faster

The existence of the method is enough to mark nodality. No need to call it to find out.
rakudo · Jan 4, 2017 · 0f25d83 · 0f25d83
1 parent bd03adb
commit 0f25d83
Showing 1 changed file with 30 additions and 18 deletions.
diff --git a/src/core/metaops.pm b/src/core/metaops.pm
@@ -364,33 +364,43 @@ sub METAOP_HYPER(\op, *%opt) {
 
 proto sub METAOP_HYPER_POSTFIX(|) {*}
 multi sub METAOP_HYPER_POSTFIX(\op) {
-    op.?nodal
-        ?? (-> \obj { nodemap(op, obj) })
-        !! (-> \obj { deepmap(op, obj) })
+    nqp::if(
+      nqp::can(op,"nodal"),
+      (-> \obj { nodemap(op, obj) }),
+      (-> \obj { deepmap(op, obj) })
+    )
 }
 
 # no indirection for subscripts and such
 proto sub METAOP_HYPER_POSTFIX_ARGS(|) {*}
 multi sub METAOP_HYPER_POSTFIX_ARGS(\obj,\op) {
-    op.?nodal
-        ?? nodemap(op, obj)
-        !! deepmap(op, obj)
+    nqp::if(
+      nqp::can(op,"nodal"),
+      nodemap(op, obj),
+      deepmap(op, obj)
+    )
 }
 multi sub METAOP_HYPER_POSTFIX_ARGS(\obj, @args, \op) {
-    op.?nodal
-        ?? nodemap( -> \o { op.(o,@args) }, obj )
-        !! deepmap( -> \o { op.(o,@args) }, obj );
+    nqp::if(
+      nqp::can(op,"nodal"),
+      nodemap( -> \o { op.(o,@args) }, obj ),
+      deepmap( -> \o { op.(o,@args) }, obj )
+    )
 }
 multi sub METAOP_HYPER_POSTFIX_ARGS(\obj, \args, \op) {
-    op.?nodal
-        ?? nodemap( -> \o { op.(o,|args) }, obj )
-        !! deepmap( -> \o { op.(o,|args) }, obj );
+    nqp::if(
+      nqp::can(op,"nodal"),
+      nodemap( -> \o { op.(o,|args) }, obj ),
+      deepmap( -> \o { op.(o,|args) }, obj )
+    )
 }
 
 sub METAOP_HYPER_PREFIX(\op) {
-    op.?nodal      # rarely true for prefixes
-        ?? (-> \obj { nodemap(op, obj) })
-        !! (-> \obj { deepmap(op, obj) })
+    nqp::if(
+      nqp::can(op,"nodal"),      # rarely true for prefixes
+      (-> \obj { nodemap(op, obj) }),
+      (-> \obj { deepmap(op, obj) })
+    )
 }
 
 sub METAOP_HYPER_CALL(\list, |args) { deepmap(-> $c { $c(|args) }, list) }
@@ -505,9 +515,11 @@ multi sub HYPER(&operator, Iterable:D \left, Iterable:D \right, :$dwim-left, :$d
 }
 
 multi sub HYPER(\op, \obj) {
-    op.?nodal
-        ?? nodemap(op, obj)
-        !! deepmap(op,obj);
+    nqp::if(
+      nqp::can(op,"nodal"),
+      nodemap(op, obj),
+      deepmap(op,obj)
+    )
 }
 
 proto sub deepmap(|) { * }