Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add literals for fast types #753

Merged
merged 4 commits into from
Oct 4, 2024
Merged

Add literals for fast types #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2820006
Add fast type literals
mborland Oct 4, 2024
60eb9a4
Add testing of fast type literals
mborland Oct 4, 2024
b44ee5f
Add documentation of fast type literals
mborland Oct 4, 2024
71ed999
Fix exp range of dec32_fast
mborland Oct 4, 2024
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
22 changes: 21 additions & 1 deletion doc/decimal/literals.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ constexpr auto operator "" _DF(const char* str) -> decimal32
constexpr auto operator "" _df(const char* str) -> decimal32

constexpr auto operator "" _DF(unsigned long long v) -> decimal32
constexpr auto operator "" _dF(unsigned long long v) -> decimal32
constexpr auto operator "" _df(unsigned long long v) -> decimal32

constexpr auto operator "" _DD(const char* str) -> decimal64
constexpr auto operator "" _dd(const char* str) -> decimal64
Expand All @@ -33,6 +33,26 @@ constexpr auto operator "" _dl(const char* str) -> decimal128
constexpr auto operator "" _DL(unsigned long long v) -> decimal128
constexpr auto operator "" _dl(unsigned long long v) -> decimal128

// ----- Fast Type Literals -----

constexpr auto operator "" _DFF(const char* str) -> decimal32_fast
constexpr auto operator "" _dff(const char* str) -> decimal32_fast

constexpr auto operator "" _DFF(unsigned long long v) -> decimal32_fast
constexpr auto operator "" _dff(unsigned long long v) -> decimal32_fast

constexpr auto operator "" _DDF(const char* str) -> decimal64_fast
constexpr auto operator "" _ddf(const char* str) -> decimal64_fast

constexpr auto operator "" _DDF(unsigned long long v) -> decimal64_fast
constexpr auto operator "" _ddf(unsigned long long v) -> decimal64_fast

constexpr auto operator "" _DLF(const char* str) -> decimal128_fast
constexpr auto operator "" _dlf(const char* str) -> decimal128_fast

constexpr auto operator "" _DLF(unsigned long long v) -> decimal128_fast
constexpr auto operator "" _dlf(unsigned long long v) -> decimal128_fast

} //namespace decimal
} //namespace boost
----
Expand Down
2 changes: 1 addition & 1 deletion include/boost/decimal/decimal32_fast.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ constexpr decimal32_fast::decimal32_fast(T1 coeff, T2 exp, bool sign) noexcept
auto biased_exp {static_cast<std::uint_fast32_t>(exp + detail::bias)};

