bumping up cmake

2026-06-08 17:27:07 +00:00 · 2026-03-25 10:21:18 -04:00
134 changed files with 2864 additions and 9410 deletions
@@ -24,6 +24,6 @@ jobs:
            apt-get update -q -y
            apt-get install -y cmake make g++
          run: |
-            cmake -DSIMDJSON_SANITIZE_UNDEFINED=ON -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
+            cmake -DSIMDJSON_SANITIZE_UNDEFINED=ON -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
            cmake --build build -j=2
            ctest --output-on-failure --test-dir build
@@ -18,13 +18,13 @@ jobs:
        run: |
          mkdir builddebug &&
          cd builddebug &&
-          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
+          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          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  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          cmake --build .   &&
          ctest --output-on-failure -LE explicitonly -j   &&
          cmake --install . &&
@@ -35,7 +35,7 @@ jobs:
        run: |
          mkdir buildshared &&
          cd buildshared &&
-          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX:PATH=destination -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          cmake --build .   &&
          ctest --output-on-failure -LE explicitonly -j   &&
          cmake --install . &&
@@ -43,6 +43,6 @@ jobs:
        run: |
          mkdir build
          cd build
-          cmake -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT=ON ..
+          cmake -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..
          cmake --build . --verbose
          ctest -j4 --output-on-failure -LE explicitonly
@@ -24,6 +24,6 @@ jobs:
            apt-get update -q -y
            apt-get install -y cmake make g++
          run: |
-            cmake -DCMAKE_BUILD_TYPE=Release -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF  -B build
+            cmake -DCMAKE_BUILD_TYPE=Release -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
            cmake --build build -j=2
            ctest --output-on-failure --test-dir build
@@ -20,7 +20,7 @@ jobs:
    - name: Build
      run: |
        CC=clang-18 CXX=clang++-18 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv_zvbb" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
+        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
        cmake --build build/ -j$(nproc) --config Release
    - name: Test VLEN=1024
      run: |
@@ -20,7 +20,7 @@ jobs:
    - name: Build
      run: |
        CC=clang-20 CXX=clang++-20 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
+        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
        cmake --build build/ -j$(nproc) --config Release
    - name: Test VLEN=128
      run: |
@@ -30,7 +30,7 @@ jobs:
    - name: Build VLS
      run: |
        CC=clang-20 CXX=clang++-20 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv_zvl128b_zba_zbb_zbc -mrvv-vector-bits=zvl" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build-vls
+        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build-vls
        cmake --build build-vls/ -j$(nproc) --config Release
    - name: Test VLEN=128 VLS
      run: |
@@ -20,7 +20,7 @@ jobs:
    - name: Build
      run: |
        CC=riscv64-linux-gnu-gcc-14 CXX=riscv64-linux-gnu-g++-14 CFLAGS=-march=rv64gcv CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
+        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
        cmake --build build/ -j$(nproc) --config Release
    - name: Test VLEN=256
      run: |
@@ -30,7 +30,7 @@ jobs:
    - name: Build VLS
      run: |
        CC=riscv64-linux-gnu-gcc-14 CXX=riscv64-linux-gnu-g++-14 CFLAGS="-march=rv64gcv_zvl256b -mrvv-vector-bits=zvl" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build-vls
+        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build-vls
        cmake --build build-vls/ -j$(nproc) --config Release
    - name: Test VLEN=256 VLS
      run: |
@@ -20,7 +20,7 @@ jobs:
    - name: Build
      run: |
        CC=clang-19 CXX=clang++-19 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
+        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
        cmake --build build/ -j$(nproc) --config Release
    - name: Test VLEN=512
      run: |
@@ -30,7 +30,7 @@ jobs:
    - name: Build VLS
      run: |
        CC=clang-19 CXX=clang++-19 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv_zvl512b_zba_zbb_zbc -mrvv-vector-bits=zvl" CXXFLAGS="${CFLAGS}" \
-        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build-vls
+        cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build-vls
        cmake --build build-vls/ -j$(nproc) --config Release
    - name: Test VLEN=512 VLS
      run: |
@@ -24,6 +24,6 @@ jobs:
            apt-get update -q -y
            apt-get install -y cmake make g++
          run: |
-            cmake -DCMAKE_BUILD_TYPE=Release  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
+            cmake -DCMAKE_BUILD_TYPE=Release  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
            cmake --build build -j=2
            ctest --output-on-failure --test-dir build
@@ -18,6 +18,6 @@ jobs:
        run: |
          mkdir build &&
          cd build &&
-          CXX=clang++-13 cmake -DSIMDJSON_DEVELOPER_MODE=ON ..  &&
+          CXX=clang++-13 cmake -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          cmake --build .   &&
          ctest --output-on-failure -LE explicitonly -j
@@ -19,6 +19,6 @@ jobs:
        run: |
          mkdir build &&
          cd build &&
-          CXX=g++-12 cmake -DCMAKE_BUILD_TYPE=Debug  -DSIMDJSON_GLIBCXX_ASSERTIONS=ON -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON ..  &&
+          CXX=g++-12 cmake -DCMAKE_BUILD_TYPE=Debug  -DSIMDJSON_GLIBCXX_ASSERTIONS=ON -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          cmake --build .   &&
          ctest . -E avoid_
@@ -18,7 +18,7 @@ jobs:
        run: |
          mkdir build &&
          cd build &&
-          CXX=g++-12 cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE_THREADS=ON ..  &&
+          CXX=g++-12 cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE_THREADS=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          cmake --build . --target document_stream_tests  --target ondemand_document_stream_tests --target parse_many_test  &&
          ctest --output-on-failure  -R parse_many_test  &&
          ctest --output-on-failure  -R document_stream_tests
@@ -24,6 +24,6 @@ jobs:
        run: |
          mkdir build &&
          cd build &&
-          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_ENABLE_DOM_CHECKPERF=ON -DCMAKE_CXX_FLAGS="-Werror=old-style-cast -pedantic -Wpedantic" -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_ENABLE_DOM_CHECKPERF=ON -DCMAKE_CXX_FLAGS="-Werror=old-style-cast -pedantic -Wpedantic" -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          cmake --build . --target checkperf  &&
          ctest --output-on-failure -R checkperf
@@ -13,7 +13,7 @@ jobs:
    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
+        run: cmake -DSIMDJSON_CXX_STANDARD=20 -DSIMDJSON_EXCEPTIONS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
        env:
          CXX: ${{matrix.cxx}}
      - name: Build
@@ -13,7 +13,7 @@ jobs:
    steps:
      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
      - name: Prepare
-        run: cmake -DSIMDJSON_CXX_STANDARD=20 -DSIMDJSON_DEVELOPER_MODE=ON  -B build
+        run: cmake -DSIMDJSON_CXX_STANDARD=20 -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
        env:
          CXX: ${{matrix.cxx}}
      - name: Build
@@ -18,13 +18,13 @@ jobs:
        run: |
          mkdir builddebug &&
          cd builddebug &&
-          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF ..  &&
+          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          cmake --build .   &&
          ctest --output-on-failure -LE explicitonly -j   &&
          cd .. &&
          mkdir build &&
          cd build &&
-          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          cmake --build .   &&
          ctest --output-on-failure -LE explicitonly -j   &&
          make install  &&
@@ -18,13 +18,13 @@ jobs:
        run: |
          mkdir builddebug &&
          cd builddebug &&
-          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF  -DSIMDJSON_ENABLE_THREADS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
+          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF  -DSIMDJSON_ENABLE_THREADS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          cmake --build .   &&
          ctest --output-on-failure -LE explicitonly -j   &&
          cd .. &&
          mkdir build &&
          cd build &&
-          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_ENABLE_THREADS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_ENABLE_THREADS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          cmake --build .   &&
          ctest --output-on-failure -LE explicitonly -j   &&
          make install  &&
@@ -18,7 +18,7 @@ jobs:
        run: |
          mkdir builddebug &&
          cd builddebug &&
-          cmake -DSIMDJSON_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
+          cmake -DSIMDJSON_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          cmake --build .   &&
          ctest --output-on-failure -LE explicitonly -j
  ubuntu-build-undefined-sanitizer:
@@ -36,6 +36,6 @@ jobs:
        run: |
          mkdir builddebugundefsani &&
          cd builddebugundefsani &&
-          cmake -DSIMDJSON_SANITIZE_UNDEFINED=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
+          cmake -DSIMDJSON_SANITIZE_UNDEFINED=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ..  &&
          cmake --build .   &&
          ctest --output-on-failure -LE explicitonly -j
@@ -16,10 +16,10 @@ jobs:
    steps:
      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
      - name: Prepare
-        run: cmake -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE=${{matrix.sanitizer}} -DBUILD_SHARED_LIBS=${{matrix.shared}}  -B build
+        run: cmake -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE=${{matrix.sanitizer}} -DBUILD_SHARED_LIBS=${{matrix.shared}} -DCMAKE_COMPILE_WARNING_AS_ERROR=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
+        run: ctest --output-on-failure --test-dir build
@@ -17,5 +17,5 @@ jobs:
         uses: actions/checkout@v4
       - 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 -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 -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build  &&
           cmake --build build --verbose
@@ -22,7 +22,7 @@ jobs:
      uses: actions/checkout@v4
    - name: Configure
      run: |
-        cmake -DSIMDJSON_CXX_STANDARD=20 -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
+        cmake -DSIMDJSON_CXX_STANDARD=20 -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
    - name: Build Debug
      run: cmake --build build --config Debug --verbose
    - name: Build Release
@@ -13,20 +13,18 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - {gen: Visual Studio 17 2022, arch: Win32, shared: ON, build_type: Release, memory_map: OFF}
-          - {gen: Visual Studio 17 2022, arch: Win32, shared: OFF, build_type: Release, memory_map: OFF}
-          - {gen: Visual Studio 17 2022, arch: x64, shared: ON, build_type: Release, memory_map: OFF}
-          - {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Debug, memory_map: OFF}
-          - {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Release, memory_map: OFF}
-          - {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: RelWithDebInfo, memory_map: OFF}
-          # Exercise the opt-in Windows memory-file mapping path at least once in CI.
-          - {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Release, memory_map: ON}
+          - {gen: Visual Studio 17 2022, arch: Win32, shared: ON, build_type: Release}
+          - {gen: Visual Studio 17 2022, arch: Win32, shared: OFF, build_type: Release}
+          - {gen: Visual Studio 17 2022, arch: x64, shared: ON, build_type: Release}
+          - {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}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -DSIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=${{matrix.memory_map}} -B build
+        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
    - name: Build Debug
      run: cmake --build build --config ${{matrix.build_type}} --verbose
    - name: Run tests
@@ -21,7 +21,7 @@ jobs:
      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
