diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | numeric.c | 29 |
2 files changed, 34 insertions, 2 deletions
@@ -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> * process.c: suppress warning for signed and unsigned type @@ -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 |