diff options
| -rw-r--r-- | lib/Option/OptTable.cpp | 16 | ||||
| -rw-r--r-- | unittests/Option/OptionParsingTest.cpp | 15 |
2 files changed, 1 insertions, 30 deletions
diff --git a/lib/Option/OptTable.cpp b/lib/Option/OptTable.cpp index 650aec8..8f21a4f 100644 --- a/lib/Option/OptTable.cpp +++ b/lib/Option/OptTable.cpp @@ -259,22 +259,6 @@ InputArgList *OptTable::ParseArgs(const char *const *ArgBegin, 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."); diff --git a/unittests/Option/OptionParsingTest.cpp b/unittests/Option/OptionParsingTest.cpp index 4a7b7b1..86286d1 100644 --- a/unittests/Option/OptionParsingTest.cpp +++ b/unittests/Option/OptionParsingTest.cpp @@ -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) { |