Scarfski/entt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meta: refine and share find_member/find_overload

Browse Source
This commit is contained in:
Michele Caini
2024-09-02 15:05:11 +02:00
parent 27f7e43b05
commit 90c975904f
2 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/entt/meta/factory.hpp
View File

@@ -30,26 +30,14 @@ namespace internal {
class basic_meta_factory {
using invoke_type = std::remove_pointer_t<decltype(meta_func_node::invoke)>;
template<typename Type>
static auto *find_member(Type &from, const id_type id) {
std::size_t pos{};
for(const std::size_t last = from.size(); (pos != last) && (from[pos].id != id); ++pos) {}
return (pos == from.size()) ? nullptr : &from[pos];
}
static auto *find_overload(meta_func_node *curr, invoke_type *const ref) {
while(curr && (curr->invoke != ref)) { curr = curr->next.get(); }
return curr;
}
auto *find_member_or_assert() {
auto *member = find_member(details->data, bucket);
auto *member = find_member<&meta_data_node::id>(details->data, bucket);
ENTT_ASSERT(member != nullptr, "Cannot find member");
return member;
}
auto *find_overload_or_assert() {
auto *overload = find_overload(find_member(details->func, bucket), invoke);
auto *overload = find_overload(find_member<&meta_func_node::id>(details->func, bucket), invoke);
ENTT_ASSERT(overload != nullptr, "Cannot find overload");
return overload;
}
@@ -71,18 +59,16 @@ protected:
void insert_or_assign(Type node) {
reset_bucket(parent);
std::size_t pos{};
if constexpr(std::is_same_v<Type, meta_base_node>) {
for(const std::size_t last = details->base.size(); (pos != last) && (details->base[pos].type != node.type); ++pos) {}
(pos == details->base.size()) ? details->base.emplace_back(node) : (details->base[pos] = node);
auto *member = find_member<&meta_base_node::type>(details->base, node.type);
member ? (*member = node) : details->base.emplace_back(node);
} else if constexpr(std::is_same_v<Type, meta_conv_node>) {
for(const std::size_t last = details->conv.size(); (pos != last) && (details->conv[pos].type != node.type); ++pos) {}
(pos == details->conv.size()) ? details->conv.emplace_back(node) : (details->conv[pos] = node);
auto *member = find_member<&meta_conv_node::type>(details->conv, node.type);
member ? (*member = node) : details->conv.emplace_back(node);
} else {
static_assert(std::is_same_v<Type, meta_ctor_node>, "Unexpected type");
for(const std::size_t last = details->ctor.size(); (pos != last) && (details->ctor[pos].id != node.id); ++pos) {}
(pos == details->ctor.size()) ? details->ctor.emplace_back(node) : (details->ctor[pos] = node);
auto *member = find_member<&meta_ctor_node::id>(details->ctor, node.id);
member ? (*member = node) : details->ctor.emplace_back(node);
}
}
@@ -94,7 +80,7 @@ protected:
void data(meta_data_node node) {
reset_bucket(node.id);
if(auto *member = find_member(details->data, node.id); member == nullptr) {
if(auto *member = find_member<&meta_data_node::id>(details->data, node.id); member == nullptr) {
details->data.emplace_back(std::move(node));
} else if(member->set != node.set || member->get != node.get) {
*member = std::move(node);
@@ -104,7 +90,7 @@ protected:
void func(meta_func_node node) {
reset_bucket(node.id, node.invoke);
if(auto *member = find_member(details->func, node.id); member == nullptr) {
if(auto *member = find_member<&meta_func_node::id>(details->func, node.id); member == nullptr) {
details->func.emplace_back(std::move(node));
} else if(auto *overload = find_overload(member, node.invoke); overload == nullptr) {
while(member->next != nullptr) { member = member->next.get(); }
@@ -123,9 +109,8 @@ protected:
container = &find_overload_or_assert()->prop;
}
std::size_t pos{};
for(const std::size_t last = container->size(); (pos != last) && ((*container)[pos].id != node.id); ++pos) {}
(pos == container->size()) ? container->emplace_back(std::move(node)) : ((*container)[pos] = std::move(node));
auto *member = find_member<&meta_prop_node::id>(*container, node.id);
member ? (*member = std::move(node)) : container->emplace_back(std::move(node));
}
void traits(const meta_traits value) {

26
src/entt/meta/node.hpp
View File

@@ -160,13 +160,29 @@ struct meta_type_node {
std::shared_ptr<meta_type_descriptor> details{};
};
template<auto Member, typename Type, typename Value>
static auto *find_member(Type &from, const Value value) {
for(auto &&elem: from) {
if((elem.*Member) == value) {
return &elem;
}
}
return static_cast<typename Type::value_type *>(nullptr);
}
static auto *find_overload(meta_func_node *curr, std::remove_pointer_t<decltype(meta_func_node::invoke)> *const ref) {
while(curr && (curr->invoke != ref)) { curr = curr->next.get(); }
return curr;
}
template<auto Member>
auto *look_for(const meta_context &context, const meta_type_node &node, const id_type id) {
using value_type = typename std::remove_reference_t<decltype((node.details.get()->*Member))>::value_type;
if(node.details) {
for(auto &&elem: (node.details.get()->*Member)) {
if(elem.id == id) {
return &elem;
}
if(auto *member = find_member<&value_type::id>((node.details.get()->*Member), id); member != nullptr) {
return member;
}
for(auto &&curr: node.details->base) {
@@ -176,7 +192,7 @@ auto *look_for(const meta_context &context, const meta_type_node &node, const id
}
}
return static_cast<typename std::remove_reference_t<decltype(node.details.get()->*Member)>::value_type *>(nullptr);
return static_cast<value_type *>(nullptr);
}
template<typename Type>