organizing metadata: erasure_base.h removed.

Author: neeraj31285

ReflectionTemplateLib/CMakeLists.txt

@@ -18,7 +18,6 @@ target_include_directories(${PROJECT_NAME}
         ${CMAKE_CURRENT_SOURCE_DIR}/rtl/cache
         ${CMAKE_CURRENT_SOURCE_DIR}/rtl/detail
         ${CMAKE_CURRENT_SOURCE_DIR}/rtl/dispatch
-        ${CMAKE_CURRENT_SOURCE_DIR}/rtl/erasure
         ${CMAKE_CURRENT_SOURCE_DIR}/rtl/inc
 		${CMAKE_CURRENT_SOURCE_DIR}/rtl
 )

ReflectionTemplateLib/rtl/CMakeLists.txt

@@ -20,5 +20,4 @@ add_subdirectory(src)
 add_subdirectory(builder)
 add_subdirectory(cache)
 add_subdirectory(detail)
-add_subdirectory(erasure)
 add_subdirectory(dispatch)

ReflectionTemplateLib/rtl/cache/cache_lambda_function.h

@@ -14,7 +14,6 @@
 #include <list>
 
 #include "lambda_function.h"
-#include "erase_return.h"
 
 namespace rtl::cache
 {
@@ -27,29 +26,17 @@ namespace rtl::cache
             return instance_;
         }
 
-        std::pair<const dispatch::lambda_base*, const dispatch::erasure_base*> push(const dispatch::functor& p_functor) const
+        const dispatch::lambda_base* push(const dispatch::functor& p_functor) const
         {
-            using erase_ret_t = dispatch::erase_return<traits::normal_sign_t<signature_t>...>;
-            m_erasure_cache.emplace_back(erase_ret_t());
-
-            erase_ret_t& eb = m_erasure_cache.back();
-            eb.template init_lambdas<detail::member::None, return_t, signature_t...>();
-
-            m_cache.push_back(dispatch::lambda_function<signature_t...>(p_functor, eb));
-            return { &m_cache.back(), &eb };
+            m_cache.push_back(dispatch::lambda_function<signature_t...>(p_functor));
+            return &m_cache.back();
         }
 
         template<class record_t>
-        std::pair<const dispatch::lambda_base*, const dispatch::erasure_base*> push(const dispatch::functor& p_functor) const
+        const dispatch::lambda_base* push(const dispatch::functor& p_functor) const
         {
-            using erase_ret_t = dispatch::erase_return<traits::normal_sign_t<signature_t>...>;
-            m_erasure_cache.emplace_back(erase_ret_t());
-
-            erase_ret_t& eb = m_erasure_cache.back();
-            eb.template init_lambdas<detail::member::UserCtor, record_t, signature_t...>();
-
-            m_cache.push_back(dispatch::lambda_function<signature_t...>(p_functor, eb));
-            return { &m_cache.back(), &eb };
+            m_cache.push_back(dispatch::lambda_function<signature_t...>(p_functor));
+            return &m_cache.back();
         }
 
         lambda_function(lambda_function&&) = delete;
@@ -61,7 +48,6 @@ namespace rtl::cache
 
         // No reallocation occurs; original objects stay intact
         mutable std::list<dispatch::lambda_function<signature_t...>> m_cache;
-        mutable std::list<dispatch::erase_return<traits::normal_sign_t<signature_t>...>> m_erasure_cache;
 
         lambda_function() = default;
     };

ReflectionTemplateLib/rtl/cache/cache_lambda_method.h

@@ -28,15 +28,10 @@ namespace rtl::cache
             return instance_;
         }
 
-        std::pair<const dispatch::lambda_base*, const dispatch::erasure_base*> push(const dispatch::functor& p_functor) const
+        const dispatch::lambda_base* push(const dispatch::functor& p_functor) const
         {
-            m_erasure_cache.emplace_back(dispatch::aware_return_n_target<record_t, return_t, signature_t...>());
-            
-            auto& eb = m_erasure_cache.back();
-            eb.init_lambdas();
-            m_cache.push_back(dispatch::lambda_method<record_t, signature_t...>(p_functor, eb));
-
-            return { &m_cache.back(), &eb };
+            m_cache.push_back(dispatch::lambda_method<record_t, signature_t...>(p_functor));
+            return &m_cache.back();
         }
 
         lambda_method(lambda_method&&) = delete;
