mirrors/CLI11
1
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-04-30 04:33:53 +00:00
Code Issues Releases Wiki Activity

Prefix program support

Browse Source
This commit is contained in:
Henry Fredrick Schreiner 2017-06-02 12:34:25 -04:00
parent 05867bebe5
commit 635eb65ace
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/CLI/App.hpp
View File

@ -57,6 +57,9 @@ class App {
/// If true, allow extra arguments (ie, don't throw an error). /// If true, allow extra arguments (ie, don't throw an error).
bool allow_extras_{false}; bool allow_extras_{false};
/// If true, return immediatly on an unrecognised option (implies allow_extras)
bool prefix_command_{false};
/// This is a function that runs when complete. Great for subcommands. Can throw. /// This is a function that runs when complete. Great for subcommands. Can throw.
std::function<void()> callback_; std::function<void()> callback_;
@ -149,6 +152,12 @@ class App {
return this; return this;
} }
/// Do not parse anything after the first unrecongnised option and return
App *prefix_command(bool allow = true) {
prefix_command_ = allow;
return this;
}
/// Ignore case. Subcommand inherit value. /// Ignore case. Subcommand inherit value.
App *ignore_case(bool value = true) { App *ignore_case(bool value = true) {
ignore_case_ = value; ignore_case_ = value;
@ -849,7 +858,7 @@ class App {
return val.first != detail::Classifer::POSITIONAL_MARK; return val.first != detail::Classifer::POSITIONAL_MARK;
}); });
if(num_left_over > 0 && !allow_extras_) if(num_left_over > 0 && !(allow_extras_ || prefix_command_))
throw ExtrasError("[" + detail::rjoin(args, " ") + "]"); throw ExtrasError("[" + detail::rjoin(args, " ") + "]");
} }
} }
@ -959,8 +968,16 @@ class App {
else { else {
args.pop_back(); args.pop_back();
missing()->emplace_back(detail::Classifer::NONE, positional); missing()->emplace_back(detail::Classifer::NONE, positional);
if(prefix_command_) {
for(std::string positional : args) {
missing()->emplace_back(detail::Classifer::NONE, args.back());
args.pop_back();
} }
} }
}
}
/// Parse a subcommand, modify args and continue /// Parse a subcommand, modify args and continue
/// ///

13
tests/SubcommandTest.cpp
View File

@ -231,6 +231,19 @@ TEST_F(TApp, BadSubcomSearch) {
EXPECT_THROW(app.get_subcommand(two), CLI::OptionNotFound); EXPECT_THROW(app.get_subcommand(two), CLI::OptionNotFound);
} }
TEST_F(TApp, PrefixProgram) {
app.prefix_command();
app.add_flag("--simple");
args = {"--simple", "other", "--simple", "--mine"};
auto ret_args = run();
EXPECT_EQ(ret_args, std::vector<std::string>({"--mine", "--simple", "other"}));
}
struct SubcommandProgram : public TApp { struct SubcommandProgram : public TApp {
CLI::App *start; CLI::App *start;