Changed symbolic indexing to slice. Closes #90

Author: jonniedie

Project.toml

@@ -1,7 +1,7 @@
 name = "ComponentArrays"
 uuid = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
 authors = ["Jonnie Diegelman <47193959+jonniedie@users.noreply.github.com>"]
-version = "0.9.11"
+version = "0.10.0"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/array_interface.jl

@@ -84,12 +84,6 @@ Base.to_indices(x::ComponentArray, i::Tuple{Vararg{Union{Integer, CartesianIndex
 Base.to_indices(x::ComponentArray, i::Tuple{Vararg{Int64}}) where N = i
 Base.to_index(x::ComponentArray, i) = i
 
-# Get AbstractAxis index
-@inline Base.getindex(::AbstractAxis, idx::FlatIdx) = ComponentIndex(idx)
-@inline Base.getindex(ax::AbstractAxis, ::Colon) = ComponentIndex(:, ax)
-@inline Base.getindex(::AbstractAxis{IdxMap}, s::Symbol) where IdxMap =
-    ComponentIndex(getproperty(IdxMap, s))
-
 # Get ComponentArray index
 Base.@propagate_inbounds Base.getindex(x::ComponentArray, idx::CartesianIndex) = getdata(x)[idx]
 Base.@propagate_inbounds Base.getindex(x::ComponentArray, idx::FlatIdx...) = getdata(x)[idx...]
@@ -101,7 +95,7 @@ end
 Base.@propagate_inbounds Base.getindex(x::ComponentArray, ::Colon) = getdata(x)[:]
 Base.@propagate_inbounds Base.getindex(x::ComponentArray, ::Colon...) = x
 @inline Base.getindex(x::ComponentArray, idx...) = getindex(x, toval.(idx)...)
-@inline Base.getindex(x::ComponentArray, idx::Val...) = _getindex(x, idx...)
+@inline Base.getindex(x::ComponentArray, idx::Val...) = _getindex(getindex, x, idx...)
 
 # Set ComponentArray index
 Base.@propagate_inbounds Base.setindex!(x::ComponentArray, v, idx::FlatOrColonIdx...) = setindex!(getdata(x), v, idx...)
@@ -111,22 +105,23 @@ Base.@propagate_inbounds Base.setindex!(x::ComponentArray, v, ::Colon) = setinde
 
 # Explicitly view
 Base.@propagate_inbounds Base.view(x::ComponentArray, idx::ComponentArrays.FlatIdx...) = view(getdata(x), idx...)
-Base.@propagate_inbounds Base.view(x::ComponentArray, idx...) = _getindex(x, toval.(idx)...)
+Base.@propagate_inbounds Base.view(x::ComponentArray, idx...) = _getindex(view, x, toval.(idx)...)
+
+Base.@propagate_inbounds Base.maybeview(x::ComponentArray, idx::ComponentArrays.FlatIdx...) = Base.maybeview(getdata(x), idx...)
+Base.@propagate_inbounds Base.maybeview(x::ComponentArray, idx...) = _getindex(Base.maybeview, x, toval.(idx)...)
 
 # Generated get and set index methods to do all of the heavy lifting in the type domain
-@generated function _getindex(x::ComponentArray, idx...)
+@generated function _getindex(index_fun, x::ComponentArray, idx...)
     ci = getindex.(getaxes(x), getval.(idx))
     inds = map(i -> i.idx, ci)
     axs = map(i -> i.ax, ci)
     axs = remove_nulls(axs...)
-    # the index must be valid after computing `ci`
-    :(Base.@_inline_meta; ComponentArray(Base.maybeview(getdata(x), $inds...), $axs...))
+    return :(Base.@_inline_meta; ComponentArray(index_fun(getdata(x), $inds...), $axs...))
 end
 
 @generated function _setindex!(x::ComponentArray, v, idx...)
     ci = getindex.(getaxes(x), getval.(idx))
     inds = map(i -> i.idx, ci)
-    # the index must be valid after computing `ci`
     return :(Base.@_inline_meta; setindex!(getdata(x), v, $inds...))
 end
 

src/axis.jl

@@ -148,3 +148,9 @@ reindex(i, offset) = i .+ offset
 reindex(ax::FlatAxis, _) = ax
 reindex(ax::Axis, offset) = Axis(map(x->reindex(x, offset), indexmap(ax)))
 reindex(ax::ViewAxis, offset) = ViewAxis(viewindex(ax) .+ offset, indexmap(ax))
+
+# Get AbstractAxis index
+@inline Base.getindex(::AbstractAxis, idx::FlatIdx) = ComponentIndex(idx)
+@inline Base.getindex(ax::AbstractAxis, ::Colon) = ComponentIndex(:, ax)
+@inline Base.getindex(::AbstractAxis{IdxMap}, s::Symbol) where IdxMap =
+    ComponentIndex(getproperty(IdxMap, s))

src/componentarray.jl

@@ -289,8 +289,10 @@ getaxes(x) = ()
 
 """
     valkeys(x::ComponentVector)
+    valkeys(x::AbstractAxis)
 
-Returns `Val`-wrapped keys of `ComponentVector` for fast iteration over component keys.
+Returns `Val`-wrapped keys of `ComponentVector` for fast iteration over component keys. Also works
+directly on an `AbstractAxis`.
 
 # Examples
 
@@ -310,8 +312,9 @@ julia> sum(prod(ca[k]) for k in valkeys(ca))
 11
 ```
 """
-@generated function valkeys(ca::ComponentVector)
-    idxmap = ComponentArrays.indexmap(getaxes(ca)[1])
+@generated function valkeys(ax::AbstractAxis)
+    idxmap = indexmap(ax)
     k = Val.(keys(idxmap))
     return :($k)
-end
+end
+valkeys(ca::ComponentVector) = valkeys(getaxes(ca)[1])

src/namedtuple_interface.jl

@@ -11,8 +11,8 @@ Base.haskey(x::ComponentVector, s::Symbol) = haskey(indexmap(getaxes(x)[1]), s)
 Base.propertynames(x::ComponentVector) = propertynames(indexmap(getaxes(x)[1]))
 
 # Property access for ComponentVectors goes through _get/_setindex
-@inline Base.getproperty(x::ComponentVector, s::Symbol) = _getindex(x, Val(s))
-@inline Base.getproperty(x::ComponentVector, s::Val) = _getindex(x, s)
+@inline Base.getproperty(x::ComponentVector, s::Symbol) = _getindex(Base.maybeview, x, Val(s))
+@inline Base.getproperty(x::ComponentVector, s::Val) = _getindex(Base.maybeview, x, s)
 
 @inline Base.setproperty!(x::ComponentVector, s::Symbol, v) = _setindex!(x, v, Val(s))
 @inline Base.setproperty!(x::ComponentVector, s::Val, v) = _setindex!(x, v, s)

test/runtests.jl

@@ -175,8 +175,9 @@ end
     @test size(caa.b) == size(sq_mat)
     @test caa.b[1:2, 3] == sq_mat[1:2, 3]
 
-    @test view(ca, :a) == ca.a
-    @test cmat[:c, :a] == view(cmat, :c, :a)
+    @test Base.maybeview(ca, :a) == ca.a
+    @test cmat[:c, :a] == getindex(cmat, :c, :a)
+    @test @view(cmat[:c, :a]) == view(cmat, :c, :a)
 
     @test ca[CartesianIndex(1)] == ca[1]
     @test cmat[CartesianIndex(1, 2)] == cmat[1, 2]
@@ -230,8 +231,8 @@ end
 
     temp.c.a .= 1000
 
-    tempmat[:b,:b][1,1][:a,:a][:a,:a] = 100000
-    tempmat[:b,:a][2].b = 1000
+    view(view(tempmat,:b,:b)[1,1],:a,:a)[:a,:a] = 100000
+    @view(tempmat[:b,:a])[2].b = 1000
 
     @test temp.c.a.a == 1000