Fix complex constructors

Add some tests
JuliaMath · Feb 1, 2018 · c6ebe4e · c6ebe4e
1 parent fe45399
commit c6ebe4e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/src/fixed.jl b/src/fixed.jl
@@ -8,7 +8,7 @@ struct Fixed{T <: Signed,f} <: FixedPoint{T,  f}
     Fixed{T, f}(x) where {T,f} = convert(Fixed{T,f}, x)
     Fixed{T, f}(x::Fixed{T,f}) where {T,f} = x
     Fixed{T, f}(x::Char) where {T,f} = throw(ArgumentError("Fixed cannot be constructed from a Char"))
-    Fixed{T, f}(x::Complex) where {T,f} = Fixed{T, f}(real(x))
+    Fixed{T, f}(x::Complex) where {T,f} = Fixed{T, f}(convert(real(typeof(x)), x))
     Fixed{T, f}(x::Base.TwicePrecision) where {T,f,S} = Fixed{T, f}(convert(Float64, x))
 end
 

diff --git a/src/normed.jl b/src/normed.jl
@@ -8,7 +8,7 @@ struct Normed{T<:Unsigned,f} <: FixedPoint{T,f}
     Normed{T, f}(x) where {T,f} = convert(Normed{T,f}, x)
     Normed{T, f}(x::Normed{T,f}) where {T,f} = x
     Normed{T, f}(x::Char) where {T,f} = throw(ArgumentError("Normed cannot be constructed from a Char"))
-    Normed{T, f}(x::Complex) where {T,f} = Normed{T, f}(real(x))
+    Normed{T, f}(x::Complex) where {T,f} = Normed{T, f}(convert(real(typeof(x)), x))
     Normed{T, f}(x::Base.TwicePrecision) where {T,f,S} = Normed{T, f}(convert(Float64, x))
 end
 

diff --git a/test/fixed.jl b/test/fixed.jl
@@ -129,3 +129,9 @@ end
 
 # issue #79
 @test realmin(Q11f4) == Q11f4(0.06)
+
+# Test disambiguation constructors
+@test_throws ArgumentError Fixed{Int32,16}('a')
+@test_throws InexactError  Fixed{Int32,16}(complex(1.0, 1.0))
+@test Fixed{Int32,16}(complex(1.0, 0.0))        == 1
+@test Fixed{Int32,16}(Base.TwicePrecision(1.0)) == 1
diff --git a/test/normed.jl b/test/normed.jl
@@ -313,3 +313,10 @@ elseif VERSION >= v"0.7.0-DEV.1790"
     @test summary(a) == "2-element Array{N0f8,1} with eltype FixedPointNumbers.Normed{UInt8,8}"
     @test summary(view(a, 1:2)) == "2-element view(::Array{N0f8,1}, 1:2) with eltype FixedPointNumbers.Normed{UInt8,8}"
 end
+
+# Test disambiguation constructors
+@test_throws ArgumentError Normed{UInt32,16}('a')
+@test_throws InexactError  Normed{UInt32,16}(complex(1.0, 1.0))
+@test Normed{UInt32,16}(complex(1.0, 0.0))        == 1
+@test Normed{UInt32,16}(Base.TwicePrecision(1.0)) == 1
+