mirrors/CLI11
1
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-05-07 23:33:52 +00:00
Code Issues Releases Wiki Activity

Refactored _parse, only called once now and has ini test

Browse Source
This commit is contained in:
Henry Fredrick Schreiner 2017-02-13 09:53:49 -05:00
parent 1d39e9f092
commit 3a9faa51f7
3 changed files with 70 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
* Updates to help print
* Removed `run`, please use `parse` unless you subclass and add it
* Supports ini files mixed with command line
## Version 0.3

50
include/CLI/App.hpp
View File

@ -337,7 +337,7 @@ public:
/// The real work is done here. Expects a reversed vector
void parse(std::vector<std::string> &args) {
return _parse(args, true);
return _parse(args);
}
@ -478,7 +478,7 @@ protected:
/// Internal parse function
void _parse(std::vector<std::string> &args, bool first_parse) {
void _parse(std::vector<std::string> &args) {
parsed = true;
bool positional_only = false;
@ -512,42 +512,49 @@ protected:
}
// Collect positionals
for(const Option_p& opt : options) {
while (opt->get_positional() && opt->count() < opt->get_expected() && positionals.size() > 0) {
opt->get_new();
opt->add_result(0, positionals.front());
positionals.pop_front();
}
}
if (first_parse && opt->count() == 0 && opt->_envname != "") {
// Will not interact very well with ini files
// Process an INI file
if (ini_setting != nullptr && ini_file != "") {
try {
std::vector<std::string> values = detail::parse_ini(ini_file);
while(values.size() > 0) {
_parse_long(values, false);
}
} catch (const FileError &e) {
if(ini_required)
throw;
}
}
// Get envname options if not yet passed
for(const Option_p& opt : options) {
if (opt->count() == 0 && opt->_envname != "") {
char *ename = std::getenv(opt->_envname.c_str());
if(ename != nullptr) {
opt->get_new();
opt->add_result(0, std::string(ename));
}
}
}
// Process callbacks
for(const Option_p& opt : options) {
if (opt->count() > 0) {
if(!opt->run_callback())
throw ConversionError(opt->get_name() + "=" + detail::join(opt->flatten_results()));
}
}
// Process an INI file
if (first_parse && ini_setting != nullptr && ini_file != "") {
try {
std::vector<std::string> values = detail::parse_ini(ini_file);
std::reverse(std::begin(values), std::end(values));
values.insert(std::begin(values), std::begin(positionals), std::end(positionals));
return _parse(values, false);
} catch (const FileError &e) {
if(ini_required)
throw;
}
}
// Verify required options
for(const Option_p& opt : options) {
// Required
@ -636,7 +643,7 @@ protected:
}
/// Parse a long argument, must be at the top of the list
void _parse_long(std::vector<std::string> &args) {
void _parse_long(std::vector<std::string> &args, bool overwrite=true) {
std::string current = args.back();
std::string name;
@ -655,6 +662,11 @@ protected:
// Get a reference to the pointer to make syntax bearable
Option_p& op = *op_ptr;
// Stop if not overwriting options (for ini parse)
if(!overwrite && op->count() > 0)
return;
int vnum = op->get_new();
int num = op->get_expected();

38
tests/IniTest.cpp
View File

@ -56,3 +56,41 @@ TEST(StringBased, SpacesSections) {
EXPECT_EQ(answer, output);
}
TEST_F(TApp, IniNotRequired) {
TempFile tmpini{"TestIniTmp.ini"};
app.add_config("--config", tmpini);
{
std::ofstream out = tmpini.ofstream();
out << "[default]" << std::endl;
out << "two=99" << std::endl;
out << "three=3" << std::endl;
}
int one=0, two=0, three=0;
app.add_option("--one", one);
app.add_option("--two", two);
app.add_option("--three", three);
args = {"--one=1"};
run();
EXPECT_EQ(1, one);
EXPECT_EQ(99, two);
EXPECT_EQ(3, three);
app.reset();
one=two=three=0;
args = {"--one=1", "--two=2"};
run();
EXPECT_EQ(1, one);
EXPECT_EQ(2, two);
EXPECT_EQ(3, three);
}