From 082605f9d31344d680b68d8a3e0f5274a05ed894 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Mon, 10 Oct 2022 18:03:30 +0200 Subject: [PATCH] meta: prepare meta containers to support context injection --- src/entt/meta/meta.hpp | 45 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/entt/meta/meta.hpp b/src/entt/meta/meta.hpp index 788bca063..43a2ed7f2 100644 --- a/src/entt/meta/meta.hpp +++ b/src/entt/meta/meta.hpp @@ -40,18 +40,19 @@ public: meta_sequence_container() noexcept = default; /** - * @brief Construct a proxy object for sequence containers. + * @brief Rebinds a proxy object to a sequence container type. * @tparam Type Type of container to wrap. * @param instance The container to wrap. */ template - meta_sequence_container(std::in_place_type_t, any instance) noexcept - : value_type_node{&internal::resolve_TODO}, - size_fn{&meta_sequence_container_traits::size}, - resize_fn{&meta_sequence_container_traits::resize}, - iter_fn{&meta_sequence_container_traits::iter}, - insert_or_erase_fn{&meta_sequence_container_traits::insert_or_erase}, - storage{std::move(instance)} {} + void rebind(any instance) noexcept { + value_type_node = &internal::resolve_TODO; + size_fn = &meta_sequence_container_traits::size; + resize_fn = &meta_sequence_container_traits::resize; + iter_fn = &meta_sequence_container_traits::iter; + insert_or_erase_fn = &meta_sequence_container_traits::insert_or_erase; + storage = std::move(instance); + } [[nodiscard]] inline meta_type value_type() const noexcept; [[nodiscard]] inline size_type size() const noexcept; @@ -87,25 +88,25 @@ public: meta_associative_container() noexcept = default; /** - * @brief Construct a proxy object for associative containers. + * @brief Rebinds a proxy object to an associative container type. * @tparam Type Type of container to wrap. * @param instance The container to wrap. */ template - meta_associative_container(std::in_place_type_t, any instance) noexcept - : key_only_container{meta_associative_container_traits::key_only}, - key_type_node{&internal::resolve_TODO}, - mapped_type_node{}, - value_type_node{&internal::resolve_TODO}, - size_fn{&meta_associative_container_traits::size}, - clear_fn{&meta_associative_container_traits::clear}, - iter_fn{&meta_associative_container_traits::iter}, - insert_or_erase_fn{&meta_associative_container_traits::insert_or_erase}, - find_fn{&meta_associative_container_traits::find}, - storage{std::move(instance)} { + void rebind(any instance) noexcept { if constexpr(!meta_associative_container_traits::key_only) { mapped_type_node = &internal::resolve_TODO; } + + key_only_container = meta_associative_container_traits::key_only; + key_type_node = &internal::resolve_TODO; + value_type_node = &internal::resolve_TODO; + size_fn = &meta_associative_container_traits::size; + clear_fn = &meta_associative_container_traits::clear; + iter_fn = &meta_associative_container_traits::iter; + insert_or_erase_fn = &meta_associative_container_traits::insert_or_erase; + find_fn = &meta_associative_container_traits::find; + storage = std::move(instance); } [[nodiscard]] inline bool key_only() const noexcept; @@ -169,12 +170,12 @@ class meta_any { break; case operation::seq: if constexpr(is_complete_v>) { - *static_cast(other) = {std::in_place_type, std::move(const_cast(value))}; + static_cast(other)->rebind(std::move(const_cast(value))); } break; case operation::assoc: if constexpr(is_complete_v>) { - *static_cast(other) = {std::in_place_type, std::move(const_cast(value))}; + static_cast(other)->rebind(std::move(const_cast(value))); } break; }