From fbb38d6d6afe264da33bbff0156dc21eb7cd6b36 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 1 May 2017 00:32:56 +0000 Subject: 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 --- rational.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'rational.c') 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); } /* -- cgit v1.2.3