Skip to content

Allow setproperty! for PointerWrappers with special structs #79

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
ranocha merged 3 commits into from
Apr 16, 2023
Merged

Allow setproperty! for PointerWrappers with special structs #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f440164
allow setproperty! for PointerWrappers with special structs
JoshuaLampert Apr 11, 2023
1483df3
Update pointerwrappers.jl
JoshuaLampert Apr 11, 2023
a295fa1
Merge branch 'main' into pw_setproperty
JoshuaLampert Apr 12, 2023
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
7 changes: 4 additions & 3 deletions src/pointerwrappers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,11 @@ end
function Base.setproperty!(pw::PointerWrapper{T}, name::Symbol, v) where T
i = findfirst(isequal(name), fieldnames(T))
if isnothing(i)
error("type $(string(T)) has no field $name")
# For some `struct`s, `fieldnames` gives `data` and not the actual field names, but we can use `Base.setproperty!` for pointers,
# see https://github.com/trixi-framework/P4est.jl/issues/72 and https://github.com/trixi-framework/P4est.jl/issues/79
return Base.setproperty!(pointer(pw), name, v)
end

unsafe_store!(reinterpret(Ptr{fieldtype(T, i)}, pointer(pw) + fieldoffset(T, i)), v)
return unsafe_store!(reinterpret(Ptr{fieldtype(T, i)}, pointer(pw) + fieldoffset(T, i)), v)
end

# `[]` allows one to access the actual underlying data and
Expand Down
14 changes: 12 additions & 2 deletions test/tests_basic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,22 @@ end
ptr = Base.unsafe_convert(Ptr{MyStruct}, Ref(obj))
pw = PointerWrapper(ptr)
@test pw.value[] == 0.0
pw.value[] = 1.0
@test_nowarn pw.value[] = 1.0
@test pw.value[] == 1.0
@test pw.value[1] == 1.0
pw.value[1] = 2.0
@test_nowarn pw.value[1] = 2.0
@test pw.value[1] == 2.0
@test pw.value[] == 2.0
# using `setproperty!`
@test_nowarn pw.value = 3.0
@test pw.value[1] == 3.0
@test pw.value[] == 3.0
# using `setproperty!` for special `struct`s
# see https://github.com/trixi-framework/P4est.jl/issues/72 and https://github.com/trixi-framework/P4est.jl/issues/79
@test p4est_pw.global_first_position.level[] == 29
@test_nowarn p4est_pw.global_first_position.level = 30
@test p4est_pw.global_first_position.level[] == 30
@test_nowarn p4est_pw.global_first_position.level = 29

# test if we can set the user_pointer
p4est_pw.user_pointer = Ptr{Cvoid}(3)
Expand Down