diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | random.c | 10 | ||||
-rw-r--r-- | test/ruby/test_rand.rb | 8 |
3 files changed, 20 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed Aug 26 23:58:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * random.c (random_rand): fixed for edge cases of ranges. + [ruby-dev:39166] + Wed Aug 26 21:49:23 2009 NARUSE, Yui <naruse@ruby-lang.org> * lib/tempfile.rb: add documents from Hongli Lai's fork. @@ -760,10 +760,11 @@ make_mask(unsigned long x) static unsigned long limited_rand(struct MT *mt, unsigned long limit) { - unsigned long mask = make_mask(limit); int i; - unsigned long val; + unsigned long val, mask; + if (!limit) return 0; + mask = make_mask(limit); retry: val = 0; for (i = SIZEOF_LONG/SIZEOF_INT32-1; 0 <= i; i--) { @@ -1016,7 +1017,7 @@ random_rand(int argc, VALUE *argv, VALUE obj) v = Qnil; if (FIXNUM_P(vmax)) { fixnum: - if ((max = FIX2LONG(vmax) - excl) > 0) { + if ((max = FIX2LONG(vmax) - excl) >= 0) { unsigned long r = limited_rand(&rnd->mt, (unsigned long)max); v = ULONG2NUM(r); } @@ -1042,6 +1043,9 @@ random_rand(int argc, VALUE *argv, VALUE obj) } v = rb_float_new(r * max); } + else if (max == 0.0 && !excl) { + v = rb_float_new(0.0); + } } } else { diff --git a/test/ruby/test_rand.rb b/test/ruby/test_rand.rb index 446211587f..b6563954cf 100644 --- a/test/ruby/test_rand.rb +++ b/test/ruby/test_rand.rb @@ -199,6 +199,14 @@ class TestRand < Test::Unit::TestCase assert_raise(ArgumentError, '[ruby-core:24677]') { r.rand(-1) } assert_raise(ArgumentError, '[ruby-core:24677]') { r.rand(-1.0) } assert_raise(ArgumentError, '[ruby-core:24677]') { r.rand(0) } + assert_equal(0, r.rand(1), '[ruby-dev:39166]') + assert_equal(0, r.rand(0...1), '[ruby-dev:39166]') + assert_equal(0, r.rand(0..0), '[ruby-dev:39166]') + assert_equal(0.0, r.rand(0.0..0.0), '[ruby-dev:39166]') + assert_raise(ArgumentError, '[ruby-dev:39166]') { r.rand(0...0) } + assert_raise(ArgumentError, '[ruby-dev:39166]') { r.rand(0..-1) } + assert_raise(ArgumentError, '[ruby-dev:39166]') { r.rand(0.0...0.0) } + assert_raise(ArgumentError, '[ruby-dev:39166]') { r.rand(0.0...-0.1) } end def test_random_seed |