Merge pull request #85 from JuliaMath/teh/ambs

Fix ambiguities and turn ambiguity testing on for all platforms

Author: timholy

.travis.yml

@@ -4,6 +4,7 @@ os:
     - osx
 julia:
     - 0.5
+    - 0.6
     - nightly
 notifications:
   email: false

appveyor.yml

@@ -2,6 +2,8 @@ environment:
   matrix:
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 

src/fixed.jl

@@ -55,6 +55,10 @@ convert{TF<:AbstractFloat,T,f}(::Type{TF}, x::Fixed{T,f}) =
     convert(TF,x.i>>f) + convert(TF,x.i&(1<<f - 1))/convert(TF,1<<f)
 
 convert{T,f}(::Type{Bool}, x::Fixed{T,f}) = x.i!=0
+function convert{T,f}(::Type{Integer}, x::Fixed{T,f})
+    isinteger(x) || throw(InexactError())
+    convert(Integer, x.i>>f)
+end
 function convert{TI<:Integer, T,f}(::Type{TI}, x::Fixed{T,f})
     isinteger(x) || throw(InexactError())
     convert(TI, x.i>>f)

src/normed.jl

@@ -32,7 +32,7 @@ zero(x::Normed) = zero(typeof(x))
 rawone(v) = reinterpret(one(v))
 
 # Conversions
-convert{T<:Unsigned,f}(::Type{Normed{T,f}}, x::Normed{T,f}) = x
+convert{U<:Normed}(::Type{U}, x::U) = x
 convert{T1<:Unsigned,T2<:Unsigned,f}(::Type{Normed{T1,f}}, x::Normed{T2,f}) = Normed{T1,f}(convert(T1, x.i), 0)
 function convert{T<:Unsigned,T2<:Unsigned,f}(::Type{Normed{T,f}}, x::Normed{T2})
     U = Normed{T,f}
@@ -67,6 +67,7 @@ function convert{T<:AbstractFloat}(::Type{T}, x::Normed)
     convert(T, y)  # needed for types like Float16 which promote arithmetic to Float32
 end
 convert(::Type{Bool}, x::Normed) = x == zero(x) ? false : true
+convert(::Type{Integer}, x::Normed) = convert(Integer, x*1.0)
 convert{T<:Integer}(::Type{T}, x::Normed) = convert(T, x*(1/one(T)))
 convert{Ti<:Integer}(::Type{Rational{Ti}}, x::Normed) = convert(Ti, reinterpret(x))//convert(Ti, rawone(x))
 convert(::Type{Rational}, x::Normed) = reinterpret(x)//rawone(x)

test/fixed.jl

@@ -103,6 +103,9 @@ for T in (Float16, Float32, Float64, BigFloat)
     @test isa(y, T)
 end
 
+@test convert(Int, Q1f6(1)) === 1
+@test convert(Integer, Q1f6(1)) === Int8(1)
+
 # Floating-point conversions
 @test isa(float(one(Fixed{Int8,6})),   Float32)
 @test isa(float(one(Fixed{Int32,18})), Float64)

test/normed.jl

@@ -89,6 +89,7 @@ for T in (FixedPointNumbers.UF..., UF2...)
     @test convert(Bool, one(T))  == true
     @test convert(Bool, convert(T, 0.2)) == true
     @test convert(Int, one(T)) == 1
+    @test convert(Integer, one(T)) == 1
     @test convert(Rational, one(T)) == 1
 end
 @test convert(Rational, convert(N0f8, 0.5)) == 0x80//0xff
@@ -203,6 +204,9 @@ end
 @test mod(reinterpret(N0f8, 0x0f), reinterpret(N0f8, 0x02)) == rem(reinterpret(N0f8, 0x0f), reinterpret(N0f8, 0x02)) == reinterpret(N0f8, 0x01)
 @test mod1(reinterpret(N0f8, 0x10), reinterpret(N0f8, 0x02)) == reinterpret(N0f8, 0x02)
 @test mod1(reinterpret(N0f8, 0x0f), reinterpret(N0f8, 0x02)) == reinterpret(N0f8, 0x01)
+@test bswap(N0f8(0.5)) === N0f8(0.5)
+@test bswap(N0f16(0.5)) === reinterpret(N0f16, 0x0080)
+@test minmax(N0f8(0.8), N0f8(0.2)) === (N0f8(0.2), N0f8(0.8))
 
 r = reinterpret(N0f8, 0x01):reinterpret(N0f8, 0x01):reinterpret(N0f8, convert(UInt8, 48))
 @test length(r) == 48

test/runtests.jl

@@ -5,6 +5,4 @@ for f in ["normed.jl", "fixed.jl"]
     include(f)
 end
 
-if v"0.5.0" <= VERSION < v"0.6.0-dev"
-    @test isempty(detect_ambiguities(FixedPointNumbers, Base, Core))
-end
+@test isempty(detect_ambiguities(FixedPointNumbers, Base, Core))