kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

rational.c: may be float

Browse source 
* rational.c (f_muldiv): Integer#** can return Rational with Float
  right now.  [ruby-core:89212] [Bug #15175]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-09-29 00:45:41 +00:00
parent c655db5217
commit 36c4713e31
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
numeric.c
View file

@ -4034,7 +4034,13 @@ fix_pow(VALUE x, VALUE y)
}
if (BIGNUM_NEGATIVE_P(y)) {
if (a == 0) rb_num_zerodiv();
return rb_rational_raw(INT2FIX(1), rb_int_pow(x, rb_big_uminus(y)));
y = rb_int_pow(x, rb_big_uminus(y));
if (0 && RB_FLOAT_TYPE_P(y)) {
/* Maybe should return a Float */
double d = pow((double)a, RFLOAT_VALUE(y));
return DBL2NUM(d);
}
return rb_rational_raw(INT2FIX(1), y);
}
if (a == 0) return INT2FIX(0);
x = rb_int2big(FIX2LONG(x));

10
rational.c
View file

@ -805,6 +805,16 @@ f_muldiv(VALUE self, VALUE anum, VALUE aden, VALUE bnum, VALUE bden, int k)
VALUE num, den;
assert(RB_TYPE_P(self, T_RATIONAL));
/* Integer#** can return Rational with Float right now */
if (RB_FLOAT_TYPE_P(anum) || RB_FLOAT_TYPE_P(aden) ||
RB_FLOAT_TYPE_P(bnum) || RB_FLOAT_TYPE_P(bden)) {
double an = NUM2DBL(anum), ad = NUM2DBL(aden);
double bn = NUM2DBL(bnum), bd = NUM2DBL(bden);
double x = (an * bn) / (ad * bd);
return DBL2NUM(x);
}
assert(RB_INTEGER_TYPE_P(anum));
assert(RB_INTEGER_TYPE_P(aden));
assert(RB_INTEGER_TYPE_P(bnum));

3
test/ruby/test_integer.rb
View file

@ -24,6 +24,9 @@ class TestInteger < Test::Unit::TestCase
rescue
nil
end, "[ruby-dev:32084] [ruby-dev:34547]")
x = EnvUtil.suppress_warning {2 ** -0x4000000000000000}
assert_in_delta(0.0, (x / 2), Float::EPSILON)
end
def test_lshift