diff options
author | Kenta Murata <mrkn@users.noreply.github.com> | 2020-10-26 18:43:30 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-26 18:43:30 +0900 |
commit | 69837229d74813c807e9d079aaee33aec2c7a4d0 (patch) | |
tree | 8610aa69e9a24fcb2815f018b8e79aa19d165bd7 | |
parent | 52c630da004d9273e8e5fc91c6304e9eed902566 (diff) |
rational.c: convert a numerator to rational before calling fdiv in Kernel.Rational() (#3702)
This makes `Rational(BigDecimal(1), 60) == Rational(1, 60)`.
[Bug #16518]
Notes
Notes:
Merged-By: mrkn <mrkn@ruby-lang.org>
-rw-r--r-- | rational.c | 10 | ||||
-rw-r--r-- | test/ruby/test_rational.rb | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/rational.c b/rational.c index 31768702a5..abf33313bb 100644 --- a/rational.c +++ b/rational.c @@ -2673,8 +2673,16 @@ nurat_convert(VALUE klass, VALUE numv, VALUE denv, int raise) } } if ((k_numeric_p(a1) && k_numeric_p(a2)) && - (!f_integer_p(a1) || !f_integer_p(a2))) + (!f_integer_p(a1) || !f_integer_p(a2))) { + VALUE tmp = rb_protect(to_rational, a1, &state); + if (!state) { + a1 = tmp; + } + else { + rb_set_errinfo(Qnil); + } return f_div(a1, a2); + } } a1 = nurat_int_value(a1); diff --git a/test/ruby/test_rational.rb b/test/ruby/test_rational.rb index 5bdf5b717e..e89b74d39e 100644 --- a/test/ruby/test_rational.rb +++ b/test/ruby/test_rational.rb @@ -165,6 +165,14 @@ class Rational_Test < Test::Unit::TestCase if (1.0/0).infinite? assert_raise(FloatDomainError){Rational(1.0/0)} end + + bug16518 = "[ruby-core:96942] [Bug #16518]" + cls = Class.new(Numeric) do + def /(y); 42; end + def to_r; 1r; end + def to_int; 1; end + end + assert_equal(1/2r, Rational(cls.new, 2)) end def test_attr |