summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-30 04:57:45 +0000
committermrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-30 04:57:45 +0000
commit70d89f2c1630966e5e813084eb5fba5ff045fdc3 (patch)
treee415bfe981ccee399a196de0f210aa271b8fe452
parent64270d3df28624de151b5d555e02b42b48c5b301 (diff)
* ext/bigdecimal/lib/bigdecimal/util.rb (Rational#to_d):
revive zero and implicit precision support as a deprecated feature. * test/bigdecimal/test_bigdecimal_util.rb: modify a test for the above change. * NEWS: describes the above change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32753 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog10
-rw-r--r--NEWS8
-rw-r--r--ext/bigdecimal/lib/bigdecimal/util.rb12
-rw-r--r--test/bigdecimal/test_bigdecimal_util.rb2
4 files changed, 26 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c1d92f888..8b1d4e7006 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Jul 30 13:52:00 2011 Kenta Murata <mrkn@mrkn.jp>
+
+ * ext/bigdecimal/lib/bigdecimal/util.rb (Rational#to_d):
+ revive zero and implicit precision support as a deprecated feature.
+
+ * test/bigdecimal/test_bigdecimal_util.rb: modify a test for the above
+ change.
+
+ * NEWS: describes the above change.
+
Sat Jul 30 10:58:10 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* vm.c (th_init): preallocate alternative stack.
diff --git a/NEWS b/NEWS
index 75d428e653..7aea2bff40 100644
--- a/NEWS
+++ b/NEWS
@@ -122,7 +122,13 @@ with all sufficient information, see the ChangeLog file.
* Rational#to_d raises ArgumentError when passing zero or negative
precision.
- * Rational#to_d requires a precision. It is an incompatible change.
+ * Rational#to_d
+
+ * Zero and an implicit precision is deprecated.
+ This feature is removed at the next release of bigdecimal.
+
+ * A negative precision isn't supported.
+ Be careful it is an incompatible change.
* date
diff --git a/ext/bigdecimal/lib/bigdecimal/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
index b27e64c511..b4b02b191d 100644
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ b/ext/bigdecimal/lib/bigdecimal/util.rb
@@ -17,7 +17,7 @@ end
class Float < Numeric
# call-seq:
- # flt.to_d -> bigdecimal
+ # flt.to_d(precision=nil) -> bigdecimal
#
# Convert +flt+ to a BigDecimal and return it.
#
@@ -83,11 +83,12 @@ end
class Rational < Numeric
# call-seq:
- # r.to_d -> bigdecimal
# r.to_d(sig) -> bigdecimal
#
# Converts a Rational to a BigDecimal. Takes an optional parameter +sig+ to
# limit the amount of significant digits.
+ # If a negative precision is given, raise ArgumentError.
+ # The zero precision and implicit precision is deprecated.
#
# r = (22/7.0).to_r
# # => (7077085128725065/2251799813685248)
@@ -95,9 +96,12 @@ class Rational < Numeric
# # => #<BigDecimal:1a52bd8,'0.3142857142 8571427937 0154144999 105E1',45(63)>
# r.to_d(3)
# # => #<BigDecimal:1a44d08,'0.314E1',18(36)>
- def to_d(precision)
- if precision <= 0
+ def to_d(precision=0)
+ if precision < 0
raise ArgumentError, "negative precision"
+ elsif precision == 0
+ warn "zero and implicit precision is deprecated."
+ precision = BigDecimal.double_fig*2+1
end
num = self.numerator
BigDecimal(num).div(self.denominator, precision)
diff --git a/test/bigdecimal/test_bigdecimal_util.rb b/test/bigdecimal/test_bigdecimal_util.rb
index 72342b922f..301c85e417 100644
--- a/test/bigdecimal/test_bigdecimal_util.rb
+++ b/test/bigdecimal/test_bigdecimal_util.rb
@@ -34,7 +34,7 @@ class TestBigDecimalUtil < Test::Unit::TestCase
end
def test_Rational_to_d_with_zero_precision
- assert_raise(ArgumentError) { 355.quo(113).to_d(0) }
+ assert_equal(355.quo(113).to_d, 355.quo(113).to_d(BigDecimal.double_fig*2+1))
end
def test_Rational_to_d_with_negative_precision