* 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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 19 insertions, 4 deletions

diff --git a/numeric.c b/numeric.c
index 6d3c1432e8..166dc520de 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1690,10 +1690,25 @@ ruby_float_step(VALUE from, VALUE to, VALUE step, int excl)
 	}
 	else {
 	    if (err>0.5) err=0.5;
-	    n = floor(n + err);
-	    if (!excl || ((long)n)*unit+beg < end) n++;
-	    for (i=0; i<n; i++) {
-		rb_yield(DBL2NUM(i*unit+beg));
+	    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));
+		}
 	    }
 	}
 	return TRUE;