Merge branch 'develop' into custom-number-type-fixes

Signed-off-by: Niels Lohmann <mail@nlohmann.me>

docs/mkdocs/docs/api/basic_json/accept.md

@@ -132,10 +132,6 @@ outside of a string, invalid) byte; see the [FAQ entry](../../home/faq.md#nul-by
 - [operator>>](../operator_gtgt.md) - deserialize from stream
 - [`JSON_STRICT_NUL_HANDLING`](../macros/json_strict_nul_handling.md) - opt in to rejecting a NUL byte in the input
   instead of treating it as end of input
-- [`JSON_DISABLE_STREAM_BULK_SCAN`](../macros/json_disable_stream_bulk_scan.md) - read a `std::istream` one character
-  at a time
-- [`JSON_DISABLE_UNLOCKED_FILE_IO`](../macros/json_disable_unlocked_file_io.md) - read a `FILE*` with the locking stdio
-  functions
 
 ## Version history
 
@@ -147,10 +143,6 @@ outside of a string, invalid) byte; see the [FAQ entry](../../home/faq.md#nul-by
 - Extended overload (2) to accept heterogeneous iterator+sentinel pairs (C++20 ranges support) in version 3.13.0.
 - `JSON_STRICT_NUL_HANDLING` added in version 3.13.0 to optionally reject a NUL byte in the input instead of treating
   it as end of input; planned to become the default in version 4.0.0.
-- Parsing from an `std::istream` scans the characters in its stream buffer in bulk in version 3.13.0
-  ([`JSON_DISABLE_STREAM_BULK_SCAN`](../macros/json_disable_stream_bulk_scan.md)).
-- Parsing from a `FILE*` locks the file once instead of once per character in version 3.13.0
-  ([`JSON_DISABLE_UNLOCKED_FILE_IO`](../macros/json_disable_unlocked_file_io.md)).
 
 !!! warning "Deprecation"
 

docs/mkdocs/docs/api/basic_json/parse.md

@@ -112,16 +112,6 @@ By default, a `'\0'` (NUL) byte anywhere in the input is treated as end of input
 outside of a string, invalid) byte; see the [FAQ entry](../../home/faq.md#nul-bytes-in-the-input) for details and the
 [`JSON_STRICT_NUL_HANDLING`](../macros/json_strict_nul_handling.md) macro to opt into rejecting it instead.
 
-!!! tip "Performance"
-
-    Contiguous inputs (strings, string views, vectors, arrays, pointer ranges) are the fastest to parse. A
-    `#!cpp std::istream` comes close: the parser scans the characters its stream buffer holds in bulk, without reading
-    ahead, so the stream is left exactly where it would be after reading one character at a time. A `#!cpp FILE*` is
-    read one character at a time, but the file is locked only once, so other threads that use the same `FILE` object
-    wait until parsing is done. See [input sources and performance](../../features/parsing/index.md#input-sources-and-performance),
-    [`JSON_DISABLE_STREAM_BULK_SCAN`](../macros/json_disable_stream_bulk_scan.md), and
-    [`JSON_DISABLE_UNLOCKED_FILE_IO`](../macros/json_disable_unlocked_file_io.md).
-
 ## Examples
 
 ??? example "Example: (1) parse from a character array"
@@ -257,10 +247,6 @@ outside of a string, invalid) byte; see the [FAQ entry](../../home/faq.md#nul-by
 - [operator>>](../operator_gtgt.md) - deserialize from stream
 - [`JSON_STRICT_NUL_HANDLING`](../macros/json_strict_nul_handling.md) - opt in to rejecting a NUL byte in the input
   instead of treating it as end of input
-- [`JSON_DISABLE_STREAM_BULK_SCAN`](../macros/json_disable_stream_bulk_scan.md) - read a `std::istream` one character
-  at a time
-- [`JSON_DISABLE_UNLOCKED_FILE_IO`](../macros/json_disable_unlocked_file_io.md) - read a `FILE*` with the locking stdio
-  functions
 
 ## Version history
 
@@ -275,11 +261,6 @@ outside of a string, invalid) byte; see the [FAQ entry](../../home/faq.md#nul-by
   it as end of input; planned to become the default in version 4.0.0.
 - Extended empty-input detection to also cover an `std::istream` without a stream buffer, and fixed a crash
   (`std::terminate`) when parsing from an `std::istream` with `eofbit` in its exception mask, in version 3.13.0.
-- Parsing from an `std::istream` scans the characters in its stream buffer in bulk in version 3.13.0
-  ([`JSON_DISABLE_STREAM_BULK_SCAN`](../macros/json_disable_stream_bulk_scan.md) restores reading one character at a
-  time).
-- Parsing from a `FILE*` locks the file once instead of once per character in version 3.13.0
-  ([`JSON_DISABLE_UNLOCKED_FILE_IO`](../macros/json_disable_unlocked_file_io.md) restores `std::fgetc`).
 
 !!! warning "Deprecation"
 

docs/mkdocs/docs/api/basic_json/sax_parse.md

@@ -116,10 +116,6 @@ consumer `sax` has a super-linear complexity.
 
 A UTF-8 byte order mark is silently ignored.
 
-When reading from a `#!c FILE*`, the file is locked while it is parsed. The lock is recursive, so the SAX handler may
-use the same file with stdio functions, but it must not wait for another thread that uses the same `FILE` object; see
-[`JSON_DISABLE_UNLOCKED_FILE_IO`](../macros/json_disable_unlocked_file_io.md).
-
 ## Examples
 
 ??? example
@@ -141,10 +137,6 @@ use the same file with stdio functions, but it must not wait for another thread
 
 - [parse](parse.md) - deserialize from a compatible input
 - [accept](accept.md) - check if the input is valid JSON
-- [`JSON_DISABLE_STREAM_BULK_SCAN`](../macros/json_disable_stream_bulk_scan.md) - read a `std::istream` one character
-  at a time
-- [`JSON_DISABLE_UNLOCKED_FILE_IO`](../macros/json_disable_unlocked_file_io.md) - read a `FILE*` with the locking stdio
-  functions
 
 ## Version history
 
@@ -156,10 +148,6 @@ use the same file with stdio functions, but it must not wait for another thread
 - Extended overload (2) to accept heterogeneous iterator+sentinel pairs (C++20 ranges support) in version 3.13.0.
 - `JSON_PRECISE_STREAM_POSITION` added in version 3.13.0 to optionally leave a `#!cpp std::istream` positioned right
   after the parsed value when `strict` is `#!cpp false`.
-- Parsing from an `std::istream` scans the characters in its stream buffer in bulk in version 3.13.0
-  ([`JSON_DISABLE_STREAM_BULK_SCAN`](../macros/json_disable_stream_bulk_scan.md)).
-- Parsing from a `FILE*` locks the file once instead of once per character in version 3.13.0
-  ([`JSON_DISABLE_UNLOCKED_FILE_IO`](../macros/json_disable_unlocked_file_io.md)).
 
 !!! warning "Deprecation"
 

docs/mkdocs/docs/api/basic_json/to_bjdata.md

@@ -123,4 +123,6 @@ Linear in the size of the JSON value `j`.
   that is not valid UTF-8 unchanged, as before; `strict` (the default if
   [`JSON_STRICT_BINARY_UTF8`](../macros/json_strict_binary_utf8.md) is enabled) throws `type_error.316`.
 - Throws `type_error.321` for a discarded value since version 3.13.0; previously, a discarded value nested in an
-  array or object was silently skipped, producing invalid BJData.
+  array or object was silently skipped, producing invalid BJData.
+- Writes unsigned integers wider than 64 bits as high-precision numbers since version 3.13.0; previously, they were
+  silently truncated to 64 bits.

docs/mkdocs/docs/api/basic_json/to_bon8.md

@@ -37,8 +37,9 @@ With (2), the bytes written before the exception remain in the output adapter.
 
 ## Exceptions
 
-- Throws [out_of_range.407](../../home/exceptions.md#jsonexceptionout_of_range407) if `j` contains an unsigned integer
-  above 9223372036854775807, which BON8 cannot represent
+- Throws [out_of_range.407](../../home/exceptions.md#jsonexceptionout_of_range407) if `j` contains an integer outside
+  the range of int64 (an unsigned integer above 9223372036854775807, or, with a number type wider than 64 bits, any
+  integer beyond int64), which BON8 cannot represent
 - Throws [type_error.316](../../home/exceptions.md#jsonexceptiontype_error316) if `j` contains a string that is not
   valid UTF-8
 - Throws [type_error.321](../../home/exceptions.md#jsonexceptiontype_error321) if `j` or a value nested in it is

docs/mkdocs/docs/api/basic_json/to_bson.md

@@ -47,6 +47,10 @@ Strong guarantee: if an exception is thrown, there are no changes in the JSON va
 
 - Throws [`type_error.317`](../../home/exceptions.md#jsonexceptiontype_error317) if the top-level type of the JSON value
   is not an object; example: `"to serialize to BSON, top-level type must be object, but is string"`
+- Throws [`out_of_range.407`](../../home/exceptions.md#jsonexceptionout_of_range407) if `j` contains a signed integer
+  outside the range of int64 or an unsigned integer outside the range of uint64, which is only possible with a number
+  type wider than 64 bits; example:
+  `"integer number 9223372036854775808 cannot be represented by BSON as it does not fit int64"`
 - Throws [`out_of_range.409`](../../home/exceptions.md#jsonexceptionout_of_range409) if a key in the JSON object contains
   a null byte (code point U+0000); example: `"BSON key cannot contain code point U+0000 (at byte 2)"`
 - Throws [`out_of_range.412`](../../home/exceptions.md#jsonexceptionout_of_range412) if the length of a document, array,
@@ -119,3 +123,5 @@ pass before anything is written.
   that is not valid UTF-8 unchanged, as before; `strict` (the default if
   [`JSON_STRICT_BINARY_UTF8`](../macros/json_strict_binary_utf8.md) is enabled) throws `type_error.316` before anything
   is written.
+- Throws `out_of_range.407` for integers that do not fit 64 bits since version 3.13.0; previously, integers of a
+  number type wider than 64 bits were silently truncated.

docs/mkdocs/docs/api/basic_json/to_cbor.md

@@ -46,6 +46,9 @@ Strong guarantee: if an exception is thrown, there are no changes in the JSON va
 
 ## Exceptions
 
+- Throws [`out_of_range.407`](../../home/exceptions.md#jsonexceptionout_of_range407) if `j` contains an integer
+  outside [-2^64, 2^64-1], which is only possible with a number type wider than 64 bits; example:
+  `"integer number 18446744073709551616 cannot be represented by CBOR as it does not fit [-2^64, 2^64-1]"`
 - Throws [type_error.316](../../home/exceptions.md#jsonexceptiontype_error316) if a string or object key in `j` is
   not valid UTF-8 and `error_handler` is `strict` (the default only if
   [`JSON_STRICT_BINARY_UTF8`](../macros/json_strict_binary_utf8.md) is enabled)
@@ -90,3 +93,5 @@ Linear in the size of the JSON value `j`.
   [`JSON_STRICT_BINARY_UTF8`](../macros/json_strict_binary_utf8.md) is enabled) throws `type_error.316`.
 - Throws `type_error.321` for a discarded value since version 3.13.0; previously, a discarded value nested in an
   array or object was silently skipped, producing invalid CBOR.
+- Throws `out_of_range.407` for integers that do not fit 64 bits since version 3.13.0; previously, integers of a
+  number type wider than 64 bits were silently truncated.

docs/mkdocs/docs/api/basic_json/to_msgpack.md

@@ -46,6 +46,9 @@ Strong guarantee: if an exception is thrown, there are no changes in the JSON va
 
 ## Exceptions
 
+- Throws [`out_of_range.407`](../../home/exceptions.md#jsonexceptionout_of_range407) if `j` contains an integer
+  outside [-2^63, 2^64-1], which is only possible with a number type wider than 64 bits; example:
+  `"integer number 18446744073709551616 cannot be represented by MessagePack as it does not fit [-2^63, 2^64-1]"`
 - Throws [`out_of_range.412`](../../home/exceptions.md#jsonexceptionout_of_range412) if the length of a string, binary
   value, array, or object exceeds 4294967295, the maximum MessagePack can store; example:
   `"MessagePack length 4294967296 exceeds maximum of 4294967295"`
@@ -112,3 +115,5 @@ Linear in the size of the JSON value `j`.
   `number_unsigned_t`.
 - Throws `type_error.321` for a discarded value since version 3.13.0; previously, a discarded value nested in an
   array or object was silently skipped, producing invalid MessagePack.
+- Throws `out_of_range.407` for integers that do not fit 64 bits since version 3.13.0; previously, integers of a
+  number type wider than 64 bits were silently truncated.

docs/mkdocs/docs/api/macros/index.md

@@ -16,10 +16,6 @@ header. See also the [macro overview page](../../features/macros.md).
 
 ## Parsing
 
-- [**JSON_DISABLE_STREAM_BULK_SCAN**](json_disable_stream_bulk_scan.md) - read a `std::istream` one character at a time
-  instead of scanning its stream buffer in bulk
-- [**JSON_DISABLE_UNLOCKED_FILE_IO**](json_disable_unlocked_file_io.md) - read a `FILE*` with `std::fgetc` instead of
-  locking it once and using the unlocked stdio functions
 - [**JSON_PRECISE_STREAM_POSITION**](json_precise_stream_position.md) - opt in to leaving an input stream positioned
   right after a parsed number
 - [**JSON_STRICT_BINARY_UTF8**](json_strict_binary_utf8.md) - opt in to checking strings for valid UTF-8 in the CBOR,

docs/mkdocs/docs/api/macros/json_disable_stream_bulk_scan.md

@@ -1,145 +0,0 @@
-# JSON_DISABLE_STREAM_BULK_SCAN
-
-```cpp
-#define JSON_DISABLE_STREAM_BULK_SCAN /* value */
-```
-
-When defined to `1`, parsing from a `#!cpp std::istream` reads the input one character at a time through the stream
-buffer, as in version 3.12.0 and earlier, instead of scanning the characters that the stream buffer already holds in
-bulk.
-
-The macro is an escape hatch for stream buffers that do not follow the usual contract of `std::basic_streambuf` (see
-the requirements on the stream buffer in the notes below). It does not change any result: values, exceptions, and the
-position of the stream after parsing are the same either way. Only the speed differs.
-
-## Default definition
-
-The default value is `0`: streams are scanned in bulk.
-
-```cpp
-#define JSON_DISABLE_STREAM_BULK_SCAN 0
-```
-
-## Notes
-
-!!! note "How streams are scanned"
-
-    A `std::streambuf` keeps the part of the input it has read but not yet handed out in its *get area*, the range
-    from `gptr()` to `egptr()`. A `std::filebuf`, for instance, reads the file in blocks of a few kilobytes into its get
-    area, and a `std::stringbuf` exposes its whole string as one get area.
-
-    When parsing from a `std::istream`, the parser scans this get area directly, with the same fast paths that it uses
-    for a `std::string`: runs of ordinary string characters, numbers, and indentation are recognized several bytes at a
-    time instead of being requested from the stream buffer one character at a time. When the parser reaches the end of
-    the get area, it asks the stream buffer for the next character as before, which makes the stream buffer refill its
-    get area.
-
-    The parser only reads characters that it would also have read one at a time, and it advances the stream buffer
-    exactly over the characters it consumes. Nothing is read ahead, buffered elsewhere, or put back. Therefore, the
-    stream is left exactly where it was left before:
-
-    - [`operator>>`](../operator_gtgt.md) and [`sax_parse`](../basic_json/sax_parse.md) with `strict = false` can still
-      read several values from one stream, and the stream can still be used with other `std::istream` functions after a
-      value has been read.
-    - With [`JSON_PRECISE_STREAM_POSITION`](json_precise_stream_position.md), the stream is still positioned right after
-      a parsed number.
-    - Exception messages, including the line, the column, and the last read token, are unchanged.
-
-!!! note "Performance"
-
-    Parsing from a `std::ifstream` or `std::istringstream` is typically 1.5 to 2 times as fast as before, and reading
-    many small values from one stream with `operator>>` 1.4 to 4 times as fast. Parsing from a stream is then within
-    about 10 to 20 % of first reading the whole file into a `std::string` and parsing that.
-
-    A stream buffer without a get area (one that only overrides `underflow()` and `uflow()` and hands out every
-    character from there) offers nothing to scan in bulk, so it is read one character at a time as before.
-
-!!! note "Requirements on the stream buffer"
-
-    The bulk scan relies on the following behavior, which every stream buffer of the standard library and every stream
-    buffer that keeps its input in its get area has:
-
-    - When `sgetc()` returns a character while `gptr() < egptr()`, that character is `*gptr()`; when `sbumpc()` returns
-      one, it was at `gptr()` before the call.
-    - Characters in the get area are not changed while they are in the get area.
-    - `underflow()` or `uflow()` either sets up a get area that holds the returned character at `gptr()` (or at
-      `gptr() - 1` after `uflow()`), or leaves the get area empty.
-
-    A stream buffer that returns characters from `uflow()` while leaving unrelated characters in its get area, or that
-    changes the characters in its get area in place, does not meet these requirements. Define the macro to `1` for
-    such stream buffers.
-
-!!! warning "Define consistently"
-
-    The macro selects between two definitions of the library's internal stream input adapter. It must therefore be
-    defined identically for **every** translation unit that includes the library; mixing translation units that define
-    it with ones that do not is an ODR violation. Prefer setting it as a compile definition on the target rather than
-    with `#!cpp #define` in individual source files.
-
-!!! note "Other inputs"
-
-    Strings, string views, vectors, arrays, and pointer or iterator ranges over contiguous memory are scanned in bulk
-    anyway. Reading from a `#!cpp FILE*` is not affected by this macro; see
-    [`JSON_DISABLE_UNLOCKED_FILE_IO`](json_disable_unlocked_file_io.md) for that input.
-
-## Examples
-
-??? example "Example: reading values from a stream (default)"
-
-    The stream is scanned in bulk, and the values are read one after the other:
-
-    ```cpp
-    #include <iostream>
-    #include <sstream>
-    #include <nlohmann/json.hpp>
-
-    using json = nlohmann::json;
-
-    int main()
-    {
-        std::istringstream input(R"({"id": 1} {"id": 2} 42 rest)");
-        json j1, j2, j3;
-        input >> j1 >> j2 >> j3;  // {"id":1}, {"id":2}, 42
-
-        std::string word;
-        input >> word;            // "rest"
-    }
-    ```
-
-??? example "Example: reading one character at a time (macro defined to 1)"
-
-    With the macro, the same program reads the stream one character at a time, with the same results:
-
-    ```cpp
-    #define JSON_DISABLE_STREAM_BULK_SCAN 1
-    #include <iostream>
-    #include <sstream>
-    #include <nlohmann/json.hpp>
-
-    using json = nlohmann::json;
-
-    int main()
-    {
-        std::istringstream input(R"({"id": 1} {"id": 2} 42 rest)");
-        json j1, j2, j3;
-        input >> j1 >> j2 >> j3;  // {"id":1}, {"id":2}, 42
-
-        std::string word;
-        input >> word;            // "rest"
-    }
-    ```
-
-## See also
-
-- [**parse**](../basic_json/parse.md) - deserialize from a compatible input
-- [**operator>>**](../operator_gtgt.md) - deserialize from stream
-- [**sax_parse**](../basic_json/sax_parse.md) - generate SAX events
-- [**JSON_PRECISE_STREAM_POSITION**](json_precise_stream_position.md) - leave an input stream positioned right after a
-  parsed number
-- [**JSON_DISABLE_UNLOCKED_FILE_IO**](json_disable_unlocked_file_io.md) - read a `FILE*` with the locking stdio
-  functions
-- [Parsing: input sources and performance](../../features/parsing/index.md#input-sources-and-performance)
-
-## Version history
-
-- Added in version 3.13.0.

docs/mkdocs/docs/api/macros/json_disable_unlocked_file_io.md

@@ -1,113 +0,0 @@
-# JSON_DISABLE_UNLOCKED_FILE_IO
-
-```cpp
-#define JSON_DISABLE_UNLOCKED_FILE_IO /* value */
-```
-
-When defined to `1`, parsing from a `#!cpp FILE*` reads every character with `std::fgetc`, as in version 3.12.0 and
-earlier, instead of locking the file once and reading it with the unlocked stdio functions.
-
-It does not change any result: values, exceptions, and the position of the file after parsing are the same either way.
-Only the speed and the locking of the file differ (see the notes on locking below).
-
-## Default definition
-
-The default value is `0`: the file is locked once and read with the unlocked stdio functions where they are available.
-
-```cpp
-#define JSON_DISABLE_UNLOCKED_FILE_IO 0
-```
-
-## Notes
-
-!!! note "Background"
-
-    The C standard library makes every `std::fgetc` call thread-safe by locking and unlocking the `FILE` object. When
-    parsing from a `FILE*`, the parser reads one character at a time, so this happens for every character of the input.
-
-    Instead, the parser locks the file once when parsing starts and unlocks it when parsing ends - also when an
-    exception is thrown - and reads the characters in between without locking:
-
-    | C library                                                  | functions                                          |
-    |------------------------------------------------------------|----------------------------------------------------|
-    | glibc (Linux), Apple (macOS, iOS), Android, FreeBSD, NetBSD, OpenBSD, DragonFly BSD | `flockfile`, `getc_unlocked`, `funlockfile` (POSIX) |
-    | Microsoft (MSVC, clang-cl)                                 | `_lock_file`, `_fgetc_nolock`, `_unlock_file`       |
-    | others (e.g., musl, MinGW, newlib)                         | `std::fgetc`, as before                             |
-
-    This makes parsing from a `FILE*` 3 to 4 times as fast with the Apple C library and 1.1 to 1.3 times as fast with
-    glibc, whose locking is cheaper. The binary formats ([`from_cbor`](../basic_json/from_cbor.md),
-    [`from_msgpack`](../basic_json/from_msgpack.md), ...) read from a `FILE*` the same way.
-
-!!! note "Locking"
-
-    While a value is parsed from a `FILE*`, the parsing thread holds the file's lock. The lock is recursive, so the
-    parsing thread itself - for instance, a [SAX](../json_sax/index.md) handler or a
-    [parser callback](../basic_json/parser_callback_t.md) - can keep using the file with stdio functions such as
-    `std::ftell`. Other threads that use the same `FILE` object wait until the parser is done. Before, they could
-    interleave their reads with the parser's, which made the parsed input unpredictable anyway.
-
-    A program in which a SAX handler or parser callback waits for **another** thread that uses the **same** `FILE`
-    object would deadlock. Define the macro to `1` for such programs.
-
-!!! warning "Define consistently"
-
-    The macro selects between two definitions of the library's internal `FILE*` input adapter. It must therefore be
-    defined identically for **every** translation unit that includes the library; mixing translation units that define
-    it with ones that do not is an ODR violation (and can leave a file locked). Prefer setting it as a compile
-    definition on the target rather than with `#!cpp #define` in individual source files.
-
-!!! note "Other inputs"
-
-    Reading from a `#!cpp std::istream` is not affected by this macro; see
-    [`JSON_DISABLE_STREAM_BULK_SCAN`](json_disable_stream_bulk_scan.md) for that input.
-
-## Examples
-
-??? example "Example: parsing from a `FILE*` (default)"
-
-    The file is locked once while it is parsed:
-
-    ```cpp
-    #include <cstdio>
-    #include <nlohmann/json.hpp>
-
-    using json = nlohmann::json;
-
-    int main()
-    {
-        std::FILE* f = std::fopen("example.json", "rb");
-        json j = json::parse(f);  // f is locked until parse() returns
-        std::fclose(f);
-    }
-    ```
-
-??? example "Example: locking for every character (macro defined to 1)"
-
-    With the macro, every character is read with `std::fgetc`, with the same result:
-
-    ```cpp
-    #define JSON_DISABLE_UNLOCKED_FILE_IO 1
-    #include <cstdio>
-    #include <nlohmann/json.hpp>
-
-    using json = nlohmann::json;
-
-    int main()
-    {
-        std::FILE* f = std::fopen("example.json", "rb");
-        json j = json::parse(f);  // std::fgetc for every character
-        std::fclose(f);
-    }
-    ```
-
-## See also
-
-- [**parse**](../basic_json/parse.md) - deserialize from a compatible input
-- [**sax_parse**](../basic_json/sax_parse.md) - generate SAX events
-- [**JSON_DISABLE_STREAM_BULK_SCAN**](json_disable_stream_bulk_scan.md) - read a `std::istream` one character at a
-  time
-- [Parsing: input sources and performance](../../features/parsing/index.md#input-sources-and-performance)
-
-## Version history
-
-- Added in version 3.13.0.

docs/mkdocs/docs/api/macros/json_precise_stream_position.md

@@ -72,12 +72,6 @@ The default value is `0` (disabled — existing behavior is preserved).
     distinct symbol names. Translation units compiled with and without it can therefore be linked into the same program
     without One Definition Rule (ODR) violations, but they cannot exchange instances of library types.
 
-!!! note "Bulk scanning"
-
-    The parser scans the characters in the stream buffer in bulk (see
-    [`JSON_DISABLE_STREAM_BULK_SCAN`](json_disable_stream_bulk_scan.md)), but it never reads ahead. The stream is left
-    at the same position with and without bulk scanning, in both modes of this macro.
-
 !!! tip "Workaround without the macro"
 
     Separate the values in the stream with whitespace. The character consumed after a number is then the separator,

docs/mkdocs/docs/api/macros/json_use_simdutf.md

@@ -12,9 +12,8 @@ non-ASCII characters (e.g. CJK or emoji) this can validate several times faster.
 This is an **opt-in external dependency**. The library itself remains header-only and its behavior is unchanged: the
 same input is accepted or rejected either way, and every parse error is reported at the same position with the same
 message (simdutf is only used to fast-path *valid* runs; anything it flags falls back to the scalar path so the exact
-diagnostic is preserved). A `std::istream` uses simdutf for the characters its stream buffer holds (see
-[`JSON_DISABLE_STREAM_BULK_SCAN`](json_disable_stream_bulk_scan.md)); other streaming inputs (`FILE*`, wide strings,
-user-defined adapters) always use the scalar path.
+diagnostic is preserved). Streaming inputs (files, `std::istream`, wide strings, user-defined adapters) always use the
+scalar path.
 
 When `JSON_USE_SIMDUTF` is defined you must make the `simdutf.h` header available on the include path and link the
 simdutf library. When it is not defined, no simdutf header is included and there is no dependency.

docs/mkdocs/docs/api/operator_gtgt.md

@@ -121,7 +121,6 @@ being read.
 - [`JSON_STRICT_NUL_HANDLING`](macros/json_strict_nul_handling.md) - opt in to rejecting a NUL byte in the input
   instead of treating it as end of input
 - [`JSON_PRECISE_STREAM_POSITION`](macros/json_precise_stream_position.md) - opt in to leaving the stream positioned right after a number
-- [`JSON_DISABLE_STREAM_BULK_SCAN`](macros/json_disable_stream_bulk_scan.md) - read the stream one character at a time
 
 ## Version history
 
@@ -134,6 +133,3 @@ being read.
   crash (`std::terminate`) when `i` has `eofbit` in its exception mask, in version 3.13.0.
 - Changed to the strong exception safety guarantee in version 3.13.0: `j` is no longer left with a partially parsed
   value if parsing throws.
-- Scans the characters in the stream buffer of `i` in bulk in version 3.13.0; the position of `i` after the call is
-  unchanged ([`JSON_DISABLE_STREAM_BULK_SCAN`](macros/json_disable_stream_bulk_scan.md) restores reading one character
-  at a time).

docs/mkdocs/docs/features/macros.md

@@ -133,14 +133,6 @@ When defined, default parse and serialize functions for enums are excluded and h
 
 See [full documentation of `JSON_DISABLE_ENUM_SERIALIZATION`](../api/macros/json_disable_enum_serialization.md).
 
-## `JSON_DISABLE_STREAM_BULK_SCAN`
-
-When defined to `1`, parsing from a `#!cpp std::istream` reads one character at a time instead of scanning the
-characters that the stream buffer holds in bulk. Results are the same either way; the macro is an escape hatch for
-stream buffers that do not follow the usual `std::streambuf` contract. The default value is `0`.
-
-See [full documentation of `JSON_DISABLE_STREAM_BULK_SCAN`](../api/macros/json_disable_stream_bulk_scan.md).
-
 ## `JSON_DISABLE_TUPLE_REFERENCE_CONVERSION`
 
 When defined to `1`, a JSON value can no longer be created from a one-element `std::tuple` holding a reference to a JSON
@@ -149,14 +141,6 @@ is planned to become the default in version 4.0.0.
 
 See [full documentation of `JSON_DISABLE_TUPLE_REFERENCE_CONVERSION`](../api/macros/json_disable_tuple_reference_conversion.md).
 
-## `JSON_DISABLE_UNLOCKED_FILE_IO`
-
-When defined to `1`, parsing from a `#!cpp FILE*` reads every character with `std::fgetc`, which locks the file each
-time, instead of locking the file once and reading it with the unlocked stdio functions. Results are the same either
-way. The default value is `0`.
-
-See [full documentation of `JSON_DISABLE_UNLOCKED_FILE_IO`](../api/macros/json_disable_unlocked_file_io.md).
-
 ## `JSON_NO_AUTOMATIC_UDLS`
 
 When defined, `<nlohmann/json.hpp>` does not include `<nlohmann/json_literals.hpp>` with the user-defined string literals

docs/mkdocs/docs/features/parsing/index.md

@@ -55,30 +55,6 @@ whitespace, because `operator>>` consumes the character that terminates a number
 [`JSON_PRECISE_STREAM_POSITION`](../../api/macros/json_precise_stream_position.md) is defined to `1` — see the
 [`operator>>` notes](../../api/operator_gtgt.md#notes) for details and examples.
 
-## Input sources and performance
-
-All inputs produce the same values and the same exceptions, but they are read in different ways, which makes some of
-them faster than others:
-
-| input                                                                                      | how it is read                                                                     |
-|--------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------|
-| strings, string views, string literals, contiguous containers, pointer or iterator ranges over contiguous memory | the whole input is scanned in bulk: runs of string characters, numbers, and indentation are recognized several bytes at a time |
-| `#!cpp std::istream` (`#!cpp std::ifstream`, `#!cpp std::istringstream`, ...)            | the characters the stream buffer holds are scanned in bulk like a string; the stream buffer is asked for more when they are used up |
-| `#!cpp FILE*`                                                                              | one character at a time, with the file locked once for the whole parse              |
-| other iterator ranges (e.g., `#!cpp std::list<char>`, `#!cpp std::istreambuf_iterator<char>`), wide strings | one character at a time                                                             |
-
-Parsing a file from a `#!cpp std::ifstream` is therefore only about 10 to 20 % slower than reading the whole file into a
-`#!cpp std::string` first and parsing that, and it needs no memory for a copy of the file. The stream is never read
-ahead: after parsing, it is positioned exactly as if every character had been read one at a time, so
-[`operator>>`](../../api/operator_gtgt.md) can still read several values from one stream (see also
-[JSON Lines](json_lines.md)).
-
-Two macros switch these optimizations off without changing any result:
-[`JSON_DISABLE_STREAM_BULK_SCAN`](../../api/macros/json_disable_stream_bulk_scan.md) for stream buffers that do not
-follow the usual `std::streambuf` contract, and
-[`JSON_DISABLE_UNLOCKED_FILE_IO`](../../api/macros/json_disable_unlocked_file_io.md) for programs in which another
-thread must use the same `#!cpp FILE` object while it is parsed.
-
 ## SAX vs. DOM parsing
 
 The library offers two parsing models:

docs/mkdocs/docs/home/exceptions.md

@@ -916,9 +916,19 @@ double-precision number when `number_float_t` is `#!cpp float`.
 
 ### json.exception.out_of_range.407
 
-An unsigned integer number greater than 9223372036854775807 cannot be represented in the binary format. This exception
-is only thrown by [`to_bon8`](../api/basic_json/to_bon8.md), as [BON8](../features/binary_formats/bon8.md) has no
-unsigned 64-bit integer type.
+An integer number cannot be represented by the binary format it is serialized to:
+
+- [BON8](../features/binary_formats/bon8.md) only stores integers that fit into int64, so
+  [`to_bon8`](../api/basic_json/to_bon8.md) throws for unsigned integers greater than 9223372036854775807.
+- [CBOR](../features/binary_formats/cbor.md), [MessagePack](../features/binary_formats/messagepack.md), and
+  [BSON](../features/binary_formats/bson.md) store integers in at most 64 bits. With the default number types, every
+  integer fits, but a [`number_integer_t`](../api/basic_json/number_integer_t.md) or
+  [`number_unsigned_t`](../api/basic_json/number_unsigned_t.md) wider than 64 bits (e.g., `__int128`) can hold values
+  outside the range of the format: [-2^64, 2^64-1] for CBOR, [-2^63, 2^64-1] for MessagePack, and the range of int64
+  (signed integers) or uint64 (unsigned integers) for BSON.
+
+[UBJSON](../features/binary_formats/ubjson.md) and [BJData](../features/binary_formats/bjdata.md) never throw this
+exception, because they serialize integers beyond 64 bits as high-precision numbers.
 
 !!! note "Former occurrences"
 
@@ -927,11 +937,17 @@ unsigned 64-bit integer type.
     - Since version 3.9.0, integer numbers beyond int64 are serialized as high-precision UBJSON numbers.
     - Since version 3.12.0, integer numbers beyond int64 are serialized as uint64 BSON numbers.
 
-!!! failure "Example message"
+    Before version 3.13.0, CBOR, MessagePack, and BSON silently truncated integers wider than 64 bits, and BJData
+    truncated unsigned integers wider than 64 bits.
+
+!!! failure "Example messages"
 
     ```
     integer number 18446744073709551615 cannot be represented by BON8 as it does not fit int64
     ```
+    ```
+    integer number 1267650600228229401496703205376 cannot be represented by CBOR as it does not fit [-2^64, 2^64-1]
+    ```
 
 ### json.exception.out_of_range.408
 

docs/mkdocs/mkdocs.yml

@@ -297,9 +297,7 @@ nav:
           - 'JSON_DELETE_DEPRECATED_FUNCTIONS': api/macros/json_delete_deprecated_functions.md
           - 'JSON_DIAGNOSTIC_POSITIONS': api/macros/json_diagnostic_positions.md
           - 'JSON_DISABLE_ENUM_SERIALIZATION': api/macros/json_disable_enum_serialization.md
-          - 'JSON_DISABLE_STREAM_BULK_SCAN': api/macros/json_disable_stream_bulk_scan.md
           - 'JSON_DISABLE_TUPLE_REFERENCE_CONVERSION': api/macros/json_disable_tuple_reference_conversion.md
-          - 'JSON_DISABLE_UNLOCKED_FILE_IO': api/macros/json_disable_unlocked_file_io.md
           - 'JSON_HAS_CPP_11, JSON_HAS_CPP_14, JSON_HAS_CPP_17, JSON_HAS_CPP_20, JSON_HAS_CPP_23, JSON_HAS_CPP_26': api/macros/json_has_cpp_11.md
           - 'JSON_HAS_EXPERIMENTAL_FILESYSTEM, JSON_HAS_FILESYSTEM': api/macros/json_has_filesystem.md
           - 'JSON_HAS_RANGE_VIEW_CONVERSION': api/macros/json_has_range_view_conversion.md

include/nlohmann/detail/input/input_adapters.hpp

@@ -14,12 +14,10 @@
 #include <cstdint> // uint32_t
 #include <cstring> // strlen
 #include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next, reverse_iterator
-#include <limits> // numeric_limits
 #include <streambuf> // streambuf
 #include <string> // string, char_traits
 #include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
 #include <utility> // pair, declval
-#include <vector> // vector
 
 #ifndef JSON_NO_IO
     #include <cstdio>   // FILE *
@@ -32,24 +30,6 @@
 #include <nlohmann/detail/meta/type_traits.hpp>
 #include <nlohmann/detail/string_utils.hpp>
 
-#ifndef JSON_NO_IO
-    // Which unlocked stdio functions file_input_adapter uses (see
-    // JSON_DISABLE_UNLOCKED_FILE_IO): 1 = POSIX flockfile/getc_unlocked,
-    // 2 = Microsoft CRT _lock_file/_fgetc_nolock, 0 = none (std::fgetc, which
-    // locks the file for every character). Only C libraries known to declare
-    // the functions are listed; the macros are tested after <cstdio>, which
-    // defines __GLIBC__.
-    #if JSON_DISABLE_UNLOCKED_FILE_IO
-        #define JSON_UNLOCKED_FILE_IO 0
-    #elif defined(_MSC_VER)
-        #define JSON_UNLOCKED_FILE_IO 2
-    #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-        #define JSON_UNLOCKED_FILE_IO 1
-    #else
-        #define JSON_UNLOCKED_FILE_IO 0
-    #endif
-#endif  // JSON_NO_IO
-
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
@@ -76,38 +56,18 @@ class file_input_adapter
         : m_file(f)
     {
         JSON_ASSERT(m_file != nullptr);
-        lock();
     }
 
     // make class move-only
     file_input_adapter(const file_input_adapter&) = delete;
-    file_input_adapter(file_input_adapter&& rhs) noexcept
-        : m_file(rhs.m_file)
-    {
-        // the lock is owned by the thread, not the adapter: hand it over
-        rhs.m_file = nullptr;
-    }
+    file_input_adapter(file_input_adapter&&) noexcept = default;
     file_input_adapter& operator=(const file_input_adapter&) = delete;
     file_input_adapter& operator=(file_input_adapter&&) = delete;
-    ~file_input_adapter()
-    {
-        if (m_file != nullptr)
-        {
-            unlock();
-        }
-    }
+    ~file_input_adapter() = default;
 
     std::char_traits<char>::int_type get_character() noexcept
     {
-        // the file is locked for the lifetime of the adapter, so the
-        // per-character lock of std::fgetc can be skipped
-#if JSON_UNLOCKED_FILE_IO == 1
-        return getc_unlocked(m_file);
-#elif JSON_UNLOCKED_FILE_IO == 2
-        return _fgetc_nolock(m_file);
-#else
         return std::fgetc(m_file);
-#endif
     }
 
     // returns the number of characters successfully read
@@ -118,27 +78,6 @@ class file_input_adapter
     }
 
   private:
-    // Lock the file once for the whole parse instead of once per character.
-    // The lock is recursive, so fread() and the user's own stdio calls on the
-    // same thread keep working.
-    void lock() noexcept
-    {
-#if JSON_UNLOCKED_FILE_IO == 1
-        flockfile(m_file);
-#elif JSON_UNLOCKED_FILE_IO == 2
-        _lock_file(m_file);
-#endif
-    }
-
-    void unlock() noexcept
-    {
-#if JSON_UNLOCKED_FILE_IO == 1
-        funlockfile(m_file);
-#elif JSON_UNLOCKED_FILE_IO == 2
-        _unlock_file(m_file);
-#endif
-    }
-
     /// the file pointer to read from
     std::FILE* m_file;
 };
@@ -188,26 +127,15 @@ class input_stream_adapter
     input_stream_adapter& operator=(input_stream_adapter&) = delete;
     input_stream_adapter& operator=(input_stream_adapter&&) = delete;
 
-    input_stream_adapter(input_stream_adapter&& rhs) noexcept
-        : is(rhs.is), sb(rhs.sb)
 #if JSON_PRECISE_STREAM_POSITION
-        , lookahead(rhs.lookahead)
-#endif
-#if !JSON_DISABLE_STREAM_BULK_SCAN
-        , token_carry(std::move(rhs.token_carry))
-        , token_segment(rhs.token_segment)
-        , current_in_get_area(rhs.current_in_get_area)
-        , tracking_token(rhs.tracking_token)
-#endif
+    input_stream_adapter(input_stream_adapter&& rhs) noexcept
+        : is(rhs.is), sb(rhs.sb), lookahead(rhs.lookahead)
     {
         rhs.is = nullptr;
         rhs.sb = nullptr;
-#if JSON_PRECISE_STREAM_POSITION
         rhs.lookahead = false;
-#endif
     }
 
-#if JSON_PRECISE_STREAM_POSITION
     // Whether the character last returned by get_character() can be given back
     // to the input with release_lookahead().
     static constexpr bool supports_lookahead = true;
@@ -227,41 +155,17 @@ class input_stream_adapter
             sb->sbumpc();
         }
 
-#if !JSON_DISABLE_STREAM_BULK_SCAN
-        // sgetc() refills the get area if it is exhausted
-        const bool refill = streambuf_access::get_ptr(sb) == streambuf_access::get_end(sb);
-        if (JSON_HEDLEY_UNLIKELY(refill))
-        {
-            save_token_segment();
-        }
-#endif
-
         auto res = sb->sgetc();
         // set eof manually, as we don't use the istream interface.
         if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
         {
             // there is nothing to step over next time
             lookahead = false;
-#if !JSON_DISABLE_STREAM_BULK_SCAN
-            current_in_get_area = false;
-#endif
             is->clear(is->rdstate() | std::ios::eofbit);
         }
         else
         {
             lookahead = true;
-#if !JSON_DISABLE_STREAM_BULK_SCAN
-            if (JSON_HEDLEY_UNLIKELY(refill))
-            {
-                // the peeked character is at gptr(), unless the streambuf has
-                // no get area
-                after_refill(res, streambuf_access::get_ptr(sb) != streambuf_access::get_end(sb));
-            }
-            else
-            {
-                current_in_get_area = true;
-            }
-#endif
         }
         return res;
     }
@@ -275,6 +179,13 @@ class input_stream_adapter
         lookahead = false;
     }
 #else
+    input_stream_adapter(input_stream_adapter&& rhs) noexcept
+        : is(rhs.is), sb(rhs.sb)
+    {
+        rhs.is = nullptr;
+        rhs.sb = nullptr;
+    }
+
     // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
     // ensure that std::char_traits<char>::eof() and the character 0xFF do not
     // end up as the same value, e.g., 0xFFFFFFFF.
@@ -283,37 +194,12 @@ class input_stream_adapter
     // stays consumed after parsing; see JSON_PRECISE_STREAM_POSITION.
     std::char_traits<char>::int_type get_character()
     {
-#if !JSON_DISABLE_STREAM_BULK_SCAN
-        // sbumpc() refills the get area if it is exhausted
-        const bool refill = streambuf_access::get_ptr(sb) == streambuf_access::get_end(sb);
-        if (JSON_HEDLEY_UNLIKELY(refill))
-        {
-            save_token_segment();
-        }
-#endif
-
         auto res = sb->sbumpc();
         // set eof manually, as we don't use the istream interface.
         if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
         {
-#if !JSON_DISABLE_STREAM_BULK_SCAN
-            current_in_get_area = false;
-#endif
             is->clear(is->rdstate() | std::ios::eofbit);
         }
-#if !JSON_DISABLE_STREAM_BULK_SCAN
-        else if (JSON_HEDLEY_UNLIKELY(refill))
-        {
-            // the consumed character is at gptr() - 1, unless the streambuf
-            // has no get area and returned it from uflow()
-            const char* const next = streambuf_access::get_ptr(sb);
-            after_refill(res, next != nullptr && next != streambuf_access::get_begin(sb));
-        }
-        else
-        {
-            current_in_get_area = true;
-        }
-#endif
         return res;
     }
 #endif
@@ -332,165 +218,7 @@ class input_stream_adapter
         return res;
     }
 
-#if !JSON_DISABLE_STREAM_BULK_SCAN
-    // The lexer may scan the characters in the get area of the streambuf
-    // directly (SWAR fast paths). The get area is only a window into the
-    // input: it ends wherever the streambuf's buffer ends, and is refilled by
-    // the next get_character(). The lexer therefore keeps counting the
-    // position itself and treats the end of the window as "unknown", not as
-    // the end of the input.
-    static constexpr bool supports_bulk_scan = true;
-    static constexpr bool bulk_window = true;
-
-    // Pointer to the next unread character; only valid when
-    // bulk_remaining() > 0. The character before it is the one last returned
-    // by get_character().
-    const char* bulk_data() const
-    {
-        return current_end();
-    }
-
-    // Number of unread characters in the get area.
-    std::size_t bulk_remaining() const
-    {
-        if (!current_in_get_area)
-        {
-            return 0;
-        }
-        return static_cast<std::size_t>(streambuf_access::get_end(sb) - current_end());
-    }
-
-    // Consume @a n characters previously inspected via bulk_data(); the last
-    // of them becomes the character last returned by get_character().
-    void bulk_skip(std::size_t n)
-    {
-        JSON_ASSERT(n <= bulk_remaining());
-        // gbump() takes an int, but a get area (e.g., of a std::stringbuf) can
-        // be larger
-        constexpr auto max_bump = static_cast<std::size_t>((std::numeric_limits<int>::max)());
-        for (; n > max_bump; n -= max_bump)
-        {
-            streambuf_access::bump(sb, static_cast<int>(max_bump));
-        }
-        streambuf_access::bump(sb, static_cast<int>(n));
-    }
-
-    // The adapter keeps the current token for the lexer's error messages: the
-    // part in the get area is only remembered as a pointer, and copied out
-    // when the get area is about to be refilled.
-    static constexpr bool supports_token_tracking = true;
-
-    // Start a token with the characters read from now on. Until this is
-    // called, nothing is tracked (the binary readers never call it).
-    void begin_token() noexcept
-    {
-        tracking_token = true;
-        token_carry.clear();
-        token_segment = current_end();
-    }
-
-    // Start a new token with the character @a c last returned by
-    // get_character().
-    void mark_token_start(std::char_traits<char>::int_type c)
-    {
-        tracking_token = true;
-        token_carry.clear();
-        if (current_in_get_area)
-        {
-            token_segment = current_end() - 1;
-        }
-        else
-        {
-            token_segment = nullptr;
-            token_carry.push_back(std::char_traits<char>::to_char_type(c));
-        }
-    }
-
-    // Copy the characters read since mark_token_start() to @a out, without the
-    // last one if @a drop_last.
-    void copy_token(std::vector<char>& out, bool drop_last) const
-    {
-        out = token_carry;
-        if (token_segment != nullptr)
-        {
-            out.insert(out.end(), token_segment, current_end());
-        }
-        if (drop_last && !out.empty())
-        {
-            out.pop_back();
-        }
-    }
-#endif
-
   private:
-#if !JSON_DISABLE_STREAM_BULK_SCAN
-    // Reads the protected get-area pointers of any std::streambuf. Naming the
-    // members through a derived class makes forming the member pointers
-    // accessible; calling them on another streambuf object is then ordinary
-    // member access through a pointer to member.
-    struct streambuf_access : std::streambuf
-    {
-        static const char* get_ptr(std::streambuf* s)
-        {
-            return (s->*(&streambuf_access::gptr))();
-        }
-        static const char* get_end(std::streambuf* s)
-        {
-            return (s->*(&streambuf_access::egptr))();
-        }
-        static const char* get_begin(std::streambuf* s)
-        {
-            return (s->*(&streambuf_access::eback))();
-        }
-        static void bump(std::streambuf* s, int n)
-        {
-            (s->*(&streambuf_access::gbump))(n);
-        }
-    };
-
-    // one past the character last returned by get_character(), if that is in
-    // the get area
-    const char* current_end() const
-    {
-#if JSON_PRECISE_STREAM_POSITION
-        // the character is peeked at gptr() and not stepped over yet, unless
-        // it was given back with release_lookahead()
-        return streambuf_access::get_ptr(sb) + (lookahead ? 1 : 0);
-#else
-        return streambuf_access::get_ptr(sb);
-#endif
-    }
-
-    // the get area is about to be replaced: copy the token's part in it
-    void save_token_segment()
-    {
-        if (token_segment != nullptr)
-        {
-            token_carry.insert(token_carry.end(), token_segment, streambuf_access::get_end(sb));
-            token_segment = nullptr;
-        }
-    }
-
-    // character @a c was just read into a new get area (@a in_get_area) or
-    // returned without one
-    void after_refill(std::char_traits<char>::int_type c, bool in_get_area)
-    {
-        current_in_get_area = in_get_area;
-        if (!tracking_token)
-        {
-            return;
-        }
-        if (in_get_area)
-        {
-            token_segment = current_end() - 1;
-        }
-        else
-        {
-            token_carry.push_back(std::char_traits<char>::to_char_type(c));
-        }
-    }
-#endif
-
 #if JSON_PRECISE_STREAM_POSITION
     // Step over the character last returned by get_character(). The character
     // has already been peeked successfully, so for every streambuf with a get
@@ -512,16 +240,6 @@ class input_stream_adapter
     /// whether get_character() peeked a character that is not consumed yet
     bool lookahead = false;
 #endif
-#if !JSON_DISABLE_STREAM_BULK_SCAN
-    /// the part of the current token that was in earlier get areas
-    std::vector<char> token_carry{}; // NOLINT(readability-redundant-member-init)
-    /// start of the current token's part in the get area, or nullptr
-    const char* token_segment = nullptr;
-    /// whether the character last returned by get_character() is in the get area
-    bool current_in_get_area = false;
-    /// whether a token is tracked at all; the binary readers never start one
-    bool tracking_token = false;
-#endif
 };
 #endif  // JSON_NO_IO
 

include/nlohmann/detail/input/lexer.hpp

@@ -166,43 +166,6 @@ constexpr bool input_adapter_supports_bulk_scan(std::false_type /*detected*/)
     return false;
 }
 
-// Detect whether an input adapter keeps the current token itself and can
-// hand it out on demand (see input_stream_adapter::supports_token_tracking),
-// so the lexer need not copy every scanned character into token_string.
-template<typename InputAdapterType>
-using detect_supports_token_tracking = decltype(InputAdapterType::supports_token_tracking);
-
-template<typename InputAdapterType>
-constexpr bool input_adapter_supports_token_tracking(std::true_type /*detected*/)
-{
-    return InputAdapterType::supports_token_tracking;
-}
-
-template<typename InputAdapterType>
-constexpr bool input_adapter_supports_token_tracking(std::false_type /*detected*/)
-{
-    return false;
-}
-
-// Detect whether the contiguous block of a bulk-scan adapter is only a window
-// into the input (see input_stream_adapter::bulk_window): its end is not the
-// end of the input, so a token that touches it must be finished character by
-// character.
-template<typename InputAdapterType>
-using detect_bulk_window = decltype(InputAdapterType::bulk_window);
-
-template<typename InputAdapterType>
-constexpr bool input_adapter_bulk_window(std::true_type /*detected*/)
-{
-    return InputAdapterType::bulk_window;
-}
-
-template<typename InputAdapterType>
-constexpr bool input_adapter_bulk_window(std::false_type /*detected*/)
-{
-    return false;
-}
-
 /*!
 @brief lexical analysis
 
@@ -221,20 +184,9 @@ class lexer : public lexer_base<BasicJsonType>
     /// whether the last read token can be reconstructed from the input adapter
     /// on demand (in error paths) instead of being copied on every scanned
     /// character; see input_adapter_supports_seek
-    static constexpr bool seekable =
+    static constexpr bool lazy_token_string =
         input_adapter_supports_seek<InputAdapterType>(is_detected<detect_supports_seek, InputAdapterType> {});
 
-    /// whether the adapter keeps the token itself (mark_token_start() /
-    /// copy_token()); see input_adapter_supports_token_tracking
-    static constexpr bool adapter_token =
-        !seekable && input_adapter_supports_token_tracking<InputAdapterType>(is_detected<detect_supports_token_tracking, InputAdapterType> {});
-
-    /// whether the last read token is obtained from the input adapter on
-    /// demand (in error paths) instead of being copied on every scanned
-    /// character: seekable adapters reconstruct it from the consumed input,
-    /// token-tracking adapters keep it themselves
-    static constexpr bool lazy_token_string = seekable || adapter_token;
-
     /// whether the read position is derived from the input adapter on demand
     /// instead of being counted on every scanned character. Seekable adapters
     /// know how much input they consumed and can revisit it, so
@@ -242,7 +194,7 @@ class lexer : public lexer_base<BasicJsonType>
     /// and line and column are recomputed from the consumed input only when
     /// get_position() is called (errors). Counting per character kept two
     /// increments and a newline check in the hot path of every get().
-    static constexpr bool lazy_position = seekable;
+    static constexpr bool lazy_position = lazy_token_string;
 
     /// whether a simulated unget can be passed on to the input adapter, which
     /// then leaves the character in the input; see
@@ -251,17 +203,14 @@ class lexer : public lexer_base<BasicJsonType>
         input_adapter_supports_lookahead<InputAdapterType>(is_detected<detect_supports_lookahead, InputAdapterType> {});
 
     /// whether string scanning may bulk-consume runs of ordinary characters
-    /// directly from a contiguous input buffer (SWAR fast path). Without
-    /// lazy_token_string / lazy_position, the bulk paths copy the consumed
-    /// characters into token_string and advance the position counters
-    /// themselves (see bulk_consume).
+    /// directly from a contiguous input buffer (SWAR fast path). This requires
+    /// the token to be reconstructible lazily (lazy_token_string), so bypassing
+    /// the per-character capture in get() cannot lose error diagnostics. It
+    /// also implies lazy_position, so the bulk paths need not advance the
+    /// position counters.
     static constexpr bool bulk_scan =
-        input_adapter_supports_bulk_scan<InputAdapterType>(is_detected<detect_supports_bulk_scan, InputAdapterType> {});
-
-    /// whether the contiguous block is only a window into the input, so that
-    /// its end does not end a token; see input_adapter_bulk_window
-    static constexpr bool bulk_window =
-        input_adapter_bulk_window<InputAdapterType>(is_detected<detect_bulk_window, InputAdapterType> {});
+        lazy_token_string
+        && input_adapter_supports_bulk_scan<InputAdapterType>(is_detected<detect_supports_bulk_scan, InputAdapterType> {});
 
   public:
     using token_type = typename lexer_base<BasicJsonType>::token_type;
@@ -270,11 +219,7 @@ class lexer : public lexer_base<BasicJsonType>
         : ia(std::move(adapter))
         , ignore_comments(ignore_comments_)
         , discard_number_values(discard_number_values_)
-    {
-        // the token string of an error before the first token is everything
-        // read so far
-        begin_token(std::integral_constant<bool, adapter_token> {});
-    }
+    {}
 
     // deleted because of pointer members
     lexer(const lexer&) = delete;
@@ -291,8 +236,8 @@ class lexer : public lexer_base<BasicJsonType>
     /// contiguous input: try to decode the 4 hex digits following `\\u`
     /// directly from the input buffer via hex_codepoint(), instead of 4 calls
     /// to get(). On success, advances the adapter exactly as those 4 get()
-    /// calls would (including the position and token bookkeeping of a
-    /// streaming adapter, see bulk_consume) and leaves @a current holding the last of
+    /// calls would (bulk_scan implies lazy_position, so there are no position
+    /// counters to advance) and leaves @a current holding the last of
     /// the 4 digits, just as the last such get() would; the codepoint is
     /// written to @a out. Makes no state change and returns false for a
     /// pending unget, fewer than 4 remaining bytes, or any of the 4 bytes not
@@ -311,7 +256,7 @@ class lexer : public lexer_base<BasicJsonType>
         {
             return false;
         }
-        bulk_consume(reinterpret_cast<const char*>(raw), 4);
+        ia.bulk_skip(4);
         current = char_traits<char_type>::to_int_type(raw[3]);
         out = codepoint;
         return true;
@@ -440,36 +385,7 @@ class lexer : public lexer_base<BasicJsonType>
             return;
         }
         token_buffer.append(reinterpret_cast<const typename string_t::value_type*>(data), pos);
-        bulk_consume(reinterpret_cast<const char*>(data), pos);
-    }
-
-    /// consume @a n characters at @a data (the adapter's bulk_data()) and do
-    /// the bookkeeping get() would have done for them; the characters are
-    /// never newlines
-    void bulk_consume(const char* data, std::size_t n)
-    {
-        bulk_track_position(n, std::integral_constant<bool, lazy_position> {});
-        bulk_track_token(data, n, std::integral_constant<bool, lazy_token_string> {});
-        ia.bulk_skip(n);
-    }
-
-    /// seekable adapter: the position is derived from the adapter
-    void bulk_track_position(std::size_t /*n*/, std::true_type /*lazy*/) const noexcept {}
-
-    /// streaming adapter: count the characters
-    void bulk_track_position(std::size_t n, std::false_type /*lazy*/) noexcept
-    {
-        position.chars_read_total += n;
-        position.chars_read_current_line += n;
-    }
-
-    /// the token is obtained from the adapter
-    void bulk_track_token(const char* /*data*/, std::size_t /*n*/, std::true_type /*lazy*/) const noexcept {}
-
-    /// streaming adapter: capture the characters
-    void bulk_track_token(const char* data, std::size_t n, std::false_type /*lazy*/)
-    {
-        token_string.insert(token_string.end(), data, data + n);
+        ia.bulk_skip(pos);
     }
 
     /// streaming input: no bulk fast path
@@ -1625,12 +1541,9 @@ scan_number_done:
         const std::size_t avail = rem + 1;
 
         // validate + classify the number extent (mirrors scan_number()'s grammar)
-        // and accumulate the mantissa digits on the way, so that tokens with up
-        // to 19 digits need no second pass for their value
         std::size_t i = 0;
         std::size_t dot_index = std::string::npos;
         token_type number_type = token_type::value_unsigned;
-        std::uint64_t w = 0;
         if (data[0] == '-')
         {
             number_type = token_type::value_integer;
@@ -1640,21 +1553,22 @@ scan_number_done:
                 return token_type::uninitialized;
             }
         }
-        const std::size_t integer_begin = i;
         if (data[i] == '0')
         {
             ++i;
         }
         else if (data[i] >= '1' && data[i] <= '9')
         {
-            i = accumulate_digits(data, i, avail, w);
+            ++i;
+            while (i < avail && data[i] >= '0' && data[i] <= '9')
+            {
+                ++i;
+            }
         }
         else
         {
             return token_type::uninitialized;
         }
-        std::size_t digit_count = i - integer_begin;
-        std::size_t fraction_digits = 0;
         if (i < avail && data[i] == '.')
         {
             number_type = token_type::value_float;
@@ -1664,45 +1578,31 @@ scan_number_done:
             {
                 return token_type::uninitialized;
             }
-            const std::size_t fraction_begin = i;
-            i = accumulate_digits(data, i, avail, w);
-            fraction_digits = i - fraction_begin;
-            digit_count += fraction_digits;
+            while (i < avail && data[i] >= '0' && data[i] <= '9')
+            {
+                ++i;
+            }
         }
         // the mantissa ends here, whether or not an exponent part follows
         const std::size_t mantissa_end = i;
-        std::int64_t exponent = 0;
         if (i < avail && (data[i] == 'e' || data[i] == 'E'))
         {
             number_type = token_type::value_float;
             ++i;
-            bool negative_exponent = false;
             if (i < avail && (data[i] == '+' || data[i] == '-'))
             {
-                negative_exponent = data[i] == '-';
                 ++i;
             }
             if (i >= avail || !(data[i] >= '0' && data[i] <= '9'))
             {
                 return token_type::uninitialized;
             }
-            // saturated far beyond every range, see parse_float_exponent()
-            constexpr std::int64_t saturation = 100000000000000000; // 10^17
             while (i < avail && data[i] >= '0' && data[i] <= '9')
             {
-                if (exponent < saturation)
-                {
-                    exponent = (exponent * 10) + (data[i] - '0');
-                }
                 ++i;
             }
-            exponent = negative_exponent ? -exponent : exponent;
         }
         const std::size_t len = i;
-        if (number_may_continue(len == avail, std::integral_constant<bool, bulk_window> {}))
-        {
-            return token_type::uninitialized;
-        }
 
         // reset() records where this token starts (for diagnostics), so it has
         // to run before the input position advances below
@@ -1717,14 +1617,10 @@ scan_number_done:
 #if !JSON_DIAGNOSTIC_POSITIONS
         if (number_type != token_type::value_float)
         {
-            // up to 18 digits always fit into std::uint64_t and std::int64_t
-            const token_type integer_result = (digit_count <= 18)
-                                              ? store_integer(number_type, w)
-                                              : convert_integer(number_type, data, data + len);
+            const token_type integer_result = convert_integer(number_type, data, data + len);
             if (JSON_HEDLEY_LIKELY(integer_result != token_type::uninitialized))
             {
-                bulk_consume(data + 1, len - 1);
-                read_number_terminator(std::integral_constant<bool, bulk_window> {});
+                ia.bulk_skip(len - 1);
                 return integer_result;
             }
             // The value does not fit an integer, so this token converts as a
@@ -1734,99 +1630,17 @@ scan_number_done:
         }
 #endif
 
-        decimal_point_position = dot_index;
-
-        bulk_consume(data + 1, len - 1);
-        read_number_terminator(std::integral_constant<bool, bulk_window> {});
-
-        // a float whose digits all fit into w converts from the accumulated
-        // value; longer ones (and other float formats) take the general path
-        if (number_type == token_type::value_float && digit_count <= 19)
-        {
-            float_significand s;
-            s.w = w;
-            s.exponent = exponent - static_cast<std::int64_t>(fraction_digits);
-            s.negative = data[0] == '-';
-            if (convert_accumulated_float(s, std::integral_constant<bool, has_native_float_format<number_float_t>::value> {}))
-            {
-                // the token text is only copied into token_buffer when
-                // get_string() asks for it; the library's own SAX handlers
-                // ignore it. A window into a stream may be refilled by the
-                // next read, so there the text is copied right away.
-                if (bulk_window)
-                {
-                    token_buffer.append(reinterpret_cast<const typename string_t::value_type*>(data), len);
-                }
-                else
-                {
-                    pending_number_text = data;
-                    pending_number_length = len;
-                }
-                return token_type::value_float;
-            }
-        }
-
         // materialize the token exactly as scan_number() would. reset() already
         // cleared token_buffer, so append() fills it (assign() is avoided
         // because custom string_t types need not provide it)
         token_buffer.append(reinterpret_cast<const typename string_t::value_type*>(data), len);
+        decimal_point_position = dot_index;
+
+        ia.bulk_skip(len - 1);
+
         return convert_number(number_type, mantissa_end);
     }
 
-    /// window adapter: a number that reaches the end of the window may continue
-    /// after it, so scan_number() has to read it character by character
-    static constexpr bool number_may_continue(bool at_end, std::true_type /*window*/) noexcept
-    {
-        return at_end;
-    }
-
-    /// the end of the block is the end of the input, which ends the number
-    static constexpr bool number_may_continue(bool /*at_end*/, std::false_type /*window*/) noexcept
-    {
-        return false;
-    }
-
-    /// window adapter: read the character after a bulk-scanned number and unget
-    /// it, as scan_number() does. The adapter is a stream that is handed back to
-    /// the user, who must find the same input consumed either way.
-    void read_number_terminator(std::true_type /*window*/)
-    {
-        get();
-        unget();
-    }
-
-    /// the input is not handed back, so the terminator can stay unread
-    void read_number_terminator(std::false_type /*window*/) const noexcept {}
-
-    /// binary32/binary64: the value of a float token from its accumulated
-    /// significand (see scan_number_bulk_contiguous())
-    bool convert_accumulated_float(const float_significand& s, std::true_type /*native*/) noexcept
-    {
-        value_float = decimal_to_float<number_float_t>(s);
-        return true;
-    }
-
-    /// other formats (e.g. x87 long double): not instantiated for them, as
-    /// decimal_to_float() only supports binary32/binary64
-    static bool convert_accumulated_float(const float_significand& /*s*/, std::false_type /*native*/) noexcept
-    {
-        return false;
-    }
-
-    /// the value of an integer token with at most 18 digits, accumulated in @a w
-    token_type store_integer(token_type number_type, std::uint64_t w) noexcept
-    {
-        if (number_type == token_type::value_unsigned)
-        {
-            value_unsigned = static_cast<number_unsigned_t>(w);
-            // reject values that do not round-trip into a narrower type
-            return (static_cast<std::uint64_t>(value_unsigned) == w) ? token_type::value_unsigned : token_type::uninitialized;
-        }
-        const std::int64_t x = -static_cast<std::int64_t>(w);
-        value_integer = static_cast<number_integer_t>(x);
-        return (static_cast<std::int64_t>(value_integer) == x) ? token_type::value_integer : token_type::uninitialized;
-    }
-
     /// contiguous input: try the number fast path, else the byte-path scanner
     token_type scan_number_dispatch(std::true_type /*bulk*/)
     {
@@ -1869,7 +1683,6 @@ scan_number_done:
     void reset() noexcept
     {
         token_buffer.clear();
-        pending_number_text = nullptr;
         decimal_point_position = std::string::npos;
 
 #if JSON_DIAGNOSTIC_POSITIONS
@@ -1883,30 +1696,11 @@ scan_number_done:
     /// seekable adapter: remember where the current token starts so it can be
     /// reconstructed from the input on error; current has already been
     /// consumed, hence the -1
-    void note_token_start(std::true_type /*lazy*/)
-    {
-        note_token_start_lazy(std::integral_constant<bool, adapter_token> {});
-    }
-
-    void note_token_start_lazy(std::false_type /*adapter_token*/) noexcept
+    void note_token_start(std::true_type /*lazy*/) noexcept
     {
         token_string_start = ia.get_consumed_count() - 1;
     }
 
-    /// token-tracking adapter: start tracking the token at the first character
-    void begin_token(std::true_type /*adapter_token*/) noexcept
-    {
-        ia.begin_token();
-    }
-
-    void begin_token(std::false_type /*adapter_token*/) const noexcept {}
-
-    /// token-tracking adapter: the token starts with the current character
-    void note_token_start_lazy(std::true_type /*adapter_token*/)
-    {
-        ia.mark_token_start(current);
-    }
-
     /// streaming adapter: start copying the token eagerly, beginning with the
     /// already-read first character
     void note_token_start(std::false_type /*lazy*/) noexcept
@@ -2129,30 +1923,10 @@ scan_number_done:
     /// return current string value
     string_t& get_string()
     {
-        if (pending_number_text != nullptr)
-        {
-            token_buffer.append(reinterpret_cast<const typename string_t::value_type*>(pending_number_text), pending_number_length);
-            pending_number_text = nullptr;
-        }
         // a number token holds '.' regardless of the locale (#4084)
         return token_buffer;
     }
 
-    /// the value of a string token (key or string), which never has pending
-    /// number text, so get_string()'s check is not needed
-    string_t& get_string_token() noexcept
-    {
-        JSON_ASSERT(pending_number_text == nullptr);
-        return token_buffer;
-    }
-
-    /// the text of a float token for a SAX handler that ignores it (the
-    /// library's own handlers): empty, without copying the token
-    const string_t& get_ignored_number_text() const noexcept
-    {
-        return token_buffer;
-    }
-
     /////////////////////
     // diagnostics
     /////////////////////
@@ -2247,20 +2021,6 @@ scan_number_done:
   public:
     /// seekable adapter: rebuild the last read token from the input on demand
     const std::vector<char_type>& collect_token_chars(std::vector<char_type>& out, std::true_type /*lazy*/) const
-    {
-        return collect_token_chars_lazy(out, std::integral_constant<bool, adapter_token> {});
-    }
-
-    /// token-tracking adapter: the adapter hands out everything read since
-    /// mark_token_start(), except a pending unget (see below)
-    const std::vector<char_type>& collect_token_chars_lazy(std::vector<char_type>& out, std::true_type /*adapter_token*/) const
-    {
-        const bool pending_real_unget = next_unget && current != char_traits<char_type>::eof();
-        ia.copy_token(out, pending_real_unget);
-        return out;
-    }
-
-    const std::vector<char_type>& collect_token_chars_lazy(std::vector<char_type>& out, std::false_type /*adapter_token*/) const
     {
         // a pending unget of a real (non-EOF) character means that character
         // was consumed from the input but is not part of the token; EOF is
@@ -2382,8 +2142,9 @@ scan_number_done:
     Pretty-printed JSON indents every line with a run of spaces, which the loop
     in skip_whitespace() would otherwise read one character at a time. The
     spaces are skipped 8 bytes at a time; the last 7 bytes of the input and any
-    other whitespace are left to that loop. Skipping bypasses get();
-    bulk_consume() does its bookkeeping.
+    other whitespace are left to that loop. Skipping bypasses get(), which is
+    fine because bulk_scan implies lazy_position: the position is derived from
+    the adapter, not counted per character.
     */
     void skip_indentation(std::true_type /*bulk*/)
     {
@@ -2406,7 +2167,7 @@ scan_number_done:
                 break;
             }
         }
-        bulk_consume(data, pos);
+        ia.bulk_skip(pos);
     }
 
     /// streaming input: no bulk fast path
@@ -2548,11 +2309,6 @@ scan_number_done:
     /// whether the next get() call should just return current
     bool next_unget = false;
 
-    /// the text of the current float token in the input, not yet copied into
-    /// token_buffer (see get_string()), or nullptr
-    const char* pending_number_text = nullptr;
-    std::size_t pending_number_length = 0;
-
     /// the start position of the current token
     position_t position {};
 

include/nlohmann/detail/input/number_parse.hpp

@@ -275,53 +275,13 @@ JSON_HEDLEY_ALWAYS_INLINE std::uint32_t parse_eight_digits(std::uint64_t v) noex
     return static_cast<std::uint32_t>(((v & 0x0000FFFF0000FFFFu) * 42949672960001u) >> 32u);
 }
 
-/// whether the eight bytes in @a v (see read_eight_bytes()) are all ASCII
-/// digits (after fast_float)
-JSON_HEDLEY_ALWAYS_INLINE bool is_eight_digits(std::uint64_t v) noexcept
+/// whether [first, last) contains a digit other than '0'
+inline bool has_nonzero_digit(const char* first, const char* last) noexcept
 {
-    return ((v & 0xF0F0F0F0F0F0F0F0u) | (((v + 0x0606060606060606u) & 0xF0F0F0F0F0F0F0F0u) >> 4u)) == 0x3333333333333333u;
-}
-
-/*!
-@brief skip the ASCII digits starting at data[i] and accumulate their value
-
-Eight digits are taken at a time while at least eight bytes remain. @a w wraps
-around after 19 digits; the caller only uses it for shorter digit runs.
-
-@return the index of the first byte at or after @a i that is not a digit
-*/
-JSON_HEDLEY_ALWAYS_INLINE std::size_t accumulate_digits(const char* data, std::size_t i, std::size_t avail, std::uint64_t& w) noexcept
-{
-    while (avail - i >= 8)
+    return std::any_of(first, last, [](char c) noexcept
     {
-        const std::uint64_t v = read_eight_bytes(data + i);
-        if (!is_eight_digits(v))
-        {
-            break;
-        }
-        w = (w * 100000000u) + parse_eight_digits(v);
-        i += 8;
-    }
-    while (i < avail && data[i] >= '0' && data[i] <= '9')
-    {
-        w = (w * 10u) + static_cast<std::uint64_t>(data[i] - '0');
-        ++i;
-    }
-    return i;
-}
-
-/// whether [first, last) contains a digit other than '0'; a plain loop, as
-/// GCC calls std::any_of out of line even for the usual empty range
-JSON_HEDLEY_ALWAYS_INLINE bool has_nonzero_digit(const char* first, const char* last) noexcept
-{
-    for (; first != last; ++first)
-    {
-        if (*first != '0')
-        {
-            return true;
-        }
-    }
-    return false;
+        return c != '0';
+    });
 }
 
 /// the value of the validated exponent digits [+-]?[0-9]+ in [first, last),
@@ -367,7 +327,7 @@ truncated is set.
                                    std::string::npos if there is none
 @param[in] mantissa_end            index of the 'e'/'E', or the token length
 */
-JSON_HEDLEY_ALWAYS_INLINE float_significand parse_float_significand(const char* first, const char* last,
+inline float_significand parse_float_significand(const char* first, const char* last,
         std::size_t decimal_point_position, std::size_t mantissa_end) noexcept
 {
     float_significand s;

include/nlohmann/detail/input/parser.hpp

@@ -51,20 +51,6 @@ template<typename BasicJsonType>
 using parser_callback_t =
     std::function<bool(int /*depth*/, parse_event_t /*event*/, BasicJsonType& /*parsed*/)>;
 
-/// whether a SAX handler ignores the text of float tokens (the library's own
-/// handlers do), so that the parser need not materialize it
-template<typename SAX>
-struct sax_ignores_number_text : std::false_type {};
-
-template<typename BasicJsonType, typename InputAdapterType>
-struct sax_ignores_number_text<json_sax_dom_parser<BasicJsonType, InputAdapterType>> : std::true_type {};
-
-template<typename BasicJsonType, typename InputAdapterType>
-struct sax_ignores_number_text<json_sax_dom_callback_parser<BasicJsonType, InputAdapterType>> : std::true_type {};
-
-template<typename BasicJsonType>
-struct sax_ignores_number_text<json_sax_acceptor<BasicJsonType>> : std::true_type {};
-
 /*!
 @brief syntax analysis
 
@@ -185,23 +171,6 @@ class parser
     }
 
   private:
-    /// the text of the current float token for @a sax (see sax_ignores_number_text)
-    template<typename SAX>
-    const string_t& number_float_text(SAX* /*sax*/)
-    {
-        return number_float_text(std::integral_constant<bool, sax_ignores_number_text<SAX>::value> {});
-    }
-
-    const string_t& number_float_text(std::true_type /*ignored*/) const noexcept
-    {
-        return m_lexer.get_ignored_number_text();
-    }
-
-    string_t& number_float_text(std::false_type /*ignored*/)
-    {
-        return m_lexer.get_string();
-    }
-
     /*!
     @brief run a DOM SAX parser to completion and position the lexer
 
@@ -278,7 +247,7 @@ class parser
                         {
                             return syntax_error(*sax, exception_message(token_type::value_string, "object key"));
                         }
-                        if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string_token())))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
                         {
                             return false;
                         }
@@ -332,7 +301,7 @@ class parser
                                                     out_of_range::create(exception_id::number_overflow, concat("number overflow parsing '", m_lexer.get_token_string(), '\''), nullptr));
                         }
 
-                        if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, number_float_text(sax))))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
                         {
                             return false;
                         }
@@ -378,7 +347,7 @@ class parser
 
                     case token_type::value_string:
                     {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string_token())))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string())))
                         {
                             return false;
                         }
@@ -487,7 +456,7 @@ class parser
                         return syntax_error(*sax, exception_message(token_type::value_string, "object key"));
                     }
 
-                    if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string_token())))
+                    if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
                     {
                         return false;
                     }

include/nlohmann/detail/macro_scope.hpp

@@ -895,11 +895,3 @@
 #ifndef JSON_DISABLE_TUPLE_REFERENCE_CONVERSION
     #define JSON_DISABLE_TUPLE_REFERENCE_CONVERSION 0
 #endif
-
-#ifndef JSON_DISABLE_STREAM_BULK_SCAN
-    #define JSON_DISABLE_STREAM_BULK_SCAN 0
-#endif
-
-#ifndef JSON_DISABLE_UNLOCKED_FILE_IO
-    #define JSON_DISABLE_UNLOCKED_FILE_IO 0
-#endif

include/nlohmann/detail/macro_unscope.hpp

@@ -21,9 +21,6 @@
 #undef JSON_NO_UNIQUE_ADDRESS
 #undef JSON_DISABLE_ENUM_SERIALIZATION
 #undef JSON_DISABLE_TUPLE_REFERENCE_CONVERSION
-#undef JSON_DISABLE_STREAM_BULK_SCAN
-#undef JSON_DISABLE_UNLOCKED_FILE_IO
-#undef JSON_UNLOCKED_FILE_IO
 #undef JSON_DTOA_SSE2
 #undef JSON_DTOA_NEON
 

include/nlohmann/detail/output/binary_writer.hpp

@@ -207,6 +207,10 @@ class binary_writer
             {
                 if (j.m_data.m_value.number_integer >= 0)
                 {
+                    if (JSON_HEDLEY_UNLIKELY(!integer_fits_max<std::uint64_t>(j.m_data.m_value.number_integer)))
+                    {
+                        throw_integer_out_of_range(j, "CBOR", "[-2^64, 2^64-1]");
+                    }
                     // CBOR does not differentiate between positive signed
                     // integers and unsigned integers
                     write_cbor_head(0x00, static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
@@ -214,6 +218,10 @@ class binary_writer
                 else
                 {
                     // a negative integer n is encoded as -1 - n
+                    if (JSON_HEDLEY_UNLIKELY(!integer_fits_max<std::uint64_t>(-1 - j.m_data.m_value.number_integer)))
+                    {
+                        throw_integer_out_of_range(j, "CBOR", "[-2^64, 2^64-1]");
+                    }
                     write_cbor_head(0x20, static_cast<std::uint64_t>(-1 - j.m_data.m_value.number_integer));
                 }
                 break;
@@ -221,6 +229,10 @@ class binary_writer
 
             case value_t::number_unsigned:
             {
+                if (JSON_HEDLEY_UNLIKELY(!integer_fits_max<std::uint64_t>(j.m_data.m_value.number_unsigned)))
+                {
+                    throw_integer_out_of_range(j, "CBOR", "uint64");
+                }
                 write_cbor_head(0x00, conditional_static_cast<std::uint64_t>(j.m_data.m_value.number_unsigned));
                 break;
             }
@@ -423,12 +435,20 @@ class binary_writer
             {
                 if (j.m_data.m_value.number_integer >= 0)
                 {
+                    if (JSON_HEDLEY_UNLIKELY(!integer_fits_max<std::uint64_t>(j.m_data.m_value.number_integer)))
+                    {
+                        throw_integer_out_of_range(j, "MessagePack", "[-2^63, 2^64-1]");
+                    }
                     // MessagePack does not differentiate between positive
                     // signed integers and unsigned integers.
                     write_msgpack_unsigned(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
                 }
                 else
                 {
+                    if (JSON_HEDLEY_UNLIKELY(!integer_fits_min<std::int64_t>(j.m_data.m_value.number_integer)))
+                    {
+                        throw_integer_out_of_range(j, "MessagePack", "[-2^63, 2^64-1]");
+                    }
                     if (j.m_data.m_value.number_integer >= -32)
                     {
                         // negative fixnum
@@ -467,6 +487,10 @@ class binary_writer
 
             case value_t::number_unsigned:
             {
+                if (JSON_HEDLEY_UNLIKELY(!integer_fits_max<std::uint64_t>(j.m_data.m_value.number_unsigned)))
+                {
+                    throw_integer_out_of_range(j, "MessagePack", "uint64");
+                }
                 write_msgpack_unsigned(static_cast<std::uint64_t>(j.m_data.m_value.number_unsigned));
                 break;
             }
@@ -824,6 +848,133 @@ class binary_writer
         JSON_THROW(type_error::create(exception_id::discarded_value_used, concat("cannot serialize discarded value to ", format_name), &j));
     }
 
+    /*!
+    @brief whether integer @a n does not exceed the maximum of @a TargetType
+
+    The binary formats store integers in at most 64 bits, but number_integer_t
+    and number_unsigned_t may be wider (e.g., __int128). The range of the
+    integer is taken from std::numeric_limits, so a number type whose range
+    fits into @a TargetType is never checked: the function is then constant
+    true, and the default int64_t/uint64_t types pay nothing.
+    */
+    template<typename TargetType, typename NumberType>
+    static constexpr bool integer_fits_max(const NumberType n) noexcept
+    {
+        return integer_fits_max<TargetType>(n, std::integral_constant < bool,
+                                            (std::numeric_limits<NumberType>::digits > std::numeric_limits<TargetType>::digits) > ());
+    }
+
+    template<typename TargetType, typename NumberType>
+    static constexpr bool integer_fits_max(const NumberType /*unused*/, std::false_type /*may_exceed*/) noexcept
+    {
+        return true;
+    }
+
+    template<typename TargetType, typename NumberType>
+    static constexpr bool integer_fits_max(const NumberType n, std::true_type /*may_exceed*/) noexcept
+    {
+        // NumberType has more digits than TargetType, so it can hold its maximum
+        return n <= static_cast<NumberType>((std::numeric_limits<TargetType>::max)());
+    }
+
+    /*!
+    @brief whether integer @a n is not below the minimum of @a TargetType;
+           constant true if NumberType cannot hold such a value
+    */
+    template<typename TargetType, typename NumberType>
+    static constexpr bool integer_fits_min(const NumberType n) noexcept
+    {
+        return integer_fits_min<TargetType>(n, std::integral_constant < bool, std::numeric_limits<NumberType>::is_signed &&
+                                            (!std::numeric_limits<TargetType>::is_signed || std::numeric_limits<NumberType>::digits > std::numeric_limits<TargetType>::digits) > ());
+    }
+
+    template<typename TargetType, typename NumberType>
+    static constexpr bool integer_fits_min(const NumberType /*unused*/, std::false_type /*may_fall_below*/) noexcept
+    {
+        return true;
+    }
+
+    template<typename TargetType, typename NumberType>
+    static constexpr bool integer_fits_min(const NumberType n, std::true_type /*may_fall_below*/) noexcept
+    {
+        // NumberType is signed and either TargetType is unsigned (minimum 0)
+        // or NumberType has more digits, so it can hold the minimum
+        return n >= static_cast<NumberType>((std::numeric_limits<TargetType>::min)());
+    }
+
+    /*!
+    @brief whether integer @a n lies in the range of @a TargetType
+    */
+    template<typename TargetType, typename NumberType>
+    static constexpr bool integer_fits(const NumberType n) noexcept
+    {
+        return integer_fits_min<TargetType>(n) && integer_fits_max<TargetType>(n);
+    }
+
+    /*!
+    @brief the decimal digits of the non-negative integer @a n
+    */
+    template<typename NumberType>
+    static std::string integer_to_string(NumberType n, std::false_type /*is_signed*/)
+    {
+        std::string result;
+        do
+        {
+            result.push_back(static_cast<char>('0' + (n % 10)));
+            n = static_cast<NumberType>(n / 10);
+        }
+        while (n != 0);
+        std::reverse(result.begin(), result.end());
+        return result;
+    }
+
+    /*!
+    @brief the decimal digits of the integer @a n, with a leading '-' if it
+           is negative
+    */
+    template<typename NumberType>
+    static std::string integer_to_string(NumberType n, std::true_type /*is_signed*/)
+    {
+        // the remainder of a negative n is not positive; each digit is
+        // negated on its own, because negating the minimum of NumberType
+        // as a whole would overflow
+        const bool negative = n < 0;
+        std::string result;
+        do
+        {
+            const auto remainder = n % 10;
+            result.push_back(static_cast<char>('0' + (remainder < 0 ? -remainder : remainder)));
+            n = static_cast<NumberType>(n / 10);
+        }
+        while (n != 0);
+        if (negative)
+        {
+            result.push_back('-');
+        }
+        std::reverse(result.begin(), result.end());
+        return result;
+    }
+
+    /*!
+    @brief throws because the integer @a j is too large for @a format_name
+    @throw out_of_range.407 always
+    */
+    JSON_HEDLEY_NO_RETURN static void throw_integer_out_of_range(const BasicJsonType& j, const char* format_name, const char* range)
+    {
+        // neither std::to_string(), which has no overload for integer types
+        // wider than 64 bits, nor dump(), which would also instantiate the
+        // serializer for objects and fail for key types it cannot write
+        using integer_limits = std::numeric_limits<typename BasicJsonType::number_integer_t>;
+        using unsigned_limits = std::numeric_limits<typename BasicJsonType::number_unsigned_t>;
+        const std::string number = j.is_number_unsigned()
+                                   ? integer_to_string(j.m_data.m_value.number_unsigned, std::integral_constant<bool, unsigned_limits::is_signed>())
+                                   : integer_to_string(j.m_data.m_value.number_integer, std::integral_constant<bool, integer_limits::is_signed>());
+        static_cast<void>(number); // unused when JSON_NOEXCEPTION is defined
+        static_cast<void>(format_name);
+        static_cast<void>(range);
+        JSON_THROW(out_of_range::create(exception_id::integer_too_large, concat("integer number ", number, " cannot be represented by ", format_name, " as it does not fit ", range), &j));
+    }
+
     void write_msgpack_array_prefix(const std::size_t N, const BasicJsonType& j)
     {
         const auto n = to_msgpack_length(N, j);
@@ -1580,6 +1731,8 @@ class binary_writer
             is neither an object nor an array
     @throw out_of_range.415 if @a j is binary with a subtype that does not fit
            into a byte, before anything is written
+    @throw out_of_range.407 if @a j is an integer that does not fit the 64 bits
+           of a BSON integer, before anything is written
     @throw type_error.316 if @a j is a string that is not valid UTF-8, before
            anything is written
     @throw type_error.321 if @a j is discarded
@@ -1598,9 +1751,17 @@ class binary_writer
                 return 8ul;
 
             case value_t::number_integer:
-                return calc_bson_integer_size(j.m_data.m_value.number_integer);
+                if (JSON_HEDLEY_UNLIKELY(!integer_fits<std::int64_t>(j.m_data.m_value.number_integer)))
+                {
+                    throw_integer_out_of_range(j, "BSON", "int64");
+                }
+                return calc_bson_integer_size(static_cast<std::int64_t>(j.m_data.m_value.number_integer));
 
             case value_t::number_unsigned:
+                if (JSON_HEDLEY_UNLIKELY(!integer_fits_max<std::uint64_t>(j.m_data.m_value.number_unsigned)))
+                {
+                    throw_integer_out_of_range(j, "BSON", "uint64");
+                }
                 return calc_bson_unsigned_size(conditional_static_cast<std::uint64_t>(j.m_data.m_value.number_unsigned));
 
             case value_t::string:
@@ -1639,8 +1800,9 @@ class binary_writer
             case value_t::number_float:
                 return write_bson_double(name, j.m_data.m_value.number_float);
 
+            // calc_bson_value_size() checked that integers fit 64 bits
             case value_t::number_integer:
-                return write_bson_integer(name, j.m_data.m_value.number_integer);
+                return write_bson_integer(name, static_cast<std::int64_t>(j.m_data.m_value.number_integer));
 
             case value_t::number_unsigned:
                 return write_bson_unsigned(name, conditional_static_cast<std::uint64_t>(j.m_data.m_value.number_unsigned));
@@ -2147,7 +2309,7 @@ class binary_writer
         {
             return 'L';
         }
-        if (use_bjdata && std::is_unsigned<NumberType>::value)
+        if (use_bjdata && std::is_unsigned<NumberType>::value && integer_fits_max<std::uint64_t>(n))
         {
             return 'M';
         }
@@ -2272,14 +2434,16 @@ class binary_writer
     @brief checks whether a JSON number fits into @a TargetType
     @param[in] el a JSON number of either the signed or unsigned integer kind
     @return whether @a el's value can be represented by @a TargetType without
-            wrapping, regardless of which of the two kinds it is stored as
+            wrapping, regardless of which of the two kinds it is stored as;
+            false for a value that does not even fit the 64-bit type it is
+            read as (possible for number types wider than 64 bits)
     */
     template<typename TargetType>
     static bool bjdata_ndarray_value_in_range(const BasicJsonType& el)
     {
         return el.is_number_unsigned()
-               ? value_in_range_of<TargetType>(el.template get<std::uint64_t>())
-               : value_in_range_of<TargetType>(el.template get<std::int64_t>());
+               ? integer_fits_max<std::uint64_t>(el.m_data.m_value.number_unsigned) && value_in_range_of<TargetType>(el.template get<std::uint64_t>())
+               : integer_fits<std::int64_t>(el.m_data.m_value.number_integer) && value_in_range_of<TargetType>(el.template get<std::int64_t>());
     }
 
     /*!
@@ -2511,10 +2675,11 @@ class binary_writer
         for (const auto& el : dims)
         {
             // a dimension is read as an unsigned value below, so anything that
-            // is not a non-negative integer is rejected: a non-integer entry
-            // would pun unrelated bytes as the dimension, and a negative one
-            // would wrap into a nonsensical length
-            if (!el.is_number_integer() || (!el.is_number_unsigned() && el.template get<std::int64_t>() < 0))
+            // is not a non-negative integer in the range of std::uint64_t is
+            // rejected: a non-integer entry would pun unrelated bytes as the
+            // dimension, and a negative or wider one would wrap into a
+            // nonsensical length
+            if (!el.is_number_integer() || !bjdata_ndarray_value_in_range<std::uint64_t>(el))
             {
                 return true;
             }
@@ -2646,9 +2811,9 @@ class binary_writer
 
             case value_t::number_unsigned:
             {
-                if (j.m_data.m_value.number_unsigned > static_cast<typename BasicJsonType::number_unsigned_t>((std::numeric_limits<std::int64_t>::max)()))
+                if (JSON_HEDLEY_UNLIKELY(!integer_fits_max<std::int64_t>(j.m_data.m_value.number_unsigned)))
                 {
-                    JSON_THROW(out_of_range::create(exception_id::integer_too_large, concat("integer number ", std::to_string(j.m_data.m_value.number_unsigned), " cannot be represented by BON8 as it does not fit int64"), &j));
+                    throw_integer_out_of_range(j, "BON8", "int64");
                 }
                 write_bon8_integer(static_cast<std::int64_t>(j.m_data.m_value.number_unsigned));
                 string_open = false;
@@ -2657,6 +2822,10 @@ class binary_writer
 
             case value_t::number_integer:
             {
+                if (JSON_HEDLEY_UNLIKELY(!integer_fits<std::int64_t>(j.m_data.m_value.number_integer)))
+                {
+                    throw_integer_out_of_range(j, "BON8", "int64");
+                }
                 write_bon8_integer(static_cast<std::int64_t>(j.m_data.m_value.number_integer));
                 string_open = false;
                 break;

include/nlohmann/detail/output/serializer.hpp

@@ -1525,7 +1525,7 @@ class serializer
         // without leading zeros
         if (abs_value < 10000000000000000u)
         {
-            const std::uint64_t value = abs_value;
+            const auto value = static_cast<std::uint64_t>(abs_value); // fits: abs_value < 10^16
             const std::uint64_t upper = value / 100000000u;
             const std::uint64_t first = dtoa_impl::eight_digit_bytes(upper != 0 ? upper : value);
             const auto leading = static_cast<unsigned>(count_leading_zeros(first) / 8); // (first is not 0)

include/nlohmann/detail/value_t.hpp

@@ -14,7 +14,6 @@
 #include <cstdint> // uint8_t
 #include <limits> // numeric_limits
 #include <string> // string
-#include <type_traits> // is_signed
 
 #include <nlohmann/detail/macro_scope.hpp>
 #if JSON_HAS_THREE_WAY_COMPARISON
@@ -175,13 +174,16 @@ FloatType compare_integer_with_float(const IntegerType i, const FloatType f) noe
 
     // values of IntegerType lie in [-bound, bound) when signed and in
     // [0, bound) when unsigned; digits excludes the sign bit, so bound is a
-    // power of two that the float represents exactly
-    const FloatType bound = std::ldexp(static_cast<FloatType>(1), std::numeric_limits<IntegerType>::digits);
+    // power of two that the float represents exactly; the signedness comes
+    // from numeric_limits as well, because std::is_signed is false for class
+    // types such as 128-bit or multiprecision integers
+    using limits = std::numeric_limits<IntegerType>;
+    const FloatType bound = std::ldexp(static_cast<FloatType>(1), limits::digits);
     if (f >= bound)
     {
         return ordered(-1);
     }
-    if (std::is_signed<IntegerType>::value ? (f < -bound) : (f < static_cast<FloatType>(0)))
+    if (limits::is_signed ? (f < -bound) : (f < static_cast<FloatType>(0)))
     {
         return ordered(1);
     }

tests/CMakeLists.txt

@@ -285,10 +285,6 @@ if (JSON_TestSimdutf)
     endif()
 endif()
 
-# test-file_input checks from a second thread that parsing from a FILE* releases the file's lock
-find_package(Threads REQUIRED)
-json_test_set_test_options("test-file_input;test-file_input_unlocked_io_disabled" LINK_LIBRARIES Threads::Threads)
-
 # *DO* use json_test_set_test_options() above this line
 
 json_test_should_build_32bit_test(json_32bit_test json_32bit_test_only "${JSON_32bitTest}")
@@ -373,33 +369,6 @@ json_test_add_test_for(src/unit-diagnostic-positions.cpp
     MAIN test_main CXX_STANDARDS ${test_cxx_standards} ${test_force}
 )
 
-# test reading from a std::istream again without scanning the get area in bulk
-json_test_set_test_options(test-stream-bulk-scan_disabled
-    COMPILE_DEFINITIONS JSON_DISABLE_STREAM_BULK_SCAN=1
-)
-json_test_add_test_for(src/unit-stream-bulk-scan.cpp
-    NAME test-stream-bulk-scan_disabled
-    MAIN test_main CXX_STANDARDS ${test_cxx_standards} ${test_force}
-)
-
-# test reading from a std::istream again with JSON_PRECISE_STREAM_POSITION
-json_test_set_test_options(test-stream-bulk-scan_precise
-    COMPILE_DEFINITIONS JSON_PRECISE_STREAM_POSITION=1
-)
-json_test_add_test_for(src/unit-stream-bulk-scan.cpp
-    NAME test-stream-bulk-scan_precise
-    MAIN test_main CXX_STANDARDS ${test_cxx_standards} ${test_force}
-)
-
-# test reading from a FILE* again with the locking stdio functions
-json_test_set_test_options(test-file_input_unlocked_io_disabled
-    COMPILE_DEFINITIONS JSON_DISABLE_UNLOCKED_FILE_IO=1
-)
-json_test_add_test_for(src/unit-file_input.cpp
-    NAME test-file_input_unlocked_io_disabled
-    MAIN test_main CXX_STANDARDS ${test_cxx_standards} ${test_force}
-)
-
 endif()
 
 # *DO NOT* use json_test_set_test_options() below this line

tests/benchmarks/src/benchmarks.cpp

@@ -8,13 +8,11 @@
 
 #include <benchmark/benchmark.h>
 #include <nlohmann/json.hpp>
-#include <array>
-#include <cstdio>
-#include <deque>
 #include <fstream>
+#include <array>
+#include <deque>
 #include <numeric>
 #include <set>
-#include <sstream>
 #include <vector>
 #include <test_data.hpp>
 
@@ -53,65 +51,6 @@ BENCHMARK_CAPTURE(ParseFile, signed_ints,       TEST_DATA_DIRECTORY "/regression
 BENCHMARK_CAPTURE(ParseFile, unsigned_ints,     TEST_DATA_DIRECTORY "/regression/unsigned_ints.json");
 BENCHMARK_CAPTURE(ParseFile, small_signed_ints, TEST_DATA_DIRECTORY "/regression/small_signed_ints.json");
 
-//////////////////////////////////////////////////////////////////////////////
-// parse JSON from a FILE*
-//////////////////////////////////////////////////////////////////////////////
-
-static void ParseFILE(benchmark::State& state, const char* filename)
-{
-    while (state.KeepRunning())
-    {
-        state.PauseTiming();
-        std::FILE* f = std::fopen(filename, "rb");
-        auto* j = new json();
-        state.ResumeTiming();
-
-        *j = json::parse(f);
-
-        state.PauseTiming();
-        std::fclose(f);
-        delete j;
-        state.ResumeTiming();
-    }
-
-    std::ifstream file(filename, std::ios::binary | std::ios::ate);
-    state.SetBytesProcessed(state.iterations() * file.tellg());
-}
-BENCHMARK_CAPTURE(ParseFILE, canada,       TEST_DATA_DIRECTORY "/nativejson-benchmark/canada.json");
-BENCHMARK_CAPTURE(ParseFILE, citm_catalog, TEST_DATA_DIRECTORY "/nativejson-benchmark/citm_catalog.json");
-BENCHMARK_CAPTURE(ParseFILE, twitter,      TEST_DATA_DIRECTORY "/nativejson-benchmark/twitter.json");
-
-//////////////////////////////////////////////////////////////////////////////
-// read many small values from one stream (NDJSON)
-//////////////////////////////////////////////////////////////////////////////
-
-static void ParseStreamValues(benchmark::State& state, bool numbers)
-{
-    std::string input;
-    for (int i = 0; i < 10000; ++i)
-    {
-        input += numbers ? std::to_string(i * 7919) + " "
-                 : R"({"id":)" + std::to_string(i) + R"(,"name":"user)" + std::to_string(i) + R"(","active":true,"score":)" + std::to_string(i * 0.25) + "}\n";
-    }
-
-    for (auto _ : state)
-    {
-        std::istringstream is(input);
-        json j;
-        std::size_t count = 0;
-        while (!(is >> std::ws).eof())
-        {
-            is >> j;
-            ++count;
-        }
-        benchmark::DoNotOptimize(count);
-    }
-
-    state.SetBytesProcessed(static_cast<int64_t>(state.iterations() * input.size()));
-}
-BENCHMARK_CAPTURE(ParseStreamValues, ndjson,  false);
-BENCHMARK_CAPTURE(ParseStreamValues, numbers, true);
-
 //////////////////////////////////////////////////////////////////////////////
 // parse JSON from string
 //////////////////////////////////////////////////////////////////////////////

tests/src/unit-class_lexer.cpp

@@ -15,12 +15,9 @@ using nlohmann::json;
 #include <array> // array
 #include <cstdint> // uint32_t, uint64_t
 #include <cstdio> // snprintf
-#include <cmath> // isfinite
 #include <cstdlib> // strtod
 #include <cstring> // memcpy
 #include <limits> // numeric_limits
-#include <initializer_list> // initializer_list
-#include <list> // list
 #include <map> // map
 #include <random> // mt19937
 #include <sstream> // stringstream
@@ -335,109 +332,6 @@ TEST_CASE("lexer number fast path")
         }
     }
 
-    SECTION("digits accumulated while scanning")
-    {
-        // The fast path accumulates the digits while it validates them, eight
-        // at a time where possible, and converts tokens with at most 19
-        // digits (floats) or 18 digits (integers) from that value. Every digit
-        // count from 1 to 25, in the integer and in the fraction part, with
-        // and without sign and exponent, must give the byte path's result. A
-        // std::list has no contiguous storage, so parsing it takes the byte
-        // path.
-        // type and value, or the error (values beyond the range of double
-        // are rejected with out_of_range.406 on both paths)
-        const auto outcome = [](const std::string & doc, bool byte_path) -> std::string
-        {
-            JSON_TRY
-            {
-                const std::list<char> chars(doc.begin(), doc.end());
-                const json j = byte_path ? json::parse(chars.begin(), chars.end()) : json::parse(doc);
-                return std::string(j[0].type_name()) + '|' + j.dump();
-            }
-            JSON_CATCH (const json::exception & e)
-            {
-                return e.what();
-            }
-        };
-
-        // the concatenation of @a parts
-        const auto join = [](std::initializer_list<std::string> parts)
-        {
-            std::string result;
-            for (const auto& part : parts)
-            {
-                result += part;
-            }
-            return result;
-        };
-
-        std::vector<std::string> numbers;
-        for (std::size_t digits = 1; digits <= 25; ++digits)
-        {
-            std::string run;
-            for (std::size_t i = 0; i < digits; ++i)
-            {
-                run += static_cast<char>('1' + static_cast<char>((i * 7) % 9));
-            }
-            const std::string nines(digits, '9');
-            for (const char* sign_text :
-                    {"", "-"
-                    })
-            {
-                const std::string sign = sign_text;
-                numbers.push_back(join({sign, run}));
-                numbers.push_back(join({sign, nines}));
-                numbers.push_back(join({sign, "1", std::string(digits - 1, '0')}));
-                numbers.push_back(join({sign, "0.", run}));
-                numbers.push_back(join({sign, "0.", std::string(digits, '0'), "1"}));
-                numbers.push_back(join({sign, run, ".", run}));
-                numbers.push_back(join({sign, run, "e-", std::to_string(digits)}));
-                numbers.push_back(join({sign, "1.", run, "E+", std::to_string(digits * 13)}));
-            }
-        }
-        // exponents beyond every range, and zeros
-        numbers.insert(numbers.end(), {"1e400", "1e-400", "-1e99999999999999999999", "1e-99999999999999999999",
-                                       "0e99999999999999999999", "0.0e-5", "-0.000", "123456789e-0000000000000000000000330"
-                                      });
-
-        for (const auto& n : numbers)
-        {
-            CAPTURE(n)
-            const std::string doc = "[" + n + "]";
-            const std::string a = outcome(doc, false);
-            CHECK(a == outcome(doc, true));
-            const double expected = std::strtod(n.c_str(), nullptr);
-            if (a.compare(0, 6, "number") == 0 && std::isfinite(expected) && n.find_first_of(".eE") != std::string::npos)
-            {
-                CHECK(json::parse(doc)[0].get<double>() == expected);
-            }
-        }
-    }
-
-    SECTION("integers that do not fit a narrower type become floats")
-    {
-        // up to 18 digits, the fast path stores the accumulated value without
-        // an overflow check; a narrower number_integer_t/number_unsigned_t
-        // must still see the value rejected and converted as a float
-        using json32 = nlohmann::basic_json<std::map, std::vector, std::string, bool, std::int32_t, std::uint32_t, float>;
-        for (const char* n :
-                {"4294967295", "4294967296", "2147483647", "-2147483648", "-2147483649", "99999999999", "-99999999999"
-                })
-        {
-            CAPTURE(n)
-            const std::string doc = std::string("[") + n + "]";
-            const std::list<char> chars(doc.begin(), doc.end());
-            const json32 a = json32::parse(doc);
-            const json32 b = json32::parse(chars.begin(), chars.end());
-            CHECK(a[0].type() == b[0].type());
-            CHECK(a == b);
-        }
-        CHECK(json32::parse("[4294967295]")[0].is_number_unsigned());
-        CHECK(json32::parse("[4294967296]")[0].is_number_float());
-        CHECK(json32::parse("[-2147483648]")[0].is_number_integer());
-        CHECK(json32::parse("[-2147483649]")[0].is_number_float());
-    }
-
     SECTION("token type classification")
     {
         CHECK((scan_string("0") == json::lexer::token_type::value_unsigned));

tests/src/unit-class_parser.cpp

@@ -30,9 +30,7 @@ using nlohmann::json;
 #include <valarray>
 #include <algorithm>
 #include <cstdio>
-#include <cstdint>
 #include <fstream>
-#include <iterator>
 #include <list>
 #include <sstream>
 #include <string>
@@ -2452,79 +2450,6 @@ std::string parse_error_message_range(IteratorType first, IteratorType last)
 }
 } // namespace
 
-TEST_CASE("text of float tokens")
-{
-    // For contiguous input, the lexer copies the text of a float token into
-    // its buffer only when a SAX handler asks for it (the library's own
-    // handlers do not). A user handler must still see the exact text, for
-    // every input adapter and in every position of a document.
-    const std::string doc = R"([1.5, -0.0, 0.1, 1e5, -2.5E-4, 12345678901234567890.5, 0.12345678901234567890123,
-                              {"a": 3.25, "b": [6.02e23, 1]}, "x", true, 7e-1])";
-    const std::vector<std::string> expected_floats =
-    {
-        "number_float(1.5)", "number_float(-0.0)", "number_float(0.1)", "number_float(1e5)", "number_float(-2.5E-4)",
-        "number_float(12345678901234567890.5)", "number_float(0.12345678901234567890123)", "number_float(3.25)",
-        "number_float(6.02e23)", "number_float(7e-1)"
-    };
-
-    const auto floats = [](const std::vector<std::string>& events)
-    {
-        std::vector<std::string> result;
-        std::copy_if(events.begin(), events.end(), std::back_inserter(result), [](const std::string & e)
-        {
-            return e.compare(0, 13, "number_float(") == 0;
-        });
-        return result;
-    };
-
-    SECTION("contiguous input")
-    {
-        SaxEventLogger l;
-        CHECK(json::sax_parse(doc, &l));
-        CHECK(floats(l.events) == expected_floats);
-    }
-
-    SECTION("byte input")
-    {
-        const std::vector<std::uint8_t> bytes(doc.begin(), doc.end());
-        SaxEventLogger l;
-        CHECK(json::sax_parse(bytes, &l));
-        CHECK(floats(l.events) == expected_floats);
-    }
-
-    SECTION("stream input")
-    {
-        std::istringstream is(doc);
-        SaxEventLogger l;
-        CHECK(json::sax_parse(is, &l));
-        CHECK(floats(l.events) == expected_floats);
-    }
-
-    SECTION("non-contiguous iterators")
-    {
-        const std::list<char> chars(doc.begin(), doc.end());
-        SaxEventLogger l;
-        CHECK(json::sax_parse(chars.begin(), chars.end(), &l));
-        CHECK(floats(l.events) == expected_floats);
-    }
-
-    SECTION("the library's own handlers do not need the text")
-    {
-        using lexer_adapter = nlohmann::detail::iterator_input_adapter<const char*>;
-        CHECK(nlohmann::detail::sax_ignores_number_text<nlohmann::detail::json_sax_dom_parser<json, lexer_adapter>>::value);
-        CHECK(nlohmann::detail::sax_ignores_number_text<nlohmann::detail::json_sax_dom_callback_parser<json, lexer_adapter>>::value);
-        CHECK(nlohmann::detail::sax_ignores_number_text<nlohmann::detail::json_sax_acceptor<json>>::value);
-        CHECK_FALSE(nlohmann::detail::sax_ignores_number_text<SaxEventLogger>::value);
-
-        // and the values are the same as when the text is read
-        const json j = json::parse(doc);
-        CHECK(j[0] == 1.5);
-        CHECK(j[5].get<double>() == 12345678901234567890.5);
-        CHECK(j[7]["b"][0] == 6.02e23);
-        CHECK(json::accept(doc));
-    }
-}
-
 TEST_CASE("last-read diagnostics are identical across input adapters")
 {
     // The lexer reconstructs the "last read" token lazily for seekable adapters

tests/src/unit-custom-array-type.cpp

@@ -9,7 +9,9 @@
 #include "doctest_compatibility.h"
 
 #include <nlohmann/json.hpp>
+using nlohmann::json;
 
+#include <cstdint>
 #include <deque>
 #include <map>
 #include <memory>
@@ -164,3 +166,47 @@ TEST_CASE("array type without at()")
     CHECK(j.at(no_at_json::json_pointer("/1")) == 2);
     CHECK_THROWS_AS(j.at(no_at_json::json_pointer("/3")), no_at_json::out_of_range);
 }
+
+TEST_CASE("regression test #5476 - array type without reserve()")
+{
+    // the capacity reserved for definite-length arrays must not require the
+    // array type to have a reserve() member function
+    SECTION("std::deque")
+    {
+        const auto j = deque_json::parse(R"({"a":[1,[2,3]],"b":[]})");
+        CHECK(j.dump() == R"({"a":[1,[2,3]],"b":[]})");
+
+        // the binary formats pass a definite length to start_array()
+        CHECK(deque_json::from_cbor(deque_json::to_cbor(j)) == j);
+        CHECK(deque_json::from_msgpack(deque_json::to_msgpack(j)) == j);
+        CHECK(deque_json::from_bon8(deque_json::to_bon8(j)) == j);
+
+        // parse() instantiates the callback parser as well, which reserves too
+        const auto with_callback = deque_json::parse(R"([1,2,3])", [](int /*depth*/, deque_json::parse_event_t /*event*/, deque_json& /*parsed*/) noexcept
+        {
+            return true;
+        });
+        CHECK(with_callback == deque_json({1, 2, 3}));
+    }
+
+    SECTION("std::vector still reserves")
+    {
+        json array = json::array();
+        for (int i = 0; i < 100; ++i)
+        {
+            array.push_back(i);
+        }
+
+        const auto j = json::from_cbor(json::to_cbor(array));
+        CHECK(j == array);
+        CHECK(j.get_ref<const json::array_t&>().capacity() >= 100);
+    }
+
+    SECTION("the reservation stays capped")
+    {
+        // CBOR array announcing 2^32-1 elements, but truncated right after the
+        // header: the input must be rejected without reserving that capacity
+        const std::vector<std::uint8_t> truncated = {0x9A, 0xFF, 0xFF, 0xFF, 0xFF};
+        CHECK(json::from_cbor(truncated, true, false).is_discarded());
+    }
+}

tests/src/unit-custom-number-types.cpp

@@ -0,0 +1,367 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+
+#include <cstdint>
+#include <limits>
+#include <map>
+#include <string>
+#include <type_traits>
+#include <vector>
+
+#if JSON_HAS_THREE_WAY_COMPARISON
+    #include <compare>
+#endif
+
+namespace custom_number_types
+{
+
+// a signed integer of class type: std::is_signed is only true for arithmetic
+// types, so the library has to take the signedness from std::numeric_limits,
+// as it does for 128-bit and multiprecision integer classes such as
+// absl::int128 or boost::multiprecision::cpp_int
+class class_int
+{
+  public:
+    // trivial, like the 128-bit integer classes: the value is stored in a union
+    class_int() = default;
+
+    // implicit from built-in integers and explicit from floats, like absl::int128;
+    // non-template overloads (as absl::int128 has) because clang 3.4 and 3.5
+    // reject basic_json's defaulted data() for a number type with template
+    // constructors
+    class_int(int v) : value(v) {} // NOLINT(google-explicit-constructor,hicpp-explicit-conversions)
+    class_int(unsigned v) : value(v) {} // NOLINT(google-explicit-constructor,hicpp-explicit-conversions)
+    class_int(long v) : value(v) {} // NOLINT(google-explicit-constructor,hicpp-explicit-conversions)
+    class_int(unsigned long v) : value(static_cast<std::int64_t>(v)) {} // NOLINT(google-explicit-constructor,hicpp-explicit-conversions)
+    class_int(long long v) : value(v) {} // NOLINT(google-explicit-constructor,hicpp-explicit-conversions)
+    class_int(unsigned long long v) : value(static_cast<std::int64_t>(v)) {} // NOLINT(google-explicit-constructor,hicpp-explicit-conversions)
+    explicit class_int(double v) : value(static_cast<std::int64_t>(v)) {}
+
+    template<typename T, typename std::enable_if<std::is_arithmetic<T>::value, int>::type = 0>
+    explicit operator T() const
+    {
+        return static_cast<T>(value);
+    }
+
+    friend bool operator==(class_int lhs, class_int rhs)
+    {
+        return lhs.value == rhs.value;
+    }
+    friend bool operator!=(class_int lhs, class_int rhs)
+    {
+        return lhs.value != rhs.value;
+    }
+    friend bool operator<(class_int lhs, class_int rhs)
+    {
+        return lhs.value < rhs.value;
+    }
+#if JSON_HAS_THREE_WAY_COMPARISON
+    friend std::strong_ordering operator<=>(class_int lhs, class_int rhs) // *NOPAD*
+    {
+        return lhs.value <=> rhs.value; // *NOPAD*
+    }
+#endif
+
+  private:
+    std::int64_t value;
+};
+
+} // namespace custom_number_types
+
+using custom_number_types::class_int;
+
+namespace std
+{
+// only the members the library uses
+template<>
+class numeric_limits<class_int>
+{
+  public:
+    static constexpr bool is_signed = true;
+    static constexpr int digits = std::numeric_limits<std::int64_t>::digits;
+};
+} // namespace std
+
+namespace
+{
+
+using class_int_json = nlohmann::basic_json<std::map, std::vector, std::string, bool, class_int, std::uint64_t, double>;
+
+class_int_json make_class_int(std::int64_t v)
+{
+    class_int_json j(class_int_json::value_t::number_integer);
+    j.get_ref<class_int&>() = class_int(v);
+    return j;
+}
+
+} // namespace
+
+// the serializer cannot print an integer of class type, so doctest must not
+// try when an assertion fails
+namespace doctest
+{
+template<>
+struct StringMaker<class_int_json>
+{
+    static String convert(const class_int_json& j)
+    {
+        return j.type_name();
+    }
+};
+} // namespace doctest
+
+// __int128 as number type needs the std::numeric_limits (for the range checks)
+// and std::is_integral (for the serializer) specializations, which libc++
+// always provides and libstdc++ only outside strict ISO modes; the MSVC
+// standard library has none
+#if defined(__SIZEOF_INT128__) && (defined(_LIBCPP_VERSION) || defined(__GLIBCXX_TYPE_INT_N_0))
+    #define JSON_TEST_INT128_NUMBER_TYPES 1
+#else
+    #define JSON_TEST_INT128_NUMBER_TYPES 0
+#endif
+
+#if JSON_TEST_INT128_NUMBER_TYPES
+namespace
+{
+
+// __extension__ keeps -Wpedantic from flagging the non-standard type
+__extension__ typedef __int128 int128; // NOLINT(modernize-use-using)
+__extension__ typedef unsigned __int128 uint128; // NOLINT(modernize-use-using)
+
+static_assert(std::numeric_limits<int128>::digits == 127 && std::numeric_limits<uint128>::digits == 128 &&
+              std::is_integral<int128>::value && std::is_integral<uint128>::value, // NOLINT(misc-redundant-expression)
+              "__int128 is not fully supported by the standard library");
+
+using wide_json = nlohmann::basic_json<std::map, std::vector, std::string, bool, int128, uint128, double>;
+
+wide_json make_int(int128 v)
+{
+    wide_json j(wide_json::value_t::number_integer);
+    j.get_ref<int128&>() = v;
+    return j;
+}
+
+wide_json make_uint(uint128 v)
+{
+    wide_json j(wide_json::value_t::number_unsigned);
+    j.get_ref<uint128&>() = v;
+    return j;
+}
+
+wide_json wrap(const wide_json& value)
+{
+    wide_json o(wide_json::value_t::object);
+    o["v"] = value;
+    return o;
+}
+
+} // namespace
+
+TEST_CASE("custom number types: integers beyond 64 bits")
+{
+    using out_of_range = wide_json::out_of_range;
+
+    const int128 two_64 = static_cast<int128>(1) << 64;
+    const int128 two_100 = static_cast<int128>(1) << 100;
+    const int128 max_int64 = (std::numeric_limits<std::int64_t>::max)();
+    const int128 min_int64 = (std::numeric_limits<std::int64_t>::min)();
+    const uint128 max_uint64 = (std::numeric_limits<std::uint64_t>::max)();
+
+    // before the range checks, these values were silently truncated, e.g.,
+    // 2^100 was written as 0
+    const wide_json int_big = make_int(two_100);
+    const wide_json int_big_negative = make_int(-two_100);
+    const wide_json uint_big = make_uint(static_cast<uint128>(two_100));
+    std::vector<std::uint8_t> _;
+
+    SECTION("CBOR")
+    {
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_cbor(int_big), "[json.exception.out_of_range.407] integer number 1267650600228229401496703205376 cannot be represented by CBOR as it does not fit [-2^64, 2^64-1]", out_of_range&);
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_cbor(int_big_negative), "[json.exception.out_of_range.407] integer number -1267650600228229401496703205376 cannot be represented by CBOR as it does not fit [-2^64, 2^64-1]", out_of_range&);
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_cbor(uint_big), "[json.exception.out_of_range.407] integer number 1267650600228229401496703205376 cannot be represented by CBOR as it does not fit uint64", out_of_range&);
+        // the extremes of the 128-bit types, whose digits are produced without
+        // negating the minimum as a whole
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_cbor(make_int((std::numeric_limits<int128>::min)())), "[json.exception.out_of_range.407] integer number -170141183460469231731687303715884105728 cannot be represented by CBOR as it does not fit [-2^64, 2^64-1]", out_of_range&);
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_cbor(make_int((std::numeric_limits<int128>::max)())), "[json.exception.out_of_range.407] integer number 170141183460469231731687303715884105727 cannot be represented by CBOR as it does not fit [-2^64, 2^64-1]", out_of_range&);
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_cbor(make_uint((std::numeric_limits<uint128>::max)())), "[json.exception.out_of_range.407] integer number 340282366920938463463374607431768211455 cannot be represented by CBOR as it does not fit uint64", out_of_range&);
+        CHECK_THROWS_AS(_ = wide_json::to_cbor(make_int(two_64)), out_of_range&);
+        CHECK_THROWS_AS(_ = wide_json::to_cbor(make_int(-two_64 - 1)), out_of_range&);
+        CHECK_THROWS_AS(_ = wide_json::to_cbor(make_uint(static_cast<uint128>(max_uint64) + 1)), out_of_range&);
+
+        // CBOR's integers cover [-2^64, 2^64-1]
+        CHECK(wide_json::to_cbor(make_int(two_64 - 1)) == std::vector<std::uint8_t>({0x1B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}));
+        CHECK(wide_json::to_cbor(make_int(-two_64)) == std::vector<std::uint8_t>({0x3B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}));
+        CHECK(wide_json::to_cbor(make_uint(max_uint64)) == std::vector<std::uint8_t>({0x1B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}));
+    }
+
+    SECTION("MessagePack")
+    {
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_msgpack(int_big), "[json.exception.out_of_range.407] integer number 1267650600228229401496703205376 cannot be represented by MessagePack as it does not fit [-2^63, 2^64-1]", out_of_range&);
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_msgpack(int_big_negative), "[json.exception.out_of_range.407] integer number -1267650600228229401496703205376 cannot be represented by MessagePack as it does not fit [-2^63, 2^64-1]", out_of_range&);
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_msgpack(uint_big), "[json.exception.out_of_range.407] integer number 1267650600228229401496703205376 cannot be represented by MessagePack as it does not fit uint64", out_of_range&);
+        CHECK_THROWS_AS(_ = wide_json::to_msgpack(make_int(two_64)), out_of_range&);
+        CHECK_THROWS_AS(_ = wide_json::to_msgpack(make_int(min_int64 - 1)), out_of_range&);
+
+        // MessagePack's integers cover [-2^63, 2^64-1]
+        CHECK(wide_json::to_msgpack(make_int(two_64 - 1)) == std::vector<std::uint8_t>({0xCF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}));
+        CHECK(wide_json::to_msgpack(make_int(min_int64)) == std::vector<std::uint8_t>({0xD3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}));
+        CHECK(wide_json::to_msgpack(make_uint(max_uint64)) == std::vector<std::uint8_t>({0xCF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}));
+    }
+
+    SECTION("BSON")
+    {
+        // wrap() stores the value at /v, which JSON_DIAGNOSTICS adds to the message
+#if JSON_DIAGNOSTICS
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_bson(wrap(int_big)), "[json.exception.out_of_range.407] (/v) integer number 1267650600228229401496703205376 cannot be represented by BSON as it does not fit int64", out_of_range&);
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_bson(wrap(int_big_negative)), "[json.exception.out_of_range.407] (/v) integer number -1267650600228229401496703205376 cannot be represented by BSON as it does not fit int64", out_of_range&);
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_bson(wrap(uint_big)), "[json.exception.out_of_range.407] (/v) integer number 1267650600228229401496703205376 cannot be represented by BSON as it does not fit uint64", out_of_range&);
+#else
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_bson(wrap(int_big)), "[json.exception.out_of_range.407] integer number 1267650600228229401496703205376 cannot be represented by BSON as it does not fit int64", out_of_range&);
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_bson(wrap(int_big_negative)), "[json.exception.out_of_range.407] integer number -1267650600228229401496703205376 cannot be represented by BSON as it does not fit int64", out_of_range&);
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_bson(wrap(uint_big)), "[json.exception.out_of_range.407] integer number 1267650600228229401496703205376 cannot be represented by BSON as it does not fit uint64", out_of_range&);
+#endif
+        CHECK_THROWS_AS(_ = wide_json::to_bson(wrap(make_int(max_int64 + 1))), out_of_range&);
+        CHECK_THROWS_AS(_ = wide_json::to_bson(wrap(make_int(min_int64 - 1))), out_of_range&);
+
+        // nested values are checked as well, before anything is written
+        wide_json nested(wide_json::value_t::object);
+        nested["a"] = wide_json::array({wrap(int_big)});
+        std::vector<std::uint8_t> out;
+        CHECK_THROWS_AS(wide_json::to_bson(nested, out), out_of_range&);
+        CHECK(out.empty());
+
+        CHECK(wide_json::from_bson(wide_json::to_bson(wrap(make_int(max_int64)))) == wrap(make_int(max_int64)));
+        CHECK(wide_json::from_bson(wide_json::to_bson(wrap(make_int(min_int64)))) == wrap(make_int(min_int64)));
+        CHECK_NOTHROW(wide_json::to_bson(wrap(make_uint(max_uint64))));
+    }
+
+    SECTION("BON8")
+    {
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_bon8(int_big), "[json.exception.out_of_range.407] integer number 1267650600228229401496703205376 cannot be represented by BON8 as it does not fit int64", out_of_range&);
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_bon8(int_big_negative), "[json.exception.out_of_range.407] integer number -1267650600228229401496703205376 cannot be represented by BON8 as it does not fit int64", out_of_range&);
+        CHECK_THROWS_WITH_AS(_ = wide_json::to_bon8(uint_big), "[json.exception.out_of_range.407] integer number 1267650600228229401496703205376 cannot be represented by BON8 as it does not fit int64", out_of_range&);
+        CHECK_THROWS_AS(_ = wide_json::to_bon8(make_int(max_int64 + 1)), out_of_range&);
+        CHECK_THROWS_AS(_ = wide_json::to_bon8(make_int(min_int64 - 1)), out_of_range&);
+
+        CHECK(wide_json::from_bon8(wide_json::to_bon8(make_int(max_int64))) == make_int(max_int64));
+        CHECK(wide_json::from_bon8(wide_json::to_bon8(make_int(min_int64))) == make_int(min_int64));
+    }
+
+    SECTION("UBJSON and BJData")
+    {
+        // integers beyond 64 bits are written exactly as high-precision numbers
+        const std::string digits = "1267650600228229401496703205376";
+        std::vector<std::uint8_t> expected = {'H', 'i', static_cast<std::uint8_t>(digits.size())};
+        expected.insert(expected.end(), digits.begin(), digits.end());
+        CHECK(wide_json::to_ubjson(int_big) == expected);
+        CHECK(wide_json::to_ubjson(uint_big) == expected);
+        CHECK(wide_json::to_bjdata(int_big) == expected);
+        // BJData's uint64 marker 'M' was used for any unsigned value beyond
+        // int64, which truncated the ones beyond 64 bits
+        CHECK(wide_json::to_bjdata(uint_big) == expected);
+
+        // the uint64 marker is still used where the value fits
+        CHECK(wide_json::to_bjdata(make_uint(max_uint64)) == std::vector<std::uint8_t>({'M', 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}));
+
+        // the elements of an optimized container are written the same way;
+        // BJData does not allow 'H' as the type of an optimized container
+        std::vector<std::uint8_t> expected_ubjson_array = {'[', '$', 'H', '#', 'i', 2};
+        std::vector<std::uint8_t> expected_bjdata_array = {'[', '#', 'i', 2};
+        for (int i = 0; i < 2; ++i)
+        {
+            expected_ubjson_array.insert(expected_ubjson_array.end(), expected.begin() + 1, expected.end());
+            expected_bjdata_array.insert(expected_bjdata_array.end(), expected.begin(), expected.end());
+        }
+        CHECK(wide_json::to_ubjson(wide_json::array({uint_big, uint_big}), true, true) == expected_ubjson_array);
+        CHECK(wide_json::to_bjdata(wide_json::array({uint_big, uint_big}), true, true) == expected_bjdata_array);
+    }
+
+    SECTION("BJData ND-array")
+    {
+        // an ND-array element beyond 64 bits does not fit any dtype, so the
+        // annotated object is written as a plain object instead of truncating
+        // the element into range
+        wide_json element(wide_json::value_t::object);
+        element["_ArrayType_"] = "uint8";
+        element["_ArraySize_"] = wide_json::array({make_uint(2), make_uint(1)});
+        element["_ArrayData_"] = wide_json::array({make_uint(1), make_uint(static_cast<uint128>(two_64) + 1)});
+        const auto element_bytes = wide_json::to_bjdata(element, true, true);
+        REQUIRE(!element_bytes.empty());
+        CHECK(element_bytes[0] == '{');
+
+        wide_json signed_element = element;
+        signed_element["_ArrayType_"] = "int8";
+        signed_element["_ArrayData_"] = wide_json::array({make_int(1), make_int(-two_64 + 1)});
+        const auto signed_element_bytes = wide_json::to_bjdata(signed_element, true, true);
+        REQUIRE(!signed_element_bytes.empty());
+        CHECK(signed_element_bytes[0] == '{');
+
+        // the same for a dimension beyond 64 bits, which wrapped into a
+        // dimension matching the size of _ArrayData_ (here: 1)
+        wide_json dimension = element;
+        dimension["_ArraySize_"] = wide_json::array({make_uint(2), make_uint(static_cast<uint128>(two_64) + 1)});
+        dimension["_ArrayData_"] = wide_json::array({make_uint(1), make_uint(2)});
+        const auto dimension_bytes = wide_json::to_bjdata(dimension, true, true);
+        REQUIRE(!dimension_bytes.empty());
+        CHECK(dimension_bytes[0] == '{');
+
+        // in range, the ND-array is still written
+        wide_json fits = element;
+        fits["_ArrayData_"] = wide_json::array({make_uint(1), make_uint(2)});
+        const auto fits_bytes = wide_json::to_bjdata(fits, true, true);
+        REQUIRE(!fits_bytes.empty());
+        CHECK(fits_bytes[0] == '[');
+    }
+}
+
+#endif
+
+TEST_CASE("custom number types")
+{
+    SECTION("signed integer of class type compared with a float")
+    {
+        // std::is_signed is false for a class type, which made the comparison
+        // treat any float below zero as less than every integer
+        const class_int_json minus_five = make_class_int(-5);
+        const class_int_json minus_two = make_class_int(-2);
+        const class_int_json five = make_class_int(5);
+        const class_int_json minus_two_and_a_half = -2.5;
+        const class_int_json two_and_a_half = 2.5;
+        const class_int_json huge_negative = -1e30;
+        const class_int_json huge_positive = 1e30;
+
+        CHECK(minus_five < minus_two_and_a_half);
+        CHECK_FALSE(minus_two_and_a_half < minus_five);
+        CHECK(minus_two_and_a_half > minus_five);
+        CHECK(minus_five <= minus_two_and_a_half);
+        CHECK(minus_two_and_a_half >= minus_five);
+        CHECK(minus_five != minus_two_and_a_half);
+
+        CHECK(minus_two_and_a_half < minus_two);
+        CHECK_FALSE(minus_two < minus_two_and_a_half);
+
+        CHECK(two_and_a_half < five);
+        CHECK(minus_five < two_and_a_half);
+
+        // floats beyond the integer's range
+        CHECK(huge_negative < minus_five);
+        CHECK_FALSE(minus_five < huge_negative);
+        CHECK(five < huge_positive);
+        CHECK_FALSE(huge_positive < five);
+
+        // equality
+        const class_int_json minus_two_float = -2.0;
+        CHECK(minus_two == minus_two_float);
+        CHECK(minus_two_float == minus_two);
+    }
+
+}