// Decimal32 exponent holds 8 bits
if (biased_exp > UINT32_C(0xFF))
if (biased_exp > detail::max_biased_exp_v<decimal32_fast>)
{
significand_ = detail::d32_fast_inf;
}
Expand Down
122 changes: 118 additions & 4 deletions include/boost/decimal/literals.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ BOOST_DECIMAL_EXPORT constexpr auto operator "" _df(const char* str) -> decimal
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DF(const char* str, std::size_t) -> decimal32
BOOST_DECIMAL_EXPORT constexpr auto operator "" _DF(const char* str, std::size_t len) -> decimal32
{
decimal32 d;
from_chars(str, str + detail::strlen(str), d);
from_chars(str, str + len, d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _df(const char* str, std::size_t) -> decimal32
BOOST_DECIMAL_EXPORT constexpr auto operator "" _df(const char* str, std::size_t len) -> decimal32
{
decimal32 d;
from_chars(str, str + detail::strlen(str), d);
from_chars(str, str + len, d);
return d;
}

Expand All @@ -58,6 +58,44 @@ BOOST_DECIMAL_EXPORT constexpr auto operator "" _df(unsigned long long v) -> de
return decimal32{v};
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DFF(const char* str) -> decimal32_fast
{
decimal32_fast d;
from_chars(str, str + detail::strlen(str), d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _dff(const char* str) -> decimal32_fast
{
decimal32_fast d;
from_chars(str, str + detail::strlen(str), d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DFF(const char* str, std::size_t len) -> decimal32_fast
{
decimal32_fast d;
from_chars(str, str + len, d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _dff(const char* str, std::size_t len) -> decimal32_fast
{
decimal32_fast d;
from_chars(str, str + len, d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DFF(unsigned long long v) -> decimal32_fast
{
return decimal32_fast{v};
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _dff(unsigned long long v) -> decimal32_fast
{
return decimal32_fast{v};
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DD(const char* str) -> decimal64
{
decimal64 d;
Expand Down Expand Up @@ -96,6 +134,44 @@ BOOST_DECIMAL_EXPORT constexpr auto operator "" _dd(unsigned long long v) -> de
return decimal64{v};
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DDF(const char* str) -> decimal64_fast
{
decimal64_fast d;
from_chars(str, str + detail::strlen(str), d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _ddf(const char* str) -> decimal64_fast
{
decimal64_fast d;
from_chars(str, str + detail::strlen(str), d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DDF(const char* str, std::size_t len) -> decimal64_fast
{
decimal64_fast d;
from_chars(str, str + len, d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _ddf(const char* str, std::size_t len) -> decimal64_fast
{
decimal64_fast d;
from_chars(str, str + len, d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DDF(unsigned long long v) -> decimal64_fast
{
return decimal64_fast{v};
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _ddf(unsigned long long v) -> decimal64_fast
{
return decimal64_fast{v};
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DL(const char* str) -> decimal128
{
decimal128 d;
Expand Down Expand Up @@ -134,6 +210,44 @@ BOOST_DECIMAL_EXPORT constexpr auto operator "" _dl(unsigned long long v) -> de
return decimal128{v};
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DLF(const char* str) -> decimal128_fast
{
decimal128_fast d;
from_chars(str, str + detail::strlen(str), d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _dlf(const char* str) -> decimal128_fast
{
decimal128_fast d;
from_chars(str, str + detail::strlen(str), d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DLF(const char* str, std::size_t len) -> decimal128_fast
{
decimal128_fast d;
from_chars(str, str + len, d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _dlf(const char* str, std::size_t len) -> decimal128_fast
{
decimal128_fast d;
from_chars(str, str + len, d);
return d;
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DLF(unsigned long long v) -> decimal128_fast
{
return decimal128_fast{v};
}

BOOST_DECIMAL_EXPORT constexpr auto operator "" _dlf(unsigned long long v) -> decimal128_fast
{
return decimal128_fast{v};
}

} // namespace decimal
} // namespace boost

Expand Down
55 changes: 55 additions & 0 deletions test/test_literals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,23 @@ void test_decimal32_literals()
BOOST_TEST(isinf(5e300_df));
}

void test_decimal32_fast_literals()
{
BOOST_TEST_EQ(decimal32_fast(0), 0_DFF);
BOOST_TEST_EQ(decimal32_fast(3), 3_DFF);
BOOST_TEST_EQ(decimal32_fast(3.1), 3.1_DFF);
BOOST_TEST_EQ(decimal32_fast(3, 1), 3e1_DFF);
BOOST_TEST(isinf(5e100_DFF));
BOOST_TEST(isinf(5e300_DFF));

BOOST_TEST_EQ(decimal32_fast(0), 0_dff);
BOOST_TEST_EQ(decimal32_fast(3), 3_dff);
BOOST_TEST_EQ(decimal32_fast(3.1), 3.1_dff);
BOOST_TEST_EQ(decimal32_fast(3, 1), 3e1_dff);
BOOST_TEST(isinf(5e100_dff));
BOOST_TEST(isinf(5e300_dff));
}

void test_decimal64_literals()
{
BOOST_TEST_EQ(decimal64(0), 0_DD);
Expand All @@ -47,6 +64,27 @@ void test_decimal64_literals()
#endif
}

void test_decimal64_fast_literals()
{
BOOST_TEST_EQ(decimal64_fast(0), 0_DDF);
BOOST_TEST_EQ(decimal64_fast(3), 3_DDF);
BOOST_TEST_EQ(decimal64_fast(3.1), 3.1_DDF);
BOOST_TEST_EQ(decimal64_fast(3, 1), 3e1_DDF);

BOOST_TEST_EQ(decimal64_fast(0), 0_ddf);
BOOST_TEST_EQ(decimal64_fast(3), 3_ddf);
BOOST_TEST_EQ(decimal64_fast(3.1), 3.1_ddf);
BOOST_TEST_EQ(decimal64_fast(3, 1), 3e1_ddf);

// 64-bit long double warn of overflow
#if !(LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024)
BOOST_TEST(isinf(5e1000_ddf));
BOOST_TEST(isinf(5e3000_ddf));
BOOST_TEST(isinf(5e1000_DDF));
BOOST_TEST(isinf(5e3000_DDF));
#endif
}

void test_decimal128_literals()
{
BOOST_TEST_EQ(decimal128(0), 0_DL);
Expand All @@ -60,11 +98,28 @@ void test_decimal128_literals()
BOOST_TEST_EQ(decimal128(3, 1), 3e1_dl);
}

void test_decimal128_fast_literals()
{
BOOST_TEST_EQ(decimal128_fast(0), 0_DLF);
BOOST_TEST_EQ(decimal128_fast(3), 3_DLF);
BOOST_TEST_EQ(decimal128_fast(3.1), 3.1_DLF);
BOOST_TEST_EQ(decimal128_fast(3, 1), 3e1_DLF);

BOOST_TEST_EQ(decimal128_fast(0), 0_dlf);
BOOST_TEST_EQ(decimal128_fast(3), 3_dlf);
BOOST_TEST_EQ(decimal128_fast(3.1), 3.1_dlf);
BOOST_TEST_EQ(decimal128_fast(3, 1), 3e1_dlf);
}

int main()
{
test_decimal32_literals();
test_decimal64_literals();
test_decimal128_literals();

test_decimal32_fast_literals();
test_decimal64_fast_literals();
test_decimal128_fast_literals();

return boost::report_errors();
}
Loading