use defaultarray for collection (#123)

* use defaultarray as default for collection

* bump project file

* also test on julia 1.4

Author: Pietro Vertechi

.travis.yml

@@ -8,6 +8,7 @@ julia:
   - 1.1
   - 1.2
   - 1.3
+  - 1.4
   - nightly
 notifications:
   email: false

Project.toml

@@ -1,6 +1,6 @@
 name = "StructArrays"
 uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
-version = "0.4.2"
+version = "0.4.3"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

src/StructArrays.jl

@@ -17,6 +17,7 @@ include("tables.jl")
 
 # Implement refarray and refvalue to deal with pooled arrays and weakrefstrings effectively
 import DataAPI: refarray, refvalue
+using DataAPI: defaultarray
 
 refarray(s::StructArray) = StructArray(map(refarray, fieldarrays(s)))
 

src/collect.jl

@@ -1,25 +1,25 @@
-default_array(::Type{S}, d::NTuple{N, Any}) where {S, N} = similar(Array{S, N}, d)
+arrayof(::Type{S}, d::NTuple{N, Any}) where {S, N} = similar(defaultarray(S, N), d)
 
 struct StructArrayInitializer{F, G}
     unwrap::F
-    default_array::G
+    arrayof::G
 end
-StructArrayInitializer(unwrap = t->false) = StructArrayInitializer(unwrap, default_array)
+StructArrayInitializer(unwrap = t->false) = StructArrayInitializer(unwrap, arrayof)
 
 const default_initializer = StructArrayInitializer()
 
 function (s::StructArrayInitializer)(S, d)
-    ai = ArrayInitializer(s.unwrap, s.default_array)
+    ai = ArrayInitializer(s.unwrap, s.arrayof)
     buildfromschema(typ -> ai(typ, d), S)
 end
 
 struct ArrayInitializer{F, G}
     unwrap::F
-    default_array::G
+    arrayof::G
 end
-ArrayInitializer(unwrap = t->false) = ArrayInitializer(unwrap, default_array)
+ArrayInitializer(unwrap = t->false) = ArrayInitializer(unwrap, arrayof)
 
-(s::ArrayInitializer)(S, d) = s.unwrap(S) ? buildfromschema(typ -> s(typ, d), S) : s.default_array(S, d)
+(s::ArrayInitializer)(S, d) = s.unwrap(S) ? buildfromschema(typ -> s(typ, d), S) : s.arrayof(S, d)
 
 _axes(itr) = _axes(itr, Base.IteratorSize(itr))
 _axes(itr, ::Base.SizeUnknown) = nothing

test/runtests.jl

@@ -363,10 +363,10 @@ StructArrays.createinstance(::Type{<:S}, x, y) = S(x)
     @test v[1].y isa Float64
 end
 
-@testset "default_array" begin
-    v = StructArrays.default_array(Missing, (2,))
+@testset "arrayof" begin
+    v = StructArrays.arrayof(Missing, (2,))
     @test v isa Array{Missing, 1}
-    v = StructArrays.default_array(Int, (2,))
+    v = StructArrays.arrayof(Int, (2,))
     @test v isa Array{Int, 1}
 end