Adapt format ::full to show parseable code

Author: OlivierHnt

src/display.jl

@@ -212,12 +212,12 @@ end
 
 # `String` representation of an `Interval`
 
-function basic_representation(a::Interval, format::Symbol)
+function basic_representation(a::Interval{T}, format::Symbol) where {T}
     isempty(a) && return "∅"
     sigdigits = display_params.sigdigits
     if format === :full
         # Do not use `inf(a)` to avoid -0.0
-        return string("Interval(", a.lo, ", ", sup(a), ")")
+        return string("Interval{", T, "}(", a.lo, ", ", sup(a), ")")
     elseif format === :midpoint
         m = round_string(mid(a), sigdigits, RoundNearest)
         r = round_string(radius(a), sigdigits, RoundUp)
@@ -237,8 +237,8 @@ function basic_representation(a::Interval{Float32}, format::Symbol)
     sigdigits = display_params.sigdigits
     if format === :full
         # Do not use `inf(a)` to avoid -0.0
-        output = string("Interval(", a.lo, "f0, ", sup(a), "f0)")
-        return replace(replace(output, "NaNf0" => "NaN32"), "Inff0" => '∞')
+        output = string("Interval{Float32}(", a.lo, "f0, ", sup(a), "f0)")
+        return replace(replace(output, "NaNf0" => "NaN32"), "Inff0" => "Inf32")
     elseif format === :midpoint
         m = round_string(mid(a), sigdigits, RoundNearest)
         r = round_string(radius(a), sigdigits, RoundUp)
@@ -253,11 +253,11 @@ function basic_representation(a::Interval{Float32}, format::Symbol)
     end
 end
 
-function basic_representation(a::Interval{<:Rational}, format::Symbol)
+function basic_representation(a::Interval{T}, format::Symbol) where {T<:Rational}
     isempty(a) && return "∅"
     if format === :full
         # Do not use `inf(a)` to avoid -0.0
-        return string("Interval(", a.lo, ", ", sup(a), ")")
+        return string("Interval{", T, "}(", a.lo, ", ", sup(a), ")")
     elseif format === :midpoint
         return string(mid(a), " ± ", radius(a))
     else  # format === :standard

test/display_tests/display.jl

@@ -45,11 +45,11 @@ let x, b
         @testset "Full" begin
             setformat(:full)
 
-            @test sprint(show, MIME("text/plain"), a) == "Interval(1.0, 2.0)"
-            @test sprint(show, MIME("text/plain"), b) == "Interval(-1.1, 1.3)"
-            @test sprint(show, MIME("text/plain"), c) == "Interval(3.141592653589793, 3.1415926535897936)"
+            @test sprint(show, MIME("text/plain"), a) == "Interval{Float64}(1.0, 2.0)"
+            @test sprint(show, MIME("text/plain"), b) == "Interval{Float64}(-1.1, 1.3)"
+            @test sprint(show, MIME("text/plain"), c) == "Interval{Float64}(3.141592653589793, 3.1415926535897936)"
             @test sprint(show, MIME("text/plain"), large_expo) ==
-                "Interval(0.0, 1.000000000000000000000000000000000000000000000000000000000000000000000000000004e+123456789)"
+                "Interval{BigFloat}(0.0, 1.000000000000000000000000000000000000000000000000000000000000000000000000000004e+123456789)"
         end
 
         @testset "Midpoint" begin
@@ -73,7 +73,7 @@ let x, b
         @test_broken sprint(show, MIME("text/plain"), a) == "[1//3, 5//4]"
 
         setformat(:full)
-        @test_broken sprint(show, MIME("text/plain"), a) == "Interval(1//3, 5//4)"
+        @test_broken sprint(show, MIME("text/plain"), a) == "Interval{Rational{Int}}(1//3, 5//4)"
 
         setformat(:midpoint)
         @test_broken sprint(show, MIME("text/plain"), a) == "19//24 ± 11//24"
@@ -88,8 +88,8 @@ let x, b
         @test sprint(show, MIME("text/plain"), b) == "[-1.0f0, ∞]"
 
         setformat(:full)
-        @test sprint(show, MIME("text/plain"), a) == "Interval(1.0f0, 2.0f0)"
-        @test sprint(show, MIME("text/plain"), b) == "Interval(-1.0f0, ∞)"
+        @test sprint(show, MIME("text/plain"), a) == "Interval{Float32}(1.0f0, 2.0f0)"
+        @test sprint(show, MIME("text/plain"), b) == "Interval{Float32}(-1.0f0, Inf32)"
 
         setformat(:midpoint)
         @test sprint(show, MIME("text/plain"), a) == "1.5f0 ± 0.5f0"
@@ -131,7 +131,7 @@ let x, b
         @test sprint(show, MIME("text/plain"), a) == "[2.0, 3.0]₂₅₆_com"
 
         setformat(:full)
-        @test sprint(show, MIME("text/plain"), a) == "DecoratedInterval(Interval(2.0, 3.0), com)"
+        @test sprint(show, MIME("text/plain"), a) == "DecoratedInterval(Interval{BigFloat}(2.0, 3.0), com)"
 
         setformat(:midpoint)
         @test sprint(show, MIME("text/plain"), a) == "(2.5 ± 0.5)₂₅₆_com"
