diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-05 01:45:39 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-05 01:45:39 +0000 |
| commit | 61277d473cba50897bdce62ee0045983106999df (patch) | |
| tree | c5408e7fec4141ce4ff40083eec16cc3f0105557 /rational.c | |
| parent | f7bd8a08ec161a5a6cb079313559fb3b4fc5861d (diff) | |
merge revision(s) 58523: [Backport #13528]
rational.c: canonicalization case
* rational.c (float_numerator, float_denominator): fix for
canonicalization case where `Float#to_r` could return an Integer
not a Rational. although mathn.rb has been removed in the
trunk, fix for the backport purpose.
[ruby-core:80942] [Bug #13528]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'rational.c')
| -rw-r--r-- | rational.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/rational.c b/rational.c index 460f82cfeb..6786131bce 100644 --- a/rational.c +++ b/rational.c @@ -2022,9 +2022,14 @@ static VALUE float_numerator(VALUE self) { double d = RFLOAT_VALUE(self); + VALUE r; if (isinf(d) || isnan(d)) return self; - return nurat_numerator(float_to_r(self)); + r = float_to_r(self); + if (canonicalization && k_integer_p(r)) { + return r; + } + return nurat_numerator(r); } /* @@ -2040,9 +2045,14 @@ static VALUE float_denominator(VALUE self) { double d = RFLOAT_VALUE(self); + VALUE r; if (isinf(d) || isnan(d)) return INT2FIX(1); - return nurat_denominator(float_to_r(self)); + r = float_to_r(self); + if (canonicalization && k_integer_p(r)) { + return ONE; + } + return nurat_denominator(r); } /* |