Merge pull request JuliaArrays#30 from piever/pv/rename

Rename and generalize foreachcolumn

Author: Pietro Vertechi

src/sort.jl

@@ -1,7 +1,7 @@
 isdiscrete(v) = false
 
 function Base.permute!(c::StructVector, p::AbstractVector)
-    foreachcolumn(c) do v
+    foreachfield(c) do v
         if isdiscrete(v) || v isa StructVector
             permute!(v, p)
         else

src/structarray.jl

@@ -74,6 +74,7 @@ fieldarrays(s::StructArray) = getfield(s, :fieldarrays)
 Base.getproperty(s::StructArray, key::Symbol) = getfield(fieldarrays(s), key)
 Base.getproperty(s::StructArray, key::Int) = getfield(fieldarrays(s), key)
 Base.propertynames(s::StructArray) = fieldnames(typeof(fieldarrays(s)))
+staticschema(::Type{<:StructArray{T}}) where {T} = staticschema(T)
 
 Base.size(s::StructArray) = size(fieldarrays(s)[1])
 Base.axes(s::StructArray) = axes(fieldarrays(s)[1])
@@ -97,24 +98,24 @@ end
 
 function Base.setindex!(s::StructArray, vals, I::Int...)
     @boundscheck checkbounds(s, I...)
-    @inbounds foreachcolumn((col, val) -> (col[I...] = val), s, vals)
+    @inbounds foreachfield((col, val) -> (col[I...] = val), s, vals)
     s
 end
 
 @inline getfieldindex(v::Tuple, field::Symbol, index::Integer) = getfield(v, index)
 @inline getfieldindex(v, field::Symbol, index::Integer) = getproperty(v, field)
 
 function Base.push!(s::StructArray, vals)
-    foreachcolumn(push!, s, vals)
+    foreachfield(push!, s, vals)
     return s
 end
 
 function Base.append!(s::StructArray, vals)
-    foreachcolumn(append!, s, vals)
+    foreachfield(append!, s, vals)
     return s
 end
 
-Base.copyto!(I::StructArray, J::StructArray) = (foreachcolumn(copyto!, I, J); I)
+Base.copyto!(I::StructArray, J::StructArray) = (foreachfield(copyto!, I, J); I)
 
 function Base.cat(args::StructArray...; dims)
     f = key -> cat((getproperty(t, key) for t in args)...; dims=dims)
@@ -130,7 +131,7 @@ function Base.resize!(s::StructArray, i::Integer)
 end
 
 function Base.empty!(s::StructArray)
-    foreachcolumn(empty!, s)
+    foreachfield(empty!, s)
 end
 
 for op in [:hcat, :vcat]

src/utils.jl

@@ -34,16 +34,17 @@ end
 
 Base.@pure SkipConstructor(::Type) = false
 
-@generated function foreachcolumn(f, x::StructArray{T, N, NamedTuple{names, types}}, xs...) where {T, N, names, types}
+@generated function foreachfield(::Type{<:NamedTuple{names}}, f, xs...) where {names}
     exprs = Expr[]
     for (i, field) in enumerate(names)
         sym = QuoteNode(field)
         args = [Expr(:call, :getfieldindex, :(getfield(xs, $j)), sym, i) for j in 1:length(xs)]
-        push!(exprs, Expr(:call, :f, Expr(:., :x, sym), args...))
+        push!(exprs, Expr(:call, :f, args...))
     end
     push!(exprs, :(return nothing))
     Expr(:block, exprs...)
 end
+foreachfield(f, x::T, xs...) where {T} = foreachfield(staticschema(T), f, x, xs...)
 
 function createinstance(::Type{T}, args...) where {T}
     SkipConstructor(T) ? unsafe_createinstance(T, args...) : T(args...)