Skip to content

Commit

Permalink
libstdc++: Use fast_float in std::from_chars for binary32/64
Browse files Browse the repository at this point in the history
This makes our std::from_chars implementation use fast_float for decimal
parsing of binary32/64 numbers.  For other floating-point formats we
still use the fallback implementation that goes through the strtod family
of functions.

libstdc++-v3/ChangeLog:

	* src/c++17/floating_from_chars.cc: (USE_LIB_FAST_FLOAT):
	Conditionally define, and use it to conditionally include
	fast_float.
	(from_chars): Use fast_float for float and double when
	USE_LIB_FAST_FLOAT.
  • Loading branch information
Patrick Palka committed Jan 17, 2022
1 parent 40b0d44 commit 490e230
Showing 1 changed file with 27 additions and 4 deletions.
31 changes: 27 additions & 4 deletions libstdc++-v3/src/c++17/floating_from_chars.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <string>
#include <memory_resource>
#include <cfenv>
#include <cfloat>
#include <cmath>
#include <cstdlib>
#include <cstring>
Expand All @@ -53,6 +54,18 @@
extern "C" __ieee128 __strtoieee128(const char*, char**);
#endif

#if _GLIBCXX_FLOAT_IS_IEEE_BINARY32 && _GLIBCXX_DOUBLE_IS_IEEE_BINARY64
# define USE_LIB_FAST_FLOAT 1
#endif

#if USE_LIB_FAST_FLOAT
# define FASTFLOAT_DEBUG_ASSERT __glibcxx_assert
namespace
{
# include "fast_float/fast_float.h"
} // anon namespace
#endif

#if _GLIBCXX_HAVE_USELOCALE
namespace std _GLIBCXX_VISIBILITY(default)
{
Expand Down Expand Up @@ -773,8 +786,12 @@ from_chars(const char* first, const char* last, float& value,
#if _GLIBCXX_FLOAT_IS_IEEE_BINARY32 && _GLIBCXX_DOUBLE_IS_IEEE_BINARY64
if (fmt == chars_format::hex)
return __floating_from_chars_hex(first, last, value);
#endif

else
{
static_assert(USE_LIB_FAST_FLOAT);
return fast_float::from_chars(first, last, value, fmt);
}
#else
errc ec = errc::invalid_argument;
#if _GLIBCXX_USE_CXX11_ABI
buffer_resource mr;
Expand All @@ -795,6 +812,7 @@ from_chars(const char* first, const char* last, float& value,
fmt = chars_format{};
}
return make_result(first, len, fmt, ec);
#endif
}

from_chars_result
Expand All @@ -804,8 +822,12 @@ from_chars(const char* first, const char* last, double& value,
#if _GLIBCXX_FLOAT_IS_IEEE_BINARY32 && _GLIBCXX_DOUBLE_IS_IEEE_BINARY64
if (fmt == chars_format::hex)
return __floating_from_chars_hex(first, last, value);
#endif

else
{
static_assert(USE_LIB_FAST_FLOAT);
return fast_float::from_chars(first, last, value, fmt);
}
#else
errc ec = errc::invalid_argument;
#if _GLIBCXX_USE_CXX11_ABI
buffer_resource mr;
Expand All @@ -826,6 +848,7 @@ from_chars(const char* first, const char* last, double& value,
fmt = chars_format{};
}
return make_result(first, len, fmt, ec);
#endif
}

from_chars_result
Expand Down

0 comments on commit 490e230

Please sign in to comment.