Add copy(::KeySet) method and specialized Set{T}(::KeySet) method (…

…#41836)
JuliaLang · Sep 1, 2021 · 27a2266 · 27a2266
1 parent dd8d3c7
commit 27a2266
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/base/abstractdict.jl b/base/abstractdict.jl
@@ -66,6 +66,8 @@ function iterate(v::Union{KeySet,ValueIterator}, state...)
     return (y[1][isa(v, KeySet) ? 1 : 2], y[2])
 end
 
+copy(v::KeySet) = copymutable(v)
+
 in(k, v::KeySet) = get(v.dict, k, secret_table_token) !== secret_table_token
 
 """

diff --git a/base/set.jl b/base/set.jl
@@ -3,13 +3,21 @@
 struct Set{T} <: AbstractSet{T}
     dict::Dict{T,Nothing}
 
-    Set{T}() where {T} = new(Dict{T,Nothing}())
-    Set{T}(s::Set{T}) where {T} = new(Dict{T,Nothing}(s.dict))
+    global _Set(dict::Dict{T,Nothing}) where {T} = new{T}(dict)
 end
 
+Set{T}() where {T} = _Set(Dict{T,Nothing}())
+Set{T}(s::Set{T}) where {T} = _Set(Dict{T,Nothing}(s.dict))
 Set{T}(itr) where {T} = union!(Set{T}(), itr)
 Set() = Set{Any}()
 
+function Set{T}(s::KeySet{T, <:Dict{T}}) where {T}
+    d = s.dict
+    slots = copy(d.slots)
+    keys = copy(d.keys)
+    vals = similar(d.vals, Nothing)
+    _Set(Dict{T,Nothing}(slots, keys, vals, d.ndel, d.count, d.age, d.idxfloor, d.maxprobe))
+end
 
 """
     Set([itr])

diff --git a/test/sets.jl b/test/sets.jl
@@ -139,6 +139,10 @@ end
     @test !in(200,s)
 end
 
+@testset "copy(::KeySet) (issue #41537)" begin
+    @test union(keys(Dict(1=>2, 3=>4))) == copy(keys(Dict(1=>2, 3=>4))) == Set([1,3])
+end
+
 @testset "copy!" begin
     for S = (Set, BitSet)
         s = S([1, 2])
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,6 +66,8 @@ function iterate(v::Union{KeySet,ValueIterator}, state...) @@
         return (y[1][isa(v, KeySet) ? 1 : 2], y[2])
     end
+    copy(v::KeySet) = copymutable(v)
     in(k, v::KeySet) = get(v.dict, k, secret_table_token) !== secret_table_token
     """
@@ Expand Down @@