refactor: Update numeric risk templates to use std_integer and std_floating for improved type safety

Author: FrozenLemonTee

src/conversion/underlying.cppm

@@ -21,9 +21,9 @@ concept statically_castable = requires(SrcRep value) {
 
 template <typename DestRep, typename SrcRep>
 concept builtin_numeric_pair =
-    numeric_underlying_type<DestRep> && numeric_underlying_type<SrcRep>;
+    std_numeric<DestRep> && std_numeric<SrcRep>;
 
-template <integer_underlying_type DestRep, integer_underlying_type SrcRep>
+template <std_integer DestRep, std_integer SrcRep>
 constexpr auto numeric_risk(SrcRep value)
     -> std::optional<risk::kind> {
   using dest_type = std::remove_cvref_t<DestRep>;
@@ -62,7 +62,7 @@ constexpr auto numeric_risk(SrcRep value)
   }
 }
 
-template <integer_underlying_type DestRep, floating_underlying_type SrcRep>
+template <std_integer DestRep, std_floating SrcRep>
 constexpr auto numeric_risk(SrcRep value)
     -> std::optional<risk::kind> {
   using dest_type = std::remove_cvref_t<DestRep>;
@@ -91,7 +91,7 @@ constexpr auto numeric_risk(SrcRep value)
   return std::nullopt;
 }
 
-template <floating_underlying_type DestRep, integer_underlying_type SrcRep>
+template <std_floating DestRep, std_integer SrcRep>
 constexpr auto numeric_risk(SrcRep value)
     -> std::optional<risk::kind> {
   using dest_type = std::remove_cvref_t<DestRep>;
@@ -111,7 +111,7 @@ constexpr auto numeric_risk(SrcRep value)
   return std::nullopt;
 }
 
-template <floating_underlying_type DestRep, floating_underlying_type SrcRep>
+template <std_floating DestRep, std_floating SrcRep>
 constexpr auto numeric_risk(SrcRep value)
     -> std::optional<risk::kind> {
   using dest_type = std::remove_cvref_t<DestRep>;
@@ -200,8 +200,7 @@ constexpr auto truncating_rep_cast(SrcRep value) noexcept
   using dest_type = std::remove_cvref_t<DestRep>;
   using src_type = std::remove_cvref_t<SrcRep>;
 
-  if constexpr (integer_underlying_type<dest_type> &&
-                floating_underlying_type<src_type>) {
+  if constexpr (std_integer<dest_type> && std_floating<src_type>) {
     if (std::isnan(value)) {
       return dest_type{};
     }
@@ -280,25 +279,25 @@ constexpr auto cast_underlying_result(Src value, RepCaster rep_caster)
 
 export namespace mcpplibs::primitives::conversion {
 
-template <integer_underlying_type DestRep, integer_underlying_type SrcRep>
+template <std_integer DestRep, std_integer SrcRep>
 constexpr auto numeric_risk(SrcRep value)
     -> std::optional<risk::kind> {
   return details::numeric_risk<DestRep>(value);
 }
 
-template <integer_underlying_type DestRep, floating_underlying_type SrcRep>
+template <std_integer DestRep, std_floating SrcRep>
 constexpr auto numeric_risk(SrcRep value)
     -> std::optional<risk::kind> {
   return details::numeric_risk<DestRep>(value);
 }
 
-template <floating_underlying_type DestRep, integer_underlying_type SrcRep>
+template <std_floating DestRep, std_integer SrcRep>
 constexpr auto numeric_risk(SrcRep value)
     -> std::optional<risk::kind> {
   return details::numeric_risk<DestRep>(value);
 }
 
-template <floating_underlying_type DestRep, floating_underlying_type SrcRep>
+template <std_floating DestRep, std_floating SrcRep>
 constexpr auto numeric_risk(SrcRep value)
     -> std::optional<risk::kind> {
   return details::numeric_risk<DestRep>(value);

src/operations/operators.cppm

@@ -532,18 +532,22 @@ constexpr auto apply_assign(Lhs &lhs, Rhs const &rhs)
   using lhs_value_type = lhs_traits::value_type;
   using lhs_value_policy = lhs_traits::value_policy;
   using lhs_rep = underlying::traits<lhs_value_type>::rep_type;
+  using assign_meta = dispatcher_meta<OpTag, Lhs, Rhs, ErrorPayload>;
+  using common_value_type = assign_meta::common_rep;
+  using common_rep = underlying::traits<common_value_type>::rep_type;
 
   auto out = apply<OpTag, Lhs, Rhs, ErrorPayload>(lhs, rhs);
   if (!out.has_value()) {
     return std::unexpected(out.error());
   }
 
   auto const assigned_common = out->load();
+  auto const assigned_common_rep =
+      underlying::traits<common_value_type>::to_rep(assigned_common);
   if constexpr (std::same_as<lhs_value_policy, policy::value::checked> &&
-                std::integral<lhs_rep>) {
+                std_integer<lhs_rep> && std_numeric<common_rep>) {
     if (auto const kind =
-            conversion::numeric_risk<lhs_rep>(
-                assigned_common);
+            conversion::numeric_risk<lhs_rep>(assigned_common_rep);
         kind.has_value()) {
       return std::unexpected(
           details::to_error_payload<ErrorPayload>(
@@ -552,7 +556,7 @@ constexpr auto apply_assign(Lhs &lhs, Rhs const &rhs)
   }
 
   auto const assigned_rep =
-      conversion::saturating_cast<lhs_rep>(assigned_common);
+      conversion::saturating_cast<lhs_rep>(assigned_common_rep);
   lhs.store(underlying::traits<lhs_value_type>::from_rep(assigned_rep));
   return out;
 }