[llvm] r188323 - Options: explicit handling of --
Hans Wennborg
hans at hanshq.net
Tue Aug 13 15:23:05 PDT 2013
Author: hans
Date: Tue Aug 13 17:23:05 2013
New Revision: 188323
URL: http://llvm.org/viewvc/llvm-project?rev=188323&view=rev
Log:
Options: explicit handling of --
Clients of the option parsing library should handle it explicitly
using a KIND_REMAINING_ARGS option.
Clang and lld have been updated in r188316 and r188318, respectively.
Also fix -Wsign-compare warning in the option parsing test.
Modified:
llvm/trunk/lib/Option/OptTable.cpp
llvm/trunk/unittests/Option/OptionParsingTest.cpp
Modified: llvm/trunk/lib/Option/OptTable.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Option/OptTable.cpp?rev=188323&r1=188322&r2=188323&view=diff
==============================================================================
--- llvm/trunk/lib/Option/OptTable.cpp (original)
+++ llvm/trunk/lib/Option/OptTable.cpp Tue Aug 13 17:23:05 2013
@@ -259,22 +259,6 @@ InputArgList *OptTable::ParseArgs(const
continue;
}
- // FIXME: Remove once clients are updated to use a KIND_REMAINING_ARGS
- // option to handle this explicitly instead.
- 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.");
Modified: llvm/trunk/unittests/Option/OptionParsingTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Option/OptionParsingTest.cpp?rev=188323&r1=188322&r2=188323&view=diff
==============================================================================
--- llvm/trunk/unittests/Option/OptionParsingTest.cpp (original)
+++ llvm/trunk/unittests/Option/OptionParsingTest.cpp Tue Aug 13 17:23:05 2013
@@ -157,19 +157,6 @@ TEST(Option, AliasArgs) {
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], "--");
-}
-
TEST(Option, SlurpEmpty) {
TestOptTable T;
unsigned MAI, MAC;
@@ -178,7 +165,7 @@ TEST(Option, SlurpEmpty) {
OwningPtr<InputArgList> AL(T.ParseArgs(MyArgs, array_endof(MyArgs), MAI, MAC));
EXPECT_TRUE(AL->hasArg(OPT_A));
EXPECT_TRUE(AL->hasArg(OPT_Slurp));
- EXPECT_EQ(AL->getAllArgValues(OPT_Slurp).size(), 0);
+ EXPECT_EQ(AL->getAllArgValues(OPT_Slurp).size(), 0U);
}
TEST(Option, Slurp) {
More information about the llvm-commits
mailing list