coffee/fast_float
1
0
Fork 0
mirror of https://github.com/fastfloat/fast_float.git synced 2026-02-08 02:36:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

type usage fixes.

Browse Source 
fix for FASTFLOAT_ISNOT_CHECKED_BOUNDS if FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN isn't enabled.
This commit is contained in:
IRainman 2025-12-28 17:41:04 +03:00
parent 59c873d028
commit 5bc96372bd
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/fast_float/fast_float.h
View File

@ -88,7 +88,7 @@ template <typename T, typename UC = char,
typename = FASTFLOAT_ENABLE_IF(is_supported_integer_type<T>::value)> typename = FASTFLOAT_ENABLE_IF(is_supported_integer_type<T>::value)>
FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC> FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC>
from_chars(UC const *first, UC const *last, T &value, from_chars(UC const *first, UC const *last, T &value,
uint_fast8_t const base = 10) noexcept; base_t const base = 10) noexcept;
} // namespace fast_float } // namespace fast_float

32
include/fast_float/parse_number.h
View File

@ -336,11 +336,13 @@ from_chars_float_advanced(UC const *first, UC const *last, T &value,
++first; ++first;
} }
} }
#endif #else
#ifdef FASTFLOAT_ISNOT_CHECKED_BOUNDS #ifdef FASTFLOAT_ISNOT_CHECKED_BOUNDS
// We are in parser code with external loop that checks bounds. // We are in parser code with external loop that checks bounds.
FASTFLOAT_ASSUME(first < last); FASTFLOAT_ASSUME(first < last);
#else #endif
#endif
#ifndef FASTFLOAT_ISNOT_CHECKED_BOUNDS
if (first == last) { if (first == last) {
answer.ec = std::errc::invalid_argument; answer.ec = std::errc::invalid_argument;
answer.ptr = first; answer.ptr = first;
@ -414,13 +416,12 @@ FASTFLOAT_CONSTEXPR20
typename std::enable_if<is_supported_float_type<T>::value, T>::type typename std::enable_if<is_supported_float_type<T>::value, T>::type
integer_times_pow10(am_sign_mant_t const mantissa, integer_times_pow10(am_sign_mant_t const mantissa,
am_pow_t const decimal_exponent) noexcept { am_pow_t const decimal_exponent) noexcept {
#ifdef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN
FASTFLOAT_ASSUME(mantissa >= 0);
const am_mant_t m = static_cast<am_mant_t>(mantissa);
#else
const bool is_negative = mantissa < 0; const bool is_negative = mantissa < 0;
const am_mant_t m = const auto m = static_cast<am_mant_t>(is_negative ? -mantissa : mantissa);
static_cast<am_mant_t>(is_negative ? -mantissa : mantissa); #else
FASTFLOAT_ASSUME(mantissa >= 0);
const auto m = static_cast<am_mant_t>(mantissa);
#endif #endif
T value; T value;
if (clinger_fast_path_impl(m, decimal_exponent, if (clinger_fast_path_impl(m, decimal_exponent,
@ -460,7 +461,8 @@ FASTFLOAT_CONSTEXPR20
std::is_integral<Int>::value && std::is_integral<Int>::value &&
!std::is_signed<Int>::value, !std::is_signed<Int>::value,
T>::type T>::type
integer_times_pow10(Int mantissa, am_pow_t decimal_exponent) noexcept { integer_times_pow10(Int const mantissa,
am_pow_t const decimal_exponent) noexcept {
return integer_times_pow10<T>(static_cast<am_mant_t>(mantissa), return integer_times_pow10<T>(static_cast<am_mant_t>(mantissa),
decimal_exponent); decimal_exponent);
} }
@ -471,7 +473,8 @@ FASTFLOAT_CONSTEXPR20
std::is_integral<Int>::value && std::is_integral<Int>::value &&
std::is_signed<Int>::value, std::is_signed<Int>::value,
T>::type T>::type
integer_times_pow10(Int mantissa, am_pow_t decimal_exponent) noexcept { integer_times_pow10(Int const mantissa,
am_pow_t const decimal_exponent) noexcept {
return integer_times_pow10<T>(static_cast<am_sign_mant_t>(mantissa), return integer_times_pow10<T>(static_cast<am_sign_mant_t>(mantissa),
decimal_exponent); decimal_exponent);
} }
@ -479,7 +482,8 @@ FASTFLOAT_CONSTEXPR20
template <typename Int> template <typename Int>
FASTFLOAT_CONSTEXPR20 typename std::enable_if< FASTFLOAT_CONSTEXPR20 typename std::enable_if<
std::is_integral<Int>::value && !std::is_signed<Int>::value, double>::type std::is_integral<Int>::value && !std::is_signed<Int>::value, double>::type
integer_times_pow10(Int mantissa, am_pow_t decimal_exponent) noexcept { integer_times_pow10(Int const mantissa,
am_pow_t const decimal_exponent) noexcept {
return integer_times_pow10(static_cast<am_mant_t>(mantissa), return integer_times_pow10(static_cast<am_mant_t>(mantissa),
decimal_exponent); decimal_exponent);
} }
@ -487,7 +491,8 @@ integer_times_pow10(Int mantissa, am_pow_t decimal_exponent) noexcept {
template <typename Int> template <typename Int>
FASTFLOAT_CONSTEXPR20 typename std::enable_if< FASTFLOAT_CONSTEXPR20 typename std::enable_if<
std::is_integral<Int>::value && std::is_signed<Int>::value, double>::type std::is_integral<Int>::value && std::is_signed<Int>::value, double>::type
integer_times_pow10(Int mantissa, am_pow_t decimal_exponent) noexcept { integer_times_pow10(Int const mantissa,
am_pow_t const decimal_exponent) noexcept {
return integer_times_pow10(static_cast<am_sign_mant_t>(mantissa), return integer_times_pow10(static_cast<am_sign_mant_t>(mantissa),
decimal_exponent); decimal_exponent);
} }
@ -508,10 +513,11 @@ from_chars_int_advanced(UC const *first, UC const *last, T &value,
++first; ++first;
} }
} }
#endif #else
#ifdef FASTFLOAT_ISNOT_CHECKED_BOUNDS #ifdef FASTFLOAT_ISNOT_CHECKED_BOUNDS
// We are in parser code with external loop that checks bounds. // We are in parser code with external loop that checks bounds.
FASTFLOAT_ASSUME(first < last); FASTFLOAT_ASSUME(first < last);
#endif
#endif #endif
if ( if (
#ifndef FASTFLOAT_ISNOT_CHECKED_BOUNDS #ifndef FASTFLOAT_ISNOT_CHECKED_BOUNDS