Skip to content

Clean up code #150

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
Sep 21, 2025
Merged

Clean up code #150

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3163e6d
Cleanup: mark class as final
kkarbowiak Sep 21, 2025
c1c6b55
Cleanup: rename local variable
kkarbowiak Sep 21, 2025
982f10c
Cleanup: rename local variable
kkarbowiak Sep 21, 2025
95c1d52
Cleanup: rename function parameter
kkarbowiak Sep 21, 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
30 changes: 15 additions & 15 deletions include/argparse.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ namespace argparse
};

template<typename T>
class TypeHandlerT : public TypeHandler
class TypeHandlerT final : public TypeHandler
{
public:
auto from_string(std::string const & string) const -> std::any override
Expand Down Expand Up @@ -1520,15 +1520,15 @@ namespace argparse
for (auto const & argument : arguments
| std::views::filter(&Formattable::is_positional))
{
auto arg_line = " " + format_arg(argument);
auto help_line = " " + format_arg(argument);

if (auto const & help = argument.get_help(); !help.empty())
{
arg_line += help_string_separation(arg_line.size());
arg_line += replace_prog(help, prog);
help_line += help_string_separation(help_line.size());
help_line += replace_prog(help, prog);
}

help_text += '\n' + arg_line;
help_text += '\n' + help_line;
}

return help_text;
Expand All @@ -1541,27 +1541,27 @@ namespace argparse
for (auto const & argument : arguments
| std::views::filter([](auto const & a) { return !a.is_positional(); }))
{
auto arg_line = std::string(" ");
auto help_line = std::string(" ");
auto const formatted_arg = format(argument);

for (auto name_it = argument.get_names().begin(); name_it != argument.get_names().end(); ++name_it)
{
if (name_it != argument.get_names().begin())
{
arg_line += ", ";
help_line += ", ";
}

arg_line += *name_it;
arg_line += formatted_arg;
help_line += *name_it;
help_line += formatted_arg;
}

if (auto const & help = argument.get_help(); !help.empty())
{
arg_line += help_string_separation(arg_line.size());
arg_line += replace_prog(help, prog);
help_line += help_string_separation(help_line.size());
help_line += replace_prog(help, prog);
}

help_text += '\n' + arg_line;
help_text += '\n' + help_line;
}

return help_text;
Expand Down Expand Up @@ -1619,11 +1619,11 @@ namespace argparse
return result;
}

auto help_string_separation(std::size_t arg_line_length) const -> std::string_view
auto help_string_separation(std::size_t help_line_length) const -> std::string_view
{
constexpr auto fill = std::string_view("\n ");
return arg_line_length < 23
? fill.substr(arg_line_length + 1)
return help_line_length < 23
? fill.substr(help_line_length + 1)
: fill;
}
};
Expand Down
Loading