moveonly: add mp/type-map.h

Author: ryanofsky

CMakeLists.txt

@@ -46,6 +46,7 @@ set(MP_PUBLIC_HEADERS
   include/mp/proxy-types.h
   include/mp/proxy.h
   include/mp/type-context.h
+  include/mp/type-map.h
   include/mp/type-optional.h
   include/mp/type-pointer.h
   include/mp/type-set.h

include/mp/proxy-types.h

@@ -143,29 +143,6 @@ struct ReadDestUpdate
 
 
 
-
-
-template <typename KeyLocalType, typename ValueLocalType, typename Input, typename ReadDest>
-decltype(auto) CustomReadField(TypeList<std::map<KeyLocalType, ValueLocalType>>,
-    Priority<1>,
-    InvokeContext& invoke_context,
-    Input&& input,
-    ReadDest&& read_dest)
-{
-    return read_dest.update([&](auto& value) {
-        auto data = input.get();
-        value.clear();
-        for (auto item : data) {
-            ReadField(TypeList<std::pair<const KeyLocalType, ValueLocalType>>(), invoke_context,
-                Make<ValueField>(item),
-                ReadDestEmplace(
-                    TypeList<std::pair<const KeyLocalType, ValueLocalType>>(), [&](auto&&... args) -> auto& {
-                        return *value.emplace(std::forward<decltype(args)>(args)...).first;
-                    }));
-        }
-    });
-}
-
 template <typename KeyLocalType, typename ValueLocalType, typename Input, typename ReadDest>
 decltype(auto) CustomReadField(TypeList<std::pair<KeyLocalType, ValueLocalType>>,
     Priority<1>,
@@ -579,22 +556,6 @@ struct ListOutput<::capnp::List<T, kind>>
     // clang-format on
 };
 
-template <typename KeyLocalType, typename ValueLocalType, typename Value, typename Output>
-void CustomBuildField(TypeList<std::map<KeyLocalType, ValueLocalType>>,
-    Priority<1>,
-    InvokeContext& invoke_context,
-    Value&& value,
-    Output&& output)
-{
-    // FIXME dededup with vector handler above
-    auto list = output.init(value.size());
-    size_t i = 0;
-    for (const auto& elem : value) {
-        BuildField(TypeList<std::pair<KeyLocalType, ValueLocalType>>(), invoke_context,
-            ListOutput<typename decltype(list)::Builds>(list, i), elem);
-        ++i;
-    }
-}
 template <typename Value>
 ::capnp::Void BuildPrimitive(InvokeContext& invoke_context, Value&&, TypeList<::capnp::Void>)
 {

include/mp/type-map.h

@@ -0,0 +1,51 @@
+// 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_MAP_H
+#define MP_PROXY_TYPE_MAP_H
+
+#include <mp/proxy-types.h>
+#include <mp/util.h>
+
+namespace mp {
+template <typename KeyLocalType, typename ValueLocalType, typename Value, typename Output>
+void CustomBuildField(TypeList<std::map<KeyLocalType, ValueLocalType>>,
+    Priority<1>,
+    InvokeContext& invoke_context,
+    Value&& value,
+    Output&& output)
+{
+    // FIXME dededup with vector handler above
+    auto list = output.init(value.size());
+    size_t i = 0;
+    for (const auto& elem : value) {
+        BuildField(TypeList<std::pair<KeyLocalType, ValueLocalType>>(), invoke_context,
+            ListOutput<typename decltype(list)::Builds>(list, i), elem);
+        ++i;
+    }
+}
+
+template <typename KeyLocalType, typename ValueLocalType, typename Input, typename ReadDest>
+decltype(auto) CustomReadField(TypeList<std::map<KeyLocalType, ValueLocalType>>,
+    Priority<1>,
+    InvokeContext& invoke_context,
+    Input&& input,
+    ReadDest&& read_dest)
+{
+    return read_dest.update([&](auto& value) {
+        auto data = input.get();
+        value.clear();
+        for (auto item : data) {
+            ReadField(TypeList<std::pair<const KeyLocalType, ValueLocalType>>(), invoke_context,
+                Make<ValueField>(item),
+                ReadDestEmplace(
+                    TypeList<std::pair<const KeyLocalType, ValueLocalType>>(), [&](auto&&... args) -> auto& {
+                        return *value.emplace(std::forward<decltype(args)>(args)...).first;
+                    }));
+        }
+    });
+}
+} // namespace mp
+
+#endif // MP_PROXY_TYPE_MAP_H

test/mp/test/foo-types.h

@@ -7,6 +7,7 @@
 
 #include <mp/proxy-types.h>
 #include <mp/type-context.h>
+#include <mp/type-map.h>
 #include <mp/type-set.h>
 #include <mp/type-vector.h>