BlackMATov/meta.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/meta.hpp.git synced 2025-12-14 19:41:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup binds with opts

Browse Source
This commit is contained in:
BlackMATov
2023-08-11 10:47:31 +07:00
parent d4185e738d
commit 33bf8cc215
6 changed files with 217 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ROADMAP.md
View File

@@ -8,6 +8,7 @@
- fix all includes to work with the library more flexible - fix all includes to work with the library more flexible
- test and support shared libraries - test and support shared libraries
- remove `resolve_poly_type`, use `resolve_type(T&&)` instead - remove `resolve_poly_type`, use `resolve_type(T&&)` instead
- add ucast manual
## Thoughts ## Thoughts

418
develop/singles/headers/meta.hpp/meta_all.hpp
View File

@@ -4591,56 +4591,30 @@ namespace meta_hpp
explicit class_bind(metadata_map metadata); explicit class_bind(metadata_map metadata);
template < detail::class_bind_base_kind<Class>... Bases > template < detail::class_bind_base_kind<Class>... Bases >
class_bind& base_() &; class_bind& base_();
template < detail::class_bind_base_kind<Class>... Bases >
class_bind base_() &&;
template < typename... Args, typename... Opts > template < typename... Args, typename... Opts >
requires detail::class_bind_constructor_kind<Class, Args...> requires detail::class_bind_constructor_kind<Class, Args...>
class_bind& constructor_(Opts&&... opts) &; class_bind& constructor_(Opts&&... opts);
template < typename... Args, typename... Opts >
requires detail::class_bind_constructor_kind<Class, Args...>
class_bind constructor_(Opts&&... opts) &&;
template < typename... Opts > template < typename... Opts >
requires detail::class_bind_destructor_kind<Class> requires detail::class_bind_destructor_kind<Class>
class_bind& destructor_(Opts&&... opts) &; class_bind& destructor_(Opts&&... opts);
template < typename... Opts >
requires detail::class_bind_destructor_kind<Class>
class_bind destructor_(Opts&&... opts) &&;
template < detail::function_pointer_kind Function, typename... Opts > template < detail::function_pointer_kind Function, typename... Opts >
class_bind& function_(std::string name, Function function_ptr, Opts&&... opts) &; class_bind& function_(std::string name, Function function_ptr, Opts&&... opts);
template < detail::function_pointer_kind Function, typename... Opts >
class_bind function_(std::string name, Function function_ptr, Opts&&... opts) &&;
template < detail::class_bind_member_kind<Class> Member, typename... Opts > template < detail::class_bind_member_kind<Class> Member, typename... Opts >
class_bind& member_(std::string name, Member member_ptr, Opts&&... opts) &; class_bind& member_(std::string name, Member member_ptr, Opts&&... opts);
template < detail::class_bind_member_kind<Class> Member, typename... Opts >
class_bind member_(std::string name, Member member_ptr, Opts&&... opts) &&;
template < detail::class_bind_method_kind<Class> Method, typename... Opts > template < detail::class_bind_method_kind<Class> Method, typename... Opts >
class_bind& method_(std::string name, Method method_ptr, Opts&&... opts) &; class_bind& method_(std::string name, Method method_ptr, Opts&&... opts);
template < detail::class_bind_method_kind<Class> Method, typename... Opts >
class_bind method_(std::string name, Method method_ptr, Opts&&... opts) &&;
template < typename Type > template < typename Type >
class_bind& typedef_(std::string name) &; class_bind& typedef_(std::string name);
template < typename Type >
class_bind typedef_(std::string name) &&;
template < detail::pointer_kind Pointer, typename... Opts > template < detail::pointer_kind Pointer, typename... Opts >
class_bind& variable_(std::string name, Pointer variable_ptr, Opts&&... opts) &; class_bind& variable_(std::string name, Pointer variable_ptr, Opts&&... opts);
template < detail::pointer_kind Pointer, typename... Opts >
class_bind variable_(std::string name, Pointer variable_ptr, Opts&&... opts) &&;
}; };
} }
@@ -4735,22 +4709,13 @@ namespace meta_hpp
explicit scope_bind(const scope& scope, metadata_map metadata); explicit scope_bind(const scope& scope, metadata_map metadata);
template < detail::function_pointer_kind Function, typename... Opts > template < detail::function_pointer_kind Function, typename... Opts >
scope_bind& function_(std::string name, Function function_ptr, Opts&&... opts) &; scope_bind& function_(std::string name, Function function_ptr, Opts&&... opts);
template < detail::function_pointer_kind Function, typename... Opts >
scope_bind function_(std::string name, Function function_ptr, Opts&&... opts) &&;
template < typename Type > template < typename Type >
scope_bind& typedef_(std::string name) &; scope_bind& typedef_(std::string name);
template < typename Type >
scope_bind typedef_(std::string name) &&;
template < detail::pointer_kind Pointer, typename... Opts > template < detail::pointer_kind Pointer, typename... Opts >
scope_bind& variable_(std::string name, Pointer variable_ptr, Opts&&... opts) &; scope_bind& variable_(std::string name, Pointer variable_ptr, Opts&&... opts);
template < detail::pointer_kind Pointer, typename... Opts >
scope_bind variable_(std::string name, Pointer variable_ptr, Opts&&... opts) &&;
}; };
} }
@@ -4875,6 +4840,24 @@ namespace meta_hpp
public: public:
using values_t = std::vector<argument_info>; using values_t = std::vector<argument_info>;
operator values_t() && {
return std::move(values_);
}
template < typename... Opts >
static values_t from_opts(Opts&&... opts) {
arguments_bind bind;
const auto process_opt = detail::overloaded{
[&bind](arguments_bind b) { bind(std::move(b)); },
[&bind](arguments_bind::values_t vs) { bind(std::move(vs)); },
[](auto&&) {}, // // ignore other opts
};
(process_opt(META_HPP_FWD(opts)), ...);
return std::move(bind.values_);
}
public: public:
arguments_bind() = default; arguments_bind() = default;
~arguments_bind() = default; ~arguments_bind() = default;
@@ -4891,7 +4874,7 @@ namespace meta_hpp
} }
arguments_bind operator()(std::string name) && { arguments_bind operator()(std::string name) && {
values_.emplace_back(std::move(name)); (*this)(std::move(name));
return std::move(*this); return std::move(*this);
} }
@@ -4901,7 +4884,7 @@ namespace meta_hpp
} }
arguments_bind operator()(std::string name, metadata_map metadata) && { arguments_bind operator()(std::string name, metadata_map metadata) && {
values_.emplace_back(std::move(name), std::move(metadata)); (*this)(std::move(name), std::move(metadata));
return std::move(*this); return std::move(*this);
} }
@@ -4915,36 +4898,24 @@ namespace meta_hpp
} }
arguments_bind operator()(values_t values) && { arguments_bind operator()(values_t values) && {
values_.insert( // (*this)(std::move(values));
values_.end(),
std::make_move_iterator(values.begin()),
std::make_move_iterator(values.end())
);
return std::move(*this); return std::move(*this);
} }
arguments_bind& operator()(arguments_bind bind) & { arguments_bind& operator()(arguments_bind bind) & {
(*this)(std::move(bind.values_)); values_.insert( //
values_.end(),
std::make_move_iterator(bind.values_.begin()),
std::make_move_iterator(bind.values_.end())
);
return *this; return *this;
} }
arguments_bind operator()(arguments_bind bind) && { arguments_bind operator()(arguments_bind bind) && {
(*this)(std::move(bind.values_)); (*this)(std::move(bind));
return std::move(*this); return std::move(*this);
} }
operator values_t() && {
return std::move(values_);
}
[[nodiscard]] values_t& get_values() noexcept {
return values_;
}
[[nodiscard]] const values_t& get_values() const noexcept {
return values_;
}
private: private:
values_t values_; values_t values_;
}; };
@@ -4968,6 +4939,24 @@ namespace meta_hpp
public: public:
using values_t = metadata_map; using values_t = metadata_map;
operator values_t() && {
return std::move(values_);
}
template < typename... Opts >
static values_t from_opts(Opts&&... opts) {
metadata_bind bind;
const auto process_opt = detail::overloaded{
[&bind](metadata_bind b) { bind(std::move(b)); },
[&bind](metadata_bind::values_t vs) { bind(std::move(vs)); },
[](auto&&) {}, // // ignore other opts
};
(process_opt(META_HPP_FWD(opts)), ...);
return std::move(bind.values_);
}
public: public:
metadata_bind() = default; metadata_bind() = default;
~metadata_bind() = default; ~metadata_bind() = default;
@@ -4984,7 +4973,7 @@ namespace meta_hpp
} }
metadata_bind operator()(std::string name, uvalue value) && { metadata_bind operator()(std::string name, uvalue value) && {
values_.insert_or_assign(std::move(name), std::move(value)); (*this)(std::move(name), std::move(value));
return std::move(*this); return std::move(*this);
} }
@@ -4994,32 +4983,20 @@ namespace meta_hpp
} }
metadata_bind operator()(values_t values) && { metadata_bind operator()(values_t values) && {
detail::insert_or_assign(values_, std::move(values)); (*this)(std::move(values));
return std::move(*this); return std::move(*this);
} }
metadata_bind& operator()(metadata_bind bind) & { metadata_bind& operator()(metadata_bind bind) & {
(*this)(std::move(bind.values_)); detail::insert_or_assign(values_, std::move(bind.values_));
return *this; return *this;
} }
metadata_bind operator()(metadata_bind bind) && { metadata_bind operator()(metadata_bind bind) && {
(*this)(std::move(bind.values_)); (*this)(std::move(bind));
return std::move(*this); return std::move(*this);
} }
operator values_t() && {
return std::move(values_);
}
[[nodiscard]] values_t& get_values() noexcept {
return values_;
}
[[nodiscard]] const values_t& get_values() const noexcept {
return values_;
}
private: private:
values_t values_; values_t values_;
}; };
@@ -5129,7 +5106,7 @@ namespace meta_hpp
template < detail::class_kind Class > template < detail::class_kind Class >
template < detail::class_bind_base_kind<Class>... Bases > template < detail::class_bind_base_kind<Class>... Bases >
class_bind<Class>& class_bind<Class>::base_() & { class_bind<Class>& class_bind<Class>::base_() {
using namespace detail; using namespace detail;
using namespace detail::class_bind_impl; using namespace detail::class_bind_impl;
@@ -5170,17 +5147,10 @@ namespace meta_hpp
return *this; return *this;
} }
template < detail::class_kind Class >
template < detail::class_bind_base_kind<Class>... Bases >
class_bind<Class> class_bind<Class>::base_() && {
base_<Bases...>();
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < typename... Args, typename... Opts > template < typename... Args, typename... Opts >
requires detail::class_bind_constructor_kind<Class, Args...> requires detail::class_bind_constructor_kind<Class, Args...>
class_bind<Class>& class_bind<Class>::constructor_(Opts&&... opts) & { class_bind<Class>& class_bind<Class>::constructor_(Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<constructor_policy::is_family, constructor_policy::as_object_t, opts_t>; using policy_t = detail::type_list_first_of_t<constructor_policy::is_family, constructor_policy::as_object_t, opts_t>;
@@ -5189,77 +5159,40 @@ namespace meta_hpp
"constructor policy may be specified only once" "constructor policy may be specified only once"
); );
metadata_bind metadata; // there is no 'use after move' here because `from opts` takes only relevant opts
arguments_bind arguments; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
arguments_bind::values_t arguments = arguments_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](constructor_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
[&arguments](arguments_bind b) { arguments(std::move(b)); },
[&arguments](arguments_bind::values_t vs) { arguments(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::constructor_state::make<policy_t, Class, Args...>(std::move(metadata)); auto state = detail::constructor_state::make<policy_t, Class, Args...>(std::move(metadata));
META_HPP_ASSERT( // META_HPP_ASSERT( //
arguments.get_values().size() <= state->arguments.size() // arguments.size() <= state->arguments.size() //
&& "provided argument names don't match constructor argument count" && "provided argument names don't match constructor argument count"
); );
for ( std::size_t i{}, e{std::min(arguments.get_values().size(), state->arguments.size())}; i < e; ++i ) { for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i]; argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments.get_values()[i].get_name()); detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments.get_values()[i].get_metadata()); detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
} }
detail::insert_or_assign(get_data().constructors, constructor{std::move(state)}); detail::insert_or_assign(get_data().constructors, constructor{std::move(state)});
return *this; return *this;
} }
template < detail::class_kind Class >
template < typename... Args, typename... Opts >
requires detail::class_bind_constructor_kind<Class, Args...>
class_bind<Class> class_bind<Class>::constructor_(Opts&&... opts) && {
constructor_<Args...>(std::forward<Opts>(opts)...);
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < typename... Opts > template < typename... Opts >
requires detail::class_bind_destructor_kind<Class> requires detail::class_bind_destructor_kind<Class>
class_bind<Class>& class_bind<Class>::destructor_(Opts&&... opts) & { class_bind<Class>& class_bind<Class>::destructor_(Opts&&... opts) {
metadata_bind metadata; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::destructor_state::make<Class>(std::move(metadata)); auto state = detail::destructor_state::make<Class>(std::move(metadata));
detail::insert_or_assign(get_data().destructors, destructor{std::move(state)}); detail::insert_or_assign(get_data().destructors, destructor{std::move(state)});
return *this; return *this;
} }
template < detail::class_kind Class >
template < typename... Opts >
requires detail::class_bind_destructor_kind<Class>
class_bind<Class> class_bind<Class>::destructor_(Opts&&... opts) && {
destructor_(std::forward<Opts>(opts)...);
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < detail::function_pointer_kind Function, typename... Opts > template < detail::function_pointer_kind Function, typename... Opts >
class_bind<Class>& class_bind<Class>::function_(std::string name, Function function_ptr, Opts&&... opts) & { class_bind<Class>& class_bind<Class>::function_(std::string name, Function function_ptr, Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<function_policy::is_family, function_policy::as_copy_t, opts_t>; using policy_t = detail::type_list_first_of_t<function_policy::is_family, function_policy::as_copy_t, opts_t>;
@@ -5268,48 +5201,30 @@ namespace meta_hpp
"function policy may be specified only once" "function policy may be specified only once"
); );
metadata_bind metadata; // there is no 'use after move' here because `from opts` takes only relevant opts
arguments_bind arguments; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
arguments_bind::values_t arguments = arguments_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](function_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
[&arguments](arguments_bind b) { arguments(std::move(b)); },
[&arguments](arguments_bind::values_t vs) { arguments(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::function_state::make<policy_t>(std::move(name), function_ptr, std::move(metadata)); auto state = detail::function_state::make<policy_t>(std::move(name), function_ptr, std::move(metadata));
META_HPP_ASSERT( // META_HPP_ASSERT( //
arguments.get_values().size() <= state->arguments.size() // arguments.size() <= state->arguments.size() //
&& "provided argument names don't match function argument count" && "provided argument names don't match function argument count"
); );
for ( std::size_t i{}, e{std::min(arguments.get_values().size(), state->arguments.size())}; i < e; ++i ) { for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i]; argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments.get_values()[i].get_name()); detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments.get_values()[i].get_metadata()); detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
} }
detail::insert_or_assign(get_data().functions, function{std::move(state)}); detail::insert_or_assign(get_data().functions, function{std::move(state)});
return *this; return *this;
} }
template < detail::class_kind Class >
template < detail::function_pointer_kind Function, typename... Opts >
class_bind<Class> class_bind<Class>::function_(std::string name, Function function_ptr, Opts&&... opts) && {
function_(std::move(name), function_ptr, std::forward<Opts>(opts)...);
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < detail::class_bind_member_kind<Class> Member, typename... Opts > template < detail::class_bind_member_kind<Class> Member, typename... Opts >
class_bind<Class>& class_bind<Class>::member_(std::string name, Member member_ptr, Opts&&... opts) & { class_bind<Class>& class_bind<Class>::member_(std::string name, Member member_ptr, Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<member_policy::is_family, member_policy::as_copy_t, opts_t>; using policy_t = detail::type_list_first_of_t<member_policy::is_family, member_policy::as_copy_t, opts_t>;
@@ -5318,33 +5233,15 @@ namespace meta_hpp
"member policy may be specified only once" "member policy may be specified only once"
); );
metadata_bind metadata; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](member_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::member_state::make<policy_t>(std::move(name), member_ptr, std::move(metadata)); auto state = detail::member_state::make<policy_t>(std::move(name), member_ptr, std::move(metadata));
detail::insert_or_assign(get_data().members, member{std::move(state)}); detail::insert_or_assign(get_data().members, member{std::move(state)});
return *this; return *this;
} }
template < detail::class_kind Class >
template < detail::class_bind_member_kind<Class> Member, typename... Opts >
class_bind<Class> class_bind<Class>::member_(std::string name, Member member_ptr, Opts&&... opts) && {
member_(std::move(name), member_ptr, std::forward<Opts>(opts)...);
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < detail::class_bind_method_kind<Class> Method, typename... Opts > template < detail::class_bind_method_kind<Class> Method, typename... Opts >
class_bind<Class>& class_bind<Class>::method_(std::string name, Method method_ptr, Opts&&... opts) & { class_bind<Class>& class_bind<Class>::method_(std::string name, Method method_ptr, Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<method_policy::is_family, method_policy::as_copy_t, opts_t>; using policy_t = detail::type_list_first_of_t<method_policy::is_family, method_policy::as_copy_t, opts_t>;
@@ -5353,62 +5250,37 @@ namespace meta_hpp
"method policy may be specified only once" "method policy may be specified only once"
); );
metadata_bind metadata; // there is no 'use after move' here because `from opts` takes only relevant opts
arguments_bind arguments; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
arguments_bind::values_t arguments = arguments_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](method_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
[&arguments](arguments_bind b) { arguments(std::move(b)); },
[&arguments](arguments_bind::values_t vs) { arguments(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::method_state::make<policy_t>(std::move(name), method_ptr, std::move(metadata)); auto state = detail::method_state::make<policy_t>(std::move(name), method_ptr, std::move(metadata));
META_HPP_ASSERT( // META_HPP_ASSERT( //
arguments.get_values().size() <= state->arguments.size() // arguments.size() <= state->arguments.size() //
&& "provided argument names don't match method argument count" && "provided argument names don't match method argument count"
); );
for ( std::size_t i{}, e{std::min(arguments.get_values().size(), state->arguments.size())}; i < e; ++i ) { for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i]; argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments.get_values()[i].get_name()); detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments.get_values()[i].get_metadata()); detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
} }
detail::insert_or_assign(get_data().methods, method{std::move(state)}); detail::insert_or_assign(get_data().methods, method{std::move(state)});
return *this; return *this;
} }
template < detail::class_kind Class >
template < detail::class_bind_method_kind<Class> Method, typename... Opts >
class_bind<Class> class_bind<Class>::method_(std::string name, Method method_ptr, Opts&&... opts) && {
method_(std::move(name), method_ptr, std::forward<Opts>(opts)...);
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < typename Type > template < typename Type >
class_bind<Class>& class_bind<Class>::typedef_(std::string name) & { class_bind<Class>& class_bind<Class>::typedef_(std::string name) {
get_data().typedefs.insert_or_assign(std::move(name), resolve_type<Type>()); get_data().typedefs.insert_or_assign(std::move(name), resolve_type<Type>());
return *this; return *this;
} }
template < detail::class_kind Class >
template < typename Type >
class_bind<Class> class_bind<Class>::typedef_(std::string name) && {
typedef_<Type>(std::move(name));
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < detail::pointer_kind Pointer, typename... Opts > template < detail::pointer_kind Pointer, typename... Opts >
class_bind<Class>& class_bind<Class>::variable_(std::string name, Pointer variable_ptr, Opts&&... opts) & { class_bind<Class>& class_bind<Class>::variable_(std::string name, Pointer variable_ptr, Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<variable_policy::is_family, variable_policy::as_copy_t, opts_t>; using policy_t = detail::type_list_first_of_t<variable_policy::is_family, variable_policy::as_copy_t, opts_t>;
@@ -5417,29 +5289,11 @@ namespace meta_hpp
"variable policy may be specified only once" "variable policy may be specified only once"
); );
metadata_bind metadata; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](variable_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::variable_state::make<policy_t>(std::move(name), variable_ptr, std::move(metadata)); auto state = detail::variable_state::make<policy_t>(std::move(name), variable_ptr, std::move(metadata));
detail::insert_or_assign(get_data().variables, variable{std::move(state)}); detail::insert_or_assign(get_data().variables, variable{std::move(state)});
return *this; return *this;
} }
template < detail::class_kind Class >
template < detail::pointer_kind Pointer, typename... Opts >
class_bind<Class> class_bind<Class>::variable_(std::string name, Pointer variable_ptr, Opts&&... opts) && {
variable_(std::move(name), variable_ptr, std::forward<Opts>(opts)...);
return std::move(*this);
}
} }
namespace meta_hpp namespace meta_hpp
@@ -5451,23 +5305,7 @@ namespace meta_hpp
template < detail::enum_kind Enum > template < detail::enum_kind Enum >
template < typename... Opts > template < typename... Opts >
enum_bind<Enum>& enum_bind<Enum>::evalue_(std::string name, Enum value, Opts&&... opts) { enum_bind<Enum>& enum_bind<Enum>::evalue_(std::string name, Enum value, Opts&&... opts) {
metadata_map metadata; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
{
// clang-format off
const auto process_opt = detail::overloaded{
[&metadata](auto&&, metadata_map m) {
detail::insert_or_assign(metadata, std::move(m));
},
[](auto&& self, metadata_bind b) {
self(self, metadata_map{std::move(b)});
},
};
// clang-format on
(process_opt(process_opt, std::forward<Opts>(opts)), ...);
}
auto state = detail::evalue_state::make(std::move(name), std::move(value), std::move(metadata)); auto state = detail::evalue_state::make(std::move(name), std::move(value), std::move(metadata));
detail::insert_or_assign(get_data().evalues, evalue{std::move(state)}); detail::insert_or_assign(get_data().evalues, evalue{std::move(state)});
return *this; return *this;
@@ -5529,7 +5367,7 @@ namespace meta_hpp
: state_bind_base{scope, std::move(metadata)} {} : state_bind_base{scope, std::move(metadata)} {}
template < detail::function_pointer_kind Function, typename... Opts > template < detail::function_pointer_kind Function, typename... Opts >
scope_bind& scope_bind::function_(std::string name, Function function_ptr, Opts&&... opts) & { scope_bind& scope_bind::function_(std::string name, Function function_ptr, Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<function_policy::is_family, function_policy::as_copy_t, opts_t>; using policy_t = detail::type_list_first_of_t<function_policy::is_family, function_policy::as_copy_t, opts_t>;
@@ -5538,58 +5376,35 @@ namespace meta_hpp
"function policy may be specified only once" "function policy may be specified only once"
); );
metadata_bind metadata; // there is no 'use after move' here because `from opts` takes only relevant opts
arguments_bind arguments; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
arguments_bind::values_t arguments = arguments_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](function_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
[&arguments](arguments_bind b) { arguments(std::move(b)); },
[&arguments](arguments_bind::values_t vs) { arguments(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::function_state::make<policy_t>(std::move(name), function_ptr, std::move(metadata)); auto state = detail::function_state::make<policy_t>(std::move(name), function_ptr, std::move(metadata));
META_HPP_ASSERT( // META_HPP_ASSERT( //
arguments.get_values().size() <= state->arguments.size() // arguments.size() <= state->arguments.size() //
&& "provided arguments don't match function argument count" && "provided arguments don't match function argument count"
); );
for ( std::size_t i{}, e{std::min(arguments.get_values().size(), state->arguments.size())}; i < e; ++i ) { for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i]; argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments.get_values()[i].get_name()); detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments.get_values()[i].get_metadata()); detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
} }
detail::insert_or_assign(get_state().functions, function{std::move(state)}); detail::insert_or_assign(get_state().functions, function{std::move(state)});
return *this; return *this;
} }
template < detail::function_pointer_kind Function, typename... Opts >
scope_bind scope_bind::function_(std::string name, Function function_ptr, Opts&&... opts) && {
function_(std::move(name), function_ptr, std::forward<Opts>(opts)...);
return std::move(*this);
}
template < typename Type > template < typename Type >
scope_bind& scope_bind::typedef_(std::string name) & { scope_bind& scope_bind::typedef_(std::string name) {
get_state().typedefs.insert_or_assign(std::move(name), resolve_type<Type>()); get_state().typedefs.insert_or_assign(std::move(name), resolve_type<Type>());
return *this; return *this;
} }
template < typename Type >
scope_bind scope_bind::typedef_(std::string name) && {
typedef_<Type>(std::move(name));
return std::move(*this);
}
template < detail::pointer_kind Pointer, typename... Opts > template < detail::pointer_kind Pointer, typename... Opts >
scope_bind& scope_bind::variable_(std::string name, Pointer variable_ptr, Opts&&... opts) & { scope_bind& scope_bind::variable_(std::string name, Pointer variable_ptr, Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<variable_policy::is_family, variable_policy::as_copy_t, opts_t>; using policy_t = detail::type_list_first_of_t<variable_policy::is_family, variable_policy::as_copy_t, opts_t>;
@@ -5598,28 +5413,11 @@ namespace meta_hpp
"variable policy may be specified only once" "variable policy may be specified only once"
); );
metadata_bind metadata; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](variable_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::variable_state::make<policy_t>(std::move(name), variable_ptr, std::move(metadata)); auto state = detail::variable_state::make<policy_t>(std::move(name), variable_ptr, std::move(metadata));
detail::insert_or_assign(get_state().variables, variable{std::move(state)}); detail::insert_or_assign(get_state().variables, variable{std::move(state)});
return *this; return *this;
} }
template < detail::pointer_kind Pointer, typename... Opts >
scope_bind scope_bind::variable_(std::string name, Pointer variable_ptr, Opts&&... opts) && {
variable_(std::move(name), variable_ptr, std::forward<Opts>(opts)...);
return std::move(*this);
}
} }
namespace meta_hpp namespace meta_hpp

