Handle ellipsis in Tuple{} (Fix #81)

JuliaLang · May 6, 2015 · ccae986 · ccae986
1 parent d013435
commit ccae986
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Compat.jl b/src/Compat.jl
@@ -273,7 +273,15 @@ function _compat(ex::Expr)
     elseif ex.head == :curly
         f = ex.args[1]
         if VERSION < v"0.4.0-dev+4319" && f == :Tuple
-            ex = Expr(:tuple, ex.args[2:end]...)
+            args = ex.args[2:end]
+            has_ellipsis = any(args) do arg
+                isa(arg, Expr) && (arg.head == :...)
+            end
+            ex = if has_ellipsis
+                Expr(:call, TopNode(:tuple), args...)
+            else
+                Expr(:tuple, args...)
+            end
         end
     end
     return Expr(ex.head, map(_compat, ex.args)...)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -222,6 +222,11 @@ if VERSION < v"0.4.0-dev+4319"
     @test @compat Tuple{Int, Tuple{Float64}} == (Int, (Float64,))
     @test @compat Tuple{Int, Tuple{Float64, Char}} == (Int, (Float64, Char))
     @test @compat Tuple{Int, Vararg{Float64}} == (Int, Float64...)
+    # Issue 81
+    a81 = [Int, Int]
+    b81 = (Int, Int)
+    @test @compat Tuple{a81..., Vararg{Float64}} == (Int, Int, Float64...)
+    @test @compat Tuple{b81..., Vararg{Float64}} == (Int, Int, Float64...)
 end
 
 # Ensure eachindex iterates over the whole array