Avoid ambiguity warning in cachedvector getindex (#64)

* Avoid ambiguity warning in cachedvector getindex * add tests
JuliaArrays · Feb 22, 2021 · bc62b56 · bc62b56 · dlfivefifty · Feb 22, 2021
1 parent 9b5e679
commit bc62b56
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "InfiniteArrays"
 uuid = "4858937d-0d70-526a-a4dd-2d5cb5dd786c"
-version = "0.10.1"
+version = "0.10.2"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

diff --git a/src/InfiniteArrays.jl b/src/InfiniteArrays.jl
@@ -39,7 +39,7 @@ import Statistics: mean, median
 
 import FillArrays: AbstractFill, getindex_value, fill_reshape, RectDiagonal, Fill, Ones, Zeros, Eye
 import LazyArrays: LazyArrayStyle, AbstractBandedLayout, MemoryLayout, LazyLayout, UnknownLayout,
-                    ZerosLayout, AbstractArrayApplyStyle, CachedArray, CachedVector, ApplyLayout, LazyMatrix,
+                    ZerosLayout, AbstractArrayApplyStyle, AbstractCachedVector, CachedArray, CachedVector, ApplyLayout, LazyMatrix,
                     reshapedlayout, sub_materialize, LayoutMatrix, LayoutVector, _padded_sub_materialize, PaddedLayout
 
 import DSP: conv

diff --git a/src/infarrays.jl b/src/infarrays.jl
@@ -257,4 +257,6 @@ _unsafe_getindex(::IndexLinear, A::Vcat, r::InfUnitRange) = _vcat(_gettail(first
 
 getindex(A::AbstractVector, r::InfRanges{<:Integer}) = layout_getindex(A, r)
 getindex(A::LayoutVector, r::InfRanges{<:Integer}) = layout_getindex(A, r)
+getindex(A::AbstractCachedVector, r::InfRanges{<:Integer}) = layout_getindex(A, r)
+getindex(A::CachedVector{<:Any,<:AbstractVector,<:AbstractFill{<:Any,1}}, r::InfRanges{<:Integer}) = layout_getindex(A, r)
 getindex(A::AbstractFill{<:Any,1}, r::InfRanges{<:Integer}) = FillArrays.fillsimilar(A, length(r))
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -583,6 +583,10 @@ end
         @test [[1,2]; [3,4]; [5,6]; Zeros(∞)] isa Vcat{<:Any,1,<:Tuple{Array,Zeros}}
 
         @test [randn(2,2); Zeros(∞,2)] isa Vcat{<:Any,2,<:Tuple{Array,Zeros}}
+
+        a = [[1,2,3]; zeros(Int,∞)]
+        @test a[3:∞][1:5] == a[3:7]
+        @test cache(1:∞)[2:∞][1:5] == 2:6
     end
 
     @testset "sparse print" begin