summaryrefslogtreecommitdiff
path: root/numeric.c
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-20 22:29:05 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-20 22:29:05 +0000
commit4e5325fe1f8ca173cbd4875379cd6da61abb6a50 (patch)
treec907e9ceb8dae3a805279d19c7717f08752ab3a9 /numeric.c
parent72e6e00f1c657e1fb61c5ace4bb2c35651728242 (diff)
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@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31663 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r--numeric.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/numeric.c b/numeric.c
index 634c2eb940..7d557db74f 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1447,7 +1447,7 @@ ruby_float_step(from, to, step, excl)
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));
}