mirror of
https://github.com/KeqingMoe/argparse.git
synced 2025-07-04 07:04:39 +00:00
Merge pull request #54 from lichray/less-sfinae
Finishing cleanup by refactoring SFINAE into constexpr-if
This commit is contained in:
commit
6ee8de5f4e
@ -70,10 +70,9 @@ template <typename T>
|
||||
static constexpr bool is_container_v = is_container<T>::value;
|
||||
|
||||
template <typename T>
|
||||
using enable_if_container = std::enable_if_t<is_container_v<T>, T>;
|
||||
|
||||
template <typename T>
|
||||
using enable_if_not_container = std::enable_if_t<!is_container_v<T>, T>;
|
||||
struct is_string_like
|
||||
: std::conjunction<std::is_constructible<std::string, T>,
|
||||
std::is_convertible<T, std::string_view>> {};
|
||||
|
||||
template <class F, class Tuple, class Extra, size_t... I>
|
||||
constexpr decltype(auto) apply_plus_one_impl(F &&f, Tuple &&t, Extra &&x,
|
||||
@ -115,8 +114,7 @@ public:
|
||||
|
||||
template <typename... Args,
|
||||
std::enable_if_t<
|
||||
std::conjunction_v<std::is_constructible<std::string, Args>...>,
|
||||
int> = 0>
|
||||
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)>{}) {}
|
||||
@ -262,22 +260,13 @@ public:
|
||||
}
|
||||
|
||||
/*
|
||||
* Entry point for template non-container types
|
||||
* Compare to an argument value of known type
|
||||
* @throws std::logic_error in case of incompatible types
|
||||
*/
|
||||
template <typename T>
|
||||
std::enable_if_t<!details::is_container_v<T>, bool>
|
||||
operator==(const T &aRhs) const {
|
||||
template <typename T> bool operator==(const T &aRhs) const {
|
||||
if constexpr (!details::is_container_v<T>) {
|
||||
return get<T>() == aRhs;
|
||||
}
|
||||
|
||||
/*
|
||||
* Template specialization for containers
|
||||
* @throws std::logic_error in case of incompatible types
|
||||
*/
|
||||
template <typename T>
|
||||
std::enable_if_t<details::is_container_v<T>, bool>
|
||||
operator==(const T &aRhs) const {
|
||||
} else {
|
||||
using ValueType = typename T::value_type;
|
||||
auto tLhs = get<T>();
|
||||
return std::equal(std::begin(tLhs), std::end(tLhs), std::begin(aRhs),
|
||||
@ -285,6 +274,7 @@ public:
|
||||
return std::any_cast<const ValueType &>(lhs) == rhs;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
static bool is_integer(const std::string &aValue) {
|
||||
@ -317,11 +307,14 @@ private:
|
||||
}
|
||||
|
||||
/*
|
||||
* Getter for template non-container types
|
||||
* Get argument value given a type
|
||||
* @throws std::logic_error in case of incompatible types
|
||||
*/
|
||||
template <typename T> details::enable_if_not_container<T> get() const {
|
||||
template <typename T> T get() const {
|
||||
if (!mValues.empty()) {
|
||||
if constexpr (details::is_container_v<T>)
|
||||
return any_cast_container<T>(mValues);
|
||||
else
|
||||
return std::any_cast<T>(mValues.front());
|
||||
}
|
||||
if (mDefaultValue.has_value()) {
|
||||
@ -330,31 +323,16 @@ private:
|
||||
throw std::logic_error("No value provided");
|
||||
}
|
||||
|
||||
/*
|
||||
* Getter for container types
|
||||
* @throws std::logic_error in case of incompatible types
|
||||
*/
|
||||
template <typename CONTAINER>
|
||||
details::enable_if_container<CONTAINER> get() const {
|
||||
using ValueType = typename CONTAINER::value_type;
|
||||
CONTAINER tResult;
|
||||
if (!mValues.empty()) {
|
||||
template <typename T>
|
||||
static auto any_cast_container(const std::vector<std::any> &aOperand) -> T {
|
||||
using ValueType = typename T::value_type;
|
||||
|
||||
T tResult;
|
||||
std::transform(
|
||||
std::begin(mValues), std::end(mValues), std::back_inserter(tResult),
|
||||
begin(aOperand), end(aOperand), std::back_inserter(tResult),
|
||||
[](const auto &value) { return std::any_cast<ValueType>(value); });
|
||||
return tResult;
|
||||
}
|
||||
if (mDefaultValue.has_value()) {
|
||||
const auto &tDefaultValues =
|
||||
std::any_cast<const CONTAINER &>(mDefaultValue);
|
||||
std::transform(std::begin(tDefaultValues), std::end(tDefaultValues),
|
||||
std::back_inserter(tResult), [](const auto &value) {
|
||||
return std::any_cast<ValueType>(value);
|
||||
});
|
||||
return tResult;
|
||||
}
|
||||
throw std::logic_error("No value provided");
|
||||
}
|
||||
|
||||
std::vector<std::string> mNames;
|
||||
std::string mUsedName;
|
||||
@ -561,11 +539,11 @@ private:
|
||||
tCompoundArgument[1] != '-') {
|
||||
++it;
|
||||
for (size_t j = 1; j < tCompoundArgument.size(); j++) {
|
||||
auto tCurrentArgument = std::string{'-', tCompoundArgument[j]};
|
||||
if (auto tIterator = mArgumentMap.find(tCurrentArgument);
|
||||
tIterator != mArgumentMap.end()) {
|
||||
auto tArgument = tIterator->second;
|
||||
it = tArgument->consume(it, end, tCurrentArgument);
|
||||
auto tHypotheticalArgument = std::string{'-', tCompoundArgument[j]};
|
||||
auto tIterator2 = mArgumentMap.find(tHypotheticalArgument);
|
||||
if (tIterator2 != mArgumentMap.end()) {
|
||||
auto tArgument = tIterator2->second;
|
||||
it = tArgument->consume(it, end, tHypotheticalArgument);
|
||||
} else {
|
||||
throw std::runtime_error("Unknown argument");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user