nobu	2011-12-15 10:44:58 +0900 (Thu, 15 Dec 2011)

  New Revision: 34048

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34048

  Log:
    * array.c (rb_ary_reject_bang, rb_ary_delete_if): update rdoc.
      documentation from Thomas Leitner <t_leitner AT gmx.at> in
      [ruby-core:41616].  [Bug #5752]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/array.c
    branches/ruby_1_9_3/test/ruby/test_array.rb
    trunk/ChangeLog
    trunk/array.c
    trunk/test/ruby/test_array.rb

Index: array.c
===================================================================
--- array.c	(revision 34047)
+++ array.c	(revision 34048)
@@ -2643,6 +2643,8 @@
  *  Equivalent to Array#delete_if, deleting elements from
  *  +self+ for which the block evaluates to true, but returns
  *  <code>nil</code> if no changes were made.
+ *  The array is changed instantly every time the block is called and
+ *  not after the iteration is over.
  *  See also Enumerable#reject and Array#delete_if.
  *
  *  If no block is given, an enumerator is returned instead.
@@ -2687,6 +2689,8 @@
  *
  *  Deletes every element of +self+ for which +block+ evaluates
  *  to true.
+ *  The array is changed instantly every time the block is called and
+ *  not after the iteration is over.
  *  See also Array#reject!
  *
  *  If no block is given, an enumerator is returned instead.
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34047)
+++ ChangeLog	(revision 34048)
@@ -1,3 +1,9 @@
+Thu Dec 15 10:44:54 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* array.c (rb_ary_reject_bang, rb_ary_delete_if): update rdoc.
+	  documentation from Thomas Leitner <t_leitner AT gmx.at> in
+	  [ruby-core:41616].  [Bug #5752]
+
 Thu Dec 15 10:10:43 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/ruby/test_require.rb (test_race_exception): get rid of
Index: test/ruby/test_array.rb
===================================================================
--- test/ruby/test_array.rb	(revision 34047)
+++ test/ruby/test_array.rb	(revision 34048)
@@ -610,7 +610,7 @@
 
     bug2545 = '[ruby-core:27366]'
     a = @cls[ 5, 6, 7, 8, 9, 10 ]
-    assert_equal(9, a.delete_if {|i| break i if i > 8; i < 7})
+    assert_equal(9, a.delete_if {|i| break i if i > 8; assert_equal(a[0], i) || true if i < 7})
     assert_equal(@cls[7, 8, 9, 10], a, bug2545)
   end
 
@@ -1098,7 +1098,7 @@
 
     bug2545 = '[ruby-core:27366]'
     a = @cls[ 5, 6, 7, 8, 9, 10 ]
-    assert_equal(9, a.reject! {|i| break i if i > 8; i < 7})
+    assert_equal(9, a.reject! {|i| break i if i > 8; assert_equal(a[0], i) || true if i < 7})
     assert_equal(@cls[7, 8, 9, 10], a, bug2545)
   end
 
Index: ruby_1_9_3/array.c
===================================================================
--- ruby_1_9_3/array.c	(revision 34047)
+++ ruby_1_9_3/array.c	(revision 34048)
@@ -2606,6 +2606,8 @@
  *  Equivalent to <code>Array#delete_if</code>, deleting elements from
  *  +self+ for which the block evaluates to true, but returns
  *  <code>nil</code> if no changes were made.
+ *  The array is changed instantly every time the block is called and
+ *  not after the iteration is over.
  *  See also <code>Enumerable#reject</code> and <code>Array#delete_if</code>.
  *
  *  If no block is given, an enumerator is returned instead.
@@ -2650,6 +2652,8 @@
  *
  *  Deletes every element of +self+ for which <i>block</i> evaluates
  *  to true.
+ *  The array is changed instantly every time the block is called and
+ *  not after the iteration is over.
  *  See also <code>Array#reject!</code>
  *
  *  If no block is given, an enumerator is returned instead.
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34047)
+++ ruby_1_9_3/ChangeLog	(revision 34048)
@@ -1,3 +1,9 @@
+Thu Dec 15 10:44:54 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* array.c (rb_ary_reject_bang, rb_ary_delete_if): update rdoc.
+	  documentation from Thomas Leitner <t_leitner AT gmx.at> in
+	  [ruby-core:41616].  [Bug #5752]
+
 Wed Dec 14 15:28:31 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* transcode.c (str_encode): about the extension of :fallback
Index: ruby_1_9_3/test/ruby/test_array.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_array.rb	(revision 34047)
+++ ruby_1_9_3/test/ruby/test_array.rb	(revision 34048)
@@ -610,7 +610,7 @@
 
     bug2545 = '[ruby-core:27366]'
     a = @cls[ 5, 6, 7, 8, 9, 10 ]
-    assert_equal(9, a.delete_if {|i| break i if i > 8; i < 7})
+    assert_equal(9, a.delete_if {|i| break i if i > 8; assert_equal(a[0], i) || true if i < 7})
     assert_equal(@cls[7, 8, 9, 10], a, bug2545)
   end
 
@@ -1098,7 +1098,7 @@
 
     bug2545 = '[ruby-core:27366]'
     a = @cls[ 5, 6, 7, 8, 9, 10 ]
-    assert_equal(9, a.reject! {|i| break i if i > 8; i < 7})
+    assert_equal(9, a.reject! {|i| break i if i > 8; assert_equal(a[0], i) || true if i < 7})
     assert_equal(@cls[7, 8, 9, 10], a, bug2545)
   end
 

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