moving recursive

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,8 +9,7 @@ assignees: ''
 
 Before submitting an issue, please ensure that you have read the documentation:
 
-* Basics is an overview of how to use simdjson and its APIs to parse JSON: https://github.com/simdjson/simdjson/blob/master/doc/basics.md
-* Builder is an overview of how to use simdjson to generate JSON: https://github.com/simdjson/simdjson/blob/master/doc/builder.md
+* Basics is an overview of how to use simdjson and its APIs: https://github.com/simdjson/simdjson/blob/master/doc/basics.md
 * Performance shows some more advanced scenarios and how to tune for them: https://github.com/simdjson/simdjson/blob/master/doc/performance.md
 * Contributing: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md
 * We follow the [JSON specification as described by RFC 8259](https://www.rfc-editor.org/rfc/rfc8259.txt) (T. Bray, 2017). If you wish to support features that are not part of RFC 8259, then you should not refer to your issue as a bug.
@@ -56,8 +55,6 @@ We support up-to-date 64-bit ARM and x64 FreeBSD, macOS, Windows and Linux syste
 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.
 
-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).
-
 **Indicate whether you are willing or able to provide a bug fix as a pull request**
 
 If you plan to contribute to simdjson, please read our guide:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -9,8 +9,7 @@ assignees: ''
 
 Before submitting an issue, please ensure that you have read the documentation:
 
-* Basics is an overview of how to use simdjson and its APIs to parse JSON: https://github.com/simdjson/simdjson/blob/master/doc/basics.md
-* Builder is an overview of how to use simdjson to generate JSON: https://github.com/simdjson/simdjson/blob/master/doc/builder.md
+* Basics is an overview of how to use simdjson and its APIs: https://github.com/simdjson/simdjson/blob/master/doc/basics.md
 * Performance shows some more advanced scenarios and how to tune for them: https://github.com/simdjson/simdjson/blob/master/doc/performance.md
 * Contributing: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md
 * We follow the [JSON specification as described by RFC 8259](https://www.rfc-editor.org/rfc/rfc8259.txt) (T. Bray, 2017).

.github/ISSUE_TEMPLATE/standard-issue-template.md

@@ -9,8 +9,7 @@ assignees: ''
 
 Before submitting an issue, please ensure that you have read the documentation:
 
-* Basics is an overview of how to use simdjson and its APIs to parse JSON: https://github.com/simdjson/simdjson/blob/master/doc/basics.md
-* Builder is an overview of how to use simdjson to generate JSON: https://github.com/simdjson/simdjson/blob/master/doc/builder.md
+* Basics is an overview of how to use simdjson and its APIs: https://github.com/simdjson/simdjson/blob/master/doc/basics.md
 * Performance shows some more advanced scenarios and how to tune for them: https://github.com/simdjson/simdjson/blob/master/doc/performance.md
 * Contributing: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md
 * We follow the [JSON specification as described by RFC 8259](https://www.rfc-editor.org/rfc/rfc8259.txt) (T. Bray, 2017).

.github/pull_request_template.md

@@ -1,53 +1,8 @@
-Short title (summary):
-
-Description
-- What did you change and why? (1-3 sentences)
-- Issue reproduced / related issue: link the issue if relevant (e.g. #123)
-
-Type of change
-- [ ] Bug fix
-- [ ] New feature
-- [ ] Refactor / cleanup
-- [ ] Documentation / tests
-- [ ] Other (please describe):
-
-How to verify / test
-- Add additional tests to verify bugs or new features.
-- If you claim performance gains, you should provide benchmark numbers using high quality benchmarking code.
 
 
-Please read before contributing:
-- CONTRIBUTING: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md
-- HACKING: https://github.com/simdjson/simdjson/blob/master/HACKING.md
+Our tests check whether you have introduced trailing white space. If such a test fails, please check the "artifacts button" above, which if you click it gives a link to a downloadable file to help you identify the issue. You can also run scripts/remove_trailing_whitespace.sh locally if you have a bash shell and the sed command available on your system.
 
+If you plan to contribute to simdjson, please read our
 
-
-If you can, we recommend running our tests with the sanitizers turned on.
-For non-Visual Studio users, it is as easy as doing:
-
-
-
-```bash
-cmake -B build -D SIMDJSON_SANITIZE=ON -D SIMDJSON_DEVELOPER_MODE=ON
-cmake --build build
-ctest --test-dir build
-```
-
-
-Our CI checks, among other things, for trailing whitespace. If a test fails for that reason,
-use the "artifacts" button to download the artifact and inspect the problematic lines,
-or run `scripts/remove_trailing_whitespace.sh` locally if you have a bash shell and `sed`.
-
-
-Checklist before submitting
-- [ ] I added/updated tests covering my change (if applicable)
-- [ ] Code builds locally and passes my check
-- [ ] Documentation / README updated if needed
-- [ ] Commits are atomic and messages are clear
-- [ ] I linked the related issue (if applicable)
-
-Final notes
-- For large PRs, prefer smaller incremental PRs or request staged review.
-
-Thanks for the contribution!
-
+CONTRIBUTING guide: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md and our
+HACKING guide: https://github.com/simdjson/simdjson/blob/master/HACKING.md

.github/workflows/aarch64.yml

@@ -1,4 +1,4 @@
-name: Ubuntu aarch64 (GCC 13)
+name: Ubuntu ppc64le (GCC 11)
 
 on:
   push:
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: uraimo/run-on-arch-action@v3
+      - uses: uraimo/run-on-arch-action@v2
         name: Test
         id: runcmd
         with:

.github/workflows/documentation.yml

@@ -1,8 +1,9 @@
 name: Doxygen GitHub Pages
 
 on:
-  release:
-    types: [created]
+  push:
+    branches:
+      - master
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 

.github/workflows/emscripten.yml

@@ -1,17 +0,0 @@
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
-      - uses: mymindstorm/setup-emsdk@6ab9eb1bda2574c4ddb79809fc9247783eaf9021 # v14
-      - name: Verify
-        run: emcc -v
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
-      - name: Configure
-        run: emcmake cmake -B build
-      - name: Build # We build but do not test
-        run: cmake --build build

.github/workflows/fix-trailing-whitespace.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   whitespace:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - name: Remove whitespace and check the diff

.github/workflows/fuzzers.yml

@@ -24,7 +24,7 @@ jobs:
       implementations: haswell westmere fallback
       UBSAN_OPTIONS: halt_on_error=1
       MAXLEN: -max_len=4000
-      CLANGVERSION: 19
+      CLANGVERSION: 15
       # which optimization level to use for the sanitizer build (see build_fuzzer.variants.sh)
       OPTLEVEL: -O3
 
@@ -125,7 +125,7 @@ jobs:
         done
 
     - name: Save the corpus as a github artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: corpus
         path: corpus.tar
@@ -148,7 +148,7 @@ jobs:
       run: tar cf valgrind.tar valgrind-*.txt
 
     - name: Save valgrind output as a github artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       if: always()
       with:
         name: valgrindresults
@@ -156,7 +156,7 @@ jobs:
         if-no-files-found: ignore
 
     - name: Archive any crashes as an artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       if: always()
       with:
         name: crashes

.github/workflows/msys2-clang.yml

@@ -20,7 +20,7 @@ jobs:
           - msystem: "MINGW64"
             install: mingw-w64-x86_64-libxml2 mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang
             type: Debug
-          - msystem: "MINGW64"
+            - msystem: "MINGW64"
             install: mingw-w64-x86_64-libxml2 mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang
             type: RelWithDebInfo
     env:

.github/workflows/ppc64.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: uraimo/run-on-arch-action@v3
+      - uses: uraimo/run-on-arch-action@v2
         name: Test
         id: runcmd
         with:

.github/workflows/riscv64.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: uraimo/run-on-arch-action@v3
+      - uses: uraimo/run-on-arch-action@v2
         name: Test
         id: runcmd
         with:

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

@@ -1,29 +0,0 @@
-name: Ubuntu rvv VLEN=1024 (clang 18)
-
-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-18
-    - name: Build
-      run: |
-        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: |
-        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

@@ -1,29 +0,0 @@
-name: Ubuntu rvv VLEN=128 (clang 17)
-
-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-17
-    - name: Build
-      run: |
-        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-256-gcc-14.yml

@@ -1,29 +0,0 @@
-name: Ubuntu rvv VLEN=256 (gcc 14)
-
-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++-14-riscv64-linux-gnu qemu-user-static
-    - name: Build
-      run: |
-        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: |
-        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)

.github/workflows/s390x.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: uraimo/run-on-arch-action@v3
+      - uses: uraimo/run-on-arch-action@v2
         name: Test
         id: runcmd
         with:

.github/workflows/ubuntu20-checkperf.yml

@@ -13,7 +13,7 @@ jobs:
     if: >-
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4

.github/workflows/ubuntu20-gcc8.yml

@@ -0,0 +1,38 @@
+name: Ubuntu 20.04 CI (GCC 8)
+
+on: [push, pull_request]
+
+jobs:
+  ubuntu-build:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+    runs-on: ubuntu-20.04
+    env:
+      CXX: g++-8
+      CC: gcc-8
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: dependencies/.cache
+          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+      - name: Install GCC 8
+        run: sudo apt-get install -y g++-8
+      - name: Use cmake
+        run: |
+          mkdir builddebug &&
+          cd builddebug &&
+          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
+          cmake --build .   &&
+          ctest --output-on-failure -LE explicitonly -j   &&
+          cd .. &&
+          mkdir build &&
+          cd build &&
+          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake --build .   &&
+          ctest --output-on-failure -LE explicitonly -j   &&
+          cmake --install . &&
+          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 &&
+          cd ../tests/installation_tests/find &&
+          mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. &&  cmake --build .

.github/workflows/ubuntu20-noexcept.yml

@@ -7,7 +7,7 @@ jobs:
     if: >-
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
@@ -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/ubuntu20-nothread.yml

@@ -7,7 +7,7 @@ jobs:
     if: >-
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
@@ -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/ubuntu20-sani.yml

@@ -7,7 +7,7 @@ jobs:
     if: >-
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
@@ -25,7 +25,7 @@ jobs:
     if: >-
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4

.github/workflows/ubuntu20.yml

@@ -0,0 +1,47 @@
+name: Ubuntu 20.04 CI (GCC 9)
+
+on: [push, pull_request]
+
+jobs:
+  ubuntu-build:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: dependencies/.cache
+          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+      - name: Use cmake to build just the library
+        run: |
+          mkdir buildjustlib &&
+          cd buildjustlib &&
+          cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_DEVELOPER_MODE=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake --build .   &&
+          cmake --install . &&
+          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 &&
+          cd ../tests/installation_tests/find &&
+          mkdir buildjustlib &&
+          cd buildjustlib &&
+          cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../buildjustlib/destination .. &&
+          cmake --build .
+      - name: Use cmake
+        run: |
+          mkdir builddebug &&
+          cd builddebug &&
+          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
+          cmake --build .   &&
+          ctest --output-on-failure -LE explicitonly -j   &&
+          cd .. &&
+          mkdir build &&
+          cd build &&
+          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake --build .   &&
+          ctest --output-on-failure -LE explicitonly -j   &&
+          cmake --install . &&
+          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 &&
+          cd ../tests/installation_tests/find &&
+          mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. &&  cmake --build .

.github/workflows/ubuntu22-cxx20.yml

@@ -14,52 +14,20 @@ jobs:
         with:
           path: dependencies/.cache
           key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-
-      - name: Configure Debug Build
+      - name: Use cmake
         run: |
-          CXX=g++-12 cmake -DSIMDJSON_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -B builddebug
-
-      - name: Compile Debug Build
-        run: |
-          cmake --build builddebug
-
-      - name: Test Debug Build
-        run: |
-          ctest --output-on-failure -LE explicitonly -j --test-dir builddebug
-
-      - name: Configure Release Build
-        run: |
-          CXX=g++-12 cmake -DSIMDJSON_CXX_STANDARD=20 -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination -B build
-
-      - name: Compile Release Build
-        run: |
-          cmake --build build
-
-      - name: Test Release Build
-        run: |
-          ctest --output-on-failure -LE explicitonly -j --test-dir build
-
-      - name: Install Release Build
-        run: |
-          cmake --install build
-
-      - name: Generate Example Code
-        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
-
-      - name: Compile Example Code
-        run: |
-          c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson
-
-      - name: Run Example Code
-        run: |
-          ./linkandrun jsonexamples/twitter.json
-
-      - name: Configure Find Tests
-        run: |
-          cd tests/installation_tests/find && \
-          cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../destination -B build
-
-      - name: Compile Find Tests
-        run: |
-          cd tests/installation_tests/find && cmake --build build
+          mkdir builddebug &&
+          cd builddebug &&
+          CXX=g++-12 cmake -DSIMDJSON_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
+          cmake --build .   &&
+          ctest --output-on-failure -LE explicitonly -j   &&
+          cd .. &&
+          mkdir build &&
+          cd build &&
+          CXX=g++-12 cmake -DSIMDJSON_CXX_STANDARD=20  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake --build .   &&
+          ctest --output-on-failure -LE explicitonly -j   &&
+          cmake --install . &&
+          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 &&
+          cd ../tests/installation_tests/find &&
+          mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. &&  cmake --build .

.github/workflows/ubuntu24-cxx20-noexcept.yml

@@ -1,22 +0,0 @@
-name: Ubuntu 24.04 CI (CXX 20, noexcept)
-
-on: [push, pull_request]
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-24.04
-    strategy:
-      matrix:
-        cxx: [g++-13, clang++-16]
-    steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
-      - name: Prepare
-        run: cmake -DSIMDJSON_CXX_STANDARD=20 -DSIMDJSON_EXCEPTIONS=OFF -DSIMDJSON_DEVELOPER_MODE=ON  -B build
-        env:
-          CXX: ${{matrix.cxx}}
-      - name: Build
-        run: cmake --build build -j=2
-      - name: Test
-        run: ctest --output-on-failure --test-dir build

.github/workflows/ubuntu24-cxx20.yml

@@ -1,22 +0,0 @@
-name: Ubuntu 24.04 CI (CXX 20)
-
-on: [push, pull_request]
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-24.04
-    strategy:
-      matrix:
-        cxx: [g++-13, clang++-16]
-    steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
-      - name: Prepare
-        run: cmake -DSIMDJSON_CXX_STANDARD=20 -DSIMDJSON_DEVELOPER_MODE=ON  -B build
-        env:
-          CXX: ${{matrix.cxx}}
-      - name: Build
-        run: cmake --build build -j=2
-      - name: Test
-        run: ctest --output-on-failure --test-dir build

.github/workflows/vs17-arm-ci.yml

@@ -10,6 +10,7 @@ jobs:
        fail-fast: false
        matrix:
          include:
+           - {arch: ARM}
            - {arch: ARM64}
            - {arch: ARM64EC}
      steps:
@@ -18,4 +19,4 @@ jobs:
        - name: Use cmake
          run: |
            cmake -A ${{ matrix.arch }} -DCMAKE_SYSTEM_VERSION="10.0.22621.0" -DCMAKE_CROSSCOMPILING=1 -DSIMDJSON_DEVELOPER_MODE=ON -D SIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_EXCEPTIONS=OFF -B build  &&
-           cmake --build build --verbose
+           cmake --build build --verbose

.github/workflows/vs17-ci-sani.yml

@@ -1,30 +0,0 @@
-name: VS17-CI-SANITIZE
-
-on: [push, pull_request]
-
-jobs:
-  ci:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    name: windows-vs17
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Debug}
-          - {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Release}
-          - {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: RelWithDebInfo}
-    steps:
-    - name: checkout
-      uses: actions/checkout@v4
-    - name: Configure
-      run: |
-        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSANITIZE=ON -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
-    - name: Build
-      run: cmake --build build --config ${{matrix.build_type}} --verbose
-    - name: Run tests
-      run: |
-        cd build
-        ctest -C ${{matrix.build_type}}  -LE explicitonly  --output-on-failure

.github/workflows/vs17-clang-ci-cxx20.yml

@@ -1,37 +0,0 @@
-name: VS17-CLANG-CI
-
-on: [push, pull_request]
-
-jobs:
-  ci:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    name: windows-vs17
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - {gen: Visual Studio 17 2022, arch: x64, build_type: Debug}
-          - {gen: Visual Studio 17 2022, arch: x64, build_type: Release}
-          - {gen: Visual Studio 17 2022, arch: x64, build_type: RelWithDebInfo}
-    steps:
-    - name: checkout
-      uses: actions/checkout@v4
-    - name: Configure
-      run: |
-        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}}  -T ClangCL -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
-    - name: Build
-      run: cmake --build build --config ${{matrix.build_type}} --verbose
-    - name: Run tests
-      run: |
-        cd build
-        ctest -C ${{matrix.build_type}}  -LE explicitonly  --output-on-failure
-    - name: Install
-      run: |
-        cmake --install build --config ${{matrix.build_type}}
-    - name: Test Installation
-      run: |
-        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}}  -B build_install_test tests/installation_tests/find
-        cmake --build build_install_test --config ${{matrix.build_type}}

.gitignore

@@ -38,7 +38,7 @@ cmake-build-release/
 .history/
 
 # Visual Studio artifacts
-/.vs/
+/VS/
 
 # C/C++ build outputs
 .build/
@@ -106,4 +106,4 @@ objs
 !.vscode/extensions.json
 
 # clangd
-.cache
+.cache

.vscode/settings.json

@@ -3,9 +3,6 @@
         {"column": 95 },
         {"column": 120 }
     ],
