define generic get! for AbstractDict (JuliaLang#34621)

halleysfifthinc · Feb 29, 2020 · c4290fe · c4290fe
1 parent 4d8f889
commit c4290fe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/base/abstractdict.jl b/base/abstractdict.jl
@@ -512,6 +512,14 @@ end
 getindex(t::AbstractDict, k1, k2, ks...) = getindex(t, tuple(k1,k2,ks...))
 setindex!(t::AbstractDict, v, k1, k2, ks...) = setindex!(t, v, tuple(k1,k2,ks...))
 
+get!(t::AbstractDict, key, default) = get!(() -> default, t, key)
+function get!(default::Callable, t::AbstractDict{K,V}, key) where K where V
+ haskey(t, key) && return t[key]
+ val = default()
+ t[key] = val
+ return val
+end
+
 push!(t::AbstractDict, p::Pair) = setindex!(t, p.second, p.first)
 push!(t::AbstractDict, p::Pair, q::Pair) = push!(push!(t, p), q)
 push!(t::AbstractDict, p::Pair, q::Pair, r::Pair...) = push!(push!(push!(t, p), q), r...)

diff --git a/base/dict.jl b/base/dict.jl
@@ -417,8 +417,6 @@ Dict{String,Int64} with 4 entries:
 """
 get!(collection, key, default)
 
-get!(h::Dict{K,V}, key0, default) where {K,V} = get!(()->default, h, key0)
-
 """
  get!(f::Function, collection, key)
 

diff --git a/test/env.jl b/test/env.jl
@@ -33,6 +33,12 @@ end
  @test_throws KeyError ENV[key]
  @test get(ENV,key,"default") == "default"
  @test get(() -> "default", ENV, key) == "default"
+
+ key = randstring(25)
+ @test !haskey(ENV, key)
+ @test get!(ENV, key, "default") == "default"
+ @test haskey(ENV, key)
+ @test ENV[key] == "default"
 end
 @testset "#17956" begin
  @test length(ENV) > 1