Skip to content

Commit e52b3cc

Browse files
authored
resolve ambiguities with StaticArrays (#304)
1 parent b1836a6 commit e52b3cc

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

ext/StructArraysStaticArraysExt.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module StructArraysStaticArraysExt
22

33
using StructArrays
4-
using StaticArrays: StaticArray, FieldArray, tuple_prod, SVector, MVector
4+
using StaticArrays: StaticArray, FieldArray, tuple_prod, SVector, MVector, SOneTo
55

66
"""
77
StructArrays.staticschema(::Type{<:StaticArray{S, T}}) where {S, T}
@@ -40,6 +40,10 @@ end
4040
StructArrays.component(s::FieldArray, i) = invoke(StructArrays.component, Tuple{Any, Any}, s, i)
4141
StructArrays.createinstance(T::Type{<:FieldArray}, args...) = invoke(StructArrays.createinstance, Tuple{Type{<:Any}, Vararg}, T, args...)
4242

43+
# disambiguation
44+
Base.similar(s::StructArray, S::Type, sz::Tuple{Union{Integer, Base.OneTo, SOneTo}, Vararg{Union{Union{Integer, Base.OneTo, SOneTo}}}}) = StructArrays._similar(s, S, sz)
45+
Base.reshape(s::StructArray{T}, d::Tuple{SOneTo, Vararg{SOneTo}}) where {T} = StructArray{T}(map(x -> reshape(x, d), StructArrays.components(s)))
46+
4347
# Broadcast overload
4448
using StaticArrays: StaticArrayStyle, similar_type, Size, SOneTo
4549
using StaticArrays: broadcast_flatten, broadcast_sizes, first_statictype

test/runtests.jl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,6 +1444,14 @@ end
14441444
@test x .+ y == StructArray([StaticArrayType{Tuple{1,2}}(3*ones(1,2) .+ 2*i) for i = 0:1])
14451445
end
14461446

1447+
let
1448+
# potential ambiguities
1449+
x = StructArray((SA[1,2], SA[1,2]))
1450+
@test eltype(similar(x)::StructArray) == eltype(x)
1451+
@test map(x->x, x)::StructArray == x
1452+
@test size(reshape(x, (SOneTo(2), SOneTo(1)))::StructArray) == (2, 1)
1453+
end
1454+
14471455
# test FieldVector constructor (see https://github.com/JuliaArrays/StructArrays.jl/issues/205)
14481456
struct FlippedVec2D <: FieldVector{2,Float64}
14491457
x::Float64

0 commit comments

Comments
 (0)