Allow accumulators to take an AbstractDict (#553)

* Allow accumulators to take an AbstractDict * Bump patch version * Update src/accumulator.jl Co-Authored-By: Nicole Epp <[email protected]> * Update test/test_accumulator.jl Co-Authored-By: Nicole Epp <[email protected]>
JuliaCollections · Nov 22, 2019 · 4e0dfcd · 4e0dfcd · oxinabox · Nov 22, 2019
1 parent 3d68cd3
commit 4e0dfcd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "DataStructures"
 uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
-version = "0.17.5"
+version = "0.17.6"
 
 [deps]
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

diff --git a/src/accumulator.jl b/src/accumulator.jl
@@ -7,9 +7,10 @@ end
 ## constructors
 
 Accumulator{T, V}() where {T,V<:Number} = Accumulator{T,V}(Dict{T,V}())
+Accumulator(map::AbstractDict) = Accumulator(Dict(map))
 
 counter(T::Type) = Accumulator{T,Int}()
-counter(dct::Dict{T,V}) where {T,V<:Integer} = Accumulator{T,V}(copy(dct))
+counter(dct::AbstractDict{T, V}) where {T, V<:Integer} = Accumulator{T, V}(Dict(dct))
 
 """
     counter(seq)

diff --git a/test/test_accumulator.jl b/test/test_accumulator.jl
@@ -90,6 +90,16 @@
         @test ctm["b"] == 0
     end
 
+    @testset "From AbstractDict" begin
+        kv = (:a => 1, :b => 2)
+        for f in (Accumulator, counter)
+            ct_odict = f(OrderedDict(kv))
+            ct_dict = f(Dict(kv))
+            @test ct_odict isa Accumulator{Symbol, Int}
+            @test ct_odict == ct_dict
+        end
+    end
+
     @testset "From Pair" begin
         ct4 = counter(Pair{Int,Int})
         @test isa(ct4, Accumulator{Pair{Int,Int}})