1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki 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> Thu Feb 5 12:01:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (ary_add_hash): split from ary_make_hash(). * 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 static VALUE
rb_ary_uniq_bang(VALUE ary) rb_ary_uniq_bang(VALUE ary)
{ {
VALUE hash, v, vv; VALUE hash, v;
long i, j; long i, j;
hash = ary_make_hash(ary); hash = ary_make_hash(ary);
@ -3023,8 +3023,8 @@ rb_ary_uniq_bang(VALUE ary)
return Qnil; return Qnil;
} }
for (i=j=0; i<RARRAY_LEN(ary); i++) { for (i=j=0; i<RARRAY_LEN(ary); i++) {
v = vv = rb_ary_elt(ary, i); st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i));
if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) { if (st_delete(RHASH_TBL(hash), &vv, 0)) {
rb_ary_store(ary, j++, v); rb_ary_store(ary, j++, v);
} }
} }
@ -3047,9 +3047,19 @@ rb_ary_uniq_bang(VALUE ary)
static VALUE static VALUE
rb_ary_uniq(VALUE ary) rb_ary_uniq(VALUE ary)
{ {
ary = rb_ary_dup(ary); VALUE hash = ary_make_hash(ary), v;
rb_ary_uniq_bang(ary); VALUE uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash));
return ary; 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;
} }
/* /*