generalize a few things that don't need to be restricted to ASCII

JuliaLang · Aug 21, 2015 · 37b9a10 · ScottPJones · Aug 21, 2015 · StefanKarpinski
1 parent 7676a6a
commit 37b9a10
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/base/LineEdit.jl b/base/LineEdit.jl
@@ -663,7 +663,7 @@ function write_prompt(terminal, p::Prompt)
     write(terminal, Base.text_colors[:normal])
     write(terminal, suffix)
 end
-write_prompt(terminal, s::ASCIIString) = write(terminal, s)
+write_prompt(terminal, s::ByteString) = write(terminal, s)
 
 ### Keymap Support
 

diff --git a/base/ascii.jl b/base/ascii.jl
@@ -129,4 +129,6 @@ function convert(::Type{ASCIIString}, a::Array{UInt8,1}, invalids_as::ASCIIStrin
     end
     convert(ASCIIString, a)
 end
+convert(::Type{ASCIIString}, a::Array{UInt8,1}, invalids_as::AbstractString) =
+    convert(ASCIIString, a, ascii(invalids_as))
 convert(::Type{ASCIIString}, s::AbstractString) = ascii(bytestring(s))
diff --git a/base/linalg/arpack.jl b/base/linalg/arpack.jl
@@ -7,8 +7,8 @@ import ..LinAlg: BlasInt, ARPACKException
 ## aupd and eupd wrappers
 
 function aupd_wrapper(T, matvecA::Function, matvecB::Function, solveSI::Function, n::Integer,
-                      sym::Bool, cmplx::Bool, bmat::ASCIIString,
-                      nev::Integer, ncv::Integer, which::ASCIIString,
+                      sym::Bool, cmplx::Bool, bmat::ByteString,
+                      nev::Integer, ncv::Integer, which::ByteString,
                       tol::Real, maxiter::Integer, mode::Integer, v0::Vector)
 
     lworkl = cmplx ? ncv * (3*ncv + 5) : (sym ? ncv * (ncv + 8) :  ncv * (3*ncv + 6) )
@@ -103,8 +103,8 @@ function aupd_wrapper(T, matvecA::Function, matvecB::Function, solveSI::Function
     return (resid, v, n, iparam, ipntr, workd, workl, lworkl, rwork, TOL)
 end
 
-function eupd_wrapper(T, n::Integer, sym::Bool, cmplx::Bool, bmat::ASCIIString,
-                      nev::Integer, which::ASCIIString, ritzvec::Bool,
+function eupd_wrapper(T, n::Integer, sym::Bool, cmplx::Bool, bmat::ByteString,
+                      nev::Integer, which::ByteString, ritzvec::Bool,
                       TOL::Array, resid, ncv::Integer, v, ldv, sigma, iparam, ipntr,
                       workd, workl, lworkl, rwork)
 

diff --git a/base/strings/util.jl b/base/strings/util.jl
@@ -233,5 +233,6 @@ function hex2bytes(s::ASCIIString)
     end
     return arr
 end
+hex2bytes(s::AbstractString) = hex2bytes(ascii(s))
 
 bytes2hex{T<:UInt8}(arr::Vector{T}) = join([hex(i,2) for i in arr])
diff --git a/test/core.jl b/test/core.jl
@@ -1345,7 +1345,7 @@ end
 
 # issue #4518
 f4518(x, y::Union{Int32,Int64}) = 0
-f4518(x::ASCIIString, y::Union{Int32,Int64}) = 1
+f4518(x::ByteString, y::Union{Int32,Int64}) = 1
 @test f4518("",1) == 1
 
 # issue #4581

diff --git a/test/unicode/utf32.jl b/test/unicode/utf32.jl
@@ -210,7 +210,7 @@ end
 @test reverse(utf32("abcd \uff\u7ff\u7fff\U7ffff")) == utf32("\U7ffff\u7fff\u7ff\uff dcba")
 
 # Test pointer() functions
-let str = "this "
+let str = ascii("this ")
     u8  = utf8(str)
     u16 = utf16(str)
     u32 = utf32(str)

diff --git a/test/unicode/utf8.jl b/test/unicode/utf8.jl
@@ -19,7 +19,7 @@ let str = UTF8String(b"this is a test\xed\x80")
     @test_throws BoundsError getindex(str, 2:17)
     @test_throws UnicodeError getindex(str, 16:17)
     @test string(Char(0x110000)) == "\ufffd"
-    sa = SubString{ASCIIString}("This is a silly test", 1, 14)
+    sa = SubString{ASCIIString}(ascii("This is a silly test"), 1, 14)
     s8 = convert(SubString{UTF8String}, sa)
     @test typeof(s8) == SubString{UTF8String}
     @test s8 == "This is a sill"

diff --git a/test/unicode/utf8proc.jl b/test/unicode/utf8proc.jl
@@ -280,7 +280,7 @@ end
 @test !isspace('\U10ffff')
 
 # Get full coverage of grapheme iterator functions
-let str = "This is a test"
+let str = ascii("This is a test")
     g = graphemes(str)
     h = hash(str)
     @test hash(g) == h