Merge pull request #16400 from gasagna/generator_ndims

add `ndims(::Generator)`. Fixes #16394
JuliaLang · May 17, 2016 · 89a1fc2 · 89a1fc2
2 parents 02c42db + a6c2cd1
commit 89a1fc2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/base/generator.jl b/base/generator.jl
@@ -53,5 +53,6 @@ iteratorsize{T<:AbstractArray}(::Type{T}) = HasShape()
 iteratorsize{I,F}(::Type{Generator{I,F}}) = iteratorsize(I)
 length(g::Generator) = length(g.iter)
 size(g::Generator) = size(g.iter)
+ndims(g::Generator) = ndims(g.iter)
 
 iteratoreltype{I,T}(::Type{Generator{I,T}}) = EltypeUnknown()
diff --git a/test/functional.jl b/test/functional.jl
@@ -240,6 +240,19 @@ end
 
 @test collect(Base.Generator(+, [1,2], [10,20])) == [11,22]
 
+# generator ndims #16394
+let gens_dims = [((i for i = 1:5),                    1),
+                 ((i for i = 1:5, j = 1:5),           2),
+                 ((i for i = 1:5, j = 1:5, k = 1:5),  3),
+                 ((i for i = Array{Int}()),           0),
+                 ((i for i = Array{Int}(1)),          1),
+                 ((i for i = Array{Int}(1, 2)),       2),
+                 ((i for i = Array{Int}(1, 2, 3)),    3)]
+    for (gen, dim) in gens_dims
+        @test ndims(gen) == ndims(collect(gen)) == dim
+    end
+end
+
 # generator with destructuring
 let d = Dict(:a=>1, :b=>2), a = Dict(3=>4, 5=>6)
     @test Dict( v=>(k,) for (k,v) in d) == Dict(2=>(:b,), 1=>(:a,))