Fix problem doing hash (|) object hash

Spotted while writing tests.
rakudo · Jun 1, 2017 · 11fa6d9 · 11fa6d9
1 parent a2add65
commit 11fa6d9
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/core/set_operators.pm b/src/core/set_operators.pm
@@ -178,15 +178,14 @@ multi sub infix:<(|)>(Map:D $a, Map:D $b) {
     nqp::stmts(
       (my $elems := nqp::create(Rakudo::Internals::IterationSet)),
       nqp::if(
-        nqp::eqaddr($a.keyof,Str(Any)) && nqp::eqaddr($b.keyof,Str(Any)),
-        nqp::stmts(                               # both ordinary Str hashes
-          Rakudo::QuantHash.ADD-MAP-TO-SET($elems,$a),
-          Rakudo::QuantHash.ADD-MAP-TO-SET($elems,$b)
-        ),
-        nqp::stmts(                               # object hash(es), coerce!
-          Rakudo::QuantHash.ADD-OBJECTHASH-TO-SET($elems,$a),
-          Rakudo::QuantHash.ADD-OBJECTHASH-TO-SET($elems,$b)
-        )
+        nqp::eqaddr($a.keyof,Str(Any)),
+        Rakudo::QuantHash.ADD-MAP-TO-SET($elems,$a),        # ordinary hash
+        Rakudo::QuantHash.ADD-OBJECTHASH-TO-SET($elems,$a)  # object hash
+      ),
+      nqp::if(
+        nqp::eqaddr($b.keyof,Str(Any)),
+        Rakudo::QuantHash.ADD-MAP-TO-SET($elems,$b),        # ordinary hash
+        Rakudo::QuantHash.ADD-OBJECTHASH-TO-SET($elems,$b)  # objetc hash
       ),
       nqp::create(Set).SET-SELF($elems)
     )