Fixes for jonniedie#175 and jonniedie#174

nrontsis · Dec 24, 2022 · 4b0bb8e · 4b0bb8e
1 parent cbb24ef
commit 4b0bb8e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/array_interface.jl b/src/array_interface.jl
@@ -123,7 +123,11 @@ Base.@propagate_inbounds Base.maybeview(x::ComponentArray, idx...) = _getindex(B
     inds = map(i -> i.idx, ci)
     axs = map(i -> i.ax, ci)
     axs = remove_nulls(axs...)
-    return :(ComponentArray(index_fun(getdata(x), $inds...), $axs...))
+    if isa(axs, Tuple{})
+        return :(index_fun(getdata(x), $inds...))
+    else
+        return :(ComponentArray(index_fun(getdata(x), $inds...), $axs...))
+    end
 end
 
 @generated function _setindex!(x::ComponentArray, v, idx...)

diff --git a/src/axis.jl b/src/axis.jl
@@ -170,7 +170,7 @@ function Base.getindex(ax::AbstractAxis, syms::Union{NTuple{N,Symbol}, <:Abstrac
         _maybe_view_axis(first_index:last_index, ax)
     end
     new_ax = Axis(NamedTuple(syms .=> new_axs))
-    return ComponentIndex(reduce(vcat, inds), new_ax)
+    return ComponentIndex(vcat(inds...), new_ax)
 end
 
 _maybe_view_axis(inds, ax::Axis) = ViewAxis(inds, ax)
@@ -202,4 +202,4 @@ Base.getindex(ax::CombinedAxis, i::AbstractArray) = _array_axis(ax)[i]
 
 Base.length(ax::CombinedAxis) = lastindex(ax) - firstindex(ax) + 1
 
-Base.CartesianIndices(ax::Tuple{Vararg{CombinedAxis}}) = CartesianIndices(_array_axis.(ax))
+Base.CartesianIndices(ax::Tuple{Vararg{CombinedAxis}}) = CartesianIndices(_array_axis.(ax))
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -176,7 +176,10 @@ end
     @test ca.c == ComponentArray(c)
     @test ca2.b[1].a.a == 20.0
 
-    @test ca[:a] == ca["a"] == ca.a
+    @test ca[:a] == ca["a"] == ca.a == ca[[:a]][1]
+    @test ca[[:a]] isa ComponentVector  # Issue 175
+    @test ca[Symbol[]] == Float64[]  # Issue 174
+    @test length(ca[()]) == 0  # Issue #174
     @test ca[:b] == ca["b"] == ca.b
     @test ca[:c] == ca["c"] == ca.c