Skip to content

Use gensym for lens variable in setmacro #156

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
merged 3 commits into from
Aug 1, 2021
Merged

Use gensym for lens variable in setmacro #156

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
eefb661
use gensym for lens in setmacro
torfjelde Jul 31, 2021
cb1d984
added test for type inference with multiple usage of setmacro within …
torfjelde Aug 1, 2021
6546c49
Merge branch 'master' into tor/use-gensym-in-setmacro
torfjelde Aug 1, 2021
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
9 changes: 5 additions & 4 deletions src/sugar.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,19 +183,20 @@ function setmacro(lenstransform, ex::Expr; overwrite::Bool=false)
@assert length(ex.args) == 2
ref, val = ex.args
obj, lens = parse_obj_lens(ref)
lenssym = gensym(:lens)
dst = overwrite ? obj : gensym("_")
val = esc(val)
ret = if ex.head == :(=)
quote
lens = ($lenstransform)($lens)
$dst = $set($obj, lens, $val)
$lenssym = ($lenstransform)($lens)
$dst = $set($obj, $lenssym, $val)
end
else
op = get_update_op(ex.head)
f = :($_UpdateOp($op,$val))
quote
lens = ($lenstransform)($lens)
$dst = $modify($f, $obj, lens)
$lenssym = ($lenstransform)($lens)
$dst = $modify($f, $obj, $lenssym)
end
end
ret
Expand Down
26 changes: 26 additions & 0 deletions test/test_setmacro.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,31 @@ using StaticNumbers
@test m3 === @SMatrix[1 0; 0 0]
end

function test_all_inferrable(f, argtypes)
typed = first(code_typed(f, argtypes))
code = typed.first
@test all(T -> !(T isa UnionAll || T === Any), code.slottypes)
end

# Example of macro that caused inference issues before.
macro test_macro(expr)
quote
function f($(esc(:x)))
$(Setfield.setmacro(identity, expr, overwrite=true))
$(Setfield.setmacro(identity, expr, overwrite=true))
$(Setfield.setmacro(identity, expr, overwrite=true))
$(Setfield.setmacro(identity, expr, overwrite=true))
$(Setfield.setmacro(identity, expr, overwrite=true))
return $(esc(:x))
end
end
end

@testset "setmacro multiple usage" begin
let f = @test_macro(x[end] = 1)
test_all_inferrable(f, (Vector{Float64}, ))
end
end

end#module