tests/src/unit-file_input.cpp

@@ -1,236 +0,0 @@
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
-// |  |  |__   |  |  | | | |  version 3.12.0
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <array>
-#include <cstdint>
-#include <cstdio>
-#include <fstream>
-#include <memory>
-#include <random>
-#include <string>
-#include <thread>
-#include <vector>
-
-// Parsing from a FILE* locks the file once and reads it with the unlocked
-// stdio functions (see JSON_DISABLE_UNLOCKED_FILE_IO). These tests pin that
-// this is not observable: the results are the same, the file is unlocked
-// again when parsing ends - also with an exception - and the same thread can
-// keep using the file while it is locked, e.g., from a SAX callback.
-
-namespace
-{
-// a file name of its own for every run: the test runs for several C++
-// standards and configurations at the same time, in the same directory
-std::string temp_file_name()
-{
-    std::random_device rd;
-    return "unit-file_input-" + std::to_string(rd()) + ".tmp";
-}
-
-using file_ptr = std::unique_ptr<std::FILE, int (*)(std::FILE*)>;
-
-// write @a content to the file @a name and open it for reading
-file_ptr open_with(const char* name, const std::string& content)
-{
-    {
-        std::ofstream file(name, std::ios::binary);
-        file << content;
-    }
-    return {std::fopen(name, "rb"), &std::fclose};
-}
-
-// The stdio lock is recursive, so whether parsing released it can only be
-// seen from another thread: ftrylockfile() fails there while this thread
-// holds the lock. ftrylockfile() is POSIX; elsewhere, the check is skipped.
-#if defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-void check_unlocked(std::FILE* f)
-{
-    int result = -1;
-    std::thread other([f, &result]
-    {
-        result = ftrylockfile(f);
-        if (result == 0)
-        {
-            funlockfile(f);
-        }
-    });
-    other.join();
-    CHECK(result == 0);
-}
-#else
-void check_unlocked(std::FILE* /*f*/) {}
-#endif
-
-// SAX consumer that also reads the position of the file it is parsing, which
-// takes the file's lock again on the same thread
-class position_reading_sax : public nlohmann::json_sax<json>
-{
-  public:
-    explicit position_reading_sax(std::FILE* f) : m_file(f) {}
-    position_reading_sax(const position_reading_sax&) = delete;
-    position_reading_sax(position_reading_sax&&) = delete;
-    position_reading_sax& operator=(const position_reading_sax&) = delete;
-    position_reading_sax& operator=(position_reading_sax&&) = delete;
-    ~position_reading_sax() override = default;
-
-    bool null() override
-    {
-        return record();
-    }
-    bool boolean(bool /*val*/) override
-    {
-        return record();
-    }
-    bool number_integer(number_integer_t /*val*/) override
-    {
-        return record();
-    }
-    bool number_unsigned(number_unsigned_t /*val*/) override
-    {
-        return record();
-    }
-    bool number_float(number_float_t /*val*/, const string_t& /*s*/) override
-    {
-        return record();
-    }
-    bool string(string_t& /*val*/) override
-    {
-        return record();
-    }
-    bool binary(binary_t& /*val*/) override
-    {
-        return record();
-    }
-    bool start_object(std::size_t /*elements*/) override
-    {
-        return record();
-    }
-    bool key(string_t& /*val*/) override
-    {
-        return record();
-    }
-    bool end_object() override
-    {
-        return record();
-    }
-    bool start_array(std::size_t /*elements*/) override
-    {
-        return record();
-    }
-    bool end_array() override
-    {
-        return record();
-    }
-    bool parse_error(std::size_t /*position*/, const std::string& /*last_token*/, const nlohmann::detail::exception& /*ex*/) override
-    {
-        return false;
-    }
-
-    const std::vector<long>& positions() const
-    {
-        return m_positions;
-    }
-
-  private:
-    bool record()
-    {
-        m_positions.push_back(std::ftell(m_file));
-        return true;
-    }
-
-    std::FILE* m_file;
-    std::vector<long> m_positions{}; // NOLINT(readability-redundant-member-init)
-};
-}  // namespace
-
-TEST_CASE("parsing from a FILE*")
-{
-    const std::string temp_name = temp_file_name();
-    const char* const name = temp_name.c_str();
-    const std::string input = "{\"a\": [1, -2.5, \"three\", true, null], \"b\": {\"c\": \"caf\xc3\xa9\"}}";
-
-    SECTION("values are the same as when parsing from a string")
-    {
-        const file_ptr f = open_with(name, input);
-        REQUIRE(f != nullptr);
-        CHECK(json::parse(f.get()) == json::parse(input));
-        // the whole input was consumed
-        std::array<char, 8> rest{};
-        CHECK(std::fgets(rest.data(), static_cast<int>(rest.size()), f.get()) == nullptr);
-        check_unlocked(f.get());
-    }
-
-    SECTION("the file is unlocked after a parse error")
-    {
-        const file_ptr f = open_with(name, "[1, 2, x]");
-        REQUIRE(f != nullptr);
-        json _;
-        CHECK_THROWS_WITH_AS(_ = json::parse(f.get()),
-                             "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - invalid literal; last read: '2, x'",
-                             json::parse_error&);
-        check_unlocked(f.get());
-
-        // the file is still usable: the rest of the input is there
-        std::array<char, 8> rest{};
-        CHECK(std::fgets(rest.data(), static_cast<int>(rest.size()), f.get()) != nullptr);
-        CHECK(std::string(rest.data()) == "]");
-    }
-
-    SECTION("the file can be parsed again and read with stdio afterwards")
-    {
-        const file_ptr f = open_with(name, "[1] [2] tail");
-        REQUIRE(f != nullptr);
-
-        // sax_parse with strict == false stops after the first value; an array
-        // ends with its closing bracket, so the space after it is not read
-        json j;
-        nlohmann::detail::json_sax_dom_parser<json, nlohmann::detail::string_input_adapter_type> sax1(j);
-        CHECK(json::sax_parse(f.get(), &sax1, json::input_format_t::json, false));
-        CHECK(j == json({1}));
-        check_unlocked(f.get());
-
-        json k;
-        nlohmann::detail::json_sax_dom_parser<json, nlohmann::detail::string_input_adapter_type> sax2(k);
-        CHECK(json::sax_parse(f.get(), &sax2, json::input_format_t::json, false));
-        CHECK(k == json({2}));
-        check_unlocked(f.get());
-
-        std::array<char, 8> rest{};
-        CHECK(std::fgets(rest.data(), static_cast<int>(rest.size()), f.get()) != nullptr);
-        CHECK(std::string(rest.data()) == " tail");
-    }
-
-    SECTION("the same thread can use the file while it is parsed")
-    {
-        const file_ptr f = open_with(name, "[10, 20, 30]");
-        REQUIRE(f != nullptr);
-        position_reading_sax sax(f.get());
-        CHECK(json::sax_parse(f.get(), &sax));
-        // start_array, three numbers, end_array
-        CHECK(sax.positions().size() == 5);
-        CHECK(sax.positions().front() == 1);
-        check_unlocked(f.get());
-    }
-
-    SECTION("binary formats read from a FILE*")
-    {
-        const json j = {{"string", std::string(300, 'x')}, {"array", {1, 2, 3}}, {"number", 1.5}};
-        const std::vector<std::uint8_t> cbor = json::to_cbor(j);
-        const file_ptr f = open_with(name, std::string(reinterpret_cast<const char*>(cbor.data()), cbor.size()));
-        REQUIRE(f != nullptr);
-        CHECK(json::from_cbor(f.get()) == j);
-        check_unlocked(f.get());
-    }
-
-    static_cast<void>(std::remove(name));
-}

