1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

numeric.c: use NUM2DBL

Browse Source 
* numeric.c (fix_fdiv_double), bignum.c (rb_big_fdiv_double): use
  NUM2DBL on unknown object.  RFLOAT_VALUE is only appliicable to
  T_FLOAT object.  [ruby-core:82924] [Bug #13928]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59986 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-09-22 03:05:02 +00:00
parent e3bb5c4ba3
commit 24ef8ad190
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bignum.c
View File

@ -6176,7 +6176,7 @@ rb_big_fdiv_double(VALUE x, VALUE y)
return big_fdiv_float(x, y); return big_fdiv_float(x, y);
} }
else { else {
return RFLOAT_VALUE(rb_num_coerce_bin(x, y, rb_intern("fdiv"))); return NUM2DBL(rb_num_coerce_bin(x, y, rb_intern("fdiv")));
} }
return dx / dy; return dx / dy;
} }

2
numeric.c
View File

@ -3629,7 +3629,7 @@ fix_fdiv_double(VALUE x, VALUE y)
return (double)FIX2LONG(x) / RFLOAT_VALUE(y); return (double)FIX2LONG(x) / RFLOAT_VALUE(y);
} }
else { else {
return RFLOAT_VALUE(rb_num_coerce_bin(x, y, rb_intern("fdiv"))); return NUM2DBL(rb_num_coerce_bin(x, y, rb_intern("fdiv")));
} }
} }

4
test/ruby/test_bignum.rb
View File

@ -693,6 +693,10 @@ class TestBignum < Test::Unit::TestCase
o = Object.new o = Object.new
def o.coerce(x); [x, 2**100]; end def o.coerce(x); [x, 2**100]; end
assert_equal((2**200).to_f, (2**300).fdiv(o)) assert_equal((2**200).to_f, (2**300).fdiv(o))
o = Object.new
def o.coerce(x); [self, x]; end
def o.fdiv(x); 1; end
assert_equal(1.0, (2**300).fdiv(o))
end end
def test_singleton_method def test_singleton_method

15
test/ruby/test_integer.rb
View File

@ -510,4 +510,19 @@ class TestInteger < Test::Unit::TestCase
end end
assert_empty(failures, bug13440) assert_empty(failures, bug13440)
end end
def test_fdiv
assert_equal(1.0, 1.fdiv(1))
assert_equal(0.5, 1.fdiv(2))
end
def test_obj_fdiv
o = Object.new
def o.coerce(x); [x, 0.5]; end
assert_equal(2.0, 1.fdiv(o))
o = Object.new
def o.coerce(x); [self, x]; end
def o.fdiv(x); 1; end
assert_equal(1.0, 1.fdiv(o))
end
end end