Merge pull request #50 from mcabbott/linear

Fix linear indexing
mcabbott · Feb 20, 2021 · fac28cb · fac28cb · mcabbott · Feb 20, 2021
2 parents 77cca56 + 62fd77f
commit fac28cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/struct.jl b/src/struct.jl
@@ -87,9 +87,10 @@ for (get_or_view, key_get, maybe_copy) in [
             KeyedArray(data, new_keys)
         end
 
-        # drop all, for A[:] and A[A .> 0] with ndims>=2
+        # drop all, for A[:] or A[A .> 0] or A[1:2], with ndims>=2
         @inline $key_get(keys::Tuple{Any, Any, Vararg{Any}}, inds::Tuple{Base.LogicalIndex}) = ()
         @inline $key_get(keys::Tuple{Any, Any, Vararg{Any}}, inds::Tuple{Base.Slice}) = ()
+        @inline $key_get(keys::Tuple{Any, Any, Vararg{Any}}, inds::Tuple{AbstractVector{<:Integer}}) = ()
 
         # drop one, for integer index
         @inline $key_get(keys::Tuple, inds::Tuple{Integer, Vararg{Any}}) =

diff --git a/test/_basic.jl b/test/_basic.jl
@@ -22,7 +22,8 @@ using Test, AxisKeys
     @test (R[2,:] .= 1:4) isa SubArray # dotview
     @test R[2,:] == KeyedArray(1:4, (10:10:40,))
 
-    @test R[:] == vec(R.data)
+    @test R[1:end] == R[:] == vec(R.data)
+    @test R[1:end] isa Vector  # issue #48
     @test R[1:2, 1, 1] == R.data[1:2, 1, 1]
     @test axiskeys(R[:, [0.9,0.1,0.9,0.1] .> 0.5],2) == [10,30]
     @test ndims(R[R .> 0.5]) == 1