From 93bbd7869c60781094507babd761cd4fb191d58b Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 26 May 2010 03:08:07 +0000 Subject: [PATCH] * random.c (random_rand): subtraction method of non-numeric can return Float, and add the result of random to the beginning of range, not the opposite. [ruby-dev:41410] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ random.c | 10 +++++++--- test/ruby/test_rand.rb | 3 +++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0663ba3418..6644323057 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed May 26 12:08:06 2010 Nobuyoshi Nakada + + * random.c (random_rand): subtraction method of non-numeric can + return Float, and add the result of random to the beginning of + range, not the opposite. [ruby-dev:41410] + Wed May 26 11:50:09 2010 Eric Hodel * marshal.c (Init_marshal): document marshal_dump and marshal_load. diff --git a/random.c b/random.c index b2abca78d1..b6ed02992f 100644 --- a/random.c +++ b/random.c @@ -1077,9 +1077,13 @@ random_rand(int argc, VALUE *argv, VALUE obj) switch (TYPE(v)) { case T_BIGNUM: return rb_big_plus(v, beg); - case T_FLOAT: - RFLOAT_VALUE(v) += RFLOAT_VALUE(rb_check_to_float(beg)); - return v; + case T_FLOAT: { + VALUE f = rb_check_to_float(beg); + if (!NIL_P(f)) { + RFLOAT_VALUE(v) += RFLOAT_VALUE(f); + return v; + } + } default: return rb_funcall2(v, id_plus, 1, &beg); } diff --git a/test/ruby/test_rand.rb b/test/ruby/test_rand.rb index b4adc8eaf5..ed74c5b211 100644 --- a/test/ruby/test_rand.rb +++ b/test/ruby/test_rand.rb @@ -357,6 +357,9 @@ END v = r.rand(3.1..4) assert_instance_of(Float, v, '[ruby-core:24679]') assert_includes(3.1..4, v) + + now = Time.now + assert_equal(now, r.rand(now..now)) end def test_random_float