diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-20 04:27:32 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-20 04:27:32 +0000 |
commit | 9ce419a45c521d8c41773ad29cb9ccec3be05028 (patch) | |
tree | 22a94afde9b375588a2d0d9aef267690e6f2d5b6 | |
parent | c9dd4823d98141754842c0b356b141d94ba36604 (diff) | |
download | ruby-9ce419a45c521d8c41773ad29cb9ccec3be05028.tar.gz |
* array.c (rb_ary_uniq_bang): the array is already unique if the
length is zero or one.
(rb_ary_uniq): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | array.c | 4 | ||||
-rw-r--r-- | test/ruby/test_array.rb | 43 |
3 files changed, 53 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Sat Mar 20 13:26:09 2010 Tanaka Akira <akr@fsij.org> + + * array.c (rb_ary_uniq_bang): the array is already unique if the + length is zero or one. + (rb_ary_uniq): ditto. + Sat Mar 20 12:30:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib: fixed typo. a patch by Sho Hashimoto in [ruby-dev:40716]. @@ -3367,6 +3367,8 @@ rb_ary_uniq_bang(VALUE ary) long i, j; 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))) { @@ -3412,6 +3414,8 @@ rb_ary_uniq(VALUE ary) VALUE hash, uniq, v; long i; + if (RARRAY_LEN(ary) <= 1) + return rb_ary_dup(ary); if (rb_block_given_p()) { hash = ary_make_hash_by(ary); uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash)); diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 98acfe9d29..69d3f1d75c 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -1308,6 +1308,30 @@ class TestArray < Test::Unit::TestCase end def test_uniq + a = [] + b = a.uniq + assert_equal([], a) + assert_equal([], b) + assert_not_same(a, b) + + a = [1] + b = a.uniq + assert_equal([1], a) + assert_equal([1], b) + assert_not_same(a, b) + + a = [1,1] + b = a.uniq + assert_equal([1,1], a) + assert_equal([1], b) + assert_not_same(a, b) + + a = [1,2] + b = a.uniq + assert_equal([1,2], a) + assert_equal([1,2], b) + assert_not_same(a, b) + a = @cls[ 1, 2, 3, 2, 1, 2, 3, 4, nil ] b = a.dup assert_equal(@cls[1, 2, 3, 4, nil], a.uniq) @@ -1322,6 +1346,25 @@ class TestArray < Test::Unit::TestCase end def test_uniq! + a = [] + b = a.uniq! + assert_equal(nil, b) + + a = [1] + b = a.uniq! + assert_equal(nil, b) + + a = [1,1] + b = a.uniq! + assert_equal([1], a) + assert_equal([1], b) + assert_same(a, b) + + a = [1,2] + b = a.uniq! + assert_equal([1,2], a) + assert_equal(nil, b) + a = @cls[ 1, 2, 3, 2, 1, 2, 3, 4, nil ] assert_equal(@cls[1, 2, 3, 4, nil], a.uniq!) assert_equal(@cls[1, 2, 3, 4, nil], a) |