diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-04 20:10:45 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-04 20:10:45 +0000 |
commit | 5f61a22950233184db0771ef743706f7c3f99371 (patch) | |
tree | 28ee455885b04363000385b59d057013ee7e8d76 | |
parent | bedda2d27f84ae4b28eed87671abc000e8a0eaf0 (diff) | |
download | ruby-5f61a22950233184db0771ef743706f7c3f99371.tar.gz |
* numeric.c (fix_plus): addition in Fixnum will never overflow
long. a patch from Ondrej Bilka <neleai at seznam.cz>.
[ruby-core:08794]
* numeric.c (fix_minus): ditto.
* bignum.c (rb_big_pow): eagerly truncate resulting bignum.
[ruby-core:08794]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | bignum.c | 2 | ||||
-rw-r--r-- | numeric.c | 10 |
3 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,14 @@ +Tue Sep 5 05:03:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * numeric.c (fix_plus): addition in Fixnum will never overflow + long. a patch from Ondrej Bilka <neleai at seznam.cz>. + [ruby-core:08794] + + * numeric.c (fix_minus): ditto. + + * bignum.c (rb_big_pow): eagerly truncate resulting bignum. + [ruby-core:08794] + Mon Sep 4 23:15:34 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * time.c (time_to_s): make it conform to RFC2822 date format. @@ -1553,8 +1553,10 @@ rb_big_pow(VALUE x, VALUE y) while (yy % 2 == 0) { yy /= 2; x = rb_big_mul0(x, x); + if (!BDIGITS(x)[RBIGNUM(x)->len-1]) RBIGNUM(x)->len--; } z = rb_big_mul0(z, x); + if (!BDIGITS(z)[RBIGNUM(z)->len-1]) RBIGNUM(z)->len--; } return bignorm(z); } @@ -1908,11 +1908,8 @@ fix_plus(VALUE x, VALUE y) a = FIX2LONG(x); b = FIX2LONG(y); c = a + b; - r = LONG2FIX(c); + r = LONG2NUM(c); - if (FIX2LONG(r) != c) { - r = rb_big_plus(rb_int2big(a), rb_int2big(b)); - } return r; } switch (TYPE(y)) { @@ -1944,11 +1941,8 @@ fix_minus(VALUE x, VALUE y) a = FIX2LONG(x); b = FIX2LONG(y); c = a - b; - r = LONG2FIX(c); + r = LONG2NUM(c); - if (FIX2LONG(r) != c) { - r = rb_big_minus(rb_int2big(a), rb_int2big(b)); - } return r; } switch (TYPE(y)) { |