kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* array.c (rb_ary_uniq): gets rid of copying.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-02-05 03:24:20 +00:00
parent e3c8cdca44
commit a2c7fdc709
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Feb 5 12:24:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_uniq): gets rid of copying.
Thu Feb 5 12:01:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (ary_add_hash): split from ary_make_hash().

22
array.c
View file

@ -3014,7 +3014,7 @@ rb_ary_or(VALUE ary1, VALUE ary2)
static VALUE
rb_ary_uniq_bang(VALUE ary)
{
VALUE hash, v, vv;
VALUE hash, v;
long i, j;
hash = ary_make_hash(ary);
@ -3023,8 +3023,8 @@ rb_ary_uniq_bang(VALUE ary)
return Qnil;
}
for (i=j=0; i<RARRAY_LEN(ary); i++) {
v = vv = rb_ary_elt(ary, i);
if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i));
if (st_delete(RHASH_TBL(hash), &vv, 0)) {
rb_ary_store(ary, j++, v);
}
}
@ -3047,9 +3047,19 @@ rb_ary_uniq_bang(VALUE ary)
static VALUE
rb_ary_uniq(VALUE ary)
{
ary = rb_ary_dup(ary);
rb_ary_uniq_bang(ary);
return ary;
VALUE hash = ary_make_hash(ary), v;
VALUE uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash));
long i;
for (i=0; i<RARRAY_LEN(ary); i++) {
st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i));
if (st_delete(RHASH_TBL(hash), &vv, 0)) {
rb_ary_push(uniq, v);
}
}
ary_recycle_hash(hash);
return uniq;
}
/*