1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* random.c (rand_init): ignore higher bits if all they are same as

Browse Source 
the lower sign bit.  [ruby-core:29292](2)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-04-07 22:22:36 +00:00
parent 0f58f9dbe7
commit f571492922
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Apr 8 07:22:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* random.c (rand_init): ignore higher bits if all they are same as
the lower sign bit. [ruby-core:29292](2)
Thu Apr 8 07:16:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Apr 8 07:16:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/irb/cmd/help.rb (IRB::ExtendCommand::Help#execute): use RI * lib/irb/cmd/help.rb (IRB::ExtendCommand::Help#execute): use RI

8
random.c
View File

@ -367,6 +367,7 @@ rand_init(struct MT *mt, VALUE vseed)
{ {
volatile VALUE seed; volatile VALUE seed;
long blen = 0; long blen = 0;
long fixnum_seed;
int i, j, len; int i, j, len;
unsigned int buf0[SIZEOF_LONG / SIZEOF_INT32 * 4], *buf = buf0; unsigned int buf0[SIZEOF_LONG / SIZEOF_INT32 * 4], *buf = buf0;
@ -374,9 +375,12 @@ rand_init(struct MT *mt, VALUE vseed)
switch (TYPE(seed)) { switch (TYPE(seed)) {
case T_FIXNUM: case T_FIXNUM:
len = 1; len = 1;
buf[0] = (unsigned int)(FIX2ULONG(seed) & 0xffffffff); fixnum_seed = FIX2LONG(seed);
buf[0] = (unsigned int)(fixnum_seed & 0xffffffff);
#if SIZEOF_LONG > SIZEOF_INT32 #if SIZEOF_LONG > SIZEOF_INT32
if ((buf[1] = (unsigned int)(FIX2ULONG(seed) >> 32)) != 0) ++len; if ((long)(int)fixnum_seed != fixnum_seed) {
if ((buf[1] = (unsigned int)(fixnum_seed >> 32)) != 0) ++len;
}
#endif #endif
break; break;
case T_BIGNUM: case T_BIGNUM:

7
test/ruby/test_rand.rb
View File

@ -398,4 +398,11 @@ END
assert(st.success?) assert(st.success?)
rescue NotImplementedError, ArgumentError rescue NotImplementedError, ArgumentError
end end
def test_seed
bug3104 = '[ruby-core:29292]'
rand_1 = Random.new(-1).rand
assert_not_equal(rand_1, Random.new((1 << 31) -1).rand, "#{bug3104} (2)")
assert_not_equal(rand_1, Random.new((1 << 63) -1).rand, "#{bug3104} (2)")
end
end end