fix string according to reviews
This commit is contained in:
@@ -61,13 +61,20 @@ namespace OpenVulkano
|
||||
template<typename T> String operator+(const T& other) const { return m_string + other; }
|
||||
String operator+(const String& other) const { return m_string + other.m_string; }
|
||||
|
||||
#if defined(_HAS_CXX20)
|
||||
template<typename T> int operator<=>(const T& other) const { return m_string <=> other; }
|
||||
#endif
|
||||
|
||||
template<typename T> bool operator==(const T& other) const { return m_string == other; }
|
||||
template<typename T> bool operator!=(const T& other) const { return m_string != other; }
|
||||
explicit operator bool() const { return !m_string.empty(); }
|
||||
|
||||
operator std::string() const { return m_string; }
|
||||
explicit operator std::string_view() const { return m_string; }
|
||||
|
||||
char& operator[](size_t index) noexcept { return m_string[index]; }
|
||||
const char& operator[](size_t index) const noexcept { return m_string[index]; }
|
||||
char& At(size_t index) { return m_string.at(index); }
|
||||
const char& At(size_t index) const { return m_string.at(index); }
|
||||
const char* CharString() const { return m_string.c_str(); }
|
||||
const char* Data() { return m_string.data(); }
|
||||
@@ -81,67 +88,77 @@ namespace OpenVulkano
|
||||
char& Back() { return m_string.back(); }
|
||||
void PopBack() { m_string.pop_back(); }
|
||||
void Clear() { m_string.clear(); }
|
||||
void Shrink() { m_string.shrink_to_fit(); }
|
||||
String SubString(size_t start, size_t end) const { return m_string.substr(start, end); }
|
||||
bool StartsWith(const String& str) const { return m_string.find(str) == 0; }
|
||||
bool EndsWith(const String& str) const { return m_string.rfind(str) == m_string.size() - str.Size(); }
|
||||
bool Contains(const String& str) const { return m_string.find(str) != std::string::npos; }
|
||||
void ShrinkToFit() { m_string.shrink_to_fit(); }
|
||||
String SubString(size_t start, size_t elementCount) const { return m_string.substr(start, elementCount); }
|
||||
bool StartsWith(const std::string_view& str) const { return m_string.find(str) == 0; }
|
||||
bool EndsWith(const std::string_view& str) const { return m_string.rfind(str) == m_string.size() - str.size(); }
|
||||
bool Contains(const std::string_view& str) const { return m_string.find(str) != std::string::npos; }
|
||||
|
||||
size_t FindStartIndexOf(const String& str) const { return m_string.find(str); }
|
||||
size_t FindEndIndexOf(const String& str) const { return m_string.rfind(str); }
|
||||
size_t FindStartIndexOf(const std::string_view& str) const { return m_string.find(str); }
|
||||
size_t FindEndIndexOf(const std::string_view& str) const { return m_string.rfind(str); }
|
||||
|
||||
String& Trim() noexcept
|
||||
{
|
||||
size_t start = m_string.find_first_not_of(" \t\n");
|
||||
size_t end = m_string.find_last_not_of(" \t\n");
|
||||
m_string = m_string.substr(start, end - start + 1);
|
||||
size_t start = m_string.find_first_not_of(" \t\n\r");
|
||||
if (start == std::string::npos)
|
||||
{
|
||||
m_string.clear();
|
||||
return *this;
|
||||
}
|
||||
|
||||
size_t end = m_string.find_last_not_of(" \t\n\r");
|
||||
|
||||
m_string.erase(0, start);
|
||||
m_string.resize(end - start + 1);
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
String& TrimFront()
|
||||
String& TrimFront() noexcept
|
||||
{
|
||||
size_t start = m_string.find_first_not_of(" \t\n");
|
||||
m_string = m_string.substr(start);
|
||||
size_t start = m_string.find_first_not_of(" \t\n\r");
|
||||
if (start == std::string::npos)
|
||||
{
|
||||
m_string.clear();
|
||||
}
|
||||
else
|
||||
{
|
||||
m_string.erase(0, start);
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
String& TrimBack()
|
||||
String& TrimBack() noexcept
|
||||
{
|
||||
size_t end = m_string.find_last_not_of(" \t\n");
|
||||
m_string = m_string.substr(0, end + 1);
|
||||
size_t end = m_string.find_last_not_of(" \t\n\r");
|
||||
if (end == std::string::npos)
|
||||
{
|
||||
m_string.clear();
|
||||
}
|
||||
else
|
||||
{
|
||||
m_string.resize(end + 1);
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
void ToUpper() noexcept
|
||||
{
|
||||
for (char& c: m_string)
|
||||
{
|
||||
if (c >= 'a' && c <= 'z')
|
||||
{
|
||||
c -= 32;
|
||||
}
|
||||
}
|
||||
std::transform(m_string.begin(), m_string.end(), m_string.begin(),
|
||||
[](unsigned char c) { return std::toupper(c); });
|
||||
}
|
||||
|
||||
void ToLower() noexcept
|
||||
{
|
||||
for (char& c: m_string)
|
||||
{
|
||||
if (c >= 'A' && c <= 'Z')
|
||||
{
|
||||
c += 32;
|
||||
}
|
||||
}
|
||||
std::transform(m_string.begin(), m_string.end(), m_string.begin(),
|
||||
[](unsigned char c) { return std::tolower(c); });
|
||||
}
|
||||
|
||||
void FirstLettersUpper()
|
||||
void Capitalize() noexcept
|
||||
{
|
||||
for (size_t i = 0; i < m_string.size(); ++i)
|
||||
if (!m_string.empty())
|
||||
{
|
||||
if (m_string[i] == ' ')
|
||||
{
|
||||
m_string[i + 1] -= 32;
|
||||
}
|
||||
m_string[0] = std::toupper(m_string[0]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user