diff options
| author | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-18 13:41:44 +0000 |
|---|---|---|
| committer | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-18 13:41:44 +0000 |
| commit | 67f93ddc216c56298aeb9981fc36649987438457 (patch) | |
| tree | ceacba47fb0d461ee9846a40f194c2a87544bbb3 /rational.c | |
| parent | 430eb945ceeec646f30ee79302d2f265b25bc1ee (diff) | |
* rational.c (nurat_s_convert): calls to_r when the given argument
is non-integer.
* rational.c (nurat_s_convert): raises TypeError when the given
argument is nil.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'rational.c')
| -rw-r--r-- | rational.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/rational.c b/rational.c index a75235f65f..be441e01a2 100644 --- a/rational.c +++ b/rational.c @@ -1410,6 +1410,9 @@ nurat_s_convert(int argc, VALUE *argv, VALUE klass) rb_scan_args(argc, argv, "11", &a1, &a2); + if (NIL_P(a1) || (argc == 2 && NIL_P(a2))) + rb_raise(rb_eTypeError, "can't convert nil into Rational"); + switch (TYPE(a1)) { case T_COMPLEX: if (k_exact_p(RCOMPLEX(a1)->imag) && f_zero_p(RCOMPLEX(a1)->imag)) @@ -1458,8 +1461,8 @@ nurat_s_convert(int argc, VALUE *argv, VALUE klass) } if (argc == 1) { - if (k_numeric_p(a1) && !f_integer_p(a1)) - return a1; + if (!(k_numeric_p(a1) && k_integer_p(a1))) + return rb_convert_type(a1, T_RATIONAL, "Rational", "to_r"); } else { if ((k_numeric_p(a1) && k_numeric_p(a2)) && |