Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/decimal/decimal128.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ template <typename Integral>
constexpr decimal128& operator=(const Integeral& RHS) noexcept;

// 3.2.4.4 Conversion to integral type
// If the value exceeds the range of the integral,
// or is non-finite std::numeric_limits::max() is returned
explicit constexpr operator int() const noexcept;
explicit constexpr operator unsigned() const noexcept;
explicit constexpr operator long() const noexcept;
Expand Down
2 changes: 2 additions & 0 deletions doc/decimal/decimal128_fast.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ template <typename Integral>
constexpr decimal128_fast& operator=(const Integeral& RHS) noexcept;

// 3.2.4.4 Conversion to integral type
// If the value exceeds the range of the integral,
// or is non-finite std::numeric_limits::max() is returned
explicit constexpr operator int() const noexcept;
explicit constexpr operator unsigned() const noexcept;
explicit constexpr operator long() const noexcept;
Expand Down
2 changes: 2 additions & 0 deletions doc/decimal/decimal32.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ template <typename Integral>
constexpr decimal32& operator=(const Integeral& RHS) noexcept;

// 3.2.2.4 Conversion to integral type
// If the value exceeds the range of the integral,
// or is non-finite std::numeric_limits::max() is returned
explicit constexpr operator int() const noexcept;
explicit constexpr operator unsigned() const noexcept;
explicit constexpr operator long() const noexcept;
Expand Down
2 changes: 2 additions & 0 deletions doc/decimal/decimal32_fast.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ template <typename Integral>
constexpr decimal32_fast& operator=(const Integeral& RHS) noexcept;

// 3.2.2.4 Conversion to integral type
// If the value exceeds the range of the integral,
// or is non-finite std::numeric_limits::max() is returned
explicit constexpr operator int() const noexcept;
explicit constexpr operator unsigned() const noexcept;
explicit constexpr operator long() const noexcept;
Expand Down
2 changes: 2 additions & 0 deletions doc/decimal/decimal64.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ template <typename Integral>
constexpr decimal64& operator=(const Integeral& RHS) noexcept;

// 3.2.3.4 Conversion to integral type
// If the value exceeds the range of the integral,
// or is non-finite std::numeric_limits::max() is returned
explicit constexpr operator int() const noexcept;
explicit constexpr operator unsigned() const noexcept;
explicit constexpr operator long() const noexcept;
Expand Down
2 changes: 2 additions & 0 deletions doc/decimal/decimal64_fast.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ template <typename Integral>
constexpr decimal64_fast& operator=(const Integeral& RHS) noexcept;

// 3.2.3.4 Conversion to integral type
// If the value exceeds the range of the integral,
// or is non-finite std::numeric_limits::max() is returned
explicit constexpr operator int() const noexcept;
explicit constexpr operator unsigned() const noexcept;
explicit constexpr operator long() const noexcept;
Expand Down
20 changes: 6 additions & 14 deletions include/boost/decimal/detail/to_integral.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,19 @@ constexpr auto to_integral(Decimal val) noexcept
if (isnan(val))
{
errno = EINVAL;
return static_cast<TargetType>(0);
return static_cast<TargetType>(std::numeric_limits<TargetType>::max());
}
if (isinf(val) || val > max_target_type || val < min_target_type)
{
errno = ERANGE;
return static_cast<TargetType>(0);
return static_cast<TargetType>(std::numeric_limits<TargetType>::max());
}

auto result {static_cast<Conversion_Type>(val.full_significand())};
auto expval {val.biased_exponent()};
const auto abs_exp_val {detail::make_positive_unsigned(expval)};

if (abs_exp_val >= 19)
{
result = 0;
}
else if (expval > 0)
if (expval > 0)
{
result *= detail::pow10<Conversion_Type>(static_cast<Conversion_Type>(expval));
}
Expand All @@ -84,23 +80,19 @@ constexpr auto to_integral_128(Decimal val) noexcept
if (isnan(val))
{
errno = EINVAL;
return static_cast<TargetType>(UINT64_C(0));
return static_cast<TargetType>(std::numeric_limits<TargetType>::max());
}
if (isinf(val) || val > max_target_type || val < min_target_type)
{
errno = ERANGE;
return static_cast<TargetType>(UINT64_C(0));
return static_cast<TargetType>(std::numeric_limits<TargetType>::max());
}

