diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-14 08:57:23 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-14 08:57:23 +0000 |
commit | 125d830eb8525151861e932f4a01e76ac5c8b25e (patch) | |
tree | 74f570eb217648b78bdf3a83160548d8139652e0 /hash.c | |
parent | 39df01c4af5fa7e4246f2a951e4fcc73a3a6aee0 (diff) |
* array.c (rb_ary_collect_bang, rb_ary_select): Return an
enumerator if no block is given.
* dir.c (dir_each, dir_foreach): Return an enumerator if no block
is given.
* enum.c (enum_partition, enum_sort_by): Ditto.
* gc.c (os_each_obj): Ditto.
* hash.c (rb_hash_delete_if, rb_hash_reject_bang, rb_hash_select,
rb_hash_each_value, rb_hash_each_key, rb_hash_each_pair,
env_each_key, env_each_value, env_each, env_each_pair,
env_reject_bang, env_delete_if, env_select): Ditto.
* numeric.c (num_step, int_upto, int_downto, int_dotimes): Ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
-rw-r--r-- | hash.c | 26 |
1 files changed, 21 insertions, 5 deletions
@@ -817,6 +817,7 @@ VALUE rb_hash_delete_if(hash) VALUE hash; { + RETURN_ENUMERATOR(hash, 0, 0); rb_hash_modify(hash); rb_hash_foreach(hash, delete_if_i, hash); return hash; @@ -834,7 +835,10 @@ VALUE rb_hash_reject_bang(hash) VALUE hash; { - int n = RHASH(hash)->tbl->num_entries; + int n; + + RETURN_ENUMERATOR(hash, 0, 0); + n = RHASH(hash)->tbl->num_entries; rb_hash_delete_if(hash); if (n == RHASH(hash)->tbl->num_entries) return Qnil; return hash; @@ -912,6 +916,7 @@ rb_hash_select(hash) { VALUE result; + RETURN_ENUMERATOR(hash, 0, 0); result = rb_ary_new(); rb_hash_foreach(hash, select_i, result); return result; @@ -1090,6 +1095,7 @@ static VALUE rb_hash_each_value(hash) VALUE hash; { + RETURN_ENUMERATOR(hash, 0, 0); rb_hash_foreach(hash, each_value_i, 0); return hash; } @@ -1122,6 +1128,7 @@ static VALUE rb_hash_each_key(hash) VALUE hash; { + RETURN_ENUMERATOR(hash, 0, 0); rb_hash_foreach(hash, each_key_i, 0); return hash; } @@ -1156,6 +1163,7 @@ static VALUE rb_hash_each_pair(hash) VALUE hash; { + RETURN_ENUMERATOR(hash, 0, 0); rb_hash_foreach(hash, each_pair_i, 0); return hash; } @@ -2003,6 +2011,7 @@ env_each_key(ehash) VALUE keys = env_keys(); long i; + RETURN_ENUMERATOR(ehash, 0, 0); for (i=0; i<RARRAY(keys)->len; i++) { rb_yield(RARRAY(keys)->ptr[i]); } @@ -2034,6 +2043,7 @@ env_each_value(ehash) VALUE values = env_values(); long i; + RETURN_ENUMERATOR(ehash, 0, 0); for (i=0; i<RARRAY(values)->len; i++) { rb_yield(RARRAY(values)->ptr[i]); } @@ -2075,6 +2085,7 @@ static VALUE env_each(ehash) VALUE ehash; { + RETURN_ENUMERATOR(ehash, 0, 0); return env_each_i(ehash, Qfalse); } @@ -2086,12 +2097,14 @@ env_each_pair(ehash) } static VALUE -env_reject_bang() +env_reject_bang(ehash) + VALUE ehash; { volatile VALUE keys; long i; int del = 0; + RETURN_ENUMERATOR(ehash, 0, 0); rb_secure(4); keys = env_keys(); @@ -2110,9 +2123,10 @@ env_reject_bang() } static VALUE -env_delete_if() +env_delete_if(ehash) + VALUE ehash; { - env_reject_bang(); + env_reject_bang(ehash); return envtbl; } @@ -2131,11 +2145,13 @@ env_values_at(argc, argv) } static VALUE -env_select() +env_select(ehash) + VALUE ehash; { VALUE result; char **env; + RETURN_ENUMERATOR(ehash, 0, 0); result = rb_ary_new(); env = GET_ENVIRON(environ); while (*env) { |