X-Git-Url: http://git.code-monkey.de/?p=ruby-vorbistagger.git;a=blobdiff_plain;f=ext%2Fcomments.c;h=cdaf576ae7e697571297a7b2a573525a8edf1e02;hp=a2569866a62766062a292d9719f0233fd75a1185;hb=397b4a686511cb3fb5fb9a7a82277487f750c86d;hpb=ab5421339ffad5eb5c910f709354872fda7c34b3

diff --git a/ext/comments.c b/ext/comments.c
index a256986..cdaf576 100644
--- a/ext/comments.c
+++ b/ext/comments.c
@@ -17,6 +17,7 @@
  */
 
 #include <ruby.h>
+#include <st.h>
 #include <stdbool.h>
 #include <ctype.h>
 #include <assert.h>
@@ -331,6 +332,31 @@ c_has_key (VALUE self, VALUE key)
 	return Qfalse;
 }
 
+static int
+merge_cb (VALUE key, VALUE value, VALUE self)
+{
+	c_aset (self, key, value);
+
+	return ST_CONTINUE;
+}
+
+/*
+ * call-seq:
+ *  object.merge!(hash) -> object
+ *
+ * Adds the key-value pairs from *hash* to *object*, overwriting existing
+ * values if a key already existed in *object*.
+ */
+static VALUE
+c_merge (VALUE self, VALUE hash)
+{
+	Check_Type (hash, T_HASH);
+
+	rb_hash_foreach (hash, merge_cb, self);
+
+	return self;
+}
+
 /*
  * call-seq:
  *  object <=> other -> -1, 0 or 1
@@ -463,6 +489,7 @@ Init_Comments (VALUE mVorbis)
 	rb_define_method (c, "empty?", c_get_empty, 0);
 	rb_define_method (c, "keys", c_keys, 0);
 	rb_define_method (c, "values", c_values, 0);
+	rb_define_method (c, "merge!", c_merge, 1);
 
 	rb_include_module (c, rb_mComparable);
 	rb_define_method (c, "<=>", c_compare, 1);