moveonly: add mp/type-struct.h

Author: ryanofsky

CMakeLists.txt

@@ -56,6 +56,7 @@ set(MP_PUBLIC_HEADERS
   include/mp/type-pointer.h
   include/mp/type-set.h
   include/mp/type-string.h
+  include/mp/type-struct.h
   include/mp/type-tuple.h
   include/mp/type-vector.h
   include/mp/util.h)

include/mp/proxy-types.h

@@ -141,43 +141,6 @@ struct ReadDestUpdate
     Value& m_value;
 };
 
-template <size_t index, typename LocalType, typename Input, typename Value>
-void ReadOne(TypeList<LocalType> param,
-    InvokeContext& invoke_context,
-    Input&& input,
-    Value&& value,
-    typename std::enable_if<index != ProxyType<LocalType>::fields>::type* enable = nullptr)
-{
-    using Index = std::integral_constant<size_t, index>;
-    using Struct = typename ProxyType<LocalType>::Struct;
-    using Accessor = typename std::tuple_element<index, typename ProxyStruct<Struct>::Accessors>::type;
-    const auto& struc = input.get();
-    auto&& field_value = value.*ProxyType<LocalType>::get(Index());
-    ReadField(TypeList<RemoveCvRef<decltype(field_value)>>(), invoke_context, Make<StructField, Accessor>(struc),
-        ReadDestUpdate(field_value));
-    ReadOne<index + 1>(param, invoke_context, input, value);
-}
-
-template <size_t index, typename LocalType, typename Input, typename Value>
-void ReadOne(TypeList<LocalType> param,
-    InvokeContext& invoke_context,
-    Input& input,
-    Value& value,
-    typename std::enable_if<index == ProxyType<LocalType>::fields>::type* enable = nullptr)
-{
-}
-
-template <typename LocalType, typename Input, typename ReadDest>
-decltype(auto) CustomReadField(TypeList<LocalType> param,
-    Priority<1>,
-    InvokeContext& invoke_context,
-    Input&& input,
-    ReadDest&& read_dest,
-    typename ProxyType<LocalType>::Struct* enable = nullptr)
-{
-    return read_dest.update([&](auto& value) { ReadOne<0>(param, invoke_context, input, value); });
-}
-
 //! Overload CustomReadField to serialize objects that have CustomReadMessage
 //! overloads. Defining a CustomReadMessage overload is simpler than defining a
 //! CustomReadField overload because it only requires defining a normal
@@ -317,42 +280,6 @@ void CustomBuildField(TypeList<LocalType>, Priority<0>, InvokeContext& invoke_co
     output.set(BuildPrimitive(invoke_context, std::forward<Value>(value), TypeList<decltype(output.get())>()));
 }
 
-template <size_t index, typename LocalType, typename Value, typename Output>
-void BuildOne(TypeList<LocalType> param,
-    InvokeContext& invoke_context,
-    Output&& output,
-    Value&& value,
-    typename std::enable_if < index<ProxyType<LocalType>::fields>::type * enable = nullptr)
-{
-    using Index = std::integral_constant<size_t, index>;
-    using Struct = typename ProxyType<LocalType>::Struct;
-    using Accessor = typename std::tuple_element<index, typename ProxyStruct<Struct>::Accessors>::type;
-    auto&& field_output = Make<StructField, Accessor>(output);
-    auto&& field_value = value.*ProxyType<LocalType>::get(Index());
-    BuildField(TypeList<Decay<decltype(field_value)>>(), invoke_context, field_output, field_value);
-    BuildOne<index + 1>(param, invoke_context, output, value);
-}
-
-template <size_t index, typename LocalType, typename Value, typename Output>
-void BuildOne(TypeList<LocalType> param,
-    InvokeContext& invoke_context,
-    Output&& output,
-    Value&& value,
-    typename std::enable_if<index == ProxyType<LocalType>::fields>::type* enable = nullptr)
-{
-}
-
-template <typename LocalType, typename Value, typename Output>
-void CustomBuildField(TypeList<LocalType> local_type,
-    Priority<1>,
-    InvokeContext& invoke_context,
-    Value&& value,
-    Output&& output,
-    typename ProxyType<LocalType>::Struct* enable = nullptr)
-{
-    BuildOne<0>(local_type, invoke_context, output.init(), value);
-}
-
 //! PassField override for callable interface reference arguments.
 template <typename Accessor, typename LocalType, typename ServerContext, typename Fn, typename... Args>
 auto PassField(Priority<1>, TypeList<LocalType&>, ServerContext& server_context, Fn&& fn, Args&&... args)

