Skip to content

Refactor handling #56

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 2 commits into from
Feb 6, 2025
Merged

Refactor handling #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b69b1de
Change values of Handle fields
kkarbowiak Feb 6, 2025
53c9e01
Simplify Handle comparison
kkarbowiak Feb 6, 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
19 changes: 12 additions & 7 deletions include/argparse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ namespace argparse

enum class Handle
{
errors_and_help,
errors,
help,
none
none = 0,
errors = 1,
help = 2,
errors_and_help = errors | help
};

class parsing_error
Expand All @@ -63,6 +63,11 @@ namespace argparse
using runtime_error::runtime_error;
};

inline auto operator&(Handle lhs, Handle rhs) -> int
{
return static_cast<int>(lhs) & static_cast<int>(rhs);
}

inline auto from_string(std::string const & s, auto & t) -> bool
{
auto iss = std::istringstream(s);
Expand Down Expand Up @@ -170,7 +175,7 @@ namespace argparse
}
catch (HelpRequested const &)
{
if (m_handle == Handle::errors_and_help || m_handle == Handle::help)
if (m_handle & Handle::help)
{
std::cout << format_help() << std::endl;
std::exit(EXIT_SUCCESS);
Expand All @@ -180,7 +185,7 @@ namespace argparse
}
catch (VersionRequested const &)
{
if (m_handle == Handle::errors_and_help || m_handle == Handle::help)
if (m_handle & Handle::help)
{
std::cout << format_version() << std::endl;
std::exit(EXIT_SUCCESS);
Expand All @@ -190,7 +195,7 @@ namespace argparse
}
catch (parsing_error const & e)
{
if (m_handle == Handle::errors_and_help || m_handle == Handle::errors)
if (m_handle & Handle::errors)
{
std::cout << e.what() << '\n';
std::cout << format_help() << std::endl;
Expand Down