Easier to disambiguate in (#126)

* Easier to disambiguate in * version bump to v0.7.4 * define in for AbstractInterval * define in(v, ::Domain) * Define in(v, ::TypedEndpointsInterval)
JuliaMath · Nov 30, 2022 · 245ab42 · 245ab42 · hyrodium · Nov 30, 2022
1 parent 0661291
commit 245ab42
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "IntervalSets"
 uuid = "8197267c-284f-5f27-9208-e0e47529a953"
-version = "0.7.3"
+version = "0.7.4"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

diff --git a/src/IntervalSets.jl b/src/IntervalSets.jl
@@ -117,21 +117,22 @@ closedendpoints(d::TypedEndpointsInterval{:closed,:open}) = (true,false)
 closedendpoints(d::TypedEndpointsInterval{:open,:closed}) = (false,true)
 closedendpoints(d::TypedEndpointsInterval{:open,:open}) = (false,false)
 
-
-in(v, I::TypedEndpointsInterval{:closed,:closed}) = leftendpoint(I) ≤ v ≤ rightendpoint(I)
-in(v, I::TypedEndpointsInterval{:open,:open}) = leftendpoint(I) < v < rightendpoint(I)
-in(v, I::TypedEndpointsInterval{:closed,:open}) = leftendpoint(I) ≤ v < rightendpoint(I)
-in(v, I::TypedEndpointsInterval{:open,:closed}) = leftendpoint(I) < v ≤ rightendpoint(I)
-
-in(v::Complex, I::TypedEndpointsInterval{:closed,:closed}) = isreal(v) && in(real(v), I)
-in(v::Complex, I::TypedEndpointsInterval{:open,:open}) = isreal(v) && in(real(v), I)
-in(v::Complex, I::TypedEndpointsInterval{:closed,:open}) = isreal(v) && in(real(v), I)
-in(v::Complex, I::TypedEndpointsInterval{:open,:closed}) = isreal(v) && in(real(v), I)
-
-in(::Missing, I::TypedEndpointsInterval{:closed,:closed}) = !isempty(I) && missing
-in(::Missing, I::TypedEndpointsInterval{:open,:open}) = !isempty(I) && missing
-in(::Missing, I::TypedEndpointsInterval{:closed,:open}) = !isempty(I) && missing
-in(::Missing, I::TypedEndpointsInterval{:open,:closed}) = !isempty(I) && missing
+# We dispatch to _in to avoid ambiguities if packages define in(v::CustomType, I::TypedEndpointsInterval)
+in(v, I::TypedEndpointsInterval) = _in(v, I)
+_in(v, I::TypedEndpointsInterval{:closed,:closed}) = leftendpoint(I) ≤ v ≤ rightendpoint(I)
+_in(v, I::TypedEndpointsInterval{:open,:open}) = leftendpoint(I) < v < rightendpoint(I)
+_in(v, I::TypedEndpointsInterval{:closed,:open}) = leftendpoint(I) ≤ v < rightendpoint(I)
+_in(v, I::TypedEndpointsInterval{:open,:closed}) = leftendpoint(I) < v ≤ rightendpoint(I)
+
+_in(v::Complex, I::TypedEndpointsInterval{:closed,:closed}) = isreal(v) && in(real(v), I)
+_in(v::Complex, I::TypedEndpointsInterval{:open,:open}) = isreal(v) && in(real(v), I)
+_in(v::Complex, I::TypedEndpointsInterval{:closed,:open}) = isreal(v) && in(real(v), I)
+_in(v::Complex, I::TypedEndpointsInterval{:open,:closed}) = isreal(v) && in(real(v), I)
+
+_in(::Missing, I::TypedEndpointsInterval{:closed,:closed}) = !isempty(I) && missing
+_in(::Missing, I::TypedEndpointsInterval{:open,:open}) = !isempty(I) && missing
+_in(::Missing, I::TypedEndpointsInterval{:closed,:open}) = !isempty(I) && missing
+_in(::Missing, I::TypedEndpointsInterval{:open,:closed}) = !isempty(I) && missing
 
 isempty(A::TypedEndpointsInterval{:closed,:closed}) = leftendpoint(A) > rightendpoint(A)
 isempty(A::TypedEndpointsInterval) = leftendpoint(A) ≥ rightendpoint(A)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -827,6 +827,7 @@ struct IncompleteInterval <: AbstractInterval{Int} end
         @test eltype(I) === Int
         @test_throws ErrorException endpoints(I)
         @test_throws ErrorException closedendpoints(I)
+        @test_throws MethodError 2 in I
     end
 
     @testset "float" begin