Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parameterized constructors for StdVector #385

Merged
merged 7 commits into from
Oct 24, 2023
Merged

Parameterized constructors for StdVector #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0db824
Refactor StdVector tests
omus Oct 24, 2023
bbbeb20
Support parameterized constructors
omus Oct 24, 2023
9fb377d
Support StdVector{Any}
omus Oct 24, 2023
5ba9057
Refactor tests
omus Oct 24, 2023
04e8ed5
Refactor logic in StdVector(::Vector)
omus Oct 24, 2023
274c93d
Empty array constructor tests
omus Oct 24, 2023
c912e99
Use eltype
omus Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/StdLib.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,30 +74,30 @@ function StdWString(s::String)
StdWString(char_arr, length(char_arr))
end

function StdVector(v::Vector{T}) where {T}
if isempty(v)
return StdVector{T}()
end
if (CxxWrapCore.cpp_trait_type(T) == CxxWrapCore.IsCxxType)
return StdVector(CxxRef.(v))
end
function StdVector{T}(v::Union{Vector{T},Vector{CxxRef{T}}}) where {T}
result = StdVector{T}()
append(result, v)
isempty(v) || append(result, v)
return result
end

StdVector{T}(v::Vector) where {T} = StdVector{T}(convert(Vector{T}, v))

function StdVector(v::Vector{CxxRef{T}}) where {T}
result = isconcretetype(T) ? StdVector{supertype(T)}() : StdVector{T}()
append(result, v)
return result
S = isconcretetype(T) ? supertype(T) : T
return StdVector{S}(v)
end

function StdVector(v::Vector{Bool})
result = StdVector{CxxBool}()
append(result, convert(Vector{CxxBool}, v))
return result
function StdVector(v::Vector{T}) where {T}
S = if isconcretetype(T) && CxxWrapCore.cpp_trait_type(T) == CxxWrapCore.IsCxxType
supertype(T)
else
T
end
return StdVector{S}(v)
end

StdVector(v::Vector{Bool}) = StdVector{CxxBool}(v)

Base.IndexStyle(::Type{<:StdVector}) = IndexLinear()
Base.size(v::StdVector) = (Int(cppsize(v)),)
Base.getindex(v::StdVector, i::Int) = cxxgetindex(v,i)[]
Expand Down
163 changes: 135 additions & 28 deletions test/stdlib.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,34 +141,141 @@ end
end
end

stvec = StdVector(Int32[1,2,3])
@test all(stvec .== [1,2,3])
push!(stvec,1)
@test all(stvec .== [1,2,3,1])
resize!(stvec,2)
@test all(stvec .== [1,2])
append!(stvec,Int32[2,1])
@test all(stvec .== [1,2,2,1])
empty!(stvec)
@test isempty(stvec)

@test all(StdVector([1,2,3]) .== [1,2,3])
@test all(StdVector([1.0,2.0,3.0]) .== [1,2,3])
@test all(StdVector([true, false, true]) .== [true, false, true])
bvec = StdVector([true, false, true])
append!(bvec, [true])
@test all(bvec .== [true, false, true, true])

cxxstrings = StdString["one", "two", "three"]
svec = StdVector(CxxRef.(cxxstrings))
@test all(svec .== ["one", "two", "three"])
push!(svec, StdString("four"))
@test all(svec .== ["one", "two", "three", "four"])
cxxappstrings = StdString["five", "six"]
append!(svec, CxxRef.(cxxappstrings))
@test all(svec .== ["one", "two", "three", "four", "five", "six"])
empty!(svec)
@test isempty(svec)
@testset "StdVector" begin
@testset "parameterized constructors" begin
vec = StdVector{Int}()
@test vec isa StdVector{Int}
@test isempty(vec)

vec = StdVector{Int}([])
@test vec isa StdVector{Int}
@test isempty(vec)

vec = StdVector{Any}([])
@test vec isa StdVector{Any}
@test isempty(vec)

vec = StdVector{Int}([1,2,3])
@test vec isa StdVector{Int}
@test vec == [1,2,3]

vec = StdVector{Any}([1,2,3])
@test vec isa StdVector{Any}
@test vec == [1,2,3]

