From 0a5ac6a44809ec32ae6e836086708a64112bcfd0 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 5 Oct 2011 07:36:28 +0000
Subject: [PATCH] Revert r33407; half-baked patch.

"* numeric.c (ruby_float_step): improve floating point calculations."

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog               | 13 -------------
 numeric.c               | 23 ++++-------------------
 test/ruby/test_float.rb | 31 -------------------------------
 3 files changed, 4 insertions(+), 63 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dfee2eacd7..1ee37b3047 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,19 +2,6 @@ Wed Oct  5 16:33:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* vm_insnhelper.c (vm_call_cfunc): remove useless hack.
 
-Wed Sep 21 11:17:22 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (ruby_float_step): improve floating point calculations.
-	  [ruby-core:35753] [Bug #4576]
-
-	* numeric.c (ruby_float_step): correct the error of floating point
-	  numbers on the excluding case.
-	  patched by Masahiro Tanaka [ruby-core:39608]
-
-	* numeric.c (ruby_float_step): use the end value when the current
-	  value is greater than or equal to the end value.
-	  patched by Akira Tanaka [ruby-core:39612]
-
 Wed Oct  5 05:56:39 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* hash.c (Init_Hash):  Improve Hash documentation.  Patch by Alvaro
diff --git a/numeric.c b/numeric.c
index 166dc520de..6d3c1432e8 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1690,25 +1690,10 @@ ruby_float_step(VALUE from, VALUE to, VALUE step, int excl)
 	}
 	else {
 	    if (err>0.5) err=0.5;
-	    if (excl) {
-		if (n>0) {
-		    if (n<err)
-			n = 1;
-		    else
-			n = floor(n - err) + 1;
-		}
-	    } else {
-		n = floor(n + err) + 1;
-	    }
-	    if (end < (n-1)*unit+beg) {
-		for (i=0; i<n; i++) {
-		    rb_yield(DBL2NUM((n-1-i)/(n-1)*beg+i/(n-1)*end));
-		}
-	    }
-	    else {
-		for (i=0; i<n; i++) {
-		    rb_yield(DBL2NUM(i*unit+beg));
-		}
+	    n = floor(n + err);
+	    if (!excl || ((long)n)*unit+beg < end) n++;
+	    for (i=0; i<n; i++) {
+		rb_yield(DBL2NUM(i*unit+beg));
 	    }
 	}
 	return TRUE;
diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb
index 531ff04fd6..e77b9e62e0 100644
--- a/test/ruby/test_float.rb
+++ b/test/ruby/test_float.rb
@@ -508,35 +508,4 @@ class TestFloat < Test::Unit::TestCase
       sleep(0.1+0.1+0.1+0.1+0.1+0.1+0.1+0.1+0.1+0.1)
     end
   end
-
-  def test_step
-    1000.times do
-      a = rand
-      b = a+rand*1000
-      s = (b - a) / 10
-      assert_equal(11, (a..b).step(s).to_a.length)
-    end
-
-    assert_equal(11, (1.0..(1.0+1E-15)).step(1E-16).to_a.length)
-
-    (1.0..12.7).step(1.3).each do |n|
-      assert_operator(n, :<=, 12.7)
-    end
-  end
-
-  def test_step_excl
-    1000.times do
-      a = rand
-      b = a+rand*1000
-      s = (b - a) / 10
-      assert_equal(10, (a...b).step(s).to_a.length)
-    end
-
-    assert_equal([1.0, 2.9, 4.8, 6.699999999999999], (1.0...6.8).step(1.9).to_a)
-
-    e = 1+1E-12
-    (1.0 ... e).step(1E-16) do |n|
-      assert_operator(n, :<, e)
-    end
-  end
 end