Distinguish "a," from "a". The first one splits into "a" + "" and the second one into
"a" + 0.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@87084 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/StringExtras.cpp b/lib/Support/StringExtras.cpp
index 687394a..1b233ab 100644
--- a/lib/Support/StringExtras.cpp
+++ b/lib/Support/StringExtras.cpp
@@ -63,8 +63,10 @@
bool KeepEmpty) const {
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;
- rest.size() != 0 && (MaxSplit < 0 || splits < MaxSplit);
+ rest.data() != NULL && (MaxSplit < 0 || splits < MaxSplit);
++splits) {
std::pair<llvm::StringRef, llvm::StringRef> p = rest.split(Separators);
@@ -72,7 +74,7 @@
A.push_back(p.first);
rest = p.second;
}
-
- if (rest.size() != 0 || KeepEmpty)
+ // If we have a tail left, add it.
+ if (rest.data() != NULL && (rest.size() != 0 || KeepEmpty))
A.push_back(rest);
}
diff --git a/unittests/ADT/StringRefTest.cpp b/unittests/ADT/StringRefTest.cpp
index ea1d26c..dfa208a 100644
--- a/unittests/ADT/StringRefTest.cpp
+++ b/unittests/ADT/StringRefTest.cpp
@@ -143,6 +143,11 @@
StringRef(",").split(parts, ",", -1, true);
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
expected.clear(); parts.clear();
expected.push_back("a,,b,c");