diff options
author | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-03 05:13:19 +0000 |
---|---|---|
committer | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-03 05:13:19 +0000 |
commit | 2b07df37d15b2c6104cd8c52137e24d265630fb6 (patch) | |
tree | 46e872b3ff2f6a28f70089950e620415ae62305a | |
parent | 95f983f6d0e5f1b2c9c26950cbfaa7cf323d3f1c (diff) |
* array.c (rb_ary_uniq_bang): remove duplicate code.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | array.c | 48 |
2 files changed, 18 insertions, 34 deletions
@@ -1,3 +1,7 @@ +Tue Dec 3 14:05:49 2013 Masaki Matsushita <glass.saga@gmail.com> + + * array.c (rb_ary_uniq_bang): remove duplicate code. + Tue Dec 3 13:40:42 2013 Masaki Matsushita <glass.saga@gmail.com> * array.c (ary_add_hash): set and return values because string keys @@ -4063,13 +4063,6 @@ rb_ary_or(VALUE ary1, VALUE ary2) } static int -push_val(st_data_t key, st_data_t val, st_data_t ary) -{ - rb_ary_push((VALUE)ary, (VALUE)val); - return ST_CONTINUE; -} - -static int push_value(st_data_t key, st_data_t val, st_data_t ary) { rb_ary_push((VALUE)ary, (VALUE)val); @@ -4110,36 +4103,23 @@ rb_ary_uniq_bang(VALUE ary) rb_ary_modify_check(ary); if (RARRAY_LEN(ary) <= 1) return Qnil; - if (rb_block_given_p()) { + if (rb_block_given_p()) hash = ary_make_hash_by(ary); - hash_size = RHASH_SIZE(hash); - if (RARRAY_LEN(ary) == hash_size) { - return Qnil; - } - rb_ary_modify_check(ary); - ARY_SET_LEN(ary, 0); - if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) { - rb_ary_unshare(ary); - FL_SET_EMBED(ary); - } - ary_resize_capa(ary, hash_size); - st_foreach(rb_hash_tbl_raw(hash), push_value, ary); - } - else { + else hash = ary_make_hash(ary); - hash_size = RHASH_SIZE(hash); - if (RARRAY_LEN(ary) == hash_size) { - return Qnil; - } - rb_ary_modify_check(ary); - ARY_SET_LEN(ary, 0); - if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) { - rb_ary_unshare(ary); - FL_SET_EMBED(ary); - } - ary_resize_capa(ary, hash_size); - st_foreach(rb_hash_tbl_raw(hash), push_val, ary); + + hash_size = RHASH_SIZE(hash); + if (RARRAY_LEN(ary) == hash_size) { + return Qnil; + } + rb_ary_modify_check(ary); + ARY_SET_LEN(ary, 0); + if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) { + rb_ary_unshare(ary); + FL_SET_EMBED(ary); } + ary_resize_capa(ary, hash_size); + st_foreach(rb_hash_tbl_raw(hash), push_value, ary); ary_recycle_hash(hash); return ary; |