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
20 changes: 20 additions & 0 deletions .github/workflows/fuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,26 @@ jobs:
- "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
source_keys:
- "https://apt.llvm.org/llvm-snapshot.gpg.key"
- toolset: clang
compiler: clang++-18
cxxstd: "14,17,20,23"
os: ubuntu-24.04
install:
- clang-18
sources:
- "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main"
source_keys:
- "https://apt.llvm.org/llvm-snapshot.gpg.key"
- toolset: clang
compiler: clang++-19
cxxstd: "14,17,20,23"
os: ubuntu-24.04
install:
- clang-19
sources:
- "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main"
source_keys:
- "https://apt.llvm.org/llvm-snapshot.gpg.key"


timeout-minutes: 60
Expand Down
30 changes: 30 additions & 0 deletions fuzzing/fuzz_from_chars_float.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,36 @@ extern "C" int LLVMFuzzerTestOneInput(const std::uint8_t* data, std::size_t size
boost::decimal::decimal128 ld_val;
boost::decimal::from_chars(c_data, c_data + size, ld_val, format);
}

// Now with strings
const auto c_data_str = std::string(c_data, size);
for (const auto format : formats)
{
boost::decimal::decimal32 f_val;
boost::decimal::from_chars(c_data_str, f_val, format);

boost::decimal::decimal64 val;
boost::decimal::from_chars(c_data_str, val, format);

boost::decimal::decimal128 ld_val;
boost::decimal::from_chars(c_data_str, ld_val, format);
}

// And string views as applicable
#ifdef BOOST_DECIMAL_HAS_STD_STRING_VIEW
const auto c_data_str_view = std::string_view(c_data_str);
for (const auto format : formats)
{
boost::decimal::decimal32 f_val;
boost::decimal::from_chars(c_data_str_view, f_val, format);

boost::decimal::decimal64 val;
boost::decimal::from_chars(c_data_str_view, val, format);

boost::decimal::decimal128 ld_val;
boost::decimal::from_chars(c_data_str_view, ld_val, format);
}
#endif
}
catch(...)
{
Expand Down
75 changes: 38 additions & 37 deletions include/boost/decimal/literals.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,232 +18,233 @@
#include <cstring>
#endif

namespace boost { namespace decimal {
namespace boost {
namespace decimal {

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

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

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

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

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

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

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DFF(const char* str) -> decimal32_fast
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
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
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
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
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
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
BOOST_DECIMAL_EXPORT constexpr auto operator ""_DD(const char* str) -> decimal64
{
decimal64 d;
from_chars(str, str + detail::strlen(str), d);
return d;
}

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

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

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

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

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

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DDF(const char* str) -> decimal64_fast
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
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
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
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
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
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
BOOST_DECIMAL_EXPORT constexpr auto operator ""_DL(const char* str) -> decimal128
{
decimal128 d;
from_chars(str, str + detail::strlen(str), d);
return d;
}

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

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

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

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

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

BOOST_DECIMAL_EXPORT constexpr auto operator "" _DLF(const char* str) -> decimal128_fast
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
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
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
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
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
BOOST_DECIMAL_EXPORT constexpr auto operator ""_dlf(unsigned long long v) -> decimal128_fast
{
return decimal128_fast{v};
}
Expand Down
13 changes: 12 additions & 1 deletion test/test_from_chars.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -325,9 +325,20 @@ void test_string_interface()
constexpr T correct_val {42};
std::string str {"42"};
T val;
const auto r = from_chars(str, val);
auto r = from_chars(str, val);
BOOST_TEST(r);
BOOST_TEST_EQ(val, correct_val);

// Empty string
std::string empty;
r = from_chars(empty, val);
BOOST_TEST(r.ec == std::errc::invalid_argument);

#ifdef BOOST_DECIMAL_HAS_STD_STRING_VIEW
std::string_view empty_view = std::string_view(empty);
r = from_chars(empty_view, val);
BOOST_TEST(r.ec == std::errc::invalid_argument);
#endif
}

int main()
Expand Down
Loading