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

NFC. Moving the RegisteredOptionCategories global into the CommandLineParser class.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229172 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Bieneman
2015-02-13 22:54:32 +00:00
parent a87100c6d2
commit 845c00e2e6
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/Support/CommandLine.cpp
View File

@ -101,6 +101,9 @@ public:
Option *ConsumeAfterOpt; // The ConsumeAfter option if it exists. Option *ConsumeAfterOpt; // The ConsumeAfter option if it exists.
// This collects the different option categories that have been registered.
SmallPtrSet<OptionCategory *, 16> RegisteredOptionCategories;
CommandLineParser() : ProgramOverview(nullptr), ConsumeAfterOpt(nullptr) {} CommandLineParser() : ProgramOverview(nullptr), ConsumeAfterOpt(nullptr) {}
void ParseCommandLineOptions(int argc, const char *const *argv, void ParseCommandLineOptions(int argc, const char *const *argv,
@ -191,6 +194,17 @@ public:
void printOptionValues(); void printOptionValues();
void registerCategory(OptionCategory *cat) {
assert(std::count_if(RegisteredOptionCategories.begin(),
RegisteredOptionCategories.end(),
[cat](const OptionCategory *Category) {
return getName() == Category->getName();
}) == 0 &&
"Duplicate option categories");
RegisteredOptionCategories.insert(cat);
}
private: private:
Option *LookupOption(StringRef &Arg, StringRef &Value); Option *LookupOption(StringRef &Arg, StringRef &Value);
}; };
@ -220,22 +234,11 @@ void Option::setArgStr(const char *S) {
ArgStr = S; ArgStr = S;
} }
// This collects the different option categories that have been registered.
typedef SmallPtrSet<OptionCategory *, 16> OptionCatSet;
static ManagedStatic<OptionCatSet> RegisteredOptionCategories;
// Initialise the general option category. // Initialise the general option category.
OptionCategory llvm::cl::GeneralCategory("General options"); OptionCategory llvm::cl::GeneralCategory("General options");
void OptionCategory::registerCategory() { void OptionCategory::registerCategory() {
assert(std::count_if(RegisteredOptionCategories->begin(), GlobalParser->registerCategory(this);
RegisteredOptionCategories->end(),
[this](const OptionCategory *Category) {
return getName() == Category->getName();
}) == 0 &&
"Duplicate option categories");
RegisteredOptionCategories->insert(this);
} }
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
@ -1577,8 +1580,8 @@ protected:
// Collect registered option categories into vector in preparation for // Collect registered option categories into vector in preparation for
// sorting. // sorting.
for (OptionCatSet::const_iterator I = RegisteredOptionCategories->begin(), for (auto I = GlobalParser->RegisteredOptionCategories.begin(),
E = RegisteredOptionCategories->end(); E = GlobalParser->RegisteredOptionCategories.end();
I != E; ++I) { I != E; ++I) {
SortedCategories.push_back(*I); SortedCategories.push_back(*I);
} }
@ -1721,7 +1724,7 @@ void HelpPrinterWrapper::operator=(bool Value) {
// Decide which printer to invoke. If more than one option category is // Decide which printer to invoke. If more than one option category is
// registered then it is useful to show the categorized help instead of // registered then it is useful to show the categorized help instead of
// uncategorized help. // uncategorized help.
if (RegisteredOptionCategories->size() > 1) { if (GlobalParser->RegisteredOptionCategories.size() > 1) {
// unhide -help-list option so user can have uncategorized output if they // unhide -help-list option so user can have uncategorized output if they
// want it. // want it.
HLOp.setHiddenFlag(NotHidden); HLOp.setHiddenFlag(NotHidden);