From aca87391e9e21395d4597ec32c135e922f92c860 Mon Sep 17 00:00:00 2001 From: tadf Date: Thu, 9 Jun 2011 15:25:12 +0000 Subject: [PATCH] * rational.c (string_to_r): Rational#** may return flonum. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ rational.c | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc0a658dc8..55d1ec50d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Jun 10 00:24:04 2011 Tadayoshi Funaba + + * rational.c (string_to_r): Rational#** may return flonum. + Thu Jun 9 23:57:53 2011 Tanaka Akira * io.c: fix IO.copy_stream interrupt handling. diff --git a/rational.c b/rational.c index fa03062c06..b64d4dda8a 100644 --- a/rational.c +++ b/rational.c @@ -2152,7 +2152,7 @@ string_to_r_strict(VALUE self) static VALUE string_to_r(VALUE self) { - VALUE s, a, backref; + VALUE s, a, a1, backref; backref = rb_backref_get(); rb_match_busy(backref); @@ -2162,8 +2162,12 @@ string_to_r(VALUE self) rb_backref_set(backref); - if (!NIL_P(RARRAY_PTR(a)[0])) - return RARRAY_PTR(a)[0]; + a1 = RARRAY_PTR(a)[0]; + if (!NIL_P(a1)) { + if (TYPE(a1) == T_FLOAT) + rb_raise(rb_eFloatDomainError, "Infinity"); + return a1; + } return rb_rational_new1(INT2FIX(0)); }