Skip to content
Open
Changes from 1 commit
Commits
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
20 changes: 16 additions & 4 deletions include/CLI/impl/App_inl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1317,10 +1317,22 @@ CLI11_INLINE void App::_process_requirements() {
missing_need = opt->get_name();
}
}
for(const auto &subc : need_subcommands_) { // Process subcommands given on the commandline first
Copy link
Collaborator

Choose a reason for hiding this comment

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

So you want to check the subcommands that are needed and were given and make sure all their requirements are met first. This is to get at the lower level errors with priority.

if (subc->count() > 0) {
subc->_process_requirements();
}
}
for(const auto &subc : need_subcommands_) {
if(subc->count_all() == 0) {
missing_needed = true;
missing_need = subc->get_display_name();
if (subc->count() == 0) {
try {
subc->_process_requirements();
} catch (const CLI::RequiresError&) {
throw RequiresError(get_display_name(), subc->name_);
Copy link
Collaborator

Choose a reason for hiding this comment

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

next you are going to check the subcommands that were not parsed and give priority to missing requirements in those needed subcommands, and make the error clearer.

}
if(subc->count_all() == 0) {
missing_needed = true;
missing_need = subc->get_display_name();
}
}
}
if(missing_needed) {
Expand Down Expand Up @@ -1402,7 +1414,7 @@ CLI11_INLINE void App::_process_requirements() {
}
}
}
if(sub->count() > 0 || sub->name_.empty()) {
if(sub->count() > 0 || sub->name_.empty() && need_subcommands_.find(sub.get()) == need_subcommands_.end()) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

this check is to process the requirements for the subcommands that were given but were not in the needed list

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think this does need another set of parenthesis around the original 2 conditions, otherwise the logic is odd. And I think that is why the test cases are failing.

sub->_process_requirements();
}

Expand Down
Loading