Add Set#reset

https://bugs.ruby-lang.org/issues/6589 Tests c&p from ruby/ruby@8c90432. Supports jruby#4876
ChrisBr · Jan 9, 2018 · 5f7e117 · 5f7e117
1 parent 4b5cea6
commit 5f7e117
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/ext/set/RubySet.java b/core/src/main/java/org/jruby/ext/set/RubySet.java
@@ -38,6 +38,7 @@
 import org.jruby.runtime.marshal.MarshalStream;
 import org.jruby.runtime.marshal.UnmarshalStream;
 import org.jruby.util.ArraySupport;
+import org.jruby.util.TypeConverter;
 
 import java.io.IOException;
 import java.lang.reflect.Array;
@@ -875,6 +876,12 @@ public IRubyObject op_equal(ThreadContext context, IRubyObject other) {
         return context.runtime.getFalse();
     }
 
+    @JRubyMethod(name = "reset")
+    public IRubyObject reset(ThreadContext context) {
+        this.hash.rehash();
+        return this;
+    }
+
     @JRubyMethod(name = "eql?")
     public IRubyObject op_eql(ThreadContext context, IRubyObject other) {
         if ( other instanceof RubySet ) {
@@ -1261,4 +1268,4 @@ final IRubyObject toRuby(Object obj) {
         return JavaUtil.convertJavaToUsableRubyObject(getRuntime(), obj);
     }
 
-}
+}
diff --git a/test/mri/test_set.rb b/test/mri/test_set.rb
@@ -734,6 +734,19 @@ def test_compare_by_identity
     assert_equal(3, set.size)
     assert_equal(array.uniq.sort, set.sort)
   end
+
+  def test_reset
+   [Set, Class.new(Set)].each { |klass|
+     a = [1, 2]
+     b = [1]
+     set = klass.new([a, b])
+
+     b << 2
+     set.reset
+
+     assert_equal(klass.new([a]), set, klass.name)
+   }
+  end
 end
 
 class TC_SortedSet < Test::Unit::TestCase