143
headers/meta.hpp/meta_binds.hpp
View File

@@ -108,56 +108,30 @@ namespace meta_hpp
explicit class_bind(metadata_map metadata); explicit class_bind(metadata_map metadata);
template < detail::class_bind_base_kind<Class>... Bases > template < detail::class_bind_base_kind<Class>... Bases >
class_bind& base_() &; class_bind& base_();
template < detail::class_bind_base_kind<Class>... Bases >
class_bind base_() &&;
template < typename... Args, typename... Opts > template < typename... Args, typename... Opts >
requires detail::class_bind_constructor_kind<Class, Args...> requires detail::class_bind_constructor_kind<Class, Args...>
class_bind& constructor_(Opts&&... opts) &; class_bind& constructor_(Opts&&... opts);
template < typename... Args, typename... Opts >
requires detail::class_bind_constructor_kind<Class, Args...>
class_bind constructor_(Opts&&... opts) &&;
template < typename... Opts > template < typename... Opts >
requires detail::class_bind_destructor_kind<Class> requires detail::class_bind_destructor_kind<Class>
class_bind& destructor_(Opts&&... opts) &; class_bind& destructor_(Opts&&... opts);
template < typename... Opts >
requires detail::class_bind_destructor_kind<Class>
class_bind destructor_(Opts&&... opts) &&;
template < detail::function_pointer_kind Function, typename... Opts > template < detail::function_pointer_kind Function, typename... Opts >
class_bind& function_(std::string name, Function function_ptr, Opts&&... opts) &; class_bind& function_(std::string name, Function function_ptr, Opts&&... opts);
template < detail::function_pointer_kind Function, typename... Opts >
class_bind function_(std::string name, Function function_ptr, Opts&&... opts) &&;
template < detail::class_bind_member_kind<Class> Member, typename... Opts > template < detail::class_bind_member_kind<Class> Member, typename... Opts >
class_bind& member_(std::string name, Member member_ptr, Opts&&... opts) &; class_bind& member_(std::string name, Member member_ptr, Opts&&... opts);
template < detail::class_bind_member_kind<Class> Member, typename... Opts >
class_bind member_(std::string name, Member member_ptr, Opts&&... opts) &&;
template < detail::class_bind_method_kind<Class> Method, typename... Opts > template < detail::class_bind_method_kind<Class> Method, typename... Opts >
class_bind& method_(std::string name, Method method_ptr, Opts&&... opts) &; class_bind& method_(std::string name, Method method_ptr, Opts&&... opts);
template < detail::class_bind_method_kind<Class> Method, typename... Opts >
class_bind method_(std::string name, Method method_ptr, Opts&&... opts) &&;
template < typename Type > template < typename Type >
class_bind& typedef_(std::string name) &; class_bind& typedef_(std::string name);
template < typename Type >
class_bind typedef_(std::string name) &&;
template < detail::pointer_kind Pointer, typename... Opts > template < detail::pointer_kind Pointer, typename... Opts >
class_bind& variable_(std::string name, Pointer variable_ptr, Opts&&... opts) &; class_bind& variable_(std::string name, Pointer variable_ptr, Opts&&... opts);
template < detail::pointer_kind Pointer, typename... Opts >
class_bind variable_(std::string name, Pointer variable_ptr, Opts&&... opts) &&;
}; };
} }
@@ -252,22 +226,13 @@ namespace meta_hpp
explicit scope_bind(const scope& scope, metadata_map metadata); explicit scope_bind(const scope& scope, metadata_map metadata);
template < detail::function_pointer_kind Function, typename... Opts > template < detail::function_pointer_kind Function, typename... Opts >
scope_bind& function_(std::string name, Function function_ptr, Opts&&... opts) &; scope_bind& function_(std::string name, Function function_ptr, Opts&&... opts);
template < detail::function_pointer_kind Function, typename... Opts >
scope_bind function_(std::string name, Function function_ptr, Opts&&... opts) &&;
template < typename Type > template < typename Type >
scope_bind& typedef_(std::string name) &; scope_bind& typedef_(std::string name);
template < typename Type >
scope_bind typedef_(std::string name) &&;
template < detail::pointer_kind Pointer, typename... Opts > template < detail::pointer_kind Pointer, typename... Opts >
scope_bind& variable_(std::string name, Pointer variable_ptr, Opts&&... opts) &; scope_bind& variable_(std::string name, Pointer variable_ptr, Opts&&... opts);
template < detail::pointer_kind Pointer, typename... Opts >
scope_bind variable_(std::string name, Pointer variable_ptr, Opts&&... opts) &&;
}; };
} }
@@ -392,6 +357,24 @@ namespace meta_hpp
public: public:
using values_t = std::vector<argument_info>; using values_t = std::vector<argument_info>;
operator values_t() && {
return std::move(values_);
}
template < typename... Opts >
static values_t from_opts(Opts&&... opts) {
arguments_bind bind;
const auto process_opt = detail::overloaded{
[&bind](arguments_bind b) { bind(std::move(b)); },
[&bind](arguments_bind::values_t vs) { bind(std::move(vs)); },
[](auto&&) {}, // // ignore other opts
};
(process_opt(META_HPP_FWD(opts)), ...);
return std::move(bind.values_);
}
public: public:
arguments_bind() = default; arguments_bind() = default;
~arguments_bind() = default; ~arguments_bind() = default;
@@ -408,7 +391,7 @@ namespace meta_hpp
} }
arguments_bind operator()(std::string name) && { arguments_bind operator()(std::string name) && {
values_.emplace_back(std::move(name)); (*this)(std::move(name));
return std::move(*this); return std::move(*this);
} }
@@ -418,7 +401,7 @@ namespace meta_hpp
} }
arguments_bind operator()(std::string name, metadata_map metadata) && { arguments_bind operator()(std::string name, metadata_map metadata) && {
values_.emplace_back(std::move(name), std::move(metadata)); (*this)(std::move(name), std::move(metadata));
return std::move(*this); return std::move(*this);
} }
@@ -432,36 +415,24 @@ namespace meta_hpp
} }
arguments_bind operator()(values_t values) && { arguments_bind operator()(values_t values) && {
values_.insert( // (*this)(std::move(values));
values_.end(),
std::make_move_iterator(values.begin()),
std::make_move_iterator(values.end())
);
return std::move(*this); return std::move(*this);
} }
arguments_bind& operator()(arguments_bind bind) & { arguments_bind& operator()(arguments_bind bind) & {
(*this)(std::move(bind.values_)); values_.insert( //
values_.end(),
std::make_move_iterator(bind.values_.begin()),
std::make_move_iterator(bind.values_.end())
);
return *this; return *this;
} }
arguments_bind operator()(arguments_bind bind) && { arguments_bind operator()(arguments_bind bind) && {
(*this)(std::move(bind.values_)); (*this)(std::move(bind));
return std::move(*this); return std::move(*this);
} }
operator values_t() && {
return std::move(values_);
}
[[nodiscard]] values_t& get_values() noexcept {
return values_;
}
[[nodiscard]] const values_t& get_values() const noexcept {
return values_;
}
private: private:
values_t values_; values_t values_;
}; };
@@ -485,6 +456,24 @@ namespace meta_hpp
public: public:
using values_t = metadata_map; using values_t = metadata_map;
operator values_t() && {
return std::move(values_);
}
template < typename... Opts >
static values_t from_opts(Opts&&... opts) {
metadata_bind bind;
const auto process_opt = detail::overloaded{
[&bind](metadata_bind b) { bind(std::move(b)); },
[&bind](metadata_bind::values_t vs) { bind(std::move(vs)); },
[](auto&&) {}, // // ignore other opts
};
(process_opt(META_HPP_FWD(opts)), ...);
return std::move(bind.values_);
}
public: public:
metadata_bind() = default; metadata_bind() = default;
~metadata_bind() = default; ~metadata_bind() = default;
@@ -501,7 +490,7 @@ namespace meta_hpp
} }
metadata_bind operator()(std::string name, uvalue value) && { metadata_bind operator()(std::string name, uvalue value) && {
values_.insert_or_assign(std::move(name), std::move(value)); (*this)(std::move(name), std::move(value));
return std::move(*this); return std::move(*this);
} }
@@ -511,32 +500,20 @@ namespace meta_hpp
} }
metadata_bind operator()(values_t values) && { metadata_bind operator()(values_t values) && {
detail::insert_or_assign(values_, std::move(values)); (*this)(std::move(values));
return std::move(*this); return std::move(*this);
} }
metadata_bind& operator()(metadata_bind bind) & { metadata_bind& operator()(metadata_bind bind) & {
(*this)(std::move(bind.values_)); detail::insert_or_assign(values_, std::move(bind.values_));
return *this; return *this;
} }
metadata_bind operator()(metadata_bind bind) && { metadata_bind operator()(metadata_bind bind) && {
(*this)(std::move(bind.values_)); (*this)(std::move(bind));
return std::move(*this); return std::move(*this);
} }
operator values_t() && {
return std::move(values_);
}
[[nodiscard]] values_t& get_values() noexcept {
return values_;
}
[[nodiscard]] const values_t& get_values() const noexcept {
return values_;
}
private: private:
values_t values_; values_t values_;
}; };

