A[1,:] lowers to layout_getindex (#45)

* A[1,:] and A[1,2:end] layout_getindex

* AdjOrTrans indexing

* Update runtests.jl

Author: dlfivefifty

Project.toml

@@ -1,7 +1,7 @@
 name = "ArrayLayouts"
 uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
 authors = ["Sheehan Olver <[email protected]>"]
-version = "0.4.8"
+version = "0.4.9"
 
 [deps]
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"

src/ArrayLayouts.jl

@@ -117,6 +117,8 @@ macro _layoutgetindex(Typ)
         @inline Base.getindex(A::$Typ, kr::Colon, jr::AbstractVector) = ArrayLayouts.layout_getindex(A, kr, jr)
         @inline Base.getindex(A::$Typ, kr::Colon, jr::Integer) = ArrayLayouts.layout_getindex(A, kr, jr)
         @inline Base.getindex(A::$Typ, kr::AbstractVector, jr::Colon) = ArrayLayouts.layout_getindex(A, kr, jr)
+        @inline Base.getindex(A::$Typ, kr::Integer, jr::Colon) = ArrayLayouts.layout_getindex(A, kr, jr)
+        @inline Base.getindex(A::$Typ, kr::Integer, jr::AbstractVector) = ArrayLayouts.layout_getindex(A, kr, jr)
     end)
 end
 
@@ -155,6 +157,8 @@ end
 
 getindex(A::LayoutVector, kr::AbstractVector) = layout_getindex(A, kr)
 getindex(A::LayoutVector, kr::Colon) = layout_getindex(A, kr)
+getindex(A::AdjOrTrans{<:Any,<:LayoutVector}, kr::Integer, jr::Colon) = layout_getindex(A, kr, jr)
+getindex(A::AdjOrTrans{<:Any,<:LayoutVector}, kr::Integer, jr::AbstractVector) = layout_getindex(A, kr, jr)
 
 _copyto!(_, _, dest::AbstractArray{T,N}, src::AbstractArray{V,N}) where {T,V,N} =
     Base.invoke(copyto!, Tuple{AbstractArray{T,N},AbstractArray{V,N}}, dest, src)

test/runtests.jl

@@ -39,6 +39,7 @@ MemoryLayout(::Type{MyVector}) = DenseColumnMajor()
         @test a == a.A == Vector(a)
         @test a[1:3] == a.A[1:3]
         @test a[:] == a
+        @test (a')[1,:] == (a')[1,1:3] == a
         @test stringmime("text/plain", a) == "3-element MyVector:\n 1.0\n 2.0\n 3.0"
         @test B*a ≈ B*a.A
         @test B'*a ≈ B'*a.A
@@ -56,7 +57,8 @@ MemoryLayout(::Type{MyVector}) = DenseColumnMajor()
 
     @testset "LayoutMatrix" begin
         A = MyMatrix(randn(5,5))
-        for (kr,jr) in ((1:2,2:3), (:,:), (:,1:2), (2:3,:), ([1,2],3:4), (:,[1,2]), ([2,3],:))
+        for (kr,jr) in ((1:2,2:3), (:,:), (:,1:2), (2:3,:), ([1,2],3:4), (:,[1,2]), ([2,3],:),
+                        (2,:), (:,2), (2,1:3), (1:3,2))
             @test A[kr,jr] == A.A[kr,jr]
         end
         b = randn(5)