diff options
| -rw-r--r-- | src/hash.c | 17 | ||||
| -rw-r--r-- | test/t/hash.rb | 8 |
2 files changed, 20 insertions, 5 deletions
diff --git a/src/hash.c b/src/hash.c index 9d7927bb9..af3571eaf 100644 --- a/src/hash.c +++ b/src/hash.c @@ -880,10 +880,17 @@ hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, mrb_bool eql) if (!mrb_respond_to(mrb, hash2, mrb_intern_lit(mrb, "to_hash"))) { return mrb_false_value(); } - if (eql) - return mrb_fixnum_value(mrb_eql(mrb, hash2, hash1)); - else - return mrb_fixnum_value(mrb_equal(mrb, hash2, hash1)); + else { + mrb_bool eq; + + if (eql) { + eq = mrb_eql(mrb, hash2, hash1); + } + else { + eq = mrb_equal(mrb, hash2, hash1); + } + return mrb_bool_value(eq); + } } h1 = RHASH_TBL(hash1); h2 = RHASH_TBL(hash2); @@ -901,7 +908,7 @@ hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, mrb_bool eql) key = kh_key(h1,k1); k2 = kh_get(ht, mrb, h2, key); if (k2 != kh_end(h2)) { - if (mrb_equal(mrb, kh_value(h1,k1), kh_value(h2,k2))) { + if (mrb_eql(mrb, kh_value(h1,k1), kh_value(h2,k2))) { continue; /* next key */ } } diff --git a/test/t/hash.rb b/test/t/hash.rb index 837fe0216..92bc223b6 100644 --- a/test/t/hash.rb +++ b/test/t/hash.rb @@ -269,6 +269,14 @@ end # Not ISO specified +assert('Hash#eql?') do + a = { 'a' => 1, 'b' => 2, 'c' => 3 } + b = { 'a' => 1, 'b' => 2, 'c' => 3 } + c = { 'a' => 1.0, 'b' => 2, 'c' => 3 } + assert_true(a.eql?(b)) + assert_false(a.eql?(c)) +end + assert('Hash#reject') do h = {:one => 1, :two => 2, :three => 3, :four => 4} ret = h.reject do |k,v| |