R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve string trimming logic

Browse Source 
Add option to trim anything before/after the criteria.
This commit is contained in:
Kawe Mazidjatari 2022-11-11 01:17:11 +01:00
parent b81566604f
commit 24a4097cef
2 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
r5dev/public/utility/utility.cpp
View File

@ -748,25 +748,57 @@ vector<string> StringSplit(string svInput, char cDelim, size_t nMax)
///////////////////////////////////////////////////////////////////////////////
// For trimming leading characters from input.
string& StringLTrim(string& svInput, const char* pszToTrim)
string& StringLTrim(string& svInput, const char* pszToTrim, bool bTrimBefore)
{
svInput.erase(0, svInput.find_first_not_of(pszToTrim));
size_t n = 0;
if (!bTrimBefore)
{
n = svInput.find_first_not_of(pszToTrim);
}
else // Remove everything before criteria as well.
{
n = svInput.find_first_of(pszToTrim);
n = svInput.find_first_not_of(pszToTrim, n);
}
if (n != string::npos)
{
svInput.erase(0, n);
}
return svInput;
}
///////////////////////////////////////////////////////////////////////////////
// For trimming trailing characters from input.
string& StringRTrim(string& svInput, const char* pszToTrim)
string& StringRTrim(string& svInput, const char* pszToTrim, bool bTrimAfter)
{
svInput.erase(svInput.find_last_not_of(pszToTrim) + 1);
size_t n = 0;
if (!bTrimAfter)
{
n = svInput.find_last_not_of(pszToTrim) + 1;
}
else // Remove everything after criteria as well.
{
n = svInput.find_first_of(pszToTrim) + 1;
}
if (n > 0)
{
svInput.erase(n);
if (bTrimAfter)
{
svInput.at(svInput.size() - 1) = '\0';
}
}
return svInput;
}
///////////////////////////////////////////////////////////////////////////////
// For trimming leading and trailing characters from input.
string& StringTrim(string& svInput, const char* pszToTrim)
string& StringTrim(string& svInput, const char* pszToTrim, bool bTrimAll)
{
return StringLTrim(StringRTrim(svInput, pszToTrim), pszToTrim);
return StringRTrim(StringLTrim(svInput, pszToTrim, bTrimAll), pszToTrim, bTrimAll);
}
///////////////////////////////////////////////////////////////////////////////

6
r5dev/public/utility/utility.h
View File

@ -52,9 +52,9 @@ string StringUnescape(const string& svInput);
size_t StringCount(const string& svInput, char cDelim);
vector<string> StringSplit(string svInput, char cDelim, size_t nMax = SIZE_MAX);
string& StringLTrim(string& svInput, const char* pszToTrim);
string& StringRTrim(string& svInput, const char* pszToTrim);
string& StringTrim(string& svInput, const char* pszToTrim);
string& StringLTrim(string& svInput, const char* pszToTrim, bool bTrimBefore = false);
string& StringRTrim(string& svInput, const char* pszToTrim, bool bTrimAfter = false);
string& StringTrim(string& svInput, const char* pszToTrim, bool bTrimAll = false);
/////////////////////////////////////////////////////////////////////////////
// Bytes