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

* array.c (rb_ary_uniq_bang): remove duplicate code.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2013-12-03 05:13:19 +00:00
parent 95f983f6d0
commit 2b07df37d1
2 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> 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 * array.c (ary_add_hash): set and return values because string keys

48
array.c
View File

@ -4062,13 +4062,6 @@ rb_ary_or(VALUE ary1, VALUE ary2)
return ary3; return ary3;
} }
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 static int
push_value(st_data_t key, st_data_t val, st_data_t ary) push_value(st_data_t key, st_data_t val, st_data_t ary)
{ {
@ -4110,36 +4103,23 @@ rb_ary_uniq_bang(VALUE ary)
rb_ary_modify_check(ary); rb_ary_modify_check(ary);
if (RARRAY_LEN(ary) <= 1) if (RARRAY_LEN(ary) <= 1)
return Qnil; return Qnil;
if (rb_block_given_p()) { if (rb_block_given_p())
hash = ary_make_hash_by(ary); hash = ary_make_hash_by(ary);
hash_size = RHASH_SIZE(hash); else
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 {
hash = ary_make_hash(ary); hash = ary_make_hash(ary);
hash_size = RHASH_SIZE(hash);
if (RARRAY_LEN(ary) == hash_size) { hash_size = RHASH_SIZE(hash);
return Qnil; 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);
} }
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); ary_recycle_hash(hash);
return ary; return ary;