193
headers/meta.hpp/meta_binds/class_bind.hpp
View File

@@ -99,7 +99,7 @@ namespace meta_hpp
template < detail::class_kind Class > template < detail::class_kind Class >
template < detail::class_bind_base_kind<Class>... Bases > template < detail::class_bind_base_kind<Class>... Bases >
class_bind<Class>& class_bind<Class>::base_() & { class_bind<Class>& class_bind<Class>::base_() {
using namespace detail; using namespace detail;
using namespace detail::class_bind_impl; using namespace detail::class_bind_impl;
@@ -140,17 +140,10 @@ namespace meta_hpp
return *this; return *this;
} }
template < detail::class_kind Class >
template < detail::class_bind_base_kind<Class>... Bases >
class_bind<Class> class_bind<Class>::base_() && {
base_<Bases...>();
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < typename... Args, typename... Opts > template < typename... Args, typename... Opts >
requires detail::class_bind_constructor_kind<Class, Args...> requires detail::class_bind_constructor_kind<Class, Args...>
class_bind<Class>& class_bind<Class>::constructor_(Opts&&... opts) & { class_bind<Class>& class_bind<Class>::constructor_(Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<constructor_policy::is_family, constructor_policy::as_object_t, opts_t>; using policy_t = detail::type_list_first_of_t<constructor_policy::is_family, constructor_policy::as_object_t, opts_t>;
@@ -159,77 +152,40 @@ namespace meta_hpp
"constructor policy may be specified only once" "constructor policy may be specified only once"
); );
metadata_bind metadata; // there is no 'use after move' here because `from opts` takes only relevant opts
arguments_bind arguments; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
arguments_bind::values_t arguments = arguments_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](constructor_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
[&arguments](arguments_bind b) { arguments(std::move(b)); },
[&arguments](arguments_bind::values_t vs) { arguments(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::constructor_state::make<policy_t, Class, Args...>(std::move(metadata)); auto state = detail::constructor_state::make<policy_t, Class, Args...>(std::move(metadata));
META_HPP_ASSERT( // META_HPP_ASSERT( //
arguments.get_values().size() <= state->arguments.size() // arguments.size() <= state->arguments.size() //
&& "provided argument names don't match constructor argument count" && "provided argument names don't match constructor argument count"
); );
for ( std::size_t i{}, e{std::min(arguments.get_values().size(), state->arguments.size())}; i < e; ++i ) { for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i]; argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments.get_values()[i].get_name()); detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments.get_values()[i].get_metadata()); detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
} }
detail::insert_or_assign(get_data().constructors, constructor{std::move(state)}); detail::insert_or_assign(get_data().constructors, constructor{std::move(state)});
return *this; return *this;
} }
template < detail::class_kind Class >
template < typename... Args, typename... Opts >
requires detail::class_bind_constructor_kind<Class, Args...>
class_bind<Class> class_bind<Class>::constructor_(Opts&&... opts) && {
constructor_<Args...>(std::forward<Opts>(opts)...);
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < typename... Opts > template < typename... Opts >
requires detail::class_bind_destructor_kind<Class> requires detail::class_bind_destructor_kind<Class>
class_bind<Class>& class_bind<Class>::destructor_(Opts&&... opts) & { class_bind<Class>& class_bind<Class>::destructor_(Opts&&... opts) {
metadata_bind metadata; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::destructor_state::make<Class>(std::move(metadata)); auto state = detail::destructor_state::make<Class>(std::move(metadata));
detail::insert_or_assign(get_data().destructors, destructor{std::move(state)}); detail::insert_or_assign(get_data().destructors, destructor{std::move(state)});
return *this; return *this;
} }
template < detail::class_kind Class >
template < typename... Opts >
requires detail::class_bind_destructor_kind<Class>
class_bind<Class> class_bind<Class>::destructor_(Opts&&... opts) && {
destructor_(std::forward<Opts>(opts)...);
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < detail::function_pointer_kind Function, typename... Opts > template < detail::function_pointer_kind Function, typename... Opts >
class_bind<Class>& class_bind<Class>::function_(std::string name, Function function_ptr, Opts&&... opts) & { class_bind<Class>& class_bind<Class>::function_(std::string name, Function function_ptr, Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<function_policy::is_family, function_policy::as_copy_t, opts_t>; using policy_t = detail::type_list_first_of_t<function_policy::is_family, function_policy::as_copy_t, opts_t>;
@@ -238,48 +194,30 @@ namespace meta_hpp
"function policy may be specified only once" "function policy may be specified only once"
); );
metadata_bind metadata; // there is no 'use after move' here because `from opts` takes only relevant opts
arguments_bind arguments; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
arguments_bind::values_t arguments = arguments_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](function_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
[&arguments](arguments_bind b) { arguments(std::move(b)); },
[&arguments](arguments_bind::values_t vs) { arguments(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::function_state::make<policy_t>(std::move(name), function_ptr, std::move(metadata)); auto state = detail::function_state::make<policy_t>(std::move(name), function_ptr, std::move(metadata));
META_HPP_ASSERT( // META_HPP_ASSERT( //
arguments.get_values().size() <= state->arguments.size() // arguments.size() <= state->arguments.size() //
&& "provided argument names don't match function argument count" && "provided argument names don't match function argument count"
); );
for ( std::size_t i{}, e{std::min(arguments.get_values().size(), state->arguments.size())}; i < e; ++i ) { for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i]; argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments.get_values()[i].get_name()); detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments.get_values()[i].get_metadata()); detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
} }
detail::insert_or_assign(get_data().functions, function{std::move(state)}); detail::insert_or_assign(get_data().functions, function{std::move(state)});
return *this; return *this;
} }
template < detail::class_kind Class >
template < detail::function_pointer_kind Function, typename... Opts >
class_bind<Class> class_bind<Class>::function_(std::string name, Function function_ptr, Opts&&... opts) && {
function_(std::move(name), function_ptr, std::forward<Opts>(opts)...);
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < detail::class_bind_member_kind<Class> Member, typename... Opts > template < detail::class_bind_member_kind<Class> Member, typename... Opts >
class_bind<Class>& class_bind<Class>::member_(std::string name, Member member_ptr, Opts&&... opts) & { class_bind<Class>& class_bind<Class>::member_(std::string name, Member member_ptr, Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<member_policy::is_family, member_policy::as_copy_t, opts_t>; using policy_t = detail::type_list_first_of_t<member_policy::is_family, member_policy::as_copy_t, opts_t>;
@@ -288,33 +226,15 @@ namespace meta_hpp
"member policy may be specified only once" "member policy may be specified only once"
); );
metadata_bind metadata; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](member_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::member_state::make<policy_t>(std::move(name), member_ptr, std::move(metadata)); auto state = detail::member_state::make<policy_t>(std::move(name), member_ptr, std::move(metadata));
detail::insert_or_assign(get_data().members, member{std::move(state)}); detail::insert_or_assign(get_data().members, member{std::move(state)});
return *this; return *this;
} }
template < detail::class_kind Class >
template < detail::class_bind_member_kind<Class> Member, typename... Opts >
class_bind<Class> class_bind<Class>::member_(std::string name, Member member_ptr, Opts&&... opts) && {
member_(std::move(name), member_ptr, std::forward<Opts>(opts)...);
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < detail::class_bind_method_kind<Class> Method, typename... Opts > template < detail::class_bind_method_kind<Class> Method, typename... Opts >
class_bind<Class>& class_bind<Class>::method_(std::string name, Method method_ptr, Opts&&... opts) & { class_bind<Class>& class_bind<Class>::method_(std::string name, Method method_ptr, Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<method_policy::is_family, method_policy::as_copy_t, opts_t>; using policy_t = detail::type_list_first_of_t<method_policy::is_family, method_policy::as_copy_t, opts_t>;
@@ -323,62 +243,37 @@ namespace meta_hpp
"method policy may be specified only once" "method policy may be specified only once"
); );
metadata_bind metadata; // there is no 'use after move' here because `from opts` takes only relevant opts
arguments_bind arguments; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
arguments_bind::values_t arguments = arguments_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](method_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
[&arguments](arguments_bind b) { arguments(std::move(b)); },
[&arguments](arguments_bind::values_t vs) { arguments(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::method_state::make<policy_t>(std::move(name), method_ptr, std::move(metadata)); auto state = detail::method_state::make<policy_t>(std::move(name), method_ptr, std::move(metadata));
META_HPP_ASSERT( // META_HPP_ASSERT( //
arguments.get_values().size() <= state->arguments.size() // arguments.size() <= state->arguments.size() //
&& "provided argument names don't match method argument count" && "provided argument names don't match method argument count"
); );
for ( std::size_t i{}, e{std::min(arguments.get_values().size(), state->arguments.size())}; i < e; ++i ) { for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i]; argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments.get_values()[i].get_name()); detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments.get_values()[i].get_metadata()); detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
} }
detail::insert_or_assign(get_data().methods, method{std::move(state)}); detail::insert_or_assign(get_data().methods, method{std::move(state)});
return *this; return *this;
} }
template < detail::class_kind Class >
template < detail::class_bind_method_kind<Class> Method, typename... Opts >
class_bind<Class> class_bind<Class>::method_(std::string name, Method method_ptr, Opts&&... opts) && {
method_(std::move(name), method_ptr, std::forward<Opts>(opts)...);
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < typename Type > template < typename Type >
class_bind<Class>& class_bind<Class>::typedef_(std::string name) & { class_bind<Class>& class_bind<Class>::typedef_(std::string name) {
get_data().typedefs.insert_or_assign(std::move(name), resolve_type<Type>()); get_data().typedefs.insert_or_assign(std::move(name), resolve_type<Type>());
return *this; return *this;
} }
template < detail::class_kind Class >
template < typename Type >
class_bind<Class> class_bind<Class>::typedef_(std::string name) && {
typedef_<Type>(std::move(name));
return std::move(*this);
}
template < detail::class_kind Class > template < detail::class_kind Class >
template < detail::pointer_kind Pointer, typename... Opts > template < detail::pointer_kind Pointer, typename... Opts >
class_bind<Class>& class_bind<Class>::variable_(std::string name, Pointer variable_ptr, Opts&&... opts) & { class_bind<Class>& class_bind<Class>::variable_(std::string name, Pointer variable_ptr, Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<variable_policy::is_family, variable_policy::as_copy_t, opts_t>; using policy_t = detail::type_list_first_of_t<variable_policy::is_family, variable_policy::as_copy_t, opts_t>;
@@ -387,27 +282,9 @@ namespace meta_hpp
"variable policy may be specified only once" "variable policy may be specified only once"
); );
metadata_bind metadata; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](variable_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::variable_state::make<policy_t>(std::move(name), variable_ptr, std::move(metadata)); auto state = detail::variable_state::make<policy_t>(std::move(name), variable_ptr, std::move(metadata));
detail::insert_or_assign(get_data().variables, variable{std::move(state)}); detail::insert_or_assign(get_data().variables, variable{std::move(state)});
return *this; return *this;
} }
template < detail::class_kind Class >
template < detail::pointer_kind Pointer, typename... Opts >
class_bind<Class> class_bind<Class>::variable_(std::string name, Pointer variable_ptr, Opts&&... opts) && {
variable_(std::move(name), variable_ptr, std::forward<Opts>(opts)...);
return std::move(*this);
}
} }

