coffee/fast_float
1
0
Fork 0
mirror of https://github.com/fastfloat/fast_float.git synced 2025-12-07 01:06:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

reduce size of from_chars_result_t to 4 bytes. Cleanup for usage FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN.

Browse Source
This commit is contained in:
IRainman 2025-04-09 15:41:29 +03:00
parent 8d4ca6983a
commit d32ae04b1b
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/fast_float/ascii_number.h
View File

@ -301,7 +301,7 @@ parse_number_string(UC const *p, UC const *pend,
#ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN
answer.negative = (*p == UC('-')); answer.negative = (*p == UC('-'));
// C++17 20.19.3.(7.1) explicitly forbids '+' sign here // C++17 20.19.3.(7.1) explicitly forbids '+' sign here
if ((*p == UC('-')) || (uint64_t(options.format & chars_format::allow_leading_plus) && if ((*p == UC('-')) || (uint8_t(options.format & chars_format::allow_leading_plus) &&
!basic_json_fmt && *p == UC('+'))) { !basic_json_fmt && *p == UC('+'))) {
++p; ++p;
if (p == pend) { if (p == pend) {
@ -385,10 +385,10 @@ parse_number_string(UC const *p, UC const *pend,
} }
int32_t exp_number = 0; // explicit exponential part int32_t exp_number = 0; // explicit exponential part
if (p != pend && if (p != pend &&
(uint64_t(options.format & chars_format::scientific) && (uint8_t(options.format & chars_format::scientific) &&
((UC('e') == *p) || (UC('E') == *p))) ((UC('e') == *p) || (UC('E') == *p)))
#ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN
|| (uint64_t(options.format & detail::basic_fortran_fmt) && || (uint8_t(options.format & detail::basic_fortran_fmt) &&
(UC('d') == *p) || (UC('D') == *p)) (UC('d') == *p) || (UC('D') == *p))
#endif #endif
) { ) {
@ -406,7 +406,7 @@ parse_number_string(UC const *p, UC const *pend,
} }
} }
if ((p == pend) || !is_integer(*p)) { if ((p == pend) || !is_integer(*p)) {
if (!uint64_t(options.format & chars_format::fixed)) { if (!uint8_t(options.format & chars_format::fixed)) {
// The exponential part is invalid for scientific notation, so it must // The exponential part is invalid for scientific notation, so it must
// be a trailing token for fixed notation. However, fixed notation is // be a trailing token for fixed notation. However, fixed notation is
// disabled, so report a scientific notation error. // disabled, so report a scientific notation error.
@ -427,8 +427,8 @@ parse_number_string(UC const *p, UC const *pend,
} }
} else { } else {
// If it scientific and not fixed, we have to bail out. // If it scientific and not fixed, we have to bail out.
if (uint64_t(options.format & chars_format::scientific) && if (uint8_t(options.format & chars_format::scientific) &&
!uint64_t(options.format & chars_format::fixed)) { !uint8_t(options.format & chars_format::fixed)) {
return report_parse_error<UC>(p, parse_error::missing_exponential_part); return report_parse_error<UC>(p, parse_error::missing_exponential_part);
} }
} }
@ -510,7 +510,7 @@ parse_int_string(UC const *p, UC const *pend, T &value,
return answer; return answer;
} }
if ((*p == UC('-')) || if ((*p == UC('-')) ||
(uint64_t(options.format & chars_format::allow_leading_plus) && (uint8_t(options.format & chars_format::allow_leading_plus) &&
(*p == UC('+')))) { (*p == UC('+')))) {
++p; ++p;
} }

2
include/fast_float/fast_float.h
View File

@ -43,7 +43,7 @@ from_chars(UC const *first, UC const *last, T &value,
template <typename T, typename UC = char> template <typename T, typename UC = char>
FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC> FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC>
from_chars_advanced(UC const *first, UC const *last, T &value, from_chars_advanced(UC const *first, UC const *last, T &value,
parse_options_t<UC> const &options) noexcept; parse_options_t<UC> const options) noexcept;
/** /**
* from_chars for integer types. * from_chars for integer types.

9
include/fast_float/parse_number.h
View File

@ -310,7 +310,7 @@ from_chars_float_advanced(UC const *first, UC const *last, T &value,
from_chars_result_t<UC> answer; from_chars_result_t<UC> answer;
#ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN
if (uint64_t(options.format & chars_format::skip_white_space)) { if (uint8_t(options.format & chars_format::skip_white_space)) {
while ((first != last) && fast_float::is_space(*first)) { while ((first != last) && fast_float::is_space(*first)) {
first++; first++;
} }
@ -326,14 +326,14 @@ from_chars_float_advanced(UC const *first, UC const *last, T &value,
#endif #endif
parsed_number_string_t<UC> const pns = parsed_number_string_t<UC> const pns =
#ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN
uint64_t(options.format & detail::basic_json_fmt) uint8_t(options.format & detail::basic_json_fmt)
? parse_number_string<true, UC>(first, last, options) ? parse_number_string<true, UC>(first, last, options)
: :
#endif #endif
parse_number_string<false, UC>(first, last, options); parse_number_string<false, UC>(first, last, options);
if (!pns.valid) { if (!pns.valid) {
#ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN
if (uint64_t(options.format & chars_format::no_infnan)) { if (uint8_t(options.format & chars_format::no_infnan)) {
#endif #endif
answer.ec = std::errc::invalid_argument; answer.ec = std::errc::invalid_argument;
answer.ptr = first; answer.ptr = first;
@ -373,7 +373,7 @@ from_chars_int_advanced(UC const *first, UC const *last, T &value,
"only char, wchar_t, char16_t and char32_t are supported"); "only char, wchar_t, char16_t and char32_t are supported");
#ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN
if (uint64_t(options.format & chars_format::skip_white_space)) { if (uint8_t(options.format & chars_format::skip_white_space)) {
while ((first != last) && fast_float::is_space(*first)) { while ((first != last) && fast_float::is_space(*first)) {
first++; first++;
} }
@ -387,6 +387,7 @@ from_chars_int_advanced(UC const *first, UC const *last, T &value,
#else #else
// 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);
// base is already checked in the parse_options_t constructor.
#endif #endif
return parse_int_string(first, last, value, options); return parse_int_string(first, last, value, options);