kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* numeric.c (rb_num2ulong): use rb_big2ulong for data from

Browse source 
Bignum. Without this 32bit integer on 32bit environment
  can't converted into long.
  This fixes 1) and 2) of [ruby-dev:41289]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27890 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-05-19 09:22:59 +00:00
parent 230ffa11d7
commit 20eebb8542
2 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed May 19 16:55:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
* numeric.c (rb_num2ulong): use rb_big2ulong for data from
Bignum. Without this 32bit integer on 32bit environment
can't converted into long.
This fixes 1) and 2) of [ruby-dev:41289]
Mon May 17 22:19:16 2010 Yusuke Endoh <mame@tsg.ne.jp> Mon May 17 22:19:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
* process.c: suppress warning for signed and unsigned type * process.c: suppress warning for signed and unsigned type

31
numeric.c
View file

@ -1722,10 +1722,35 @@ rb_num2long(VALUE val)
VALUE VALUE
rb_num2ulong(VALUE val) rb_num2ulong(VALUE val)
{ {
if (TYPE(val) == T_BIGNUM) { again:
return rb_big2ulong(val); if (NIL_P(val)) {
rb_raise(rb_eTypeError, "no implicit conversion from nil to integer");
}
if (FIXNUM_P(val)) return FIX2LONG(val); /* this is FIX2LONG, inteneded */
switch (TYPE(val)) {
case T_FLOAT:
if (RFLOAT_VALUE(val) <= (double)LONG_MAX
&& RFLOAT_VALUE(val) >= (double)LONG_MIN) {
return (RFLOAT_VALUE(val));
}
else {
char buf[24];
char *s;
snprintf(buf, sizeof(buf), "%-.10g", RFLOAT_VALUE(val));
if ((s = strchr(buf, ' ')) != 0) *s = '\0';
rb_raise(rb_eRangeError, "float %s out of range of integer", buf);
}
case T_BIGNUM:
return rb_big2ulong(val);
default:
val = rb_to_int(val);
goto again;
} }
return (VALUE)rb_num2long(val);
} }
#if SIZEOF_INT < SIZEOF_VALUE #if SIZEOF_INT < SIZEOF_VALUE