External/cxxopts
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #245: Mention the option name when throwing on "no value" (#246)

Browse Source 
* Fixes #245:

* Added a new exception type: `option_has_no_value_exception`; throwing it when an option has no value we can cast with `as()`, instead of an `std::domain_error`.
* The `OptionValue` type now holds a pointer to the long option name (in its corresponding key within ParseResults's `m_results` field.
This commit is contained in:
Eyal Rozenberg 2020-07-23 10:27:04 +03:00 committed by GitHub
parent 1b660d5680
commit 5f43f4cbfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/cxxopts.hpp
View File

@ -443,6 +443,18 @@ namespace cxxopts
}
};
class option_has_no_value_exception : public OptionException
{
public:
explicit option_has_no_value_exception(const std::string& option)
: OptionException(
option.empty() ?
("Option " + LQUOTE + option + RQUOTE + " has no value") :
"Option has no value")
{
}
};
class argument_incorrect_type : public OptionParseException
{
public:
@ -1077,6 +1089,7 @@ namespace cxxopts
ensure_value(details);
++m_count;
m_value->parse(text);
m_long_name = &details->long_name();
}
void
@ -1084,6 +1097,7 @@ namespace cxxopts
{
ensure_value(details);
m_default = true;
m_long_name = &details->long_name();
m_value->parse();
}
@ -1105,7 +1119,8 @@ namespace cxxopts
as() const
{
if (m_value == nullptr) {
throw_or_mimic<std::domain_error>("No value");
throw_or_mimic<option_has_no_value_exception>(
m_long_name == nullptr ? "" : *m_long_name);
}
#ifdef CXXOPTS_NO_RTTI
@ -1125,6 +1140,9 @@ namespace cxxopts
}
}
const std::string* m_long_name = nullptr;
// Holding this pointer is safe, since OptionValue's only exist in key-value pairs,
// where the key has the string we point to.
std::shared_ptr<Value> m_value;
size_t m_count = 0;
bool m_default = false;

2
test/options.cpp
View File

@ -94,7 +94,7 @@ TEST_CASE("Basic options", "[options]")
CHECK(arguments[2].key() == "value");
CHECK(arguments[3].key() == "av");
CHECK_THROWS_AS(result["nothing"].as<std::string>(), std::domain_error&);
CHECK_THROWS_AS(result["nothing"].as<std::string>(), cxxopts::option_has_no_value_exception&);
}
TEST_CASE("Short options", "[options]")