-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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.
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
implement islower, isupper and istitle for String #23394
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -772,6 +772,7 @@ export | |
ispunct, | ||
isspace, | ||
isupper, | ||
istitle, | ||
isvalid, | ||
isxdigit, | ||
join, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ export isgraphemebreak, category_code, category_abbrev, category_string | |
|
||
# also exported by Base: | ||
export normalize_string, graphemes, is_assigned_char, charwidth, isvalid, | ||
islower, isupper, isalpha, isdigit, isnumber, isalnum, | ||
islower, isupper, istitle, isalpha, isdigit, isnumber, isalnum, | ||
iscntrl, ispunct, isspace, isprint, isgraph | ||
|
||
# whether codepoints are valid Unicode scalar values, i.e. 0-0xd7ff, 0xe000-0x10ffff | ||
|
@@ -265,7 +265,31 @@ julia> islower('❤') | |
false | ||
``` | ||
""" | ||
islower(c::Char) = (category_code(c) == UTF8PROC_CATEGORY_LL) | ||
islower(c::Char) = islower(category_code(c)) | ||
islower(ccode::Int32) = ccode == UTF8PROC_CATEGORY_LL | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should be a separate function, not a method of |
||
|
||
""" | ||
islower(s::AbstractString) -> Bool | ||
|
||
Tests whether all letters in `s` are lowercase, and that | ||
`s` contains at least one letter. | ||
|
||
# Examples | ||
```jldoctest | ||
julia> islower("let's see...") | ||
true | ||
|
||
julia> islower("Julia") | ||
false | ||
|
||
julia> islower("12 ÷ 3 == 4") | ||
false | ||
|
||
julia> islower(lowercase(randstring())) # very unlikely to be false | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. don't use a random string here |
||
true | ||
``` | ||
""" | ||
islower(s::AbstractString) = iscasegood(s, islower, isupper) | ||
|
||
# true for Unicode upper and mixed case | ||
|
||
|
@@ -288,9 +312,81 @@ julia> isupper('❤') | |
false | ||
``` | ||
""" | ||
function isupper(c::Char) | ||
ccode = category_code(c) | ||
return ccode == UTF8PROC_CATEGORY_LU || ccode == UTF8PROC_CATEGORY_LT | ||
isupper(c::Char) = isupper(category_code(c)) | ||
isupper(ccode::Int32) = ccode == UTF8PROC_CATEGORY_LU || ccode == UTF8PROC_CATEGORY_LT | ||
|
||
""" | ||
isupper(s::AbstractString) -> Bool | ||
|
||
Tests whether all letters in `s` are uppercase, and that | ||
`s` contains at least one letter. | ||
|
||
# Examples | ||
```jldoctest | ||
julia> isupper("JULIACON 2017") | ||
true | ||
|
||
julia> isupper("Julia") | ||
false | ||
|
||
julia> isupper("12 ÷ 3 == 4") | ||
false | ||
|
||
julia> isupper(uppercase(randstring())) # very unlikely to be false | ||
true | ||
``` | ||
""" | ||
isupper(s::AbstractString) = iscasegood(s, isupper, islower) | ||
|
||
function iscasegood(s::AbstractString, good, bad) | ||
onecased = false | ||
for c in s | ||
ccode = category_code(c) | ||
bad(ccode) && return false | ||
onecased || good(ccode) && (onecased = true) | ||
end | ||
onecased | ||
end | ||
|
||
""" | ||
istitle(s::AbstractString, strict=true) -> Bool | ||
|
||
Tests whether all words in `s` have their first letter in uppercase; | ||
if `strict` is true, all remaining letters must be in lowercase. | ||
|
||
# Examples | ||
```jldoctest | ||
julia> istitle("The Julia Programming Language") | ||
true | ||
|
||
julia> istitle("ISS - International Space Station") | ||
false | ||
|
||
julia> istitle("ISS - International Space Station", false) | ||
true | ||
|
||
julia> istitle(titlecase(randstring())) # very unlikely to be false | ||
true | ||
``` | ||
""" | ||
function istitle(s::AbstractString) | ||
onecased = false | ||
startword = true | ||
for c in s | ||
ccode = category_code(c) | ||
if islower(ccode) | ||
startword && return false | ||
onecased = true | ||
startword = false | ||
elseif isupper(ccode) | ||
startword || return false | ||
onecased = true | ||
startword = false | ||
else | ||
startword = false | ||
end | ||
end | ||
onecased | ||
end | ||
|
||
""" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be: at least one letter
Not: at least on letter