Support Empty{SVector}

JuliaFolds · Dec 20, 2019 · 674c613 · 674c613
1 parent ac190bc
commit 674c613
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/src/NoBang/emptycontainers.jl b/src/NoBang/emptycontainers.jl
@@ -37,6 +37,10 @@ julia> @assert push!!(Empty(StructVector), (a=1, b=2)) == StructVector(a=[1], b=
 julia> using TypedTables: Table
 
 julia> @assert push!!(Empty(Table), (a=1, b=2)) == Table(a=[1], b=[2])
+
+julia> using StaticArrays: SVector
+
+julia> @assert push!!(Empty(SVector), 1) === SVector(1)
 ```
 
 `Empty(T)` object is an iterable with length 0 and element type `Union{}`:

diff --git a/src/NoBang/singletonof.jl b/src/NoBang/singletonof.jl
@@ -21,6 +21,12 @@ julia> @assert singletonof(StructVector, (a=1, b=2)) == StructVector(a=[1], b=[2
 julia> using TypedTables: Table
 
 julia> @assert singletonof(Table, (a=1, b=2)) == Table(a=[1], b=[2])
+
+julia> using StaticArrays: SArray, SVector
+
+julia> @assert singletonof(SArray, 1) === SVector(1)
+
+julia> @assert singletonof(SVector, 1) === SVector(1)
 ```
 """
 singletonof(::Type{T}, x) where T = T(SingletonVector(x))

diff --git a/src/NoBang/staticarrays.jl b/src/NoBang/staticarrays.jl
@@ -10,3 +10,8 @@ _empty(xs::StaticArrays.StaticVector) =
         StaticArrays.pop(xs)
     end
 _setindex(xs::StaticArrays.StaticArray, v, I...) = Base.setindex(xs, v, I...)
+
+StaticArrays.SArray(x::SingletonVector) = StaticArrays.SVector{1}(x)
+StaticArrays.SVector(x::SingletonVector) = StaticArrays.SVector{1}(x)
+StaticArrays.MArray(x::SingletonVector) = StaticArrays.MVector{1}(x)
+StaticArrays.MVector(x::SingletonVector) = StaticArrays.MVector{1}(x)
diff --git a/test/preamble.jl b/test/preamble.jl
@@ -4,6 +4,14 @@ using BangBang
 using BangBang: ismutable
 using StaticArrays: SVector
 
+"""
+    ==ₜ(x, y)
+
+Check that _type_ and value of `x` and `y` are equal.
+"""
+==ₜ(_, _) = false
+==ₜ(x::T, y::T) where T = x == y
+
 macro test_error(ex)
     quote
         let err = nothing

diff --git a/test/test_staticarrays.jl b/test/test_staticarrays.jl
@@ -1,8 +1,8 @@
 module TestStaticArrays
 
-using Test
+include("preamble.jl")
 using BangBang: ismutable
-using StaticArrays
+using StaticArrays: MArray, MMatrix, MVector, SArray, SMatrix, SVector
 
 @testset begin
     @test !ismutable(SVector(0))
@@ -11,4 +11,11 @@ using StaticArrays
     @test ismutable(MMatrix{1, 1}(0))
 end
 
+@testset "Empty" begin
+    @test push!!(Empty(SVector), 1) === SVector(1)
+    @test push!!(Empty(SArray), 1) === SVector(1)
+    @test push!!(Empty(MVector), 1) ==ₜ MVector(1)
+    @test push!!(Empty(MArray), 1) ==ₜ MVector(1)
+end
+
 end  # module