More flexible get, e.g. get(dict, key, nothing)

andyferris · Mar 5, 2021 · e4d8e02 · e4d8e02 · andyferris · Mar 5, 2021
1 parent aeab543
commit e4d8e02
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 authors = ["Andy Ferris <[email protected]>"]
 name = "Dictionaries"
 uuid = "85a47980-9c8c-11e8-2b9f-f7ca1fa99fb4"
-version = "0.3.7"
+version = "0.3.8"
 
 [deps]
 Indexing = "313cdc1a-70c2-5d6a-ae34-0150d3930a38"

diff --git a/src/indexing.jl b/src/indexing.jl
@@ -20,11 +20,7 @@ end
     get(d, convert(I, i), default)
 end
 
-@propagate_inbounds function Base.get(d::AbstractDictionary{I, T}, i::I, default) where {I, T}
-    get(d, i, convert(T, default))
-end
-
-@propagate_inbounds function Base.get(d::AbstractDictionary{I, T}, i::I, default::T) where {I, T}
+@propagate_inbounds function Base.get(d::AbstractDictionary{I}, i::I, default) where {I}
     (hasindex, t) = gettoken(d, i)
     if hasindex
         return gettokenvalue(d, t)
@@ -42,7 +38,7 @@ end
     if hasindex
         return gettokenvalue(d, t)
     else
-        return convert(T, f())
+        return f()
     end
 end
 

diff --git a/src/insertion.jl b/src/insertion.jl
@@ -254,12 +254,12 @@ function Base.get!(f::Callable, d::AbstractDictionary{I}, i) where {I}
 end
 
 
-function Base.get!(f::Callable, d::AbstractDictionary{I}, i::I) where {I}
+function Base.get!(f::Callable, d::AbstractDictionary{I, T}, i::I) where {I, T}
     (hadindex, token) = gettoken!(d, i)
     if hadindex
         return @inbounds gettokenvalue(d, token)
     else
-        default = f()
+        default = convert(T, f())
         @inbounds settokenvalue!(d, token, default)
         return default
     end