round and ceil now return FixedPoint

Author: bjarthur

src/ufixed.jl

@@ -112,10 +112,6 @@ trunc{T<:Integer}(::Type{T}, x::UFixed) = convert(T, div(reinterpret(x), rawone(
 round{T<:Integer}(::Type{T}, x::UFixed) = round(T, reinterpret(x)/rawone(x))
 floor{T<:Integer}(::Type{T}, x::UFixed) = trunc(T, x)
  ceil{T<:Integer}(::Type{T}, x::UFixed) =  ceil(T, reinterpret(x)/rawone(x))
-trunc(x::UFixed) = trunc(Int, x)
-round(x::UFixed) = round(Int, x)
-floor(x::UFixed) = floor(Int, x)
- ceil(x::UFixed) =  ceil(Int, x)
 
 isfinite(x::UFixed) = true
 isnan(x::UFixed) = false

test/ufixed.jl

@@ -100,12 +100,16 @@ function testtrunc{T}(inc::T)
     for i = 0 : min(1e6, reinterpret(typemax(T))-1)
         xf = incf*i
         try
+            @test typeof(trunc(x)) == T
             @test trunc(x) == trunc(xf)
+            @test typeof(round(x)) == T
             @test round(x) == round(xf)
             cxf = ceil(xf)
             if cxf < tm
+                @test typeof(ceil(x)) == T
                 @test ceil(x) == ceil(xf)
             end
+            @test typeof(floor(x)) == T
             @test floor(x) == floor(xf)
             @test trunc(Int,x) == trunc(Int,xf)
             @test round(Int,x) == round(Int,xf)