Skip to content

Rework consuming arguments #86

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 4 commits into from
Mar 13, 2025
Merged

Rework consuming arguments #86

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03861ab
Refactor: extract code to function
kkarbowiak Mar 13, 2025
c4988ed
Refactor: rename function
kkarbowiak Mar 13, 2025
d0c3624
Separate processings args and marking as consumed
kkarbowiak Mar 13, 2025
a0082ae
Separate processings args and marking as consumed
kkarbowiak Mar 13, 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
43 changes: 29 additions & 14 deletions include/argparse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,23 +802,33 @@ namespace argparse
}

auto consume_arg(Token & arg) const -> std::any
{
arg.m_consumed = true;
return process_arg(arg.m_token);
}

auto process_arg(std::string const & arg) const -> std::any
{
std::any value;
if (!m_options.type_handler->from_string(arg.m_token, value))
if (!m_options.type_handler->from_string(arg, value))
{
throw parsing_error(std::format("argument {}: invalid value: '{}'", get_dest_name(), arg.m_token));
throw parsing_error(std::format("argument {}: invalid value: '{}'", get_dest_name(), arg));
}
check_choices(value);
arg.m_consumed = true;
return value;
}

auto consume_args(std::ranges::view auto args) const -> std::vector<std::any>
{
auto transformation = args
| std::views::transform([&](auto & arg) { return consume_arg(arg); })
| std::views::common;
return std::vector(transformation.begin(), transformation.end());
auto result = std::vector<std::any>();
auto consumed = std::vector<Token *>();
for (auto & arg : args)
{
result.push_back(process_arg(arg.m_token));
consumed.push_back(&arg);
}
std::ranges::for_each(consumed, [](auto arg) { arg->m_consumed = true; });
return result;
}

private:
Expand Down Expand Up @@ -878,7 +888,7 @@ namespace argparse
}
else
{
m_value = consume_arg(value);
m_value = process_arg(value);
}
}
break;
Expand Down Expand Up @@ -1104,10 +1114,10 @@ namespace argparse
auto consume_arg(Token & arg) const -> std::any
{
arg.m_consumed = true;
return consume_arg(arg.m_token);
return process_arg(arg.m_token);
}

auto consume_arg(std::string const & arg) const -> std::any
auto process_arg(std::string const & arg) const -> std::any
{
std::any value;
if (!m_options.type_handler->from_string(arg, value))
Expand All @@ -1120,10 +1130,15 @@ namespace argparse

auto consume_args(std::ranges::view auto args) const -> std::vector<std::any>
{
auto transformation = args
| std::views::transform([&](auto & arg) { return consume_arg(arg); })
| std::views::common;
return std::vector(transformation.begin(), transformation.end());
auto result = std::vector<std::any>();
auto consumed = std::vector<Token *>();
for (auto & arg : args)
{
result.push_back(process_arg(arg.m_token));
consumed.push_back(&arg);
}
std::ranges::for_each(consumed, [](auto arg) { arg->m_consumed = true; });
return result;
}

auto get_name_for_dest() const -> std::string
Expand Down