mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* random.c (rand_init, random_load): use already defined macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
8e6ea3712b
commit
ebbe19e1ad
1 changed files with 7 additions and 7 deletions
14
random.c
14
random.c
|
@ -318,7 +318,7 @@ rand_init(struct MT *mt, VALUE vseed)
|
||||||
for (i = (int)(blen-1); 0 <= i; i--) {
|
for (i = (int)(blen-1); 0 <= i; i--) {
|
||||||
j = i * SIZEOF_BDIGITS / SIZEOF_INT32;
|
j = i * SIZEOF_BDIGITS / SIZEOF_INT32;
|
||||||
#if SIZEOF_BDIGITS < SIZEOF_INT32
|
#if SIZEOF_BDIGITS < SIZEOF_INT32
|
||||||
buf[j] <<= SIZEOF_BDIGITS * CHAR_BIT;
|
buf[j] <<= BITSPERDIG;
|
||||||
#endif
|
#endif
|
||||||
buf[j] |= RBIGNUM_DIGITS(seed)[i];
|
buf[j] |= RBIGNUM_DIGITS(seed)[i];
|
||||||
if (!len && buf[j]) len = j;
|
if (!len && buf[j]) len = j;
|
||||||
|
@ -590,13 +590,13 @@ random_load(VALUE obj, VALUE dump)
|
||||||
x = FIX2ULONG(state);
|
x = FIX2ULONG(state);
|
||||||
mt->state[0] = (unsigned int)x;
|
mt->state[0] = (unsigned int)x;
|
||||||
#if SIZEOF_LONG / SIZEOF_INT >= 2
|
#if SIZEOF_LONG / SIZEOF_INT >= 2
|
||||||
mt->state[1] = (unsigned int)(x >> CHAR_BIT * SIZEOF_BDIGITS);
|
mt->state[1] = (unsigned int)(x >> BITSPERDIG);
|
||||||
#endif
|
#endif
|
||||||
#if SIZEOF_LONG / SIZEOF_INT >= 3
|
#if SIZEOF_LONG / SIZEOF_INT >= 3
|
||||||
mt->state[2] = (unsigned int)(x >> 2 * CHAR_BIT * SIZEOF_BDIGITS);
|
mt->state[2] = (unsigned int)(x >> 2 * BITSPERDIG);
|
||||||
#endif
|
#endif
|
||||||
#if SIZEOF_LONG / SIZEOF_INT >= 4
|
#if SIZEOF_LONG / SIZEOF_INT >= 4
|
||||||
mt->state[3] = (unsigned int)(x >> 3 * CHAR_BIT * SIZEOF_BDIGITS);
|
mt->state[3] = (unsigned int)(x >> 3 * BITSPERDIG);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -616,7 +616,7 @@ random_load(VALUE obj, VALUE dump)
|
||||||
# else
|
# else
|
||||||
x = 0;
|
x = 0;
|
||||||
do {
|
do {
|
||||||
x = (x << CHAR_BIT * SIZEOF_BDIGITS) | *--d;
|
x = (x << BITSPERDIG) | *--d;
|
||||||
} while (--len % DIGSPERINT);
|
} while (--len % DIGSPERINT);
|
||||||
# endif
|
# endif
|
||||||
mt->state[len / DIGSPERINT] = (unsigned int)x;
|
mt->state[len / DIGSPERINT] = (unsigned int)x;
|
||||||
|
@ -629,10 +629,10 @@ random_load(VALUE obj, VALUE dump)
|
||||||
x = *--d;
|
x = *--d;
|
||||||
# if DIGSPERINT == 2
|
# if DIGSPERINT == 2
|
||||||
--len;
|
--len;
|
||||||
x = (x << CHAR_BIT * SIZEOF_BDIGITS) | *--d;
|
x = (x << BITSPERDIG) | *--d;
|
||||||
# elif SIZEOF_BDIGITS < SIZEOF_INT
|
# elif SIZEOF_BDIGITS < SIZEOF_INT
|
||||||
do {
|
do {
|
||||||
x = (x << CHAR_BIT * SIZEOF_BDIGITS) | *--d;
|
x = (x << BITSPERDIG) | *--d;
|
||||||
} while (--len % DIGSPERINT);
|
} while (--len % DIGSPERINT);
|
||||||
# endif
|
# endif
|
||||||
mt->state[len / DIGSPERINT] = (unsigned int)x;
|
mt->state[len / DIGSPERINT] = (unsigned int)x;
|
||||||
|
|
Loading…
Reference in a new issue