kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Refine time_to_r

Browse source 
* time.c (time_to_r): get rid canonicalize and uncanonicalize
  one-denominator rational, by rb_time_unmagnify_to_rational.
This commit is contained in:
Nobuyoshi Nakada 2019-08-06 23:39:14 +09:00
parent a04e3585d3
commit 0ed298f382
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
time.c
View file

@ -141,9 +141,8 @@ modv(VALUE x, VALUE y)
#define neg(x) (subv(INT2FIX(0), (x))) #define neg(x) (subv(INT2FIX(0), (x)))
static VALUE static VALUE
quov(VALUE x, VALUE y) quor(VALUE x, VALUE y)
{ {
VALUE ret;
if (FIXNUM_P(x) && FIXNUM_P(y)) { if (FIXNUM_P(x) && FIXNUM_P(y)) {
long a, b, c; long a, b, c;
a = FIX2LONG(x); a = FIX2LONG(x);
@ -155,7 +154,13 @@ quov(VALUE x, VALUE y)
return LONG2FIX(c); return LONG2FIX(c);
} }
} }
ret = rb_numeric_quo(x, y); return rb_numeric_quo(x, y);
}
static VALUE
quov(VALUE x, VALUE y)
{
VALUE ret = quor(x, y);
if (RB_TYPE_P(ret, T_RATIONAL) && if (RB_TYPE_P(ret, T_RATIONAL) &&
RRATIONAL(ret)->den == INT2FIX(1)) { RRATIONAL(ret)->den == INT2FIX(1)) {
ret = RRATIONAL(ret)->num; ret = RRATIONAL(ret)->num;
@ -548,10 +553,16 @@ rb_time_magnify(wideval_t w)
return wmul(w, WINT2FIXWV(TIME_SCALE)); return wmul(w, WINT2FIXWV(TIME_SCALE));
} }
static VALUE
rb_time_unmagnify_to_rational(wideval_t w)
{
return quor(w2v(w), INT2FIX(TIME_SCALE));
}
static wideval_t static wideval_t
rb_time_unmagnify(wideval_t w) rb_time_unmagnify(wideval_t w)
{ {
return wquo(w, WINT2FIXWV(TIME_SCALE)); return v2w(rb_time_unmagnify_to_rational(w));
} }
static VALUE static VALUE
@ -3549,7 +3560,7 @@ time_to_r(VALUE time)
VALUE v; VALUE v;
GetTimeval(time, tobj); GetTimeval(time, tobj);
v = w2v(rb_time_unmagnify(tobj->timew)); v = rb_time_unmagnify_to_rational(tobj->timew);
if (!RB_TYPE_P(v, T_RATIONAL)) { if (!RB_TYPE_P(v, T_RATIONAL)) {
v = rb_Rational1(v); v = rb_Rational1(v);
} }