diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-07 06:23:40 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-07 06:23:40 +0000 |
commit | 136c117fc1c5e396f71d2db0a192fb195bb5f37e (patch) | |
tree | 4f6e1378914b7d276e2caa190335dbd037b16037 /numeric.c | |
parent | a259db72b72c9cdf1059c15f6c99fdab3fbfc1a7 (diff) | |
download | ruby-136c117fc1c5e396f71d2db0a192fb195bb5f37e.tar.gz |
* numeric.c (rb_num2ull): use own switch sentense.
Current implementation can't convert 18446744073709551615.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r-- | numeric.c | 37 |
1 files changed, 35 insertions, 2 deletions
@@ -1973,10 +1973,43 @@ rb_num2ll(VALUE val) unsigned LONG_LONG rb_num2ull(VALUE val) { - if (TYPE(val) == T_BIGNUM) { + switch (TYPE(val)) { + case T_NIL: + rb_raise(rb_eTypeError, "no implicit conversion from nil"); + + case T_FIXNUM: + return (LONG_LONG)FIX2ULONG(val); + + case T_FLOAT: + if (RFLOAT_VALUE(val) < ULLONG_MAX_PLUS_ONE + && RFLOAT_VALUE(val) > 0) { + return (unsigned LONG_LONG)(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 unsgined long long", buf); + } + + case T_BIGNUM: return rb_big2ull(val); + + case T_STRING: + rb_raise(rb_eTypeError, "no implicit conversion from string"); + return Qnil; /* not reached */ + + case T_TRUE: + case T_FALSE: + rb_raise(rb_eTypeError, "no implicit conversion from boolean"); + return Qnil; /* not reached */ + + default: + val = rb_to_int(val); + return NUM2ULL(val); } - return (unsigned LONG_LONG)rb_num2ll(val); } #endif /* HAVE_LONG_LONG */ |