From 524f76e9b5d6fb881382f72a3d94827d22cae65a Mon Sep 17 00:00:00 2001 From: jishnub Date: Tue, 9 Feb 2021 19:02:02 +0400 Subject: [PATCH 1/2] fix show for OffsetRanges --- src/OffsetArrays.jl | 3 +-- test/runtests.jl | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/OffsetArrays.jl b/src/OffsetArrays.jl index 39c07897..f39ca1ed 100644 --- a/src/OffsetArrays.jl +++ b/src/OffsetArrays.jl @@ -368,8 +368,7 @@ indexing is faster with ranges =# function Base.show(io::IO, r::OffsetRange) show(io, r.parent) - o = r.offsets[1] - print(io, " with indices ", o+1:o+length(r)) + print(io, " with indices ", UnitRange(axes(r, 1))) end Base.show(io::IO, ::MIME"text/plain", r::OffsetRange) = show(io, r) diff --git a/test/runtests.jl b/test/runtests.jl index 310d6991..d1468651 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1003,6 +1003,12 @@ end show(io, MIME"text/plain"(), OffsetArray(3:5, 0:2)) @test String(take!(io)) == "3:5 with indices 0:2" + # issue #198 + r = axes(OffsetVector(1:10, -5), 1) + a = OffsetVector(r, 5) + show(io, a) + @test String(take!(io)) == "$(repr(r)) with indices $(UnitRange(axes(a,1)))" + d = Diagonal([1,2,3]) Base.print_array(io, d) s1 = String(take!(io)) From 837b6d477ece3bc68eb2dffd2953ddafd1a1b9f9 Mon Sep 17 00:00:00 2001 From: jishnub Date: Wed, 10 Feb 2021 22:43:57 +0400 Subject: [PATCH 2/2] Do not show type --- src/OffsetArrays.jl | 2 +- test/runtests.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OffsetArrays.jl b/src/OffsetArrays.jl index f39ca1ed..b5957551 100644 --- a/src/OffsetArrays.jl +++ b/src/OffsetArrays.jl @@ -367,7 +367,7 @@ indexing is faster with ranges =# @propagate_inbounds Base.getindex(r::UnitRange{<:Integer}, s::IIUR) = IdentityUnitRange(r[no_offset_view(s)]) function Base.show(io::IO, r::OffsetRange) - show(io, r.parent) + show(io, UnitRange(r.parent)) print(io, " with indices ", UnitRange(axes(r, 1))) end Base.show(io::IO, ::MIME"text/plain", r::OffsetRange) = show(io, r) diff --git a/test/runtests.jl b/test/runtests.jl index d1468651..15130d30 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1007,7 +1007,7 @@ end r = axes(OffsetVector(1:10, -5), 1) a = OffsetVector(r, 5) show(io, a) - @test String(take!(io)) == "$(repr(r)) with indices $(UnitRange(axes(a,1)))" + @test String(take!(io)) == "$(UnitRange(r)) with indices $(UnitRange(axes(a,1)))" d = Diagonal([1,2,3]) Base.print_array(io, d)