diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | numeric.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_range.rb | 9 |
3 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Thu Apr 14 23:43:43 2011 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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 Apr 14 22:48:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/test/unit.rb (Test::Unit::Options#setup_options): set possible @@ -1634,7 +1634,7 @@ 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) n++; + if (!excl || ((long)n)*unit+beg < end) n++; for (i=0; i<n; i++) { rb_yield(DBL2NUM(i*unit+beg)); } diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb index a2935955de..12ba47c219 100644 --- a/test/ruby/test_range.rb +++ b/test/ruby/test_range.rb @@ -182,6 +182,15 @@ class TestRange < Test::Unit::TestCase assert_nothing_raised("[ruby-dev:34558]") { (0..2).step(o) {|x| } } 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 + def test_each a = [] (0..10).each {|x| a << x } |