1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* hash.c (rb_hash_delete_if, rb_hash_reject_bang, env_delete_if,

Browse Source 
env_reject_bang): Return an enumerator if no block is given.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-04-14 08:31:38 +00:00
parent 6866bce757
commit ac5b69acb8
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Apr 14 17:23:27 2008 Akinori MUSHA <knu@iDaemons.org>
* hash.c (rb_hash_delete_if, rb_hash_reject_bang, env_delete_if,
env_reject_bang): Return an enumerator if no block is given.
Mon Apr 14 14:33:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Apr 14 14:33:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c, compile.h (compile_debug): made runtime option. * compile.c, compile.h (compile_debug): made runtime option.

10
hash.c
View File

@ -787,6 +787,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);
rb_hash_modify(hash); rb_hash_modify(hash);
rb_hash_foreach(hash, delete_if_i, hash); rb_hash_foreach(hash, delete_if_i, hash);
return hash; return hash;
@ -804,6 +805,8 @@ VALUE
rb_hash_reject_bang(VALUE hash) rb_hash_reject_bang(VALUE hash)
{ {
int n; int n;
RETURN_ENUMERATOR(hash, 0, 0);
if (!RHASH(hash)->ntbl) if (!RHASH(hash)->ntbl)
return Qnil; return Qnil;
n = RHASH(hash)->ntbl->num_entries; n = RHASH(hash)->ntbl->num_entries;
@ -2142,12 +2145,13 @@ env_each_pair(VALUE ehash)
} }
static VALUE static VALUE
env_reject_bang(void) env_reject_bang(VALUE ehash)
{ {
volatile VALUE keys; volatile VALUE keys;
long i; long i;
int del = 0; int del = 0;
RETURN_ENUMERATOR(ehash, 0, 0);
rb_secure(4); rb_secure(4);
keys = env_keys(); keys = env_keys();
for (i=0; i<RARRAY_LEN(keys); i++) { for (i=0; i<RARRAY_LEN(keys); i++) {
@ -2165,9 +2169,9 @@ env_reject_bang(void)
} }
static VALUE static VALUE
env_delete_if(void) env_delete_if(VALUE ehash)
{ {
env_reject_bang(); env_reject_bang(ehash);
return envtbl; return envtbl;
} }