ado/ssp
1
1
Fork 0
mirror of https://github.com/red0124/ssp.git synced 2025-12-14 21:59:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

add meson support, update pipeline

Browse Source
This commit is contained in:
ado
2021-01-19 20:26:36 +01:00
parent 4de7063708
commit 92e8e200f9
11 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/ss/converter.hpp
View File

@@ -9,9 +9,9 @@
#include <vector>
namespace ss {
INIT_HAS_METHOD(tied);
INIT_HAS_METHOD(ss_valid);
INIT_HAS_METHOD(error);
INIT_HAS_METHOD(tied)
INIT_HAS_METHOD(ss_valid)
INIT_HAS_METHOD(error)
////////////////
// replace validator
@@ -147,7 +147,7 @@ public:
no_void_validator_tup_t<T, Ts...> convert(const split_input& elems) {
if constexpr (sizeof...(Ts) == 0 &&
is_instance_of<T, std::tuple>::value) {
return convert_impl(elems, (T*){});
return convert_impl(elems, static_cast<T*>(nullptr));
} else if constexpr (tied_class_v<T, Ts...>) {
using arg_ref_tuple =
@@ -156,7 +156,8 @@ public:
using arg_tuple =
typename apply_trait<std::decay, arg_ref_tuple>::type;
return to_object<T>(convert_impl(elems, (arg_tuple*){}));
return to_object<T>(
convert_impl(elems, static_cast<arg_tuple*>(nullptr)));
} else {
return convert_impl<T, Ts...>(elems);
}
@@ -167,13 +168,9 @@ public:
: bool_error_ == false;
}
const std::string& error_msg() const {
return string_error_;
}
const std::string& error_msg() const { return string_error_; }
void set_error_mode(error_mode mode) {
error_mode_ = mode;
}
void set_error_mode(error_mode mode) { error_mode_ = mode; }
// 'splits' string by given delimiter, returns vector of pairs which
// contain the beginings and the ends of each column of the string
@@ -286,9 +283,7 @@ private:
return input_;
}
bool no_match(const char* end, char delim) const {
return *end != delim;
}
bool no_match(const char* end, char delim) const { return *end != delim; }
bool no_match(const char* end, const std::string& delim) const {
return strncmp(end, delim.c_str(), delim.size()) != 0;
@@ -361,7 +356,7 @@ private:
no_void_validator_tup_t<Ts...> ret;
extract_multiple<0, 0, Ts...>(ret, elems);
return ret;
};
}
////////////////
// members

4
include/ss/parser.hpp
View File

@@ -181,7 +181,7 @@ public:
using Ret = no_void_validator_tup_t<Ts...>;
return try_invoke_and_make_composite<
std::optional<Ret>>(get_next<Ts...>(), std::forward<Fun>(fun));
};
}
// identical to try_next but returns composite with object instead of a
// tuple
@@ -189,7 +189,7 @@ public:
composite<std::optional<T>> try_object(Fun&& fun = none{}) {
return try_invoke_and_make_composite<
std::optional<T>>(get_object<T, Ts...>(), std::forward<Fun>(fun));
};
}
private:
template <typename...>