From 36b84733f4493ef6c259ac9cc83291980cd68c36 Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 1 Jul 2009 20:17:00 +0000 Subject: [PATCH] * 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 --- ChangeLog | 4 ++++ time.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5c4a47422f..1a8e614e8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Jul 2 05:15:54 2009 Tanaka Akira + + * time.c (quo): return an integer if possible. + Wed Jul 1 21:09:25 2009 Tanaka Akira * include/ruby/intern.h (rb_time_num_new): declared. 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) {