Merge pull request #19 from JuliaString/spj/fixwchr

Fix bug with concatenating LatinStr

Author: ScottPJones

Project.toml

@@ -4,7 +4,7 @@ authors  = ["ScottPJones <scottjones@alum.mit.edu>"]
 keywords = ["Strings"]
 license  = "MIT"
 uuid     = "e79e7a6a-7bb1-5a4d-9d64-da657b06f53a"
-version = "1.1.1"
+version = "1.1.2"
 
 [deps]
 Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

src/latin.jl

@@ -22,7 +22,7 @@ function string(collection::MS_ASCIILatin...)
     @inbounds for str in collection
         len += ncodeunits(str)
     end
-    buf, pnt = _allocate(len)
+    buf, pnt = _allocate(UInt8, len)
     @inbounds for str in collection
         len = ncodeunits(str)
         _memcpy(pnt, pointer(str), len)

src/support.jl

@@ -726,14 +726,14 @@ _fwd_memchr(ptr::Ptr{T}, byt::T, len::Integer) where {T<:UInt8} =
     ccall(:memchr, Ptr{T}, (Ptr{T}, Int32, Csize_t), ptr, byt, len)
 
 _fwd_memchr(beg::Ptr{T}, wchr::T, len::Integer) where {T<:OthChr} =
-    _fwd_memchr(beg, ch, bytoff(beg, len))
+    _fwd_memchr(beg, wchr, bytoff(beg, len))
 
 _fwd_memchr(ptr::Ptr{T}, byt::T, fin::Ptr{T}) where {T<:UInt8} =
     ptr < fin ? _fwd_memchr(ptr, byt, fin - ptr) : C_NULL
 
 function _fwd_memchr(pnt::Ptr{T}, wchr::T, fin::Ptr{T}) where {T<:OthChr}
     while pnt < fin
-        get_codeunit(pnt) == ch && return pnt
+        get_codeunit(pnt) == wchr && return pnt
         pnt += sizeof(T)
     end
     C_NULL

test/basic.jl

@@ -30,6 +30,14 @@ for T in AllCharTypes
     test_strings_base[T] = [String(rand(T, len)) for len in test_string_length]
 end
 
+@testset "string" begin
+    a = ASCIIStr("ascii")
+    b = LatinStr("latin")
+    @test typeof(a * a) === ASCIIStr
+    @test typeof(b * b) === LatinStr
+    @test typeof(a * b) === LatinStr
+end
+
 @testset "constructors" begin
     for (ST, type_list) in compat_types, CT in type_list, str in test_strings_base[CT]
         @eval @test convert($ST, $str) == $str