apply changes to cfmt() and add tests

Author: hhaensel

src/cformat.jl

@@ -1,6 +1,16 @@
 formatters = Dict{ ASCIIStr, Function }()
 
-cfmt( fmt::ASCIIStr, x ) = m_eval(Expr(:call, generate_formatter( fmt ), x))
+cfmt( fmt::ASCIIStr, x::Union{<:AbstractString,<:Real} ) = m_eval(Expr(:call, generate_formatter( fmt ), x))
+
+function cfmt( fmt_str::ASCIIStr, x::Number )
+    #remove width information
+    new_fmt_str = replace(fmt_str, r"(%(\d+\$)?[\-\+#0' ]*)(\d+)?"=>s"\1")
+    s = fmt_Number(x, x->m_eval(Expr(:call, generate_formatter( new_fmt_str ), AbstractFloat(x))))
+    # extract width information
+    m = match(r"%(\d+\$)?[\-\+#0' ]*(\d+)?", fmt_str)
+    width = m[2] == nothing ? 0 : parse(Int, m[2])
+    fmt(s, width, occursin("-", fmt_str) ? :left : :right)
+end
 
 function checkfmt(fmt)
     test = PF.parse( fmt )

test/fmt.jl

@@ -20,9 +20,10 @@ i = 1234567
 @test fmt(i) == "1234567"
 @test fmt(i,:commas) == "1,234,567"
 
-# These are not handled
+# All Number types are now handled, default is right aligned string
 #@test_throws ErrorException fmt_default(Real)
 #@test_throws ErrorException fmt_default(Complex)
+fmt_default(Real) == fmt_default(Number) == FormatSpec('s', align = '>')
 
 @test fmt(2 - 3im, 10) == "   2 - 3im"
 @test fmt(pi - 3im, 15, 2) == "  3.14 - 3.00im"