Merge pull request #25 from xiaodaigh/bugfix/vcat_promote_rule

fixed
JuliaString · Oct 31, 2020 · 47de9c9 · 47de9c9
2 parents 8ff5af2 + 04bfac2
commit 47de9c9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/base.jl b/src/base.jl
@@ -104,7 +104,14 @@ function Base.cmp(a::ShortString{S}, b::ShortString{S}) where S
 end
 
 promote_rule(::Type{String}, ::Type{ShortString{S}}) where S = String
-promote_rule(::Type{ShortString{T}}, ::Type{ShortString{S}}) where {T,S} = ShortString{promote_rule(T,S)}
+
+function promote_rule(::Type{ShortString{T}}, ::Type{ShortString{S}}) where {T,S}
+    if sizeof(T) >= sizeof(S)
+        return ShortString{promote_rule(T,S)}
+    else
+        return ShortString{promote_rule(S,T)}
+    end
+end
 
 size_content(s::ShortString) = s.size_content
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -105,3 +105,8 @@ end
 
     @test_throws ErrorException ShortString3(ShortString7("123456"))
 end
+
+@testset "promote rule" begin
+    @test vcat(ShortString3["ab", "cd"], ShortString7["abcd", "efgc"]) ==  vcat(ShortString3["ab", "cd"], ["abcd", "efgc"])
+    @test vcat(ShortString3["ab", "cd"], ShortString7["abcd", "efgc"]) ==  vcat(["ab", "cd"], ShortString7["abcd", "efgc"])
+end