Skip to content

Add get with default #26

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

Open
kpamnany wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Add get with default #26

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1023684
Add non-allocating `get`
kpamnany Aug 18, 2025
28c377b
Allow `default` to have a different type
kpamnany Aug 19, 2025
4944a41
Add test
kpamnany Aug 19, 2025
28ca05a
Fix test
kpamnany Aug 19, 2025
6026aab
Address review comment
kpamnany Aug 20, 2025
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
14 changes: 14 additions & 0 deletions src/ScopedValues.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,20 @@ struct ScopedFunctor{F}
end
(sf::ScopedFunctor)() = @enter_scope sf.scope sf.f()

"""
get(val::ScopedValue{T}, default::T)::T

Like the single-argument [`ScopedValues.get`](@ref), but returns the
provided `default` rather than the default in `val` and does not wrap
the return in `Some` (to save the allocation).
"""
function get(val::ScopedValue{T}, default::T) where {T}
scope = current_scope()::Union{Nothing, Scope}
scope === nothing && return default
scope = scope::Scope
return Base.get(scope.values, val, default)
end
Copy link
Member

@vchuravy vchuravy Aug 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ::Union{Nothing, Scope} is likely unecessary (and might even be slower).

Copy link
Member Author

@kpamnany kpamnany Aug 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ::Union{Nothing, Scope} is how this is called upstream. I've removed it in this PR, but which is right?


@deprecate scoped with

end # module ScopedValues
Loading