Skip to content
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

Jump to bottom

@kwdef: handle const and atomic fields #46276

Merged
merged 4 commits into from
Aug 9, 2022
Merged

@kwdef: handle const and atomic fields #46276

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a574036
make kwdef handle const and atomic fields
IanButterworth Aug 7, 2022
1afddec
add tests
IanButterworth Aug 7, 2022
57e857a
Merge branch 'master' into ib/kwdef_fixes
IanButterworth Aug 7, 2022
a39ba06
Update base/util.jl
IanButterworth Aug 8, 2022
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
15 changes: 13 additions & 2 deletions base/util.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,16 @@ function _kwdef!(blk, params_args, call_args)
push!(params_args, ei)
push!(call_args, ei)
elseif ei isa Expr
if ei.head === :(=)
is_atomic = ei.head == :atomic
ei = is_atomic ? first(ei.args) : ei # strip "@atomic" and add it back later
is_const = ei.head == :const
IanButterworth marked this conversation as resolved.
Show resolved Hide resolved
ei = is_const ? first(ei.args) : ei # strip "const" and add it back later
# Note: `@atomic const ..` isn't valid, but reconstruct it anyway to serve a nice error
if ei isa Symbol
# const var
push!(params_args, ei)
push!(call_args, ei)
elseif ei.head === :(=)
lhs = ei.args[1]
if lhs isa Symbol
# var = defexpr
Expand All @@ -593,7 +602,9 @@ function _kwdef!(blk, params_args, call_args)
defexpr = ei.args[2] # defexpr
push!(params_args, Expr(:kw, var, esc(defexpr)))
push!(call_args, var)
blk.args[i] = lhs
lhs = is_const ? Expr(:const, lhs) : lhs
lhs = is_atomic ? Expr(:atomic, lhs) : lhs
blk.args[i] = lhs # overrides arg
elseif ei.head === :(::) && ei.args[1] isa Symbol
# var::Typ
var = ei.args[1]
Expand Down
31 changes: 31 additions & 0 deletions test/misc.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,6 +1103,37 @@ const outsidevar = 7
end
@test TestOutsideVar() == TestOutsideVar(7)

@kwdef mutable struct Test_kwdef_const_atomic
a
b::Int
c::Int = 1
const d
const e::Int
const f = 1
const g::Int = 1
@atomic h::Int
end

@testset "const and @atomic fields in @kwdef" begin
x = Test_kwdef_const_atomic(a = 1, b = 1, d = 1, e = 1, h = 1)
for f in fieldnames(Test_kwdef_const_atomic)
@test getfield(x, f) == 1
end
@testset "const fields" begin
@test_throws ErrorException x.d = 2
@test_throws ErrorException x.e = 2
@test_throws MethodError x.e = "2"
@test_throws ErrorException x.f = 2
@test_throws ErrorException x.g = 2
end
@testset "atomic fields" begin
@test_throws ConcurrencyViolationError x.h = 1
@atomic x.h = 1
@test @atomic(x.h) == 1
@atomic x.h = 2
@test @atomic(x.h) == 2
end
end

@testset "exports of modules" begin
for (_, mod) in Base.loaded_modules
Expand Down