Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion include/argparse.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});
}

Expand Down
68 changes: 52 additions & 16 deletions test/unittest/test_parsing_positional.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<int>();
parser.add_argument("num").type<T>();

auto const args = parser.parse_args(2, cstr_arr{"prog", "65"});
if constexpr (std::is_integral_v<T>)
{
auto const args = parser.parse_args(2, cstr_arr{"prog", "65"});

CHECK(args.get_value<T>("num") == T(65));
}
else
{
auto const args = parser.parse_args(2, cstr_arr{"prog", "1.125"});

CHECK(args.get_value<int>("num") == 65);
CHECK(args.get_value<T>("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<int>();
parser.add_argument("num").type<T>();

if constexpr (std::is_integral_v<T>)
{
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<T>("num") == T(65));
}
else
{
auto const args = parser.parse_args(3, cstr_arr{"prog", "--", "1.125"});

CHECK(args.get_value<int>("num") == 65);
CHECK(args.get_value<T>("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<int>();
parser.add_argument("num").type<T>();

auto const args = parser.parse_args(2, cstr_arr{"prog", "-65"});
if constexpr (std::is_integral_v<T>)
{
auto const args = parser.parse_args(2, cstr_arr{"prog", "-65"});

CHECK(args.get_value<int>("num") == -65);
CHECK(args.get_value<T>("num") == T(-65));
}
else
{
auto const args = parser.parse_args(2, cstr_arr{"prog", "-1.125"});

CHECK(args.get_value<T>("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<int>();
parser.add_argument("num").type<T>();

auto const args = parser.parse_args(3, cstr_arr{"prog", "--", "-65"});
if constexpr (std::is_integral_v<T>)
{
auto const args = parser.parse_args(3, cstr_arr{"prog", "--", "-65"});

CHECK(args.get_value<T>("num") == T(-65));
}
else
{
auto const args = parser.parse_args(3, cstr_arr{"prog", "--", "-1.125"});

CHECK(args.get_value<int>("num") == -65);
CHECK(args.get_value<T>("num") == T(-1.125));
}
}