fix type problem that was plaguing #7147

JuliaLang · Jun 9, 2014 · e97bb5e · e97bb5e · mbauman · Jun 9, 2014
1 parent 2935fd4
commit e97bb5e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/jltypes.c b/src/jltypes.c
@@ -128,6 +128,7 @@ static int jl_has_typevars__(jl_value_t *v, int incl_wildcard, jl_tuple_t *p)
 
 static int jl_has_typevars_(jl_value_t *v, int incl_wildcard)
 {
+    if (jl_is_typevar(v)) return 1;
     return jl_has_typevars__(v, incl_wildcard, NULL);
 }
 
@@ -140,6 +141,7 @@ static int jl_has_typevars_from(jl_value_t *v, jl_tuple_t *p)
 
 int jl_has_typevars(jl_value_t *v)
 {
+    if (jl_is_typevar(v)) return 1;
     return jl_has_typevars__(v, 0, NULL);
 }
 

diff --git a/test/core.jl b/test/core.jl
@@ -102,6 +102,13 @@ end
 @test typeintersect(Type{(Int...)}, Type{(Bool...)}) === None
 @test typeintersect((Bool,Int...), (Bool...)) === (Bool,)
 
+let T = TypeVar(:T,Union(Float32,Float64))
+    @test typeintersect(AbstractArray, Matrix{T}) == Matrix{T}
+end
+let T = TypeVar(:T,Union(Float32,Float64),true)
+    @test typeintersect(AbstractArray, Matrix{T}) == Matrix{T}
+end
+
 @test isa(Int,Type{TypeVar(:T,Number)})
 @test !isa(DataType,Type{TypeVar(:T,Number)})
 @test DataType <: Type{TypeVar(:T,Type)}