birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed StringFunc whitespace differences.

Browse Source 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
This commit is contained in:
santorac
2022-01-26 16:55:45 -08:00
parent 68e4970a2d
commit ed21e97dcd
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/StringFunc/StringFunc.cpp
+5 -5
View File
@@ -757,12 +757,12 @@ namespace AZ::StringFunc
}
return value;
}
void Tokenize(AZStd::string_view in, AZStd::vector<AZStd::string>& tokens, const char delimiter, bool keepEmptyStrings, bool keepSpaceStrings)
{
return Tokenize(in, tokens, { &delimiter, 1 }, keepEmptyStrings, keepSpaceStrings);
}
void Tokenize(AZStd::string_view in, AZStd::vector<AZStd::string>& tokens, AZStd::string_view delimiters, bool keepEmptyStrings, bool keepSpaceStrings)
{
auto insertVisitor = [&tokens](AZStd::string_view token)
@@ -771,7 +771,7 @@ namespace AZ::StringFunc
};
return TokenizeVisitor(in, insertVisitor, delimiters, keepEmptyStrings, keepSpaceStrings);
}
void TokenizeVisitor(AZStd::string_view in, const TokenVisitor& tokenVisitor, const char delimiter, bool keepEmptyStrings, bool keepSpaceStrings)
{
return TokenizeVisitor(in, tokenVisitor, { &delimiter, 1 }, keepEmptyStrings, keepSpaceStrings);
@@ -918,7 +918,7 @@ namespace AZ::StringFunc
return found;
}
void Tokenize(AZStd::string_view input, AZStd::vector<AZStd::string>& tokens, const AZStd::vector<AZStd::string_view>& delimiters, bool keepEmptyStrings /*= false*/, bool keepSpaceStrings /*= false*/)
{
if (input.empty())
@@ -948,7 +948,7 @@ namespace AZ::StringFunc
offset = nextOffset + delimiters[nextMatch].size();
}
}
int ToInt(const char* in)
{
if (!in)
Code/Framework/AzCore/Tests/StringFunc.cpp
+2 -2
View File
@@ -202,7 +202,7 @@ namespace AZ
AZStd::vector<AZStd::string> tokens;
AZ::StringFunc::Tokenize(input.c_str(), tokens, ' ');
ASSERT_EQ(tokens.size(), 0);
}
}
TEST_F(StringFuncTest, Tokenize_SingleDelimeter)
{
@@ -259,7 +259,7 @@ namespace AZ
ASSERT_TRUE(tokens[2] == "c");
ASSERT_TRUE(tokens[3] == "d-e"); // Test for something like a guid, which contain typical separator characters
}
TEST_F(StringFuncTest, TokenizeVisitor_EmptyString_DoesNotInvokeVisitor)
{
int visitedCount{};