KeqingMoe/argparse
1
0
Fork 0
mirror of https://github.com/KeqingMoe/argparse.git synced 2025-07-04 15:14:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Return default_arguments from operator& of two default_arguments

Browse Source 
operator& should return combined values of the same type, not a new type
(i.e. bool).  This is much more verbose, but easier to reason about
without implied conversion.

Signed-off-by: Sean Robinson <sean.robinson@scottsdalecc.edu>
This commit is contained in:
Sean Robinson 2022-02-07 14:27:06 -07:00
parent 6a8b1318ec
commit 7cbc66f65b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/argparse/argparse.hpp
View File

@ -332,8 +332,11 @@ enum class default_arguments : unsigned int {
all = help | version, all = help | version,
}; };
inline bool operator& (const default_arguments &a, const default_arguments &b) { inline default_arguments operator& (const default_arguments &a,
return static_cast<unsigned int>(a) & static_cast<unsigned int>(b); const default_arguments &b) {
return static_cast<default_arguments>(
static_cast<std::underlying_type<default_arguments>::type>(a) &
static_cast<std::underlying_type<default_arguments>::type>(b));
} }
class ArgumentParser; class ArgumentParser;
@ -857,7 +860,7 @@ public:
std::string aVersion = "1.0", std::string aVersion = "1.0",
default_arguments aArgs = default_arguments::all) default_arguments aArgs = default_arguments::all)
: mProgramName(std::move(aProgramName)), mVersion(std::move(aVersion)) { : mProgramName(std::move(aProgramName)), mVersion(std::move(aVersion)) {
if (aArgs & default_arguments::help) { if ((aArgs & default_arguments::help) == default_arguments::help) {
add_argument("-h", "--help") add_argument("-h", "--help")
.action([&](const auto &) { .action([&](const auto &) {
std::cout << help().str(); std::cout << help().str();
@ -868,7 +871,7 @@ public:
.implicit_value(true) .implicit_value(true)
.nargs(0); .nargs(0);
} }
if (aArgs & default_arguments::version) { if ((aArgs & default_arguments::version) == default_arguments::version) {
add_argument("-v", "--version") add_argument("-v", "--version")
.action([&](const auto &) { .action([&](const auto &) {
std::cout << mVersion; std::cout << mVersion;