summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--ext/bigdecimal/bigdecimal.c13
-rw-r--r--test/bigdecimal/test_bigdecimal.rb3
-rw-r--r--test/bigdecimal/test_bigdecimal_util.rb6
4 files changed, 31 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e2e057a..7dea1e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Dec 6 01:27:00 2013 Kenta Murata <mrkn@mrkn.jp>
+
+ * ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec):
+ treat 0.0 and -0.0 of floating-point numbers specially for an optimization
+ and to correctly propagate its signbit to the result.
+ [Bug #9214] [ruby-core:58858]
+
+ * test/bigdecimal/test_bigdecimal.rb: add tests case for the above change.
+
+ * test/bigdecimal/test_bigdecimal_util.rb: ditto.
+
Thu Dec 5 22:18:01 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (configuration): strip destdir part from prefix to get
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 29240c7..e0cd4b0 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -199,14 +199,23 @@ GetVpValueWithPrec(VALUE v, long prec, int must)
VALUE num, bg;
char szD[128];
VALUE orig = Qundef;
+ double d;
again:
switch(TYPE(v)) {
case T_FLOAT:
if (prec < 0) goto unable_to_coerce_without_prec;
if (prec > DBL_DIG+1) goto SomeOneMayDoIt;
- v = rb_funcall(v, id_to_r, 0);
- goto again;
+ d = RFLOAT_VALUE(v);
+ if (d != 0.0) {
+ v = rb_funcall(v, id_to_r, 0);
+ goto again;
+ }
+ if (1/d < 0.0) {
+ return VpCreateRbObject(prec, "-0");
+ }
+ return VpCreateRbObject(prec, "0");
+
case T_RATIONAL:
if (prec < 0) goto unable_to_coerce_without_prec;
diff --git a/test/bigdecimal/test_bigdecimal.rb b/test/bigdecimal/test_bigdecimal.rb
index 8eb732a..6df858c 100644
--- a/test/bigdecimal/test_bigdecimal.rb
+++ b/test/bigdecimal/test_bigdecimal.rb
@@ -86,6 +86,9 @@ class TestBigDecimal < Test::Unit::TestCase
assert_raise(ArgumentError) { BigDecimal(0.1) }
assert_raise(ArgumentError) { BigDecimal(0.1, Float::DIG + 2) }
assert_nothing_raised { BigDecimal(0.1, Float::DIG + 1) }
+
+ bug9214 = '[ruby-core:58858]'
+ assert_equal(BigDecimal(-0.0, Float::DIG).sign, -1, bug9214)
end
def test_global_new_with_big_decimal
diff --git a/test/bigdecimal/test_bigdecimal_util.rb b/test/bigdecimal/test_bigdecimal_util.rb
index 9a5d504..e4d6400 100644
--- a/test/bigdecimal/test_bigdecimal_util.rb
+++ b/test/bigdecimal/test_bigdecimal_util.rb
@@ -18,6 +18,9 @@ class TestBigDecimalUtil < Test::Unit::TestCase
assert_in_delta(BigDecimal(0.5, Float::DIG), 0.5.to_d, delta)
assert_in_delta(BigDecimal(355.0/113.0, Float::DIG), (355.0/113.0).to_d, delta)
assert_equal(9.05.to_d.to_s('F'), "9.05")
+
+ bug9214 = '[ruby-core:58858]'
+ assert_equal((-0.0).to_d.sign, -1, bug9214)
end
def test_Float_to_d_with_precision
@@ -25,6 +28,9 @@ class TestBigDecimalUtil < Test::Unit::TestCase
delta = 1.0/10**(digits)
assert_in_delta(BigDecimal(0.5, 5), 0.5.to_d(digits), delta)
assert_in_delta(BigDecimal(355.0/113.0, 5), (355.0/113.0).to_d(digits), delta)
+
+ bug9214 = '[ruby-core:58858]'
+ assert_equal((-0.0).to_d(digits).sign, -1, bug9214)
end
def test_Rational_to_d