KeqingMoe/argparse
1
0
Fork 0
mirror of https://github.com/KeqingMoe/argparse.git synced 2025-07-04 15:14:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify Argument exposition-only constructors

Browse Source 
Although they are public, they are not meant for end-users
to use, so we can change its interface to use less sfinae.
This commit is contained in:
Zhihao Yuan 2020-01-01 16:09:27 -06:00
parent e06890af97
commit 03a0ce831d
No known key found for this signature in database
GPG Key ID: A2E474BDAA37E11C
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/argparse.hpp
View File

@ -73,11 +73,6 @@ struct is_container<
template <typename T> template <typename T>
static constexpr bool is_container_v = is_container<T>::value; static constexpr bool is_container_v = is_container<T>::value;
template <typename T>
struct is_string_like
: std::conjunction<std::is_constructible<std::string, T>,
std::is_convertible<T, std::string_view>> {};
template <typename T> constexpr bool standard_signed_integer = false; template <typename T> constexpr bool standard_signed_integer = false;
template <> constexpr bool standard_signed_integer<signed char> = true; template <> constexpr bool standard_signed_integer<signed char> = true;
template <> constexpr bool standard_signed_integer<short int> = true; template <> constexpr bool standard_signed_integer<short int> = true;
@ -271,10 +266,10 @@ class Argument {
-> std::ostream &; -> std::ostream &;
template <size_t N, size_t... I> template <size_t N, size_t... I>
explicit Argument(std::string(&&a)[N], std::index_sequence<I...>) explicit Argument(std::string_view(&&a)[N], std::index_sequence<I...>)
: mIsOptional((is_optional(a[I]) || ...)), mIsRequired(false), : mIsOptional((is_optional(a[I]) || ...)), mIsRequired(false),
mIsUsed(false) { mIsUsed(false) {
((void)mNames.push_back(std::move(a[I])), ...); ((void)mNames.emplace_back(a[I]), ...);
std::sort( std::sort(
mNames.begin(), mNames.end(), [](const auto &lhs, const auto &rhs) { mNames.begin(), mNames.end(), [](const auto &lhs, const auto &rhs) {
return lhs.size() == rhs.size() ? lhs < rhs : lhs.size() < rhs.size(); return lhs.size() == rhs.size() ? lhs < rhs : lhs.size() < rhs.size();
@ -282,14 +277,9 @@ class Argument {
} }
public: public:
Argument() = default; template <size_t N>
explicit Argument(std::string_view(&&a)[N])
template <typename... Args, : Argument(std::move(a), std::make_index_sequence<N>{}) {}
std::enable_if_t<
std::conjunction_v<details::is_string_like<Args>...>, int> = 0>
explicit Argument(Args &&... args)
: Argument({std::string(std::forward<Args>(args))...},
std::make_index_sequence<sizeof...(Args)>{}) {}
Argument &help(std::string aHelp) { Argument &help(std::string aHelp) {
mHelp = std::move(aHelp); mHelp = std::move(aHelp);
@ -780,8 +770,9 @@ public:
// Parameter packing // Parameter packing
// Call add_argument with variadic number of string arguments // Call add_argument with variadic number of string arguments
template <typename... Targs> Argument &add_argument(Targs... Fargs) { template <typename... Targs> Argument &add_argument(Targs... Fargs) {
using array_of_sv = std::string_view[sizeof...(Targs)];
auto tArgument = mOptionalArguments.emplace(cend(mOptionalArguments), auto tArgument = mOptionalArguments.emplace(cend(mOptionalArguments),
std::move(Fargs)...); array_of_sv{Fargs...});
if (!tArgument->mIsOptional) if (!tArgument->mIsOptional)
mPositionalArguments.splice(cend(mPositionalArguments), mPositionalArguments.splice(cend(mPositionalArguments),