cpp2util.h: UFCS macro auto-dereference so that you can write . in most cases vs *..

Author: prenaux

include/cpp2util.h

@@ -191,7 +191,7 @@
         // in our -pure-cpp2 "import std;" simulation mode... if you need this,
         // use mixed mode (not -pure-cpp2) and #include all the headers you need
         // including this one
-        // 
+        //
         // #include <execution>
     #endif
 
@@ -629,6 +629,8 @@ class out {
 [](auto&& obj, auto&& ...params) CPP2_FORCE_INLINE -> decltype(auto) { \
     if constexpr (requires{ std::forward<decltype(obj)>(obj).FUNCNAME(std::forward<decltype(params)>(params)...); }) { \
         return std::forward<decltype(obj)>(obj).FUNCNAME(std::forward<decltype(params)>(params)...); \
+    } else if constexpr (requires{ std::forward<decltype(*obj)>(*obj).FUNCNAME(std::forward<decltype(params)>(params)...); }) { \
+        return std::forward<decltype(*obj)>(*obj).FUNCNAME(std::forward<decltype(params)>(params)...); \
     } else { \
         return FUNCNAME(std::forward<decltype(obj)>(obj), std::forward<decltype(params)>(params)...); \
     } \
@@ -638,6 +640,8 @@ class out {
 [](auto&& obj) CPP2_FORCE_INLINE -> decltype(auto) { \
     if constexpr (requires{ std::forward<decltype(obj)>(obj).FUNCNAME(); }) { \
         return std::forward<decltype(obj)>(obj).FUNCNAME(); \
+    } else if constexpr (requires{ std::forward<decltype(*obj)>(*obj).FUNCNAME(); }) { \
+        return std::forward<decltype(*obj)>(*obj).FUNCNAME(); \
     } else { \
         return FUNCNAME(std::forward<decltype(obj)>(obj)); \
     } \
@@ -649,6 +653,8 @@ class out {
 [](auto&& obj, auto&& ...params) CPP2_FORCE_INLINE -> decltype(auto) { \
     if constexpr (requires{ std::forward<decltype(obj)>(obj).template FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (std::forward<decltype(params)>(params)...); }) { \
         return std::forward<decltype(obj)>(obj).template FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (std::forward<decltype(params)>(params)...); \
+    } else if constexpr (requires{ std::forward<decltype(*obj)>(*obj).template FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (std::forward<decltype(params)>(params)...); }) { \
+        return std::forward<decltype(*obj)>(*obj).template FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (std::forward<decltype(params)>(params)...); \
     } else { \
         return FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (std::forward<decltype(obj)>(obj), std::forward<decltype(params)>(params)...); \
     } \
@@ -658,6 +664,8 @@ class out {
 [](auto&& obj) CPP2_FORCE_INLINE -> decltype(auto) { \
     if constexpr (requires{ std::forward<decltype(obj)>(obj).template FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (); }) { \
         return std::forward<decltype(obj)>(obj).template FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (); \
+    } else if constexpr (requires{ std::forward<decltype(*obj)>(*obj).template FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (); }) { \
+        return std::forward<decltype(*obj)>(*obj).template FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (); \
     } else { \
         return FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (std::forward<decltype(obj)>(obj)); \
     } \
@@ -731,17 +739,17 @@ auto is( X const& ) -> bool {
 
 template< typename C, typename X >
     requires (
-        ( std::is_base_of_v<X, C> || 
-          ( std::is_polymorphic_v<C> && std::is_polymorphic_v<X>) 
+        ( std::is_base_of_v<X, C> ||
+          ( std::is_polymorphic_v<C> && std::is_polymorphic_v<X>)
         ) && !std::is_same_v<C,X>)
 auto is( X const& x ) -> bool {
     return Dynamic_cast<C const*>(&x) != nullptr;
 }
 
 template< typename C, typename X >
     requires (
-        ( std::is_base_of_v<X, C> || 
-          ( std::is_polymorphic_v<C> && std::is_polymorphic_v<X>) 
+        ( std::is_base_of_v<X, C> ||
+          ( std::is_polymorphic_v<C> && std::is_polymorphic_v<X>)
         ) && !std::is_same_v<C,X>)
 auto is( X const* x ) -> bool {
     return Dynamic_cast<C const*>(x) != nullptr;
@@ -1314,7 +1322,7 @@ inline auto to_string(std::string const& s) -> std::string const&
 
 template<typename T>
 inline auto to_string(T const& sv) -> std::string
-    requires (std::is_convertible_v<T, std::string_view> 
+    requires (std::is_convertible_v<T, std::string_view>
               && !std::is_convertible_v<T, const char*>)
 {
     return std::string{sv};