shyouhei	2008-06-29 17:06:28 +0900 (Sun, 29 Jun 2008)

  New Revision: 17648

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/lib/set.rb
    branches/ruby_1_8_6/version.h

  Log:
    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.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17648&r2=17647&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17648&r2=17647&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/lib/set.rb?r1=17648&r2=17647&diff_format=u

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17647)
+++ ruby_1_8_6/ChangeLog	(revision 17648)
@@ -1,3 +1,13 @@
+Sun Jun 29 16:56:57 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.
+
 Sun Jun 29 16:49:11 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (search_method, remove_method, error_print, rb_alias)
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17647)
+++ ruby_1_8_6/version.h	(revision 17648)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-29"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 239
+#define RUBY_PATCHLEVEL 240
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/lib/set.rb
===================================================================
--- ruby_1_8_6/lib/set.rb	(revision 17647)
+++ ruby_1_8_6/lib/set.rb	(revision 17648)
@@ -228,7 +228,7 @@
   # 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 @@
 
 	  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 @@
 
 	  def each
 	    to_a.each { |o| yield(o) }
+	    self
 	  end
 
 	  def to_a
@@ -1161,11 +1162,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[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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/