Skip to content

Optimize pop!(s::Set, x, default) #52023

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 4 commits into from
Nov 10, 2023
Merged

Optimize pop!(s::Set, x, default) #52023

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44209e9
Optimize `pop!(s::Set, x, default)`
petvana Nov 4, 2023
bd2b5ea
Fix return value
petvana Nov 4, 2023
e5bf00f
Merge branch 'master' into pv/set_pop_optimization
petvana Nov 9, 2023
136acbc
Merge branch 'master' into pv/set_pop_optimization
petvana Nov 10, 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
13 changes: 12 additions & 1 deletion base/set.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,18 @@ end

push!(s::Set, x) = (s.dict[x] = nothing; s)

pop!(s::Set, x, default) = (x in s ? pop!(s, x) : default)
function pop!(s::Set, x, default)
dict = s.dict
index = ht_keyindex(dict, x)
if index > 0
@inbounds key = dict.keys[index]
_delete!(dict, index)
return key
else
return default
end
end

function pop!(s::Set, x)
index = ht_keyindex(s.dict, x)
index < 1 && throw(KeyError(x))
Expand Down