maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

NFC. More code cleanup making LookupOption a member of the CommandLineParser. 

llvm-svn: 229170
This commit is contained in:
Chris Bieneman 2015-02-13 22:54:27 +00:00
parent fcd3d87ad8
commit 542f56a512
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/lib/Support/CommandLine.cpp
View File

@ -190,6 +190,9 @@ public:
} }
void printOptionValues(); void printOptionValues();
private:
Option *LookupOption(StringRef &Arg, StringRef &Value);
}; };
} // namespace } // namespace
@ -242,8 +245,7 @@ void OptionCategory::registerCategory() {
/// LookupOption - Lookup the option specified by the specified option on the /// LookupOption - Lookup the option specified by the specified option on the
/// command line. If there is a value specified (after an equal sign) return /// command line. If there is a value specified (after an equal sign) return
/// that as well. This assumes that leading dashes have already been stripped. /// that as well. This assumes that leading dashes have already been stripped.
static Option *LookupOption(StringRef &Arg, StringRef &Value, Option *CommandLineParser::LookupOption(StringRef &Arg, StringRef &Value) {
const StringMap<Option *> &OptionsMap) {
// Reject all dashes. // Reject all dashes.
if (Arg.empty()) if (Arg.empty())
return nullptr; return nullptr;
@ -953,7 +955,7 @@ void CommandLineParser::ParseCommandLineOptions(int argc,
while (!ArgName.empty() && ArgName[0] == '-') while (!ArgName.empty() && ArgName[0] == '-')
ArgName = ArgName.substr(1); ArgName = ArgName.substr(1);
Handler = LookupOption(ArgName, Value, OptionsMap); Handler = LookupOption(ArgName, Value);
if (!Handler || Handler->getFormattingFlag() != cl::Positional) { if (!Handler || Handler->getFormattingFlag() != cl::Positional) {
ProvidePositionalOption(ActivePositionalArg, argv[i], i); ProvidePositionalOption(ActivePositionalArg, argv[i], i);
continue; // We are done! continue; // We are done!
@ -965,7 +967,7 @@ void CommandLineParser::ParseCommandLineOptions(int argc,
while (!ArgName.empty() && ArgName[0] == '-') while (!ArgName.empty() && ArgName[0] == '-')
ArgName = ArgName.substr(1); ArgName = ArgName.substr(1);
Handler = LookupOption(ArgName, Value, OptionsMap); Handler = LookupOption(ArgName, Value);
// Check to see if this "option" is really a prefixed or grouped argument. // Check to see if this "option" is really a prefixed or grouped argument.
if (!Handler) if (!Handler)