mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* time.c (num_exact): use to_r for T_FLOAT.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
36b84733f4
commit
841cf3b948
2 changed files with 5 additions and 48 deletions
|
@ -1,3 +1,7 @@
|
|||
Thu Jul 2 05:37:38 2009 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* time.c (num_exact): use to_r for T_FLOAT.
|
||||
|
||||
Thu Jul 2 05:15:54 2009 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* time.c (quo): return an integer if possible.
|
||||
|
|
49
time.c
49
time.c
|
@ -154,55 +154,8 @@ num_exact(VALUE v)
|
|||
break;
|
||||
|
||||
case T_FLOAT:
|
||||
{
|
||||
double d = NUM2DBL(v);
|
||||
int exp;
|
||||
static long r = 0;
|
||||
static int n = 0;
|
||||
if (r == 0) {
|
||||
long rr = FLT_RADIX;
|
||||
int nn = 1;
|
||||
while (rr < FIXNUM_MAX / FLT_RADIX) {
|
||||
rr *= FLT_RADIX;
|
||||
nn++;
|
||||
}
|
||||
n = nn;
|
||||
r = rr;
|
||||
}
|
||||
d = frexp(d, &exp);
|
||||
v = INT2FIX(0);
|
||||
while (d != 0) {
|
||||
long u;
|
||||
exp -= n;
|
||||
d *= r;
|
||||
v = mul(v, LONG2FIX(r));
|
||||
u = (long)d;
|
||||
d -= u;
|
||||
v = add(v, LONG2FIX(u));
|
||||
}
|
||||
if (exp < 0) {
|
||||
VALUE w;
|
||||
w = INT2FIX(1);
|
||||
if (FLT_RADIX == 2)
|
||||
w = lshift(w, INT2FIX(-exp));
|
||||
else
|
||||
while (exp) {
|
||||
w = mul(w, INT2FIX(FLT_RADIX));
|
||||
exp++;
|
||||
}
|
||||
v = quo(v, w);
|
||||
}
|
||||
else {
|
||||
if (FLT_RADIX == 2)
|
||||
v = lshift(v, INT2FIX(exp));
|
||||
else
|
||||
while (exp) {
|
||||
v = mul(v, INT2FIX(FLT_RADIX));
|
||||
exp--;
|
||||
}
|
||||
}
|
||||
v = rb_convert_type(v, T_RATIONAL, "Rational", "to_r");
|
||||
break;
|
||||
}
|
||||
|
||||
case T_NIL:
|
||||
goto typeerror;
|
||||
|
|
Loading…
Reference in a new issue