summaryrefslogtreecommitdiff
path: root/hash.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-10 05:02:02 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-10 05:02:02 (GMT)
commitd68c3ecf98bf3b5802a6b0f9a6bcf7825addd9e5 (patch)
tree95a8b3e8116776990c19e5cacd5af0af59f898c7 /hash.c
parentf11a85c72600026f6e26afe6dda2548c785ce1d3 (diff)
hash.c: compare methods
* hash.c (rb_hash_{le,lt,ge,gt}): new methods, Hash#<=, Hash#<, Hash#>=, Hash#>, to test if all elements of a hash are also included in another hash, and vice versa. [ruby-core:68561] [Feature #10984] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52518 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c57
1 files changed, 57 insertions, 0 deletions
diff --git a/hash.c b/hash.c
index ae65aa4..beaaad6 100644
--- a/hash.c
+++ b/hash.c
@@ -2714,6 +2714,58 @@ rb_hash_dig(int argc, VALUE *argv, VALUE self)
return rb_obj_dig(argc, argv, self, Qnil);
}
+static int
+hash_le_i(VALUE key, VALUE value, VALUE arg)
+{
+ VALUE *args = (VALUE *)arg;
+ VALUE v = rb_hash_lookup2(args[0], key, Qundef);
+ if (v != Qundef && rb_equal(value, v)) return ST_CONTINUE;
+ args[1] = Qfalse;
+ return ST_STOP;
+}
+
+static VALUE
+hash_le(VALUE hash1, VALUE hash2)
+{
+ VALUE args[2];
+ args[0] = hash2;
+ args[1] = Qtrue;
+ rb_hash_foreach(hash1, hash_le_i, (VALUE)args);
+ return args[1];
+}
+
+static VALUE
+rb_hash_le(VALUE hash, VALUE other)
+{
+ other = to_hash(other);
+ if (RHASH_SIZE(hash) > RHASH_SIZE(other)) return Qfalse;
+ return hash_le(hash, other);
+}
+
+static VALUE
+rb_hash_lt(VALUE hash, VALUE other)
+{
+ other = to_hash(other);
+ if (RHASH_SIZE(hash) >= RHASH_SIZE(other)) return Qfalse;
+ return hash_le(hash, other);
+}
+
+static VALUE
+rb_hash_ge(VALUE hash, VALUE other)
+{
+ other = to_hash(other);
+ if (RHASH_SIZE(hash) < RHASH_SIZE(other)) return Qfalse;
+ return hash_le(other, hash);
+}
+
+static VALUE
+rb_hash_gt(VALUE hash, VALUE other)
+{
+ other = to_hash(other);
+ if (RHASH_SIZE(hash) <= RHASH_SIZE(other)) return Qfalse;
+ return hash_le(other, hash);
+}
+
static int path_tainted = -1;
static char **origenviron;
@@ -4139,6 +4191,11 @@ Init_Hash(void)
rb_define_method(rb_cHash, "any?", rb_hash_any_p, 0);
rb_define_method(rb_cHash, "dig", rb_hash_dig, -1);
+ rb_define_method(rb_cHash, "<=", rb_hash_le, 1);
+ rb_define_method(rb_cHash, "<", rb_hash_lt, 1);
+ rb_define_method(rb_cHash, ">=", rb_hash_ge, 1);
+ rb_define_method(rb_cHash, ">", rb_hash_gt, 1);
+
/* Document-class: ENV
*
* ENV is a hash-like accessor for environment variables.