[PATCH] Option parsing: recognize the special -- token
Hans Wennborg
hans at chromium.org
Fri Aug 2 14:11:50 PDT 2013
Addressing rnk's comment.
OK to commit?
Hi rnk,
http://llvm-reviews.chandlerc.com/D1274
CHANGE SINCE LAST DIFF
http://llvm-reviews.chandlerc.com/D1274?vs=3162&id=3167#toc
Files:
lib/Option/OptTable.cpp
unittests/Option/OptionParsingTest.cpp
Index: lib/Option/OptTable.cpp
===================================================================
--- lib/Option/OptTable.cpp
+++ lib/Option/OptTable.cpp
@@ -253,11 +253,26 @@
unsigned Index = 0, End = ArgEnd - ArgBegin;
while (Index < End) {
// 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;
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;
Arg *A = ParseOneArg(*Args, Index, FlagsToInclude, FlagsToExclude);
assert(Index > Prev && "Parser failed to consume argument.");
Index: unittests/Option/OptionParsingTest.cpp
===================================================================
--- unittests/Option/OptionParsingTest.cpp
+++ unittests/Option/OptionParsingTest.cpp
@@ -156,3 +156,16 @@
EXPECT_EQ(AL->getAllArgValues(OPT_B)[0], "foo");
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(), 2);
+ EXPECT_EQ(AL->getAllArgValues(OPT_INPUT)[0], "-B");
+ EXPECT_EQ(AL->getAllArgValues(OPT_INPUT)[1], "--");
+}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D1274.2.patch
Type: text/x-patch
Size: 1851 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130802/03bdc2fd/attachment.bin>
More information about the llvm-commits
mailing list