tests/src/unit-msgpack-custom-types.cpp

@@ -0,0 +1,296 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+// MessagePack tests with basic_json specializations other than nlohmann::json;
+// they are kept apart from unit-msgpack.cpp because every specialization adds
+// many sections to the object file, and MinGW cannot link objects with more
+// than 65535 sections (see the clang job in .github/workflows/windows.yml)
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <cstdint> // SIZE_MAX, UINT32_MAX
+#include <functional>
+#include <limits>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+// the fake sizes below do not fit into a 32-bit std::size_t
+// with clang and libstdc++ 10, the std::filesystem::path conversion that
+// C++17 builds consider for every string type is ambiguous for a class
+// derived from std::string, so the string case is not tested there
+#if !(defined(__clang__) && defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 11)
+    #define JSON_TEST_BEYOND_UINT32_STRING 1
+#endif
+
+#if SIZE_MAX > UINT32_MAX
+template<typename T, typename A = std::allocator<T>>
+struct huge_array : std::vector<T, A>
+{
+    using base = std::vector<T, A>;
+    using base::base;
+
+    bool fake_size = false;
+
+    std::size_t size() const noexcept
+    {
+        if (fake_size)
+        {
+            return (std::numeric_limits<std::uint32_t>::max)() + 1ULL;
+        }
+
+        return base::size();
+    }
+};
+
+using huge_array_json = nlohmann::json::with_array_t<huge_array>;
+
+TEST_CASE("MessagePack Size above uint32 for array")
+{
+    huge_array_json j = huge_array_json::array();
+
+    j.push_back(1);
+    j.push_back(2);
+    j.push_back(3);
+
+    auto& array = j.get_ref<huge_array_json::array_t&>();
+    array.fake_size = true;
+
+    // write into a caller-owned vector: to_msgpack(j) reserves space based on
+    // the (faked) element count, which fails with bad_alloc on Windows
+    std::vector<std::uint8_t> result;
+    CHECK_THROWS_WITH_AS(
+        huge_array_json::to_msgpack(j, result),
+        "[json.exception.out_of_range.412] MessagePack length 4294967296 exceeds maximum of 4294967295",
+        json::out_of_range&);
+
+    array.fake_size = false;
+}
+
+template<typename K, typename V,
+         typename C = std::less<K>,
+         typename A = std::allocator<std::pair<const K, V>>>
+                                     struct huge_map : std::map<K, V, C, A>
+{
+    using base = std::map<K, V, C, A>;
+    using base::base;
+
+    bool fake_size = false;
+
+    std::size_t size() const noexcept
+    {
+        if (fake_size)
+        {
+            return static_cast<std::size_t>(UINT32_MAX) + 1ULL;
+        }
+
+        return base::size();
+    }
+};
+
+using huge_object_json = nlohmann::json::with_object_t<huge_map>;
+
+TEST_CASE("MessagePack Size above uint32 for object")
+{
+
+    huge_object_json j = huge_object_json::object();
+
+    j["one"] = 1;
+    j["two"] = 2;
+
+    auto& object = j.get_ref<huge_object_json::object_t&>();
+    object.fake_size = true;
+
+    // write into a caller-owned vector: to_msgpack(j) reserves space based on
+    // the (faked) element count, which fails with bad_alloc on Windows
+    std::vector<std::uint8_t> result;
+    CHECK_THROWS_WITH_AS(
+        huge_object_json::to_msgpack(j, result),
+        "[json.exception.out_of_range.412] MessagePack length 4294967296 exceeds maximum of 4294967295",
+        json::out_of_range&);
+
+    object.fake_size = false;
+}
+
+#ifdef JSON_TEST_BEYOND_UINT32_STRING
+struct huge_string : std::string
+{
+    using std::string::string;
+
+    std::size_t size() const noexcept // NOLINT(readability-convert-member-functions-to-static)
+    {
+        return static_cast<std::size_t>(UINT32_MAX) + 1ULL;
+    }
+};
+
+using huge_string_json = nlohmann::json::with_string_t<huge_string>;
+
+TEST_CASE("MessagePack Size above uint32 for string")
+{
+    const huge_string_json j = "hello";
+
+    CHECK_THROWS_WITH_AS(
+        huge_string_json::to_msgpack(j),
+        "[json.exception.out_of_range.412] MessagePack length 4294967296 exceeds maximum of 4294967295",
+        json::out_of_range&);
+}
+#endif
+
+struct huge_binary : std::vector<std::uint8_t>
+{
+    using std::vector<std::uint8_t>::vector;
+
+    std::size_t size() const noexcept // NOLINT(readability-convert-member-functions-to-static)
+    {
+        return static_cast<std::size_t>(UINT32_MAX) + 1ULL;
+    }
+};
+
+using huge_binary_json = nlohmann::json::with_binary_t<huge_binary>;
+
+TEST_CASE("MessagePack Size above uint32 for binary")
+{
+
+    huge_binary_json j = huge_binary_json::binary(huge_binary{});
+
+    j.get_binary().push_back(0x01);
+    j.get_binary().push_back(0x02);
+
+    CHECK_THROWS_WITH_AS(
+        huge_binary_json::to_msgpack(j),
+        "[json.exception.out_of_range.412] MessagePack length 4294967296 exceeds maximum of 4294967295",
+        json::out_of_range&);
+}
+#endif
+
+namespace
+{
+// types that report a size beyond UINT32_MAX without allocating that much
+// memory, so the MessagePack length limit can be tested cheaply; see the
+// similar types in unit-bson.cpp
+std::size_t beyond_uint32_size()
+{
+    return static_cast<std::size_t>((std::numeric_limits<std::uint32_t>::max)()) + 1;
+}
+
+class beyond_uint32_binary_t : public std::vector<std::uint8_t>
+{
+  public:
+    using std::vector<std::uint8_t>::vector;
+
+    size_type size() const noexcept // NOLINT(readability-convert-member-functions-to-static)
+    {
+        return beyond_uint32_size();
+    }
+};
+
+#ifdef JSON_TEST_BEYOND_UINT32_STRING
+class beyond_uint32_string_t : public std::string
+{
+  public:
+    using std::string::string;
+
+    size_type size() const noexcept // NOLINT(readability-convert-member-functions-to-static)
+    {
+        return beyond_uint32_size();
+    }
+};
+
+using beyond_uint32_string_json = nlohmann::json::with_string_t<beyond_uint32_string_t>;
+#endif
+
+using beyond_uint32_binary_json = nlohmann::json::with_binary_t<beyond_uint32_binary_t>;
+} // namespace
+
+TEST_CASE("MessagePack lengths beyond UINT32_MAX cannot be serialized")
+{
+    // MessagePack stores the length of a string, binary value, array, or
+    // object in at most 32 bits; a larger one used to be written without any
+    // length at all
+#if SIZE_MAX > UINT32_MAX
+    {
+        const char* const expected = "[json.exception.out_of_range.412] MessagePack length 4294967296 exceeds maximum of 4294967295";
+
+        const beyond_uint32_binary_json binary = beyond_uint32_binary_json::binary(beyond_uint32_binary_t{});
+        CHECK_THROWS_WITH_AS(beyond_uint32_binary_json::to_msgpack(binary), expected, beyond_uint32_binary_json::out_of_range&);
+
+        const beyond_uint32_binary_json ext = beyond_uint32_binary_json::binary(beyond_uint32_binary_t{}, 42);
+        CHECK_THROWS_WITH_AS(beyond_uint32_binary_json::to_msgpack(ext), expected, beyond_uint32_binary_json::out_of_range&);
+
+#ifdef JSON_TEST_BEYOND_UINT32_STRING
+        // created from its type rather than from a beyond_uint32_string_t:
+        // that would consider the std::filesystem::path conversion, which
+        // libstdc++ 10 cannot decide for a class derived from std::string
+        const beyond_uint32_string_json string(beyond_uint32_string_json::value_t::string);
+        CHECK_THROWS_WITH_AS(beyond_uint32_string_json::to_msgpack(string), expected, beyond_uint32_string_json::out_of_range&);
+#endif
+    }
+#endif
+}
+
+TEST_CASE("MessagePack numbers use the active union member (see #5644)")
+{
+    // when number_integer_t is narrower than number_unsigned_t, to_msgpack()
+    // used to read the union member that was not the active one, writing
+    // wrong bytes for some values; std::int64_t/std::uint64_t (the default
+    // types, where both members have the same width) were not affected
+    using int32_json = nlohmann::json::with_integers_t<std::int32_t, std::uint64_t>;
+    using int16_json = nlohmann::json::with_integers_t<std::int16_t, std::uint64_t>;
+
+    SECTION("number_integer_t = std::int32_t")
+    {
+        SECTION("6442450944 (uint 64; the low 32 bits used to be sign-extended)")
+        {
+            const int32_json j = 6442450944ULL;
+            CHECK(j.is_number_unsigned());
+
+            std::vector<uint8_t> const expected{0xcf, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00};
+            const auto result = int32_json::to_msgpack(j);
+            CHECK(result == expected);
+            CHECK(int32_json::from_msgpack(result) == j);
+        }
+
+        SECTION("4294967496 (uint 64; the low 32 bits used to be the whole value)")
+        {
+            const int32_json j = 4294967496ULL;
+            CHECK(j.is_number_unsigned());
+
+            std::vector<uint8_t> const expected{0xcf, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xc8};
+            const auto result = int32_json::to_msgpack(j);
+            CHECK(result == expected);
+            CHECK(int32_json::from_msgpack(result) == j);
+        }
+    }
+
+    SECTION("number_integer_t = std::int16_t, 98304 (uint 32)")
+    {
+        const int16_json j = 98304ULL;
+        CHECK(j.is_number_unsigned());
+
+        std::vector<uint8_t> const expected{0xce, 0x00, 0x01, 0x80, 0x00};
+        const auto result = int16_json::to_msgpack(j);
+        CHECK(result == expected);
+        CHECK(int16_json::from_msgpack(result) == j);
+    }
+
+    SECTION("default types (std::int64_t/std::uint64_t) are unaffected")
+    {
+        const json j = 4294967496ULL;
+        CHECK(j.is_number_unsigned());
+
+        std::vector<uint8_t> const expected{0xcf, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xc8};
+        const auto result = json::to_msgpack(j);
+        CHECK(result == expected);
+        CHECK(json::from_msgpack(result) == j);
+    }
+}

