Merge pull request #18 from JuliaString/spj/fixlatin

Fix Issue #17, as well as another problem with convert and _LatinStr, and a new error code added in 1.8

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.0"
+version = "1.1.1"
 
 [deps]
 Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

src/latin.jl

@@ -1,7 +1,8 @@
 #=
 LatinStr/_LatinStr type (ISO Latin1 8-bit subset of Unicode)
 
-Copyright 2017 Gandalf Software, Inc., Scott P. Jones, and other contributors to the Julia language
+Copyright 2017-2022 Gandalf Software, Inc., Scott P. Jones,
+and other contributors to the Julia language
 Licensed under MIT License, see LICENSE.md
 Based in part on code for ASCIIString that used to be in Julia
 =#
@@ -50,7 +51,7 @@ const LatinSubStr  = SubString{<:Str{LatinCSE}}
 const _LatinSubStr = SubString{<:Str{_LatinCSE}}
 
 _cpyconvert(::Type{C}, str) where {C} = Str(C, _copysub(str))::Str{C,Nothing,Nothing,Nothing}
-_cpysubset(::Type{_LatinCSE}, str) = Str(is_ascii(s) ? ASCIICSE : _LatinCSE, _copysub(s))
+_cpysubset(::Type{_LatinCSE}, str) = Str(is_ascii(str) ? ASCIICSE : _LatinCSE, _copysub(str))
 
 convert(::Type{<:Str{LatinCSE}}, s::Str{LatinCSE})  = s
 convert(::Type{<:Str{LatinCSE}}, s::Str{ASCIICSE})  = _cpyconvert(LatinCSE, s)
@@ -167,7 +168,7 @@ end
 
 function convert(::Type{<:Str{C}}, vec::Vector{CU}) where {C<:Latin_CSEs,CU<:CodeUnitTypes}
     # handle zero length string quickly
-    (len = length(vec)) == 0 && return _empty_str(C)
+    (len = length(vec)) == 0 && return empty_str(C)
     @preserve vec begin
         pnt = pointer(vec)
         # get number of bytes to allocate

test/basic.jl

@@ -21,6 +21,9 @@ legacy_types = Dict(ASCIIStr => to_ascii,
                     UTF16Str => utf16,
                     UTF32Str => utf32)
 
+const errtype =
+    @static isdefined(Base, :CanonicalIndexError) ? Base.CanonicalIndexError : ErrorException
+
 ##  create type specific test strings
 test_strings_base = Dict()
 for T in AllCharTypes
@@ -872,7 +875,7 @@ end
         @test u[1] == 0xe2
         @test u[2] == 0x88
         @test u[8] == 0x79
-        @test_throws ErrorException (u[1] = 0x00)
+        @test_throws errtype (u[1] = 0x00)
         @test collect(u) == b"∀x∃y"
     end
 

test/convert.jl

@@ -1,3 +1,8 @@
+# Typos in Latin conversions
+
+@test convert(StrBase._LatinStr, SubString(LatinStr("abc"))) == ASCIIStr("abc")
+@test convert(LatinStr, UInt8[]) == ""
+
 # issue #11551 (#11004,#10959)
 function tstcvt(strUTF8::UTF8Str, strUTF16::UTF16Str, strUTF32::UTF32Str)
     @test utf16(strUTF8) == strUTF16

test/util.jl

@@ -314,7 +314,7 @@
         b = testb()
         @test eltype(b) === UInt8
         @test b isa AbstractVector
-        @test_throws ErrorException b[4] = '4'
+        @test_throws errtype (b[4] = '4')
         @test testb() == UInt8['0','1','2','3']
     end
 end