Relintai/rcpp_framework
1
0
Fork 0
mirror of https://github.com/Relintai/rcpp_framework.git synced 2025-02-20 15:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix expected alphanumeric comparison logic in string.

Browse Source
This commit is contained in:
Relintai 2022-02-04 16:13:54 +01:00
parent 3a5487b2ab
commit c827f6fe64
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/string.cpp
View File

@ -325,19 +325,21 @@ void String::replace(const String &find_str, const String &with, const int count
} }
int String::compare(const String &other) const { int String::compare(const String &other) const {
int cmp_size = MIN(size(), other.size());
for (int i = 0; i < cmp_size; ++i) {
if (_data[i] < other._data[i]) {
return 1;
} else if (_data[i] > other._data[i]) {
return 2;
}
}
if (size() < other.size()) { if (size() < other.size()) {
return 1; return 1;
} else if (size() > other.size()) { } else if (size() > other.size()) {
return 2; return 2;
} else { } else {
for (int i = 0; i < _size; ++i) {
if (_data[i] < other._data[i]) {
return 1;
} else if (_data[i] > other._data[i]) {
return 2;
}
}
return 0; return 0;
} }
} }