summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rational.c14
-rw-r--r--version.h2
2 files changed, 13 insertions, 3 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);
}
/*
diff --git a/version.h b/version.h
index da628b993f..af8af5cb0c 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.2"
#define RUBY_RELEASE_DATE "2017-08-05"
-#define RUBY_PATCHLEVEL 173
+#define RUBY_PATCHLEVEL 174
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 8