Skip to content

Commit 58aae8b

Browse files
committed
Merge branch 'mat_index_bug' into view_axis_length
2 parents ed9f14c + b43853b commit 58aae8b

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/componentarray.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@ function make_idx(data, nt::Union{NamedTuple, AbstractDict}, last_val)
167167
)...)
168168
return (data, ViewAxis(last_index(last_val) .+ (1:len), kvs))
169169
end
170+
function make_idx(data, nt::NamedTuple{(), Tuple{}}, last_val)
171+
out = last_index(last_val) .+ (1:length(nt))
172+
return (data, ViewAxis(out, ShapedAxis((length(nt),))))
173+
end
170174
function make_idx(data, pair::Pair, last_val)
171175
data, ax = make_idx(data, pair.second, last_val)
172176
len = recursive_length(data)

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ end
137137
for T in [Int64, Int32, Float64, Float32, ComplexF64, ComplexF32]
138138
@test ComponentArray(a = T[]) == ComponentVector{T}(a = T[])
139139
@test ComponentArray(a = T[], b = T[]) == ComponentVector{T}(a = T[], b = T[])
140-
@test_broken ComponentArray(a = T[], b = (;)) == ComponentVector{T}(a = T[], b = T[])
140+
@test ComponentArray(a = T[], b = (;)) == ComponentVector{T}(a = T[], b = T[])
141141
@test ComponentArray(a = Any[one(Int32)], b=T[]) == ComponentVector{T}(a = [one(T)], b = T[])
142142
end
143143
@test ComponentArray(NamedTuple()) == ComponentVector{Any}()

0 commit comments

Comments
 (0)