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: Support for enumerators created by Hash:

Browse source 
delete_if, reject!, ...
  [Feature #6636]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2012-11-06 17:13:33 +00:00
parent cef054d5b2
commit 19ed71c8d0
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
hash.c
View file

@ -911,6 +911,8 @@ delete_if_i(VALUE key, VALUE value, VALUE hash)
return ST_CONTINUE; return ST_CONTINUE;
} }
static VALUE rb_hash_size(VALUE hash);
/* /*
* call-seq: * call-seq:
* hsh.delete_if {| key, value | block } -> hsh * hsh.delete_if {| key, value | block } -> hsh
@ -929,7 +931,7 @@ delete_if_i(VALUE key, VALUE value, VALUE hash)
VALUE VALUE
rb_hash_delete_if(VALUE hash) rb_hash_delete_if(VALUE hash)
{ {
RETURN_ENUMERATOR(hash, 0, 0); RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
rb_hash_modify_check(hash); rb_hash_modify_check(hash);
if (RHASH(hash)->ntbl) if (RHASH(hash)->ntbl)
rb_hash_foreach(hash, delete_if_i, hash); rb_hash_foreach(hash, delete_if_i, hash);
@ -950,7 +952,7 @@ rb_hash_reject_bang(VALUE hash)
{ {
st_index_t n; st_index_t n;
RETURN_ENUMERATOR(hash, 0, 0); RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
rb_hash_modify(hash); rb_hash_modify(hash);
if (!RHASH(hash)->ntbl) if (!RHASH(hash)->ntbl)
return Qnil; return Qnil;
@ -1027,7 +1029,7 @@ rb_hash_select(VALUE hash)
{ {
VALUE result; VALUE result;
RETURN_ENUMERATOR(hash, 0, 0); RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
result = rb_hash_new(); result = rb_hash_new();
rb_hash_foreach(hash, select_i, result); rb_hash_foreach(hash, select_i, result);
return result; return result;
@ -1056,7 +1058,7 @@ rb_hash_select_bang(VALUE hash)
{ {
st_index_t n; st_index_t n;
RETURN_ENUMERATOR(hash, 0, 0); RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
rb_hash_modify_check(hash); rb_hash_modify_check(hash);
if (!RHASH(hash)->ntbl) if (!RHASH(hash)->ntbl)
return Qnil; return Qnil;
@ -1081,7 +1083,7 @@ rb_hash_select_bang(VALUE hash)
VALUE VALUE
rb_hash_keep_if(VALUE hash) rb_hash_keep_if(VALUE hash)
{ {
RETURN_ENUMERATOR(hash, 0, 0); RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
rb_hash_modify_check(hash); rb_hash_modify_check(hash);
if (RHASH(hash)->ntbl) if (RHASH(hash)->ntbl)
rb_hash_foreach(hash, keep_if_i, hash); rb_hash_foreach(hash, keep_if_i, hash);
@ -1310,7 +1312,7 @@ each_value_i(VALUE key, VALUE value)
static VALUE static VALUE
rb_hash_each_value(VALUE hash) rb_hash_each_value(VALUE hash)
{ {
RETURN_ENUMERATOR(hash, 0, 0); RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
rb_hash_foreach(hash, each_value_i, 0); rb_hash_foreach(hash, each_value_i, 0);
return hash; return hash;
} }
@ -1343,7 +1345,7 @@ each_key_i(VALUE key, VALUE value)
static VALUE static VALUE
rb_hash_each_key(VALUE hash) rb_hash_each_key(VALUE hash)
{ {
RETURN_ENUMERATOR(hash, 0, 0); RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
rb_hash_foreach(hash, each_key_i, 0); rb_hash_foreach(hash, each_key_i, 0);
return hash; return hash;
} }
@ -1380,7 +1382,7 @@ each_pair_i(VALUE key, VALUE value)
static VALUE static VALUE
rb_hash_each_pair(VALUE hash) rb_hash_each_pair(VALUE hash)
{ {
RETURN_ENUMERATOR(hash, 0, 0); RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
rb_hash_foreach(hash, each_pair_i, 0); rb_hash_foreach(hash, each_pair_i, 0);
return hash; return hash;
} }

7
test/ruby/test_enumerator.rb
View file

@ -443,6 +443,13 @@ class TestEnumerator < Test::Unit::TestCase
assert_equal 42, @sized.each_with_object(nil).size assert_equal 42, @sized.each_with_object(nil).size
end end
def test_size_for_enum_created_from_hash
h = {a: 1, b: 2, c: 3}
%i[delete_if reject! select select! keep_if each each_key each_pair].each do |method|
assert_equal 3, h.send(method).size
end
end
def check_consistency_for_combinatorics(method) def check_consistency_for_combinatorics(method)
[ [], [:a, :b, :c, :d, :e] ].product([-2, 0, 2, 5, 6]) do |array, arg| [ [], [:a, :b, :c, :d, :e] ].product([-2, 0, 2, 5, 6]) do |array, arg|
assert_equal array.send(method, arg).to_a.size, array.send(method, arg).size, assert_equal array.send(method, arg).to_a.size, array.send(method, arg).size,