shyouhei	2011-05-21 07:29:05 +0900 (Sat, 21 May 2011)

  New Revision: 31663

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

  Log:
    merge revision(s) 31302:
    
    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.
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/numeric.c
    branches/ruby_1_8_7/test/ruby/test_range.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/numeric.c
===================================================================
--- ruby_1_8_7/numeric.c	(revision 31662)
+++ ruby_1_8_7/numeric.c	(revision 31663)
@@ -1447,7 +1447,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_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 31662)
+++ ruby_1_8_7/ChangeLog	(revision 31663)
@@ -1,3 +1,13 @@
+Sat May 21 01:32:08 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.
+
 Sat May 21 00:55:21 2011  NARUSE, Yui  <naruse@r...>
 
 	* ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in gzip's
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 31662)
+++ ruby_1_8_7/version.h	(revision 31663)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2011-05-21"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20110521
-#define RUBY_PATCHLEVEL 339
+#define RUBY_PATCHLEVEL 341
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/test/ruby/test_range.rb
===================================================================
--- ruby_1_8_7/test/ruby/test_range.rb	(revision 31662)
+++ ruby_1_8_7/test/ruby/test_range.rb	(revision 31663)
@@ -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/