fixup axes for 1.0

Author: Michael Abbott

src/LazyStack.jl

@@ -8,6 +8,13 @@ ndims(A) = Base.ndims(A)
 ndims(::Tuple) = 1
 ndims(::NamedTuple) = 1
 
+axes(A) = Base.axes(A)
+axes(A, d) = Base.axes(A, d)
+if VERSION < v"1.1" # because, on Julia 1.0, axes((1,2)) === Base.OneTo(2)
+    axes(t::Tuple) = tuple(Base.axes(t))
+end
+axes(nt::NamedTuple) = tuple(Base.OneTo(length(nt)))
+
 size(A) = Base.size(A)
 size(t::Tuple) = tuple(length(t))
 size(t::NamedTuple) = tuple(length(t))
@@ -80,9 +87,6 @@ Base.size(x::Stacked) = (size(first(x.slices))..., size(x.slices)...)
 Base.size(x::Stacked{T,N,<:Tuple}) where {T,N} = (size(first(x.slices))..., length(x.slices))
 
 Base.axes(x::Stacked) = (axes(first(x.slices))..., axes(x.slices)...)
-if VERSION < v"1.1" # axes((1:9, 1:9)) == Base.OneTo(2) # on Julia 1.0
-    Base.axes(x::Stacked{T,N,<:Tuple}) where {T,N} = (axes(first(x.slices))..., axes(x.slices))
-end
 
 Base.parent(x::Stacked) = x.slices
 

test/runtests.jl

@@ -18,6 +18,7 @@ using OffsetArrays, NamedDims
     @test stack(v34)[1,1,1] == v34[1][1] # trailing dims
     @test stack(v34) * ones(4) ≈ hcat(v34...) * ones(4) # issue #6
     @test stack(v34) * ones(4,2) ≈ hcat(v34...) * ones(4,2)
+    @test axes(stack(v34)) === axes(stack(v34...)) === axes(stack(v34[i] for i in 1:4))
 
 end
 @testset "tuples" begin
@@ -211,6 +212,21 @@ end
 
     @test dimnames(rstack(:b, NamedDimsArray(1:2, :a), OffsetArray([2,3], +1))) == (:a, :b)
 
+end
+@testset "tuple functions" begin
+
+    @test LazyStack.ndims([1,2]) == 1
+    @test LazyStack.ndims((1,2)) == 1
+    @test LazyStack.ndims((a=1,b=2)) == 1
+
+    @test LazyStack.size([1,2]) == (2,)
+    @test LazyStack.size((1,2)) == (2,)
+    @test LazyStack.size((a=1,b=2)) == (2,)
+
+    @test LazyStack.axes([1,2]) == (1:2,)
+    @test LazyStack.axes((1,2)) == (1:2,)
+    @test LazyStack.axes((a=1,b=2)) == (1:2,)
+
 end
 @info "loading Zygote"
 using Zygote