-    "cmake.configureArgs": [
-        "-DSIMDJSON_DEVELOPER_MODE=ON"
-    ],
     "files.trimTrailingWhitespace": true,
     "files.associations": {
         ".clangd": "yaml",
@@ -112,23 +109,11 @@
         "numbers": "cpp",
         "semaphore": "cpp",
         "stop_token": "cpp",
-        "cfenv": "cpp",
-        "format": "cpp",
-        "xlocmes": "cpp",
-        "xlocmon": "cpp",
-        "xlocnum": "cpp",
-        "xloctime": "cpp",
-        "xutility": "cpp",
-        "coroutine": "cpp",
-        "xfacet": "cpp",
-        "xhash": "cpp",
-        "xiosbase": "cpp",
-        "xlocale": "cpp",
-        "xlocbuf": "cpp",
-        "xlocinfo": "cpp",
-        "xmemory": "cpp",
-        "xstring": "cpp",
-        "xtr1common": "cpp",
-        "xtree": "cpp"
+        "cfenv": "cpp"
+    },
+    "cmake.configureSettings": {
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "YES",
+        "SIMDJSON_DEVELOPER_MODE": "ON",
+        "SIMDJSON_SINGLEHEADER": "OFF"
     }
 }

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14)
 project(
     simdjson
     # The version number is modified by tools/release.py
-    VERSION 4.0.7
+    VERSION 3.10.1
     DESCRIPTION "Parsing gigabytes of JSON per second"
     HOMEPAGE_URL "https://simdjson.org/"
     LANGUAGES CXX C
@@ -20,8 +20,8 @@ string(
 # ---- Options, variables ----
 
 # These version numbers are modified by tools/release.py
-set(SIMDJSON_LIB_VERSION "27.0.0" CACHE STRING "simdjson library version")
-set(SIMDJSON_LIB_SOVERSION "27" CACHE STRING "simdjson library soversion")
+set(SIMDJSON_LIB_VERSION "23.0.0" CACHE STRING "simdjson library version")
+set(SIMDJSON_LIB_SOVERSION "23" 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)
@@ -43,20 +43,6 @@ if(SIMDJSON_DISABLE_DEPRECATED_API)
   )
 endif()
 
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.25.0")
-    option(SIMDJSON_STATIC_REFLECTION "Enables static reflection (experimental), requires C++26" OFF)
-else()
-    set(SIMDJSON_STATIC_REFLECTION OFF CACHE BOOL "Enables static reflection (experimental)" FORCE)
-    message(WARNING "SIMDJSON_STATIC_REFLECTION is disabled because your CMake version is below 3.25")
-endif()
-
-if(SIMDJSON_STATIC_REFLECTION)
-  simdjson_add_props(
-      target_compile_definitions PUBLIC
-      SIMDJSON_STATIC_REFLECTION=1
-  )
-endif()
-
 option(SIMDJSON_DEVELOPMENT_CHECKS "Enable development-time aids, such as \
 checks for incorrect API usage. Enabled by default in DEBUG." OFF)
 if(SIMDJSON_DEVELOPMENT_CHECKS)
@@ -98,7 +84,7 @@ set_target_properties(
 )
 
 # FIXME: Use proper CMake integration for exports
-if(WIN32 AND BUILD_SHARED_LIBS)
+if(MSVC AND BUILD_SHARED_LIBS)
   target_compile_definitions(
       simdjson
       PRIVATE SIMDJSON_BUILDING_WINDOWS_DYNAMIC_LIBRARY=1
@@ -112,16 +98,7 @@ simdjson_add_props(
     PRIVATE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>"
 )
 
-if(SIMDJSON_STATIC_REFLECTION)
-  # We would like to require C++26, but no compiler supports that!
-  # This is a hack:
-  simdjson_add_props(
-      target_compile_options PUBLIC
-      -freflection -fexpansion-statements -stdlib=libc++ -std=c++26
-  )
-else()
-  simdjson_add_props(target_compile_features PUBLIC cxx_std_11)
-endif()
+simdjson_add_props(target_compile_features PUBLIC cxx_std_11)
 
 # workaround for GNU GCC poor AVX load/store code generation
 if(
@@ -134,12 +111,6 @@ if(
   )
 endif()
 
-option(SIMDJSON_MINUS_ZERO_AS_FLOAT "Treat -0 as a floating-point value" OFF)
-
-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)

CONTRIBUTING.md

@@ -92,7 +92,7 @@ We welcome contributions from women and less represented groups. If you need hel
 
 Consider the following points when engaging with the project:
 
-- We discourage arguments from authority: ideas are discussed on their own merits and not based on who stated it.
+- We discourage arguments from authority: ideas are discusssed on their own merits and not based on who stated it.
 - Be mindful that what you may view as an aggression is maybe merely a difference of opinion or a misunderstanding.
 - Be mindful that a collection of small aggressions, even if mild in isolation, can become harmful.
 

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.0.7"
+PROJECT_NUMBER         = "3.10.1"
 
 # 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

@@ -20,54 +20,13 @@ If you plan to contribute to simdjson, please read our [CONTRIBUTING](https://gi
 Build Quickstart
 ------------------------------
 
-For non-Windows system,
-
 ```bash
-cmake -B -D SIMDJSON_DEVELOPER_MODE=ON ..
-cmake --build build
-ctest --test-dir build
+mkdir build
+cd build
+cmake -D SIMDJSON_DEVELOPER_MODE=ON ..
+cmake --build .
 ```
 
-It is similar for Visual Studio users, please see the CMake or Visual Studio documentation.
-
-By default the library is built in Release mode.
-
-
-Assertions and development checks
-------------------------------
-
-We do not use conventional `assert` in simdjson. Instead we use the macro
-`SIMDJSON_ASSUME`:
-
-```cpp
-SIMDJSON_ASSUME(something_that_is_true());
-```
-
-Sometimes, you need to do a bit more work that a simple check.
-The `SIMDJSON_DEVELOPMENT_CHECKS` macro is true only in Debug mode unless manually set.
-It is acceptable to add checks that you would not do in Release mode as long as
-they are guarded:
-
-```cpp
-#if SIMDJSON_DEVELOPMENT_CHECKS
-// do sanity checks here
-```
-
-
-Working with sanitizers
-------------------------------
-
-The simdjson library must be memory-safe. We cannot allow buffer overruns.
-During development, if you system supports it, we recommend configuring
-the project with `-D SIMDJSON_SANITIZE=ON`.
-
-```bash
-cmake -B -D SIMDJSON_SANITIZE=ON -D SIMDJSON_DEVELOPER_MODE=ON ..
-cmake --build build
-ctest --test-dir build
-```
-
-
 Design notes
 ------------------------------
 
@@ -144,9 +103,12 @@ simdjson's source structure, from the top level, looks like this:
     * generic/stage2/*.h: `simdjson::<implementation>::stage2` namespace. Generic implementation of the tape creator, which consumes the index from stage 1 and actually parses numbers and string and such. Used for the DOM interface.
 
 Other important files and directories:
+* **.drone.yml:** Definitions for Drone CI.
+* **.appveyor.yml:** Definitions for Appveyor CI (Windows).
+* **.circleci:** Definitions for Circle CI.
 * **.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/amalgamate.py:** Generates `singleheader/simdjson.h` and `singleheader/simdjson.cpp` for release (python script).
 * **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:

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2025 The simdjson authors
+   Copyright 2018-2023 The simdjson authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

LICENSE-MIT

@@ -1,18 +0,0 @@
-Copyright 2018-2025 The simdjson authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,5 +1,7 @@
-[![][license img]][license] [![][licensemit img]][licensemit]
 
+[![Ubuntu 20.04 CI](https://github.com/simdjson/simdjson/workflows/Ubuntu%2020.04%20CI%20(GCC%209)/badge.svg)](https://simdjson.org/plots.html)
+[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/simdjson.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:simdjson)
+[![][license img]][license]
 
 [![Doxygen Documentation](https://img.shields.io/badge/docs-doxygen-green.svg)](https://simdjson.github.io/simdjson/)
 
@@ -29,7 +31,6 @@ Table of Contents
 * [Documentation](#documentation)
 * [Godbolt](#godbolt)
 * [Performance results](#performance-results)
-* [Packages](#packages)
 * [Bindings and Ports of simdjson](#bindings-and-ports-of-simdjson)
 * [About simdjson](#about-simdjson)
 * [Funding](#funding)
@@ -60,10 +61,6 @@ Real-world usage
 - [ada-url](https://github.com/ada-url/ada)
 - [fastgron](https://github.com/adamritter/fastgron)
 - [WasmEdge](https://wasmedge.org)
-- [RonDB](https://github.com/logicalclocks/rondb)
-- [GreptimeDB](https://github.com/GreptimeTeam/greptimedb)
-- [mamba](https://github.com/mamba-org/mamba)
-
 
 If you are planning to use simdjson in a product, please work from one of our releases.
 
@@ -108,7 +105,6 @@ Documentation
 Usage documentation is available:
 
 * [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.
@@ -118,7 +114,6 @@ 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)
 
@@ -148,9 +143,6 @@ speed for [synthetic files over various sizes generated with a script](https://g
 For NDJSON files, we can exceed 3 GB/s with [our  multithreaded parsing functions](https://github.com/simdjson/simdjson/blob/master/doc/parse_many.md).
 
 
-Packages
-------------------------------
-[![Packaging status](https://repology.org/badge/vertical-allrepos/simdjson.svg)](https://repology.org/project/simdjson/versions)
 
 
 Bindings and Ports of simdjson
@@ -175,8 +167,7 @@ We distinguish between "bindings" (which just wrap the C++ code) and a port to a
 - [simdjsone](https://github.com/saleyn/simdjsone): erlang bindings.
 - [lua-simdjson](https://github.com/FourierTransformer/lua-simdjson): lua bindings.
 - [hermes-json](https://hackage.haskell.org/package/hermes-json): haskell bindings.
-- [zimdjson](https://github.com/EzequielRamis/zimdjson): Zig port.
-- [simdjzon](https://github.com/travisstaloch/simdjzon): Zig port.
+- [simdjzon](https://github.com/travisstaloch/simdjzon): zig port.
 - [JSON-Simd](https://github.com/rawleyfowler/JSON-simd): Raku bindings.
 - [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.
@@ -216,11 +207,6 @@ RGPIN-2017-03910 and RGPIN-2024-03787.
 [license]: LICENSE
 [license img]: https://img.shields.io/badge/License-Apache%202-blue.svg
 
-
-[licensemit]: LICENSE-MIT
-[licensemit img]: https://img.shields.io/badge/License-MIT-blue.svg
-
-
 Contributing to simdjson
 ------------------------
 
@@ -230,7 +216,7 @@ Head over to [CONTRIBUTING.md](CONTRIBUTING.md) for information on contributing
 License
 -------
 
-This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html) as well as under the MIT License. As a user, you can pick the license you prefer.
+This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html).
 
 Under Windows, we build some tools using the windows/dirent_portable.h file (which is outside our library code): it is under the liberal (business-friendly) MIT license.
 

benchmark/CMakeLists.txt

@@ -4,9 +4,6 @@ add_subdirectory(dom)
 include_directories( . linux )
 link_libraries(simdjson-windows-headers test-data)
 link_libraries(simdjson)
-if(SIMDJSON_STATIC_REFLECTION)
-  add_compile_definitions(SIMDJSON_STATIC_REFLECTION=1)
-endif(SIMDJSON_STATIC_REFLECTION)
 
 add_executable(benchfeatures benchfeatures.cpp)
 add_executable(get_corpus_benchmark get_corpus_benchmark.cpp)
@@ -35,16 +32,3 @@ if (TARGET benchmark::benchmark)
   endif()
 endif()
 
-
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag("-std=c++20" SIMDJSON_COMPILER_SUPPORTS_CXX20)
-if(SIMDJSON_STATIC_REFLECTION)
-  add_subdirectory(static_reflect)
-else()
-  if(SIMDJSON_EXCEPTIONS AND SIMDJSON_COMPILER_SUPPORTS_CXX20)
-    add_subdirectory(from)
-    add_subdirectory(car_builder)
-  endif()
-endif(SIMDJSON_STATIC_REFLECTION)
-
-

benchmark/benchmark_reflection_usage_compilation.sh

@@ -1,618 +0,0 @@
-#!/bin/bash
-
-# JSON Parsing Compilation Benchmark: Reflection Usage vs Manual Parsing
-# Compares compilation times when ACTUALLY USING reflection for parsing vs manual parsing
-# This measures the compile-time cost of reflection-based automatic deserialization
-
-set -e
-
-echo "=== simdjson Reflection Usage Compilation Benchmark ==="
-echo "Measuring compilation impact of ACTUALLY USING reflection for parsing"
-echo "Starting at: $(date)"
-echo
-echo "╔════════════════════════════════════════════════════════════════════════════╗"
-echo "║                              METHODOLOGY                                   ║"
-echo "╠════════════════════════════════════════════════════════════════════════════╣"
-echo "║                                                                            ║"
-echo "║ FAIR COMPARISON STRATEGY:                                                  ║"
-echo "║ This benchmark compares two DIFFERENT approaches to parsing the same JSON: ║"
-echo "║                                                                            ║"
-echo "║ • MANUAL PARSING: Traditional simdjson with explicit .get() calls          ║"
-echo "║   - Uses doc[\"field\"].get(variable) for each field                         ║"
-echo "║   - No reflection involved                                                 ║"
-echo "║                                                                            ║"
-echo "║ • REFLECTION PARSING: Automatic deserialization with reflection            ║"
-echo "║   - Uses doc.get<MyStruct>() for automatic field mapping                   ║"
-echo "║   - Relies on compile-time reflection to generate parsing code             ║"
-echo "║                                                                            ║"
-echo "║ WHAT WE'RE MEASURING:                                                      ║"
-echo "║ • Compile-time cost of reflection-based automatic deserialization          ║"
-echo "║ • Template instantiation overhead for reflection parsing                   ║"
-echo "║ • Code generation complexity from using reflection features                ║"
-echo "║                                                                            ║"
-echo "║ TEST SCENARIOS:                                                            ║"
-echo "║                                                                            ║"
-echo "║ 1. SIMPLE STRUCT: Basic fields (string, int, bool)                         ║"
-echo "║    - Measures baseline reflection overhead                                 ║"
-echo "║                                                                            ║"
-echo "║ 2. NESTED STRUCT: Multiple levels of nested objects                        ║"
-echo "║    - Measures reflection complexity scaling                                ║"
-echo "║                                                                            ║"
-echo "║ 3. COMPLEX STRUCT: Arrays, optional fields, mixed types                    ║"
-echo "║    - Measures real-world reflection usage impact                           ║"
-echo "║                                                                            ║"
-echo "║ WHY THIS IS MEANINGFUL:                                                    ║"
-echo "║ • Shows actual cost of using reflection features                           ║"
-echo "║ • Measures compile-time code generation overhead                           ║"
-echo "║ • Helps developers understand reflection's compilation impact              ║"
-echo "║ • Compares equivalent functionality implemented two different ways         ║"
-echo "║                                                                            ║"
-echo "╚════════════════════════════════════════════════════════════════════════════╝"
-echo
-
-# Configuration
-ITERATIONS=10
-JOBS=4
-
-# ───────────────────────────── BOX-PRINT HELPER ────────────────────────────
-BOX_WIDTH=74                               # characters between the pipes
-print_box_line() {                         # usage: print_box_line "text"
-  printf "║ %-*s ║\n" "${BOX_WIDTH}" "$1"
-}
-
-# Function to test if a compiler supports reflection with debug output
-test_reflection_support() {
-    local compiler="$1"
-    echo "  → Testing compiler: $compiler"
-
-    if [ ! -x "$compiler" ] && ! command -v "$compiler" >/dev/null 2>&1; then
-        echo "  → Compiler not found or not executable"
-        return 1
-    fi
-
-    # Check compiler version first
-    echo "  → Compiler version: $("$compiler" --version 2>/dev/null | head -n1 || echo "version check failed")"
-
-    # Simple test: check if compiler accepts reflection flags
-    local test_file=$(mktemp /tmp/reflection_test_XXXXXX.cpp)
-    cat > "$test_file" << 'EOF'
-int main() {
-    return 0;
-}
-EOF
-
-    echo "  → Testing basic reflection flags..."
-    local test_exe=$(mktemp /tmp/reflection_test_XXXXXX)
-    local basic_result=$("$compiler" -freflection -fexpansion-statements -std=c++26 "$test_file" -o "$test_exe" 2>&1)
-    local basic_exit_code=$?
-
-    if [ $basic_exit_code -ne 0 ]; then
-        echo "  → Basic flags FAILED with exit code $basic_exit_code"
-        echo "  → Error output: $basic_result"
-        rm -f "$test_file" "$test_exe"
-        return 1
-    fi
-    echo "  → Basic flags: OK"
-    rm -f "$test_exe"
-
-    # Test reflection syntax
-    echo "  → Testing reflection syntax..."
-    cat > "$test_file" << 'EOF'
-struct Test {
-    int x;
-};
-
-int main() {
-    auto refl = ^^Test;
-    return 0;
-}
-EOF
-
-    local syntax_result=$("$compiler" -freflection -fexpansion-statements -std=c++26 "$test_file" -o "$test_exe" 2>&1)
-    local syntax_exit_code=$?
-
-    if [ $syntax_exit_code -eq 0 ]; then
-        echo "  → Reflection syntax: OK"
-        echo "  → ✓ REFLECTION SUPPORT CONFIRMED"
-        rm -f "$test_file" "$test_exe"
-        return 0
-    else
-        echo "  → Reflection syntax FAILED with exit code $syntax_exit_code"
-        echo "  → Error output: $syntax_result"
-        rm -f "$test_file" "$test_exe"
-        return 1
-    fi
-}
-
-# Find a compiler with reflection support
-echo "Searching for clang++ with reflection support..."
-
-REFLECTION_CXX=""
-REFLECTION_CC=""
-
-# List of potential clang++ locations to check
-POTENTIAL_COMPILERS=(
-    "/usr/local/bin/clang++"
-    "/opt/clang/bin/clang++"
-    "/usr/bin/clang++"
-    "clang++"
-)
-
-# If CXX is already set, test it first
-if [ -n "$CXX" ]; then
-    echo "Testing user-specified compiler: $CXX"
-    if test_reflection_support "$CXX"; then
-        REFLECTION_CXX="$CXX"
-        echo "✓ User-specified compiler supports reflection: $CXX"
-    else
-        echo "✗ User-specified compiler does not support reflection: $CXX"
-        echo "Will search for alternative..."
-    fi
-fi
-
-# If we don't have a working compiler yet, search for one
-if [ -z "$REFLECTION_CXX" ]; then
-    for compiler in "${POTENTIAL_COMPILERS[@]}"; do
-        echo "Testing: $compiler"
-        if test_reflection_support "$compiler"; then
-            REFLECTION_CXX="$compiler"
-            echo "✓ Found reflection-enabled compiler: $compiler"
-            break
-        else
-            echo "✗ No reflection support: $compiler"
-        fi
-    done
-fi
-
-# Check if we found a working compiler
-if [ -z "$REFLECTION_CXX" ]; then
-    echo
-    echo "╔════════════════════════════════════════════════════════════════════════════╗"
-    echo "║                                 ERROR                                      ║"
-    echo "╠════════════════════════════════════════════════════════════════════════════╣"
-    echo "║                                                                            ║"
-    echo "║ No clang++ compiler with reflection support found!                        ║"
-    echo "║                                                                            ║"
-    echo "║ This benchmark requires a compiler that supports C++26 reflection.        ║"
-    echo "║                                                                            ║"
-    echo "║ Options:                                                                   ║"
-    echo "║ 1. Use the Docker container: ./p2996/run_docker.sh                        ║"
-    echo "║ 2. Build clang with reflection from: https://github.com/bloomberg/clang-p2996 ║"
-    echo "║ 3. Set CXX environment variable to point to reflection-enabled clang++    ║"
-    echo "║                                                                            ║"
-    echo "║ Example: CXX=/path/to/reflection-clang++ ./benchmark_script.sh            ║"
-    echo "║                                                                            ║"
-    echo "╚════════════════════════════════════════════════════════════════════════════╝"
-    exit 1
-fi
-
-# Set the compilers
-export CXX="$REFLECTION_CXX"
-
-# Find corresponding C compiler
-if [ -n "$CC" ]; then
-    REFLECTION_CC="$CC"
-elif [ "$REFLECTION_CXX" = "/usr/local/bin/clang++" ]; then
-    REFLECTION_CC="/usr/local/bin/clang"
-elif [ "$REFLECTION_CXX" = "/opt/clang/bin/clang++" ]; then
-    REFLECTION_CC="/opt/clang/bin/clang"
-elif [ "$REFLECTION_CXX" = "/usr/bin/clang++" ]; then
-    REFLECTION_CC="/usr/bin/clang"
-else
-    REFLECTION_CC="clang"
-fi
-
-export CC="$REFLECTION_CC"
-
-echo
-echo "Using reflection-enabled compiler: $($CXX --version | head -n1)"
-echo "Using C compiler: $($CC --version | head -n1)"
-echo
-
-# Function to create manual parsing test
-create_manual_parsing_test() {
-    local test_name="$1"
-    local struct_complexity="$2"
-
-    cat > "${test_name}_manual.cpp" << 'EOF'
-#include <simdjson.h>
-#include <iostream>
-#include <string>
-#include <vector>
-#include <optional>
-
-// Test structures
-struct Person {
-    std::string name;
-    int age;
-    bool active;
-};
-
-struct Address {
-    std::string street;
-    std::string city;
-    int zipcode;
-};
-
-struct Employee {
-    Person person;
-    Address address;
-    std::vector<std::string> skills;
-    std::optional<std::string> department;
-    double salary;
-};
-
-// Manual parsing functions
-bool parse_person_manual(simdjson::ondemand::value& val, Person& person) {
-    auto obj = val.get_object();
-    if (obj.error()) return false;
-
-    for (auto field : obj) {
-        std::string_view key = field.unescaped_key();
-        if (key == "name") {
-            std::string_view name_val;
-            if (field.value().get(name_val)) return false;
-            person.name = name_val;
-        } else if (key == "age") {
-            if (field.value().get(person.age)) return false;
-        } else if (key == "active") {
-            if (field.value().get(person.active)) return false;
-        }
-    }
-    return true;
-}
-
-bool parse_address_manual(simdjson::ondemand::value& val, Address& address) {
-    auto obj = val.get_object();
-    if (obj.error()) return false;
-
-    for (auto field : obj) {
-        std::string_view key = field.unescaped_key();
-        if (key == "street") {
-            std::string_view street_val;
-            if (field.value().get(street_val)) return false;
-            address.street = street_val;
-        } else if (key == "city") {
-            std::string_view city_val;
-            if (field.value().get(city_val)) return false;
-            address.city = city_val;
-        } else if (key == "zipcode") {
-            if (field.value().get(address.zipcode)) return false;
-        }
-    }
-    return true;
-}
-
-bool parse_employee_manual(simdjson::ondemand::document& doc, Employee& employee) {
-    auto obj = doc.get_object();
-    if (obj.error()) return false;
-
-    for (auto field : obj) {
-        std::string_view key = field.unescaped_key();
-        if (key == "person") {
-            auto person_val = field.value();
-            if (!parse_person_manual(person_val, employee.person)) return false;
-        } else if (key == "address") {
-            auto addr_val = field.value();
-            if (!parse_address_manual(addr_val, employee.address)) return false;
-        } else if (key == "skills") {
-            auto skills_array = field.value().get_array();
-            if (skills_array.error()) return false;
-            for (auto skill : skills_array) {
-                std::string_view skill_val;
-                if (skill.get(skill_val)) return false;
-                employee.skills.emplace_back(skill_val);
-            }
-        } else if (key == "department") {
-            std::string_view dept_val;
-            if (!field.value().get(dept_val)) {
-                employee.department = dept_val;
-            }
-        } else if (key == "salary") {
-            if (field.value().get(employee.salary)) return false;
-        }
-    }
-    return true;
-}
-
-int main() {
-    simdjson::ondemand::parser parser;
-    std::string json_str = R"({
-        "person": {
-            "name": "John Doe",
-            "age": 30,
-            "active": true
-        },
-        "address": {
-            "street": "123 Main St",
-            "city": "Anytown",
-            "zipcode": 12345
-        },
-        "skills": ["C++", "JSON", "Programming"],
-        "department": "Engineering",
-        "salary": 85000.50
-    })";
-
-    simdjson::ondemand::document doc;
-    auto error = parser.iterate(simdjson::pad(json_str)).get(doc);
-    if (error) {
-        std::cerr << "Parse error" << std::endl;
-        return 1;
-    }
-
-    Employee employee;
-    if (!parse_employee_manual(doc, employee)) {
-        std::cerr << "Manual parsing failed" << std::endl;
-        return 1;
-    }
-
-    std::cout << "Manual parsing successful: " << employee.person.name
-              << ", age " << employee.person.age << std::endl;
-    return 0;
-}
-EOF
-}
-
-# Function to create reflection parsing test
-create_reflection_parsing_test() {
-    local test_name="$1"
-    local struct_complexity="$2"
-
-    cat > "${test_name}_reflection.cpp" << 'EOF'
-#include <simdjson.h>
-#include <iostream>
-#include <string>
-#include <vector>
-#include <optional>
-
-// Test structures (same as manual version)
-struct Person {
-    std::string name;
-    int age;
-    bool active;
-};
-
-struct Address {
-    std::string street;
-    std::string city;
-    int zipcode;
-};
-
-struct Employee {
-    Person person;
-    Address address;
-    std::vector<std::string> skills;
-    std::optional<std::string> department;
-    double salary;
-};
-
-int main() {
-    simdjson::ondemand::parser parser;
-    std::string json_str = R"({
-        "person": {
-            "name": "John Doe",
-            "age": 30,
-            "active": true
-        },
-        "address": {
-            "street": "123 Main St",
-            "city": "Anytown",
-            "zipcode": 12345
-        },
-        "skills": ["C++", "JSON", "Programming"],
-        "department": "Engineering",
-        "salary": 85000.50
-    })";
-
-    simdjson::ondemand::document doc;
-    auto error = parser.iterate(simdjson::pad(json_str)).get(doc);
-    if (error) {
-        std::cerr << "Parse error" << std::endl;
-        return 1;
-    }
-
-    // Use reflection-based automatic deserialization
-    Employee employee;
-    auto result = doc.get<Employee>();
-    if (result.error()) {
-        std::cerr << "Reflection parsing failed" << std::endl;
-        return 1;
-    }
-    employee = result.value();
-
-    std::cout << "Reflection parsing successful: " << employee.person.name
-              << ", age " << employee.person.age << std::endl;
-    return 0;
-}
-EOF
-}
-
-# Function to time compilation of parsing approach
-time_parsing_compilation() {
-    local description="$1"
-    local test_file="$2"
-    local use_reflection="$3"
-    local iteration="$4"
-
-    echo "[$iteration] $description"
-
-    # Clean build
-    rm -rf build_parsing_test
-    mkdir build_parsing_test
-    cd build_parsing_test
-
-    # Copy test file
-    cp "../$test_file" .
-
-    echo "  Configuring..."
-    if [ "$use_reflection" = "true" ]; then
-        cmake -DCMAKE_CXX_COMPILER="$CXX" \
-              -DSIMDJSON_DEVELOPER_MODE=ON \
-              -DSIMDJSON_STATIC_REFLECTION=ON \
-              -DBUILD_SHARED_LIBS=OFF \
-              ../.. >/dev/null 2>&1
-    else
-        cmake -DCMAKE_CXX_COMPILER="$CXX" \
-              -DSIMDJSON_DEVELOPER_MODE=ON \
-              -DSIMDJSON_STATIC_REFLECTION=OFF \
-              -DBUILD_SHARED_LIBS=OFF \
-              ../.. >/dev/null 2>&1
-    fi
-
-    echo "  Building simdjson..."
-    cmake --build . --target simdjson >/dev/null 2>&1
-
-    echo "  Compiling parsing test..."
-    # Time just the test compilation
-    start_time=$(date +%s.%N)
-
-    "$CXX" -std=c++17 -I../../include "$test_file" -L. -lsimdjson -o parsing_test >/dev/null 2>&1
-
-    end_time=$(date +%s.%N)
-
-    # Calculate time duration
-    time_taken=$(echo "$end_time $start_time" | awk '{printf "%.3f", $1 - $2}')
-    echo "  Completed in: ${time_taken}s"
-
-    cd ..
-    rm -rf build_parsing_test
-
-    echo "$time_taken"
-}
-
-# Create test files
-echo "Creating test files..."
-create_manual_parsing_test "complex" "complex"
-create_reflection_parsing_test "complex" "complex"
-
-# Arrays to store times
-times_manual=""
-times_reflection=""
-
-echo
-echo "=== MANUAL PARSING COMPILATION ==="
-echo "Testing traditional simdjson parsing with explicit .get() calls"
-echo
-
-for i in $(seq 1 $ITERATIONS); do
-    time_result=$(time_parsing_compilation "Compiling manual parsing test" "complex_manual.cpp" "false" "$i" | tail -n1)
-    times_manual="$times_manual $time_result"
-done
-
-echo
-echo "=== REFLECTION PARSING COMPILATION ==="
-echo "Testing automatic deserialization with doc.get<Struct>()"
-echo
-
-for i in $(seq 1 $ITERATIONS); do
-    time_result=$(time_parsing_compilation "Compiling reflection parsing test" "complex_reflection.cpp" "true" "$i" | tail -n1)
-    times_reflection="$times_reflection $time_result"
-done
-
-echo
-echo "╔════════════════════════════════════════════════════════════════════════════╗"
-echo "║           REFLECTION USAGE COMPILATION RESULTS                             ║"
-echo "╠════════════════════════════════════════════════════════════════════════════╣"
-echo "║                                                                            ║"
-echo "║ MANUAL PARSING (explicit .get() calls):                                    ║"
-count=1
-for t in $times_manual; do
-    if [[ "$t" =~ ^[0-9]+\.?[0-9]*$ ]]; then
-        line=$(printf "Run %2d: %7.3f seconds" "$count" "$t")
-        print_box_line "$line"
-        count=$((count + 1))
-    fi
-done
-echo "║                                                                            ║"
-echo "║ REFLECTION PARSING (automatic doc.get<Struct>()):                          ║"
-count=1
-for t in $times_reflection; do
-    if [[ "$t" =~ ^[0-9]+\.?[0-9]*$ ]]; then
-        line=$(printf "Run %2d: %7.3f seconds" "$count" "$t")
-        print_box_line "$line"
-        count=$((count + 1))
-    fi
-done
-echo "╚════════════════════════════════════════════════════════════════════════════╝"
-
-echo
-echo "╔════════════════════════════════════════════════════════════════════════════╗"
-echo "║                              ANALYSIS SUMMARY                              ║"
-echo "╠════════════════════════════════════════════════════════════════════════════╣"
-echo "║                                                                            ║"
-
-# Calculate averages and percentages - filter to only numeric values first
-manual_numbers=""
-reflection_numbers=""
-
-for t in $times_manual; do
-    if [[ "$t" =~ ^[0-9]+\.?[0-9]*$ ]]; then
-        manual_numbers="$manual_numbers $t"
-    fi
-done
-
-for t in $times_reflection; do
-    if [[ "$t" =~ ^[0-9]+\.?[0-9]*$ ]]; then
-        reflection_numbers="$reflection_numbers $t"
-    fi
-done
-
-if [ -n "$manual_numbers" ] && [ -n "$reflection_numbers" ]; then
-    manual_avg=$(echo "$manual_numbers" | awk '{sum=0; for(i=1;i<=NF;i++) sum+=$i; print sum/NF}')
-    reflection_avg=$(echo "$reflection_numbers" | awk '{sum=0; for(i=1;i<=NF;i++) sum+=$i; print sum/NF}')
-    overhead=$(echo "$reflection_avg $manual_avg" | awk '{printf "%.3f", $1 - $2}')
-
-    if [ $(echo "$manual_avg > 0" | awk '{print ($1 > 0)}') -eq 1 ]; then
-        percent=$(echo "$reflection_avg $manual_avg" | awk '{printf "%.1f", ($1 - $2) / $2 * 100}')
-    else
-        percent="0"
-    fi
-
-    print_box_line "MANUAL PARSING RESULTS:"
-    print_box_line "$(printf "Average compilation time: %.3fs" "$manual_avg")"
-    print_box_line ""
-    print_box_line "REFLECTION PARSING RESULTS:"
-    print_box_line "$(printf "Average compilation time: %.3fs" "$reflection_avg")"
-    print_box_line ""
-    print_box_line "REFLECTION OVERHEAD:"
-    print_box_line "$(printf "Additional time: %.3fs (%+.1f%%)" "$overhead" "$percent")"
-    print_box_line ""
-else
-    echo "║ ERROR: Could not extract valid timing data                                 ║"
-    echo "║ Manual times: $times_manual"
-    echo "║ Reflection times: $times_reflection"
-    echo "║                                                                            ║"
-fi
-
-echo "╠════════════════════════════════════════════════════════════════════════════╣"
-echo "║                              INTERPRETATION                                ║"
-echo "╠════════════════════════════════════════════════════════════════════════════╣"
-echo "║                                                                            ║"
-echo "║ WHAT THESE RESULTS SHOW:                                                   ║"
-echo "║                                                                            ║"
-echo "║ • COMPILE-TIME COST: How much longer reflection parsing takes to compile   ║"
-echo "║   - Higher % = more expensive template instantiation and codegen           ║"
-echo "║                                                                            ║"
-echo "║ • CODE GENERATION OVERHEAD: Reflection creates parsing code at compile     ║"
-echo "║   time, which requires more template processing than manual parsing        ║"
-echo "║                                                                            ║"
-echo "║ • DEVELOPER TRADE-OFF: Reflection provides automatic deserialization       ║"
-echo "║   but at the cost of increased compilation time                            ║"
-echo "║                                                                            ║"
-echo "║ EVALUATION:                                                                ║"
-echo "║ • Low overhead (0-20%): Reflection is compile-time efficient               ║"
-echo "║ • Medium overhead (20-50%): Noticeable but potentially acceptable          ║"
-echo "║ • High overhead (50%+): Significant compilation cost for reflection        ║"
-echo "║                                                                            ║"
-echo "║ REAL-WORLD IMPACT:                                                         ║"
-echo "║ • Small projects: Absolute time matters more than percentage               ║"
-echo "║ • Large projects: Percentage overhead compounds across many files          ║"
-echo "║ • CI/CD pipelines: Longer builds affect development velocity               ║"
-echo "║                                                                            ║"
-echo "╚════════════════════════════════════════════════════════════════════════════╝"
-
-# Clean up test files
-rm -f complex_manual.cpp complex_reflection.cpp
-
-echo
-echo "Completed at: $(date)"

benchmark/car_builder/CMakeLists.txt

@@ -1,14 +0,0 @@
-# Executable
-add_executable(benchmark_car_builder benchmark_car_builder.cpp)
-
-# Compile for C++20.
-target_compile_features(benchmark_car_builder PRIVATE cxx_std_20)
-
-# Check if -march=native is supported
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag("-march=native" SIMDJSON_SUPPORTS_MARCH_NATIVE)
-if(SIMDJSON_SUPPORTS_MARCH_NATIVE)
-  target_compile_options(benchmark_car_builder PRIVATE -march=native)
-endif()
-
-target_include_directories(benchmark_car_builder PRIVATE ${CMAKE_CURRENT_LIST_DIR}/..)

benchmark/car_builder/benchmark_car_builder.cpp

@@ -1,127 +0,0 @@
-#include "event_counter.h"
-#include <random>
-#include <vector>
-
-#include <simdjson.h>
-
-event_collector collector;
-
-struct Car {
-  std::string make;
-  std::string model;
-  int64_t year; // We deliberately do not include the tire pressure.
-};
-
-std::vector<Car> generate_random_cars(size_t count) {
-  static const std::vector<std::string> makes = {"Toyota", "Honda", "Ford",
-                                                 "BMW", "Mazda"};
-  static const std::vector<std::string> models = {"Camry", "Civic", "Focus",
-                                                  "320i", "3"};
-  static thread_local std::mt19937 rng{std::random_device{}()};
-  std::uniform_int_distribution<int> make_dist(0, makes.size() - 1);
-  std::uniform_int_distribution<int> model_dist(0, models.size() - 1);
-  std::uniform_int_distribution<int64_t> year_dist(2000, 2025);
-  std::uniform_real_distribution<double> pressure_dist(30.0, 45.0);
-
-  std::vector<Car> cars;
-  cars.reserve(count);
-  for (size_t i = 0; i < count; ++i) {
-    Car car;
-    car.make = makes[make_dist(rng)];
-    car.model = models[model_dist(rng)];
-    car.year = year_dist(rng);
-    cars.push_back(std::move(car));
-  }
-  return cars;
-}
-
-std::string_view serialize(simdjson::builder::string_builder &sb,
-                           const std::vector<Car> &cars) {
-  sb.clear();
-  sb.start_array();
-  for (const auto &car : cars) {
-    sb.start_object();
-    sb.append_key_value("make", car.make);
-    sb.append_comma();
-    sb.append_key_value("model", car.model);
-    sb.append_comma();
-    sb.append_key_value("year", car.year);
-    sb.end_object();
-  }
-  sb.end_array();
-  std::string_view result;
-  if (sb.view().get(result)) {
-    return ""; // unexpected (error)
-  }
-  return result;
-}
-
-double pretty_print(const std::string &name, size_t num_chars,
-                    std::pair<event_aggregate, size_t> result) {
-  const auto &agg = result.first;
-  size_t N = result.second;
-  num_chars *= N;
-  printf("%-40s : %8.2f ns %8.2f GB/s", name.c_str(),
-         agg.elapsed_ns() / num_chars, num_chars / agg.elapsed_ns());
-  if (collector.has_events()) {
-    printf(" %8.2f GHz %8.2f cycles/char %8.2f ins./char %8.2f i/c",
-           agg.cycles() / agg.elapsed_ns(), agg.cycles() / num_chars,
-           agg.instructions() / num_chars, agg.instructions() / agg.cycles());
-  }
-  printf("\n");
-  return num_chars / agg.elapsed_ns();
-}
-
-template <class function_type>
-std::pair<event_aggregate, size_t>
-bench(const function_type &&function, size_t min_repeat = 100,
-      size_t min_time_ns = 40'000'000, size_t max_repeat = 10000000) {
-  size_t N = min_repeat;
-  if (N == 0) {
-    N = 1;
-  }
-  event_aggregate warm_aggregate{};
-  for (size_t i = 0; i < N; i++) {
-    std::atomic_thread_fence(std::memory_order_acquire);
-    collector.start();
-    function();
-    std::atomic_thread_fence(std::memory_order_release);
-    event_count allocate_count = collector.end();
-    warm_aggregate << allocate_count;
-    if ((i + 1 == N) && (warm_aggregate.total_elapsed_ns() < min_time_ns) &&
-        (N < max_repeat)) {
-      N *= 10;
-    }
-  }
-  event_aggregate aggregate{};
-  for (size_t i = 0; i < 10; i++) {
-    std::atomic_thread_fence(std::memory_order_acquire);
-    collector.start();
-    for (size_t i = 0; i < N; i++) {
-      function();
-    }
-    std::atomic_thread_fence(std::memory_order_release);
-    event_count allocate_count = collector.end();
-    aggregate << allocate_count;
-  }
-  return {aggregate, N};
-}
-
-void run_benchmarks() {
-  std::vector<Car> source = generate_random_cars(100000);
-  simdjson::builder::string_builder sb;
-  size_t volume = serialize(sb, source).size();
-
-  pretty_print("string_builder", volume, bench([&source, &sb]() -> size_t {
-                 return serialize(sb, source).size();
-               }));
-}
-
-int main() {
-  for (size_t trial = 0; trial < 3; trial++) {
-    printf("Trial %zu:\n", trial + 1);
-    run_benchmarks();
-    printf("\n");
-  }
-  return EXIT_SUCCESS;
-}

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/dom/parse_stream.cpp

@@ -25,11 +25,12 @@ int main(int argc, char *argv[]) {
     exit(1);
   }
   const char *filename = argv[1];
-  simdjson::padded_string p;
-  if (simdjson::padded_string::load(filename).get(p)) {
+  auto v = simdjson::padded_string::load(filename);
+  if (v.error()) {
     std::cerr << "Could not load the file " << filename << std::endl;
     return EXIT_FAILURE;
   }
+  const simdjson::padded_string& p = v.value_unsafe();
   if (test_baseline) {
     std::wclog << "Baseline: Getline + normal parse... " << std::endl;
     std::cout << "Gigabytes/second\t"

benchmark/event_counter.h

@@ -122,7 +122,6 @@ struct event_aggregate {
   }
 
   double elapsed_sec() const { return total.elapsed_sec() / iterations; }
-  double total_elapsed_ns() const { return total.elapsed_ns(); }
   double elapsed_ns() const { return total.elapsed_ns() / iterations; }
   double cycles() const { return total.cycles() / iterations; }
   double instructions() const { return total.instructions() / iterations; }

benchmark/find_tweet/nlohmann_json.h

@@ -13,7 +13,7 @@ struct nlohmann_json {
     auto root = nlohmann::json::parse(json.data(), json.data() + json.size());
     for (auto tweet : root["statuses"]) {
       if (tweet["id"] == find_id) {
-        result = to_string(tweet["text"]);
+        result = tweet["text"];
         return true;
       }
     }

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/from/CMakeLists.txt

@@ -1,15 +0,0 @@
-# Executable
-add_executable(from_benchmark from_benchmark.cpp)
-
-# Compile for C++20.
-if(CMAKE_CXX_STANDARD LESS 20)
-  target_compile_features(from_benchmark PRIVATE cxx_std_20)
-endif()
-# Check if -march=native is supported
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag("-march=native" SIMDJSON_SUPPORTS_MARCH_NATIVE)
-if(SIMDJSON_SUPPORTS_MARCH_NATIVE)
-  target_compile_options(from_benchmark PRIVATE -march=native)
-endif()
-
-target_include_directories(from_benchmark PRIVATE ${CMAKE_CURRENT_LIST_DIR}/..)

benchmark/from/benchmark_helpers.h

@@ -1,77 +0,0 @@
-#ifndef BENCHMARK_HELPERS_H
-#define BENCHMARK_HELPERS_H
-
-#include "event_counter.h"
-#include <atomic>
-
-event_collector collector;
-
-template <class function_type>
-std::pair<event_aggregate, size_t>
-bench(const function_type &&function, size_t min_repeat = 10,
-      size_t min_time_ns = 40'000'000, size_t max_repeat = 10000000) {
-  size_t N = min_repeat;
-  if (N == 0) {
-    N = 1;
-  }
-  event_aggregate warm_aggregate{};
-  for (size_t i = 0; i < N; i++) {
-    std::atomic_thread_fence(std::memory_order_acquire);
-    collector.start();
-    function();
-    std::atomic_thread_fence(std::memory_order_release);
-    event_count allocate_count = collector.end();
-    warm_aggregate << allocate_count;
-    if ((i + 1 == N) && (warm_aggregate.total_elapsed_ns() < min_time_ns) &&
-        (N < max_repeat)) {
-      N *= 10;
-    }
-  }
-  event_aggregate aggregate{};
-  for (size_t i = 0; i < 10; i++) {
-    std::atomic_thread_fence(std::memory_order_acquire);
-    collector.start();
-    for (size_t i = 0; i < N; i++) {
-      function();
-    }
-    std::atomic_thread_fence(std::memory_order_release);
-    event_count allocate_count = collector.end();
-    aggregate << allocate_count;
-  }
-  return {aggregate, N};
-}
-
-double pretty_print(const std::string &name, size_t num_chars,
-                    std::pair<event_aggregate, size_t> result) {
-  const auto &agg = result.first;
-  size_t N = result.second;
-  num_chars *= N;
-  printf("%-40s : %8.2f ns %8.2f GB/s", name.c_str(),
-         agg.elapsed_ns() / num_chars, num_chars / agg.elapsed_ns());
-  if (collector.has_events()) {
-    printf(" %8.2f GHz %8.2f cycles/char %8.2f ins./char %8.2f i/c",
-           agg.cycles() / agg.elapsed_ns(), agg.cycles() / num_chars,
-           agg.instructions() / num_chars, agg.instructions() / agg.cycles());
-  }
-  printf("\n");
-  return num_chars / agg.elapsed_ns();
-}
-
-double pretty_print_array(const std::string &name, size_t num_chars, size_t num_elements,
-                    std::pair<event_aggregate, size_t> result) {
-  const auto &agg = result.first;
-  size_t N = result.second;
-  num_chars *= N;
-  printf("%-40s : %8.2f ns/char %8.2f ns/value %8.2f GB/s", name.c_str(),
-         agg.elapsed_ns() / num_chars, agg.elapsed_ns() / num_elements, num_chars / agg.elapsed_ns());
-  if (collector.has_events()) {
-    printf(" %8.2f GHz %8.2f cycles/char %8.2f ins./char %8.2f ins./value %8.2f i/c",
-           agg.cycles() / agg.elapsed_ns(), agg.cycles() / num_chars,
-           agg.instructions() / num_chars, agg.instructions() / num_elements, agg.instructions() / agg.cycles());
-  }
-  printf("\n");
-  return num_chars / agg.elapsed_ns();
-}
-
-
-#endif

benchmark/from/car_helpers.h

@@ -1,146 +0,0 @@
-#ifndef CAR_HELPERS_H
-#define CAR_HELPERS_H
-
-#include <iomanip>
-#include <random>
-#include <sstream>
-#include <vector>
-
-#include <simdjson.h>
-
-struct Car {
-  std::string make;
-  std::string model;
-  int64_t year; // We deliberately do not include the tire pressure.
-};
-
-using namespace simdjson;
-
-std::string random_car_json() {
-  static const std::vector<std::string> makes = {"Toyota", "Honda", "Ford",
-                                                 "BMW", "Mazda"};
-  static const std::vector<std::string> models = {"Camry", "Civic", "Focus",
-                                                  "320i", "3"};
-  static thread_local std::mt19937 rng{std::random_device{}()};
-  std::uniform_int_distribution<int> make_dist(0, makes.size() - 1);
-  std::uniform_int_distribution<int> model_dist(0, models.size() - 1);
-  std::uniform_int_distribution<int> year_dist(2000, 2025);
-  std::uniform_real_distribution<double> pressure_dist(30.0, 45.0);
-
-  std::ostringstream oss;
-  oss << R"({ "make": ")" << makes[make_dist(rng)] << R"(", "model": ")"
-      << models[model_dist(rng)] << R"(",  "year": )" << year_dist(rng)
-      << R"(, "tire_pressure": [ )" << std::fixed << std::setprecision(1)
-      << pressure_dist(rng) << ", " << pressure_dist(rng) << R"( ] })";
-  return oss.str();
-}
-
-std::string generate_car_json_stream(size_t N) {
-  std::ostringstream oss;
-  for (size_t i = 0; i < N; ++i) {
-    oss << random_car_json();
-    oss << "\n";
-  }
-  return oss.str();
-}
-
-std::string generate_car_json_array(size_t N) {
-  std::ostringstream oss;
-  oss << "[\n";
-  for (size_t i = 0; i < N; ++i) {
-    oss << random_car_json();
-    if (i < N - 1) {
-      oss << ",";
-    }
-    oss << "\n";
-  }
-  oss << "]";
-  return oss.str();
-}
-
-// We want to maximize C++ portability, but this is not needed with static
-// reflection (C++26).
-template <>
-simdjson_inline simdjson_result<Car>
-simdjson::ondemand::document::get() & noexcept {
-  ondemand::object obj;
-  auto error = get_object().get(obj);
-  if (error) {
-    return error;
-  }
-  Car car;
-  if ((error = obj["make"].get_string(car.make))) {
-    return error;
-  }
-  if ((error = obj["model"].get_string(car.model))) {
-    return error;
-  }
-  if ((error = obj["year"].get_int64().get(car.year))) {
-    return error;
-  }
-  return car;
-}
-
-template <>
-simdjson_inline simdjson_result<Car> simdjson::ondemand::value::get() noexcept {
-  ondemand::object obj;
-  auto error = get_object().get(obj);
-  if (error) {
-    return error;
-  }
-  Car car;
-  if ((error = obj["make"].get_string(car.make))) {
-    return error;
-  }
-  if ((error = obj["model"].get_string(car.model))) {
-    return error;
-  }
-  if ((error = obj["year"].get_int64().get(car.year))) {
-    return error;
-  }
-  return car;
-}
-
-template <>
-simdjson_inline simdjson_result<Car>
-simdjson::ondemand::document_reference::get() & noexcept {
-  ondemand::object obj;
-  auto error = get_object().get(obj);
-  if (error) {
-    return error;
-  }
-  Car car;
-  if ((error = obj["make"].get_string(car.make))) {
-    return error;
-  }
-  if ((error = obj["model"].get_string(car.model))) {
-    return error;
-  }
-  if ((error = obj["year"].get_int64().get(car.year))) {
-    return error;
-  }
-  return car;
-}
-
-template <>
-simdjson_inline simdjson_result<Car>
-simdjson::ondemand::document_reference::get() && noexcept {
-  ondemand::object obj;
-  auto error = get_object().get(obj);
-  if (error) {
-    return error;
-  }
-  Car car;
-  if ((error = obj["make"].get_string(car.make))) {
-    return error;
-  }
-  if ((error = obj["model"].get_string(car.model))) {
-    return error;
-  }
-  if ((error = obj["year"].get_int64().get(car.year))) {
-    return error;
-  }
-  return car;
-}
-
-#endif

benchmark/from/from_benchmark.cpp

@@ -1,132 +0,0 @@
-// We are going to assume C++20.
-
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <simdjson.h>
-#include <string>
-
-#include "benchmark_helpers.h"
-#include "car_helpers.h"
-
-using namespace simdjson;
-
-void run_benchmarks() {
-  printf("Running benchmarks on tiny input...\n");
-  simdjson::padded_string json =
-      R"({ "make": "Toyota", "model": "Camry",  "year": 2018, "tire_pressure": [ 40.1, 39.9 ] })"_padded;
-  volatile size_t dummy = 0;
-  ondemand::parser parser;
-
-  // Classic On-Demand
-  pretty_print("simdjson classic", json.size(),
-               bench([&json, &dummy, &parser]() {
-                 ondemand::document doc = parser.iterate(json);
-                 Car car = doc.get<Car>();
-                 dummy = dummy + car.year;
-               }));
-
-  // Benchmark simdjson::from() without parser
-  pretty_print("simdjson::from<Car>() (no parser)", json.size(),
-               bench([&json, &dummy]() {
-                 Car car = simdjson::from(json);
-                 dummy = dummy + car.year;
-               }));
-
-  // Benchmark simdjson::from() with parser
-  pretty_print("simdjson::from<Car>() (with parser)", json.size(),
-               bench([&json, &dummy, &parser]() {
-                 Car car = simdjson::from(parser, json);
-                 dummy = dummy + car.year;
-               }));
-}
-
-void run_array_benchmarks() {
-  printf("Running benchmarks on large array...\n");
-  size_t N = 1'000'000;
-  simdjson::padded_string json = generate_car_json_array(N);
-  volatile size_t dummy = 0;
-  ondemand::parser parser;
-
-  // Classic On-Demand
-  pretty_print_array("simdjson classic", json.size(), N,
-                     bench([&json, &dummy, &parser]() {
-                       dummy = 0;
-                       ondemand::document doc = parser.iterate(json);
-                       ondemand::array array = doc.get_array();
-                       for (auto value : array) {
-                         Car car = value.get<Car>();
-                         dummy = dummy + car.year;
-                       }
-                     }));
-
-  // from with array
-  pretty_print_array("simdjson::from(json).array()", json.size(), N,
-                     bench([&json, &dummy, &parser]() {
-                       dummy = 0;
-
-                       for (auto value : simdjson::from(json).array()) {
-                         Car car = value.get<Car>();
-                         dummy = dummy + car.year;
-                       }
-                     }));
-#if SIMDJSON_SUPPORTS_RANGES_FROM
-  // Benchmark simdjson::from() without parser (EXPERIMENTAL)
-  pretty_print_array("simdjson::from<Car>() (experimental, no parser)",
-                     json.size(), N, bench([&json, &dummy]() {
-                       dummy = 0;
-                       for (Car car :
-                            simdjson::from(json) | simdjson::as<Car>()) {
-                         dummy = dummy + car.year;
-                       }
-                     }));
-
-  // Benchmark simdjson::from() with parser (EXPERIMENTAL)
-  pretty_print_array("simdjson::from<Car>() (experimental, with parser)",
-                     json.size(), N, bench([&json, &dummy, &parser]() {
-                       dummy = 0;
-                       for (Car car : simdjson::from(parser, json) |
-                                          simdjson::as<Car>()) {
-                         dummy = dummy + car.year;
-                       }
-                     }));
-#endif // SIMDJSON_SUPPORTS_RANGES_FROM
-}
-
-void run_stream_benchmarks() {
-  printf("Running stream benchmarks...\n");
-  simdjson::padded_string json = generate_car_json_stream(1'000'000);
-  volatile size_t dummy = 0;
-  ondemand::parser parser;
-
-  // Classic On-Demand
-  pretty_print("simdjson classic", json.size(),
-               bench([&json, &dummy, &parser]() {
-                 ondemand::document_stream stream = parser.iterate_many(json);
-                 for (auto doc : stream) {
-                   Car car = doc.get<Car>();
-                   dummy = dummy + car.year;
-                 }
-               }));
-  // from_many
-  pretty_print("simdjson with thread local", json.size(),
-               bench([&json, &dummy, &parser]() {
-                 ondemand::document_stream stream =
-                     ondemand::parser::get_parser().iterate_many(json);
-                 for (auto doc : stream) {
-                   Car car = doc.get<Car>();
-                   dummy = dummy + car.year;
-                 }
-               }));
-}
-
-int main() {
-  for (size_t trial = 0; trial < 3; trial++) {
-    printf("Trial %zu:\n", trial + 1);
-    run_array_benchmarks();
-    run_stream_benchmarks();
-    run_benchmarks();
-    printf("\n");
-  }
-  return EXIT_SUCCESS;
-}

benchmark/get_corpus_benchmark.cpp

@@ -9,11 +9,7 @@ simdjson_never_inline
 double bench(std::string filename, simdjson::padded_string& p) {
   std::chrono::time_point<std::chrono::steady_clock> start_clock =
       std::chrono::steady_clock::now();
-  auto error = simdjson::padded_string::load(filename).get(p);
-  if(error) {
-    std::cerr << simdjson::error_message(error) << std::endl;
-    std::abort();
-  }
+  simdjson::padded_string::load(filename).value_unsafe().swap(p);
   std::chrono::time_point<std::chrono::steady_clock> end_clock =
       std::chrono::steady_clock::now();
   std::chrono::duration<double> elapsed = end_clock - start_clock;

benchmark/json2msgpack/simdjson_ondemand.h

@@ -50,7 +50,7 @@ private:
                                               uint8_t *p) noexcept;
   simdjson_inline void
   write_raw_string(simdjson::ondemand::raw_json_string rjs);
-  inline void recursive_processor(simdjson::ondemand::value element);
+  inline void recursive_processor(simdjson::ondemand::value&& element);
   inline void recursive_processor_ref(simdjson::ondemand::value& element);
 
   simdjson::ondemand::parser parser;
@@ -90,12 +90,13 @@ simdjson2msgpack::to_msgpack(const simdjson::padded_string &json,
   } else {
     simdjson::ondemand::value val = doc;
 #define SIMDJSON_GCC_COMPILER ((__GNUC__) && !(__clang__) && !(__INTEL_COMPILER))
-#if SIMDJSON_GCC_COMPILER
+#if 1
+//SIMDJSON_GCC_COMPILER
     // the GCC compiler does well with by-value passing.
     // GCC has superior recursive inlining:
     // https://stackoverflow.com/questions/29186186/why-does-gcc-generate-a-faster-program-than-clang-in-this-recursive-fibonacci-co
     // https://godbolt.org/z/TeK4doE51
-    recursive_processor(val);
+    recursive_processor(std::move(val));
 #else
     recursive_processor_ref(val);
 #endif
@@ -140,7 +141,7 @@ void simdjson2msgpack::write_raw_string(
   write_uint32_at(uint32_t(v.size()), location);
 }
 
-void simdjson2msgpack::recursive_processor(simdjson::ondemand::value element) {
+void simdjson2msgpack::recursive_processor(simdjson::ondemand::value&& element) {
   switch (element.type()) {
   case simdjson::ondemand::json_type::array: {
     uint32_t counter = 0;
@@ -148,7 +149,7 @@ void simdjson2msgpack::recursive_processor(simdjson::ondemand::value element) {
     uint8_t *location = skip_uint32();
     for (auto child : element.get_array()) {
       counter++;
-      recursive_processor(child.value());
+      recursive_processor(std::move(child.value()));
     }
     write_uint32_at(counter, location);
   } break;

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/simdjson_ondemand.h

@@ -23,29 +23,7 @@ struct simdjson_ondemand {
 };
 
 BENCHMARK_TEMPLATE(large_random, simdjson_ondemand)->UseManualTime();
-#if SIMDJSON_STATIC_REFLECTION
 
-struct simdjson_ondemand_static_reflect {
-  static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    auto doc = parser.iterate(json);
-    if(auto e = doc.get_array().get<std::vector<point>>(result); e) { return false; }
-    // We can also do it like so:
-    //for (ondemand::object coord : doc) {
-    //  result.emplace_back(coord.get<point>());
-    //}
-    // It seems that doing the reflection is slower than doing the manual lookup.
-    // E.g., it is faster if we do result.emplace_back(coord["x"], coord["y"], coord["z"]);
-    return true;
-  }
-};
-BENCHMARK_TEMPLATE(large_random, simdjson_ondemand_static_reflect)->UseManualTime();
-
-
-#endif
 } // namespace large_random
 
 #endif // SIMDJSON_EXCEPTIONS

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

@@ -1,48 +0,0 @@
-# Include reflect-cpp
-CPMAddPackage(
-  NAME reflect-cpp
-  GITHUB_REPOSITORY getml/reflect-cpp
-  GIT_TAG v0.17.0
-  EXCLUDE_FROM_ALL YES
-)
-
-option(SIMDJSON_USE_RUST "Build the static_reflect benchmark" OFF)
-
-if(SIMDJSON_USER_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_USER_RUST)
-  message(STATUS "We will not benchmark serde-benchmark." )
-endif(SIMDJSON_USER_RUST)
-
-# Add the benchmark executable targets
-add_subdirectory(twitter_benchmark)
-add_subdirectory(citm_catalog_benchmark)

benchmark/static_reflect/benchmark_utils/benchmark_helper.h

@@ -1,52 +0,0 @@
-#ifndef BENCHMARK_HELPER_HPP
-#define BENCHMARK_HELPER_HPP
-#include "event_counter.h"
-#include <atomic>
-
-inline event_collector &get_collector() {
-  static event_collector collector;
-  return collector;
-}
-
-template <class function_type>
-event_aggregate bench(const function_type &function, size_t min_repeat = 10,
-                      size_t min_time_ns = 1000000000,
-                      size_t max_repeat = 100000) {
-  event_collector &collector = get_collector();
-  event_aggregate aggregate{};
-  size_t N = min_repeat;
-  if (N == 0) {
-    N = 1;
-  }
-  for (size_t i = 0; i < N; i++) {
-    std::atomic_thread_fence(std::memory_order_acquire);
-    collector.start();
-    function();
-    std::atomic_thread_fence(std::memory_order_release);
-    event_count allocate_count = collector.end();
-    aggregate << allocate_count;
-    if ((i + 1 == N) && (aggregate.total_elapsed_ns() < min_time_ns) &&
-        (N < max_repeat)) {
-      N *= 10;
-    }
-  }
-  return aggregate;
-}
-
-// Source of the 2 functions below:
-// https://github.com/simdutf/simdutf/blob/master/benchmarks/base64/benchmark_base64.cpp
-inline void pretty_print(size_t strings, size_t bytes, std::string name,
-                         event_aggregate agg) {
-  event_collector &collector = get_collector();
-  printf("%-60s : ", name.c_str());
-  printf(" %5.2f MB/s ", bytes * 1000 / agg.elapsed_ns());
-  printf(" %5.2f Ms/s ", strings * 1000 / agg.elapsed_ns());
-  if (collector.has_events()) {
-    printf(" %5.2f GHz ", agg.cycles() / agg.elapsed_ns());
-    printf(" %5.2f c/b ", agg.cycles() / bytes);
-    printf(" %5.2f i/b ", agg.instructions() / bytes);
-    printf(" %5.2f i/c ", agg.instructions() / agg.cycles());
-  }
-  printf("\n");
-}
-#endif

benchmark/static_reflect/citm_catalog_benchmark/CMakeLists.txt

@@ -1,14 +0,0 @@
-add_executable(benchmark_serialization_citm_catalog benchmark_serialization_citm_catalog.cpp)
-
-# Link with Rust benchmarking code if available
-if(TARGET serde-benchmark)
-    message(STATUS "serde-benchmark target was created. Linking CITM catalog benchmark with serde-benchmark.")
-    target_link_libraries(benchmark_serialization_citm_catalog PRIVATE serde-benchmark)
-    target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE SIMDJSON_RUST_VERSION="${Rust_VERSION}")
-endif()
-
-target_link_libraries(benchmark_serialization_citm_catalog PRIVATE simdjson::simdjson nlohmann_json)
-target_link_libraries(benchmark_serialization_citm_catalog PRIVATE reflectcpp)
-target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE SIMDJSON_BENCH_CPP_REFLECT=1)
-
-target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE JSON_FILE="${BENCH_CITM_JSON}")

benchmark/static_reflect/citm_catalog_benchmark/benchmark_serialization_citm_catalog.cpp

@@ -1,177 +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"
-
-#if SIMDJSON_BENCH_CPP_REFLECT
-#include <rfl.hpp>
-#include <rfl/json.hpp>
-void bench_reflect_cpp(CitmCatalog &data) {
-  std::string output = rfl::json::write(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_reflect_cpp",
-               bench([&data, &measured_volume, &output_volume]() {
-                 std::string output = rfl::json::write(data);
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-#endif // SIMDJSON_BENCH_CPP_REFLECT
-
-#ifdef SIMDJSON_RUST_VERSION
-#include "../serde-benchmark/serde_benchmark.h"
-
-void bench_rust(serde_benchmark::CitmCatalog *data) {
-  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([&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
-
-void bench_nlohmann(CitmCatalog &data) {
-  std::string output = nlohmann_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_nlohmann",
-               bench([&data, &measured_volume, &output_volume]() {
-                 std::string output = nlohmann_serialize(data);
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-
-void bench_simdjson_static_reflection(CitmCatalog &data) {
-  simdjson::builder::string_builder sb;
-  simdjson::builder::append(sb, data);
-  std::string_view p;
-  if(sb.view().get(p)) {
-    std::cerr << "Error!" << std::endl;
-  }
-  size_t output_volume = p.size();
-  sb.clear();
-  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, &sb]() {
-                 sb.clear();
-                 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");
-                 }
-               }));
-}
-
-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);
-  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 contains filter substring
-bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
-  return filter.empty() || benchmark_name.find(filter) != 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;
-          }
-      }
-  }
-  // Testing correctness of round-trip (serialization + deserialization)
-  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(simdjson::pad(json_str)).get(doc)) {
-    std::cerr << "Error loading the document!" << std::endl;
-    return EXIT_FAILURE;
-  }
-  CitmCatalog my_struct;
-  if(doc.get<CitmCatalog>().get(my_struct)) {
-    std::cerr << "Error loading CitmCatalog!" << std::endl;
-    return EXIT_FAILURE;
-  }
-
-  // Benchmarking the serialization
-  if (matches_filter("nlohmann", filter)) {
-    bench_nlohmann(my_struct);
-  }
-  if (matches_filter("simdjson_static_reflection", filter)) {
-    bench_simdjson_static_reflection(my_struct);
-  }
-#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.c_str(), json_str.size());
-
-    if (rust_data == nullptr) {
-      printf("# Failed to initialize Rust data structure\n");
-    } else {
-      bench_rust(rust_data);
-      serde_benchmark::free_citm(rust_data);
-    }
-  }
-#endif
-#if SIMDJSON_BENCH_CPP_REFLECT
-  if (matches_filter("reflect_cpp", filter)) {
-    bench_reflect_cpp(my_struct);
-  }
-#endif
-  return EXIT_SUCCESS;
-}

benchmark/static_reflect/citm_catalog_benchmark/citm_catalog_data.h

@@ -1,82 +0,0 @@
-#ifndef CITM_CATALOG_DATA_H
-#define CITM_CATALOG_DATA_H
-
-#include <string>
-#include <vector>
-#include <map>
-
-struct Area {
-  int64_t id;
-  std::string name;
-  int64_t parent;
-  std::vector<int64_t> childAreas;
-  bool operator==(const Area &other) const = default;
-};
-
-struct AudienceSubCategory {
-  int64_t id;
-  std::string name;
-  int64_t parent;
-  bool operator==(const AudienceSubCategory &other) 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 Performance {
-  int64_t id;
-  std::string name;
-  int64_t event;
-  std::string start;
-  int64_t venueCode;
-  bool operator==(const Performance &other) 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, 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;
-};
-
-#endif

benchmark/static_reflect/citm_catalog_benchmark/nlohmann_citm_catalog_data.h

@@ -1,171 +0,0 @@
-// nlohmann_citm_catalog_data.h
-#ifndef NLOHMANN_CITM_CATALOG_DATA_H
-#define NLOHMANN_CITM_CATALOG_DATA_H
-
-#include "citm_catalog_data.h"
-#include <nlohmann/json.hpp>
-#include <string>
-
-using json = nlohmann::json;
-
-// ---- Area ----
-inline void to_json(json &j, const Area &a) {
-    j = json{
-      {"id", a.id},
-      {"name", a.name},
-      {"parent", a.parent},
-      {"childAreas", a.childAreas}
-    };
-}
-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);
-}
-
-// ---- AudienceSubCategory ----
-inline void to_json(json &j, const AudienceSubCategory &asc) {
-    j = json{
-      {"id", asc.id},
-      {"name", asc.name},
-      {"parent", asc.parent}
-    };
-}
-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);
-}
-
-// ---- Event ----
-inline void to_json(json &j, const Event &e) {
-    j = json{
-      {"id", e.id},
-      {"name", e.name},
-      {"description", e.description},
-      {"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},
-      {"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);
-}
-
-// 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/serde-benchmark/Cargo.lock

@@ -1,103 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "libc"
-version = "0.2.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "serde"
-version = "1.0.209"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-benchmark"
-version = "0.1.0"
-dependencies = [
- "libc",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.209"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.127"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"

benchmark/static_reflect/serde-benchmark/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "serde-benchmark"
-version = "0.1.0"
-
-[lib]
-path = "lib.rs"
-crate-type = ["cdylib"]
-
-[dependencies]
-serde = { version = "1.0", features = ["derive"] }
-libc = "0.2"
-serde_json = "1.0"
-
-[profile.release]
-opt-level = 3
-debug = false
-lto = true

benchmark/static_reflect/serde-benchmark/README.md

@@ -1,18 +0,0 @@
-## Rust Serde FFI
-
-This folder includes FFI bindings for rust/serde.
-
-### Links
-
-- https://github.com/eqrion/cbindgen/blob/master/docs.md
-- https://gist.github.com/zbraniecki/b251714d77ffebbc73c03447f2b2c69f
-- https://michael-f-bryan.github.io/rust-ffi-guide/setting_up.html
-
-### Building
-
-- Generating cbindgen output
-  - Install dependencies with `brew install cbindgen` or `apt-get install cbindgen` or `cargo install cbindgen` or the equivalent: we used `cargo install --version 0.23.0 cbindgen`.
-  - Go to the directory where this README.md file is located
-  - Generate with `cbindgen --config cbindgen.toml --crate serde-benchmark --output serde_benchmark.h`
-- Building
-  - Run with `cargo build --release`

benchmark/static_reflect/serde-benchmark/cbindgen.toml

@@ -1,12 +0,0 @@
-autogen_warning = "/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */"
-include_version = true
-braces = "SameLine"
-line_length = 100
-tab_width = 2
-language = "C++"
-namespaces = ["serde_benchmark"]
-include_guard = "serde_benchmark_ffi_h"
-
-[parse]
-parse_deps = true
-include = ["serde_json", "serde"]

benchmark/static_reflect/serde-benchmark/lib.rs

@@ -1,482 +0,0 @@
-extern crate serde;
-extern crate serde_json;
-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.
- */
- /******************************************************/
- /******************************************************/
-
-// 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: 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: 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: i64,
-    text: String,
-    user: User,
-    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>,
-}
-
-#[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(),
-  }
-}
-
-#[no_mangle]
-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 free_twitter(raw: *mut TwitterData) {
-  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 _);
-}
-
-// Functions associated with the CitmCatalog benchmark
-
-#[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>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct AudienceSubCategory {
-    pub id: i64,
-    pub name: Option<String>,  // Changed to Option
-    pub parent: i64,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Event {
-    #[serde(default)]
-    pub description: Option<String>,
-    pub id: i64,
-    #[serde(default)]
-    pub logo: Option<String>,
-    #[serde(default)]
-    pub name: Option<String>,
-    #[serde(default)]
-    pub subTopicIds: Vec<i64>,
-    #[serde(default)]
-    pub subjectCode: Option<String>,
-    #[serde(default)]
-    pub subtitle: Option<String>,
-    #[serde(default)]
-    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)
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct CitmCatalog {
-    #[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>,
-}
-
-/// Creates a CitmCatalog from a JSON string (UTF-8 encoded).
-#[no_mangle]
-pub unsafe extern "C" fn citm_from_str(
-    raw_input: *const c_char,
-    raw_input_length: usize
-) -> *mut CitmCatalog {
-    if raw_input.is_null() {
-        eprintln!("Error: Input pointer is null");
-        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,
-        Err(e) => {
-            eprintln!("Error: Invalid UTF-8 string: {}", e);
-            return ptr::null_mut();
-        }
-    };
-
-    // 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()
-        }
-    }
-}
-
-/// Serializes a CitmCatalog into a JSON string (UTF-8).
-#[no_mangle]
-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()
-        }
-    }
-}
-
-/// Frees the CitmCatalog pointer.
-#[no_mangle]
-pub unsafe extern "C" fn free_citm(raw_catalog: *mut CitmCatalog) {
-    if !raw_catalog.is_null() {
-        drop(Box::from_raw(raw_catalog));
-    }
-}
-
-#[no_mangle]
-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);
-        }
-    }
-}

