ruby-changes:5542
From: knu <ko1@a...>
Date: Mon, 9 Jun 2008 17:58:50 +0900 (JST)
Subject: [ruby-changes:5542] Ruby:r17045 (trunk): * lib/set.rb (Set#delete_if): Call to_a.
knu 2008-06-09 17:58:30 +0900 (Mon, 09 Jun 2008) New Revision: 17045 Modified files: trunk/ChangeLog trunk/lib/set.rb Log: * 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. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17045&r2=17044&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/set.rb?r1=17045&r2=17044&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 17044) +++ ChangeLog (revision 17045) @@ -1,3 +1,13 @@ +Mon Jun 9 17:56:30 2008 Akinori MUSHA <knu@i...> + + * 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. + Mon Jun 9 17:47:09 2008 Tanaka Akira <akr@f...> * io.c (fptr_finalize): close IO object if fd is already closed. Index: lib/set.rb =================================================================== --- lib/set.rb (revision 17044) +++ lib/set.rb (revision 17045) @@ -251,7 +251,7 @@ # true, and returns self. def delete_if block_given? or return enum_for(__method__) - @hash.delete_if { |o,| yield(o) } + to_a.each { |o| @hash.delete(o) if yield(o) } self end @@ -510,7 +510,7 @@ def delete_if block_given? or return enum_for(__method__) n = @hash.size - @hash.delete_if { |o,| yield(o) } + super @keys = nil if @hash.size != n self end @@ -523,6 +523,7 @@ def each block_given? or return enum_for(__method__) to_a.each { |o| yield(o) } + self end def to_a @@ -936,6 +937,9 @@ ary = [1,3,5,7,10,20] set = Set.new(ary) + ret = set.each { |o| } + assert_same(set, ret) + e = set.each assert_instance_of(Enumerable::Enumerator, e) @@ -1182,11 +1186,33 @@ 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.start_with?('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.start_with?('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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/