maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #40097 from mrushyendra/file_sort_master

Browse source 
Fix natural sort comparison for strings with large numbers
This commit is contained in:
Rémi Verschelde 2020-10-07 13:59:14 +02:00 committed by GitHub
parent e93af13959 de46c92711
commit cb77e8d6cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
core/ustring.cpp
View file

@ -787,29 +787,46 @@ signed char String::naturalnocasecmp_to(const String &p_str) const {
if (!*that_str) {
return 1;
} else if (IS_DIGIT(*this_str)) {
int64_t this_int, that_int;
if (!IS_DIGIT(*that_str)) {
return -1;
}
/* Compare the numbers */
this_int = to_int(this_str, -1, true);
that_int = to_int(that_str, -1, true);
// Keep ptrs to start of numerical sequences
const CharType *this_substr = this_str;
const CharType *that_substr = that_str;
if (this_int < that_int) {
return -1;
} else if (this_int > that_int) {
return 1;
}
/* Skip */
// Compare lengths of both numerical sequences, ignoring leading zeros
while (IS_DIGIT(*this_str)) {
this_str++;
}
while (IS_DIGIT(*that_str)) {
that_str++;
}
while (*this_substr == '0') {
this_substr++;
}
while (*that_substr == '0') {
that_substr++;
}
int this_len = this_str - this_substr;
int that_len = that_str - that_substr;
if (this_len < that_len) {
return -1;
} else if (this_len > that_len) {
return 1;
}
// If lengths equal, compare lexicographically
while (this_substr != this_str && that_substr != that_str) {
if (*this_substr < *that_substr) {
return -1;
} else if (*this_substr > *that_substr) {
return 1;
}
this_substr++;
that_substr++;
}
} else if (IS_DIGIT(*that_str)) {
return 1;
} else {