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

* time.c (num_exact): fix for mathn. [ruby-dev:41599]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2010-06-22 14:13:09 +00:00
parent 7d8d8c4f59
commit bf8cec6db1
2 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Jun 22 23:10:10 2010 Tanaka Akira <akr@fsij.org>
* time.c (num_exact): fix for mathn. [ruby-dev:41599]
Tue Jun 22 22:00:06 2010 Tanaka Akira <akr@fsij.org>
* ext/socket/lib/socket.rb: suppress warnings.

51
time.c
View file

@ -656,35 +656,50 @@ wmod(wideval_t wx, wideval_t wy)
static VALUE
num_exact(VALUE v)
{
switch (TYPE(v)) {
VALUE tmp;
int t;
t = TYPE(v);
switch (t) {
case T_FIXNUM:
case T_BIGNUM:
case T_RATIONAL:
break;
return v;
case T_FLOAT:
v = rb_convert_type(v, T_RATIONAL, "Rational", "to_r");
case T_RATIONAL:
break;
case T_STRING:
case T_NIL:
goto typeerror;
default: {
VALUE tmp;
if (!NIL_P(tmp = rb_check_convert_type(v, T_RATIONAL, "Rational", "to_r"))) {
if (rb_respond_to(v, rb_intern("to_str"))) goto typeerror;
default:
if ((tmp = rb_check_funcall(v, rb_intern("to_r"), 0, NULL)) != Qundef) {
if (rb_respond_to(v, rb_intern("to_str"))) goto typeerror;
v = tmp;
}
else if (!NIL_P(tmp = rb_check_to_integer(v, "to_int")))
v = tmp;
else {
typeerror:
rb_raise(rb_eTypeError, "can't convert %s into an exact number",
NIL_P(v) ? "nil" : rb_obj_classname(v));
break;
}
if (!NIL_P(tmp = rb_check_to_integer(v, "to_int"))) {
v = tmp;
break;
}
goto typeerror;
}
t = TYPE(v);
switch (t) {
case T_FIXNUM:
case T_BIGNUM:
return v;
case T_RATIONAL:
if (RRATIONAL(v)->den == INT2FIX(1))
v = RRATIONAL(v)->num;
break;
}
default:
typeerror:
rb_raise(rb_eTypeError, "can't convert %s into an exact number",
NIL_P(v) ? "nil" : rb_obj_classname(v));
}
return v;
}
@ -3140,7 +3155,7 @@ time_to_r(VALUE time)
GetTimeval(time, tobj);
v = w2v(rb_time_unmagnify(tobj->timew));
if (TYPE(v) != T_RATIONAL) {
v = rb_convert_type(v, T_RATIONAL, "Rational", "to_r");
v = rb_Rational1(v);
}
return v;
}