benchmark/static_reflect/serde-benchmark/serde_benchmark.h

@@ -1,45 +0,0 @@
-#ifndef serde_benchmark_ffi_h
-#define serde_benchmark_ffi_h
-
-/* Generated with cbindgen:0.28.0 */
-
-/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
-
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-namespace serde_benchmark {
-
-struct CitmCatalog;
-
-struct TwitterData;
-
-extern "C" {
-
-TwitterData *twitter_from_str(const char *raw_input, size_t raw_input_length);
-
-const char *str_from_twitter(TwitterData *raw);
-
-void free_twitter(TwitterData *raw);
-
-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);
-
-/// 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);
-
-}  // extern "C"
-
-}  // namespace serde_benchmark
-
-#endif  // serde_benchmark_ffi_h

benchmark/static_reflect/twitter_benchmark/CMakeLists.txt

@@ -1,14 +0,0 @@
-
-# Add executable targets
-add_executable(benchmark_serialization_twitter benchmark_serialization_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_compile_definitions(benchmark_serialization_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_compile_definitions(benchmark_serialization_twitter PRIVATE JSON_FILE="${EXAMPLE_JSON}")

benchmark/static_reflect/twitter_benchmark/benchmark_serialization_twitter.cpp

@@ -1,168 +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"
-#if SIMDJSON_BENCH_CPP_REFLECT
-#include <rfl.hpp>
-#include <rfl/json.hpp>
-void bench_reflect_cpp(TwitterData &data) {
-  std::string output = rfl::json::write(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_reflect_cpp",
-               bench([&data, &measured_volume, &output_volume]() {
-                 std::string output = rfl::json::write(data);
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-#endif // SIMDJSON_BENCH_CPP_REFLECT
-
-#ifdef SIMDJSON_RUST_VERSION
-#include "../serde-benchmark/serde_benchmark.h"
-
-
-void bench_rust(serde_benchmark::TwitterData *data) {
-  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([&data, &measured_volume, &output_volume]() {
-                 const char * output = serde_benchmark::str_from_twitter(data);
-                 serde_benchmark::free_string(output);
-               }));
-}
-#endif
-
-template <class T> void bench_simdjson_static_reflection(T &data) {
-  simdjson::builder::string_builder sb;
-  simdjson::builder::append(sb, data);
-  std::string_view p;
-  if(sb.view().get(p)) {
-    std::cerr << "Error!" << std::endl;
-  }
-  size_t output_volume = p.size();
-  sb.clear();
-  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, &sb]() {
-                 sb.clear();
-                 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");
-                 }
-               }));
-}
-
-void bench_nlohmann(TwitterData &data) {
-  std::string output = nlohmann_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_nlohmann",
-               bench([&data, &measured_volume, &output_volume]() {
-                 std::string output = nlohmann_serialize(data);
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-
-size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp) {
-  ((std::string *)userp)->append((char *)contents, size * nmemb);
-  return size * nmemb;
-}
-
-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 contains filter substring
-bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
-  return filter.empty() || benchmark_name.find(filter) != 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;
-          }
-      }
-  }
-  // Testing correctness of round-trip (serialization + deserialization)
-  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(simdjson::pad(json_str)).get(doc)) {
-    std::cerr << "Error loading the document!" << std::endl;
-    return EXIT_FAILURE;
-  }
-  TwitterData my_struct;
-  if(doc.get<TwitterData>().get(my_struct)) {
-    std::cerr << "Error loading TwitterData!" << std::endl;
-    return EXIT_FAILURE;
-  }
-
-  // Benchmarking the serialization
-  if (matches_filter("nlohmann", filter)) {
-    bench_nlohmann(my_struct);
-  }
-  if (matches_filter("simdjson_static_reflection", filter)) {
-    bench_simdjson_static_reflection(my_struct);
-  }
-#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");
-    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
-  if (matches_filter("reflect_cpp", filter)) {
-    bench_reflect_cpp(my_struct);
-  }
-#endif
-  return EXIT_SUCCESS;
-}

