mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-09 21:44:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stringops_string_view' into 'master'

Browse Source 
Use string_view for StringUtils functions

See merge request OpenMW/openmw!2042
This commit is contained in:
jvoisin 2022-06-21 21:40:10 +00:00
commit e29c1abfae
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/misc/stringops.hpp
View File

@ -62,7 +62,8 @@ public:
return tolowermap[static_cast<unsigned char>(c)]; return tolowermap[static_cast<unsigned char>(c)];
} }
static bool ciLess(const std::string &x, const std::string &y) { static bool ciLess(std::string_view x, std::string_view y)
{
return std::lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), ci()); return std::lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), ci());
} }
@ -96,10 +97,10 @@ public:
return ciEqual(x, std::string_view(y, n - 1)); return ciEqual(x, std::string_view(y, n - 1));
} }
static int ciCompareLen(const std::string &x, const std::string &y, size_t len) static int ciCompareLen(std::string_view x, std::string_view y, std::size_t len)
{ {
std::string::const_iterator xit = x.begin(); std::string_view::const_iterator xit = x.begin();
std::string::const_iterator yit = y.begin(); std::string_view::const_iterator yit = y.begin();
for(;xit != x.end() && yit != y.end() && len > 0;++xit,++yit,--len) for(;xit != x.end() && yit != y.end() && len > 0;++xit,++yit,--len)
{ {
char left = *xit; char left = *xit;
@ -139,11 +140,12 @@ public:
struct CiEqual struct CiEqual
{ {
bool operator()(const std::string& left, const std::string& right) const bool operator()(std::string_view left, std::string_view right) const
{ {
return ciEqual(left, right); return ciEqual(left, right);
} }
}; };
struct CiHash struct CiHash
{ {
std::size_t operator()(std::string str) const std::size_t operator()(std::string str) const
@ -152,9 +154,10 @@ public:
return std::hash<std::string>{}(str); return std::hash<std::string>{}(str);
} }
}; };
struct CiComp struct CiComp
{ {
bool operator()(const std::string& left, const std::string& right) const bool operator()(std::string_view left, std::string_view right) const
{ {
return ciLess(left, right); return ciLess(left, right);
} }
@ -216,20 +219,20 @@ public:
} }
template <class Container> template <class Container>
static inline void split(const std::string& str, Container& cont, const std::string& delims = " ") static inline void split(std::string_view str, Container& cont, std::string_view delims = " ")
{ {
std::size_t current, previous = 0; std::size_t current = str.find_first_of(delims);
current = str.find_first_of(delims); std::size_t previous = 0;
while (current != std::string::npos) while (current != std::string::npos)
{ {
cont.push_back(str.substr(previous, current - previous)); cont.emplace_back(str.substr(previous, current - previous));
previous = current + 1; previous = current + 1;
current = str.find_first_of(delims, previous); current = str.find_first_of(delims, previous);
} }
cont.push_back(str.substr(previous, current - previous)); cont.emplace_back(str.substr(previous, current - previous));
} }
static inline void replaceLast(std::string& str, const std::string& substr, const std::string& with) static inline void replaceLast(std::string& str, std::string_view substr, std::string_view with)
{ {
size_t pos = str.rfind(substr); size_t pos = str.rfind(substr);
if (pos == std::string::npos) if (pos == std::string::npos)