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

move values inside composite when possible, write unit tests for composite

Browse Source
This commit is contained in:
ado
2020-12-26 00:36:08 +01:00
parent 616316d2a7
commit 371da072be
3 changed files with 235 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/ss/parser.hpp
View File

@@ -86,8 +86,8 @@ class parser {
template <typename... Ts>
class composite {
public:
composite(std::tuple<Ts...> values, parser& parser)
: values_{values}, parser_{parser} {
composite(std::tuple<Ts...>&& values, parser& parser)
: values_{std::move(values)}, parser_{parser} {
}
// tries to convert the same line with a different output type
@@ -145,12 +145,13 @@ class parser {
auto tuple_output = try_same<Us...>();
if constexpr (!std::is_same_v<
U, decltype(tuple_output)>) {
new_value = to_object<U>(tuple_output);
new_value = to_object<U>(
std::move(tuple_output));
} else {
new_value = tuple_output;
new_value = std::move(tuple_output);
}
if (parser_.valid()) {
value = new_value;
value = std::move(new_value);
parser_.try_invoke(*value,
std::forward<Fun>(
fun));
@@ -181,10 +182,10 @@ class parser {
std::optional<no_void_validator_tup_t<Ts...>> value;
auto new_value = get_next<Ts...>();
if (valid()) {
value = new_value;
value = std::move(new_value);
try_invoke(*value, std::forward<Fun>(fun));
}
return {value, *this};
return {std::move(value), *this};
};
private:

3
include/ss/type_traits.hpp
View File

@@ -328,8 +328,7 @@ struct is_instance_of<Template<Ts...>, Template> {
template <class S, std::size_t... Is, class Tup>
S to_object(std::index_sequence<Is...>, Tup&& tup) {
using std::get;
return {get<Is>(std::forward<Tup>(tup))...};
return {std::get<Is>(std::forward<Tup>(tup))...};
}
template <class S, class Tup>