diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-19 09:22:59 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-19 09:22:59 +0000 |
commit | 20eebb8542143ffbccbace932ca0277ee16cf6f0 (patch) | |
tree | 869215ff48df73f9ee626c67a73ff1bbcfadaf59 /numeric.c | |
parent | 230ffa11d70c90ae1439b8953d8e3d343dc0582b (diff) |
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27890 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r-- | numeric.c | 29 |
1 files changed, 27 insertions, 2 deletions
@@ -1722,10 +1722,35 @@ rb_num2long(VALUE val) VALUE rb_num2ulong(VALUE val) { - if (TYPE(val) == T_BIGNUM) { + again: + 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 |