benchmark/static_reflect/twitter_benchmark/nlohmann_twitter_data.h

@@ -1,116 +0,0 @@
-#ifndef NLOHMANN_TWITTER_DATA_H
-#define NLOHMANN_TWITTER_DATA_H
-
-#include "twitter_data.h"
-#include <nlohmann/json.hpp>
-
-void to_json(nlohmann::json &j, const User &u) {
-  j = nlohmann::json{{"id", u.id},
-                     {"name", u.name},
-                     {"screen_name", u.screen_name},
-                     {"location", u.location},
-                     {"description", u.description},
-                     {"verified", u.verified},
-                     {"followers_count", u.followers_count},
-                     {"friends_count", u.friends_count},
-                     {"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},
-                     {"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}};
-}
-
-std::string nlohmann_serialize(const TwitterData &data) {
-  return nlohmann_serialize(data.statuses);
-}
-
-#endif // NLOHMANN_TWITTER_DATA_H

benchmark/static_reflect/twitter_benchmark/twitter_data.h

@@ -1,71 +0,0 @@
-#ifndef TWITTER_DATA_H
-#define TWITTER_DATA_H
-
-#include <string>
-#include <vector>
-
-struct User {
-  int64_t id;
-  std::string id_str;
-  std::string name;
-  std::string screen_name;
-  std::string location;
-  std::string description;
-  bool verified;
-  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;
-  int64_t id;
-  std::string text;
-  User user;
-  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

benchmark/top_tweet/nlohmann_json.h

@@ -26,8 +26,8 @@ struct nlohmann_json {
       }
     }
 
-    result.text = to_string(top_tweet["text"]);
-    result.screen_name = to_string(top_tweet["user"]["screen_name"]);
+    result.text = top_tweet["text"];
+    result.screen_name = top_tweet["user"]["screen_name"];
     return result.retweet_count != -1;
   }
 };

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

@@ -2,10 +2,7 @@
 # Flags used by exes and by the simdjson library (project-wide flags)
 #
 add_library(simdjson-internal-flags INTERFACE)
-if(NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
-  # We default to ON for all targets, so that we can use the library in shared libraries.
-  set_target_properties(simdjson-internal-flags PROPERTIES INTERFACE_POSITION_INDEPENDENT_CODE ON)
-endif(NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
+
 
 option(SIMDJSON_CHECK_EOF "Check for the end of the input buffer. The setting is unnecessary since we require padding of the inputs. You should expect tests to fail with this option turned on." OFF)
 if(SIMDJSON_CHECK_EOF)
@@ -32,9 +29,6 @@ undefined behavior.")
     link_libraries(
         -fsanitize=address -fno-omit-frame-pointer -fno-sanitize-recover=all
     )
-  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    add_compile_options(-fsanitize=address)
-    link_libraries(-fsanitize=address)
   else()
     message(
         STATUS
@@ -58,6 +52,7 @@ endif()
 
 option(SIMDJSON_SANITIZE_MEMORY "Sanitize memory" OFF)
 
+
 if(SIMDJSON_SANITIZE_MEMORY)
   message(STATUS "Setting the memory sanitizer.")
   add_compile_options(
@@ -115,14 +110,8 @@ endif()
 
 # We compile tools, tests, etc. with C++ 17. Override yourself if you need on a
 # target.
-if(SIMDJSON_STATIC_REFLECTION)
-  # This is temporary.
-  set(SIMDJSON_CXX_STANDARD 26 CACHE STRING "the C++ standard to use for simdjson")
-  #set(CMAKE_CXX_STANDARD ${SIMDJSON_CXX_STANDARD})
-else()
-  set(SIMDJSON_CXX_STANDARD 17 CACHE STRING "the C++ standard to use for simdjson")
-  set(CMAKE_CXX_STANDARD ${SIMDJSON_CXX_STANDARD})
-endif()
+set(SIMDJSON_CXX_STANDARD 17 CACHE STRING "the C++ standard to use for simdjson")
+set(CMAKE_CXX_STANDARD ${SIMDJSON_CXX_STANDARD})
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_THREAD_PREFER_PTHREAD ON)
@@ -169,15 +158,14 @@ We recommend Visual Studio 2019 or better on a 64-bit system.")
     add_compile_options(/Zi)
   endif()
 else()
+  if(NOT WIN32)
+    target_compile_options(simdjson-internal-flags INTERFACE -fPIC)
+  endif()
   target_compile_options(
       simdjson-internal-flags INTERFACE
       -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/toolchains-ci/riscv64-linux-gnu.cmake

@@ -1,4 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR riscv64)
-
-set(CMAKE_CROSSCOMPILING_EMULATOR "qemu-riscv64-static")

dependencies/CMakeLists.txt

@@ -7,12 +7,12 @@ option(SIMDJSON_ALLOW_DOWNLOADS
 cmake_dependent_option(SIMDJSON_COMPETITION "Compile competitive benchmarks" ON
         SIMDJSON_ALLOW_DOWNLOADS OFF)
 cmake_dependent_option(SIMDJSON_GOOGLE_BENCHMARKS "compile the Google Benchmark benchmarks" ON
-        "SIMDJSON_ALLOW_DOWNLOADS OR MINGW" OFF)
+        SIMDJSON_ALLOW_DOWNLOADS OFF)
 
 if(SIMDJSON_GOOGLE_BENCHMARKS)
   CPMAddPackage(
         NAME google_benchmarks
-        URL https://github.com/google/benchmark/archive/refs/tags/v1.9.4.zip
+        URL https://github.com/google/benchmark/archive/refs/tags/v1.7.1.zip
         OPTIONS
         "BENCHMARK_ENABLE_TESTING OFF"
         "BENCHMARK_ENABLE_INSTALL OFF"
@@ -22,7 +22,7 @@ endif()
 
 CPMAddPackage(
         NAME simdjson-data
-        URL https://github.com/simdjson/simdjson-data/archive/351949906abde446f0314bf79606fb5d884f5be7.zip
+        URL https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.zip
 )
 
 option(SIMDJSON_USE_BOOST_JSON "Try to include BOOST_JSON, this may break your binaries under some systems." OFF)
@@ -93,11 +93,19 @@ int main() {}
 
   CPMAddPackage(
       NAME nlohmann_json
-      URL https://github.com/nlohmann/json/archive/refs/tags/v3.12.0.zip
+      URL https://github.com/nlohmann/json/archive/refs/tags/v3.10.5.zip
   )
 
   set_property(TARGET nlohmann_json APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS SIMDJSON_COMPETITION_NLOHMANN_JSON)
 
+  CPMAddPackage(
+      NAME json11
+      URL https://github.com/dropbox/json11/archive/ec4e45219af1d7cde3d58b49ed762376fccf1ace.zip
+      DOWNLOAD_ONLY YES
+  )
+  add_library(json11 STATIC "${json11_SOURCE_DIR}/json11.cpp")
+  target_include_directories(json11 SYSTEM PUBLIC "${json11_SOURCE_DIR}")
+  target_compile_definitions(json11 INTERFACE SIMDJSON_COMPETITION_JSON11)
 
   set(jsoncpp_SOURCE_DIR "${simdjson_SOURCE_DIR}/dependencies/jsoncppdist")
   add_library(jsoncpp STATIC "${jsoncpp_SOURCE_DIR}/jsoncpp.cpp")
@@ -106,7 +114,7 @@ int main() {}
 
   CPMAddPackage(
       NAME rapidjson
-      URL https://github.com/Tencent/rapidjson/archive/805d7ed5dfe97a39b8b0816fd5eeed8731dc4936.zip
+      URL https://github.com/Tencent/rapidjson/archive/f54b0e47a08782a6131cc3d60f94d038fa6e0a51.zip
       DOWNLOAD_ONLY YES
   )
   add_library(rapidjson INTERFACE)
@@ -169,7 +177,7 @@ int main() {}
   endif()
 
   add_library(competition-all INTERFACE)
-  target_link_libraries(competition-all INTERFACE competition-core jsoncpp fastjson gason ujson4c)
+  target_link_libraries(competition-all INTERFACE competition-core jsoncpp json11 fastjson gason ujson4c)
 endfunction()
 
 if(SIMDJSON_COMPETITION)

doc/builder.md

@@ -1,366 +0,0 @@
-Builder
-==========
-
-Sometimes you want to generate JSON string outputs efficiently.
-The simdjson library provides high-performance low-level facilities.
-When using these low-level functionalities, you are responsible to
-define the structure of your JSON document. Our more advanced interface
-automates the process using C++26 static reflection: you get both high
-speed and high convenience.
-
-- [Builder](#builder)
-  * [Overview: string_builder](#overview--string-builder)
-  * [Example: string_builder](#example--string-builder)
-  * [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)
-
-Overview: string_builder
----------------------------
-
-The string_builder class is a low-level utility for constructing JSON strings representing documents. It is optimized for performance, potentially leveraging kernel-specific features like SIMD instructions for tasks such as string escaping. This class supports atomic types (e.g., booleans, numbers, strings) but does not handle composed types directly (like arrays or objects).
-Note that JSON strings are always encoded as UTF-8.
-
-An `string_builder` is created with an initial buffer capacity (e.g., 1kB). The memory
-is reallocated when needed.
-The efficiency of `string_builder` stems from its internal use of a resizable array or buffer. When you append data, it adds the characters to this buffer, resizing it only when necessary, typically in a way that minimizes reallocations. This approach contrasts with regular string concatenation, where each operation creates a new string, copying all previous content, leading to quadratic time complexity for repeated concatenations.
-
-
-It has the following methods to add content to the string:
-
-
-- `append(number_type v)`: Appends a number (including booleans) to the JSON buffer. Booleans are converted to the strings "false" or "true". Numbers are formatted according to the JSON standard, with floating-point numbers using the shortest representation that accurately reflects the value.
-- `append(char c)`: Appends a single character to the JSON buffer.
-- `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(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:
-
-- `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.
-
-You might need to do unicode validation if you have strings in your data structures containing
-malformed UTF-8. Note that we do not automatically call `validate_unicode()`.
-
-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).
-
-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
----------------------------
-
-```C++
-struct Car {
-    std::string make;
-    std::string model;
-    int64_t year;
-    std::vector<double> tire_pressure;
-};
-
-void serialize_car(const Car& car, simdjson::builder::string_builder& builder) {
-    // start of JSON
-    builder.start_object();
-
-    // "make"
-    builder.append_key_value("make", car.make);
-    builder.append_comma();
-
-    // "model"
-    builder.append_key_value("model", car.model);
-    builder.append_comma();
-
-    // "year"
-    builder.append_key_value("year", car.year);
-    builder.append_comma();
-
-    // "tire_pressure"
-    builder.escape_and_append_with_quotes("tire_pressure");
-    builder.append_colon();
-    builder.start_array();
-    // vector tire_pressure
-    for (size_t i = 0; i < car.tire_pressure.size(); ++i) {
-        builder.append(car.tire_pressure[i]);
-        if (i < car.tire_pressure.size() - 1) {
-            builder.append_comma();
-        }
-    }
-    builder.end_array();
-    builder.end_object();
-}
-
-bool car_test() {
-    simdjson::builder::string_builder sb;
-    Car c = {"Toyota", "Corolla", 2017, {30.0,30.2,30.513,30.79}};
-    serialize_car(c, sb);
-    std::string_view p{sb};
-    // p holds the JSON:
-    // "{\"make\":\"Toyota\",\"model\":\"Corolla\",\"year\":2017,\"tire_pressure\":[30.0,30.2,30.513,30.79]}"
-    return true;
-}
-```
-
-
-
-
-The `string_builder` constructor takes an optional parameter which specifies the initial
-memory allocation in byte. If you know approximately the size of your JSON output, you can
-pass this value as a parameter (e.g., `simdjson::builder::string_builder sb{1233213}`).
-
-The `string_builder` might throw an exception in case of error when you cast it result to `std::string_view`. If you wish to avoid exceptions, you can use the following programming pattern:
-
-```cpp
-    std::string_view p;
-    if(sb.view().get(p)) {
-        return false; // there was an error
-    }
-```
-
-In all cases, the `std::string_view` instance depends the corresponding `string_builder` instance.
-
-### C++20
-
-
-
-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).
-
-```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_comma();
-    sb.append_key_value<"model">(c.model);
-    sb.append_comma();
-    sb.append_key_value<"year">(c.year);
-    sb.append_comma();
-    sb.append_key_value<"tire_pressure">(c.tire_pressure);
-    sb.end_object();
-    std::string_view p = sb.view();
-```
-
-With C++20, you can similarly handle standard containers transparently.
-For example, you can serialize `std::map<std::string,T>` types.
-
-```cpp
-    std::map<std::string,double> c = {{"key1", 1}, {"key2", 1}};
-    simdjson::builder::string_builder sb;
-    sb.append(c);
-    std::string_view p = sb.view();
-```
-
-You can also serialize `std::vector<T>` types.
-
-```cpp
-    std::vector<std::vector<double>> c = {{1.0, 2.0}, {3.0, 4.0}};
-    simdjson::builder::string_builder sb;
-    sb.append(c);
-    std::string_view p = sb.view();
-```
-
-You can also skip the creation for the `string_builder` instance in such simple cases.
-
-```cpp
-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
-------------------------
-
-Static reflection (or compile-time reflection) in C++26 introduces a powerful compile-time mechanism that allows a program to inspect and manipulate its own structure, such as types, variables, functions, and other program elements, during compilation. Unlike runtime reflection in languages like Java or Python, C++26’s static reflection operates entirely at compile time, aligning with C++’s emphasis on zero-overhead abstractions and high performance. It means
-that you can delegate much of the work to the library.
-If you have a compiler with support C++26 static reflection, you can compile
-your code with the `SIMDJSON_STATIC_REFLECTION` macro set:
-
-```cpp
-#define SIMDJSON_STATIC_REFLECTION 1
-//...
-#include "simdjson.h"
-```
-
-And then you can append your data structures to a `string_builder` instance
-automatically. In most cases, it should work automatically:
-
-```cpp
-    struct Car {
-        std::string make;
-        std::string model;
-        int64_t year;
-        std::vector<double> tire_pressure;
-    };
-
-    bool car_test() {
-        simdjson::builder::string_builder sb;
-        Car c = {"Toyota", "Corolla", 2017, {30.0,30.2,30.513,30.79}};
-        sb << c;
-        std::string_view p{sb};
-        // p holds the JSON:
-        // "{\"make\":\"Toyota\",\"model\":\"Corolla\",\"year\":2017,\"tire_pressure\":[30.0,30.2,30.513,30.79]}"
-        return true;
-    }
-```
-
-
-### Without `string_buffer` instance
-
-In some instances, you might want to create a string directly from your own data type.
-You can create a string directly, without an explicit `string_builder` instance
-with the `simdjson::to_json` template function.
-(Under the hood a `string_builder` instance may still be created.)
-
-```cpp
-    struct Car {
-        std::string make;
-        std::string model;
-        int64_t year;
-        std::vector<double> tire_pressure;
-    };
-
-    void f() {
-        Car c = {"Toyota", "Corolla", 2017, {30.0,30.2,30.513,30.79}};
-        std::string json = simdjson::to_json(c);
-    }
-```
-
-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
-
-If prefer a version without exceptions and explicit error handling, you can use the following
-pattern:
-
-```cpp
-  std::string json;
-  if(simdjson::to_json(c).get(json)) {
-    // there was an error
-  } else {
-    // json contain the serialized JSON
-  }
-```
-
-### Customization
-
-If you want to serialize a value in a custome 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
-```

doc/dom.md

@@ -1,16 +1,12 @@
 The Document-Object-Model (DOM) front-end
 ==========
 
-An overview of what you need to know to use simdjson to parse JSON documents with
-our DOM API, with examples. [Our documentation regarding the generation (serialization) of JSON documents is in a
-separate document](https://github.com/simdjson/simdjson/blob/master/doc/builder.md).
-
+An overview of what you need to know to use simdjson, with examples.
 
 * [DOM vs On-Demand](#dom-vs-on-demand)
 * [The Basics: Loading and Parsing JSON Documents](#the-basics-loading-and-parsing-json-documents-using-the-dom-front-end)
 * [Using the Parsed JSON](#using-the-parsed-json)
 * [C++17 Support](#c17-support)
-* [C++20 Support](#c20-support)
 * [JSON Pointer](#json-pointer)
 * [JSONPath](#jsonpath)
 * [Error Handling](#error-handling)
@@ -31,10 +27,6 @@ a conventional Document-Object-Model (DOM) front-end. In such a scenario, the JS
 entirely parsed, validated and materialized in memory as the first step. The programmer may
 then access the parsed data using this in-memory model.
 
-On-Demand is a different model where you parse just what you need, directly into your own
-data structure. The On-Demand approach, when well tuned, can provide superior performance.
-[We refer you to the On-Demand documentation for further details](https://github.com/simdjson/simdjson/blob/master/doc/basics.md).
-
 The Basics: Loading and Parsing JSON Documents using the DOM front-end
 ----------------------------------------------
 
@@ -68,26 +60,6 @@ std::string data = "my data";
 simdjson::padded_string my_padded_data(data); // copies to a padded buffer
 ```
 
-You can then parse the JSON document from the `simdjson::padded_string` instance:
-
-```cpp
-simdjson::dom::parser parser;
-simdjson::dom::element doc = parser.parse(my_padded_data);
-```
-
-Whenever you pass an `std::string` reference to `parser::parse`,
-the parser will access the bytes beyond the end of
-the string but before the end of the allocated memory (`std::string::capacity()`).
-If you are using a sanitizer that checks for reading uninitialized bytes or `std::string`'s
-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:
-
-```c++
-std::string json = "[1]";
-dom::element doc = parser.parse(simdjson::pad(json));
-```
-
 The parsed document resulting from the `parser.load` and `parser.parse` calls depends on the `parser` instance. Thus the `parser` instance must remain in scope. Furthermore, you must have at most one parsed document in play per `parser` instance.
 You cannot copy a `parser` instance, you may only move it.
 
@@ -98,7 +70,7 @@ During the`load` or `parse` calls, neither the input file nor the input string a
 For best performance, a `parser` instance should be reused over several files: otherwise you will needlessly reallocate memory, an expensive process. It is also possible to avoid entirely memory allocations during parsing when using simdjson. [See our performance notes for details](performance.md).
 
 If you need a lower-level interface, you may call the function `parser.parse(const char * p, size_t l)` on a pointer `p` while specifying the
-length of your input `l` in bytes.
+length of your input `l` in bytes. To see how to get the very best performance from a low-level approach, you way want to read our [performance notes](https://github.com/simdjson/simdjson/blob/master/doc/performance.md#padding-and-temporary-copies) on this topic (see the Padding and Temporary Copies section).
 
 *Windows-specific*:  Windows users who need to read files with
 non-ANSI characters in the name should set their code page to
@@ -127,12 +99,6 @@ Once you have an element, you can navigate it with idiomatic C++ iterators, oper
   std::cout << "I parsed " << value << " from " << numberstring.data() << std::endl;
   ```
   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
-  `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`.
 * **Field Access:** To get the value of the "foo" field in an object, use `object["foo"]`.
 * **Array Iteration:** To iterate through an array, use `for (auto value : array) { ... }`. If you
   know the type of the value, you can cast it right there, too! `for (double value : array) { ... }`
@@ -246,23 +212,6 @@ for (dom::key_value_pair field : object) {
 }
 ```
 
-C++20 Support
-------------
-
-simdjson library also supports some C++20 feature including `std::ranges`:
-
-```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 ] },
-  { "make": "Toyota", "model": "Tercel", "year": 1999, "tire_pressure": [ 29.8, 30.0, 30.2, 30.5 ] }
-] )"_padded;
-dom::parser parser;
-auto justmodel = [](auto car) { return car["model"]; };
-for (auto car : parser.parse(cars_json).get_array() | std::views::transform(justmodel)) {
-  std::cout << car << std::endl;
-}
-```
 
 JSON Pointer
 ------------
@@ -354,74 +303,6 @@ if(error) { /*won't happen*/ }
 ```
 
 
-## Using `at_path_with_wildcard` for JSONPath Queries
-
-The `at_path_with_wildcard` function in simdjson extends the JSONPath querying capabilities by supporting wildcard expressions (`*`) in JSON paths. This allows users to retrieve multiple elements from a JSON document in a single query. For example, you can use `$.address.*` to fetch all fields within the `address` object or `$.phoneNumbers[*].numbers[*]` to retrieve all phone numbers across multiple objects in an array.
-
-The `*` wildcard matches all elements at a specific level. For instance, `$.address.*` retrieves all key-value pairs in the `address` object, while `$.*.streetAddress` fetches all `streetAddress` fields across objects at the root level.  You can combine wildcards with array indexing. For example, `$.phoneNumbers[*].numbers[1]` retrieves the second number from each `numbers` array in the `phoneNumbers` array. If no elements match the wildcard query, the function returns an empty result. For instance, querying `$.empty_object.*` or `$.empty_array.*` will yield an empty set.
-
-### Example Usage
-
-Here is an example demonstrating the use of `at_path_with_wildcard`:
-
-```cpp
-simdjson::padded_string json_string = R"(
-{
-  "firstName": "John",
-  "lastName": "doe",
-  "age": 26,
-  "address": {
-    "streetAddress": "naist street",
-    "city": "Nara",
-    "postalCode": "630-0192"
-  },
-  "phoneNumbers": [
-    {
-      "type": "iPhone",
-      "numbers": ["0123-4567-8888", "0123-4567-8788"]
-    },
-    {
-      "type": "home",
-      "numbers": ["0123-4567-8910"]
-    }
-  ]
-})"_padded;
-
-dom::parser parser;
-dom::element parsed_json = parser.parse(json_string);
-std::vector<dom::element> values;
-
-// Fetch all fields in the address object
-auto error = parsed_json.at_path_with_wildcard("$.address.*").get(values);
-if(error) {
-  // do something
-}
-for (auto &value : values) {
-  std::string_view field;
-  error = value.get(field);
-  if(error) {
-    // do something
-  }
-  std::cout << field << std::endl;
-}
-
-// Fetch all phone numbers
-error = parsed_json.at_path_with_wildcard("$.phoneNumbers[*].numbers[*]").get(values);
-if(error) {
-  // do something
-}
-for (auto &value : values) {
-  std::string_view number;
-  error = value.get(number);
-  if(error) {
-    // do something
-  }
-  std::cout << number << std::endl;
-}
-```
-
-This function is particularly useful for extracting data from complex JSON structures with nested arrays and objects. By leveraging wildcards, you can simplify your queries and reduce the need for multiple iterations.
-
 Error Handling
 --------------
 
@@ -832,5 +713,5 @@ Setting the `realloc_if_needed` parameter `false` in this manner may lead to bet
 Performance Tips
 ---------------------
 
-- For release builds, we recommend setting `NDEBUG` pre-processor directive when compiling the `simdjson` library. Importantly, using the optimization flags `-O2` or `-O3` under GCC and LLVM clang does not set the `NDEBUG` directive, you must set it manually (e.g., `-DNDEBUG`).
+- For release builds, we recommend setting `NDEBUG` pre-processor directive when compiling the `simdjson` library. Importantly, using the optimization flags `-O2` or `-O3` under GCC and LLVM clang does not set the `NDEBUG` directrive, you must set it manually (e.g., `-DNDEBUG`).
 - For long streams of JSON documents, consider [`iterate_many`](iterate_many.md) and [`parse_many`](parse_many.md) for better performance.

doc/iterate_many.md

@@ -25,7 +25,6 @@ Contents
 - [Use cases](#use-cases)
 - [Tracking your position](#tracking-your-position)
 - [Incomplete streams](#incomplete-streams)
-- [C++20 features](#c20-features)
 
 Motivation
 -----------
@@ -130,7 +129,7 @@ If your documents are all objects or arrays, then you may even have nothing betw
 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/)
+- [Newline-Delimited JSON (NDJSON)](http://ndjson.org/)
 - [JSON lines (JSONL)](http://jsonlines.org/)
 - [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)
@@ -294,111 +293,3 @@ string
 object
 array
 ```
-
-
-C++20 features
---------------------
-
-In C++20, the standard introduced the notion of *customization point*.
-A customization point is a function or function object that can be customized for different types. It allows library authors to provide default behavior while giving users the ability to override this behavior for specific types.
-
-A tag_invoke function serves as a mechanism for customization points. It is not directly part of the C++ standard library but is often used in libraries that implement customization points.
-The tag_invoke function is typically a generic function that takes a tag type and additional arguments.
-The first argument is usually a tag type (often an empty struct) that uniquely identifies the customization point (e.g., deserialization of custom types in simdjson). Users or library providers can specialize tag_invoke for their types by defining it in the appropriate namespace, often inline namespace.
-
-
-
-You can deserialize you own data structures conveniently if your system supports C++20.
-When it is the case, the macro `SIMDJSON_SUPPORTS_CONCEPTS` will be set to 1 by
-the simdjson library.
-
-Consider a custom class `Car`:
-
-```C++
-struct Car {
-  std::string make;
-  std::string model;
-  int year;
-  std::vector<float> tire_pressure;
-};
-```
-
-
-You may support deserializing directly from a JSON value or document to your own `Car` instance
-by defining a single `tag_invoke` function:
-
-
-```C++
-namespace simdjson {
-// This tag_invoke MUST be inside simdjson namespace
-template <typename simdjson_value>
-auto tag_invoke(deserialize_tag, simdjson_value &val, Car& car) {
-  ondemand::object obj;
-  auto error = val.get_object().get(obj);
-  if (error) {
-    return error;
-  }
-  if ((error = obj["make"].get_string(car.make))) {
-    return error;
-  }
-  if ((error = obj["model"].get_string(car.model))) {
-    return error;
-  }
-  if ((error = obj["year"].get(car.year))) {
-    return error;
-  }
-  if ((error = obj["tire_pressure"].get<std::vector<float>>().get(
-           car.tire_pressure))) {
-    return error;
-  }
-  return simdjson::SUCCESS;
-}
-} // namespace simdjson
-```
-
-Importantly, the `tag_invoke` function must be inside the `simdjson` namespace.
-Let us explain each argument of `tag_invoke` function.
-
-- `simdjson::deserialize_tag`: it is the tag for Customization Point Object (CPO). You may often ignore this parameter. It is used to indicate that you mean to provide a deserialization function for simdjson.
-- `var`: It receives automatically a `simdjson` value type (document, value, document_reference).
-- The third parameter is an instance of the type that you want to support.
-
-Please see our main documentation (`basics.md`) under
-"Use `tag_invoke` for custom types (C++20)" for details about
-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:
-
-```C++
-  padded_string json =
-      R"( { "make": "Toyota", "model": "Camry",  "year": 2018,
-       "tire_pressure": [ 40.1, 39.9 ] }
-  { "make": "Kia",    "model": "Soul",   "year": 2012,
-       "tire_pressure": [ 30.1, 31.0 ] }
-  { "make": "Toyota", "model": "Tercel", "year": 1999,
-       "tire_pressure": [ 29.8, 30.0 ] }
-)"_padded;
-  ondemand::parser parser;
-  ondemand::document_stream stream;
-  [[maybe_unused]] auto error = parser.iterate_many(json).get(stream);
-  std::vector<Car> cars;
-  for(auto doc : stream) {
-    cars.push_back((Car)doc); // an exception may be thrown
-  }
-```
-
-Otherwise you may use this longer version for explicit handling of errors:
-
-
-```C++
-  std::vector<Car> cars;
-  for(auto doc : stream) {
-    Car c;
-    if ((error = doc.get<Car>().get(c))) {
-      std::cerr << simdjson::error_message(error); << std::endl;
-      return EXIT_FAILURE;
-    }
-    cars.push_back(c);
-  }
-```

doc/ondemand_design.md

@@ -102,7 +102,7 @@ or indexing (`object["key"]`). In some cases, the values are even deserialized d
 maps.
 
 The DOM approach is conceptually simple and "programmer friendly". Using the
-DOM tree is often easy enough that many users process the DOM as-is instead of creating
+DOM tree is often easy enough that many users use the DOM as-is instead of creating
 their own custom data structures.
 
 The DOM approach was the only way to parse JSON documents up to version 0.6 of the simdjson library.

doc/performance.md

@@ -4,9 +4,9 @@ Performance Notes
 simdjson strives to be at its fastest *without tuning*, and generally achieves this. However, there
 are still some scenarios where tuning can enhance performance.
 Once your code is tested, we
-further encourage you to define `NDEBUG` in your release builds to disable additional runtime
+further encourage you to define `NDEBUG` in your Release builds to disable additional runtime
 testing and get the best performance.
-* [NDEBUG macro](#ndebug-macro)
+* [NDEBUG directive](#ndebug-directive)
 * [Reusing the parser for maximum efficiency](#reusing-the-parser-for-maximum-efficiency)
 * [Reusing string buffers](#reusing-string-buffers)
 * [Server Loops: Long-Running Processes and Memory Capacity](#server-loops-long-running-processes-and-memory-capacity)
@@ -17,27 +17,16 @@ testing and get the best performance.
 * [Free Padding](#free-padding)
 
 
-NDEBUG macro
+NDEBUG directive
 -------------
 
-We recommend that you set `NDEBUG` macro in your release builds.
+In C/C++, the `NDEBUG` pre-processor directive is not set by default. When it is not set, the simdjson library does
+many additional checks that may impact negatively the performance. We recommend that, once your code
+is well tested, you define `NDEBUG` directive in your Release builds. The `NDEBUG` directive should be defined
+prior to including the `simdjson.h` header.
 
-In C/C++, the `NDEBUG` macro is not set by default.
-When it is not set, the software may do many additional checks that may impact
-negatively the performance. We recommend that, once your code
-is well tested, you define `NDEBUG` directive in your release builds.
-
-The `NDEBUG` directive is generally independent from optimization flags.
-For example, setting `-O3` under GCC does not set the `NDEBUG` directive.
-However, tools like `CMake` automatically
-set `NDEBUG` for release builds.
-
-In the simdjson library, we check the `NDEBUG` macro as well as other
-macros to make performant release builds. However, the C++ standard
-does not provide a definitive approach to determine whether you are
-compiling for a release build. Thus we recommend that you follow
-the practice of setting the `NDEBUG` macro in release mode to make sure
-that you do not get undesirable expensive checks.
+The `NDEBUG` directive is generally independent from optimization flags. For example, setting `-O3` under
+GCC does not set the `NDEBUG` directive.
 
 Reusing the parser for maximum efficiency
 -----------------------------------------
@@ -169,9 +158,9 @@ On Intel and AMD Windows platforms, Microsoft Visual Studio enables programmers
 
 When compiling with Visual Studio, we recommend the flags `/Ob2 /O2` or better. We do not recommend that you compile simdjson with architecture-specific flags such as  `arch:AVX2`. The simdjson library automatically selects the best execution kernel at runtime.
 
-Recent versions of Microsoft Visual Studio on Windows provides support for the LLVM Clang compiler. You  only need to install the "Clang compiler" optional component (clang-cl). You may also get a copy of the 64-bit LLVM CLang compiler for [Windows directly from LLVM](https://releases.llvm.org/download.html). The simdjson library fully supports the LLVM Clang compiler under Windows. In fact, you may get better performance out of simdjson with the LLVM Clang compiler than with the regular Visual Studio compiler. Meanwhile the [LLVM CLang compiler is binary compatible with Visual Studio](https://clang.llvm.org/docs/MSVCCompatibility.html) which means that you can combine their binaries (executables and libraries).
+Recent versions of Microsoft Visual Studio on Windows provides support for the LLVM Clang compiler. You  only need to install the "Clang compiler" optional component (ClangCL). You may also get a copy of the 64-bit LLVM CLang compiler for [Windows directly from LLVM](https://releases.llvm.org/download.html). The simdjson library fully supports the LLVM Clang compiler under Windows. In fact, you may get better performance out of simdjson with the LLVM Clang compiler than with the regular Visual Studio compiler. Meanwhile the [LLVM CLang compiler is binary compatible with Visual Studio](https://clang.llvm.org/docs/MSVCCompatibility.html) which means that you can combine their binaries (executables and libraries).
 
-We recommend Visual Studio users prefer LLVM (clang-cl). It compiles to faster release binaries. Furthermore, it compilers faster in release mode.
+Under Windows, we also support the GNU GCC compiler via MSYS2. The performance of 64-bit MSYS2 under Windows is excellent (on par with Linux).
 
 
 Power Usage and Downclocking
@@ -253,7 +242,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

examples/quickstart/CMakeLists.txt

@@ -20,14 +20,10 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   endif()
 
   add_quickstart_test(quickstart_noexceptions   quickstart_noexceptions.cpp NO_EXCEPTIONS LABELS acceptance)
-  if(NOT SIMDJSON_STATIC_REFLECTION)
-    add_quickstart_test(quickstart_noexceptions11 quickstart_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11)
-  endif(NOT SIMDJSON_STATIC_REFLECTION)
+  add_quickstart_test(quickstart_noexceptions11 quickstart_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11)
 
   add_quickstart_test(quickstart2_noexceptions   quickstart2_noexceptions.cpp NO_EXCEPTIONS LABELS acceptance)
-  if(NOT SIMDJSON_STATIC_REFLECTION)
-    add_quickstart_test(quickstart2_noexceptions11 quickstart2_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11)
-  endif(NOT SIMDJSON_STATIC_REFLECTION)
+  add_quickstart_test(quickstart2_noexceptions11 quickstart2_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11)
 
   # On-Demand Quick Start
   if (SIMDJSON_EXCEPTIONS)
@@ -37,8 +33,6 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   endif()
 
   add_quickstart_test(quickstart_ondemand_noexceptions   quickstart_ondemand_noexceptions.cpp NO_EXCEPTIONS LABELS quickstart_ondemand acceptance)
-  if(NOT SIMDJSON_STATIC_REFLECTION)
-    add_quickstart_test(quickstart_ondemand_noexceptions11 quickstart_ondemand_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11 LABELS quickstart_ondemand)
-  endif(NOT SIMDJSON_STATIC_REFLECTION)
+  add_quickstart_test(quickstart_ondemand_noexceptions11 quickstart_ondemand_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11 LABELS quickstart_ondemand)
 
 endif()

fuzz/fuzz_implementations.cpp

@@ -72,7 +72,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
 
     // make this dynamic, so it works regardless of how it was compiled
     // or what hardware it runs on
-    constexpr std::size_t Nimplementations_max=4;
+    constexpr std::size_t Nimplementations_max=3;
     const std::size_t Nimplementations = supported_implementations.size();
 
     if(Nimplementations>Nimplementations_max) {

fuzz/fuzz_minify.cpp

@@ -18,7 +18,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
     auto error = parser.parse(str).get(elem);
     if (error) { return 0; }
 
-    std::string minified = simdjson::minify(elem);
+    std::string minified=simdjson::minify(elem);
     (void)minified;
     return 0;
 }

include/simdjson.h

@@ -53,6 +53,5 @@
 
 #include "simdjson/dom.h"
 #include "simdjson/ondemand.h"
-#include "simdjson/convert.h"
-#include "simdjson/convert-inl.h"
+
 #endif // SIMDJSON_H

include/simdjson/arm64/bitmanipulation.h

@@ -19,7 +19,7 @@ SIMDJSON_NO_SANITIZE_UNDEFINED
 // See issue https://github.com/simdjson/simdjson/issues/1965
 SIMDJSON_NO_SANITIZE_MEMORY
 simdjson_inline int trailing_zeroes(uint64_t input_num) {
-#if SIMDJSON_REGULAR_VISUAL_STUDIO
+#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
   unsigned long ret;
   // Search the mask data from least significant bit (LSB)
   // to the most significant bit (MSB) for a set bit (1).
@@ -43,7 +43,7 @@ simdjson_inline uint64_t clear_lowest_bit(uint64_t input_num) {
 SIMDJSON_NO_SANITIZE_UNDEFINED
 /* result might be undefined when input_num is zero */
 simdjson_inline int leading_zeroes(uint64_t input_num) {
-#if SIMDJSON_REGULAR_VISUAL_STUDIO
+#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
   unsigned long leading_zero = 0;
   // Search the mask data from most significant bit (MSB)
   // to least significant bit (LSB) for a set bit (1).
@@ -96,7 +96,7 @@ simdjson_inline uint64_t zero_leading_bit(uint64_t rev_bits, int leading_zeroes)
 #endif
 
 simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, uint64_t *result) {
-#if SIMDJSON_REGULAR_VISUAL_STUDIO
+#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
   *result = value1 + value2;
   return *result < value1;
 #else

include/simdjson/arm64/simd.h

@@ -12,7 +12,7 @@ namespace arm64 {
 namespace {
 namespace simd {
 
-#if SIMDJSON_REGULAR_VISUAL_STUDIO
+#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
 namespace {
 // Start of private section with Visual Studio workaround
 
@@ -121,7 +121,7 @@ namespace {
     // We return uint32_t instead of uint16_t because that seems to be more efficient for most
     // purposes (cutting it down to uint16_t costs performance in some compilers).
     simdjson_inline uint32_t to_bitmask() const {
-#if SIMDJSON_REGULAR_VISUAL_STUDIO
+#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
       const uint8x16_t bit_mask =  simdjson_make_uint8x16_t(0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
                                                    0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80);
 #else
@@ -134,12 +134,6 @@ namespace {
       tmp = vpaddq_u8(tmp, tmp);
       return vgetq_lane_u16(vreinterpretq_u16_u8(tmp), 0);
     }
-    // Returns 4-bit out of each byte, alternating between the high 4 bits and low
-    // bits result it is 64 bit.
-    simdjson_inline uint64_t to_bitmask64() const {
-      return vget_lane_u64(
-          vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(*this), 4)), 0);
-    }
     simdjson_inline bool any() const { return vmaxvq_u32(vreinterpretq_u32_u8(*this)) != 0; }
   };
 
@@ -158,7 +152,7 @@ namespace {
     // Splat constructor
     simdjson_inline simd8(uint8_t _value) : simd8(splat(_value)) {}
     // Member-by-member initialization
-#if SIMDJSON_REGULAR_VISUAL_STUDIO
+#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
     simdjson_inline simd8(
       uint8_t v0,  uint8_t v1,  uint8_t v2,  uint8_t v3,  uint8_t v4,  uint8_t v5,  uint8_t v6,  uint8_t v7,
       uint8_t v8,  uint8_t v9,  uint8_t v10, uint8_t v11, uint8_t v12, uint8_t v13, uint8_t v14, uint8_t v15
@@ -216,7 +210,7 @@ namespace {
 
     // Bit-specific operations
     simdjson_inline simd8<bool> any_bits_set(simd8<uint8_t> bits) const { return vtstq_u8(*this, bits); }
-    simdjson_inline bool any_bits_set_anywhere() const { return vmaxvq_u32(vreinterpretq_u32_u8(*this)) != 0; }
+    simdjson_inline bool any_bits_set_anywhere() const { return this->max_val() != 0; }
     simdjson_inline bool any_bits_set_anywhere(simd8<uint8_t> bits) const { return (*this & bits).any_bits_set_anywhere(); }
     template<int N>
     simdjson_inline simd8<uint8_t> shr() const { return vshrq_n_u8(*this, N); }
@@ -229,12 +223,7 @@ namespace {
       return lookup_table.apply_lookup_16_to(*this);
     }
 
-    // Returns 4-bit out of each byte, alternating between the high 4 bits and low
-    // bits result it is 64 bit.
-    simdjson_inline uint64_t to_bitmask64() const {
-      return vget_lane_u64(
-          vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(*this), 4)), 0);
-    }
+
     // Copies to 'output" all bytes corresponding to a 0 in the mask (interpreted as a bitset).
     // Passing a 0 value for mask would be equivalent to writing out every byte to output.
     // Only the first 16 - count_ones(mask) bytes of the result are significant but 16 bytes
@@ -257,7 +246,7 @@ namespace {
       uint64x2_t shufmask64 = {thintable_epi8[mask1], thintable_epi8[mask2]};
       uint8x16_t shufmask = vreinterpretq_u8_u64(shufmask64);
       // we increment by 0x08 the second half of the mask
-#if SIMDJSON_REGULAR_VISUAL_STUDIO
+#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
       uint8x16_t inc = simdjson_make_uint8x16_t(0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08);
 #else
       uint8x16_t inc = {0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08};
@@ -287,7 +276,7 @@ namespace {
       uint8x8_t compactmask1 = vcreate_u8(thintable_epi8[mask1]);
       uint8x8_t compactmask2 = vcreate_u8(thintable_epi8[mask2]);
       // we increment by 0x08 the second half of the mask
-#if SIMDJSON_REGULAR_VISUAL_STUDIO
+#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
       uint8x8_t inc = simdjson_make_uint8x8_t(0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08);
 #else
       uint8x8_t inc = {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08};
@@ -339,7 +328,7 @@ namespace {
     // Array constructor
     simdjson_inline simd8(const int8_t* values) : simd8(load(values)) {}
     // Member-by-member initialization
-#if SIMDJSON_REGULAR_VISUAL_STUDIO
+#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
     simdjson_inline simd8(
       int8_t v0,  int8_t v1,  int8_t v2,  int8_t v3, int8_t v4,  int8_t v5,  int8_t v6,  int8_t v7,
       int8_t v8,  int8_t v9,  int8_t v10, int8_t v11, int8_t v12, int8_t v13, int8_t v14, int8_t v15
@@ -460,7 +449,7 @@ namespace {
     }
 
     simdjson_inline uint64_t to_bitmask() const {
-#if SIMDJSON_REGULAR_VISUAL_STUDIO
+#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
       const uint8x16_t bit_mask = simdjson_make_uint8x16_t(
         0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
         0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80

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; }
@@ -46,32 +46,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
   };
 }
 
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits) / 4; }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    (is_backslash | is_quote | is_control).to_bitmask64()
-  };
-}
-
-
-
 } // unnamed namespace
 } // namespace arm64
 } // namespace simdjson

include/simdjson/base.h

@@ -9,8 +9,6 @@
 #include "simdjson/compiler_check.h"
 #include "simdjson/error.h"
 #include "simdjson/portability.h"
-#include "simdjson/concepts.h"
-#include "simdjson/constevalutil.h"
 
 /**
  * @brief The top level simdjson namespace, containing everything the library provides.

include/simdjson/common_defs.h

@@ -23,7 +23,7 @@ double from_chars(const char *first, const char* end) noexcept;
 }
 
 #ifndef SIMDJSON_EXCEPTIONS
-#if defined(__cpp_exceptions) || defined(_CPPUNWIND)
+#if __cpp_exceptions
 #define SIMDJSON_EXCEPTIONS 1
 #else
 #define SIMDJSON_EXCEPTIONS 0
@@ -199,6 +199,17 @@ double from_chars(const char *first, const char* end) noexcept;
     // We assume by default static linkage
     #define SIMDJSON_DLLIMPORTEXPORT
     #endif
+
+/**
+ * Workaround for the vcpkg package manager. Only vcpkg should
+ * ever touch the next line. The SIMDJSON_USING_LIBRARY macro is otherwise unused.
+ */
+#if SIMDJSON_USING_LIBRARY
+#define SIMDJSON_DLLIMPORTEXPORT __declspec(dllimport)
+#endif
+/**
+ * End of workaround for the vcpkg package manager.
+ */
 #else
     #define SIMDJSON_DLLIMPORTEXPORT
 #endif
@@ -215,14 +226,12 @@ double from_chars(const char *first, const char* end) noexcept;
 // even if we do not have C++17 support.
 #ifdef __cpp_lib_string_view
 #define SIMDJSON_HAS_STRING_VIEW
-#include <string_view>
 #endif
 
 // Some systems have string_view even if we do not have C++17 support,
 // and even if __cpp_lib_string_view is undefined, it is the case
 // with Apple clang version 11.
 // We must handle it. *This is important.*
-#ifndef _MSC_VER
 #ifndef SIMDJSON_HAS_STRING_VIEW
 #if defined __has_include
 // do not combine the next #if with the previous one (unsafe)
@@ -238,7 +247,6 @@ double from_chars(const char *first, const char* end) noexcept;
 #endif // __has_include (<string_view>)
 #endif // defined __has_include
 #endif // def SIMDJSON_HAS_STRING_VIEW
-#endif // def _MSC_VER
 // end of complicated but important routine to try to detect string_view.
 
 //
@@ -271,25 +279,16 @@ namespace std {
 // It could also wrongly set SIMDJSON_DEVELOPMENT_CHECKS (e.g., if the programmer
 // sets _DEBUG in a release build under Visual Studio, or if some compiler fails to
 // set the __OPTIMIZE__ macro).
-// We make it so that if NDEBUG is defined, then SIMDJSON_DEVELOPMENT_CHECKS
-// is not defined, irrespective of the compiler.
-// We recommend that users set NDEBUG in release builds, so that
-// SIMDJSON_DEVELOPMENT_CHECKS is not defined in release builds by default,
-// irrespective of the compiler.
 #ifndef SIMDJSON_DEVELOPMENT_CHECKS
 #ifdef _MSC_VER
 // Visual Studio seems to set _DEBUG for debug builds.
-// We set SIMDJSON_DEVELOPMENT_CHECKS to 1 if _DEBUG is defined
-// and NDEBUG is not defined.
-#if defined(_DEBUG) && !defined(NDEBUG)
+#ifdef _DEBUG
 #define SIMDJSON_DEVELOPMENT_CHECKS 1
 #endif // _DEBUG
 #else // _MSC_VER
 // All other compilers appear to set __OPTIMIZE__ to a positive integer
 // when the compiler is optimizing.
-// We only set SIMDJSON_DEVELOPMENT_CHECKS if both __OPTIMIZE__
-// and NDEBUG are not defined.
-#if !defined(__OPTIMIZE__) && !defined(NDEBUG)
+#ifndef __OPTIMIZE__
 #define SIMDJSON_DEVELOPMENT_CHECKS 1
 #endif // __OPTIMIZE__
 #endif // _MSC_VER
@@ -345,16 +344,4 @@ namespace std {
 #define SIMDJSON_AVX512_ALLOWED 1
 #endif
 
-
-#ifndef __has_cpp_attribute
-#define simdjson_lifetime_bound
-#elif __has_cpp_attribute(msvc::lifetimebound)
-#define simdjson_lifetime_bound [[msvc::lifetimebound]]
-#elif __has_cpp_attribute(clang::lifetimebound)
-#define simdjson_lifetime_bound [[clang::lifetimebound]]
-#elif __has_cpp_attribute(lifetimebound)
-#define simdjson_lifetime_bound [[lifetimebound]]
-#else
-#define simdjson_lifetime_bound
-#endif
 #endif // SIMDJSON_COMMON_DEFS_H

include/simdjson/compiler_check.h

@@ -50,69 +50,4 @@
 #endif
 #endif
 
-#ifndef SIMDJSON_CONSTEXPR_LAMBDA
-#if SIMDJSON_CPLUSPLUS17
-#define SIMDJSON_CONSTEXPR_LAMBDA constexpr
-#else
-#define SIMDJSON_CONSTEXPR_LAMBDA
-#endif
-#endif
-
-
-
-#ifdef __has_include
-#if __has_include(<version>)
-#include <version>
-#endif
-#endif
-
-// The current specification is unclear on how we detect
-// static reflection, both __cpp_lib_reflection and
-// __cpp_impl_reflection are proposed in the draft specification.
-// For now, we disable static reflect by default. It must be
-// specified at compiler time.
-#ifndef SIMDJSON_STATIC_REFLECTION
-#define SIMDJSON_STATIC_REFLECTION 0 // disabled by default.
-#endif
-
-#if defined(__apple_build_version__)
-#if __apple_build_version__ < 14000000
-#define SIMDJSON_CONCEPT_DISABLED 1 // apple-clang/13 doesn't support std::convertible_to
-#endif
-#endif
-
-#if defined(__cpp_lib_ranges) && __cpp_lib_ranges >= 201911L
-#include <ranges>
-#define SIMDJSON_SUPPORTS_RANGES 1
-#else
-#define SIMDJSON_SUPPORTS_RANGES 0
-#endif
-
-#if defined(__cpp_concepts) && !defined(SIMDJSON_CONCEPT_DISABLED)
-#if __cpp_concepts >= 201907L
-#include <utility>
-#define SIMDJSON_SUPPORTS_CONCEPTS 1
-#else
-#define SIMDJSON_SUPPORTS_CONCEPTS 0
-#endif
-#else // defined(__cpp_concepts) && !defined(SIMDJSON_CONCEPT_DISABLED)
-#define SIMDJSON_SUPPORTS_CONCEPTS 0
-#endif // defined(__cpp_concepts) && !defined(SIMDJSON_CONCEPT_DISABLED)
-
-// copy SIMDJSON_SUPPORTS_CONCEPTS to SIMDJSON_SUPPORTS_DESERIALIZATION.
-#if SIMDJSON_SUPPORTS_CONCEPTS
-#define SIMDJSON_SUPPORTS_DESERIALIZATION 1
-#else
-#define SIMDJSON_SUPPORTS_DESERIALIZATION 0
-#endif
-
-
-#if !defined(SIMDJSON_CONSTEVAL)
-#if defined(__cpp_consteval) && __cpp_consteval >= 201811L && defined(__cpp_lib_constexpr_string) && __cpp_lib_constexpr_string >= 201907L
-#define SIMDJSON_CONSTEVAL 1
-#else
-#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

@@ -1,167 +0,0 @@
-#ifndef SIMDJSON_CONCEPTS_H
-#define SIMDJSON_CONCEPTS_H
-#if SIMDJSON_SUPPORTS_CONCEPTS
-
-#include <concepts>
-#include <type_traits>
-
-namespace simdjson {
-namespace concepts {
-
-namespace details {
-#define SIMDJSON_IMPL_CONCEPT(name, method)                                    \
-  template <typename T>                                                        \
-  concept supports_##name = !std::is_const_v<T> && requires {                  \
-    typename std::remove_cvref_t<T>::value_type;                               \
-    requires requires(typename std::remove_cvref_t<T>::value_type &&val,       \
-                      T obj) {                                                 \
-      obj.method(std::move(val));                                              \
-      requires !requires { obj = std::move(val); };                            \
-    };                                                                         \
-  };
-
-SIMDJSON_IMPL_CONCEPT(emplace_back, emplace_back)
-SIMDJSON_IMPL_CONCEPT(emplace, emplace)
-SIMDJSON_IMPL_CONCEPT(push_back, push_back)
-SIMDJSON_IMPL_CONCEPT(add, add)
-SIMDJSON_IMPL_CONCEPT(push, push)
-SIMDJSON_IMPL_CONCEPT(append, append)
-SIMDJSON_IMPL_CONCEPT(insert, insert)
-SIMDJSON_IMPL_CONCEPT(op_append, operator+=)
-
-#undef SIMDJSON_IMPL_CONCEPT
-} // namespace details
-
-template <typename T>
-concept is_pair = requires { typename T::first_type; typename T::second_type; } &&
-                  std::same_as<T, std::pair<typename T::first_type, typename T::second_type>>;
-template <typename T>
-concept string_view_like = std::is_convertible_v<T, std::string_view> &&
-                           !std::is_convertible_v<T, const char*>;
-
-template<typename T>
-concept constructible_from_string_view = std::is_constructible_v<T, std::string_view>
-                                        && !std::is_same_v<T, std::string_view>
-                                        && std::is_default_constructible_v<T>;
-
-template<typename M>
-concept string_view_keyed_map = string_view_like<typename M::key_type>
-              && requires(std::remove_cvref_t<M>& m, typename M::key_type sv, typename M::mapped_type v) {
-    { m.emplace(sv, v) } -> std::same_as<std::pair<typename M::iterator, bool>>;
-};
-
-/// Check if T is a container that we can append to, including:
-///   std::vector, std::deque, std::list, std::string, ...
-template <typename T>
-concept appendable_containers =
-    (details::supports_emplace_back<T> || details::supports_emplace<T> ||
-    details::supports_push_back<T> || details::supports_push<T> ||
-    details::supports_add<T> || details::supports_append<T> ||
-    details::supports_insert<T>) && !string_view_keyed_map<T>;
-
-/// Insert into the container however possible
-template <appendable_containers T, typename... Args>
-constexpr decltype(auto) emplace_one(T &vec, Args &&...args) {
-  if constexpr (details::supports_emplace_back<T>) {
-    return vec.emplace_back(std::forward<Args>(args)...);
-  } else if constexpr (details::supports_emplace<T>) {
-    return vec.emplace(std::forward<Args>(args)...);
-  } else if constexpr (details::supports_push_back<T>) {
-    return vec.push_back(std::forward<Args>(args)...);
-  } else if constexpr (details::supports_push<T>) {
-    return vec.push(std::forward<Args>(args)...);
-  } else if constexpr (details::supports_add<T>) {
-    return vec.add(std::forward<Args>(args)...);
-  } else if constexpr (details::supports_append<T>) {
-    return vec.append(std::forward<Args>(args)...);
-  } else if constexpr (details::supports_insert<T>) {
-    return vec.insert(std::forward<Args>(args)...);
-  } else if constexpr (details::supports_op_append<T> && sizeof...(Args) == 1) {
-    return vec.operator+=(std::forward<Args>(args)...);
-  } else {
-    static_assert(!sizeof(T *),
-                  "We don't know how to add things to this container");
-  }
-}
-
-/// This checks if the container will return a reference to the newly added
-/// element after an insert which for example `std::vector::emplace_back` does
-/// since C++17; this will allow some optimizations.
-template <typename T>
-concept returns_reference = appendable_containers<T> && requires {
-  typename std::remove_cvref_t<T>::reference;
-  requires requires(typename std::remove_cvref_t<T>::value_type &&val, T obj) {
-    {
-      emplace_one(obj, std::move(val))
-    } -> std::same_as<typename std::remove_cvref_t<T>::reference>;
-  };
-};
-
-template <typename T>
-concept smart_pointer = requires(std::remove_cvref_t<T> ptr) {
-  // Check if T has a member type named element_type
-  typename std::remove_cvref_t<T>::element_type;
-
-  // Check if T has a get() member function
-  {
-    ptr.get()
-  } -> std::same_as<typename std::remove_cvref_t<T>::element_type *>;
-
-  // Check if T can be dereferenced
-  { *ptr } -> std::same_as<typename std::remove_cvref_t<T>::element_type &>;
-};
-
-template <typename T>
-concept optional_type = requires(std::remove_cvref_t<T> obj) {
-  typename std::remove_cvref_t<T>::value_type;
-  { obj.value() } -> std::same_as<typename std::remove_cvref_t<T>::value_type&>;
-  requires requires(typename std::remove_cvref_t<T>::value_type &&val) {
-    obj.emplace(std::move(val));
-    {
-      obj.value_or(val)
-    } -> 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>;
-
-
-} // 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

@@ -1,76 +0,0 @@
-#ifndef SIMDJSON_CONSTEVALUTIL_H
-#define SIMDJSON_CONSTEVALUTIL_H
-
-#include <string>
-#include <string_view>
-#include <array>
-
-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,
-  1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-constexpr static std::array<std::string_view, 32> control_chars = {
-    "\\u0000", "\\u0001", "\\u0002", "\\u0003", "\\u0004", "\\u0005", "\\u0006",
-    "\\u0007", "\\b", "\\t",     "\\n",     "\\u000b", "\\f",     "\\r",
-    "\\u000e", "\\u000f", "\\u0010", "\\u0011", "\\u0012", "\\u0013", "\\u0014",
-    "\\u0015", "\\u0016", "\\u0017", "\\u0018", "\\u0019", "\\u001a", "\\u001b",
-    "\\u001c", "\\u001d", "\\u001e", "\\u001f"};
-// unoptimized, meant for compile-time execution
-consteval std::string consteval_to_quoted_escaped(std::string_view input) {
-  std::string out = "\"";
-  for (char c : input) {
-    if (json_quotable_character[uint8_t(c)]) {
-      if (c == '"') {
-        out.append("\\\"");
-      } else if (c == '\\') {
-        out.append("\\\\");
-      } else {
-        std::string_view v = control_chars[uint8_t(c)];
-        out.append(v);
-      }
-    } else {
-      out.push_back(c);
-    }
-  }
-  out.push_back('"');
-  return out;
-}
-#endif  // SIMDJSON_CONSTEVAL
-
-
-#if SIMDJSON_SUPPORTS_CONCEPTS
-template <std::size_t N>
-struct fixed_string {
-    constexpr fixed_string() : data{} {}  // Default constructor for buffers
-    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}; }
-};
-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_CONSTEVALUTIL_H

include/simdjson/convert-inl.h

@@ -1,135 +0,0 @@
-
-#ifndef SIMDJSON_CONVERT_INL_H
-#define SIMDJSON_CONVERT_INL_H
-
-#include "simdjson/convert.h"
-#if SIMDJSON_SUPPORTS_CONCEPTS
-namespace simdjson {
-namespace convert {
-namespace internal {
-// auto_parser method definitions
-template <typename parser_type>
-inline auto_parser<parser_type>::auto_parser(parser_type &&parser, ondemand::document &&doc) noexcept requires(!std::is_pointer_v<parser_type>)
-  : m_parser{std::move(parser)}, m_doc{std::move(doc)} {}
-
-template <typename parser_type>
-inline auto_parser<parser_type>::auto_parser(parser_type &&parser, padded_string_view const str) noexcept requires(!std::is_pointer_v<parser_type>)
-  : m_parser{std::move(parser)}, m_doc{}, m_error{SUCCESS} {
-  m_error = m_parser.iterate(str).get(m_doc);
-}
-
-template <typename parser_type>
-inline auto_parser<parser_type>::auto_parser(std::remove_pointer_t<parser_type> &parser, ondemand::document &&doc) noexcept requires(std::is_pointer_v<parser_type>)
-  : m_parser{&parser}, m_doc{std::move(doc)} {}
-
-template <typename parser_type>
-inline auto_parser<parser_type>::auto_parser(std::remove_pointer_t<parser_type> &parser, padded_string_view const str) noexcept requires(std::is_pointer_v<parser_type>)
-  : m_parser{&parser}, m_doc{}, m_error{SUCCESS} {
-  m_error = m_parser->iterate(str).get(m_doc);
-}
-
-template <typename parser_type>
-inline auto_parser<parser_type>::auto_parser(padded_string_view const str) noexcept requires(std::is_pointer_v<parser_type>)
-  : auto_parser{ondemand::parser::get_parser(), str} {}
-
-template <typename parser_type>
-inline auto_parser<parser_type>::auto_parser(parser_type parser, ondemand::document &&doc) noexcept requires(std::is_pointer_v<parser_type>)
-  : auto_parser{*parser, std::move(doc)} {}
-
-
-
-
-
-template <typename parser_type>
-inline std::remove_pointer_t<parser_type> &auto_parser<parser_type>::parser() noexcept {
-  if constexpr (std::is_pointer_v<parser_type>) {
-    return *m_parser;
-  } else {
-    return m_parser;
-  }
-}
-
-template <typename parser_type>
-template <typename T>
-inline simdjson_result<T> auto_parser<parser_type>::result() noexcept(is_nothrow_gettable<T>) {
-  if (m_error != SUCCESS) {
-    return m_error;
-  }
-  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>();
-}
-
-template <typename parser_type>
-inline simdjson_result<ondemand::object> auto_parser<parser_type>::object() noexcept {
-  return result<ondemand::object>();
-}
-
-template <typename parser_type>
-inline simdjson_result<ondemand::number> auto_parser<parser_type>::number() noexcept {
-  return result<ondemand::number>();
-}
-
-#if SIMDJSON_EXCEPTIONS
-template <typename parser_type>
-template <typename T>
-inline auto_parser<parser_type>::operator T() noexcept(false) {
-  if (m_error != SUCCESS) {
-    throw simdjson_error(m_error);
-  }
-  return m_doc.get<T>();
-}
-#endif // SIMDJSON_EXCEPTIONS
-
-template <typename parser_type>
-template <typename T>
-inline std::optional<T> auto_parser<parser_type>::optional() noexcept(is_nothrow_gettable<T>) {
-  if (m_error != SUCCESS) {
-    return std::nullopt;
-  }
-  T value;
-  if (m_doc.get<T>().get(value)) [[unlikely]] {
-    return std::nullopt;
-  }
-  return {std::move(value)};
-}
-
-// to_adaptor method definitions
-template <typename T>
-inline T to_adaptor<T>::operator()(simdjson_result<ondemand::value> &val) const noexcept {
-  return val.get<T>();
-}
-
-template <typename T>
-inline auto to_adaptor<T>::operator()(padded_string_view const str) const noexcept {
-  return auto_parser<ondemand::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
-#endif // SIMDJSON_SUPPORTS_CONCEPTS
-#endif // SIMDJSON_CONVERT_INL_H

include/simdjson/convert.h

@@ -1,121 +0,0 @@
-
-#ifndef SIMDJSON_CONVERT_H
-#define SIMDJSON_CONVERT_H
-
-#include "simdjson/ondemand.h"
-#include <optional>
-
-#if SIMDJSON_SUPPORTS_CONCEPTS
-
-
-namespace simdjson {
-namespace convert {
-namespace internal {
-
-/**
- * A utility class for automatically parsing JSON documents.
- * This template is NOT part of our public API.
- * It is subject to changes.
- * @private
- */
-template <typename parser_type = ondemand::parser*>
-struct auto_parser {
-private:
-	parser_type m_parser;
-	ondemand::document m_doc;
-	error_code m_error{SUCCESS};
-
-	template <typename T>
-	static constexpr bool is_nothrow_gettable = requires(ondemand::document doc) {
-		{ doc.get<T>() } noexcept;
-	};
-public:
-	explicit auto_parser(parser_type &&parser, ondemand::document &&doc) noexcept requires(!std::is_pointer_v<parser_type>);
-	explicit auto_parser(parser_type &&parser, padded_string_view const str) noexcept requires(!std::is_pointer_v<parser_type>);
-	explicit auto_parser(std::remove_pointer_t<parser_type> &parser, ondemand::document &&doc) noexcept requires(std::is_pointer_v<parser_type>);
-	explicit auto_parser(std::remove_pointer_t<parser_type> &parser, padded_string_view const str) noexcept requires(std::is_pointer_v<parser_type>);
-	explicit auto_parser(padded_string_view const str) noexcept requires(std::is_pointer_v<parser_type>);
-	explicit auto_parser(parser_type parser, ondemand::document &&doc) noexcept requires(std::is_pointer_v<parser_type>);
-		auto_parser(auto_parser const &) = delete;
-		auto_parser &operator=(auto_parser const &) = delete;
-		auto_parser(auto_parser &&) noexcept = default;
-		auto_parser &operator=(auto_parser &&) noexcept = default;
-		~auto_parser() = default;
-
-	simdjson_warn_unused std::remove_pointer_t<parser_type> &parser() noexcept;
-
-	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;
-
-
-#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>);
-};
-
-
-/**
- * A utility class for adapting values for the `auto_parser`.
- * This template is not part of our public API. It is subject to changes.
- * @private
- */
-template <typename T = void>
-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
-
-/**
- * The simdjson::from instance is EXPERIMENTAL AND SUBJECT TO CHANGES.
- *
- * The `from` instance is a utility adaptor for parsing JSON strings into objects.
- * It provides a convenient way to convert JSON data into C++ objects using the `auto_parser`.
- *
- * Example usage:
- *
- * ```cpp
- * std::map<std::string, std::string> obj =
- *   simdjson::from(R"({"key": "value"})"_padded);
- * ```
- *
- * This will parse the JSON string and return an object representation. By default, we
- * use the simdjson::ondemand::parser::get_parser() instance. A parser instance should
- * be used for just one document at a time.
- *
- * You can also pass you own parser instance:
- * ```cpp
- * simdjson::ondemand::parser parser;
- * std::map<std::string, std::string> obj =
- *   simdjson::from(parser, R"({"key": "value"})"_padded);
- * ```
- * The parser instance can be reused.
- *
- * This functionality requires C++20 or better.
- */
-static constexpr convert::internal::to_adaptor<> from{};
-
-} // namespace simdjson
-
-#endif // SIMDJSON_SUPPORTS_CONCEPTS
-#endif // SIMDJSON_CONVERT_H

include/simdjson/dom/array-inl.h

@@ -52,22 +52,11 @@ inline simdjson_result<dom::element> simdjson_result<dom::array>::at_pointer(std
   return at_pointer(json_pointer);
  }
 
-inline simdjson_result<std::vector<dom::element>> simdjson_result<dom::array>::at_path_with_wildcard(std::string_view json_path) const noexcept {
-  if (error()) {
-    return error();
-  }
-  return first.at_path_with_wildcard(json_path);
-}
-
 inline simdjson_result<dom::element> simdjson_result<dom::array>::at(size_t index) const noexcept {
   if (error()) { return error(); }
   return first.at(index);
 }
 
-inline std::vector<dom::element>& simdjson_result<dom::array>::get_values(std::vector<dom::element>& out) const noexcept {
-  return first.get_values(out);
-}
-
 namespace dom {
 
 //
@@ -138,93 +127,6 @@ inline simdjson_result<element> array::at_path(std::string_view json_path) const
   return at_pointer(json_pointer);
 }
 
-inline void array::process_json_path_of_child_elements(std::vector<element>::iterator& current, std::vector<element>::iterator& end, const std::string_view& path_suffix, std::vector<element>& accumulator) const noexcept {
-  if (current == end) {
-    return;
-  }
-
-  simdjson_result<std::vector<element>> result;
-
-
-  for (auto it = current; it != end; ++it) {
-    std::vector<element> child_result;
-    auto error = it->at_path_with_wildcard(path_suffix).get(child_result);
-    if(error) {
-      continue;
-    }
-    accumulator.reserve(accumulator.size() + child_result.size());
-    accumulator.insert(accumulator.end(),
-                        std::make_move_iterator(child_result.begin()),
-                        std::make_move_iterator(child_result.end()));
-  }
-}
-
-inline simdjson_result<std::vector<element>> array::at_path_with_wildcard(std::string_view json_path) const noexcept {
-  SIMDJSON_DEVELOPMENT_ASSERT(tape.usable()); // https://github.com/simdjson/simdjson/issues/1914
-
-  size_t i = 0;
-   // json_path.starts_with('$') requires C++20.
-  if (!json_path.empty() && json_path.front() == '$') {
-    i = 1;
-  }
-
-  if (i >= json_path.size() || (json_path[i] != '.' && json_path[i] != '[')) {
-    return INVALID_JSON_POINTER;
-  }
-
-  if (json_path.find("*") != std::string::npos) {
-    std::vector<element> child_values;
-
-    if (
-      (json_path.compare(i, 3, "[*]") == 0 && json_path.size() == i + 3) ||
-      (json_path.compare(i, 2,".*") == 0 && json_path.size() == i + 2)
-    ) {
-      get_values(child_values);
-      return child_values;
-    }
-
-    std::pair<std::string_view, std::string_view> key_and_json_path = get_next_key_and_json_path(json_path);
-
-    std::string_view key = key_and_json_path.first;
-    json_path = key_and_json_path.second;
-
-    if (key.size() > 0) {
-      if (key == "*") {
-        get_values(child_values);
-      } else {
-        element pointer_result;
-        std::string json_pointer = std::string("/") + std::string(key);
-        auto error = at_pointer(json_pointer).get(pointer_result);
-
-        if (!error) {
-          child_values.emplace_back(pointer_result);
-        }
-      }
-
-      std::vector<element> result = {};
-
-      if (child_values.size() > 0) {
-        std::vector<element>::iterator child_values_begin = child_values.begin();
-        std::vector<element>::iterator child_values_end = child_values.end();
-
-        process_json_path_of_child_elements(child_values_begin, child_values_end, json_path, result);
-      }
-
-      return result;
-    } else {
-      return INVALID_JSON_POINTER;
-    }
-  } else {
-    element result;
-    auto error = at_path(json_path).get(result);
-    if (error) {
-      return error;
-    }
-
-    return std::vector<element>{std::move(result)};
-  }
-}
-
 inline simdjson_result<element> array::at(size_t index) const noexcept {
   SIMDJSON_DEVELOPMENT_ASSERT(tape.usable()); // https://github.com/simdjson/simdjson/issues/1914
   size_t i=0;
@@ -235,15 +137,6 @@ inline simdjson_result<element> array::at(size_t index) const noexcept {
   return INDEX_OUT_OF_BOUNDS;
 }
 
-inline std::vector<element>& array::get_values(std::vector<element>& out) const noexcept {
-  out.reserve(this->size());
-  for (auto element : *this) {
-    out.emplace_back(element);
-  }
-
-  return out;
-}
-
 inline array::operator element() const noexcept {
 	return element(tape);
 }
@@ -290,13 +183,13 @@ inline bool array::iterator::operator>(const array::iterator& other) const noexc
 
 #include "simdjson/dom/element-inl.h"
 
-#if SIMDJSON_SUPPORTS_RANGES
+#if defined(__cpp_lib_ranges)
 static_assert(std::ranges::view<simdjson::dom::array>);
 static_assert(std::ranges::sized_range<simdjson::dom::array>);
 #if SIMDJSON_EXCEPTIONS
 static_assert(std::ranges::view<simdjson::simdjson_result<simdjson::dom::array>>);
 static_assert(std::ranges::sized_range<simdjson::simdjson_result<simdjson::dom::array>>);
 #endif // SIMDJSON_EXCEPTIONS
-#endif // SIMDJSON_SUPPORTS_RANGES
+#endif // defined(__cpp_lib_ranges)
 
 #endif // SIMDJSON_ARRAY_INL_H

include/simdjson/dom/array.h

@@ -1,8 +1,6 @@
 #ifndef SIMDJSON_DOM_ARRAY_H
 #define SIMDJSON_DOM_ARRAY_H
 
-#include <vector>
-
 #include "simdjson/dom/base.h"
 #include "simdjson/internal/tape_ref.h"
 
@@ -59,7 +57,7 @@ public:
     iterator& operator=(const iterator&) noexcept = default;
   private:
     simdjson_inline iterator(const internal::tape_ref &tape) noexcept;
-    internal::tape_ref tape{};
+    internal::tape_ref tape;
     friend class array;
   };
 
@@ -110,17 +108,6 @@ public:
    */
   inline simdjson_result<element> at_pointer(std::string_view json_pointer) const noexcept;
 
-  /**
-   * Recursive function which processes the json path of each child element
-   */
-  inline void process_json_path_of_child_elements(std::vector<element>::iterator& current, std::vector<element>::iterator& end, const std::string_view& path_suffix, std::vector<element>& accumulator) const noexcept;
-
-
-  /**
-   * Adds support for JSONPath expression with wildcards '*'
-   */
-  inline simdjson_result<std::vector<element>> at_path_with_wildcard(std::string_view json_path) const noexcept;
-
   /**
    * Get the value associated with the given JSONPath expression. We only support
    * JSONPath queries that trivially convertible to JSON Pointer queries: key
@@ -154,15 +141,6 @@ public:
    */
   inline simdjson_result<element> at(size_t index) const noexcept;
 
-  /**
-   * Gets the values of items in an array element
-   * This function has linear-time complexity: the values are checked one by one.
-   *
-   * @return The child elements of an array
-   */
-
-  inline std::vector<element>& get_values(std::vector<element>& out) const noexcept;
-
   /**
    * Implicitly convert object to element
    */
@@ -170,7 +148,7 @@ public:
 
 private:
   simdjson_inline array(const internal::tape_ref &tape) noexcept;
-  internal::tape_ref tape{};
+  internal::tape_ref tape;
   friend class element;
   friend struct simdjson_result<element>;
   template<typename T>
@@ -189,11 +167,8 @@ public:
   simdjson_inline simdjson_result(error_code error) noexcept; ///< @private
 
   inline simdjson_result<dom::element> at_pointer(std::string_view json_pointer) const noexcept;
-  inline void process_json_path_of_child_elements(std::vector<dom::element>::iterator& current, std::vector<dom::element>::iterator& end, const std::string_view& path_suffix, std::vector<dom::element>& accumulator) const noexcept;
-  inline simdjson_result<std::vector<dom::element>> at_path_with_wildcard(std::string_view json_path) const noexcept;
   inline simdjson_result<dom::element> at_path(std::string_view json_path) const noexcept;
   inline simdjson_result<dom::element> at(size_t index) const noexcept;
-  inline std::vector<dom::element>& get_values(std::vector<dom::element>& out) const noexcept;
 
 #if SIMDJSON_EXCEPTIONS
   inline dom::array::iterator begin() const noexcept(false);
@@ -206,7 +181,9 @@ public:
 
 } // namespace simdjson
 
-#if SIMDJSON_SUPPORTS_RANGES
+#if defined(__cpp_lib_ranges)
+#include <ranges>
+
 namespace std {
 namespace ranges {
 template<>
@@ -217,6 +194,6 @@ inline constexpr bool enable_view<simdjson::simdjson_result<simdjson::dom::array
 #endif // SIMDJSON_EXCEPTIONS
 } // namespace ranges
 } // namespace std
-#endif // SIMDJSON_SUPPORTS_RANGES
+#endif // defined(__cpp_lib_ranges)
 
 #endif // SIMDJSON_DOM_ARRAY_H