Skip to content

[CommandLine][NFCI] Simplify enumerating subcommands of an option #75679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 19, 2023
Merged

[CommandLine][NFCI] Simplify enumerating subcommands of an option #75679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions llvm/include/llvm/Support/CommandLine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,6 @@ class Option {
return getNumOccurrencesFlag() == cl::ConsumeAfter;
}

bool isInAllSubCommands() const {
return Subs.contains(&SubCommand::getAll());
}

//-------------------------------------------------------------------------===
// Accessor functions set by OptionModifiers
//
Expand Down
79 changes: 24 additions & 55 deletions llvm/lib/Support/CommandLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,24 @@ class CommandLineParser {
StringRef Overview, raw_ostream *Errs = nullptr,
bool LongOptionsUseDoubleDash = false);

void forEachSubCommand(Option &Opt,
std::function<void(SubCommand &)> Action) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use function_ref instead of std::function here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the suggestion. I've created #75973 for this.

if (Opt.Subs.empty()) {
Action(SubCommand::getTopLevel());
return;
}
if (Opt.Subs.size() == 1 && *Opt.Subs.begin() == &SubCommand::getAll()) {
for (auto *SC : RegisteredSubCommands)
Action(*SC);
return;
}
for (auto *SC : Opt.Subs) {
assert(SC != &SubCommand::getAll() &&
"SubCommand::getAll() should not be used with other subcommands");
Action(*SC);
}
}

void addLiteralOption(Option &Opt, SubCommand *SC, StringRef Name) {
if (Opt.hasArgStr())
return;
Expand All @@ -183,25 +201,11 @@ class CommandLineParser {
<< "' registered more than once!\n";
report_fatal_error("inconsistency in registered CommandLine options");
}

// If we're adding this to all sub-commands, add it to the ones that have
// already been registered.
if (SC == &SubCommand::getAll()) {
for (auto *Sub : RegisteredSubCommands) {
if (SC == Sub)
continue;
addLiteralOption(Opt, Sub, Name);
}
}
}

void addLiteralOption(Option &Opt, StringRef Name) {
if (Opt.Subs.empty())
addLiteralOption(Opt, &SubCommand::getTopLevel(), Name);
else {
for (auto *SC : Opt.Subs)
addLiteralOption(Opt, SC, Name);
}
forEachSubCommand(
Opt, [&](SubCommand &SC) { addLiteralOption(Opt, &SC, Name); });
}

void addOption(Option *O, SubCommand *SC) {
Expand Down Expand Up @@ -238,30 +242,14 @@ class CommandLineParser {
// linked LLVM distribution.
if (HadErrors)
report_fatal_error("inconsistency in registered CommandLine options");

// If we're adding this to all sub-commands, add it to the ones that have
// already been registered.
if (SC == &SubCommand::getAll()) {
for (auto *Sub : RegisteredSubCommands) {
if (SC == Sub)
continue;
addOption(O, Sub);
}
}
}

void addOption(Option *O, bool ProcessDefaultOption = false) {
if (!ProcessDefaultOption && O->isDefaultOption()) {
DefaultOptions.push_back(O);
return;
}

if (O->Subs.empty()) {
addOption(O, &SubCommand::getTopLevel());
} else {
for (auto *SC : O->Subs)
addOption(O, SC);
}
forEachSubCommand(*O, [&](SubCommand &SC) { addOption(O, &SC); });
}

void removeOption(Option *O, SubCommand *SC) {
Expand Down Expand Up @@ -298,17 +286,7 @@ class CommandLineParser {
}

void removeOption(Option *O) {
if (O->Subs.empty())
removeOption(O, &SubCommand::getTopLevel());
else {
if (O->isInAllSubCommands()) {
for (auto *SC : RegisteredSubCommands)
removeOption(O, SC);
} else {
for (auto *SC : O->Subs)
removeOption(O, SC);
}
}
forEachSubCommand(*O, [&](SubCommand &SC) { removeOption(O, &SC); });
}

bool hasOptions(const SubCommand &Sub) const {
Expand Down Expand Up @@ -344,17 +322,8 @@ class CommandLineParser {
}

void updateArgStr(Option *O, StringRef NewName) {
if (O->Subs.empty())
updateArgStr(O, NewName, &SubCommand::getTopLevel());
else {
if (O->isInAllSubCommands()) {
for (auto *SC : RegisteredSubCommands)
updateArgStr(O, NewName, SC);
} else {
for (auto *SC : O->Subs)
updateArgStr(O, NewName, SC);
}
}
forEachSubCommand(*O,
[&](SubCommand &SC) { updateArgStr(O, NewName, &SC); });
}

void printOptionValues();
Expand Down