Merge pull request #10 from jessymilare/master

Fix bug of to_ascii constructor from vectors and pointers

Author: ScottPJones

src/legacy.jl

@@ -4,8 +4,8 @@
 
 # Renamed from ascii to to_ascii, to prevent issues with Base.ascii
 to_ascii(str) = convert(ASCIIStr, str)
-to_ascii(pnt::Ptr{UInt8}) = convert(ASCIIStr, unsafe_string(p))
-to_ascii(pnt::Ptr{UInt8}, len::Integer) = convert(ASCIIStr, unsafe_string(p, len))
+to_ascii(p::Ptr{UInt8}) = convert(ASCIIStr, unsafe_string(p))
+to_ascii(p::Ptr{UInt8}, len::Integer) = convert(ASCIIStr, unsafe_string(p, len))
 
 """
     utf8(s)

src/utf8.jl

@@ -157,7 +157,7 @@ is_ascii(str::SubString{<:Str{C}}) where {C<:Union{UTF8CSE,LatinCSE,Binary_CSEs,
 
 is_ascii(vec::Vector{T}) where {T<:CodeUnitTypes} =
     (cnt = sizeof(vec)) == 0 ? true :
-    @preserve str _check_mask_ul(pointer(vec), cnt, _ascii_mask(T))
+    @preserve vec _check_mask_ul(pointer(vec), cnt, _ascii_mask(T))
 
 is_ascii(str::Str{C}) where {C<:Union{UTF8_CSEs,LatinCSE,Binary_CSEs,UTF16CSE,UCS2CSE,
                                       Text2CSE,Text4CSE,UTF32CSE}} =

test/basic.jl

@@ -16,6 +16,11 @@ end
 
 string_types = keys(compat_types)
 
+legacy_types = Dict(ASCIIStr => to_ascii,
+                    UTF8Str => utf8,
+                    UTF16Str => utf16,
+                    UTF32Str => utf32)
+
 ##  create type specific test strings
 test_strings_base = Dict()
 for T in AllCharTypes
@@ -28,6 +33,14 @@ end
     end
 end
 
+@testset "legacy constructors" begin
+    for (ST, constructor) in legacy_types, str in test_strings_base[ASCIIChr]
+        vec = Vector{codeunit(ST)}(codeunits(str))
+        @eval @test $constructor($vec) == $str
+        @eval @test $constructor(pointer($vec), $(length(vec))) == $str
+    end
+end
+
 @testset "empty strings" begin
     for ST in keys(compat_types)
         @eval @test is_empty(convert($ST, ""))