views for CartesianIndex, inferred in tests

JuliaArrays · May 12, 2021 · 2724123 · 2724123
1 parent 673adf4
commit 2724123
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/abstractarray.jl b/src/abstractarray.jl
@@ -301,4 +301,7 @@ end
 # wrap elements in Scalar to be consistent with 0D views
 _maybewrapscalar(S::SArray{<:Any,T}, r::T) where {T} = Scalar{T}(r)
 _maybewrapscalar(S, r) = r
-Base.view(S::SArray, I::Union{Colon, Integer, SOneTo, StaticArray{<:Tuple, Int}}...) = _maybewrapscalar(S, getindex(S, I...))
+function Base.view(S::SArray, I::Union{Colon, Integer, SOneTo, StaticArray{<:Tuple, Int}, CartesianIndex}...)
+ V = getindex(S, I...)
+ _maybewrapscalar(S, V)
+end
diff --git a/test/SArray.jl b/test/SArray.jl
@@ -140,12 +140,15 @@
 
  @test Base.dataids(m) === ()
 
- @test (@view m[:, :]) === m
- @test (@view m[:, 1]) === @SArray [11, 12]
- @test (@view m[SVector{2,Int}(1,2), 1]) === @SArray [11, 12]
- @test (@view m[SMatrix{2,2,Int}(1,2,3,4)]) === m
- @test (@view m[SOneTo(2), 1]) === @SArray [11, 12]
- @test (@view m[1, 1])[] === m[1, 1]
+ @test (@inferred view(m, :, :)) === m
+ @test (@inferred view(m, :, 1)) === @SArray [11, 12]
+ @test (@inferred view(m, SVector{2,Int}(1,2), 1)) === @SArray [11, 12]
+ @test (@inferred view(m, SMatrix{2,2,Int}(1,2,3,4))) === m
+ @test (@inferred view(m, SOneTo(2), 1)) === @SArray [11, 12]
+ @test (@inferred view(m, 1, 1)) === Scalar(m[1, 1])
+ @test (@inferred view(m, CartesianIndex(1, 1))) === Scalar(m[1, 1])
+ @test (@inferred view(m, CartesianIndex(1, 1, 1))) === Scalar(m[1, 1])
+ @test (@inferred view(m, 1, 1, CartesianIndex(1))) === Scalar(m[1, 1])
  end
 
  @testset "promotion" begin

diff --git a/test/SVector.jl b/test/SVector.jl
@@ -82,6 +82,14 @@
  @test length(v) === 3
 
  @test_throws Exception v[1] = 1
+
+ @test (@inferred view(v, :)) === v
+ @test (@inferred view(v, 1)) === Scalar(v[1])
+ @test (@inferred view(v, CartesianIndex(1))) === Scalar(v[1])
+ @test (@inferred view(v, CartesianIndex(1,1))) === Scalar(v[1])
+ @test (@inferred view(v, 1, CartesianIndex(1))) === Scalar(v[1])
+ @test (@inferred view(v, SVector{2,Int}(1,2))) === @SArray [11, 12]
+ @test (@inferred view(v, SOneTo(2))) === @SArray [11, 12]
  end
 
  @testset "CartesianIndex" begin