Fix ambiguity in indexing with zero-dimensional sub arrays (#15)

JuliaMath · Sep 2, 2021 · 792229a · 792229a
1 parent 0e567f7
commit 792229a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/cardinality.jl b/src/cardinality.jl
@@ -204,8 +204,8 @@ getindex(A::Array, i1::InfiniteCardinal{0}, I::Integer...) = throw(BoundsError(A
 Base._unsafe_getindex(::IndexStyle, A::AbstractArray, I::InfiniteCardinal{0}) = error("Overload getindex(::$(typeof(A)), ::InfiniteCardinal{0})")
 
 # Avoid too-strict restrictions in SubArray
-function getindex(V::SubArray{T,N}, I::Vararg{InfiniteCardinal{0},N}) where {T,N}
-  @boundscheck checkbounds(V, I...)
-  @inbounds r = V.parent[Base.reindex(V.indices, I)...]
+function getindex(V::SubArray{T,N}, i1::InfiniteCardinal{0}, I::Integer...) where {T,N}
+  @boundscheck checkbounds(V, i1, I...)
+  @inbounds r = V.parent[Base.reindex(V.indices, tuple(i1, I...))...]
   r
 end
diff --git a/test/test_cardinality.jl b/test/test_cardinality.jl
@@ -133,5 +133,7 @@ using Infinities, Base64, Base.Checked, Test
         @test_throws BoundsError randn(3)[ℵ₀]
         @test_throws ErrorException Base._unsafe_getindex(IndexCartesian(),permutedims(1:3)',ℵ₀)
         @test_throws BoundsError view(randn(3),1:2)[ℵ₀]
+        # check ambiguity is not introduced
+        @test view(collect(1:5),2)[] == 2
     end
 end