Merge pull request #98 from JuliaMath/teh/promotion_fix

Fixes for 0.7

Author: timholy

src/FixedPointNumbers.jl

@@ -10,7 +10,7 @@ import Base: ==, <, <=, -, +, *, /, ~, isapprox,
              zero, oneunit, one, typemin, typemax, realmin, realmax, eps, sizeof, reinterpret,
              float, trunc, round, floor, ceil, bswap,
              div, fld, rem, mod, mod1, fld1, min, max, minmax,
-             start, next, done, r_promote, reducedim_init, rand
+             start, next, done, reducedim_init, rand
 if isdefined(Base, :rem1)
     import Base: rem1
 end
@@ -133,8 +133,12 @@ sizeof(::Type{T}) where {T <: FixedPoint} = sizeof(rawtype(T))
 
 # Promotions for reductions
 const Treduce = Float64
-r_promote(::typeof(+), x::FixedPoint{T}) where {T} = Treduce(x)
-r_promote(::typeof(*), x::FixedPoint{T}) where {T} = Treduce(x)
+if isdefined(Base, :r_promote)
+    Base.r_promote(::typeof(+), x::FixedPoint{T}) where {T} = Treduce(x)
+    Base.r_promote(::typeof(*), x::FixedPoint{T}) where {T} = Treduce(x)
+else
+    Base.promote_sys_size(::Type{<:FixedPoint}) = Treduce
+end
 
 reducedim_init(f::typeof(identity),
                               op::typeof(+),

test/fixed.jl

@@ -124,7 +124,7 @@ for T in (Fixed{Int8,8}, Fixed{Int16,8}, Fixed{Int16,10}, Fixed{Int32,16})
     a = rand(T)
     @test isa(a, T)
     a = rand(T, (3, 5))
-    @test isa(a, Array{T,2})
+    @test ndims(a) == 2 && eltype(a) == T
     @test size(a) == (3,5)
 end
 

test/normed.jl

@@ -297,7 +297,7 @@ for T in (Normed{UInt8,8}, Normed{UInt8,6},
     a = rand(T)
     @test isa(a, T)
     a = rand(T, (3, 5))
-    @test isa(a, Array{T,2})
+    @test ndims(a) == 2 && eltype(a) == T
     @test size(a) == (3,5)
 end