auto sig {val.full_significand()};
auto expval {val.biased_exponent()};
const auto abs_exp_val {detail::make_positive_unsigned(expval)};

if (abs_exp_val >= 38)
{
sig = 0;
}
else if (expval > 0)
if (expval > 0)
{
sig *= detail::pow10<detail::uint128>(expval);
}
Expand Down
16 changes: 8 additions & 8 deletions test/roundtrip_decimal128.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,20 @@ void test_conversion_to_integer()
else
{
// Bad conversion so we use zero
BOOST_TEST_EQ(static_cast<T>(-one), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(-one), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);
}

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal128>::infinity()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal128>::infinity()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(-std::numeric_limits<decimal128>::infinity()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(-std::numeric_limits<decimal128>::infinity()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal128>::quiet_NaN()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, EINVAL);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal128>::quiet_NaN()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, EINVAL);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal128>::signaling_NaN()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, EINVAL);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal128>::signaling_NaN()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, EINVAL);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(half), static_cast<T>(0)) && BOOST_TEST_EQ(errno, 0);
Expand All @@ -89,13 +89,13 @@ void test_conversion_to_integer()
std::mt19937_64 rng(42);
std::uniform_int_distribution<int> dist(-100, -20);
errno = 0;
BOOST_TEST_EQ(static_cast<unsigned>(decimal128(dist(rng))), static_cast<unsigned>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned>(decimal128(dist(rng))), std::numeric_limits<unsigned>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<unsigned long>(decimal128(dist(rng))), static_cast<unsigned long>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned long>(decimal128(dist(rng))), std::numeric_limits<unsigned long>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<unsigned long long>(decimal128(dist(rng))), static_cast<unsigned long long>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned long long>(decimal128(dist(rng))), std::numeric_limits<unsigned long long>::max()) && BOOST_TEST_EQ(errno, ERANGE);
}

template <typename T>
Expand Down
16 changes: 8 additions & 8 deletions test/roundtrip_decimal128_fast.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,20 @@ void test_conversion_to_integer()
else
{
// Bad conversion so we use zero
BOOST_TEST_EQ(static_cast<T>(-one), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(-one), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);
}

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal128_fast>::infinity()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal128_fast>::infinity()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(-std::numeric_limits<decimal128_fast>::infinity()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(-std::numeric_limits<decimal128_fast>::infinity()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal128_fast>::quiet_NaN()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, EINVAL);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal128_fast>::quiet_NaN()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, EINVAL);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal128_fast>::signaling_NaN()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, EINVAL);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal128_fast>::signaling_NaN()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, EINVAL);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(half), static_cast<T>(0)) && BOOST_TEST_EQ(errno, 0);
Expand All @@ -89,13 +89,13 @@ void test_conversion_to_integer()
std::mt19937_64 rng(42);
std::uniform_int_distribution<int> dist(-100, -20);
errno = 0;
BOOST_TEST_EQ(static_cast<unsigned>(decimal128_fast(dist(rng))), static_cast<unsigned>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned>(decimal128_fast(dist(rng))), std::numeric_limits<unsigned>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<unsigned long>(decimal128_fast(dist(rng))), static_cast<unsigned long>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned long>(decimal128_fast(dist(rng))), std::numeric_limits<unsigned long>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<unsigned long long>(decimal128_fast(dist(rng))), static_cast<unsigned long long>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned long long>(decimal128_fast(dist(rng))), std::numeric_limits<unsigned long long>::max()) && BOOST_TEST_EQ(errno, ERANGE);
}

template <typename T>
Expand Down
16 changes: 8 additions & 8 deletions test/roundtrip_decimal32.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@ void test_conversion_to_integer()
else
{
// Bad conversion so we use zero
BOOST_TEST_EQ(static_cast<T>(-one), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(-one), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);
}

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal32>::infinity()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal32>::infinity()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(-std::numeric_limits<decimal32>::infinity()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(-std::numeric_limits<decimal32>::infinity()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal32>::quiet_NaN()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, EINVAL);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal32>::quiet_NaN()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, EINVAL);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal32>::signaling_NaN()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, EINVAL);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal32>::signaling_NaN()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, EINVAL);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(half), static_cast<T>(0)) && BOOST_TEST_EQ(errno, 0);
Expand All @@ -82,13 +82,13 @@ void test_conversion_to_integer()
std::mt19937_64 rng(42);
std::uniform_int_distribution<int> dist(-100, -20);
errno = 0;
BOOST_TEST_EQ(static_cast<unsigned>(decimal32(dist(rng))), static_cast<unsigned>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned>(decimal32(dist(rng))), std::numeric_limits<unsigned>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<unsigned long>(decimal32(dist(rng))), static_cast<unsigned long>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned long>(decimal32(dist(rng))), std::numeric_limits<unsigned long>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<unsigned long long>(decimal32(dist(rng))), static_cast<unsigned long long>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned long long>(decimal32(dist(rng))), std::numeric_limits<unsigned long long>::max()) && BOOST_TEST_EQ(errno, ERANGE);
}

