IO fixes

Author: timholy

src/io.jl

@@ -1,11 +1,8 @@
-# after this, functionality was incorporated into Base
 function Base.showarg(io::IO, A::BSplineInterpolation{T,N,TW,ST,GT}, toplevel) where {T,N,TW,ST,GT}
     print(io, "interpolate(")
     Base.showarg(io, A.coefs, false)
     print(io, ", ")
-    _showtypeparam(io, ST)
-    print(io, ", ")
-    _showtypeparam(io, GT)
+    show(io, itpflag(A))
     if toplevel
         print(io, ") with element type ",T)
     else
@@ -66,32 +63,3 @@ end
 #         print(io, " with element type ",T)
 #     end
 # end
-
-_showtypeparam(io, ::Type{T}) where {T} =
-    print(io, T.name.name, "()")
-_showtypeparam(io, ::Type{Quadratic{T}}) where {T} =
-    print(io, "Quadratic(", T.name.name, "())")
-_showtypeparam(io, ::Type{Cubic{T}}) where {T} =
-    print(io, "Cubic(",     T.name.name, "())")
-
-function _showtypeparam(io, ::Type{BSpline{T}}) where T
-    print(io, "BSpline(")
-    _showtypeparam(io, T)
-    print(io, ')')
-end
-
-# function _showtypeparam(io, ::Type{Gridded{T}}) where T
-#     print(io, "Gridded(")
-#     _showtypeparam(io, T)
-#     print(io, ')')
-# end
-
-function _showtypeparam(io, types::Type{TTup}) where TTup<:Tuple
-    print(io, '(')
-    N = length(types.types)
-    for (i, T) in enumerate(types.types)
-        _showtypeparam(io, T)
-        i < N && print(io, ", ")
-    end
-    print(io, ')')
-end

test/io.jl

@@ -7,23 +7,23 @@ using Test
     @testset "BSpline" begin
         A = rand(8,20)
 
-        itp = interpolate(A, BSpline(Constant()), OnCell())
-        @test summary(itp) == "8×20 interpolate(::Array{Float64,2}, BSpline(Constant()), OnCell()) with element type Float64"
+        itp = interpolate(A, BSpline(Constant()))
+        @test summary(itp) == "8×20 interpolate(::Array{Float64,2}, BSpline(Constant())) with element type Float64"
 
-        itp = interpolate(A, BSpline(Constant()), OnGrid())
-        @test summary(itp) == "8×20 interpolate(::Array{Float64,2}, BSpline(Constant()), OnGrid()) with element type Float64"
+        itp = interpolate(A, BSpline(Constant()))
+        @test summary(itp) == "8×20 interpolate(::Array{Float64,2}, BSpline(Constant())) with element type Float64"
 
-        itp = interpolate(A, BSpline(Linear()), OnGrid())
-        @test summary(itp) == "8×20 interpolate(::Array{Float64,2}, BSpline(Linear()), OnGrid()) with element type Float64"
+        itp = interpolate(A, BSpline(Linear()))
+        @test summary(itp) == "8×20 interpolate(::Array{Float64,2}, BSpline(Linear())) with element type Float64"
 
-        itp = interpolate(A, BSpline(Quadratic(Reflect())), OnCell())
-        @test summary(itp) == "8×20 interpolate(OffsetArray(::Array{Float64,2}, 0:9, 0:21), BSpline(Quadratic(Reflect())), OnCell()) with element type Float64"
+        itp = interpolate(A, BSpline(Quadratic(Reflect(OnCell()))))
+        @test summary(itp) == "8×20 interpolate(OffsetArray(::Array{Float64,2}, 0:9, 0:21), BSpline(Quadratic(Reflect(OnCell())))) with element type Float64"
 
-        itp = interpolate(A, (BSpline(Linear()), NoInterp()), OnGrid())
-        @test summary(itp) == "8×20 interpolate(::Array{Float64,2}, (BSpline(Linear()), NoInterp()), OnGrid()) with element type Float64"
+        itp = interpolate(A, (BSpline(Linear()), NoInterp()))
+        @test summary(itp) == "8×20 interpolate(::Array{Float64,2}, (BSpline(Linear()), NoInterp())) with element type Float64"
 
-        itp = interpolate!(copy(A), BSpline(Quadratic(InPlace())), OnCell())
-        @test summary(itp) == "8×20 interpolate(::Array{Float64,2}, BSpline(Quadratic(InPlace())), OnCell()) with element type Float64"
+        itp = interpolate!(copy(A), BSpline(Quadratic(InPlace(OnCell()))))
+        @test summary(itp) == "8×20 interpolate(::Array{Float64,2}, BSpline(Quadratic(InPlace(OnCell())))) with element type Float64"
     end
 
     # @testset "Gridded" begin