Skip to content

Enable parsing negative numbers as values for optional arguments #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kkarbowiak merged 11 commits into from
Oct 2, 2025
Merged

Enable parsing negative numbers as values for optional arguments #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5b106b0
Enable parsing negative numbers as values for optional arguments
kkarbowiak Oct 2, 2025
fc92734
Unskip unit test
kkarbowiak Oct 2, 2025
0b8666b
Unskip unit test
kkarbowiak Oct 2, 2025
e1ba487
Extend unit test
kkarbowiak Oct 2, 2025
868be96
Extend unit test
kkarbowiak Oct 2, 2025
6db863e
Extend unit test
kkarbowiak Oct 2, 2025
3598f45
Extend unit test
kkarbowiak Oct 2, 2025
58c6c1d
Extend unit test
kkarbowiak Oct 2, 2025
ef542a5
Extend unit test
kkarbowiak Oct 2, 2025
f7cbd8b
Extend unit test
kkarbowiak Oct 2, 2025
6275549
Extend unit test
kkarbowiak Oct 2, 2025
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
16 changes: 15 additions & 1 deletion include/argparse.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,7 +1406,21 @@ namespace argparse
auto get_consumable_args(auto it, std::ranges::view auto consumable) const
{
return std::ranges::subrange(std::ranges::next(it), consumable.end())
| std::views::take_while([](auto const & token) { return !token.m_token.starts_with("-"); });
| std::views::take_while([](auto const & token)
{
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;
});
}

private:
Expand Down
136 changes: 104 additions & 32 deletions test/unittest/test_parsing_optional.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2809,82 +2809,154 @@ TEST_CASE("Parsing joined flags does not affect long options")
CHECK(args.get_value<bool>("r") == true);
}

TEST_CASE("Parsing an optional argument yields correct value for positive number")
TEST_CASE_TEMPLATE("Parsing an optional 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("-n").type<int>();
parser.add_argument("-n").type<T>();

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

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

CHECK(args.get_value<T>("n") == T(1.125));
}
}

TEST_CASE("Parsing an optional argument yields correct value for positive number")
TEST_CASE_TEMPLATE("Parsing an optional 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("-n").type<int>();
parser.add_argument("-n").type<T>();

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

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

CHECK(args.get_value<T>("n") == T(1.125));
}
}

TEST_CASE("Parsing an optional argument yields correct value for positive number")
TEST_CASE_TEMPLATE("Parsing an optional 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("--number").type<int>();
parser.add_argument("--number").type<T>();

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

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

CHECK(args.get_value<T>("number") == T(1.125));
}
}

TEST_CASE("Parsing an optional argument yields correct value for positive number")
TEST_CASE_TEMPLATE("Parsing an optional 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("--number").type<int>();
parser.add_argument("--number").type<T>();

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

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

CHECK(args.get_value<T>("number") == T(1.125));
}
}

TEST_CASE("Parsing an optional argument yields correct value for negative number" * doctest::skip())
TEST_CASE_TEMPLATE("Parsing an optional 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("-n").type<int>();
parser.add_argument("-n").type<T>();

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

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

CHECK(args.get_value<T>("n") == T(-1.125));
}
}

TEST_CASE("Parsing an optional argument yields correct value for negative number")
TEST_CASE_TEMPLATE("Parsing an optional 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("-n").type<int>();
parser.add_argument("-n").type<T>();

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

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

CHECK(args.get_value<T>("n") == T(-1.125));
}
}

TEST_CASE("Parsing an optional argument yields correct value for negative number" * doctest::skip())
TEST_CASE_TEMPLATE("Parsing an optional 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("--number").type<int>();
parser.add_argument("--number").type<T>();

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

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

CHECK(args.get_value<T>("number") == T(-1.125));
}
}

TEST_CASE("Parsing an optional argument yields correct value for negative number")
TEST_CASE_TEMPLATE("Parsing an optional 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("--number").type<int>();
parser.add_argument("--number").type<T>();

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

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

CHECK(args.get_value<T>("number") == T(-1.125));
}
}