averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Clang importer] Lowercase plural initialisms correctly.

Browse Source 
URLs -> urls rather than urLs.
This commit is contained in:
Doug Gregor
2016-01-27 16:38:11 -08:00
parent a7cd2d215a
commit b9955404c8
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Basic/StringExtras.cpp
View File

@@ -747,6 +747,11 @@ static StringRef omitNeedlessWords(StringRef name,
return name;
}
/// Whether the given word is a plural s
static bool isPluralSuffix(StringRef word) {
return word == "s" || word == "es" || word == "ies";
}
/// A form of toLowercaseWord that also lowercases acronyms.
static StringRef toLowercaseWordAndAcronym(StringRef string,
StringScratchSpace &scratch) {
@@ -763,9 +768,11 @@ static StringRef toLowercaseWordAndAcronym(StringRef string,
for (unsigned i = 0, n = string.size(); i != n; ++i) {
// If the next character is not uppercase, stop.
if (i < n - 1 && !clang::isUppercase(string[i+1])) {
// If the next non-uppercase character was alphanumeric, we should
// still lowercase the character we're on.
if (!clang::isLetter(string[i+1])) {
// If the next non-uppercase character was not a letter, we seem
// to have a plural, we should still lowercase the character
// we're on.
if (!clang::isLetter(string[i+1]) ||
isPluralSuffix(camel_case::getFirstWord(string.substr(i+1)))) {
scratchStr.push_back(clang::toLowercase(string[i]));
++i;
}