[RISC-V Vector]Add 128-bit fixed-width SIMD layer (#2472)

* Fix riscv intrinsics header missing SIMDJSON_CONDITIONAL_INCLUDE guard

Co-authored-by: gong-flying <gongxiaofei24@iscas.ac.cn>

* Fix riscv intrinsics header missing SIMDJSON_CONDITIONAL_INCLUDE guard

Co-authored-by: gong-flying <gongxiaofei24@iscas.ac.cn>

* Implement simd8/simd8x64 with RVV intrinsics and fallback bitmanipulation

Co-authored-by: gong-flying <gongxiaofei24@iscas.ac.cn>

* Fix missing SIMDJSON_CONDITIONAL_INCLUDE guard

Co-authored-by: gong-flying <gongxiaofei24@iscas.ac.cn>

* Fix missing SIMDJSON_CONDITIONAL_INCLUDE guard

Co-authored-by: gong-flying <gongxiaofei24@iscas.ac.cn>

---------

Co-authored-by: gong-flying <gongxiaofei24@iscas.ac.cn>

.circleci/config.yml

@@ -0,0 +1,316 @@
+version: 2.1
+
+
+# We constantly run out of memory so please do not use parallelism (-j, -j4).
+
+# Reusable image / compiler definitions
+executors:
+  gcc8:
+    docker:
+      - image: conanio/gcc8
+        environment:
+          CXX: g++-8
+          CC: gcc-8
+          CMAKE_BUILD_FLAGS:
+          CTEST_FLAGS: --output-on-failure
+
+  gcc9:
+    docker:
+      - image: conanio/gcc9
+        environment:
+          CXX: g++-9
+          CC: gcc-9
+          CMAKE_BUILD_FLAGS:
+          CTEST_FLAGS: --output-on-failure
+
+  gcc10:
+    docker:
+      - image: conanio/gcc10
+        environment:
+          CXX: g++-10
+          CC: gcc-10
+          CMAKE_BUILD_FLAGS:
+          CTEST_FLAGS: --output-on-failure
+
+  clang10:
+    docker:
+      - image: conanio/clang10
+        environment:
+          CXX: clang++-10
+          CC: clang-10
+          CMAKE_BUILD_FLAGS:
+          CTEST_FLAGS: --output-on-failure
+
+  clang9:
+    docker:
+      - image: conanio/clang9
+        environment:
+          CXX: clang++-9
+          CC: clang-9
+          CMAKE_BUILD_FLAGS:
+          CTEST_FLAGS: --output-on-failure
+
+  clang6:
+    docker:
+      - image: conanio/clang60
+        environment:
+          CXX: clang++-6.0
+          CC: clang-6.0
+          CMAKE_BUILD_FLAGS:
+          CTEST_FLAGS: --output-on-failure
+
+# Reusable test commands (and initializer for clang 6)
+commands:
+  dependency_restore:
+    steps:
+      - restore_cache:
+          keys:
+            - cmake-cache-{{ checksum "dependencies/CMakeLists.txt" }}
+
+  dependency_cache:
+    steps:
+      - save_cache:
+          key: cmake-cache-{{ checksum "dependencies/CMakeLists.txt" }}
+          paths:
+            - dependencies/.cache
+
+  install_cmake:
+    steps:
+      - run: apt-get update -qq
+      - run: apt-get install -y cmake
+
+  cmake_prep:
+    steps:
+      - checkout
+      - run: mkdir -p build
+
+  cmake_build_cache:
+    steps:
+      - cmake_prep
+      - dependency_restore
+      - run: cmake  -DSIMDJSON_DEVELOPER_MODE=ON $CMAKE_FLAGS -DCMAKE_INSTALL_PREFIX:PATH=destination -B build .
+      - dependency_cache # dependencies are produced in the configure step
+
+  cmake_build:
+    steps:
+      - cmake_build_cache
+      - run: cmake  --build build
+
+  cmake_test:
+    steps:
+      - cmake_build
+      - run: |
+          cd build &&
+          tools/json2json -h &&
+          ctest $CTEST_FLAGS -L acceptance &&
+          ctest $CTEST_FLAGS -LE acceptance -LE explicitonly
+
+  cmake_assert_test:
+    steps:
+      - run: |
+          cd build &&
+          tools/json2json -h &&
+          ctest $CTEST_FLAGS -L assert
+
+  cmake_test_all:
+    steps:
+      - cmake_build
+      - run: |
+          cd build &&
+          tools/json2json -h &&
+          ctest $CTEST_FLAGS -DSIMDJSON_IMPLEMENTATION="haswell;westmere;fallback" -L acceptance -LE per_implementation &&
+          SIMDJSON_FORCE_IMPLEMENTATION=haswell ctest $CTEST_FLAGS -L per_implementation -LE explicitonly &&
+          SIMDJSON_FORCE_IMPLEMENTATION=westmere ctest $CTEST_FLAGS -L per_implementation -LE explicitonly &&
+          SIMDJSON_FORCE_IMPLEMENTATION=fallback ctest $CTEST_FLAGS -L per_implementation -LE explicitonly &&
+          ctest $CTEST_FLAGS -LE "acceptance|per_implementation" # Everything we haven't run yet, run now.
+
+
+  cmake_perftest:
+    steps:
+      - cmake_build_cache
+      - run: |
+          cmake -DSIMDJSON_ENABLE_DOM_CHECKPERF=ON --build  build --target checkperf &&
+          cd build &&
+          ctest --output-on-failure -R checkperf
+
+  # we not only want cmake to build and run tests, but we want also a successful installation from which we can build, link and run programs
+  cmake_install_test: # this version builds, install, test and then verify from the installation
+    steps:
+      - run: cd build && make install
+      - run: echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Ibuild/destination/include -Lbuild/destination/lib -std=c++17 -Wl,-rpath,build/destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json
+
+  cmake_installed_test_cxx20: # assuming that it was installed, this tries to build using C++20
+    steps:
+      - run: echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Ibuild/destination/include -Lbuild/destination/lib -std=c++20 -Wl,-rpath,build/destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json
+
+jobs:
+
+  # static
+  justlib-gcc10:
+    description: Build just the library, install it and do a basic test
+    executor: gcc10
+    environment: { CMAKE_FLAGS: -DSIMDJSON_JUST_LIBRARY=ON }
+    steps: [ cmake_build, cmake_install_test, cmake_installed_test_cxx20 ]
+  assert-gcc10:
+    description: Build the library with asserts on, install it and run tests
+    executor: gcc10
+    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DCMAKE_CXX_FLAGS_RELEASE=-O3 }
+    steps: [ cmake_test, cmake_assert_test ]
+  assert-clang10:
+    description: Build just the library, install it and do a basic test
+    executor: clang10
+    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DCMAKE_CXX_FLAGS_RELEASE=-O3 }
+    steps: [ cmake_test, cmake_assert_test ]
+  gcc10-perftest:
+    description: Build and run performance tests on GCC 10 and AVX 2 with a cmake static build, this test performance regression
+    executor: gcc10
+    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DBUILD_SHARED_LIBS=OFF }
+    steps: [ cmake_perftest ]
+  gcc10:
+    description: Build and run tests on GCC 10 and AVX 2 with a cmake static build
+    executor: gcc10
+    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF }
+    steps: [ cmake_test, cmake_install_test, cmake_installed_test_cxx20 ]
+  clang6:
+    description: Build and run tests on clang 6 and AVX 2 with a cmake static build
+    executor: clang6
+    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF }
+    steps: [ cmake_test, cmake_install_test ]
+  clang10:
+    description: Build and run tests on clang 10 and AVX 2 with a cmake static build
+    executor: clang10
+    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON  -DBUILD_SHARED_LIBS=OFF }
+    steps: [ cmake_test, cmake_install_test, cmake_installed_test_cxx20 ]
+  # libcpp
+  libcpp-clang10:
+    description: Build and run tests on clang 10 and AVX 2 with a cmake static build and libc++
+    executor: clang10
+    environment: { CMAKE_FLAGS: -DSIMDJSON_USE_LIBCPP=ON  -DBUILD_SHARED_LIBS=OFF }
+    steps: [ cmake_test, cmake_install_test, cmake_installed_test_cxx20 ]
+  # sanitize
+  sanitize-gcc10:
+    description: Build and run tests on GCC 10 and AVX 2 with a cmake sanitize build
+    executor: gcc10
+    environment: { CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    steps: [ cmake_test ]
+  sanitize-clang10:
+    description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
+    executor: clang10
+    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON -DSIMDJSON_NO_FORCE_INLINING=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    steps: [ cmake_test ]
+  threadsanitize-gcc10:
+    description: Build and run tests on GCC 10 and AVX 2 with a cmake sanitize build
+    executor: gcc10
+    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON -DSIMDJSON_SANITIZE_THREADS=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    steps: [ cmake_test ]
+  threadsanitize-clang10:
+    description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
+    executor: clang10
+    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON  -DSIMDJSON_NO_FORCE_INLINING=ON -DSIMDJSON_SANITIZE_THREADS=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    steps: [ cmake_test ]
+  # dynamic
+  dynamic-gcc10:
+    description: Build and run tests on GCC 10 and AVX 2 with a cmake dynamic build
+    executor: gcc10
+    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON }
+    steps: [ cmake_test, cmake_install_test ]
+  dynamic-clang10:
+    description: Build and run tests on clang 10 and AVX 2 with a cmake dynamic build
+    executor: clang10
+    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON }
+    steps: [ cmake_test, cmake_install_test ]
+
+  # unthreaded
+  unthreaded-gcc10:
+    description: Build and run tests on GCC 10 and AVX 2 *without* threads
+    executor: gcc10
+    environment: { CMAKE_FLAGS: -DSIMDJSON_ENABLE_THREADS=OFF }
+    steps: [ cmake_test, cmake_install_test ]
+  unthreaded-clang10:
+    description: Build and run tests on Clang 10 and AVX 2 *without* threads
+    executor: clang10
+    environment: { CMAKE_FLAGS: -DSIMDJSON_ENABLE_THREADS=OFF }
+    steps: [ cmake_test, cmake_install_test ]
+
+  # noexcept
+  noexcept-gcc10:
+    description: Build and run tests on GCC 10 and AVX 2 with exceptions off
+    executor: gcc10
+    environment: { CMAKE_FLAGS: -DSIMDJSON_EXCEPTIONS=OFF }
+    steps: [ cmake_test, cmake_install_test ]
+  noexcept-clang10:
+    description: Build and run tests on Clang 10 and AVX 2 with exceptions off
+    executor: clang10
+    environment: { CMAKE_FLAGS: -DSIMDJSON_EXCEPTIONS=OFF }
+    steps: [ cmake_test, cmake_install_test ]
+
+  #
+  # Misc.
+  #
+
+  # make (test and checkperf)
+  arch-haswell-gcc10:
+    description: Build, run tests and check performance on GCC 10 with -march=haswell
+    executor: gcc10
+    environment: { CXXFLAGS: -march=haswell }
+    steps: [ cmake_test ]
+  arch-nehalem-gcc10:
+    description: Build, run tests and check performance on GCC 10 with -march=nehalem
+    executor: gcc10
+    environment: { CXXFLAGS: -march=nehalem }
+    steps: [ cmake_test ]
+  sanitize-haswell-gcc10:
+    description: Build and run tests on GCC 10 and AVX 2 with a cmake sanitize build
+    executor: gcc10
+    environment: {  CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    steps: [ cmake_test ]
+  sanitize-haswell-clang10:
+    description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
+    executor: clang10
+    environment: { CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON  -DSIMDJSON_NO_FORCE_INLINING=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    steps: [ cmake_test ]
+
+workflows:
+  version: 2.1
+  build_and_test:
+    jobs:
+      # full multi-implementation tests
+      #- gcc7 tested on GitHub actions
+      - gcc10 # do not delete this as it tests our performance
+      - clang6
+      #- clang10 # this gets tested a lot below
+
+      # libc++
+      - libcpp-clang10
+
+      # full single-implementation tests
+      - sanitize-gcc10
+      - sanitize-clang10
+      - threadsanitize-gcc10
+      - threadsanitize-clang10
+      - dynamic-gcc10
+      - dynamic-clang10
+      - unthreaded-gcc10
+      - unthreaded-clang10
+
+      # no exceptions
+      - noexcept-gcc10
+      - noexcept-clang10
+
+      # quicker make single-implementation tests
+      - arch-haswell-gcc10
+      - arch-nehalem-gcc10
+
+
+      # sanitized single-implementation tests
+      - sanitize-haswell-gcc10
+      - sanitize-haswell-clang10
+
+      # testing "just the library"
+      - justlib-gcc10
+
+      # testing asserts
+      - assert-gcc10
+      - assert-clang10
+
+      # TODO add windows: https://circleci.com/docs/2.0/configuration-reference/#windows

.github/ISSUE_TEMPLATE/bug_report.md

@@ -29,9 +29,6 @@ We accept the identification of an issue by a sanitizer or some checker tool (e.
 
 We recommend that you run your tests using different optimization levels. In particular, we recommend your run tests with the simdjson library and you code compiled in debug mode. The simdjson then sets the SIMDJSON_DEVELOPMENT_CHECKS macro to 1, and this triggers additional checks on your code and on the internals of the library. If possible, we recommend that you run tests with sanitizers (e.g., see [No more leaks with sanitize flags in gcc and clang](https://lemire.me/blog/2016/04/20/no-more-leaks-with-sanitize-flags-in-gcc-and-clang/)).  You can compile the library with sanitizers for debugging purposes (e.g., set SIMDJSON_SANITIZE to ON using CMake), but you should also turn on sanitizers on your own code. You may also use tools like valgrind or the commercial equivalent.
 
-Mixing debug and release simdjson code is unsafe: you either build all your code using simdjson in
-release mode or all of it in debug mode.
-
 Before reporting a bug, please ensure that you have read our documentation.
 
 **To Reproduce**
@@ -41,7 +38,7 @@ If we cannot reproduce the issue, then we cannot address it. Note that a stack t
 
 It should be possible to trigger the bug by using solely simdjson with our default build setup. If you can only observe the bug within some specific context, with some other software, please reduce the issue first.
 
-**simdjson release**
+**simjson release**
 
 Unless you plan to contribute to simdjson, you should only work from releases. Please be mindful that our main branch may have additional features, bugs and documentation items.
 
@@ -58,7 +55,6 @@ We support up-to-date 64-bit ARM and x64 FreeBSD, macOS, Windows and Linux syste
 * We do not support unreleased or experimental compilers. If you encounter an issue with a
 pre-release version of a compiler, do not report it as a bug to simdjson. However, we always
 invite contributions either in the form an analysis or of a code contribution.
-* Vendors (e.g., Apple and Microsoft) stop supporting old systems. Once a compiler system is no longer supported by its vendor, we no longer support it. We will gladly accept code contributions, but we do not consider it a *bug* if you have issues with an obsolete compiler systems. This policy extends to obsolete standard libraries, linkers and other build tools. Please do not report it as an issue. If you cannot resolve the issue yourself, we encourage you to reach out to the vendor for legacy support.
 
 Under Windows, we support Visual Studio (both with LLVM and without). We do not support MinGW and other alternate compiler systems. Windows users should be aware that there [is a long-running bug with GCC under Windows](https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412).
 

.github/pull_request_template.md

@@ -6,7 +6,6 @@ Description
 
 Type of change
 - [ ] Bug fix
-- [ ] Optimization
 - [ ] New feature
 - [ ] Refactor / cleanup
 - [ ] Documentation / tests
@@ -20,7 +19,7 @@ How to verify / test
 Please read before contributing:
 - CONTRIBUTING: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md
 - HACKING: https://github.com/simdjson/simdjson/blob/master/HACKING.md
-- AI Usage Policy: https://github.com/simdjson/simdjson/blob/master/AI_USAGE_POLICY.md
+
 
 
 If you can, we recommend running our tests with the sanitizers turned on.

.github/workflows/aarch64.yml

@@ -1,4 +1,4 @@
-name: Ubuntu aarch64 (GCC 13)
+name: Ubuntu ppc64le (GCC 11)
 
 on:
   push:

.github/workflows/documentation.yml

@@ -2,13 +2,7 @@ name: Doxygen GitHub Pages
 
 on:
   release:
-    # Trigger when a release object is created and when it's published.
-    # Some GitHub flows create a release object then publish it later; include both.
-    types: [created, published]
-  # Also trigger on tag creation pushes so releasing via Git tags still runs the workflow
-  push:
-    tags:
-      - "v*"  # common release tag pattern like v1.2.3
+    types: [created]
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
@@ -33,7 +27,7 @@ jobs:
       - name: Generate Doxygen Documentation
         run: doxygen
       - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v4
+        uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: doc/api/html

.github/workflows/rvv-1024-clang-18.yml

@@ -19,11 +19,11 @@ jobs:
         sudo apt-get install -y cmake make g++-riscv64-linux-gnu qemu-user-static clang-18
     - name: Build
       run: |
-        CC=clang-18 CXX=clang++-18 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv_zvbb" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
-        cmake --build build/ -j$(nproc) --config Release
+        CXX=clang++-18 CXXFLAGS="--target=riscv64-linux-gnu -march=rv64gcv_zvbb" \
+        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DCMAKE_BUILD_TYPE=Release -B build
+        cmake --build build/ -j$(nproc)
     - name: Test VLEN=1024
       run: |
-        QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
-        QEMU_CPU="rv64,v=on,zvbb=on,vlen=1024,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
+        export QEMU_LD_PREFIX="/usr/riscv64-linux-gnu"
+        export QEMU_CPU="rv64,v=on,zvbb=on,vlen=1024,rvv_ta_all_1s=on,rvv_ma_all_1s=on"
         ctest --timeout 1800 --output-on-failure --test-dir build -j $(nproc)

.github/workflows/rvv-128-clang-17.yml

@@ -19,6 +19,11 @@ jobs:
         sudo apt-get install -y cmake make g++-riscv64-linux-gnu qemu-user-static clang-17
     - name: Build
       run: |
-        CC=clang-17 CXX=clang++-17 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
-        cmake --build build/ -j$(nproc) --config Release
+        CXX=clang++-17 CXXFLAGS="--target=riscv64-linux-gnu -march=rv64gcv" \
+        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DCMAKE_BUILD_TYPE=Release -B build
+        cmake --build build/ -j$(nproc)
+    - name: Test VLEN=128
+      run: |
+        export QEMU_LD_PREFIX="/usr/riscv64-linux-gnu"
+        export QEMU_CPU="rv64,v=on,vlen=128,rvv_ta_all_1s=on,rvv_ma_all_1s=on"
+        ctest --timeout 1800 --output-on-failure --test-dir build -j $(nproc)

.github/workflows/rvv-128-clang-20.yml

@@ -1,39 +0,0 @@
-name: Ubuntu rvv VLEN=128 (clang 20)
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install packages
-      run: |
-        sudo apt-get update -q -y
-        sudo apt-get install -y cmake make g++-riscv64-linux-gnu qemu-user-static clang-20
-    - name: Build
-      run: |
-        CC=clang-20 CXX=clang++-20 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
-        cmake --build build/ -j$(nproc) --config Release
-    - name: Test VLEN=128
-      run: |
-        QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
-        QEMU_CPU="rv64,v=on,vlen=128,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
-        ctest --timeout 1800 --output-on-failure --test-dir build -j $(nproc)
-    - name: Build VLS
-      run: |
-        CC=clang-20 CXX=clang++-20 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv_zvl128b_zba_zbb_zbc -mrvv-vector-bits=zvl" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build-vls
-        cmake --build build-vls/ -j$(nproc) --config Release
-    - name: Test VLEN=128 VLS
-      run: |
-        QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
-        QEMU_CPU="rv64,v=on,zba=on,zbb=on,zbc=on,vlen=128,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
-        ctest --timeout 1800 --output-on-failure --test-dir build-vls -j $(nproc)

.github/workflows/rvv-256-gcc-14.yml

@@ -19,21 +19,11 @@ jobs:
         sudo apt-get install -y cmake make g++-14-riscv64-linux-gnu qemu-user-static
     - name: Build
       run: |
-        CC=riscv64-linux-gnu-gcc-14 CXX=riscv64-linux-gnu-g++-14 CFLAGS=-march=rv64gcv CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
-        cmake --build build/ -j$(nproc) --config Release
+        CXX=riscv64-linux-gnu-g++-14 CXXFLAGS=-march=rv64gcv \
+        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DCMAKE_BUILD_TYPE=Release -B build
+        cmake --build build/ -j$(nproc)
     - name: Test VLEN=256
       run: |
-        QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
-        QEMU_CPU="rv64,v=on,zvbb=on,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
+        export QEMU_LD_PREFIX="/usr/riscv64-linux-gnu"
+        export QEMU_CPU="rv64,v=on,zvbb=on,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on"
         ctest --timeout 1800 --output-on-failure --test-dir build -j $(nproc)
-    - name: Build VLS
-      run: |
-        CC=riscv64-linux-gnu-gcc-14 CXX=riscv64-linux-gnu-g++-14 CFLAGS="-march=rv64gcv_zvl256b -mrvv-vector-bits=zvl" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build-vls
-        cmake --build build-vls/ -j$(nproc) --config Release
-    - name: Test VLEN=256 VLS
-      run: |
-        QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
-        QEMU_CPU="rv64,v=on,zvbb=on,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
-        ctest --timeout 1800 --output-on-failure --test-dir build-vls -j $(nproc)

.github/workflows/rvv-512-clang-19.yml

@@ -1,39 +0,0 @@
-name: Ubuntu rvv VLEN=512 (clang 19)
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install packages
-      run: |
-        sudo apt-get update -q -y
-        sudo apt-get install -y cmake make g++-riscv64-linux-gnu qemu-user-static clang-19
-    - name: Build
-      run: |
-        CC=clang-19 CXX=clang++-19 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
-        cmake --build build/ -j$(nproc) --config Release
-    - name: Test VLEN=512
-      run: |
-        QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
-        QEMU_CPU="rv64,v=on,vlen=512,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
-        ctest --timeout 1800 --output-on-failure --test-dir build -j $(nproc)
-    - name: Build VLS
-      run: |
-        CC=clang-19 CXX=clang++-19 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv_zvl512b_zba_zbb_zbc -mrvv-vector-bits=zvl" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build-vls
-        cmake --build build-vls/ -j$(nproc) --config Release
-    - name: Test VLEN=512 VLS
-      run: |
-        QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
-        QEMU_CPU="rv64,v=on,zba=on,zbb=on,zbc=on,vlen=512,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
-        ctest --timeout 1800 --output-on-failure --test-dir build-vls -j $(nproc)

.github/workflows/ubuntu24-noexcept.yml

@@ -31,4 +31,4 @@ jobs:
           echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
           mkdir testfindpackage &&
           cd testfindpackage &&
-          echo -e 'cmake_minimum_required(VERSION 3.14)\nproject(simdjsontester)\nset(CMAKE_CXX_STANDARD 17)\nfind_package(simdjson REQUIRED)'> CMakeLists.txt && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../destination .. &&  cmake --build .
+          echo -e 'cmake_minimum_required(VERSION 3.1)\nproject(simdjsontester)\nset(CMAKE_CXX_STANDARD 17)\nfind_package(simdjson REQUIRED)'> CMakeLists.txt && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../destination .. &&  cmake --build .

.github/workflows/ubuntu24-nothread.yml

@@ -31,4 +31,4 @@ jobs:
           echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
           mkdir testfindpackage &&
           cd testfindpackage &&
-          echo -e 'cmake_minimum_required(VERSION 3.14)\nproject(simdjsontester)\nset(CMAKE_CXX_STANDARD 17)\nfind_package(simdjson REQUIRED)'> CMakeLists.txt && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../destination .. &&  cmake --build .
+          echo -e 'cmake_minimum_required(VERSION 3.1)\nproject(simdjsontester)\nset(CMAKE_CXX_STANDARD 17)\nfind_package(simdjson REQUIRED)'> CMakeLists.txt && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../destination .. &&  cmake --build .

.gitignore

@@ -88,6 +88,7 @@ objs
 # Build outputs
 /build*/
 /visual_studio/
+/originbuild/
 
 # Fuzzer outputs generated by instructions in fuzz/Fuzzing.md
 /corpus.zip

AI_USAGE_POLICY.md

@@ -1,56 +0,0 @@
-# AI Usage Policy
-
-Contributors can use whatever tools they would like to
-craft their contributions, but there must be a **human in the loop**.
-**Contributors must read and review all LLM-generated code or text before they
-ask other project members to review it.** The contributor is always the author
-and is fully accountable for their contributions. Contributors should be
-sufficiently confident that the contribution is high enough quality that asking
-for a review is a good use of scarce maintainer time, and they should be **able
-to answer questions about their work** during review.
-
-We expect that new contributors will be less confident in their contributions,
-and our guidance to them is to **start with small contributions** that they can
-fully understand to build confidence. We aspire to be a welcoming community
-that helps new contributors grow their expertise, but learning involves taking
-small steps, getting feedback, and iterating. Passing maintainer feedback to an
-LLM doesn't help anyone grow, and does not sustain our community.
-
-This policy includes, but is not limited to, the following kinds of
-contributions:
-
-- Code, usually in the form of a pull request
-- Issues or security vulnerabilities
-- Comments and feedback on pull requests
-
-## Extractive Contributions
-
-The reason for our "human-in-the-loop" contribution policy is that processing
-patches, PRs, RFCs, and comments is not free -- it takes a lot of
-maintainer time and energy to review those contributions! Sending the
-unreviewed output of an LLM to open source project maintainers *extracts* work
-from them in the form of design and code review, so we call this kind of
-contribution an "extractive contribution".
-
-## Transparency
-
-For contributions involving significant AI assistance, we encourage you to disclose
-its use and explain your process. If a submission appears to rely heavily on AI
-without disclosure, we may doubt that the **human-in-the-loop** requirement has
-been met. Please show awareness of your use of AI.
-
-## Copyright
-
-Artificial intelligence systems raise many questions around copyright that have
-yet to be answered. Our policy on AI tools is similar to our copyright policy:
-Contributors are responsible for ensuring that they have the right to
-contribute code under the terms of our license, typically meaning that either
-they, their employer, or their collaborators hold the copyright. Using AI tools
-to regenerate copyrighted material does not remove the copyright, and
-contributors are responsible for ensuring that such material does not appear in
-their contributions. Contributions found to violate this policy will be removed
-just like any other offending contribution.
-
-## Reference
-
-- [LLVM AI Tool Use Policy](https://discourse.llvm.org/t/rfc-llvm-ai-tool-policy-human-in-the-loop/89159)

CMakeLists.txt

@@ -1,18 +1,9 @@
 cmake_minimum_required(VERSION 3.14)
 
-# Build performance optimizations
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "Export compile commands for faster IDE integration")
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
-# Enable parallel compilation on MSVC
-if(MSVC)
-  add_compile_options(/MP)
-endif()
-
 project(
     simdjson
     # The version number is modified by tools/release.py
-    VERSION 4.4.0
+    VERSION 4.0.2
     DESCRIPTION "Parsing gigabytes of JSON per second"
     HOMEPAGE_URL "https://simdjson.org/"
     LANGUAGES CXX C
@@ -29,8 +20,8 @@ string(
 # ---- Options, variables ----
 
 # These version numbers are modified by tools/release.py
-set(SIMDJSON_LIB_VERSION "31.0.0" CACHE STRING "simdjson library version")
-set(SIMDJSON_LIB_SOVERSION "31" CACHE STRING "simdjson library soversion")
+set(SIMDJSON_LIB_VERSION "27.0.0" CACHE STRING "simdjson library version")
+set(SIMDJSON_LIB_SOVERSION "27" CACHE STRING "simdjson library soversion")
 
 option(SIMDJSON_BUILD_STATIC_LIB "Build simdjson_static library along with simdjson (only makes sense if BUILD_SHARED_LIBS=ON)" OFF)
 if(SIMDJSON_BUILD_STATIC_LIB AND NOT BUILD_SHARED_LIBS)
@@ -92,36 +83,10 @@ add_library(simdjson ${SIMDJSON_SOURCES})
 add_library(simdjson::simdjson ALIAS simdjson)
 set(SIMDJSON_LIBRARIES simdjson)
 
-# Enable precompiled headers for faster builds
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16")
-  target_precompile_headers(simdjson PRIVATE
-    <algorithm>
-    <array>
-    <atomic>
-    <bit>
-    <cassert>
-    <cctype>
-    <cerrno>
-    <cstddef>
-    <cstdint>
-    <cstdlib>
-    <cstring>
-    <memory>
-    <string>
-    <utility>
-    <vector>
-  )
-endif()
-
 if(SIMDJSON_BUILD_STATIC_LIB)
   add_library(simdjson_static STATIC ${SIMDJSON_SOURCES})
   add_library(simdjson::simdjson_static ALIAS simdjson_static)
   list(APPEND SIMDJSON_LIBRARIES simdjson_static)
-
-  # Reuse precompiled headers for static library
-  if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16")
-    target_precompile_headers(simdjson_static REUSE_FROM simdjson)
-  endif()
 endif()
 
 set_target_properties(
@@ -147,14 +112,6 @@ simdjson_add_props(
     PRIVATE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>"
 )
 
-# Optimize linker settings for faster builds
-if(MSVC)
-  target_link_options(simdjson PRIVATE /INCREMENTAL)
-  if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    target_link_options(simdjson PRIVATE /DEBUG:FASTLINK)
-  endif()
-endif()
-
 if(SIMDJSON_STATIC_REFLECTION)
   # We would like to require C++26, but no compiler supports that!
   # This is a hack:
@@ -183,6 +140,24 @@ if(SIMDJSON_MINUS_ZERO_AS_FLOAT)
   simdjson_add_props(target_compile_definitions PRIVATE SIMDJSON_MINUS_ZERO_AS_FLOAT=1)
 endif(SIMDJSON_MINUS_ZERO_AS_FLOAT)
 
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(loongarch64)$")
+    option(SIMDJSON_PREFER_LSX "Prefer LoongArch SX" ON)
+    include(CheckCXXCompilerFlag)
+    check_cxx_compiler_flag(-mlasx COMPILER_SUPPORTS_LASX)
+    check_cxx_compiler_flag(-mlsx COMPILER_SUPPORTS_LSX)
+    if(COMPILER_SUPPORTS_LASX AND NOT SIMDJSON_PREFER_LSX)
+        simdjson_add_props(
+            target_compile_options PRIVATE
+            -mlasx
+        )
+    elseif(COMPILER_SUPPORTS_LSX)
+        simdjson_add_props(
+            target_compile_options PRIVATE
+            -mlsx
+        )
+    endif()
+endif()
+
 # GCC and Clang have horrendous Debug builds when using SIMD.
 # A common fix is to use '-Og' instead.
 # bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412
@@ -196,12 +171,7 @@ if(
       target_compile_options PRIVATE
       $<$<CONFIG:DEBUG>:-Og>
   )
-  # We still want to enable development checks in Debug mode
-  simdjson_add_props(
-      target_compile_definitions PUBLIC
-      SIMDJSON_DEVELOPMENT_CHECKS
-  )
-  endif()
+endif()
 
 if(SIMDJSON_ENABLE_THREADS)
   find_package(Threads REQUIRED)

CONTRIBUTING.md

@@ -101,10 +101,3 @@ Getting Started Hacking
 
 An overview of simdjson's directory structure, with pointers to architecture and design
 considerations and other helpful notes, can be found at [HACKING.md](HACKING.md).
-
-
-
-AI Usage Policy
----------------
-
-Please also review our [AI Usage Policy](AI_USAGE_POLICY.md).

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = simdjson
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "4.4.0"
+PROJECT_NUMBER         = "4.0.2"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

HACKING.md

@@ -110,24 +110,6 @@ workflows used by simdjson.
 Directory Structure and Source
 ------------------------------
 
-Before diving into the directory structure, here are key concepts used in the codebase:
-
-- **Amalgamated File**: A file that is conditionally included in the amalgamation process. These are wrapped in `#ifndef SIMDJSON_CONDITIONAL_INCLUDE` blocks and are included based on the target implementation (e.g., ARM64, x86). They include implementation-specific files (e.g., `arm64.h`) and generic files (e.g., under `generic/`). Amalgamated files have associated dependency files (`dependencies.h`) to track includes.
-
-- **Amalgamator File**: A file that orchestrates the inclusion of amalgamated files. Examples: `arm64.h`, `arm64/implementation.h`, `generic/amalgamated.h`. These are not themselves amalgamated but control conditional inclusions.
-
-- **Free Dependency File**: A top-level header that is always included unconditionally. These do not have dependency files and represent the public API (e.g., main headers).
-
-- **Implementation-Specific File**: A file tied to a specific CPU architecture or instruction set (e.g., `arm64/`, `haswell/`). These must be amalgamated.
-
-- **Generic File**: A shared file (under `generic/` or `simdjson/generic/`) that contains common code included once per implementation.
-
-- **Builtin File**: Special files under `simdjson/builtin/` that handle the builtin implementation, a fallback/default implementation used when no optimized implementation is available.
-
-- **Conditional Include Block**: A section wrapped in `#ifndef SIMDJSON_CONDITIONAL_INCLUDE` for editor-only or implementation-specific content.
-
-The script `singleheader/amalgation_helper.py` will generate an HTML report which you can use to visualize the status of each file.
-
 simdjson's source structure, from the top level, looks like this:
 
 * **CMakeLists.txt:** The main build system.
@@ -151,12 +133,6 @@ simdjson's source structure, from the top level, looks like this:
     * simdjson/generic/ondemand/*.h: individual On-Demand classes, generically written.
       * simdjson/generic/ondemand/dependencies.h: dependencies on common, non-implementation-specific simdjson classes. This will be included before including amalgamated.h.
       * simdjson/generic/ondemand/amalgamated.h: all generic ondemand classes for an implementation.
-  * simdjson/builder.h: the `simdjson::builder` namespace. Includes all public builder classes.
-    * simdjson/builtin/builder.h: the `simdjson::builtin::builder` namespace.
-    * simdjson/arm64|fallback|haswell|icelake|ppc64|westmere/builder.h: the `simdjson::<implementation>::builder` namespace. Builder compiled for the specific implementation.
-    * simdjson/generic/builder/*.h: individual Builder classes, generically written.
-      * simdjson/generic/builder/dependencies.h: dependencies on common, non-implementation-specific simdjson classes. This will be included before including amalgamated.h.
-      * simdjson/generic/builder/amalgamated.h: all generic builder classes for an implementation.
 * **src:** The source files for non-inlined functionality (e.g. the architecture-specific parser
   implementations).
   * simdjson.cpp: A "main source" that includes all implementation files from src/. This is
@@ -171,7 +147,6 @@ Other important files and directories:
 * **.github/workflows:** Definitions for GitHub Actions (CI).
 * **singleheader:** Contains generated `simdjson.h` and `simdjson.cpp` that we release. The files `singleheader/simdjson.h` and `singleheader/simdjson.cpp` should never be edited by hand.
 * **singleheader/amalgamate.py:** Generates `singleheader/simdjson.h` and `singleheader/simdjson.cpp` for release (python script). If you add a new implementation (e.g., rvv), you need to edit this file (IMPLEMENTATIONS).
-* **singleheader/amalgation_helper.py:** Generates and `amalgamation_report.html` that helps you understand the status of each file.
 * **benchmark:** This is where we do benchmarking. Benchmarking is core to every change we make; the
   cardinal rule is don't regress performance without knowing exactly why, and what you're trading
   for it. Many of our benchmarks are microbenchmarks. We are effectively doing controlled scientific experiments for the purpose of understanding what affects our performance. So we simplify as much as possible. We try to avoid irrelevant factors such as page faults, interrupts, unnecessary system calls. We recommend checking the performance as follows:

README.md

@@ -6,8 +6,7 @@
 simdjson : Parsing gigabytes of JSON per second
 ===============================================
 
-<img src="images/official_logo/logo_noir/SVG/logo_simdjson_noir.svg" width="40%" style="float: right">
-
+<img src="images/logo.png" width="10%" style="float: right">
 JSON is everywhere on the Internet. Servers spend a *lot* of time parsing it. We need a fresh
 approach. The simdjson library uses commonly available SIMD instructions and microparallel algorithms
 to parse JSON 4x  faster than RapidJSON and 25x faster than JSON for Modern C++.
@@ -63,15 +62,10 @@ Real-world usage
 - [WasmEdge](https://wasmedge.org)
 - [RonDB](https://github.com/logicalclocks/rondb)
 - [GreptimeDB](https://github.com/GreptimeTeam/greptimedb)
-- [mamba](https://github.com/mamba-org/mamba)
-- [Ladybird Browser](https://ladybird.org)
 
 
 If you are planning to use simdjson in a product, please work from one of our releases.
 
-
-
-
 Quick Start
 -----------
 
@@ -88,7 +82,7 @@ The simdjson library is easily consumable with a single .h and .cpp file.
    ```
 2. Create `quickstart.cpp`:
 
-```cpp
+```c++
 #include <iostream>
 #include "simdjson.h"
 using namespace simdjson;
@@ -118,16 +112,14 @@ Usage documentation is available:
 * [Implementation Selection](doc/implementation-selection.md) describes runtime CPU detection and
   how you can work with it.
 * [API](https://simdjson.github.io/simdjson/) contains the automatically generated API documentation.
-* [Compile-Time Parsing](doc/compile_time.md) presents our compile-time parsing function (C++26 only).
-
 
 Godbolt
 -------------
 
 Some users may want to browse code along with the compiled assembly. You want to check out the following lists of examples:
-* [C++26 reflection example](https://godbolt.org/z/K3Px64TqK)
 * [simdjson examples with errors handled through exceptions](https://godbolt.org/z/7G5qE4sr9)
 * [simdjson examples with errors without exceptions](https://godbolt.org/z/e9dWb9E4v)
+* [C++26 reflection example](https://godbolt.org/z/xK5TGKdPb)
 
 Performance results
 -------------------
@@ -188,7 +180,6 @@ We distinguish between "bindings" (which just wrap the C++ code) and a port to a
 - [JSON::SIMD](https://metacpan.org/pod/JSON::SIMD): Perl bindings; fully-featured JSON module that uses simdjson for decoding.
 - [gemmaJSON](https://github.com/sainttttt/gemmaJSON): Nim JSON parser based on simdjson bindings.
 - [simdjson-java](https://github.com/simdjson/simdjson-java): Java port.
-- [mruby-fast-json](https://github.com/Asmod4n/mruby-fast-json): mruby binding with high API coverage.
 
 About simdjson
 --------------
@@ -215,21 +206,6 @@ For the video inclined, <br />
 [![simdjson at QCon San Francisco 2019](http://img.youtube.com/vi/wlvKAT7SZIQ/0.jpg)](http://www.youtube.com/watch?v=wlvKAT7SZIQ)<br />
 (It was the best voted talk, we're kinda proud of it.)
 
-Citing this work
------------------
-
-If you use simdjson in published research, please cite the software library. A suitable BibTeX entry is:
-
-```bibtex
-@misc{simdjson,
-  title={{The simdjson library: Parsing Gigabytes of JSON per Second}},
-  author={Daniel Lemire and Geoff Langdale and John Keiser and Paul Dreik and Francisco Thiesen and others},
-  year={2019},
-  howpublished={Software library},
-  note={https://github.com/simdjson/simdjson}
-}
-```
-
 Funding
 -------
 
@@ -250,13 +226,6 @@ Contributing to simdjson
 Head over to [CONTRIBUTING.md](CONTRIBUTING.md) for information on contributing to simdjson, and
 [HACKING.md](HACKING.md) for information on source, building, and architecture/design.
 
-
-Stars
-------
-
-[![Star History Chart](https://api.star-history.com/svg?repos=simdjson/simdjson&type=Date)](https://www.star-history.com/#simdjson/simdjson&Date)
-
-
 License
 -------
 

benchmark/accessor_performance/README.md

@@ -1,46 +0,0 @@
-# Accessor Performance Benchmarks (C++26)
-
-These benchmarks compare the performance of runtime vs compile-time JSON accessors.
-For the comparison to be meaningful, you must build simdjson with support for
-C++26 reflexion. See the `p2996` repository in the main project directory.
-
-## Files
-
-- `accessor_benchmark.h` - Common benchmark framework and test data
-- `runtime_accessors.h` - Runtime `at_path()` benchmarks
-- `compile_time_accessors.h` - Compile-time `at_path_compiled()` benchmarks (requires C++26 reflection)
-
-## Benchmarks
-
-Each benchmark measures parsing + single field access:
-
-1. **accessor_simple** - Simple field: `.name`
-2. **accessor_nested** - Nested field: `.address.city`
-3. **accessor_deep** - Deep nested field: `.address.coordinates.lat`
-
-## Building (Linux/macOS)
-
-```bash
-cmake -B build -D SIMDJSON_STATIC_REFLECTION=ON -DSIMDJSON_DEVELOPER_MODE=ON
-cmake --build build --target=bench_ondemand
-```
-
-The `SIMDJSON_STATIC_REFLECTION` will be made unnecessary once mainstream compilers
-begin supporting C++26 sufficiently well.
-
-## Running (Linux/macOS)
-
-
-```bash
-# Run all accessor benchmarks
-./build/bench_ondemand --benchmark_filter="accessor"
-```
-
-## Results
-
-We find that compile-time accessors show performance improvements that scale with path depth:
-- Simple fields: ~1.2x faster
-- Nested fields: ~1.5x faster
-- Deep nested fields: ~1.8x faster
-
-The speedup comes from eliminating runtime path parsing and conversion overhead.

benchmark/accessor_performance/accessor_benchmark.h

@@ -1,132 +0,0 @@
-#pragma once
-
-#include "json_benchmark/file_runner.h"
-#include <string>
-
-namespace accessor_performance {
-
-using namespace json_benchmark;
-
-// Test JSON for accessor benchmarks
-static const char* TEST_JSON = R"({
-  "name": "Alice",
-  "age": 30,
-  "email": "alice@example.com",
-  "address": {
-    "street": "123 Main St",
-    "city": "Boston",
-    "state": "MA",
-    "zip": 12345,
-    "coordinates": {
-      "lat": 42.3601,
-      "lon": -71.0589
-    }
-  },
-  "scores": [95, 87, 92, 88, 91],
-  "preferences": {
-    "theme": "dark",
-    "notifications": {
-      "email": true,
-      "push": false,
-      "sms": true
-    }
-  }
-})";
-
-// Struct definitions for compile-time validation
-#if SIMDJSON_STATIC_REFLECTION
-struct Coordinates {
-  double lat;
-  double lon;
-};
-
-struct Address {
-  std::string street;
-  std::string city;
-  std::string state;
-  int64_t zip;
-  Coordinates coordinates;
-};
-
-struct Notifications {
-  bool email;
-  bool push;
-  bool sms;
-};
-
-struct Preferences {
-  std::string theme;
-  Notifications notifications;
-};
-
-struct TestData {
-  std::string name;
-  int64_t age;
-  std::string email;
-  Address address;
-  std::vector<int64_t> scores;
-  Preferences preferences;
-};
-#endif // SIMDJSON_STATIC_REFLECTION
-
-// Single-access benchmark runner: measures ONE field access per iteration
-template<typename I>
-struct single_access_runner : public file_runner<I> {
-  std::string result_string;
-  int64_t result_int{};
-  double result_double{};
-  bool result_bool{};
-
-  bool setup(benchmark::State &state) {
-    this->json = simdjson::padded_string(TEST_JSON, strlen(TEST_JSON));
-    state.SetBytesProcessed(int64_t(state.iterations()) * int64_t(this->json.size()));
-    return true;
-  }
-
-  bool before_run(benchmark::State &state) {
-    if (!file_runner<I>::before_run(state)) { return false; }
-    result_string.clear();
-    result_int = 0;
-    result_double = 0.0;
-    result_bool = false;
-    return true;
-  }
-
-  bool run(benchmark::State &) {
-    return this->implementation.run(this->json, result_string, result_int, result_double, result_bool);
-  }
-
-  template<typename R>
-  bool diff(benchmark::State &state, single_access_runner<R> &reference) {
-    if (result_string != reference.result_string ||
-        result_int != reference.result_int ||
-        result_double != reference.result_double ||
-        result_bool != reference.result_bool) {
-      std::cerr << "Accessor benchmark results differ!" << std::endl;
-      return false;
-    }
-    return true;
-  }
-
-  size_t items_per_iteration() {
-    return 1;
-  }
-};
-
-// Benchmark template definitions
-struct runtime_at_path_simple;
-template<typename I> simdjson_inline static void accessor_simple(benchmark::State &state) {
-  run_json_benchmark<single_access_runner<I>, single_access_runner<runtime_at_path_simple>>(state);
-}
-
-struct runtime_at_path_nested;
-template<typename I> simdjson_inline static void accessor_nested(benchmark::State &state) {
-  run_json_benchmark<single_access_runner<I>, single_access_runner<runtime_at_path_nested>>(state);
-}
-
-struct runtime_at_path_deep;
-template<typename I> simdjson_inline static void accessor_deep(benchmark::State &state) {
-  run_json_benchmark<single_access_runner<I>, single_access_runner<runtime_at_path_deep>>(state);
-}
-
-} // namespace accessor_performance

benchmark/accessor_performance/compile_time_accessors.h

@@ -1,56 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS && SIMDJSON_STATIC_REFLECTION
-
-#include "accessor_benchmark.h"
-
-namespace accessor_performance {
-
-using namespace simdjson;
-
-struct compile_time_at_path_simple {
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::string &result_str, int64_t&, double&, bool&) {
-    auto doc = parser.iterate(json);
-    std::string_view name;
-    auto r = ondemand::json_path::at_path_compiled<TestData, ".name">(doc);
-    if (r.get(name) != SUCCESS) return false;
-    result_str = name;
-    return true;
-  }
-};
-
-struct compile_time_at_path_nested {
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::string &result_str, int64_t&, double&, bool&) {
-    auto doc = parser.iterate(json);
-    std::string_view city;
-    auto r = ondemand::json_path::at_path_compiled<TestData, ".address.city">(doc);
-    if (r.get(city) != SUCCESS) return false;
-    result_str = city;
-    return true;
-  }
-};
-
-struct compile_time_at_path_deep {
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::string&, int64_t&, double &result_dbl, bool&) {
-    auto doc = parser.iterate(json);
-    double lat;
-    auto r = ondemand::json_path::at_path_compiled<TestData, ".address.coordinates.lat">(doc);
-    if (r.get(lat) != SUCCESS) return false;
-    result_dbl = lat;
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(accessor_simple, compile_time_at_path_simple)->UseManualTime();
-BENCHMARK_TEMPLATE(accessor_nested, compile_time_at_path_nested)->UseManualTime();
-BENCHMARK_TEMPLATE(accessor_deep, compile_time_at_path_deep)->UseManualTime();
-
-} // namespace accessor_performance
-
-#endif // SIMDJSON_EXCEPTIONS && SIMDJSON_STATIC_REFLECTION

benchmark/accessor_performance/runtime_accessors.h

@@ -1,53 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "accessor_benchmark.h"
-
-namespace accessor_performance {
-
-using namespace simdjson;
-
-struct runtime_at_path_simple {
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::string &result_str, int64_t&, double&, bool&) {
-    auto doc = parser.iterate(json);
-    std::string_view name;
-    if (doc.at_path(".name").get(name) != SUCCESS) return false;
-    result_str = name;
-    return true;
-  }
-};
-
-struct runtime_at_path_nested {
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::string &result_str, int64_t&, double&, bool&) {
-    auto doc = parser.iterate(json);
-    std::string_view city;
-    if (doc.at_path(".address.city").get(city) != SUCCESS) return false;
-    result_str = city;
-    return true;
-  }
-};
-
-struct runtime_at_path_deep {
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::string&, int64_t&, double &result_dbl, bool&) {
-    auto doc = parser.iterate(json);
-    double lat;
-    if (doc.at_path(".address.coordinates.lat").get(lat) != SUCCESS) return false;
-    result_dbl = lat;
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(accessor_simple, runtime_at_path_simple)->UseManualTime();
-BENCHMARK_TEMPLATE(accessor_nested, runtime_at_path_nested)->UseManualTime();
-BENCHMARK_TEMPLATE(accessor_deep, runtime_at_path_deep)->UseManualTime();
-
-} // namespace accessor_performance
-
-#endif // SIMDJSON_EXCEPTIONS

benchmark/apple/apple_arm_events.h

@@ -245,7 +245,7 @@ static u32 (*kpc_get_counter_count)(u32 classes);
 
 /// Get counter accumulations.
 /// If `all_cpus` is true, the buffer count should not smaller than
-/// (cpu_count * counter_count). Otherwise, the buffer count should not smaller
+/// (cpu_count * counter_count). Otherwize, the buffer count should not smaller
 /// than (counter_count).
 /// @see kpc_get_counter_count(), kpc_cpu_count().
 /// @param all_cpus true for all CPUs, false for current cpu.
@@ -374,7 +374,7 @@ static int kperf_lightweight_pet_set(u32 enabled) {
 // These functions do not require root privileges.
 // -----------------------------------------------------------------------------
 
-// KPEP CPU architecture constants.
+// KPEP CPU archtecture constants.
 #define KPEP_ARCH_I386 0
 #define KPEP_ARCH_X86_64 1
 #define KPEP_ARCH_ARM 2
@@ -414,7 +414,7 @@ typedef struct kpep_db {
   usize fixed_counter_count;
   usize config_counter_count;
   usize power_counter_count;
-  u32 architecture; ///< see `KPEP CPU architecture constants` above.
+  u32 archtecture; ///< see `KPEP CPU archtecture constants` above.
   u32 fixed_counter_bits;
   u32 config_counter_bits;
   u32 power_counter_bits;

benchmark/bench_ondemand.cpp

@@ -148,9 +148,4 @@ SIMDJSON_POP_DISABLE_WARNINGS
 #include "large_amazon_cellphones/simdjson_dom.h"
 #include "large_amazon_cellphones/simdjson_ondemand.h"
 
-#include "accessor_performance/runtime_accessors.h"
-#if SIMDJSON_STATIC_REFLECTION
-#include "accessor_performance/compile_time_accessors.h"
-#endif
-
 BENCHMARK_MAIN();

benchmark/distinct_user_id/yyjson.h

@@ -44,10 +44,7 @@ struct yyjson_base {
 
 struct yyjson : yyjson_base {
   bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
-    bool b = yyjson_base::run(doc, result);
-    yyjson_doc_free(doc);
-    return b;
+    return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), result);
   }
 };
 BENCHMARK_TEMPLATE(distinct_user_id, yyjson)->UseManualTime();
@@ -55,15 +52,11 @@ BENCHMARK_TEMPLATE(distinct_user_id, yyjson)->UseManualTime();
 #if SIMDJSON_COMPETITION_ONDEMAND_INSITU
 struct yyjson_insitu : yyjson_base {
   bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    yyjson_doc *doc = yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
-    bool b = yyjson_base::run(doc, result);
-    yyjson_doc_free(doc);
-    return b;
+    return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), result);
   }
 };
 BENCHMARK_TEMPLATE(distinct_user_id, yyjson_insitu)->UseManualTime();
 #endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
-
 } // namespace distinct_user_id
 
 #endif // SIMDJSON_COMPETITION_YYJSON

benchmark/find_tweet/yyjson.h

@@ -36,26 +36,18 @@ struct yyjson_base {
 
 struct yyjson : yyjson_base {
   bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
-    bool b = yyjson_base::run(doc, find_id, result);
-    yyjson_doc_free(doc);
-    return b;
+    return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), find_id, result);
   }
 };
 BENCHMARK_TEMPLATE(find_tweet, yyjson)->UseManualTime();
-
 #if SIMDJSON_COMPETITION_ONDEMAND_INSITU
 struct yyjson_insitu : yyjson_base {
   bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    yyjson_doc *doc = yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
-    bool b = yyjson_base::run(doc, find_id, result);
-    yyjson_doc_free(doc);
-    return b;
+    return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), find_id, result);
   }
 };
 BENCHMARK_TEMPLATE(find_tweet, yyjson_insitu)->UseManualTime();
 #endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
-
 } // namespace find_tweet
 
 #endif // SIMDJSON_COMPETITION_YYJSON

benchmark/json2msgpack/yyjson.h

@@ -100,7 +100,6 @@ struct yyjson : yyjson2msgpack {
            std::string_view &result) {
     yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
     result = to_msgpack(doc, reinterpret_cast<uint8_t*>(buffer));
-    yyjson_doc_free(doc);
     return true;
   }
 };
@@ -114,7 +113,6 @@ struct yyjson_insitu : yyjson2msgpack {
     yyjson_doc *doc =
         yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
     result = to_msgpack(doc, reinterpret_cast<uint8_t*>(buffer));
-    yyjson_doc_free(doc);
     return true;
   }
 };
@@ -122,4 +120,4 @@ BENCHMARK_TEMPLATE(json2msgpack, yyjson_insitu)->UseManualTime();
 #endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
 } // namespace json2msgpack
 
-#endif // SIMDJSON_COMPETITION_YYJSON
+#endif // SIMDJSON_COMPETITION_YYJSON

benchmark/kostya/yyjson.h

@@ -49,26 +49,18 @@ struct yyjson_base {
 
 struct yyjson : yyjson_base {
   bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
-    bool b = yyjson_base::run(doc, result);
-    yyjson_doc_free(doc);
-    return b;
+    return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), result);
   }
 };
 BENCHMARK_TEMPLATE(kostya, yyjson)->UseManualTime();
-
 #if SIMDJSON_COMPETITION_ONDEMAND_INSITU
 struct yyjson_insitu : yyjson_base {
   bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    yyjson_doc *doc = yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
-    bool b = yyjson_base::run(doc, result);
-    yyjson_doc_free(doc);
-    return b;
+    return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), result);
   }
 };
 BENCHMARK_TEMPLATE(kostya, yyjson_insitu)->UseManualTime();
 #endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
-
 } // namespace kostya
 
 #endif // SIMDJSON_COMPETITION_YYJSON

benchmark/large_random/yyjson.h

@@ -47,26 +47,18 @@ struct yyjson_base {
 
 struct yyjson : yyjson_base {
   bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
-    bool b = yyjson_base::run(doc, result);
-    yyjson_doc_free(doc);
-    return b;
+    return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), result);
   }
 };
 BENCHMARK_TEMPLATE(large_random, yyjson)->UseManualTime();
-
 #if SIMDJSON_COMPETITION_ONDEMAND_INSITU
 struct yyjson_insitu : yyjson_base {
   bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    yyjson_doc *doc = yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
-    bool b = yyjson_base::run(doc, result);
-    yyjson_doc_free(doc);
-    return b;
+    return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), result);
   }
 };
 BENCHMARK_TEMPLATE(large_random, yyjson_insitu)->UseManualTime();
 #endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
-
 } // namespace large_random
 
 #endif // SIMDJSON_COMPETITION_YYJSON

benchmark/partial_tweets/yyjson.h

@@ -62,26 +62,19 @@ struct yyjson_base {
 
 struct yyjson : yyjson_base {
   bool run(simdjson::padded_string &json, std::vector<tweet<std::string_view>> &result) {
-    yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
-    bool b = yyjson_base::run(doc, result);
-    yyjson_doc_free(doc);
-    return b;
+    return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), result);
   }
 };
 BENCHMARK_TEMPLATE(partial_tweets, yyjson)->UseManualTime();
-
 #if SIMDJSON_COMPETITION_ONDEMAND_INSITU
 struct yyjson_insitu : yyjson_base {
   bool run(simdjson::padded_string &json, std::vector<tweet<std::string_view>> &result) {
-    yyjson_doc *doc = yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
-    bool b = yyjson_base::run(doc, result);
-    yyjson_doc_free(doc);
-    return b;
+    return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), result);
   }
 };
 BENCHMARK_TEMPLATE(partial_tweets, yyjson_insitu)->UseManualTime();
 #endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
-
 } // namespace partial_tweets
 
 #endif // SIMDJSON_COMPETITION_YYJSON
+

benchmark/static_reflect/CMakeLists.txt

@@ -6,42 +6,38 @@ CPMAddPackage(
   EXCLUDE_FROM_ALL YES
 )
 
-option(SIMDJSON_USE_RUST "Build the static_reflect benchmark" OFF)
 
-if(SIMDJSON_USE_RUST)
-  if(NOT WIN32)
-  # We want the check whether Rust is available before trying to build a crate.
-  CPMAddPackage(
-    NAME corrosion
-    GITHUB_REPOSITORY corrosion-rs/corrosion
-    VERSION 0.4.4
-    DOWNLOAD_ONLY ON
-    OPTIONS "Rust_FIND_QUIETLY OFF"
-  )
-  include("${corrosion_SOURCE_DIR}/cmake/FindRust.cmake")
-  endif()
 
-  if(RUST_FOUND)
-    message(STATUS "Rust found: " ${Rust_VERSION} )
-    add_subdirectory("${corrosion_SOURCE_DIR}" "${PROJECT_BINARY_DIR}/_deps/corrosion" EXCLUDE_FROM_ALL)
-    # Important: we want to build in release mode!
-    corrosion_import_crate(MANIFEST_PATH "serde-benchmark/Cargo.toml" NO_LINKER_OVERRIDE PROFILE release)
-  else()
-    message(STATUS "Rust/Cargo is unavailable." )
-    message(STATUS "We will not benchmark serde-benchmark." )
-    if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-      message(STATUS "Under macOS, you may be able to install rust with")
-      message(STATUS "curl https://sh.rustup.rs -sSf | sh")
-    elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-      message(STATUS "Under Linux, you may be able to install rust with a command such as")
-      message(STATUS "apt-get install cargo" )
-      message(STATUS "or" )
-      message(STATUS "curl https://sh.rustup.rs -sSf | sh")
-    endif()
-  endif()
-else(SIMDJSON_USE_RUST)
+if(NOT WIN32)
+# We want the check whether Rust is available before trying to build a crate.
+CPMAddPackage(
+  NAME corrosion
+  GITHUB_REPOSITORY corrosion-rs/corrosion
+  VERSION 0.4.4
+  DOWNLOAD_ONLY ON
+  OPTIONS "Rust_FIND_QUIETLY OFF"
+)
+include("${corrosion_SOURCE_DIR}/cmake/FindRust.cmake")
+endif()
+
+if(RUST_FOUND)
+  message(STATUS "Rust found: " ${Rust_VERSION} )
+  add_subdirectory("${corrosion_SOURCE_DIR}" "${PROJECT_BINARY_DIR}/_deps/corrosion" EXCLUDE_FROM_ALL)
+  # Important: we want to build in release mode!
+  corrosion_import_crate(MANIFEST_PATH "serde-benchmark/Cargo.toml" NO_LINKER_OVERRIDE PROFILE release)
+else()
+  message(STATUS "Rust/Cargo is unavailable." )
   message(STATUS "We will not benchmark serde-benchmark." )
-endif(SIMDJSON_USE_RUST)
+  if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    message(STATUS "Under macOS, you may be able to install rust with")
+    message(STATUS "curl https://sh.rustup.rs -sSf | sh")
+  elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    message(STATUS "Under Linux, you may be able to install rust with a command such as")
+    message(STATUS "apt-get install cargo" )
+    message(STATUS "or" )
+    message(STATUS "curl https://sh.rustup.rs -sSf | sh")
+  endif()
+endif()
 
 # Add the benchmark executable targets
 add_subdirectory(twitter_benchmark)

benchmark/static_reflect/citm_catalog_benchmark/CMakeLists.txt

@@ -1,5 +1,4 @@
 add_executable(benchmark_serialization_citm_catalog benchmark_serialization_citm_catalog.cpp)
-add_executable(benchmark_parsing_citm benchmark_parsing_citm.cpp)
 
 # Link with Rust benchmarking code if available
 if(TARGET serde-benchmark)
@@ -12,29 +11,4 @@ target_link_libraries(benchmark_serialization_citm_catalog PRIVATE simdjson::sim
 target_link_libraries(benchmark_serialization_citm_catalog PRIVATE reflectcpp)
 target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE SIMDJSON_BENCH_CPP_REFLECT=1)
 
-if(TARGET yyjson)
-    target_link_libraries(benchmark_serialization_citm_catalog PRIVATE yyjson)
-    target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE SIMDJSON_COMPETITION_YYJSON)
-endif()
-
-target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE JSON_FILE="${BENCH_CITM_JSON}")
-
-# Configuration for parsing benchmark
-if(TARGET serde-benchmark)
-    target_link_libraries(benchmark_parsing_citm PRIVATE serde-benchmark)
-    target_compile_definitions(benchmark_parsing_citm PRIVATE SIMDJSON_RUST_VERSION="${Rust_VERSION}")
-endif()
-
-target_link_libraries(benchmark_parsing_citm PRIVATE simdjson::simdjson nlohmann_json)
-
-if(TARGET rapidjson)
-    target_link_libraries(benchmark_parsing_citm PRIVATE rapidjson)
-    target_compile_definitions(benchmark_parsing_citm PRIVATE SIMDJSON_COMPETITION_RAPIDJSON)
-endif()
-
-if(TARGET yyjson)
-    target_link_libraries(benchmark_parsing_citm PRIVATE yyjson)
-    target_compile_definitions(benchmark_parsing_citm PRIVATE SIMDJSON_COMPETITION_YYJSON)
-endif()
-
-target_compile_definitions(benchmark_parsing_citm PRIVATE JSON_FILE="${BENCH_CITM_JSON}")
+target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE JSON_FILE="${BENCH_CITM_JSON}")

benchmark/static_reflect/citm_catalog_benchmark/benchmark_parsing_citm.cpp

@@ -1,563 +0,0 @@
-#include <cassert>
-#include <cstdlib>
-#include <ctime>
-#include <format>
-#include <fstream>
-#include <iostream>
-#include <nlohmann/json.hpp>
-#include <simdjson.h>
-#include <string>
-#include "citm_catalog_data.h"
-#include "nlohmann_citm_catalog_data.h"
-#include "../benchmark_utils/benchmark_helper.h"
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-#include "rapidjson_citm_catalog_data.h"
-#endif
-
-#ifdef SIMDJSON_COMPETITION_YYJSON
-#include "yyjson_citm_catalog_data.h"
-#endif
-
-#ifdef SIMDJSON_RUST_VERSION
-#include "../serde-benchmark/serde_benchmark.h"
-
-void bench_rust_parsing(const std::string &json_str) {
-  size_t input_volume = json_str.size();
-  printf("# input volume: %zu bytes\n", input_volume);
-
-  volatile bool result = true;
-  pretty_print(1, input_volume, "bench_rust_parsing",
-               bench([&json_str, &result]() {
-                 serde_benchmark::CitmCatalog *catalog = serde_benchmark::citm_from_str(json_str.c_str(), json_str.size());
-                 result = (catalog != nullptr);
-                 if (catalog) {
-                   serde_benchmark::free_citm(catalog);
-                 }
-                 if (!result) {
-                   printf("parse error\n");
-                 }
-               }));
-}
-#endif
-
-template <class T> void bench_simdjson_static_reflection_parsing(const std::string &json_str) {
-  size_t input_volume = json_str.size();
-  printf("# input volume: %zu bytes\n", input_volume);
-
-  // Pre-allocate padded buffer outside the benchmark loop
-  std::string mutable_json = json_str;
-  simdjson::pad(mutable_json);
-
-  volatile bool result = true;
-  pretty_print(1, input_volume, "bench_simdjson_static_reflection_parsing",
-               bench([&mutable_json, &result]() {
-                 simdjson::ondemand::parser parser;
-                 simdjson::ondemand::document doc;
-                 if(parser.iterate(mutable_json).get(doc)) {
-                   result = false;
-                   return;
-                 }
-                 T my_struct;
-                 if(doc.get<T>().get(my_struct)) {
-                   result = false;
-                 }
-                 if (!result) {
-                   printf("parse error\n");
-                 }
-               }));
-}
-
-#if SIMDJSON_STATIC_REFLECTION
-template <class T> void bench_simdjson_from_parsing(const std::string &json_str) {
-  size_t input_volume = json_str.size();
-  printf("# input volume: %zu bytes\n", input_volume);
-
-  // Pre-allocate padded buffer outside the benchmark loop
-  simdjson::padded_string padded = simdjson::padded_string(json_str);
-
-  volatile bool result = true;
-  pretty_print(1, input_volume, "bench_simdjson_from_parsing",
-               bench([&padded, &result]() {
-                 T my_struct;
-                 auto err = simdjson::from(padded).get(my_struct);
-                  if (err) {
-                    result = false;
-                    printf("parse error: %s\n", simdjson::error_message(err));
-                    return;
-                  }
-               }));
-}
-#endif
-
-// nlohmann::json deserialization functions
-void from_json(const nlohmann::json &j, CITMPrice &p) {
-    j.at("amount").get_to(p.amount);
-    j.at("audienceSubCategoryId").get_to(p.audienceSubCategoryId);
-    j.at("seatCategoryId").get_to(p.seatCategoryId);
-}
-
-void from_json(const nlohmann::json &j, CITMArea &a) {
-    j.at("areaId").get_to(a.areaId);
-    j.at("blockIds").get_to(a.blockIds);
-}
-
-void from_json(const nlohmann::json &j, CITMSeatCategory &s) {
-    j.at("areas").get_to(s.areas);
-    j.at("seatCategoryId").get_to(s.seatCategoryId);
-}
-
-void from_json(const nlohmann::json &j, CITMPerformance &p) {
-    j.at("id").get_to(p.id);
-    j.at("eventId").get_to(p.eventId);
-    if (j.contains("logo") && !j["logo"].is_null()) {
-        p.logo = j["logo"].get<std::string>();
-    }
-    if (j.contains("name") && !j["name"].is_null()) {
-        p.name = j["name"].get<std::string>();
-    }
-    j.at("prices").get_to(p.prices);
-    j.at("seatCategories").get_to(p.seatCategories);
-    if (j.contains("seatMapImage") && !j["seatMapImage"].is_null()) {
-        p.seatMapImage = j["seatMapImage"].get<std::string>();
-    }
-    j.at("start").get_to(p.start);
-    j.at("venueCode").get_to(p.venueCode);
-}
-
-void from_json(const nlohmann::json &j, CITMEvent &e) {
-    j.at("id").get_to(e.id);
-    j.at("name").get_to(e.name);
-    if (j.contains("description") && !j["description"].is_null()) {
-        e.description = j["description"].get<std::string>();
-    }
-    if (j.contains("logo") && !j["logo"].is_null()) {
-        e.logo = j["logo"].get<std::string>();
-    }
-    j.at("subTopicIds").get_to(e.subTopicIds);
-    if (j.contains("subjectCode") && !j["subjectCode"].is_null()) {
-        e.subjectCode = j["subjectCode"].get<std::string>();
-    }
-    if (j.contains("subtitle") && !j["subtitle"].is_null()) {
-        e.subtitle = j["subtitle"].get<std::string>();
-    }
-    j.at("topicIds").get_to(e.topicIds);
-}
-
-void from_json(const nlohmann::json &j, CitmCatalog &c) {
-    j.at("events").get_to(c.events);
-    j.at("performances").get_to(c.performances);
-}
-
-CitmCatalog nlohmann_deserialize(const std::string &json_str) {
-    nlohmann::json j = nlohmann::json::parse(json_str);
-    return j.get<CitmCatalog>();
-}
-
-void bench_nlohmann_parsing(const std::string &json_str) {
-  size_t input_volume = json_str.size();
-  printf("# input volume: %zu bytes\n", input_volume);
-
-  volatile bool result = true;
-  pretty_print(1, input_volume, "bench_nlohmann_parsing",
-               bench([&json_str, &result]() {
-                 try {
-                   CitmCatalog data = nlohmann_deserialize(json_str);
-                   result = true;
-                 } catch (...) {
-                   result = false;
-                   printf("parse error\n");
-                 }
-               }));
-}
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-CitmCatalog rapidjson_deserialize(const std::string &json_str) {
-    rapidjson::Document doc;
-    doc.Parse(json_str.c_str());
-
-    if (doc.HasParseError()) {
-        throw std::runtime_error("RapidJSON parse error");
-    }
-
-    CitmCatalog catalog;
-
-    // Parse events
-    if (doc.HasMember("events") && doc["events"].IsObject()) {
-        for (auto& m : doc["events"].GetObject()) {
-            CITMEvent event;
-            const auto& e = m.value;
-
-            event.id = e["id"].GetUint64();
-            event.name = e["name"].GetString();
-            if (e.HasMember("description") && !e["description"].IsNull()) {
-                event.description = e["description"].GetString();
-            }
-            if (e.HasMember("logo") && !e["logo"].IsNull()) {
-                event.logo = e["logo"].GetString();
-            }
-
-            event.subTopicIds.clear();
-            for (auto& id : e["subTopicIds"].GetArray()) {
-                event.subTopicIds.push_back(id.GetUint64());
-            }
-
-            if (e.HasMember("subjectCode") && !e["subjectCode"].IsNull()) {
-                event.subjectCode = e["subjectCode"].GetString();
-            }
-            if (e.HasMember("subtitle") && !e["subtitle"].IsNull()) {
-                event.subtitle = e["subtitle"].GetString();
-            }
-
-            event.topicIds.clear();
-            for (auto& id : e["topicIds"].GetArray()) {
-                event.topicIds.push_back(id.GetUint64());
-            }
-
-            catalog.events[m.name.GetString()] = event;
-        }
-    }
-
-    // Parse performances
-    if (doc.HasMember("performances") && doc["performances"].IsArray()) {
-        for (auto& p : doc["performances"].GetArray()) {
-            CITMPerformance perf;
-
-            perf.id = p["id"].GetUint64();
-            perf.eventId = p["eventId"].GetUint64();
-            if (p.HasMember("logo") && !p["logo"].IsNull()) {
-                perf.logo = p["logo"].GetString();
-            }
-            if (p.HasMember("name") && !p["name"].IsNull()) {
-                perf.name = p["name"].GetString();
-            }
-
-            // Parse prices
-            for (auto& price : p["prices"].GetArray()) {
-                CITMPrice pr;
-                pr.amount = price["amount"].GetUint64();
-                pr.audienceSubCategoryId = price["audienceSubCategoryId"].GetUint64();
-                pr.seatCategoryId = price["seatCategoryId"].GetUint64();
-                perf.prices.push_back(pr);
-            }
-
-            // Parse seat categories
-            for (auto& sc : p["seatCategories"].GetArray()) {
-                CITMSeatCategory seatCat;
-                seatCat.seatCategoryId = sc["seatCategoryId"].GetUint64();
-
-                for (auto& area : sc["areas"].GetArray()) {
-                    CITMArea ar;
-                    ar.areaId = area["areaId"].GetUint64();
-                    for (auto& block : area["blockIds"].GetArray()) {
-                        ar.blockIds.push_back(block.GetUint64());
-                    }
-                    seatCat.areas.push_back(ar);
-                }
-                perf.seatCategories.push_back(seatCat);
-            }
-
-            if (p.HasMember("seatMapImage") && !p["seatMapImage"].IsNull()) {
-                perf.seatMapImage = p["seatMapImage"].GetString();
-            }
-            perf.start = p["start"].GetUint64();
-            perf.venueCode = p["venueCode"].GetString();
-
-            catalog.performances.push_back(perf);
-        }
-    }
-
-    return catalog;
-}
-
-void bench_rapidjson_parsing(const std::string &json_str) {
-  size_t input_volume = json_str.size();
-  printf("# input volume: %zu bytes\n", input_volume);
-
-  volatile bool result = true;
-  pretty_print(1, input_volume, "bench_rapidjson_parsing",
-               bench([&json_str, &result]() {
-                 try {
-                   CitmCatalog data = rapidjson_deserialize(json_str);
-                   result = true;
-                 } catch (...) {
-                   result = false;
-                   printf("parse error\n");
-                 }
-               }));
-}
-#endif
-
-#ifdef SIMDJSON_COMPETITION_YYJSON
-CitmCatalog yyjson_deserialize(const std::string &json_str) {
-    yyjson_doc *doc = yyjson_read(json_str.c_str(), json_str.size(), 0);
-    if (!doc) {
-        throw std::runtime_error("YYJson parse error");
-    }
-
-    yyjson_val *root = yyjson_doc_get_root(doc);
-    CitmCatalog catalog;
-
-    // Parse events
-    yyjson_val *events = yyjson_obj_get(root, "events");
-    if (events) {
-        size_t idx, max;
-        yyjson_val *key, *val;
-        yyjson_obj_foreach(events, idx, max, key, val) {
-            CITMEvent event;
-
-            event.id = yyjson_get_uint(yyjson_obj_get(val, "id"));
-            const char* name = yyjson_get_str(yyjson_obj_get(val, "name"));
-            if (name) event.name = name;
-
-            yyjson_val *desc = yyjson_obj_get(val, "description");
-            if (desc && !yyjson_is_null(desc)) {
-                const char* str = yyjson_get_str(desc);
-                if (str) event.description = str;
-            }
-
-            yyjson_val *logo = yyjson_obj_get(val, "logo");
-            if (logo && !yyjson_is_null(logo)) {
-                const char* str = yyjson_get_str(logo);
-                if (str) event.logo = str;
-            }
-
-            yyjson_val *subTopics = yyjson_obj_get(val, "subTopicIds");
-            if (subTopics) {
-                size_t sidx, smax;
-                yyjson_val *sval;
-                yyjson_arr_foreach(subTopics, sidx, smax, sval) {
-                    event.subTopicIds.push_back(yyjson_get_uint(sval));
-                }
-            }
-
-            yyjson_val *subjectCode = yyjson_obj_get(val, "subjectCode");
-            if (subjectCode && !yyjson_is_null(subjectCode)) {
-                const char* str = yyjson_get_str(subjectCode);
-                if (str) event.subjectCode = str;
-            }
-
-            yyjson_val *subtitle = yyjson_obj_get(val, "subtitle");
-            if (subtitle && !yyjson_is_null(subtitle)) {
-                const char* str = yyjson_get_str(subtitle);
-                if (str) event.subtitle = str;
-            }
-
-            yyjson_val *topics = yyjson_obj_get(val, "topicIds");
-            if (topics) {
-                size_t tidx, tmax;
-                yyjson_val *tval;
-                yyjson_arr_foreach(topics, tidx, tmax, tval) {
-                    event.topicIds.push_back(yyjson_get_uint(tval));
-                }
-            }
-
-            const char* keyStr = yyjson_get_str(key);
-            if (keyStr) {
-                catalog.events[keyStr] = event;
-            }
-        }
-    }
-
-    // Parse performances
-    yyjson_val *performances = yyjson_obj_get(root, "performances");
-    if (performances) {
-        size_t idx, max;
-        yyjson_val *val;
-        yyjson_arr_foreach(performances, idx, max, val) {
-            CITMPerformance perf;
-
-            perf.id = yyjson_get_uint(yyjson_obj_get(val, "id"));
-            perf.eventId = yyjson_get_uint(yyjson_obj_get(val, "eventId"));
-
-            yyjson_val *logo = yyjson_obj_get(val, "logo");
-            if (logo && !yyjson_is_null(logo)) {
-                const char* str = yyjson_get_str(logo);
-                if (str) perf.logo = str;
-            }
-
-            yyjson_val *name = yyjson_obj_get(val, "name");
-            if (name && !yyjson_is_null(name)) {
-                const char* str = yyjson_get_str(name);
-                if (str) perf.name = str;
-            }
-
-            // Parse prices
-            yyjson_val *prices = yyjson_obj_get(val, "prices");
-            if (prices) {
-                size_t pidx, pmax;
-                yyjson_val *pval;
-                yyjson_arr_foreach(prices, pidx, pmax, pval) {
-                    CITMPrice price;
-                    price.amount = yyjson_get_uint(yyjson_obj_get(pval, "amount"));
-                    price.audienceSubCategoryId = yyjson_get_uint(yyjson_obj_get(pval, "audienceSubCategoryId"));
-                    price.seatCategoryId = yyjson_get_uint(yyjson_obj_get(pval, "seatCategoryId"));
-                    perf.prices.push_back(price);
-                }
-            }
-
-            // Parse seat categories
-            yyjson_val *seatCats = yyjson_obj_get(val, "seatCategories");
-            if (seatCats) {
-                size_t scidx, scmax;
-                yyjson_val *scval;
-                yyjson_arr_foreach(seatCats, scidx, scmax, scval) {
-                    CITMSeatCategory seatCat;
-                    seatCat.seatCategoryId = yyjson_get_uint(yyjson_obj_get(scval, "seatCategoryId"));
-
-                    yyjson_val *areas = yyjson_obj_get(scval, "areas");
-                    if (areas) {
-                        size_t aidx, amax;
-                        yyjson_val *aval;
-                        yyjson_arr_foreach(areas, aidx, amax, aval) {
-                            CITMArea area;
-                            area.areaId = yyjson_get_uint(yyjson_obj_get(aval, "areaId"));
-
-                            yyjson_val *blocks = yyjson_obj_get(aval, "blockIds");
-                            if (blocks) {
-                                size_t bidx, bmax;
-                                yyjson_val *bval;
-                                yyjson_arr_foreach(blocks, bidx, bmax, bval) {
-                                    area.blockIds.push_back(yyjson_get_uint(bval));
-                                }
-                            }
-                            seatCat.areas.push_back(area);
-                        }
-                    }
-                    perf.seatCategories.push_back(seatCat);
-                }
-            }
-
-            yyjson_val *seatMapImage = yyjson_obj_get(val, "seatMapImage");
-            if (seatMapImage && !yyjson_is_null(seatMapImage)) {
-                const char* str = yyjson_get_str(seatMapImage);
-                if (str) perf.seatMapImage = str;
-            }
-
-            perf.start = yyjson_get_uint(yyjson_obj_get(val, "start"));
-            const char* venueCode = yyjson_get_str(yyjson_obj_get(val, "venueCode"));
-            if (venueCode) perf.venueCode = venueCode;
-
-            catalog.performances.push_back(perf);
-        }
-    }
-
-    yyjson_doc_free(doc);
-    return catalog;
-}
-
-void bench_yyjson_parsing(const std::string &json_str) {
-  size_t input_volume = json_str.size();
-  printf("# input volume: %zu bytes\n", input_volume);
-
-  volatile bool result = true;
-  pretty_print(1, input_volume, "bench_yyjson_parsing",
-               bench([&json_str, &result]() {
-                 try {
-                   CitmCatalog data = yyjson_deserialize(json_str);
-                   result = true;
-                 } catch (...) {
-                   result = false;
-                   printf("parse error\n");
-                 }
-               }));
-}
-#endif
-
-std::string read_file(std::string filename) {
-  printf("# Reading file %s\n", filename.c_str());
-  constexpr size_t read_size = 4096;
-  auto stream = std::ifstream(filename);
-  stream.exceptions(std::ios_base::badbit);
-
-  if (!stream) {
-    std::cerr << "Error: Failed to open file " << filename << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  std::string out;
-  auto buf = std::string(read_size, '\0');
-  while (stream.read(&buf[0], read_size)) {
-    out.append(buf, 0, size_t(stream.gcount()));
-  }
-  out.append(buf, 0, size_t(stream.gcount()));
-  return out;
-}
-
-// Function to check if benchmark name matches any of the comma-separated filters
-bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
-  if (filter.empty()) return true;
-
-  // Split filter by comma
-  size_t start = 0;
-  size_t end = filter.find(',');
-  while (end != std::string::npos) {
-    std::string token = filter.substr(start, end - start);
-    if (benchmark_name.find(token) != std::string::npos) {
-      return true;
-    }
-    start = end + 1;
-    end = filter.find(',', start);
-  }
-  // Check last token
-  std::string token = filter.substr(start);
-  return benchmark_name.find(token) != std::string::npos;
-}
-
-int main(int argc, char *argv[]) {
-  // Get the JSON file path from preprocessor or use default
-  std::string filename;
-#ifdef JSON_FILE
-  filename = JSON_FILE;
-#else
-  filename = "jsonexamples/citm_catalog.json";
-#endif
-
-  std::string json_str = read_file(filename);
-
-  // Parse command-line arguments for filter
-  std::string filter;
-  for (int i = 1; i < argc; i++) {
-    std::string arg = argv[i];
-    if (arg == "-f" && i + 1 < argc) {
-      filter = argv[i + 1];
-      printf("# Filter: %s\n", filter.c_str());
-      i++;
-    }
-  }
-
-  // If no filter provided, run all benchmarks
-  if (filter.empty()) {
-    printf("# Running all benchmarks (use -f <filter> to run specific ones)\n");
-  }
-
-  // Benchmarking the parsing
-  if (matches_filter("nlohmann", filter)) {
-    bench_nlohmann_parsing(json_str);
-  }
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-  if (matches_filter("rapidjson", filter)) {
-    bench_rapidjson_parsing(json_str);
-  }
-#endif
-#ifdef SIMDJSON_COMPETITION_YYJSON
-  if (matches_filter("yyjson", filter)) {
-    bench_yyjson_parsing(json_str);
-  }
-#endif
-  if (matches_filter("simdjson_static_reflection", filter)) {
-    bench_simdjson_static_reflection_parsing<CitmCatalog>(json_str);
-  }
-#if SIMDJSON_STATIC_REFLECTION
-  if (matches_filter("simdjson_from", filter)) {
-    bench_simdjson_from_parsing<CitmCatalog>(json_str);
-  }
-#endif
-#ifdef SIMDJSON_RUST_VERSION
-  if (matches_filter("rust", filter)) {
-    printf("# Note: Rust/Serde parsing test\n");
-    bench_rust_parsing(json_str);
-  }
-#endif
-  return EXIT_SUCCESS;
-}

benchmark/static_reflect/citm_catalog_benchmark/benchmark_serialization_citm_catalog.cpp

@@ -11,10 +11,6 @@
 #include "nlohmann_citm_catalog_data.h"
 #include "../benchmark_utils/benchmark_helper.h"
 
-#ifdef SIMDJSON_COMPETITION_YYJSON
-#include "yyjson_citm_catalog_data.h"
-#endif
-
 #if SIMDJSON_BENCH_CPP_REFLECT
 #include <rfl.hpp>
 #include <rfl/json.hpp>
@@ -39,15 +35,20 @@ void bench_reflect_cpp(CitmCatalog &data) {
 #include "../serde-benchmark/serde_benchmark.h"
 
 void bench_rust(serde_benchmark::CitmCatalog *data) {
-  serde_benchmark::set_citm_data(data);
-  size_t output_volume = serde_benchmark::serialize_citm_to_string();
+  const char * output = serde_benchmark::str_from_citm(data);
+  size_t output_volume = strlen(output);
   printf("# output volume: %zu bytes\n", output_volume);
-
   volatile size_t measured_volume = 0;
   pretty_print(1, output_volume, "bench_rust",
-               bench([&measured_volume, &output_volume]() {
-                 measured_volume = serde_benchmark::serialize_citm_to_string();
+               bench([&data, &measured_volume, &output_volume]() {
+                 const char * output = serde_benchmark::str_from_citm(data);
+                 measured_volume = strlen(output);
+                 if (measured_volume != output_volume) {
+                   printf("mismatch\n");
+                 }
+                 serde_benchmark::free_str(const_cast<char*>(output));
                }));
+  serde_benchmark::free_str(const_cast<char*>(output));
 }
 #endif // SIMDJSON_RUST_VERSION
 
@@ -67,55 +68,7 @@ void bench_nlohmann(CitmCatalog &data) {
                }));
 }
 
-#ifdef SIMDJSON_COMPETITION_YYJSON
-void bench_yyjson(CitmCatalog &data) {
-  std::string output = yyjson_serialize_citm(data);
-  size_t output_volume = output.size();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(1, output_volume, "bench_yyjson",
-               bench([&data, &measured_volume, &output_volume]() {
-                 std::string output = yyjson_serialize_citm(data);
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-#endif
-
-// Fair allocation variant: allocates fresh buffer each iteration (matches other libraries)
 void bench_simdjson_static_reflection(CitmCatalog &data) {
-  // First run to determine expected size
-  simdjson::builder::string_builder sb_init;
-  simdjson::builder::append(sb_init, data);
-  std::string_view p_init;
-  if(sb_init.view().get(p_init)) {
-    std::cerr << "Error!" << std::endl;
-  }
-  size_t output_volume = p_init.size();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(sizeof(data), output_volume, "bench_simdjson_static_reflection",
-               bench([&data, &measured_volume, &output_volume]() {
-                 // Fresh allocation each iteration - fair comparison
-                 simdjson::builder::string_builder sb;
-                 simdjson::builder::append(sb, data);
-                 std::string_view p;
-                 if(sb.view().get(p)) {
-                   std::cerr << "Error!" << std::endl;
-                 }
-                 measured_volume = sb.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-
-// Optimized variant: reuses buffer across iterations (shows API potential)
-void bench_simdjson_static_reflection_reuse(CitmCatalog &data) {
   simdjson::builder::string_builder sb;
   simdjson::builder::append(sb, data);
   std::string_view p;
@@ -127,7 +80,7 @@ void bench_simdjson_static_reflection_reuse(CitmCatalog &data) {
   printf("# output volume: %zu bytes\n", output_volume);
 
   volatile size_t measured_volume = 0;
-  pretty_print(sizeof(data), output_volume, "bench_simdjson_reuse_buffer",
+  pretty_print(sizeof(data), output_volume, "bench_simdjson_static_reflection",
                bench([&data, &measured_volume, &output_volume, &sb]() {
                  sb.clear();
                  simdjson::builder::append(sb, data);
@@ -142,97 +95,25 @@ void bench_simdjson_static_reflection_reuse(CitmCatalog &data) {
                }));
 }
 
-#if SIMDJSON_STATIC_REFLECTION
-// Fair allocation variant: allocates fresh string each iteration
-void bench_simdjson_to(CitmCatalog &data) {
-  // First run to determine size
-  std::string output_init;
-  if (simdjson::error_code err = simdjson::builder::to_json(data, output_init); err) {
-    std::cerr << "Error in to_json initialization!" << simdjson::error_message(err) << std::endl;
-    return;
-  }
-  size_t output_volume = output_init.size();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(sizeof(data), output_volume, "bench_simdjson_to",
-               bench([&data, &measured_volume, &output_volume]() {
-                 // Fresh allocation each iteration - fair comparison
-                 std::string output;
-                 if (simdjson::error_code err = simdjson::builder::to_json(data, output); err) {
-                   std::cerr << "Error in to_json!" << simdjson::error_message(err) << std::endl;
-                   return;
-                 }
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-
-// Optimized variant: reuses pre-allocated string
-void bench_simdjson_to_reuse(CitmCatalog &data) {
-  std::string output;
-  if (simdjson::error_code err = simdjson::builder::to_json(data, output); err) {
-    std::cerr << "Error in to_json initialization!" << simdjson::error_message(err) << std::endl;
-    return;
-  }
-  size_t output_volume = output.size();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  // Pre-allocate string with sufficient capacity to avoid reallocation
-  output.reserve(output_volume * 2);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(sizeof(data), output_volume, "bench_simdjson_to_reuse",
-               bench([&data, &measured_volume, &output_volume, &output]() {
-                 // Reuse the pre-allocated string - avoids allocation
-                 if (simdjson::error_code err = simdjson::builder::to_json(data, output); err) {
-                   std::cerr << "Error in to_json!" << simdjson::error_message(err) << std::endl;
-                   return;
-                 }
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-#endif
-
-simdjson::padded_string read_file(const std::string &file_path, size_t read_size = 65536) {
+std::string read_file(const std::string &file_path, size_t read_size = 65536) {
   std::ifstream stream(file_path, std::ios::binary);
   if(!stream) {
     std::cerr << "Could not open file '" << file_path << "'" << std::endl;
     exit(EXIT_FAILURE);
   }
   stream.exceptions(std::ios_base::badbit);
-  simdjson::padded_string_builder builder;
+  std::string out;
   std::string buf(read_size, '\0');
   while (stream.read(&buf[0], read_size)) {
-    builder.append(buf.data(), size_t(stream.gcount()));
+    out.append(buf, 0, size_t(stream.gcount()));
   }
-  builder.append(buf.data(), size_t(stream.gcount()));
-  return builder.convert();
+  out.append(buf, 0, size_t(stream.gcount()));
+  return out;
 }
 
-// Function to check if benchmark name matches any of the comma-separated filters
+// Function to check if benchmark name contains filter substring
 bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
-  if (filter.empty()) return true;
-
-  // Split filter by comma
-  size_t start = 0;
-  size_t end = filter.find(',');
-  while (end != std::string::npos) {
-    std::string token = filter.substr(start, end - start);
-    if (benchmark_name.find(token) != std::string::npos) {
-      return true;
-    }
-    start = end + 1;
-    end = filter.find(',', start);
-  }
-  // Check last token
-  std::string token = filter.substr(start);
-  return benchmark_name.find(token) != std::string::npos;
+  return filter.empty() || benchmark_name.find(filter) != std::string::npos;
 }
 
 int main(int argc, char* argv[]) {
@@ -250,12 +131,12 @@ int main(int argc, char* argv[]) {
       }
   }
   // Testing correctness of round-trip (serialization + deserialization)
-  simdjson::padded_string json_str = read_file(JSON_FILE);
+  std::string json_str = read_file(JSON_FILE);
 
   // Loading up the data into a structure.
   simdjson::ondemand::parser parser;
   simdjson::ondemand::document doc;
-  if(parser.iterate(json_str).get(doc)) {
+  if(parser.iterate(simdjson::pad(json_str)).get(doc)) {
     std::cerr << "Error loading the document!" << std::endl;
     return EXIT_FAILURE;
   }
@@ -266,37 +147,18 @@ int main(int argc, char* argv[]) {
   }
 
   // Benchmarking the serialization
-  // Note: simdjson benchmarks include both "fair" (fresh allocation) and "reuse" (buffer reuse) variants
-  // The "fair" variants allocate fresh memory each iteration, matching other libraries' behavior
-  // The "reuse" variants demonstrate the API's potential when buffer reuse is possible
-
   if (matches_filter("nlohmann", filter)) {
     bench_nlohmann(my_struct);
   }
-#ifdef SIMDJSON_COMPETITION_YYJSON
-  if (matches_filter("yyjson", filter)) {
-    bench_yyjson(my_struct);
-  }
-#endif
   if (matches_filter("simdjson_static_reflection", filter)) {
     bench_simdjson_static_reflection(my_struct);
   }
-  if (matches_filter("simdjson_reuse", filter)) {
-    bench_simdjson_static_reflection_reuse(my_struct);
-  }
-#if SIMDJSON_STATIC_REFLECTION
-  if (matches_filter("simdjson_to", filter)) {
-    bench_simdjson_to(my_struct);
-  }
-  if (matches_filter("simdjson_to_reuse", filter)) {
-    bench_simdjson_to_reuse(my_struct);
-  }
-#endif
 #ifdef SIMDJSON_RUST_VERSION
   if (matches_filter("rust", filter)) {
+    printf("# WARNING: The Rust benchmark may not be directly comparable since it does not use an equivalent data structure.\n");
     // Create a Rust-compatible CitmCatalog structure from the JSON string
     serde_benchmark::CitmCatalog* rust_data =
-      serde_benchmark::citm_from_str(json_str.data(), json_str.size());
+      serde_benchmark::citm_from_str(json_str.c_str(), json_str.size());
 
     if (rust_data == nullptr) {
       printf("# Failed to initialize Rust data structure\n");

benchmark/static_reflect/citm_catalog_benchmark/citm_catalog_data.h

@@ -4,65 +4,79 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <optional>
-#include <cstdint>
 
-// Price structure - field names must match JSON keys for reflection
-struct CITMPrice {
-    uint64_t amount;
-    uint64_t audienceSubCategoryId;
-    uint64_t seatCategoryId;
-    bool operator==(const CITMPrice&) const = default;
+struct Area {
+  int64_t id;
+  std::string name;
+  int64_t parent;
+  std::vector<int64_t> childAreas;
+  bool operator==(const Area &other) const = default;
 };
 
-struct CITMArea {
-    uint64_t areaId;
-    std::vector<uint64_t> blockIds;
-    bool operator==(const CITMArea&) const = default;
+struct AudienceSubCategory {
+  int64_t id;
+  std::string name;
+  int64_t parent;
+  bool operator==(const AudienceSubCategory &other) const = default;
 };
 
-struct CITMSeatCategory {
-    std::vector<CITMArea> areas;
-    uint64_t seatCategoryId;
-    bool operator==(const CITMSeatCategory&) const = default;
+struct Event {
+  int64_t id;
+  std::string name;
+  std::string description;
+  int64_t subTopic;
+  int64_t topic;
+  std::vector<int64_t> audience;
+  bool operator==(const Event &other) const = default;
 };
 
-struct CITMPerformance {
-    uint64_t id;
-    uint64_t eventId;
-    std::optional<std::string> logo;
-    std::optional<std::string> name;
-    std::vector<CITMPrice> prices;
-    std::vector<CITMSeatCategory> seatCategories;
-    std::optional<std::string> seatMapImage;
-    uint64_t start;
-    std::string venueCode;
-    bool operator==(const CITMPerformance&) const = default;
+struct Performance {
+  int64_t id;
+  std::string name;
+  int64_t event;
+  std::string start;
+  int64_t venueCode;
+  bool operator==(const Performance &other) const = default;
 };
 
-struct CITMEvent {
-    uint64_t id;
-    std::string name;
-    std::optional<std::string> description;
-    std::optional<std::string> logo;
-    std::vector<uint64_t> subTopicIds;
-    std::optional<std::string> subjectCode;
-    std::optional<std::string> subtitle;
-    std::vector<uint64_t> topicIds;
-    bool operator==(const CITMEvent&) const = default;
+struct SeatCategory {
+  int64_t id;
+  std::string name;
+  std::vector<int64_t> areas;
+  bool operator==(const SeatCategory &other) const = default;
+};
+
+struct SubTopic {
+  int64_t id;
+  std::string name;
+  int64_t parent;
+  bool operator==(const SubTopic &other) const = default;
+};
+
+struct Topic {
+  int64_t id;
+  std::string name;
+  bool operator==(const Topic &other) const = default;
+};
+
+struct Venue {
+  int64_t id;
+  std::string name;
+  int64_t address;
+  bool operator==(const Venue &other) const = default;
 };
 
 struct CitmCatalog {
-    std::map<std::string, CITMEvent> events;
-    std::vector<CITMPerformance> performances;
-    bool operator==(const CitmCatalog&) const = default;
+  std::map<std::string, Area> areas;
+  std::map<std::string, AudienceSubCategory> audienceSubCategory;
+  std::map<std::string, Event> events;
+  std::map<std::string, Performance> performances;
+  std::map<std::string, SeatCategory> seatCategory;
+  std::map<std::string, SubTopic> subTopic;
+  std::map<std::string, Topic> topic;
+  std::map<std::string, Venue> venue;
+
+  bool operator==(const CitmCatalog &other) const = default;
 };
 
-// Type aliases
-using Event = CITMEvent;
-using Performance = CITMPerformance;
-using Price = CITMPrice;
-using SeatArea = CITMArea;
-using SeatCategoryInfo = CITMSeatCategory;
-
-#endif
+#endif

benchmark/static_reflect/citm_catalog_benchmark/nlohmann_citm_catalog_data.h

@@ -8,72 +8,164 @@
 
 using json = nlohmann::json;
 
-// ---- CITMPrice ----
-inline void to_json(json &j, const CITMPrice &p) {
+// ---- Area ----
+inline void to_json(json &j, const Area &a) {
     j = json{
-      {"amount", p.amount},
-      {"audienceSubCategoryId", p.audienceSubCategoryId},
-      {"seatCategoryId", p.seatCategoryId}
+      {"id", a.id},
+      {"name", a.name},
+      {"parent", a.parent},
+      {"childAreas", a.childAreas}
     };
 }
-
-// ---- CITMArea ----
-inline void to_json(json &j, const CITMArea &a) {
-    j = json{
-      {"areaId", a.areaId},
-      {"blockIds", a.blockIds}
-    };
+inline void from_json(const json &j, Area &a) {
+    j.at("id").get_to(a.id);
+    j.at("name").get_to(a.name);
+    j.at("parent").get_to(a.parent);
+    j.at("childAreas").get_to(a.childAreas);
 }
 
-// ---- CITMSeatCategory ----
-inline void to_json(json &j, const CITMSeatCategory &s) {
+// ---- AudienceSubCategory ----
+inline void to_json(json &j, const AudienceSubCategory &asc) {
     j = json{
-      {"areas", s.areas},
-      {"seatCategoryId", s.seatCategoryId}
+      {"id", asc.id},
+      {"name", asc.name},
+      {"parent", asc.parent}
     };
 }
-
-// ---- CITMPerformance ----
-inline void to_json(json &j, const CITMPerformance &p) {
-    j = json{
-      {"id", p.id},
-      {"eventId", p.eventId},
-      {"logo", p.logo},
-      {"name", p.name},
-      {"prices", p.prices},
-      {"seatCategories", p.seatCategories},
-      {"seatMapImage", p.seatMapImage},
-      {"start", p.start},
-      {"venueCode", p.venueCode}
-    };
+inline void from_json(const json &j, AudienceSubCategory &asc) {
+    j.at("id").get_to(asc.id);
+    j.at("name").get_to(asc.name);
+    j.at("parent").get_to(asc.parent);
 }
 
-// ---- CITMEvent ----
-inline void to_json(json &j, const CITMEvent &e) {
+// ---- Event ----
+inline void to_json(json &j, const Event &e) {
     j = json{
       {"id", e.id},
       {"name", e.name},
       {"description", e.description},
-      {"logo", e.logo},
-      {"subTopicIds", e.subTopicIds},
-      {"subjectCode", e.subjectCode},
-      {"subtitle", e.subtitle},
-      {"topicIds", e.topicIds}
+      {"subTopic", e.subTopic},
+      {"topic", e.topic},
+      {"audience", e.audience}
     };
 }
+inline void from_json(const json &j, Event &e) {
+    j.at("id").get_to(e.id);
+    j.at("name").get_to(e.name);
+    j.at("description").get_to(e.description);
+    j.at("subTopic").get_to(e.subTopic);
+    j.at("topic").get_to(e.topic);
+    j.at("audience").get_to(e.audience);
+}
+
+// ---- Performance ----
+inline void to_json(json &j, const Performance &p) {
+    j = json{
+      {"id", p.id},
+      {"name", p.name},
+      {"event", p.event},
+      {"start", p.start},
+      {"venueCode", p.venueCode}
+    };
+}
+inline void from_json(const json &j, Performance &p) {
+    j.at("id").get_to(p.id);
+    j.at("name").get_to(p.name);
+    j.at("event").get_to(p.event);
+    j.at("start").get_to(p.start);
+    j.at("venueCode").get_to(p.venueCode);
+}
+
+// ---- SeatCategory ----
+inline void to_json(json &j, const SeatCategory &sc) {
+    j = json{
+      {"id", sc.id},
+      {"name", sc.name},
+      {"areas", sc.areas}
+    };
+}
+inline void from_json(const json &j, SeatCategory &sc) {
+    j.at("id").get_to(sc.id);
+    j.at("name").get_to(sc.name);
+    j.at("areas").get_to(sc.areas);
+}
+
+// ---- SubTopic ----
+inline void to_json(json &j, const SubTopic &st) {
+    j = json{
+      {"id", st.id},
+      {"name", st.name},
+      {"parent", st.parent}
+    };
+}
+inline void from_json(const json &j, SubTopic &st) {
+    j.at("id").get_to(st.id);
+    j.at("name").get_to(st.name);
+    j.at("parent").get_to(st.parent);
+}
+
+// ---- Topic ----
+inline void to_json(json &j, const Topic &t) {
+    j = json{
+      {"id", t.id},
+      {"name", t.name}
+    };
+}
+inline void from_json(const json &j, Topic &t) {
+    j.at("id").get_to(t.id);
+    j.at("name").get_to(t.name);
+}
+
+// ---- Venue ----
+inline void to_json(json &j, const Venue &v) {
+    j = json{
+      {"id", v.id},
+      {"name", v.name},
+      {"address", v.address}
+    };
+}
+inline void from_json(const json &j, Venue &v) {
+    j.at("id").get_to(v.id);
+    j.at("name").get_to(v.name);
+    j.at("address").get_to(v.address);
+}
 
 // ---- CitmCatalog ----
 inline void to_json(json &j, const CitmCatalog &c) {
     j = json{
+      {"areas", c.areas},
+      {"audienceSubCategory", c.audienceSubCategory},
       {"events", c.events},
-      {"performances", c.performances}
+      {"performances", c.performances},
+      {"seatCategory", c.seatCategory},
+      {"subTopic", c.subTopic},
+      {"topic", c.topic},
+      {"venue", c.venue}
     };
 }
+inline void from_json(const json &j, CitmCatalog &c) {
+    j.at("areas").get_to(c.areas);
+    j.at("audienceSubCategory").get_to(c.audienceSubCategory);
+    j.at("events").get_to(c.events);
+    j.at("performances").get_to(c.performances);
+    j.at("seatCategory").get_to(c.seatCategory);
+    j.at("subTopic").get_to(c.subTopic);
+    j.at("topic").get_to(c.topic);
+    j.at("venue").get_to(c.venue);
+}
 
-// Serialization function
+// Optional convenience functions for benchmarking
 inline std::string nlohmann_serialize(const CitmCatalog &catalog) {
     json j = catalog;
     return j.dump();
 }
+inline bool nlohmann_deserialize(const std::string &json_in, CitmCatalog &catalog) {
+    try {
+        catalog = json::parse(json_in);
+        return false; // success
+    } catch(...) {
+        return true;  // failure
+    }
+}
 
 #endif // NLOHMANN_CITM_CATALOG_DATA_H

benchmark/static_reflect/citm_catalog_benchmark/rapidjson_citm_catalog_data.h

@@ -1,189 +0,0 @@
-#ifndef RAPIDJSON_CITM_CATALOG_DATA_H
-#define RAPIDJSON_CITM_CATALOG_DATA_H
-
-#include "citm_catalog_data.h"
-#include <rapidjson/document.h>
-#include <rapidjson/writer.h>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/error/en.h>
-
-using namespace rapidjson;
-
-// RapidJSON deserialization for CITM Catalog data
-CitmCatalog rapidjson_deserialize_citm(const std::string& json_str) {
-    Document doc;
-    doc.Parse(json_str.c_str());
-
-    if (doc.HasParseError()) {
-        throw std::runtime_error("RapidJSON parse error");
-    }
-
-    CitmCatalog catalog;
-
-    // Parse events
-    if (doc.HasMember("events") && doc["events"].IsObject()) {
-        const Value& events = doc["events"];
-        for (auto it = events.MemberBegin(); it != events.MemberEnd(); ++it) {
-            Event event;
-            const Value& ev = it->value;
-
-            if (ev.HasMember("description") && ev["description"].IsString())
-                event.description = ev["description"].GetString();
-            if (ev.HasMember("id") && ev["id"].IsUint64())
-                event.id = ev["id"].GetUint64();
-            if (ev.HasMember("logo") && ev["logo"].IsString())
-                event.logo = ev["logo"].GetString();
-            if (ev.HasMember("name") && ev["name"].IsString())
-                event.name = ev["name"].GetString();
-            if (ev.HasMember("subjectCode") && ev["subjectCode"].IsString())
-                event.subjectCode = ev["subjectCode"].GetString();
-            if (ev.HasMember("subtitle") && ev["subtitle"].IsString())
-                event.subtitle = ev["subtitle"].GetString();
-
-            if (ev.HasMember("topicIds") && ev["topicIds"].IsArray()) {
-                const Value& topics = ev["topicIds"];
-                for (SizeType j = 0; j < topics.Size(); j++) {
-                    if (topics[j].IsUint64())
-                        event.topicIds.push_back(topics[j].GetUint64());
-                }
-            }
-
-            if (ev.HasMember("subTopicIds") && ev["subTopicIds"].IsArray()) {
-                const Value& subtopics = ev["subTopicIds"];
-                for (SizeType j = 0; j < subtopics.Size(); j++) {
-                    if (subtopics[j].IsUint64())
-                        event.subTopicIds.push_back(subtopics[j].GetUint64());
-                }
-            }
-
-            catalog.events[it->name.GetString()] = event;
-        }
-    }
-
-    // Parse performances
-    if (doc.HasMember("performances") && doc["performances"].IsArray()) {
-        const Value& performances = doc["performances"];
-        for (SizeType i = 0; i < performances.Size(); i++) {
-            Performance perf;
-            const Value& p = performances[i];
-
-            if (p.HasMember("id") && p["id"].IsUint64())
-                perf.id = p["id"].GetUint64();
-            if (p.HasMember("eventId") && p["eventId"].IsUint64())
-                perf.eventId = p["eventId"].GetUint64();
-            if (p.HasMember("start") && p["start"].IsUint64())
-                perf.start = p["start"].GetUint64();
-            if (p.HasMember("venueCode") && p["venueCode"].IsString())
-                perf.venueCode = p["venueCode"].GetString();
-            if (p.HasMember("name") && p["name"].IsString())
-                perf.name = p["name"].GetString();
-
-            catalog.performances.push_back(perf);
-        }
-    }
-
-    // Parse other string maps
-    auto parseStringMap = [&doc](const char* key, std::map<std::string, std::string>& target) {
-        if (doc.HasMember(key) && doc[key].IsObject()) {
-            const Value& obj = doc[key];
-            for (auto it = obj.MemberBegin(); it != obj.MemberEnd(); ++it) {
-                if (it->value.IsString()) {
-                    target[it->name.GetString()] = it->value.GetString();
-                }
-            }
-        }
-    };
-
-    return catalog;
-}
-
-// RapidJSON serialization for CITM Catalog data
-std::string rapidjson_serialize_citm(const CitmCatalog& catalog) {
-    Document doc;
-    doc.SetObject();
-    Document::AllocatorType& allocator = doc.GetAllocator();
-
-    // Serialize events
-    Value events_obj(kObjectType);
-    for (const auto& [key, event] : catalog.events) {
-        Value event_obj(kObjectType);
-
-        if (event.description) {
-            Value desc;
-            desc.SetString(event.description->c_str(), allocator);
-            event_obj.AddMember("description", desc, allocator);
-        }
-
-        event_obj.AddMember("id", event.id, allocator);
-
-        if (event.logo) {
-            Value logo;
-            logo.SetString(event.logo->c_str(), allocator);
-            event_obj.AddMember("logo", logo, allocator);
-        }
-
-        Value name;
-        name.SetString(event.name.c_str(), allocator);
-        event_obj.AddMember("name", name, allocator);
-
-        if (event.subjectCode) {
-            Value subject;
-            subject.SetString(event.subjectCode->c_str(), allocator);
-            event_obj.AddMember("subjectCode", subject, allocator);
-        }
-
-        if (event.subtitle) {
-            Value subtitle;
-            subtitle.SetString(event.subtitle->c_str(), allocator);
-            event_obj.AddMember("subtitle", subtitle, allocator);
-        }
-
-        Value topicIds(kArrayType);
-        for (uint64_t id : event.topicIds) {
-            topicIds.PushBack(id, allocator);
-        }
-        event_obj.AddMember("topicIds", topicIds, allocator);
-
-        Value subTopicIds(kArrayType);
-        for (uint64_t id : event.subTopicIds) {
-            subTopicIds.PushBack(id, allocator);
-        }
-        event_obj.AddMember("subTopicIds", subTopicIds, allocator);
-
-        Value key_val;
-        key_val.SetString(key.c_str(), allocator);
-        events_obj.AddMember(key_val, event_obj, allocator);
-    }
-    doc.AddMember("events", events_obj, allocator);
-
-    // Serialize performances
-    Value performances_array(kArrayType);
-    for (const auto& perf : catalog.performances) {
-        Value perf_obj(kObjectType);
-        perf_obj.AddMember("id", perf.id, allocator);
-        perf_obj.AddMember("eventId", perf.eventId, allocator);
-        perf_obj.AddMember("start", perf.start, allocator);
-
-        Value venue;
-        venue.SetString(perf.venueCode.c_str(), allocator);
-        perf_obj.AddMember("venueCode", venue, allocator);
-
-        if (perf.name) {
-            Value name;
-            name.SetString(perf.name->c_str(), allocator);
-            perf_obj.AddMember("name", name, allocator);
-        }
-
-
-        performances_array.PushBack(perf_obj, allocator);
-    }
-    doc.AddMember("performances", performances_array, allocator);
-
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    doc.Accept(writer);
-
-    return buffer.GetString();
-}
-
-#endif // RAPIDJSON_CITM_CATALOG_DATA_H

benchmark/static_reflect/citm_catalog_benchmark/yyjson_citm_catalog_data.h

@@ -1,231 +0,0 @@
-#ifndef YYJSON_CITM_CATALOG_DATA_H
-#define YYJSON_CITM_CATALOG_DATA_H
-
-#include "citm_catalog_data.h"
-#include <yyjson.h>
-#include <string>
-#include <stdexcept>
-
-// yyjson deserialization for CITM Catalog data
-// Matches C++ CitmCatalog struct (only events + performances)
-CitmCatalog yyjson_deserialize_citm(const std::string &json_str) {
-    CitmCatalog catalog;
-
-    yyjson_doc *doc = yyjson_read(json_str.c_str(), json_str.size(), 0);
-    if (!doc) {
-        throw std::runtime_error("yyjson parse error");
-    }
-
-    yyjson_val *root = yyjson_doc_get_root(doc);
-    if (!root) {
-        yyjson_doc_free(doc);
-        return catalog;
-    }
-
-    // Parse events
-    yyjson_val *events_val = yyjson_obj_get(root, "events");
-    if (events_val && yyjson_is_obj(events_val)) {
-        size_t idx, max;
-        yyjson_val *key, *val;
-        yyjson_obj_foreach(events_val, idx, max, key, val) {
-            CITMEvent event;
-
-            yyjson_val *v;
-            v = yyjson_obj_get(val, "description");
-            if (v && yyjson_is_str(v)) event.description = yyjson_get_str(v);
-
-            v = yyjson_obj_get(val, "id");
-            if (v && yyjson_is_uint(v)) event.id = yyjson_get_uint(v);
-
-            v = yyjson_obj_get(val, "logo");
-            if (v && yyjson_is_str(v)) event.logo = yyjson_get_str(v);
-
-            v = yyjson_obj_get(val, "name");
-            if (v && yyjson_is_str(v)) event.name = yyjson_get_str(v);
-
-            v = yyjson_obj_get(val, "subjectCode");
-            if (v && yyjson_is_str(v)) event.subjectCode = yyjson_get_str(v);
-
-            v = yyjson_obj_get(val, "subtitle");
-            if (v && yyjson_is_str(v)) event.subtitle = yyjson_get_str(v);
-
-            // Parse topicIds array
-            v = yyjson_obj_get(val, "topicIds");
-            if (v && yyjson_is_arr(v)) {
-                size_t arr_idx, arr_max;
-                yyjson_val *arr_val;
-                yyjson_arr_foreach(v, arr_idx, arr_max, arr_val) {
-                    if (yyjson_is_uint(arr_val))
-                        event.topicIds.push_back(yyjson_get_uint(arr_val));
-                }
-            }
-
-            // Parse subTopicIds array
-            v = yyjson_obj_get(val, "subTopicIds");
-            if (v && yyjson_is_arr(v)) {
-                size_t arr_idx, arr_max;
-                yyjson_val *arr_val;
-                yyjson_arr_foreach(v, arr_idx, arr_max, arr_val) {
-                    if (yyjson_is_uint(arr_val))
-                        event.subTopicIds.push_back(yyjson_get_uint(arr_val));
-                }
-            }
-
-            if (yyjson_is_str(key))
-                catalog.events[yyjson_get_str(key)] = event;
-        }
-    }
-
-    // Parse performances (simplified - full parsing would need prices/seatCategories)
-    yyjson_val *performances_val = yyjson_obj_get(root, "performances");
-    if (performances_val && yyjson_is_arr(performances_val)) {
-        size_t idx, max;
-        yyjson_val *perf_val;
-        yyjson_arr_foreach(performances_val, idx, max, perf_val) {
-            CITMPerformance perf;
-
-            yyjson_val *v;
-            v = yyjson_obj_get(perf_val, "id");
-            if (v && yyjson_is_uint(v)) perf.id = yyjson_get_uint(v);
-
-            v = yyjson_obj_get(perf_val, "eventId");
-            if (v && yyjson_is_uint(v)) perf.eventId = yyjson_get_uint(v);
-
-            v = yyjson_obj_get(perf_val, "start");
-            if (v && yyjson_is_uint(v)) perf.start = yyjson_get_uint(v);
-
-            v = yyjson_obj_get(perf_val, "venueCode");
-            if (v && yyjson_is_str(v)) perf.venueCode = yyjson_get_str(v);
-
-            v = yyjson_obj_get(perf_val, "name");
-            if (v && yyjson_is_str(v)) perf.name = yyjson_get_str(v);
-
-            v = yyjson_obj_get(perf_val, "logo");
-            if (v && yyjson_is_str(v)) perf.logo = yyjson_get_str(v);
-
-            v = yyjson_obj_get(perf_val, "seatMapImage");
-            if (v && yyjson_is_str(v)) perf.seatMapImage = yyjson_get_str(v);
-
-            // Note: prices and seatCategories parsing omitted for brevity
-            // The serialization benchmark uses data loaded by simdjson
-
-            catalog.performances.push_back(perf);
-        }
-    }
-
-    yyjson_doc_free(doc);
-    return catalog;
-}
-
-// Helper to add optional string field
-static inline void yyjson_add_optional_str(yyjson_mut_doc *doc, yyjson_mut_val *obj,
-                                           const char *key, const std::optional<std::string> &val) {
-    if (val.has_value()) {
-        yyjson_mut_obj_add_str(doc, obj, key, val->c_str());
-    } else {
-        yyjson_mut_obj_add_null(doc, obj, key);
-    }
-}
-
-// yyjson serialization for CITM Catalog data
-// Matches C++ CitmCatalog struct exactly (only events + performances)
-std::string yyjson_serialize_citm(const CitmCatalog &catalog) {
-    yyjson_mut_doc *doc = yyjson_mut_doc_new(NULL);
-    yyjson_mut_val *root = yyjson_mut_obj(doc);
-    yyjson_mut_doc_set_root(doc, root);
-
-    // Create events object
-    yyjson_mut_val *events_obj = yyjson_mut_obj(doc);
-    for (const auto& [key, event] : catalog.events) {
-        yyjson_mut_val *event_obj = yyjson_mut_obj(doc);
-
-        yyjson_add_optional_str(doc, event_obj, "description", event.description);
-        yyjson_mut_obj_add_uint(doc, event_obj, "id", event.id);
-        yyjson_add_optional_str(doc, event_obj, "logo", event.logo);
-        // name is not optional in CITMEvent
-        yyjson_mut_obj_add_str(doc, event_obj, "name", event.name.c_str());
-
-        // Add subTopicIds array
-        yyjson_mut_val *subtopic_ids = yyjson_mut_arr(doc);
-        for (uint64_t id : event.subTopicIds) {
-            yyjson_mut_arr_add_uint(doc, subtopic_ids, id);
-        }
-        yyjson_mut_obj_add_val(doc, event_obj, "subTopicIds", subtopic_ids);
-
-        yyjson_add_optional_str(doc, event_obj, "subjectCode", event.subjectCode);
-        yyjson_add_optional_str(doc, event_obj, "subtitle", event.subtitle);
-
-        // Add topicIds array
-        yyjson_mut_val *topic_ids = yyjson_mut_arr(doc);
-        for (uint64_t id : event.topicIds) {
-            yyjson_mut_arr_add_uint(doc, topic_ids, id);
-        }
-        yyjson_mut_obj_add_val(doc, event_obj, "topicIds", topic_ids);
-
-        yyjson_mut_obj_add_val(doc, events_obj, key.c_str(), event_obj);
-    }
-    yyjson_mut_obj_add_val(doc, root, "events", events_obj);
-
-    // Create performances array
-    yyjson_mut_val *performances_array = yyjson_mut_arr(doc);
-    for (const auto& perf : catalog.performances) {
-        yyjson_mut_val *perf_obj = yyjson_mut_obj(doc);
-
-        yyjson_mut_obj_add_uint(doc, perf_obj, "eventId", perf.eventId);
-        yyjson_mut_obj_add_uint(doc, perf_obj, "id", perf.id);
-        yyjson_add_optional_str(doc, perf_obj, "logo", perf.logo);
-        yyjson_add_optional_str(doc, perf_obj, "name", perf.name);
-
-        // Add prices array
-        yyjson_mut_val *prices_array = yyjson_mut_arr(doc);
-        for (const auto& price : perf.prices) {
-            yyjson_mut_val *price_obj = yyjson_mut_obj(doc);
-            yyjson_mut_obj_add_uint(doc, price_obj, "amount", price.amount);
-            yyjson_mut_obj_add_uint(doc, price_obj, "audienceSubCategoryId", price.audienceSubCategoryId);
-            yyjson_mut_obj_add_uint(doc, price_obj, "seatCategoryId", price.seatCategoryId);
-            yyjson_mut_arr_append(prices_array, price_obj);
-        }
-        yyjson_mut_obj_add_val(doc, perf_obj, "prices", prices_array);
-
-        // Add seatCategories array
-        yyjson_mut_val *seat_cats_array = yyjson_mut_arr(doc);
-        for (const auto& seatCat : perf.seatCategories) {
-            yyjson_mut_val *seat_cat_obj = yyjson_mut_obj(doc);
-
-            // Add areas array
-            yyjson_mut_val *areas_array = yyjson_mut_arr(doc);
-            for (const auto& area : seatCat.areas) {
-                yyjson_mut_val *area_obj = yyjson_mut_obj(doc);
-                yyjson_mut_obj_add_uint(doc, area_obj, "areaId", area.areaId);
-
-                yyjson_mut_val *block_ids = yyjson_mut_arr(doc);
-                for (uint64_t blockId : area.blockIds) {
-                    yyjson_mut_arr_add_uint(doc, block_ids, blockId);
-                }
-                yyjson_mut_obj_add_val(doc, area_obj, "blockIds", block_ids);
-                yyjson_mut_arr_append(areas_array, area_obj);
-            }
-            yyjson_mut_obj_add_val(doc, seat_cat_obj, "areas", areas_array);
-            yyjson_mut_obj_add_uint(doc, seat_cat_obj, "seatCategoryId", seatCat.seatCategoryId);
-            yyjson_mut_arr_append(seat_cats_array, seat_cat_obj);
-        }
-        yyjson_mut_obj_add_val(doc, perf_obj, "seatCategories", seat_cats_array);
-
-        yyjson_add_optional_str(doc, perf_obj, "seatMapImage", perf.seatMapImage);
-        yyjson_mut_obj_add_uint(doc, perf_obj, "start", perf.start);
-        yyjson_mut_obj_add_str(doc, perf_obj, "venueCode", perf.venueCode.c_str());
-
-        yyjson_mut_arr_append(performances_array, perf_obj);
-    }
-    yyjson_mut_obj_add_val(doc, root, "performances", performances_array);
-
-    // Write to string
-    char *json_output = yyjson_mut_write(doc, 0, NULL);
-    std::string result(json_output);
-    free(json_output);
-    yyjson_mut_doc_free(doc);
-
-    return result;
-}
-
-#endif // YYJSON_CITM_CATALOG_DATA_H

benchmark/static_reflect/serde-benchmark/lib.rs

@@ -5,165 +5,405 @@ extern crate libc;
 use libc::{c_char, size_t};
 use serde::{Serialize, Deserialize};
 use std::{collections::HashMap, ffi::CString, ptr, slice};
+use serde::de::{self, Deserializer};
+/******************************************************/
+/******************************************************/
+/**
+ * Warning: the C++ code may not generate the same JSON.
+ */
+ /******************************************************/
+ /******************************************************/
 
-//==============================================================================
-// Twitter Benchmark Structures
-// These match the C++ TwitterData structures exactly
-//==============================================================================
+// This has no equivalent in C++:
+#[derive(Serialize, Deserialize)]
+pub struct Metadata {
+    result_type: String,
+    iso_language_code: String,
+}
 
 #[derive(Serialize, Deserialize)]
 pub struct User {
-    id: u64,
+    id: i64,
+    id_str: String,
     name: String,
     screen_name: String,
     location: String,
     description: String,
+    // C++ does not have those:
+    // url: Option<String>,
+    //protected: bool,
+    //listed_count: i64,
+    //created_at: String,
+    //favourites_count: i64,
+    //utc_offset: Option<i64>,
+    //time_zone: Option<String>,
+    //geo_enabled: bool,
     verified: bool,
-    followers_count: u64,
-    friends_count: u64,
-    statuses_count: u64,
+    followers_count: i64,
+    friends_count: i64,
+    statuses_count: i64,
+    // C++ does not have those:
+    //lang: String,
+    //profile_background_color: String,
+    //profile_background_image_url: String,
+    //profile_background_image_url_https: String,
+    //profile_background_tile: bool,
+    //profile_image_url: String,
+    //profile_image_url_https: String,
+    //profile_banner_url: Option<String>,
+    //profile_link_color: String,
+    //profile_sidebar_border_color: String,
+    //profile_sidebar_fill_color: String,
+    //profile_text_color: String,
+    //profile_use_background_image: bool,
+    //default_profile: bool,
+    //default_profile_image: bool,
+    //following: bool,
+    //follow_request_sent: bool,
+    //notifications: bool,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct Hashtag {
+    text: String,
+
+    // C++ has those but D. Lemire does not know what they are, they don't appear in the JSON:
+    // int64_t indices_start;
+    // int64_t indices_end;
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct Url {
+    url: String,
+    expanded_url: String,
+    display_url: String,
+    // C++ has those but D. Lemire does not know what they are, they don't appear in the JSON:
+    // int64_t indices_start;
+    // int64_t indices_end;
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct UserMention {
+    id: i64,
+    name: String,
+    screen_name: String,
+    // Not in the C++ equivalent:
+    //id_str: String,
+    //indices: Vec<i64>,
+    // C++ has those but D. Lemire does not know what they are, they don't appear in the JSON:
+    // int64_t indices_start;
+    // int64_t indices_end;
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct Entities {
+    hashtags: Vec<Hashtag>,
+    urls: Vec<Url>,
+    user_mentions: Vec<UserMention>,
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct Status {
     created_at: String,
-    id: u64,
+    id: i64,
     text: String,
     user: User,
-    retweet_count: u64,
-    favorite_count: u64,
+    entities: Entities,
+    retweet_count: i64,
+    favorite_count: i64,
+    favorited: bool,
+    retweeted: bool,
+    // None of these are in the C++ equivalent:
+    /*
+    metadata: Metadata,
+    id_str: String,
+    source: String,
+    truncated: bool,
+    in_reply_to_status_id: Option<i64>,
+    in_reply_to_status_id_str: Option<String>,
+    in_reply_to_user_id: Option<i64>,
+    in_reply_to_user_id_str: Option<String>,
+    in_reply_to_screen_name: Option<String>,
+    geo: Option<String>,
+    coordinates: Option<String>,
+    place: Option<String>,
+    contributors: Option<String>,
+    lang: String,
+    */
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct TwitterData {
     statuses: Vec<Status>,
 }
-static mut TWITTER_DATA: *mut TwitterData = std::ptr::null_mut();
 
 #[no_mangle]
-pub unsafe extern "C" fn twitter_from_str(raw_input: *const c_char, raw_input_length: size_t) -> *mut TwitterData {
-    let input = std::str::from_utf8_unchecked(slice::from_raw_parts(raw_input as *const u8, raw_input_length));
-    match serde_json::from_str(&input) {
-        Ok(result) => Box::into_raw(Box::new(result)),
-        Err(_) => std::ptr::null_mut(),
-    }
+pub unsafe extern "C" fn  twitter_from_str(raw_input: *const c_char, raw_input_length: size_t) -> *mut TwitterData {
+  let input = std::str::from_utf8_unchecked(slice::from_raw_parts(raw_input as *const u8, raw_input_length));
+  match serde_json::from_str(&input) {
+    Ok(result) => Box::into_raw(Box::new(result)),
+    Err(_) => std::ptr::null_mut(),
+  }
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn set_twitter_data(raw: *mut TwitterData) {
-    TWITTER_DATA = raw;
+pub unsafe extern "C" fn str_from_twitter(raw: *mut TwitterData) -> *const c_char {
+  let twitter_thing = { &*raw };
+  let serialized = serde_json::to_string(&twitter_thing).unwrap();
+  return std::ffi::CString::new(serialized.as_str()).unwrap().into_raw()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn serialize_twitter_to_string() -> usize {
-    if TWITTER_DATA.is_null() {
-        return 0;
-    }
-    let data = &*TWITTER_DATA;
-    serde_json::to_string(data).unwrap().len()
-}
 
 #[no_mangle]
 pub unsafe extern "C" fn free_twitter(raw: *mut TwitterData) {
-    if raw.is_null() {
-        return;
-    }
-    drop(Box::from_raw(raw))
+  if raw.is_null() {
+    return;
+  }
+
+  drop(Box::from_raw(raw))
 }
 
+
 #[no_mangle]
 pub unsafe extern fn free_string(ptr: *const c_char) {
     let _ = std::ffi::CString::from_raw(ptr as *mut _);
 }
 
-//==============================================================================
-// CITM Catalog Benchmark Structures
-// These match the C++ CitmCatalog structures EXACTLY for fair comparison
-//==============================================================================
+// Functions associated with the CitmCatalog benchmark
 
-/// Matches C++ CITMPrice struct exactly
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct CITMPrice {
-    pub amount: u64,
-    #[serde(rename = "audienceSubCategoryId")]
-    pub audience_sub_category_id: u64,
-    #[serde(rename = "seatCategoryId")]
-    pub seat_category_id: u64,
+#[derive(Serialize, Deserialize)]
+pub struct Area {
+    pub id: i64,
+    pub name: Option<String>,  // Changed to Option
+    pub parent: i64,
+    #[serde(rename = "childAreas")]
+    pub child_areas: Vec<i64>,
 }
 
-/// Matches C++ CITMArea struct exactly
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct CITMArea {
-    #[serde(rename = "areaId")]
-    pub area_id: u64,
-    #[serde(rename = "blockIds")]
-    pub block_ids: Vec<u64>,
+#[derive(Serialize, Deserialize)]
+pub struct AudienceSubCategory {
+    pub id: i64,
+    pub name: Option<String>,  // Changed to Option
+    pub parent: i64,
 }
 
-/// Matches C++ CITMSeatCategory struct exactly
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct CITMSeatCategory {
-    pub areas: Vec<CITMArea>,
-    #[serde(rename = "seatCategoryId")]
-    pub seat_category_id: u64,
-}
-
-/// Matches C++ CITMPerformance struct exactly
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct CITMPerformance {
-    pub id: u64,
-    #[serde(rename = "eventId")]
-    pub event_id: u64,
-    #[serde(default)]
-    pub logo: Option<String>,
-    #[serde(default)]
-    pub name: Option<String>,
-    pub prices: Vec<CITMPrice>,
-    #[serde(rename = "seatCategories")]
-    pub seat_categories: Vec<CITMSeatCategory>,
-    #[serde(default)]
-    #[serde(rename = "seatMapImage")]
-    pub seat_map_image: Option<String>,
-    pub start: u64,
-    #[serde(rename = "venueCode")]
-    pub venue_code: String,
-}
-
-/// Matches C++ CITMEvent struct exactly
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct CITMEvent {
-    pub id: u64,
-    #[serde(default)]
-    pub name: Option<String>,
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Event {
     #[serde(default)]
     pub description: Option<String>,
+    pub id: i64,
     #[serde(default)]
     pub logo: Option<String>,
     #[serde(default)]
-    #[serde(rename = "subTopicIds")]
-    pub sub_topic_ids: Vec<u64>,
+    pub name: Option<String>,
     #[serde(default)]
-    #[serde(rename = "subjectCode")]
-    pub subject_code: Option<String>,
+    pub subTopicIds: Vec<i64>,
+    #[serde(default)]
+    pub subjectCode: Option<String>,
     #[serde(default)]
     pub subtitle: Option<String>,
     #[serde(default)]
-    #[serde(rename = "topicIds")]
-    pub topic_ids: Vec<u64>,
+    pub topicIds: Vec<i64>,
+    // Add a catch-all for any other fields
+    #[serde(flatten)]
+    pub extra: HashMap<String, serde_json::Value>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Performance {
+    #[serde(default)]
+    pub id: i64,
+
+    #[serde(default)]
+    pub name: Option<String>,
+
+    #[serde(default)]
+    pub event: i64,
+
+    // This is the key fix - accept any JSON value type for timestamps
+    // This allows both string dates and integer timestamps (line 3511)
+    #[serde(default)]
+    pub start: serde_json::Value,
+
+    #[serde(rename = "venueCode")]
+    pub venue_code: String,
+
+    // Add a catch-all for any other fields
+    #[serde(flatten)]
+    pub extra: HashMap<String, serde_json::Value>,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct SeatCategory {
+    pub id: i64,
+    pub name: Option<String>,  // Changed to Option
+    pub areas: Vec<i64>,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct SubTopic {
+    pub id: i64,
+    pub name: Option<String>,  // Changed to Option
+    pub parent: i64,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct Topic {
+    pub id: i64,
+    pub name: Option<String>,  // Changed to Option
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct Venue {
+    pub id: i64,
+    pub name: Option<String>,  // Changed to Option
+    pub address: i64,
+}
+
+// Custom deserializers
+fn deserialize_string_to_area<'de, D>(deserializer: D) -> Result<HashMap<String, Area>, D::Error>
+where D: Deserializer<'de> {
+    let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
+    let mut result = HashMap::new();
+
+    for (id, name) in string_map {
+        let id_num = id.parse::<i64>().unwrap_or(0);
+        result.insert(id.clone(), Area {
+            id: id_num,
+            name: Some(name),
+            parent: 0,
+            child_areas: Vec::new(),
+        });
+    }
+
+    Ok(result)
+}
+
+fn deserialize_string_to_audience_subcategory<'de, D>(deserializer: D) -> Result<HashMap<String, AudienceSubCategory>, D::Error>
+where D: Deserializer<'de> {
+    let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
+    let mut result = HashMap::new();
+
+    for (id, name) in string_map {
+        let id_num = id.parse::<i64>().unwrap_or(0);
+        result.insert(id.clone(), AudienceSubCategory {
+            id: id_num,
+            name: Some(name),
+            parent: 0,
+        });
+    }
+
+    Ok(result)
+}
+
+fn deserialize_string_to_seat_category<'de, D>(deserializer: D) -> Result<HashMap<String, SeatCategory>, D::Error>
+where D: Deserializer<'de> {
+    let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
+    let mut result = HashMap::new();
+
+    for (id, name) in string_map {
+        let id_num = id.parse::<i64>().unwrap_or(0);
+        result.insert(id.clone(), SeatCategory {
+            id: id_num,
+            name: Some(name),
+            areas: Vec::new(),
+        });
+    }
+
+    Ok(result)
+}
+
+fn deserialize_string_to_subtopic<'de, D>(deserializer: D) -> Result<HashMap<String, SubTopic>, D::Error>
+where D: Deserializer<'de> {
+    let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
+    let mut result = HashMap::new();
+
+    for (id, name) in string_map {
+        let id_num = id.parse::<i64>().unwrap_or(0);
+        result.insert(id.clone(), SubTopic {
+            id: id_num,
+            name: Some(name),
+            parent: 0,
+        });
+    }
+
+    Ok(result)
+}
+
+fn deserialize_string_to_topic<'de, D>(deserializer: D) -> Result<HashMap<String, Topic>, D::Error>
+where D: Deserializer<'de> {
+    let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
+    let mut result = HashMap::new();
+
+    for (id, name) in string_map {
+        let id_num = id.parse::<i64>().unwrap_or(0);
+        result.insert(id.clone(), Topic {
+            id: id_num,
+            name: Some(name),
+        });
+    }
+
+    Ok(result)
+}
+
+fn deserialize_string_to_venue<'de, D>(deserializer: D) -> Result<HashMap<String, Venue>, D::Error>
+where D: Deserializer<'de> {
+    let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
+    let mut result = HashMap::new();
+
+    for (id, name) in string_map {
+        result.insert(id.clone(), Venue {
+            id: 0,
+            name: Some(name),
+            address: 0,
+        });
+    }
+
+    Ok(result)
 }
 
-/// Matches C++ CitmCatalog struct exactly - ONLY events and performances
-/// This is the key fix: we serialize only what C++ serializes
 #[derive(Serialize, Deserialize, Debug)]
 pub struct CitmCatalog {
-    pub events: HashMap<String, CITMEvent>,
-    pub performances: Vec<CITMPerformance>,
+    #[serde(rename = "areaNames")]
+    pub area_names: HashMap<String, String>,
+
+    #[serde(rename = "audienceSubCategoryNames")]
+    pub audience_subcategory_names: HashMap<String, String>,
+
+    #[serde(default)]
+    #[serde(rename = "blockNames")]
+    pub block_names: HashMap<String, String>,
+
+    pub events: HashMap<String, Event>,
+
+    #[serde(default)]
+    pub performances: Vec<Performance>,
+
+    #[serde(rename = "seatCategoryNames")]
+    pub seat_category_names: HashMap<String, String>,
+
+    #[serde(rename = "subTopicNames")]
+    pub subtopic_names: HashMap<String, String>,
+
+    #[serde(default)]
+    #[serde(rename = "subjectNames")]
+    pub subject_names: HashMap<String, String>,
+
+    #[serde(rename = "topicNames")]
+    pub topic_names: HashMap<String, String>,
+
+    #[serde(rename = "topicSubTopics")]
+    pub topic_subtopics: HashMap<String, Vec<i64>>,
+
+    #[serde(rename = "venueNames")]
+    pub venue_names: HashMap<String, String>,
+
+    // Catch-all for other fields
+    #[serde(flatten)]
+    pub extra: HashMap<String, serde_json::Value>,
 }
 
-static mut CITM_DATA: *mut CitmCatalog = std::ptr::null_mut();
-
 /// Creates a CitmCatalog from a JSON string (UTF-8 encoded).
-/// Only extracts events and performances to match C++ behavior.
 #[no_mangle]
 pub unsafe extern "C" fn citm_from_str(
     raw_input: *const c_char,
@@ -174,6 +414,7 @@ pub unsafe extern "C" fn citm_from_str(
         return ptr::null_mut();
     }
 
+    // Convert the raw pointer + length into a Rust slice
     let bytes = slice::from_raw_parts(raw_input as *const u8, raw_input_length);
     let input_str = match std::str::from_utf8(bytes) {
         Ok(s) => s,
@@ -183,23 +424,12 @@ pub unsafe extern "C" fn citm_from_str(
         }
     };
 
-    // Parse the full JSON to extract only events and performances
-    match serde_json::from_str::<serde_json::Value>(input_str) {
-        Ok(full_json) => {
-            // Extract only the fields we need (matching C++ behavior)
-            let events: HashMap<String, CITMEvent> = full_json.get("events")
-                .and_then(|v| serde_json::from_value(v.clone()).ok())
-                .unwrap_or_default();
-
-            let performances: Vec<CITMPerformance> = full_json.get("performances")
-                .and_then(|v| serde_json::from_value(v.clone()).ok())
-                .unwrap_or_default();
-
-            let catalog = CitmCatalog { events, performances };
-            Box::into_raw(Box::new(catalog))
-        },
+    // Try deserializing the input string into CitmCatalog
+    match serde_json::from_str::<CitmCatalog>(input_str) {
+        Ok(catalog) => Box::into_raw(Box::new(catalog)),
         Err(e) => {
             eprintln!("Error deserializing JSON: {}", e);
+            eprintln!("JSON snippet (first 200 chars): {:.200}...", input_str);
             ptr::null_mut()
         }
     }
@@ -207,17 +437,30 @@ pub unsafe extern "C" fn citm_from_str(
 
 /// Serializes a CitmCatalog into a JSON string (UTF-8).
 #[no_mangle]
-pub unsafe extern "C" fn set_citm_data(raw: *mut CitmCatalog) {
-    CITM_DATA = raw;
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn serialize_citm_to_string() -> usize {
-    if CITM_DATA.is_null() {
-        return 0;
+pub unsafe extern "C" fn str_from_citm(raw_catalog: *mut CitmCatalog) -> *mut c_char {
+    if raw_catalog.is_null() {
+        eprintln!("Error: Catalog pointer is null");
+        return ptr::null_mut();
+    }
+
+    // Fix: Actually serialize the catalog
+    let catalog = &*raw_catalog;
+
+    match serde_json::to_string(catalog) {
+        Ok(serialized) => {
+            match CString::new(serialized) {
+                Ok(cstr) => cstr.into_raw(),
+                Err(e) => {
+                    eprintln!("Error creating CString: {}", e);
+                    ptr::null_mut()
+                }
+            }
+        },
+        Err(e) => {
+            eprintln!("Error serializing catalog to JSON: {}", e);
+            ptr::null_mut()
+        }
     }
-    let data = &*CITM_DATA;
-    return serde_json::to_string(data).unwrap().len();
 }
 
 /// Frees the CitmCatalog pointer.
@@ -232,120 +475,8 @@ pub unsafe extern "C" fn free_citm(raw_catalog: *mut CitmCatalog) {
 pub extern "C" fn free_str(ptr: *mut c_char) {
     if !ptr.is_null() {
         unsafe {
+            // Convert back into a CString, which automatically frees the memory
             let _ = CString::from_raw(ptr);
         }
     }
-}
-
-//==============================================================================
-// FFI Overhead Measurement Functions
-// These allow measuring the actual FFI overhead vs pure Rust serialization
-//==============================================================================
-
-/// Result structure for FFI overhead measurement
-#[repr(C)]
-pub struct FfiOverheadResult {
-    /// Time in nanoseconds for pure serde_json::to_string() (no FFI overhead)
-    pub pure_serde_ns: u64,
-    /// Time in nanoseconds for serde + CString conversion
-    pub serde_plus_cstring_ns: u64,
-    /// Number of iterations performed
-    pub iterations: u64,
-    /// Output size in bytes (for verification)
-    pub output_size: u64,
-}
-
-/// Prevents compiler from optimizing away the value
-/// Works on stable Rust (unlike std::hint::black_box which is unstable)
-#[inline(never)]
-fn black_box<T>(dummy: T) -> T {
-    unsafe {
-        let ret = std::ptr::read_volatile(&dummy);
-        std::mem::forget(dummy);
-        ret
-    }
-}
-
-/// Measures FFI overhead for Twitter serialization.
-/// Performs `iterations` serializations entirely in Rust and returns timing data.
-/// This allows comparing against per-call FFI overhead.
-#[no_mangle]
-pub unsafe extern "C" fn measure_twitter_ffi_overhead(
-    raw: *mut TwitterData,
-    iterations: u64
-) -> FfiOverheadResult {
-    use std::time::Instant;
-
-    let twitter_data = &*raw;
-    let output_size: u64;
-
-    // Warm-up run
-    let warmup = serde_json::to_string(&twitter_data).unwrap();
-    output_size = warmup.len() as u64;
-
-    // Measure pure serde_json::to_string() - no CString conversion
-    let start_pure = Instant::now();
-    for _ in 0..iterations {
-        let serialized = serde_json::to_string(&twitter_data).unwrap();
-        // Prevent optimization from eliminating the work
-        black_box(&serialized);
-    }
-    let pure_serde_ns = start_pure.elapsed().as_nanos() as u64;
-
-    // Measure serde + CString conversion (but not FFI return)
-    let start_cstring = Instant::now();
-    for _ in 0..iterations {
-        let serialized = serde_json::to_string(&twitter_data).unwrap();
-        let cstring = CString::new(serialized).unwrap();
-        // Prevent optimization from eliminating the work
-        black_box(&cstring);
-    }
-    let serde_plus_cstring_ns = start_cstring.elapsed().as_nanos() as u64;
-
-    FfiOverheadResult {
-        pure_serde_ns,
-        serde_plus_cstring_ns,
-        iterations,
-        output_size,
-    }
-}
-
-/// Measures FFI overhead for CITM serialization.
-#[no_mangle]
-pub unsafe extern "C" fn measure_citm_ffi_overhead(
-    raw: *mut CitmCatalog,
-    iterations: u64
-) -> FfiOverheadResult {
-    use std::time::Instant;
-
-    let catalog = &*raw;
-    let output_size: u64;
-
-    // Warm-up run
-    let warmup = serde_json::to_string(&catalog).unwrap();
-    output_size = warmup.len() as u64;
-
-    // Measure pure serde_json::to_string() - no CString conversion
-    let start_pure = Instant::now();
-    for _ in 0..iterations {
-        let serialized = serde_json::to_string(&catalog).unwrap();
-        black_box(&serialized);
-    }
-    let pure_serde_ns = start_pure.elapsed().as_nanos() as u64;
-
-    // Measure serde + CString conversion
-    let start_cstring = Instant::now();
-    for _ in 0..iterations {
-        let serialized = serde_json::to_string(&catalog).unwrap();
-        let cstring = CString::new(serialized).unwrap();
-        black_box(&cstring);
-    }
-    let serde_plus_cstring_ns = start_cstring.elapsed().as_nanos() as u64;
-
-    FfiOverheadResult {
-        pure_serde_ns,
-        serde_plus_cstring_ns,
-        iterations,
-        output_size,
-    }
-}
+}

benchmark/static_reflect/serde-benchmark/serde_benchmark.h

@@ -4,7 +4,6 @@
 /* Generated with cbindgen:0.28.0 */
 
 /* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
-/* Note: FfiOverheadResult and measurement functions added manually */
 
 #include <cstdarg>
 #include <cstdint>
@@ -18,25 +17,11 @@ struct CitmCatalog;
 
 struct TwitterData;
 
-/// Result structure for FFI overhead measurement
-struct FfiOverheadResult {
-    /// Time in nanoseconds for pure serde_json::to_string() (no FFI overhead)
-    uint64_t pure_serde_ns;
-    /// Time in nanoseconds for serde + CString conversion
-    uint64_t serde_plus_cstring_ns;
-    /// Number of iterations performed
-    uint64_t iterations;
-    /// Output size in bytes (for verification)
-    uint64_t output_size;
-};
-
 extern "C" {
 
 TwitterData *twitter_from_str(const char *raw_input, size_t raw_input_length);
 
-void set_twitter_data(TwitterData *raw);
-
-size_t serialize_twitter_to_string();
+const char *str_from_twitter(TwitterData *raw);
 
 void free_twitter(TwitterData *raw);
 
@@ -45,22 +30,14 @@ void free_string(const char *ptr);
 /// Creates a CitmCatalog from a JSON string (UTF-8 encoded).
 CitmCatalog *citm_from_str(const char *raw_input, uintptr_t raw_input_length);
 
-void set_citm_data(CitmCatalog *raw);
-
-size_t serialize_citm_to_string();
+/// Serializes a CitmCatalog into a JSON string (UTF-8).
+char *str_from_citm(CitmCatalog *raw_catalog);
 
 /// Frees the CitmCatalog pointer.
 void free_citm(CitmCatalog *raw_catalog);
 
 void free_str(char *ptr);
 
-/// Measures FFI overhead for Twitter serialization.
-/// Performs `iterations` serializations entirely in Rust and returns timing data.
-FfiOverheadResult measure_twitter_ffi_overhead(TwitterData *raw, uint64_t iterations);
-
-/// Measures FFI overhead for CITM serialization.
-FfiOverheadResult measure_citm_ffi_overhead(CitmCatalog *raw, uint64_t iterations);
-
 }  // extern "C"
 
 }  // namespace serde_benchmark

benchmark/static_reflect/serde-benchmark/src/main.rs

@@ -1,31 +0,0 @@
-use std::fs;
-
-// Include the lib.rs content directly
-include!("../lib.rs");
-
-fn main() {
-    // Read the Twitter JSON file
-    let json_str = fs::read_to_string("/Users/random_person/Desktop/simdjson/build/jsonexamples/twitter.json")
-        .expect("Failed to read file");
-
-    // Parse it
-    let data: TwitterData = serde_json::from_str(&json_str)
-        .expect("Failed to parse JSON");
-
-    // Serialize it back
-    let output = serde_json::to_string(&data)
-        .expect("Failed to serialize");
-
-    // Write to file for comparison
-    fs::write("rust_output.json", &output)
-        .expect("Failed to write output");
-
-    println!("Output size: {} bytes", output.len());
-    println!("Written to rust_output.json");
-
-    // Also write pretty version for easier inspection
-    let pretty = serde_json::to_string_pretty(&data)
-        .expect("Failed to serialize pretty");
-    fs::write("rust_output_pretty.json", &pretty)
-        .expect("Failed to write pretty output");
-}

benchmark/static_reflect/serde-benchmark/src/test_output.rs

@@ -1,36 +0,0 @@
-use std::fs;
-
-// Import from the parent lib.rs
-include!("../lib.rs");
-
-fn main() {
-    // Read the Twitter JSON file
-    let json_str = fs::read_to_string("/Users/random_person/Desktop/simdjson/build/jsonexamples/twitter.json")
-        .expect("Failed to read file");
-
-    // Parse it
-    let data: TwitterData = serde_json::from_str(&json_str)
-        .expect("Failed to parse JSON");
-
-    // Serialize it back (compact)
-    let output = serde_json::to_vec(&data)
-        .expect("Failed to serialize");
-    
-    let output_str = String::from_utf8(output.clone()).unwrap();
-
-    // Write to file for comparison
-    fs::write("rust_output_test.json", &output)
-        .expect("Failed to write output");
-
-    println!("Output size: {} bytes", output.len());
-    
-    // Count statuses
-    println!("Number of statuses: {}", data.statuses.len());
-    
-    // Check what fields are in the first status
-    if let Some(first) = data.statuses.first() {
-        // Let's serialize just the first status to see what fields are included
-        let first_json = serde_json::to_string_pretty(first).unwrap();
-        println!("First status (pretty):\n{}", first_json);
-    }
-}

benchmark/static_reflect/twitter_benchmark/CMakeLists.txt

@@ -1,32 +1,14 @@
 
 # Add executable targets
 add_executable(benchmark_serialization_twitter benchmark_serialization_twitter.cpp)
-add_executable(benchmark_parsing_twitter benchmark_parsing_twitter.cpp)
 
  if(TARGET serde-benchmark)
     message(STATUS "serde-benchmark target was created. Linking benchmarks and serde-benchmark.")
     target_link_libraries(benchmark_serialization_twitter PRIVATE serde-benchmark)
-    target_link_libraries(benchmark_parsing_twitter PRIVATE serde-benchmark)
     target_compile_definitions(benchmark_serialization_twitter PRIVATE SIMDJSON_RUST_VERSION="${Rust_VERSION}")
-    target_compile_definitions(benchmark_parsing_twitter PRIVATE SIMDJSON_RUST_VERSION="${Rust_VERSION}")
 endif()
 target_link_libraries(benchmark_serialization_twitter PRIVATE simdjson::simdjson nlohmann_json)
 target_link_libraries(benchmark_serialization_twitter PRIVATE reflectcpp)
 target_compile_definitions(benchmark_serialization_twitter PRIVATE SIMDJSON_BENCH_CPP_REFLECT=1)
 
-target_link_libraries(benchmark_parsing_twitter PRIVATE simdjson::simdjson nlohmann_json)
-
-if(TARGET rapidjson)
-    target_link_libraries(benchmark_parsing_twitter PRIVATE rapidjson)
-    target_compile_definitions(benchmark_parsing_twitter PRIVATE SIMDJSON_COMPETITION_RAPIDJSON)
-endif()
-
-if(TARGET yyjson)
-    target_link_libraries(benchmark_parsing_twitter PRIVATE yyjson)
-    target_compile_definitions(benchmark_parsing_twitter PRIVATE SIMDJSON_COMPETITION_YYJSON)
-    target_link_libraries(benchmark_serialization_twitter PRIVATE yyjson)
-    target_compile_definitions(benchmark_serialization_twitter PRIVATE SIMDJSON_COMPETITION_YYJSON)
-endif()
-
-target_compile_definitions(benchmark_serialization_twitter PRIVATE JSON_FILE="${EXAMPLE_JSON}")
-target_compile_definitions(benchmark_parsing_twitter PRIVATE JSON_FILE="${EXAMPLE_JSON}")
+target_compile_definitions(benchmark_serialization_twitter PRIVATE JSON_FILE="${EXAMPLE_JSON}")

benchmark/static_reflect/twitter_benchmark/benchmark_parsing_twitter.cpp

@@ -1,232 +0,0 @@
-#include <cassert>
-#include <cstdlib>
-#include <ctime>
-#include <format>
-#include <fstream>
-#include <iostream>
-#include <nlohmann/json.hpp>
-#include <simdjson.h>
-#include <string>
-#include "twitter_data.h"
-#include "nlohmann_twitter_data.h"
-#include "../benchmark_utils/benchmark_helper.h"
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-#include "rapidjson_twitter_data.h"
-#endif
-#ifdef SIMDJSON_COMPETITION_YYJSON
-#include "yyjson_twitter_data.h"
-#endif
-
-#ifdef SIMDJSON_RUST_VERSION
-#include "../serde-benchmark/serde_benchmark.h"
-
-void bench_rust_parsing(const std::string &json_str) {
-  size_t input_volume = json_str.size();
-  printf("# input volume: %zu bytes\n", input_volume);
-
-  volatile bool result = true;
-  pretty_print(1, input_volume, "bench_rust_parsing",
-               bench([&json_str, &result]() {
-                 serde_benchmark::TwitterData *td = serde_benchmark::twitter_from_str(json_str.c_str(), json_str.size());
-                 result = (td != nullptr);
-                 if (td) {
-                   serde_benchmark::free_twitter(td);
-                 }
-                 if (!result) {
-                   printf("parse error\n");
-                 }
-               }));
-}
-#endif
-
-// OPTIMIZED VERSION: Reuses parser across iterations
-template <class T>
-void bench_simdjson_static_reflection_parsing(const std::string &json_str) {
-  size_t input_volume = json_str.size();
-  printf("# input volume: %zu bytes\n", input_volume);
-
-  // Pre-allocate padded buffer outside the benchmark loop
-  simdjson::padded_string padded = simdjson::padded_string(json_str);
-
-  // CRITICAL: Create parser OUTSIDE the loop for reuse
-  simdjson::ondemand::parser parser;
-
-  volatile bool result = true;
-  pretty_print(1, input_volume, "bench_simdjson_static_reflection_parsing",
-               bench([&padded, &result, &parser]() {
-                 // Reuse the same parser instance
-                 simdjson::ondemand::document doc;
-                 if(parser.iterate(padded).get(doc)) {
-                   result = false;
-                   return;
-                 }
-                 T my_struct;
-                 if(doc.get<T>().get(my_struct)) {
-                   result = false;
-                 }
-                 if (!result) {
-                   printf("parse error\n");
-                 }
-               }));
-}
-
-#if SIMDJSON_STATIC_REFLECTION
-template <class T>
-void bench_simdjson_from_parsing(const std::string &json_str) {
-  size_t input_volume = json_str.size();
-  printf("# input volume: %zu bytes\n", input_volume);
-
-  // Pre-allocate padded buffer outside the benchmark loop
-  simdjson::padded_string padded = simdjson::padded_string(json_str);
-
-  volatile bool result = true;
-  pretty_print(1, input_volume, "bench_simdjson_from_parsing",
-               bench([&padded, &result]() {
-                 T my_struct;
-                 auto err = simdjson::from(padded).get(my_struct);
-                  if (err) {
-                    result = false;
-                    printf("parse error: %s\n", simdjson::error_message(err));
-                    return;
-                  }
-               }));
-}
-#endif
-
- void bench_nlohmann_parsing(const std::string &json_str) {
-   size_t input_volume = json_str.size();
-   printf("# input volume: %zu bytes\n", input_volume);
-
-   volatile bool result = true;
-   pretty_print(1, input_volume, "bench_nlohmann_parsing",
-                bench([&json_str, &result]() {
-                  try {
-                    TwitterData data = nlohmann_deserialize(json_str);
-                    result = true;
-                  } catch (...) {
-                    result = false;
-                    printf("parse error\n");
-                  }
-                }));
-}
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-void bench_rapidjson_parsing(const std::string &json_str) {
-  size_t input_volume = json_str.size();
-  printf("# input volume: %zu bytes\n", input_volume);
-
-  volatile bool result = true;
-  pretty_print(1, input_volume, "bench_rapidjson_parsing",
-               bench([&json_str, &result]() {
-                 try {
-                   TwitterData data = rapidjson_deserialize(json_str);
-                   result = true;
-                 } catch (...) {
-                   result = false;
-                   printf("parse error\n");
-                 }
-               }));
-}
-#endif
-
-#ifdef SIMDJSON_COMPETITION_YYJSON
-void bench_yyjson_parsing(const std::string &json_str) {
-  size_t input_volume = json_str.size();
-  printf("# input volume: %zu bytes\n", input_volume);
-
-  volatile bool result = true;
-  pretty_print(1, input_volume, "bench_yyjson_parsing",
-               bench([&json_str, &result]() {
-                 try {
-                   TwitterData data = yyjson_deserialize(json_str);
-                   result = true;
-                 } catch (...) {
-                   result = false;
-                   printf("parse error\n");
-                 }
-               }));
-}
-#endif
-
-std::string read_file(std::string filename) {
-  printf("# Reading file %s\n", filename.c_str());
-  constexpr size_t read_size = 4096;
-  auto stream = std::ifstream(filename.c_str());
-  stream.exceptions(std::ios_base::badbit);
-  std::string out;
-  std::string buf(read_size, '\0');
-  while (stream.read(&buf[0], read_size)) {
-    out.append(buf, 0, size_t(stream.gcount()));
-  }
-  out.append(buf, 0, size_t(stream.gcount()));
-  return out;
-}
-
-// Function to check if benchmark name matches any of the comma-separated filters
-bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
-  if (filter.empty()) return true;
-
-  // Split filter by comma
-  size_t start = 0;
-  size_t end = filter.find(',');
-  while (end != std::string::npos) {
-    std::string token = filter.substr(start, end - start);
-    if (benchmark_name.find(token) != std::string::npos) {
-      return true;
-    }
-    start = end + 1;
-    end = filter.find(',', start);
-  }
-  // Check last token
-  std::string token = filter.substr(start);
-  return benchmark_name.find(token) != std::string::npos;
-}
-
-int main(int argc, char* argv[]) {
-  std::string filter;
-
-  // Parse command-line arguments
-  for (int i = 1; i < argc; ++i) {
-      if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "--filter") == 0) {
-          if (i + 1 < argc) {
-              filter = argv[++i];
-          } else {
-              std::cerr << "Error: -f/--filter requires an argument" << std::endl;
-              return EXIT_FAILURE;
-          }
-      }
-  }
-
-  // Load the JSON data
-  std::string json_str = read_file(JSON_FILE);
-
-  // Benchmarking the parsing
-  if (matches_filter("nlohmann", filter)) {
-    bench_nlohmann_parsing(json_str);
-  }
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-  if (matches_filter("rapidjson", filter)) {
-    bench_rapidjson_parsing(json_str);
-  }
-#endif
-#ifdef SIMDJSON_COMPETITION_YYJSON
-  if (matches_filter("yyjson", filter)) {
-    bench_yyjson_parsing(json_str);
-  }
-#endif
-  if (matches_filter("simdjson_static_reflection", filter)) {
-    bench_simdjson_static_reflection_parsing<TwitterData>(json_str);
-  }
-#if SIMDJSON_STATIC_REFLECTION
-  if (matches_filter("simdjson_from", filter)) {
-    bench_simdjson_from_parsing<TwitterData>(json_str);
-  }
-#endif
-#ifdef SIMDJSON_RUST_VERSION
-  if (matches_filter("rust", filter)) {
-    printf("# Note: Rust/Serde parsing test\n");
-    bench_rust_parsing(json_str);
-  }
-#endif
-  return EXIT_SUCCESS;
-}

benchmark/static_reflect/twitter_benchmark/benchmark_serialization_twitter.cpp

@@ -1,5 +1,4 @@
 #include <cassert>
-#include <chrono>
 #include <cstdlib>
 #include <ctime>
 #include <format>
@@ -11,9 +10,6 @@
 #include "twitter_data.h"
 #include "nlohmann_twitter_data.h"
 #include "../benchmark_utils/benchmark_helper.h"
-#ifdef SIMDJSON_COMPETITION_YYJSON
-#include "yyjson_twitter_data.h"
-#endif
 #if SIMDJSON_BENCH_CPP_REFLECT
 #include <rfl.hpp>
 #include <rfl/json.hpp>
@@ -39,49 +35,19 @@ void bench_reflect_cpp(TwitterData &data) {
 
 
 void bench_rust(serde_benchmark::TwitterData *data) {
-  serde_benchmark::set_twitter_data(data);
-  size_t output_volume = serde_benchmark::serialize_twitter_to_string();
+  const char * output = serde_benchmark::str_from_twitter(data);
+  size_t output_volume = strlen(output);
   printf("# output volume: %zu bytes\n", output_volume);
-
   volatile size_t measured_volume = 0;
   pretty_print(1, output_volume, "bench_rust",
-               bench([&measured_volume, &output_volume]() {
-                 measured_volume = serde_benchmark::serialize_twitter_to_string();
+               bench([&data, &measured_volume, &output_volume]() {
+                 const char * output = serde_benchmark::str_from_twitter(data);
+                 serde_benchmark::free_string(output);
                }));
 }
 #endif
 
-// Fair allocation variant: allocates fresh buffer each iteration (matches other libraries)
 template <class T> void bench_simdjson_static_reflection(T &data) {
-  // First run to determine expected size
-  simdjson::builder::string_builder sb_init;
-  simdjson::builder::append(sb_init, data);
-  std::string_view p_init;
-  if(sb_init.view().get(p_init)) {
-    std::cerr << "Error!" << std::endl;
-  }
-  size_t output_volume = p_init.size();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(sizeof(data), output_volume, "bench_simdjson_static_reflection",
-               bench([&data, &measured_volume, &output_volume]() {
-                 // Fresh allocation each iteration - fair comparison
-                 simdjson::builder::string_builder sb;
-                 simdjson::builder::append(sb, data);
-                 std::string_view p;
-                 if(sb.view().get(p)) {
-                   std::cerr << "Error!" << std::endl;
-                 }
-                 measured_volume = sb.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-
-// Optimized variant: reuses buffer across iterations (shows API potential)
-template <class T> void bench_simdjson_static_reflection_reuse(T &data) {
   simdjson::builder::string_builder sb;
   simdjson::builder::append(sb, data);
   std::string_view p;
@@ -93,7 +59,7 @@ template <class T> void bench_simdjson_static_reflection_reuse(T &data) {
   printf("# output volume: %zu bytes\n", output_volume);
 
   volatile size_t measured_volume = 0;
-  pretty_print(sizeof(data), output_volume, "bench_simdjson_reuse_buffer",
+  pretty_print(sizeof(data), output_volume, "bench_simdjson_static_reflection",
                bench([&data, &measured_volume, &output_volume, &sb]() {
                  sb.clear();
                  simdjson::builder::append(sb, data);
@@ -108,63 +74,6 @@ template <class T> void bench_simdjson_static_reflection_reuse(T &data) {
                }));
 }
 
-#if SIMDJSON_STATIC_REFLECTION
-// Fair allocation variant: allocates fresh string each iteration
-template <class T> void bench_simdjson_to(T &data) {
-  // First run to determine size
-  std::string output_init;
-  if (simdjson::error_code err = simdjson::builder::to_json(data, output_init); err) {
-    std::cerr << "Error in to_json initialization!" << simdjson::error_message(err) << std::endl;
-    return;
-  }
-  size_t output_volume = output_init.size();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(sizeof(data), output_volume, "bench_simdjson_to",
-               bench([&data, &measured_volume, &output_volume]() {
-                 // Fresh allocation each iteration - fair comparison
-                 std::string output;
-                 if (simdjson::error_code err = simdjson::builder::to_json(data, output); err) {
-                   std::cerr << "Error in to_json!" << simdjson::error_message(err) << std::endl;
-                   return;
-                 }
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-
-// Optimized variant: reuses pre-allocated string
-template <class T> void bench_simdjson_to_reuse(T &data) {
-  std::string output;
-  if (simdjson::error_code err = simdjson::builder::to_json(data, output); err) {
-    std::cerr << "Error in to_json initialization!" << simdjson::error_message(err) << std::endl;
-    return;
-  }
-  size_t output_volume = output.size();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  // Pre-allocate string with sufficient capacity to avoid reallocation
-  output.reserve(output_volume * 2);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(sizeof(data), output_volume, "bench_simdjson_to_reuse",
-               bench([&data, &measured_volume, &output_volume, &output]() {
-                 // Reuse the pre-allocated string - avoids allocation
-                 if (simdjson::error_code err = simdjson::builder::to_json(data, output); err) {
-                   std::cerr << "Error in to_json!" << simdjson::error_message(err) << std::endl;
-                   return;
-                 }
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-#endif
-
 void bench_nlohmann(TwitterData &data) {
   std::string output = nlohmann_serialize(data);
   size_t output_volume = output.size();
@@ -181,61 +90,28 @@ void bench_nlohmann(TwitterData &data) {
                }));
 }
 
-#ifdef SIMDJSON_COMPETITION_YYJSON
-void bench_yyjson(TwitterData &data) {
-  std::string output = yyjson_serialize(data);
-  size_t output_volume = output.size();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(1, output_volume, "bench_yyjson",
-               bench([&data, &measured_volume, &output_volume]() {
-                 std::string output = yyjson_serialize(data);
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-#endif
-
 size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp) {
   ((std::string *)userp)->append((char *)contents, size * nmemb);
   return size * nmemb;
 }
 
-simdjson::padded_string read_file(std::string filename) {
+std::string read_file(std::string filename) {
   printf("# Reading file %s\n", filename.c_str());
   constexpr size_t read_size = 4096;
   auto stream = std::ifstream(filename.c_str());
   stream.exceptions(std::ios_base::badbit);
-  simdjson::padded_string_builder builder;
+  std::string out;
   std::string buf(read_size, '\0');
   while (stream.read(&buf[0], read_size)) {
-    builder.append(buf.data(), size_t(stream.gcount()));
+    out.append(buf, 0, size_t(stream.gcount()));
   }
-  builder.append(buf.data(), size_t(stream.gcount()));
-  return builder.convert();
+  out.append(buf, 0, size_t(stream.gcount()));
+  return out;
 }
 
-// Function to check if benchmark name matches any of the comma-separated filters
+// Function to check if benchmark name contains filter substring
 bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
-  if (filter.empty()) return true;
-
-  // Split filter by comma
-  size_t start = 0;
-  size_t end = filter.find(',');
-  while (end != std::string::npos) {
-    std::string token = filter.substr(start, end - start);
-    if (benchmark_name.find(token) != std::string::npos) {
-      return true;
-    }
-    start = end + 1;
-    end = filter.find(',', start);
-  }
-  // Check last token
-  std::string token = filter.substr(start);
-  return benchmark_name.find(token) != std::string::npos;
+  return filter.empty() || benchmark_name.find(filter) != std::string::npos;
 }
 
 int main(int argc, char* argv[]) {
@@ -253,12 +129,12 @@ int main(int argc, char* argv[]) {
       }
   }
   // Testing correctness of round-trip (serialization + deserialization)
-  simdjson::padded_string json_str = read_file(JSON_FILE);
+  std::string json_str = read_file(JSON_FILE);
 
   // Loading up the data into a structure.
   simdjson::ondemand::parser parser;
   simdjson::ondemand::document doc;
-  if(parser.iterate(json_str).get(doc)) {
+  if(parser.iterate(simdjson::pad(json_str)).get(doc)) {
     std::cerr << "Error loading the document!" << std::endl;
     return EXIT_FAILURE;
   }
@@ -269,41 +145,18 @@ int main(int argc, char* argv[]) {
   }
 
   // Benchmarking the serialization
-  // Note: simdjson benchmarks include both "fair" (fresh allocation) and "reuse" (buffer reuse) variants
-  // The "fair" variants allocate fresh memory each iteration, matching other libraries' behavior
-  // The "reuse" variants demonstrate the API's potential when buffer reuse is possible
-
   if (matches_filter("nlohmann", filter)) {
     bench_nlohmann(my_struct);
   }
-#ifdef SIMDJSON_COMPETITION_YYJSON
-  if (matches_filter("yyjson", filter)) {
-    bench_yyjson(my_struct);
-  }
-#endif
   if (matches_filter("simdjson_static_reflection", filter)) {
     bench_simdjson_static_reflection(my_struct);
   }
-  if (matches_filter("simdjson_reuse", filter)) {
-    bench_simdjson_static_reflection_reuse(my_struct);
-  }
-#if SIMDJSON_STATIC_REFLECTION
-  if (matches_filter("simdjson_to", filter)) {
-    bench_simdjson_to(my_struct);
-  }
-  if (matches_filter("simdjson_to_reuse", filter)) {
-    bench_simdjson_to_reuse(my_struct);
-  }
-#endif
 #ifdef SIMDJSON_RUST_VERSION
   if (matches_filter("rust", filter)) {
-    serde_benchmark::TwitterData * td = serde_benchmark::twitter_from_str(json_str.data(), json_str.size());
-    if (td == nullptr) {
-      printf("# Failed to parse Twitter data for Rust benchmark\n");
-    } else {
-      bench_rust(td);
-      serde_benchmark::free_twitter(td);
-    }
+    printf("# WARNING: The Rust benchmark may not be directly comparable since it does not use an equivalent data structure.\n");
+    serde_benchmark::TwitterData * td = serde_benchmark::twitter_from_str(json_str.c_str(), json_str.size());
+    bench_rust(td);
+    serde_benchmark::free_twitter(td);
   }
 #endif
 #if SIMDJSON_BENCH_CPP_REFLECT

benchmark/static_reflect/twitter_benchmark/nlohmann_twitter_data.h

@@ -4,7 +4,6 @@
 #include "twitter_data.h"
 #include <nlohmann/json.hpp>
 
-// Serialization functions for nlohmann
 void to_json(nlohmann::json &j, const User &u) {
   j = nlohmann::json{{"id", u.id},
                      {"name", u.name},
@@ -17,54 +16,101 @@ void to_json(nlohmann::json &j, const User &u) {
                      {"statuses_count", u.statuses_count}};
 }
 
+void to_json(nlohmann::json &j, const Hashtag &h) {
+  j = nlohmann::json{{"text", h.text},
+                     {"indices_start", h.indices_start},
+                     {"indices_end", h.indices_end}};
+}
+
+void to_json(nlohmann::json &j, const Url &u) {
+  j = nlohmann::json{{"url", u.url},
+                     {"expanded_url", u.expanded_url},
+                     {"display_url", u.display_url},
+                     {"indices_start", u.indices_start},
+                     {"indices_end", u.indices_end}};
+}
+
+void to_json(nlohmann::json &j, const UserMention &um) {
+  j = nlohmann::json{{"id", um.id},
+                     {"name", um.name},
+                     {"screen_name", um.screen_name},
+                     {"indices_start", um.indices_start},
+                     {"indices_end", um.indices_end}};
+}
+
+void to_json(nlohmann::json &j, const Entities &e) {
+  j = nlohmann::json{{"hashtags", e.hashtags},
+                     {"urls", e.urls},
+                     {"user_mentions", e.user_mentions}};
+}
+
 void to_json(nlohmann::json &j, const Status &s) {
   j = nlohmann::json{{"created_at", s.created_at},
                      {"id", s.id},
                      {"text", s.text},
                      {"user", s.user},
+                     {"entities", s.entities},
                      {"retweet_count", s.retweet_count},
-                     {"favorite_count", s.favorite_count}};
+                     {"favorite_count", s.favorite_count},
+                     {"favorited", s.favorited},
+                     {"retweeted", s.retweeted}};
+}
+
+
+std::string nlohmann_serialize(const std::vector<Hashtag>& v) {
+  nlohmann::json a = nlohmann::json::array();
+  for(const Hashtag & h : v) {
+    a.push_back(nlohmann::json{{"text", h.text},
+                     {"indices_start", h.indices_start},
+                     {"indices_end", h.indices_end}});
+  }
+  return a.dump();
+}
+std::string nlohmann_serialize(const std::vector<Url>& v) {
+  nlohmann::json a = nlohmann::json::array();
+  for(const Url & u : v) {
+    a.push_back(nlohmann::json{{"url", u.url},
+                     {"expanded_url", u.expanded_url},
+                     {"display_url", u.display_url},
+                     {"indices_start", u.indices_start},
+                     {"indices_end", u.indices_end}});
+  }
+  return a.dump();
+}
+std::string nlohmann_serialize(const std::vector<UserMention>& v) {
+  nlohmann::json a = nlohmann::json::array();
+  for(const UserMention & um : v) {
+    a.push_back(nlohmann::json{{"id", um.id},
+                     {"name", um.name},
+                     {"screen_name", um.screen_name},
+                     {"indices_start", um.indices_start},
+                     {"indices_end", um.indices_end}});
+  }
+  return a.dump();
+}
+
+std::string nlohmann_serialize(const std::vector<Status>& v) {
+  nlohmann::json a = nlohmann::json::array();
+  for(const Status & s : v) {
+    a.push_back(nlohmann::json{{"created_at", s.created_at},
+                     {"id", s.id},
+                     {"text", s.text},
+                     {"user", s.user},
+                     {"entities", s.entities},
+                     {"retweet_count", s.retweet_count},
+                     {"favorite_count", s.favorite_count},
+                     {"favorited", s.favorited},
+                     {"retweeted", s.retweeted}});
+  }
+  return a.dump();
 }
 
 void to_json(nlohmann::json &j, const TwitterData &t) {
   j = nlohmann::json{{"statuses", t.statuses}};
 }
 
-// Deserialization functions for nlohmann
-void from_json(const nlohmann::json &j, User &u) {
-  j.at("id").get_to(u.id);
-  j.at("name").get_to(u.name);
-  j.at("screen_name").get_to(u.screen_name);
-  j.at("location").get_to(u.location);
-  j.at("description").get_to(u.description);
-  j.at("verified").get_to(u.verified);
-  j.at("followers_count").get_to(u.followers_count);
-  j.at("friends_count").get_to(u.friends_count);
-  j.at("statuses_count").get_to(u.statuses_count);
-}
-
-void from_json(const nlohmann::json &j, Status &s) {
-  j.at("created_at").get_to(s.created_at);
-  j.at("id").get_to(s.id);
-  j.at("text").get_to(s.text);
-  j.at("user").get_to(s.user);
-  j.at("retweet_count").get_to(s.retweet_count);
-  j.at("favorite_count").get_to(s.favorite_count);
-}
-
-void from_json(const nlohmann::json &j, TwitterData &t) {
-  j.at("statuses").get_to(t.statuses);
-}
-
-// Helper functions for benchmarking
 std::string nlohmann_serialize(const TwitterData &data) {
-  nlohmann::json j = data;
-  return j.dump();
-}
-
-TwitterData nlohmann_deserialize(const std::string &json_str) {
-  nlohmann::json j = nlohmann::json::parse(json_str);
-  return j.get<TwitterData>();
+  return nlohmann_serialize(data.statuses);
 }
 
 #endif // NLOHMANN_TWITTER_DATA_H

benchmark/static_reflect/twitter_benchmark/rapidjson_twitter_data.h

@@ -1,142 +0,0 @@
-#ifndef RAPIDJSON_TWITTER_DATA_H
-#define RAPIDJSON_TWITTER_DATA_H
-
-#include "twitter_data.h"
-#include <rapidjson/document.h>
-#include <rapidjson/writer.h>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/error/en.h>
-
-using namespace rapidjson;
-
-// RapidJSON deserialization for simplified Twitter data
-TwitterData rapidjson_deserialize(const std::string& json_str) {
-    Document doc;
-    doc.Parse(json_str.c_str());
-
-    if (doc.HasParseError()) {
-        throw std::runtime_error("RapidJSON parse error");
-    }
-
-    TwitterData data;
-
-    if (!doc.HasMember("statuses") || !doc["statuses"].IsArray()) {
-        return data;
-    }
-
-    const Value& statuses = doc["statuses"];
-    data.statuses.reserve(statuses.Size());
-
-    for (SizeType i = 0; i < statuses.Size(); i++) {
-        const Value& status_json = statuses[i];
-        Status status;
-
-        // Parse status fields
-        if (status_json.HasMember("created_at") && status_json["created_at"].IsString())
-            status.created_at = status_json["created_at"].GetString();
-        if (status_json.HasMember("id") && status_json["id"].IsUint64())
-            status.id = status_json["id"].GetUint64();
-        if (status_json.HasMember("text") && status_json["text"].IsString())
-            status.text = status_json["text"].GetString();
-        if (status_json.HasMember("retweet_count") && status_json["retweet_count"].IsUint64())
-            status.retweet_count = status_json["retweet_count"].GetUint64();
-        if (status_json.HasMember("favorite_count") && status_json["favorite_count"].IsUint64())
-            status.favorite_count = status_json["favorite_count"].GetUint64();
-
-        // Parse user
-        if (status_json.HasMember("user") && status_json["user"].IsObject()) {
-            const Value& user_json = status_json["user"];
-            User user;
-
-            if (user_json.HasMember("id") && user_json["id"].IsUint64())
-                user.id = user_json["id"].GetUint64();
-            if (user_json.HasMember("name") && user_json["name"].IsString())
-                user.name = user_json["name"].GetString();
-            if (user_json.HasMember("screen_name") && user_json["screen_name"].IsString())
-                user.screen_name = user_json["screen_name"].GetString();
-            if (user_json.HasMember("location") && user_json["location"].IsString())
-                user.location = user_json["location"].GetString();
-            if (user_json.HasMember("description") && user_json["description"].IsString())
-                user.description = user_json["description"].GetString();
-            if (user_json.HasMember("verified") && user_json["verified"].IsBool())
-                user.verified = user_json["verified"].GetBool();
-            if (user_json.HasMember("followers_count") && user_json["followers_count"].IsUint64())
-                user.followers_count = user_json["followers_count"].GetUint64();
-            if (user_json.HasMember("friends_count") && user_json["friends_count"].IsUint64())
-                user.friends_count = user_json["friends_count"].GetUint64();
-            if (user_json.HasMember("statuses_count") && user_json["statuses_count"].IsUint64())
-                user.statuses_count = user_json["statuses_count"].GetUint64();
-
-            status.user = user;
-        }
-
-        data.statuses.push_back(status);
-    }
-
-    return data;
-}
-
-// RapidJSON serialization for simplified Twitter data
-std::string rapidjson_serialize(const TwitterData& data) {
-    Document doc;
-    doc.SetObject();
-    Document::AllocatorType& allocator = doc.GetAllocator();
-
-    Value statuses_array(kArrayType);
-
-    for (const auto& status : data.statuses) {
-        Value status_obj(kObjectType);
-
-        Value created_at;
-        created_at.SetString(status.created_at.c_str(), allocator);
-        status_obj.AddMember("created_at", created_at, allocator);
-
-        status_obj.AddMember("id", status.id, allocator);
-
-        Value text;
-        text.SetString(status.text.c_str(), allocator);
-        status_obj.AddMember("text", text, allocator);
-
-        // Add user
-        Value user_obj(kObjectType);
-        user_obj.AddMember("id", status.user.id, allocator);
-
-        Value name;
-        name.SetString(status.user.name.c_str(), allocator);
-        user_obj.AddMember("name", name, allocator);
-
-        Value screen_name;
-        screen_name.SetString(status.user.screen_name.c_str(), allocator);
-        user_obj.AddMember("screen_name", screen_name, allocator);
-
-        Value location;
-        location.SetString(status.user.location.c_str(), allocator);
-        user_obj.AddMember("location", location, allocator);
-
-        Value description;
-        description.SetString(status.user.description.c_str(), allocator);
-        user_obj.AddMember("description", description, allocator);
-
-        user_obj.AddMember("verified", status.user.verified, allocator);
-        user_obj.AddMember("followers_count", status.user.followers_count, allocator);
-        user_obj.AddMember("friends_count", status.user.friends_count, allocator);
-        user_obj.AddMember("statuses_count", status.user.statuses_count, allocator);
-
-        status_obj.AddMember("user", user_obj, allocator);
-
-        status_obj.AddMember("retweet_count", status.retweet_count, allocator);
-        status_obj.AddMember("favorite_count", status.favorite_count, allocator);
-
-        statuses_array.PushBack(status_obj, allocator);
-    }
-
-    doc.AddMember("statuses", statuses_array, allocator);
-
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    doc.Accept(writer);
-
-    return buffer.GetString();
-}
-
-#endif // RAPIDJSON_TWITTER_DATA_H

benchmark/static_reflect/twitter_benchmark/twitter_data.h

@@ -4,31 +4,68 @@
 #include <string>
 #include <vector>
 
-// Simplified Twitter structures for benchmarking
-
 struct User {
-  uint64_t id;
+  int64_t id;
+  std::string id_str;
   std::string name;
   std::string screen_name;
   std::string location;
   std::string description;
   bool verified;
-  uint64_t followers_count;
-  uint64_t friends_count;
-  uint64_t statuses_count;
+  int64_t followers_count;
+  int64_t friends_count;
+  int64_t statuses_count;
+  bool operator<=>(const User &other) const = default;
+};
+
+struct Hashtag {
+  std::string text;
+  int64_t indices_start;
+  int64_t indices_end;
+  bool operator<=>(const Hashtag &other) const = default;
+};
+
+struct Url {
+  std::string url;
+  std::string expanded_url;
+  std::string display_url;
+  int64_t indices_start;
+  int64_t indices_end;
+  bool operator<=>(const Url &other) const = default;
+};
+
+struct UserMention {
+  int64_t id;
+  std::string name;
+  std::string screen_name;
+  int64_t indices_start;
+  int64_t indices_end;
+  bool operator<=>(const UserMention &other) const = default;
+};
+
+struct Entities {
+  std::vector<Hashtag> hashtags;
+  std::vector<Url> urls;
+  std::vector<UserMention> user_mentions;
+  bool operator==(const Entities &other) const = default;
 };
 
 struct Status {
   std::string created_at;
-  uint64_t id;
+  int64_t id;
   std::string text;
   User user;
-  uint64_t retweet_count;
-  uint64_t favorite_count;
+  Entities entities;
+  int64_t retweet_count;
+  int64_t favorite_count;
+  bool favorited;
+  bool retweeted;
+  bool operator==(const Status &other) const = default;
 };
 
 struct TwitterData {
   std::vector<Status> statuses;
+  bool operator==(const TwitterData &other) const = default;
 };
 
-#endif // TWITTER_DATA_H
+#endif

benchmark/static_reflect/twitter_benchmark/yyjson_twitter_data.h

@@ -1,145 +0,0 @@
-#ifndef YYJSON_TWITTER_DATA_H
-#define YYJSON_TWITTER_DATA_H
-
-#include "twitter_data.h"
-#include <yyjson.h>
-#include <string>
-#include <stdexcept>
-
-// yyjson deserialization for simplified Twitter data
-TwitterData yyjson_deserialize(const std::string &json_str) {
-    TwitterData data;
-
-    yyjson_doc *doc = yyjson_read(json_str.c_str(), json_str.size(), 0);
-    if (!doc) {
-        throw std::runtime_error("yyjson parse error");
-    }
-
-    yyjson_val *root = yyjson_doc_get_root(doc);
-    if (!root) {
-        yyjson_doc_free(doc);
-        return data;
-    }
-
-    // Get statuses array
-    yyjson_val *statuses_val = yyjson_obj_get(root, "statuses");
-    if (!statuses_val || !yyjson_is_arr(statuses_val)) {
-        yyjson_doc_free(doc);
-        return data;
-    }
-
-    size_t idx, max;
-    yyjson_val *status_val;
-    yyjson_arr_foreach(statuses_val, idx, max, status_val) {
-        Status status;
-
-        // Parse status fields
-        yyjson_val *val;
-
-        val = yyjson_obj_get(status_val, "created_at");
-        if (val && yyjson_is_str(val)) status.created_at = yyjson_get_str(val);
-
-        val = yyjson_obj_get(status_val, "id");
-        if (val && yyjson_is_uint(val)) status.id = yyjson_get_uint(val);
-
-        val = yyjson_obj_get(status_val, "text");
-        if (val && yyjson_is_str(val)) status.text = yyjson_get_str(val);
-
-        val = yyjson_obj_get(status_val, "retweet_count");
-        if (val && yyjson_is_uint(val)) status.retweet_count = yyjson_get_uint(val);
-
-        val = yyjson_obj_get(status_val, "favorite_count");
-        if (val && yyjson_is_uint(val)) status.favorite_count = yyjson_get_uint(val);
-
-        // Parse user
-        yyjson_val *user_val = yyjson_obj_get(status_val, "user");
-        if (user_val && yyjson_is_obj(user_val)) {
-            User user;
-
-            val = yyjson_obj_get(user_val, "id");
-            if (val && yyjson_is_uint(val)) user.id = yyjson_get_uint(val);
-
-            val = yyjson_obj_get(user_val, "name");
-            if (val && yyjson_is_str(val)) user.name = yyjson_get_str(val);
-
-            val = yyjson_obj_get(user_val, "screen_name");
-            if (val && yyjson_is_str(val)) user.screen_name = yyjson_get_str(val);
-
-            val = yyjson_obj_get(user_val, "location");
-            if (val && yyjson_is_str(val)) user.location = yyjson_get_str(val);
-
-            val = yyjson_obj_get(user_val, "description");
-            if (val && yyjson_is_str(val)) user.description = yyjson_get_str(val);
-
-            val = yyjson_obj_get(user_val, "verified");
-            if (val && yyjson_is_bool(val)) user.verified = yyjson_get_bool(val);
-
-            val = yyjson_obj_get(user_val, "followers_count");
-            if (val && yyjson_is_uint(val)) user.followers_count = yyjson_get_uint(val);
-
-            val = yyjson_obj_get(user_val, "friends_count");
-            if (val && yyjson_is_uint(val)) user.friends_count = yyjson_get_uint(val);
-
-            val = yyjson_obj_get(user_val, "statuses_count");
-            if (val && yyjson_is_uint(val)) user.statuses_count = yyjson_get_uint(val);
-
-            status.user = user;
-        }
-
-        data.statuses.push_back(status);
-    }
-
-    yyjson_doc_free(doc);
-    return data;
-}
-
-// yyjson serialization for simplified Twitter data
-std::string yyjson_serialize(const TwitterData &data) {
-    yyjson_mut_doc *doc = yyjson_mut_doc_new(NULL);
-    yyjson_mut_val *root = yyjson_mut_obj(doc);
-    yyjson_mut_doc_set_root(doc, root);
-
-    // Create statuses array
-    yyjson_mut_val *statuses_array = yyjson_mut_arr(doc);
-
-    for (const auto& status : data.statuses) {
-        yyjson_mut_val *status_obj = yyjson_mut_obj(doc);
-
-        // Add status fields
-        yyjson_mut_obj_add_str(doc, status_obj, "created_at", status.created_at.c_str());
-        yyjson_mut_obj_add_uint(doc, status_obj, "id", status.id);
-        yyjson_mut_obj_add_str(doc, status_obj, "text", status.text.c_str());
-
-        // User object
-        yyjson_mut_val *user_obj = yyjson_mut_obj(doc);
-        yyjson_mut_obj_add_uint(doc, user_obj, "id", status.user.id);
-        yyjson_mut_obj_add_str(doc, user_obj, "name", status.user.name.c_str());
-        yyjson_mut_obj_add_str(doc, user_obj, "screen_name", status.user.screen_name.c_str());
-        yyjson_mut_obj_add_str(doc, user_obj, "location", status.user.location.c_str());
-        yyjson_mut_obj_add_str(doc, user_obj, "description", status.user.description.c_str());
-        yyjson_mut_obj_add_bool(doc, user_obj, "verified", status.user.verified);
-        yyjson_mut_obj_add_uint(doc, user_obj, "followers_count", status.user.followers_count);
-        yyjson_mut_obj_add_uint(doc, user_obj, "friends_count", status.user.friends_count);
-        yyjson_mut_obj_add_uint(doc, user_obj, "statuses_count", status.user.statuses_count);
-        yyjson_mut_obj_add_val(doc, status_obj, "user", user_obj);
-
-        // Other fields
-        yyjson_mut_obj_add_uint(doc, status_obj, "retweet_count", status.retweet_count);
-        yyjson_mut_obj_add_uint(doc, status_obj, "favorite_count", status.favorite_count);
-
-        yyjson_mut_arr_append(statuses_array, status_obj);
-    }
-
-    // Add statuses array to root
-    yyjson_mut_obj_add_val(doc, root, "statuses", statuses_array);
-
-    // Write to string
-    char *json_output = yyjson_mut_write(doc, 0, NULL);
-    std::string result(json_output);
-    free(json_output);
-    yyjson_mut_doc_free(doc);
-
-    return result;
-}
-
-#endif // YYJSON_TWITTER_DATA_H

benchmark/top_tweet/yyjson.h

@@ -51,26 +51,18 @@ struct yyjson_base {
 
 struct yyjson : yyjson_base {
   bool run(simdjson::padded_string &json, int64_t max_retweet_count, top_tweet_result<StringType> &result) {
-    yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
-    bool b = yyjson_base::run(doc, max_retweet_count, result);
-    yyjson_doc_free(doc);
-    return b;
+    return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), max_retweet_count, result);
   }
 };
 BENCHMARK_TEMPLATE(top_tweet, yyjson)->UseManualTime();
-
 #if SIMDJSON_COMPETITION_ONDEMAND_INSITU
 struct yyjson_insitu : yyjson_base {
   bool run(simdjson::padded_string &json, int64_t max_retweet_count, top_tweet_result<StringType> &result) {
-    yyjson_doc *doc = yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
-    bool b = yyjson_base::run(doc, max_retweet_count, result);
-    yyjson_doc_free(doc);
-    return b;
+    return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), max_retweet_count, result);
   }
 };
 BENCHMARK_TEMPLATE(top_tweet, yyjson_insitu)->UseManualTime();
 #endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
-
 } // namespace top_tweet
 
 #endif // SIMDJSON_COMPETITION_YYJSON

cmake/developer-options.cmake

@@ -174,10 +174,6 @@ else()
       -Werror -Wall -Wextra -Weffc++ -Wsign-compare -Wshadow -Wwrite-strings
       -Wpointer-arith -Winit-self -Wconversion -Wno-sign-conversion
   )
-  if(CMAKE_CXX_STANDARD VERSION_GREATER_EQUAL 20)
-    target_compile_options(simdjson-internal-flags INTERFACE -Wctad-maybe-unsupported)
-  endif()
-
 endif()
 
 option(SIMDJSON_GLIBCXX_ASSERTIONS "Set _GLIBCXX_ASSERTIONS" OFF)

cmake/exception-flags.cmake

@@ -17,9 +17,8 @@ editing CMAKE_CXX_FLAGS")
     # /EHc used in conjection with /EHs indicates that extern "C" functions
     # never throw (terminate-on-throw)
     # Here, we disable both with the - argument negation operator
-    if(CMAKE_CXX_FLAGS)
-        string(REPLACE "/EHsc" "/EHs-c-" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-    endif()
+    string(REPLACE "/EHsc" "/EHs-c-" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+
     # Because we cannot change the flag above on an individual target (yet), the
     # definition below must similarly be added globally
     add_definitions(-D_HAS_EXCEPTIONS=0)

cmake/implementation-flags.cmake

@@ -1,7 +1,7 @@
 #
 # Implementation selection
 #
-set(SIMDJSON_ALL_IMPLEMENTATIONS fallback westmere haswell icelake arm64 ppc64)
+set(SIMDJSON_ALL_IMPLEMENTATIONS fallback westmere haswell icelake arm64 ppc64 rvv)
 
 set(
     SIMDJSON_IMPLEMENTATION ""
@@ -15,7 +15,7 @@ set(
     SIMDJSON_EXCLUDE_IMPLEMENTATION ""
     CACHE STRING "\
 Semicolon-separated list of implementations to exclude \
-(icelake/haswell/westmere/arm64/ppc64/fallback). By default, excludes any \
+(icelake/haswell/westmere/arm64/ppc64/rvv/fallback). By default, excludes any \
 implementations that are unsupported at compile time or cannot be selected at \
 runtime."
 )

doc/basics_doxygen.md

@@ -1,8 +1,5 @@
 We take our documentation seriously. Please start reading the documentation before you attempt to use simdjson. We hope you will enjoy reading us.
 
-* [Basics](doc/basics.md) is an overview of how to use simdjson and its APIs.
-* [Builder](doc/builder.md) is an overview of how to efficiently write JSON strings using simdjson.
-* [Performance](doc/performance.md) shows some more advanced scenarios and how to tune for them.
-* [Implementation Selection](doc/implementation-selection.md) describes runtime CPU detection and
-  how you can work with it.
-* [API](https://simdjson.github.io/simdjson/) contains the automatically generated API documentation.
+* Basics: https://github.com/simdjson/simdjson/blob/master/doc/basics.md is an overview of how to use simdjson and its APIs.
+* iterate_many: https://github.com/simdjson/simdjson/blob/master/doc/iterate_many.md describes an interface providing features to work with files or streams containing multiple small JSON documents. As fast and convenient as possible.
+* Performance: https://github.com/simdjson/simdjson/blob/master/doc/performance.md shows some more advanced scenarios and how to tune for them.

doc/builder.md

@@ -14,7 +14,6 @@ speed and high convenience.
   * [C++26 static reflection](#c--26-static-reflection)
     + [Without `string_buffer` instance](#without--string-buffer--instance)
     + [Without `string_buffer` instance but with explicit error handling](#without--string-buffer--instance-but-with-explicit-error-handling)
-    + [Pretty formatted (fractured JSON)](#pretty-formatted-fractured-json)
 
 Overview: string_builder
 ---------------------------
@@ -35,15 +34,14 @@ It has the following methods to add content to the string:
 - `append_null()`: Appends the string "null" to the JSON buffer.
 - `clear()`: Clears the contents of the JSON buffer, resetting the position to 0 while retaining the allocated capacity.
 - `escape_and_append(std::string_view input)`: Appends a string view to the JSON buffer after escaping special characters (e.g., quotes, backslashes) as required by JSON.
-- `escape_and_append_with_quotes(std::string_view input)` Appends a string view surrounded by double quotes (e.g., "input") to the JSON buffer after escaping special characters. For constant strings, you may also do `escape_and_append_with_quotes<"mystring">()`.
+- `escape_and_append_with_quotes(std::string_view input)` Appends a string view surrounded by double quotes (e.g., "input") to the JSON buffer after escaping special characters.
+Parameters:
 - `escape_and_append_with_quotes(char input)`: Appends a single character surrounded by double quotes (e.g., "c") to the JSON buffer after escaping it if necessary.
 - `append_raw(const char *c)`: Appends a null-terminated C string directly to the JSON buffer without escaping.
 - `append_raw(std::string_view input)`: Appends a string view directly to the JSON buffer without escaping.
 - `append_raw(const char *str, size_t len)`: Appends a specified number of characters from a C string directly to the JSON
-- `append_key_value(key,value)`: Appends a key and a value (`"json":somevalue`)
-- `append_key_value<"mykey">(value)`: Appends a key and a value (`"json":somevalue`), useful when the key is a compile-time constant (C++20).
 
-After writing the content, if you have reasons to believe that the content might violate UTF-8 conventions, you can check it as follows:
+After writting the content, if you have reasons to believe that the content might violate UTF-8 conventions, you can check it as follows:
 
 - `validate_unicode()`: Checks if the content in the JSON buffer is valid UTF-8. Returns: true if the content is valid UTF-8, false otherwise.
 
@@ -54,14 +52,14 @@ Once you are satisfied, you can recover the string as follows:
 
 - `operator std::string()`: Converts the JSON buffer to an std::string. (Might throw if an error occurred.)
 - `operator std::string_view()`: Converts the JSON buffer to an std::string_view.  (Might throw if an error occurred.)
-- `view()`: Returns a view of the written JSON buffer as a `simdjson_result<std::string_view>` (C++20).
+- `view()`: Returns a view of the written JSON buffer as a `simdjson_result<std::string_view>`.
 
 The later method (`view()`) is recommended.  For performance reasons, we expect you to explicitly call `validate_unicode()` as needed (e.g., prior to calling `view()`).
 
 Example: string_builder
 ---------------------------
 
-```cpp
+```C++
 struct Car {
     std::string make;
     std::string model;
@@ -133,20 +131,20 @@ In all cases, the `std::string_view` instance depends the corresponding `string_
 
 
 
-If you have C++20, you can simplify the code, as the `std::vector<double>` is automatically supported. Further, we can pass the keys (which are compile-time
-constant) as template parameter (for improved performance).
+If you have C++20, you can simplify the code, as the `std::vector<double>` is automatically
+supported.
 
 ```cpp
     Car c = {"Toyota", "Corolla", 2017, {30.0,30.2,30.513,30.79}};
     simdjson::builder::string_builder sb;
     sb.start_object();
-    sb.append_key_value<"make">(c.make);
+    sb.append_key_value("make", c.make);
     sb.append_comma();
-    sb.append_key_value<"model">(c.model);
+    sb.append_key_value("model", c.model);
     sb.append_comma();
-    sb.append_key_value<"year">(c.year);
+    sb.append_key_value("year", c.year);
     sb.append_comma();
-    sb.append_key_value<"tire_pressure">(c.tire_pressure);
+    sb.append_key_value("tire_pressure", c.tire_pressure);
     sb.end_object();
     std::string_view p = sb.view();
 ```
@@ -177,52 +175,9 @@ std::vector<std::vector<double>> c = {{1.0, 2.0}, {3.0, 4.0}};
 std::string json = simdjson::to_json(c);
 ```
 
-We also have an overload for when you want to reuse the same `std::string` instance:
-
-
-```cpp
-std::vector<std::vector<double>> c = {{1.0, 2.0}, {3.0, 4.0}};
-std::string json;
-auto error = simdjson::to_json(c, json);
-if(error) { /* there was an error */ }
-```
-
-
 We do recommend that you create and reuse the `string_builder` instance for performance
 reasons.
 
-You can also add custom serialization functions using a `tag_invoke` function.
-For example, the following
-function will allow you to serialize instances of the type `Car`.
-
-```cpp
-#include <simdjson>
-
-struct Car {
-  std::string make;
-  std::string model;
-  int64_t year;
-  std::vector<float> tire_pressure;
-};
-
-namespace simdjson {
-
-template <typename builder_type>
-void tag_invoke(serialize_tag, builder_type &builder, const Car& car) {
-  builder.start_object();
-  builder.append_key_value("make", car.make);
-  builder.append_comma();
-  builder.append_key_value("model", car.model);
-  builder.append_comma();
-  builder.append_key_value("year", car.year);
-  builder.append_comma();
-  builder.append_key_value("tire_pressure", car.tire_pressure);
-  builder.end_object();
-}
-
-} // namespace simdjson
-```
-
 C++26 static reflection
 ------------------------
 
@@ -284,38 +239,7 @@ with the `simdjson::to_json` template function.
 If you know the output size, in bytes, of your JSON string, you may
 pass it as a second parameter (e.g., `simdjson::to_json(c, 31123)`).
 
-Sometimes you may want to reuse the same `std::string` instance. We
-have an overload for this purpose:
 
-```cpp
-Car c = {"Toyota", "Corolla", 2017, {30.0,30.2,30.513,30.79}};
-std::string s;
-auto error = simdjson::to_json(c, s);
-if(error) { /* there was an error */ }
-```
-
-You can then also add a third parameter for the expected output size in bytes.
-
-### Extracting just some fields
-In some instances, your class might have many fields that you do not want to serialize.
-You can achieve this result with the `simdjson::extract_from` template. In the following
-example, we serialize only the `year` and `price` fields on the `Car` instance.
-```cpp
-struct Car {
-    std::string make;
-    std::string model;
-    int year;
-    double price;
-    bool electric;
-};
-Car car{"Ford", "F-150", 2024, 55000.0, false};
-// Extract year and price
-std::string json_result = simdjson::extract_from<"year", "price">(car);
-// Alternatively:
-// std::string json_result;
-// auto error =  extract_from<"year", "price">(car).get(json_result);
-// if(error) { /* error handling */ }
-```
 
 ### Without `string_buffer` instance but with explicit error handling
 
@@ -324,90 +248,9 @@ pattern:
 
 ```cpp
   std::string json;
-  if(simdjson::to_json(c).get(json)) {
+  if(simdjson::to(c).get(json)) {
     // there was an error
   } else {
     // json contain the serialized JSON
   }
-```
-
-### Customization
-
-If you want to serialize a value in a custom way, you can do it with a
-`tag_invoke` specialization like the following example which will map
-the year attribute to a string.
-
-
-```cpp
-#include <simdjson>
-
-struct Car {
-  std::string make;
-  std::string model;
-  int64_t year;
-  std::vector<float> tire_pressure;
-};
-
-namespace simdjson {
-
-template <typename builder_type>
-void tag_invoke(serialize_tag, builder_type &builder, const Car& car) {
-  builder.start_object();
-  builder.append_key_value("make", car.make);
-  builder.append_comma();
-  builder.append_key_value("model", car.model);
-  builder.append_comma();
-  builder.append_key_value("year", std::to_string(car.year));
-  builder.append_comma();
-  builder.append_key_value("tire_pressure", car.tire_pressure);
-  builder.end_object();
-}
-
-} // namespace simdjson
-```
-
-### Pretty formatted (fractured JSON)
-
-In some instances, you may want your JSON to be more readable. For this pupose, we also
-support the Fractured JSON standard.
-
-```Cpp
-  TableTestData data{
-    {{1, "Alice", true}, {2, "Bob", false}, {3, "Carol", true}, {4, "Dave", false}}
-  };
-
-  fractured_json_options opts;
-  opts.enable_table_format = true;
-  opts.min_table_rows = 3;
-
-  std::string formatted = simdjson::to_fractured_json_string(data, opts);
-```
-
-The result might be as follows.
-
-```json
-{
-    "records": [
-        { "active": true , "id": 1, "name": "Alice" },
-        { "active": false, "id": 2, "name": "Bob" },
-        { "active": true , "id": 3, "name": "Carol" },
-        { "active": false, "id": 4, "name": "Dave" }
-    ]
-}
-```
-
-The `fractured_json_options` struct allows you to customize the formatting behavior. It includes the following options:
-
-- `max_total_line_length` (default: 120): Maximum total characters per line. Content exceeding this will be expanded to multiple lines.
-- `max_inline_length` (default: 80): Maximum length for inlined elements. Simple arrays/objects shorter than this may be rendered inline.
-- `max_inline_complexity` (default: 2): Maximum nesting depth for inline rendering. Elements with complexity exceeding this will be expanded. Complexity 0 = scalar, 1 = flat array/object, 2 = one level of nesting.
-- `max_compact_array_complexity` (default: 1): Maximum complexity for compact array formatting. Arrays with elements of this complexity or less may have multiple items per line.
-- `indent_spaces` (default: 4): Number of spaces per indentation level.
-- `enable_table_format` (default: true): Enable tabular formatting for arrays of similar objects. When enabled, arrays of objects with identical keys are formatted as aligned tables.
-- `min_table_rows` (default: 3): Minimum number of rows to trigger table mode.
-- `table_similarity_threshold` (default: 0.8): Similarity threshold for table detection. Objects must share at least this fraction of keys to be formatted as a table.
-- `enable_compact_multiline` (default: true): Enable compact multiline arrays. When enabled, arrays of simple elements may have multiple items per line.
-- `max_items_per_line` (default: 10): Maximum array items per line in compact mode.
-- `simple_bracket_padding` (default: true): Add space inside brackets for simple containers. When true: `{ "key": "value" }`, when false: `{"key": "value"}`.
-- `colon_padding` (default: true): Add space after colons. When true: `"key": "value"`, when false: `"key":"value"`.
-- `comma_padding` (default: true): Add space after commas in inline content. When true: `[1, 2, 3]`, when false: `[1,2,3]`.
+```

doc/compile_time.md

@@ -1,227 +0,0 @@
-# Parse json at compile time
-   * [Introduction](#introduction)
-   * [Example](#example)
-   * [Concepts](#concepts)
-   * [Loading from disk](#loading-from-disk)
-   * [Limitations (compile-time errors)](#limitations-compile-time-errors)
-
-
-## Introduction
-In some instances, you may want to configure your software at compile-time with a JSON document.
-Maybe you have a single code base but many different possible configurations, all resulting in
-different software. For example, you might be programming robots, using the same software, but
-different robot configurations.
-
-To achieve the desired result, you have a few options. You may start the software and parser a
-JSON file at runtime. Or you might convert your JSON data into C++ code that you can compile with
-your software.
-
-With C++26, there is another way: parse the JSON file along with your C++ code. In this manner,
-the JSON data becomes native C++ data.
-
-The simdjson library supports parsing JSON documents at compile time if you have C++26 support. To
-activate C++26 reflection support, you can compile
-your code with the `SIMDJSON_STATIC_REFLECTION` macro set:
-
-```cpp
-#define SIMDJSON_STATIC_REFLECTION 1
-//...
-#include "simdjson.h"
-```
-
-The `simdjson::compile_time::parse_json` function parses a JSON document at **compile time** and returns a `constexpr` structure reflecting its content. We support the full range of JSON values, which are mapped to C++ types as in
-the following table.
-
-
-| JSON type      | C++ type                         |
-|----------------|----------------------------------|
-| object         | anonymous struct                 |
-| array          | `std::array<T, N>` (homogeneous) |
-| string         | `const char*` (UTF-8)            |
-| number         | `int64_t`, `uint64_t`, `double`  |
-| `true`/`false` | `bool`                           |
-| `null`         | `std::nullptr_t`                 |
-
-## Example
-
-Suppose you want to parse the following JSON document:
-
-```cpp
-{
-    "port": 8080,
-    "host": "localhost",
-    "debug": true
-}
-```
-
-**Reminder**: In C++, `R"( )"` allows us to write multi-line strings with unescaped quotes.
-
-
-You can do so, at compile-time, as follows:
-
-
-```cpp
-constexpr auto cfg = R"(
-
-{
-    "port": 8080,
-    "host": "localhost",
-    "debug": true
-}
-
-)"_json;
-
-// cfg.port == 8080
-// std::string_view(cfg.host) == "localhost"
-// cfg.debug == true
-```
-
-You can nest objects and arrays:
-
-```cpp
-constexpr auto data = R"(
-
-{
-    "servers": [
-        {"host": "s1", "port": 3000},
-        {"host": "s2", "port": 3001}
-    ]
-}
-
-)"_json;
-
-
-// data.servers.size() == 2
-// std::string_view(data.servers[0].host) == "s1"
-```
-
-Top-level arrays are allowed:
-
-```cpp
-constexpr auto arr = R"(
-
-[1, 2, 3]
-
-)"_json;
-static_assert(arr.size() == 3);
-static_assert(arr[1] == 2);
-```
-
-
-## Concepts
-
-Given that the parsed data is made of structures that depend on the JSON input, you might
-want to check that it conforms to your expectation. You can do so with concepts.
-
-Let us consider this example:
-
-```cpp
-    constexpr auto config = R"(
-
-    [
-      { "name": "Alice", "age": 30 },
-      { "name": "Bob", "age": 25 },
-      { "name": "Charlie", "age": 35 }
-    ]
-
-    )"_json;
-```
-
-You might want to ensure that the result is an array of persons. You can define your
-expectation with concepts like so:
-
-```cpp
-template <typename T>
-concept person = requires(T p) {
-    std::string_view(p.name);  // has name field convertible to string_view
-    p.age;                     // has age field
-    requires std::is_integral_v<decltype(p.age)>;  // age is integral
-};
-
-/**
- * Concept to validate that a type is an array of person objects
- */
-template <typename T>
-concept array_of_person = requires(T arr) {
-    arr.size();                    // has size method
-    arr[0];                        // can access elements with []
-    requires person<decltype(arr[0])>;  // elements satisfy person concept
-};
-```
-
-And then a simple static assert with `decltype` is sufficient to check that the expectation is met:
-
-```cpp
-  constexpr auto config = R"(
-
-  [
-    { "name": "Alice", "age": 30 },
-    { "name": "Bob", "age": 25 },
-    { "name": "Charlie", "age": 35 }
-  ]
-
-  )"_json;
-
-
-  // Validate that the array satisfies the array_of_person concept
-  static_assert(array_of_person<decltype(config)>);
-```
-
-
-
-## Loading from disk
-
-In practice, you may have a JSON file, say `json_data` that you want to parse
-at compile time. You may do so as follows.
-
-```c++
-constexpr const char json_data[] = {
-    #embed "test.json"
-    , 0
-};
-
-constexpr auto json = simdjson::compile_time::parse_json<json_data>();
-```
-
-
-## Limitations (compile-time errors)
-
-We have a few limitations which trigger compile-time errors if violated.
-
-
-- Only JSON objects and arrays are supported at the top level (no primitives).
-  We will lift this limitation in the future.
-- Strings are represented using the `const char*` in UTF-8, but they must not
-  contain embedded nulls. We would prefer to represent them as std::string or
-  std::string_view, and hope to do so in the future.
-- Heterogeneous arrays are not supported yet. E.g., you need to have arrays of
-  all integers, or all strings, all floats, all compatible objects, etc.
-  For example, the following is accepted:
-  ```json
-   [
-    { "name": "Alice", "age": 30 },
-    { "name": "Bob", "age": 25 },
-    { "name": "Charlie", "age": 35 }
-  ]
-  ```
-  but the following is not:
-  ```json
-  [
-    { "name": "Alice", "age": 30 },
-    "Just a string",
-    42,
-    { "name": "Charlie", "age": 35 }
-  ]
-  ```
-  We may support heterogeneous arrays in the future with std::variant types.
-- We parse the first JSON document encountered in the string. Trailing
-  characters are ignored. Thus if your JSON begins with {"a":1}, everything
-  after the closing brace is ignored. This limitation will be lifted in the future,
-  reporting an error.
-
-These limitations are safe in the sense that they result in compile-time errors.
-Thus you will not get truncated strings or imprecise floats silently.
-
-
-Although we are committed to maintaining the functionality in the long run, the
-`compile_time::parse_json` function is subject to change.

doc/compile_time_accessors.md

@@ -1,445 +0,0 @@
-# Compile-Time JSONPath and JSON Pointer Accessors
-
-**Note:** This feature requires C++26 Static Reflection support (P2996) and is currently only available with experimental compilers. You must enable it with `-DSIMDJSON_STATIC_REFLECTION=ON` when building.
-
-## Overview
-
-simdjson provides compile-time JSONPath and JSON Pointer accessors that validate paths against struct definitions at compile time and generate optimized accessor code with zero runtime overhead. This combines the safety of compile-time type checking with the performance of pre-parsed, pre-validated access paths.
-
-## Requirements
-
-- C++26 compiler with Static Reflection support (P2996)
-- Experimental compiler flags:
-  - Clang with P2996 support: `-std=c++26 -freflection -fexpansion-statements`
-- Build configuration: `-DSIMDJSON_STATIC_REFLECTION=ON`
-
-## How It Works
-
-**Compile Time:**
-1. Path string is parsed and converted to access steps
-2. Path is validated against struct definition using reflection
-3. Field types are checked and verified
-4. Optimized accessor code is generated
-
-**Runtime:**
-- Direct navigation with no parsing
-- No validation overhead
-- No string comparisons for path components
-- Type-safe extraction
-
-## Two Usage Modes
-
-### Mode 1: With Type Validation (Recommended)
-
-When you provide a struct type, the compiler validates the entire path at compile time:
-
-```cpp
-struct User {
-  std::string name;
-  int age;
-  std::vector<std::string> emails;
-};
-
-//  R"( ... )" is a C++ raw string literal.
-const padded_string json = R"({
-  "name": "Alice",
-  "age": 30,
-  "emails": ["alice@example.com", "alice@work.com"]
-})"_padded;
-
-ondemand::parser parser;
-auto doc = parser.iterate(json);
-
-// Compile-time validation: checks that User has "name" field of type std::string
-std::string name;
-auto result = ondemand::json_path::at_path_compiled<User, ".name">(doc);
-result.get(name); // name = "Alice"
-
-// Compile-time validation: checks that "emails" is array-like with string elements
-std::string email;
-result = ondemand::json_path::at_path_compiled<User, ".emails[0]">(doc);
-result.get(email); // email = "alice@example.com"
-```
-
-**Benefits:**
-- **Compile-time errors** if path doesn't exist in struct
-- **Type safety** - verifies field types match expected types
-- **Refactoring protection** - renaming struct fields causes compile errors
-
-**What gets validated:**
-- Field existence
-- Field types
-- Array/container access validity
-- Nested struct navigation
-
-### Mode 2: Without Validation
-
-When you omit the struct type, the path is parsed at compile time but not validated:
-
-```cpp
-const padded_string json = R"({
-  "name": "Alice",
-  "age": 30,
-  "address": {"city": "Boston"}
-})"_padded;
-
-ondemand::parser parser;
-auto doc = parser.iterate(json);
-
-// No compile-time validation - path is only parsed
-std::string name;
-auto result = ondemand::json_path::at_path_compiled<".name">(doc);
-result.get(name); // name = "Alice"
-
-std::string_view city;
-result = ondemand::json_path::at_path_compiled<".address.city">(doc);
-result.get(city); // city = "Boston"
-```
-
-**Benefits:**
-- Works with dynamic/unknown JSON structures
-- Still benefits from compile-time path parsing
-- No runtime string parsing overhead
-
-**Use when:**
-- JSON structure is not known at compile time
-- Working with varied JSON schemas
-- Prototyping or exploratory parsing
-
-## JSONPath Syntax
-
-JSONPath uses dot notation and bracket notation for field access:
-
-### Supported Syntax
-
-| Syntax | Description | Example |
-|--------|-------------|---------|
-| `.field` | Dot notation for field access | `.name`, `.address.city` |
-| `["field"]` | Bracket notation with quotes | `["name"]`, `["address"]["city"]` |
-| `[index]` | Array index access | `[0]`, `[1]` |
-| Mixed | Combination of notations | `.emails[0]`, `["users"][0].name` |
-| `$` prefix | Optional root indicator | `$.name`, `$["name"]` |
-
-### Examples
-
-```cpp
-struct Address {
-  std::string city;
-  int zip;
-};
-
-struct Person {
-  std::string name;
-  int age;
-  Address address;
-  std::vector<std::string> emails;
-};
-
-// Dot notation
-at_path_compiled<Person, ".name">(doc)
-at_path_compiled<Person, ".address.city">(doc)
-
-// Bracket notation
-at_path_compiled<Person, "[\"name\"]">(doc)
-at_path_compiled<Person, "[\"address\"][\"city\"]">(doc)
-
-// Array access
-at_path_compiled<Person, ".emails[0]">(doc)
-at_path_compiled<Person, ".emails[1]">(doc)
-
-// Mixed notation
-at_path_compiled<Person, ".address[\"zip\"]">(doc)
-at_path_compiled<Person, "[\"emails\"][0]">(doc)
-
-// With root indicator
-at_path_compiled<Person, "$.name">(doc)
-at_path_compiled<Person, "$.address.city">(doc)
-```
-
-## JSON Pointer Syntax
-
-JSON Pointer (RFC 6901) uses slash-separated paths:
-
-### Supported Syntax
-
-| Syntax | Description | Example |
-|--------|-------------|---------|
-| `/field` | Field access | `/name`, `/address/city` |
-| `/index` | Array index | `/0`, `/1` |
-| `~0` | Escaped `~` | `/field~0name` → field~name |
-| `~1` | Escaped `/` | `/field~1name` → field/name |
-
-### Examples
-
-```cpp
-struct Car {
-  std::string make;
-  std::string model;
-  int64_t year;
-  std::vector<double> tire_pressure;
-};
-
-// Field access
-at_pointer_compiled<Car, "/make">(doc)
-at_pointer_compiled<Car, "/model">(doc)
-
-// Array access
-at_pointer_compiled<Car, "/tire_pressure/0">(doc)
-at_pointer_compiled<Car, "/tire_pressure/1">(doc)
-
-// Root pointer (returns whole document)
-at_pointer_compiled<Car, "">(doc)
-at_pointer_compiled<Car, "/">(doc)
-```
-
-## API Reference
-
-### JSONPath Functions
-
-```cpp
-// With type validation
-template<typename T, constevalutil::fixed_string Path, typename DocOrValue>
-simdjson_result<value> at_path_compiled(DocOrValue& doc_or_val);
-
-// Without validation
-template<constevalutil::fixed_string Path, typename DocOrValue>
-simdjson_result<value> at_path_compiled(DocOrValue& doc_or_val);
-```
-
-### JSON Pointer Functions
-
-```cpp
-// With type validation
-template<typename T, constevalutil::fixed_string Pointer, typename DocOrValue>
-simdjson_result<value> at_pointer_compiled(DocOrValue& doc_or_val);
-
-// Without validation
-template<constevalutil::fixed_string Pointer, typename DocOrValue>
-simdjson_result<value> at_pointer_compiled(DocOrValue& doc_or_val);
-```
-
-### Direct Field Extraction
-
-Extract values directly into variables with compile-time type checking:
-
-```cpp
-// JSONPath
-template<typename T, constevalutil::fixed_string Path>
-struct path_accessor {
-  template<typename DocOrValue, typename FieldType>
-  static error_code extract_field(DocOrValue& doc_or_val, FieldType& target);
-};
-
-// JSON Pointer
-template<typename T, constevalutil::fixed_string Pointer>
-struct pointer_accessor {
-  template<typename DocOrValue, typename FieldType>
-  static error_code extract_field(DocOrValue& doc_or_val, FieldType& target);
-};
-```
-
-**Example:**
-
-```cpp
-struct User {
-  std::string name;
-  int age;
-};
-
-ondemand::parser parser;
-auto doc = parser.iterate(json);
-
-// Extract directly into variable
-std::string name;
-ondemand::json_path::path_accessor<User, ".name">::extract_field(doc, name);
-
-int age;
-ondemand::json_path::pointer_accessor<User, "/age">::extract_field(doc, age);
-```
-
-The compiler verifies that the target variable type matches the field type at the path.
-
-## Complete Examples
-
-### Example 1: Validated Access
-
-```cpp
-#include "simdjson.h"
-using namespace simdjson;
-
-struct Car {
-  std::string make;
-  std::string model;
-  int64_t year;
-  std::vector<double> tire_pressure;
-};
-
-int main() {
-  const padded_string json = R"({
-    "make": "Toyota",
-    "model": "Camry",
-    "year": 2018,
-    "tire_pressure": [40.1, 39.9, 37.7, 40.4]
-  })"_padded;
-
-  ondemand::parser parser;
-  auto doc = parser.iterate(json);
-
-  // Type-validated access
-  std::string make;
-  auto result = ondemand::json_path::at_path_compiled<Car, ".make">(doc);
-  result.get(make); // make = "Toyota"
-
-  // Array access with validation
-  double pressure;
-  result = ondemand::json_path::at_path_compiled<Car, ".tire_pressure[1]">(doc);
-  result.get(pressure); // pressure = 39.9
-
-  return 0;
-}
-```
-
-### Example 2: Non-Validated Access
-
-```cpp
-#include "simdjson.h"
-using namespace simdjson;
-
-int main() {
-  const padded_string json = R"({
-    "user": {
-      "name": "Alice",
-      "preferences": {
-        "theme": "dark",
-        "notifications": true
-      }
-    }
-  })"_padded;
-
-  ondemand::parser parser;
-  auto doc = parser.iterate(json);
-
-  // No validation - works with any JSON structure
-  std::string_view theme;
-  auto result = ondemand::json_path::at_path_compiled<".user.preferences.theme">(doc);
-  result.get(theme); // theme = "dark"
-
-  bool notifications;
-  result = ondemand::json_path::at_path_compiled<".user.preferences.notifications">(doc);
-  result.get(notifications); // notifications = true
-
-  return 0;
-}
-```
-
-### Example 3: Direct Extraction
-
-```cpp
-#include "simdjson.h"
-using namespace simdjson;
-
-struct Person {
-  std::string name;
-  int age;
-  std::vector<std::string> emails;
-};
-
-int main() {
-  const padded_string json = R"({
-    "name": "Bob",
-    "age": 25,
-    "emails": ["bob@example.com", "bob@work.com"]
-  })"_padded;
-
-  ondemand::parser parser;
-  auto doc = parser.iterate(json);
-
-  // Extract with type validation
-  std::string name;
-  ondemand::json_path::path_accessor<Person, ".name">::extract_field(doc, name);
-  // name = "Bob"
-
-  int age;
-  ondemand::json_path::pointer_accessor<Person, "/age">::extract_field(doc, age);
-  // age = 25
-
-  std::string email;
-  ondemand::json_path::path_accessor<Person, ".emails[0]">::extract_field(doc, email);
-  // email = "bob@example.com"
-
-  return 0;
-}
-```
-
-## Error Handling
-
-Compile-time errors occur when:
-- Path doesn't exist in struct: `static_assert` failure
-- Field type mismatch: `static_assert` failure
-- Invalid array access on non-array field: `static_assert` failure
-
-Runtime errors occur when:
-- JSON structure doesn't match expected structure
-- Array index out of bounds
-- Type conversion failures
-
-```cpp
-struct User {
-  std::string name;
-  int age;
-};
-
-// Compile-time error: no "email" field in User
-// auto result = ondemand::json_path::at_path_compiled<User, ".email">(doc);
-
-// Compile-time error: age is not an array
-// auto result = ondemand::json_path::at_path_compiled<User, ".age[0]">(doc);
-
-// Runtime error if JSON doesn't have "name" field
-auto result = ondemand::json_path::at_path_compiled<User, ".name">(doc);
-std::string name;
-if (result.get(name) != SUCCESS) {
-  // Handle error
-}
-```
-
-## Performance
-
-Compile-time accessors provide:
-- **Zero path parsing overhead** - paths parsed at compile time
-- **Zero validation overhead** - validation done at compile time
-- **Direct field access** - no runtime path traversal
-- **Type-safe extraction** - no dynamic type checking
-
-Compared to runtime `at_path()` and `at_pointer()`:
-- Eliminates runtime path string parsing
-- Eliminates runtime path validation
-- Generates optimal code path directly
-
-## Limitations
-
-- Requires C++26 compiler with P2996 support (experimental)
-- Paths must be compile-time constants (string literals)
-- Cannot use runtime-computed paths
-- Limited to struct types that support reflection
-- Array indices must be compile-time constants in the path
-
-## When to Use
-
-**Use compile-time accessors when:**
-- You have well-defined struct types
-- JSON structure is known at compile time
-- You want maximum type safety
-- Performance is critical
-
-**Use runtime `at_path()`/`at_pointer()` when:**
-- JSON structure varies or is unknown
-- Paths are computed at runtime
-- Working with C++20 or earlier
-- Flexibility is more important than compile-time checks
-
-## See Also
-
-- [JSON Pointer](basics.md#json-pointer) - Runtime JSON Pointer support
-- [JSONPath](basics.md#jsonpath) - Runtime JSONPath support
-- [Static Reflection for Deserialization](basics.md#3-using-static-reflection-c26) - Using reflection for full struct deserialization

doc/dom.md

@@ -41,7 +41,7 @@ The Basics: Loading and Parsing JSON Documents using the DOM front-end
 The simdjson library offers a simple DOM tree API, which you can access by creating a
 `dom::parser` and calling the `load()` method:
 
-```cpp
+```c++
 dom::parser parser;
 dom::element doc = parser.load(filename); // load and parse a file
 ```
@@ -49,39 +49,21 @@ dom::element doc = parser.load(filename); // load and parse a file
 Or by creating a padded string (for efficiency reasons, simdjson requires a string with
 SIMDJSON_PADDING bytes at the end) and calling `parse()`:
 
-```cpp
+```c++
 dom::parser parser;
 dom::element doc = parser.parse("[1,2,3]"_padded); // parse a string, the _padded suffix creates a simdjson::padded_string instance
 ```
 
-You can also load a `padded_string` from a file.
-
-
-```cpp
-auto json = padded_string::load("twitter.json"); // load JSON file 'twitter.json'.
-dom::element doc = parser.parse(json);
-```
-
-[You can similarly fetch a file from a URL to a padded string](https://github.com/simdjson/curltostring) using our `simdjson::padded_string_builder`.
-
-(Windows users compiling with C++17 or better may use `wchar_t` strings to support non-ASCII
-filenames: `padded_string::load(L"twitter.json")`.)
-
-
-(Windows users compiling with C++17 or better may use `wchar_t` strings to support non-ASCII
-filenames: `padded_string::load(L"twitter.json")`.)
-
-
 You can copy your data directly on a `simdjson::padded_string` as follows:
 
-```cpp
+```c++
 const char * data = "my data"; // 7 bytes
 simdjson::padded_string my_padded_data(data, 7); // copies to a padded buffer
 ```
 
 Or as follows...
 
-```cpp
+```c++
 std::string data = "my data";
 simdjson::padded_string my_padded_data(data); // copies to a padded buffer
 ```
@@ -101,7 +83,7 @@ container-overflow checks, you may encounter sanitizer warnings.
 You can safely ignore these warnings. Or you can call `simdjson::pad(std::string&)` to pad the
 string with `SIMDJSON_PADDING` spaces: this function returns a `simdjson::padding_string_view` which can be be passed to the parser's iterator function:
 
-```cpp
+```c++
 std::string json = "[1]";
 dom::element doc = parser.parse(simdjson::pad(json));
 ```
@@ -125,22 +107,6 @@ Further, they may use the AreFileApisANSI function to determine whether
 the filename is interpreted using the ANSI or the system default OEM
 codepage, and they may call SetFileApisToOEM accordingly.
 
-
-**Advanced feature:**
-On non-Windows systems, you can use memory-file mapping to create a `simdjson::padded_string_view`
-from a file on disk.
-
-```cpp
-// if the macro _WIN32 is defined, this will not work since we do not support Windows
-simdjson::padded_memory_map map(TWITTER_JSON);
-if (!map.is_valid()) { /* handle error */ }
-simdjson::padded_string_view view = map.view(); // view is usable while padded_memory_map is in scope
-ondemand::document doc = parser.iterate(view); // parse the JSON
-```
-
-Using memory-file mapping requires some care. The file should not be modified while you are
-accessing it.
-
 Using the Parsed JSON
 ---------------------
 
@@ -151,9 +117,8 @@ Once you have an element, you can navigate it with idiomatic C++ iterators, oper
   dom::object and dom::array. An exception (`simdjson::simdjson_error`) is thrown if the cast is not possible.
 * **Extracting Values (without exceptions):** You can use a variant usage of `get()` with error codes to avoid exceptions. You first declare the variable of the appropriate type (`double`, `uint64_t`, `int64_t`, `bool`, `std::string_view`,
   `dom::object` and `dom::array`) and pass it by reference to `get()` which gives you back an error code: e.g.,
-  ```cpp
+  ```c++
   simdjson::error_code error;
-  // _padded returns an simdjson::padded_string instance
   simdjson::padded_string numberstring = "1.2"_padded; // our JSON input ("1.2")
   simdjson::dom::parser parser;
   double value; // variable where we store the value to be parsed
@@ -164,7 +129,7 @@ Once you have an element, you can navigate it with idiomatic C++ iterators, oper
   The strings contain unescaped valid UTF-8 strings: no unmatched surrogate is allowed.
   Internally, numbers are stored as either 64-bit integers or 64-bit floating-point numbers.
   Thus it is possible to get the full 64-bit integer range (either signed or  unsigned).
-  By default, the string `-0` is parsed as the integer 0 as in Python or C++. If you set the macro
+  By default, the string `-0` is parsed as the integer 0 as in Pytho or C++. If you set the macro
   `SIMDJSON_MINUS_ZERO_AS_FLOAT` to `1` when building simdjson, you can get that `-0` is mapped to `-0.0`
   as in JavaScript. You can get the desired effect by building simdjson with cmake setting the
   `SIMDJSON_MINUS_ZERO_AS_FLOAT` to on: `cmake -B build -D SIMDJSON_MINUS_ZERO_AS_FLOAT=ON`.
@@ -187,8 +152,7 @@ Once you have an element, you can navigate it with idiomatic C++ iterators, oper
 
 The following code illustrates all of the above:
 
-```cpp
-//  R"( ... )" is a C++ raw string literal.
+```c++
 auto cars_json = R"( [
   { "make": "Toyota", "model": "Camry",  "year": 2018, "tire_pressure": [ 40.1, 39.9, 37.7, 40.4 ] },
   { "make": "Kia",    "model": "Soul",   "year": 2012, "tire_pressure": [ 30.1, 31.0, 28.6, 28.7 ] },
@@ -221,7 +185,7 @@ for (dom::object car : parser.parse(cars_json)) {
 
 Here is a different example illustrating the same ideas:
 
-```cpp
+```C++
 auto abstract_json = R"( [
     {  "12345" : {"a":12.34, "b":56.78, "c": 9998877}   },
     {  "12545" : {"a":11.44, "b":12.78, "c": 11111111}  }
@@ -243,7 +207,7 @@ for (dom::object obj : parser.parse(abstract_json)) {
 And another one:
 
 
-```cpp
+```C++
   auto abstract_json = R"(
     {  "str" : { "123" : {"abc" : 3.14 } } } )"_padded;
   dom::parser parser;
@@ -257,7 +221,7 @@ C++17 Support
 
 While the simdjson library can be used in any project using C++ 11 and above, field iteration has special support C++ 17's destructuring syntax. For example:
 
-```cpp
+```c++
 padded_string json = R"(  { "foo": 1, "bar": 2 }  )"_padded;
 dom::parser parser;
 dom::object object; // invalid until the get() succeeds
@@ -270,7 +234,7 @@ for (auto [key, value] : object) {
 
 For comparison, here is the C++ 11 version of the same code:
 
-```cpp
+```c++
 // C++ 11 version for comparison
 padded_string json = R"(  { "foo": 1, "bar": 2 }  )"_padded;
 dom::parser parser;
@@ -287,7 +251,7 @@ C++20 Support
 
 simdjson library also supports some C++20 feature including `std::ranges`:
 
-```cpp
+```c++
 auto cars_json = R"( [
   { "make": "Toyota", "model": "Camry",  "year": 2018, "tire_pressure": [ 40.1, 39.9, 37.7, 40.4 ] },
   { "make": "Kia",    "model": "Soul",   "year": 2012, "tire_pressure": [ 30.1, 31.0, 28.6, 28.7 ] },
@@ -306,7 +270,7 @@ JSON Pointer
 The simdjson library also supports [JSON pointer](https://tools.ietf.org/html/rfc6901) through the
 `at_pointer()` method, letting you reach further down into the document in a single call:
 
-```cpp
+```c++
 auto cars_json = R"( [
   { "make": "Toyota", "model": "Camry",  "year": 2018, "tire_pressure": [ 40.1, 39.9, 37.7, 40.4 ] },
   { "make": "Kia",    "model": "Soul",   "year": 2012, "tire_pressure": [ 30.1, 31.0, 28.6, 28.7 ] },
@@ -327,7 +291,7 @@ You can apply a JSON Pointer expression to any node and the path gets interprete
 
 Consider the following example:
 
-```cpp
+```c++
 auto cars_json = R"( [
   { "make": "Toyota", "model": "Camry",  "year": 2018, "tire_pressure": [ 40.1, 39.9, 37.7, 40.4 ] },
   { "make": "Kia",    "model": "Soul",   "year": 2012, "tire_pressure": [ 30.1, 31.0, 28.6, 28.7 ] },
@@ -349,11 +313,11 @@ JSONPath
 ------------
 
 
-The simdjson library supports a subset of [JSONPath](https://www.rfc-editor.org/rfc/rfc9535) (RFC 9535) through the `at_path()` method, allowing you to reach further into the document in a single call. The subset of JSONPath that is implemented is the subset that is trivially convertible into the JSON Pointer format, using `.` to access a field and `[]` to access a specific index.
+The simdjson library supports a subset of [JSONPath](https://datatracker.ietf.org/doc/html/draft-normington-jsonpath-00) through the `at_path()` method, allowing you to reach further into the document in a single call. The subset of JSONPath that is implemented is the subset that is trivially convertible into the JSON Pointer format, using `.` to access a field and `[]` to access a specific index.
 
 Consider the following example:
 
-```cpp
+```c++
 auto cars_json = R"( [
   { "make": "Toyota", "model": "Camry",  "year": 2018, "tire_pressure": [ 40.1, 39.9, 37.7, 40.4 ] },
   { "make": "Kia",    "model": "Soul",   "year": 2012, "tire_pressure": [ 30.1, 31.0, 28.6, 28.7 ] },
@@ -372,7 +336,7 @@ cout << p << endl; // Prints 39.9
 
 We also support the `$` prefix. When you start a JSONPath expression with $, you are indicating that the path starts from the root of the JSON document. E.g.,
 
-```cpp
+```c++
 auto json = R"( { "c" :{ "foo": { "a": [ 10, 20, 30 ] }}, "d": { "foo2": { "a": [ 10, 20, 30 ] }} , "e": 120 })"_padded;
 dom::parser parser;
 dom::element doc;
@@ -464,7 +428,7 @@ Error Handling
 All simdjson APIs that can fail return `simdjson_result<T>`, which is a &lt;value, error_code&gt;
 pair. You can retrieve the value with .get(), like so:
 
-```cpp
+```c++
 dom::element doc;
 auto error = parser.parse(json).get(doc);
 if (error) { cerr << error << endl; exit(1); }
@@ -498,7 +462,7 @@ We can write a "quick start" example where we attempt to parse the following JSO
 Our program loads the file, selects value corresponding to key "search_metadata" which expected to be an object, and then
 it selects the key "count" within that object.
 
-```cpp
+```C++
 #include <iostream>
 #include "simdjson.h"
 
@@ -526,7 +490,7 @@ triggering exceptions. To do this, we use `["statuses"].at(0)["id"]`. We break t
 
 Observe how we use the `at` method when querying an index into an array, and not the bracket operator.
 
-```cpp
+```C++
 #include <iostream>
 #include "simdjson.h"
 
@@ -550,7 +514,7 @@ over the content of an array.
 
 This is how the example in "Using the Parsed JSON" could be written using only error code checking:
 
-```cpp
+```c++
 auto cars_json = R"( [
   { "make": "Toyota", "model": "Camry",  "year": 2018, "tire_pressure": [ 40.1, 39.9, 37.7, 40.4 ] },
   { "make": "Kia",    "model": "Soul",   "year": 2012, "tire_pressure": [ 30.1, 31.0, 28.6, 28.7 ] },
@@ -597,7 +561,7 @@ for (dom::element car_element : cars) {
 
 Here is another example:
 
-```cpp
+```C++
 auto abstract_json = R"( [
     {  "12345" : {"a":12.34, "b":56.78, "c": 9998877}   },
     {  "12545" : {"a":11.44, "b":12.78, "c": 11111111}  }
@@ -630,7 +594,7 @@ for (dom::element elem : array) {
 
 And another one:
 
-```cpp
+```C++
   auto abstract_json = R"(
     {  "str" : { "123" : {"abc" : 3.14 } } } )"_padded;
   dom::parser parser;
@@ -644,7 +608,7 @@ Notice how we can string several operations (`parser.parse(abstract_json)["str"]
 
 The next two functions will take as input a JSON document containing an array with a single element, either a string or a number. They return true upon success.
 
-```cpp
+```C++
 simdjson::dom::parser parser{};
 
 bool parse_double(const char *j, double &d) {
@@ -676,7 +640,7 @@ target_compile_definitions(simdjson PUBLIC SIMDJSON_EXCEPTIONS=OFF)
 
 Users more comfortable with an exception flow may choose to directly cast the `simdjson_result<T>` to the desired type:
 
-```cpp
+```c++
 dom::element doc = parser.parse(json); // Throws an exception if there was an error!
 ```
 
@@ -686,7 +650,7 @@ program from continuing if there was an error.
 
 If one is willing to trigger exceptions, it is possible to write simpler code:
 
-```cpp
+```C++
 #include <iostream>
 #include "simdjson.h"
 
@@ -707,7 +671,7 @@ inspect or walk over JSON elements. To do that, you can use iterators and the ty
 example, here's a quick and dirty recursive function that verbosely prints the JSON document as JSON
 (* ignoring nuances like trailing commas and escaping strings, for brevity's sake):
 
-```cpp
+```c++
 void print_json(dom::element element) {
   switch (element.type()) {
     case dom::element_type::ARRAY:
@@ -763,7 +727,7 @@ and reuse it. The simdjson library will allocate and retain internal buffers bet
 buffers hot in cache and keeping memory allocation and initialization to a minimum. In this manner,
 you can parse terabytes of JSON data without doing any new allocation.
 
-```cpp
+```c++
 dom::parser parser;
 
 // This initializes buffers and a document big enough to handle this JSON.
@@ -806,7 +770,7 @@ without bound:
 
 * You can set a *max capacity* when constructing a parser:
 
-  ```cpp
+  ```c++
   dom::parser parser(1000*1000); // Never grow past documents > 1MB
   for (web_request request : listen()) {
     dom::element doc;
@@ -822,7 +786,7 @@ without bound:
 * You can set a *fixed capacity* that never grows, as well, which can be excellent for
   predictability and reliability, since simdjson will never call malloc after startup!
 
-  ```cpp
+  ```c++
   dom::parser parser(0); // This parser will refuse to automatically grow capacity
   auto error = parser.allocate(1000*1000); // This allocates enough capacity to handle documents <= 1MB
   if (error) { cerr << error << endl; exit(1); }
@@ -853,7 +817,7 @@ When calling `parser.parse` on a pointer (e.g., `parser.parse(my_char_pointer, m
 Some users may not be able use our `padded_string` class or to load the data directly from disk (`parser.load`). They may need to pass data pointers to the library.  If these users wish to avoid temporary copies and corresponding temporary memory allocations, they may want to call `parser.parse` with the `realloc_if_needed` parameter set to false (e.g., `parser.parse(my_char_pointer, my_length_in_bytes, false)`). In such cases, they need to ensure that there are at least SIMDJSON_PADDING extra bytes at the end that can be safely accessed and read. They do not need to initialize the padded bytes to any value in particular. The following example is safe:
 
 
-```cpp
+```C++
 const char *json      = R"({"key":"value"})";
 const size_t json_len = std::strlen(json);
 std::unique_ptr<char[]> padded_json_copy{new char[json_len + SIMDJSON_PADDING]};
@@ -861,7 +825,7 @@ memcpy(padded_json_copy.get(), json, json_len);
 memset(padded_json_copy.get() + json_len, 0, SIMDJSON_PADDING);
 simdjson::dom::parser parser;
 simdjson::dom::element element = parser.parse(padded_json_copy.get(), json_len, false);
-```
+````
 
 Setting the `realloc_if_needed` parameter `false` in this manner may lead to better performance since copies are avoided, but it requires that the user takes more responsibilities: the simdjson library cannot verify that the input buffer was padded with SIMDJSON_PADDING extra bytes.
 

doc/implementation-selection.md

@@ -33,9 +33,6 @@ compiles *all* the implementations into the executable. On Intel, it will includ
 (icelake, haswell, westmere and fallback), on 64-bit ARM it will include just one since running dispatching is  unnecessary, and on PPC
 it will include 2 (ppc64 and fallback).
 
-On Loongson processors, LASX runtime dispatching is only enabled on GCC 15+, not on LLVM or older versions of GCC.
-Thus unless you compile specifically for LASX or use GCC 15+, you will not benefit from LASX support.
-
 If you know more about where you're going to run and want to save the space, you can disable any of
 these implementations at compile time with `-DSIMDJSON_IMPLEMENTATION_X=0` (where X is ICELAKE, HASWELL,
 WESTMERE, ARM64, PPC64, LSX, LASX and FALLBACK).
@@ -58,7 +55,7 @@ Inspecting the Detected Implementation
 
 You can check what implementation is running with `active_implementation`:
 
-```cpp
+```c++
 cout << "simdjson v" << SIMDJSON_VERSION << endl;
 cout << "Detected the best implementation for your machine: " << simdjson::get_active_implementation()->name();
 cout << "(" << simdjson::get_active_implementation()->description() << ")" << endl;
@@ -71,7 +68,7 @@ Querying Available Implementations
 
 You can list all available implementations, regardless of which one was selected:
 
-```cpp
+```c++
 for (auto implementation : simdjson::get_available_implementations()) {
   cout << implementation->name() << ": " << implementation->description() << endl;
 }
@@ -79,7 +76,7 @@ for (auto implementation : simdjson::get_available_implementations()) {
 
 And look them up by name:
 
-```cpp
+```c++
 cout << simdjson::get_available_implementations()["fallback"]->description() << endl;
 ```
 When an implementation is not available, the bracket call `simdjson::get_available_implementations()[name]`
@@ -96,7 +93,7 @@ Manually Selecting the Implementation
 If you're trying to do performance tests or see how different implementations of simdjson run, you
 can select the CPU architecture yourself:
 
-```cpp
+```c++
 // Use the fallback implementation, even though my machine is fast enough for anything
 simdjson::get_active_implementation() = simdjson::get_available_implementations()["fallback"];
 ```
@@ -105,7 +102,7 @@ You are responsible for ensuring that the requirements of the selected implement
 Furthermore, you should check that the implementation is available before setting it to `simdjson::get_active_implementation()`
 by comparing it with the null pointer.
 
-```cpp
+```c++
 auto my_implementation = simdjson::get_available_implementations()["haswell"];
 if (! my_implementation) { exit(1); }
 if (! my_implementation->supported_by_runtime_system()) { exit(1); }
@@ -117,7 +114,7 @@ Checking that an Implementation can Run on your System
 
 You should call `supported_by_runtime_system()` to compare the processor's features with the need of the implementation.
 
-```cpp
+```c++
 for (auto implementation : simdjson::get_available_implementations()) {
   if (implementation->supported_by_runtime_system()) {
     cout << implementation->name() << ": " << implementation->description() << endl;

doc/iterate_many.md

@@ -8,7 +8,7 @@ library provides high-speed access to files or streams containing multiple small
 {"text":"a"}
 {"text":"b"}
 {"text":"c"}
-"..."
+...
 ```
 ... you want to read the entries (individual JSON documents) as quickly and as conveniently as possible. Importantly, the input might span several gigabytes, but you want to use a small (fixed) amount of memory. Ideally, you'd also like the parallelize the processing (using more than one core) to speed up the process.
 
@@ -132,7 +132,7 @@ E.g., `[1,2]{"32":1}` is recognized as two documents.
 Some official formats **(non-exhaustive list)**:
 - [Newline-Delimited JSON (NDJSON)](https://github.com/ndjson/ndjson-spec/)
 - [JSON lines (JSONL)](http://jsonlines.org/)
-- [Record separator-delimited JSON (RFC 7464)](https://tools.ietf.org/html/rfc7464) <- Not supported by simdjson!
+- [Record separator-delimited JSON (RFC 7464)](https://tools.ietf.org/html/rfc7464) <- Not supported by JsonStream!
 - [More on Wikipedia...](https://en.wikipedia.org/wiki/JSON_streaming)
 
 API
@@ -140,10 +140,8 @@ API
 
 Example:
 
-```cpp
-//  R"( ... )" is a C++ raw string literal.
+```c++
 auto json = R"({ "foo": 1 } { "foo": 2 } { "foo": 3 } )"_padded;
-// _padded returns an simdjson::padded_string instance
 ondemand::parser parser;
 ondemand::document_stream docs = parser.iterate_many(json);
 for (auto doc : docs) {
@@ -154,20 +152,6 @@ for (auto doc : docs) {
 
 See [basics.md](basics.md#newline-delimited-json-ndjson-and-json-lines) for an overview of the API.
 
-
-**Advanced feature:**
-On non-Windows systems, you can use memory-file mapping to create a `simdjson::padded_string_view`
-from a file on disk.
-
-```cpp
-// If the macro _WIN32 is defined, this will not work since we do not support memory-file mapping
-// under Windows at this time.
-simdjson::padded_memory_map map(myfilename);
-if (!map.is_valid()) { /* handle error */ }
-simdjson::padded_string_view view = map.view(); // view is usable while padded_memory_map is in scope
-ondemand::document doc = parser.iterate(view); // parse the JSON
-```
-
 ## Use cases
 
 From [jsonlines.org](http://jsonlines.org/examples/):
@@ -213,7 +197,7 @@ and `error()` to check if there were any error.
 Let us illustrate the idea with code:
 
 
-```cpp
+```C++
     auto json = R"([1,2,3]  {"1":1,"2":3,"4":4} [1,2,3]  )"_padded;
     simdjson::ondemand::parser parser;
     simdjson::ondemand::document_stream stream;
@@ -254,7 +238,7 @@ Some users may need to work with truncated streams. The simdjson may truncate do
 
 Consider the following example where a truncated document (`{"key":"intentionally unclosed string  `) containing 39 bytes has been left within the stream. In such cases, the first two whole documents are parsed and returned, and the `truncated_bytes()` method returns 39.
 
-```cpp
+```C++
     auto json = R"([1,2,3]  {"1":1,"2":3,"4":4} {"key":"intentionally unclosed string  )"_padded;
     simdjson::ondemand::parser parser;
     simdjson::ondemand::document_stream stream;
@@ -283,7 +267,7 @@ is effectively ignored, as it is set to at least the document size.
 
 Example:
 
-```cpp
+```C++
     auto json = R"( 1, 2, 3, 4, "a", "b", "c", {"hello": "world"} , [1, 2, 3])"_padded;
     ondemand::parser parser;
     ondemand::document_stream doc_stream;
@@ -330,7 +314,7 @@ the simdjson library.
 
 Consider a custom class `Car`:
 
-```cpp
+```C++
 struct Car {
   std::string make;
   std::string model;
@@ -344,7 +328,7 @@ You may support deserializing directly from a JSON value or document to your own
 by defining a single `tag_invoke` function:
 
 
-```cpp
+```C++
 namespace simdjson {
 // This tag_invoke MUST be inside simdjson namespace
 template <typename simdjson_value>
@@ -386,7 +370,7 @@ tag_invoke functions.
 Given a stream of JSON documents, you can add them to a data structure
 such as a `std::vector<Car>` like so if you support exceptions:
 
-```cpp
+```C++
   padded_string json =
       R"( { "make": "Toyota", "model": "Camry",  "year": 2018,
        "tire_pressure": [ 40.1, 39.9 ] }
@@ -407,7 +391,7 @@ such as a `std::vector<Car>` like so if you support exceptions:
 Otherwise you may use this longer version for explicit handling of errors:
 
 
-```cpp
+```C++
   std::vector<Car> cars;
   for(auto doc : stream) {
     Car c;
@@ -417,4 +401,4 @@ Otherwise you may use this longer version for explicit handling of errors:
     }
     cars.push_back(c);
   }
-```
+```

doc/ondemand_design.md

@@ -23,7 +23,7 @@ applications with a computation efficiency that is difficult to surpass.
 
 A code example illustrates our API from a programmer's point of view:
 
-```cpp
+```c++
 ondemand::parser parser;
 auto doc = parser.iterate(json);
 for (auto tweet : doc["statuses"]) {
@@ -109,7 +109,7 @@ The DOM approach was the only way to parse JSON documents up to version 0.6 of t
 Our DOM API looks similar to our On-Demand example, except
 it calls `parse` instead of `iterate`:
 
-```cpp
+```c++
 dom::parser parser;
 auto doc = parser.parse(json);
 for (auto tweet : doc["statuses"]) {
@@ -157,7 +157,7 @@ examples. To make it short enough to use as an example at all, it has heavily re
 a part of the problem (does not get user.screen_name), it has bugs (it does not handle sub-objects
 in a tweet at all), and it uses a theoretical, simple event-based API that minimizes ceremony.
 
-```cpp
+```c++
 struct twitter_callbacks {
   bool in_statuses;
   bool in_tweet;
@@ -284,14 +284,14 @@ To help visualize the algorithm, we'll walk through the example C++ given at the
 
    This declaration does not allocate any memory; that will happen in the next step.
 
-   ```cpp
+   ```c++
    ondemand::parser parser;
    ```
 
 2. We then start iterating the JSON document by allocating internal parser buffers, preprocessing
    the JSON, and initializing the iterator.
 
-   ```cpp
+   ```c++
    auto doc = parser.iterate(json);
    ```
 
@@ -337,14 +337,14 @@ To help visualize the algorithm, we'll walk through the example C++ given at the
 3. We iterate over the "statuses" field using a typical C++ iterator, reading past the initial
    `{ "statuses": [ {`.
 
-   ```cpp
+   ```c++
    for (ondemand::object tweet : doc["statuses"]) {
    ```
 
    This shorthand does a lot, and it is helpful to see what it expands to.
    Comments in front of each one explain what's going on:
 
-   ```cpp
+   ```c++
    // Validate that the top-level value is an object: check for {. Increase depth to 2 (root > field).
    ondemand::object top = doc.get_object();
 
@@ -396,7 +396,7 @@ To help visualize the algorithm, we'll walk through the example C++ given at the
 
 4. We get the `"text"` field as a string.
 
-   ```cpp
+   ```c++
    std::string_view text        = tweet["text"];
    ```
 
@@ -435,7 +435,7 @@ To help visualize the algorithm, we'll walk through the example C++ given at the
 
 4. We get the `"screen_name"` from the `"user"` object.
 
-   ```cpp
+   ```c++
       ondemand::object user        = tweet["user"];
       screen_name                  = user["screen_name"];
    ```
@@ -469,7 +469,7 @@ To help visualize the algorithm, we'll walk through the example C++ given at the
 
 5. We get `"retweet_count"` as an unsigned integer.
 
-   ```cpp
+   ```c++
    uint64_t         retweets    = tweet["retweet_count"];
    ```
 
@@ -513,7 +513,7 @@ To help visualize the algorithm, we'll walk through the example C++ given at the
 
 6. We loop to the next tweet.
 
-   ```cpp
+   ```c++
    for (ondemand::object tweet : doc["statuses"]) {
      ...
    }
@@ -521,7 +521,7 @@ To help visualize the algorithm, we'll walk through the example C++ given at the
 
    The relevant parts of the loop  are:
 
-   ```cpp
+   ```c++
    while (iter != statuses.end()) {
      ondemand::object tweet = *iter;
      ...
@@ -545,7 +545,7 @@ To help visualize the algorithm, we'll walk through the example C++ given at the
      "statuses": [
        { "id": 1, "text": "first!", "user": { "screen_name": "lemire", "name": "Daniel" }, "retweet_count": 40 },
        { "id": 2, "text": "second!", "user": { "screen_name": "jkeiser2", "name": "John" }, "retweet_count": 3 }
-         ^ (depth 4 - root > statuses > tweet > field)
+                                                                                                               ^ (depth 3 - root > statuses > tweet)
      ],
      "search_metadata": { "count": 2 }
    }
@@ -566,7 +566,7 @@ To help visualize the algorithm, we'll walk through the example C++ given at the
 
 8. The loop ends. Recall the relevant parts of the statuses loop:
 
-   ```cpp
+   ```c++
    while (iter != statuses.end()) {
      ondemand::object tweet = *iter;
      ...
@@ -610,7 +610,7 @@ When the user requests strings, we unescape them to a single string buffer much
 so that users enjoy the same string performance as the core simdjson. We do not write the length to the
 string buffer, however; that is stored in the `string_view` instance we return to the user.
 
-```cpp
+```C++
   ondemand::parser parser;
   auto doc = parser.iterate(json);
   std::set<std::string_view> default_users;
@@ -645,7 +645,7 @@ from the `unescaped_key()` method has a lifecycle tied to the `parser` instance:
 is destroyed or reused with another document, the `std::string_view` instance becomes invalid.
 
 
-```cpp
+```C++
 auto doc = parser.iterate(json);
 for(auto field : doc.get_object())  {
       std::string_view keyv = field.unescaped_key();
@@ -670,11 +670,9 @@ in production systems:
   Some care is needed when using the On-Demand API in scenarios where you need to access several sibling arrays or objects because
   only one object or array can be active at any one time. Let us consider the following example:
 
-```cpp
+```C++
     ondemand::parser parser;
-    //  R"( ... )" is a C++ raw string literal.
     const padded_string json = R"({ "parent": {"child1": {"name": "John"} , "child2": {"name": "Daniel"}} })"_padded;
-    // _padded returns an simdjson padded_string instance
     auto doc = parser.iterate(json);
     ondemand::object parent = doc["parent"];
     // parent owns the focus
@@ -690,7 +688,7 @@ in production systems:
 
 A correct usage is given by the following example:
 
-```cpp
+```C++
     ondemand::parser parser;
     const padded_string json = R"({ "parent": {"child1": {"name": "John"} , "child2": {"name": "Daniel"}} })"_padded;
     auto doc = parser.iterate(json);
@@ -756,7 +754,7 @@ Some users wish to run at the best possible speed. Under recent Intel and AMD pr
 
 Given that the On-Demand API offer limited runtime dispatching, it matters that your code is compiled against a specific CPU target. You should verify that the code is compiled against the target you expect. Thankfully, the simdjson library will tell you exactly what it detects as an implementation: `icelake` (AVX512 x64 processors), `haswell` (AVX2 x64 processors), `westmere` (SSE4 x64 processors), `arm64` (64-bit ARM), `ppc64` (64-bit POWER), `lasx` (LoongArch), `lsx` (LoongArch),  `fallback` (others). Under x64 processors, many programmers will want to target `haswell` whereas under ARM, most programmers will want to target `arm64` (and it should do so automatically). The `fallback` is probably only good for testing purposes, not for deployment.
 
-```cpp
+```C++
   std::cout << simdjson::builtin_implementation()->name() << std::endl;
 ```
 

doc/parse_many.md

@@ -132,7 +132,7 @@ Whitespace Characters:
 Some official formats **(non-exhaustive list)**:
 - [Newline-Delimited JSON (NDJSON)](https://github.com/ndjson/ndjson-spec)
 - [JSON lines (JSONL)](http://jsonlines.org/)
-- [Record separator-delimited JSON (RFC 7464)](https://tools.ietf.org/html/rfc7464) <- Not supported by simdjson!
+- [Record separator-delimited JSON (RFC 7464)](https://tools.ietf.org/html/rfc7464) <- Not supported by JsonStream!
 - [More on Wikipedia...](https://en.wikipedia.org/wiki/JSON_streaming)
 
 API
@@ -184,7 +184,7 @@ You may also call the `source()` method to get a `std::string_view` instance on
 Let us illustrate the idea with code:
 
 
-```cpp
+```C++
     auto json = R"([1,2,3]  {"1":1,"2":3,"4":4} [1,2,3]  )"_padded;
     simdjson::dom::parser parser;
     simdjson::dom::document_stream stream;
@@ -217,20 +217,6 @@ got full document at 29
 ```
 
 
-
-**Advanced feature:**
-On non-Windows systems, you can use memory-file mapping to create a `simdjson::padded_string_view`
-from a file on disk.
-
-```cpp
-// If the macro _WIN32 is defined, this will not work since we do not support memory-file mapping
-// under Windows at this time.
-simdjson::padded_memory_map map(myfilename);
-if (!map.is_valid()) { /* handle error */ }
-simdjson::padded_string_view view = map.view(); // view is usable while padded_memory_map is in scope
-ondemand::document doc = parser.iterate(view); // parse the JSON
-```
-
 Incomplete streams
 -----------
 
@@ -239,7 +225,7 @@ Some users may need to work with truncated streams. The simdjson may truncate do
 
 Consider the following example where a truncated document (`{"key":"intentionally unclosed string  `) containing 39 bytes has been left within the stream. In such cases, the first two whole documents are parsed and returned, and the `truncated_bytes()` method returns 39.
 
-```cpp
+```C++
     auto json = R"([1,2,3]  {"1":1,"2":3,"4":4} {"key":"intentionally unclosed string  )"_padded;
     simdjson::dom::parser parser;
     simdjson::dom::document_stream stream;

doc/performance.md

@@ -47,7 +47,7 @@ and reuse it. The simdjson library will allocate and retain internal buffers bet
 buffers hot in cache and keeping memory allocation and initialization to a minimum. In this manner,
 you can parse terabytes of JSON data without doing any new allocation.
 
-```cpp
+```c++
 ondemand::parser parser;
 
 // This initializes buffers  big enough to handle this JSON.
@@ -71,14 +71,14 @@ Reusing string buffers
 
 We recommend against creating many `std::string` or `simdjson::padded_string` instances to store the JSON content in your application. [Creating many non-trivial objects is convenient but often surprisingly slow](https://lemire.me/blog/2020/08/08/performance-tip-constructing-many-non-trivial-objects-is-slow/). Instead, as much as possible, you should allocate (once or a few times) reusable memory buffers where you write your JSON content. If you have a buffer `json_str` (of type `char*`) allocated for  `capacity` bytes and you store a JSON document spanning `length` bytes, you can pass it to simdjson as follows:
 
-```cpp
+```c++
  auto doc = parser.iterate(padded_string_view(json_str, length, capacity));
 ```
 
 or simply
 
 
-```cpp
+```c++
  auto doc = parser.iterate(json_str, length, capacity);
 ```
 
@@ -89,7 +89,7 @@ Server Loops: Long-Running Processes and Memory Capacity
 The On-Demand approach also automatically expands its memory capacity when larger documents are parsed. However, for longer processes where very large files are processed (such as server loops), this capacity is not resized down. On-Demand also lets you adjust the maximal capacity that the parser can process:
 
 * You can set an upper bound (*max_capacity*) when construction the parser:
-```cpp
+```C++
     ondemand::parser parser(1000*1000);  // Never grows past documents > 1 MB
     auto doc = parser.iterate(json);
     for (web_request request : listen()) {
@@ -105,7 +105,7 @@ The On-Demand approach also automatically expands its memory capacity when large
 The capacity will grow as the parser encounters larger documents up to 1 MB.
 
 * You can also allocate a *fixed capacity* that will never grow:
-```cpp
+```C++
     ondemand::parser parser(1000*1000);
     parser.allocate(1000*1000)  // Fix the capacity to 1 MB
     auto doc = parser.iterate(json);
@@ -253,7 +253,7 @@ long page_size() {
 // page boundary.
 bool need_allocation(const char *buf, size_t len) {
   return ((reinterpret_cast<uintptr_t>(buf + len - 1) % page_size())
-    + simdjson::SIMDJSON_PADDING >= static_cast<uintptr_t>(page_size()));
+    + simdjson::SIMDJSON_PADDING > static_cast<uintptr_t>(page_size()));
 }
 
 simdjson::padded_string_view
@@ -297,62 +297,4 @@ int main() {
   }
   return EXIT_SUCCESS;
 }
-```
-
-Further, whenever you allocate N bytes, memory allocators tend to allocate more memory, without you necessarily knowing about it. Under linux, you can use the `malloc_usable_size` function to see how much memory was actually allocated.
-Under an Apple plateform, you can  `malloc_size`. The following program illustrates the usage.
-
-```cpp
-#include <iostream>
-#include <cstddef>
-#include <memory>
-#include <cstdlib>
-#ifdef __APPLE__
-#include <malloc/malloc.h>  // for malloc_size on macOS
-#endif
-#ifdef __linux__
-#include <malloc.h> // for malloc_usable_size on Linux
-#endif
-size_t get_usable_size(void* ptr) {
-#ifdef __linux__
-    return malloc_usable_size(ptr);
-#elif defined(__APPLE__)
-    return malloc_size(ptr);
-#else
-    return 0;  // Unsupported platform
-#endif
-}
-
-int main() {
-    std::cout << "Demonstrating allocation overhead and rounding with operator new\n\n";
-
-#ifdef __linux__
-    std::cout << "Platform: Linux\n";
-#elif defined(__APPLE__)
-    std::cout << "Platform: macOS (using malloc_size)\n";
-#else
-    std::cout << "Platform: Other/unsupported (usable size will show 0)\n";
-#endif
-
-    std::cout << "Requested size | Actual usable size\n";
-    std::cout << "---------------|-------------------\n";
-    size_t total_requested = 0;
-    size_t total_usable = 0;
-    for (size_t requested = 1; requested <= 4096; requested++) {
-        total_requested += requested;
-        std::unique_ptr<char[]> ptr(new char[requested]);  // Allocate
-        size_t usable = get_usable_size(ptr.get());  // Get usable size
-        total_usable += usable;
-
-        std::cout << requested << "\t       | " << usable << "\n";
-    }
-    std::cout << "---------------|-------------------\n";
-    std::cout << "Total requested: " << total_requested << " bytes\n";
-    std::cout << "Total usable:    " << total_usable << " bytes\n";
-    std::cout << "Total overhead:  " << (total_usable - total_requested) << " bytes\n";
-    std::cout << "Percentage overhead: "
-              << ((total_usable - total_requested) * 100.0 / total_requested) << " %\n";
-
-    return EXIT_SUCCESS;
-}
 ```

fuzz/fuzz_minify.cpp

@@ -8,11 +8,16 @@
  * Minifies by first parsing, then minifying.
  */
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
-    simdjson::padded_string str(reinterpret_cast<const char *>(Data), Size);
+
+    auto begin = as_chars(Data);
+    auto end = begin + Size;
+
+    std::string str(begin, end);
     simdjson::dom::parser parser;
     simdjson::dom::element elem;
     auto error = parser.parse(str).get(elem);
     if (error) { return 0; }
+
     std::string minified = simdjson::minify(elem);
     (void)minified;
     return 0;

fuzz/ossfuzz.sh

@@ -35,7 +35,7 @@ cmake .. \
 -DSIMDJSON_DISABLE_DEPRECATED_API=On \
 -DSIMDJSON_FUZZ_LDFLAGS=$LIB_FUZZING_ENGINE
 
-cmake --build . --target all_fuzzers all_tests
+cmake --build . --target all_fuzzers
 
 cp fuzz/fuzz_* $OUT
 

include/simdjson.h

@@ -52,13 +52,7 @@
 #include "simdjson/padded_string_view-inl.h"
 
 #include "simdjson/dom.h"
-#include "simdjson/builder.h"
 #include "simdjson/ondemand.h"
 #include "simdjson/convert.h"
 #include "simdjson/convert-inl.h"
-
-// Compile-time JSON parsing (C++26 P2996 reflection)
-#include "simdjson/compile_time_json.h"
-#include "simdjson/compile_time_json-inl.h"
-
 #endif // SIMDJSON_H

include/simdjson/arm64/builder.h

@@ -1,8 +0,0 @@
-#ifndef SIMDJSON_ARM64_BUILDER_H
-#define SIMDJSON_ARM64_BUILDER_H
-
-#include "simdjson/arm64/begin.h"
-#include "simdjson/generic/builder/amalgamated.h"
-#include "simdjson/arm64/end.h"
-
-#endif // SIMDJSON_ARM64_BUILDER_H

include/simdjson/arm64/simd.h

@@ -428,7 +428,6 @@ namespace {
     static constexpr int NUM_CHUNKS = 64 / sizeof(simd8<T>);
     static_assert(NUM_CHUNKS == 4, "ARM kernel should use four registers per 64-byte block.");
     const simd8<T> chunks[NUM_CHUNKS];
-    template<int idx> simd8<uint8_t> get() const { return idx < NUM_CHUNKS ? chunks[idx] : simd8<T>(); }
 
     simd8x64(const simd8x64<T>& o) = delete; // no copy allowed
     simd8x64<T>& operator=(const simd8<T>& other) = delete; // no assignment allowed

include/simdjson/arm64/stringparsing_defs.h

@@ -17,7 +17,7 @@ using namespace simd;
 struct backslash_and_quote {
 public:
   static constexpr uint32_t BYTES_PROCESSED = 32;
-  simdjson_inline backslash_and_quote copy_and_find(const uint8_t *src, uint8_t *dst);
+  simdjson_inline static backslash_and_quote copy_and_find(const uint8_t *src, uint8_t *dst);
 
   simdjson_inline bool has_quote_first() { return ((bs_bits - 1) & quote_bits) != 0; }
   simdjson_inline bool has_backslash() { return bs_bits != 0; }

include/simdjson/builder.h

@@ -1,14 +0,0 @@
-#ifndef SIMDJSON_BUILDER_H
-#define SIMDJSON_BUILDER_H
-
-#include "simdjson/builtin/builder.h"
-
-namespace simdjson {
-  /**
-   * @copydoc simdjson::builtin::builder
-   */
-  namespace builder = builtin::builder;
-
-} // namespace simdjson
-
-#endif // SIMDJSON_BUILDER_H

include/simdjson/builtin.h

@@ -20,12 +20,12 @@
 #include "simdjson/ppc64.h"
 #elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(westmere)
 #include "simdjson/westmere.h"
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lasx)
-#include "simdjson/lasx.h"
 #elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lsx)
 #include "simdjson/lsx.h"
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(rvv_vls)
-#include "simdjson/rvv-vls.h"
+#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lasx)
+#include "simdjson/lasx.h"
+#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(rvv)
+#include "simdjson/rvv.h"
 #else
 #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
 #endif

include/simdjson/builtin/base.h

@@ -21,8 +21,8 @@ namespace simdjson {
   namespace lsx {}
 #elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lasx)
   namespace lasx {}
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(rvv_vls)
-  namespace rvv_vls {}
+#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(rvv)
+  namespace rvv {}
 #else
 #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
 #endif

include/simdjson/builtin/builder.h

@@ -1,42 +0,0 @@
-#ifndef SIMDJSON_BUILTIN_BUILDER_H
-#define SIMDJSON_BUILTIN_BUILDER_H
-
-#include "simdjson/builtin.h"
-#include "simdjson/builtin/base.h"
-
-#include "simdjson/generic/builder/dependencies.h"
-
-#define SIMDJSON_CONDITIONAL_INCLUDE
-
-#if SIMDJSON_BUILTIN_IMPLEMENTATION_IS(arm64)
-#include "simdjson/arm64/builder.h"
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(fallback)
-#include "simdjson/fallback/builder.h"
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(haswell)
-#include "simdjson/haswell/builder.h"
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(icelake)
-#include "simdjson/icelake/builder.h"
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(ppc64)
-#include "simdjson/ppc64/builder.h"
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(westmere)
-#include "simdjson/westmere/builder.h"
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lsx)
-#include "simdjson/lsx/builder.h"
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lasx)
-#include "simdjson/lasx/builder.h"
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(rvv_vls)
-#include "simdjson/rvv-vls/builder.h"
-#else
-#error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
-#endif
-
-#undef SIMDJSON_CONDITIONAL_INCLUDE
-
-namespace simdjson {
-  /**
-   * @copydoc simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::builder
-   */
-  namespace builder = SIMDJSON_BUILTIN_IMPLEMENTATION::builder;
-} // namespace simdjson
-
-#endif // SIMDJSON_BUILTIN_BUILDER_H

include/simdjson/builtin/implementation.h

@@ -23,8 +23,8 @@
 #include "simdjson/lsx/implementation.h"
 #elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lasx)
 #include "simdjson/lasx/implementation.h"
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(rvv_vls)
-#include "simdjson/rvv-vls/implementation.h"
+#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(rvv)
+#include "simdjson/rvv/implementation.h"
 #else
 #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
 #endif
@@ -41,4 +41,4 @@ namespace simdjson {
   const implementation * builtin_implementation();
 } // namespace simdjson
 
-#endif // SIMDJSON_BUILTIN_IMPLEMENTATION_H
+#endif // SIMDJSON_BUILTIN_IMPLEMENTATION_H

include/simdjson/builtin/ondemand.h

@@ -24,8 +24,8 @@
 #include "simdjson/lsx/ondemand.h"
 #elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lasx)
 #include "simdjson/lasx/ondemand.h"
-#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(rvv_vls)
-#include "simdjson/rvv-vls/ondemand.h"
+#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(rvv)
+#include "simdjson/rvv/ondemand.h"
 #else
 #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
 #endif
@@ -39,4 +39,4 @@ namespace simdjson {
   namespace ondemand = SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand;
 } // namespace simdjson
 
-#endif // SIMDJSON_BUILTIN_ONDEMAND_H
+#endif // SIMDJSON_BUILTIN_ONDEMAND_H

include/simdjson/common_defs.h

@@ -289,9 +289,7 @@ namespace std {
 // when the compiler is optimizing.
 // We only set SIMDJSON_DEVELOPMENT_CHECKS if both __OPTIMIZE__
 // and NDEBUG are not defined.
-// We recognize _DEBUG as overriding __OPTIMIZE__ so that if both
-// __OPTIMIZE__ and _DEBUG are defined, we still set SIMDJSON_DEVELOPMENT_CHECKS.
-#if ((!defined(__OPTIMIZE__) || defined(_DEBUG)) && !defined(NDEBUG))
+#if !defined(__OPTIMIZE__) && !defined(NDEBUG)
 #define SIMDJSON_DEVELOPMENT_CHECKS 1
 #endif // __OPTIMIZE__
 #endif // _MSC_VER

include/simdjson/compile_time_json.h

@@ -1,75 +0,0 @@
-/**
- * @file compile_time_json.h
- * @brief Compile-time JSON parsing using C++26 reflection with
- * std::meta::substitute()
- */
-
-#ifndef SIMDJSON_GENERIC_COMPILE_TIME_JSON_H
-#define SIMDJSON_GENERIC_COMPILE_TIME_JSON_H
-
-#if SIMDJSON_STATIC_REFLECTION
-
-#include <algorithm>
-#include <array>
-#include <charconv>
-#include <cstdint>
-#include <expected>
-#include <meta>
-#include <string>
-#include <string_view>
-#include <vector>
-
-namespace simdjson {
-namespace compile_time {
-
-/**
- * @brief Compile-time JSON parser. This function parses the provided JSON
- * string at compile time and returns a custom struct type representing the JSON
- * object.
- *
- * We have a few limitations which trigger compile-time errors if violated:
- * - Only JSON objects and arrays are supported at the top level (no primitives).
- *   We will lift this limitation in the future.
- * - Strings are represented using the const char * in UTF-8, but they must not
- *   contain embedded nulls. We would prefer to represent them as std::string or
- *   std::string_view, and hope to do so in the future.
- * - Heterogeneous arrays are not supported yet. E.g., you need to have arrays of
- *   all integers, or all strings, all floats, all compatible objects, etc.
- *   For example, the following is accepted:
- *    [
- *     { "name": "Alice", "age": 30 },
- *     { "name": "Bob", "age": 25 },
- *     { "name": "Charlie", "age": 35 }
- *   ]
- *   but the following is not:
- *   [
- *     { "name": "Alice", "age": 30 },
- *     "Just a string",
- *     42,
- *     { "name": "Charlie", "age": 35 }
- *   ]
- *
- *    We may support heterogeneous arrays in the future with std::variant types.
- * - We parse the first JSON document encountered in the string. Trailing
- *   characters are ignored. Thus if your JSON begins with {"a":1}, everything
- *   after the closing } is ignored. This limitation will be lifted in the future,
- *   reporting an error.
- *
- * These limitations are safe in the sense that they result in compile-time errors.
- * Thus you will not get truncated strings or imprecise floats silently.
- *
- * This function is subject to change in the future.
- */
-template <constevalutil::fixed_string json_str> consteval auto parse_json();
-
-} // namespace compile_time
-} // namespace simdjson
-
-
-template <simdjson::constevalutil::fixed_string str>
-consteval auto operator ""_json() {
-  return simdjson::compile_time::parse_json<str>();
-}
-
-#endif // SIMDJSON_STATIC_REFLECTION
-#endif // SIMDJSON_GENERIC_COMPILE_TIME_JSON_H

include/simdjson/compiler_check.h

@@ -13,11 +13,6 @@
 #endif
 #endif
 
-// C++ 26
-#if !defined(SIMDJSON_CPLUSPLUS26) && (SIMDJSON_CPLUSPLUS >= 202402L) // update when the standard is finalized
-#define SIMDJSON_CPLUSPLUS26 1
-#endif
-
 // C++ 23
 #if !defined(SIMDJSON_CPLUSPLUS23) && (SIMDJSON_CPLUSPLUS >= 202302L)
 #define SIMDJSON_CPLUSPLUS23 1
@@ -119,4 +114,5 @@
 #define SIMDJSON_CONSTEVAL 0
 #endif // defined(__cpp_consteval) && __cpp_consteval >= 201811L && defined(__cpp_lib_constexpr_string) && __cpp_lib_constexpr_string >= 201907L
 #endif // !defined(SIMDJSON_CONSTEVAL)
+
 #endif // SIMDJSON_COMPILER_CHECK_H

include/simdjson/concepts.h

@@ -122,65 +122,11 @@ concept optional_type = requires(std::remove_cvref_t<T> obj) {
     } -> std::convertible_to<typename std::remove_cvref_t<T>::value_type>;
   };
   { static_cast<bool>(obj) } -> std::same_as<bool>; // convertible to bool
-  { obj.reset() } noexcept -> std::same_as<void>;
 };
 
 
 
-// Types we serialize as JSON strings (not as containers)
-template <typename T>
-concept string_like =
-  std::is_same_v<std::remove_cvref_t<T>, std::string> ||
-  std::is_same_v<std::remove_cvref_t<T>, std::string_view> ||
-  std::is_same_v<std::remove_cvref_t<T>, const char*> ||
-  std::is_same_v<std::remove_cvref_t<T>, char*>;
-
-// Concept that checks if a type is a container but not a string (because
-// strings handling must be handled differently)
-// Now uses iterator-based approach for broader container support
-template <typename T>
-concept container_but_not_string =
-  std::ranges::input_range<T> && !string_like<T> && !concepts::string_view_keyed_map<T>;
-
-
-
-// Concept: Indexable container that is not a string or associative container
-// Accepts: std::vector, std::array, std::deque (have operator[], value_type, not string_like)
-// Rejects: std::string (string_like), std::list (no operator[]), std::map (has key_type)
-template<typename Container>
-concept indexable_container = requires {
-  typename Container::value_type;
-  requires !concepts::string_like<Container>;
-  requires !requires { typename Container::key_type; };  // Reject maps/sets
-  requires requires(Container& c, std::size_t i) {
-    { c[i] } -> std::convertible_to<typename Container::value_type>;
-  };
-};
-
-
-// Variable template to use with std::meta::substitute
-template<typename Container>
-constexpr bool indexable_container_v = indexable_container<Container>;
-
 } // namespace concepts
-
-
-/**
- * We use tag_invoke as our customization point mechanism.
- */
-template <typename Tag, typename... Args>
-concept tag_invocable = requires(Tag tag, Args... args) {
-  tag_invoke(std::forward<Tag>(tag), std::forward<Args>(args)...);
-};
-
-template <typename Tag, typename... Args>
-concept nothrow_tag_invocable =
-    tag_invocable<Tag, Args...> && requires(Tag tag, Args... args) {
-      {
-        tag_invoke(std::forward<Tag>(tag), std::forward<Args>(args)...)
-      } noexcept;
-    };
-
 } // namespace simdjson
 #endif // SIMDJSON_SUPPORTS_CONCEPTS
 #endif // SIMDJSON_CONCEPTS_H

include/simdjson/constevalutil.h

@@ -5,9 +5,9 @@
 #include <string_view>
 #include <array>
 
+#if SIMDJSON_CONSTEVAL
 namespace simdjson {
 namespace constevalutil {
-#if SIMDJSON_CONSTEVAL
 
 constexpr static std::array<uint8_t, 256> json_quotable_character = {
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -47,43 +47,7 @@ consteval std::string consteval_to_quoted_escaped(std::string_view input) {
   out.push_back('"');
   return out;
 }
-#endif  // SIMDJSON_CONSTEVAL
-
-
-#if SIMDJSON_SUPPORTS_CONCEPTS
-template <size_t N>
-struct fixed_string {
-    constexpr fixed_string(const char (&str)[N])  {
-        for (std::size_t i = 0; i < N; ++i) {
-            data[i] = str[i];
-        }
-    }
-    char data[N];
-    constexpr std::string_view view() const { return {data, N - 1}; }
-    constexpr size_t size() const { return N ; }
-    constexpr operator std::string_view() const { return view(); }
-    constexpr char operator[](std::size_t index) const { return data[index]; }
-    constexpr bool operator==(const fixed_string& other) const {
-        if (N != other.size()) {
-            return false;
-        }
-        for (std::size_t i = 0; i < N; ++i) {
-            if (data[i] != other.data[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-};
-template <std::size_t N>
-fixed_string(const char (&)[N]) -> fixed_string<N>;
-
-template <fixed_string str>
-struct string_constant {
-    static constexpr std::string_view value = str.view();
-};
-#endif // SIMDJSON_SUPPORTS_CONCEPTS
-
 } // namespace constevalutil
 } // namespace simdjson
+#endif  // SIMDJSON_CONSTEVAL
 #endif // SIMDJSON_CONSTEVALUTIL_H

include/simdjson/convert-inl.h

@@ -58,12 +58,6 @@ inline simdjson_result<T> auto_parser<parser_type>::result() noexcept(is_nothrow
   return m_doc.get<T>();
 }
 
-template <typename parser_type>
-template <typename T>
-simdjson_warn_unused simdjson_inline error_code auto_parser<parser_type>::get(T &value) && noexcept(is_nothrow_gettable<T>) {
-  return result<T>().get(value);
-}
-
 template <typename parser_type>
 inline simdjson_result<ondemand::array> auto_parser<parser_type>::array() noexcept {
   return result<ondemand::array>();
@@ -79,7 +73,12 @@ inline simdjson_result<ondemand::number> auto_parser<parser_type>::number() noex
   return result<ondemand::number>();
 }
 
-#if SIMDJSON_EXCEPTIONS
+template <typename parser_type>
+template <typename T>
+inline auto_parser<parser_type>::operator simdjson_result<T>() noexcept(is_nothrow_gettable<T>) {
+  return result<T>();
+}
+
 template <typename parser_type>
 template <typename T>
 inline auto_parser<parser_type>::operator T() noexcept(false) {
@@ -88,7 +87,6 @@ inline auto_parser<parser_type>::operator T() noexcept(false) {
   }
   return m_doc.get<T>();
 }
-#endif // SIMDJSON_EXCEPTIONS
 
 template <typename parser_type>
 template <typename T>
@@ -111,23 +109,13 @@ inline T to_adaptor<T>::operator()(simdjson_result<ondemand::value> &val) const
 
 template <typename T>
 inline auto to_adaptor<T>::operator()(padded_string_view const str) const noexcept {
-  return auto_parser<ondemand::parser *>{str};
+  return auto_parser{str};
 }
 
 template <typename T>
 inline auto to_adaptor<T>::operator()(ondemand::parser &parser, padded_string_view const str) const noexcept {
   return auto_parser<ondemand::parser *>{parser, str};
 }
-
-template <typename T>
-inline auto to_adaptor<T>::operator()(std::string str) const noexcept {
-  return auto_parser<ondemand::parser *>{pad_with_reserve(str)};
-}
-
-template <typename T>
-inline auto to_adaptor<T>::operator()(ondemand::parser &parser, std::string str) const noexcept {
-  return auto_parser<ondemand::parser *>{parser, pad_with_reserve(str)};
-}
 } // namespace internal
 } // namespace convert
 } // namespace simdjson

include/simdjson/convert.h

@@ -46,19 +46,16 @@ public:
 
 	template <typename T>
 	simdjson_warn_unused simdjson_inline simdjson_result<T> result() noexcept(is_nothrow_gettable<T>);
-	template <typename T>
-	simdjson_warn_unused simdjson_inline error_code get(T &value) && noexcept(is_nothrow_gettable<T>);
-
 
 	simdjson_warn_unused simdjson_inline simdjson_result<ondemand::array> array() noexcept;
 	simdjson_warn_unused simdjson_inline simdjson_result<ondemand::object> object() noexcept;
 	simdjson_warn_unused simdjson_inline simdjson_result<ondemand::number> number() noexcept;
 
+	template <typename T>
+	simdjson_warn_unused simdjson_inline explicit(false) operator simdjson_result<T>() noexcept(is_nothrow_gettable<T>);
 
-#if SIMDJSON_EXCEPTIONS
 	template <typename T>
 	simdjson_warn_unused simdjson_inline explicit(false) operator T() noexcept(false);
-#endif // SIMDJSON_EXCEPTIONS
 
 	template <typename T>
 	simdjson_warn_unused simdjson_inline std::optional<T> optional() noexcept(is_nothrow_gettable<T>);
@@ -75,14 +72,7 @@ struct to_adaptor {
 	T operator()(simdjson_result<ondemand::value> &val) const noexcept;
 	auto operator()(padded_string_view const str) const noexcept;
 	auto operator()(ondemand::parser &parser, padded_string_view const str) const noexcept;
-	// The std::string is padded with reserve to ensure there is enough space for padding.
-	// Some sanitizers may not like this, so you can use simdjson::pad instead.
-	// simdjson::from(simdjson::pad(str))
-	auto operator()(std::string str) const noexcept;
-	auto operator()(ondemand::parser &parser, std::string str) const noexcept;
 };
-// deduction guide
-auto_parser(padded_string_view const str) -> auto_parser<ondemand::parser*>;
 } // namespace internal
 } // namespace convert
 

include/simdjson/dom.h

@@ -9,7 +9,6 @@
 #include "simdjson/dom/object.h"
 #include "simdjson/dom/parser.h"
 #include "simdjson/dom/serialization.h"
-#include "simdjson/dom/fractured_json.h"
 
 // Inline functions
 #include "simdjson/dom/array-inl.h"
@@ -20,6 +19,5 @@
 #include "simdjson/dom/parser-inl.h"
 #include "simdjson/internal/tape_ref-inl.h"
 #include "simdjson/dom/serialization-inl.h"
-#include "simdjson/dom/fractured_json-inl.h"
 
 #endif // SIMDJSON_DOM_H