Merge pull request #5000 from yui-knk/fix_test_cmp

enebo · web-flow · commit eccb28ddcd6b · 2018-01-23T10:21:41.000-06:00
Accept `nil` as an argument of `Rational#&lt;=&gt;`
diff --git a/core/src/main/java/org/jruby/RubyRational.java b/core/src/main/java/org/jruby/RubyRational.java
@@ -674,7 +674,7 @@ public IRubyObject op_cmp(ThreadContext context, IRubyObject other) {
             }
             return f_cmp(context, f_sub(context, num1, num2), RubyFixnum.zero(context.runtime));
         }
-        return coerceBin(context, sites(context).op_cmp, other);
+        return coerceCmp(context, sites(context).op_cmp, other);
     }
 
     /** nurat_equal_p
diff --git a/test/mri/excludes/Rational_Test.rb b/test/mri/excludes/Rational_Test.rb
@@ -1,4 +1,3 @@
-exclude :test_cmp, "needs investigation"
 exclude :test_coerce, "needs investigation"
 exclude :test_coerce2, "needs investigation"
 exclude :test_conv, "needs investigation"

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ public IRubyObject op_cmp(ThreadContext context, IRubyObject other) {`
`674`	`674`	`}`
`675`	`675`	`return f_cmp(context, f_sub(context, num1, num2), RubyFixnum.zero(context.runtime));`
`676`	`676`	`}`
`677`		`- return coerceBin(context, sites(context).op_cmp, other);`
	`677`	`+ return coerceCmp(context, sites(context).op_cmp, other);`
`678`	`678`	`}`
`679`	`679`
`680`	`680`	`/** nurat_equal_p`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-exclude :test_cmp, "needs investigation"`
`2`	`1`	`exclude :test_coerce, "needs investigation"`
`3`	`2`	`exclude :test_coerce2, "needs investigation"`
`4`	`3`	`exclude :test_conv, "needs investigation"`