kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r31286 from trunk into ruby_1_9_2.

Browse source 
--
* 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_9_2@31803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-29 22:50:11 +00:00
parent f13e0ec80e
commit f0de89f81a
4 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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 21:21:06 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/win32.h (frexp, modf): wrongly declared as pure in

2
numeric.c
View file

@ -1592,7 +1592,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));
}

9
test/ruby/test_range.rb
View file

@ -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 }

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 230
#define RUBY_PATCHLEVEL 231
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1