Made print method for FixedDecimal (#75)

Allows users to just print the numeric representation to a buffer.

Author: omus

src/FixedPointDecimals.jl

@@ -29,8 +29,8 @@ using Compat
 
 import Base: reinterpret, zero, one, abs, sign, ==, <, <=, +, -, /, *, div,
              rem, divrem, fld, mod, fldmod, fld1, mod1, fldmod1, isinteger,
-             typemin, typemax, realmin, realmax, show, convert, promote_rule,
-             min, max, trunc, round, floor, ceil, eps, float, widemul
+             typemin, typemax, realmin, realmax, print, show, string, convert,
+             promote_rule, min, max, trunc, round, floor, ceil, eps, float, widemul
 
 """
     FixedDecimal{I <: Integer, f::Int}
@@ -223,17 +223,10 @@ realmin{T <: FD}(::Type{T}) = eps(T)
 realmax{T <: FD}(::Type{T}) = typemax(T)
 
 # printing
-function show{T}(io::IO, x::FD{T, 0})
-    iscompact = get(io, :compact, false)
-    if !iscompact
-        print(io, "FixedDecimal{$T,0}(")
-    end
+function print{T}(io::IO, x::FD{T, 0})
     print(io, x.i)
-    if !iscompact
-        print(io, ')')
-    end
 end
-function show{T, f}(io::IO, x::FD{T, f})
+function print{T, f}(io::IO, x::FD{T, f})
     iscompact = get(io, :compact, false)
 
     # note: a is negative if x.i == typemin(x.i)
@@ -242,9 +235,6 @@ function show{T, f}(io::IO, x::FD{T, f})
     integer = abs(integer)  # ...but since f > 0, this is positive
     fractional = abs(fractional)
 
-    if !iscompact
-        print(io, "FixedDecimal{$T,$f}(")
-    end
     if s == -1
         print(io, "-")
     end
@@ -256,6 +246,14 @@ function show{T, f}(io::IO, x::FD{T, f})
         end
     end
     print(io, integer, '.', fractionchars)
+end
+
+function show{T, f}(io::IO, x::FD{T, f})
+    iscompact = get(io, :compact, false)
+    if !iscompact
+        print(io, "FixedDecimal{$T,$f}(")
+    end
+    print(io, x)
     if !iscompact
         print(io, ')')
     end

test/runtests.jl

@@ -345,6 +345,16 @@ epsi{T}(::Type{T}) = eps(T)
     end
 end
 
+@testset "print" begin
+    @test string(FD2(1.00)) == "1.00"
+    @test string(FD2(1.23)) == "1.23"
+    @test string(FD2(42.40)) == "42.40"
+    @test string(FD2(-42.40)) == "-42.40"
+    @test string(FD2(-0.01)) == "-0.01"
+    @test string(FD2(0)) == "0.00"
+    @test string(FixedDecimal{Int,0}(123.4)) == "123"
+end
+
 @testset "show" begin
     @testset "compact" begin
         @test sprint(showcompact, FD2(1.00)) == "1.0"
@@ -353,19 +363,22 @@ end
         @test sprint(showcompact, FD2(-42.40)) == "-42.4"
         @test sprint(showcompact, FD2(-0.01)) == "-0.01"
         @test sprint(showcompact, FD2(0)) == "0.0"
-        for x in keyvalues[FD2]
-            if 0 ≤ abs(x) < 1000
-                @test eval(parse(string(x))) == x
-            end
-        end
 
-        @test string(typemin(FixedDecimal{Int64, 2})) ==
+        @test repr(typemin(FixedDecimal{Int64, 2})) ==
               "FixedDecimal{Int64,2}(-92233720368547758.08)"
-        @test string(typemax(FixedDecimal{Int64, 2})) ==
+        @test repr(typemax(FixedDecimal{Int64, 2})) ==
               "FixedDecimal{Int64,2}(92233720368547758.07)"
-        @test string(typemin(FixedDecimal{Int32, 2})) ==
+        @test repr(typemin(FixedDecimal{Int32, 2})) ==
               "FixedDecimal{Int32,2}(-21474836.48)"
-        @test string(typemax(FixedDecimal{Int32, 2})) ==
+        @test repr(typemax(FixedDecimal{Int32, 2})) ==
               "FixedDecimal{Int32,2}(21474836.47)"
     end
 end
+
+@testset "string" begin
+    for x in keyvalues[FD2]
+        if 0 ≤ abs(x) < 1000
+            @test eval(parse(string(x))) == x
+        end
+    end
+end