archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 59986: [Backport #13928]

Browse source 
numeric.c: use NUM2DBL

	* 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/branches/ruby_2_4@62171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-02-03 02:05:17 +00:00
parent e25eace6a6
commit 05ba99388d
5 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bignum.c
View file

@ -6159,7 +6159,7 @@ rb_big_fdiv_double(VALUE x, VALUE y)
return big_fdiv_float(x, y);
}
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;
}

2
numeric.c
View file

@ -3629,7 +3629,7 @@ fix_fdiv_double(VALUE x, VALUE y)
return (double)FIX2LONG(x) / RFLOAT_VALUE(y);
}
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
def o.coerce(x); [x, 2**100]; end
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
def test_singleton_method

15
test/ruby/test_integer.rb
View file

@ -464,4 +464,19 @@ class TestInteger < Test::Unit::TestCase
end
assert_equal([0, 1], 10.digits(o))
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

8
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.4.4"
#define RUBY_RELEASE_DATE "2018-01-15"
#define RUBY_PATCHLEVEL 228
#define RUBY_RELEASE_DATE "2018-02-03"
#define RUBY_PATCHLEVEL 229
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 15
#define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 3
#include "ruby/version.h"