Merge pull request #17 from invenia/big-promote

Fix promotion stack overflows with Base Big* types
JuliaMath · Dec 21, 2017 · be5eacc · be5eacc
2 parents 61b23a4 + 6bc010a
commit be5eacc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/arithmetic.jl b/src/arithmetic.jl
@@ -1,5 +1,9 @@
 Base.promote_rule(::Type{Decimal}, ::Type{<:Real}) = Decimal
 
+# override definitions in Base
+Base.promote_rule(::Type{BigFloat}, ::Type{Decimal}) = Decimal
+Base.promote_rule(::Type{BigInt}, ::Type{Decimal}) = Decimal
+
 # Addition
 # To add, convert both decimals to the same exponent.
 # (If the exponents are different, use the smaller exponent

diff --git a/test/test_equals.jl b/test/test_equals.jl
@@ -21,6 +21,14 @@ end
 
     @test Decimal(1, 2, 0) == -2
     @test Decimal(1, 2, 0) != 2
+
+    bf_pi = BigFloat(pi)
+    @test Decimal(bf_pi) == bf_pi
+    @test bf_pi == Decimal(bf_pi)
+
+    bi = big"4608230166434464229556241992703"
+    @test Decimal(bi) == bi
+    @test bi == Decimal(bi)
 end
 
 @testset "<" begin