moveonly: add mp/type-number.h

Author: ryanofsky

CMakeLists.txt

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

include/mp/proxy-types.h

@@ -141,45 +141,6 @@ struct ReadDestUpdate
     Value& m_value;
 };
 
-template <typename LocalType, typename Input, typename ReadDest>
-decltype(auto) CustomReadField(TypeList<LocalType>,
-    Priority<1>,
-    InvokeContext& invoke_context,
-    Input&& input,
-    ReadDest&& read_dest,
-    typename std::enable_if<std::is_enum<LocalType>::value>::type* enable = 0)
-{
-    return read_dest.construct(static_cast<LocalType>(input.get()));
-}
-
-template <typename LocalType, typename Input, typename ReadDest>
-decltype(auto) CustomReadField(TypeList<LocalType>,
-    Priority<1>,
-    InvokeContext& invoke_context,
-    Input&& input,
-    ReadDest&& read_dest,
-    typename std::enable_if<std::is_integral<LocalType>::value>::type* enable = nullptr)
-{
-    auto value = input.get();
-    if (value < std::numeric_limits<LocalType>::min() || value > std::numeric_limits<LocalType>::max()) {
-        throw std::range_error("out of bound int received");
-    }
-    return read_dest.construct(static_cast<LocalType>(value));
-}
-
-template <typename LocalType, typename Input, typename ReadDest>
-decltype(auto) CustomReadField(TypeList<LocalType>,
-    Priority<1>,
-    InvokeContext& invoke_context,
-    Input&& input,
-    ReadDest&& read_dest,
-    typename std::enable_if<std::is_floating_point<LocalType>::value>::type* enable = 0)
-{
-    auto value = input.get();
-    static_assert(std::is_same<LocalType, decltype(value)>::value, "floating point type mismatch");
-    return read_dest.construct(value);
-}
-
 template <typename Input, typename ReadDest>
 decltype(auto) CustomReadField(TypeList<std::string>,
     Priority<1>,
@@ -516,43 +477,6 @@ ::capnp::Void BuildPrimitive(InvokeContext& invoke_context, Value&&, TypeList<::
 {
     return {};
 }
-
-template <typename LocalType, typename Value>
-LocalType BuildPrimitive(InvokeContext& invoke_context,
-    const Value& value,
-    TypeList<LocalType>,
-    typename std::enable_if<std::is_enum<Value>::value>::type* enable = nullptr)
-{
-    using E = std::make_unsigned_t<std::underlying_type_t<Value>>;
-    using T = std::make_unsigned_t<LocalType>;
-    static_assert(std::numeric_limits<T>::max() >= std::numeric_limits<E>::max(), "mismatched integral/enum types");
-    return static_cast<LocalType>(value);
-}
-
-template <typename LocalType, typename Value>
-LocalType BuildPrimitive(InvokeContext& invoke_context,
-    const Value& value,
-    TypeList<LocalType>,
-    typename std::enable_if<std::is_integral<Value>::value, int>::type* enable = nullptr)
-{
-    static_assert(
-        std::numeric_limits<LocalType>::lowest() <= std::numeric_limits<Value>::lowest(), "mismatched integral types");
-    static_assert(
-        std::numeric_limits<LocalType>::max() >= std::numeric_limits<Value>::max(), "mismatched integral types");
-    return value;
-}
-
-template <typename LocalType, typename Value>
-LocalType BuildPrimitive(InvokeContext& invoke_context,
-    const Value& value,
-    TypeList<LocalType>,
-    typename std::enable_if<std::is_floating_point<Value>::value>::type* enable = nullptr)
-{
-    static_assert(std::is_same<Value, LocalType>::value,
-        "mismatched floating point types. please fix message.capnp type declaration to match wrapped interface");
-    return value;
-}
-
 template <typename Output>
 void CustomBuildField(TypeList<std::exception>,
     Priority<1>,

include/mp/type-number.h

@@ -0,0 +1,87 @@
+// 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_NUMBER_H
+#define MP_PROXY_TYPE_NUMBER_H
+
+#include <mp/util.h>
+
+namespace mp {
+template <typename LocalType, typename Value>
+LocalType BuildPrimitive(InvokeContext& invoke_context,
+    const Value& value,
+    TypeList<LocalType>,
+    typename std::enable_if<std::is_enum<Value>::value>::type* enable = nullptr)
+{
+    using E = std::make_unsigned_t<std::underlying_type_t<Value>>;
+    using T = std::make_unsigned_t<LocalType>;
+    static_assert(std::numeric_limits<T>::max() >= std::numeric_limits<E>::max(), "mismatched integral/enum types");
+    return static_cast<LocalType>(value);
+}
+
+template <typename LocalType, typename Value>
+LocalType BuildPrimitive(InvokeContext& invoke_context,
+    const Value& value,
+    TypeList<LocalType>,
+    typename std::enable_if<std::is_integral<Value>::value, int>::type* enable = nullptr)
+{
+    static_assert(
+        std::numeric_limits<LocalType>::lowest() <= std::numeric_limits<Value>::lowest(), "mismatched integral types");
+    static_assert(
+        std::numeric_limits<LocalType>::max() >= std::numeric_limits<Value>::max(), "mismatched integral types");
+    return value;
+}
+
+template <typename LocalType, typename Value>
+LocalType BuildPrimitive(InvokeContext& invoke_context,
+    const Value& value,
+    TypeList<LocalType>,
+    typename std::enable_if<std::is_floating_point<Value>::value>::type* enable = nullptr)
+{
+    static_assert(std::is_same<Value, LocalType>::value,
+        "mismatched floating point types. please fix message.capnp type declaration to match wrapped interface");
+    return value;
+}
+
+template <typename LocalType, typename Input, typename ReadDest>
+decltype(auto) CustomReadField(TypeList<LocalType>,
+    Priority<1>,
+    InvokeContext& invoke_context,
+    Input&& input,
+    ReadDest&& read_dest,
+    typename std::enable_if<std::is_enum<LocalType>::value>::type* enable = 0)
+{
+    return read_dest.construct(static_cast<LocalType>(input.get()));
+}
+
+template <typename LocalType, typename Input, typename ReadDest>
+decltype(auto) CustomReadField(TypeList<LocalType>,
+    Priority<1>,
+    InvokeContext& invoke_context,
+    Input&& input,
+    ReadDest&& read_dest,
+    typename std::enable_if<std::is_integral<LocalType>::value>::type* enable = nullptr)
+{
+    auto value = input.get();
+    if (value < std::numeric_limits<LocalType>::min() || value > std::numeric_limits<LocalType>::max()) {
+        throw std::range_error("out of bound int received");
+    }
+    return read_dest.construct(static_cast<LocalType>(value));
+}
+
+template <typename LocalType, typename Input, typename ReadDest>
+decltype(auto) CustomReadField(TypeList<LocalType>,
+    Priority<1>,
+    InvokeContext& invoke_context,
+    Input&& input,
+    ReadDest&& read_dest,
+    typename std::enable_if<std::is_floating_point<LocalType>::value>::type* enable = 0)
+{
+    auto value = input.get();
+    static_assert(std::is_same<LocalType, decltype(value)>::value, "floating point type mismatch");
+    return read_dest.construct(value);
+}
+} // namespace mp
+
+#endif // MP_PROXY_TYPE_NUMBER_H

test/mp/test/foo-types.h

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