Skip to content

Commit

Permalink
store more useful information in symbolic struct
Browse files Browse the repository at this point in the history
  • Loading branch information
baggepinnen committed Feb 16, 2024
1 parent c8d46a7 commit 920da26
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 2 deletions.
22 changes: 22 additions & 0 deletions src/struct.jl
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,31 @@ function decodetyp(typ::TypeT)
end

struct Struct
juliatype::DataType
v::Vector{StructElement}
end


"""
symstruct(T)
Create a symbolic struct from a given type `T`.
"""
function symstruct(T)
elems = map(fieldnames(T)) do fieldname
StructElement(fieldtype(T, fieldname), fieldname)
end |> collect
Struct(T, elems)
end

"""
juliatype(s::Struct)
Get the Julia type that `s` is representing.
"""
juliatype(s::Struct) = getfield(s, :juliatype)
getelements(s::Struct) = getfield(s, :v)

function Base.getproperty(s::Struct, name::Symbol)
v = getfield(s, :v)
idx = findfirst(x -> nameof(x) == name, v)
Expand Down
19 changes: 17 additions & 2 deletions test/struct.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Test, Symbolics
using Symbolics: StructElement, Struct, operation, arguments
using Symbolics: StructElement, Struct, operation, arguments, symstruct, structname

handledtypes = [Int8,
Int16,
Expand All @@ -17,9 +17,13 @@ for t in handledtypes
end

@variables t x(t)
struct Fisk
a::Int8
b::Int
end
a = StructElement(Int8, :a)
b = StructElement(Int, :b)
s = Struct([a, b])
s = Struct(Fisk, [a, b])
sa = s.a
sb = s.b
@test operation(sa) === getfield
Expand All @@ -28,6 +32,8 @@ sb = s.b
@test operation(sb) === getfield
@test arguments(sb) == Any[s, 2]
@test arguments(sb) isa Any
@test juliatype(s) == Fisk
@test symstruct(Fisk) == s

sa1 = (setproperty!(s, :a, UInt8(1)))
@test operation(sa1) === setfield!
Expand All @@ -38,3 +44,12 @@ sb1 = (setproperty!(s, :b, "hi"))
@test operation(sb1) === setfield!
@test arguments(sb1) == Any[s, 2, "hi"]
@test arguments(sb1) isa Any

struct Jörgen
a::Int
b::Float64
end

ss = symstruct(Jörgen)

@test getfield(ss, :v) == [StructElement(Int, :a), StructElement(Float64, :b)]

0 comments on commit 920da26

Please sign in to comment.