Merge pull request #1488 from kmsquire/iterator_update

Make product iterator iterate in a more natural fashion.
JuliaLang · Nov 3, 2012 · 8d7686f · 8d7686f
2 parents ccf7f27 + d3b271c
commit 8d7686f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/extras/iterators.jl b/extras/iterators.jl
@@ -190,7 +190,7 @@ function start(it::Product)
         end
     end
     vs = Array(Any, n)
-    for i = 1:n
+    for i = n:-1:1
         vs[i], js[i] = next(it.xss[i], js[i])
     end
     return js, vs
@@ -201,11 +201,11 @@ function next(it::Product, state)
     ans = tuple(vs...)
 
     n = length(it.xss)
-    for i in 1:n
+    for i in n:-1:1
         if !done(it.xss[i], js[i])
             vs[i], js[i] = next(it.xss[i], js[i])
             break
-        elseif i == n
+        elseif i == 1
             vs = nothing
             break
         end