diff --git a/include/argparse.hpp b/include/argparse.hpp index eba3f6d..2c2124d 100644 --- a/include/argparse.hpp +++ b/include/argparse.hpp @@ -1030,7 +1030,18 @@ namespace argparse past_pseudo_arg = true; return false; } - return !token.m_token.starts_with("-"); + if (!token.m_token.starts_with("-")) + { + return true; + } + auto iss = std::istringstream(token.m_token); + auto num = double(); + iss >> num; + if (!iss.fail() && (iss.eof() || iss.peek() == std::istringstream::traits_type::eof())) + { + return true; + } + return false; }); } diff --git a/test/unittest/test_parsing_positional.cpp b/test/unittest/test_parsing_positional.cpp index bc43819..891aed5 100644 --- a/test/unittest/test_parsing_positional.cpp +++ b/test/unittest/test_parsing_positional.cpp @@ -1915,42 +1915,78 @@ TEST_CASE("Parsing missing positional argument with nargs set throws an exceptio CHECK_THROWS_WITH_AS(parser.parse_args(1, cstr_arr{"prog"}), "the following arguments are required: p1 p2 p3", argparse::parsing_error); } -TEST_CASE("Parsing a positional argument yields correct value for positive number") +TEST_CASE_TEMPLATE("Parsing a positional argument yields correct value for positive number", T, short int, unsigned short int, int, unsigned int, long int, unsigned long int, long long int, unsigned long long int, float, double, long double) { auto parser = argparse::ArgumentParser(); - parser.add_argument("num").type(); + parser.add_argument("num").type(); - auto const args = parser.parse_args(2, cstr_arr{"prog", "65"}); + if constexpr (std::is_integral_v) + { + auto const args = parser.parse_args(2, cstr_arr{"prog", "65"}); + + CHECK(args.get_value("num") == T(65)); + } + else + { + auto const args = parser.parse_args(2, cstr_arr{"prog", "1.125"}); - CHECK(args.get_value("num") == 65); + CHECK(args.get_value("num") == T(1.125)); + } } -TEST_CASE("Parsing a positional argument yields correct value for positive number") +TEST_CASE_TEMPLATE("Parsing a positional argument yields correct value for positive number", T, short int, unsigned short int, int, unsigned int, long int, unsigned long int, long long int, unsigned long long int, float, double, long double) { auto parser = argparse::ArgumentParser(); - parser.add_argument("num").type(); + parser.add_argument("num").type(); + + if constexpr (std::is_integral_v) + { + auto const args = parser.parse_args(3, cstr_arr{"prog", "--", "65"}); - auto const args = parser.parse_args(3, cstr_arr{"prog", "--", "65"}); + CHECK(args.get_value("num") == T(65)); + } + else + { + auto const args = parser.parse_args(3, cstr_arr{"prog", "--", "1.125"}); - CHECK(args.get_value("num") == 65); + CHECK(args.get_value("num") == T(1.125)); + } } -TEST_CASE("Parsing a positional argument yields correct value for negative number" * doctest::skip()) +TEST_CASE_TEMPLATE("Parsing a positional argument yields correct value for negative number", T, short int, int, long int, long long int, float, double, long double) { auto parser = argparse::ArgumentParser(); - parser.add_argument("num").type(); + parser.add_argument("num").type(); - auto const args = parser.parse_args(2, cstr_arr{"prog", "-65"}); + if constexpr (std::is_integral_v) + { + auto const args = parser.parse_args(2, cstr_arr{"prog", "-65"}); - CHECK(args.get_value("num") == -65); + CHECK(args.get_value("num") == T(-65)); + } + else + { + auto const args = parser.parse_args(2, cstr_arr{"prog", "-1.125"}); + + CHECK(args.get_value("num") == T(-1.125)); + } } -TEST_CASE("Parsing a positional argument yields correct value for negative number") +TEST_CASE_TEMPLATE("Parsing a positional argument yields correct value for negative number", T, short int, int, long int, long long int, float, double, long double) { auto parser = argparse::ArgumentParser(); - parser.add_argument("num").type(); + parser.add_argument("num").type(); - auto const args = parser.parse_args(3, cstr_arr{"prog", "--", "-65"}); + if constexpr (std::is_integral_v) + { + auto const args = parser.parse_args(3, cstr_arr{"prog", "--", "-65"}); + + CHECK(args.get_value("num") == T(-65)); + } + else + { + auto const args = parser.parse_args(3, cstr_arr{"prog", "--", "-1.125"}); - CHECK(args.get_value("num") == -65); + CHECK(args.get_value("num") == T(-1.125)); + } }