summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-01 20:17:00 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-01 20:17:00 +0000
commit36b84733f4493ef6c259ac9cc83291980cd68c36 (patch)
treed9467c8d9492daab89bdceffeaba0918028f5c7e /time.c
parent2cb0c380143550469504d1fef6af16d40cd7d365 (diff)
* time.c (quo): return an integer if possible.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/time.c b/time.c
index a0fdcef468..09afb57be5 100644
--- a/time.c
+++ b/time.c
@@ -112,13 +112,24 @@ static ID id_eq, id_ne, id_quo, id_div, id_cmp, id_lshift;
#define add(x,y) (rb_funcall((x), '+', 1, (y)))
#define sub(x,y) (rb_funcall((x), '-', 1, (y)))
#define mul(x,y) (rb_funcall((x), '*', 1, (y)))
-#define quo(x,y) (rb_funcall((x), id_quo, 1, (y)))
#define div(x,y) (rb_funcall((x), id_div, 1, (y)))
#define mod(x,y) (rb_funcall((x), '%', 1, (y)))
#define neg(x) (sub(INT2FIX(0), (x)))
#define cmp(x,y) (rb_funcall((x), id_cmp, 1, (y)))
#define lshift(x,y) (rb_funcall((x), id_lshift, 1, (y)))
+static VALUE
+quo(VALUE x, VALUE y)
+{
+ VALUE ret;
+ ret = rb_funcall((x), id_quo, 1, (y));
+ if (TYPE(ret) == T_RATIONAL &&
+ ((struct RRational *)ret)->den == INT2FIX(1)) {
+ ret = ((struct RRational *)ret)->num;
+ }
+ return ret;
+}
+
static void
divmodv(VALUE n, VALUE d, VALUE *q, VALUE *r)
{