Fix stale comments in include/
- json_view.hpp: find_key() returns the first member with a duplicate key, not the last one (as find_member() and the API documentation say). - binary_writer.hpp: throw_size_marker_required() throws other_error.502, not other_error.407. - serializer.hpp, number_parse.hpp, to_chars.hpp: doubles are no longer converted with Grisu2 but with the shortest digits of Zmij; Grisu2 is only used for binary32 and other formats. Comments only; the amalgamation is regenerated. Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
7 files changed
+20
-16
No files matched your search
@@ -48,10 +48,11 @@ namespace detail
|
|||||||
{
|
{
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@brief implements the Grisu2 algorithm for binary to decimal floating-point
|
@brief implements binary to decimal floating-point conversion: the shortest
|
||||||
conversion.
|
digits of Zmij (see zmij.hpp) for IEEE 754 binary64 numbers, and the Grisu2
|
||||||
|
algorithm for all other formats.
|
||||||
|
|
||||||
This implementation is a slightly modified version of the reference
|
The Grisu2 implementation is a slightly modified version of the reference
|
||||||
implementation which may be obtained from
|
implementation which may be obtained from
|
||||||
http://florian.loitsch.com/publications (bench.tar.gz).
|
http://florian.loitsch.com/publications (bench.tar.gz).
|
||||||
|
|
||||||
|
|||||||
@@ -257,7 +257,7 @@ struct ieee_binary_format<53> // binary64
|
|||||||
|
|
||||||
These formats (float, double, and long double where it is binary64, e.g.
|
These formats (float, double, and long double where it is binary64, e.g.
|
||||||
with MSVC or on Apple arm64) are converted by parse_float_native(). The
|
with MSVC or on Apple arm64) are converted by parse_float_native(). The
|
||||||
predicate is the one the serializer uses to choose Grisu2.
|
predicate is the one the serializer uses to choose to_chars() over snprintf.
|
||||||
*/
|
*/
|
||||||
template<typename FloatType>
|
template<typename FloatType>
|
||||||
struct has_native_float_format
|
struct has_native_float_format
|
||||||
|
|||||||
@@ -915,7 +915,7 @@ class binary_writer
|
|||||||
JSON_THROW(out_of_range::create(exception_id::subtype_out_of_range, concat("subtype ", std::to_string(subtype), " is too large for ", what, " (max 255)"), &j));
|
JSON_THROW(out_of_range::create(exception_id::subtype_out_of_range, concat("subtype ", std::to_string(subtype), " is too large for ", what, " (max 255)"), &j));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @throw other_error.407 always
|
/// @throw other_error.502 always
|
||||||
JSON_HEDLEY_NO_RETURN JSON_HEDLEY_NEVER_INLINE
|
JSON_HEDLEY_NO_RETURN JSON_HEDLEY_NEVER_INLINE
|
||||||
static void throw_size_marker_required(const BasicJsonType& j)
|
static void throw_size_marker_required(const BasicJsonType& j)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2033,8 +2033,9 @@ class serializer
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If number_float_t is an IEEE-754 single or double precision number,
|
// If number_float_t is an IEEE-754 single or double precision number,
|
||||||
// use the Grisu2 algorithm to produce short numbers which are
|
// use to_chars() to produce short numbers which are guaranteed to
|
||||||
// guaranteed to round-trip, using strtof and strtod, resp.
|
// round-trip, using strtof and strtod, resp. (the shortest digits of
|
||||||
|
// Zmij for binary64, the Grisu2 algorithm for binary32).
|
||||||
//
|
//
|
||||||
// NB: The test below works if <long double> == <double>.
|
// NB: The test below works if <long double> == <double>.
|
||||||
static constexpr bool is_ieee_single_or_double
|
static constexpr bool is_ieee_single_or_double
|
||||||
|
|||||||
@@ -849,7 +849,7 @@ class basic_json_view
|
|||||||
return !navigation::editable() || m_doc->edits == nullptr;
|
return !navigation::editable() || m_doc->edits == nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// the member of this object with @a key (the last one if the key occurs more than once), or nullptr
|
/// the member of this object with @a key (the first one if the key occurs more than once), or nullptr
|
||||||
NLOHMANN_VIEW_ALWAYS_INLINE const node* find_key(string_view_t key) const
|
NLOHMANN_VIEW_ALWAYS_INLINE const node* find_key(string_view_t key) const
|
||||||
{
|
{
|
||||||
return find_key(key, std::integral_constant<bool, is_editable> {});
|
return find_key(key, std::integral_constant<bool, is_editable> {});
|
||||||
|
|||||||
Generated
+9
-7
@@ -11642,7 +11642,7 @@ struct ieee_binary_format<53> // binary64
|
|||||||
|
|
||||||
These formats (float, double, and long double where it is binary64, e.g.
|
These formats (float, double, and long double where it is binary64, e.g.
|
||||||
with MSVC or on Apple arm64) are converted by parse_float_native(). The
|
with MSVC or on Apple arm64) are converted by parse_float_native(). The
|
||||||
predicate is the one the serializer uses to choose Grisu2.
|
predicate is the one the serializer uses to choose to_chars() over snprintf.
|
||||||
*/
|
*/
|
||||||
template<typename FloatType>
|
template<typename FloatType>
|
||||||
struct has_native_float_format
|
struct has_native_float_format
|
||||||
@@ -31147,7 +31147,7 @@ class binary_writer
|
|||||||
JSON_THROW(out_of_range::create(exception_id::subtype_out_of_range, concat("subtype ", std::to_string(subtype), " is too large for ", what, " (max 255)"), &j));
|
JSON_THROW(out_of_range::create(exception_id::subtype_out_of_range, concat("subtype ", std::to_string(subtype), " is too large for ", what, " (max 255)"), &j));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @throw other_error.407 always
|
/// @throw other_error.502 always
|
||||||
JSON_HEDLEY_NO_RETURN JSON_HEDLEY_NEVER_INLINE
|
JSON_HEDLEY_NO_RETURN JSON_HEDLEY_NEVER_INLINE
|
||||||
static void throw_size_marker_required(const BasicJsonType& j)
|
static void throw_size_marker_required(const BasicJsonType& j)
|
||||||
{
|
{
|
||||||
@@ -36006,10 +36006,11 @@ namespace detail
|
|||||||
{
|
{
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@brief implements the Grisu2 algorithm for binary to decimal floating-point
|
@brief implements binary to decimal floating-point conversion: the shortest
|
||||||
conversion.
|
digits of Zmij (see zmij.hpp) for IEEE 754 binary64 numbers, and the Grisu2
|
||||||
|
algorithm for all other formats.
|
||||||
|
|
||||||
This implementation is a slightly modified version of the reference
|
The Grisu2 implementation is a slightly modified version of the reference
|
||||||
implementation which may be obtained from
|
implementation which may be obtained from
|
||||||
http://florian.loitsch.com/publications (bench.tar.gz).
|
http://florian.loitsch.com/publications (bench.tar.gz).
|
||||||
|
|
||||||
@@ -39519,8 +39520,9 @@ class serializer
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If number_float_t is an IEEE-754 single or double precision number,
|
// If number_float_t is an IEEE-754 single or double precision number,
|
||||||
// use the Grisu2 algorithm to produce short numbers which are
|
// use to_chars() to produce short numbers which are guaranteed to
|
||||||
// guaranteed to round-trip, using strtof and strtod, resp.
|
// round-trip, using strtof and strtod, resp. (the shortest digits of
|
||||||
|
// Zmij for binary64, the Grisu2 algorithm for binary32).
|
||||||
//
|
//
|
||||||
// NB: The test below works if <long double> == <double>.
|
// NB: The test below works if <long double> == <double>.
|
||||||
static constexpr bool is_ieee_single_or_double
|
static constexpr bool is_ieee_single_or_double
|
||||||
|
|||||||
Generated
+1
-1
@@ -11016,7 +11016,7 @@ class basic_json_view
|
|||||||
return !navigation::editable() || m_doc->edits == nullptr;
|
return !navigation::editable() || m_doc->edits == nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// the member of this object with @a key (the last one if the key occurs more than once), or nullptr
|
/// the member of this object with @a key (the first one if the key occurs more than once), or nullptr
|
||||||
NLOHMANN_VIEW_ALWAYS_INLINE const node* find_key(string_view_t key) const
|
NLOHMANN_VIEW_ALWAYS_INLINE const node* find_key(string_view_t key) const
|
||||||
{
|
{
|
||||||
return find_key(key, std::integral_constant<bool, is_editable> {});
|
return find_key(key, std::integral_constant<bool, is_editable> {});
|
||||||
|
|||||||
Reference in new issue
Block a user