tuple cleanup (JuliaArrays#15)

* Tuple cleanup

* reallow tuples

* tests

Author: Pietro Vertechi

src/StructArrays.jl

@@ -2,8 +2,6 @@ module StructArrays
 
 export StructArray
 
-const Tup = Union{Tuple, NamedTuple}
-
 include("structarray.jl")
 include("utils.jl")
 

src/structarray.jl

@@ -1,12 +1,12 @@
 """
 A type that stores an array of structures as a structure of arrays.
 # Fields:
-- `columns`: a tuple of arrays. Also `columns(x)`
+- `columns`: a named tuple of arrays. Also `columns(x)`
 """
-struct StructArray{T, N, C<:Tup} <: AbstractArray{T, N}
+struct StructArray{T, N, C<:NamedTuple} <: AbstractArray{T, N}
     columns::C
 
-    function StructArray{T, N, C}(c) where {T, N, C<:Tup}
+    function StructArray{T, N, C}(c) where {T, N, C<:NamedTuple}
         length(c) > 0 || error("must have at least one column")
         n = size(c[1])
         length(n) == N || error("wrong number of dimensions")
@@ -21,6 +21,7 @@ StructArray{T}(c::C) where {T, C<:Tuple} = StructArray{T}(NamedTuple{fields(T)}(
 StructArray{T}(c::C) where {T, C<:NamedTuple} =
     StructArray{createtype(T, eltypes(C)), length(size(c[1])), C}(c)
 StructArray(c::C) where {C<:NamedTuple} = StructArray{C}(c)
+StructArray(c::C) where {C<:Tuple} = StructArray{eltypes(C)}(c)
 
 StructArray{T}(; kwargs...) where {T} = StructArray{T}(values(kwargs))
 StructArray(; kwargs...) = StructArray(values(kwargs))
@@ -73,6 +74,10 @@ fields(::Type{<:StructArray{T}}) where {T} = fields(T)
 @generated function fields(t::Type{T}) where {T}
    return :($(Expr(:tuple, [QuoteNode(f) for f in fieldnames(T)]...)))
 end
+@generated function fields(t::Type{T}) where {T<:Tuple}
+    return :($(Expr(:tuple, [QuoteNode(Symbol("x$f")) for f in fieldnames(T)]...)))
+end
+
 
 @generated function Base.push!(s::StructArray{T, 1}, vals) where {T}
     args = []

src/utils.jl

@@ -32,7 +32,7 @@ end
 end
 
 createinstance(::Type{T}, args...) where {T} = T(args...)
-createinstance(::Type{T}, args...) where {T<:Tup} = T(args)
+createinstance(::Type{T}, args...) where {T<:Union{Tuple, NamedTuple}} = T(args)
 
 createtype(::Type{T}, ::Type{C}) where {T<:NamedTuple{N}, C} where {N} = NamedTuple{N, C}
 createtype(::Type{T}, ::Type{C}) where {T, C} = T

test/runtests.jl

@@ -22,6 +22,15 @@ end
     @test t3 == t
 end
 
+@testset "tuple case" begin
+    s = StructArray(([1], ["test"],))
+    @test s[1] == (1, "test")
+    @test Base.getproperty(s, 1) == [1]
+    @test Base.getproperty(s, 2) == ["test"]
+    t = StructArray{Tuple{Int, Float64}}([1], [1.2])
+    @test t[1] == (1, 1.2)
+end
+
 @testset "kwargs constructor" begin
     a = [1.2]
     b = [2.3]