1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hoisted out ndigits_denominator

Browse Source 
* time.c (ndigits_denominator): calculate the denominator for
  digits.
This commit is contained in:
Nobuyoshi Nakada 2019-05-24 15:07:38 +09:00
parent 54d5b599e8
commit 1a4080cb0a
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
1 changed files with 24 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
time.c
View File

@ -4159,6 +4159,21 @@ rb_time_succ(VALUE time)
#define time_succ rb_time_succ #define time_succ rb_time_succ
static VALUE
ndigits_denominator(VALUE ndigits)
{
long nd = NUM2LONG(ndigits);
if (nd < 0) {
rb_raise(rb_eArgError, "negative ndigits given");
}
if (nd == 0) {
return INT2FIX(1);
}
return rb_rational_new(INT2FIX(1),
rb_int_positive_pow(10, (unsigned long)nd));
}
/* /*
* call-seq: * call-seq:
* time.round([ndigits]) -> new_time * time.round([ndigits]) -> new_time
@ -4193,31 +4208,17 @@ rb_time_succ(VALUE time)
static VALUE static VALUE
time_round(int argc, VALUE *argv, VALUE time) time_round(int argc, VALUE *argv, VALUE time)
{ {
VALUE ndigits, v, a, b, den; VALUE ndigits, v, den;
long nd;
struct time_object *tobj; struct time_object *tobj;
if (!rb_check_arity(argc, 0, 1) || NIL_P(ndigits = argv[0])) if (!rb_check_arity(argc, 0, 1) || NIL_P(ndigits = argv[0]))
ndigits = INT2FIX(0); den = INT2FIX(1);
else else
ndigits = rb_to_int(ndigits); den = ndigits_denominator(ndigits);
nd = NUM2LONG(ndigits);
if (nd < 0)
rb_raise(rb_eArgError, "negative ndigits given");
GetTimeval(time, tobj); GetTimeval(time, tobj);
v = w2v(rb_time_unmagnify(tobj->timew)); v = w2v(rb_time_unmagnify(tobj->timew));
a = INT2FIX(1);
b = INT2FIX(10);
while (0 < nd) {
if (nd & 1)
a = mulv(a, b);
b = mulv(b, b);
nd = nd >> 1;
}
den = quov(INT2FIX(1), a);
v = modv(v, den); v = modv(v, den);
if (lt(v, quov(den, INT2FIX(2)))) if (lt(v, quov(den, INT2FIX(2))))
return time_add(tobj, time, v, -1); return time_add(tobj, time, v, -1);
@ -4257,31 +4258,17 @@ time_round(int argc, VALUE *argv, VALUE time)
static VALUE static VALUE
time_floor(int argc, VALUE *argv, VALUE time) time_floor(int argc, VALUE *argv, VALUE time)
{ {
VALUE ndigits, v, a, b, den; VALUE ndigits, v, den;
long nd;
struct time_object *tobj; struct time_object *tobj;
if (!rb_check_arity(argc, 0, 1) || NIL_P(ndigits = argv[0])) if (!rb_check_arity(argc, 0, 1) || NIL_P(ndigits = argv[0]))
ndigits = INT2FIX(0); den = INT2FIX(1);
else else
ndigits = rb_to_int(ndigits); den = ndigits_denominator(ndigits);
nd = NUM2LONG(ndigits);
if (nd < 0)
rb_raise(rb_eArgError, "negative ndigits given");
GetTimeval(time, tobj); GetTimeval(time, tobj);
v = w2v(rb_time_unmagnify(tobj->timew)); v = w2v(rb_time_unmagnify(tobj->timew));
a = INT2FIX(1);
b = INT2FIX(10);
while (0 < nd) {
if (nd & 1)
a = mulv(a, b);
b = mulv(b, b);
nd = nd >> 1;
}
den = quov(INT2FIX(1), a);
v = modv(v, den); v = modv(v, den);
return time_add(tobj, time, v, -1); return time_add(tobj, time, v, -1);
} }
@ -4318,31 +4305,17 @@ time_floor(int argc, VALUE *argv, VALUE time)
static VALUE static VALUE
time_ceil(int argc, VALUE *argv, VALUE time) time_ceil(int argc, VALUE *argv, VALUE time)
{ {
VALUE ndigits, v, a, b, den; VALUE ndigits, v, den;
long nd;
struct time_object *tobj; struct time_object *tobj;
if (!rb_check_arity(argc, 0, 1) || NIL_P(ndigits = argv[0])) if (!rb_check_arity(argc, 0, 1) || NIL_P(ndigits = argv[0]))
ndigits = INT2FIX(0); den = INT2FIX(1);
else else
ndigits = rb_to_int(ndigits); den = ndigits_denominator(ndigits);
nd = NUM2LONG(ndigits);
if (nd < 0)
rb_raise(rb_eArgError, "negative ndigits given");
GetTimeval(time, tobj); GetTimeval(time, tobj);
v = w2v(rb_time_unmagnify(tobj->timew)); v = w2v(rb_time_unmagnify(tobj->timew));
a = INT2FIX(1);
b = INT2FIX(10);
while (0 < nd) {
if (nd & 1)
a = mulv(a, b);
b = mulv(b, b);
nd = nd >> 1;
}
den = quov(INT2FIX(1), a);
v = modv(v, den); v = modv(v, den);
return time_add(tobj, time, subv(den, v), 1); return time_add(tobj, time, subv(den, v), 1);
} }