diff options
| -rw-r--r-- | args.hxx | 9 | ||||
| -rw-r--r-- | test.cxx | 7 |
2 files changed, 14 insertions, 2 deletions
@@ -3265,9 +3265,14 @@ namespace args operator ()(const std::string &name, const std::string &value, T &destination) { std::istringstream ss(value); - ss >> destination >> std::ws; + bool failed = !(ss >> destination); - if (ss.rdbuf()->in_avail() > 0) + if (!failed) + { + ss >> std::ws; + } + + if (ss.rdbuf()->in_avail() > 0 || failed) { #ifdef ARGS_NOEXCEPT (void)name; @@ -1192,6 +1192,8 @@ TEST_CASE("ValueParser works as expected", "[args]") args::ValueFlag<std::string> f(p, "name", "description", {'f'}); args::ValueFlag<StringAssignable> b(p, "name", "description", {'b'}); args::ValueFlag<int> i(p, "name", "description", {'i'}); + args::ValueFlag<int> d(p, "name", "description", {'d'}); + args::PositionalList<double> ds(p, "name", "description"); REQUIRE_NOTHROW(p.ParseArgs(std::vector<std::string>{"-f", "a b"})); REQUIRE(args::get(f) == "a b"); @@ -1204,6 +1206,11 @@ TEST_CASE("ValueParser works as expected", "[args]") REQUIRE_NOTHROW(p.ParseArgs(std::vector<std::string>{"-i", " 12"})); REQUIRE(args::get(i) == 12); + + REQUIRE_THROWS_AS(p.ParseArgs(std::vector<std::string>{"-i", "a"}), args::ParseError); + REQUIRE_THROWS_AS(p.ParseArgs(std::vector<std::string>{"-d", "b"}), args::ParseError); + REQUIRE_THROWS_AS(p.ParseArgs(std::vector<std::string>{"c"}), args::ParseError); + REQUIRE_THROWS_AS(p.ParseArgs(std::vector<std::string>{"s"}), args::ParseError); } TEST_CASE("ActionFlag works as expected", "[args]") |