Skip to content

Avoid accessing .names property of NamedTuple #42

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
simonschoelly merged 1 commit into from
Nov 13, 2021
Merged

Avoid accessing .names property of NamedTuple #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions src/AbstractTuples.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function typetuple_to_type end

typetuple_to_type(tup::TypeTuple) = Tuple{ (T for T in tup)... }
typetuple_to_type(tup::NamedTypeTuple) =
NamedTuple{ Tuple(typeof(tup).names), Tuple{ (T for T in tup)... }}
NamedTuple{propertynames(tup), Tuple{ (T for T in tup)... }}

"""
typetuple(::Type{<:Tuple})
Expand Down Expand Up @@ -161,7 +161,7 @@ end

function typetuple(TT::Type{<:NamedTuple})

return NamedTuple{Tuple(TT.names)}(TT.types)
return NamedTuple{fieldnames(TT)}(TT.types)
end

# ======================================================
Expand Down
2 changes: 1 addition & 1 deletion src/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ end

# TODO check if still correct
@generated function edgevals_container_type(::Val{E_VAL}) where {E_VAL <:NamedTuple}
R = NamedTuple{ Tuple(E_VAL.names), Tuple{( Adjlist{T} for T in E_VAL.types )...}}
R = NamedTuple{ fieldnames(E_VAL), Tuple{( Adjlist{T} for T in E_VAL.types )...}}
return :($R)
end

Expand Down
6 changes: 3 additions & 3 deletions test/testutils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,9 +398,9 @@ function testset_topological_equivalent(g::SimpleDiGraph, gv::ValDiGraph)
end


allkeys_for_E_VALS(E_VALS::Type{<:Tuple}) = 1:length(E_VALS.types)
allkeys_for_E_VALS(E_VALS::Type{<:NamedTuple}) = E_VALS.names ∪
(1:length(E_VALS.names))
allkeys_for_E_VALS(E_VALS::Type{<:Tuple}) = 1:fieldcount(E_VALS)
allkeys_for_E_VALS(E_VALS::Type{<:NamedTuple}) = fieldnames(E_VALS) ∪
(1:fieldcount(E_VALS))


# ========================================
Expand Down