Fix global tuple iteration

Author: pfitzseb

src/iterate.jl

@@ -257,10 +257,20 @@ function _const(x, i)
 end
 
 function _global(x, i)
-    if hastrivia(x) && (headof(first(x.trivia)) === :GLOBAL || headof(first(x.trivia)) === :LOCAL)
-        oddt_evena(x, i)
+    if length(x.trivia) > length(x.args) # probably :tuple
+        if i <= 2
+            x.trivia[i]
+        elseif isodd(i)
+            x.args[div(i - 1, 2)]
+        else
+            x.trivia[div(i - 2, 2) + 2]
+        end
     else
-        odda_event(x, i)
+        if hastrivia(x) && (headof(first(x.trivia)) === :GLOBAL || headof(first(x.trivia)) === :LOCAL)
+            oddt_evena(x, i)
+        else
+            odda_event(x, i)
+        end
     end
 end
 

test/iterate.jl

@@ -29,6 +29,18 @@ end
             @test x[1] === x.trivia[1]
             @test x[2] === x.args[1]
         end
+
+        @testset "global tuple" begin
+            x = cst"global (a = 1,b = 2)"
+            @test length(x) == 6
+            @test x[1] === x.trivia[1]
+            @test x[2] === x.trivia[2]
+            @test x[3] === x.args[1]
+            @test x[4] === x.trivia[3]
+            @test x[5] === x.args[2]
+            @test x[6] === x.trivia[4]
+        end
+
         @testset "const" begin
             x = cst"const a = 1"
             @test length(x) == 2