kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

hash.c: add compact and compact! methods

Browse source 
* hash.c (rb_hash_compact, rb_hash_compact_bang): Removes nil
  values from the original hash, to port Active Support behavior.
  [Feature #11818]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-10-13 08:06:00 +00:00
parent 5b3b8554c9
commit bbd58fa2b9
3 changed files with 78 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Oct 13 17:05:57 2016 Dwain Faithfull <dwfaithfull@gmail.com>
* hash.c (rb_hash_compact, rb_hash_compact_bang): Removes nil
values from the original hash, to port Active Support behavior.
[Feature #11818]
Thu Oct 13 11:35:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_sort_bang, rb_ary_sort, rb_ary_sort_by_bang):

64
hash.c
View file

@ -2669,6 +2669,68 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
return ary;
}
static int
delete_if_nil(VALUE key, VALUE value, VALUE hash)
{
if (NIL_P(value)) {
return ST_DELETE;
}
return ST_CONTINUE;
}
static int
set_if_not_nil(VALUE key, VALUE value, VALUE hash)
{
if (!NIL_P(value)) {
rb_hash_aset(hash, key, value);
}
return ST_CONTINUE;
}
/*
* call-seq:
* hsh.compact -> new_hash
*
* Returns a new hash with the nil values/key pairs removed
*
* h = { a: 1, b: false, c: nil }
* h.compact #=> { a: 1, b: false }
* h #=> { a: 1, b: false, c: nil }
*
*/
static VALUE
rb_hash_compact(VALUE hash)
{
VALUE result = rb_hash_new();
if (!RHASH_EMPTY_P(hash)) {
rb_hash_foreach(hash, set_if_not_nil, result);
}
return result;
}
/*
* call-seq:
* hsh.compact! -> hsh
*
* Removes all nil values from the hash.
* Returns the hash.
*
* h = { a: 1, b: false, c: nil }
* h.compact! #=> { a: 1, b: false }
*
*/
static VALUE
rb_hash_compact_bang(VALUE hash)
{
rb_hash_modify_check(hash);
if (RHASH(hash)->ntbl) {
rb_hash_foreach(hash, delete_if_nil, hash);
}
return hash;
}
static VALUE rb_hash_compare_by_id_p(VALUE hash);
/*
@ -4426,6 +4488,8 @@ Init_Hash(void)
rb_define_method(rb_cHash, "assoc", rb_hash_assoc, 1);
rb_define_method(rb_cHash, "rassoc", rb_hash_rassoc, 1);
rb_define_method(rb_cHash, "flatten", rb_hash_flatten, -1);
rb_define_method(rb_cHash,"compact", rb_hash_compact, 0);
rb_define_method(rb_cHash,"compact!", rb_hash_compact_bang, 0);
rb_define_method(rb_cHash,"include?", rb_hash_has_key, 1);
rb_define_method(rb_cHash,"member?", rb_hash_has_key, 1);

8
test/ruby/test_hash.rb
View file

@ -354,6 +354,14 @@ class TestHash < Test::Unit::TestCase
assert_equal({1=>2,3=>4,5=>6}, h.keep_if{true})
end
def test_compact
h = @cls[a: 1, b: nil, c: false, d: true, e: nil]
assert_equal({a: 1, c: false, d: true}, h.compact)
assert_equal({a: 1, b: nil, c: false, d: true, e: nil}, h)
h.compact!
assert_equal({a: 1, c: false, d: true}, h)
end
def test_dup
for taint in [ false, true ]
for frozen in [ false, true ]