fix inference of e.g. Generator(=>, x, y) (#24145)

reported in #22907
JuliaLang · Oct 16, 2017 · c7cbebf · c7cbebf
1 parent 4fd1d40
commit c7cbebf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/base/generator.jl b/base/generator.jl
@@ -37,6 +37,8 @@ Generator(f, I1, I2, Is...) = Generator(a->f(a...), zip(I1, I2, Is...))
 
 Generator(::Type{T}, iter::I) where {T,I} = Generator{I,Type{T}}(T, iter)
 
+Generator(::Type{T}, I1, I2, Is...) where {T} = Generator(a->T(a...), zip(I1, I2, Is...))
+
 start(g::Generator) = (@_inline_meta; start(g.iter))
 done(g::Generator, s) = (@_inline_meta; done(g.iter, s))
 function next(g::Generator, s)

diff --git a/test/functional.jl b/test/functional.jl
@@ -131,6 +131,11 @@ let gen = ((x,y) for x in 1:10, y in 1:10 if x % 2 == 0 && y % 2 == 0),
     @test collect(gen) == collect(gen2)
 end
 
+# inference on vararg generator of a type (see #22907 comments)
+let f(x) = collect(Base.Generator(=>, x, x))
+    @test @inferred(f((1,2))) == [1=>1, 2=>2]
+end
+
 # generators with nested loops (#4867)
 @test [(i,j) for i=1:3 for j=1:i] == [(1,1), (2,1), (2,2), (3,1), (3,2), (3,3)]