diff options
Diffstat (limited to 'args.hxx')
| -rw-r--r-- | args.hxx | 29 |
1 files changed, 19 insertions, 10 deletions
@@ -1633,11 +1633,11 @@ namespace args public: Subparser(std::vector<std::string> args_, ArgumentParser &parser_, const Command &command_, const HelpParams &helpParams_) - : args(std::move(args_)), parser(&parser_), helpParams(helpParams_), command(command_) + : Group({}, Validators::AllChildGroups), args(std::move(args_)), parser(&parser_), helpParams(helpParams_), command(command_) { } - Subparser(const Command &command_, const HelpParams &helpParams_) : helpParams(helpParams_), command(command_) + Subparser(const Command &command_, const HelpParams &helpParams_) : Group({}, Validators::AllChildGroups), helpParams(helpParams_), command(command_) { } @@ -2128,18 +2128,23 @@ namespace args return; } - for (Base *child: Children()) + auto onValidationError = [&] { - if (child->IsGroup() && !child->Matched()) - { - std::ostringstream problem; - problem << "Group validation failed somewhere!"; + std::ostringstream problem; + problem << "Group validation failed somewhere!"; #ifdef ARGS_NOEXCEPT - error = Error::Validation; - errorMsg = problem.str(); + error = Error::Validation; + errorMsg = problem.str(); #else - throw ValidationError(problem.str()); + throw ValidationError(problem.str()); #endif + }; + + for (Base *child: Children()) + { + if (child->IsGroup() && !child->Matched()) + { + onValidationError(); } child->Validate(shortprefix, longprefix); @@ -2148,6 +2153,10 @@ namespace args if (subparser != nullptr) { subparser->Validate(shortprefix, longprefix); + if (!subparser->Matched()) + { + onValidationError(); + } } if (selectedCommand == nullptr && commandIsRequired && (Group::HasCommand() || subparserHasCommand)) |