+        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}}  -T ClangCL -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build
    - name: Build
      run: cmake --build build --config ${{matrix.build_type}} --verbose
    - name: Run tests
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.24)

 # Build performance optimizations
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "Export compile commands for faster IDE integration")
@@ -12,7 +12,7 @@ endif()
 project(
    simdjson
    # The version number is modified by tools/release.py
-    VERSION 4.6.1
+    VERSION 4.4.2
    DESCRIPTION "Parsing gigabytes of JSON per second"
    HOMEPAGE_URL "https://simdjson.org/"
    LANGUAGES CXX C
@@ -29,8 +29,8 @@ string(
 # ---- Options, variables ----

 # These version numbers are modified by tools/release.py
-set(SIMDJSON_LIB_VERSION "33.0.0" CACHE STRING "simdjson library version")
-set(SIMDJSON_LIB_SOVERSION "33" CACHE STRING "simdjson library soversion")
+set(SIMDJSON_LIB_VERSION "31.0.0" CACHE STRING "simdjson library version")
+set(SIMDJSON_LIB_SOVERSION "31" 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)
@@ -75,48 +75,10 @@ if(SIMDJSON_DEVELOPMENT_CHECKS)
  )
 endif()

-# padded_memory_map is always available on POSIX. On Windows it is disabled
-# by default because it depends on the `CreateFileMapping2` / `MapViewOfFile3`
-# APIs, which require Windows 10 version 1803 or later and are exported via
-# onecore.lib rather than the default kernel32.lib. Turn this option ON to
-# opt into the feature on Windows; simdjson will then set the appropriate
-# Windows version macros and link onecore, so everything that links
-# simdjson picks up both the compile-time declarations and the import
-# library automatically. The option is a no-op on POSIX (where the feature
-# is unconditionally enabled).
-option(SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS
-  "Enable simdjson::padded_memory_map on Windows (requires Windows 10 \
-version 1803 or later). Always enabled on POSIX." OFF)
-if(SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS)
-  simdjson_add_props(
-      target_compile_definitions PUBLIC
-      SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=1
-  )
-  if(WIN32)
-    # Raise the Windows version floor so that <windows.h> declares the
-    # modern memory-mapping APIs, and link the import library that
-    # actually exports them. _WIN32_WINNT / WINVER / NTDDI_VERSION together
-    # tell <sdkddkver.h> which APIs to light up.
-    simdjson_add_props(
-        target_compile_definitions PUBLIC
-        _WIN32_WINNT=0x0A00
-        WINVER=0x0A00
-        NTDDI_VERSION=0x0A000006 # NTDDI_WIN10_RS5, Windows 10 version 1809
-    )
-    simdjson_add_props(
-        target_link_libraries PUBLIC
-        onecore
-    )
-  endif()
-endif()
-
 if(is_top_project)
-  option(SIMDJSON_INSTALL "Enable target install" ON)
  option(SIMDJSON_DEVELOPER_MODE "Enable targets for developing simdjson" OFF)
  option(BUILD_SHARED_LIBS "Build simdjson as a shared library" OFF)
  option(SIMDJSON_SINGLEHEADER "Disable singleheader generation" ON)
-else()
-  option(SIMDJSON_INSTALL "Enable target install" ${BUILD_SHARED_LIBS})
 endif()

 include(cmake/handle-deprecations.cmake)
@@ -130,16 +92,13 @@ add_library(simdjson ${SIMDJSON_SOURCES})
 add_library(simdjson::simdjson ALIAS simdjson)
 set(SIMDJSON_LIBRARIES simdjson)

-# Check for <bit> header compatibility
-include(CheckIncludeFileCXX)
-check_include_file_cxx(bit SIMDJSON_HAS_BIT_HEADER)
-
 # Enable precompiled headers for faster builds
 if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16")
-  set(SIMDJSON_PRECOMPILE_HEADERS
+  target_precompile_headers(simdjson PRIVATE
    <algorithm>
    <array>
    <atomic>
+    <bit>
    <cassert>
    <cctype>
    <cerrno>
@@ -152,12 +111,6 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16")
    <utility>
    <vector>
  )
-
-  if(SIMDJSON_HAS_BIT_HEADER)
-    list(APPEND SIMDJSON_PRECOMPILE_HEADERS <bit>)
-  endif()
-
-  target_precompile_headers(simdjson PRIVATE ${SIMDJSON_PRECOMPILE_HEADERS})
 endif()

 if(SIMDJSON_BUILD_STATIC_LIB)
@@ -202,37 +155,13 @@ if(MSVC)
  endif()
 endif()

-
-
 if(SIMDJSON_STATIC_REFLECTION)
-
-
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION MATCHES "^21")
-    execute_process(
-        COMMAND ${CMAKE_CXX_COMPILER} --version
-        OUTPUT_VARIABLE CLANG_VERSION_OUTPUT
-        ERROR_VARIABLE CLANG_VERSION_ERROR
-        RESULT_VARIABLE CLANG_VERSION_RESULT
-    )
-    if(CLANG_VERSION_RESULT EQUAL 0 AND CLANG_VERSION_OUTPUT MATCHES "https://github.com/bloomberg/clang-p2996.git")
-        set(IS_BLOOMBERG_P2996_CLANG ON)
-        message(STATUS "Using Bloomberg P2996 Clang fork")
-    endif()
-  endif()
-
  # We would like to require C++26, but no compiler supports that!
  # This is a hack:
-  if(IS_BLOOMBERG_P2996_CLANG)
  simdjson_add_props(
      target_compile_options PUBLIC
      -freflection -fexpansion-statements -stdlib=libc++ -std=c++26
  )
-  else()
-  simdjson_add_props(
-      target_compile_options PUBLIC
-      -freflection -std=c++26
-  )
-  endif()
 else()
  simdjson_add_props(target_compile_features PUBLIC cxx_std_11)
 endif()
@@ -287,89 +216,87 @@ endif()

 # ---- Install rules ----

-if(SIMDJSON_INSTALL)
-    include(CMakePackageConfigHelpers)
-    include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
+include(GNUInstallDirs)

-    if(SIMDJSON_SINGLEHEADER)
-      install(
-          FILES singleheader/simdjson.h
-          DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-          COMPONENT simdjson_Development
-      )
-    endif()
-
-    install(
-        TARGETS simdjson
-        EXPORT simdjsonTargets
-        RUNTIME COMPONENT simdjson_Runtime
-        LIBRARY COMPONENT simdjson_Runtime
-        NAMELINK_COMPONENT simdjson_Development
-        ARCHIVE COMPONENT simdjson_Development
-        INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-    )
-    configure_file(cmake/simdjson-config.cmake.in simdjson-config.cmake @ONLY)
-
-    write_basic_package_version_file(
-        simdjson-config-version.cmake
-        COMPATIBILITY SameMinorVersion
-    )
-
-    set(
-        SIMDJSON_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/simdjson"
-        CACHE STRING "CMake package config location relative to the install prefix"
-    )
-    mark_as_advanced(SIMDJSON_INSTALL_CMAKEDIR)
-
-    install(
-        FILES
-        "${PROJECT_BINARY_DIR}/simdjson-config.cmake"
-        "${PROJECT_BINARY_DIR}/simdjson-config-version.cmake"
-        DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
-        COMPONENT simdjson_Development
-    )
-
-    install(
-        EXPORT simdjsonTargets
-        NAMESPACE simdjson::
-        DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
-        COMPONENT simdjson_Development
-    )
-
-    if(SIMDJSON_BUILD_STATIC_LIB)
-      install(
-          TARGETS simdjson_static
-          EXPORT simdjson_staticTargets
-          ARCHIVE COMPONENT simdjson_Development
-          INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-      )
-      install(
-          EXPORT simdjson_staticTargets
-          NAMESPACE simdjson::
-          DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
-          COMPONENT simdjson_Development
-      )
-    endif()
-
-    # pkg-config
-    include(cmake/JoinPaths.cmake)
-    join_paths(PKGCONFIG_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
-    join_paths(PKGCONFIG_LIBDIR "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
-
-    if(SIMDJSON_ENABLE_THREADS)
-      set(PKGCONFIG_CFLAGS "-DSIMDJSON_THREADS_ENABLED=1")
-      if(CMAKE_THREAD_LIBS_INIT)
-        set(PKGCONFIG_LIBS_PRIVATE "Libs.private: ${CMAKE_THREAD_LIBS_INIT}")
-      endif()
-    endif()
-
-    configure_file("simdjson.pc.in" "simdjson.pc" @ONLY)
-    install(
-        FILES "${CMAKE_CURRENT_BINARY_DIR}/simdjson.pc"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
-    )
+if(SIMDJSON_SINGLEHEADER)
+  install(
+      FILES singleheader/simdjson.h
+      DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+      COMPONENT simdjson_Development
+  )
 endif()

+install(
+    TARGETS simdjson
+    EXPORT simdjsonTargets
+    RUNTIME COMPONENT simdjson_Runtime
+    LIBRARY COMPONENT simdjson_Runtime
+    NAMELINK_COMPONENT simdjson_Development
+    ARCHIVE COMPONENT simdjson_Development
+    INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+configure_file(cmake/simdjson-config.cmake.in simdjson-config.cmake @ONLY)
+
+write_basic_package_version_file(
+    simdjson-config-version.cmake
+    COMPATIBILITY SameMinorVersion
+)
+
+set(
+    SIMDJSON_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/simdjson"
+    CACHE STRING "CMake package config location relative to the install prefix"
+)
+mark_as_advanced(SIMDJSON_INSTALL_CMAKEDIR)
+
+install(
+    FILES
+    "${PROJECT_BINARY_DIR}/simdjson-config.cmake"
+    "${PROJECT_BINARY_DIR}/simdjson-config-version.cmake"
+    DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
+    COMPONENT simdjson_Development
+)
+
+install(
+    EXPORT simdjsonTargets
+    NAMESPACE simdjson::
+    DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
+    COMPONENT simdjson_Development
+)
+
+if(SIMDJSON_BUILD_STATIC_LIB)
+  install(
+      TARGETS simdjson_static
+      EXPORT simdjson_staticTargets
+      ARCHIVE COMPONENT simdjson_Development
+      INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+  )
+  install(
+      EXPORT simdjson_staticTargets
+      NAMESPACE simdjson::
+      DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
+      COMPONENT simdjson_Development
+  )
+endif()
+
+# pkg-config
+include(cmake/JoinPaths.cmake)
+join_paths(PKGCONFIG_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+join_paths(PKGCONFIG_LIBDIR "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+
+if(SIMDJSON_ENABLE_THREADS)
+  set(PKGCONFIG_CFLAGS "-DSIMDJSON_THREADS_ENABLED=1")
+  if(CMAKE_THREAD_LIBS_INIT)
+    set(PKGCONFIG_LIBS_PRIVATE "Libs.private: ${CMAKE_THREAD_LIBS_INIT}")
+  endif()
+endif()
+
+configure_file("simdjson.pc.in" "simdjson.pc" @ONLY)
+install(
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/simdjson.pc"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+)
+
 #
 # CPack
 #
@@ -446,25 +373,18 @@ add_subdirectory(fuzz)
 #
 # Source files should be just ASCII
 #
-find_program(FIND_CMD find)
-find_program(FILE_CMD file)
-find_program(GREP_CMD grep)
-if(FIND_CMD AND FILE_CMD AND GREP_CMD)
+find_program(FIND find)
+find_program(FILE file)
+find_program(GREP grep)
+if(FIND AND FILE AND GREP)
  add_test(
      NAME just_ascii
      COMMAND sh -c "\
-non_ascii=$(${FIND_CMD} include src windows tools singleheader tests examples benchmark \
-  -path benchmark/checkperf-reference -prune -name '*.h' -o -name '*.cpp' \
-  -type f -exec ${FILE_CMD} '{}' \; | ${GREP_CMD} -v ASCII); \
-if [ -n \"$non_ascii\" ]; then \
-  echo 'The following files contain non-ASCII characters:'; \
-  echo \"$non_ascii\"; \
-  exit 1; \
-fi"
+${FIND} include src windows tools singleheader tests examples benchmark \
+-path benchmark/checkperf-reference -prune -name '*.h' -o -name '*.cpp' \
+-type f -exec ${FILE} '{}' \; | ${GREP} -qv ASCII || exit 0  && exit 1"
      WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
  )
-else()
-  message(WARNING "just_ascii test disabled because required tools were not found: find='${FIND_CMD}', file='${FILE_CMD}', grep='${GREP_CMD}'")
 endif()

 ##
@@ -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.6.1"
+PROJECT_NUMBER         = "4.4.2"

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1,10 +1,9 @@
 add_subdirectory(dom)


-include_directories( . )
+include_directories( . linux )
 link_libraries(simdjson-windows-headers test-data)
 link_libraries(simdjson)
-link_libraries(counters)
 if(SIMDJSON_STATIC_REFLECTION)
  add_compile_definitions(SIMDJSON_STATIC_REFLECTION=1)
 endif(SIMDJSON_STATIC_REFLECTION)
@@ -16,7 +15,6 @@ if (TARGET benchmark::benchmark)
  link_libraries(benchmark::benchmark)
  add_executable(bench_parse_call bench_parse_call.cpp)
  add_executable(bench_dom_api bench_dom_api.cpp)
-  add_executable(bench_stream_formats bench_stream_formats.cpp)
  if(SIMDJSON_EXCEPTIONS)
    add_executable(bench_ondemand bench_ondemand.cpp)
    if(TARGET yyjson)
@@ -40,7 +40,6 @@ SIMDJSON_POP_DISABLE_WARNINGS
 #include "json2msgpack/boostjson.h"

 #include "partial_tweets/simdjson_ondemand.h"
-#include "partial_tweets/simdjson_ondemand_key_selector.h"
 #include "partial_tweets/simdjson_dom.h"
 #include "partial_tweets/yyjson.h"
 #if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
@@ -1,216 +0,0 @@
-#include <benchmark/benchmark.h>
-#include <string>
-#include "simdjson.h"
-
-using namespace simdjson;
-
-namespace {
-
-enum class stream_case {
-  ndjson_small,
-  ndjson_large,
-  rfc7464_small,
-  rfc7464_large,
-  comma_delimited_small,
-  comma_delimited_large
-};
-
-constexpr size_t TARGET_BYTES = 128 * 1000 * 1000;
-constexpr size_t SMALL_PAYLOAD = 16;
-constexpr size_t LARGE_PAYLOAD = 4096;
-constexpr size_t BATCH_SIZE = 1 << 20;
-
-struct stream_dataset {
-  padded_string json;
-  size_t count{};
-};
-
-std::string make_document(size_t id, size_t payload_size) {
-  return std::string{"{\"id\":"} + std::to_string(id) +
-    ",\"name\":\"aaaaaaaa\",\"payload\":\"" +
-    std::string(payload_size, 'x') + "\",\"flag\":true}";
-}
-
-stream_dataset build_dataset(stream_case which) {
-  const bool small = which == stream_case::ndjson_small ||
-                     which == stream_case::rfc7464_small ||
-                     which == stream_case::comma_delimited_small;
-  const bool rfc = which == stream_case::rfc7464_small ||
-                   which == stream_case::rfc7464_large;
-  const bool comma = which == stream_case::comma_delimited_small ||
-                     which == stream_case::comma_delimited_large;
-  const size_t payload_size = small ? SMALL_PAYLOAD : LARGE_PAYLOAD;
-  const size_t count = TARGET_BYTES / (payload_size + 48);
-  std::string out;
-  out.reserve(count * (payload_size + 64));
-  for (size_t i = 0; i < count; i++) {
-    if (rfc) {
-      out += char(0x1E);
-    }
-    if (comma && i > 0) {
-      out += ',';
-    }
-    out += make_document(i, payload_size);
-    if (!comma) {
-      out += '\n';
-    }
-  }
-  return {padded_string(out), count};
-}
-
-const stream_dataset &get_dataset(stream_case which) {
-  static const stream_dataset ndjson_small =
-    build_dataset(stream_case::ndjson_small);
-  static const stream_dataset ndjson_large =
-    build_dataset(stream_case::ndjson_large);
-  static const stream_dataset rfc_small =
-    build_dataset(stream_case::rfc7464_small);
-  static const stream_dataset rfc_large =
-    build_dataset(stream_case::rfc7464_large);
-  static const stream_dataset comma_small =
-    build_dataset(stream_case::comma_delimited_small);
-  static const stream_dataset comma_large =
-    build_dataset(stream_case::comma_delimited_large);
-  switch (which) {
-    case stream_case::ndjson_small:
-      return ndjson_small;
-    case stream_case::ndjson_large:
-      return ndjson_large;
-    case stream_case::rfc7464_small:
-      return rfc_small;
-    case stream_case::rfc7464_large:
-      return rfc_large;
-    case stream_case::comma_delimited_small:
-      return comma_small;
-    case stream_case::comma_delimited_large:
-      return comma_large;
-  }
-  return ndjson_small;
-}
-
-void set_counters(benchmark::State &state, const stream_dataset &dataset) {
-  state.SetBytesProcessed(int64_t(state.iterations()) * int64_t(dataset.json.size()));
-  state.SetItemsProcessed(int64_t(state.iterations()) * int64_t(dataset.count));
-}
-
-template <stream_case which, bool threaded = true>
-static void bench_ondemand(benchmark::State &state) {
-  const auto &dataset = get_dataset(which);
-  ondemand::parser parser;
-  parser.threaded = threaded;
-  stream_format format = stream_format::whitespace_delimited;
-  if constexpr (which == stream_case::rfc7464_small ||
-                which == stream_case::rfc7464_large) {
-    format = stream_format::json_sequence;
-  } else if constexpr (which == stream_case::comma_delimited_small ||
-                       which == stream_case::comma_delimited_large) {
-    format = stream_format::comma_delimited;
-  }
-  for (const auto _ : state) {
-    ondemand::document_stream docs;
-    auto error = parser.iterate_many(dataset.json, BATCH_SIZE, format).get(docs);
-    if (error) {
-      state.SkipWithError(error_message(error));
-      return;
-    }
-    uint64_t sum = 0;
-    for (auto doc : docs) {
-      ondemand::object obj;
-      if ((error = doc.get_object().get(obj))) {
-        state.SkipWithError(error_message(error));
-        return;
-      }
-      uint64_t id;
-      if ((error = obj["id"].get_uint64().get(id))) {
-        state.SkipWithError(error_message(error));
-        return;
-      }
-      sum += id;
-    }
-    benchmark::DoNotOptimize(sum);
-  }
-  set_counters(state, dataset);
-}
-
-template <stream_case which>
-static void bench_dom(benchmark::State &state) {
-  const auto &dataset = get_dataset(which);
-  dom::parser parser;
-  parser.threaded = true;
-  stream_format format = stream_format::whitespace_delimited;
-  if constexpr (which == stream_case::rfc7464_small ||
-                which == stream_case::rfc7464_large) {
-    format = stream_format::json_sequence;
-  } else if constexpr (which == stream_case::comma_delimited_small ||
-                       which == stream_case::comma_delimited_large) {
-    format = stream_format::comma_delimited;
-  }
-  for (const auto _ : state) {
-    dom::document_stream docs;
-    auto error = parser.parse_many(dataset.json, BATCH_SIZE, format).get(docs);
-    if (error) {
-      state.SkipWithError(error_message(error));
-      return;
-    }
-    uint64_t sum = 0;
-    for (auto doc : docs) {
-      uint64_t id;
-      if ((error = doc["id"].get(id))) {
-        state.SkipWithError(error_message(error));
-        return;
-      }
-      sum += id;
-    }
-    benchmark::DoNotOptimize(sum);
-  }
-  set_counters(state, dataset);
-}
-
-} // namespace
-
-BENCHMARK(bench_ondemand<stream_case::ndjson_small>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-BENCHMARK(bench_ondemand<stream_case::ndjson_large>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-BENCHMARK(bench_ondemand<stream_case::rfc7464_small>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-BENCHMARK(bench_ondemand<stream_case::rfc7464_large>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-BENCHMARK(bench_ondemand<stream_case::comma_delimited_small>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-BENCHMARK(bench_ondemand<stream_case::comma_delimited_large>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-// Non-threaded comma_delimited for comparison
-BENCHMARK(bench_ondemand<stream_case::comma_delimited_small, false>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-BENCHMARK(bench_ondemand<stream_case::comma_delimited_large, false>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-
-BENCHMARK(bench_dom<stream_case::ndjson_small>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-BENCHMARK(bench_dom<stream_case::ndjson_large>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-BENCHMARK(bench_dom<stream_case::rfc7464_small>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-BENCHMARK(bench_dom<stream_case::rfc7464_large>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-BENCHMARK(bench_dom<stream_case::comma_delimited_small>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-BENCHMARK(bench_dom<stream_case::comma_delimited_large>)
-    ->UseRealTime()
-    ->DisplayAggregatesOnly(true);
-
-BENCHMARK_MAIN();
@@ -1,5 +1,4 @@
-#include <counters/event_counter.h>
-using namespace counters;
+#include "event_counter.h"

 #include <cassert>
 #include <cctype>
@@ -26,6 +25,7 @@ using namespace counters;
 #include <string>
 #include <vector>

+#include "linux-perf-events.h"
 #ifdef __linux__
 #include <libgen.h>
 #endif
@@ -204,8 +204,12 @@ struct feature_benchmarker {
  }
  // Rate of 1-7-structural misses per 8-structural flip
  double struct1_7_miss_rate(BenchmarkStage stage) const {
+#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+    return 1;
+#else
    if (!has_events()) { return 1; }
    return struct7_miss[stage].best.branch_misses() - struct7[stage].best.branch_misses() / double(struct7_miss.stats->blocks_with_1_structural_flipped);
+#endif
  }
  // Extra cost of an 8-15 structural block over a 1-7 structural block
  double struct8_15_cost(BenchmarkStage stage) const {
@@ -217,8 +221,12 @@ struct feature_benchmarker {
  }
  // Rate of 8-15-structural misses per 8-structural flip
  double struct8_15_miss_rate(BenchmarkStage stage) const {
+#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+    return 1;
+#else
    if (!has_events()) { return 1; }
    return double(struct15_miss[stage].best.branch_misses() - struct15[stage].best.branch_misses()) / double(struct15_miss.stats->blocks_with_8_structurals_flipped);
+#endif
  }

  // Extra cost of a 16+-structural block over an 8-15 structural block (actual varies based on # of structurals!)
@@ -231,8 +239,12 @@ struct feature_benchmarker {
  }
  // Rate of 16-structural misses per 16-structural flip
  double struct16_miss_rate(BenchmarkStage stage) const {
+#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+    return 1;
+#else
    if (!has_events()) { return 1; }
    return double(struct23_miss[stage].best.branch_misses() - struct23[stage].best.branch_misses()) / double(struct23_miss.stats->blocks_with_16_structurals_flipped);
+#endif
  }


@@ -246,8 +258,12 @@ struct feature_benchmarker {
  }
  // Rate of UTF-8 misses per UTF-8 flip
  double utf8_miss_rate(BenchmarkStage stage) const {
+#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+    return 1;
+#else
    if (!has_events()) { return 1; }
    return double(utf8_miss[stage].best.branch_misses() - utf8[stage].best.branch_misses()) / double(utf8_miss.stats->blocks_with_utf8_flipped);
+#endif
  }
  // Extra cost of having escapes in a block
  double escape_cost(BenchmarkStage stage) const {
@@ -259,8 +275,12 @@ struct feature_benchmarker {
  }
  // Rate of escape misses per escape flip
  double escape_miss_rate(BenchmarkStage stage) const {
+#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+    return 1;
+#else
    if (!has_events()) { return 1; }
    return double(escape_miss[stage].best.branch_misses() - escape[stage].best.branch_misses()) / double(escape_miss.stats->blocks_with_escapes_flipped);
+#endif
  }


@@ -358,6 +378,22 @@ struct feature_benchmarker {
  }
 };

+#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+void print_file_effectiveness(BenchmarkStage stage, const char* filename, const benchmarker& results, const feature_benchmarker& features) {
+  double actual = results[stage].best.elapsed_ns() / double(results.stats->blocks);
+  double calc = features.calc_expected(stage, results);
+  double calc_misses = features.calc_expected_misses(stage, results);
+  double calc_miss_cost = features.calc_expected_miss_cost(stage, results);
+  printf("        | %-8s ", benchmark_stage_name(stage));
+  printf("| %-15s ",   filename);
+  printf("|    %8.3g ", features.calc_expected_feature_cost(stage, results));
+  printf("|    %8.3g ", calc_miss_cost);
+  printf("| %8.3g ",  calc);
+  printf("| %8.3g ",  actual);
+  printf("| %+8.3g ", actual - calc);
+  printf("| %13llu ", (long long unsigned)(calc_misses));
+}
+#else
 void print_file_effectiveness(BenchmarkStage stage, const char* filename, const benchmarker& results, const feature_benchmarker& features) {
  double actual = results[stage].best.elapsed_ns() / double(results.stats->blocks);
  double calc = features.calc_expected(stage, results);
@@ -381,6 +417,7 @@ void print_file_effectiveness(BenchmarkStage stage, const char* filename, const
  }
  printf("|\n");
 }
+#endif

 int main(int argc, char *argv[]) {
  // Read options
@@ -1,8 +1,7 @@
 #ifndef _BENCHMARK_H_
 #define _BENCHMARK_H_

-#include <counters/event_counter.h>
-using namespace counters;
+#include "event_counter.h"

 /*
 * Prints the best number of operations per cycle where
@@ -1,8 +1,7 @@
 #ifndef __BENCHMARKER_H
 #define __BENCHMARKER_H

-#include <counters/event_counter.h>
-using namespace counters;
+#include "event_counter.h"
 #include "simdjson.h"

 #include <cassert>
@@ -29,9 +28,11 @@ using namespace counters;
 #include <string>
 #include <vector>

+#include "linux-perf-events.h"
 #ifdef __linux__
 #include <libgen.h>
 #endif
+#include "simdjson.h"

 #include <functional>

@@ -422,12 +423,18 @@ struct benchmarker {
        stage.instructions() / static_cast<double>(stats->structurals),
        stage.instructions() / static_cast<double>(stage.cycles())
      );
-      printf("%s%-13s: %7.0f branch misses (%6.2f%%)\n",
+#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+      // NOTE: removed cycles/miss because it is a somewhat misleading stat
+      printf("%s%-13s: %7.0f branch misses (%6.2f%%) - %.0f cache misses (%6.2f%%) - %.2f cache references\n",
        prefix,
        "Misses",
        stage.branch_misses(),
-        percent(stage.branch_misses(), all_stages_without_allocation.branch_misses())
+        percent(stage.branch_misses(), all_stages_without_allocation.branch_misses()),
+        stage.cache_misses(),
+        percent(stage.cache_misses(), all_stages_without_allocation.cache_misses()),
+        stage.cache_references()
      );
+#endif
    }
  }

@@ -1,5 +1,4 @@
-#include <counters/event_counter.h>
-using namespace counters;
+#include "event_counter.h"
 #include <random>
 #include <vector>

@@ -1,12 +1,11 @@
-include_directories( .. )
+include_directories( .. ../linux )
 link_libraries(simdjson-windows-headers test-data)
 link_libraries(simdjson)
-link_libraries(counters)

 add_executable(perfdiff perfdiff.cpp)
 add_executable(parse parse.cpp)
 add_executable(parse_stream parse_stream.cpp)
-
+add_executable(statisticalmodel statisticalmodel.cpp)

 add_executable(parse_noutf8validation parse.cpp)
 target_compile_definitions(parse_noutf8validation PRIVATE SIMDJSON_SKIPUTF8VALIDATION)
@@ -1,5 +1,4 @@
-#include <counters/event_counter.h>
-using namespace counters;
+#include "event_counter.h"

 #include <cassert>
 #include <cctype>
@@ -25,6 +24,7 @@ using namespace counters;
 #include <string>
 #include <vector>

+#include "linux-perf-events.h"
 #ifdef __linux__
 #include <libgen.h>
 #endif
@@ -0,0 +1,207 @@
+#include <iostream>
+#include <unistd.h>
+#include "simdjson.h"
+#ifdef __linux__
+#include "linux-perf-events.h"
+#endif
+
+size_t count_nonasciibytes(const uint8_t *input, size_t length) {
+  size_t count = 0;
+  for (size_t i = 0; i < length; i++) {
+    count += input[i] >> 7;
+  }
+  return count;
+}
+
+size_t count_backslash(const uint8_t *input, size_t length) {
+  size_t count = 0;
+  for (size_t i = 0; i < length; i++) {
+    count += (input[i] == '\\') ? 1 : 0;
+  }
+  return count;
+}
+
+struct stat_s {
+  size_t integer_count;
+  size_t float_count;
+  size_t string_count;
+  size_t backslash_count;
+  size_t non_ascii_byte_count;
+  size_t object_count;
+  size_t array_count;
+  size_t null_count;
+  size_t true_count;
+  size_t false_count;
+  size_t byte_count;
+  size_t structural_indexes_count;
+  bool valid;
+};
+
+using stat_t = struct stat_s;
+
+
+
+simdjson_inline void simdjson_process_atom(stat_t &s,
+                                         simdjson::dom::element element) {
+  if (element.is<int64_t>()) {
+    s.integer_count++;
+  } else if(element.is<std::string_view>()) {
+    s.string_count++;
+  } else if(element.is<double>()) {
+    s.float_count++;
+  } else if (element.is<bool>()) {
+    bool v;
+    simdjson::error_code error;
+    if ((error = element.get(v))) { std::cerr << error << std::endl; abort(); }
+    if (v) {
+      s.true_count++;
+    } else {
+      s.false_count++;
+    }
+  } else if (element.is_null()) {
+    s.null_count++;
+  }
+}
+
+void simdjson_recurse(stat_t &s, simdjson::dom::element element) {
+  simdjson::error_code error;
+  if (element.is<simdjson::dom::array>()) {
+    s.array_count++;
+    simdjson::dom::array array;
+    if ((error = element.get(array))) { std::cerr << error << std::endl; abort(); }
+    for (auto child : array) {
+      if (child.is<simdjson::dom::array>() || child.is<simdjson::dom::object>()) {
+        simdjson_recurse(s, child);
+      } else {
+        simdjson_process_atom(s, child);
+      }
+    }
+  } else if (element.is<simdjson::dom::object>()) {
+    s.object_count++;
+    simdjson::dom::object object;
+    if ((error = element.get(object))) { std::cerr << error << std::endl; abort(); }
+    for (auto field : object) {
+      s.string_count++; // for key
+      if (field.value.is<simdjson::dom::array>() || field.value.is<simdjson::dom::object>()) {
+        simdjson_recurse(s, field.value);
+      } else {
+        simdjson_process_atom(s, field.value);
+      }
+    }
+  } else {
+    simdjson_process_atom(s, element);
+  }
+}
+
+stat_t simdjson_compute_stats(const simdjson::padded_string &p) {
+  stat_t answer{};
+  simdjson::dom::parser parser;
+  simdjson::dom::element doc;
+  auto error = parser.parse(p).get(doc);
+  if (error) {
+    answer.valid = false;
+    return answer;
+  }
+  answer.valid = true;
+  answer.backslash_count =
+      count_backslash(reinterpret_cast<const uint8_t *>(p.data()), p.size());
+  answer.non_ascii_byte_count = count_nonasciibytes(
+      reinterpret_cast<const uint8_t *>(p.data()), p.size());
+  answer.byte_count = p.size();
+  answer.structural_indexes_count = parser.implementation->n_structural_indexes;
+  simdjson_recurse(answer, doc);
+  return answer;
+}
+
+int main(int argc, char *argv[]) {
+#ifndef _MSC_VER
+  int c;
+  while ((c = getopt(argc, argv, "")) != -1) {
+    switch (c) {
+
+    default:
+      abort();
+    }
+  }
+#else
+  int optind = 1;
+#endif
+  if (optind >= argc) {
+    std::cerr << "Reads json, prints stats. " << std::endl;
+    std::cerr << "Usage: " << argv[0] << " <jsonfile>" << std::endl;
+
+    exit(1);
+  }
+  const char *filename = argv[optind];
+  if (optind + 1 < argc) {
+    std::cerr << "warning: ignoring everything after " << argv[optind + 1]
+              << std::endl;
+  }
+  simdjson::padded_string p;
+  auto error = simdjson::padded_string::load(filename).get(p);
+  if (error) {
+    std::cerr << "Could not load the file " << filename << std::endl;
+    return EXIT_FAILURE;
+  }
+  stat_t s = simdjson_compute_stats(p);
+  if (!s.valid) {
+    std::cerr << "not a valid JSON" << std::endl;
+    return EXIT_FAILURE;
+  }
+
+  printf("# integer_count float_count string_count backslash_count "
+         "non_ascii_byte_count object_count array_count null_count true_count "
+         "false_count byte_count structural_indexes_count ");
+#ifdef __linux__
+  printf("  stage1_cycle_count stage1_instruction_count  stage2_cycle_count "
+         " stage2_instruction_count  stage3_cycle_count "
+         "stage3_instruction_count  ");
+#else
+  printf("(you are not under linux, so perf counters are disaabled)");
+#endif
+  printf("\n");
+  printf("%zu %zu %zu %zu %zu %zu %zu %zu %zu %zu %zu %zu ", s.integer_count,
+         s.float_count, s.string_count, s.backslash_count,
+         s.non_ascii_byte_count, s.object_count, s.array_count, s.null_count,
+         s.true_count, s.false_count, s.byte_count, s.structural_indexes_count);
+#ifdef __linux__
+  simdjson::dom::parser parser;
+  simdjson::error_code alloc_error = parser.allocate(p.size());
+  if (alloc_error) {
+    std::cerr << alloc_error << std::endl;
+    return EXIT_FAILURE;
+  }
+  const uint32_t iterations = p.size() < 1 * 1000 * 1000 ? 1000 : 50;
+  std::vector<int> evts;
+  evts.push_back(PERF_COUNT_HW_CPU_CYCLES);
+  evts.push_back(PERF_COUNT_HW_INSTRUCTIONS);
+  LinuxEvents<PERF_TYPE_HARDWARE> unified(evts);
+  unsigned long cy1 = 0, cy2 = 0;
+  unsigned long cl1 = 0, cl2 = 0;
+  std::vector<unsigned long long> results;
+  results.resize(evts.size());
+  for (uint32_t i = 0; i < iterations; i++) {
+    unified.start();
+    // The default template is simdjson::architecture::NATIVE.
+    bool isok = (parser.implementation->stage1((const uint8_t *)p.data(), p.size(), simdjson::stage1_mode::regular) == simdjson::SUCCESS);
+    unified.end(results);
+
+    cy1 += results[0];
+    cl1 += results[1];
+
+    unified.start();
+    isok = isok && (parser.implementation->stage2(parser.doc) == simdjson::SUCCESS);
+    unified.end(results);
+
+    cy2 += results[0];
+    cl2 += results[1];
+    if (!isok) {
+      std::cerr << "failure?" << std::endl;
+    }
+  }
+  printf("%f %f %f %f ", static_cast<double>(cy1) / static_cast<double>(iterations), static_cast<double>(cl1) / static_cast<double>(iterations),
+         static_cast<double>(cy2) / static_cast<double>(iterations), static_cast<double>(cl2) / static_cast<double>(iterations));
+#endif // __linux__
+  printf("\n");
+  return EXIT_SUCCESS;
+}
@@ -0,0 +1,201 @@
+#ifndef __EVENT_COUNTER_H
+#define __EVENT_COUNTER_H
+
+#ifndef SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+#ifdef __aarch64__
+// on ARM, we use just cycles and instructions
+#define SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS 1
+#else
+// elsewhere, we try to use four counters.
+#define SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS 0
+#endif
+#endif
+#include <cassert>
+#include <cctype>
+#ifndef _MSC_VER
+#include <dirent.h>
+#endif
+#include <unistd.h>
+#include <cinttypes>
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+#include <algorithm>
+#include <chrono>
+#include <cstring>
+#include <fstream>
+#include <iomanip>
+#include <iostream>
+#include <map>
+#include <set>
+#include <sstream>
+#include <string>
+#include <vector>
+
+#ifdef __linux__
+#include "linux-perf-events.h"
+#include <libgen.h>
+#endif
+
+#if __APPLE__ &&  __aarch64__
+#include "apple/apple_arm_events.h"
+#endif
+
+#include "simdjson.h"
+
+using std::string;
+using std::vector;
+using std::chrono::steady_clock;
+using std::chrono::time_point;
+using std::chrono::duration;
+
+struct event_count {
+  duration<double> elapsed;
+  vector<unsigned long long> event_counts;
+  event_count() : elapsed(0), event_counts{0,0,0,0,0} {}
+  event_count(const duration<double> _elapsed, const vector<unsigned long long> _event_counts) : elapsed(_elapsed), event_counts(_event_counts) {}
+  event_count(const event_count& other): elapsed(other.elapsed), event_counts(other.event_counts) { }
+
+  // The types of counters (so we can read the getter more easily)
+  #if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+  enum event_counter_types {
+    CPU_CYCLES,
+    INSTRUCTIONS
+  };
+  #else
+  enum event_counter_types {
+    CPU_CYCLES,
+    INSTRUCTIONS,
+    BRANCH_MISSES,
+    CACHE_REFERENCES,
+    CACHE_MISSES
+  };
+  #endif
+  double elapsed_sec() const { return duration<double>(elapsed).count(); }
+  double elapsed_ns() const { return duration<double, std::nano>(elapsed).count(); }
+  double cycles() const { return static_cast<double>(event_counts[CPU_CYCLES]); }
+  double instructions() const { return static_cast<double>(event_counts[INSTRUCTIONS]); }
+#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+  double branch_misses() const { return static_cast<double>(event_counts[BRANCH_MISSES]); }
+  double cache_references() const { return static_cast<double>(event_counts[CACHE_REFERENCES]); }
+  double cache_misses() const { return static_cast<double>(event_counts[CACHE_MISSES]); }
+#endif
+  event_count& operator=(const event_count& other) {
+    this->elapsed = other.elapsed;
+    this->event_counts = other.event_counts;
+    return *this;
+  }
+  event_count operator+(const event_count& other) const {
+    return event_count(elapsed+other.elapsed, {
+      event_counts[0]+other.event_counts[0],
+      event_counts[1]+other.event_counts[1],
+      event_counts[2]+other.event_counts[2],
+      event_counts[3]+other.event_counts[3],
+      event_counts[4]+other.event_counts[4],
+    });
+  }
+
+  void operator+=(const event_count& other) {
+    *this = *this + other;
+  }
+};
+
+struct event_aggregate {
+  int iterations = 0;
+  event_count total{};
+  event_count best{};
+  event_count worst{};
+
+  event_aggregate() {}
+
+  void operator<<(const event_count& other) {
+    if (iterations == 0 || other.elapsed < best.elapsed) {
+      best = other;
+    }
+    if (iterations == 0 || other.elapsed > worst.elapsed) {
+      worst = other;
+    }
+    iterations++;
+    total += other;
+  }
+
+  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; }
+#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+  double branch_misses() const { return total.branch_misses() / iterations; }
+  double cache_references() const { return total.cache_references() / iterations; }
+  double cache_misses() const { return total.cache_misses() / iterations; }
+#endif
+};
+
+struct event_collector {
+  event_count count{};
+  time_point<steady_clock> start_clock{};
+
+#if defined(__linux__)
+  LinuxEvents<PERF_TYPE_HARDWARE> linux_events;
+  event_collector() : linux_events(vector<int>{
+  #if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+    PERF_COUNT_HW_CPU_CYCLES,
+    PERF_COUNT_HW_INSTRUCTIONS,
+  #else
+    PERF_COUNT_HW_CPU_CYCLES,
+    PERF_COUNT_HW_INSTRUCTIONS,
+    PERF_COUNT_HW_BRANCH_MISSES,
+    PERF_COUNT_HW_CACHE_REFERENCES,
+    PERF_COUNT_HW_CACHE_MISSES
+  #endif
+  }) {}
+  bool has_events() {
+    return linux_events.is_working();
+  }
+#elif __APPLE__ &&  __aarch64__
+  AppleEvents apple_events;
+  performance_counters diff;
+  event_collector() : diff(0) {
+    apple_events.setup_performance_counters();
+  }
+  bool has_events() {
+    return apple_events.setup_performance_counters();
+  }
+#else
+  event_collector() {}
+  bool has_events() {
+    return false;
+  }
+#endif
+
+  simdjson_inline void start() {
+#if defined(__linux)
+    linux_events.start();
+#elif __APPLE__ &&  __aarch64__
+    if(has_events()) { diff = apple_events.get_counters(); }
+#endif
+    start_clock = steady_clock::now();
+  }
+  simdjson_inline event_count& end() {
+    time_point<steady_clock> end_clock = steady_clock::now();
+#if defined(__linux)
+    linux_events.end(count.event_counts);
+#elif __APPLE__ &&  __aarch64__
+    if(has_events()) {
+      performance_counters end = apple_events.get_counters();
+      diff = end - diff;
+    }
+    count.event_counts[0] = diff.cycles;
+    count.event_counts[1] = diff.instructions;
+    count.event_counts[2] = diff.missed_branches;
+    count.event_counts[3] = 0;
+    count.event_counts[4] = 0;
+#endif
+    count.elapsed = end_clock - start_clock;
+    return count;
+  }
+};
+
+#endif
@@ -1,8 +1,7 @@
 #ifndef BENCHMARK_HELPERS_H
 #define BENCHMARK_HELPERS_H

-#include <counters/event_counter.h>
-using namespace counters;
+#include "event_counter.h"
 #include <atomic>

 event_collector collector;
@@ -1,8 +1,7 @@
 #pragma once

 #include "simdjson.h"
-#include <counters/event_counter.h>
-using namespace counters;
+#include "event_counter.h"
 #include <iostream>

 namespace json_benchmark {
@@ -59,7 +58,11 @@ template<typename B, typename R> static void run_json_benchmark(benchmark::State
  if (collector.has_events()) {
    state.counters["instructions"] = events.instructions();
    state.counters["cycles"]       = events.cycles();
+#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
    state.counters["branch_miss"]  = events.branch_misses();
+    state.counters["cache_miss"]   = events.cache_misses();
+    state.counters["cache_ref"]    = events.cache_references();
+#endif
    state.counters["instructions_per_byte"]  = events.instructions() / double(bench.bytes_per_iteration());
    state.counters["instructions_per_cycle"] = events.instructions() / events.cycles();
    state.counters["cycles_per_byte"]        = events.cycles()       / double(bench.bytes_per_iteration());
@@ -67,7 +70,11 @@ template<typename B, typename R> static void run_json_benchmark(benchmark::State

    state.counters["best_instructions"] = events.best.instructions();
    state.counters["best_cycles"]       = events.best.cycles();
+#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
    state.counters["best_branch_miss"]  = events.best.branch_misses();
+    state.counters["best_cache_miss"]   = events.best.cache_misses();
+    state.counters["best_cache_ref"]    = events.best.cache_references();
+#endif

    state.counters["best_instructions_per_byte"]  = events.best.instructions() / double(bench.bytes_per_iteration());
    state.counters["best_instructions_per_cycle"] = events.best.instructions() / events.best.cycles();
@@ -88,7 +95,11 @@ template<typename B, typename R> static void run_json_benchmark(benchmark::State
  if (collector.has_events()) {
    label << " instructions=" << setw(12) << uint64_t(events.best.instructions())     << setw(0);
    label << " cycles="       << setw(12) << uint64_t(events.best.cycles())           << setw(0);
+#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
    label << " branch_miss="  << setw(8)  << uint64_t(events.best.branch_misses())    << setw(0);
+    label << " cache_miss="   << setw(8)  << uint64_t(events.best.cache_misses())     << setw(0);
+    label << " cache_ref="    << setw(10) << uint64_t(events.best.cache_references()) << setw(0);
+#endif
  }

  label << " items=" << setw(10) << bench.items_per_iteration() << setw(0);
@@ -1,7 +1,6 @@
 #pragma once

 #include "json_benchmark/string_runner.h"
-#include <fstream>
 #include <map>
 #include <string>

@@ -0,0 +1,105 @@
+#pragma once
+#ifdef __linux__
+
+#include <asm/unistd.h>       // for __NR_perf_event_open
+#include <linux/perf_event.h> // for perf event constants
+#include <sys/ioctl.h>        // for ioctl
+#include <unistd.h>           // for syscall
+
+#include <cerrno>  // for errno
+#include <cstring> // for memset
+#include <stdexcept>
+
+#include <iostream>
+#include <vector>
+
+template <int TYPE = PERF_TYPE_HARDWARE> class LinuxEvents {
+  int fd;
+  bool working;
+  perf_event_attr attribs{};
+  size_t num_events{};
+  std::vector<uint64_t> temp_result_vec{};
+  std::vector<uint64_t> ids{};
+
+public:
+  explicit LinuxEvents(std::vector<int> config_vec) : fd(0), working(true) {
+    memset(&attribs, 0, sizeof(attribs));
+    attribs.type = TYPE;
+    attribs.size = sizeof(attribs);
+    attribs.disabled = 1;
+    attribs.exclude_kernel = 1;
+    attribs.exclude_hv = 1;
+
+    attribs.sample_period = 0;
+    attribs.read_format = PERF_FORMAT_GROUP | PERF_FORMAT_ID;
+    const int pid = 0;  // the current process
+    const int cpu = -1; // all CPUs
+    const unsigned long flags = 0;
+
+    int group = -1; // no group
+    num_events = config_vec.size();
+    ids.resize(config_vec.size());
+    uint32_t i = 0;
+    for (auto config : config_vec) {
+      attribs.config = config;
+      int _fd = static_cast<int>(syscall(__NR_perf_event_open, &attribs, pid, cpu, group, flags));
+      if (_fd == -1) {
+        report_error("perf_event_open");
+      }
+      ioctl(_fd, PERF_EVENT_IOC_ID, &ids[i++]);
+      if (group == -1) {
+        group = _fd;
+        fd = _fd;
+      }
+    }
+
+    temp_result_vec.resize(num_events * 2 + 1);
+  }
+
+  ~LinuxEvents() { if (fd != -1) { close(fd); } }
+
+  inline void start() {
+    if (fd != -1) {
+      if (ioctl(fd, PERF_EVENT_IOC_RESET, PERF_IOC_FLAG_GROUP) == -1) {
+        report_error("ioctl(PERF_EVENT_IOC_RESET)");
+      }
+
+      if (ioctl(fd, PERF_EVENT_IOC_ENABLE, PERF_IOC_FLAG_GROUP) == -1) {
+        report_error("ioctl(PERF_EVENT_IOC_ENABLE)");
+      }
+    }
+  }
+
+  inline void end(std::vector<unsigned long long> &results) {
+    if (fd != -1) {
+      if (ioctl(fd, PERF_EVENT_IOC_DISABLE, PERF_IOC_FLAG_GROUP) == -1) {
+        report_error("ioctl(PERF_EVENT_IOC_DISABLE)");
+      }
+
+      if (read(fd, temp_result_vec.data(), temp_result_vec.size() * 8) == -1) {
+        report_error("read");
+      }
+    }
+    // our actual results are in slots 1,3,5, ... of this structure
+    for (uint32_t i = 1; i < temp_result_vec.size(); i += 2) {
+      results[i / 2] = temp_result_vec[i];
+    }
+    for (uint32_t i = 2; i < temp_result_vec.size(); i += 2) {
+      if(ids[i/2-1] != temp_result_vec[i]) {
+        report_error("event mismatch");
+      }
+    }
+
+
+  }
+
+  bool is_working() {
+    return working;
+  }
+
+private:
+  void report_error(const std::string &) {
+    working = false;
+  }
+};
+#endif
@@ -10,7 +10,7 @@ namespace partial_tweets {
 //     {
 //       "created_at": "Sun Aug 31 00:29:15 +0000 2014",
 //       "id": 505874924095815700,
-//       "text": "@aym0566x ...",
+//       "text": "@aym0566x \n\n名前:前田あゆみ\n第一印象:なんか怖っ！\n今の印象:とりあえずキモい。噛み合わない\n好きなところ:ぶすでキモいとこ😋✨✨\n思い出:んーーー、ありすぎ😊❤️\nLINE交換できる？:あぁ……ごめん✋\nトプ画をみて:照れますがな😘✨\n一言:お前は一生もんのダチ💖",
 //       "in_reply_to_status_id": null,
 //       "user": {
 //         "id": 1186275104,
@@ -1,7 +1,6 @@
 #ifndef BENCHMARK_HELPER_HPP
 #define BENCHMARK_HELPER_HPP
-#include <counters/event_counter.h>
-using namespace counters;
+#include "event_counter.h"
 #include <atomic>

 inline event_collector &get_collector() {
@@ -171,7 +171,7 @@ We recommend Visual Studio 2019 or better on a 64-bit system.")
 else()
  target_compile_options(
      simdjson-internal-flags INTERFACE
-      -Werror -Wall -Wextra -Weffc++ -Wsign-compare -Wshadow -Wwrite-strings
+      -Wall -Wextra -Weffc++ -Wsign-compare -Wshadow -Wwrite-strings
      -Wpointer-arith -Winit-self -Wconversion -Wno-sign-conversion
  )
  if(CMAKE_CXX_STANDARD VERSION_GREATER_EQUAL 20)
@@ -20,14 +20,6 @@ if(SIMDJSON_GOOGLE_BENCHMARKS)
  )
 endif()

-CPMAddPackage(
-        NAME counters
-        URL https://github.com/lemire/counters/archive/refs/tags/v3.1.0.zip
-        OPTIONS
-        "COUNTERS_BUILD_TESTS OFF"
-        "COUNTERS_INSTALL OFF"
-)
-
 CPMAddPackage(
        NAME simdjson-data
        URL https://github.com/simdjson/simdjson-data/archive/351949906abde446f0314bf79606fb5d884f5be7.zip
@@ -161,77 +161,54 @@ The basics: loading and parsing JSON documents
 ----------------------------------------------

 The simdjson library allows you to navigate and validate JSON documents ([RFC 8259](https://www.tbray.org/ongoing/When/201x/2017/12/14/rfc8259.html)).
-Your JSON document should be a valid Unicode (UTF-8) string.
+As required by the standard, your JSON document should be in a Unicode (UTF-8) string. The whole
+string, from the beginning to the end, needs to be valid: we do not attempt to tolerate bad
+inputs before or after a document.

-To parse JSON, create a `ondemand::parser` and call its `iterate()` method on a padded input.
-The simplest way to load a JSON file is with `padded_string::load`:
+For efficiency reasons, simdjson requires a string with a few bytes (`simdjson::SIMDJSON_PADDING`)
+at the end, these bytes may be read but their content does not affect the parsing. In practice,
+it means that the JSON inputs should be stored in a memory region with `simdjson::SIMDJSON_PADDING`
+extra bytes at the end. You do not have to set these bytes to specific values though you may
+want to if you want to avoid runtime warnings with some sanitizers. We expect the user
+of the library to load the data (from disk or from the network) into a padded buffer. To make
+this easy, we provide the `padded_string::load` function which loads files from disk in a padded buffer.
+[You can similarly fetch a file from a URL to a padded string](https://github.com/simdjson/curltostring) using our `simdjson::padded_string_builder`. Advanced users may want to read the section Free Padding in [our performance notes](performance.md).
+
+The simdjson library offers a tree-like [API](https://en.wikipedia.org/wiki/API), which you can
+access by creating a `ondemand::parser` and calling the `iterate()` method. The iterate method
+quickly indexes the input string and may detect some errors. The following example illustrates
+how to get started with an input JSON file (`"twitter.json"`):

 ```cpp
 ondemand::parser parser;
-auto json = padded_string::load("twitter.json");
-ondemand::document doc = parser.iterate(json);
+auto json = padded_string::load("twitter.json"); // load JSON file 'twitter.json'.
+ondemand::document doc = parser.iterate(json); // position a pointer at the beginning of the JSON data
 ```

-For inline JSON strings, use the `_padded` suffix:
+(Windows users compiling with C++17 or better may use `wchar_t` strings to support non-ASCII
+filenames: `padded_string::load(L"twitter.json")`.)

-```cpp
-ondemand::parser parser;
-auto json = "[1,2,3]"_padded;
-ondemand::document doc = parser.iterate(json);
-```
+If you prefer not to create your own `ondemand::parser` instance, you can access
+a thread-local version by calling `ondemand::parser.get_parser()`.

-If you are compiling with C++17 or better, you can use `simdjson::padded_input`
-which accepts any string-like input and handles padding automatically:
-
-```cpp
-ondemand::parser parser;
-std::string_view json = "[1,2,3]";
-simdjson::padded_input input(json);
-ondemand::document doc = parser.iterate(input);
-
-// Also works with std::string, considering reserved capacity
-std::string json_str = "[1,2,3]";
-json_str.reserve(100);  // Reserve extra space
-simdjson::padded_input input2(json_str);  // May avoid copying
-ondemand::document doc2 = parser.iterate(input2);
-```
-
-The simdjson library also accepts `std::string` instances directly---if the provided
-reference is non-const, it will allocate padding as needed:
-
-```cpp
-ondemand::parser parser;
-std::string json = "[1,2,3]";
-ondemand::document doc = parser.iterate(json);
-```
-
-By default, the simdjson library throws exceptions (`simdjson_error`) on errors. We omit `try`-`catch` clauses from our illustrating examples: if you omit `try`-`catch` in your code, an uncaught exception will halt your program. It is also possible to use simdjson without generating exceptions, and you may even build the library without exception support at all. See [Error handling](#error-handling) for details.
-
-
-### Advanced input options
-
-This section covers additional ways to provide JSON input to simdjson, including
-options for fine-grained control over padding and memory.
-
-**Thread-local parser.** If you prefer not to create your own `ondemand::parser` instance, you can access
-a thread-local version by calling `ondemand::parser.get_parser()`:

 ```cpp
 ondemand::document doc = ondemand::parser.get_parser().iterate(json);
 ```

-A parser instance can only be used for one document at a time, so
-the thread-local parser is only applicable when you parse one
+However, you should be careful because a parser instance can only be used for one
+document at a time, thus it is only applicable when you are only parsing one
 document per thread at any one time.

-**`padded_input` details (C++17+).** The actual padding only occurs when the JSON string ends near the boundary of a memory page, which is
-uncommon. Using a `simdjson::padded_input` is safe although sanitizers and tools like valgrind
-might report illegal reads (which are safe in our case because they remain in the mapped page). You should avoid `simdjson::padded_input`
-on systems without a page size of at least 4096: virtually all systems qualify except for
-some niche embedded systems running custom operating systems. Standard Linux, Windows, macOS, Android, iOS, etc., are all fine. Note that, most times, a `simdjson::padded_input` instance will not copy the data and will only act
-as a view (it does not own the memory).
+You can also create a padded string---and call `iterate()`:

-**User-managed buffers.** If you have a buffer of your own with enough padding already (`SIMDJSON_PADDING` extra bytes allocated), you can use `padded_string_view` to pass it in:
+```cpp
+ondemand::parser parser;
+auto json = "[1,2,3]"_padded; // The _padded suffix creates a simdjson::padded_string instance
+ondemand::document doc = parser.iterate(json); // parse a string
+```
+
+If you have a buffer of your own with enough padding already (SIMDJSON_PADDING extra bytes allocated), you can use `padded_string_view` to pass it in:

 ```cpp
 ondemand::parser parser;
@@ -240,97 +217,73 @@ strcpy(json, "[1]");
 ondemand::document doc = parser.iterate(json, strlen(json), sizeof(json));
 ```

-**Copying into a `padded_string`.** You can copy your data directly into a `simdjson::padded_string`:
+The simdjson library will also accept `std::string` instances. If the provided
+reference is non-const, it will allocate padding as needed.
+
+You can copy your data directly on a `simdjson::padded_string` as follows:

 ```cpp
 const char * data = "my data"; // 7 bytes
 simdjson::padded_string my_padded_data(data, 7); // copies to a padded buffer
 ```

-Or from a `std::string`:
+Or as follows...

 ```cpp
 std::string data = "my data";
 simdjson::padded_string my_padded_data(data); // copies to a padded buffer
 ```

-**`std::string` and sanitizer warnings.** Whenever you pass an `std::string` reference to `parser::iterate`,
-the parser may access bytes beyond the end of
+You can then parse the JSON data from the `simdjson::padded_string` instance:
+
+
+```cpp
+ondemand::document doc = parser.iterate(my_padded_data);
+```
+
+Whenever you pass an `std::string` reference to `parser::iterate`,
+the parser will access the bytes beyond the end of
 the string but before the end of the allocated memory (`std::string::capacity()`).
-Sanitizers that check for reading uninitialized bytes may produce warnings.
-You can safely ignore these warnings, or call `simdjson::pad(std::string&)` to pad the
-string explicitly:
+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:

 ```cpp
 std::string json = "[1]";
 ondemand::document doc = parser.iterate(simdjson::pad(json));
 ```

-We recommend against creating many `std::string` or many `std::padded_string` instances in your application to store your JSON data.
+We recommend against creating many `std::string` or many `std::padding_string` instances in your application to store your JSON data.
 Consider reusing the same buffers and limiting memory allocations.

-**Memory-file mapping.** You can use `simdjson::padded_memory_map` to create a
-`simdjson::padded_string_view` from a file on disk. On POSIX systems (Linux,
-macOS, BSD, ...) it uses `mmap` for true zero-copy access and is always
-available. On Windows it is an **opt-in** feature because it relies on the
-`CreateFileMapping2` / `MapViewOfFile3` APIs (Windows 10, version 1803 or
-later) which are exported from `onecore.lib` rather than the default
-`kernel32.lib`. To enable it, you must satisfy **all** of the following:
+By default, the simdjson library throws exceptions (`simdjson_error`) on errors. We omit `try`-`catch` clauses from our illustrating examples: if you omit `try`-`catch` in your code, an uncaught exception will halt your program. It is also possible to use simdjson without generating exceptions, and you may even build the library without exception support at all. See [Error handling](#error-handling) for details.

-1. Building simdjson with `-DSIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=ON`, or
-   defining `SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=1` and raising
-   `NTDDI_VERSION` to at least `NTDDI_WIN10_RS4` (Windows 10, version 1803)
-   and linking `onecore.lib` manually if you are consuming simdjson as a
-   pre-built library.
-2. `#include <windows.h>` before including simdjson, in every translation
-   unit that uses `padded_memory_map`.
+Some users may want to browse code along with the compiled assembly. You want to check out the following lists of examples:

-The Windows implementation then uses `CreateFileMapping2` / `MapViewOfFile3`
-for true zero-copy access whenever possible, with a transparent
-buffered-read fallback for files that end too close to a page boundary.
+* [simdjson examples with errors handled through exceptions](https://godbolt.org/z/98Kx9Kqjn)
+* [simdjson examples with errors without exceptions](https://godbolt.org/z/PKG7GdbPo)

-The availability of the class can be tested with the preprocessor macro
-`SIMDJSON_HAS_PADDED_MEMORY_MAP`.
-
-```cpp
-#ifdef _WIN32
-#include <windows.h> // Must come BEFORE <simdjson.h> on Windows
-#endif
-#include "simdjson.h"
-// ...
-simdjson::padded_memory_map map(myfilename);
-if (!map.is_valid()) { /* handle error */ }
-simdjson::padded_string_view view = map.view();
-ondemand::document doc = parser.iterate(view);
-```
-
-**Windows-specific notes.** Windows users compiling with C++17 or better may use `wchar_t` strings to support non-ASCII
-filenames: `padded_string::load(L"twitter.json")`. Windows users who need to read files with
+*Windows-specific*:  Windows users who need to read files with
 non-ANSI characters in the name should set their code page to
 UTF-8 (65001). This should be the default with Windows 11 and better.
 Further, they may use the AreFileApisANSI function to determine whether
 the filename is interpreted using the ANSI or the system default OEM
 codepage, and they may call SetFileApisToOEM accordingly.

-Some users may want to browse code along with the compiled assembly:

-* [simdjson examples with errors handled through exceptions](https://godbolt.org/z/98Kx9Kqjn)
-* [simdjson examples with errors without exceptions](https://godbolt.org/z/PKG7GdbPo)
+**Advanced feature:**
+On non-Windows systems, you can use memory-file mapping to create a `simdjson::padded_string_view`
+from a file on disk.

-**Summary of input types:**
-
-
-| Input Type / Method                          | Padding Requirement                                                                 | How Padding is Handled                                                                 | Ownership / Copying                          | Notes / Warnings                                                                 |
-|----------------------------------------------|-------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------|----------------------------------------------|----------------------------------------------------------------------------------|
-| `padded_string::load("file.json")`           | Automatic (SIMDJSON_PADDING extra bytes)                                           | Library allocates padded buffer and loads file into it                                 | Owned by `padded_string`                     | Recommended for files; safest and simplest.                                      |
-| `"...json..."_padded` literal                | Automatic (built-in padding)                                                        | Creates `padded_string` with padding                                                   | Owned by `padded_string`                     | Convenient for small hardcoded JSON.                                             |
-| `simdjson::padded_input` (C++17+)            | Automatic when needed                                                               | Adds padding **only** if the string ends near a memory page boundary. For `std::string`, considers `capacity()` | Usually a non-owning view (no copy most times) | Safe on standard OS (page size ≥ 4096). May trigger sanitizer/valgrind warnings (harmless). Avoid on niche embedded systems. |
-| User buffer with explicit padding            | Must have at least `SIMDJSON_PADDING` extra allocated bytes after JSON content     | Pass via `iterate(ptr, json_length, total_allocated_size)` or `padded_string_view`     | User-owned (no copy)                         | Use `char buf[len + SIMDJSON_PADDING]`. Library reads (but never writes) into padding. |
-| `std::string` (non-const)                    | Library checks `capacity()`                                                         | If insufficient, library may allocate a padded copy                                    | May copy (depends on capacity)               | Can trigger sanitizer warnings on uninitialized bytes. Use `simdjson::pad(json)` to avoid. |
-| `simdjson::pad(std::string&)`                | Adds padding if needed                                                              | Returns `padded_string_view` pointing to the (possibly resized) string                 | References original string                   | Recommended to silence sanitizers when using `std::string`.                      |
-| `padded_string(data, length)` or `padded_string(std::string)` | Automatic (copies into padded buffer)                                              | Explicit copy into owned padded buffer                                                 | Owned by `padded_string`                     | Safe when you want full ownership and padding guaranteed.                        |
-| `padded_string_view` (manual)                | User guarantees `SIMDJSON_PADDING` extra bytes after the viewed length             | User provides pointer + length + capacity                                              | Non-owning view                              | Low-level; requires careful buffer management.                                   |
-| Memory-mapped file (`padded_memory_map`)     | Automatic via mapping / padded read                                                 | Creates view with sufficient padding                                                   | Non-owning (tied to map lifetime)            | Always available on POSIX (zero-copy `mmap`). On Windows, opt-in via `-DSIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=ON` (requires Windows 10 1803+ and links `onecore.lib`) and `#include <windows.h>` before simdjson; uses `CreateFileMapping2` + `MapViewOfFile3`. |
+```cpp
+// If the macro _WIN32 is defined, this will not work since we do not support memory-file mapping
+// under Windows at this time.
+simdjson::padded_memory_map map(myfilename);
+if (!map.is_valid()) { /* handle error */ }
+simdjson::padded_string_view view = map.view(); // view is usable while padded_memory_map is in scope
+ondemand::document doc = parser.iterate(view); // parse the JSON
+```


 Documents are iterators
@@ -483,7 +436,7 @@ support for users who avoid exceptions. See [the simdjson error handling documen
 * **Extracting Values:** You can cast a JSON element to a native type:
  `double(element)`. This works for `std::string_view`, double, uint64_t, int64_t, bool,
  ondemand::object and ondemand::array. We also have explicit methods such as `get_string()`, `get_double()`,
-  `get_uint64()`, `get_int64()`, `get_uint32()`, `get_int32()`, `get_bool()`, `get_object()` and `get_array()`. After a cast or an explicit method,
+  `get_uint64()`, `get_int64()`, `get_bool()`, `get_object()` and `get_array()`. After a cast or an explicit method,
  the number, string or boolean will be parsed, or the initial `{` or `[` will be verified for `ondemand::object` and `ondemand::array`. An exception may be thrown if
  the cast is not possible: the error code is `simdjson::INCORRECT_TYPE` (see [Error handling](#error-handling)). Importantly, when getting an ondemand::object or ondemand::array instance, its content is
  not validated: you are only guaranteed that the corresponding initial character (`{` or `[`) is present. Thus,
@@ -493,8 +446,8 @@ support for users who avoid exceptions. See [the simdjson error handling documen
  pass `true` (`get_string(true)`) as a parameter to get replacement characters where errors
  occur. If you somehow need to access non-UTF-8 strings in a lossless manner
  (e.g., if you strings contain unpaired surrogates), you may use the `get_wobbly_string()` function to get a string in the [WTF-8 format](https://simonsapin.github.io/wtf-8).
-  When calling `get_uint64()`, `get_int64()`, `get_uint32()` or `get_int32()`, if the number does not fit in the
-  corresponding integer type, it is also considered an error (`NUMBER_OUT_OF_RANGE`). When parsing numbers or other scalar values, the library checks
+  When calling `get_uint64()` and `get_int64()`, if the number does not fit in a corresponding
+  64-bit integer type, it is also considered an error. When parsing numbers or other scalar values, the library checks
  that the value is followed by an expected character, thus you *may* get a number parsing error when accessing the digits
  as an integer in the following strings: `{"number":12332a`, `{"number":12332\0`, `{"number":12332` (the digits appear at the end). We always abide by the [RFC 8259](https://www.tbray.org/ongoing/When/201x/2017/12/14/rfc8259.html) JSON specification so that, for example, numbers prefixed by the `+` sign are in error.

@@ -1347,6 +1300,10 @@ You can also use the custom `Car` type as part of a template such as `std::vecto
  simdjson::ondemand::parser parser;
  simdjson::ondemand::document doc = parser.iterate(json);
  std::vector<Car> cars(doc);
+  // visual studio users need an explicit call:
+  //   std::vector<Car> cars = doc.get<std::vector<Car>>();
+  // because the compiler does not know whether to convert
+  // doc to an unsigned int or to a vector.
  for(Car& c : cars) {
    std::cout << c.year << std::endl;
  }
@@ -1440,8 +1397,6 @@ With this code, deserializing an `std::list<Car>` instance would capture only th
 that are not made by Toyota.


-**Performance tip**: You will get better performance if you order the attributes (make, model)
-in the order they appear in the JSON document.


 ### 3. Using static reflection (C++26)
@@ -1518,10 +1473,6 @@ void f() {
 }
 ```

-
-**Performance tip**: You will get better performance if you order the attributes (make, model)
-in the order they appear in the JSON document.
-
 #### Special cases

 However, there are instances where the construction cannot
@@ -32,21 +32,6 @@ your code with the `SIMDJSON_STATIC_REFLECTION` macro set:
 The `simdjson::compile_time::parse_json` function parses a JSON document at **compile time** and returns a `constexpr` structure reflecting its content. We support the full range of JSON values, which are mapped to C++ types as in
 the following table.

-For convenience, you can also use the `""_json` user-defined literal operator, which is available in the `simdjson::literals` namespace:
-
-```cpp
-using namespace simdjson::literals;
-
-constexpr auto cfg = R"(
-{
-    "port": 8080,
-    "host": "localhost"
-}
-)"_json;
-```
-
-Alternatively, you can use the qualified name `simdjson::literals::operator""_json`.
-

 | JSON type      | C++ type                         |
 |----------------|----------------------------------|
@@ -76,8 +61,6 @@ You can do so, at compile-time, as follows:


 ```cpp
-using namespace simdjson::literals;
-
 constexpr auto cfg = R"(

 {
@@ -96,8 +79,6 @@ constexpr auto cfg = R"(
 You can nest objects and arrays:

 ```cpp
-using namespace simdjson::literals;
-
 constexpr auto data = R"(

 {
@@ -117,8 +98,6 @@ constexpr auto data = R"(
 Top-level arrays are allowed:

 ```cpp
-using namespace simdjson::literals;
-
 constexpr auto arr = R"(

 [1, 2, 3]
@@ -137,8 +116,6 @@ want to check that it conforms to your expectation. You can do so with concepts.
 Let us consider this example:

 ```cpp
-    using namespace simdjson::literals;
-
    constexpr auto config = R"(

    [
@@ -127,31 +127,11 @@ codepage, and they may call SetFileApisToOEM accordingly.


 **Advanced feature:**
-You can use `simdjson::padded_memory_map` to create a `simdjson::padded_string_view`
-from a file on disk without copying the file contents into your own buffer.
-On POSIX systems (Linux, macOS, BSD, ...) it uses `mmap` for true zero-copy
-access. On Windows it is available as an **opt-in** feature and requires:
-
-1. Building simdjson with `-DSIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=ON`, or
-   defining `SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=1` and raising
-   `NTDDI_VERSION` to at least `NTDDI_WIN10_RS4` (Windows 10, version 1803)
-   and linking `onecore.lib` manually if you are consuming simdjson as a
-   pre-built library.
-2. `#include <windows.h>` before `#include "simdjson.h"` in every
-   translation unit where you want to use `padded_memory_map`.
-
-When enabled on Windows, the implementation uses `CreateFileMapping2` and
-`MapViewOfFile3` for true zero-copy mapping whenever the file does not end
-within `SIMDJSON_PADDING` bytes of a page boundary; otherwise it falls back
-to reading the file into a padded heap buffer. If those requirements are
-not met, the class is not declared and the code below will fail to compile.
+On non-Windows systems, you can use memory-file mapping to create a `simdjson::padded_string_view`
+from a file on disk.

 ```cpp
-#ifdef _WIN32
-#include <windows.h> // Must come BEFORE <simdjson.h> on Windows
-#endif
-#include "simdjson.h"
-// ...
+// if the macro _WIN32 is defined, this will not work since we do not support Windows
 simdjson::padded_memory_map map(TWITTER_JSON);
 if (!map.is_valid()) { /* handle error */ }
 simdjson::padded_string_view view = map.view(); // view is usable while padded_memory_map is in scope
@@ -188,23 +168,6 @@ Once you have an element, you can navigate it with idiomatic C++ iterators, oper
  `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`.
-* **Big Integer Support (opt-in):** By default, integers that exceed the 64-bit range cause parsing to fail with `BIGINT_ERROR`. You can opt in to big integer support so that these numbers are stored as raw digit strings on the tape instead:
-  ```cpp
-  simdjson::dom::parser parser;
-  parser.number_as_string(true); // opt-in, default false
-  simdjson::dom::element doc;
-  auto error = parser.parse("[1, 123456789012345678901]"_padded).get(doc);
-  if (error) { std::cerr << error << std::endl; return EXIT_FAILURE; }
-  for (simdjson::dom::element elem : doc) {
-    if (elem.is_bigint()) {
-      std::string_view digits;
-      error = elem.get_bigint().get(digits);
-      if (error) { std::cerr << error << std::endl; return EXIT_FAILURE; }
-      std::cout << "big integer: " << digits << std::endl;
-    }
-  }
-  ```
-  When enabled, big integers have type `element_type::BIGINT`. Calling `get_int64()`, `get_uint64()`, or `get_double()` on a big integer returns `INCORRECT_TYPE`. Normal numbers (int64, uint64, double) are unaffected.
 * **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) { ... }`
@@ -217,7 +180,7 @@ Once you have an element, you can navigate it with idiomatic C++ iterators, oper
 * **Array and Object size** Given an array or an object, you can get its size (number of elements or keys)
  with the `size()` method.
 * **Checking an Element Type:** You can check an element's type with `element.type()`. It
-  returns an `element_type` with values such as `simdjson::dom::element_type::ARRAY`, `simdjson::dom::element_type::OBJECT`, `simdjson::dom::element_type::INT64`,  `simdjson::dom::element_type::UINT64`,`simdjson::dom::element_type::DOUBLE`, `simdjson::dom::element_type::STRING`, `simdjson::dom::element_type::BOOL`, `simdjson::dom::element_type::NULL_VALUE` or, `simdjson::dom::element_type::BIGINT` (when big integer support is enabled).
+  returns an `element_type` with values such as `simdjson::dom::element_type::ARRAY`, `simdjson::dom::element_type::OBJECT`, `simdjson::dom::element_type::INT64`,  `simdjson::dom::element_type::UINT64`,`simdjson::dom::element_type::DOUBLE`, `simdjson::dom::element_type::STRING`, `simdjson::dom::element_type::BOOL` or, `simdjson::dom::element_type::NULL_VALUE`.
 * **Output to streams and strings:** Given a document or an element (or node) out of a JSON document, you can output a minified string version using the C++ stream idiom (`out << element`). You can also request the construction of a minified string version (`simdjson::minify(element)`) or a prettified string version (`simdjson::prettify(element)`). Numbers are serialized as 64-bit floating-point numbers (`double`).

 ### Examples
@@ -790,9 +753,6 @@ void basics_treewalk_1() {
 }
 ```

-Notice that we do not include `dom::element_type::BIGINT` in this example
-as `dom::element_type::BIGINT` type is only generated if the parser was
-set to support big integers (`parser.number_as_string(true)`).


 Reusing the parser for maximum efficiency
@@ -905,19 +865,6 @@ simdjson::dom::element element = parser.parse(padded_json_copy.get(), json_len,

 Setting the `realloc_if_needed` parameter `false` in this manner may lead to better performance since copies are avoided, but it requires that the user takes more responsibilities: the simdjson library cannot verify that the input buffer was padded with SIMDJSON_PADDING extra bytes.

-If you are compiling your project with C++17 or better, you can use a `simdjson::padded_input`:
-
-```cpp
-simdjson::dom::parser parser;
-std::string_view json = "[1,2,3]";
-simdjson::padded_input input(json); // Automatically pads if needed
-simdjson::dom::element element = parser.parse(input);
-```
-
-The actual padding only occurs if the JSON string ends near the boundary of a memory page, which is uncommon. Using a `simdjson::padded_input` is safe although sanitizers and tools like valgrind might report illegal reads (which are safe in our case because they remain in the mapped page). You should avoid `simdjson::padded_input` on systems without a page size of at least 4096: virtually all systems qualify except for some niche embedded systems running custom operating systems. Standard Linux, Windows, macOS, Android, iOS, etc., are all fine.  Note that, most times, an `simdjson::padded_input` instance will not copy the data and will only act
-as a view (it does not own the memory).
-
-
 Performance Tips
 ---------------------

@@ -22,12 +22,10 @@ Contents
  - [Threads](#threads)
 - [Support](#support)
 - [API](#api)
- [Streaming directly from a memory-mapped file](#streaming-directly-from-a-memory-mapped-file)
 - [Use cases](#use-cases)
 - [Tracking your position](#tracking-your-position)
 - [Incomplete streams](#incomplete-streams)
 - [C++20 features](#c20-features)
- [C++26 features (static reflection)](#c26-features-static-reflection)

 Motivation
 -----------
@@ -134,7 +132,7 @@ E.g., `[1,2]{"32":1}` is recognized as two documents.
 Some official formats **(non-exhaustive list)**:
 - [Newline-Delimited JSON (NDJSON)](https://github.com/ndjson/ndjson-spec/)
 - [JSON lines (JSONL)](http://jsonlines.org/)
- [Record separator-delimited JSON (RFC 7464)](https://tools.ietf.org/html/rfc7464)
+- [Record separator-delimited JSON (RFC 7464)](https://tools.ietf.org/html/rfc7464) <- Not supported by simdjson!
 - [More on Wikipedia...](https://en.wikipedia.org/wiki/JSON_streaming)

 API
@@ -157,79 +155,13 @@ for (auto doc : docs) {
 See [basics.md](basics.md#newline-delimited-json-ndjson-and-json-lines) for an overview of the API.


-Streaming directly from a memory-mapped file
--------------------------------------------
-
-When your input is a large NDJSON / JSON-lines file on disk, the most efficient
-way to feed `iterate_many` is to use `simdjson::padded_memory_map`. It returns
-a `padded_string_view` with the right amount of trailing padding, so you can
-hand it straight to `iterate_many` without ever copying the file contents into
-your own buffer.
-
-`padded_memory_map` is available on POSIX systems (Linux, macOS, BSD, ...) by
-default. On Windows it is an **opt-in** feature with the following
-requirements:
-
-1. Build simdjson with `-DSIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=ON`, or — if
-   you consume simdjson as a pre-built library — define
-   `SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=1`, raise `NTDDI_VERSION` to at
-   least `NTDDI_WIN10_RS4` (`0x0A000005`, Windows 10 version 1803), and
-   add `onecore.lib` to your link line yourself. The Windows
-   implementation uses the modern memory APIs `CreateFileMapping2` /
-   `MapViewOfFile3`, which are available starting with that version of
-   Windows and are exported by `onecore.lib`.
-2. `#include <windows.h>` before `#include "simdjson.h"` in every
-   translation unit where you want to use `padded_memory_map`. simdjson
-   deliberately does not pull in `<windows.h>` itself, so the class is
-   only declared when the Win32 types are already visible.
-
-If either requirement is not met on Windows, the `padded_memory_map` class is
-not declared at all and any code that references it fails to compile with an
-"unknown identifier" error. The availability of the class can be tested with
-the macro `SIMDJSON_HAS_PADDED_MEMORY_MAP`.
-
-On POSIX, `padded_memory_map` uses `mmap` to map the file directly into
-memory with zero copies. On Windows (when enabled), it uses
-`CreateFileMapping2` + `MapViewOfFile3` for true zero-copy mapping
-whenever the file does not end within `SIMDJSON_PADDING` bytes of a page
-boundary; for those rare cases, it transparently falls back to reading
-the file into a heap-allocated padded buffer so that the returned view
-always has `SIMDJSON_PADDING` accessible zero bytes after the file content.
-
-```cpp
-#ifdef _WIN32
-#include <windows.h> // Must come BEFORE <simdjson.h> on Windows
-#endif
-#include "simdjson.h"
-
-// ...
-
-simdjson::padded_memory_map map("huge_stream.ndjson");
-if (!map.is_valid()) { /* file missing, unreadable, too large, ... */ return; }
-
-simdjson::ondemand::parser parser;
-simdjson::ondemand::document_stream stream;
-auto error = parser.iterate_many(map.view()).get(stream);
-if (error) { std::cerr << error << std::endl; return; }
-
-for (auto doc : stream) {
-  // process each JSON document in the stream
-  std::cout << doc << std::endl;
-}
-```
-
-Important lifetime rule: the `padded_string_view` returned by `map.view()` is
-only valid while the `padded_memory_map` instance is alive, so keep `map`
-alive for as long as you are iterating the stream.
-
-The file must not be modified while the memory map is in use. If you need a
-fully independent copy of the data, use `simdjson::padded_string::load(...)`
-instead.
-
-If you prefer single-document parsing on a memory-mapped file, the same
-pattern applies to `parser.iterate(...)`:
+**Advanced feature:**
+On non-Windows systems, you can use memory-file mapping to create a `simdjson::padded_string_view`
+from a file on disk.

 ```cpp
+// If the macro _WIN32 is defined, this will not work since we do not support memory-file mapping
+// under Windows at this time.
 simdjson::padded_memory_map map(myfilename);
 if (!map.is_valid()) { /* handle error */ }
 simdjson::padded_string_view view = map.view(); // view is usable while padded_memory_map is in scope
@@ -346,131 +278,39 @@ Importantly, you should only call `truncated_bytes()` after iterating through al
 Comma-separated documents
 -----------

-To parse comma-separated documents like `{"a":1},{"b":2},{"c":3}`, use the `stream_format::comma_delimited` parameter:
+We also support comma-separated documents, but with some performance limitations. The `iterate_many` function  takes in an option to allow parsing of comma separated documents (which defaults on false). In this mode, the entire buffer is processed in one batch. Therefore, the total size of the document should not exceed the maximal capacity of the parser (4 GB). This mode also effectively disallow multithreading. It is therefore mostly suitable for not "very large" inputs. In this mode, the batch_size parameter
+is effectively ignored, as it is set to at least the document size.
+
+Example:

 ```cpp
-auto json = R"({"a":1},{"b":2},{"c":3})"_padded;
-ondemand::parser parser;
-ondemand::document_stream stream;
-auto error = parser.iterate_many(json, ondemand::DEFAULT_BATCH_SIZE,
-                                 simdjson::stream_format::comma_delimited).get(stream);
-if (error) { std::cerr << error << std::endl; return; }
-for (auto doc : stream) {
-    std::cout << doc << std::endl;
-}
-// Prints: {"a":1}
-//         {"b":2}
-//         {"c":3}
+    auto json = R"( 1, 2, 3, 4, "a", "b", "c", {"hello": "world"} , [1, 2, 3])"_padded;
+    ondemand::parser parser;
+    ondemand::document_stream doc_stream;
+    // We pass '32' as the batch size, but it is a bogus parameter because, since
+    // we pass 'true' to the allow_comma parameter, the batch size will be set to at least
+    // the document size.
+    auto error = parser.iterate_many(json, 32, true).get(doc_stream);
+    if (error) { std::cerr << error << std::endl; return; }
+    for (auto doc : doc_stream) {
+        std::cout << doc.type() << std::endl;
+    }
+ ```
+
+ This will print:
+
 ```
-
-Whitespace around the commas is allowed:
-```cpp
-auto json = R"({"a":1} , {"b":2} , {"c":3})"_padded;  // Also works
+number
+number
+number
+number
+string
+string
+string
+object
+array
 ```

-Nested commas inside objects and arrays are preserved:
-```cpp
-auto json = R"({"arr":[1,2,3]},{"obj":{"x":1,"y":2}})"_padded;
-// Correctly parses as 2 documents, not 6
-```
-
-Mixed document types are supported:
-```cpp
-auto json = R"(1, 2, 3, 4, "a", "b", "c", {"hello": "world"}, [1, 2, 3])"_padded;
-ondemand::parser parser;
-ondemand::document_stream doc_stream;
-auto error = parser.iterate_many(json, ondemand::DEFAULT_BATCH_SIZE,
-                                 simdjson::stream_format::comma_delimited).get(doc_stream);
-if (error) { std::cerr << error << std::endl; return; }
-for (auto doc : doc_stream) {
-    std::cout << doc.type() << std::endl;
-}
-// Prints: number number number number string string string object array
-```
-
-Extra top-level separators are tolerated for compatibility with the legacy
-`allow_comma_separated` behavior. For example, leading commas, trailing commas,
-and repeated commas are treated as empty separators rather than documents.
-
-### Legacy `allow_comma_separated` parameter (deprecated)
-
-The `allow_comma_separated` boolean parameter is deprecated. When set to `true`, it now internally maps to `stream_format::comma_delimited`.
-
-The old single-batch limitation no longer applies - comma-delimited parsing now supports multi-batch processing and threading for optimal performance on large files.
-
-JSON Text Sequences (RFC 7464)
------------------------------
-
-[RFC 7464](https://tools.ietf.org/html/rfc7464) defines a format for streaming JSON values using ASCII Record Separator (RS, 0x1E) as a delimiter. Each JSON text is preceded by RS and optionally followed by ASCII Line Feed (LF, 0x0A).
-
-Example input:
-```
-<RS>{"name":"doc1"}<LF>
-<RS>{"name":"doc2"}<LF>
-<RS>{"name":"doc3"}<LF>
-```
-
-To parse JSON text sequences, use the `stream_format::json_sequence` parameter:
-
-```cpp
-// Build input with RS (0x1E) and LF (0x0A) delimiters
-std::string input_str;
-input_str += '\x1e'; input_str += "{\"a\":1}"; input_str += '\x0a';
-input_str += '\x1e'; input_str += "{\"b\":2}"; input_str += '\x0a';
-input_str += '\x1e'; input_str += "{\"c\":3}"; input_str += '\x0a';
-simdjson::padded_string input(input_str);
-
-ondemand::parser parser;
-ondemand::document_stream stream;
-auto error = parser.iterate_many(input, ondemand::DEFAULT_BATCH_SIZE,
-                                 simdjson::stream_format::json_sequence).get(stream);
-if (error) { std::cerr << error << std::endl; return; }
-for (auto doc : stream) {
-    std::cout << doc << std::endl;
-}
-```
-
-The `stream_format` enum has the following values:
- `stream_format::whitespace_delimited` (default): Standard NDJSON/JSON Lines format
- `stream_format::json_sequence`: RFC 7464 format with RS delimiters
- `stream_format::comma_delimited`: Comma-separated JSON documents
- `stream_format::comma_delimited_array`: A single JSON array whose elements are iterated as comma-delimited documents (see below)
-
-The trailing LF after each JSON text is optional but recommended by the RFC for robustness.
-
-JSON Array As A Document Stream
-------------------------------
-
-Sometimes an input is a single, well-formed JSON array — `[{"a":1},{"b":2},{"c":3}]` — but you want to iterate its elements one at a time without materializing the whole array. Use `stream_format::comma_delimited_array`:
-
-```cpp
-auto json = R"([{"a":1},{"b":2},{"c":3}])"_padded;
-ondemand::parser parser;
-ondemand::document_stream stream;
-auto error = parser.iterate_many(json, ondemand::DEFAULT_BATCH_SIZE,
-                                 simdjson::stream_format::comma_delimited_array).get(stream);
-if (error) { std::cerr << error << std::endl; return; }
-for (auto doc : stream) {
-    std::cout << doc << std::endl;
-}
-// Prints: {"a":1}
-//         {"b":2}
-//         {"c":3}
-```
-
-The parser strips the outer `[` and `]` plus any surrounding JSON whitespace (space, tab, LF, CR) and then behaves exactly like `stream_format::comma_delimited` over the remaining bytes. All comma-delimited features are inherited: multi-batch processing, threading, mixed scalar types, and nested commas preserved inside inner objects and arrays.
-
-```cpp
-// All of these work:
-auto a = R"([1, "x", true, null, {"k":"v"}, [1,2]])"_padded;  // mixed scalars
-auto b = R"(  [ 1, 2, 3 ] )"_padded;                          // whitespace
-auto c = R"([])"_padded;                                      // empty array → 0 docs
-```
-
-If the input is not a well-formed outer array (missing `[`, missing `]`, or empty / all-whitespace), `iterate_many` returns `TAPE_ERROR`. Content **inside** the array is not validated up front — individual document parse errors surface when you iterate, just like `comma_delimited`.
-
-Positions reported via `current_index()` are relative to the **stripped** buffer (the bytes between `[` and `]`), not the original input, for consistency with the existing BOM-stripping behavior.
-

 C++20 features
 --------------------
@@ -578,161 +418,3 @@ Otherwise you may use this longer version for explicit handling of errors:
    cars.push_back(c);
  }
 ```
-
-**Performance tip**: You will get better performance if you order the attributes (make, model)
-in the order they appear in the JSON document.
-
-C++26 features (static reflection)
-----------------------------------
-
-If you have a C++26 compatible compiler with [P2996](https://wg21.link/P2996)
-static reflection support, you can compile the simdjson library with the
-`SIMDJSON_STATIC_REFLECTION` macro set to `1`. When this is the case, simdjson
-can deserialize a stream of JSON documents directly into your own structures
-**without** writing any `tag_invoke` function. The library inspects the
-non-static public members of your type at compile time and produces the
-parsing code automatically.
-
-```cpp
-#define SIMDJSON_STATIC_REFLECTION 1
-#include "simdjson.h"
-```
-
-Consider the same `Car` structure used in the C++20 example, but **without**
-any `tag_invoke` glue:
-
-```cpp
-struct Car {
-  std::string make;
-  std::string model;
-  int year;
-  std::vector<double> tire_pressure;
-};
-```
-
-With C++26 static reflection enabled, you can iterate a stream of cars and
-push them into a `std::vector<Car>` directly:
-
-```cpp
-auto 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;
-auto error = parser.iterate_many(json).get(stream);
-if (error) { /* handle error */ }
-std::vector<Car> cars;
-for (auto doc : stream) {
-  Car c;
-  if ((error = doc.get<Car>().get(c))) { /* handle error */ }
-  cars.push_back(c);
-}
-```
-
-This works for every `stream_format` value supported by `iterate_many`. The
-following examples each parse the same three cars, but laid out using a
-different streaming convention.
-
-### Whitespace-delimited (default, NDJSON / JSON Lines)
-
-```cpp
-auto 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;
-auto error = parser.iterate_many(json, ondemand::DEFAULT_BATCH_SIZE,
-                                 simdjson::stream_format::whitespace_delimited).get(stream);
-if (error) { /* handle error */ }
-std::vector<Car> cars;
-for (auto doc : stream) {
-  cars.push_back((Car)doc); // throws on error
-}
-```
-
-### Comma-delimited documents
-
-```cpp
-auto 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;
-auto error = parser.iterate_many(json, ondemand::DEFAULT_BATCH_SIZE,
-                                 simdjson::stream_format::comma_delimited).get(stream);
-if (error) { /* handle error */ }
-std::vector<Car> cars;
-for (auto doc : stream) {
-  Car c;
-  if ((error = doc.get<Car>().get(c))) { /* handle error */ }
-  cars.push_back(c);
-}
-```
-
-### A single JSON array as a stream of documents
-
-When the input is a single JSON array, you can stream its elements one at a
-time without materializing the entire array as a `std::vector` upfront:
-
-```cpp
-auto 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;
-auto error = parser.iterate_many(json, ondemand::DEFAULT_BATCH_SIZE,
-                                 simdjson::stream_format::comma_delimited_array).get(stream);
-if (error) { /* handle error */ }
-std::vector<Car> cars;
-for (auto doc : stream) {
-  Car c;
-  if ((error = doc.get<Car>().get(c))) { /* handle error */ }
-  cars.push_back(c);
-}
-```
-
-### JSON Text Sequences (RFC 7464)
-
-```cpp
-// Build input with RS (0x1E) and LF (0x0A) delimiters
-std::string input_str;
-auto append = [&](std::string_view doc) {
-  input_str += '\x1e'; input_str += doc; input_str += '\x0a';
-};
-append(R"({ "make": "Toyota", "model": "Camry",  "year": 2018, "tire_pressure": [ 40.1, 39.9 ] })");
-append(R"({ "make": "Kia",    "model": "Soul",   "year": 2012, "tire_pressure": [ 30.1, 31.0 ] })");
-append(R"({ "make": "Toyota", "model": "Tercel", "year": 1999, "tire_pressure": [ 29.8, 30.0 ] })");
-simdjson::padded_string input(input_str);
-
-ondemand::parser parser;
-ondemand::document_stream stream;
-auto error = parser.iterate_many(input, ondemand::DEFAULT_BATCH_SIZE,
-                                 simdjson::stream_format::json_sequence).get(stream);
-if (error) { /* handle error */ }
-std::vector<Car> cars;
-for (auto doc : stream) {
-  Car c;
-  if ((error = doc.get<Car>().get(c))) { /* handle error */ }
-  cars.push_back(c);
-}
-```
-
-In every case, the user-defined type (`Car` here) does not need a hand-written
-`tag_invoke` overload: the library generates the deserialization code from the
-type's public data members at compile time.
-
-
-**Performance tip**: You will get better performance if you order the attributes (make, model)
-in the order they appear in the JSON document.
@@ -18,7 +18,6 @@ Contents
 - [How it works](#how-it-works)
 - [Support](#support)
 - [API](#api)
- [Streaming directly from a memory-mapped file](#streaming-directly-from-a-memory-mapped-file)
 - [Use cases](#use-cases)
 - [Tracking your position](#tracking-your-position)
 - [Incomplete streams](#incomplete-streams)
@@ -133,7 +132,7 @@ Whitespace Characters:
 Some official formats **(non-exhaustive list)**:
 - [Newline-Delimited JSON (NDJSON)](https://github.com/ndjson/ndjson-spec)
 - [JSON lines (JSONL)](http://jsonlines.org/)
- [Record separator-delimited JSON (RFC 7464)](https://tools.ietf.org/html/rfc7464)
+- [Record separator-delimited JSON (RFC 7464)](https://tools.ietf.org/html/rfc7464) <- Not supported by simdjson!
 - [More on Wikipedia...](https://en.wikipedia.org/wiki/JSON_streaming)

 API
@@ -219,83 +218,17 @@ got full document at 29



-Streaming directly from a memory-mapped file
--------------------------------------------
-
-When your input is a large NDJSON / JSON-lines file on disk, the most
-efficient way to feed `parse_many` is to use `simdjson::padded_memory_map`.
-It returns a `padded_string_view` with the right amount of trailing padding,
-so you can pass it directly to `parse_many` without copying the file content
-into your own buffer first.
-
-`padded_memory_map` is available on POSIX systems (Linux, macOS, BSD, ...) by
-default. On Windows it is an **opt-in** feature with the following
-requirements:
-
-1. Build simdjson with `-DSIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=ON`, or — if
-   you consume simdjson as a pre-built library — define
-   `SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=1`, raise `NTDDI_VERSION` to at
-   least `NTDDI_WIN10_RS4` (`0x0A000005`, Windows 10 version 1803), and
-   add `onecore.lib` to your link line yourself. The Windows
-   implementation uses the modern memory APIs `CreateFileMapping2` /
-   `MapViewOfFile3`, which are available starting with that version of
-   Windows and are exported by `onecore.lib`.
-2. `#include <windows.h>` before `#include "simdjson.h"` in every
-   translation unit where you want to use `padded_memory_map`. simdjson
-   deliberately does not pull in `<windows.h>` itself, so the class is
-   only declared when the Win32 types are already visible.
-
-If either requirement is not met on Windows, the `padded_memory_map` class is
-not declared at all and any code that references it fails to compile with an
-"unknown identifier" error. The availability of the class can be tested with
-the macro `SIMDJSON_HAS_PADDED_MEMORY_MAP`.
-
-On POSIX, `padded_memory_map` uses `mmap` to map the file directly into
-memory with zero copies. On Windows (when enabled), it uses
-`CreateFileMapping2` + `MapViewOfFile3` for true zero-copy mapping
-whenever the file does not end within `SIMDJSON_PADDING` bytes of a page
-boundary; for those rare cases, it transparently falls back to reading
-the file into a heap-allocated padded buffer so that the returned view
-always has `SIMDJSON_PADDING` accessible zero bytes after the file content.
-
-```cpp
-#ifdef _WIN32
-#include <windows.h> // Must come BEFORE <simdjson.h> on Windows
-#endif
-#include "simdjson.h"
-
-// ...
-
-simdjson::padded_memory_map map("huge_stream.ndjson");
-if (!map.is_valid()) { /* file missing, unreadable, too large, ... */ return; }
-
-simdjson::dom::parser parser;
-simdjson::dom::document_stream stream;
-auto error = parser.parse_many(map.view()).get(stream);
-if (error) { std::cerr << error << std::endl; return; }
-
-for (auto doc : stream) {
-  // process each JSON document in the stream
-  std::cout << doc << std::endl;
-}
-```
-
-Important lifetime rule: the `padded_string_view` returned by `map.view()` is
-only valid while the `padded_memory_map` instance is alive, so keep `map`
-alive for as long as you are iterating the stream.
-
-The file must not be modified while the memory map is in use. If you need a
-fully independent copy of the data, use `simdjson::padded_string::load(...)`
-instead.
-
-If you prefer single-document parsing on a memory-mapped file, the same
-pattern applies to `parser.parse(...)`:
+**Advanced feature:**
+On non-Windows systems, you can use memory-file mapping to create a `simdjson::padded_string_view`
+from a file on disk.

 ```cpp
+// If the macro _WIN32 is defined, this will not work since we do not support memory-file mapping
+// under Windows at this time.
 simdjson::padded_memory_map map(myfilename);
 if (!map.is_valid()) { /* handle error */ }
 simdjson::padded_string_view view = map.view(); // view is usable while padded_memory_map is in scope
-simdjson::dom::element doc = parser.parse(view); // parse the JSON
+ondemand::document doc = parser.iterate(view); // parse the JSON
 ```

 Incomplete streams
@@ -320,115 +253,3 @@ Consider the following example where a truncated document (`{"key":"intentionall


 Importantly, you should only call `truncated_bytes()` after iterating through all of the documents since the stream cannot tell whether there are truncated documents at the very end when it may not have accessed that part of the data yet.
-
-JSON Text Sequences (RFC 7464)
------------------------------
-
-[RFC 7464](https://tools.ietf.org/html/rfc7464) defines a format for streaming JSON values using ASCII Record Separator (RS, 0x1E) as a delimiter. Each JSON text is preceded by RS and optionally followed by ASCII Line Feed (LF, 0x0A).
-
-Example input:
-```
-<RS>{"name":"doc1"}<LF>
-<RS>{"name":"doc2"}<LF>
-<RS>{"name":"doc3"}<LF>
-```
-
-To parse JSON text sequences, use the `stream_format::json_sequence` parameter:
-
-```cpp
-// Build input with RS (0x1E) and LF (0x0A) delimiters
-std::string input_str;
-input_str += '\x1e'; input_str += "{\"a\":1}"; input_str += '\x0a';
-input_str += '\x1e'; input_str += "{\"b\":2}"; input_str += '\x0a';
-input_str += '\x1e'; input_str += "{\"c\":3}"; input_str += '\x0a';
-simdjson::padded_string input(input_str);
-
-simdjson::dom::parser parser;
-simdjson::dom::document_stream stream;
-auto error = parser.parse_many(input, simdjson::dom::DEFAULT_BATCH_SIZE,
-                               simdjson::stream_format::json_sequence).get(stream);
-if (error) { std::cerr << error << std::endl; return; }
-for (auto doc : stream) {
-    std::cout << doc << std::endl;
-}
-```
-
-The `stream_format` enum has the following values:
- `stream_format::whitespace_delimited` (default): Standard NDJSON/JSON Lines format
- `stream_format::json_sequence`: RFC 7464 format with RS delimiters
- `stream_format::comma_delimited`: Comma-separated JSON documents
- `stream_format::comma_delimited_array`: A single JSON array whose elements are iterated as comma-delimited documents (see below)
-
-The trailing LF after each JSON text is optional but recommended by the RFC for robustness.
-
-Comma-Separated Documents
-------------------------
-
-Some systems produce JSON documents separated by commas, like `{"a":1},{"b":2},{"c":3}`. This is common when extracting elements from a JSON array or when APIs return comma-separated results.
-
-To parse comma-separated documents, use the `stream_format::comma_delimited` parameter:
-
-```cpp
-auto json = R"({"a":1},{"b":2},{"c":3})"_padded;
-simdjson::dom::parser parser;
-simdjson::dom::document_stream stream;
-auto error = parser.parse_many(json, simdjson::dom::DEFAULT_BATCH_SIZE,
-                               simdjson::stream_format::comma_delimited).get(stream);
-if (error) { std::cerr << error << std::endl; return; }
-for (auto doc : stream) {
-    std::cout << doc << std::endl;
-}
-// Prints: {"a":1}
-//         {"b":2}
-//         {"c":3}
-```
-
-Whitespace around the commas is allowed:
-```cpp
-auto json = R"({"a":1} , {"b":2} , {"c":3})"_padded;  // Also works
-```
-
-Nested commas inside objects and arrays are preserved:
-```cpp
-auto json = R"({"arr":[1,2,3]},{"obj":{"x":1,"y":2}})"_padded;
-// Correctly parses as 2 documents, not 6
-```
-
-Extra top-level separators are tolerated for compatibility with the legacy
-On-Demand comma-separated mode. Leading commas, trailing commas, and repeated
-commas are treated as empty separators rather than documents.
-
-Unlike the legacy `allow_comma_separated` parameter, `stream_format::comma_delimited` supports multi-batch processing and threading for optimal performance on large files.
-
-JSON Array As A Document Stream
-------------------------------
-
-Sometimes an input is a single, well-formed JSON array — `[{"a":1},{"b":2},{"c":3}]` — but you want to iterate its elements one at a time without materializing the whole array. Use `stream_format::comma_delimited_array`:
-
-```cpp
-auto json = R"([{"a":1},{"b":2},{"c":3}])"_padded;
-simdjson::dom::parser parser;
-simdjson::dom::document_stream stream;
-auto error = parser.parse_many(json, simdjson::dom::DEFAULT_BATCH_SIZE,
-                               simdjson::stream_format::comma_delimited_array).get(stream);
-if (error) { std::cerr << error << std::endl; return; }
-for (auto doc : stream) {
-    std::cout << doc << std::endl;
-}
-// Prints: {"a":1}
-//         {"b":2}
-//         {"c":3}
-```
-
-The parser strips the outer `[` and `]` plus any surrounding JSON whitespace (space, tab, LF, CR) and then behaves exactly like `stream_format::comma_delimited` over the remaining bytes. All comma-delimited features are inherited: multi-batch processing, threading, mixed scalar types, and nested commas preserved inside inner objects and arrays.
-
-```cpp
-// All of these work:
-auto a = R"([1, "x", true, null, {"k":"v"}, [1,2]])"_padded;  // mixed scalars
-auto b = R"(  [ 1, 2, 3 ] )"_padded;                          // whitespace
-auto c = R"([])"_padded;                                      // empty array → 0 docs
-```
-
-If the input is not a well-formed outer array (missing `[`, missing `]`, or empty / all-whitespace), `parse_many` returns `TAPE_ERROR`. Content **inside** the array is not validated up front — individual document parse errors surface when you iterate, just like `comma_delimited`.
-
-Positions reported via `current_index()` are relative to the **stripped** buffer (the bytes between `[` and `]`), not the original input, for consistency with the existing BOM-stripping behavior.
@@ -204,31 +204,9 @@ but can be significantly larger. E.g., Apple systems favour pages spanning 16 ki

 In effect, it means that you can almost always read a few bytes beyond your current buffer---without
 allocating extra memory. However, tools such as valgrind or memory sanitizers will flag such behavior as unsafe.
-You can still make sure of this capability in your code if you are an expert
-programmer and you are willing to silence sanitizer warnings.
-
-If you are building simdjson with C++17 or better, you can use `simdjson::padded_input`.
-The `padded_input` struct automatically manages padding for you. It can be constructed from a `std::string_view`, a C-style string with length, or a `std::string`. For `std::string`, it takes into account the reserved capacity when determining if sufficient padding exists. If the input already has sufficient padding (up to the end of the memory page), it creates a view without copying. Otherwise, it copies the data into a `padded_string` with proper padding.
-
-Example usage:
-
-```cpp
-std::string_view json = get_json_data();
-simdjson::padded_input input(json);  // Automatically pads if needed
-auto result = parser.parse(input);
-
-// Also works with std::string, considering capacity
-std::string json_str = get_json_string();
-json_str.reserve(json_str.size() + 100);  // Reserve extra space
-simdjson::padded_input input2(json_str);  // May avoid copying if capacity is sufficient
-auto result2 = parser.parse(input2);
-```
-
-This simplifies padding management compared to manually checking and allocating.
-
-
-More generally, the following code provides a portable example.
-
+Nevertheless, you can still make sure of this capability in your code if you are an expert
+programmer and you are willing to silence sanitizer warnings. The following code provides
+a portable example.


 The conditional compilation checks for the `_MSC_VER` macro (indicating Microsoft Visual Studio)
@@ -272,7 +250,7 @@ long page_size() {
 }

 // Returns true if the buffer + len + simdjson::SIMDJSON_PADDING crosses the
-// page boundary. Assumes len != 0.
+// 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()));
@@ -93,14 +93,6 @@ Float values are represented as two 64-bit tape elements:

 Performance consideration: We store numbers of the main tape because we believe that locality of reference is helpful for performance.

-## Big Integers
-
-When a JSON integer exceeds the 64-bit range (both signed and unsigned), it is classified as a big integer. By default, parsing returns `BIGINT_ERROR`. When `parser.number_as_string(true)` is set, the raw digits are stored on the string tape using the same format as strings (4-byte little-endian length prefix, followed by the UTF-8 digit bytes, followed by a null terminator).
-
-A big integer is represented on the main tape as the 64-bit tape element `('Z' << 56) + x` where the payload `x` is the location on the string tape of the null-terminated digit string.
-
-For example, the JSON value `99999999999999999999` would be stored as the string `"99999999999999999999"` on the string tape, with a `'Z'` tag on the main tape. Negative big integers include the leading minus sign.
-
 ## Root node

 Each JSON document will have two special 64-bit tape elements representing a root node, one at the beginning and one at the end.
@@ -2,13 +2,6 @@
 function(add_quickstart_test TEST_NAME SOURCE_FILE)
  cmake_parse_arguments(PARSE_ARGV 2 ARGS "NO_EXCEPTIONS;NATIVE_ARCH" "" "CXX_STANDARD;LABELS")

-  # Standard compiler flags
-  if (MSVC)
-    list(APPEND QUICKSTART_FLAGS /WX)
-  else()
-    list(APPEND QUICKSTART_FLAGS -Werror)
-  endif()
-
  # Native architecture compiler flag
  if (ARGS_NATIVE_ARCH)
    if (MSVC)
@@ -54,9 +54,6 @@ static void print_json(std::ostream& os, simdjson::dom::element element) noexcep
  case simdjson::dom::element_type::NULL_VALUE:
    os << "null" << endl;
    break;
-  case simdjson::dom::element_type::BIGINT:
-    os << element.get_bigint().value_unsafe() << endl;
-    break;
  }
 }
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
@@ -21,10 +21,6 @@ SIMDJSON_PUSH_DISABLE_UNUSED_WARNINGS

 /** The maximum document size supported by simdjson. */
 constexpr size_t SIMDJSON_MAXSIZE_BYTES = 0xFFFFFFFF;
-/** The maximum depth of nested objects and arrays supported by simdjson.
- A depth of SIMDJSON_MAXSIZE_BYTES/2 is not reasonable and would be
- adversarial, but it serves as an upper bound for validation purposes. */
-constexpr size_t SIMDJSON_MAX_DEPTH = SIMDJSON_MAXSIZE_BYTES/2;

 /**
 * The amount of padding needed in a buffer to parse JSON.
@@ -50,21 +46,6 @@ struct padded_string;
 class padded_string_view;
 enum class stage1_mode;

-/**
- * Stream format for parse_many/iterate_many.
- */
-enum class stream_format {
-  whitespace_delimited, ///< Whitespace-delimited JSON documents (default, includes NDJSON/JSONL)
-  json_sequence,        ///< RFC 7464 JSON text sequences (RS-delimited)
-  comma_delimited,      ///< Comma-separated JSON documents (e.g., `{...},{...},{...}`)
-  comma_delimited_array ///< A single JSON array whose elements are iterated as
-                        ///< comma-separated documents (e.g., `[{...},{...},{...}]`).
-                        ///< The parser strips the outer `[` / `]` plus any
-                        ///< surrounding JSON whitespace (space, tab, LF, CR)
-                        ///< and then behaves like `comma_delimited` over the
-                        ///< remaining bytes.
-};
-
 namespace internal {

 template<typename T>
@@ -266,12 +266,6 @@ consteval std::pair<double, size_t> parse_double(const char *src,
 }
 } // namespace number_parsing

-consteval auto make_data_member_options(auto&& name_str) {
-  std::meta::data_member_options options{};
-  options.name = std::forward<decltype(name_str)>(name_str);
-  return options;
-}
-
 // JSON string may contain embedded nulls, and C++26 reflection does not yet
 // support std::string_view as a data member type. As a workaround, we define
 // a custom type that holds a const char* and a size.
@@ -326,8 +320,7 @@ using class_type = type_builder<meta_info...>::constructed_type;
 /**
 * @brief Variable template for constructing instances with values
 */
-template <typename T, auto... Vs> constexpr T construct_from = T{Vs...};
-
+template <typename T, auto... Vs> constexpr auto construct_from = T{Vs...};

 // in JSON, there are only a few whitespace characters that are allowed
 // outside of objects, arrays, strings, and numbers.
@@ -417,7 +410,7 @@ parse_number(std::string_view json,
        std::from_chars(json.data(), json.data() + json.size(), int_value);
    if (res.ec == std::errc()) {
      out = int_value;
-      if (static_cast<std::size_t>(res.ptr - json.data()) != scope) {
+      if ((res.ptr - json.data()) != scope) {
        simdjson_consteval_error(
            "Internal error: cannot agree on the character range of the float");
      }
@@ -431,7 +424,7 @@ parse_number(std::string_view json,
        std::from_chars(json.data(), json.data() + json.size(), uint_value);
    if (res.ec == std::errc()) {
      out = uint_value;
-      if (static_cast<std::size_t>(res.ptr - json.data()) != scope) {
+      if ((res.ptr - json.data()) != scope) {
        simdjson_consteval_error(
            "Internal error: cannot agree on the character range of the float");
      }
@@ -540,7 +533,7 @@ parse_string(std::string_view json) {
      // present, we have an error (isolated high surrogate), which we
      // tolerate by substituting the substitution_code_point.
      if (end - cursor < 6 || *cursor != '\\' ||
-          *(cursor + 1) != 'u') {
+          *(cursor + 1) != 'u' > 0xFFFF) {
        code_point = substitution_code_point;
      } else {       // we have \u following the high surrogate
        cursor += 2; // skip \u
@@ -894,19 +887,10 @@ parse_json_array_impl(const std::string_view json) {
  std::size_t count = values.size() - 1;
  // We assume all elements have the same type as the first element.
  // However, if the array is heterogeneous, we should use std::variant.
-  auto elem_type = std::meta::type_of(values[1]);
-  // String literals reflected via reflect_constant_string have type const
-  // char[N], but when passed as template auto parameters they decay to
-  // const char*.  Use const char* as the element type so that
-  // construct_from can aggregate-initialize the array.
-  if (std::meta::is_array_type(elem_type) &&
-      std::meta::remove_all_extents(elem_type) == ^^const char) {
-    elem_type = ^^const char *;
-  }
  auto array_type = std::meta::substitute(
      ^^std::array,
      {
-          elem_type, std::meta::reflect_constant(count)});
+          std::meta::type_of(values[1]), std::meta::reflect_constant(count)});

  // Create array instance with values
  values[0] = array_type;
@@ -973,7 +957,8 @@ parse_json_object_impl(std::string_view json) {
        simdjson_consteval_error("Expected '}'");
      }
      cursor += object_size;
-      auto dms = std::meta::data_member_spec(std::meta::type_of(parsed), make_data_member_options(field_name));
+      auto dms = std::meta::data_member_spec(std::meta::type_of(parsed),
+                                             {.name = field_name});
      members.push_back(std::meta::reflect_constant(dms));
      values.push_back(parsed);

@@ -982,7 +967,8 @@ parse_json_object_impl(std::string_view json) {
    case '[': {
      std::string_view value(cursor, end);
      auto [parsed, array_size] = parse_json_array_impl(value);
-      auto dms = std::meta::data_member_spec(std::meta::type_of(parsed), make_data_member_options(field_name));
+      auto dms = std::meta::data_member_spec(std::meta::type_of(parsed),
+                                             {.name = field_name});
      members.push_back(std::meta::reflect_constant(dms));
      values.push_back(parsed);
      if (*(cursor + array_size - 1) != ']') {
@@ -1003,7 +989,8 @@ parse_json_object_impl(std::string_view json) {
        }
      }
      auto dms =
-          std::meta::data_member_spec(^^const char *, make_data_member_options(field_name));
+          std::meta::data_member_spec(^^const char *, {
+                                                          .name = field_name});
      members.push_back(std::meta::reflect_constant(dms));
      values.push_back(std::meta::reflect_constant_string(value));
      break;
@@ -1014,7 +1001,8 @@ parse_json_object_impl(std::string_view json) {
      }
      cursor += 4;

-      auto dms = std::meta::data_member_spec(^^bool, make_data_member_options(field_name));
+      auto dms = std::meta::data_member_spec(^^bool, {
+                                                         .name = field_name});
      members.push_back(std::meta::reflect_constant(dms));
      values.push_back(std::meta::reflect_constant(true));
      break;
@@ -1025,7 +1013,8 @@ parse_json_object_impl(std::string_view json) {
      }
      cursor += 5;

-      auto dms = std::meta::data_member_spec(^^bool, make_data_member_options(field_name));
+      auto dms = std::meta::data_member_spec(^^bool, {
+                                                         .name = field_name});
      members.push_back(std::meta::reflect_constant(dms));
      values.push_back(std::meta::reflect_constant(false));
      break;
@@ -1036,7 +1025,9 @@ parse_json_object_impl(std::string_view json) {
      }
      cursor += 4;

-      auto dms = std::meta::data_member_spec(^^std::nullptr_t, make_data_member_options(field_name));
+      auto dms = std::meta::data_member_spec(^^std::nullptr_t,
+                                             {
+                                                 .name = field_name});
      members.push_back(std::meta::reflect_constant(dms));
      values.push_back(std::meta::reflect_constant(nullptr));
      break;
@@ -1060,19 +1051,22 @@ parse_json_object_impl(std::string_view json) {
      if (std::holds_alternative<int64_t>(out)) {
        int64_t int_value = std::get<int64_t>(out);
        auto dms =
-            std::meta::data_member_spec(^^int64_t, make_data_member_options(field_name));
+            std::meta::data_member_spec(^^int64_t, {
+                                                       .name = field_name});
        members.push_back(std::meta::reflect_constant(dms));
        values.push_back(std::meta::reflect_constant(int_value));
      } else if (std::holds_alternative<uint64_t>(out)) {
        uint64_t uint_value = std::get<uint64_t>(out);
        auto dms =
-            std::meta::data_member_spec(^^uint64_t, make_data_member_options(field_name));
+            std::meta::data_member_spec(^^uint64_t, {
+                                                        .name = field_name});
        members.push_back(std::meta::reflect_constant(dms));
        values.push_back(std::meta::reflect_constant(uint_value));
      } else {
        double float_value = std::get<double>(out);
        auto dms =
-            std::meta::data_member_spec(^^double, make_data_member_options(field_name));
+            std::meta::data_member_spec(^^double, {
+                                                      .name = field_name});
        members.push_back(std::meta::reflect_constant(dms));
        values.push_back(std::meta::reflect_constant(float_value));
      }
@@ -1117,11 +1111,16 @@ template <constevalutil::fixed_string json_str> consteval auto parse_json() {
                "Only JSON objects and arrays are supported at the top level, this "
                "limitation will be lifted in the future.");*/

-  if constexpr (json.front() == '[') {
-    return [: parse_json_array_impl(json).first :];
-  } else {
-    return [: parse_json_object_impl(json).first :];
-  }
+  constexpr auto result = json.front() == '['
+                              ? parse_json_array_impl(json)
+                              : parse_json_object_impl(json);
+  return [: result.first :];
+  /*
+  if(json.front() == '[') {
+      return [:parse_json_array_impl(json).first:];
+  } else if(json.front() == '{') {
+   //   return [:parse_json_object_impl(json).first:];
+  }*/
 }

 } // namespace compile_time
@@ -63,16 +63,13 @@ namespace compile_time {
 template <constevalutil::fixed_string json_str> consteval auto parse_json();

 } // namespace compile_time
+} // namespace simdjson

-inline namespace literals {

 template <simdjson::constevalutil::fixed_string str>
 consteval auto operator ""_json() {
  return simdjson::compile_time::parse_json<str>();
 }

-} // namespace literals
-} // namespace simdjson
-
 #endif // SIMDJSON_STATIC_REFLECTION
 #endif // SIMDJSON_GENERIC_COMPILE_TIME_JSON_H
@@ -59,15 +59,6 @@ concept appendable_containers =
    details::supports_add<T> || details::supports_append<T> ||
    details::supports_insert<T>) && !string_view_keyed_map<T>;

-/// Check if T is a key_selector type for efficient JSON field lookup.
-/// T must expose a compile-time N (number of keys) and static match_raw that
-/// returns [0, N) on hit or N on miss.
-template <typename T>
-concept key_selector_type = requires {
-    { T::size() } -> std::same_as<std::size_t>;
-    { T::N } -> std::convertible_to<std::size_t>;
-};
-
 /// Insert into the container however possible
 template <appendable_containers T, typename... Args>
 constexpr decltype(auto) emplace_one(T &vec, Args &&...args) {
@@ -58,11 +58,6 @@ struct fixed_string {
            data[i] = str[i];
        }
    }
-    constexpr fixed_string(const unsigned char (&str)[N])  {
-        for (std::size_t i = 0; i < N; ++i) {
-            data[i] = static_cast<char>(str[i]);
-        }
-    }
    char data[N];
    constexpr std::string_view view() const { return {data, N - 1}; }
    constexpr size_t size() const { return N ; }
@@ -33,9 +33,6 @@ inline error_code document::allocate(size_t capacity) noexcept {
    allocated_capacity = 0;
    return SUCCESS;
  }
-  if (capacity > SIMDJSON_MAXSIZE_BYTES) {
-    return CAPACITY;
-  }

  // a pathological input like "[[[[..." would generate capacity tape elements, so
  // need a capacity of at least capacity + 1, but it is also possible to do
@@ -144,15 +141,6 @@ inline bool document::dump_raw_tape(std::ostream &os) const noexcept {
    case 'r': // we start and end with the root node
      // should we be hitting the root node?
      return false;
-    case 'Z': // we have a big integer
-      os << "bigint ";
-      std::memcpy(&string_length, string_buf.get() + payload, sizeof(uint32_t));
-      os << std::string_view(
-        reinterpret_cast<const char *>(string_buf.get() + payload + sizeof(uint32_t)),
-        string_length
-      );
-      os << '\n';
-      break;
    default:
      return false;
    }
@@ -89,14 +89,12 @@ simdjson_inline document_stream::document_stream(
  dom::parser &_parser,
  const uint8_t *_buf,
  size_t _len,
-  size_t _batch_size,
-  stream_format _format
+  size_t _batch_size
 ) noexcept
  : parser{&_parser},
    buf{_buf},
    len{_len},
    batch_size{_batch_size <= MINIMAL_BATCH_SIZE ? MINIMAL_BATCH_SIZE : _batch_size},
-    format{_format},
    error{SUCCESS}
 #ifdef SIMDJSON_THREADS_ENABLED
    , use_thread(_parser.threaded) // we need to make a copy because _parser.threaded can change
@@ -114,7 +112,6 @@ simdjson_inline document_stream::document_stream() noexcept
    buf{nullptr},
    len{0},
    batch_size{0},
-    format{stream_format::whitespace_delimited},
    error{UNINITIALIZED}
 #ifdef SIMDJSON_THREADS_ENABLED
    , use_thread(false)
@@ -227,14 +224,7 @@ simdjson_inline std::string_view document_stream::iterator::source() const noexc
  } else {
    size_t next_doc_index = stream->batch_start + stream->parser->implementation->structural_indexes[stream->parser->implementation->next_structural_index];
    size_t svlen = next_doc_index - current_index();
-    // Trim trailing whitespace, NUL, and RS (0x1E). In RFC 7464 json_sequence
-    // mode the scanner classifies RS as a scalar character, so an RS-prefixed
-    // scalar document (number/true/false/null/string) has no closing structural
-    // index and the slice runs all the way up to the next document's RS. RS
-    // cannot legally appear in a JSON value at the source level (control
-    // characters in strings must be escaped as \u001E), so stripping it is
-    // safe in every stream_format.
-    while(svlen > 1 && (std::isspace(start[svlen-1]) || start[svlen-1] == '\0' || static_cast<uint8_t>(start[svlen-1]) == 0x1E)) {
+    while(svlen > 1 && (std::isspace(start[svlen-1]) || start[svlen-1] == '\0')) {
      svlen--;
    }
    return std::string_view(start, svlen);
@@ -284,35 +274,10 @@ inline size_t document_stream::next_batch_start() const noexcept {

 inline error_code document_stream::run_stage1(dom::parser &p, size_t _batch_start) noexcept {
  size_t remaining = len - _batch_start;
-  stage1_mode mode;
  if (remaining <= batch_size) {
-    // Final batch
-    switch (format) {
-      case stream_format::json_sequence:
-        mode = stage1_mode::json_sequence_final;
-        break;
-      case stream_format::comma_delimited:
-        mode = stage1_mode::comma_delimited_final;
-        break;
-      default:
-        mode = stage1_mode::streaming_final;
-        break;
-    }
-    return p.implementation->stage1(&buf[_batch_start], remaining, mode);
+    return p.implementation->stage1(&buf[_batch_start], remaining, stage1_mode::streaming_final);
  } else {
-    // Partial batch
-    switch (format) {
-      case stream_format::json_sequence:
-        mode = stage1_mode::json_sequence_partial;
-        break;
-      case stream_format::comma_delimited:
-        mode = stage1_mode::comma_delimited_partial;
-        break;
-      default:
-        mode = stage1_mode::streaming_partial;
-        break;
-    }
-    return p.implementation->stage1(&buf[_batch_start], batch_size, mode);
+    return p.implementation->stage1(&buf[_batch_start], batch_size, stage1_mode::streaming_partial);
  }
 }

@@ -206,14 +206,12 @@ private:
   * @param buf is the raw byte buffer we need to process
   * @param len is the length of the raw byte buffer in bytes
   * @param batch_size is the size of the windows (must be strictly greater or equal to the largest JSON document)
-   * @param format is the stream format
   */
  simdjson_inline document_stream(
    dom::parser &parser,
    const uint8_t *buf,
    size_t len,
-    size_t batch_size,
-    stream_format format = stream_format::whitespace_delimited
+    size_t batch_size
  ) noexcept;

  /**
@@ -263,8 +261,6 @@ private:
  const uint8_t *buf;
  size_t len;
  size_t batch_size;
-  /** The stream format. */
-  stream_format format;
  /** The error (or lack thereof) from the current document. */
  error_code error;
  size_t batch_start{0};
@@ -81,10 +81,6 @@ simdjson_inline simdjson_result<bool> simdjson_result<dom::element>::get_bool()
  if (error()) { return error(); }
  return first.get_bool();
 }
-simdjson_inline simdjson_result<std::string_view> simdjson_result<dom::element>::get_bigint() const noexcept {
-  if (error()) { return error(); }
-  return first.get_bigint();
-}

 simdjson_inline bool simdjson_result<dom::element>::is_array() const noexcept {
  return !error() && first.is_array();
@@ -114,9 +110,6 @@ simdjson_inline bool simdjson_result<dom::element>::is_bool() const noexcept {
 simdjson_inline bool simdjson_result<dom::element>::is_null() const noexcept {
  return !error() && first.is_null();
 }
-simdjson_inline bool simdjson_result<dom::element>::is_bigint() const noexcept {
-  return !error() && first.is_bigint();
-}

 simdjson_inline simdjson_result<dom::element> simdjson_result<dom::element>::operator[](std::string_view key) const noexcept {
  if (error()) { return error(); }
@@ -225,15 +218,6 @@ inline simdjson_result<bool> element::get_bool() const noexcept {
  }
  return INCORRECT_TYPE;
 }
-inline simdjson_result<std::string_view> element::get_bigint() const noexcept {
-  SIMDJSON_DEVELOPMENT_ASSERT(tape.usable());
-  switch (tape.tape_ref_type()) {
-    case internal::tape_type::BIGINT:
-      return tape.get_string_view();
-    default:
-      return INCORRECT_TYPE;
-  }
-}
 inline simdjson_result<const char *> element::get_c_str() const noexcept {
  SIMDJSON_DEVELOPMENT_ASSERT(tape.usable()); // https://github.com/simdjson/simdjson/issues/1914
  switch (tape.tape_ref_type()) {
@@ -376,10 +360,6 @@ inline bool element::is_null() const noexcept {
  return tape.is_null_on_tape();
 }

-inline bool element::is_bigint() const noexcept {
-  return tape.tape_ref_type() == internal::tape_type::BIGINT;
-}
-
 #if SIMDJSON_EXCEPTIONS

 inline element::operator bool() const noexcept(false) { return get<bool>(); }
@@ -512,8 +492,6 @@ inline std::ostream& operator<<(std::ostream& out, element_type type) {
      return out << "bool";
    case element_type::NULL_VALUE:
      return out << "null";
-    case element_type::BIGINT:
-      return out << "bigint";
    default:
      return out << "unexpected content!!!"; // abort() usage is forbidden in the library
  }
@@ -21,10 +21,7 @@ enum class element_type {
  DOUBLE = 'd',    ///< double: Any number with a "." or "e" that fits in double.
  STRING = '"',    ///< std::string_view
  BOOL = 't',      ///< bool
-  NULL_VALUE = 'n', ///< null
-  /// The BIGINT type is for integers that do not fit in 64 bits. It is only present
-  // if you set parser.number_as_string(true).
-  BIGINT = 'Z'     ///< std::string_view: big integer stored as raw digit string
+  NULL_VALUE = 'n' ///< null
 };

 /**
@@ -123,14 +120,6 @@ public:
   */
  inline simdjson_result<bool> get_bool() const noexcept;

-  /**
-   * Read this element as a big integer (raw digit string).
-   *
-   * @returns A string_view of the raw digits, or:
-   *          INCORRECT_TYPE if the JSON element is not a big integer.
-   */
-  inline simdjson_result<std::string_view> get_bigint() const noexcept;
-
  /**
   * Whether this element is a json array.
   *
@@ -186,11 +175,6 @@ public:
   */
  inline bool is_null() const noexcept;

-  /**
-   * Whether this element is a big integer (number exceeding 64-bit range).
-   */
-  inline bool is_bigint() const noexcept;
-
  /**
   * Tell whether the value can be cast to provided type (T).
   *
@@ -549,7 +533,6 @@ public:
  simdjson_inline simdjson_result<uint64_t> get_uint64() const noexcept;
  simdjson_inline simdjson_result<double> get_double() const noexcept;
  simdjson_inline simdjson_result<bool> get_bool() const noexcept;
-  simdjson_inline simdjson_result<std::string_view> get_bigint() const noexcept;

  simdjson_inline bool is_array() const noexcept;
  simdjson_inline bool is_object() const noexcept;
@@ -560,7 +543,6 @@ public:
  simdjson_inline bool is_number() const noexcept;
  simdjson_inline bool is_bool() const noexcept;
  simdjson_inline bool is_null() const noexcept;
-  simdjson_inline bool is_bigint() const noexcept;

  simdjson_inline simdjson_result<dom::element> operator[](std::string_view key) const noexcept;
  simdjson_inline simdjson_result<dom::element> operator[](const char *key) const noexcept;
@@ -36,11 +36,10 @@ inline bool parser::dump_raw_tape(std::ostream &os) const noexcept {
 }

 inline simdjson_result<size_t> parser::read_file(std::string_view path) noexcept {
-  const std::string path_copy(path);
  // Open the file
  SIMDJSON_PUSH_DISABLE_WARNINGS
  SIMDJSON_DISABLE_DEPRECATED_WARNING // Disable CRT_SECURE warning on MSVC: manually verified this is safe
-  std::FILE *fp = std::fopen(path_copy.c_str(), "rb");
+  std::FILE *fp = std::fopen(path.data(), "rb");
  SIMDJSON_POP_DISABLE_WARNINGS

  if (fp == nullptr) {
@@ -133,7 +132,6 @@ inline simdjson_result<element> parser::parse_into_document(document& provided_d
    buf += 3;
    len -= 3;
  }
-  implementation->_number_as_string = _number_as_string;
  _error = implementation->parse(buf, len, provided_doc);

  if (_error) { return _error; }
@@ -170,7 +168,12 @@ simdjson_inline simdjson_result<element> parser::parse(const padded_string_view
 }

 inline simdjson_result<document_stream> parser::parse_many(const uint8_t *buf, size_t len, size_t batch_size) noexcept {
-  return parse_many(buf, len, batch_size, stream_format::whitespace_delimited);
+  if(batch_size < MINIMAL_BATCH_SIZE) { batch_size = MINIMAL_BATCH_SIZE; }
+  if((len >= 3) && (std::memcmp(buf, "\xEF\xBB\xBF", 3) == 0)) {
+    buf += 3;
+    len -= 3;
+  }
+  return document_stream(*this, buf, len, batch_size);
 }
 inline simdjson_result<document_stream> parser::parse_many(const char *buf, size_t len, size_t batch_size) noexcept {
  return parse_many(reinterpret_cast<const uint8_t *>(buf), len, batch_size);
@@ -181,48 +184,6 @@ inline simdjson_result<document_stream> parser::parse_many(const std::string &s,
 inline simdjson_result<document_stream> parser::parse_many(const padded_string &s, size_t batch_size) noexcept {
  return parse_many(s.data(), s.length(), batch_size);
 }
-inline simdjson_result<document_stream> parser::parse_many(const padded_string_view &v, size_t batch_size) noexcept {
-  return parse_many(v.data(), v.length(), batch_size);
-}
-
-inline simdjson_result<document_stream> parser::parse_many(const uint8_t *buf, size_t len, size_t batch_size, stream_format format) noexcept {
-  if(batch_size < MINIMAL_BATCH_SIZE) { batch_size = MINIMAL_BATCH_SIZE; }
-  if((len >= 3) && (std::memcmp(buf, "\xEF\xBB\xBF", 3) == 0)) {
-    buf += 3;
-    len -= 3;
-  }
-  if (format == stream_format::comma_delimited_array) {
-    // Strip leading JSON whitespace.
-    while (len > 0 && (buf[0] == ' ' || buf[0] == '\t' || buf[0] == '\n' || buf[0] == '\r')) {
-      buf++; len--;
-    }
-    // Expect the opening '['.
-    if (len == 0 || buf[0] != '[') { return TAPE_ERROR; }
-    buf++; len--;
-    // Strip trailing JSON whitespace.
-    while (len > 0 && (buf[len-1] == ' ' || buf[len-1] == '\t' || buf[len-1] == '\n' || buf[len-1] == '\r')) {
-      len--;
-    }
-    // Expect the closing ']'.
-    if (len == 0 || buf[len-1] != ']') { return TAPE_ERROR; }
-    len--;
-    // Fall through to comma_delimited over the array contents.
-    format = stream_format::comma_delimited;
-  }
-  return document_stream(*this, buf, len, batch_size, format);
-}
-inline simdjson_result<document_stream> parser::parse_many(const char *buf, size_t len, size_t batch_size, stream_format format) noexcept {
-  return parse_many(reinterpret_cast<const uint8_t *>(buf), len, batch_size, format);
-}
-inline simdjson_result<document_stream> parser::parse_many(const std::string &s, size_t batch_size, stream_format format) noexcept {
-  return parse_many(s.data(), s.length(), batch_size, format);
-}
-inline simdjson_result<document_stream> parser::parse_many(const padded_string &s, size_t batch_size, stream_format format) noexcept {
-  return parse_many(s.data(), s.length(), batch_size, format);
-}
-inline simdjson_result<document_stream> parser::parse_many(const padded_string_view &v, size_t batch_size, stream_format format) noexcept {
-  return parse_many(v.data(), v.length(), batch_size, format);
-}

 simdjson_inline size_t parser::capacity() const noexcept {
  return implementation ? implementation->capacity() : 0;
@@ -490,39 +490,10 @@ public:
  /** @overload parse_many(const uint8_t *buf, size_t len, size_t batch_size) */
  inline simdjson_result<document_stream> parse_many(const padded_string &s, size_t batch_size = dom::DEFAULT_BATCH_SIZE) noexcept;
  inline simdjson_result<document_stream> parse_many(const padded_string &&s, size_t batch_size) = delete;// unsafe
-  /** @overload parse_many(const uint8_t *buf, size_t len, size_t batch_size)
-   *
-   * Because padded_string_view guarantees SIMDJSON_PADDING trailing bytes, this
-   * overload is safe to use with buffers that the caller owns elsewhere (for
-   * example, a padded_memory_map), with no extra copy. Without this overload,
-   * passing a padded_string_view would silently bind to the padded_string
-   * overload via an implicit conversion, allocating and copying the input, and
-   * — because that temporary is destroyed at the end of the full-expression —
-   * leaving the returned document_stream pointing at freed memory. */
-  inline simdjson_result<document_stream> parse_many(const padded_string_view &v, size_t batch_size = dom::DEFAULT_BATCH_SIZE) noexcept;

  /** @private We do not want to allow implicit conversion from C string to std::string. */
  simdjson_result<document_stream> parse_many(const char *buf, size_t batch_size = dom::DEFAULT_BATCH_SIZE) noexcept = delete;

-  /**
-   * Parse a stream of JSON documents with explicit format specification.
-   *
-   * @param buf The concatenated JSON documents.
-   * @param len The length of the buffer.
-   * @param batch_size The batch size to use.
-   * @param format The stream format.
-   * @return A stream of documents, or an error.
-   */
-  inline simdjson_result<document_stream> parse_many(const uint8_t *buf, size_t len, size_t batch_size, stream_format format) noexcept;
-  /** @overload parse_many(const uint8_t *buf, size_t len, size_t batch_size, stream_format format) */
-  inline simdjson_result<document_stream> parse_many(const char *buf, size_t len, size_t batch_size, stream_format format) noexcept;
-  /** @overload parse_many(const uint8_t *buf, size_t len, size_t batch_size, stream_format format) */
-  inline simdjson_result<document_stream> parse_many(const std::string &s, size_t batch_size, stream_format format) noexcept;
-  /** @overload parse_many(const uint8_t *buf, size_t len, size_t batch_size, stream_format format) */
-  inline simdjson_result<document_stream> parse_many(const padded_string &s, size_t batch_size, stream_format format) noexcept;
-  /** @overload parse_many(const uint8_t *buf, size_t len, size_t batch_size, stream_format format) */
-  inline simdjson_result<document_stream> parse_many(const padded_string_view &v, size_t batch_size, stream_format format) noexcept;
-
  /**
   * Ensure this parser has enough memory to process JSON documents up to `capacity` bytes in length
   * and `max_depth` depth.
@@ -639,13 +610,6 @@ public:
  inline bool dump_raw_tape(std::ostream &os) const noexcept;


-  /**
-   * When enabled, big integers (exceeding uint64 range) are stored as strings
-   * in the tape instead of returning BIGINT_ERROR. Default: false.
-   */
-  inline void number_as_string(bool enabled) noexcept { _number_as_string = enabled; }
-  inline bool number_as_string() const noexcept { return _number_as_string; }
-
 private:
  /**
   * The maximum document length this parser will automatically support.
@@ -654,9 +618,6 @@ private:
   */
  size_t _max_capacity;

-  /** Whether to store big integers as strings instead of returning BIGINT_ERROR */
-  bool _number_as_string{false};
-
  /**
   * The loaded buffer (reused each time load() is called)
   */
@@ -460,12 +460,6 @@ inline void string_builder<serializer>::append(simdjson::dom::element value) {
    case tape_type::STRING:
      format.string(iter.get_string_view());
      break;
-    case tape_type::BIGINT: {
-      // Big integer stored as string — output raw digits (no quotes)
-      auto sv = iter.get_string_view();
-      format.chars(sv.data(), sv.data() + sv.size());
-      break;
-    }
    case tape_type::INT64:
      format.number(iter.next_tape_value<int64_t>());
      iter.json_index++; // numbers take up 2 spots, so we need to increment
@@ -22,7 +22,7 @@ namespace SIMDJSON_IMPLEMENTATION {
 namespace builder {

 template <class T>
-  requires(concepts::container_but_not_string<T> && ! concepts::optional_type<T> && !require_custom_serialization<T>)
+  requires(concepts::container_but_not_string<T> && !require_custom_serialization<T>)
 constexpr void atom(string_builder &b, const T &t) {
  auto it = t.begin();
  auto end = t.end();
@@ -130,7 +130,7 @@ template <typename T>
  requires(std::is_enum_v<T> && !require_custom_serialization<T>)
 void atom(string_builder &b, const T &e) {
 #if SIMDJSON_STATIC_REFLECTION
-  static constexpr auto enumerators = std::define_static_array(std::meta::enumerators_of(^^T));
+  constexpr auto enumerators = std::define_static_array(std::meta::enumerators_of(^^T));
  template for (constexpr auto enum_val : enumerators) {
    constexpr auto enum_str = std::define_static_string(constevalutil::consteval_to_quoted_escaped(std::meta::identifier_of(enum_val)));
    if (e == [:enum_val:]) {
@@ -294,23 +294,30 @@ string_builder& operator<<(string_builder& b, const Z& z) {
 template<constevalutil::fixed_string... FieldNames, typename T>
  requires(std::is_class_v<T> && (sizeof...(FieldNames) > 0))
 void extract_from(string_builder &b, const T &obj) {
+  // Helper to check if a field name matches any of the requested fields
+  auto should_extract = [](std::string_view field_name) constexpr -> bool {
+    return ((FieldNames.view() == field_name) || ...);
+  };
+
  b.append('{');
  bool first = true;
+
  // Iterate through all members of T using reflection
-  static constexpr auto members = std::define_static_array(std::meta::nonstatic_data_members_of(^^T, std::meta::access_context::unchecked()));
-  template for (constexpr auto mem : members) {
+  template for (constexpr auto mem : std::define_static_array(
+      std::meta::nonstatic_data_members_of(^^T, std::meta::access_context::unchecked()))) {
+
    if constexpr (std::meta::is_public(mem)) {
-      static constexpr std::string_view key = std::define_static_string(std::meta::identifier_of(mem));
+      constexpr std::string_view key = std::define_static_string(std::meta::identifier_of(mem));

      // Only serialize this field if it's in our list of requested fields
-      if constexpr (((FieldNames.view() == key) || ...)) {
+      if constexpr (should_extract(key)) {
        if (!first) {
          b.append(',');
        }
        first = false;

        // Serialize the key
-        static constexpr auto quoted_key = std::define_static_string(constevalutil::consteval_to_quoted_escaped(std::meta::identifier_of(mem)));
+        constexpr auto quoted_key = std::define_static_string(constevalutil::consteval_to_quoted_escaped(std::meta::identifier_of(mem)));
        b.append_raw(quoted_key);
        b.append(':');

@@ -505,7 +505,7 @@ simdjson_inline bool string_builder::capacity_check(size_t upcoming_bytes) {
  return is_valid;
 }

-inline void string_builder::grow_buffer(size_t desired_capacity) {
+simdjson_inline void string_builder::grow_buffer(size_t desired_capacity) {
  if (!is_valid) {
    return;
  }
@@ -842,7 +842,7 @@ simdjson_inline void string_builder::append(const T &value) {
 #if SIMDJSON_SUPPORTS_RANGES && SIMDJSON_SUPPORTS_CONCEPTS
 // Support for range-based appending (std::ranges::view, etc.)
 template <std::ranges::range R>
-  requires(!std::is_convertible<R, std::string_view>::value && !concepts::optional_type<R> && !require_custom_serialization<R>)
+  requires(!std::is_convertible<R, std::string_view>::value && !require_custom_serialization<R>)
 simdjson_inline void string_builder::append(const R &range) noexcept {
  auto it = std::ranges::begin(range);
  auto end = std::ranges::end(range);
@@ -171,7 +171,7 @@ public:
 #if SIMDJSON_SUPPORTS_RANGES && SIMDJSON_SUPPORTS_CONCEPTS
  // Support for range-based appending (std::ranges::view, etc.)
  template <std::ranges::range R>
-requires (!std::is_convertible<R, std::string_view>::value && !concepts::optional_type<R> && !require_custom_serialization<R>)
+requires (!std::is_convertible<R, std::string_view>::value && !require_custom_serialization<R>)
  simdjson_inline void append(const R &range) noexcept;
 #endif
  /**
@@ -249,7 +249,7 @@ private:
   * If the allocation fails, is_valid is set to false. We expect
   * that this function would not be repeatedly called.
   */
-  inline void grow_buffer(size_t desired_capacity);
+  simdjson_inline void grow_buffer(size_t desired_capacity);

  /**
   * We use this helper function to make sure that is_valid is kept consistent.
@@ -74,7 +74,6 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_capacity(s
 }

 inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth(size_t max_depth) noexcept {
-  if(max_depth > SIMDJSON_MAX_DEPTH) { return CAPACITY; }
  // Stage 2 stacks
  open_containers.reset(new (std::nothrow) open_container[max_depth]);
  is_array.reset(new (std::nothrow) bool[max_depth]);
@@ -20,7 +20,6 @@
 #include "simdjson/generic/ondemand/document.h"
 #include "simdjson/generic/ondemand/document_stream.h"
 #include "simdjson/generic/ondemand/field.h"
-#include "simdjson/generic/ondemand/key_selector.h"
 #include "simdjson/generic/ondemand/object.h"
 #include "simdjson/generic/ondemand/object_iterator.h"
 #include "simdjson/generic/ondemand/serialization.h"
@@ -40,7 +39,6 @@
 #include "simdjson/generic/ondemand/logger-inl.h"
 #include "simdjson/generic/ondemand/object-inl.h"
 #include "simdjson/generic/ondemand/object_iterator-inl.h"
-#include "simdjson/generic/ondemand/key_selector_iterator.h"
 #include "simdjson/generic/ondemand/parser-inl.h"
 #include "simdjson/generic/ondemand/raw_json_string-inl.h"
 #include "simdjson/generic/ondemand/token_iterator-inl.h"
@@ -39,10 +39,6 @@ class raw_json_string;
 class token_iterator;
 class value;
 class value_iterator;
-#if SIMDJSON_SUPPORTS_CONCEPTS
-template <typename Selector> class selector_iterator;
-template <typename Selector> class selector_range;
-#endif

 } // namespace ondemand
 } // namespace SIMDJSON_IMPLEMENTATION
@@ -16,8 +16,6 @@
 #include "simdjson/generic/ondemand/deserialize.h"
 #endif // SIMDJSON_CONDITIONAL_INCLUDE

-#include <limits>
-
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 namespace ondemand {
@@ -133,18 +131,6 @@ simdjson_inline simdjson_result<int64_t> document::get_int64() noexcept {
 simdjson_inline simdjson_result<int64_t> document::get_int64_in_string() noexcept {
  return get_root_value_iterator().get_root_int64_in_string(true);
 }
-simdjson_inline simdjson_result<uint32_t> document::get_uint32() noexcept {
-  uint64_t result;
-  SIMDJSON_TRY(get_uint64().get(result));
-  if (result > (std::numeric_limits<uint32_t>::max)()) { return NUMBER_OUT_OF_RANGE; }
-  return static_cast<uint32_t>(result);
-}
-simdjson_inline simdjson_result<int32_t> document::get_int32() noexcept {
-  int64_t result;
-  SIMDJSON_TRY(get_int64().get(result));
-  if (result > (std::numeric_limits<int32_t>::max)() || result < (std::numeric_limits<int32_t>::min)()) { return NUMBER_OUT_OF_RANGE; }
-  return static_cast<int32_t>(result);
-}
 simdjson_inline simdjson_result<double> document::get_double() noexcept {
  return get_root_value_iterator().get_root_double(true);
 }
@@ -178,8 +164,6 @@ template<> simdjson_inline simdjson_result<std::string_view> document::get() & n
 template<> simdjson_inline simdjson_result<double> document::get() & noexcept { return get_double(); }
 template<> simdjson_inline simdjson_result<uint64_t> document::get() & noexcept { return get_uint64(); }
 template<> simdjson_inline simdjson_result<int64_t> document::get() & noexcept { return get_int64(); }
-template<> simdjson_inline simdjson_result<uint32_t> document::get() & noexcept { return get_uint32(); }
-template<> simdjson_inline simdjson_result<int32_t> document::get() & noexcept { return get_int32(); }
 template<> simdjson_inline simdjson_result<bool> document::get() & noexcept { return get_bool(); }
 template<> simdjson_inline simdjson_result<value> document::get() & noexcept { return get_value(); }

@@ -190,8 +174,6 @@ template<> simdjson_warn_unused simdjson_inline error_code document::get(std::st
 template<> simdjson_warn_unused simdjson_inline error_code document::get(double& out) & noexcept { return get_double().get(out); }
 template<> simdjson_warn_unused simdjson_inline error_code document::get(uint64_t& out) & noexcept { return get_uint64().get(out); }
 template<> simdjson_warn_unused simdjson_inline error_code document::get(int64_t& out) & noexcept { return get_int64().get(out); }
-template<> simdjson_warn_unused simdjson_inline error_code document::get(uint32_t& out) & noexcept { return get_uint32().get(out); }
-template<> simdjson_warn_unused simdjson_inline error_code document::get(int32_t& out) & noexcept { return get_int32().get(out); }
 template<> simdjson_warn_unused simdjson_inline error_code document::get(bool& out) & noexcept { return get_bool().get(out); }
 template<> simdjson_warn_unused simdjson_inline error_code document::get(value& out) & noexcept { return get_value().get(out); }

@@ -522,14 +504,6 @@ simdjson_inline simdjson_result<int64_t> simdjson_result<SIMDJSON_IMPLEMENTATION
  if (error()) { return error(); }
  return first.get_int64_in_string();
 }
-simdjson_inline simdjson_result<uint32_t> simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document>::get_uint32() noexcept {
-  if (error()) { return error(); }
-  return first.get_uint32();
-}
-simdjson_inline simdjson_result<int32_t> simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document>::get_int32() noexcept {
-  if (error()) { return error(); }
-  return first.get_int32();
-}
 simdjson_inline simdjson_result<double> simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document>::get_double() noexcept {
  if (error()) { return error(); }
  return first.get_double();
@@ -653,27 +627,27 @@ simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document>::op
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document>::operator uint64_t() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
-  return first.get_uint64();
+  return first;
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document>::operator int64_t() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
-  return first.get_int64();
+  return first;
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document>::operator double() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
-  return first.get_double();
+  return first;
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document>::operator std::string_view() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
-  return first.get_string();
+  return first;
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document>::operator SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
-  return first.get_raw_json_string();
+  return first;
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document>::operator bool() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
-  return first.get_bool();
+  return first;
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document>::operator SIMDJSON_IMPLEMENTATION::ondemand::value() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
@@ -757,18 +731,6 @@ simdjson_inline simdjson_result<uint64_t> document_reference::get_uint64() noexc
 simdjson_inline simdjson_result<uint64_t> document_reference::get_uint64_in_string() noexcept { return doc->get_root_value_iterator().get_root_uint64_in_string(false); }
 simdjson_inline simdjson_result<int64_t> document_reference::get_int64() noexcept { return doc->get_root_value_iterator().get_root_int64(false); }
 simdjson_inline simdjson_result<int64_t> document_reference::get_int64_in_string() noexcept { return doc->get_root_value_iterator().get_root_int64_in_string(false); }
-simdjson_inline simdjson_result<uint32_t> document_reference::get_uint32() noexcept {
-  uint64_t result;
-  SIMDJSON_TRY(doc->get_root_value_iterator().get_root_uint64(false).get(result));
-  if (result > (std::numeric_limits<uint32_t>::max)()) { return NUMBER_OUT_OF_RANGE; }
-  return static_cast<uint32_t>(result);
-}
-simdjson_inline simdjson_result<int32_t> document_reference::get_int32() noexcept {
-  int64_t result;
-  SIMDJSON_TRY(doc->get_root_value_iterator().get_root_int64(false).get(result));
-  if (result > (std::numeric_limits<int32_t>::max)() || result < (std::numeric_limits<int32_t>::min)()) { return NUMBER_OUT_OF_RANGE; }
-  return static_cast<int32_t>(result);
-}
 simdjson_inline simdjson_result<double> document_reference::get_double() noexcept { return doc->get_root_value_iterator().get_root_double(false); }
 simdjson_inline simdjson_result<double> document_reference::get_double_in_string() noexcept { return doc->get_root_value_iterator().get_root_double(false); }
 simdjson_inline simdjson_result<std::string_view> document_reference::get_string(bool allow_replacement) noexcept { return doc->get_root_value_iterator().get_root_string(false, allow_replacement); }
@@ -786,8 +748,6 @@ template<> simdjson_inline simdjson_result<std::string_view> document_reference:
 template<> simdjson_inline simdjson_result<double> document_reference::get() & noexcept { return get_double(); }
 template<> simdjson_inline simdjson_result<uint64_t> document_reference::get() & noexcept { return get_uint64(); }
 template<> simdjson_inline simdjson_result<int64_t> document_reference::get() & noexcept { return get_int64(); }
-template<> simdjson_inline simdjson_result<uint32_t> document_reference::get() & noexcept { return get_uint32(); }
-template<> simdjson_inline simdjson_result<int32_t> document_reference::get() & noexcept { return get_int32(); }
 template<> simdjson_inline simdjson_result<bool> document_reference::get() & noexcept { return get_bool(); }
 template<> simdjson_inline simdjson_result<value> document_reference::get() & noexcept { return get_value(); }
 #if SIMDJSON_EXCEPTIONS
@@ -919,14 +879,6 @@ simdjson_inline simdjson_result<int64_t> simdjson_result<SIMDJSON_IMPLEMENTATION
  if (error()) { return error(); }
  return first.get_int64_in_string();
 }
-simdjson_inline simdjson_result<uint32_t> simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document_reference>::get_uint32() noexcept {
-  if (error()) { return error(); }
-  return first.get_uint32();
-}
-simdjson_inline simdjson_result<int32_t> simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document_reference>::get_int32() noexcept {
-  if (error()) { return error(); }
-  return first.get_int32();
-}
 simdjson_inline simdjson_result<double> simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document_reference>::get_double() noexcept {
  if (error()) { return error(); }
  return first.get_double();
@@ -1042,27 +994,27 @@ simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document_refe
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document_reference>::operator uint64_t() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
-  return first.get_uint64();
+  return first;
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document_reference>::operator int64_t() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
-  return first.get_int64();
+  return first;
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document_reference>::operator double() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
-  return first.get_double();
+  return first;
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document_reference>::operator std::string_view() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
-  return first.get_string();
+  return first;
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document_reference>::operator SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
-  return first.get_raw_json_string();
+  return first;
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document_reference>::operator bool() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
-  return first.get_bool();
+  return first;
 }
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document_reference>::operator SIMDJSON_IMPLEMENTATION::ondemand::value() noexcept(false) {
  if (error()) { throw simdjson_error(error()); }
@@ -76,26 +76,6 @@ public:
   * @returns INCORRECT_TYPE If the JSON value is not a 64-bit integer.
   */
  simdjson_inline simdjson_result<int64_t> get_int64_in_string() noexcept;
-  /**
-   * Cast this JSON value to a 32-bit unsigned integer.
-   *
-   * Calls get_uint64() and checks that the result fits in a uint32_t.
-   *
-   * @returns A 32-bit unsigned integer.
-   * @returns INCORRECT_TYPE If the JSON value is not an unsigned integer.
-   * @returns NUMBER_OUT_OF_RANGE If the value does not fit in a uint32_t.
-   */
-  simdjson_inline simdjson_result<uint32_t> get_uint32() noexcept;
-  /**
-   * Cast this JSON value to a 32-bit signed integer.
-   *
-   * Calls get_int64() and checks that the result fits in an int32_t.
-   *
-   * @returns A 32-bit signed integer.
-   * @returns INCORRECT_TYPE If the JSON value is not an integer.
-   * @returns NUMBER_OUT_OF_RANGE If the value does not fit in an int32_t.
-   */
-  simdjson_inline simdjson_result<int32_t> get_int32() noexcept;
  /**
   * Cast this JSON value to a double.
   *
@@ -319,21 +299,21 @@ public:
   * @returns A signed 64-bit integer.
   * @exception simdjson_error(INCORRECT_TYPE) If the JSON value is not a 64-bit unsigned integer.
   */
-  explicit simdjson_inline operator uint64_t() noexcept(false);
+  simdjson_inline operator uint64_t() noexcept(false);
  /**
   * Cast this JSON value to a signed integer.
   *
   * @returns A signed 64-bit integer.
   * @exception simdjson_error(INCORRECT_TYPE) If the JSON value is not a 64-bit integer.
   */
-  explicit simdjson_inline operator int64_t() noexcept(false);
+  simdjson_inline operator int64_t() noexcept(false);
  /**
   * Cast this JSON value to a double.
   *
   * @returns A double.
   * @exception simdjson_error(INCORRECT_TYPE) If the JSON value is not a valid floating-point number.
   */
-  explicit simdjson_inline operator double() noexcept(false);
+  simdjson_inline operator double() noexcept(false);
  /**
   * Cast this JSON value to a string.
   *
@@ -343,7 +323,7 @@ public:
   *          time it parses a document or when it is destroyed.
   * @exception simdjson_error(INCORRECT_TYPE) if the JSON value is not a string.
   */
-  explicit simdjson_inline operator std::string_view() noexcept(false) simdjson_lifetime_bound;
+  simdjson_inline operator std::string_view() noexcept(false) simdjson_lifetime_bound;
  /**
   * Cast this JSON value to a raw_json_string.
   *
@@ -352,14 +332,14 @@ public:
   * @returns A pointer to the raw JSON for the given string.
   * @exception simdjson_error(INCORRECT_TYPE) if the JSON value is not a string.
   */
-  explicit simdjson_inline operator raw_json_string() noexcept(false) simdjson_lifetime_bound;
+  simdjson_inline operator raw_json_string() noexcept(false) simdjson_lifetime_bound;
  /**
   * Cast this JSON value to a bool.
   *
   * @returns A bool value.
   * @exception simdjson_error(INCORRECT_TYPE) if the JSON value is not true or false.
   */
-  explicit simdjson_inline operator bool() noexcept(false);
+  simdjson_inline operator bool() noexcept(false);
  /**
   * Cast this JSON value to a value when the document is an object or an array.
   *
@@ -849,8 +829,6 @@ public:
  simdjson_inline simdjson_result<uint64_t> get_uint64_in_string() noexcept;
  simdjson_inline simdjson_result<int64_t> get_int64() noexcept;
  simdjson_inline simdjson_result<int64_t> get_int64_in_string() noexcept;
-  simdjson_inline simdjson_result<uint32_t> get_uint32() noexcept;
-  simdjson_inline simdjson_result<int32_t> get_int32() noexcept;
  simdjson_inline simdjson_result<double> get_double() noexcept;
  simdjson_inline simdjson_result<double> get_double_in_string() noexcept;
  simdjson_inline simdjson_result<std::string_view> get_string(bool allow_replacement = false) noexcept;
@@ -945,12 +923,12 @@ public:
  explicit simdjson_inline operator T() noexcept(false);
  simdjson_inline operator array() & noexcept(false);
  simdjson_inline operator object() & noexcept(false);
-  explicit simdjson_inline operator uint64_t() noexcept(false);
-  explicit simdjson_inline operator int64_t() noexcept(false);
-  explicit simdjson_inline operator double() noexcept(false);
-  explicit simdjson_inline operator std::string_view() noexcept(false);
-  explicit simdjson_inline operator raw_json_string() noexcept(false);
-  explicit simdjson_inline operator bool() noexcept(false);
+  simdjson_inline operator uint64_t() noexcept(false);
+  simdjson_inline operator int64_t() noexcept(false);
+  simdjson_inline operator double() noexcept(false);
+  simdjson_inline operator std::string_view() noexcept(false);
+  simdjson_inline operator raw_json_string() noexcept(false);
+  simdjson_inline operator bool() noexcept(false);
  simdjson_inline operator value() noexcept(false);
 #endif
  simdjson_inline simdjson_result<size_t> count_elements() & noexcept;
@@ -1004,8 +982,6 @@ public:
  simdjson_inline simdjson_result<uint64_t> get_uint64_in_string() noexcept;
  simdjson_inline simdjson_result<int64_t> get_int64() noexcept;
  simdjson_inline simdjson_result<int64_t> get_int64_in_string() noexcept;
-  simdjson_inline simdjson_result<uint32_t> get_uint32() noexcept;
-  simdjson_inline simdjson_result<int32_t> get_int32() noexcept;
  simdjson_inline simdjson_result<double> get_double() noexcept;
  simdjson_inline simdjson_result<double> get_double_in_string() noexcept;
  simdjson_inline simdjson_result<std::string_view> get_string(bool allow_replacement = false) noexcept;
@@ -1030,12 +1006,12 @@ public:
  explicit simdjson_inline operator T() noexcept(false);
  simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::array() & noexcept(false);
  simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::object() & noexcept(false);
-  explicit simdjson_inline operator uint64_t() noexcept(false);
-  explicit simdjson_inline operator int64_t() noexcept(false);
-  explicit simdjson_inline operator double() noexcept(false);
-  explicit simdjson_inline operator std::string_view() noexcept(false);
-  explicit simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false);
-  explicit simdjson_inline operator bool() noexcept(false);
+  simdjson_inline operator uint64_t() noexcept(false);
+  simdjson_inline operator int64_t() noexcept(false);
+  simdjson_inline operator double() noexcept(false);
+  simdjson_inline operator std::string_view() noexcept(false);
+  simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false);
+  simdjson_inline operator bool() noexcept(false);
  simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::value() noexcept(false);
 #endif
  simdjson_inline simdjson_result<size_t> count_elements() & noexcept;
@@ -1093,8 +1069,6 @@ public:
  simdjson_inline simdjson_result<uint64_t> get_uint64_in_string() noexcept;
  simdjson_inline simdjson_result<int64_t> get_int64() noexcept;
  simdjson_inline simdjson_result<int64_t> get_int64_in_string() noexcept;
-  simdjson_inline simdjson_result<uint32_t> get_uint32() noexcept;
-  simdjson_inline simdjson_result<int32_t> get_int32() noexcept;
  simdjson_inline simdjson_result<double> get_double() noexcept;
  simdjson_inline simdjson_result<double> get_double_in_string() noexcept;
  simdjson_inline simdjson_result<std::string_view> get_string(bool allow_replacement = false) noexcept;
@@ -1116,12 +1090,12 @@ public:
  explicit simdjson_inline operator T() noexcept(false);
  simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::array() & noexcept(false);
  simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::object() & noexcept(false);
-  explicit simdjson_inline operator uint64_t() noexcept(false);
-  explicit simdjson_inline operator int64_t() noexcept(false);
-  explicit simdjson_inline operator double() noexcept(false);
-  explicit simdjson_inline operator std::string_view() noexcept(false);
-  explicit simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false);
-  explicit simdjson_inline operator bool() noexcept(false);
+  simdjson_inline operator uint64_t() noexcept(false);
+  simdjson_inline operator int64_t() noexcept(false);
+  simdjson_inline operator double() noexcept(false);
+  simdjson_inline operator std::string_view() noexcept(false);
+  simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false);
+  simdjson_inline operator bool() noexcept(false);
  simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::value() noexcept(false);
 #endif
  simdjson_inline simdjson_result<size_t> count_elements() & noexcept;
@@ -95,15 +95,13 @@ simdjson_inline document_stream::document_stream(
  const uint8_t *_buf,
  size_t _len,
  size_t _batch_size,
-  bool _allow_comma_separated,
-  stream_format _format
+  bool _allow_comma_separated
 ) noexcept
  : parser{&_parser},
    buf{_buf},
    len{_len},
    batch_size{_batch_size <= MINIMAL_BATCH_SIZE ? MINIMAL_BATCH_SIZE : _batch_size},
    allow_comma_separated{_allow_comma_separated},
-    format{_format},
    error{SUCCESS}
    #ifdef SIMDJSON_THREADS_ENABLED
    , use_thread(_parser.threaded) // we need to make a copy because _parser.threaded can change
@@ -122,7 +120,6 @@ simdjson_inline document_stream::document_stream() noexcept
    len{0},
    batch_size{0},
    allow_comma_separated{false},
-    format{stream_format::whitespace_delimited},
    error{UNINITIALIZED}
    #ifdef SIMDJSON_THREADS_ENABLED
    , use_thread(false)
@@ -222,10 +219,7 @@ inline void document_stream::start() noexcept {
    error = run_stage1(*parser, batch_start);
  }
  if (error) { return; }
-  // For json_sequence mode, structural_indexes[0] points to the actual JSON value
-  // after the RS delimiter and any following whitespace. For regular mode, it is
-  // the offset from batch_start to the first document in the batch.
-  doc_index = batch_start + parser->implementation->structural_indexes[0];
+  doc_index = batch_start;
  doc = document(json_iterator(&buf[batch_start], parser));
  doc.iter._streaming = true;

@@ -306,7 +300,7 @@ inline void document_stream::next() noexcept {
       */

      if (error) { continue; } // If the error was EMPTY, we may want to load another batch.
-      doc_index = batch_start + parser->implementation->structural_indexes[0];
+      doc_index = batch_start;
    }
  }
 }
@@ -335,35 +329,10 @@ inline error_code document_stream::run_stage1(ondemand::parser &p, size_t _batch
  // This code only updates the structural index in the parser, it does not update any json_iterator
  // instance.
  size_t remaining = len - _batch_start;
-  stage1_mode mode;
  if (remaining <= batch_size) {
-    // Final batch
-    switch (format) {
-      case stream_format::json_sequence:
-        mode = stage1_mode::json_sequence_final;
-        break;
-      case stream_format::comma_delimited:
-        mode = stage1_mode::comma_delimited_final;
-        break;
-      default:
-        mode = stage1_mode::streaming_final;
-        break;
-    }
-    return p.implementation->stage1(&buf[_batch_start], remaining, mode);
+    return p.implementation->stage1(&buf[_batch_start], remaining, stage1_mode::streaming_final);
  } else {
-    // Partial batch
-    switch (format) {
-      case stream_format::json_sequence:
-        mode = stage1_mode::json_sequence_partial;
-        break;
-      case stream_format::comma_delimited:
-        mode = stage1_mode::comma_delimited_partial;
-        break;
-      default:
-        mode = stage1_mode::streaming_partial;
-        break;
-    }
-    return p.implementation->stage1(&buf[_batch_start], batch_size, mode);
+    return p.implementation->stage1(&buf[_batch_start], batch_size, stage1_mode::streaming_partial);
  }
 }

@@ -384,21 +353,14 @@ simdjson_inline std::string_view document_stream::iterator::source() const noexc
        depth--;
        break;
      default:    // Scalar value document
+        // TODO: We could remove trailing whitespaces
        // This returns a string spanning from start of value to the beginning of the next document (excluded)
        {
          auto next_index = stream->parser->implementation->structural_indexes[++cur_struct_index];
          // normally the length would be next_index - current_index() - 1, except for the last document
          size_t svlen = next_index - current_index();
          const char *start = reinterpret_cast<const char*>(stream->buf) + current_index();
-          // Trim trailing whitespace, NUL, and RS (0x1E). In RFC 7464
-          // json_sequence mode the scanner classifies RS as a scalar
-          // character, so an RS-prefixed scalar document (number / true /
-          // false / null / string) has no closing structural index and the
-          // slice runs all the way up to the next document's RS. RS cannot
-          // legally appear in a JSON value at the source level (control
-          // characters in strings must be escaped as \u001E), so stripping
-          // it is safe in every stream_format.
-          while(svlen > 1 && (std::isspace(start[svlen-1]) || start[svlen-1] == '\0' || static_cast<uint8_t>(start[svlen-1]) == 0x1E)) {
+          while(svlen > 1 && (std::isspace(start[svlen-1]) || start[svlen-1] == '\0')) {
            svlen--;
          }
          return std::string_view(start, svlen);
@@ -479,4 +441,4 @@ simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::document_stre

 }

-#endif // SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_INL_H
+#endif // SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_INL_H
@@ -229,16 +229,13 @@ private:
   * @param buf is the raw byte buffer we need to process
   * @param len is the length of the raw byte buffer in bytes
   * @param batch_size is the size of the windows (must be strictly greater or equal to the largest JSON document)
-   * @param allow_comma_separated whether to allow comma-separated documents
-   * @param format the stream format
   */
  simdjson_inline document_stream(
    ondemand::parser &parser,
    const uint8_t *buf,
    size_t len,
    size_t batch_size,
-    bool allow_comma_separated,
-    stream_format format = stream_format::whitespace_delimited
+    bool allow_comma_separated
  ) noexcept;

  /**
@@ -287,7 +284,6 @@ private:
  size_t len;
  size_t batch_size;
  bool allow_comma_separated;
-  stream_format format;
  /**
   * We are going to use just one document instance. The document owns
   * the json_iterator. It implies that we only ever pass a reference
@@ -1,435 +0,0 @@
-#ifndef SIMDJSON_GENERIC_ONDEMAND_KEY_SELECTOR_H
-#define SIMDJSON_GENERIC_ONDEMAND_KEY_SELECTOR_H
-
-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
-#include "simdjson/base.h"
-#include "simdjson/common_defs.h"
-#include "simdjson/constevalutil.h"
-#include "simdjson/generic/ondemand/raw_json_string.h"
-#endif
-
-#include <array>
-#include <string_view>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-
-#if defined(__aarch64__) || defined(__ARM_NEON)
-  #include <arm_neon.h>
-  #define SIMDJSON_KEY_SELECTOR_HAS_NEON 1
-#else
-  #define SIMDJSON_KEY_SELECTOR_HAS_NEON 0
-#endif
-#if defined(__SSE2__)
-  #include <emmintrin.h>
-  #define SIMDJSON_KEY_SELECTOR_HAS_SSE2 1
-#else
-  #define SIMDJSON_KEY_SELECTOR_HAS_SSE2 0
-#endif
-
-#if SIMDJSON_SUPPORTS_CONCEPTS
-
-namespace simdjson {
-namespace SIMDJSON_IMPLEMENTATION {
-namespace ondemand {
-
-namespace key_selector_detail {
-
-inline constexpr std::size_t MAX_POSITIONS   = 4;
-inline constexpr std::size_t MAX_TABLE_SIZE  = 256;
-inline constexpr std::uint8_t POS_LAST_CHAR  = 0xFF;
-inline constexpr std::uint8_t SENTINEL_KEY   = 0xFF;
-
-// All PHF tables live inside this structural type; a single instance becomes a
-// static constexpr member of key_selector<Keys...>, so every field below is a
-// compile-time constant at every call site.
-template <std::size_t N, std::size_t TableSize, std::size_t MaxKeyLen>
-struct phf_data {
-    std::array<std::array<std::uint8_t, 256>, MAX_POSITIONS> asso_values{};
-    std::array<std::uint8_t, MAX_POSITIONS>                  positions{};
-    std::uint8_t                                             num_positions{};
-    std::array<std::uint8_t, TableSize>                      slot_to_key{};
-    // slot_key_bytes[s] holds the key stored at slot s, zero-padded to MaxKeyLenPadded.
-    std::array<std::array<char, ((MaxKeyLen + 31) / 32) * 32>, TableSize> slot_key_bytes{};
-    std::array<std::uint8_t, TableSize>                      slot_key_len{};
-};
-
-constexpr std::size_t next_pow2(std::size_t n) noexcept {
-    std::size_t p = 1;
-    while (p < n) p <<= 1;
-    return p;
-}
-
-// Returns the chosen TableSize (power of two >= N, up to MAX_TABLE_SIZE).
-template <std::size_t N>
-constexpr std::size_t pick_table_size() noexcept {
-    std::size_t t = next_pow2(N);
-    if (t < 2) t = 2;
-    return t;
-}
-
-template <std::size_t N>
-constexpr std::size_t char_at(std::string_view key, std::uint8_t pos) noexcept {
-    if (pos == POS_LAST_CHAR) {
-        return key.empty() ? 256 : static_cast<unsigned char>(key.back());
-    }
-    return (pos < key.size()) ? static_cast<unsigned char>(key[pos]) : 256;
-}
-
-// Try one gperf-style PHF configuration. Returns true if a perfect assignment was found.
-template <std::size_t N, std::size_t TableSize>
-constexpr bool try_phf(
-    const std::array<std::string_view, N>& keys,
-    std::array<std::array<std::uint8_t, 256>, MAX_POSITIONS>& asso,
-    std::array<std::uint8_t, MAX_POSITIONS>& positions,
-    std::uint8_t& num_positions,
-    std::array<std::uint8_t, TableSize>& slot_to_key) noexcept
-{
-    // Helper: reset mapping.
-    auto reset = [&]() {
-        for (std::size_t i = 0; i < TableSize; ++i) slot_to_key[i] = SENTINEL_KEY;
-    };
-
-    // Attempt 1: length-only.
-    reset();
-    {
-        bool ok = true;
-        for (std::size_t i = 0; i < N && ok; ++i) {
-            std::size_t slot = keys[i].size() % TableSize;
-            if (slot_to_key[slot] != SENTINEL_KEY) { ok = false; break; }
-            slot_to_key[slot] = static_cast<std::uint8_t>(i);
-        }
-        if (ok) { num_positions = 0; return true; }
-    }
-
-    // Attempt 2: single position (0), vary offset.
-    for (std::size_t offset = 0; offset < TableSize; ++offset) {
-        reset();
-        for (std::size_t c = 0; c < 256; ++c)
-            asso[0][c] = static_cast<std::uint8_t>((c + offset) % TableSize);
-        positions[0] = 0;
-        num_positions = 1;
-        bool ok = true;
-        for (std::size_t i = 0; i < N && ok; ++i) {
-            std::size_t h = keys[i].size();
-            std::size_t ch = char_at<N>(keys[i], 0);
-            if (ch < 256) h += asso[0][ch];
-            std::size_t slot = h % TableSize;
-            if (slot_to_key[slot] != SENTINEL_KEY) { ok = false; break; }
-            slot_to_key[slot] = static_cast<std::uint8_t>(i);
-        }
-        if (ok) return true;
-    }
-
-    // Attempt 3: positions {0, last_char}.
-    for (std::size_t o1 = 0; o1 < TableSize; ++o1) {
-        for (std::size_t o2 = 0; o2 < TableSize; ++o2) {
-            reset();
-            for (std::size_t c = 0; c < 256; ++c) {
-                asso[0][c] = static_cast<std::uint8_t>((c + o1) % TableSize);
-                asso[1][c] = static_cast<std::uint8_t>((c + o2) % TableSize);
-            }
-            positions[0] = 0;
-            positions[1] = POS_LAST_CHAR;
-            num_positions = 2;
-            bool ok = true;
-            for (std::size_t i = 0; i < N && ok; ++i) {
-                std::size_t h = keys[i].size();
-                std::size_t c1 = char_at<N>(keys[i], 0);
-                if (c1 < 256) h += asso[0][c1];
-                std::size_t c2 = char_at<N>(keys[i], POS_LAST_CHAR);
-                if (c2 < 256) h += asso[1][c2];
-                std::size_t slot = h % TableSize;
-                if (slot_to_key[slot] != SENTINEL_KEY) { ok = false; break; }
-                slot_to_key[slot] = static_cast<std::uint8_t>(i);
-            }
-            if (ok) return true;
-        }
-    }
-    return false;
-}
-
-template <std::size_t N, std::size_t TableSize, std::size_t MaxKeyLen>
-consteval phf_data<N, TableSize, MaxKeyLen>
-compute_phf(const std::array<std::string_view, N>& keys) {
-    // Validate.
-    for (std::size_t i = 0; i < N; ++i) {
-        if (keys[i].empty())        throw "empty keys are not allowed in key_selector";
-        if (keys[i].size() > MaxKeyLen) throw "key length exceeds MaxKeyLen";
-        for (char c : keys[i]) {
-            if (c == '\\')          throw "backslash not allowed in key_selector keys";
-            if (c == '"')           throw "quote not allowed in key_selector keys";
-            if (c == '\0')          throw "null byte not allowed in key_selector keys";
-        }
-        for (std::size_t j = i + 1; j < N; ++j)
-            if (keys[i] == keys[j]) throw "duplicate keys in key_selector";
-    }
-
-    phf_data<N, TableSize, MaxKeyLen> out{};
-    for (std::size_t s = 0; s < TableSize; ++s) out.slot_to_key[s] = SENTINEL_KEY;
-
-    if (!try_phf<N, TableSize>(keys, out.asso_values, out.positions,
-                               out.num_positions, out.slot_to_key))
-        throw "key_selector PHF generation failed";
-
-    // Populate slot key bytes (zero-padded) and lengths.
-    for (std::size_t s = 0; s < TableSize; ++s) {
-        std::uint8_t ki = out.slot_to_key[s];
-        if (ki < N) {
-            auto k = keys[ki];
-            out.slot_key_len[s] = static_cast<std::uint8_t>(k.size());
-            for (std::size_t c = 0; c < k.size(); ++c)
-                out.slot_key_bytes[s][c] = k[c];
-        } else {
-            out.slot_key_len[s] = 0; // sentinel: no length can match
-        }
-    }
-    return out;
-}
-
-// --- SIMD primitives --------------------------------------------------------
-
-// Scan for the terminating '"' starting at p. Returns its byte offset (= key length).
-// Reads at most 16 bytes (if MaxKeyLen <= 15) else up to MaxKeyLen+1 bytes.
-// Caller guarantees SIMDJSON_PADDING bytes past the JSON buffer, so the load is safe.
-template <std::size_t MaxKeyLen>
-simdjson_really_inline std::size_t scan_key_length(const char* p) noexcept {
-#if SIMDJSON_KEY_SELECTOR_HAS_NEON
-    uint8x16_t v0 = vld1q_u8(reinterpret_cast<const uint8_t*>(p));
-    uint8x16_t cmp0 = vceqq_u8(v0, vdupq_n_u8('"'));
-    uint64_t m0 = vget_lane_u64(
-        vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(cmp0), 4)), 0);
-    if constexpr (MaxKeyLen < 16) {
-        // Only the first 16 bytes are relevant.
-        if (simdjson_likely(m0 != 0)) return std::size_t(__builtin_ctzll(m0)) >> 2;
-        return MaxKeyLen + 1;
-    } else {
-        uint8x16_t v1 = vld1q_u8(reinterpret_cast<const uint8_t*>(p) + 16);
-        uint8x16_t cmp1 = vceqq_u8(v1, vdupq_n_u8('"'));
-        uint64_t m1 = vget_lane_u64(
-            vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(cmp1), 4)), 0);
-        // Combine into a single 128-bit-ish mask. If m0 != 0, first-byte lives there.
-        if (simdjson_likely(m0 != 0)) return std::size_t(__builtin_ctzll(m0)) >> 2;
-        if (m1 != 0) return 16 + (std::size_t(__builtin_ctzll(m1)) >> 2);
-        return MaxKeyLen + 1;
-    }
-#elif SIMDJSON_KEY_SELECTOR_HAS_SSE2
-    __m128i v0   = _mm_loadu_si128(reinterpret_cast<const __m128i*>(p));
-    __m128i cmp0 = _mm_cmpeq_epi8(v0, _mm_set1_epi8('"'));
-    unsigned m0  = static_cast<unsigned>(_mm_movemask_epi8(cmp0));
-    if constexpr (MaxKeyLen < 16) {
-        if (simdjson_likely(m0 != 0)) return std::size_t(__builtin_ctz(m0));
-        return MaxKeyLen + 1;
-    } else {
-        __m128i v1   = _mm_loadu_si128(reinterpret_cast<const __m128i*>(p + 16));
-        __m128i cmp1 = _mm_cmpeq_epi8(v1, _mm_set1_epi8('"'));
-        unsigned m1  = static_cast<unsigned>(_mm_movemask_epi8(cmp1));
-        if (simdjson_likely(m0 != 0)) return std::size_t(__builtin_ctz(m0));
-        if (m1 != 0) return 16 + std::size_t(__builtin_ctz(m1));
-        return MaxKeyLen + 1;
-    }
-#else
-    for (std::size_t i = 0; i <= MaxKeyLen; ++i)
-        if (p[i] == '"') return i;
-    return MaxKeyLen + 1;
-#endif
-}
-
-// Byte-equal of p[0..len) against stored[0..len). stored is zero-padded past `len`.
-// Input is read over 16 or 32 bytes (padded JSON buffer guaranteed).
-template <std::size_t MaxKeyLen>
-simdjson_really_inline bool compare_key_bytes(
-    const char* p, const char* stored, std::size_t len) noexcept
-{
-    alignas(16) static constexpr uint8_t idx16[16] =
-        {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
-    if constexpr (MaxKeyLen <= 16) {
-#if SIMDJSON_KEY_SELECTOR_HAS_NEON
-        uint8x16_t vp = vld1q_u8(reinterpret_cast<const uint8_t*>(p));
-        uint8x16_t vs = vld1q_u8(reinterpret_cast<const uint8_t*>(stored));
-        uint8x16_t mask = vcltq_u8(vld1q_u8(idx16), vdupq_n_u8(static_cast<uint8_t>(len)));
-        uint8x16_t diff = veorq_u8(vandq_u8(vp, mask), vs);
-        return vmaxvq_u8(diff) == 0;
-#elif SIMDJSON_KEY_SELECTOR_HAS_SSE2
-        __m128i vp = _mm_loadu_si128(reinterpret_cast<const __m128i*>(p));
-        __m128i vs = _mm_loadu_si128(reinterpret_cast<const __m128i*>(stored));
-        __m128i idx = _mm_load_si128(reinterpret_cast<const __m128i*>(idx16));
-        __m128i mask = _mm_cmplt_epi8(idx, _mm_set1_epi8(static_cast<char>(len)));
-        __m128i eq = _mm_cmpeq_epi8(_mm_and_si128(vp, mask), vs);
-        return _mm_movemask_epi8(eq) == 0xFFFF;
-#else
-        for (std::size_t i = 0; i < len; ++i)
-            if (p[i] != stored[i]) return false;
-        return true;
-#endif
-    } else if constexpr (MaxKeyLen <= 32) {
-        // Two 16-byte lanes. JSON buffer is padded so the second load is safe.
-        alignas(16) static constexpr uint8_t idx32_hi[16] =
-            {16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31};
-#if SIMDJSON_KEY_SELECTOR_HAS_NEON
-        uint8x16_t vp_lo = vld1q_u8(reinterpret_cast<const uint8_t*>(p));
-        uint8x16_t vp_hi = vld1q_u8(reinterpret_cast<const uint8_t*>(p) + 16);
-        uint8x16_t vs_lo = vld1q_u8(reinterpret_cast<const uint8_t*>(stored));
-        uint8x16_t vs_hi = vld1q_u8(reinterpret_cast<const uint8_t*>(stored) + 16);
-        uint8x16_t lenv = vdupq_n_u8(static_cast<uint8_t>(len));
-        uint8x16_t m_lo = vcltq_u8(vld1q_u8(idx16),    lenv);
-        uint8x16_t m_hi = vcltq_u8(vld1q_u8(idx32_hi), lenv);
-        uint8x16_t d_lo = veorq_u8(vandq_u8(vp_lo, m_lo), vs_lo);
-        uint8x16_t d_hi = veorq_u8(vandq_u8(vp_hi, m_hi), vs_hi);
-        return vmaxvq_u8(vorrq_u8(d_lo, d_hi)) == 0;
-#elif SIMDJSON_KEY_SELECTOR_HAS_SSE2
-        __m128i vp_lo = _mm_loadu_si128(reinterpret_cast<const __m128i*>(p));
-        __m128i vp_hi = _mm_loadu_si128(reinterpret_cast<const __m128i*>(p + 16));
-        __m128i vs_lo = _mm_loadu_si128(reinterpret_cast<const __m128i*>(stored));
-        __m128i vs_hi = _mm_loadu_si128(reinterpret_cast<const __m128i*>(stored + 16));
-        __m128i lenv = _mm_set1_epi8(static_cast<char>(len));
-        __m128i m_lo = _mm_cmplt_epi8(_mm_load_si128(reinterpret_cast<const __m128i*>(idx16)),    lenv);
-        __m128i m_hi = _mm_cmplt_epi8(_mm_load_si128(reinterpret_cast<const __m128i*>(idx32_hi)), lenv);
-        __m128i eq_lo = _mm_cmpeq_epi8(_mm_and_si128(vp_lo, m_lo), vs_lo);
-        __m128i eq_hi = _mm_cmpeq_epi8(_mm_and_si128(vp_hi, m_hi), vs_hi);
-        return (_mm_movemask_epi8(eq_lo) & _mm_movemask_epi8(eq_hi)) == 0xFFFF;
-#else
-        for (std::size_t i = 0; i < len; ++i)
-            if (p[i] != stored[i]) return false;
-        return true;
-#endif
-    } else {
-        // MaxKeyLen > 32: byte loop.
-        for (std::size_t i = 0; i < len; ++i)
-            if (p[i] != stored[i]) return false;
-        return true;
-    }
-}
-
-template <std::size_t N>
-constexpr std::size_t compute_max_key_len(const std::array<std::string_view, N>& keys) noexcept {
-    std::size_t m = 0;
-    for (std::size_t i = 0; i < N; ++i) if (keys[i].size() > m) m = keys[i].size();
-    return m;
-}
-
-} // namespace key_selector_detail
-
-/**
- * Stateless, compile-time key selector.
- *
- * Usage:
- *   using sel_t = decltype(make_key_selector<"id", "text", "user">());
- *   std::size_t i = sel_t::match_raw(raw_key); // returns sel_t::size() on miss
- *
- * All PHF tables are static constexpr — the compiler sees them as compile-time
- * constants at every call site and fully unrolls compute_hash / compare.
- */
-template <constevalutil::fixed_string... Keys>
-struct key_selector {
-    static constexpr std::size_t N = sizeof...(Keys);
-    static_assert(N > 0,   "key_selector requires at least one key");
-    static_assert(N <= 100,"key_selector supports at most 100 keys");
-
-    static constexpr std::array<std::string_view, N> keys{ Keys.view()... };
-    static constexpr std::size_t table_size  = key_selector_detail::pick_table_size<N>();
-    static constexpr std::size_t max_key_len = key_selector_detail::compute_max_key_len<N>(keys);
-    static_assert(max_key_len <= SIMDJSON_PADDING,
-                  "key longer than SIMDJSON_PADDING is not supported");
-
-    static constexpr auto phf =
-        key_selector_detail::compute_phf<N, table_size, max_key_len>(keys);
-
-    static constexpr std::size_t size() noexcept { return N; }
-
-    static constexpr std::uint8_t tbl_masks[17][16] = {
-        {0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80},
-        {0,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80},
-        {0,1,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80},
-        {0,1,2,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80},
-        {0,1,2,3,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80},
-        {0,1,2,3,4,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80},
-        {0,1,2,3,4,5,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80},
-        {0,1,2,3,4,5,6,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80},
-        {0,1,2,3,4,5,6,7,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80},
-        {0,1,2,3,4,5,6,7,8,0x80,0x80,0x80,0x80,0x80,0x80,0x80},
-        {0,1,2,3,4,5,6,7,8,9,0x80,0x80,0x80,0x80,0x80,0x80},
-        {0,1,2,3,4,5,6,7,8,9,10,0x80,0x80,0x80,0x80,0x80},
-        {0,1,2,3,4,5,6,7,8,9,10,11,0x80,0x80,0x80,0x80},
-        {0,1,2,3,4,5,6,7,8,9,10,11,12,0x80,0x80,0x80},
-        {0,1,2,3,4,5,6,7,8,9,10,11,12,13,0x80,0x80},
-        {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,0x80},
-        {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15},
-    };
-    /**
-     * Look up a JSON key. rjs must point just after an opening quote in a padded
-     * simdjson buffer. Returns the selector index in [0, N) on match, or N on miss.
-     */
-    static simdjson_really_inline std::size_t match_raw(raw_json_string rjs) noexcept {
-        const char* p = rjs.raw();
-        //std::size_t len = key_selector_detail::scan_key_length<max_key_len>(p);
-        uint8x16_t v0 = vld1q_u8(reinterpret_cast<const uint8_t*>(p));
-        uint8x16_t v1 = vld1q_u8(reinterpret_cast<const uint8_t*>(p)+16);
-        uint8x16_t cmp0 = vceqq_u8(v0, vdupq_n_u8('"'));
-        uint8x16_t cmp1 = vceqq_u8(v1, vdupq_n_u8('"'));
-        uint64_t m0 = vget_lane_u64(
-            vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(cmp0), 4)), 0);
-        uint64_t m1 = vget_lane_u64(
-            vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(cmp1), 4)), 0);
-        size_t len = m0 ? std::size_t(__builtin_ctzll(m0)) >> 2 : (m1 ? 16 + (std::size_t(__builtin_ctzll(m1)) >> 2) : max_key_len + 1);
-        if (len == 0 || len > max_key_len) return N;
-        // Compute hash. positions / num_positions / asso_values are compile-time
-        // constants, so this fully unrolls.
-        std::size_t h = len;
-        //printf("len=%zu\n", len);
-        for (std::uint8_t i = 0; i < phf.num_positions; ++i) {
-            std::uint8_t pos = phf.positions[i];
-            std::size_t idx = (pos == key_selector_detail::POS_LAST_CHAR)
-                              ? (len - std::size_t{1})
-                              : static_cast<std::size_t>(pos);
-            std::size_t has = static_cast<std::size_t>(idx < len);
-            std::size_t mask = std::size_t{0} - has;
-            std::size_t safe_idx = idx & mask;
-            unsigned char b = static_cast<unsigned char>(p[safe_idx]);
-            h += static_cast<std::size_t>(phf.asso_values[i][b]) & mask;
-        }
-
-        std::size_t slot = h & (table_size - 1);
-        //printf("len=%zu phf.slot_key_len[slot]=%zu\n", len, phf.slot_key_len[slot]);
-
-        //if(phf.slot_key_len[slot] != len) return N;
-
-        size_t len1 = len <= 16 ? len : 16;
-        uint8x16_t input1 = vqtbl1q_u8(v0, vld1q_u8(tbl_masks[len1]));
-        //std::size_t tail_len = len > 16 ? len - 16 : 0;
-        //uint8x16_t input2 = vqtbl1q_u8(v1, vld1q_u8(tbl_masks[tail_len]));
-
-        std::uint8_t ki = phf.slot_to_key[slot];
-        if (ki >= N) return N;
-        uint8x16_t k0 = vld1q_u8(reinterpret_cast<const uint8_t*>(phf.slot_key_bytes[slot].data()));
-        //uint8x16_t k1 = vld1q_u8(reinterpret_cast<const uint8_t*>(phf.slot_key_bytes[slot].data())+16);
-        uint8x16_t cmpk0 = veorq_u8(input1, k0);
-        //uint8x16_t cmpk1 = veorq_u8(input2, k1);
-        //uint8x16_t cmpk = vorrq_u8(cmpk0, cmpk1);
-
-        uint8x16_t cmpk = cmpk0;
-        if((vmaxvq_u32(cmpk) != 0) | ( (phf.slot_key_len[slot] != len))) return N;
-        return ki;
-    }
-
-    /** Return the key text at selector index i (i in [0, N)). */
-    static constexpr std::string_view key_at(std::size_t i) noexcept {
-        return keys[i];
-    }
-};
-
-/**
- * Factory for readability, matching make_perfect_set in ConstexprCore.
- */
-template <constevalutil::fixed_string... Keys>
-consteval auto make_key_selector() noexcept {
-    return key_selector<Keys...>{};
-}
-
-} // namespace ondemand
-} // namespace SIMDJSON_IMPLEMENTATION
-} // namespace simdjson
-
-#endif // SIMDJSON_SUPPORTS_CONCEPTS
-
-#endif // SIMDJSON_GENERIC_ONDEMAND_KEY_SELECTOR_H
@@ -1,131 +0,0 @@
-#ifndef SIMDJSON_GENERIC_ONDEMAND_KEY_SELECTOR_ITERATOR_H
-
-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
-#define SIMDJSON_GENERIC_ONDEMAND_KEY_SELECTOR_ITERATOR_H
-#include "simdjson/generic/ondemand/base.h"
-#include "simdjson/generic/ondemand/key_selector.h"
-#include "simdjson/generic/ondemand/object.h"
-#include "simdjson/generic/ondemand/object_iterator.h"
-#include "simdjson/generic/ondemand/field.h"
-#include "simdjson/generic/ondemand/value.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
-
-#include <array>
-#include <cstddef>
-#include <utility>
-
-#if SIMDJSON_SUPPORTS_CONCEPTS
-
-namespace simdjson {
-namespace SIMDJSON_IMPLEMENTATION {
-namespace ondemand {
-
-/**
- * Forward iterator over selector matches in an object.
- *
- * Walks the JSON object once, yielding each (selector_index, value) pair whose
- * key matches one of the selector's keys, in JSON order. Duplicate matches of
- * the same key are silently skipped; iteration ends when every selector key
- * has matched OR the object ends.
- *
- *   for (auto [i, val] : obj.select<sel_t>()) {
- *     switch (i) { case 0: ...; case 1: ...; }
- *   }
- */
-template <typename Selector>
-class selector_iterator {
-public:
-    // Yield ondemand::value directly (not simdjson_result<value>); the caller
-    // uses iterator state (error()) to check for errors after iteration.
-    using value_type = std::pair<std::size_t, value>;
-
-    struct end_sentinel {};
-
-    simdjson_inline selector_iterator() noexcept = default;
-
-    simdjson_inline explicit selector_iterator(object obj) noexcept
-      : obj_{std::move(obj)} {
-        auto begin_res = obj_.begin();
-        if (begin_res.error()) { done_ = true; last_error_ = begin_res.error(); return; }
-        it_ = begin_res.value();
-        advance();
-    }
-
-    simdjson_inline value_type operator*() noexcept {
-        return { current_index_, std::move(current_value_) };
-    }
-
-    simdjson_inline selector_iterator& operator++() noexcept { advance(); return *this; }
-
-    simdjson_inline bool operator==(end_sentinel) const noexcept { return done_; }
-    simdjson_inline bool operator!=(end_sentinel) const noexcept { return !done_; }
-
-    /** Error code set if iteration was terminated by an error. */
-    simdjson_inline error_code error() const noexcept { return last_error_; }
-    /** Number of unique selector-key matches produced so far. */
-    simdjson_inline std::size_t matched_count() const noexcept { return matched_; }
-
-private:
-    object obj_{};
-    object_iterator it_{};
-    std::array<bool, Selector::size()> seen_{};
-    std::size_t matched_{0};
-    std::size_t current_index_{Selector::size()};
-    value current_value_{};
-    error_code last_error_{SUCCESS};
-    bool done_{false};
-    bool primed_{false};
-
-    simdjson_inline void advance() noexcept {
-        if (done_) return;
-        if (primed_) { ++it_; primed_ = false; }
-        if (matched_ >= Selector::size()) { done_ = true; return; }
-
-        object_iterator end{};
-        while (it_ != end) {
-            auto f_res = *it_;
-            if (f_res.error()) { last_error_ = f_res.error(); done_ = true; return; }
-            field f = f_res.value_unsafe();
-            std::size_t idx = Selector::match_raw(f.key());
-            if (idx < Selector::size() && !seen_[idx]) {
-                seen_[idx] = true;
-                ++matched_;
-                current_index_ = idx;
-                current_value_ = std::move(f.value());
-                primed_ = true;
-                return;
-            }
-            ++it_;
-        }
-        done_ = true;
-    }
-};
-
-/**
- * Range adapter returned by object::select<Selector>(). Satisfies the range-for
- * loop requirements (begin() / end()).
- */
-template <typename Selector>
-class selector_range {
-public:
-    simdjson_inline explicit selector_range(object obj) noexcept
-      : obj_{std::move(obj)} {}
-
-    simdjson_inline selector_iterator<Selector> begin() noexcept {
-        return selector_iterator<Selector>{std::move(obj_)};
-    }
-    simdjson_inline typename selector_iterator<Selector>::end_sentinel end() const noexcept {
-        return {};
-    }
-
-private:
-    object obj_;
-};
-
-} // namespace ondemand
-} // namespace SIMDJSON_IMPLEMENTATION
-} // namespace simdjson
-
-#endif // SIMDJSON_SUPPORTS_CONCEPTS
-
-#endif // SIMDJSON_GENERIC_ONDEMAND_KEY_SELECTOR_ITERATOR_H
@@ -63,17 +63,6 @@ simdjson_inline simdjson_result<value> object::find_field(const std::string_view
  return value(iter.child());
 }

-#if SIMDJSON_SUPPORTS_CONCEPTS
-template <typename Selector>
-simdjson_inline selector_range<Selector> object::select() & noexcept {
-  return selector_range<Selector>{*this};
-}
-template <typename Selector>
-simdjson_inline selector_range<Selector> object::select() && noexcept {
-  return selector_range<Selector>{std::move(*this)};
-}
-#endif
-
 simdjson_inline simdjson_result<object> object::start(value_iterator &iter) noexcept {
  SIMDJSON_TRY( iter.start_object().error() );
  return object(iter);
@@ -345,22 +334,6 @@ simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> simdjs
  return std::forward<SIMDJSON_IMPLEMENTATION::ondemand::object>(first).find_field(key);
 }

-#if SIMDJSON_SUPPORTS_CONCEPTS
-template <typename Selector>
-simdjson_inline SIMDJSON_IMPLEMENTATION::ondemand::selector_range<Selector>
-simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object>::select() & noexcept {
-  // On error, construct a range over a default (invalid) object; iteration will
-  // yield the stored error at first dereference via the underlying iterator path.
-  return first.template select<Selector>();
-}
-
-template <typename Selector>
-simdjson_inline SIMDJSON_IMPLEMENTATION::ondemand::selector_range<Selector>
-simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object>::select() && noexcept {
-  return std::forward<SIMDJSON_IMPLEMENTATION::ondemand::object>(first).template select<Selector>();
-}
-#endif
-
 simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object>::at_pointer(std::string_view json_pointer) noexcept {
  if (error()) { return error(); }
  return first.at_pointer(json_pointer);
@@ -5,7 +5,6 @@
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/implementation_simdjson_result_base.h"
 #include "simdjson/generic/ondemand/value_iterator.h"
-#include "simdjson/generic/ondemand/key_selector.h"
 #include <vector>
 #if SIMDJSON_STATIC_REFLECTION && SIMDJSON_SUPPORTS_CONCEPTS
 #include "simdjson/generic/ondemand/json_string_builder.h"  // for constevalutil::fixed_string
@@ -123,27 +122,6 @@ public:
  /** @overload simdjson_inline simdjson_result<value> find_field_unordered(std::string_view key) & noexcept; */
  simdjson_inline simdjson_result<value> operator[](std::string_view key) && noexcept;

-#if SIMDJSON_SUPPORTS_CONCEPTS
-  /**
-   * Iterate over this object, yielding every field whose key is in the compile-time
-   * key_selector Selector. Yields std::pair<std::size_t, simdjson_result<value>>
-   * (selector_index, value) in JSON order. Duplicate keys in the JSON are skipped
-   * (first occurrence wins). Iteration ends when all Selector::size() keys have
-   * matched or the object ends.
-   *
-   * Usage:
-   *   using sel_t = decltype(make_key_selector<"id", "text", "user">());
-   *   for (auto [i, v] : obj.select<sel_t>()) { ... }
-   *
-   * @tparam Selector A stateless key_selector type (see key_selector.h).
-   */
-  template <typename Selector>
-  simdjson_inline selector_range<Selector> select() & noexcept;
-  /** @overload */
-  template <typename Selector>
-  simdjson_inline selector_range<Selector> select() && noexcept;
-#endif
-
  /**
   * Get the value associated with the given JSON pointer. We use the RFC 6901
   * https://tools.ietf.org/html/rfc6901 standard, interpreting the current node
@@ -346,12 +324,6 @@ public:
  simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> find_field(std::string_view key) && noexcept;
  simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> find_field_unordered(std::string_view key) & noexcept;
  simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> find_field_unordered(std::string_view key) && noexcept;
-#if SIMDJSON_SUPPORTS_CONCEPTS
-  template <typename Selector>
-  simdjson_inline SIMDJSON_IMPLEMENTATION::ondemand::selector_range<Selector> select() & noexcept;
-  template <typename Selector>
-  simdjson_inline SIMDJSON_IMPLEMENTATION::ondemand::selector_range<Selector> select() && noexcept;
-#endif
  simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> operator[](std::string_view key) & noexcept;
  simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> operator[](std::string_view key) && noexcept;
  simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> at_pointer(std::string_view json_pointer) noexcept;
@@ -133,34 +133,6 @@ simdjson_warn_unused simdjson_inline simdjson_result<json_iterator> parser::iter
  return json_iterator(reinterpret_cast<const uint8_t *>(json.data()), this);
 }

-inline simdjson_result<document_stream> parser::iterate_many(const uint8_t *buf, size_t len, size_t batch_size) noexcept {
-  if(batch_size < MINIMAL_BATCH_SIZE) { batch_size = MINIMAL_BATCH_SIZE; }
-  if((len >= 3) && (std::memcmp(buf, "\xEF\xBB\xBF", 3) == 0)) {
-    buf += 3;
-    len -= 3;
-  }
-  return document_stream(*this, buf, len, batch_size, false, stream_format::whitespace_delimited);
-}
-inline simdjson_result<document_stream> parser::iterate_many(const char *buf, size_t len, size_t batch_size) noexcept {
-  return iterate_many(reinterpret_cast<const uint8_t *>(buf), len, batch_size);
-}
-inline simdjson_result<document_stream> parser::iterate_many(padded_string_view s, size_t batch_size) noexcept {
-  if (!s.has_sufficient_padding()) { return INSUFFICIENT_PADDING; }
-  return iterate_many(s.data(), s.length(), batch_size);
-}
-inline simdjson_result<document_stream> parser::iterate_many(const padded_string &s, size_t batch_size) noexcept {
-  return iterate_many(padded_string_view(s), batch_size);
-}
-inline simdjson_result<document_stream> parser::iterate_many(const std::string &s, size_t batch_size) noexcept {
-  return iterate_many(padded_string_view(s), batch_size);
-}
-inline simdjson_result<document_stream> parser::iterate_many(std::string &s, size_t batch_size) noexcept {
-  return iterate_many(pad(s), batch_size);
-}
-
-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
-SIMDJSON_PUSH_DISABLE_WARNINGS
-SIMDJSON_DISABLE_DEPRECATED_WARNING
 inline simdjson_result<document_stream> parser::iterate_many(const uint8_t *buf, size_t len, size_t batch_size, bool allow_comma_separated) noexcept {
  // Warning: no check is done on the buffer padding. We trust the user.
  if(batch_size < MINIMAL_BATCH_SIZE) { batch_size = MINIMAL_BATCH_SIZE; }
@@ -168,11 +140,8 @@ inline simdjson_result<document_stream> parser::iterate_many(const uint8_t *buf,
    buf += 3;
    len -= 3;
  }
-  // Map allow_comma_separated to stream_format::comma_delimited
-  if (allow_comma_separated) {
-    return document_stream(*this, buf, len, batch_size, false, stream_format::comma_delimited);
-  }
-  return document_stream(*this, buf, len, batch_size, false, stream_format::whitespace_delimited);
+  if(allow_comma_separated && batch_size < len) { batch_size = len; }
+  return document_stream(*this, buf, len, batch_size, allow_comma_separated);
 }

 inline simdjson_result<document_stream> parser::iterate_many(const char *buf, size_t len, size_t batch_size, bool allow_comma_separated) noexcept {
@@ -192,48 +161,6 @@ inline simdjson_result<document_stream> parser::iterate_many(const std::string &
 inline simdjson_result<document_stream> parser::iterate_many(std::string &s, size_t batch_size, bool allow_comma_separated) noexcept {
  return iterate_many(pad(s), batch_size, allow_comma_separated);
 }
-SIMDJSON_POP_DISABLE_WARNINGS
-#endif // SIMDJSON_DISABLE_DEPRECATED_API
-
-inline simdjson_result<document_stream> parser::iterate_many(const uint8_t *buf, size_t len, size_t batch_size, stream_format format) noexcept {
-  if(batch_size < MINIMAL_BATCH_SIZE) { batch_size = MINIMAL_BATCH_SIZE; }
-  if((len >= 3) && (std::memcmp(buf, "\xEF\xBB\xBF", 3) == 0)) {
-    buf += 3;
-    len -= 3;
-  }
-  if (format == stream_format::comma_delimited_array) {
-    // Strip leading JSON whitespace.
-    while (len > 0 && (buf[0] == ' ' || buf[0] == '\t' || buf[0] == '\n' || buf[0] == '\r')) {
-      buf++; len--;
-    }
-    // Expect the opening '['.
-    if (len == 0 || buf[0] != '[') { return TAPE_ERROR; }
-    buf++; len--;
-    // Strip trailing JSON whitespace.
-    while (len > 0 && (buf[len-1] == ' ' || buf[len-1] == '\t' || buf[len-1] == '\n' || buf[len-1] == '\r')) {
-      len--;
-    }
-    // Expect the closing ']'.
-    if (len == 0 || buf[len-1] != ']') { return TAPE_ERROR; }
-    len--;
-    // Fall through to comma_delimited over the array contents.
-    format = stream_format::comma_delimited;
-  }
-  return document_stream(*this, buf, len, batch_size, false, format);
-}
-inline simdjson_result<document_stream> parser::iterate_many(const char *buf, size_t len, size_t batch_size, stream_format format) noexcept {
-  return iterate_many(reinterpret_cast<const uint8_t *>(buf), len, batch_size, format);
-}
-inline simdjson_result<document_stream> parser::iterate_many(padded_string_view s, size_t batch_size, stream_format format) noexcept {
-  if (!s.has_sufficient_padding()) { return INSUFFICIENT_PADDING; }
-  return iterate_many(s.data(), s.length(), batch_size, format);
-}
-inline simdjson_result<document_stream> parser::iterate_many(const std::string &s, size_t batch_size, stream_format format) noexcept {
-  return iterate_many(padded_string_view(s), batch_size, format);
-}
-inline simdjson_result<document_stream> parser::iterate_many(const padded_string &s, size_t batch_size, stream_format format) noexcept {
-  return iterate_many(padded_string_view(s), batch_size, format);
-}
 simdjson_pure simdjson_inline size_t parser::capacity() const noexcept {
  return _capacity;
 }
@@ -245,7 +172,7 @@ simdjson_pure simdjson_inline size_t parser::max_depth() const noexcept {
 }

 simdjson_inline void parser::set_max_capacity(size_t max_capacity) noexcept {
-  if(max_capacity > dom::MINIMAL_DOCUMENT_CAPACITY) {
+  if(max_capacity < dom::MINIMAL_DOCUMENT_CAPACITY) {
    _max_capacity = max_capacity;
  } else {
    _max_capacity = dom::MINIMAL_DOCUMENT_CAPACITY;
@@ -244,66 +244,32 @@ public:
   *                   spot is cache-related: small enough to fit in cache, yet big enough to
   *                   parse as many documents as possible in one tight loop.
   *                   Defaults to 10MB, which has been a reasonable sweet spot in our tests.
-   * @param allow_comma_separated @deprecated Use stream_format::comma_delimited instead.
-   *                   When true, maps internally to stream_format::comma_delimited.
-   *                   Defaults to false.
+   * @param allow_comma_separated (defaults on false) This allows a mode where the documents are
+   *                   separated by commas instead of whitespace. It comes with a performance
+   *                   penalty because the entire document is indexed at once (and the document must be
+   *                   less than 4 GB), and there is no multithreading. In this mode, the batch_size parameter
+   *                   is effectively ignored, as it is set to at least the document size.
   * @return The stream, or an error. An empty input will yield 0 documents rather than an EMPTY error. Errors:
   *         - MEMALLOC if the parser does not have enough capacity and memory allocation fails
   *         - CAPACITY if the parser does not have enough capacity and batch_size > max_capacity.
   *         - other json errors if parsing fails. You should not rely on these errors to always the same for the
   *           same document: they may vary under runtime dispatch (so they may vary depending on your system and hardware).
   */
-  inline simdjson_result<document_stream> iterate_many(const uint8_t *buf, size_t len, size_t batch_size = DEFAULT_BATCH_SIZE) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size) */
-  inline simdjson_result<document_stream> iterate_many(padded_string_view json, size_t batch_size = DEFAULT_BATCH_SIZE) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size) */
-  inline simdjson_result<document_stream> iterate_many(const char *buf, size_t len, size_t batch_size = DEFAULT_BATCH_SIZE) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size) */
-  inline simdjson_result<document_stream> iterate_many(const std::string &s, size_t batch_size = DEFAULT_BATCH_SIZE) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size)
+  inline simdjson_result<document_stream> iterate_many(const uint8_t *buf, size_t len, size_t batch_size = DEFAULT_BATCH_SIZE, bool allow_comma_separated = false) noexcept;
+  /** @overload parse_many(const uint8_t *buf, size_t len, size_t batch_size) */
+  inline simdjson_result<document_stream> iterate_many(padded_string_view json, size_t batch_size = DEFAULT_BATCH_SIZE, bool allow_comma_separated = false) noexcept;
+  /** @overload parse_many(const uint8_t *buf, size_t len, size_t batch_size) */
+  inline simdjson_result<document_stream> iterate_many(const char *buf, size_t len, size_t batch_size = DEFAULT_BATCH_SIZE, bool allow_comma_separated = false) noexcept;
+  /** @overload parse_many(const uint8_t *buf, size_t len, size_t batch_size) */
+  inline simdjson_result<document_stream> iterate_many(const std::string &s, size_t batch_size = DEFAULT_BATCH_SIZE, bool allow_comma_separated = false) noexcept;
+  /** @overload parse_many(const uint8_t *buf, size_t len, size_t batch_size)
    the string might be automatically padded with up to SIMDJSON_PADDING whitespace characters */
-  inline simdjson_result<document_stream> iterate_many(std::string &s, size_t batch_size = DEFAULT_BATCH_SIZE) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size) */
-  inline simdjson_result<document_stream> iterate_many(const padded_string &s, size_t batch_size = DEFAULT_BATCH_SIZE) noexcept;
+  inline simdjson_result<document_stream> iterate_many(std::string &s, size_t batch_size = DEFAULT_BATCH_SIZE, bool allow_comma_separated = false) noexcept;
+  /** @overload parse_many(const uint8_t *buf, size_t len, size_t batch_size) */
+  inline simdjson_result<document_stream> iterate_many(const padded_string &s, size_t batch_size = DEFAULT_BATCH_SIZE, bool allow_comma_separated = false) noexcept;
  /** @private We do not want to allow implicit conversion from C string to std::string. */
  simdjson_result<document_stream> iterate_many(const char *buf, size_t batch_size = DEFAULT_BATCH_SIZE) noexcept = delete;

-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
-  /**
-   * @deprecated Use iterate_many with stream_format::comma_delimited instead.
-   */
-  simdjson_deprecated inline simdjson_result<document_stream> iterate_many(const uint8_t *buf, size_t len, size_t batch_size, bool allow_comma_separated) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size, bool allow_comma_separated) */
-  simdjson_deprecated inline simdjson_result<document_stream> iterate_many(padded_string_view json, size_t batch_size, bool allow_comma_separated) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size, bool allow_comma_separated) */
-  simdjson_deprecated inline simdjson_result<document_stream> iterate_many(const char *buf, size_t len, size_t batch_size, bool allow_comma_separated) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size, bool allow_comma_separated) */
-  simdjson_deprecated inline simdjson_result<document_stream> iterate_many(const std::string &s, size_t batch_size, bool allow_comma_separated) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size, bool allow_comma_separated) */
-  simdjson_deprecated inline simdjson_result<document_stream> iterate_many(std::string &s, size_t batch_size, bool allow_comma_separated) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size, bool allow_comma_separated) */
-  simdjson_deprecated inline simdjson_result<document_stream> iterate_many(const padded_string &s, size_t batch_size, bool allow_comma_separated) noexcept;
-#endif // SIMDJSON_DISABLE_DEPRECATED_API
-
-  /**
-   * Parse a stream of JSON documents with explicit format specification.
-   *
-   * @param buf The concatenated JSON documents.
-   * @param len The length of the buffer.
-   * @param batch_size The batch size to use.
-   * @param format The stream format (whitespace_delimited, json_sequence, or comma_delimited).
-   * @return A stream of documents, or an error.
-   */
-  inline simdjson_result<document_stream> iterate_many(const uint8_t *buf, size_t len, size_t batch_size, stream_format format) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size, stream_format format) */
-  inline simdjson_result<document_stream> iterate_many(const char *buf, size_t len, size_t batch_size, stream_format format) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size, stream_format format) */
-  inline simdjson_result<document_stream> iterate_many(padded_string_view s, size_t batch_size, stream_format format) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size, stream_format format) */
-  inline simdjson_result<document_stream> iterate_many(const std::string &s, size_t batch_size, stream_format format) noexcept;
-  /** @overload iterate_many(const uint8_t *buf, size_t len, size_t batch_size, stream_format format) */
-  inline simdjson_result<document_stream> iterate_many(const padded_string &s, size_t batch_size, stream_format format) noexcept;
-
  /** The capacity of this parser (the largest document it can process). */
  simdjson_pure simdjson_inline size_t capacity() const noexcept;
  /** The maximum capacity of this parser (the largest document it is allowed to process). */
@@ -459,4 +425,4 @@ public:

 } // namespace simdjson

-#endif // SIMDJSON_GENERIC_ONDEMAND_PARSER_H
+#endif // SIMDJSON_GENERIC_ONDEMAND_PARSER_H
@@ -305,7 +305,7 @@ error_code tag_invoke(deserialize_tag, ValT &val, T &out) noexcept {
 #if SIMDJSON_STATIC_REFLECTION
  std::string_view str;
  SIMDJSON_TRY(val.get_string().get(str));
-  static constexpr auto enumerators = std::define_static_array(std::meta::enumerators_of(^^T));
+  constexpr auto enumerators = std::define_static_array(std::meta::enumerators_of(^^T));
  template for (constexpr auto enum_val : enumerators) {
    if (str == std::meta::identifier_of(enum_val)) {
      out = [:enum_val:];
@@ -12,8 +12,6 @@
 #include "simdjson/generic/ondemand/value.h"
 #endif // SIMDJSON_CONDITIONAL_INCLUDE

-#include <limits>
-
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 namespace ondemand {
@@ -74,18 +72,6 @@ simdjson_inline simdjson_result<int64_t> value::get_int64() noexcept {
 simdjson_inline simdjson_result<int64_t> value::get_int64_in_string() noexcept {
  return iter.get_int64_in_string();
 }
-simdjson_inline simdjson_result<uint32_t> value::get_uint32() noexcept {
-  uint64_t result;
-  SIMDJSON_TRY(get_uint64().get(result));
-  if (result > (std::numeric_limits<uint32_t>::max)()) { return NUMBER_OUT_OF_RANGE; }
-  return static_cast<uint32_t>(result);
-}
-simdjson_inline simdjson_result<int32_t> value::get_int32() noexcept {
-  int64_t result;
-  SIMDJSON_TRY(get_int64().get(result));
-  if (result > (std::numeric_limits<int32_t>::max)() || result < (std::numeric_limits<int32_t>::min)()) { return NUMBER_OUT_OF_RANGE; }
-  return static_cast<int32_t>(result);
-}
 simdjson_inline simdjson_result<bool> value::get_bool() noexcept {
  return iter.get_bool();
 }
@@ -101,8 +87,6 @@ template<> simdjson_inline simdjson_result<number> value::get() noexcept { retur
 template<> simdjson_inline simdjson_result<double> value::get() noexcept { return get_double(); }
 template<> simdjson_inline simdjson_result<uint64_t> value::get() noexcept { return get_uint64(); }
 template<> simdjson_inline simdjson_result<int64_t> value::get() noexcept { return get_int64(); }
-template<> simdjson_inline simdjson_result<uint32_t> value::get() noexcept { return get_uint32(); }
-template<> simdjson_inline simdjson_result<int32_t> value::get() noexcept { return get_int32(); }
 template<> simdjson_inline simdjson_result<bool> value::get() noexcept { return get_bool(); }


@@ -114,8 +98,6 @@ template<> simdjson_warn_unused simdjson_inline error_code value::get(number& ou
 template<> simdjson_warn_unused simdjson_inline error_code value::get(double& out) noexcept { return get_double().get(out); }
 template<> simdjson_warn_unused simdjson_inline error_code value::get(uint64_t& out) noexcept { return get_uint64().get(out); }
 template<> simdjson_warn_unused simdjson_inline error_code value::get(int64_t& out) noexcept { return get_int64().get(out); }
-template<> simdjson_warn_unused simdjson_inline error_code value::get(uint32_t& out) noexcept { return get_uint32().get(out); }
-template<> simdjson_warn_unused simdjson_inline error_code value::get(int32_t& out) noexcept { return get_int32().get(out); }
 template<>  simdjson_warn_unused simdjson_inline error_code value::get(bool& out) noexcept { return get_bool().get(out); }

 #if SIMDJSON_EXCEPTIONS
@@ -419,14 +401,6 @@ simdjson_inline simdjson_result<int64_t> simdjson_result<SIMDJSON_IMPLEMENTATION
  if (error()) { return error(); }
  return first.get_int64_in_string();
 }
-simdjson_inline simdjson_result<uint32_t> simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value>::get_uint32() noexcept {
-  if (error()) { return error(); }
-  return first.get_uint32();
-}
-simdjson_inline simdjson_result<int32_t> simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value>::get_int32() noexcept {
-  if (error()) { return error(); }
-  return first.get_int32();
-}
 simdjson_inline simdjson_result<double> simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value>::get_double() noexcept {
  if (error()) { return error(); }
  return first.get_double();
@@ -161,28 +161,6 @@ public:
   */
  simdjson_inline simdjson_result<int64_t> get_int64_in_string() noexcept;

-  /**
-   * Cast this JSON value to a 32-bit unsigned integer.
-   *
-   * Calls get_uint64() and checks that the result fits in a uint32_t.
-   *
-   * @returns A 32-bit unsigned integer.
-   * @returns INCORRECT_TYPE If the JSON value is not an unsigned integer.
-   * @returns NUMBER_OUT_OF_RANGE If the value does not fit in a uint32_t.
-   */
-  simdjson_inline simdjson_result<uint32_t> get_uint32() noexcept;
-
-  /**
-   * Cast this JSON value to a 32-bit signed integer.
-   *
-   * Calls get_int64() and checks that the result fits in an int32_t.
-   *
-   * @returns A 32-bit signed integer.
-   * @returns INCORRECT_TYPE If the JSON value is not an integer.
-   * @returns NUMBER_OUT_OF_RANGE If the value does not fit in an int32_t.
-   */
-  simdjson_inline simdjson_result<int32_t> get_int32() noexcept;
-
  /**
   * Cast this JSON value to a double.
   *
@@ -768,8 +746,6 @@ public:
  simdjson_inline simdjson_result<uint64_t> get_uint64_in_string() noexcept;
  simdjson_inline simdjson_result<int64_t> get_int64() noexcept;
  simdjson_inline simdjson_result<int64_t> get_int64_in_string() noexcept;
-  simdjson_inline simdjson_result<uint32_t> get_uint32() noexcept;
-  simdjson_inline simdjson_result<int32_t> get_int32() noexcept;
  simdjson_inline simdjson_result<double> get_double() noexcept;
  simdjson_inline simdjson_result<double> get_double_in_string() noexcept;
  simdjson_inline simdjson_result<std::string_view> get_string(bool allow_replacement = false) noexcept;
@@ -19,12 +19,7 @@ class document;
 * 3) The stream_final mode allows us to truncate final
 * unterminated strings. It is useful in conjunction with streaming_partial.
 */
-enum class stage1_mode {
-  regular,
-  streaming_partial, streaming_final,
-  json_sequence_partial, json_sequence_final,
-  comma_delimited_partial, comma_delimited_final
-};
+enum class stage1_mode { regular, streaming_partial, streaming_final};

 /**
 * Returns true if mode == streaming_partial or mode == streaming_final
@@ -36,6 +31,7 @@ inline bool is_streaming(stage1_mode mode) {
  // return (mode == stage1_mode::streaming_partial || mode == stage1_mode::streaming_final);
 }

+
 namespace internal {


@@ -216,12 +212,6 @@ protected:
   */
  size_t _max_depth{0};

-public:
-  /** Whether to store big integers as strings instead of returning BIGINT_ERROR */
-  bool _number_as_string{false};
-
-protected:
-
  // Declaring these so that subclasses can use them to implement their constructors.
  simdjson_inline dom_parser_implementation() noexcept;
  simdjson_inline dom_parser_implementation(dom_parser_implementation &&other) noexcept;
@@ -19,8 +19,7 @@ enum class tape_type {
  DOUBLE = 'd',
  TRUE_VALUE = 't',
  FALSE_VALUE = 'f',
-  NULL_VALUE = 'n',
-  BIGINT = 'Z'  // Big integer stored as string in string buffer
+  NULL_VALUE = 'n'
 }; // enum class tape_type

 } // namespace internal
@@ -10,18 +10,13 @@
 #include <climits>
 #include <cwchar>

-#if SIMDJSON_HAS_UNISTD_H
+#ifndef _WIN32
 #include <fcntl.h>
 #include <stdio.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #endif
-// On Windows, `padded_memory_map` (when it is enabled) depends on types and
-// functions declared in <windows.h>. We deliberately do NOT include that
-// header here: users of simdjson who want `padded_memory_map` on Windows
-// must include <windows.h> themselves *before* including this header. See
-// padded_string.h for the detection logic.

 namespace simdjson {
 namespace internal {
@@ -173,13 +168,10 @@ inline padded_string::operator padded_string_view() const noexcept simdjson_life
 }

 inline simdjson_result<padded_string> padded_string::load(std::string_view filename) noexcept {
-  // std::string_view is not guaranteed to be null-terminated, but std::fopen requires
-  // a null-terminated C string. Construct a temporary std::string to ensure null-termination.
-  const std::string null_terminated_filename(filename);
  // Open the file
  SIMDJSON_PUSH_DISABLE_WARNINGS
  SIMDJSON_DISABLE_DEPRECATED_WARNING // Disable CRT_SECURE warning on MSVC: manually verified this is safe
-  std::FILE *fp = std::fopen(null_terminated_filename.c_str(), "rb");
+  std::FILE *fp = std::fopen(filename.data(), "rb");
  SIMDJSON_POP_DISABLE_WARNINGS

  if (fp == nullptr) {
@@ -231,13 +223,10 @@ inline simdjson_result<padded_string> padded_string::load(std::string_view filen

 #if defined(_WIN32) && SIMDJSON_CPLUSPLUS17
 inline simdjson_result<padded_string> padded_string::load(std::wstring_view filename) noexcept {
-  // std::wstring_view is not guaranteed to be null-terminated, but _wfopen requires
-  // a null-terminated wide C string. Construct a temporary std::wstring to ensure null-termination.
-  const std::wstring null_terminated_filename(filename);
  // Open the file using the wide characters
  SIMDJSON_PUSH_DISABLE_WARNINGS
  SIMDJSON_DISABLE_DEPRECATED_WARNING // Disable CRT_SECURE warning on MSVC: manually verified this is safe
-  std::FILE *fp = _wfopen(null_terminated_filename.c_str(), L"rb");
+  std::FILE *fp = _wfopen(filename.data(), L"rb");
  SIMDJSON_POP_DISABLE_WARNINGS

  if (fp == nullptr) {
@@ -360,9 +349,6 @@ inline padded_string padded_string_builder::convert() noexcept {
 }

 inline bool padded_string_builder::reserve(size_t additional) noexcept {
-  if (simdjson_unlikely(additional + size < size)) {
-    return false; // overflow: cannot satisfy request
-  }
  size_t needed = size + additional;
  if (needed <= capacity) {
    return true;
@@ -372,9 +358,8 @@ inline bool padded_string_builder::reserve(size_t additional) noexcept {
  // repeated allocations.
  if (new_capacity < 4096) {
    new_capacity *= 2;
-    // overflow guard: ensure new_capacity + new_capacity/2 does not overflow
-  } else if (new_capacity + new_capacity / 2 > new_capacity) {
-    new_capacity += new_capacity / 2; // grow by 1.5x
+  } else {
+    new_capacity += new_capacity/2; // grow by 1.5x
  }
  char *new_data = internal::allocate_padded_buffer(new_capacity);
  if (new_data == nullptr) {
@@ -390,9 +375,7 @@ inline bool padded_string_builder::reserve(size_t additional) noexcept {
 }


-#if SIMDJSON_HAS_PADDED_MEMORY_MAP
-
-#if SIMDJSON_HAS_UNISTD_H
+#ifndef _WIN32
 simdjson_inline padded_memory_map::padded_memory_map(const char *filename) noexcept {

    int fd = open(filename, O_RDONLY);
@@ -428,132 +411,7 @@ simdjson_inline padded_memory_map::~padded_memory_map() noexcept {
    munmap(const_cast<char *>(data), size + simdjson::SIMDJSON_PADDING);
  }
 }
-#elif defined(_WIN32)
-// Windows zero-copy implementation using placeholder virtual memory.
-//
-// We use the modern Windows memory APIs (VirtualAlloc2, CreateFileMapping2,
-// MapViewOfFile3 — available since Windows 10 1803) to map the file into a
-// contiguous virtual address range that includes at least SIMDJSON_PADDING
-// zero bytes after the file content, with no data copies.
-//
-// Strategy:
-//   1. If rounding the file size up to the allocation granularity already
-//      exceeds file_size + SIMDJSON_PADDING, the OS page zero-fill provides
-//      the padding and we use a simple MapViewOfFile3 call.
-//   2. Otherwise we reserve a contiguous placeholder region via VirtualAlloc2,
-//      split it at the granularity-aligned file boundary, map the file into
-//      the first part, and commit zero pages for the second part (padding).
-simdjson_inline padded_memory_map::padded_memory_map(const char *filename) noexcept {
-  HANDLE file_handle = ::CreateFileA(
-      filename, GENERIC_READ,
-      FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-      NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-  if (file_handle == INVALID_HANDLE_VALUE) {
-    return;
-  }
-  LARGE_INTEGER file_size_li;
-  if (!::GetFileSizeEx(file_handle, &file_size_li) || file_size_li.QuadPart < 0) {
-    ::CloseHandle(file_handle);
-    return;
-  }
-#if SIMDJSON_IS_32BITS
-  if (static_cast<unsigned long long>(file_size_li.QuadPart) >
-      static_cast<unsigned long long>(SIZE_MAX - simdjson::SIMDJSON_PADDING)) {
-    ::CloseHandle(file_handle);
-    return;
-  }
-#endif
-  size = static_cast<size_t>(file_size_li.QuadPart);
-  if (size == 0) {
-    ::CloseHandle(file_handle);
-    return;
-  }

-  HANDLE section = ::CreateFileMapping2(
-      file_handle, NULL, FILE_MAP_READ, PAGE_READONLY,
-      0, 0, NULL, NULL, 0);
-  ::CloseHandle(file_handle);
-  if (section == NULL) {
-    return;
-  }
-
-  SYSTEM_INFO si;
-  ::GetSystemInfo(&si);
-  const size_t granularity = static_cast<size_t>(si.dwAllocationGranularity);
-  const size_t file_region = (size + granularity - 1) & ~(granularity - 1);
-  const size_t total_needed = size + simdjson::SIMDJSON_PADDING;
-
-  if (file_region >= total_needed) {
-    // The zero-fill in the last page already covers the padding.
-    PVOID view = ::MapViewOfFile3(
-        section, ::GetCurrentProcess(), NULL, 0, 0,
-        0, PAGE_READONLY, NULL, 0);
-    ::CloseHandle(section);
-    if (view != NULL) {
-      data = static_cast<const char *>(view);
-    }
-    return;
-  }
-
-  // We need extra zero pages beyond the file region. Use the placeholder API
-  // to get a contiguous virtual address range spanning both the file mapping
-  // and the zero-filled padding.
-  const size_t padding_region =
-      ((total_needed - file_region) + granularity - 1) & ~(granularity - 1);
-  const size_t reserve_size = file_region + padding_region;
-
-  // Reserve a contiguous placeholder.
-  PVOID placeholder = ::VirtualAlloc2(
-      ::GetCurrentProcess(), NULL, reserve_size,
-      MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS, NULL, 0);
-  if (placeholder == NULL) {
-    ::CloseHandle(section);
-    return;
-  }
-
-  // Split into two placeholders at the file_region boundary.
-  if (!::VirtualFree(placeholder, file_region,
-                     MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER)) {
-    ::VirtualFree(placeholder, 0, MEM_RELEASE);
-    ::CloseHandle(section);
-    return;
-  }
-
-  // Map the file into the first placeholder.
-  PVOID file_view = ::MapViewOfFile3(
-      section, ::GetCurrentProcess(), placeholder, 0, file_region,
-      MEM_REPLACE_PLACEHOLDER, PAGE_READONLY, NULL, 0);
-  ::CloseHandle(section);
-  if (file_view == NULL) {
-    ::VirtualFree(placeholder, 0, MEM_RELEASE);
-    ::VirtualFree(static_cast<char *>(placeholder) + file_region,
-                  0, MEM_RELEASE);
-    return;
-  }
-
-  // Commit zero pages in the second placeholder (the padding).
-  void *pad = static_cast<char *>(placeholder) + file_region;
-  PVOID padding_ptr = ::VirtualAlloc2(
-      ::GetCurrentProcess(), pad, padding_region,
-      MEM_REPLACE_PLACEHOLDER | MEM_COMMIT, PAGE_READONLY, NULL, 0);
-  if (padding_ptr == NULL) {
-    ::UnmapViewOfFile(file_view);
-    ::VirtualFree(pad, 0, MEM_RELEASE);
-    return;
-  }
-
-  data = static_cast<const char *>(file_view);
-  padding_view_ = padding_ptr;
-}
-
-simdjson_inline padded_memory_map::~padded_memory_map() noexcept {
-  if (data == nullptr) { return; }
-  ::UnmapViewOfFile(data);
-  if (padding_view_ != nullptr) {
-    ::VirtualFree(padding_view_, 0, MEM_RELEASE);
-  }
-}
-#endif // POSIX or _WIN32

 simdjson_inline simdjson::padded_string_view padded_memory_map::view() const noexcept simdjson_lifetime_bound {
  if(!is_valid()) {
@@ -565,8 +423,7 @@ simdjson_inline simdjson::padded_string_view padded_memory_map::view() const noe
 simdjson_inline bool padded_memory_map::is_valid() const noexcept {
  return data != nullptr;
 }
-
-#endif // SIMDJSON_HAS_PADDED_MEMORY_MAP
+#endif // _WIN32

 } // namespace simdjson

@@ -277,26 +277,11 @@ inline std::ostream& operator<<(std::ostream& out, const padded_string& s) { ret
 inline std::ostream& operator<<(std::ostream& out, simdjson_result<padded_string> &s) noexcept(false) { return out << s.value(); }
 #endif

-#if SIMDJSON_HAS_PADDED_MEMORY_MAP
+
+#ifndef _WIN32
 /**
 * A class representing a memory-mapped file with padding.
- *
- * On POSIX systems (Linux, macOS, BSD, ...), this uses `mmap` to map the file
- * contents directly into memory, which is efficient for large files (no copy).
- *
- * On Windows, this class is disabled by default and must be opted into at
- * build time by defining `SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=1`. When
- * enabled, `<windows.h>` must also be included before `<simdjson.h>` and
- * the compilation must target Windows 10, version 1803 or later. The
- * Windows implementation uses the modern memory APIs (`VirtualAlloc2`,
- * `CreateFileMapping2`, `MapViewOfFile3`) with the placeholder virtual
- * memory mechanism to always achieve true zero-copy mapping with
- * contiguous zero-filled padding.
- *
- * Either way, the resulting `padded_string_view` carries at least
- * `SIMDJSON_PADDING` bytes of accessible zero-filled padding after the file
- * content, so it can be consumed directly by the simdjson parsers (including
- * `parse_many` / `iterate_many`).
+ * It is only available on non-Windows platforms, as Windows has different APIs for memory mapping.
 */
 class padded_memory_map {
 public:
@@ -304,11 +289,9 @@ public:
   * Create a new padded memory map for the given file.
   * After creating the memory map, you can call view() to get a padded_string_view of the file content.
   * The memory map will be automatically released when the padded_memory_map instance is destroyed.
-   * On POSIX systems, the file content is not copied, so this is efficient for large files.
-   * On Windows, the file is mapped into memory via `MapViewOfFile3` (zero-copy).
-   * In all cases, the file must remain unchanged while the memory map is in use.
-   * In case of error (e.g., file not found, permission denied, etc.), the memory map will be
-   * invalid and view() will return an empty view.
+   * Note that the file content is not copied, so this is efficient for large files. However,
+   * the file must remain unchanged while the memory map is in use. In case of error (e.g., file not found,
+   * permission denied, etc.), the memory map will be invalid and view() will return an empty view.
   * You can check if the memory map is valid by calling is_valid() before using view().
   *
   * @param filename the path to the file to memory-map.
@@ -345,14 +328,8 @@ private:
  padded_memory_map &operator=(const padded_memory_map &) = delete;
  const char *data{nullptr};
  size_t size{0};
-#ifdef _WIN32
-  // When the file ends near an allocation-granularity boundary, we use the
-  // placeholder API to append zero-filled padding pages. This pointer tracks
-  // that region so the destructor can release it with VirtualFree.
-  void *padding_view_{nullptr};
-#endif
 };
-#endif // SIMDJSON_HAS_PADDED_MEMORY_MAP
+#endif // _WIN32



@@ -6,15 +6,6 @@

 #include <cstring> /* memcmp */

-// for page size computation.
-#if SIMDJSON_HAS_UNISTD_H
-  #include <unistd.h>
-  #if defined(__APPLE__)
-    #include <sys/sysctl.h>
-  #endif
-#endif
-
-
 namespace simdjson {

 inline padded_string_view::padded_string_view(const char* s, size_t len, size_t capacity) noexcept
@@ -104,83 +95,7 @@ inline padded_string_view pad_with_reserve(std::string& s) noexcept {
  return padded_string_view(s.data(), s.size(), s.capacity());
 }

-inline uint32_t get_page_size() noexcept {
-#if defined(_WINDOWS_) // if and only if someone loaded Windows.h, we can get the page size from there.
-// Otherwise, we assume 4096.
-    static const uint32_t cached = []() -> uint32_t {
-      SYSTEM_INFO si;
-      GetSystemInfo(&si);
-      return static_cast<std::uint32_t>(si.dwPageSize);
-    }();
-    return cached;
-#elif SIMDJSON_HAS_UNISTD_H
-    static const uint32_t cached = []() -> uint32_t {
-      long page_size = sysconf(_SC_PAGESIZE);
-      if (page_size > 0) {
-          return static_cast<uint32_t>(page_size);
-      }
-      return 4096; // fallback
-    }();
-    return cached;
-#else
-    return 4096; // fallback
-#endif
-}
-#if SIMDJSON_CPLUSPLUS17

-inline padded_input::padded_input(std::string_view sv)
-    : storage(simdjson::padded_string_view{}) {
-  if (needs_allocation(sv.data(), sv.size())) {
-      storage = simdjson::padded_string(sv);
-  } else {
-      storage = simdjson::padded_string_view(
-          sv.data(), sv.size(), sv.size() + simdjson::SIMDJSON_PADDING);
-  }
-}
-
-inline padded_input::padded_input(const char *data, size_t length)
-    : storage(simdjson::padded_string_view{}) {
-  if (needs_allocation(data, length)) {
-      storage = simdjson::padded_string(data, length);
-  } else {
-      storage = simdjson::padded_string_view(
-          data, length, length + simdjson::SIMDJSON_PADDING);
-  }
-}
-
-inline padded_input::padded_input(const std::string &s)
-    : storage(simdjson::padded_string_view{}) {
-  const size_t len = s.size();
-  const size_t cap = s.capacity();
-  // Here we have the string content from data() to data() + size(),
-  // but the memory is accessible from data() to data() + capacity().
-  const size_t needed_padding = (cap - len) < simdjson::SIMDJSON_PADDING
-    ? simdjson::SIMDJSON_PADDING - (cap - len) : 0;
-  if (needed_padding > 0 && needs_allocation(s.data(), cap, needed_padding)) {
-      storage = simdjson::padded_string(s);
-  } else {
-      storage = simdjson::padded_string_view(
-          s.data(), len, len + simdjson::SIMDJSON_PADDING);
-  }
-}
-
-inline bool padded_input::is_view() const noexcept {
-  return std::holds_alternative<simdjson::padded_string_view>(storage);
-}
-
-inline padded_input::operator simdjson::padded_string_view() const noexcept {
-  return std::visit([](const auto& p) -> simdjson::padded_string_view {
-      return p;
-  }, storage);
-}
-
-inline bool padded_input::needs_allocation(const char* buf, size_t len, size_t padding) noexcept {
-  if(len == 0) { return false; }
-  const auto page_size = get_page_size();
-  return ((reinterpret_cast<uintptr_t>(buf + len - 1) % page_size)
-          + padding >= static_cast<uintptr_t>(page_size));
-}
-#endif // SIMDJSON_CPLUSPLUS17

 } // namespace simdjson

@@ -9,9 +9,6 @@
 #include <memory>
 #include <string>
 #include <ostream>
-#if SIMDJSON_CPLUSPLUS17
-#include <variant>
-#endif

 namespace simdjson {

@@ -76,68 +73,6 @@ public:

 }; // padded_string_view

-/**
- * Get the system's memory page size. By default, we return
- * 4096 bytes, which is the most common page size. On systems
- * where the page size is not a multiple of 4096 bytes, and not
- * a unix-like system, nor Windows, this function may return an
- * incorrect value.
- *
- * @return The page size in bytes.
- */
-inline uint32_t get_page_size() noexcept;
-
-#if SIMDJSON_CPLUSPLUS17
-/**
- * A padded_input is a wrapper around either a padded_string_view or a padded_string.
- * It will automatically pad a string_view if it does not have sufficient padding
- * up to the end of the memory page. Note that a requirement for this method to
- * make sense is to be on a system with a page size of at least 4096 (which is
- * universal except on some embedded systems).
- */
-struct padded_input {
-    /**
-     * Construct a padded_input from a string_view. If the string_view does not have sufficient padding,
-     * the data will be copied into a padded_string and the padded_string_view will point to the
-     * padded_string's data. Otherwise, the padded_string_view will point to the original string_view's data.
-     */
-     inline explicit padded_input(std::string_view sv);
-    /**
-     * Construct a padded_input from a C-style string (length specified). If the string does not have sufficient padding,
-     * the data will be copied into a padded_string and the padded_string_view will point to the
-     * padded_string's data. Otherwise, the padded_string_view will point to the original string's data.
-     */
-     inline explicit padded_input(const char *data, size_t length);
-    /**
-     * Construct a padded_input from a std::string. If the string does not have sufficient padding
-     * (considering its capacity), the data will be copied into a padded_string and the padded_string_view
-     * will point to the padded_string's data. Otherwise, the padded_string_view will point to the
-     * original string's data.
-     */
-     inline explicit padded_input(const std::string &s);
-
-    /**
-     * Check if the padded_input is a view.
-     *
-     * @return true if the padded_input is a view, false otherwise.
-     */
-     inline bool is_view() const noexcept;
-
-    /**
-     * Convert the padded_input to a padded_string_view.
-     *
-     * @return The padded_string_view.
-     */
-     inline operator simdjson::padded_string_view() const noexcept;
-
-private:
-    std::variant<simdjson::padded_string_view, simdjson::padded_string> storage;
-    // whether we cross a page boundary and need to allocate a new padded string.
-    static inline bool needs_allocation(const char* buf, size_t len, size_t padding = SIMDJSON_PADDING) noexcept;
-};
-
-#endif // SIMDJSON_CPLUSPLUS17
-
 #if SIMDJSON_EXCEPTIONS
 /**
 * Send padded_string instance to an output stream.
@@ -170,7 +105,6 @@ inline padded_string_view pad(std::string& s) noexcept;
 * @return The padded string.
 */
 inline padded_string_view pad_with_reserve(std::string& s) noexcept;
-
 } // namespace simdjson

 #endif // SIMDJSON_PADDED_STRING_VIEW_H
@@ -285,53 +285,5 @@ using std::size_t;
 #endif
 #endif

-#ifndef SIMDJSON_HAS_UNISTD_H
-#if defined(__unix__) || defined(__APPLE__) || defined(__linux__)
-#define SIMDJSON_HAS_UNISTD_H 1
-#else
-#define SIMDJSON_HAS_UNISTD_H 0
-#endif
-#endif
-
-// padded_memory_map availability.
-//
-// On POSIX platforms the class is always available: the implementation uses
-// `mmap` (and a trailing anonymous page for padding) from <sys/mman.h>.
-//
-// On Windows the class is disabled by default and must be explicitly
-// opted into by defining `SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=1`. Enabling
-// it requires:
-//   1. `<windows.h>` has been included *before* `<simdjson.h>` (so that
-//      this header can see the Win32 types and the `_WINDOWS_` include
-//      guard),
-//   2. the compilation targets Windows 10, version 1803 or later
-//      (i.e. `NTDDI_VERSION >= NTDDI_WIN10_RS4`, `0x0A000005`). This is
-//      required because the implementation relies on the modern memory
-//      APIs introduced with that version (`CreateFileMapping2` /
-//      `MapViewOfFile3`),
-//   3. the link step pulls in an import library that exports those APIs,
-//      typically `onecore.lib` (or `mincore.lib`).
-//
-// The `SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS` CMake option arranges (1)-(3)
-// automatically when building simdjson with its own CMake. Consumers using
-// simdjson as a pre-built library are responsible for setting the macro,
-// the Windows version macros, and the link library themselves.
-//
-// If the opt-in conditions are not met on Windows, `padded_memory_map`
-// simply does not exist — any attempt to use it fails at compile time
-// with an "unknown identifier" diagnostic rather than silently degrading.
-//
-// The SIMDJSON_HAS_PADDED_MEMORY_MAP macro reflects whether the class is
-// available in the current translation unit. Users may test this macro to
-// conditionally compile code that depends on padded_memory_map.
-#ifndef SIMDJSON_HAS_PADDED_MEMORY_MAP
-  #if defined(__unix__) || defined(__APPLE__) || defined(__linux__)
-    #define SIMDJSON_HAS_PADDED_MEMORY_MAP 1
-  #elif defined(_WINDOWS_) && defined(SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS) && SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS
-    #define SIMDJSON_HAS_PADDED_MEMORY_MAP 1
-  #else
-    #define SIMDJSON_HAS_PADDED_MEMORY_MAP 0
-  #endif
-#endif

 #endif // SIMDJSON_PORTABILITY_H
@@ -4,7 +4,7 @@
 #define SIMDJSON_SIMDJSON_VERSION_H

 /** The version of simdjson being used (major.minor.revision) */
-#define SIMDJSON_VERSION "4.6.1"
+#define SIMDJSON_VERSION "4.4.2"

 namespace simdjson {
 enum {
@@ -15,11 +15,11 @@ enum {
  /**
   * The minor version (major.MINOR.revision) of simdjson being used.
   */
-  SIMDJSON_VERSION_MINOR = 6,
+  SIMDJSON_VERSION_MINOR = 4,
  /**
   * The revision (major.minor.REVISION) of simdjson being used.
   */
-  SIMDJSON_VERSION_REVISION = 1
+  SIMDJSON_VERSION_REVISION = 2
 };
 } // namespace simdjson

@@ -1,11 +0,0 @@
-{
-  "app_name": "MyApp",
-  "version": "1.0.0",
-  "port": 8080,
-  "debug": true,
-  "features": ["logging", "caching"],
-  "database": {
-    "host": "localhost",
-    "port": 5432
-  }
-}
@@ -268,21 +268,7 @@ class SimdjsonFile:
        print(f"    Adding include: {self} includes {include}")
        if self.is_conditional_include:
            # If I have a dependency file, I can only include something that has a dependency file.
-            if not include.is_conditional_include:
-                dep = self.dependency_file
-                dep_hint = f" and add it to the dependency file '{dep}'" if dep else ""
-                raise AssertionError(
-                    f"Error: Amalgamated file '{self}' is trying to include '{include}', "
-                    f"but '{include}' is not an amalgamated file.\n\n"
-                    f"FIX: Wrap the #include \"{include}\" in a conditional block:\n\n"
-                    f"    #ifndef SIMDJSON_CONDITIONAL_INCLUDE\n"
-                    f"    #include \"{include}\"\n"
-                    f"    #endif // SIMDJSON_CONDITIONAL_INCLUDE\n\n"
-                    f"This makes the include editor-only (skipped during amalgamation){dep_hint}.\n\n"
-                    f"During amalgamation, '{include}' is already included earlier in the "
-                    f"amalgamated output, so it does not need to be included again.\n\n"
-                    f"{rules}"
-                )
+            assert include.is_conditional_include, f"Error: Amalgamated file '{self}' is trying to include '{include}', but '{include}' is not an amalgamated file. Amalgamated files can only include other amalgamated files to maintain conditional inclusion structure. Check the inclusion rules in the script's 'rules' variable. {rules}"
            # TODO make sure we only include amalgamated files that are guaranteed to be included with us (or before us)
            # if include.amalgamator_file:
            #     assert include.amalgamator_file == self, f"{self} cannot include {include}: it should be included from {include.amalgamator_file} instead."
@@ -439,10 +425,8 @@ class Amalgamator:
            self.implementation = "SIMDJSON_BUILTIN_IMPLEMENTATION"

        assert not self.editor_only_region, f"Error: Already in an editor-only region when starting to write '{file}'. Ensure proper nesting of conditional blocks."
-        editor_only_start_line = None
-        bare_endif_lines = []
        with open(file.absolute_path, 'r') as fid2:
-            for line_number, line in enumerate(fid2, 1):
+            for line in fid2:
                line = line.rstrip('\n')

                # Ignore #pragma once, it causes warnings if it ends up in a .cpp file
@@ -455,7 +439,6 @@ class Amalgamator:
                    assert self.in_conditional_include_block, f"Error: File '{file}' uses '#ifndef SIMDJSON_CONDITIONAL_INCLUDE' without a prior '#define SIMDJSON_CONDITIONAL_INCLUDE'. Ensure the define comes first. Stack: {self.include_stack}. {rules}"
                    assert not self.editor_only_region, f"Error: File '{file}' uses '#ifndef SIMDJSON_CONDITIONAL_INCLUDE' twice in a row. Ensure conditional blocks are properly nested and closed. {rules}"
                    self.editor_only_region = True
-                    editor_only_start_line = line_number

                # Handle ignored lines (and ending ignore blocks)
                end_ignore = endif_conditional_re.search(line)
@@ -470,12 +453,6 @@ class Amalgamator:
                            file.add_editor_only_include(included_file)
                    if end_ignore:
                        self.editor_only_region = False
-                        editor_only_start_line = None
-                    else:
-                        # Track bare #endif lines that might be the intended closer
-                        stripped = line.strip()
-                        if stripped == '#endif' or (stripped.startswith('#endif') and 'SIMDJSON_CONDITIONAL_INCLUDE' not in stripped):
-                            bare_endif_lines.append((line_number, line.strip()))
                    continue

                assert not end_ignore, f"Error: File '{file}' has '#endif // SIMDJSON_CONDITIONAL_INCLUDE' without a matching '#ifndef'. Ensure proper conditional block structure. {rules}"
@@ -524,35 +501,7 @@ class Amalgamator:

                self.write(line)

-            if self.editor_only_region:
-                msg = (
-                    f"Error: File '{file}' ended without closing the "
-                    f"'#endif // SIMDJSON_CONDITIONAL_INCLUDE' block "
-                    f"(opened at line {editor_only_start_line}).\n\n"
-                )
-                if bare_endif_lines:
-                    msg += (
-                        f"HINT: Found #endif line(s) inside the block that are missing "
-                        f"the required comment. The amalgamation script looks for exactly:\n\n"
-                        f"    #endif // SIMDJSON_CONDITIONAL_INCLUDE\n\n"
-                        f"but found:\n"
-                    )
-                    for ln, text in bare_endif_lines:
-                        msg += f"    line {ln}: {text}\n"
-                    msg += (
-                        f"\nFIX: Change the #endif to:\n\n"
-                        f"    #endif // SIMDJSON_CONDITIONAL_INCLUDE\n\n"
-                        f"The '// SIMDJSON_CONDITIONAL_INCLUDE' comment is required "
-                        f"for the amalgamation script to recognize it as the closing "
-                        f"of the conditional block.\n"
-                    )
-                else:
-                    msg += (
-                        f"FIX: Add '#endif // SIMDJSON_CONDITIONAL_INCLUDE' to close "
-                        f"the '#ifndef SIMDJSON_CONDITIONAL_INCLUDE' block.\n"
-                    )
-                msg += f"\n{rules}"
-                raise AssertionError(msg)
+            assert not self.editor_only_region, f"Error: File '{file}' ended without closing the '#endif // SIMDJSON_CONDITIONAL_INCLUDE'. Ensure all conditional blocks are properly closed. {rules}"

        self.write(f"/* end file {self.file_to_str(file)} */")

@@ -1,4 +1,4 @@
-/* auto-generated on 2026-04-02 19:14:16 -0400. version 4.6.1 Do not edit! */
+/* auto-generated on 2026-03-20 11:11:38 -0400. version 4.4.2 Do not edit! */
 /* including simdjson.cpp:  */
 /* begin file simdjson.cpp */
 #define SIMDJSON_SRC_SIMDJSON_CPP
@@ -3168,11 +3168,6 @@ struct fixed_string {
            data[i] = str[i];
        }
    }
-    constexpr fixed_string(const unsigned char (&str)[N])  {
-        for (std::size_t i = 0; i < N; ++i) {
-            data[i] = static_cast<char>(str[i]);
-        }
-    }
    char data[N];
    constexpr std::string_view view() const { return {data, N - 1}; }
    constexpr size_t size() const { return N ; }
@@ -7313,12 +7308,6 @@ protected:
   */
  size_t _max_depth{0};

-public:
-  /** Whether to store big integers as strings instead of returning BIGINT_ERROR */
-  bool _number_as_string{false};
-
-protected:
-
  // Declaring these so that subclasses can use them to implement their constructors.
  simdjson_inline dom_parser_implementation() noexcept;
  simdjson_inline dom_parser_implementation(dom_parser_implementation &&other) noexcept;
@@ -7894,8 +7883,7 @@ enum class tape_type {
  DOUBLE = 'd',
  TRUE_VALUE = 't',
  FALSE_VALUE = 'f',
-  NULL_VALUE = 'n',
-  BIGINT = 'Z'  // Big integer stored as string in string buffer
+  NULL_VALUE = 'n'
 }; // enum class tape_type

 } // namespace internal
@@ -14190,9 +14178,6 @@ struct tape_writer {
  /** Write a double value to tape. */
  simdjson_inline void append_double(double value) noexcept;

-  /** Write a big integer (as string) to tape. src points to first digit, len is byte count. */
-  simdjson_inline void append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept;
-
  /**
   * Append a tape entry (an 8-bit type,and 56 bits worth of value).
   */
@@ -14276,18 +14261,6 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern
  tape_loc = val | ((uint64_t(char(t))) << 56);
 }

-simdjson_inline void tape_writer::append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept {
-  // Write to string buffer: [4-byte LE length][digits][null]
-  uint32_t str_len = uint32_t(len);
-  memcpy(string_buf, &str_len, sizeof(uint32_t));
-  memcpy(string_buf + sizeof(uint32_t), src, len);
-  string_buf[sizeof(uint32_t) + len] = 0;
-  // Tape entry: offset into string buffer
-  // The caller must set the offset relative to doc.string_buf base
-  append(0, internal::tape_type::BIGINT); // placeholder offset, caller patches
-  string_buf += sizeof(uint32_t) + len + 1;
-}
-
 } // namespace stage2
 } // unnamed namespace
 } // namespace arm64
@@ -15225,23 +15198,7 @@ simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_string(

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_number(json_iterator &iter, const uint8_t *value) noexcept {
  iter.log_value("number");
-  error_code err = numberparsing::parse_number(value, tape);
-  if (simdjson_unlikely(err == BIGINT_ERROR &&
-      iter.dom_parser._number_as_string)) {
-    // Write big integer to string buffer using the same format as strings.
-    // Scan digits the same way parse_number does (skip optional '-', then digits).
-    const uint8_t *p = value;
-    if (*p == '-') p++;
-    while (numberparsing::is_digit(*p)) p++;
-    size_t len = size_t(p - value);
-    tape.append(current_string_buf_loc - iter.dom_parser.doc->string_buf.get(), internal::tape_type::BIGINT);
-    uint8_t *dst = current_string_buf_loc + sizeof(uint32_t);
-    memcpy(dst, value, len);
-    dst += len;
-    on_end_string(dst);
-    return SUCCESS;
-  }
-  return err;
+  return numberparsing::parse_number(value, tape);
 }

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_number(json_iterator &iter, const uint8_t *value) noexcept {
@@ -20582,9 +20539,6 @@ struct tape_writer {
  /** Write a double value to tape. */
  simdjson_inline void append_double(double value) noexcept;

-  /** Write a big integer (as string) to tape. src points to first digit, len is byte count. */
-  simdjson_inline void append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept;
-
  /**
   * Append a tape entry (an 8-bit type,and 56 bits worth of value).
   */
@@ -20668,18 +20622,6 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern
  tape_loc = val | ((uint64_t(char(t))) << 56);
 }

-simdjson_inline void tape_writer::append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept {
-  // Write to string buffer: [4-byte LE length][digits][null]
-  uint32_t str_len = uint32_t(len);
-  memcpy(string_buf, &str_len, sizeof(uint32_t));
-  memcpy(string_buf + sizeof(uint32_t), src, len);
-  string_buf[sizeof(uint32_t) + len] = 0;
-  // Tape entry: offset into string buffer
-  // The caller must set the offset relative to doc.string_buf base
-  append(0, internal::tape_type::BIGINT); // placeholder offset, caller patches
-  string_buf += sizeof(uint32_t) + len + 1;
-}
-
 } // namespace stage2
 } // unnamed namespace
 } // namespace haswell
@@ -21617,23 +21559,7 @@ simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_string(

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_number(json_iterator &iter, const uint8_t *value) noexcept {
  iter.log_value("number");
-  error_code err = numberparsing::parse_number(value, tape);
-  if (simdjson_unlikely(err == BIGINT_ERROR &&
-      iter.dom_parser._number_as_string)) {
-    // Write big integer to string buffer using the same format as strings.
-    // Scan digits the same way parse_number does (skip optional '-', then digits).
-    const uint8_t *p = value;
-    if (*p == '-') p++;
-    while (numberparsing::is_digit(*p)) p++;
-    size_t len = size_t(p - value);
-    tape.append(current_string_buf_loc - iter.dom_parser.doc->string_buf.get(), internal::tape_type::BIGINT);
-    uint8_t *dst = current_string_buf_loc + sizeof(uint32_t);
-    memcpy(dst, value, len);
-    dst += len;
-    on_end_string(dst);
-    return SUCCESS;
-  }
-  return err;
+  return numberparsing::parse_number(value, tape);
 }

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_number(json_iterator &iter, const uint8_t *value) noexcept {
@@ -26969,9 +26895,6 @@ struct tape_writer {
  /** Write a double value to tape. */
  simdjson_inline void append_double(double value) noexcept;

-  /** Write a big integer (as string) to tape. src points to first digit, len is byte count. */
-  simdjson_inline void append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept;
-
  /**
   * Append a tape entry (an 8-bit type,and 56 bits worth of value).
   */
@@ -27055,18 +26978,6 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern
  tape_loc = val | ((uint64_t(char(t))) << 56);
 }

-simdjson_inline void tape_writer::append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept {
-  // Write to string buffer: [4-byte LE length][digits][null]
-  uint32_t str_len = uint32_t(len);
-  memcpy(string_buf, &str_len, sizeof(uint32_t));
-  memcpy(string_buf + sizeof(uint32_t), src, len);
-  string_buf[sizeof(uint32_t) + len] = 0;
-  // Tape entry: offset into string buffer
-  // The caller must set the offset relative to doc.string_buf base
-  append(0, internal::tape_type::BIGINT); // placeholder offset, caller patches
-  string_buf += sizeof(uint32_t) + len + 1;
-}
-
 } // namespace stage2
 } // unnamed namespace
 } // namespace icelake
@@ -28004,23 +27915,7 @@ simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_string(

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_number(json_iterator &iter, const uint8_t *value) noexcept {
  iter.log_value("number");
-  error_code err = numberparsing::parse_number(value, tape);
-  if (simdjson_unlikely(err == BIGINT_ERROR &&
-      iter.dom_parser._number_as_string)) {
-    // Write big integer to string buffer using the same format as strings.
-    // Scan digits the same way parse_number does (skip optional '-', then digits).
-    const uint8_t *p = value;
-    if (*p == '-') p++;
-    while (numberparsing::is_digit(*p)) p++;
-    size_t len = size_t(p - value);
-    tape.append(current_string_buf_loc - iter.dom_parser.doc->string_buf.get(), internal::tape_type::BIGINT);
-    uint8_t *dst = current_string_buf_loc + sizeof(uint32_t);
-    memcpy(dst, value, len);
-    dst += len;
-    on_end_string(dst);
-    return SUCCESS;
-  }
-  return err;
+  return numberparsing::parse_number(value, tape);
 }

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_number(json_iterator &iter, const uint8_t *value) noexcept {
@@ -33627,9 +33522,6 @@ struct tape_writer {
  /** Write a double value to tape. */
  simdjson_inline void append_double(double value) noexcept;

-  /** Write a big integer (as string) to tape. src points to first digit, len is byte count. */
-  simdjson_inline void append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept;
-
  /**
   * Append a tape entry (an 8-bit type,and 56 bits worth of value).
   */
@@ -33713,18 +33605,6 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern
  tape_loc = val | ((uint64_t(char(t))) << 56);
 }

-simdjson_inline void tape_writer::append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept {
-  // Write to string buffer: [4-byte LE length][digits][null]
-  uint32_t str_len = uint32_t(len);
-  memcpy(string_buf, &str_len, sizeof(uint32_t));
-  memcpy(string_buf + sizeof(uint32_t), src, len);
-  string_buf[sizeof(uint32_t) + len] = 0;
-  // Tape entry: offset into string buffer
-  // The caller must set the offset relative to doc.string_buf base
-  append(0, internal::tape_type::BIGINT); // placeholder offset, caller patches
-  string_buf += sizeof(uint32_t) + len + 1;
-}
-
 } // namespace stage2
 } // unnamed namespace
 } // namespace ppc64
@@ -34662,23 +34542,7 @@ simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_string(

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_number(json_iterator &iter, const uint8_t *value) noexcept {
  iter.log_value("number");
-  error_code err = numberparsing::parse_number(value, tape);
-  if (simdjson_unlikely(err == BIGINT_ERROR &&
-      iter.dom_parser._number_as_string)) {
-    // Write big integer to string buffer using the same format as strings.
-    // Scan digits the same way parse_number does (skip optional '-', then digits).
-    const uint8_t *p = value;
-    if (*p == '-') p++;
-    while (numberparsing::is_digit(*p)) p++;
-    size_t len = size_t(p - value);
-    tape.append(current_string_buf_loc - iter.dom_parser.doc->string_buf.get(), internal::tape_type::BIGINT);
-    uint8_t *dst = current_string_buf_loc + sizeof(uint32_t);
-    memcpy(dst, value, len);
-    dst += len;
-    on_end_string(dst);
-    return SUCCESS;
-  }
-  return err;
+  return numberparsing::parse_number(value, tape);
 }

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_number(json_iterator &iter, const uint8_t *value) noexcept {
@@ -40847,9 +40711,6 @@ struct tape_writer {
  /** Write a double value to tape. */
  simdjson_inline void append_double(double value) noexcept;

-  /** Write a big integer (as string) to tape. src points to first digit, len is byte count. */
-  simdjson_inline void append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept;
-
  /**
   * Append a tape entry (an 8-bit type,and 56 bits worth of value).
   */
@@ -40933,18 +40794,6 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern
  tape_loc = val | ((uint64_t(char(t))) << 56);
 }

-simdjson_inline void tape_writer::append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept {
-  // Write to string buffer: [4-byte LE length][digits][null]
-  uint32_t str_len = uint32_t(len);
-  memcpy(string_buf, &str_len, sizeof(uint32_t));
-  memcpy(string_buf + sizeof(uint32_t), src, len);
-  string_buf[sizeof(uint32_t) + len] = 0;
-  // Tape entry: offset into string buffer
-  // The caller must set the offset relative to doc.string_buf base
-  append(0, internal::tape_type::BIGINT); // placeholder offset, caller patches
-  string_buf += sizeof(uint32_t) + len + 1;
-}
-
 } // namespace stage2
 } // unnamed namespace
 } // namespace westmere
@@ -41882,23 +41731,7 @@ simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_string(

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_number(json_iterator &iter, const uint8_t *value) noexcept {
  iter.log_value("number");
-  error_code err = numberparsing::parse_number(value, tape);
-  if (simdjson_unlikely(err == BIGINT_ERROR &&
-      iter.dom_parser._number_as_string)) {
-    // Write big integer to string buffer using the same format as strings.
-    // Scan digits the same way parse_number does (skip optional '-', then digits).
-    const uint8_t *p = value;
-    if (*p == '-') p++;
-    while (numberparsing::is_digit(*p)) p++;
-    size_t len = size_t(p - value);
-    tape.append(current_string_buf_loc - iter.dom_parser.doc->string_buf.get(), internal::tape_type::BIGINT);
-    uint8_t *dst = current_string_buf_loc + sizeof(uint32_t);
-    memcpy(dst, value, len);
-    dst += len;
-    on_end_string(dst);
-    return SUCCESS;
-  }
-  return err;
+  return numberparsing::parse_number(value, tape);
 }

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_number(json_iterator &iter, const uint8_t *value) noexcept {
@@ -47098,9 +46931,6 @@ struct tape_writer {
  /** Write a double value to tape. */
  simdjson_inline void append_double(double value) noexcept;

-  /** Write a big integer (as string) to tape. src points to first digit, len is byte count. */
-  simdjson_inline void append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept;
-
  /**
   * Append a tape entry (an 8-bit type,and 56 bits worth of value).
   */
@@ -47184,18 +47014,6 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern
  tape_loc = val | ((uint64_t(char(t))) << 56);
 }

-simdjson_inline void tape_writer::append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept {
-  // Write to string buffer: [4-byte LE length][digits][null]
-  uint32_t str_len = uint32_t(len);
-  memcpy(string_buf, &str_len, sizeof(uint32_t));
-  memcpy(string_buf + sizeof(uint32_t), src, len);
-  string_buf[sizeof(uint32_t) + len] = 0;
-  // Tape entry: offset into string buffer
-  // The caller must set the offset relative to doc.string_buf base
-  append(0, internal::tape_type::BIGINT); // placeholder offset, caller patches
-  string_buf += sizeof(uint32_t) + len + 1;
-}
-
 } // namespace stage2
 } // unnamed namespace
 } // namespace lasx
@@ -48133,23 +47951,7 @@ simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_string(

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_number(json_iterator &iter, const uint8_t *value) noexcept {
  iter.log_value("number");
-  error_code err = numberparsing::parse_number(value, tape);
-  if (simdjson_unlikely(err == BIGINT_ERROR &&
-      iter.dom_parser._number_as_string)) {
-    // Write big integer to string buffer using the same format as strings.
-    // Scan digits the same way parse_number does (skip optional '-', then digits).
-    const uint8_t *p = value;
-    if (*p == '-') p++;
-    while (numberparsing::is_digit(*p)) p++;
-    size_t len = size_t(p - value);
-    tape.append(current_string_buf_loc - iter.dom_parser.doc->string_buf.get(), internal::tape_type::BIGINT);
-    uint8_t *dst = current_string_buf_loc + sizeof(uint32_t);
-    memcpy(dst, value, len);
-    dst += len;
-    on_end_string(dst);
-    return SUCCESS;
-  }
-  return err;
+  return numberparsing::parse_number(value, tape);
 }

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_number(json_iterator &iter, const uint8_t *value) noexcept {
@@ -53253,9 +53055,6 @@ struct tape_writer {
  /** Write a double value to tape. */
  simdjson_inline void append_double(double value) noexcept;

-  /** Write a big integer (as string) to tape. src points to first digit, len is byte count. */
-  simdjson_inline void append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept;
-
  /**
   * Append a tape entry (an 8-bit type,and 56 bits worth of value).
   */
@@ -53339,18 +53138,6 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern
  tape_loc = val | ((uint64_t(char(t))) << 56);
 }

-simdjson_inline void tape_writer::append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept {
-  // Write to string buffer: [4-byte LE length][digits][null]
-  uint32_t str_len = uint32_t(len);
-  memcpy(string_buf, &str_len, sizeof(uint32_t));
-  memcpy(string_buf + sizeof(uint32_t), src, len);
-  string_buf[sizeof(uint32_t) + len] = 0;
-  // Tape entry: offset into string buffer
-  // The caller must set the offset relative to doc.string_buf base
-  append(0, internal::tape_type::BIGINT); // placeholder offset, caller patches
-  string_buf += sizeof(uint32_t) + len + 1;
-}
-
 } // namespace stage2
 } // unnamed namespace
 } // namespace lsx
@@ -54288,23 +54075,7 @@ simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_string(

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_number(json_iterator &iter, const uint8_t *value) noexcept {
  iter.log_value("number");
-  error_code err = numberparsing::parse_number(value, tape);
-  if (simdjson_unlikely(err == BIGINT_ERROR &&
-      iter.dom_parser._number_as_string)) {
-    // Write big integer to string buffer using the same format as strings.
-    // Scan digits the same way parse_number does (skip optional '-', then digits).
-    const uint8_t *p = value;
-    if (*p == '-') p++;
-    while (numberparsing::is_digit(*p)) p++;
-    size_t len = size_t(p - value);
-    tape.append(current_string_buf_loc - iter.dom_parser.doc->string_buf.get(), internal::tape_type::BIGINT);
-    uint8_t *dst = current_string_buf_loc + sizeof(uint32_t);
-    memcpy(dst, value, len);
-    dst += len;
-    on_end_string(dst);
-    return SUCCESS;
-  }
-  return err;
+  return numberparsing::parse_number(value, tape);
 }

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_number(json_iterator &iter, const uint8_t *value) noexcept {
@@ -59827,9 +59598,6 @@ struct tape_writer {
  /** Write a double value to tape. */
  simdjson_inline void append_double(double value) noexcept;

-  /** Write a big integer (as string) to tape. src points to first digit, len is byte count. */
-  simdjson_inline void append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept;
-
  /**
   * Append a tape entry (an 8-bit type,and 56 bits worth of value).
   */
@@ -59913,18 +59681,6 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern
  tape_loc = val | ((uint64_t(char(t))) << 56);
 }

-simdjson_inline void tape_writer::append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept {
-  // Write to string buffer: [4-byte LE length][digits][null]
-  uint32_t str_len = uint32_t(len);
-  memcpy(string_buf, &str_len, sizeof(uint32_t));
-  memcpy(string_buf + sizeof(uint32_t), src, len);
-  string_buf[sizeof(uint32_t) + len] = 0;
-  // Tape entry: offset into string buffer
-  // The caller must set the offset relative to doc.string_buf base
-  append(0, internal::tape_type::BIGINT); // placeholder offset, caller patches
-  string_buf += sizeof(uint32_t) + len + 1;
-}
-
 } // namespace stage2
 } // unnamed namespace
 } // namespace rvv_vls
@@ -60862,23 +60618,7 @@ simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_string(

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_number(json_iterator &iter, const uint8_t *value) noexcept {
  iter.log_value("number");
-  error_code err = numberparsing::parse_number(value, tape);
-  if (simdjson_unlikely(err == BIGINT_ERROR &&
-      iter.dom_parser._number_as_string)) {
-    // Write big integer to string buffer using the same format as strings.
-    // Scan digits the same way parse_number does (skip optional '-', then digits).
-    const uint8_t *p = value;
-    if (*p == '-') p++;
-    while (numberparsing::is_digit(*p)) p++;
-    size_t len = size_t(p - value);
-    tape.append(current_string_buf_loc - iter.dom_parser.doc->string_buf.get(), internal::tape_type::BIGINT);
-    uint8_t *dst = current_string_buf_loc + sizeof(uint32_t);
-    memcpy(dst, value, len);
-    dst += len;
-    on_end_string(dst);
-    return SUCCESS;
-  }
-  return err;
+  return numberparsing::parse_number(value, tape);
 }

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_number(json_iterator &iter, const uint8_t *value) noexcept {
@@ -64449,9 +64189,6 @@ struct tape_writer {
  /** Write a double value to tape. */
  simdjson_inline void append_double(double value) noexcept;

-  /** Write a big integer (as string) to tape. src points to first digit, len is byte count. */
-  simdjson_inline void append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept;
-
  /**
   * Append a tape entry (an 8-bit type,and 56 bits worth of value).
   */
@@ -64535,18 +64272,6 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern
  tape_loc = val | ((uint64_t(char(t))) << 56);
 }

-simdjson_inline void tape_writer::append_bigint(const uint8_t *src, size_t len, uint8_t *&string_buf) noexcept {
-  // Write to string buffer: [4-byte LE length][digits][null]
-  uint32_t str_len = uint32_t(len);
-  memcpy(string_buf, &str_len, sizeof(uint32_t));
-  memcpy(string_buf + sizeof(uint32_t), src, len);
-  string_buf[sizeof(uint32_t) + len] = 0;
-  // Tape entry: offset into string buffer
-  // The caller must set the offset relative to doc.string_buf base
-  append(0, internal::tape_type::BIGINT); // placeholder offset, caller patches
-  string_buf += sizeof(uint32_t) + len + 1;
-}
-
 } // namespace stage2
 } // unnamed namespace
 } // namespace fallback
@@ -64730,23 +64455,7 @@ simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_string(

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_number(json_iterator &iter, const uint8_t *value) noexcept {
  iter.log_value("number");
-  error_code err = numberparsing::parse_number(value, tape);
-  if (simdjson_unlikely(err == BIGINT_ERROR &&
-      iter.dom_parser._number_as_string)) {
-    // Write big integer to string buffer using the same format as strings.
-    // Scan digits the same way parse_number does (skip optional '-', then digits).
-    const uint8_t *p = value;
-    if (*p == '-') p++;
-    while (numberparsing::is_digit(*p)) p++;
-    size_t len = size_t(p - value);
-    tape.append(current_string_buf_loc - iter.dom_parser.doc->string_buf.get(), internal::tape_type::BIGINT);
-    uint8_t *dst = current_string_buf_loc + sizeof(uint32_t);
-    memcpy(dst, value, len);
-    dst += len;
-    on_end_string(dst);
-    return SUCCESS;
-  }
-  return err;
+  return numberparsing::parse_number(value, tape);
 }

 simdjson_warn_unused simdjson_inline error_code tape_builder::visit_root_number(json_iterator &iter, const uint8_t *value) noexcept {
@@ -226,15 +226,9 @@ simdjson_warn_unused simdjson_inline error_code scan() {
      add_structural();
    // Primitive or invalid character (invalid characters will be checked in stage 2)
    } else {
-      // Anything else, add the structural and go until we find the next one.
-      // We also stop on RS (0x1E) so that RFC 7464 json_sequence inputs
-      // like `\x1e"a"\x1e"b"` produce a separate structural for each RS
-      // rather than being absorbed into a single primitive run. RS is a
-      // control character that is invalid in normal JSON, so breaking
-      // the run here has no effect on well-formed non-json_sequence
-      // inputs.
+      // Anything else, add the structural and go until we find the next one
      add_structural();
-      while (idx+1<len && !char_is_space_or_operator(buf[idx+1]) && buf[idx+1] != 0x1e) {
+      while (idx+1<len && !char_is_space_or_operator(buf[idx+1])) {
        idx++;
      };
    }
@@ -289,56 +283,6 @@ simdjson_warn_unused simdjson_inline error_code scan() {
    // doing.
    parser.structural_indexes[parser.n_structural_indexes] = uint32_t(len);
    if (parser.n_structural_indexes == 0) { return EMPTY; }
-  } else if (partial == stage1_mode::json_sequence_partial) {
-    // RFC 7464: use RS positions for batch boundaries
-    if(unclosed_string) {
-      parser.n_structural_indexes--;
-      if (simdjson_unlikely(parser.n_structural_indexes == 0)) { return CAPACITY; }
-    }
-    uint32_t next_batch_start = uint32_t(len);
-    auto new_structural_indexes = find_next_document_index_json_sequence(parser, len, false, next_batch_start);
-    if (new_structural_indexes == DOCUMENT_TOO_LARGE) {
-      return CAPACITY;
-    }
-    if (new_structural_indexes == 0) {
-      parser.n_structural_indexes = 0;
-      return EMPTY;
-    }
-    parser.n_structural_indexes = new_structural_indexes;
-    parser.structural_indexes[parser.n_structural_indexes] = next_batch_start;
-  } else if (partial == stage1_mode::json_sequence_final) {
-    // RFC 7464: final batch, last document extends to EOF
-    if(unclosed_string) { parser.n_structural_indexes--; }
-    uint32_t next_batch_start = uint32_t(len);
-    parser.n_structural_indexes = find_next_document_index_json_sequence(parser, len, true, next_batch_start);
-    parser.structural_indexes[parser.n_structural_indexes + 1] = parser.structural_indexes[parser.n_structural_indexes];
-    parser.structural_indexes[parser.n_structural_indexes] = uint32_t(len);
-    if (simdjson_unlikely(parser.n_structural_indexes == 0)) { return EMPTY; }
-  } else if (partial == stage1_mode::comma_delimited_partial) {
-    // Comma-delimited: filter root-level commas, use comma positions for batch boundaries
-    if(unclosed_string) {
-      parser.n_structural_indexes--;
-      if (simdjson_unlikely(parser.n_structural_indexes == 0)) { return CAPACITY; }
-    }
-    uint32_t next_batch_start = uint32_t(len);
-    auto new_structural_indexes = filter_comma_delimited(parser, len, false, next_batch_start);
-    if (new_structural_indexes == DOCUMENT_TOO_LARGE) {
-      return CAPACITY;
-    }
-    if (new_structural_indexes == 0) {
-      parser.n_structural_indexes = 0;
-      return EMPTY;
-    }
-    parser.n_structural_indexes = new_structural_indexes;
-    parser.structural_indexes[parser.n_structural_indexes] = next_batch_start;
-  } else if (partial == stage1_mode::comma_delimited_final) {
-    // Comma-delimited: final batch, last document extends to EOF
-    if(unclosed_string) { parser.n_structural_indexes--; }
-    uint32_t next_batch_start = uint32_t(len);
-    parser.n_structural_indexes = filter_comma_delimited(parser, len, true, next_batch_start);
-    parser.structural_indexes[parser.n_structural_indexes + 1] = parser.structural_indexes[parser.n_structural_indexes];
-    parser.structural_indexes[parser.n_structural_indexes] = uint32_t(len);
-    if (simdjson_unlikely(parser.n_structural_indexes == 0)) { return EMPTY; }
  } else if(unclosed_string) { error = UNCLOSED_STRING; }
  return error;
 }
--- a/Show More
+++ b/Show More