Merge pull request #4951 from yui-knk/test_reject

Fix `Hash#reject`
jruby · Jan 8, 2018 · 9504a1c · 9504a1c
2 parents ab75bbb + 5def73d
commit 9504a1c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/RubyHash.java b/core/src/main/java/org/jruby/RubyHash.java
@@ -1694,11 +1694,29 @@ public IRubyObject delete_if(final ThreadContext context, final Block block) {
         return block.isGiven() ? delete_ifInternal(context, block) : enumeratorizeWithSize(context, this, "delete_if", enumSizeFn());
     }
 
+    private static final class RejectVisitor extends VisitorWithState<Block> {
+        final RubyHash result;
+        RejectVisitor(RubyHash result) {
+            this.result = result;
+        }
+
+        @Override
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Block block) {
+            if (!block.yieldArray(context, RubyArray.newArray(context.runtime, key, value), null).isTrue()) {
+                result.fastASet(key, value);
+            }
+        }
+    }
+
     /** rb_hash_reject
      *
      */
     public RubyHash rejectInternal(ThreadContext context, Block block) {
-        return ((RubyHash)dup()).delete_ifInternal(context, block);
+        final RubyHash result = newHash(context.runtime);
+
+        iteratorVisitAll(context, new RejectVisitor(result), block);
+
+        return result;
     }
 
     @JRubyMethod

diff --git a/test/mri/excludes/TestHash.rb b/test/mri/excludes/TestHash.rb
@@ -10,7 +10,6 @@
 exclude :test_inverse_hash, "needs investigation"
 exclude :test_NEWHASH_fstring_key, "needs investigation"
 exclude :test_recursive_hash_value_struct, "needs investigation"
-exclude :test_reject, "needs investigation"
 exclude :test_AREF_fstring_key, "Depends on MRI-specific GC.stat key"
 exclude :test_ASET_fstring_key, "due https://github.com/jruby/jruby/commit/f3f0091da7d98c5df285"