18
headers/meta.hpp/meta_binds/enum_bind.hpp
View File

@@ -19,23 +19,7 @@ namespace meta_hpp
template < detail::enum_kind Enum > template < detail::enum_kind Enum >
template < typename... Opts > template < typename... Opts >
enum_bind<Enum>& enum_bind<Enum>::evalue_(std::string name, Enum value, Opts&&... opts) { enum_bind<Enum>& enum_bind<Enum>::evalue_(std::string name, Enum value, Opts&&... opts) {
metadata_map metadata; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
{
// clang-format off
const auto process_opt = detail::overloaded{
[&metadata](auto&&, metadata_map m) {
detail::insert_or_assign(metadata, std::move(m));
},
[](auto&& self, metadata_bind b) {
self(self, metadata_map{std::move(b)});
},
};
// clang-format on
(process_opt(process_opt, std::forward<Opts>(opts)), ...);
}
auto state = detail::evalue_state::make(std::move(name), std::move(value), std::move(metadata)); auto state = detail::evalue_state::make(std::move(name), std::move(value), std::move(metadata));
detail::insert_or_assign(get_data().evalues, evalue{std::move(state)}); detail::insert_or_assign(get_data().evalues, evalue{std::move(state)});
return *this; return *this;

64
headers/meta.hpp/meta_binds/scope_bind.hpp
View File

@@ -16,7 +16,7 @@ namespace meta_hpp
: state_bind_base{scope, std::move(metadata)} {} : state_bind_base{scope, std::move(metadata)} {}
template < detail::function_pointer_kind Function, typename... Opts > template < detail::function_pointer_kind Function, typename... Opts >
scope_bind& scope_bind::function_(std::string name, Function function_ptr, Opts&&... opts) & { scope_bind& scope_bind::function_(std::string name, Function function_ptr, Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<function_policy::is_family, function_policy::as_copy_t, opts_t>; using policy_t = detail::type_list_first_of_t<function_policy::is_family, function_policy::as_copy_t, opts_t>;
@@ -25,58 +25,35 @@ namespace meta_hpp
"function policy may be specified only once" "function policy may be specified only once"
); );
metadata_bind metadata; // there is no 'use after move' here because `from opts` takes only relevant opts
arguments_bind arguments; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
arguments_bind::values_t arguments = arguments_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](function_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
[&arguments](arguments_bind b) { arguments(std::move(b)); },
[&arguments](arguments_bind::values_t vs) { arguments(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::function_state::make<policy_t>(std::move(name), function_ptr, std::move(metadata)); auto state = detail::function_state::make<policy_t>(std::move(name), function_ptr, std::move(metadata));
META_HPP_ASSERT( // META_HPP_ASSERT( //
arguments.get_values().size() <= state->arguments.size() // arguments.size() <= state->arguments.size() //
&& "provided arguments don't match function argument count" && "provided arguments don't match function argument count"
); );
for ( std::size_t i{}, e{std::min(arguments.get_values().size(), state->arguments.size())}; i < e; ++i ) { for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i]; argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments.get_values()[i].get_name()); detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments.get_values()[i].get_metadata()); detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
} }
detail::insert_or_assign(get_state().functions, function{std::move(state)}); detail::insert_or_assign(get_state().functions, function{std::move(state)});
return *this; return *this;
} }
template < detail::function_pointer_kind Function, typename... Opts >
scope_bind scope_bind::function_(std::string name, Function function_ptr, Opts&&... opts) && {
function_(std::move(name), function_ptr, std::forward<Opts>(opts)...);
return std::move(*this);
}
template < typename Type > template < typename Type >
scope_bind& scope_bind::typedef_(std::string name) & { scope_bind& scope_bind::typedef_(std::string name) {
get_state().typedefs.insert_or_assign(std::move(name), resolve_type<Type>()); get_state().typedefs.insert_or_assign(std::move(name), resolve_type<Type>());
return *this; return *this;
} }
template < typename Type >
scope_bind scope_bind::typedef_(std::string name) && {
typedef_<Type>(std::move(name));
return std::move(*this);
}
template < detail::pointer_kind Pointer, typename... Opts > template < detail::pointer_kind Pointer, typename... Opts >
scope_bind& scope_bind::variable_(std::string name, Pointer variable_ptr, Opts&&... opts) & { scope_bind& scope_bind::variable_(std::string name, Pointer variable_ptr, Opts&&... opts) {
using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>; using opts_t = detail::type_list<std::remove_cvref_t<Opts>...>;
using policy_t = detail::type_list_first_of_t<variable_policy::is_family, variable_policy::as_copy_t, opts_t>; using policy_t = detail::type_list_first_of_t<variable_policy::is_family, variable_policy::as_copy_t, opts_t>;
@@ -85,26 +62,9 @@ namespace meta_hpp
"variable policy may be specified only once" "variable policy may be specified only once"
); );
metadata_bind metadata; metadata_bind::values_t metadata = metadata_bind::from_opts(META_HPP_FWD(opts)...);
{
const auto process_opt = detail::overloaded{
[](variable_policy::family auto) {}, // nothing
[&metadata](metadata_bind b) { metadata(std::move(b)); },
[&metadata](metadata_bind::values_t vs) { metadata(std::move(vs)); },
};
(process_opt(std::forward<Opts>(opts)), ...);
}
auto state = detail::variable_state::make<policy_t>(std::move(name), variable_ptr, std::move(metadata)); auto state = detail::variable_state::make<policy_t>(std::move(name), variable_ptr, std::move(metadata));
detail::insert_or_assign(get_state().variables, variable{std::move(state)}); detail::insert_or_assign(get_state().variables, variable{std::move(state)});
return *this; return *this;
} }
template < detail::pointer_kind Pointer, typename... Opts >
scope_bind scope_bind::variable_(std::string name, Pointer variable_ptr, Opts&&... opts) && {
variable_(std::move(name), variable_ptr, std::forward<Opts>(opts)...);
return std::move(*this);
}
} }