Define constants for complex subtypes

Author: hhaensel

src/fmt.jl

@@ -73,15 +73,20 @@ end
 # methods to get the current default objects
 # note: if you want to set a default for an abstract type (i.e. AbstractFloat)
 # you'll need to extend this method like here:
+
+const ComplexInteger  = Complex{<:Integer}
+const ComplexFloat    = Complex{<:AbstractFloat}
+const ComplexRational = Complex{<:Rational}
+
 default_spec(::Type{<:Integer})        = DEFAULT_FORMATTERS[Integer]
 default_spec(::Type{<:AbstractFloat})  = DEFAULT_FORMATTERS[AbstractFloat]
 default_spec(::Type{<:AbstractString}) = DEFAULT_FORMATTERS[AbstractString]
 default_spec(::Type{<:AbstractChar})   = DEFAULT_FORMATTERS[AbstractChar]
 default_spec(::Type{<:AbstractIrrational}) = DEFAULT_FORMATTERS[AbstractIrrational]
 default_spec(::Type{<:Number})         = DEFAULT_FORMATTERS[Number]
-default_spec(::Complex{T} where T<:Integer)       = DEFAULT_FORMATTERS[Complex{T} where T<:Integer]
-default_spec(::Complex{T} where T<:AbstractFloat) = DEFAULT_FORMATTERS[Complex{T} where T<:AbstractFloat]
-default_spec(::Complex{T} where T<:Rational)      = DEFAULT_FORMATTERS[Complex{T} where T<:Rational]
+default_spec(::ComplexInteger)         = DEFAULT_FORMATTERS[ComplexInteger]
+default_spec(::ComplexFloat)           = DEFAULT_FORMATTERS[ComplexFloat]
+default_spec(::ComplexRational)        = DEFAULT_FORMATTERS[ComplexRational]
 
 default_spec(::Type{T}) where {T} =
     get(DEFAULT_FORMATTERS, T) do
@@ -224,11 +229,12 @@ for (t, c) in [(Integer,'d'),
                (AbstractFloat,'f'),
                (AbstractChar,'c'),
                (AbstractString,'s'),
-               (Complex{T} where T<:Integer, 'd' ),
-               (Complex{T} where T<:AbstractFloat, 'f' )]
+               (ComplexInteger,'d'),
+               (ComplexFloat,'f')]
     default_spec!(t, c)
 end
 
-default_spec!(Number, 's', :right)
+default_spec!(Rational, 's', :right)
 default_spec!(AbstractIrrational, 's', :right)
-default_spec!(Complex{T} where T<:Rational, 's', :right)
+default_spec!(ComplexRational, 's', :right)
+default_spec!(Number, 's', :right)

test/fmt.jl

@@ -27,7 +27,7 @@ i = 1234567
 @test fmt(1//2 + 6//2 * im, 15) == " 1//2 + 3//1*im"
 
 fmt_default!(Rational, 'f', prec = 2)
-fmt_default!(Complex{T} where T<:Rational, 'f', prec = 2)
+fmt_default!(Format.ComplexRational, 'f', prec = 2)
 
 @test fmt(3//4, 10, 2) == "      0.75"
 @test fmt(3//4, 10, 1) == "       0.8"