Add a C-API "rb_hash_clear"

rubinius · Jul 30, 2015 · f68f9a0 · f68f9a0
1 parent f8daad8
commit f68f9a0
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git a/spec/ruby/optional/capi/ext/hash_spec.c b/spec/ruby/optional/capi/ext/hash_spec.c
@@ -40,6 +40,12 @@ VALUE hash_spec_rb_hash_aset(VALUE self, VALUE hash, VALUE key, VALUE val) {
 }
 #endif
 
+#ifdef HAVE_RB_HASH_CLEAR
+VALUE hash_spec_rb_hash_clear(VALUE self, VALUE hash) {
+  return rb_hash_clear(hash);
+}
+#endif
+
 #ifdef HAVE_RB_HASH_DELETE
 VALUE hash_spec_rb_hash_delete(VALUE self, VALUE hash, VALUE key) {
   return rb_hash_delete(hash, key);
@@ -148,6 +154,10 @@ void Init_hash_spec() {
   rb_define_method(cls, "rb_hash_aset", hash_spec_rb_hash_aset, 3);
 #endif
 
+#ifdef HAVE_RB_HASH_CLEAR
+  rb_define_method(cls, "rb_hash_clear", hash_spec_rb_hash_clear, 1);
+#endif
+
 #ifdef HAVE_RB_HASH_DELETE
   rb_define_method(cls, "rb_hash_delete", hash_spec_rb_hash_delete, 2);
 #endif

diff --git a/spec/ruby/optional/capi/ext/rubyspec.h b/spec/ruby/optional/capi/ext/rubyspec.h
@@ -322,6 +322,7 @@
 #define HAVE_RB_HASH_FREEZE                1
 #define HAVE_RB_HASH_AREF                  1
 #define HAVE_RB_HASH_ASET                  1
+#define HAVE_RB_HASH_CLEAR                 1
 #define HAVE_RB_HASH_DELETE                1
 #define HAVE_RB_HASH_DELETE_IF             1
 #define HAVE_RB_HASH_FOREACH               1

diff --git a/spec/ruby/optional/capi/hash_spec.rb b/spec/ruby/optional/capi/hash_spec.rb
@@ -91,6 +91,14 @@
     end
   end
 
+  describe "rb_hash_clear" do
+    it "returns self that cleared keys and values" do
+      hsh = { :key => 'value' }
+      @s.rb_hash_clear(hsh).should equal(hsh)
+      hsh.should == {}
+    end
+  end
+
   describe "rb_hash_delete" do
     it "removes the key and returns the value" do
       hsh = {:chunky => 'bacon'}

diff --git a/vm/capi/hash.cpp b/vm/capi/hash.cpp
@@ -26,6 +26,10 @@ extern "C" {
     return capi_fast_call(self, rb_intern("[]="), 2, key, value);
   }
 
+  VALUE rb_hash_clear(VALUE self) {
+    return capi_fast_call(self, rb_intern("clear"), 0);
+  }
+
   VALUE rb_hash_delete(VALUE self, VALUE key) {
     return capi_fast_call(self, rb_intern("delete"), 1, key);
   }

diff --git a/vm/include/capi/ruby/ruby.h b/vm/include/capi/ruby/ruby.h
@@ -1453,6 +1453,9 @@ struct RTypedData {
   /** Set the value associated with the key. */
   VALUE   rb_hash_aset(VALUE self, VALUE key, VALUE value);
 
+  /** Clear the Hash object */
+  VALUE   rb_hash_clear(VALUE self);
+
   /** Remove the key and return the associated value. */
   VALUE   rb_hash_delete(VALUE self, VALUE key);