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

Jump to bottom

Remove unexported, undocumented, and unused utf8sizeof and is_utf8_start from Base #12655

Merged
merged 2 commits into from Aug 17, 2015
Merged

Remove unexported, undocumented, and unused utf8sizeof and is_utf8_start from Base #12655

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e15ac3
Remove utf8sizeof function
ScottPJones Aug 17, 2015
ea0c31a
Remove unexported is_utf8_start function
ScottPJones Aug 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 1 addition & 8 deletions base/unicode/utf8.jl
View file
Open in desktop
Expand Up @@ -26,10 +26,6 @@ const utf8_trailing = [
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5,
]

# Retained because although undocumented and unexported, used in a package (MutableStrings)
# should be deprecated
is_utf8_start(byte::UInt8) = ((byte&0xc0)!=0x80)

## required core functionality ##
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A PR or issue should probably be opened on MutableStrings since this package is mentioned explicitly.


function endof(s::UTF8String)
Expand Down Expand Up @@ -117,7 +113,7 @@ function getindex(s::UTF8String, r::UnitRange{Int})
if i < 1 || i > length(s.data)
throw(BoundsError(s, i))
end
if !is_utf8_start(d[i])
if is_valid_continuation(d[i])
throw(UnicodeError(UTF_ERR_INVALID_INDEX, i, d[i]))
end
if j > length(d)
Expand Down Expand Up @@ -345,6 +341,3 @@ end

utf8(p::Ptr{UInt8}) = UTF8String(bytestring(p))
utf8(p::Ptr{UInt8}, len::Integer) = utf8(pointer_to_array(p, len))

# The last case is the replacement character 0xfffd (3 bytes)
utf8sizeof(c::Char) = c < Char(0x80) ? 1 : c < Char(0x800) ? 2 : c < Char(0x10000) ? 3 : c < Char(0x110000) ? 4 : 3