RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-24 12:36:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Distinguish "a," from "a". The first one splits into "a" + "" and the second one into

Browse Source 
"a" + 0.

llvm-svn: 87084
This commit is contained in:
Rafael Espindola 2009-11-13 04:55:09 +00:00
parent 3e2aba2402
commit bece8d9ae7
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Support/StringExtras.cpp
View File

@ -63,8 +63,10 @@ void llvm::StringRef::split(SmallVectorImpl<StringRef> &A,
bool KeepEmpty) const { bool KeepEmpty) const {
StringRef rest = *this; StringRef rest = *this;
// rest.data() is used to distinguish cases like "a," that splits into
// "a" + "" and "a" that splits into "a" + 0.
for (int splits = 0; for (int splits = 0;
rest.size() != 0 && (MaxSplit < 0 || splits < MaxSplit); rest.data() != NULL && (MaxSplit < 0 || splits < MaxSplit);
++splits) { ++splits) {
std::pair<llvm::StringRef, llvm::StringRef> p = rest.split(Separators); std::pair<llvm::StringRef, llvm::StringRef> p = rest.split(Separators);
@ -72,7 +74,7 @@ void llvm::StringRef::split(SmallVectorImpl<StringRef> &A,
A.push_back(p.first); A.push_back(p.first);
rest = p.second; rest = p.second;
} }
// If we have a tail left, add it.
if (rest.size() != 0 || KeepEmpty) if (rest.data() != NULL && (rest.size() != 0 || KeepEmpty))
A.push_back(rest); A.push_back(rest);
} }

5
unittests/ADT/StringRefTest.cpp
View File

@ -143,6 +143,11 @@ TEST(StringRefTest, Split2) {
StringRef(",").split(parts, ",", -1, true); StringRef(",").split(parts, ",", -1, true);
EXPECT_TRUE(parts == expected); EXPECT_TRUE(parts == expected);
expected.clear(); parts.clear();
expected.push_back("a"); expected.push_back("b");
StringRef("a,b").split(parts, ",", -1, true);
EXPECT_TRUE(parts == expected);
// Test MaxSplit // Test MaxSplit
expected.clear(); parts.clear(); expected.clear(); parts.clear();
expected.push_back("a,,b,c"); expected.push_back("a,,b,c");