projects
/
ruby-vorbistagger.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Relaxed rules for Ogg::Vorbis::Comments#merge!.
[ruby-vorbistagger.git]
/
ext
/
comments.c
diff --git
a/ext/comments.c
b/ext/comments.c
index fb3ae82f653d727d751cc9975626caabfb1b5f8c..03a237b104f87d0fbfd77f78e165dae2a828fb34 100644
(file)
--- a/
ext/comments.c
+++ b/
ext/comments.c
@@
-24,7
+24,7
@@
#include "vcedit.h"
#include "vcedit.h"
-static ID id_casecmp, id_replace, id_compare;
+static ID id_casecmp, id_replace, id_
each, id_
compare;
void
comments_init (VALUE self, vcedit_state *state)
void
comments_init (VALUE self, vcedit_state *state)
@@
-345,27
+345,34
@@
c_has_key (VALUE self, VALUE key)
return Qfalse;
}
return Qfalse;
}
-static
int
-merge_cb (VALUE
key, VALUE value
, VALUE self)
+static
VALUE
+merge_cb (VALUE
ar
, VALUE self)
{
{
- c_aset (self, key, value);
+ struct RArray *pair = RARRAY (ar);
+
+ c_aset (self, pair->ptr[0], pair->ptr[1]);
- return
ST_CONTINUE
;
+ return
Qnil
;
}
/*
* call-seq:
}
/*
* call-seq:
- * object.merge!(
hash
) -> object
+ * object.merge!(
arg
) -> object
*
*
- * Adds the key-value pairs from *
hash
* to *object*, overwriting existing
+ * Adds the key-value pairs from *
arg
* to *object*, overwriting existing
* values if a key already existed in *object*.
* values if a key already existed in *object*.
+ *
+ * Note that *arg*'s each method needs to yield key-value pairs for this
+ * to work. This means that e.g. hashes and Ogg::Vorbis::Comments objects
+ * are supported as arguments.
*/
static VALUE
*/
static VALUE
-c_merge (VALUE self, VALUE
hash
)
+c_merge (VALUE self, VALUE
arg
)
{
{
- Check_Type (hash, T_HASH);
+ if (!rb_respond_to (arg, id_each))
+ rb_raise (rb_eArgError, "invalid argument");
- rb_
hash_foreach (hash
, merge_cb, self);
+ rb_
iterate (rb_each, arg
, merge_cb, self);
return self;
}
return self;
}
@@
-536,6
+543,7
@@
Init_Comments (VALUE mVorbis)
id_casecmp = rb_intern ("casecmp");
id_replace = rb_intern ("replace");
id_casecmp = rb_intern ("casecmp");
id_replace = rb_intern ("replace");
+ id_each = rb_intern ("each");
id_compare = rb_intern ("<=>");
return c;
id_compare = rb_intern ("<=>");
return c;