From 0672c5fc3212a7b423eb35f706ee75c72632a376 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 2 Dec 2010 08:07:24 +0000 Subject: [PATCH] merges r29490 from trunk into ruby_1_9_2. -- * numeric.c (ruby_float_step): fix Numeric#step with infinity unit doesn't works well. [ruby-core:32779] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ numeric.c | 2 +- test/ruby/test_numeric.rb | 13 +++++++++++++ test/ruby/test_string.rb | 4 ++++ version.h | 2 +- 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3cd6eafff4..bb8ccd0dc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 14 04:16:41 2010 NARUSE, Yui + + * numeric.c (ruby_float_step): fix Numeric#step with infinity unit + doesn't works well. [ruby-core:32779] + Wed Oct 13 22:32:34 2010 Takeyuki FUJIOKA * lib/cgi/util.rb (CGI::unescape): bugfix to unescape the multibyte diff --git a/numeric.c b/numeric.c index 1bb8d5c75c..6fb50a04e6 100644 --- a/numeric.c +++ b/numeric.c @@ -1576,7 +1576,7 @@ ruby_float_step(VALUE from, VALUE to, VALUE step, int excl) long i; if (isinf(unit)) { - if (unit > 0) rb_yield(DBL2NUM(beg)); + if (unit > 0 ? beg <= end : beg >= end) rb_yield(DBL2NUM(beg)); } else { if (err>0.5) err=0.5; diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb index f4fbea4ce9..9667046916 100644 --- a/test/ruby/test_numeric.rb +++ b/test/ruby/test_numeric.rb @@ -27,6 +27,7 @@ class TestNumeric < Test::Unit::TestCase assert_raise(ArgumentError) { 1 <= a } DummyNumeric.class_eval do + remove_method :coerce def coerce(x); 1.coerce(x); end end assert_equal(2, 1 + a) @@ -34,6 +35,7 @@ class TestNumeric < Test::Unit::TestCase assert(1 <= a) DummyNumeric.class_eval do + remove_method :coerce def coerce(x); [x, 1]; end end assert_equal(-1, -a) @@ -95,6 +97,7 @@ class TestNumeric < Test::Unit::TestCase assert_equal(:ok, a.abs) DummyNumeric.class_eval do + remove_method :< def <(x); false; end end @@ -150,6 +153,7 @@ class TestNumeric < Test::Unit::TestCase assert_equal(1, a.truncate) DummyNumeric.class_eval do + remove_method :to_f def to_f; 1.4; end end @@ -160,6 +164,7 @@ class TestNumeric < Test::Unit::TestCase assert_equal(1, a.truncate) DummyNumeric.class_eval do + remove_method :to_f def to_f; -1.5; end end @@ -202,6 +207,14 @@ class TestNumeric < Test::Unit::TestCase a = [] 10.step(1, -(2**32)) {|x| a << x } assert_equal([10], a) + + a = [] + 1.step(0, Float::INFINITY) {|x| a << x } + assert_equal([], a) + + a = [] + 0.step(1, -Float::INFINITY) {|x| a << x } + assert_equal([], a) end def test_num2long diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index d8915e6937..cea74c35e8 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -175,9 +175,11 @@ class TestString < Test::Unit::TestCase def o.<=>(x); nil; end assert_nil("foo" <=> o) + class << o;remove_method :<=>;end def o.<=>(x); 1; end assert_equal(-1, "foo" <=> o) + class << o;remove_method :<=>;end def o.<=>(x); 2**100; end assert_equal(-(2**100), "foo" <=> o) end @@ -200,6 +202,7 @@ class TestString < Test::Unit::TestCase def o.to_str; end def o.==(x); false; end assert_equal(false, "foo" == o) + class << o;remove_method :==;end def o.==(x); true; end assert_equal(true, "foo" == o) end @@ -1814,6 +1817,7 @@ class TestString < Test::Unit::TestCase c.class_eval { attr 1 } end + class << o;remove_method :to_str;end def o.to_str; "foo"; end assert_nothing_raised do c.class_eval { attr o } diff --git a/version.h b/version.h index 20e8ae7bbe..10db9e16ca 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 75 +#define RUBY_PATCHLEVEL 76 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1