diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-29 08:06:28 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-29 08:06:28 +0000 |
commit | 6daec36d0cb2f7335e036b931728472e38f72841 (patch) | |
tree | d4910324366bae67885bcac35282adc670c29393 /lib | |
parent | 72a943aa47b922f8bd2b4348e85928fdf675fa5b (diff) |
merge revision(s) 17046:
* lib/set.rb (Set#delete_if): Call to_a.
(SortedSet#delete_if, TC_SortedSet#test_sortedset): Use super to
yield elements in sorted order; [ruby-core:17144] by Arthur
Schreiber.
(SortedSet#each, SortedSet#each, TC_Set#test_each)
(TC_SortedSet#test_sortedset): Return self; [ruby-dev:35002] by
Arthur Schreiber.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/set.rb | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/lib/set.rb b/lib/set.rb index 5a9287ba89..d3f85f8422 100644 --- a/lib/set.rb +++ b/lib/set.rb @@ -228,7 +228,7 @@ class Set # Deletes every element of the set for which block evaluates to # true, and returns self. def delete_if - @hash.delete_if { |o,| yield(o) } + to_a.each { |o| @hash.delete(o) if yield(o) } self end @@ -486,7 +486,7 @@ class SortedSet < Set def delete_if n = @hash.size - @hash.delete_if { |o,| yield(o) } + super @keys = nil if @hash.size != n self end @@ -498,6 +498,7 @@ class SortedSet < Set def each to_a.each { |o| yield(o) } + self end def to_a @@ -1161,11 +1162,33 @@ class TC_SortedSet < Test::Unit::TestCase assert_equal([-10,-8,-6,-4,-2], s.to_a) prev = nil - s.each { |o| assert(prev < o) if prev; prev = o } + ret = s.each { |o| assert(prev < o) if prev; prev = o } assert_not_nil(prev) + assert_same(s, ret) s = SortedSet.new([2,1,3]) { |o| o * -2 } assert_equal([-6,-4,-2], s.to_a) + + s = SortedSet.new(['one', 'two', 'three', 'four']) + a = [] + ret = s.delete_if { |o| a << o; o[0] == ?t } + assert_same(s, ret) + assert_equal(['four', 'one'], s.to_a) + assert_equal(['four', 'one', 'three', 'two'], a) + + s = SortedSet.new(['one', 'two', 'three', 'four']) + a = [] + ret = s.reject! { |o| a << o; o[0] == ?t } + assert_same(s, ret) + assert_equal(['four', 'one'], s.to_a) + assert_equal(['four', 'one', 'three', 'two'], a) + + s = SortedSet.new(['one', 'two', 'three', 'four']) + a = [] + ret = s.reject! { |o| a << o; false } + assert_same(nil, ret) + assert_equal(['four', 'one', 'three', 'two'], s.to_a) + assert_equal(['four', 'one', 'three', 'two'], a) end end |