Dispatch on Type instead of using Core.Typeof

JuliaMath · Jul 2, 2023 · 07ac8c9 · 07ac8c9 · oschulz · Jul 2, 2023
1 parent 7f9884c
commit 07ac8c9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/src/inverse.jl b/src/inverse.jl
@@ -62,11 +62,11 @@ An instance `NoInverse(f)` signifies that `inverse(f)` is not defined.
 """
 struct NoInverse{F}
     f::F
-    NoInverse{F}(f) where F = new{F}(f)
-    NoInverse(f) = new{Core.Typeof(f)}(f)
 end
 export NoInverse
 
+NoInverse(::Type{F}) where F = NoInverse{Type{F}}(F)
+
 (f::NoInverse)(x) = error("inverse of ", f.f, " is not defined")
 
 inverse(f) = NoInverse(f)

diff --git a/src/setinverse.jl b/src/setinverse.jl
@@ -11,10 +11,10 @@ Do not construct directly, use [`setinverse(f, invf)`](@ref) instead.
 struct FunctionWithInverse{F,InvF} <: Function
     f::F
     invf::InvF
-    FunctionWithInverse{F, InvF}(f, invf) where {F, InvF} = new{F, InvF}(f, invf)
-    FunctionWithInverse(f, invf) = new{Core.Typeof(f),Core.Typeof(invf)}(f, invf)
 end
-
+FunctionWithInverse(::Type{F}, invf::InvF) where {F,InvF} = FunctionWithInverse{Type{F},InvF}(F,invf)
+FunctionWithInverse(f::F, ::Type{InvF}) where {F,InvF} = FunctionWithInverse{F,Type{InvF}}(f,InvF)
+FunctionWithInverse(::Type{F}, ::Type{InvF}) where {F,InvF} = FunctionWithInverse{Type{F},Type{InvF}}(F,InvF)
 
 (f::FunctionWithInverse)(x) = f.f(x)
 

diff --git a/test/test_inverse.jl b/test/test_inverse.jl
@@ -38,7 +38,6 @@ InverseFunctions.inverse(f::Bar) = Bar(inv(f.A))
 
     @test @inferred(inverse(Complex)) isa NoInverse{Type{Complex}}
     @test @inferred(NoInverse(Complex)) isa NoInverse{Type{Complex}}
-    @test @inferred(NoInverse{Type{Complex}}(Complex)) isa NoInverse{Type{Complex}}
 
     InverseFunctions.test_inverse(inverse, log, compare = ===)
 

diff --git a/test/test_setinverse.jl b/test/test_setinverse.jl
@@ -7,8 +7,11 @@ using InverseFunctions
 @testset "setinverse" begin
     @test @inferred(setinverse(Complex, Real)) isa InverseFunctions.FunctionWithInverse{Type{Complex},Type{Real}}
     @test @inferred(InverseFunctions.FunctionWithInverse(Complex, Real)) isa InverseFunctions.FunctionWithInverse{Type{Complex},Type{Real}}
-    @test @inferred(InverseFunctions.FunctionWithInverse{Type{Complex},Type{Real}}(Complex, Real)) isa InverseFunctions.FunctionWithInverse{Type{Complex},Type{Real}}
+    @test @inferred(InverseFunctions.FunctionWithInverse(Real, identity)) isa InverseFunctions.FunctionWithInverse{Type{Real},typeof(identity)}
+    @test @inferred(InverseFunctions.FunctionWithInverse(identity, Real)) isa InverseFunctions.FunctionWithInverse{typeof(identity),Type{Real}}
     InverseFunctions.test_inverse(setinverse(Complex, Real), 4.2)
+    InverseFunctions.test_inverse(setinverse(Real, identity), 4.2)
+    InverseFunctions.test_inverse(setinverse(identity, Real), 4.2)
 
     @test @inferred(setinverse(sin, asin)) === InverseFunctions.FunctionWithInverse(sin, asin)
     @test @inferred(setinverse(sin, setinverse(asin, sqrt))) === InverseFunctions.FunctionWithInverse(sin, asin)