Permalink
Browse files

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
  • Loading branch information...
1 parent f11a85c commit d68c3ecf98bf3b5802a6b0f9a6bcf7825addd9e5 @nobu nobu committed Nov 10, 2015
Showing with 90 additions and 0 deletions.
  1. +7 −0 ChangeLog
  2. +1 −0 NEWS
  3. +57 −0 hash.c
  4. +25 −0 test/ruby/test_hash.rb
View
@@ -1,3 +1,10 @@
+Tue Nov 10 14:01:59 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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]
+
Tue Nov 10 11:25:29 2015 NARUSE, Yui <naruse@ruby-lang.org>
* time.c (rb_timespec_now): added.
View
@@ -59,6 +59,7 @@ with all sufficient information, see the ChangeLog file.
* Hash#fetch_values [Feature #10017]
* Hash#dig [Feature #11643]
+ * Hash#<=, Hash#<, Hash#>=, Hash#> [Feature #10984]
* IO
View
@@ -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.
@@ -1308,6 +1308,31 @@ def test_dig
assert_nil(h.dig(:c, 1))
end
+ def test_cmp
+ h1 = {a:1, b:2}
+ h2 = {a:1, b:2, c:3}
+
+ assert_operator(h1, :<=, h1)
+ assert_operator(h1, :<=, h2)
+ assert_not_operator(h2, :<=, h1)
+ assert_operator(h2, :<=, h2)
+
+ assert_operator(h1, :>=, h1)
+ assert_not_operator(h1, :>=, h2)
+ assert_operator(h2, :>=, h1)
+ assert_operator(h2, :>=, h2)
+
+ assert_not_operator(h1, :<, h1)
+ assert_operator(h1, :<, h2)
+ assert_not_operator(h2, :<, h1)
+ assert_not_operator(h2, :<, h2)
+
+ assert_not_operator(h1, :>, h1)
+ assert_not_operator(h1, :>, h2)
+ assert_operator(h2, :>, h1)
+ assert_not_operator(h2, :>, h2)
+ end
+
class TestSubHash < TestHash
class SubHash < Hash
def reject(*)

2 comments on commit d68c3ec

@olivierlacan

You're made of 💖

Please sign in to comment.