Make DefaultDictBase signature valid on Julia master

Hoping this is temporary until the type system can take care of it again. Closes #62.
JuliaCollections · Oct 25, 2014 · 63a9266 · 63a9266
1 parent 5528b15
commit 63a9266
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/defaultdict.jl b/src/defaultdict.jl
@@ -14,15 +14,17 @@
 # subclassed.
 #
 
-immutable DefaultDictBase{K,V,F,D<:Associative{K,V}} <: Associative{K,V}
+immutable DefaultDictBase{K,V,F,D} <: Associative{K,V}
     default::F
     d::D
 
-    DefaultDictBase(x::F, kv::AbstractArray{(K,V)}) = new(x, D(kv))
-    DefaultDictBase(x::F, d::DefaultDictBase) = DefaultDictBase(x, d.d)
-    DefaultDictBase(x::F, d::D=D()) = new(x, d)
-    DefaultDictBase(x, ks, vs) = new(x, D(ks,vs))
+    check_D(D,K,V) = (D <: Associative{K,V}) ||
+        error("Default dict must be <: Associative{K,V}")
 
+    DefaultDictBase(x::F, kv::AbstractArray{(K,V)}) = (check_D(D,K,V); new(x, D(kv)))
+    DefaultDictBase(x::F, d::DefaultDictBase) = (check_D(D,K,V); DefaultDictBase(x, d.d))
+    DefaultDictBase(x::F, d::D=D()) = (check_D(D,K,V); new(x, d))
+    DefaultDictBase(x, ks, vs) = (check_D(D,K,V); new(x, D(ks,vs)))
 end
 
 # Constructors