diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-01 00:32:56 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-01 00:32:56 +0000 |
| commit | 75e3c77de48657fb438180b7ae2cc8f0470ec188 (patch) | |
| tree | 5ee29e2883b9598ea045c5ca693a0b9d966daa33 /rational.c | |
| parent | dcd38d4b184f97a25a359d28d93d8f6ea007957d (diff) | |
| download | ruby-75e3c77de48657fb438180b7ae2cc8f0470ec188.tar.gz | |
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/trunk@58523 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 11fcaed7fd..e845506850 100644 --- a/rational.c +++ b/rational.c @@ -2073,9 +2073,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); } /* @@ -2091,9 +2096,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); } /* |