From 8673907e4e3f2f9ff6e8bd18aaf3ddc6d84c0e64 Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 1 Jan 2024 22:20:21 +0800 Subject: NEED TEST: add support for pointer conversion in ObjectResolver. --- include/cru/common/Event2.h | 30 ++++++++++------- include/cru/common/SelfResolvable.h | 67 +++++++++++++++++++++++++++++++++++-- 2 files changed, 82 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/cru/common/Event2.h b/include/cru/common/Event2.h index 5677828a..62fb366d 100644 --- a/include/cru/common/Event2.h +++ b/include/cru/common/Event2.h @@ -10,6 +10,13 @@ #include namespace cru { +class Event2Base { + public: + virtual ~Event2Base() = default; + + virtual void RevokeHandler(int token_value) = 0; +}; + template class EventContext { public: @@ -46,20 +53,19 @@ constexpr bool is_event2_v = false; template constexpr bool is_event2_v> = true; -template class EventHandlerToken { - static_assert(is_event2_v, "TEvent2 must be Event2 class."); - public: - EventHandlerToken(ObjectResolver event_resolver, int token_value) + EventHandlerToken(ObjectResolver event_resolver, int token_value) : event_resolver_(std::move(event_resolver)), token_value_(token_value) {} - ObjectResolver GetEventResolver() const { return event_resolver_; } + ObjectResolver GetEventResolver() const { + return event_resolver_; + } int GetTokenValue() const { return token_value_; } - void RevokeHandler() const; + inline void RevokeHandler() const; private: - ObjectResolver event_resolver_; + ObjectResolver event_resolver_; int token_value_; }; @@ -79,9 +85,10 @@ struct Event2BehaviorFlags { template -class Event2 : public SelfResolvable> { +class Event2 : public Event2Base, + public SelfResolvable> { public: - using HandlerToken = EventHandlerToken; + using HandlerToken = EventHandlerToken; using Context = EventContext; using Handler = std::function; using SpyOnlyHandler = std::function; @@ -122,7 +129,7 @@ class Event2 : public SelfResolvable> { return HandlerToken(this->CreateResolver(), token); } - void RevokeHandler(int token_value) { + void RevokeHandler(int token_value) override { auto iter = this->handlers_.cbegin(); auto end = this->handlers_.cend(); for (; iter != end; ++iter) { @@ -184,8 +191,7 @@ class Event2 : public SelfResolvable> { Event2BehaviorFlag flags_; }; -template -void EventHandlerToken::RevokeHandler() const { +inline void EventHandlerToken::RevokeHandler() const { auto event = this->event_resolver_.Resolve(); if (event) { event->RevokeHandler(this->token_value_); diff --git a/include/cru/common/SelfResolvable.h b/include/cru/common/SelfResolvable.h index ce5b1628..84fa54f6 100644 --- a/include/cru/common/SelfResolvable.h +++ b/include/cru/common/SelfResolvable.h @@ -1,7 +1,9 @@ #pragma once #include +#include #include +#include namespace cru { template @@ -10,22 +12,74 @@ class SelfResolvable; template class ObjectResolver { friend SelfResolvable; + template + friend class ObjectResolver; private: - explicit ObjectResolver(T* o) : shared_object_ptr_(new T*(o)) {} + template + using Accessor_ = std::function&)>; + using ThisAccessor_ = Accessor_; + + explicit ObjectResolver(T* o) + : shared_object_ptr_(new void*(o)), + accessor_([](const std::shared_ptr& ptr) { + return static_cast(*ptr); + }) {} + explicit ObjectResolver(std::shared_ptr ptr, ThisAccessor_ accessor) + : shared_object_ptr_(std::move(ptr)), accessor_(std::move(accessor)) {} + + template + static ThisAccessor_ CreateAccessor(Accessor_ parent_accessor) { + return [parent_accessor = + std::move(parent_accessor)](const std::shared_ptr& ptr) { + return static_cast(parent_accessor(ptr)); + }; + } public: + template >> + ObjectResolver(const ObjectResolver& other) + : shared_object_ptr_(other.shared_object_ptr_), + accessor_(CreateAccessor(other.accessor_)) {} + + template >> + ObjectResolver(ObjectResolver&& other) + : shared_object_ptr_(std::move(other.shared_object_ptr_)), + accessor_(CreateAccessor(std::move(other.accessor_))) {} + ObjectResolver(const ObjectResolver&) = default; ObjectResolver& operator=(const ObjectResolver&) = default; ObjectResolver(ObjectResolver&&) = default; ObjectResolver& operator=(ObjectResolver&&) = default; ~ObjectResolver() = default; + template >> + ObjectResolver& operator=(const ObjectResolver& other) { + if (this != &other) { + this->shared_object_ptr_ = other.shared_object_ptr_; + this->accessor_ = CreateAccessor(other.accessor_); + } + return *this; + } + + template >> + ObjectResolver& operator=(ObjectResolver&& other) { + if (this != &other) { + this->shared_object_ptr_ = std::move(other.shared_object_ptr_); + this->accessor_ = CreateAccessor(std::move(other.shared_object_ptr_)); + } + return *this; + } + bool IsValid() const { return this->shared_object_ptr_ != nullptr; } T* Resolve() const { assert(IsValid()); - return *this->shared_object_ptr_; + return this->accessor_(this->shared_object_ptr_); } /** @@ -33,6 +87,12 @@ class ObjectResolver { */ T* operator()() const { return Resolve(); } + template >> + operator ObjectResolver() const { + return ObjectResolver(*this); + } + private: void SetResolvedObject(T* o) { assert(IsValid()); @@ -40,7 +100,8 @@ class ObjectResolver { } private: - std::shared_ptr shared_object_ptr_; + std::shared_ptr shared_object_ptr_; + std::function&)> accessor_; }; /** -- cgit v1.2.3