Infinite IdOffsetRanges

Author: jishnub

Project.toml

@@ -13,6 +13,7 @@ DistributedArrays = "0.6"
 Documenter = "0.27"
 EllipsisNotation = "1"
 FillArrays = "0.11, 0.13"
+InfiniteArrays = "0.12"
 StaticArrays = "1"
 julia = "0.7, 1"
 
@@ -24,9 +25,10 @@ DistributedArrays = "aaf54ef3-cdf8-58ed-94cc-d582ad619b94"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 EllipsisNotation = "da5c29d0-fa7d-589e-88eb-ea29b0a81949"
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
+InfiniteArrays = "4858937d-0d70-526a-a4dd-2d5cb5dd786c"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Aqua", "CatIndices", "DistributedArrays", "DelimitedFiles", "Documenter", "Test", "LinearAlgebra", "EllipsisNotation", "StaticArrays", "FillArrays"]
+test = ["Aqua", "CatIndices", "DistributedArrays", "DelimitedFiles", "Documenter", "InfiniteArrays", "Test", "LinearAlgebra", "EllipsisNotation", "StaticArrays", "FillArrays"]

src/OffsetArrays.jl

@@ -607,9 +607,9 @@ Base.empty!(A::OffsetVector) = (empty!(A.parent); A)
 # These functions keep the summary compact
 const OffsetIndices = Union{IdOffsetRange, IdentityUnitRange{<:IdOffsetRange}}
 function Base.inds2string(inds::Tuple{OffsetIndices, Vararg{OffsetIndices}})
-    Base.inds2string(map(UnitRange, inds))
+    Base.inds2string(map(no_offset_view, inds))
 end
-Base.showindices(io::IO, ind1::IdOffsetRange, inds::IdOffsetRange...) = Base.showindices(io, map(UnitRange, (ind1, inds...))...)
+Base.showindices(io::IO, ind1::IdOffsetRange, inds::IdOffsetRange...) = Base.showindices(io, map(no_offset_view, (ind1, inds...))...)
 
 function Base.showarg(io::IO, @nospecialize(a::OffsetArray), toplevel)
     print(io, "OffsetArray(")

src/axes.jl

@@ -177,6 +177,7 @@ if VERSION < v"1.8.2"
 end
 @inline Base.unsafe_indices(r::IdOffsetRange) = (axes1(r),)
 @inline Base.length(r::IdOffsetRange) = length(r.parent)
+@inline Base.checked_length(x::IdOffsetRange) = Base.checked_length(x.parent)
 @inline Base.isempty(r::IdOffsetRange) = isempty(r.parent)
 #= We specialize on reduced_indices to work around cases where the parent axis type doesn't
 support reduced_index, but the axes do support reduced_indices
@@ -275,7 +276,11 @@ Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(+), x::Int
 Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(big), r::IdOffsetRange) =
     IdOffsetRange(big.(r.parent), r.offset)
 
-Base.show(io::IO, r::IdOffsetRange) = print(io, IdOffsetRange, "(values=",first(r), ':', last(r),", indices=",first(eachindex(r)),':',last(eachindex(r)), ")")
+function Base.show(io::IO, r::IdOffsetRange)
+    values_offset = r.parent .+ r.offset
+    indices_offset = axes(r.parent,1) .+ r.offset
+    print(io, IdOffsetRange, "(values=",values_offset,", indices=",indices_offset,")")
+end
 
 # Optimizations
 @inline Base.checkindex(::Type{Bool}, inds::IdOffsetRange, i::Real) = Base.checkindex(Bool, inds.parent, i - inds.offset)
@@ -287,6 +292,8 @@ if VERSION < v"1.5.2"
         Base.compute_linindex(parent, I) - stride1*first(Base.axes1(inds[1]))
 end
 
+Base.IteratorSize(::Type{<:IdOffsetRange{<:Any,I}}) where {I} = Base.IteratorSize(I)
+
 # This was deemed "too private" to extend: see issue #184
 # # Fixes an inference failure in Base.mapfirst!
 # # Test: A = OffsetArray(rand(4,4), (-3,5)); R = similar(A, (1:1, 6:9)); maximum!(R, A)

test/Project.toml

@@ -7,6 +7,7 @@ using DistributedArrays
 using Documenter
 using EllipsisNotation
 using FillArrays
+using InfiniteArrays
 using LinearAlgebra
 using OffsetArrays
 using OffsetArrays: IdentityUnitRange, no_offset_view, IIUR, Origin, IdOffsetRange
@@ -401,6 +402,17 @@ end
         ind, st = iterate(ax, st)
         @test C[ind] == C[5]
     end
+
+    @testset "Infinite ranges" begin
+        x = 1:∞
+        y = IdOffsetRange(x)
+        @test y[2] == x[2]
+        @test first(x,2) == first(y,2)
+        stry = repr(y)
+        strx = repr(x)
+        @test contains(stry, "values=$strx")
+        @test contains(stry, "indices=$strx")
+    end
 end
 
 # used in testing the constructor