Skip to content

Commit aba90c9

Browse files
authored
Merge pull request #125 from phipsgabler/phg/empty_varinfo_print
Fix empty varinfo printing
2 parents a673228 + b842c03 commit aba90c9

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/varinfo.jl

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -956,16 +956,21 @@ function _show_varnames(io::IO, vi)
956956
md = vi.metadata
957957
vns = md.vns
958958

959-
groups = Dict{Symbol, Vector{VarName}}()
959+
vns_by_name = Dict{Symbol, Vector{VarName}}()
960960
for vn in vns
961-
group = get!(() -> Vector{VarName}(), groups, getsym(vn))
961+
group = get!(() -> Vector{VarName}(), vns_by_name, getsym(vn))
962962
push!(group, vn)
963963
end
964964

965-
print(io, length(groups), length(groups) == 1 ? " variable " : " variables ", "(")
966-
join(io, Iterators.take(keys(groups), _MAX_VARS_SHOWN), ", ")
967-
length(groups) > _MAX_VARS_SHOWN && print(io, ", ...")
968-
print(io, "), dimension ", sum(prod(size(md.vals[md.ranges[md.idcs[vn]]])) for vn in vns))
965+
L = length(vns_by_name)
966+
if L == 0
967+
print(io, "0 variables, dimension 0")
968+
else
969+
(L == 1) ? print(io, "1 variable (") : print(io, L, " variables (")
970+
join(io, Iterators.take(keys(vns_by_name), _MAX_VARS_SHOWN), ", ")
971+
(L > _MAX_VARS_SHOWN) && print(io, ", ...")
972+
print(io, "), dimension ", length(md.vals))
973+
end
969974
end
970975

971976
function Base.show(io::IO, vi::UntypedVarInfo)

0 commit comments

Comments
 (0)