Skip to content

Commit 673adf4

Browse files
committed
allow indexing with SArrays
1 parent 1a8a542 commit 673adf4

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/abstractarray.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,4 +301,4 @@ end
301301
# wrap elements in Scalar to be consistent with 0D views
302302
_maybewrapscalar(S::SArray{<:Any,T}, r::T) where {T} = Scalar{T}(r)
303303
_maybewrapscalar(S, r) = r
304-
Base.view(S::SArray, I::Union{Colon, Integer, SOneTo}...) = _maybewrapscalar(S, getindex(S, I...))
304+
Base.view(S::SArray, I::Union{Colon, Integer, SOneTo, StaticArray{<:Tuple, Int}}...) = _maybewrapscalar(S, getindex(S, I...))

test/SArray.jl

+3
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@
142142

143143
@test (@view m[:, :]) === m
144144
@test (@view m[:, 1]) === @SArray [11, 12]
145+
@test (@view m[SVector{2,Int}(1,2), 1]) === @SArray [11, 12]
146+
@test (@view m[SMatrix{2,2,Int}(1,2,3,4)]) === m
147+
@test (@view m[SOneTo(2), 1]) === @SArray [11, 12]
145148
@test (@view m[1, 1])[] === m[1, 1]
146149
end
147150

0 commit comments

Comments
 (0)