Skip to content

Avoid returning the value of toplevel in Base.showarg #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jishnub merged 2 commits into from
Dec 17, 2020
Merged

Avoid returning the value of toplevel in Base.showarg #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
105fdc1
type-stable showarg
jishnub Dec 17, 2020
60199f4
add tests for showarg
jishnub Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/OffsetArrays.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,9 @@ function Base.showarg(io::IO, a::OffsetArray, toplevel)
Base.showarg(io, parent(a), false)
Base.showindices(io, axes(a)...)
print(io, ')')
toplevel && print(io, " with eltype ", eltype(a))
if toplevel
print(io, " with eltype ", eltype(a))
end
end

function Base.replace_in_print_matrix(A::OffsetArray{<:Any,2}, i::Integer, j::Integer, s::AbstractString)
Expand Down
6 changes: 6 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,12 @@ end
v = rand(3)
ov = OffsetArray(v, (-2,))
@test Base.replace_in_print_matrix(ov, -1, 1, " ") == Base.replace_in_print_matrix(v, 1, 1, " ")

# Avoid returning the value of toplevel if it is false
# showarg should only print values, it shouldn't return anything
@test Base.showarg(io, a, false) === nothing
# check the other case too for good measure
@test Base.showarg(io, a, true) === nothing
end

@testset "readdlm/writedlm" begin
Expand Down