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

Options: explicit handling of --

Browse Source 
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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188323 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Hans Wennborg
2013-08-13 22:23:05 +00:00
parent 51a0280d29
commit b06ccefc91
2 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Option/OptTable.cpp
View File

@ -259,22 +259,6 @@ InputArgList *OptTable::ParseArgs(const char *const *ArgBegin,
continue; 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; 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.");

15
unittests/Option/OptionParsingTest.cpp
View File

@ -157,19 +157,6 @@ TEST(Option, AliasArgs) {
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], "--");
}
TEST(Option, SlurpEmpty) { TEST(Option, SlurpEmpty) {
TestOptTable T; TestOptTable T;
unsigned MAI, MAC; unsigned MAI, MAC;
@ -178,7 +165,7 @@ TEST(Option, SlurpEmpty) {
OwningPtr<InputArgList> AL(T.ParseArgs(MyArgs, array_endof(MyArgs), MAI, MAC)); OwningPtr<InputArgList> AL(T.ParseArgs(MyArgs, array_endof(MyArgs), MAI, MAC));
EXPECT_TRUE(AL->hasArg(OPT_A)); EXPECT_TRUE(AL->hasArg(OPT_A));
EXPECT_TRUE(AL->hasArg(OPT_Slurp)); 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) { TEST(Option, Slurp) {