tests/src/unit-msgpack.cpp

@@ -2173,276 +2173,6 @@ TEST_CASE("MessagePack roundtrips" * doctest::skip())
     }
 }
 
-// the fake sizes below do not fit into a 32-bit std::size_t
-// with clang and libstdc++ 10, the std::filesystem::path conversion that
-// C++17 builds consider for every string type is ambiguous for a class
-// derived from std::string, so the string case is not tested there
-#if !(defined(__clang__) && defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 11)
-    #define JSON_TEST_BEYOND_UINT32_STRING 1
-#endif
-
-#if SIZE_MAX > UINT32_MAX
-template<typename T, typename A = std::allocator<T>>
-struct huge_array : std::vector<T, A>
-{
-    using base = std::vector<T, A>;
-    using base::base;
-
-    bool fake_size = false;
-
-    std::size_t size() const noexcept
-    {
-        if (fake_size)
-        {
-            return (std::numeric_limits<std::uint32_t>::max)() + 1ULL;
-        }
-
-        return base::size();
-    }
-};
-
-using huge_array_json = nlohmann::json::with_array_t<huge_array>;
-
-TEST_CASE("MessagePack Size above uint32 for array")
-{
-    huge_array_json j = huge_array_json::array();
-
-    j.push_back(1);
-    j.push_back(2);
-    j.push_back(3);
-
-    auto& array = j.get_ref<huge_array_json::array_t&>();
-    array.fake_size = true;
-
-    // write into a caller-owned vector: to_msgpack(j) reserves space based on
-    // the (faked) element count, which fails with bad_alloc on Windows
-    std::vector<std::uint8_t> result;
-    CHECK_THROWS_WITH_AS(
-        huge_array_json::to_msgpack(j, result),
-        "[json.exception.out_of_range.412] MessagePack length 4294967296 exceeds maximum of 4294967295",
-        json::out_of_range&);
-
-    array.fake_size = false;
-}
-
-template<typename K, typename V,
-         typename C = std::less<K>,
-         typename A = std::allocator<std::pair<const K, V>>>
-                                     struct huge_map : std::map<K, V, C, A>
-{
-    using base = std::map<K, V, C, A>;
-    using base::base;
-
-    bool fake_size = false;
-
-    std::size_t size() const noexcept
-    {
-        if (fake_size)
-        {
-            return static_cast<std::size_t>(UINT32_MAX) + 1ULL;
-        }
-
-        return base::size();
-    }
-};
-
-using huge_object_json = nlohmann::json::with_object_t<huge_map>;
-
-TEST_CASE("MessagePack Size above uint32 for object")
-{
-
-    huge_object_json j = huge_object_json::object();
-
-    j["one"] = 1;
-    j["two"] = 2;
-
-    auto& object = j.get_ref<huge_object_json::object_t&>();
-    object.fake_size = true;
-
-    // write into a caller-owned vector: to_msgpack(j) reserves space based on
-    // the (faked) element count, which fails with bad_alloc on Windows
-    std::vector<std::uint8_t> result;
-    CHECK_THROWS_WITH_AS(
-        huge_object_json::to_msgpack(j, result),
-        "[json.exception.out_of_range.412] MessagePack length 4294967296 exceeds maximum of 4294967295",
-        json::out_of_range&);
-
-    object.fake_size = false;
-}
-
-#ifdef JSON_TEST_BEYOND_UINT32_STRING
-struct huge_string : std::string
-{
-    using std::string::string;
-
-    std::size_t size() const noexcept // NOLINT(readability-convert-member-functions-to-static)
-    {
-        return static_cast<std::size_t>(UINT32_MAX) + 1ULL;
-    }
-};
-
-using huge_string_json = nlohmann::json::with_string_t<huge_string>;
-
-TEST_CASE("MessagePack Size above uint32 for string")
-{
-    const huge_string_json j = "hello";
-
-    CHECK_THROWS_WITH_AS(
-        huge_string_json::to_msgpack(j),
-        "[json.exception.out_of_range.412] MessagePack length 4294967296 exceeds maximum of 4294967295",
-        json::out_of_range&);
-}
-#endif
-
-struct huge_binary : std::vector<std::uint8_t>
-{
-    using std::vector<std::uint8_t>::vector;
-
-    std::size_t size() const noexcept // NOLINT(readability-convert-member-functions-to-static)
-    {
-        return static_cast<std::size_t>(UINT32_MAX) + 1ULL;
-    }
-};
-
-using huge_binary_json = nlohmann::json::with_binary_t<huge_binary>;
-
-TEST_CASE("MessagePack Size above uint32 for binary")
-{
-
-    huge_binary_json j = huge_binary_json::binary(huge_binary{});
-
-    j.get_binary().push_back(0x01);
-    j.get_binary().push_back(0x02);
-
-    CHECK_THROWS_WITH_AS(
-        huge_binary_json::to_msgpack(j),
-        "[json.exception.out_of_range.412] MessagePack length 4294967296 exceeds maximum of 4294967295",
-        json::out_of_range&);
-}
-#endif
-
-namespace
-{
-// types that report a size beyond UINT32_MAX without allocating that much
-// memory, so the MessagePack length limit can be tested cheaply; see the
-// similar types in unit-bson.cpp
-std::size_t beyond_uint32_size()
-{
-    return static_cast<std::size_t>((std::numeric_limits<std::uint32_t>::max)()) + 1;
-}
-
-class beyond_uint32_binary_t : public std::vector<std::uint8_t>
-{
-  public:
-    using std::vector<std::uint8_t>::vector;
-
-    size_type size() const noexcept // NOLINT(readability-convert-member-functions-to-static)
-    {
-        return beyond_uint32_size();
-    }
-};
-
-#ifdef JSON_TEST_BEYOND_UINT32_STRING
-class beyond_uint32_string_t : public std::string
-{
-  public:
-    using std::string::string;
-
-    size_type size() const noexcept // NOLINT(readability-convert-member-functions-to-static)
-    {
-        return beyond_uint32_size();
-    }
-};
-
-using beyond_uint32_string_json = nlohmann::json::with_string_t<beyond_uint32_string_t>;
-#endif
-
-using beyond_uint32_binary_json = nlohmann::json::with_binary_t<beyond_uint32_binary_t>;
-} // namespace
-
-TEST_CASE("MessagePack lengths beyond UINT32_MAX cannot be serialized")
-{
-    // MessagePack stores the length of a string, binary value, array, or
-    // object in at most 32 bits; a larger one used to be written without any
-    // length at all
-#if SIZE_MAX > UINT32_MAX
-    {
-        const char* const expected = "[json.exception.out_of_range.412] MessagePack length 4294967296 exceeds maximum of 4294967295";
-
-        const beyond_uint32_binary_json binary = beyond_uint32_binary_json::binary(beyond_uint32_binary_t{});
-        CHECK_THROWS_WITH_AS(beyond_uint32_binary_json::to_msgpack(binary), expected, beyond_uint32_binary_json::out_of_range&);
-
-        const beyond_uint32_binary_json ext = beyond_uint32_binary_json::binary(beyond_uint32_binary_t{}, 42);
-        CHECK_THROWS_WITH_AS(beyond_uint32_binary_json::to_msgpack(ext), expected, beyond_uint32_binary_json::out_of_range&);
-
-#ifdef JSON_TEST_BEYOND_UINT32_STRING
-        // created from its type rather than from a beyond_uint32_string_t:
-        // that would consider the std::filesystem::path conversion, which
-        // libstdc++ 10 cannot decide for a class derived from std::string
-        const beyond_uint32_string_json string(beyond_uint32_string_json::value_t::string);
-        CHECK_THROWS_WITH_AS(beyond_uint32_string_json::to_msgpack(string), expected, beyond_uint32_string_json::out_of_range&);
-#endif
-    }
-#endif
-}
-
-TEST_CASE("MessagePack numbers use the active union member (see #5644)")
-{
-    // when number_integer_t is narrower than number_unsigned_t, to_msgpack()
-    // used to read the union member that was not the active one, writing
-    // wrong bytes for some values; std::int64_t/std::uint64_t (the default
-    // types, where both members have the same width) were not affected
-    using int32_json = nlohmann::json::with_integers_t<std::int32_t, std::uint64_t>;
-    using int16_json = nlohmann::json::with_integers_t<std::int16_t, std::uint64_t>;
-
-    SECTION("number_integer_t = std::int32_t")
-    {
-        SECTION("6442450944 (uint 64; the low 32 bits used to be sign-extended)")
-        {
-            const int32_json j = 6442450944ULL;
-            CHECK(j.is_number_unsigned());
-
-            std::vector<uint8_t> const expected{0xcf, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00};
-            const auto result = int32_json::to_msgpack(j);
-            CHECK(result == expected);
-            CHECK(int32_json::from_msgpack(result) == j);
-        }
-
-        SECTION("4294967496 (uint 64; the low 32 bits used to be the whole value)")
-        {
-            const int32_json j = 4294967496ULL;
-            CHECK(j.is_number_unsigned());
-
-            std::vector<uint8_t> const expected{0xcf, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xc8};
-            const auto result = int32_json::to_msgpack(j);
-            CHECK(result == expected);
-            CHECK(int32_json::from_msgpack(result) == j);
-        }
-    }
-
-    SECTION("number_integer_t = std::int16_t, 98304 (uint 32)")
-    {
-        const int16_json j = 98304ULL;
-        CHECK(j.is_number_unsigned());
-
-        std::vector<uint8_t> const expected{0xce, 0x00, 0x01, 0x80, 0x00};
-        const auto result = int16_json::to_msgpack(j);
-        CHECK(result == expected);
-        CHECK(int16_json::from_msgpack(result) == j);
-    }
-
-    SECTION("default types (std::int64_t/std::uint64_t) are unaffected")
-    {
-        const json j = 4294967496ULL;
-        CHECK(j.is_number_unsigned());
-
-        std::vector<uint8_t> const expected{0xcf, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xc8};
-        const auto result = json::to_msgpack(j);
-        CHECK(result == expected);
-        CHECK(json::from_msgpack(result) == j);
-    }
-}
-
 TEST_CASE("MessagePack large strings and binaries (chunked reader)")
 {
     // get_msgpack_string()/get_msgpack_binary() both read through get_binary(),

tests/src/unit-precise-stream-position.cpp

@@ -20,7 +20,6 @@
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 
-#include <algorithm>
 #include <cstddef>
 #include <sstream>
 #include <streambuf>
@@ -73,40 +72,6 @@ class no_putback_streambuf : public std::streambuf
     std::size_t m_pos = 0;
 };
 
