mirrors/CLI11
1
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-04-29 12:13:52 +00:00
Code Issues Releases Wiki Activity

Fix Issue #1090, (#1108)

Browse Source 
max, min on positional was not respected, specifically max positionals
only filled up to min, and skipped over optional options.

Fixes #1090

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Philip Top 2024-12-30 12:34:47 -08:00 committed by GitHub
parent ecdcf633a5
commit d2b331f02a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/CLI/impl/App_inl.hpp
View File

@ -1731,7 +1731,7 @@ CLI11_INLINE bool App::_parse_positional(std::vector<std::string> &args, bool ha
for(const Option_p &opt : options_) {
// Eat options, one by one, until done
if(opt->get_positional() &&
(static_cast<int>(opt->count()) < opt->get_items_expected_min() || opt->get_allow_extra_args())) {
(static_cast<int>(opt->count()) < opt->get_items_expected_max() || opt->get_allow_extra_args())) {
if(validate_positionals_) {
std::string pos = positional;
pos = opt->_validate(pos, 0);

50
tests/AppTest.cpp
View File

@ -1236,6 +1236,56 @@ TEST_CASE_METHOD(TApp, "RequiredOptsDoubleNeg", "[app]") {
CHECK(std::vector<std::string>({"one", "two"}) == strs);
}
TEST_CASE_METHOD(TApp, "ExpectedRangeParam", "[app]") {
app.add_option("-s")->required()->expected(2, 4);
args = {"-s", "one"};
CHECK_THROWS_AS(run(), CLI::ArgumentMismatch);
args = {"-s", "one", "two"};
CHECK_NOTHROW(run());
args = {"-s", "one", "two", "three"};
CHECK_NOTHROW(run());
args = {"-s", "one", "two", "three", "four"};
CHECK_NOTHROW(run());
args = {"-s", "one", "two", "three", "four", "five"};
CHECK_THROWS_AS(run(), CLI::ExtrasError);
}
TEST_CASE_METHOD(TApp, "ExpectedRangePositional", "[app]") {
app.add_option("arg")->required()->expected(2, 4);
args = {"one"};
CHECK_THROWS_AS(run(), CLI::ArgumentMismatch);
args = {"one", "two"};
CHECK_NOTHROW(run());
args = {"one", "two", "three"};
CHECK_NOTHROW(run());
args = {"one", "two", "three", "four"};
CHECK_NOTHROW(run());
args = {"one", "two", "three", "four", "five"};
CHECK_THROWS_AS(run(), CLI::ExtrasError);
}
// This makes sure unlimited option priority is
// correct for space vs. no space #90
TEST_CASE_METHOD(TApp, "PositionalNoSpace", "[app]") {