usa	2011-04-18 10:12:36 +0900 (Mon, 18 Apr 2011)

  New Revision: 31302

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

  Log:
    backported r31286 from trunk
    
    * numeric.c (ruby_float_step): wrong loop condition.
      fixes [ruby-core:35753], reported by Joey Zhou.
    
    * test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
      test above change.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/numeric.c
    branches/ruby_1_8/test/ruby/test_range.rb

Index: ruby_1_8/numeric.c
===================================================================
--- ruby_1_8/numeric.c	(revision 31301)
+++ ruby_1_8/numeric.c	(revision 31302)
@@ -1445,7 +1445,7 @@
 
 	if (err>0.5) err=0.5;
 	n = floor(n + err);
-	if (!excl) n++;
+	if (!excl || ((long)n)*unit+beg < end) n++;
 	for (i=0; i<n; i++) {
 	    rb_yield(rb_float_new(i*unit+beg));
 	}
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 31301)
+++ ruby_1_8/ChangeLog	(revision 31302)
@@ -1,3 +1,13 @@
+Mon Apr 18 10:04:41 2011  NAKAMURA Usaku  <usa@r...>
+
+	backported r31286 from trunk
+
+	* numeric.c (ruby_float_step): wrong loop condition.
+	  fixes [ruby-core:35753], reported by Joey Zhou.
+
+	* test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
+	  test above change.
+
 Thu Mar  3 17:10:49 2011  Akinori MUSHA  <knu@i...>
 
 	* array.c (rb_ary_collect), enum.c (enum_collect): Add
Index: ruby_1_8/test/ruby/test_range.rb
===================================================================
--- ruby_1_8/test/ruby/test_range.rb	(revision 31301)
+++ ruby_1_8/test/ruby/test_range.rb	(revision 31302)
@@ -14,4 +14,13 @@
     r = (arr.shift)..(arr.shift)
     assert_equal(1..2, r, "[ruby-dev:26383]")
   end
+
+  def test_step_ruby_core_35753
+    assert_equal(6, (1...6.3).step.to_a.size)
+    assert_equal(5, (1.1...6).step.to_a.size)
+    assert_equal(5, (1...6).step(1.1).to_a.size)
+    assert_equal(3, (1.0...6.3).step(1.8).to_a.size)
+    assert_equal(3, (1.0...6.4).step(1.8).to_a.size)
+    assert_equal(4, (1.0...6.5).step(1.8).to_a.size)
+  end
 end

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