-// A streambuf that serves its input in get areas of a fixed size, so that the
-// end of a number falls on every possible offset of a get area. The lexer scans
-// the get area directly; the stream position must not depend on its size.
-class chunked_streambuf : public std::streambuf
-{
-  public:
-    chunked_streambuf(std::string s, std::size_t chunk_size)
-        : m_data(std::move(s)), m_chunk_size(chunk_size)
-    {}
-
-  protected:
-    int_type underflow() override
-    {
-        if (gptr() < egptr())
-        {
-            return traits_type::to_int_type(*gptr());
-        }
-        m_pos += static_cast<std::size_t>(egptr() - eback());
-        if (m_pos >= m_data.size())
-        {
-            setg(nullptr, nullptr, nullptr);
-            return traits_type::eof();
-        }
-        char* const begin = &m_data[m_pos];
-        setg(begin, begin, begin + (std::min)(m_chunk_size, m_data.size() - m_pos));
-        return traits_type::to_int_type(*gptr());
-    }
-
-  private:
-    std::string m_data;
-    std::size_t m_pos = 0;
-    std::size_t m_chunk_size;
-};
-
 // read the characters that are left in a stream
 std::string remaining(std::istream& is)
 {
@@ -298,26 +263,4 @@ TEST_CASE("JSON_PRECISE_STREAM_POSITION")
         json _;
         CHECK_THROWS_WITH_AS(_ = json::parse(is), "[json.exception.parse_error.101] parse error: attempting to parse an empty input; check that your input string or stream contains the expected JSON", json::parse_error&);
     }
