summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-23 16:22:04 +0000
committermrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-23 16:22:04 +0000
commitaf8cae1e7fe0a5ee0b9404aaf8ed7c9888272d09 (patch)
tree691a59654bd5dff36bfb54318ff4fe40c732d276
parent526d246f715a1a0046942f942173c2d9447e78a5 (diff)
* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): to_f must underflow when the exponent is less than DBL_MIN_10_EXP - BASE_FIG.
* test/bigdecimal/test_bigdecimal.rb (test_to_f): added test for the above changes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/bigdecimal/bigdecimal.c33
-rw-r--r--test/bigdecimal/test_bigdecimal.rb10
3 files changed, 41 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ff77557cdc..25c102dc59b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Aug 24 01:14:58 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): to_f must underflow
+ when the exponent is less than DBL_MIN_10_EXP - BASE_FIG.
+
+ * test/bigdecimal/test_bigdecimal.rb (test_to_f): added test for the above changes.
+
Mon Aug 23 23:14:21 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (path_each_line): Pathname#each_line
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index c674c95e608..7109f8c2421 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -513,25 +513,40 @@ BigDecimal_to_f(VALUE self)
ENTER(1);
Real *p;
double d;
- ssize_t e;
+ SIGNED_VALUE e;
char *buf;
volatile VALUE str;
GUARD_OBJ(p, GetVpValue(self, 1));
- if (VpVtoD(&d, &e, p) != 1) return rb_float_new(d);
- if (e > (ssize_t)(DBL_MAX_10_EXP+BASE_FIG)) goto erange;
+ if (VpVtoD(&d, &e, p) != 1)
+ return rb_float_new(d);
+ if (e > (SIGNED_VALUE)(DBL_MAX_10_EXP+BASE_FIG))
+ goto overflow;
+ if (e < (SIGNED_VALUE)(DBL_MIN_10_EXP-BASE_FIG))
+ goto underflow;
+
str = rb_str_new(0, VpNumOfChars(p,"E"));
buf = RSTRING_PTR(str);
VpToString(p, buf, 0, 0);
errno = 0;
d = strtod(buf, 0);
- if (errno == ERANGE) {
- erange:
- VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion",0);
- if (d > 0.0) d = VpGetDoublePosInf();
- else d = VpGetDoubleNegInf();
- }
+ if (errno == ERANGE)
+ goto overflow;
return rb_float_new(d);
+
+overflow:
+ VpException(VP_EXCEPTION_OVERFLOW, "BigDecimal to Float conversion", 0);
+ if (d > 0.0)
+ return rb_float_new(VpGetDoublePosInf());
+ else
+ return rb_float_new(VpGetDoubleNegInf());
+
+underflow:
+ VpException(VP_EXCEPTION_UNDERFLOW, "BigDecimal to Float conversion", 0);
+ if (d > 0.0)
+ return rb_float_new(0.0);
+ else
+ return rb_float_new(-0.0);
}
diff --git a/test/bigdecimal/test_bigdecimal.rb b/test/bigdecimal/test_bigdecimal.rb
index 467b5e1b0b2..53979340a12 100644
--- a/test/bigdecimal/test_bigdecimal.rb
+++ b/test/bigdecimal/test_bigdecimal.rb
@@ -343,6 +343,16 @@ class TestBigDecimal < Test::Unit::TestCase
BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
assert_kind_of(Float, x .to_f)
assert_kind_of(Float, (-x).to_f)
+
+ BigDecimal.mode(BigDecimal::EXCEPTION_UNDERFLOW, true)
+ assert_raise(FloatDomainError) {
+ BigDecimal("1e#{Float::MIN_10_EXP - 2*Float::DIG}").to_f }
+ assert_raise(FloatDomainError) {
+ BigDecimal("-1e#{Float::MIN_10_EXP - 2*Float::DIG}").to_f }
+
+ BigDecimal.mode(BigDecimal::EXCEPTION_UNDERFLOW, false)
+ assert_equal( 0.0, BigDecimal("1e#{Float::MIN_10_EXP - 2*Float::DIG}").to_f)
+ assert_equal(-0.0, BigDecimal("-1e#{Float::MIN_10_EXP - 2*Float::DIG}").to_f)
end
def test_coerce