vec = StdVector{Float64}([1,2,3])
@test vec isa StdVector{Float64}
@test vec == [1.0,2.0,3.0]

vec = StdVector{CxxBool}([true, false, true])
@test vec isa StdVector{CxxBool}
@test vec == [true, false, true]

vec = StdVector{StdString}(["a", "b", "c"])
@test vec isa StdVector{StdString}
@test vec == ["a", "b", "c"]

svec_alloc = StdString.(["a", "b", "c"])::Vector{CxxWrap.StdLib.StdStringAllocated}
vec = StdVector{StdString}(svec_alloc)
@test vec isa StdVector{StdString}
@test vec == ["a", "b", "c"]

svec_ref = CxxRef.(StdString["a", "b", "c"])
vec = StdVector{StdString}(svec_ref)
@test vec isa StdVector{StdString}
@test vec == ["a", "b", "c"]

svec_deref = getindex.(svec_ref)::Vector{CxxWrap.StdLib.StdStringDereferenced}
vec = StdVector{StdString}(svec_deref)
@test vec isa StdVector{StdString}
@test vec == ["a", "b", "c"]

@test_throws MethodError StdVector{Bool}([true])
@test_throws MethodError StdVector{eltype(svec_alloc)}(svec_alloc)
@test_throws MethodError StdVector{eltype(svec_deref)}(svec_deref)
end

@testset "constructors" begin
@test_throws MethodError StdVector()

vec = StdVector(Int[])
@test vec isa StdVector{Int}
@test isempty(vec)

vec = StdVector(Any[])
@test vec isa StdVector{Any}
@test isempty(vec)

vec = StdVector([1,2,3])
@test vec isa StdVector{Int}
@test vec == [1,2,3]

vec = StdVector(Any[1,2,3])
@test vec isa StdVector{Any}
@test vec == [1,2,3]

vec = StdVector([1.0, 2.0, 3.0])
@test vec isa StdVector{Float64}
@test vec == [1,2,3]

vec = StdVector([true, false, true])
@test vec isa StdVector{CxxBool}
@test vec == [true, false, true]

vec = StdVector(StdString["a", "b", "c"])
@test vec isa StdVector{StdString}
@test vec == ["a", "b", "c"]

svec_alloc = StdString.(["a", "b", "c"])::Vector{CxxWrap.StdLib.StdStringAllocated}
vec = StdVector(svec_alloc)
@test vec isa StdVector{StdString}
@test vec == ["a", "b", "c"]

svec_ref = CxxRef.(StdString["a", "b", "c"])
vec = StdVector(svec_ref)
@test vec isa StdVector{StdString}
@test vec == ["a", "b", "c"]

svec_deref = getindex.(svec_ref)::Vector{CxxWrap.StdLib.StdStringDereferenced}
vec = StdVector(svec_deref)
@test vec isa StdVector{StdString}
@test vec == ["a", "b", "c"]

@test_throws MethodError StdVector(["a", "b", "c"])
end

@testset "mutating with integer" begin
stvec = StdVector(Int32[1,2,3])
@test stvec == [1,2,3]
push!(stvec,1)
@test stvec == [1,2,3,1]
resize!(stvec, 2)
@test stvec == [1,2]
append!(stvec, Int32[2,1])
@test stvec == [1,2,2,1]
empty!(stvec)
@test isempty(stvec)
end

@testset "mutating with bool" begin
bvec = StdVector([true, false, true])
append!(bvec, [true])
@test bvec == [true, false, true, true]
end

@testset "mutating with StdString" begin
cxxstrings = StdString["one", "two", "three"]
svec = StdVector(CxxRef.(cxxstrings))
@test svec == ["one", "two", "three"]
push!(svec, StdString("four"))
@test svec == ["one", "two", "three", "four"]
cxxappstrings = StdString["five", "six"]
append!(svec, CxxRef.(cxxappstrings))
@test svec == ["one", "two", "three", "four", "five", "six"]
empty!(svec)
@test isempty(svec)
end
end

stvec = StdVector(Int32[1,2,3])
for vref in (CxxRef(stvec), CxxPtr(stvec))
Expand Down