-
-    SECTION("the position does not depend on the get area of the streambuf")
-    {
-        const std::vector<std::size_t> chunk_sizes = {1, 2, 3, 4, 5, 7, 8, 13, 4096};
-        for (const std::size_t chunk_size : chunk_sizes)
-        {
-            CAPTURE(chunk_size)
-            chunked_streambuf buf("12345678901234567890true\"a long string value\"-1.25e+3,[1,2]42", chunk_size);
-            std::istream input(&buf);
-            json j;
-
-            input >> j;
-            CHECK(j == 12345678901234567890u);
-            input >> j;
-            CHECK(j == true);
-            input >> j;
-            CHECK(j == "a long string value");
-            input >> j;
-            CHECK(j == -1250.0);
-            CHECK(remaining(input) == ",[1,2]42");
-        }
-    }
 }

tests/src/unit-regression3.cpp

@@ -43,7 +43,6 @@ using ordered_json = nlohmann::ordered_json;
 #endif
 
 #include <cstdio>
-#include <deque>
 #include <list>
 #include <type_traits>
 #include <utility>
@@ -867,52 +866,6 @@ TEST_CASE("issue #5402 - update(merge_objects=true) overwrites a primitive with
 }
 
 
-TEST_CASE("regression test #5476 - array type without reserve()")
-{
-    // the capacity reserved for definite-length arrays must not require the
-    // array type to have a reserve() member function
-    using deque_json = nlohmann::json::with_array_t<std::deque>;
-
-    SECTION("std::deque")
-    {
-        const auto j = deque_json::parse(R"({"a":[1,[2,3]],"b":[]})");
-        CHECK(j.dump() == R"({"a":[1,[2,3]],"b":[]})");
-
-        // the binary formats pass a definite length to start_array()
-        CHECK(deque_json::from_cbor(deque_json::to_cbor(j)) == j);
-        CHECK(deque_json::from_msgpack(deque_json::to_msgpack(j)) == j);
-        CHECK(deque_json::from_bon8(deque_json::to_bon8(j)) == j);
-
-        // parse() instantiates the callback parser as well, which reserves too
-        const auto with_callback = deque_json::parse(R"([1,2,3])", [](int /*depth*/, deque_json::parse_event_t /*event*/, deque_json& /*parsed*/) noexcept
-        {
-            return true;
-        });
-        CHECK(with_callback == deque_json({1, 2, 3}));
-    }
-
-    SECTION("std::vector still reserves")
-    {
-        json array = json::array();
-        for (int i = 0; i < 100; ++i)
-        {
-            array.push_back(i);
-        }
-
-        const auto j = json::from_cbor(json::to_cbor(array));
-        CHECK(j == array);
-        CHECK(j.get_ref<const json::array_t&>().capacity() >= 100);
-    }
-
-    SECTION("the reservation stays capped")
-    {
-        // CBOR array announcing 2^32-1 elements, but truncated right after the
-        // header: the input must be rejected without reserving that capacity
-        const std::vector<std::uint8_t> truncated = {0x9A, 0xFF, 0xFF, 0xFF, 0xFF};
-        CHECK(json::from_cbor(truncated, true, false).is_discarded());
-    }
-}
-
 TEST_CASE("issue #5317 - nested indefinite-length CBOR string chunks are rejected")
 {
     json _;

tests/src/unit-stream-bulk-scan.cpp

@@ -1,417 +0,0 @@
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
-// |  |  |__   |  |  | | | |  version 3.12.0
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-#include "doctest_compatibility.h"
-
-// the library undefines its configuration macros at the end of the header
-#if defined(JSON_DISABLE_STREAM_BULK_SCAN) && JSON_DISABLE_STREAM_BULK_SCAN
-    #define TEST_STREAM_BULK_SCAN 0
-#else
-    #define TEST_STREAM_BULK_SCAN 1
-#endif
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <fstream>
-#include <istream>
-#include <random>
-#include <sstream>
-#include <streambuf>
-#include <string>
-#include <utility>
-#include <vector>
-
-// The lexer scans the characters in the get area of a std::istream's
-// streambuf directly instead of reading them one at a time. These tests pin
-// that this is not observable: for any get area size - including a streambuf
-// without a get area, which still takes the character-at-a-time path - the
-// parsed values, the exception messages (including the "last read" token),
-// the stream state, and the characters left in the stream are the same. See
-// unit-stream-bulk-scan-disabled.cpp for JSON_DISABLE_STREAM_BULK_SCAN.
-
-namespace
-{
-// A streambuf that serves its input in get areas of a fixed size, so that
-// tokens, numbers, UTF-8 sequences, and indentation cross the end of the get
-// area at every possible offset. With a size of 0, it keeps no get area at all
-// and serves every character from underflow()/uflow().
-class chunked_streambuf : public std::streambuf
-{
-  public:
-    chunked_streambuf(std::string s, std::size_t chunk_size)
-        : m_data(std::move(s)), m_chunk_size(chunk_size)
-    {}
-
-  protected:
-    int_type underflow() override
-    {
-        if (m_chunk_size == 0)
-        {
-            return m_pos < m_data.size() ? traits_type::to_int_type(m_data[m_pos]) : traits_type::eof();
-        }
-        if (gptr() < egptr())
-        {
-            return traits_type::to_int_type(*gptr());
-        }
-        // the previous get area has been consumed
-        m_pos += static_cast<std::size_t>(egptr() - eback());
-        if (m_pos >= m_data.size())
-        {
-            setg(nullptr, nullptr, nullptr);
-            return traits_type::eof();
-        }
-        char* const begin = &m_data[m_pos];
-        setg(begin, begin, begin + (std::min)(m_chunk_size, m_data.size() - m_pos));
-        return traits_type::to_int_type(*gptr());
-    }
-
-    int_type uflow() override
-    {
-        if (m_chunk_size == 0)
-        {
-            return m_pos < m_data.size() ? traits_type::to_int_type(m_data[m_pos++]) : traits_type::eof();
-        }
-        return std::streambuf::uflow();
-    }
-
-  private:
-    std::string m_data;
-    std::size_t m_pos = 0;
-    std::size_t m_chunk_size;
-};
-
-// how a test reads from the stream
-enum class read_mode
-{
-    extract,         // up to four times operator>>, as for concatenated values
-    parse,           // json::parse(stream)
-    parse_lenient,   // json::parse(stream) with comments
-};
-
-// Read @a input from a chunked_streambuf and describe everything observable:
-// the values or the exception, the stream state after each value, and the
-// characters left in the stream.
-std::string observe(const std::string& input, std::size_t chunk_size, read_mode mode)
-{
-    chunked_streambuf buf(input, chunk_size);
-    std::istream is(&buf);
-    std::string result;
-    for (int i = 0; i < 4; ++i)
-    {
-        json j;
-        try
-        {
-            if (mode == read_mode::extract)
-            {
-                is >> j;
-            }
-            else
-            {
-                j = json::parse(is, nullptr, true, mode == read_mode::parse_lenient);
-            }
-            result += "value " + j.dump() + "; state " + std::to_string(static_cast<unsigned int>(is.rdstate())) + "\n";
-        }
-        catch (const json::exception& e)
-        {
-            result += std::string("exception ") + e.what() + "\n";
-            break;
-        }
-        if (mode != read_mode::extract)
-        {
-            break;
-        }
-        is.clear();
-    }
-
-    is.clear();
-    result += "remaining ";
-    char c = 0;
-    while (is.get(c))
-    {
-        result += c;
-    }
-    return result;
-}
-
-// get area sizes that put every boundary everywhere in short inputs, plus one
-// that holds most inputs completely
-std::vector<std::size_t> chunk_sizes()
-{
-    return {1, 2, 3, 4, 5, 7, 8, 9, 13, 16, 64, 4096};
-}
-
-// valid and invalid inputs covering every token type and every bulk path:
-// strings (plain runs, escapes, UTF-8), numbers (all grammar parts, too large
-// for an integer), and indentation
-std::vector<std::string> corpus()
-{
-    return
-    {
-        // numbers, terminated in every way
-        "0", "-0", "123", "-123", "1.5", "-1.5e+10", "2E-3", "123456789012345678901234567890",
-        "18446744073709551615", "18446744073709551616", "-9223372036854775809",
-        "123 456", "123,456", "123]", "1true", "42\nfoo", "1.25e3}", "7\t8\r9",
-        // malformed numbers
-        "1.", "-", "1e", "1e+", "01", "-a", "1.x", "1ee5",
-        // strings
-        R"("")", R"("abc")", R"("a long string with a run of ordinary characters to scan in bulk")",
-        R"("escapes \" \\ \/ \b \f \n \r \t é 😀")",
-        "\"UTF-8: \xc3\xa9 \xe2\x82\xac \xf0\x9f\x98\x80 done\"",
-        // malformed strings
-        R"("unterminated)", "\"control\x01character\"", "\"ill-formed \xc3\x28 UTF-8\"", R"("bad \x escape")",
-        R"("\ud800 lone surrogate")",
-        // literals
-        "true", "false", "null", "tru", "nul", "falsey",
-        // structures
-        "[]", "{}", "[1,2,3]", R"({"a":1,"b":[true,false,null],"c":{"d":"e"}})", "[1,]", R"({"a" 1})", "[[[[[]]]]]",
-        // pretty-printed
-        "{\n    \"key\": [\n        1,\n        -2.5,\n        \"three\"\n    ]\n}",
-        "[\n                                \"deep\"\n                                ]",
-        "{\n    \"a\": 1,\n    \"b\": 2x\n}",
-        // concatenated values and whitespace
-        "1 2 3", R"("a""b")", "[1][2]", "{}{}", " \n\t 42 \n\t ", "",
-        // comments (only accepted by parse_lenient)
-        "/* comment */ 1", "// comment\n[1, /* c */ 2]",
-        // byte order mark
-        "\xef\xbb\xbf[1]",
-    };
-}
-}  // namespace
-
-TEST_CASE("parsing from a std::istream scans the get area in bulk")
-{
-    SECTION("results do not depend on the get area")
-    {
-        const std::vector<read_mode> read_modes = {read_mode::extract, read_mode::parse, read_mode::parse_lenient};
-        for (const auto& input : corpus())
-        {
-            for (const read_mode mode : read_modes)
-            {
-                // no get area: the character-at-a-time path
-                const std::string expected = observe(input, 0, mode);
-                for (const std::size_t chunk_size : chunk_sizes())
-                {
-                    CAPTURE(input)
-                    CAPTURE(chunk_size)
-                    CAPTURE(static_cast<int>(mode))
-                    CHECK(observe(input, chunk_size, mode) == expected);
-                }
-            }
-        }
-    }
-
-    SECTION("values are the same as when parsing from a string")
-    {
-        const std::string input = R"({"name": "nlohmann::json", "numbers": [1, -2, 3.5, 4e10, 18446744073709551615],)"
-                                  "\n    \"text\": \"caf\xc3\xa9 \\u00e9 \\\"quoted\\\"\", \"nested\": [[{}], [[]]], \"flags\": [true, false, null]}";
-        const json expected = json::parse(input);
-        for (const std::size_t chunk_size : chunk_sizes())
-        {
-            CAPTURE(chunk_size)
-            chunked_streambuf buf(input, chunk_size);
-            std::istream is(&buf);
-            CHECK(json::parse(is) == expected);
-        }
-
-        std::istringstream ss(input);
-        CHECK(json::parse(ss) == expected);
-    }
-
-    SECTION("a token that spans several get areas is reported completely")
-    {
-        // the error is found after the string has crossed many get areas; the
-        // token string holds everything since the start of the last token
-        const std::string input = R"(["this string is longer than every get area", tru])";
-        for (const std::size_t chunk_size : chunk_sizes())
-        {
-            CAPTURE(chunk_size)
-            chunked_streambuf buf(input, chunk_size);
-            std::istream is(&buf);
-            json j;
-            CHECK_THROWS_WITH_AS(is >> j,
-                                 "[json.exception.parse_error.101] parse error at line 1, column 50: syntax error while parsing value - invalid literal; last read: '\"this string is longer than every get area\", tru]'",
-                                 json::parse_error&);
-        }
-
-        const std::string unterminated = R"("this string is longer than every get area)";
-        for (const std::size_t chunk_size : chunk_sizes())
-        {
-            CAPTURE(chunk_size)
-            chunked_streambuf buf(unterminated, chunk_size);
-            std::istream is(&buf);
-            json j;
-            CHECK_THROWS_WITH_AS(is >> j,
-                                 "[json.exception.parse_error.101] parse error at line 1, column 43: syntax error while parsing value - invalid string: missing closing quote; last read: '\"this string is longer than every get area'",
-                                 json::parse_error&);
-        }
-    }
-
-    SECTION("an error before the first token reports everything read")
-    {
-        chunked_streambuf buf("  \n  x", 2);
-        std::istream is(&buf);
-        json j;
-        CHECK_THROWS_WITH_AS(is >> j,
-                             "[json.exception.parse_error.101] parse error at line 2, column 3: syntax error while parsing value - invalid literal; last read: '  <U+000A>  x'",
-                             json::parse_error&);
-    }
-
-    SECTION("lines and columns are counted across get areas")
-    {
-        const std::string input = "[\n    1,\n    \"two\",\n    3.0,\n    x\n]";
-        for (const std::size_t chunk_size : chunk_sizes())
-        {
-            CAPTURE(chunk_size)
-            chunked_streambuf buf(input, chunk_size);
-            std::istream is(&buf);
-            json j;
-            CHECK_THROWS_WITH_AS(is >> j,
-                                 "[json.exception.parse_error.101] parse error at line 5, column 5: syntax error while parsing value - invalid literal; last read: '3.0,<U+000A>    x'",
-                                 json::parse_error&);
-        }
-    }
-
-    SECTION("many values from one stream")
-    {
-        std::string input;
-        for (int i = 0; i < 200; ++i)
-        {
-            input += R"({"id":)" + std::to_string(i) + R"(,"name":"user)" + std::to_string(i) + R"(","score":)" + std::to_string(i) + ".5}\n";
-            input += std::to_string(i * 7919) + "\n";
-        }
-
-        for (const std::size_t chunk_size : chunk_sizes())
-        {
-            CAPTURE(chunk_size)
-            chunked_streambuf buf(input, chunk_size);
-            std::istream is(&buf);
-            json j;
-            int count = 0;
-            while (!(is >> std::ws).eof())
-            {
-                is >> j;
-                if (count % 2 == 0)
-                {
-                    CHECK(j["id"] == count / 2);
-                }
-                else
-                {
-                    CHECK(j == (count / 2) * 7919);
-                }
-                ++count;
-            }
-            CHECK(count == 400);
-        }
-    }
-
-    SECTION("the stream can be used after parsing")
-    {
-        for (const std::size_t chunk_size : chunk_sizes())
-        {
-            CAPTURE(chunk_size)
-            chunked_streambuf buf(R"({"a": "some text"} trailing words 42)", chunk_size);
-            std::istream is(&buf);
-            json j;
-            is >> j;
-            CHECK(j == json({{"a", "some text"}}));
-
-            std::string word;
-            int number = 0;
-            is >> word;
-            CHECK(word == "trailing");
-            is >> word >> number;
-            CHECK(word == "words");
-            CHECK(number == 42);
-        }
-    }
-
-    SECTION("std::stringstream and std::ifstream")
-    {
-        const std::string input = R"([1, 2.5, "three", {"four": [true, null]}] 5)";
-
-        std::stringstream ss(input);
-        json j1;
-        json j2;
-        ss >> j1 >> j2;
-        CHECK(j1 == json::parse(R"([1, 2.5, "three", {"four": [true, null]}])"));
-        CHECK(j2 == 5);
-        CHECK(ss.eof());
-
-        // a file name of its own for every run: the test runs for several C++
-        // standards and configurations at the same time, in the same directory
-        std::random_device rd;
-        const std::string temp_name = "unit-stream-bulk-scan-" + std::to_string(rd()) + ".tmp";
-        const char* const filename = temp_name.c_str();
-        {
-            std::ofstream file(filename);
-            file << input;
-        }
-        {
-            std::ifstream file(filename);
-            json k1;
-            json k2;
-            file >> k1 >> k2;
-            CHECK(k1 == j1);
-            CHECK(k2 == j2);
-        }
-        static_cast<void>(std::remove(filename));
-    }
-
-    SECTION("binary formats read from a stream")
-    {
-        const json j = {{"string", std::string(300, 'x')}, {"array", {1, 2, 3}}, {"number", 1.5}};
-        const std::vector<std::uint8_t> cbor = json::to_cbor(j);
-        const std::string bytes(reinterpret_cast<const char*>(cbor.data()), cbor.size());
-        for (const std::size_t chunk_size : chunk_sizes())
-        {
-            CAPTURE(chunk_size)
-            chunked_streambuf buf(bytes, chunk_size);
-            std::istream is(&buf);
-            CHECK(json::from_cbor(is) == j);
-        }
-    }
-
-#if TEST_STREAM_BULK_SCAN
-    SECTION("the adapter keeps no token unless the lexer starts one")
-    {
-        // the binary readers read through the same adapter, but never start a
-        // token; refilling the get area must then not collect the input
-        chunked_streambuf buf(std::string(1000, 'x'), 7);
-        std::istream is(&buf);
-        nlohmann::detail::input_stream_adapter ia(is);
-        for (int i = 0; i < 1000; ++i)
-        {
-            CHECK(ia.get_character() == 'x');
-        }
-
-        std::vector<char> token;
-        ia.copy_token(token, false);
-        CHECK(token.empty());
-    }
-#endif
-
-    SECTION("SAX parsing from a stream")
-    {
-        const std::string input = R"({"a": [1, "two", 3.5]} rest)";
-        for (const std::size_t chunk_size : chunk_sizes())
-        {
-            CAPTURE(chunk_size)
-            chunked_streambuf buf(input, chunk_size);
-            std::istream is(&buf);
-            json j;
-            nlohmann::detail::json_sax_dom_parser<json, nlohmann::detail::string_input_adapter_type> sax(j);
-            CHECK(json::sax_parse(is, &sax, json::input_format_t::json, false));
-            CHECK(j == json::parse(R"({"a": [1, "two", 3.5]})"));
-        }
-    }
-}