mrkn	2018-02-28 01:45:09 +0900 (Wed, 28 Feb 2018)

  New Revision: 62598

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62598

  Log:
    Support two `to_r`-responding args in Rational()
    
    * rational.c (nurat_s_convert): call `to_r` to convert non-Numeric
      objects also if argc == 2 in Rational().
    
    * test/ruby/test_rational.rb: add tests.

  Modified files:
    trunk/rational.c
    trunk/test/ruby/test_rational.rb
Index: test/ruby/test_rational.rb
===================================================================
--- test/ruby/test_rational.rb	(revision 62597)
+++ test/ruby/test_rational.rb	(revision 62598)
@@ -120,7 +120,32 @@ class Rational_Test < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/test/ruby/test_rational.rb#L120
     assert_raise_with_message(ArgumentError, /\u{221a 2668}/) {
       Rational("\u{221a 2668}")
     }
+
     assert_raise(TypeError){Rational(Object.new)}
+    assert_raise(TypeError){Rational(Object.new, Object.new)}
+    assert_raise(TypeError){Rational(1, Object.new)}
+
+    o = Object.new
+    def o.to_r; 1/42r; end
+    assert_equal(1/42r, Rational(o))
+    assert_equal(1/84r, Rational(o, 2))
+    assert_equal(42, Rational(1, o))
+    assert_equal(1, Rational(o, o))
+
+    o = Object.new
+    def o.to_r; nil; end
+    assert_raise(TypeError) { Rational(o) }
+    assert_raise(TypeError) { Rational(o, 2) }
+    assert_raise(TypeError) { Rational(1, o) }
+    assert_raise(TypeError) { Rational(o, o) }
+
+    o = Object.new
+    def o.to_r; raise; end
+    assert_raise(RuntimeError) { Rational(o) }
+    assert_raise(RuntimeError) { Rational(o, 2) }
+    assert_raise(RuntimeError) { Rational(1, o) }
+    assert_raise(RuntimeError) { Rational(o, o) }
+
     assert_raise(ArgumentError){Rational()}
     assert_raise(ArgumentError){Rational(1,2,3)}
 
Index: rational.c
===================================================================
--- rational.c	(revision 62597)
+++ rational.c	(revision 62598)
@@ -2548,6 +2548,12 @@ nurat_s_convert(int argc, VALUE *argv, V https://github.com/ruby/ruby/blob/trunk/rational.c#L2548
 	    return rb_convert_type_with_id(a1, T_RATIONAL, "Rational", idTo_r);
     }
     else {
+        if (!k_numeric_p(a1)) {
+            a1 = rb_check_convert_type_with_id(a1, T_RATIONAL, "Rational", idTo_r);
+        }
+        if (!k_numeric_p(a2)) {
+            a2 = rb_check_convert_type_with_id(a2, T_RATIONAL, "Rational", idTo_r);
+        }
 	if ((k_numeric_p(a1) && k_numeric_p(a2)) &&
 	    (!f_integer_p(a1) || !f_integer_p(a2)))
 	    return f_div(a1, a2);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/