summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-20 09:47:20 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-20 09:47:20 +0000
commitcb390bef8ae68a766a1a46f71fecbf7d31a9a9cc (patch)
treeb0db26e71737773a1f970778847adba159a1c5e9 /time.c
parenta2b4c6d1b1c4bc0176b94563bfd77c7930eeee7f (diff)
downloadruby-cb390bef8ae68a766a1a46f71fecbf7d31a9a9cc.tar.gz
* time.c (add): remove FIXABLE() which is in LONG2NUM().
* time.c (sub): ditto. * time.c (mul): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/time.c b/time.c
index 80eacf07f1..c51bd5bff7 100644
--- a/time.c
+++ b/time.c
@@ -75,9 +75,7 @@ static VALUE
add(VALUE x, VALUE y)
{
if (FIXNUM_P(x) && FIXNUM_P(y)) {
- long l = FIX2LONG(x) + FIX2LONG(y);
- if (FIXABLE(l)) return LONG2FIX(l);
- return LONG2NUM(l);
+ return LONG2NUM(FIX2LONG(x) + FIX2LONG(y));
}
if (RB_TYPE_P(x, T_BIGNUM)) return rb_big_plus(x, y);
return rb_funcall(x, '+', 1, y);
@@ -87,9 +85,7 @@ static VALUE
sub(VALUE x, VALUE y)
{
if (FIXNUM_P(x) && FIXNUM_P(y)) {
- long l = FIX2LONG(x) - FIX2LONG(y);
- if (FIXABLE(l)) return LONG2FIX(l);
- return LONG2NUM(l);
+ return LONG2NUM(FIX2LONG(x) - FIX2LONG(y));
}
if (RB_TYPE_P(x, T_BIGNUM)) return rb_big_minus(x, y);
return rb_funcall(x, '-', 1, y);
@@ -144,10 +140,7 @@ mul(VALUE x, VALUE y)
{
if (FIXNUM_P(x) && FIXNUM_P(y)) {
#if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG
- LONG_LONG ll = (LONG_LONG)FIX2LONG(x) * FIX2LONG(y);
- if (FIXABLE(ll))
- return LONG2FIX(ll);
- return LL2NUM(ll);
+ return LL2NUM((LONG_LONG)FIX2LONG(x) * FIX2LONG(y));
#else
long z;
if (long_mul(FIX2LONG(x), FIX2LONG(y), &z))