6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-14 14:24:05 +00:00
Code Issues Projects Releases Wiki Activity

reapply r82348 with a fix, thanks Jeffrey.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@82683 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2009-09-24 05:38:36 +00:00
parent 393e277ecd
commit 63e944b05e
1 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/Support/CommandLine.cpp
View File

@ -351,42 +351,33 @@ static bool EatsUnboundedNumberOfValues(const Option *O) {
/// using strdup(), so it is the caller's responsibility to free() /// using strdup(), so it is the caller's responsibility to free()
/// them later. /// them later.
/// ///
static void ParseCStringVector(std::vector<char *> &output, static void ParseCStringVector(std::vector<char *> &OutputVector,
const char *input) { const char *Input) {
// Characters which will be treated as token separators: // Characters which will be treated as token separators:
static const char *const delims = " \v\f\t\r\n"; StringRef Delims = " \v\f\t\r\n";
std::string work(input); StringRef WorkStr(Input);
// Skip past any delims at head of input string. while (!WorkStr.empty()) {
size_t pos = work.find_first_not_of(delims); // If the first character is a delimiter, strip them off.
// If the string consists entirely of delims, then exit early. if (Delims.find(WorkStr[0]) != StringRef::npos) {
if (pos == std::string::npos) return; size_t Pos = WorkStr.find_first_not_of(Delims);
// Otherwise, jump forward to beginning of first word. if (Pos == StringRef::npos) Pos = WorkStr.size();
work = work.substr(pos); WorkStr = WorkStr.substr(Pos);
// Find position of first delimiter. continue;
pos = work.find_first_of(delims);
while (!work.empty() && pos != std::string::npos) {
// Everything from 0 to POS is the next word to copy.
output.push_back(strdup(work.substr(0,pos).c_str()));
// Is there another word in the string?
size_t nextpos = work.find_first_not_of(delims, pos + 1);
if (nextpos != std::string::npos) {
// Yes? Then remove delims from beginning ...
work = work.substr(work.find_first_not_of(delims, pos + 1));
// and find the end of the word.
pos = work.find_first_of(delims);
} else {
// No? (Remainder of string is delims.) End the loop.
work = "";
pos = std::string::npos;
} }
// Find position of first delimiter.
size_t Pos = WorkStr.find_first_of(Delims);
if (Pos == StringRef::npos) Pos = WorkStr.size();
// Everything from 0 to Pos is the next word to copy.
char *NewStr = (char*)malloc(Pos+1);
memcpy(NewStr, WorkStr.data(), Pos);
NewStr[Pos] = 0;
OutputVector.push_back(NewStr);
WorkStr = WorkStr.substr(Pos);
} }
// If `input' ended with non-delim char, then we'll get here with
// the last word of `input' in `work'; copy it now.
if (!work.empty())
output.push_back(strdup(work.c_str()));
} }
/// ParseEnvironmentOptions - An alternative entry point to the /// ParseEnvironmentOptions - An alternative entry point to the