diff options
| author | mitaclaw <140017135+mitaclaw@users.noreply.github.com> | 2024-09-21 22:32:24 -0700 |
|---|---|---|
| committer | mitaclaw <140017135+mitaclaw@users.noreply.github.com> | 2024-09-21 23:15:42 -0700 |
| commit | 508ccc2054590a9efa89054e742b74521f272063 (patch) | |
| tree | b611a93de812ddf6d1ed025d72f047c1d312e6f0 /Source/Core/Common/StringUtil.cpp | |
| parent | 067bdaa3ddfad15b6c08b4ab59361ebd0a31066c (diff) | |
IniFile: Migrate `Common::CaseInsensitiveLess` to StringUtil
Migrating `Common::CaseInsensitiveLess` to StringUtil.h will hopefully discourage rolling one's own solution in the future for case-insensitive associative containers when this (quite robust!) solution already exists.
`Common::CaseInsensitiveStringCompare::IsEqual` was removed in favor of using the `Common::CaseInsensitiveEquals` function.
The `a.size() != b.size()` condition in `Common::CaseInsensitiveEquals` can be removed, since `std::ranges::equal` already checks this condition (confirmed in libc++).
Diffstat (limited to 'Source/Core/Common/StringUtil.cpp')
| -rw-r--r-- | Source/Core/Common/StringUtil.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 513a880cd7..41ed8e11fc 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -681,10 +681,14 @@ void ToUpper(std::string* str) bool CaseInsensitiveEquals(std::string_view a, std::string_view b) { - if (a.size() != b.size()) - return false; - return std::equal(a.begin(), a.end(), b.begin(), - [](char ca, char cb) { return Common::ToLower(ca) == Common::ToLower(cb); }); + return std::ranges::equal( + a, b, [](char ca, char cb) { return Common::ToLower(ca) == Common::ToLower(cb); }); +} + +bool CaseInsensitiveLess::operator()(std::string_view a, std::string_view b) const +{ + return std::ranges::lexicographical_compare( + a, b, [](char ca, char cb) { return Common::ToLower(ca) < Common::ToLower(cb); }); } std::string BytesToHexString(std::span<const u8> bytes) |
