indexing of arrays of arrays

closes #83
mcabbott · Oct 3, 2021 · 86fdfb2 · 86fdfb2
1 parent 853bd30
commit 86fdfb2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/struct.jl b/src/struct.jl
@@ -75,7 +75,7 @@ for (get_or_view, key_get, maybe_copy) in [
             inds = to_indices(A, raw_inds)
             @boundscheck checkbounds(parent(A), inds...)
             data = @inbounds $get_or_view(parent(A), inds...)
-            data isa AbstractArray || return data # scalar output
+            inds isa Tuple{Vararg{Integer}} && return data # scalar output
 
             raw_keys = $key_get(axiskeys(A), inds)
             raw_keys === () && return data # things like A[A .> 0]

diff --git a/test/_basic.jl b/test/_basic.jl
@@ -64,6 +64,10 @@ using Test, AxisKeys
     @test_throws Exception wrapdims(rand(5), ['a','b','c'])
     @test_throws Exception KeyedArray(rand(5), ['a','b','c'])
 
+    G = KeyedArray([[1,2], [3,4], [5,6]], 'α':'γ')  # array of arrays, issue 83
+    @test G[end] == [5,6]
+    @test axiskeys(G') == (1:1, 'α':'γ')
+    @test begin G('α',:) .= Ref([7,8]); G[1] == [7,8] end  # trailing colon still OK here
 end
 @testset "selectors" begin