include/mp/type-struct.h

@@ -0,0 +1,85 @@
+// Copyright (c) 2025 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef MP_PROXY_TYPE_STRUCT_H
+#define MP_PROXY_TYPE_STRUCT_H
+
+#include <mp/util.h>
+
+namespace mp {
+template <size_t index, typename LocalType, typename Value, typename Output>
+void BuildOne(TypeList<LocalType> param,
+    InvokeContext& invoke_context,
+    Output&& output,
+    Value&& value,
+    typename std::enable_if < index<ProxyType<LocalType>::fields>::type * enable = nullptr)
+{
+    using Index = std::integral_constant<size_t, index>;
+    using Struct = typename ProxyType<LocalType>::Struct;
+    using Accessor = typename std::tuple_element<index, typename ProxyStruct<Struct>::Accessors>::type;
+    auto&& field_output = Make<StructField, Accessor>(output);
+    auto&& field_value = value.*ProxyType<LocalType>::get(Index());
+    BuildField(TypeList<Decay<decltype(field_value)>>(), invoke_context, field_output, field_value);
+    BuildOne<index + 1>(param, invoke_context, output, value);
+}
+
+template <size_t index, typename LocalType, typename Value, typename Output>
+void BuildOne(TypeList<LocalType> param,
+    InvokeContext& invoke_context,
+    Output&& output,
+    Value&& value,
+    typename std::enable_if<index == ProxyType<LocalType>::fields>::type* enable = nullptr)
+{
+}
+
+template <typename LocalType, typename Value, typename Output>
+void CustomBuildField(TypeList<LocalType> local_type,
+    Priority<1>,
+    InvokeContext& invoke_context,
+    Value&& value,
+    Output&& output,
+    typename ProxyType<LocalType>::Struct* enable = nullptr)
+{
+    BuildOne<0>(local_type, invoke_context, output.init(), value);
+}
+
+template <size_t index, typename LocalType, typename Input, typename Value>
+void ReadOne(TypeList<LocalType> param,
+    InvokeContext& invoke_context,
+    Input&& input,
+    Value&& value,
+    typename std::enable_if<index != ProxyType<LocalType>::fields>::type* enable = nullptr)
+{
+    using Index = std::integral_constant<size_t, index>;
+    using Struct = typename ProxyType<LocalType>::Struct;
+    using Accessor = typename std::tuple_element<index, typename ProxyStruct<Struct>::Accessors>::type;
+    const auto& struc = input.get();
+    auto&& field_value = value.*ProxyType<LocalType>::get(Index());
+    ReadField(TypeList<RemoveCvRef<decltype(field_value)>>(), invoke_context, Make<StructField, Accessor>(struc),
+        ReadDestUpdate(field_value));
+    ReadOne<index + 1>(param, invoke_context, input, value);
+}
+
+template <size_t index, typename LocalType, typename Input, typename Value>
+void ReadOne(TypeList<LocalType> param,
+    InvokeContext& invoke_context,
+    Input& input,
+    Value& value,
+    typename std::enable_if<index == ProxyType<LocalType>::fields>::type* enable = nullptr)
+{
+}
+
+template <typename LocalType, typename Input, typename ReadDest>
+decltype(auto) CustomReadField(TypeList<LocalType> param,
+    Priority<1>,
+    InvokeContext& invoke_context,
+    Input&& input,
+    ReadDest&& read_dest,
+    typename ProxyType<LocalType>::Struct* enable = nullptr)
+{
+    return read_dest.update([&](auto& value) { ReadOne<0>(param, invoke_context, input, value); });
+}
+} // namespace mp
+
+#endif // MP_PROXY_TYPE_STRUCT_H

test/mp/test/foo-types.h

@@ -12,6 +12,7 @@
 #include <mp/type-number.h>
 #include <mp/type-set.h>
 #include <mp/type-string.h>
+#include <mp/type-struct.h>
 #include <mp/type-vector.h>
 
 namespace mp {