Merge pull request #15 from tkoolen/fix-map-ambiguity

Fix map! ambiguity.

Author: tkoolen

src/TypeSortedCollections.jl

@@ -92,6 +92,7 @@ Base.@pure num_types(::Type{<:TypeSortedCollection{<:Any, N}}) where {N} = N
 num_types(x::TypeSortedCollection) = num_types(typeof(x))
 
 const TSCOrAbstractVector{N} = Union{<:TypeSortedCollection{<:Any, N}, AbstractVector}
+const TSCOrAbstractArray{N} = Union{<:TypeSortedCollection{<:Any, N}, AbstractArray}
 
 Base.isempty(x::TypeSortedCollection) = all(isempty, x.data)
 Base.empty!(x::TypeSortedCollection) = foreach(empty!, x.data)
@@ -131,7 +132,7 @@ end
 @inline indices_match(vali::Val, indices::Vector{Int}, a1, as...) = indices_match(vali, indices, a1) && indices_match(vali, indices, as...)
 @noinline indices_match_fail() = throw(ArgumentError("Indices of TypeSortedCollections do not match."))
 
-@generated function Base.map!(f, dest::TSCOrAbstractVector{N}, args::TSCOrAbstractVector{N}...) where {N}
+@generated function Base.map!(f, dest::TSCOrAbstractArray{N}, args::TSCOrAbstractArray{N}...) where {N} # TSCOrAbstract*Array* to avoid ambiguities with map!(f, ::AbstractArray, ::AbstractArray...)
     expr = Expr(:block)
     push!(expr.args, :(Base.@_inline_meta))
     push!(expr.args, :(leading_tsc = first_tsc(dest, args...)))

test/runtests.jl

@@ -13,9 +13,7 @@ g(x::Int64, y1::Int64, y2::Float64) = x - y1 * y2
 end
 
 @testset "ambiguities" begin
-    base_ambiguities = detect_ambiguities(Base, Core)
-    tsc_ambiguities = setdiff(detect_ambiguities(TypeSortedCollections, Base, Core), base_ambiguities)
-    @test isempty(tsc_ambiguities)
+    @test isempty(detect_ambiguities(Base, Core, TypeSortedCollections))
 end
 
 @testset "general collection interface" begin