RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00
Code Issues Projects Releases Wiki Activity

Option parsing: recognize the special -- token

Browse Source 
Everything that comes after -- should be treated as a filename. This
enables passing in filenames that would otherwise be conflated with
command-line options.

This is especially important for clang-cl which supports options
starting with /, which are easily conflatable with Unix-style
path names.

Differential Revision: http://llvm-reviews.chandlerc.com/D1274

llvm-svn: 187675
This commit is contained in:
Hans Wennborg 2013-08-02 21:20:27 +00:00
parent 0047fe7d03
commit 749f8bc956
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Option/OptTable.cpp
View File

@ -253,11 +253,26 @@ InputArgList *OptTable::ParseArgs(const char *const *ArgBegin,
unsigned Index = 0, End = ArgEnd - ArgBegin; unsigned Index = 0, End = ArgEnd - ArgBegin;
while (Index < End) { while (Index < End) {
// Ignore empty arguments (other things may still take them as arguments). // Ignore empty arguments (other things may still take them as arguments).
if (Args->getArgString(Index)[0] == '\0') { StringRef Str = Args->getArgString(Index);
if (Str == "") {
++Index; ++Index;
continue; continue;
} }
if (Str == "--") {
// Everything after -- is a filename.
++Index;
assert(TheInputOptionID != 0 && "Invalid input option ID.");
while (Index < End) {
Args->append(new Arg(getOption(TheInputOptionID),
Args->getArgString(Index), Index,
Args->getArgString(Index)));
++Index;
}
break;
}
unsigned Prev = Index; unsigned Prev = Index;
Arg *A = ParseOneArg(*Args, Index, FlagsToInclude, FlagsToExclude); Arg *A = ParseOneArg(*Args, Index, FlagsToInclude, FlagsToExclude);
assert(Index > Prev && "Parser failed to consume argument."); assert(Index > Prev && "Parser failed to consume argument.");

13
unittests/Option/OptionParsingTest.cpp
View File

@ -156,3 +156,16 @@ TEST(Option, AliasArgs) {
EXPECT_EQ(AL->getAllArgValues(OPT_B)[0], "foo"); EXPECT_EQ(AL->getAllArgValues(OPT_B)[0], "foo");
EXPECT_EQ(AL->getAllArgValues(OPT_B)[1], "bar"); EXPECT_EQ(AL->getAllArgValues(OPT_B)[1], "bar");
} }
TEST(Option, DashDash) {
TestOptTable T;
unsigned MAI, MAC;
const char *MyArgs[] = { "-A", "--", "-B", "--" };
OwningPtr<InputArgList> AL(T.ParseArgs(MyArgs, array_endof(MyArgs), MAI, MAC));
EXPECT_TRUE(AL->hasArg(OPT_A));
EXPECT_FALSE(AL->hasArg(OPT_B));
EXPECT_EQ(AL->getAllArgValues(OPT_INPUT).size(), 2U);
EXPECT_EQ(AL->getAllArgValues(OPT_INPUT)[0], "-B");
EXPECT_EQ(AL->getAllArgValues(OPT_INPUT)[1], "--");
}