Less scary bounds check skipping. Fixes #70

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.0"
+version = "0.9.1"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/set_get.jl

@@ -32,7 +32,7 @@ Base.@propagate_inbounds Base.getindex(x::ComponentArray, idx...) = getindex(x,
 @inline Base.getindex(x::ComponentArray, idx::Val...) = _getindex(x, idx...)
 
 # Set ComponentArray index
-Base.@propagate_inbounds Base.setindex!(x::ComponentArray, v, idx::FlatIdx...) = setindex!(getdata(x), v, idx...)
+@inline Base.setindex!(x::ComponentArray, v, idx::FlatIdx...) = setindex!(getdata(x), v, idx...)
 Base.@propagate_inbounds Base.setindex!(x::ComponentArray, v, ::Colon) = setindex!(getdata(x), v, :)
 Base.@propagate_inbounds Base.setindex!(x::ComponentArray, v, idx...) = setindex!(x, v, toval.(idx)...)
 @inline Base.setindex!(x::ComponentArray, v, idx::Val...) = _setindex!(x, v, idx...)
@@ -53,14 +53,14 @@ Base.@propagate_inbounds Base.setindex!(x::ComponentArray, v, idx...) = setindex
     axs = map(i -> i.ax, ci)
     axs = remove_nulls(axs...)
     # the index must be valid after computing `ci`
-    :(Base.@_inline_meta; @inbounds ComponentArray(Base.maybeview(getdata(x), $inds...), $axs...))
+    :(Base.@_inline_meta; ComponentArray(Base.maybeview(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; @inbounds setindex!(getdata(x), v, $inds...))
+    return :(Base.@_inline_meta; setindex!(getdata(x), v, $inds...))
 end
 
 Base.@propagate_inbounds Base.view(x::ComponentArray, idx::ComponentArrays.FlatIdx...) = view(getdata(x), idx...)

test/runtests.jl

@@ -157,6 +157,10 @@ end
 
     @test getproperty(ca, Val(:a)) == ca.a
 
+    @test Base.to_indices(ca, (:a, :b)) == (:a, :b)
+    @test Base.to_indices(ca, (1, 2)) == (1, 2)
+    @test Base.to_index(ca, :a) == :a
+
     #OffsetArray stuff
     part_ax = PartitionedAxis(2, Axis(a=1, b=2))
     oaca = ComponentArray(OffsetArray(collect(1:5), -1), Axis(a=0, b=ViewAxis(1:4, part_ax)))
@@ -176,9 +180,11 @@ end
     @test getdata(A_vec) isa Vector
     @test getdata(A_mat) isa Matrix
 
-    @test Base.to_indices(ca, (:a, :b)) == (:a, :b)
-    @test Base.to_indices(ca, (1, 2)) == (1, 2)
-    @test Base.to_index(ca, :a) == :a
+    # Issue #70
+    let 
+        ca = ComponentVector(a=1, b=2, c=3)
+        @test_throws BoundsError ca[:a, :b]
+    end
 end
 
 @testset "Set" begin