Simplify Any (elem) Map

rakudo · Aug 8, 2018 · 81bcc54 · 81bcc54
1 parent 3684154
commit 81bcc54
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/core/set_elem.pm6 b/src/core/set_elem.pm6
@@ -9,8 +9,7 @@
 proto sub infix:<(elem)>($, $, *% --> Bool:D) is pure {*}
 multi sub infix:<(elem)>(Str:D $a, Map:D $b --> Bool:D) {
     nqp::p6bool(
-      (my $storage := nqp::getattr(nqp::decont($b),Map,'$!storage'))
-        && nqp::elems($storage)
+      nqp::elems(my $storage := nqp::getattr(nqp::decont($b),Map,'$!storage'))
         && nqp::if(
              nqp::eqaddr($b.keyof,Str(Any)),
              nqp::atkey($storage,$a),                     # normal hash
@@ -28,9 +27,9 @@ multi sub infix:<(elem)>(Str:D $a, Map:D $b --> Bool:D) {
 }
 multi sub infix:<(elem)>(Any $a, Map:D $b --> Bool:D) {
     nqp::p6bool(
-      (my $storage := nqp::getattr(nqp::decont($b),Map,'$!storage'))
-        && nqp::elems($storage)                         # haz a haystack
-        && nqp::not_i(nqp::eqaddr($b.keyof,Str(Any)))   # is object hash
+      nqp::elems(                                       # haz a haystack
+        my $storage := nqp::getattr(nqp::decont($b),Map,'$!storage')
+      ) && nqp::not_i(nqp::eqaddr($b.keyof,Str(Any)))   # is object hash
         && nqp::getattr(
              nqp::ifnull(
                nqp::atkey($storage,$a.WHICH),           # exists