@@ -150,7 +150,7 @@ let x, b
         @test sprint(show, MIME("text/plain"), a) == "[1.0, 1.0]₁₂₈"
 
         setformat(:full)
-        @test sprint(show, MIME("text/plain"), a) == "Interval(1.0, 1.0)"
+        @test sprint(show, MIME("text/plain"), a) == "Interval{BigFloat}(1.0, 1.0)"
 
         a = DecoratedInterval(big(2), big(3), com)
         @test typeof(a) == DecoratedInterval{BigFloat}
@@ -162,7 +162,7 @@ let x, b
         @test sprint(show, MIME("text/plain"), a) == "[2.0, 3.0]₁₂₈_com"
 
         setformat(:full)
-        @test sprint(show, MIME("text/plain"), a) == "DecoratedInterval(Interval(2.0, 3.0), com)"
+        @test sprint(show, MIME("text/plain"), a) == "DecoratedInterval(Interval{BigFloat}(2.0, 3.0), com)"
     end
 
     @testset "IntervalBox" begin
@@ -177,7 +177,7 @@ let x, b
         @test sprint(show, MIME("text/plain"), X) == "[-∞, ∞]²"
 
         setformat(:full)
-        @test sprint(show, MIME("text/plain"), X) == "IntervalBox(Interval(-Inf, Inf), 2)"
+        @test sprint(show, MIME("text/plain"), X) == "IntervalBox(Interval{Float64}(-Inf, Inf), 2)"
 
         setformat(:standard)
         a = IntervalBox(1..2, 2..3)
@@ -188,9 +188,9 @@ let x, b
         @test sprint(show, MIME("text/plain"), c) == "[1.0, 2.0]¹"
 
         setformat(:full)
-        @test sprint(show, MIME("text/plain"), a) == "IntervalBox(Interval(1.0, 2.0), Interval(2.0, 3.0))"
+        @test sprint(show, MIME("text/plain"), a) == "IntervalBox(Interval{Float64}(1.0, 2.0), Interval{Float64}(2.0, 3.0))"
         @test sprint(show, MIME("text/plain"), b) == "IntervalBox(∅, 2)"
-        @test sprint(show, MIME("text/plain"), c) == "IntervalBox(Interval(1.0, 2.0), 1)"
+        @test sprint(show, MIME("text/plain"), c) == "IntervalBox(Interval{Float64}(1.0, 2.0), 1)"
 
         setformat(:midpoint)
         @test sprint(show, MIME("text/plain"), a) == "(1.5 ± 0.5) × (2.5 ± 0.5)"
@@ -205,19 +205,19 @@ end
 
     x = 0..1
     @test sprint(show, MIME("text/plain"), x) == "[0.0, 1.0]"
-    @test sprint(show, x) == "Interval(0.0, 1.0)"
+    @test sprint(show, x) == "Interval{Float64}(0.0, 1.0)"
 
     x = @biginterval(0, 1)
     @test sprint(show, MIME("text/plain"), x) == "[0.0, 1.0]₁₂₈"
-    @test sprint(show, x) == "Interval(0.0, 1.0)"
+    @test sprint(show, x) == "Interval{BigFloat}(0.0, 1.0)"
 
     x = DecoratedInterval(0, 1, dac)
     @test sprint(show, MIME("text/plain"), x) == "[0.0, 1.0]"
-    @test sprint(show, x) == "DecoratedInterval(Interval(0.0, 1.0), dac)"
+    @test sprint(show, x) == "DecoratedInterval(Interval{Float64}(0.0, 1.0), dac)"
 
     x = DecoratedInterval(big(0), big(1), def)
     @test sprint(show, MIME("text/plain"), x) == "[0.0, 1.0]₁₂₈"
-    @test sprint(show, x) == "DecoratedInterval(Interval(0.0, 1.0), def)"
+    @test sprint(show, x) == "DecoratedInterval(Interval{BigFloat}(0.0, 1.0), def)"
 
     setformat(; decorations = true)
     @test sprint(show, MIME("text/plain"), x) == "[0.0, 1.0]₁₂₈_def"
@@ -226,17 +226,17 @@ end
     b = IntervalBox(emptyinterval(), 2)
     c = IntervalBox(1..2, 1)
 
-    @test sprint(show, a) == "IntervalBox(Interval(1.0, 2.0), Interval(2.0, 3.0))"
+    @test sprint(show, a) == "IntervalBox(Interval{Float64}(1.0, 2.0), Interval{Float64}(2.0, 3.0))"
     @test sprint(show, b) == "IntervalBox(∅, 2)"
-    @test sprint(show, c) == "IntervalBox(Interval(1.0, 2.0), 1)"
+    @test sprint(show, c) == "IntervalBox(Interval{Float64}(1.0, 2.0), 1)"
 
 end
 
 @testset "@format tests" begin
     x = prevfloat(0.1)..nextfloat(0.3)
 
     @format full
-    @test sprint(show, MIME("text/plain"), x) == "Interval(0.09999999999999999, 0.30000000000000004)"
+    @test sprint(show, MIME("text/plain"), x) == "Interval{Float64}(0.09999999999999999, 0.30000000000000004)"
 
     @format standard 3
     @test sprint(show, MIME("text/plain"), x) == "[0.0999, 0.301]"