From b0bae17b10eb9afc65ad985528fe28002242c6ef Mon Sep 17 00:00:00 2001 From: IRainman Date: Fri, 11 Apr 2025 23:49:27 +0300 Subject: [PATCH] * added chars_format_t for performance reason. --- include/fast_float/ascii_number.h | 14 +++++++------- include/fast_float/float_common.h | 14 +++++++++----- include/fast_float/parse_number.h | 10 +++++----- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/include/fast_float/ascii_number.h b/include/fast_float/ascii_number.h index c4b4da7..98e2223 100644 --- a/include/fast_float/ascii_number.h +++ b/include/fast_float/ascii_number.h @@ -303,7 +303,7 @@ parse_number_string(UC const *p, UC const *pend, answer.negative = (*p == UC('-')); // C++17 20.19.3.(7.1) explicitly forbids '+' sign here if ((*p == UC('-')) || - (uint8_t(options.format & chars_format::allow_leading_plus) && + (chars_format_t(options.format & chars_format::allow_leading_plus) && !basic_json_fmt && *p == UC('+'))) { ++p; if (p == pend) { @@ -390,11 +390,11 @@ parse_number_string(UC const *p, UC const *pend, // Now we can parse the explicit exponential part. int16_t exp_number = 0; // explicit exponential part - if ((p != pend) && (uint8_t(options.format & chars_format::scientific) && + if ((p != pend) && (chars_format_t(options.format & chars_format::scientific) && (UC('e') == *p) || (UC('E') == *p)) #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN - || (uint8_t(options.format & detail::basic_fortran_fmt) && + || (chars_format_t(options.format & detail::basic_fortran_fmt) && ((UC('+') == *p) || (UC('-') == *p) || (UC('d') == *p) || (UC('D') == *p))) #endif @@ -419,7 +419,7 @@ parse_number_string(UC const *p, UC const *pend, } } if ((p == pend) || !is_integer(*p)) { - if (!uint8_t(options.format & chars_format::fixed)) { + if (!chars_format_t(options.format & chars_format::fixed)) { // The exponential part is invalid for scientific notation, so it must // be a trailing token for fixed notation. However, fixed notation is // disabled, so report a scientific notation error. @@ -443,8 +443,8 @@ parse_number_string(UC const *p, UC const *pend, } } else { // If it scientific and not fixed, we have to bail out. - if (uint8_t(options.format & chars_format::scientific) && - !uint8_t(options.format & chars_format::fixed)) { + if (chars_format_t(options.format & chars_format::scientific) && + !chars_format_t(options.format & chars_format::fixed)) { return report_parse_error(p, parse_error::missing_exponential_part); } } @@ -527,7 +527,7 @@ parse_int_string(UC const *p, UC const *pend, T &value, return answer; } if ((*p == UC('-')) || - (uint8_t(options.format & chars_format::allow_leading_plus) && + (chars_format_t(options.format & chars_format::allow_leading_plus) && (*p == UC('+')))) { ++p; } diff --git a/include/fast_float/float_common.h b/include/fast_float/float_common.h index 2ca4f3a..6e5fa92 100644 --- a/include/fast_float/float_common.h +++ b/include/fast_float/float_common.h @@ -33,7 +33,11 @@ namespace fast_float { -enum class chars_format : uint8_t; +// because library only support 32 and 64 bit architectures, +// we should use 32 bit value here +typedef uint32_t chars_format_t; + +enum class chars_format : chars_format_t; #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN namespace detail { @@ -42,7 +46,7 @@ constexpr chars_format basic_fortran_fmt = chars_format(1 << 5); } // namespace detail #endif -enum class chars_format : uint8_t { +enum class chars_format : chars_format_t { scientific = 1 << 0, fixed = 1 << 1, general = fixed | scientific, @@ -69,8 +73,8 @@ using from_chars_result = from_chars_result_t; template struct parse_options_t { FASTFLOAT_CONSTEXPR20 explicit parse_options_t( chars_format const fmt = chars_format::general, UC const dot = UC('.'), - int const b = 10) noexcept - : format(fmt), decimal_point(dot), base(uint8_t(b)) { + chars_format_t const b = 10) noexcept + : format(fmt), decimal_point(dot), base(b) { #ifdef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN // static_assert(b >= 2 && b <= 36); #endif @@ -81,7 +85,7 @@ template struct parse_options_t { /** The character used as decimal point */ UC const decimal_point; /** The base used for integers */ - uint8_t const base; /* only allowed from 2 to 36 */ + uint32_t const base; /* only allowed from 2 to 36 */ FASTFLOAT_ASSUME(base >= 2 && base <= 36); }; diff --git a/include/fast_float/parse_number.h b/include/fast_float/parse_number.h index 7cece6b..1b96464 100644 --- a/include/fast_float/parse_number.h +++ b/include/fast_float/parse_number.h @@ -33,7 +33,7 @@ from_chars_result_t bool const minusSign = (*first == UC('-')); // C++17 20.19.3.(7.1) explicitly forbids '+' sign here if ((*first == UC('-')) || - (uint64_t(fmt & chars_format::allow_leading_plus) && + (chars_format_t(fmt & chars_format::allow_leading_plus) && (*first == UC('+')))) { ++first; } @@ -310,7 +310,7 @@ from_chars_float_advanced(UC const *first, UC const *last, T &value, from_chars_result_t answer; #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN - if (uint8_t(options.format & chars_format::skip_white_space)) { + if (chars_format_t(options.format & chars_format::skip_white_space)) { while ((first != last) && fast_float::is_space(*first)) { ++first; } @@ -326,14 +326,14 @@ from_chars_float_advanced(UC const *first, UC const *last, T &value, #endif parsed_number_string_t const pns = #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN - uint8_t(options.format & detail::basic_json_fmt) + chars_format_t(options.format & detail::basic_json_fmt) ? parse_number_string(first, last, options) : #endif parse_number_string(first, last, options); if (!pns.valid) { #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN - if (uint8_t(options.format & chars_format::no_infnan)) { + if (chars_format_t(options.format & chars_format::no_infnan)) { #endif answer.ec = std::errc::invalid_argument; 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"); #ifndef FASTFLOAT_ONLY_POSITIVE_C_NUMBER_WO_INF_NAN - if (uint8_t(options.format & chars_format::skip_white_space)) { + if (chars_format_t(options.format & chars_format::skip_white_space)) { while ((first != last) && fast_float::is_space(*first)) { ++first; }