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

* array.c (rb_ary_uniq_bang): use st_foreach() instead of for loop.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2013-10-29 13:14:19 +00:00
parent c5e08b764e
commit 806b93ed9b
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Oct 29 22:11:37 2013 Masaki Matsushita <glass.saga@gmail.com>
* array.c (rb_ary_uniq_bang): use st_foreach() instead of for loop.
Tue Oct 29 20:01:58 2013 Koichi Sasada <ko1@atdot.net>
* add RUBY_TYPED_FREE_IMMEDIATELY to data types which only use

32
array.c
View File

@ -4050,6 +4050,13 @@ rb_ary_or(VALUE ary1, VALUE ary2)
return ary3;
}
static int
push_key(st_data_t key, st_data_t val, st_data_t ary)
{
rb_ary_push((VALUE)ary, (VALUE)key);
return ST_CONTINUE;
}
static int
push_value(st_data_t key, st_data_t val, st_data_t ary)
{
@ -4085,15 +4092,16 @@ push_value(st_data_t key, st_data_t val, st_data_t ary)
static VALUE
rb_ary_uniq_bang(VALUE ary)
{
VALUE hash, v;
long i, j;
VALUE hash;
long hash_size;
rb_ary_modify_check(ary);
if (RARRAY_LEN(ary) <= 1)
return Qnil;
if (rb_block_given_p()) {
hash = ary_make_hash_by(ary);
if (RARRAY_LEN(ary) == (i = RHASH_SIZE(hash))) {
hash_size = RHASH_SIZE(hash);
if (RARRAY_LEN(ary) == hash_size) {
return Qnil;
}
rb_ary_modify(ary);
@ -4102,21 +4110,23 @@ rb_ary_uniq_bang(VALUE ary)
rb_ary_unshare(ary);
FL_SET_EMBED(ary);
}
ary_resize_capa(ary, i);
ary_resize_capa(ary, hash_size);
st_foreach(rb_hash_tbl_raw(hash), push_value, ary);
}
else {
hash = ary_make_hash(ary);
if (RARRAY_LEN(ary) == (long)RHASH_SIZE(hash)) {
hash_size = RHASH_SIZE(hash);
if (RARRAY_LEN(ary) == hash_size) {
return Qnil;
}
for (i=j=0; i<RARRAY_LEN(ary); i++) {
st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i));
if (st_delete(rb_hash_tbl_raw(hash), &vv, 0)) {
rb_ary_store(ary, j++, v);
}
rb_ary_modify(ary);
ARY_SET_LEN(ary, 0);
if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) {
rb_ary_unshare(ary);
FL_SET_EMBED(ary);
}
ARY_SET_LEN(ary, j);
ary_resize_capa(ary, hash_size);
st_foreach(rb_hash_tbl_raw(hash), push_key, ary);
}
ary_recycle_hash(hash);