Use new impl in decimal64_fast

Author: mborland

include/boost/decimal/decimal64_fast.hpp

@@ -888,27 +888,10 @@ constexpr auto operator+(decimal64_fast lhs, decimal64_fast rhs) noexcept -> dec
     }
     #endif
 
-    bool lhs_bigger {lhs > rhs};
-    if (lhs.isneg() && rhs.isneg())
-    {
-        lhs_bigger = !lhs_bigger;
-    }
-
-    // Ensure that lhs is always the larger for ease of impl
-    if (!lhs_bigger)
-    {
-        detail::swap(lhs, rhs);
-    }
-
-    if (!lhs.isneg() && rhs.isneg())
-    {
-        return lhs - abs(rhs);
-    }
-
     return detail::d64_add_impl<decimal64_fast>(
-              lhs.significand_, lhs.biased_exponent(), lhs.sign_,
-              rhs.significand_, rhs.biased_exponent(), rhs.sign_
-              );
+            lhs.significand_, lhs.biased_exponent(), lhs.sign_,
+            rhs.significand_, rhs.biased_exponent(), rhs.sign_,
+            (abs(lhs) > abs(rhs)));
 }
 
 template <typename Integer>
@@ -925,45 +908,16 @@ constexpr auto operator+(decimal64_fast lhs, Integer rhs) noexcept
     }
     #endif
 
-    bool lhs_bigger {lhs > rhs};
-    if (lhs.isneg() && (rhs < 0))
-    {
-        lhs_bigger = !lhs_bigger;
-    }
     auto sig_rhs {static_cast<promoted_significand_type>(detail::make_positive_unsigned(rhs))};
-    bool abs_lhs_bigger {abs(lhs) > sig_rhs};
-
-    auto lhs_components {detail::decimal64_fast_components{lhs.significand_, lhs.biased_exponent(), lhs.isneg()}};
+    const bool abs_lhs_bigger {abs(lhs) > sig_rhs};
 
     exp_type exp_rhs {0};
     detail::normalize<decimal64>(sig_rhs, exp_rhs);
-    auto unsigned_sig_rhs {static_cast<detail::decimal64_fast_components::significand_type>(sig_rhs)};
-    auto rhs_components {detail::decimal64_fast_components{unsigned_sig_rhs, exp_rhs, (rhs < 0)}};
-
-    if (!lhs_bigger)
-    {
-        detail::swap(lhs_components, rhs_components);
-        abs_lhs_bigger = !abs_lhs_bigger;
-    }
-
-    #ifdef BOOST_DECIMAL_DEBUG_ADD
-    std::cerr << "Lhs sig: " << lhs_components.sig
-              << "\nLhs exp: " << lhs_components.exp
-              << "\nRhs sig: " << rhs_components.sig
-              << "\nRhs exp: " << rhs_components.exp << std::endl;
-    #endif
+    const auto final_sig_rhs {static_cast<decimal64_fast::significand_type>(sig_rhs)};
 
-    if (!lhs_components.sign && rhs_components.sign)
-    {
-        return detail::d64_sub_impl<decimal64_fast>(lhs_components.sig, lhs_components.exp, lhs_components.sign,
-                                                    rhs_components.sig, rhs_components.exp, rhs_components.sign,
-                                                    abs_lhs_bigger);
-    }
-    else
-    {
-        return detail::d64_add_impl<decimal64_fast>(lhs_components.sig, lhs_components.exp, lhs_components.sign,
-                                                    rhs_components.sig, rhs_components.exp, rhs_components.sign);
-    }
+    return detail::d64_add_impl<decimal64_fast>(lhs.significand_, lhs.biased_exponent(), lhs.sign_,
+                                                final_sig_rhs, exp_rhs, (rhs < 0),
+                                                abs_lhs_bigger);
 }
 
 template <typename Integer>