Merge branch 'develop'

Author: ibireme

CHANGELOG.md

@@ -5,7 +5,16 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 #### Added
-- Add `yyjson_write_number()` and `yyjson_mut_write_number()` functions to write a number value to a string buffer.
+- Add `yyjson_write_number()` and `yyjson_mut_write_number()` to write a number value to a string buffer.
+- Add `YYJSON_READ_ALLOW_EXT_NUMBER` to support extended number formats, such as `0x7B`, `+.123`.
+- Add `YYJSON_READ_ALLOW_EXT_ESCAPE` to support extended escape, such as `\a`, `\0`, `\x7B`.
+- Add `YYJSON_READ_ALLOW_EXT_WHITESPACE` to support extended whitespace, such as `\v`, `\u2028`.
+- Add `YYJSON_READ_ALLOW_SINGLE_QUOTED_STR` to support single-quoted strings, such as `'ab'`.
+- Add `YYJSON_READ_ALLOW_UNQUOTED_KEY` to allow unquoted keys, such as `{a:1,b:2}`.
+- Add `YYJSON_READ_JSON5` to enable full JSON5 support: [json5.org](https://json5.org).
+
+#### Changed
+- Removed support for non-standard JSON in the incremental reader `yyjson_incr_read()`.
 
 
 ## 0.11.1 (2025-05-14)

CMakeLists.txt

@@ -524,17 +524,7 @@ if(YYJSON_BUILD_MISC)
     endif()
 
     # make tables
-    find_package(GMP REQUIRED)
-    find_package(MPFR REQUIRED)
     add_executable(make_tables "misc/make_tables.c")
-    target_include_directories(make_tables PRIVATE
-        ${GMP_INCLUDE_DIR}
-        ${MPFR_INCLUDES}
-    )
-    target_link_libraries(make_tables PRIVATE
-        ${GMP_LIBRARIES}
-        ${MPFR_LIBRARIES}
-    )
     if(XCODE)
         set_default_xcode_property(make_tables)
     endif()

README.md

@@ -10,14 +10,14 @@
 A high performance JSON library written in ANSI C.
 
 # Features
-- **Fast**: can read or write gigabytes per second JSON data on modern CPUs.
+- **Fast**: can read or write gigabytes of JSON data per second on modern CPUs.
 - **Portable**: complies with ANSI C (C89) for cross-platform compatibility.
-- **Strict**: complies with [RFC 8259](https://datatracker.ietf.org/doc/html/rfc8259) JSON standard, ensuring strict number format and UTF-8 validation.
-- **Extendable**: offers options to allow comments, trailing commas, NaN/Inf, and custom memory allocator.
+- **Strict**: complies with [RFC 8259](https://datatracker.ietf.org/doc/html/rfc8259) JSON standard, ensuring strict number formats and UTF-8 validation.
+- **Extendable**: offers options to enable individual JSON5 features and custom allocator.
 - **Accuracy**: can accurately read and write `int64`, `uint64`, and `double` numbers.
-- **Flexible**: supports unlimited JSON nesting levels, `\u0000` characters, and non null-terminated strings.
-- **Manipulation**: supports querying and modifying using [JSON Pointer](https://datatracker.ietf.org/doc/html/rfc6901), [JSON Patch](https://datatracker.ietf.org/doc/html/rfc6902) and [JSON Merge Patch](https://datatracker.ietf.org/doc/html/rfc7386).
-- **Developer-Friendly**: easy integration with only one `h` and one `c` file.
+- **Flexible**: supports unlimited JSON nesting levels, `\u0000` characters, and non-null-terminated strings.
+- **Manipulation**: supports querying and modifying with [JSON Pointer](https://datatracker.ietf.org/doc/html/rfc6901), [JSON Patch](https://datatracker.ietf.org/doc/html/rfc6902), and [JSON Merge Patch](https://datatracker.ietf.org/doc/html/rfc7386).
+- **Developer-Friendly**: easy integration with just one `.h` and one `.c` file.
 
 # Limitations
 - An array or object is stored as a [data structure](https://ibireme.github.io/yyjson/doc/doxygen/html/md_doc__data_structure.html) such as linked list, which makes accessing elements by index or key slower than using an iterator.
@@ -205,7 +205,7 @@ The pre-generated Doxygen HTML for the release version can be viewed here:
 
 # Packaging status
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/yyjson.svg)](https://repology.org/project/yyjson/versions)
+[![Packaging status](https://repology.org/badge/vertical-allrepos/yyjson.svg?columns=2)](https://repology.org/project/yyjson/versions)
 
 # Built With yyjson
 
@@ -235,7 +235,7 @@ yyjson, feel free to open a PR to add it to this list.
 * [x] Support JSON Pointer to query and modify JSON.
 * [x] Add `RAW` type for JSON reader and writer.
 * [x] Add option to limit real number output precision.
-* [ ] Add option to support JSON5 (if feasible).
+* [x] Add option to support JSON5.
 * [ ] Add functions to diff two JSON documents.
 * [ ] Add documentation on performance optimizations.
 * [ ] Ensure ABI stability.

cmake/FindGMP.cmake

@@ -184,6 +184,9 @@ Incremental reading is recommended only for large documents and only when the
 program needs to be responsive. Incremental reading is slightly slower than
 `yyjson_read()` and `yyjson_read_opts()`.
 
+Note: The incremental JSON reader only supports standard JSON.
+Flags for non-standard features (e.g. comments, trailing commas) are ignored.
+
 To read a large JSON document incrementally:
 
 1. Call `yyjson_incr_new()` to create the state for incremental reading.
@@ -378,12 +381,12 @@ Allow a single trailing comma at the end of an object or array (non-standard), f
 ```
 
 ### **YYJSON_READ_ALLOW_COMMENTS**
-Allow C-style single line and multiple line comments (non-standard), for example:
+Allow C-style single-line and multi-line comments (non-standard), for example:
 
 ```
 {
-    "name": "Harry", // single line comment
-    "id": /* multiple line comment */ 123
+    "name": "Harry", // single-line comment
+    "id": /* multi-line comment */ 123
 }
 ```
 
@@ -433,6 +436,45 @@ This flag permits invalid characters to appear in the string values, but it stil
 ### **YYJSON_READ_ALLOW_BOM**
 Allow UTF-8 BOM and skip it before parsing if any (non-standard).
 
+### **YYJSON_READ_ALLOW_EXT_NUMBER**
+Allow extended number formats (non-standard):
+- Hexadecimal numbers, such as `0x7B`.
+- Numbers with leading or trailing decimal point, such as `.123`, `123.`.
+- Numbers with a leading plus sign, such as `+123`.
+
+### **YYJSON_READ_ALLOW_EXT_ESCAPE**
+Allow extended escape sequences in strings (non-standard):
+- Additional escapes: `\a`, `\e`, `\v`, ``\'``, `\?`, `\0`.
+- Hex escapes: `\xNN`, such as `\x7B`.
+- Line continuation: backslash followed by line terminator sequences.
+- Unknown escape: if backslash is followed by an unsupported character,
+    the backslash will be removed and the character will be kept as-is.
+    However, `\1`-`\9` will still trigger an error.
+
+### **YYJSON_READ_ALLOW_EXT_WHITESPACE**
+Allow extended whitespace characters (non-standard):
+- Vertical tab `\v` and form feed `\f`.
+- Line separator `\u2028` and paragraph separator `\u2029`.
+- Non-breaking space `\xA0`.
+- Byte order mark: `\uFEFF`.
+- Other Unicode characters in the Zs (Separator, space) category.
+
+### **YYJSON_READ_ALLOW_SINGLE_QUOTED_STR**
+Allow strings enclosed in single quotes (non-standard), such as ``'ab'``.
+
+### **YYJSON_READ_ALLOW_UNQUOTED_KEY**
+Allow object keys without quotes (non-standard), such as `{a:1,b:2}`.
+This extends the ECMAScript IdentifierName rule by allowing any
+non-whitespace character with code point above `U+007F`.
+
+### **YYJSON_READ_JSON5**
+Allow JSON5 format, see: https://json5.org.
+
+This flag supports all JSON5 features with some additional extensions:
+- Accepts more escape sequences than JSON5 (e.g. `\a`, `\e`).
+- Unquoted keys are and not limited to ECMAScript IdentifierName.
+- Allow case-insensitive `NaN`, `Inf` and `Infinity` literals.
+
 
 ---------------
 # Writing JSON

cmake/FindMPFR.cmake

@@ -17,9 +17,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
                     YYJSON_READ_NOFLAG,
                     YYJSON_WRITE_NOFLAG);
     test_with_flags(data, size,
-                    YYJSON_READ_ALLOW_TRAILING_COMMAS |
-                    YYJSON_READ_ALLOW_COMMENTS |
-                    YYJSON_READ_ALLOW_INF_AND_NAN,
+                    YYJSON_READ_JSON5,
                     YYJSON_WRITE_PRETTY |
                     YYJSON_WRITE_ESCAPE_UNICODE |
                     YYJSON_WRITE_ESCAPE_SLASHES |