From ff2c72b858362bdd69c4ecb072d9b41e2db8d68e Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 13 Nov 2009 04:55:09 +0000 Subject: Distinguish "a," from "a". The first one splits into "a" + "" and the second one into "a" + 0. llvm-svn: 87084 --- llvm/lib/Support/StringExtras.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'llvm/lib/Support/StringExtras.cpp') diff --git a/llvm/lib/Support/StringExtras.cpp b/llvm/lib/Support/StringExtras.cpp index 687394a2fce..1b233ab200a 100644 --- a/llvm/lib/Support/StringExtras.cpp +++ b/llvm/lib/Support/StringExtras.cpp @@ -63,8 +63,10 @@ void llvm::StringRef::split(SmallVectorImpl &A, 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 p = rest.split(Separators); @@ -72,7 +74,7 @@ void llvm::StringRef::split(SmallVectorImpl &A, 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); } -- cgit v1.2.3