Skip to content

Remove invoke #348

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

Open
ptiede wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −5
Open

Remove invoke #348

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
8 changes: 4 additions & 4 deletions ext/StructArraysStaticArraysExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ function StructArrays.component(s::StructArray{<:Union{SVector,MVector}}, key::S
StructArrays.component(s, i)
end

# invoke general fallbacks for a `FieldArray` type.
# use general fallbacks for a `FieldArray` type.
@inline function StructArrays.staticschema(T::Type{<:FieldArray})
invoke(StructArrays.staticschema, Tuple{Type{<:Any}}, T)
StructArrays.staticschema_generic(T)
end
StructArrays.component(s::FieldArray, i) = invoke(StructArrays.component, Tuple{Any, Any}, s, i)
StructArrays.createinstance(T::Type{<:FieldArray}, args...) = invoke(StructArrays.createinstance, Tuple{Type{<:Any}, Vararg}, T, args...)
StructArrays.component(s::FieldArray, i) = getfield(s, i)
StructArrays.createinstance(T::Type{<:FieldArray}, args...) = StructArrays.createinstance_generic(T, args...)

# disambiguation
Base.similar(s::StructArray, S::Type, sz::Tuple{Union{Integer, Base.OneTo, SOneTo}, Vararg{Union{Union{Integer, Base.OneTo, SOneTo}}}}) = StructArrays._similar(s, S, sz)
Expand Down
10 changes: 9 additions & 1 deletion src/interface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ julia> StructArrays.staticschema(Complex{Float64})
NamedTuple{(:re, :im),Tuple{Float64,Float64}}
```
"""
@generated function staticschema(::Type{T}) where {T}
function staticschema(::Type{T}) where {T}
return staticschema_generic(T)
end

@generated function staticschema_generic(::Type{T}) where {T}
name_tuple = Expr(:tuple, [QuoteNode(f) for f in fieldnames(T)]...)
type_tuple = Expr(:curly, :Tuple, [Expr(:call, :fieldtype, :T, i) for i in 1:fieldcount(T)]...)
Expr(:curly, :NamedTuple, name_tuple, type_tuple)
Expand All @@ -46,6 +50,10 @@ julia> StructArrays.createinstance(Complex{Float64}, (re=1.0, im=2.0)...)
```
"""
function createinstance(::Type{T}, args...)::T where {T}
return createinstance_generic(T, args...)
end

function createinstance_generic(::Type{T}, args...)::T where {T}
isconcretetype(T) ? bypass_constructor(T, args) : constructorof(T)(args...)
end

Expand Down
Loading