Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix test failure with ReinterpretArray #25

Merged
merged 1 commit into from
Oct 24, 2017
Merged

Fix test failure with ReinterpretArray #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions src/support.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,16 @@ function unsafe_checkstring(dat::AbstractVector{UInt8},
flags::UInt = 0
totalchar = num2byte = num3byte = num4byte = 0
@inbounds while pos <= endpos
ch, pos = next(dat, pos)
ch = dat[pos]
pos += 1
totalchar += 1
if ch > 0x7f
# Check UTF-8 encoding
if ch < 0xe0
# 2-byte UTF-8 sequence (i.e. characters 0x80-0x7ff)
(pos > endpos) && throw(UnicodeError(UTF_ERR_SHORT, pos, ch))
byt, pos = next(dat, pos)
byt = dat[pos]
pos += 1
ch = get_continuation(ch & 0x3f, byt, pos)
if ch > 0x7f
num2byte += 1
Expand All @@ -110,20 +112,25 @@ function unsafe_checkstring(dat::AbstractVector{UInt8},
elseif ch < 0xf0
# 3-byte UTF-8 sequence (i.e. characters 0x800-0xffff)
(pos + 1 > endpos) && throw(UnicodeError(UTF_ERR_SHORT, pos, ch))
byt, pos = next(dat, pos)
byt = dat[pos]
pos += 1
ch = get_continuation(ch & 0x0f, byt, pos)
byt, pos = next(dat, pos)
byt = dat[pos]
pos += 1
ch = get_continuation(ch, byt, pos)
# check for surrogate pairs, make sure correct
if is_surrogate_codeunit(ch)
!is_surrogate_lead(ch) && throw(UnicodeError(UTF_ERR_NOT_LEAD, pos-2, ch))
# next character *must* be a trailing surrogate character
(pos + 2 > endpos) && throw(UnicodeError(UTF_ERR_MISSING_SURROGATE, pos-2, ch))
byt, pos = next(dat, pos)
byt = dat[pos]
pos += 1
(byt != 0xed) && throw(UnicodeError(UTF_ERR_NOT_TRAIL, pos, byt))
byt, pos = next(dat, pos)
byt = dat[pos]
pos += 1
surr = get_continuation(0x0000d, byt, pos)
byt, pos = next(dat, pos)
byt = dat[pos]
pos += 1
surr = get_continuation(surr, byt, pos)
!is_surrogate_trail(surr) && throw(UnicodeError(UTF_ERR_NOT_TRAIL, pos-2, surr))
!accept_surrogates && throw(UnicodeError(UTF_ERR_SURROGATE, pos-2, surr))
Expand All @@ -140,11 +147,14 @@ function unsafe_checkstring(dat::AbstractVector{UInt8},
elseif ch < 0xf5
# 4-byte UTF-8 sequence (i.e. characters > 0xffff)
(pos + 2 > endpos) && throw(UnicodeError(UTF_ERR_SHORT, pos, ch))
byt, pos = next(dat, pos)
byt = dat[pos]
pos += 1
ch = get_continuation(ch & 0x07, byt, pos)
byt, pos = next(dat, pos)
byt = dat[pos]
pos += 1
ch = get_continuation(ch, byt, pos)
byt, pos = next(dat, pos)
byt = dat[pos]
pos += 1
ch = get_continuation(ch, byt, pos)
if ch > 0x10ffff
throw(UnicodeError(UTF_ERR_INVALID, pos-3, ch))
Expand Down Expand Up @@ -187,7 +197,8 @@ function unsafe_checkstring(
flags::UInt = 0
totalchar = num2byte = num3byte = num4byte = 0
@inbounds while pos <= endpos
ch, pos = next(dat, pos)
ch = dat[pos]
pos = nextind(dat, pos)
totalchar += 1
if ch > 0x7f
if ch < 0x100
Expand All @@ -204,7 +215,8 @@ function unsafe_checkstring(
elseif is_surrogate_lead(ch)
pos > endpos && throw(UnicodeError(UTF_ERR_MISSING_SURROGATE, pos, ch))
# next character *must* be a trailing surrogate character
ch, pos = next(dat, pos)
ch = dat[pos]
pos = nextind(dat, pos)
!is_surrogate_trail(ch) && throw(UnicodeError(UTF_ERR_NOT_TRAIL, pos, ch))
num4byte += 1
if !(typeof(dat) <: AbstractVector{UInt16})
Expand Down
2 changes: 1 addition & 1 deletion src/utf32.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function convert(::Type{UTF32String}, str::UTF16String)
# get number of words to create
len, flags, num4byte = unsafe_checkstring(dat, 1, len>>>1)
# No surrogate pairs, do optimized copy
(flags & UTF_UNICODE4) == 0 && @inbounds return UTF32String(copy!(Vector{Char}(len), dat))
(flags & UTF_UNICODE4) == 0 && @inbounds return UTF32String(copy!(Vector{UInt32}(len), dat))
local ch::UInt32
buf = Vector{UInt32}(len)
out = 0
Expand Down