Make bigdec work on clojure.lang.BigInt args

clojure · May 18, 2012 · fb653b7 · fb653b7
1 parent 82fb40a
commit fb653b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj
@@ -3247,7 +3247,8 @@
   [x] (cond
        (decimal? x) x
        (float? x) (. BigDecimal valueOf (double x))
-       (ratio? x) (/ (BigDecimal. (.numerator x)) (.denominator x))
+       (ratio? x) (/ (BigDecimal. (.numerator ^clojure.lang.Ratio x)) (.denominator ^clojure.lang.Ratio x))
+       (instance? clojure.lang.BigInt x) (.toBigDecimal ^clojure.lang.BigInt x)
        (instance? BigInteger x) (BigDecimal. ^BigInteger x)
        (number? x) (BigDecimal/valueOf (long x))
        :else (BigDecimal. x)))

diff --git a/src/jvm/clojure/lang/BigInt.java b/src/jvm/clojure/lang/BigInt.java
@@ -13,6 +13,7 @@
 package clojure.lang;
 
 import java.math.BigInteger;
+import java.math.BigDecimal;
 
 public final class BigInt extends Number{
 
@@ -66,6 +67,13 @@ public BigInteger toBigInteger(){
 		return bipart;
 }
 
+public BigDecimal toBigDecimal(){
+	if(bipart == null)
+		return BigDecimal.valueOf(lpart);
+	else
+		return new BigDecimal(bipart);
+}
+
 ///// java.lang.Number:
 
 public int intValue(){

diff --git a/test/clojure/test_clojure/numbers.clj b/test/clojure/test_clojure/numbers.clj
@@ -25,7 +25,7 @@
 
 
 (deftest Coerced-BigDecimal
-  (let [v (bigdec 3)]
+  (doseq [v [(bigdec 3) (bigdec (inc (bigint Long/MAX_VALUE)))]]
     (are [x] (true? x)
      (instance? BigDecimal v)
      (number? v)