ruby-changes:23145
From: nobu <ko1@a...>
Date: Sat, 31 Mar 2012 14:16:13 +0900 (JST)
Subject: [ruby-changes:23145] nobu:r35195 (trunk): * hash.c: do not allocate st_table when it is not necessary.
nobu 2012-03-31 14:16:04 +0900 (Sat, 31 Mar 2012) New Revision: 35195 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35195 Log: * hash.c: do not allocate st_table when it is not necessary. Modified files: trunk/ChangeLog trunk/hash.c Index: ChangeLog =================================================================== --- ChangeLog (revision 35194) +++ ChangeLog (revision 35195) @@ -1,3 +1,7 @@ +Sat Mar 31 14:16:02 2012 Sokolov Yura (funny-falcon) <funny.falcon@g...> + + * hash.c: do not allocate st_table when it is not necessary. + Sat Mar 31 13:42:39 2012 Shugo Maeda <shugo@r...> * lib/net/ftp.rb (read_timeout=, open_timeout=): supported timeout. Index: hash.c =================================================================== --- hash.c (revision 35194) +++ hash.c (revision 35195) @@ -649,7 +649,7 @@ static VALUE rb_hash_set_default(VALUE hash, VALUE ifnone) { - rb_hash_modify(hash); + rb_hash_modify_check(hash); RHASH_IFNONE(hash) = ifnone; FL_UNSET(hash, HASH_PROC_DEFAULT); return ifnone; @@ -697,7 +697,7 @@ { VALUE b; - rb_hash_modify(hash); + rb_hash_modify_check(hash); b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc"); if (NIL_P(b) || !rb_obj_is_proc(b)) { rb_raise(rb_eTypeError, @@ -799,7 +799,7 @@ { VALUE val; - rb_hash_modify(hash); + rb_hash_modify_check(hash); val = rb_hash_delete_key(hash, key); if (val != Qundef) return val; if (rb_block_given_p()) { @@ -852,18 +852,20 @@ { struct shift_var var; - rb_hash_modify(hash); - var.key = Qundef; - rb_hash_foreach(hash, RHASH(hash)->iter_lev > 0 ? shift_i_safe : shift_i, - (VALUE)&var); + rb_hash_modify_check(hash); + if (RHASH(hash)->ntbl) { + var.key = Qundef; + rb_hash_foreach(hash, RHASH(hash)->iter_lev > 0 ? shift_i_safe : shift_i, + (VALUE)&var); - if (var.key != Qundef) { - if (RHASH(hash)->iter_lev > 0) { - rb_hash_delete_key(hash, var.key); + if (var.key != Qundef) { + if (RHASH(hash)->iter_lev > 0) { + rb_hash_delete_key(hash, var.key); + } + return rb_assoc_new(var.key, var.val); } - return rb_assoc_new(var.key, var.val); } - else if (FL_TEST(hash, HASH_PROC_DEFAULT)) { + if (FL_TEST(hash, HASH_PROC_DEFAULT)) { return rb_funcall(RHASH_IFNONE(hash), id_yield, 2, hash, Qnil); } else { @@ -899,8 +901,9 @@ rb_hash_delete_if(VALUE hash) { RETURN_ENUMERATOR(hash, 0, 0); - rb_hash_modify(hash); - rb_hash_foreach(hash, delete_if_i, hash); + rb_hash_modify_check(hash); + if (RHASH(hash)->ntbl) + rb_hash_foreach(hash, delete_if_i, hash); return hash; } @@ -1025,7 +1028,7 @@ st_index_t n; RETURN_ENUMERATOR(hash, 0, 0); - rb_hash_modify(hash); + rb_hash_modify_check(hash); if (!RHASH(hash)->ntbl) return Qnil; n = RHASH(hash)->ntbl->num_entries; @@ -1050,8 +1053,9 @@ rb_hash_keep_if(VALUE hash) { RETURN_ENUMERATOR(hash, 0, 0); - rb_hash_modify(hash); - rb_hash_foreach(hash, keep_if_i, hash); + rb_hash_modify_check(hash); + if (RHASH(hash)->ntbl) + rb_hash_foreach(hash, keep_if_i, hash); return hash; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/