Merge pull request #42 from JuliaLang/sjk/ngenerate

Define X_n variables on entry to function generated by nsplat/ngenerate
JuliaLang · Feb 9, 2015 · 94423b4 · 94423b4
2 parents 0b4b92a + c2f960e
commit 94423b4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/ngenerate.jl b/src/ngenerate.jl
@@ -51,7 +51,10 @@ function _nsplat(prototype, body, varname, T, itersym)
     bodyquot = Expr(:quote, body)
     newbody = quote
         $itersym = length($varsym)
-        Compat.CompatCartesian.resolvesplats!($bodyquot, $varquot, $itersym)
+        quote
+            Base.Cartesian.@nexprs $($itersym) (d->$($(Expr(:quote, symbol(varsym, "_d")))) = $($varquot)[d])
+            $(Compat.CompatCartesian.resolvesplats!($bodyquot, $varquot, $itersym))
+        end
     end
     prototype, newbody
 end

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -80,3 +80,16 @@ end
 @test size(bitrand(MersenneTwister(), 3, 4)) == (3, 4)
 @test size(bitrand(MersenneTwister(), (3, 4))) == (3, 4)
 @test rand(Bool) in [false, true]
+
+module CartesianTest
+	using Base.Cartesian, Compat
+	@ngenerate N NTuple{N,Int} function f(X::NTuple{N,Int}...)
+		@ncall N tuple X
+	end
+end
+
+@test CartesianTest.f(1) == (1,)
+@test CartesianTest.f(1,2) == (1,2)
+@test CartesianTest.f(1,2,3) == (1,2,3)
+@test CartesianTest.f(1,2,3,4) == (1,2,3,4)
+@test CartesianTest.f(1,2,3,4,5) == (1,2,3,4,5)