* numeric.c (num_quo): should return a Float for a Float argument.

  [ruby-dev:44710] [Bug #5515]

* test/ruby/test_fixnum.rb: Add an assertion for the above change.

* test/ruby/test_bignum.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 8 deletions

diff --git a/numeric.c b/numeric.c
index 89544dc745..e8d2f9df25 100644
--- a/numeric.c
+++ b/numeric.c
@@ -371,29 +371,34 @@ num_uminus(VALUE num)
 
 /*
  *  call-seq:
- *     num.quo(numeric)  ->  real
+ *     num.fdiv(numeric)  ->  float
  *
- *  Returns most exact division (rational for integers, float for floats).
+ *  Returns float division.
  */
 
 static VALUE
-num_quo(VALUE x, VALUE y)
+num_fdiv(VALUE x, VALUE y)
 {
-    return rb_funcall(rb_rational_raw1(x), '/', 1, y);
+    return rb_funcall(rb_Float(x), '/', 1, y);
 }
 
 
 /*
  *  call-seq:
- *     num.fdiv(numeric)  ->  float
+ *     num.quo(int_or_rat)   ->  rat
+ *     num.quo(flo)          ->  flo
  *
- *  Returns float division.
+ *  Returns most exact division (rational for integers, float for floats).
  */
 
 static VALUE
-num_fdiv(VALUE x, VALUE y)
+num_quo(VALUE x, VALUE y)
 {
-    return rb_funcall(rb_Float(x), '/', 1, y);
+    if (RB_TYPE_P(y, T_FLOAT)) {
+        return num_fdiv(x, y);
+    }
+
+    return rb_funcall(rb_rational_raw1(x), '/', 1, y);
 }