Support Zeros(2)[:], etc., via _unsafe_getindex overload (#119)

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "FillArrays"
 uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
-version = "0.9.5"
+version = "0.9.6"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/FillArrays.jl

@@ -153,10 +153,8 @@ convert(::Type{T}, F::T) where T<:Fill = F   # ambiguity fix
 
 getindex(F::Fill{<:Any,0}) = getindex_value(F)
 
-function getindex(F::Fill, kj::Vararg{AbstractVector{II},N}) where {II<:Integer,N}
-    checkbounds(F, kj...)
+Base._unsafe_getindex(::IndexStyle, F::Fill, kj::Vararg{AbstractVector{II},N}) where {II<:Integer,N} =
     Fill(getindex_value(F), length.(kj))
-end
 
 function getindex(A::Fill, kr::AbstractVector{Bool})
    length(A) == length(kr) || throw(DimensionMismatch())
@@ -264,10 +262,8 @@ for (Typ, funcs, func) in ((:Zeros, :zeros, :zero), (:Ones, :ones, :one))
         copy(F::$Typ) = F
 
         getindex(F::$Typ{T,0}) where T = getindex_value(F)
-        function getindex(F::$Typ{T}, kj::Vararg{AbstractVector{II},N}) where {T,II<:Integer,N}
-            checkbounds(F, kj...)
+        Base._unsafe_getindex(::IndexStyle, F::$Typ{T}, kj::Vararg{AbstractVector{II},N}) where {T,II<:Integer,N} =
             $Typ{T}(length.(kj))
-        end
         function getindex(A::$Typ{T}, kr::AbstractVector{Bool}) where T
             length(A) == length(kr) || throw(DimensionMismatch("lengths must match"))
             $Typ{T}(count(kr))

test/runtests.jl

@@ -680,6 +680,16 @@ end
     @test A[[true false; true false]] ≡ Zeros{Int}(2)
     @test A[[true, false, true, false]] ≡ Zeros{Int}(2)
     @test_throws DimensionMismatch A[[true false false; true false false]]
+
+    @testset "colon" begin
+        @test Ones(2)[:] ≡ Ones(2)[Base.Slice(Base.OneTo(2))] ≡ Ones(2)
+        @test Zeros(2)[:] ≡ Zeros(2)[Base.Slice(Base.OneTo(2))] ≡ Zeros(2)
+        @test Fill(3.0,2)[:] ≡ Fill(3.0,2)[Base.Slice(Base.OneTo(2))] ≡ Fill(3.0,2)
+
+        @test Ones(2,2)[:,:] ≡ Ones(2,2)[Base.Slice(Base.OneTo(2)),Base.Slice(Base.OneTo(2))] ≡ Ones(2,2)
+        @test Zeros(2,2)[:,:] ≡ Zeros(2)[Base.Slice(Base.OneTo(2)),Base.Slice(Base.OneTo(2))] ≡ Zeros(2,2)
+        @test Fill(3.0,2,2)[:,:] ≡ Fill(3.0,2,2)[Base.Slice(Base.OneTo(2)),Base.Slice(Base.OneTo(2))] ≡ Fill(3.0,2,2)
+    end
 end
 
 @testset "Offset indexing" begin