Use single arg check_non_finite decimal_fast32_t

Author: mborland

include/boost/decimal/decimal_fast32_t.hpp

@@ -221,6 +221,9 @@ BOOST_DECIMAL_EXPORT class decimal_fast32_t final
     template <typename Decimal>
     friend constexpr Decimal detail::check_non_finite(Decimal lhs, Decimal rhs) noexcept;
 
+    template <typename Decimal>
+    friend constexpr Decimal detail::check_non_finite(Decimal x) noexcept;
+
 public:
     constexpr decimal_fast32_t() noexcept = default;
 
@@ -1007,7 +1010,7 @@ constexpr auto operator+(const decimal_fast32_t lhs, const Integer rhs) noexcept
     #ifndef BOOST_DECIMAL_FAST_MATH
     if (!isfinite(lhs))
     {
-        return lhs;
+        return detail::check_non_finite(lhs);
     }
     #endif
 
@@ -1059,7 +1062,7 @@ constexpr auto operator-(const decimal_fast32_t lhs, const Integer rhs) noexcept
     #ifndef BOOST_DECIMAL_FAST_MATH
     if (!isfinite(lhs))
     {
-        return lhs;
+        return detail::check_non_finite(lhs);
     }
     #endif
 
@@ -1085,7 +1088,7 @@ constexpr auto operator-(const Integer lhs, const decimal_fast32_t rhs) noexcept
     #ifndef BOOST_DECIMAL_FAST_MATH
     if (!isfinite(rhs))
     {
-        return rhs;
+        return detail::check_non_finite(rhs);
     }
     #endif
 
@@ -1128,7 +1131,7 @@ constexpr auto operator*(const decimal_fast32_t lhs, const Integer rhs) noexcept
     #ifndef BOOST_DECIMAL_FAST_MATH
     if (!isfinite(lhs))
     {
-        return lhs;
+        return detail::check_non_finite(lhs);
     }
     #endif
 
@@ -1259,7 +1262,6 @@ constexpr auto operator/(const decimal_fast32_t lhs, const Integer rhs) noexcept
     #ifndef BOOST_DECIMAL_FAST_MATH
     // Check pre-conditions
     constexpr decimal_fast32_t zero {0, 0};
-    constexpr decimal_fast32_t nan {direct_init(detail::d32_fast_qnan, UINT8_C(0), false)};
     constexpr decimal_fast32_t inf {direct_init(detail::d32_fast_inf, UINT8_C(0), false)};
 
     const bool sign {lhs.isneg() != (rhs < 0)};
@@ -1269,9 +1271,9 @@ constexpr auto operator/(const decimal_fast32_t lhs, const Integer rhs) noexcept
     switch (lhs_fp)
     {
         case FP_NAN:
-            return nan;
+            return issignaling(lhs) ? nan_conversion(lhs) : lhs;
         case FP_INFINITE:
-            return inf;
+            return lhs;
         case FP_ZERO:
             return sign ? -zero : zero;
         default:
@@ -1300,20 +1302,16 @@ constexpr auto operator/(const Integer lhs, const decimal_fast32_t rhs) noexcept
     #ifndef BOOST_DECIMAL_FAST_MATH
     // Check pre-conditions
     constexpr decimal_fast32_t zero {0, 0};
-    constexpr decimal_fast32_t nan {direct_init(detail::d32_fast_qnan, UINT8_C(0), false)};
     constexpr decimal_fast32_t inf {direct_init(detail::d32_fast_inf, UINT8_C(0), false)};
 
     const bool sign {(lhs < 0) != rhs.isneg()};
 
     const auto rhs_fp {fpclassify(rhs)};
 
-    if (rhs_fp == FP_NAN)
-    {
-        return nan;
-    }
-
     switch (rhs_fp)
     {
+        case FP_NAN:
+            return issignaling(rhs) ? nan_conversion(rhs) : rhs;
         case FP_INFINITE:
             return sign ? -zero : zero;
         case FP_ZERO:

test/test_nan_conversions.cpp

@@ -250,7 +250,7 @@ int main()
     generate_mixed_tests<decimal64_t>();
     generate_mixed_tests<decimal128_t>();
 
-    //generate_mixed_tests<decimal_fast32_t>();
+    generate_mixed_tests<decimal_fast32_t>();
     //generate_mixed_tests<decimal_fast64_t>();
     //generate_mixed_tests<decimal_fast128_t>();