RObjectConverters: Heap clone fix.

Author: neerajsys

RTLTestRunApp/src/RObjectTests/RObjectReflecting_strings.cpp

@@ -369,12 +369,11 @@ namespace unit_test
                 ASSERT_NE(&str_addr, STR_STD_STRING.c_str());
             }
         };
-        testWithAlloc.operator()<rtl::alloc::Stack>();
-        // TODO: This fails. Fix it.
+
         // Should even std::string to 'char' conversion be allowed implicitly?
         // Need to re-think it. The implicit conversions are not used in core dispatch yet.
-        // will sit on it for a while.
-        //testWithAlloc.operator()<rtl::alloc::Heap>();
+        testWithAlloc.operator()<rtl::alloc::Stack>();
+        testWithAlloc.operator()<rtl::alloc::Heap>();
     }
 
 

ReflectionTemplateLib/rtl/detail/src/RObjectConverters_string.cpp

@@ -11,6 +11,7 @@
 
 #include <rtl/rtl_typeid.h>
 #include <detail/inc/ReflectCast.hpp>
+#include <detail/inc/RObjectUPtr.h>
 
 namespace rtl::detail
 {
@@ -20,10 +21,23 @@ namespace rtl::detail
     {
         const auto& conversion = [](const std::any& pSrc, const EntityKind& pSrcEntityKind, EntityKind& pNewEntityKind)-> std::any
         {
-            pNewEntityKind = EntityKind::Ptr;
-            const auto& isPtr = (pSrcEntityKind == EntityKind::Ptr);
-            const auto& srcObj = (isPtr ? *std::any_cast<const std::string*>(pSrc) : std::any_cast<const std::string&>(pSrc));
-            return std::any(srcObj.c_str());
+            try {
+                pNewEntityKind = EntityKind::Ptr;
+                const auto& isPtr = (pSrcEntityKind == EntityKind::Ptr);
+                if (pSrcEntityKind == EntityKind::Wrapper) {
+                    //TODO: Will fail for any other wrapper other than 'RObjectUPtr<>'.
+                    const auto& srcRUptr = std::any_cast<const RObjectUPtr<std::string>&>(pSrc);
+                    return std::any(srcRUptr.get()->c_str());
+                }
+                else {
+                    const auto& srcObj = (isPtr ? *std::any_cast<const std::string*>(pSrc) : std::any_cast<const std::string&>(pSrc));
+                    return std::any(srcObj.c_str());
+                }
+            }
+            catch (std::exception e) {
+                pNewEntityKind = EntityKind::None;
+                return std::any();
+            }
         };
         conversions().emplace_back(std::pair(traits::uid<char>::value, conversion));
     }
@@ -35,10 +49,23 @@ namespace rtl::detail
     {
         const auto& conversion = [](const std::any& pSrc, const EntityKind& pSrcEntityKind, EntityKind& pNewEntityKind)-> std::any
         {
-            pNewEntityKind = EntityKind::Ptr;
-            const auto& isPtr = (pSrcEntityKind == EntityKind::Ptr);
-            const auto& srcObj = (isPtr ? *std::any_cast<const std::string_view*>(pSrc) : std::any_cast<const std::string_view&>(pSrc));
-            return std::any(srcObj.data());
+            try {
+                pNewEntityKind = EntityKind::Ptr;
+                const auto& isPtr = (pSrcEntityKind == EntityKind::Ptr);
+                if (pSrcEntityKind == EntityKind::Wrapper) {
+                    //TODO: Will fail for any other wrapper other than 'RObjectUPtr<>'.
+                    const auto& srcRUptr = std::any_cast<const RObjectUPtr<std::string>&>(pSrc);
+                    return std::any(srcRUptr.get()->data());
+                }
+                else {
+                    const auto& srcObj = (isPtr ? *std::any_cast<const std::string_view*>(pSrc) : std::any_cast<const std::string_view&>(pSrc));
+                    return std::any(srcObj.data());
+                }
+            }
+            catch (std::exception e) {
+                pNewEntityKind = EntityKind::None;
+                return std::any();
+            }
         };
         conversions().emplace_back(std::pair(traits::uid<char>::value, conversion));
     }
@@ -51,10 +78,23 @@ namespace rtl::detail
         using _toType = std::string;
         const auto& conversion = [](const std::any& pSrc, const EntityKind& pSrcEntityKind, EntityKind& pNewEntityKind)-> std::any
         {
-            pNewEntityKind = EntityKind::Value;
-            const auto& isPtr = (pSrcEntityKind == EntityKind::Ptr);
-            const auto& srcObj = (isPtr ? *std::any_cast<const std::string_view*>(pSrc) : std::any_cast<const std::string_view&>(pSrc));
-            return std::any(_toType(srcObj));
+            try {
+                pNewEntityKind = EntityKind::Value;
+                const auto& isPtr = (pSrcEntityKind == EntityKind::Ptr);
+                if (pSrcEntityKind == EntityKind::Wrapper) {
+                    //TODO: Will fail for any other wrapper other than 'RObjectUPtr<>'.
+                    const auto& srcRUptr = std::any_cast<const RObjectUPtr<std::string_view>&>(pSrc);
+                    return std::any(_toType(*srcRUptr.get()));
+                }
+                else {
+                    const auto& srcObj = (isPtr ? *std::any_cast<const std::string_view*>(pSrc) : std::any_cast<const std::string_view&>(pSrc));
+                    return std::any(_toType(srcObj));
+                }
+            }
+            catch (std::exception e) {
+                pNewEntityKind = EntityKind::None;
+                return std::any();
+            }
         };
         conversions().emplace_back(std::pair(traits::uid<_toType>::value, conversion));
     }