External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow disabling floating point support (#1590)

Browse Source 
* Allow disabling floating point support

Add FMT_USE_FLOAT, FMT_USE_DOUBLE and FMT_USE_LONG_DOUBLE to allow a
user of the library to configure the float types they want to allow.
This is specially useful in embedded environements where code size is
important.

* Avoid conditional macros to disable float support

* Add is_supported_floating_point constexpr function

* Fix empty-body warning
This commit is contained in:
Alberto Aguirre 2020-03-20 08:46:31 -05:00 committed by GitHub
parent 52d0e1bbe3
commit d3e668418f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/fmt/core.h
View File

@ -316,6 +316,18 @@ struct int128_t {};
struct uint128_t {}; struct uint128_t {};
#endif #endif
#ifndef FMT_USE_FLOAT
# define FMT_USE_FLOAT 1
#endif
#ifndef FMT_USE_DOUBLE
# define FMT_USE_DOUBLE 1
#endif
#ifndef FMT_USE_LONG_DOUBLE
# define FMT_USE_LONG_DOUBLE 1
#endif
// Casts a nonnegative integer to unsigned. // Casts a nonnegative integer to unsigned.
template <typename Int> template <typename Int>
FMT_CONSTEXPR typename std::make_unsigned<Int>::type to_unsigned(Int value) { FMT_CONSTEXPR typename std::make_unsigned<Int>::type to_unsigned(Int value) {

32
include/fmt/format.h
View File

@ -724,6 +724,13 @@ FMT_CONSTEXPR bool is_negative(T) {
return false; return false;
} }
template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
FMT_CONSTEXPR bool is_supported_floating_point(T) {
return (std::is_same<T, float>::value && FMT_USE_FLOAT) ||
(std::is_same<T, double>::value && FMT_USE_DOUBLE) ||
(std::is_same<T, long double>::value && FMT_USE_LONG_DOUBLE);
}
// Smallest of uint32_t, uint64_t, uint128_t that is large enough to // Smallest of uint32_t, uint64_t, uint128_t that is large enough to
// represent all values of T. // represent all values of T.
template <typename T> template <typename T>
@ -1685,6 +1692,9 @@ template <typename Range> class basic_writer {
template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)> template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
void write(T value, format_specs specs = {}) { void write(T value, format_specs specs = {}) {
if (const_check(!is_supported_floating_point(value))) {
return;
}
float_specs fspecs = parse_float_type_spec(specs); float_specs fspecs = parse_float_type_spec(specs);
fspecs.sign = specs.sign; fspecs.sign = specs.sign;
if (std::signbit(value)) { // value < 0 is false for NaN so use signbit. if (std::signbit(value)) { // value < 0 is false for NaN so use signbit.
@ -1883,6 +1893,10 @@ class arg_formatter_base {
template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)> template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
iterator operator()(T value) { iterator operator()(T value) {
if (const_check(!is_supported_floating_point(value))) {
FMT_ASSERT(false, "unsupported float argument type");
return out();
}
writer_.write(value, specs_ ? *specs_ : format_specs()); writer_.write(value, specs_ ? *specs_ : format_specs());
return out(); return out();
} }
@ -2923,9 +2937,25 @@ struct formatter<T, Char,
&specs_, internal::char_specs_checker<decltype(eh)>(specs_.type, eh)); &specs_, internal::char_specs_checker<decltype(eh)>(specs_.type, eh));
break; break;
case internal::type::float_type: case internal::type::float_type:
if (internal::const_check(FMT_USE_FLOAT)) {
internal::parse_float_type_spec(specs_, eh);
} else {
FMT_ASSERT(false, "float support disabled");
}
break;
case internal::type::double_type: case internal::type::double_type:
if (internal::const_check(FMT_USE_DOUBLE)) {
internal::parse_float_type_spec(specs_, eh);
} else {
FMT_ASSERT(false, "double support disabled");
}
break;
case internal::type::long_double_type: case internal::type::long_double_type:
internal::parse_float_type_spec(specs_, eh); if (internal::const_check(FMT_USE_LONG_DOUBLE)) {
internal::parse_float_type_spec(specs_, eh);
} else {
FMT_ASSERT(false, "long double support disabled");
}
break; break;
case internal::type::cstring_type: case internal::type::cstring_type:
internal::handle_cstring_type_spec( internal::handle_cstring_type_spec(