Merge pull request #12453 from rened/dict

fix #12451 by providing a better error message
JuliaLang · Aug 12, 2015 · 90fe14d · carnaval · Aug 12, 2015 · StefanKarpinski
2 parents 963ab22 + 79db1ac
commit 90fe14d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/base/dict.jl b/base/dict.jl
@@ -432,7 +432,19 @@ Dict{K  }(ps::Pair{K}...,)             = Dict{K,Any}(ps)
 Dict{V  }(ps::Pair{TypeVar(:K),V}...,) = Dict{Any,V}(ps)
 Dict(     ps::Pair...)                 = Dict{Any,Any}(ps)
 
-Dict(kv) = dict_with_eltype(kv, eltype(kv))
+function Dict(kv)
+    try
+        Base.dict_with_eltype(kv, eltype(kv))
+    catch e
+        if any(x->isempty(methods(x, (typeof(kv),))), [start, next, done]) ||
+            !all(x->isa(x,Union{Tuple,Pair}),kv)
+            throw(ArgumentError("Dict(kv): kv needs to be an iterator of tuples or pairs"))
+        else
+            rethrow(e)
+        end
+    end
+end
+
 dict_with_eltype{K,V}(kv, ::Type{Tuple{K,V}}) = Dict{K,V}(kv)
 dict_with_eltype{K,V}(kv, ::Type{Pair{K,V}}) = Dict{K,V}(kv)
 dict_with_eltype(kv, t) = Dict{Any,Any}(kv)

diff --git a/test/dict.jl b/test/dict.jl
@@ -338,3 +338,9 @@ end
 d = Dict('a'=>1, 'b'=>1, 'c'=> 3)
 @test [d[k] for k in keys(d)] == [d[k] for k in eachindex(d)] ==
       [v for (k, v) in d] == [d[x[1]] for (i, x) in enumerate(d)]
+
+
+# Issue 12451
+@test_throws ArgumentError Dict(0)
+@test_throws ArgumentError Dict([1])
+@test_throws ArgumentError Dict([(1,2),0])