@@ -48,8 +43,7 @@ namespace rtl::cache
 
         // No reallocation occurs; original objects stay intact
         mutable std::list<dispatch::lambda_method<record_t, signature_t...>> m_cache;
-        mutable std::list<dispatch::aware_return_n_target<record_t, return_t, signature_t...>> m_erasure_cache;
-
+        
         lambda_method() = default;
     };
 }

ReflectionTemplateLib/rtl/detail/inc/FunctionCaller.hpp

@@ -17,12 +17,11 @@
 #include "FunctorContainer.h"
 
 #include "functor_cast.h"
+#include "rtl_function_erased_return.h"
 
 #include "lambda_method.h"
 #include "lambda_function.h"
 
-#include "erase_return.h"
-#include "rtl_function_erased_return.h"
 
 namespace rtl::detail
 {

ReflectionTemplateLib/rtl/detail/inc/MethodInvoker.hpp

@@ -18,14 +18,13 @@
 
 #include "lambda_method.h"
 
-#include "erasure_base.hpp"
-
 #include "rtl_method.h"
 #include "rtl_method_const.h"
 #include "rtl_method_erased.h"
 #include "rtl_method_erased_target.h"
 #include "rtl_method_erased_return.h"
 
+
 namespace rtl::detail
 {
     /*  @lambda: call()
@@ -163,7 +162,7 @@ namespace rtl::detail
 {
     template<class record_t, class ...args_t>
     template<class return_t> requires (!traits::type_aware_v<record_t, return_t>)
-        inline constexpr const method<record_t, return_t(args_t...)> HopMethod<record_t, args_t...>::returnT() const
+    inline constexpr const method<record_t, return_t(args_t...)> HopMethod<record_t, args_t...>::returnT() const
     {
         method<record_t, return_t(traits::normal_sign_t<args_t>...)> erasedMth;
         initHopper<return_t>(erasedMth);
@@ -173,7 +172,7 @@ namespace rtl::detail
 
     template<class record_t, class ...args_t>
     template<class return_t> requires (traits::type_aware_v<record_t, return_t>)
-        inline constexpr const method<record_t, return_t(args_t...)> HopMethod<record_t, args_t...>::returnT() const
+    inline constexpr const method<record_t, return_t(args_t...)> HopMethod<record_t, args_t...>::returnT() const
     {
         method<record_t, return_t(args_t...)> mth;
         if (!m_argsTfnMeta.is_empty())
@@ -185,8 +184,8 @@ namespace rtl::detail
 
                 const auto retId = traits::uid<return_t>::value;
                 return m_argsTfnMeta.get_lambda()
-                    .template to_method<record_t, args_t...>()
-                    .template get_hopper<return_t>(retId);
+                                    .template to_method<record_t, args_t...>()
+                                    .template get_hopper<return_t>(retId);
             }
         }
         return mth;

ReflectionTemplateLib/rtl/detail/inc/RObjectId.h

@@ -14,7 +14,6 @@
 #include <any>
 #include <optional>
 
-#include "ReflectCast.h"
 #include "FunctorId.h"
 
 namespace rtl::detail

ReflectionTemplateLib/rtl/dispatch/CMakeLists.txt

@@ -20,6 +20,11 @@ set(LOCAL_HEADERS
     "${CMAKE_CURRENT_SOURCE_DIR}/lambda_method.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/lambda_function.h"
 
+	"${CMAKE_CURRENT_SOURCE_DIR}/aware_return.h"
+	"${CMAKE_CURRENT_SOURCE_DIR}/aware_constructor.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/aware_return_n_target.h"
+	"${CMAKE_CURRENT_SOURCE_DIR}/aware_return_n_target_const.h"
+
     "${CMAKE_CURRENT_SOURCE_DIR}/rtl_function.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/rtl_function_erased_return.h"