template <typename T>
Expand Down
16 changes: 8 additions & 8 deletions test/roundtrip_decimal32_fast.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ void test_conversion_to_integer()
else
{
// Bad conversion so we use zero
BOOST_TEST_EQ(static_cast<T>(-one), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(-one), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);
}

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal32_fast>::infinity()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal32_fast>::infinity()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(-std::numeric_limits<decimal32_fast>::infinity()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(-std::numeric_limits<decimal32_fast>::infinity()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal32_fast>::quiet_NaN()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, EINVAL);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal32_fast>::quiet_NaN()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, EINVAL);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal32_fast>::signaling_NaN()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, EINVAL);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal32_fast>::signaling_NaN()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, EINVAL);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(half), static_cast<T>(0)) && BOOST_TEST_EQ(errno, 0);
Expand All @@ -80,13 +80,13 @@ void test_conversion_to_integer()
std::mt19937_64 rng(42);
std::uniform_int_distribution<int> dist(-100, -20);
errno = 0;
BOOST_TEST_EQ(static_cast<unsigned>(decimal32_fast(dist(rng))), static_cast<unsigned>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned>(decimal32_fast(dist(rng))), std::numeric_limits<unsigned>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<unsigned long>(decimal32_fast(dist(rng))), static_cast<unsigned long>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned long>(decimal32_fast(dist(rng))), std::numeric_limits<unsigned long>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<unsigned long long>(decimal32_fast(dist(rng))), static_cast<unsigned long long>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned long long>(decimal32_fast(dist(rng))), std::numeric_limits<unsigned long long>::max()) && BOOST_TEST_EQ(errno, ERANGE);
}

template <typename T>
Expand Down
16 changes: 8 additions & 8 deletions test/roundtrip_decimal64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@ void test_conversion_to_integer()
else
{
// Bad conversion so we use zero
BOOST_TEST_EQ(static_cast<T>(-one), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(-one), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);
}

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal64>::infinity()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal64>::infinity()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(-std::numeric_limits<decimal64>::infinity()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<T>(-std::numeric_limits<decimal64>::infinity()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal64>::quiet_NaN()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, EINVAL);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal64>::quiet_NaN()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, EINVAL);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal64>::signaling_NaN()), static_cast<T>(0)) && BOOST_TEST_EQ(errno, EINVAL);
BOOST_TEST_EQ(static_cast<T>(std::numeric_limits<decimal64>::signaling_NaN()), std::numeric_limits<T>::max()) && BOOST_TEST_EQ(errno, EINVAL);

errno = 0;
BOOST_TEST_EQ(static_cast<T>(half), static_cast<T>(0)) && BOOST_TEST_EQ(errno, 0);
Expand All @@ -79,13 +79,13 @@ void test_conversion_to_integer()
std::mt19937_64 rng(42);
std::uniform_int_distribution<int> dist(-100, -20);
errno = 0;
BOOST_TEST_EQ(static_cast<unsigned>(decimal64(dist(rng))), static_cast<unsigned>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned>(decimal64(dist(rng))), std::numeric_limits<unsigned>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<unsigned long>(decimal64(dist(rng))), static_cast<unsigned long>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned long>(decimal64(dist(rng))), std::numeric_limits<unsigned long>::max()) && BOOST_TEST_EQ(errno, ERANGE);

errno = 0;
BOOST_TEST_EQ(static_cast<unsigned long long>(decimal64(dist(rng))), static_cast<unsigned long long>(0)) && BOOST_TEST_EQ(errno, ERANGE);
BOOST_TEST_EQ(static_cast<unsigned long long>(decimal64(dist(rng))), std::numeric_limits<unsigned long long>::max()) && BOOST_TEST_EQ(errno, ERANGE);
}

template <typename T>
Expand Down
Loading