diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-09 02:31:23 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-09 02:31:23 +0000 |
| commit | c56edb9a59488f5efb6b6cbe02ac9db10bc0e6d3 (patch) | |
| tree | 13bb3e499ace099af85fe5679e763f5fba3a16de /object.c | |
| parent | 35fde4da0bef35b1f0e240549ed3307a3f0c0fca (diff) | |
revert RB_FIXABLE related changesets [Bug #13288][Bug #13293][Bug #13294]
This commit is auto-generated using following command:
svn diff -r57807:57788 include internal.h bignum.c numeric.c compile.c insns.def object.c sprintf.c | patch -p0
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'object.c')
| -rw-r--r-- | object.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -2747,8 +2747,11 @@ rb_convert_to_integer(VALUE val, int base) VALUE tmp; if (RB_FLOAT_TYPE_P(val)) { + double f; if (base != 0) goto arg_error; - return rb_dbl2ival(RFLOAT_VALUE(val)); + f = RFLOAT_VALUE(val); + if (FIXABLE(f)) return LONG2FIX((long)f); + return rb_dbl2big(f); } else if (RB_INTEGER_TYPE_P(val)) { if (base != 0) goto arg_error; |