moving the files back to ondemand for now.

Initial work on JSON builder
2026-06-08 17:27:07 +00:00 · 2025-07-14 11:46:06 -04:00 · 2025-07-14 11:45:25 -04:00
113 changed files with 950 additions and 73080 deletions
@@ -38,7 +38,7 @@ cmake-build-release/
 .history/

 # Visual Studio artifacts
-/.vs/
+/VS/

 # C/C++ build outputs
 .build/
@@ -49,27 +49,6 @@ objs

 # C++ ignore from https://github.com/github/gitignore/blob/master/C%2B%2B.gitignore

-# CMake build artifacts
-CMakeCache.txt
-CMakeFiles/
-CPackConfig.cmake
-CPackSourceConfig.cmake
-Makefile
-cmake_install.cmake
-simdjson-config*.cmake
-simdjson-props.cmake
-simdjson.pc
-
-# Build directories
-deps/
-examples/build_*/
-examples/*_demo
-examples/*_benchmark
-
-# Temporary files
-examples/CMakeLists_demo.txt
-examples/simple_http.h
-
 # Prerequisites
 *.d

@@ -127,4 +106,4 @@ examples/simple_http.h
 !.vscode/extensions.json

 # clangd
-.cache
+.cache
@@ -1,9 +1,11 @@
 cmake_minimum_required(VERSION 3.14)
+cmake_policy(VERSION 3.5) # For doctest
+

 project(
    simdjson
    # The version number is modified by tools/release.py
-    VERSION 4.0.0
+    VERSION 3.13.0
    DESCRIPTION "Parsing gigabytes of JSON per second"
    HOMEPAGE_URL "https://simdjson.org/"
    LANGUAGES CXX C
@@ -20,8 +22,8 @@ string(
 # ---- Options, variables ----

 # These version numbers are modified by tools/release.py
-set(SIMDJSON_LIB_VERSION "28.0.0" CACHE STRING "simdjson library version")
-set(SIMDJSON_LIB_SOVERSION "28" CACHE STRING "simdjson library soversion")
+set(SIMDJSON_LIB_VERSION "26.0.0" CACHE STRING "simdjson library version")
+set(SIMDJSON_LIB_SOVERSION "26" CACHE STRING "simdjson library soversion")

 option(SIMDJSON_BUILD_STATIC_LIB "Build simdjson_static library along with simdjson (only makes sense if BUILD_SHARED_LIBS=ON)" OFF)
 if(SIMDJSON_BUILD_STATIC_LIB AND NOT BUILD_SHARED_LIBS)
@@ -43,20 +45,6 @@ if(SIMDJSON_DISABLE_DEPRECATED_API)
  )
 endif()

-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.25.0")
-    option(SIMDJSON_STATIC_REFLECTION "Enables static reflection (experimental), requires C++26" OFF)
-else()
-    set(SIMDJSON_STATIC_REFLECTION OFF CACHE BOOL "Enables static reflection (experimental)" FORCE)
-    message(WARNING "SIMDJSON_STATIC_REFLECTION is disabled because your CMake version is below 3.25")
-endif()
-
-if(SIMDJSON_STATIC_REFLECTION)
-  simdjson_add_props(
-      target_compile_definitions PUBLIC
-      SIMDJSON_STATIC_REFLECTION=1
-  )
-endif()
-
 option(SIMDJSON_DEVELOPMENT_CHECKS "Enable development-time aids, such as \
 checks for incorrect API usage. Enabled by default in DEBUG." OFF)
 if(SIMDJSON_DEVELOPMENT_CHECKS)
@@ -112,16 +100,7 @@ simdjson_add_props(
    PRIVATE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>"
 )

-if(SIMDJSON_STATIC_REFLECTION)
-  # We would like to require C++26, but no compiler supports that!
-  # This is a hack:
-  simdjson_add_props(
-      target_compile_options PUBLIC
-      -freflection -fexpansion-statements -stdlib=libc++ -std=c++26
-  )
-else()
-  simdjson_add_props(target_compile_features PUBLIC cxx_std_11)
-endif()
+simdjson_add_props(target_compile_features PUBLIC cxx_std_11)

 # workaround for GNU GCC poor AVX load/store code generation
 if(
@@ -38,7 +38,7 @@ PROJECT_NAME           = simdjson
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = "4.0.0"
+PROJECT_NUMBER         = "3.13.0"

 # 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
@@ -109,7 +109,6 @@ Documentation
 Usage documentation is available:

 * [Basics](doc/basics.md) is an overview of how to use simdjson and its APIs.
-* [Builder](doc/builder.md) is an overview of how to efficiently write JSON strings using simdjson.
 * [Performance](doc/performance.md) shows some more advanced scenarios and how to tune for them.
 * [Implementation Selection](doc/implementation-selection.md) describes runtime CPU detection and
  how you can work with it.
@@ -4,9 +4,6 @@ add_subdirectory(dom)
 include_directories( . linux )
 link_libraries(simdjson-windows-headers test-data)
 link_libraries(simdjson)
-if(SIMDJSON_STATIC_REFLECTION)
-  add_compile_definitions(SIMDJSON_STATIC_REFLECTION=1)
-endif(SIMDJSON_STATIC_REFLECTION)

 add_executable(benchfeatures benchfeatures.cpp)
 add_executable(get_corpus_benchmark get_corpus_benchmark.cpp)
@@ -35,6 +32,3 @@ if (TARGET benchmark::benchmark)
  endif()
 endif()

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

  double elapsed_sec() const { return total.elapsed_sec() / iterations; }
-  double total_elapsed_ns() const { return total.elapsed_ns(); }
  double elapsed_ns() const { return total.elapsed_ns() / iterations; }
  double cycles() const { return total.cycles() / iterations; }
  double instructions() const { return total.instructions() / iterations; }
@@ -23,29 +23,7 @@ struct simdjson_ondemand {
 };

 BENCHMARK_TEMPLATE(large_random, simdjson_ondemand)->UseManualTime();
-#if SIMDJSON_STATIC_REFLECTION

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

 #endif // SIMDJSON_EXCEPTIONS
@@ -1,44 +0,0 @@
-# Include reflect-cpp
-CPMAddPackage(
-  NAME reflect-cpp
-  GITHUB_REPOSITORY getml/reflect-cpp
-  GIT_TAG v0.17.0
-  EXCLUDE_FROM_ALL YES
-)
-
-
-
-if(NOT WIN32)
-# We want the check whether Rust is available before trying to build a crate.
-CPMAddPackage(
-  NAME corrosion
-  GITHUB_REPOSITORY corrosion-rs/corrosion
-  VERSION 0.4.4
-  DOWNLOAD_ONLY ON
-  OPTIONS "Rust_FIND_QUIETLY OFF"
-)
-include("${corrosion_SOURCE_DIR}/cmake/FindRust.cmake")
-endif()
-
-if(RUST_FOUND)
-  message(STATUS "Rust found: " ${Rust_VERSION} )
-  add_subdirectory("${corrosion_SOURCE_DIR}" "${PROJECT_BINARY_DIR}/_deps/corrosion" EXCLUDE_FROM_ALL)
-  # Important: we want to build in release mode!
-  corrosion_import_crate(MANIFEST_PATH "serde-benchmark/Cargo.toml" NO_LINKER_OVERRIDE PROFILE release)
-else()
-  message(STATUS "Rust/Cargo is unavailable." )
-  message(STATUS "We will not benchmark serde-benchmark." )
-  if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    message(STATUS "Under macOS, you may be able to install rust with")
-    message(STATUS "curl https://sh.rustup.rs -sSf | sh")
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    message(STATUS "Under Linux, you may be able to install rust with a command such as")
-    message(STATUS "apt-get install cargo" )
-    message(STATUS "or" )
-    message(STATUS "curl https://sh.rustup.rs -sSf | sh")
-  endif()
-endif()
-
-# Add the benchmark executable targets
-add_subdirectory(twitter_benchmark)
-add_subdirectory(citm_catalog_benchmark)
@@ -1,52 +0,0 @@
-#ifndef BENCHMARK_HELPER_HPP
-#define BENCHMARK_HELPER_HPP
-#include "event_counter.h"
-#include <atomic>
-
-inline event_collector &get_collector() {
-  static event_collector collector;
-  return collector;
-}
-
-template <class function_type>
-event_aggregate bench(const function_type &function, size_t min_repeat = 10,
-                      size_t min_time_ns = 1000000000,
-                      size_t max_repeat = 100000) {
-  event_collector &collector = get_collector();
-  event_aggregate aggregate{};
-  size_t N = min_repeat;
-  if (N == 0) {
-    N = 1;
-  }
-  for (size_t i = 0; i < N; i++) {
-    std::atomic_thread_fence(std::memory_order_acquire);
-    collector.start();
-    function();
-    std::atomic_thread_fence(std::memory_order_release);
-    event_count allocate_count = collector.end();
-    aggregate << allocate_count;
-    if ((i + 1 == N) && (aggregate.total_elapsed_ns() < min_time_ns) &&
-        (N < max_repeat)) {
-      N *= 10;
-    }
-  }
-  return aggregate;
-}
-
-// Source of the 2 functions below:
-// https://github.com/simdutf/simdutf/blob/master/benchmarks/base64/benchmark_base64.cpp
-inline void pretty_print(size_t strings, size_t bytes, std::string name,
-                         event_aggregate agg) {
-  event_collector &collector = get_collector();
-  printf("%-60s : ", name.c_str());
-  printf(" %5.2f MB/s ", bytes * 1000 / agg.elapsed_ns());
-  printf(" %5.2f Ms/s ", strings * 1000 / agg.elapsed_ns());
-  if (collector.has_events()) {
-    printf(" %5.2f GHz ", agg.cycles() / agg.elapsed_ns());
-    printf(" %5.2f c/b ", agg.cycles() / bytes);
-    printf(" %5.2f i/b ", agg.instructions() / bytes);
-    printf(" %5.2f i/c ", agg.instructions() / agg.cycles());
-  }
-  printf("\n");
-}
-#endif
@@ -1,14 +0,0 @@
-add_executable(benchmark_serialization_citm_catalog benchmark_serialization_citm_catalog.cpp)
-
-# Link with Rust benchmarking code if available
-if(TARGET serde-benchmark)
-    message(STATUS "serde-benchmark target was created. Linking CITM catalog benchmark with serde-benchmark.")
-    target_link_libraries(benchmark_serialization_citm_catalog PRIVATE serde-benchmark)
-    target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE SIMDJSON_RUST_VERSION="${Rust_VERSION}")
-endif()
-
-target_link_libraries(benchmark_serialization_citm_catalog PRIVATE simdjson::simdjson nlohmann_json)
-target_link_libraries(benchmark_serialization_citm_catalog PRIVATE reflectcpp)
-target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE SIMDJSON_BENCH_CPP_REFLECT=1)
-
-target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE JSON_FILE="${BENCH_CITM_JSON}")
@@ -1,177 +0,0 @@
-#include <cassert>
-#include <cstdlib>
-#include <ctime>
-#include <format>
-#include <fstream>
-#include <iostream>
-#include <nlohmann/json.hpp>
-#include <simdjson.h>
-#include <string>
-#include "citm_catalog_data.h"
-#include "nlohmann_citm_catalog_data.h"
-#include "../benchmark_utils/benchmark_helper.h"
-
-#if SIMDJSON_BENCH_CPP_REFLECT
-#include <rfl.hpp>
-#include <rfl/json.hpp>
-void bench_reflect_cpp(CitmCatalog &data) {
-  std::string output = rfl::json::write(data);
-  size_t output_volume = output.size();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(1, output_volume, "bench_reflect_cpp",
-               bench([&data, &measured_volume, &output_volume]() {
-                 std::string output = rfl::json::write(data);
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-#endif // SIMDJSON_BENCH_CPP_REFLECT
-
-#ifdef SIMDJSON_RUST_VERSION
-#include "../serde-benchmark/serde_benchmark.h"
-
-void bench_rust(serde_benchmark::CitmCatalog *data) {
-  const char * output = serde_benchmark::str_from_citm(data);
-  size_t output_volume = strlen(output);
-  printf("# output volume: %zu bytes\n", output_volume);
-  volatile size_t measured_volume = 0;
-  pretty_print(1, output_volume, "bench_rust",
-               bench([&data, &measured_volume, &output_volume]() {
-                 const char * output = serde_benchmark::str_from_citm(data);
-                 measured_volume = strlen(output);
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-                 serde_benchmark::free_str(const_cast<char*>(output));
-               }));
-  serde_benchmark::free_str(const_cast<char*>(output));
-}
-#endif // SIMDJSON_RUST_VERSION
-
-void bench_nlohmann(CitmCatalog &data) {
-  std::string output = nlohmann_serialize(data);
-  size_t output_volume = output.size();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(1, output_volume, "bench_nlohmann",
-               bench([&data, &measured_volume, &output_volume]() {
-                 std::string output = nlohmann_serialize(data);
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-
-void bench_simdjson_static_reflection(CitmCatalog &data) {
-  simdjson::builder::string_builder sb;
-  simdjson::builder::append(sb, data);
-  std::string_view p;
-  if(sb.view().get(p)) {
-    std::cerr << "Error!" << std::endl;
-  }
-  size_t output_volume = p.size();
-  sb.clear();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(sizeof(data), output_volume, "bench_simdjson_static_reflection",
-               bench([&data, &measured_volume, &output_volume, &sb]() {
-                 sb.clear();
-                 simdjson::builder::append(sb, data);
-                 std::string_view p;
-                 if(sb.view().get(p)) {
-                   std::cerr << "Error!" << std::endl;
-                 }
-                 measured_volume = sb.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-
-std::string read_file(const std::string &file_path, size_t read_size = 65536) {
-  std::ifstream stream(file_path, std::ios::binary);
-  if(!stream) {
-    std::cerr << "Could not open file '" << file_path << "'" << std::endl;
-    exit(EXIT_FAILURE);
-  }
-  stream.exceptions(std::ios_base::badbit);
-  std::string out;
-  std::string buf(read_size, '\0');
-  while (stream.read(&buf[0], read_size)) {
-    out.append(buf, 0, size_t(stream.gcount()));
-  }
-  out.append(buf, 0, size_t(stream.gcount()));
-  return out;
-}
-
-// Function to check if benchmark name contains filter substring
-bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
-  return filter.empty() || benchmark_name.find(filter) != std::string::npos;
-}
-
-int main(int argc, char* argv[]) {
-  std::string filter;
-
-  // Parse command-line arguments
-  for (int i = 1; i < argc; ++i) {
-      if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "--filter") == 0) {
-          if (i + 1 < argc) {
-              filter = argv[++i];
-          } else {
-              std::cerr << "Error: -f/--filter requires an argument" << std::endl;
-              return EXIT_FAILURE;
-          }
-      }
-  }
-  // Testing correctness of round-trip (serialization + deserialization)
-  std::string json_str = read_file(JSON_FILE);
-
-  // Loading up the data into a structure.
-  simdjson::ondemand::parser parser;
-  simdjson::ondemand::document doc;
-  if(parser.iterate(simdjson::pad(json_str)).get(doc)) {
-    std::cerr << "Error loading the document!" << std::endl;
-    return EXIT_FAILURE;
-  }
-  CitmCatalog my_struct;
-  if(doc.get<CitmCatalog>().get(my_struct)) {
-    std::cerr << "Error loading CitmCatalog!" << std::endl;
-    return EXIT_FAILURE;
-  }
-
-  // Benchmarking the serialization
-  if (matches_filter("nlohmann", filter)) {
-    bench_nlohmann(my_struct);
-  }
-  if (matches_filter("simdjson_static_reflection", filter)) {
-    bench_simdjson_static_reflection(my_struct);
-  }
-#ifdef SIMDJSON_RUST_VERSION
-  if (matches_filter("rust", filter)) {
-    printf("# WARNING: The Rust benchmark may not be directly comparable since it does not use an equivalent data structure.\n");
-    // Create a Rust-compatible CitmCatalog structure from the JSON string
-    serde_benchmark::CitmCatalog* rust_data =
-      serde_benchmark::citm_from_str(json_str.c_str(), json_str.size());
-
-    if (rust_data == nullptr) {
-      printf("# Failed to initialize Rust data structure\n");
-    } else {
-      bench_rust(rust_data);
-      serde_benchmark::free_citm(rust_data);
-    }
-  }
-#endif
-#if SIMDJSON_BENCH_CPP_REFLECT
-  if (matches_filter("reflect_cpp", filter)) {
-    bench_reflect_cpp(my_struct);
-  }
-#endif
-  return EXIT_SUCCESS;
-}
@@ -1,82 +0,0 @@
-#ifndef CITM_CATALOG_DATA_H
-#define CITM_CATALOG_DATA_H
-
-#include <string>
-#include <vector>
-#include <map>
-
-struct Area {
-  int64_t id;
-  std::string name;
-  int64_t parent;
-  std::vector<int64_t> childAreas;
-  bool operator==(const Area &other) const = default;
-};
-
-struct AudienceSubCategory {
-  int64_t id;
-  std::string name;
-  int64_t parent;
-  bool operator==(const AudienceSubCategory &other) const = default;
-};
-
-struct Event {
-  int64_t id;
-  std::string name;
-  std::string description;
-  int64_t subTopic;
-  int64_t topic;
-  std::vector<int64_t> audience;
-  bool operator==(const Event &other) const = default;
-};
-
-struct Performance {
-  int64_t id;
-  std::string name;
-  int64_t event;
-  std::string start;
-  int64_t venueCode;
-  bool operator==(const Performance &other) const = default;
-};
-
-struct SeatCategory {
-  int64_t id;
-  std::string name;
-  std::vector<int64_t> areas;
-  bool operator==(const SeatCategory &other) const = default;
-};
-
-struct SubTopic {
-  int64_t id;
-  std::string name;
-  int64_t parent;
-  bool operator==(const SubTopic &other) const = default;
-};
-
-struct Topic {
-  int64_t id;
-  std::string name;
-  bool operator==(const Topic &other) const = default;
-};
-
-struct Venue {
-  int64_t id;
-  std::string name;
-  int64_t address;
-  bool operator==(const Venue &other) const = default;
-};
-
-struct CitmCatalog {
-  std::map<std::string, Area> areas;
-  std::map<std::string, AudienceSubCategory> audienceSubCategory;
-  std::map<std::string, Event> events;
-  std::map<std::string, Performance> performances;
-  std::map<std::string, SeatCategory> seatCategory;
-  std::map<std::string, SubTopic> subTopic;
-  std::map<std::string, Topic> topic;
-  std::map<std::string, Venue> venue;
-
-  bool operator==(const CitmCatalog &other) const = default;
-};
-
-#endif
@@ -1,171 +0,0 @@
-// nlohmann_citm_catalog_data.h
-#ifndef NLOHMANN_CITM_CATALOG_DATA_H
-#define NLOHMANN_CITM_CATALOG_DATA_H
-
-#include "citm_catalog_data.h"
-#include <nlohmann/json.hpp>
-#include <string>
-
-using json = nlohmann::json;
-
-// ---- Area ----
-inline void to_json(json &j, const Area &a) {
-    j = json{
-      {"id", a.id},
-      {"name", a.name},
-      {"parent", a.parent},
-      {"childAreas", a.childAreas}
-    };
-}
-inline void from_json(const json &j, Area &a) {
-    j.at("id").get_to(a.id);
-    j.at("name").get_to(a.name);
-    j.at("parent").get_to(a.parent);
-    j.at("childAreas").get_to(a.childAreas);
-}
-
-// ---- AudienceSubCategory ----
-inline void to_json(json &j, const AudienceSubCategory &asc) {
-    j = json{
-      {"id", asc.id},
-      {"name", asc.name},
-      {"parent", asc.parent}
-    };
-}
-inline void from_json(const json &j, AudienceSubCategory &asc) {
-    j.at("id").get_to(asc.id);
-    j.at("name").get_to(asc.name);
-    j.at("parent").get_to(asc.parent);
-}
-
-// ---- Event ----
-inline void to_json(json &j, const Event &e) {
-    j = json{
-      {"id", e.id},
-      {"name", e.name},
-      {"description", e.description},
-      {"subTopic", e.subTopic},
-      {"topic", e.topic},
-      {"audience", e.audience}
-    };
-}
-inline void from_json(const json &j, Event &e) {
-    j.at("id").get_to(e.id);
-    j.at("name").get_to(e.name);
-    j.at("description").get_to(e.description);
-    j.at("subTopic").get_to(e.subTopic);
-    j.at("topic").get_to(e.topic);
-    j.at("audience").get_to(e.audience);
-}
-
-// ---- Performance ----
-inline void to_json(json &j, const Performance &p) {
-    j = json{
-      {"id", p.id},
-      {"name", p.name},
-      {"event", p.event},
-      {"start", p.start},
-      {"venueCode", p.venueCode}
-    };
-}
-inline void from_json(const json &j, Performance &p) {
-    j.at("id").get_to(p.id);
-    j.at("name").get_to(p.name);
-    j.at("event").get_to(p.event);
-    j.at("start").get_to(p.start);
-    j.at("venueCode").get_to(p.venueCode);
-}
-
-// ---- SeatCategory ----
-inline void to_json(json &j, const SeatCategory &sc) {
-    j = json{
-      {"id", sc.id},
-      {"name", sc.name},
-      {"areas", sc.areas}
-    };
-}
-inline void from_json(const json &j, SeatCategory &sc) {
-    j.at("id").get_to(sc.id);
-    j.at("name").get_to(sc.name);
-    j.at("areas").get_to(sc.areas);
-}
-
-// ---- SubTopic ----
-inline void to_json(json &j, const SubTopic &st) {
-    j = json{
-      {"id", st.id},
-      {"name", st.name},
-      {"parent", st.parent}
-    };
-}
-inline void from_json(const json &j, SubTopic &st) {
-    j.at("id").get_to(st.id);
-    j.at("name").get_to(st.name);
-    j.at("parent").get_to(st.parent);
-}
-
-// ---- Topic ----
-inline void to_json(json &j, const Topic &t) {
-    j = json{
-      {"id", t.id},
-      {"name", t.name}
-    };
-}
-inline void from_json(const json &j, Topic &t) {
-    j.at("id").get_to(t.id);
-    j.at("name").get_to(t.name);
-}
-
-// ---- Venue ----
-inline void to_json(json &j, const Venue &v) {
-    j = json{
-      {"id", v.id},
-      {"name", v.name},
-      {"address", v.address}
-    };
-}
-inline void from_json(const json &j, Venue &v) {
-    j.at("id").get_to(v.id);
-    j.at("name").get_to(v.name);
-    j.at("address").get_to(v.address);
-}
-
-// ---- CitmCatalog ----
-inline void to_json(json &j, const CitmCatalog &c) {
-    j = json{
-      {"areas", c.areas},
-      {"audienceSubCategory", c.audienceSubCategory},
-      {"events", c.events},
-      {"performances", c.performances},
-      {"seatCategory", c.seatCategory},
-      {"subTopic", c.subTopic},
-      {"topic", c.topic},
-      {"venue", c.venue}
-    };
-}
-inline void from_json(const json &j, CitmCatalog &c) {
-    j.at("areas").get_to(c.areas);
-    j.at("audienceSubCategory").get_to(c.audienceSubCategory);
-    j.at("events").get_to(c.events);
-    j.at("performances").get_to(c.performances);
-    j.at("seatCategory").get_to(c.seatCategory);
-    j.at("subTopic").get_to(c.subTopic);
-    j.at("topic").get_to(c.topic);
-    j.at("venue").get_to(c.venue);
-}
-
-// Optional convenience functions for benchmarking
-inline std::string nlohmann_serialize(const CitmCatalog &catalog) {
-    json j = catalog;
-    return j.dump();
-}
-inline bool nlohmann_deserialize(const std::string &json_in, CitmCatalog &catalog) {
-    try {
-        catalog = json::parse(json_in);
-        return false; // success
-    } catch(...) {
-        return true;  // failure
-    }
-}
-
-#endif // NLOHMANN_CITM_CATALOG_DATA_H
@@ -1,103 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "libc"
-version = "0.2.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "serde"
-version = "1.0.209"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-benchmark"
-version = "0.1.0"
-dependencies = [
- "libc",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.209"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.127"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
@@ -1,17 +0,0 @@
-[package]
-name = "serde-benchmark"
-version = "0.1.0"
-
-[lib]
-path = "lib.rs"
-crate-type = ["cdylib"]
-
-[dependencies]
-serde = { version = "1.0", features = ["derive"] }
-libc = "0.2"
-serde_json = "1.0"
-
-[profile.release]
-opt-level = 3
-debug = false
-lto = true
@@ -1,18 +0,0 @@
-## Rust Serde FFI
-
-This folder includes FFI bindings for rust/serde.
-
-### Links
-
- https://github.com/eqrion/cbindgen/blob/master/docs.md
- https://gist.github.com/zbraniecki/b251714d77ffebbc73c03447f2b2c69f
- https://michael-f-bryan.github.io/rust-ffi-guide/setting_up.html
-
-### Building
-
- Generating cbindgen output
-  - Install dependencies with `brew install cbindgen` or `apt-get install cbindgen` or `cargo install cbindgen` or the equivalent: we used `cargo install --version 0.23.0 cbindgen`.
-  - Go to the directory where this README.md file is located
-  - Generate with `cbindgen --config cbindgen.toml --crate serde-benchmark --output serde_benchmark.h`
- Building
-  - Run with `cargo build --release`
@@ -1,12 +0,0 @@
-autogen_warning = "/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */"
-include_version = true
-braces = "SameLine"
-line_length = 100
-tab_width = 2
-language = "C++"
-namespaces = ["serde_benchmark"]
-include_guard = "serde_benchmark_ffi_h"
-
-[parse]
-parse_deps = true
-include = ["serde_json", "serde"]
@@ -1,482 +0,0 @@
-extern crate serde;
-extern crate serde_json;
-extern crate libc;
-
-use libc::{c_char, size_t};
-use serde::{Serialize, Deserialize};
-use std::{collections::HashMap, ffi::CString, ptr, slice};
-use serde::de::{self, Deserializer};
-/******************************************************/
-/******************************************************/
-/**
- * Warning: the C++ code may not generate the same JSON.
- */
- /******************************************************/
- /******************************************************/
-
-// This has no equivalent in C++:
-#[derive(Serialize, Deserialize)]
-pub struct Metadata {
-    result_type: String,
-    iso_language_code: String,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct User {
-    id: i64,
-    id_str: String,
-    name: String,
-    screen_name: String,
-    location: String,
-    description: String,
-    // C++ does not have those:
-    // url: Option<String>,
-    //protected: bool,
-    //listed_count: i64,
-    //created_at: String,
-    //favourites_count: i64,
-    //utc_offset: Option<i64>,
-    //time_zone: Option<String>,
-    //geo_enabled: bool,
-    verified: bool,
-    followers_count: i64,
-    friends_count: i64,
-    statuses_count: i64,
-    // C++ does not have those:
-    //lang: String,
-    //profile_background_color: String,
-    //profile_background_image_url: String,
-    //profile_background_image_url_https: String,
-    //profile_background_tile: bool,
-    //profile_image_url: String,
-    //profile_image_url_https: String,
-    //profile_banner_url: Option<String>,
-    //profile_link_color: String,
-    //profile_sidebar_border_color: String,
-    //profile_sidebar_fill_color: String,
-    //profile_text_color: String,
-    //profile_use_background_image: bool,
-    //default_profile: bool,
-    //default_profile_image: bool,
-    //following: bool,
-    //follow_request_sent: bool,
-    //notifications: bool,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Hashtag {
-    text: String,
-
-    // C++ has those but D. Lemire does not know what they are, they don't appear in the JSON:
-    // int64_t indices_start;
-    // int64_t indices_end;
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Url {
-    url: String,
-    expanded_url: String,
-    display_url: String,
-    // C++ has those but D. Lemire does not know what they are, they don't appear in the JSON:
-    // int64_t indices_start;
-    // int64_t indices_end;
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct UserMention {
-    id: i64,
-    name: String,
-    screen_name: String,
-    // Not in the C++ equivalent:
-    //id_str: String,
-    //indices: Vec<i64>,
-    // C++ has those but D. Lemire does not know what they are, they don't appear in the JSON:
-    // int64_t indices_start;
-    // int64_t indices_end;
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Entities {
-    hashtags: Vec<Hashtag>,
-    urls: Vec<Url>,
-    user_mentions: Vec<UserMention>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Status {
-    created_at: String,
-    id: i64,
-    text: String,
-    user: User,
-    entities: Entities,
-    retweet_count: i64,
-    favorite_count: i64,
-    favorited: bool,
-    retweeted: bool,
-    // None of these are in the C++ equivalent:
-    /*
-    metadata: Metadata,
-    id_str: String,
-    source: String,
-    truncated: bool,
-    in_reply_to_status_id: Option<i64>,
-    in_reply_to_status_id_str: Option<String>,
-    in_reply_to_user_id: Option<i64>,
-    in_reply_to_user_id_str: Option<String>,
-    in_reply_to_screen_name: Option<String>,
-    geo: Option<String>,
-    coordinates: Option<String>,
-    place: Option<String>,
-    contributors: Option<String>,
-    lang: String,
-    */
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct TwitterData {
-    statuses: Vec<Status>,
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn  twitter_from_str(raw_input: *const c_char, raw_input_length: size_t) -> *mut TwitterData {
-  let input = std::str::from_utf8_unchecked(slice::from_raw_parts(raw_input as *const u8, raw_input_length));
-  match serde_json::from_str(&input) {
-    Ok(result) => Box::into_raw(Box::new(result)),
-    Err(_) => std::ptr::null_mut(),
-  }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn str_from_twitter(raw: *mut TwitterData) -> *const c_char {
-  let twitter_thing = { &*raw };
-  let serialized = serde_json::to_string(&twitter_thing).unwrap();
-  return std::ffi::CString::new(serialized.as_str()).unwrap().into_raw()
-}
-
-
-#[no_mangle]
-pub unsafe extern "C" fn free_twitter(raw: *mut TwitterData) {
-  if raw.is_null() {
-    return;
-  }
-
-  drop(Box::from_raw(raw))
-}
-
-
-#[no_mangle]
-pub unsafe extern fn free_string(ptr: *const c_char) {
-    let _ = std::ffi::CString::from_raw(ptr as *mut _);
-}
-
-// Functions associated with the CitmCatalog benchmark
-
-#[derive(Serialize, Deserialize)]
-pub struct Area {
-    pub id: i64,
-    pub name: Option<String>,  // Changed to Option
-    pub parent: i64,
-    #[serde(rename = "childAreas")]
-    pub child_areas: Vec<i64>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct AudienceSubCategory {
-    pub id: i64,
-    pub name: Option<String>,  // Changed to Option
-    pub parent: i64,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Event {
-    #[serde(default)]
-    pub description: Option<String>,
-    pub id: i64,
-    #[serde(default)]
-    pub logo: Option<String>,
-    #[serde(default)]
-    pub name: Option<String>,
-    #[serde(default)]
-    pub subTopicIds: Vec<i64>,
-    #[serde(default)]
-    pub subjectCode: Option<String>,
-    #[serde(default)]
-    pub subtitle: Option<String>,
-    #[serde(default)]
-    pub topicIds: Vec<i64>,
-    // Add a catch-all for any other fields
-    #[serde(flatten)]
-    pub extra: HashMap<String, serde_json::Value>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Performance {
-    #[serde(default)]
-    pub id: i64,
-
-    #[serde(default)]
-    pub name: Option<String>,
-
-    #[serde(default)]
-    pub event: i64,
-
-    // This is the key fix - accept any JSON value type for timestamps
-    // This allows both string dates and integer timestamps (line 3511)
-    #[serde(default)]
-    pub start: serde_json::Value,
-
-    #[serde(rename = "venueCode")]
-    pub venue_code: String,
-
-    // Add a catch-all for any other fields
-    #[serde(flatten)]
-    pub extra: HashMap<String, serde_json::Value>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct SeatCategory {
-    pub id: i64,
-    pub name: Option<String>,  // Changed to Option
-    pub areas: Vec<i64>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct SubTopic {
-    pub id: i64,
-    pub name: Option<String>,  // Changed to Option
-    pub parent: i64,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Topic {
-    pub id: i64,
-    pub name: Option<String>,  // Changed to Option
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Venue {
-    pub id: i64,
-    pub name: Option<String>,  // Changed to Option
-    pub address: i64,
-}
-
-// Custom deserializers
-fn deserialize_string_to_area<'de, D>(deserializer: D) -> Result<HashMap<String, Area>, D::Error>
-where D: Deserializer<'de> {
-    let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
-    let mut result = HashMap::new();
-
-    for (id, name) in string_map {
-        let id_num = id.parse::<i64>().unwrap_or(0);
-        result.insert(id.clone(), Area {
-            id: id_num,
-            name: Some(name),
-            parent: 0,
-            child_areas: Vec::new(),
-        });
-    }
-
-    Ok(result)
-}
-
-fn deserialize_string_to_audience_subcategory<'de, D>(deserializer: D) -> Result<HashMap<String, AudienceSubCategory>, D::Error>
-where D: Deserializer<'de> {
-    let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
-    let mut result = HashMap::new();
-
-    for (id, name) in string_map {
-        let id_num = id.parse::<i64>().unwrap_or(0);
-        result.insert(id.clone(), AudienceSubCategory {
-            id: id_num,
-            name: Some(name),
-            parent: 0,
-        });
-    }
-
-    Ok(result)
-}
-
-fn deserialize_string_to_seat_category<'de, D>(deserializer: D) -> Result<HashMap<String, SeatCategory>, D::Error>
-where D: Deserializer<'de> {
-    let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
-    let mut result = HashMap::new();
-
-    for (id, name) in string_map {
-        let id_num = id.parse::<i64>().unwrap_or(0);
-        result.insert(id.clone(), SeatCategory {
-            id: id_num,
-            name: Some(name),
-            areas: Vec::new(),
-        });
-    }
-
-    Ok(result)
-}
-
-fn deserialize_string_to_subtopic<'de, D>(deserializer: D) -> Result<HashMap<String, SubTopic>, D::Error>
-where D: Deserializer<'de> {
-    let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
-    let mut result = HashMap::new();
-
-    for (id, name) in string_map {
-        let id_num = id.parse::<i64>().unwrap_or(0);
-        result.insert(id.clone(), SubTopic {
-            id: id_num,
-            name: Some(name),
-            parent: 0,
-        });
-    }
-
-    Ok(result)
-}
-
-fn deserialize_string_to_topic<'de, D>(deserializer: D) -> Result<HashMap<String, Topic>, D::Error>
-where D: Deserializer<'de> {
-    let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
-    let mut result = HashMap::new();
-
-    for (id, name) in string_map {
-        let id_num = id.parse::<i64>().unwrap_or(0);
-        result.insert(id.clone(), Topic {
-            id: id_num,
-            name: Some(name),
-        });
-    }
-
-    Ok(result)
-}
-
-fn deserialize_string_to_venue<'de, D>(deserializer: D) -> Result<HashMap<String, Venue>, D::Error>
-where D: Deserializer<'de> {
-    let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
-    let mut result = HashMap::new();
-
-    for (id, name) in string_map {
-        result.insert(id.clone(), Venue {
-            id: 0,
-            name: Some(name),
-            address: 0,
-        });
-    }
-
-    Ok(result)
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct CitmCatalog {
-    #[serde(rename = "areaNames")]
-    pub area_names: HashMap<String, String>,
-
-    #[serde(rename = "audienceSubCategoryNames")]
-    pub audience_subcategory_names: HashMap<String, String>,
-
-    #[serde(default)]
-    #[serde(rename = "blockNames")]
-    pub block_names: HashMap<String, String>,
-
-    pub events: HashMap<String, Event>,
-
-    #[serde(default)]
-    pub performances: Vec<Performance>,
-
-    #[serde(rename = "seatCategoryNames")]
-    pub seat_category_names: HashMap<String, String>,
-
-    #[serde(rename = "subTopicNames")]
-    pub subtopic_names: HashMap<String, String>,
-
-    #[serde(default)]
-    #[serde(rename = "subjectNames")]
-    pub subject_names: HashMap<String, String>,
-
-    #[serde(rename = "topicNames")]
-    pub topic_names: HashMap<String, String>,
-
-    #[serde(rename = "topicSubTopics")]
-    pub topic_subtopics: HashMap<String, Vec<i64>>,
-
-    #[serde(rename = "venueNames")]
-    pub venue_names: HashMap<String, String>,
-
-    // Catch-all for other fields
-    #[serde(flatten)]
-    pub extra: HashMap<String, serde_json::Value>,
-}
-
-/// Creates a CitmCatalog from a JSON string (UTF-8 encoded).
-#[no_mangle]
-pub unsafe extern "C" fn citm_from_str(
-    raw_input: *const c_char,
-    raw_input_length: usize
-) -> *mut CitmCatalog {
-    if raw_input.is_null() {
-        eprintln!("Error: Input pointer is null");
-        return ptr::null_mut();
-    }
-
-    // Convert the raw pointer + length into a Rust slice
-    let bytes = slice::from_raw_parts(raw_input as *const u8, raw_input_length);
-    let input_str = match std::str::from_utf8(bytes) {
-        Ok(s) => s,
-        Err(e) => {
-            eprintln!("Error: Invalid UTF-8 string: {}", e);
-            return ptr::null_mut();
-        }
-    };
-
-    // Try deserializing the input string into CitmCatalog
-    match serde_json::from_str::<CitmCatalog>(input_str) {
-        Ok(catalog) => Box::into_raw(Box::new(catalog)),
-        Err(e) => {
-            eprintln!("Error deserializing JSON: {}", e);
-            eprintln!("JSON snippet (first 200 chars): {:.200}...", input_str);
-            ptr::null_mut()
-        }
-    }
-}
-
-/// Serializes a CitmCatalog into a JSON string (UTF-8).
-#[no_mangle]
-pub unsafe extern "C" fn str_from_citm(raw_catalog: *mut CitmCatalog) -> *mut c_char {
-    if raw_catalog.is_null() {
-        eprintln!("Error: Catalog pointer is null");
-        return ptr::null_mut();
-    }
-
-    // Fix: Actually serialize the catalog
-    let catalog = &*raw_catalog;
-
-    match serde_json::to_string(catalog) {
-        Ok(serialized) => {
-            match CString::new(serialized) {
-                Ok(cstr) => cstr.into_raw(),
-                Err(e) => {
-                    eprintln!("Error creating CString: {}", e);
-                    ptr::null_mut()
-                }
-            }
-        },
-        Err(e) => {
-            eprintln!("Error serializing catalog to JSON: {}", e);
-            ptr::null_mut()
-        }
-    }
-}
-
-/// Frees the CitmCatalog pointer.
-#[no_mangle]
-pub unsafe extern "C" fn free_citm(raw_catalog: *mut CitmCatalog) {
-    if !raw_catalog.is_null() {
-        drop(Box::from_raw(raw_catalog));
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn free_str(ptr: *mut c_char) {
-    if !ptr.is_null() {
-        unsafe {
-            // Convert back into a CString, which automatically frees the memory
-            let _ = CString::from_raw(ptr);
-        }
-    }
-}
@@ -1,45 +0,0 @@
-#ifndef serde_benchmark_ffi_h
-#define serde_benchmark_ffi_h
-
-/* Generated with cbindgen:0.28.0 */
-
-/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
-
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-namespace serde_benchmark {
-
-struct CitmCatalog;
-
-struct TwitterData;
-
-extern "C" {
-
-TwitterData *twitter_from_str(const char *raw_input, size_t raw_input_length);
-
-const char *str_from_twitter(TwitterData *raw);
-
-void free_twitter(TwitterData *raw);
-
-void free_string(const char *ptr);
-
-/// Creates a CitmCatalog from a JSON string (UTF-8 encoded).
-CitmCatalog *citm_from_str(const char *raw_input, uintptr_t raw_input_length);
-
-/// Serializes a CitmCatalog into a JSON string (UTF-8).
-char *str_from_citm(CitmCatalog *raw_catalog);
-
-/// Frees the CitmCatalog pointer.
-void free_citm(CitmCatalog *raw_catalog);
-
-void free_str(char *ptr);
-
-}  // extern "C"
-
-}  // namespace serde_benchmark
-
-#endif  // serde_benchmark_ffi_h
@@ -1,14 +0,0 @@
-
-# Add executable targets
-add_executable(benchmark_serialization_twitter benchmark_serialization_twitter.cpp)
-
- if(TARGET serde-benchmark)
-    message(STATUS "serde-benchmark target was created. Linking benchmarks and serde-benchmark.")
-    target_link_libraries(benchmark_serialization_twitter PRIVATE serde-benchmark)
-    target_compile_definitions(benchmark_serialization_twitter PRIVATE SIMDJSON_RUST_VERSION="${Rust_VERSION}")
-endif()
-target_link_libraries(benchmark_serialization_twitter PRIVATE simdjson::simdjson nlohmann_json)
-target_link_libraries(benchmark_serialization_twitter PRIVATE reflectcpp)
-target_compile_definitions(benchmark_serialization_twitter PRIVATE SIMDJSON_BENCH_CPP_REFLECT=1)
-
-target_compile_definitions(benchmark_serialization_twitter PRIVATE JSON_FILE="${EXAMPLE_JSON}")
@@ -1,168 +0,0 @@
-#include <cassert>
-#include <cstdlib>
-#include <ctime>
-#include <format>
-#include <fstream>
-#include <iostream>
-#include <nlohmann/json.hpp>
-#include <simdjson.h>
-#include <string>
-#include "twitter_data.h"
-#include "nlohmann_twitter_data.h"
-#include "../benchmark_utils/benchmark_helper.h"
-#if SIMDJSON_BENCH_CPP_REFLECT
-#include <rfl.hpp>
-#include <rfl/json.hpp>
-void bench_reflect_cpp(TwitterData &data) {
-  std::string output = rfl::json::write(data);
-  size_t output_volume = output.size();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(1, output_volume, "bench_reflect_cpp",
-               bench([&data, &measured_volume, &output_volume]() {
-                 std::string output = rfl::json::write(data);
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-#endif // SIMDJSON_BENCH_CPP_REFLECT
-
-#ifdef SIMDJSON_RUST_VERSION
-#include "../serde-benchmark/serde_benchmark.h"
-
-
-void bench_rust(serde_benchmark::TwitterData *data) {
-  const char * output = serde_benchmark::str_from_twitter(data);
-  size_t output_volume = strlen(output);
-  printf("# output volume: %zu bytes\n", output_volume);
-  volatile size_t measured_volume = 0;
-  pretty_print(1, output_volume, "bench_rust",
-               bench([&data, &measured_volume, &output_volume]() {
-                 const char * output = serde_benchmark::str_from_twitter(data);
-                 serde_benchmark::free_string(output);
-               }));
-}
-#endif
-
-template <class T> void bench_simdjson_static_reflection(T &data) {
-  simdjson::builder::string_builder sb;
-  simdjson::builder::append(sb, data);
-  std::string_view p;
-  if(sb.view().get(p)) {
-    std::cerr << "Error!" << std::endl;
-  }
-  size_t output_volume = p.size();
-  sb.clear();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(sizeof(data), output_volume, "bench_simdjson_static_reflection",
-               bench([&data, &measured_volume, &output_volume, &sb]() {
-                 sb.clear();
-                 simdjson::builder::append(sb, data);
-                 std::string_view p;
-                 if(sb.view().get(p)) {
-                   std::cerr << "Error!" << std::endl;
-                 }
-                 measured_volume = sb.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-
-void bench_nlohmann(TwitterData &data) {
-  std::string output = nlohmann_serialize(data);
-  size_t output_volume = output.size();
-  printf("# output volume: %zu bytes\n", output_volume);
-
-  volatile size_t measured_volume = 0;
-  pretty_print(1, output_volume, "bench_nlohmann",
-               bench([&data, &measured_volume, &output_volume]() {
-                 std::string output = nlohmann_serialize(data);
-                 measured_volume = output.size();
-                 if (measured_volume != output_volume) {
-                   printf("mismatch\n");
-                 }
-               }));
-}
-
-size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp) {
-  ((std::string *)userp)->append((char *)contents, size * nmemb);
-  return size * nmemb;
-}
-
-std::string read_file(std::string filename) {
-  printf("# Reading file %s\n", filename.c_str());
-  constexpr size_t read_size = 4096;
-  auto stream = std::ifstream(filename.c_str());
-  stream.exceptions(std::ios_base::badbit);
-  std::string out;
-  std::string buf(read_size, '\0');
-  while (stream.read(&buf[0], read_size)) {
-    out.append(buf, 0, size_t(stream.gcount()));
-  }
-  out.append(buf, 0, size_t(stream.gcount()));
-  return out;
-}
-
-// Function to check if benchmark name contains filter substring
-bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
-  return filter.empty() || benchmark_name.find(filter) != std::string::npos;
-}
-
-int main(int argc, char* argv[]) {
-  std::string filter;
-
-  // Parse command-line arguments
-  for (int i = 1; i < argc; ++i) {
-      if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "--filter") == 0) {
-          if (i + 1 < argc) {
-              filter = argv[++i];
-          } else {
-              std::cerr << "Error: -f/--filter requires an argument" << std::endl;
-              return EXIT_FAILURE;
-          }
-      }
-  }
-  // Testing correctness of round-trip (serialization + deserialization)
-  std::string json_str = read_file(JSON_FILE);
-
-  // Loading up the data into a structure.
-  simdjson::ondemand::parser parser;
-  simdjson::ondemand::document doc;
-  if(parser.iterate(simdjson::pad(json_str)).get(doc)) {
-    std::cerr << "Error loading the document!" << std::endl;
-    return EXIT_FAILURE;
-  }
-  TwitterData my_struct;
-  if(doc.get<TwitterData>().get(my_struct)) {
-    std::cerr << "Error loading TwitterData!" << std::endl;
-    return EXIT_FAILURE;
-  }
-
-  // Benchmarking the serialization
-  if (matches_filter("nlohmann", filter)) {
-    bench_nlohmann(my_struct);
-  }
-  if (matches_filter("simdjson_static_reflection", filter)) {
-    bench_simdjson_static_reflection(my_struct);
-  }
-#ifdef SIMDJSON_RUST_VERSION
-  if (matches_filter("rust", filter)) {
-    printf("# WARNING: The Rust benchmark may not be directly comparable since it does not use an equivalent data structure.\n");
-    serde_benchmark::TwitterData * td = serde_benchmark::twitter_from_str(json_str.c_str(), json_str.size());
-    bench_rust(td);
-    serde_benchmark::free_twitter(td);
-  }
-#endif
-#if SIMDJSON_BENCH_CPP_REFLECT
-  if (matches_filter("reflect_cpp", filter)) {
-    bench_reflect_cpp(my_struct);
-  }
-#endif
-  return EXIT_SUCCESS;
-}
@@ -1,116 +0,0 @@
-#ifndef NLOHMANN_TWITTER_DATA_H
-#define NLOHMANN_TWITTER_DATA_H
-
-#include "twitter_data.h"
-#include <nlohmann/json.hpp>
-
-void to_json(nlohmann::json &j, const User &u) {
-  j = nlohmann::json{{"id", u.id},
-                     {"name", u.name},
-                     {"screen_name", u.screen_name},
-                     {"location", u.location},
-                     {"description", u.description},
-                     {"verified", u.verified},
-                     {"followers_count", u.followers_count},
-                     {"friends_count", u.friends_count},
-                     {"statuses_count", u.statuses_count}};
-}
-
-void to_json(nlohmann::json &j, const Hashtag &h) {
-  j = nlohmann::json{{"text", h.text},
-                     {"indices_start", h.indices_start},
-                     {"indices_end", h.indices_end}};
-}
-
-void to_json(nlohmann::json &j, const Url &u) {
-  j = nlohmann::json{{"url", u.url},
-                     {"expanded_url", u.expanded_url},
-                     {"display_url", u.display_url},
-                     {"indices_start", u.indices_start},
-                     {"indices_end", u.indices_end}};
-}
-
-void to_json(nlohmann::json &j, const UserMention &um) {
-  j = nlohmann::json{{"id", um.id},
-                     {"name", um.name},
-                     {"screen_name", um.screen_name},
-                     {"indices_start", um.indices_start},
-                     {"indices_end", um.indices_end}};
-}
-
-void to_json(nlohmann::json &j, const Entities &e) {
-  j = nlohmann::json{{"hashtags", e.hashtags},
-                     {"urls", e.urls},
-                     {"user_mentions", e.user_mentions}};
-}
-
-void to_json(nlohmann::json &j, const Status &s) {
-  j = nlohmann::json{{"created_at", s.created_at},
-                     {"id", s.id},
-                     {"text", s.text},
-                     {"user", s.user},
-                     {"entities", s.entities},
-                     {"retweet_count", s.retweet_count},
-                     {"favorite_count", s.favorite_count},
-                     {"favorited", s.favorited},
-                     {"retweeted", s.retweeted}};
-}
-
-
-std::string nlohmann_serialize(const std::vector<Hashtag>& v) {
-  nlohmann::json a = nlohmann::json::array();
-  for(const Hashtag & h : v) {
-    a.push_back(nlohmann::json{{"text", h.text},
-                     {"indices_start", h.indices_start},
-                     {"indices_end", h.indices_end}});
-  }
-  return a.dump();
-}
-std::string nlohmann_serialize(const std::vector<Url>& v) {
-  nlohmann::json a = nlohmann::json::array();
-  for(const Url & u : v) {
-    a.push_back(nlohmann::json{{"url", u.url},
-                     {"expanded_url", u.expanded_url},
-                     {"display_url", u.display_url},
-                     {"indices_start", u.indices_start},
-                     {"indices_end", u.indices_end}});
-  }
-  return a.dump();
-}
-std::string nlohmann_serialize(const std::vector<UserMention>& v) {
-  nlohmann::json a = nlohmann::json::array();
-  for(const UserMention & um : v) {
-    a.push_back(nlohmann::json{{"id", um.id},
-                     {"name", um.name},
-                     {"screen_name", um.screen_name},
-                     {"indices_start", um.indices_start},
-                     {"indices_end", um.indices_end}});
-  }
-  return a.dump();
-}
-
-std::string nlohmann_serialize(const std::vector<Status>& v) {
-  nlohmann::json a = nlohmann::json::array();
-  for(const Status & s : v) {
-    a.push_back(nlohmann::json{{"created_at", s.created_at},
-                     {"id", s.id},
-                     {"text", s.text},
-                     {"user", s.user},
-                     {"entities", s.entities},
-                     {"retweet_count", s.retweet_count},
-                     {"favorite_count", s.favorite_count},
-                     {"favorited", s.favorited},
-                     {"retweeted", s.retweeted}});
-  }
-  return a.dump();
-}
-
-void to_json(nlohmann::json &j, const TwitterData &t) {
-  j = nlohmann::json{{"statuses", t.statuses}};
-}
-
-std::string nlohmann_serialize(const TwitterData &data) {
-  return nlohmann_serialize(data.statuses);
-}
-
-#endif // NLOHMANN_TWITTER_DATA_H
@@ -1,71 +0,0 @@
-#ifndef TWITTER_DATA_H
-#define TWITTER_DATA_H
-
-#include <string>
-#include <vector>
-
-struct User {
-  int64_t id;
-  std::string id_str;
-  std::string name;
-  std::string screen_name;
-  std::string location;
-  std::string description;
-  bool verified;
-  int64_t followers_count;
-  int64_t friends_count;
-  int64_t statuses_count;
-  bool operator<=>(const User &other) const = default;
-};
-
-struct Hashtag {
-  std::string text;
-  int64_t indices_start;
-  int64_t indices_end;
-  bool operator<=>(const Hashtag &other) const = default;
-};
-
-struct Url {
-  std::string url;
-  std::string expanded_url;
-  std::string display_url;
-  int64_t indices_start;
-  int64_t indices_end;
-  bool operator<=>(const Url &other) const = default;
-};
-
-struct UserMention {
-  int64_t id;
-  std::string name;
-  std::string screen_name;
-  int64_t indices_start;
-  int64_t indices_end;
-  bool operator<=>(const UserMention &other) const = default;
-};
-
-struct Entities {
-  std::vector<Hashtag> hashtags;
-  std::vector<Url> urls;
-  std::vector<UserMention> user_mentions;
-  bool operator==(const Entities &other) const = default;
-};
-
-struct Status {
-  std::string created_at;
-  int64_t id;
-  std::string text;
-  User user;
-  Entities entities;
-  int64_t retweet_count;
-  int64_t favorite_count;
-  bool favorited;
-  bool retweeted;
-  bool operator==(const Status &other) const = default;
-};
-
-struct TwitterData {
-  std::vector<Status> statuses;
-  bool operator==(const TwitterData &other) const = default;
-};
-
-#endif
@@ -112,14 +112,8 @@ endif()

 # We compile tools, tests, etc. with C++ 17. Override yourself if you need on a
 # target.
-if(SIMDJSON_STATIC_REFLECTION)
-  # This is temporary.
-  set(SIMDJSON_CXX_STANDARD 26 CACHE STRING "the C++ standard to use for simdjson")
-  #set(CMAKE_CXX_STANDARD ${SIMDJSON_CXX_STANDARD})
-else()
-  set(SIMDJSON_CXX_STANDARD 17 CACHE STRING "the C++ standard to use for simdjson")
-  set(CMAKE_CXX_STANDARD ${SIMDJSON_CXX_STANDARD})
-endif()
+set(SIMDJSON_CXX_STANDARD 17 CACHE STRING "the C++ standard to use for simdjson")
+set(CMAKE_CXX_STANDARD ${SIMDJSON_CXX_STANDARD})
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_THREAD_PREFER_PTHREAD ON)
@@ -106,7 +106,7 @@ int main() {}

  CPMAddPackage(
      NAME rapidjson
-      URL https://github.com/Tencent/rapidjson/archive/805d7ed5dfe97a39b8b0816fd5eeed8731dc4936.zip
+      URL https://github.com/Tencent/rapidjson/archive/f54b0e47a08782a6131cc3d60f94d038fa6e0a51.zip
      DOWNLOAD_ONLY YES
  )
  add_library(rapidjson INTERFACE)
@@ -1,50 +1,47 @@
 The Basics
 ==========

-An overview of what you need to know to use simdjson to parse JSON documents, with examples.
-[Our documentation regarding the generation (serialization) of JSON documents is in a
-separate document](https://github.com/simdjson/simdjson/blob/master/doc/builder.md).
+An overview of what you need to know to use simdjson, with examples.

 - [The Basics](#the-basics)
-  * [Requirements](#requirements)
-  * [Including simdjson](#including-simdjson)
-  * [Using simdjson with package managers](#using-simdjson-with-package-managers)
-  * [Using simdjson as a CMake dependency](#using-simdjson-as-a-cmake-dependency)
-  * [Versions](#versions)
-  * [The basics: loading and parsing JSON documents](#the-basics--loading-and-parsing-json-documents)
-  * [Documents are iterators](#documents-are-iterators)
-    + [Parser, document and JSON scope](#parser--document-and-json-scope)
-  * [string_view](#string-view)
-  * [Avoiding pitfalls: enable development checks](#avoiding-pitfalls--enable-development-checks)
-  * [Using the parsed JSON](#using-the-parsed-json)
-    + [Using the parsed JSON: additional examples](#using-the-parsed-json--additional-examples)
-  * [Adding support for custom types](#adding-support-for-custom-types)
-    + [1. Specialize `simdjson::ondemand::value::get` to get custom types (pre-C++20)](#1-specialize--simdjson--ondemand--value--get--to-get-custom-types--pre-c--20-)
-    + [2. Use `tag_invoke` for custom types (C++20)](#2-use--tag-invoke--for-custom-types--c--20-)
-    + [3. Using static reflection (C++26)](#3-using-static-reflection--c--26-)
-  * [Minifying JSON strings without parsing](#minifying-json-strings-without-parsing)
-  * [UTF-8 validation (alone)](#utf-8-validation--alone-)
-  * [JSON Pointer](#json-pointer)
-  * [JSONPath](#jsonpath)
-  * [Error handling](#error-handling)
-    + [Error handling examples without exceptions](#error-handling-examples-without-exceptions)
-    + [Disabling exceptions](#disabling-exceptions)
-    + [Exceptions](#exceptions)
-    + [Current location in document](#current-location-in-document)
-    + [Checking for trailing content](#checking-for-trailing-content)
-  * [Rewinding](#rewinding)
-  * [Newline-Delimited JSON (ndjson) and JSON lines](#newline-delimited-json--ndjson--and-json-lines)
-  * [Parsing numbers inside strings](#parsing-numbers-inside-strings)
-  * [Dynamic Number Types](#dynamic-number-types)
-  * [Raw strings from keys](#raw-strings-from-keys)
-  * [General direct access to the raw JSON string](#general-direct-access-to-the-raw-json-string)
-  * [Storing directly into an existing string instance](#storing-directly-into-an-existing-string-instance)
-  * [Thread safety](#thread-safety)
-  * [Standard compliance](#standard-compliance)
-  * [Backwards compatibility](#backwards-compatibility)
-  * [Examples](#examples)
-  * [Performance tips](#performance-tips)
-  * [Further reading](#further-reading)
+  - [Requirements](#requirements)
+  - [Including simdjson](#including-simdjson)
+  - [Using simdjson with package managers](#using-simdjson-with-package-managers)
+  - [Using simdjson as a CMake dependency](#using-simdjson-as-a-cmake-dependency)
+  - [Versions](#versions)
+  - [The basics: loading and parsing JSON documents](#the-basics-loading-and-parsing-json-documents)
+  - [Documents are iterators](#documents-are-iterators)
+    - [Parser, document and JSON scope](#parser-document-and-json-scope)
+  - [string_view](#string_view)
+  - [Avoiding pitfalls: enable development checks](#avoiding-pitfalls-enable-development-checks)
+  - [Using the parsed JSON](#using-the-parsed-json)
+    - [Using the parsed JSON: additional examples](#using-the-parsed-json-additional-examples)
+  - [Adding support for custom types](#adding-support-for-custom-types)
+    - [1. Specialize `simdjson::ondemand::value::get` to get custom types (pre-C++20)](#1-specialize-simdjsonondemandvalueget-to-get-custom-types-pre-c20)
+    - [2. Use `tag_invoke` for custom types (C++20)](#2-use-tag_invoke-for-custom-types-c20)
+  - [Minifying JSON strings without parsing](#minifying-json-strings-without-parsing)
+  - [UTF-8 validation (alone)](#utf-8-validation-alone)
+  - [JSON Pointer](#json-pointer)
+  - [JSONPath](#jsonpath)
+  - [Error handling](#error-handling)
+    - [Error handling examples without exceptions](#error-handling-examples-without-exceptions)
+    - [Disabling exceptions](#disabling-exceptions)
+    - [Exceptions](#exceptions)
+    - [Current location in document](#current-location-in-document)
+    - [Checking for trailing content](#checking-for-trailing-content)
+  - [Rewinding](#rewinding)
+  - [Newline-Delimited JSON (ndjson) and JSON lines](#newline-delimited-json-ndjson-and-json-lines)
+  - [Parsing numbers inside strings](#parsing-numbers-inside-strings)
+  - [Dynamic Number Types](#dynamic-number-types)
+  - [Raw strings from keys](#raw-strings-from-keys)
+  - [General direct access to the raw JSON string](#general-direct-access-to-the-raw-json-string)
+  - [Storing directly into an existing string instance](#storing-directly-into-an-existing-string-instance)
+  - [Thread safety](#thread-safety)
+  - [Standard compliance](#standard-compliance)
+  - [Backwards compatibility](#backwards-compatibility)
+  - [Examples](#examples)
+  - [Performance tips](#performance-tips)
+  - [Further reading](#further-reading)


 Requirements
@@ -823,17 +820,15 @@ for (ondemand::object points : parser.iterate(points_json)) {
 Adding support for custom types
 ----------------------

-There are 3 main ways provided by simdjson to deserialize a value into a custom type:
+There are 2 main ways provided by simdjson to deserialize a value into a custom type:

 1. Provide a [**template specialization** for member functions](https://en.cppreference.com/w/cpp/language/template_specialization#Members_of_specializations)
   1. Specialize `simdjson::ondemand::document::get` for the whole document
   2. Specialize `simdjson::ondemand::value::get` for each value
 2. Using `tag_invoke` *(the recommended way if your system supports C++20 or better)*
-3. Using static reflection (requires C++26 or better)

-We describe all of them in the following sections. Most users who have systems compatible with
+We describe both of them in the following sections. Most users who have systems compatible with
 C++20 or better should skip ahead to [using `tag_invoke` for custom types (C++20)](#2-use-tag_invoke-for-custom-types-c20) as it is more powerful and simpler.
-The C++26 approach is even simpler.

 ### 1. Specialize `simdjson::ondemand::value::get` to get custom types (pre-C++20)

@@ -1143,7 +1138,7 @@ struct Car {
 };
 ```

-Observe how we define the class to use types that simdjson does not directly support (`float`, `int`).
+Observe how we defined the class to use types that simdjson does not directly support (`float`, `int`).
 With C++20 support, the library grabs from the JSON the generic type (`double`, `int`) and then it
 casts it automatically.

@@ -1306,8 +1301,8 @@ from `std::string_view` instances:
 })"_padded;
  ondemand::parser parser;
  ondemand::document doc = parser.iterate(json);
-  std::map<std::string,Car> cars;
-  error = doc.get<std::map<std::string,Car>>().get(cars);
+  std:map<std::string,Car> cars;
+  error = doc.get<std:map<std::string,Car>>().get(cars);
  // car has value car1->Car{"Toyota", "Camry", 2018, {40.1f, 39.9f}}
  // error is simdjson::SUCCESS
 ```
@@ -1347,83 +1342,6 @@ With this code, deserializing an `std::list<Car>` instance would capture only th
 that are not made by Toyota.


-
-For even more convenience, you can do it directly without a parser instance like so:
-
-```cpp
-Car car = simdjson::from(json);
-```
-
-You can also use C++20 ranges to iterate over an array:
-
-```cpp
-  simdjson::padded_string json_cars =
-      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;
-
-  for (Car car : simdjson::from(json_cars) | simdjson::as<Car>()) {
-    if (car.year < 1998) {
-      return false;
-    }
-  }
-```
-
-
-### 3. Using static reflection (C++26)
-
-If you have a C++26 compatible compiler, you can compile
-your code with the `SIMDJSON_STATIC_REFLECTION` macro set:
-
-```cpp
-#define SIMDJSON_STATIC_REFLECTION 1
-//...
-#include "simdjson.h"
-```
-
-Then you can deserialize a type such as `Car` automatically:
-
-```cpp
-std::string json =  R"( { "make": "Toyota", "model": "Camry",  "year": 2018,
-       "tire_pressure": [ 40.1, 39.9 ] } )";
-simdjson::ondemand::parser parser;
-simdjson::ondemand::document doc = parser.iterate(simdjson::pad(json));
-Car c = doc.get<Car>();
-```
-
-Just like when using `tag_invoke` for custom types (but without the `tag_invoke` code), you can parse a class instance directly without a parser instance:
-
-```cpp
-Car car = simdjson::from(json);
-```
-
-Similarly, you can also use C++20 ranges to iterate over an array:
-
-```cpp
-  simdjson::padded_string json_cars =
-      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;
-
-  for (Car car : simdjson::from(json_cars) | simdjson::as<Car>()) {
-    if (car.year < 1998) {
-      return false;
-    }
-  }
-```
-
-You can also automatically serialize the `Car` instance to a JSON string, see
-our [Builder documentation](builder.md).
-
-
 Minifying JSON strings without parsing
 ----------------------

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

-An overview of what you need to know to use simdjson to parse JSON documents with
-our DOM API, with examples. [Our documentation regarding the generation (serialization) of JSON documents is in a
-separate document](https://github.com/simdjson/simdjson/blob/master/doc/builder.md).
-
+An overview of what you need to know to use simdjson, with examples.

 * [DOM vs On-Demand](#dom-vs-on-demand)
 * [The Basics: Loading and Parsing JSON Documents](#the-basics-loading-and-parsing-json-documents-using-the-dom-front-end)
@@ -31,10 +28,6 @@ a conventional Document-Object-Model (DOM) front-end. In such a scenario, the JS
 entirely parsed, validated and materialized in memory as the first step. The programmer may
 then access the parsed data using this in-memory model.

-On-Demand is a different model where you parse just what you need, directly into your own
-data structure. The On-Demand approach, when well tuned, can provide superior performance.
-[We refer you to the On-Demand documentation for further details](https://github.com/simdjson/simdjson/blob/master/doc/basics.md).
-
 The Basics: Loading and Parsing JSON Documents using the DOM front-end
 ----------------------------------------------

@@ -1,254 +0,0 @@
-# 🛠️ Build Instructions for simdjson One-Liner Demo
-
-## Prerequisites
-
-### For Both Examples
- **cpr library** (for HTTP requests) - See [INSTALL_CPR.md](INSTALL_CPR.md) for installation
- **curl library** (cpr dependency) - Usually pre-installed on most systems
- **simdjson library** - Included in this repository
-
-### For Legacy Example (github_legacy.cpp)
- Any C++20 compatible compiler (GCC 10+, Clang 10+, MSVC 2019+)
-
-### For Modern Example (github_modern.cpp)  
- Bloomberg Clang fork with C++26 reflection support
-  - Get it from: https://github.com/bloomberg/clang-p2996
-
-## 🔨 Compilation Commands
-
-### Quick Setup (Recommended)
-
-1. **Build cpr from source** (if not installed system-wide):
-```bash
-# From the examples directory
-mkdir -p ../deps && cd ../deps
-git clone https://github.com/libcpr/cpr.git
-cd cpr && git checkout 1.10.5
-mkdir build && cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++ -DCPR_USE_SYSTEM_CURL=ON -DBUILD_SHARED_LIBS=OFF -DCPR_ENABLE_SSL=OFF
-make -j4
-cd ../../../examples
-```
-
-2. **Compile the examples**:
-```bash
-# Legacy approach (any C++20 compiler)
-clang++ -std=c++20 \
-  -I../deps/cpr/include \
-  -I../deps/cpr/build/cpr_generated_includes \
-  -I../include -I.. \
-  github_legacy.cpp \
-  ../singleheader/simdjson.cpp \
-  ../deps/cpr/build/lib/libcpr.a \
-  -lcurl -pthread \
-  -o github_legacy_demo
-
-# Modern approach (Bloomberg clang with reflection)
-clang++ -std=c++26 -freflection \
-  -DSIMDJSON_STATIC_REFLECTION=1 \
-  -I../deps/cpr/include \
-  -I../deps/cpr/build/cpr_generated_includes \
-  -I../include -I.. \
-  github_modern.cpp \
-  ../singleheader/simdjson.cpp \
-  ../deps/cpr/build/lib/libcpr.a \
-  -lcurl -pthread \
-  -o github_modern_demo
-```
-
-### Using System-Installed cpr
-
-If cpr is installed system-wide (see [INSTALL_CPR.md](INSTALL_CPR.md)):
-
-```bash
-# Legacy approach
-clang++ -std=c++20 \
-  -I../include -I.. \
-  github_legacy.cpp \
-  -lcpr -lcurl \
-  -o github_legacy_demo
-
-# Modern approach
-clang++ -std=c++26 -freflection \
-  -DSIMDJSON_STATIC_REFLECTION=1 \
-  -I../include -I.. \
-  github_modern.cpp \
-  -lcpr -lcurl \
-  -o github_modern_demo
-```
-
-### Using simdjson Single Header
-
-```bash
-# Legacy approach
-clang++ -std=c++20 \
-  -I../singleheader \
-  github_legacy.cpp \
-  ../singleheader/simdjson.cpp \
-  -lcpr -lcurl \
-  -o github_legacy_demo
-
-# Modern approach
-clang++ -std=c++26 -freflection \
-  -DSIMDJSON_STATIC_REFLECTION=1 \
-  -I../singleheader -I../include \
-  github_modern.cpp \
-  ../singleheader/simdjson.cpp \
-  -lcpr -lcurl \
-  -o github_modern_demo
-```
-
-### Using CMake (Recommended)
-
-```bash
-# Create build directory
-mkdir build && cd build
-
-# Configure with CMake
-cmake .. -DCMAKE_CXX_COMPILER=clang++ \
-         -DCMAKE_CXX_STANDARD=26 \
-         -DCMAKE_CXX_FLAGS="-freflection -DSIMDJSON_STATIC_REFLECTION=1"
-
-# Build both examples
-make github_legacy github_modern
-```
-
-### Quick Build with simdjson Single Header
-
-```bash
-# Legacy approach
-clang++ -std=c++20 \
-  -I../singleheader \
-  github_legacy.cpp \
-  ../singleheader/simdjson.cpp \
-  -lcpr -lcurl \
-  -o github_legacy_demo
-
-# Modern approach  
-clang++ -std=c++26 -freflection \
-  -DSIMDJSON_STATIC_REFLECTION=1 \
-  -I../singleheader \
-  github_modern.cpp \
-  ../singleheader/simdjson.cpp \
-  -lcpr -lcurl \
-  -o github_modern_demo
-```
-
-## 🏃 Running the Examples
-
-```bash
-# Run legacy version
-./github_legacy_demo
-
-# Run modern version  
-./github_modern_demo
-```
-
-## 🎯 Platform-Specific Notes
-
-### Linux (x86_64)
-```bash
-DSIMDJSON_IMPLEMENTATION_HASWELL=1
-```
-
-### Linux (ARM64)
-```bash
-DSIMDJSON_IMPLEMENTATION_ARM64=1
-```
-
-### macOS (Apple Silicon)
-```bash
-DSIMDJSON_IMPLEMENTATION_ARM64=1
-```
-
-### macOS (Intel)
-```bash
-DSIMDJSON_IMPLEMENTATION_HASWELL=1
-```
-
-### Windows (MSVC)
-```cmd
-cl /std:c++20 /I..\include /I.. github_legacy.cpp /Fe:github_legacy_demo.exe
-```
-
-## 🐛 Troubleshooting
-
-### "reflection feature not available"
- Ensure you're using the Bloomberg clang fork
- Check version: `clang++ --version` should show bloomberg/clang-p2996
-
-### "SIMDJSON_STATIC_REFLECTION not working"
- Make sure to define it before including headers:
-  ```cpp
-  #define SIMDJSON_STATIC_REFLECTION 1
-  #include <simdjson.h>
-  ```
-
-### Linking errors
- Use single-header approach for simplicity
- Or ensure simdjson library is properly built and linked
-
-### Performance issues
- Add optimization flags: `-O3 -march=native`
- Enable LTO: `-flto`
-
-## 📦 Creating a Portable Demo
-
-For conferences, prepare the demo environment:
-
-```bash
-# Install cpr library (if not available)
-# Ubuntu/Debian:
-sudo apt-get install libcpr-dev
-
-# macOS:
-brew install cpr
-
-# Or build from source:
-git clone https://github.com/libcpr/cpr.git
-cd cpr && mkdir build && cd build
-cmake .. && make && sudo make install
-
-# Create demo directory
-mkdir simdjson_oneliner_demo
-cd simdjson_oneliner_demo
-
-# Copy necessary files
-cp path/to/github_legacy.cpp .
-cp path/to/github_modern.cpp .
-cp -r path/to/simdjson/include .
-cp -r path/to/simdjson/singleheader .
-
-# Create build script
-cat > build_demo.sh << 'EOF'
-#!/bin/bash
-echo "🔨 Building Legacy Example..."
-clang++ -std=c++20 -O3 -I./include -I. \
-  github_legacy.cpp -lcpr -lcurl -o legacy_demo
-
-echo "🔨 Building Modern Example (C++26)..."  
-clang++ -std=c++26 -freflection -DSIMDJSON_STATIC_REFLECTION=1 -O3 \
-  -I./include -I. github_modern.cpp -lcpr -lcurl -o modern_demo
-
-echo "✅ Build complete!"
-echo "Run: ./legacy_demo or ./modern_demo"
-EOF
-
-chmod +x build_demo.sh
-```
-
-## 🎪 Conference Checklist
-
- [ ] Bloomberg clang installed on demo machine
- [ ] Both examples compile cleanly  
- [ ] Internet connection for live API calls (or use standalone)
- [ ] Backup: pre-recorded video of compilation and execution
- [ ] Slides with code snippets
- [ ] QR code for GitHub repo
-
-## 🔗 Quick Links
-
- simdjson: https://github.com/simdjson/simdjson
- Bloomberg Clang: https://github.com/bloomberg/clang-p2996  
- P2996 Reflection Proposal: https://wg21.link/p2996
- Talk Resources: [Your GitHub repo with examples]
@@ -1,23 +1 @@
 add_subdirectory(quickstart)
-
-# Add simdjson one-liner demo examples
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/github_legacy.cpp AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/github_modern.cpp)
-    # FetchContent to download cpr
-    include(FetchContent)
-    set(CPR_ENABLE_SSL OFF CACHE BOOL "")
-    FetchContent_Declare(
-      cpr
-      GIT_REPOSITORY https://github.com/libcpr/cpr.git
-      GIT_TAG 1.10.5
-    )
-    FetchContent_MakeAvailable(cpr)
-
-    # Build the examples
-    add_executable(github_legacy github_legacy.cpp)
-    target_link_libraries(github_legacy simdjson cpr::cpr)
-
-    add_executable(github_modern github_modern.cpp)
-    target_link_libraries(github_modern simdjson cpr::cpr)
-    target_compile_options(github_modern PRIVATE -std=c++26 -freflection)
-    target_compile_definitions(github_modern PRIVATE SIMDJSON_STATIC_REFLECTION=1)
-endif()
@@ -1,232 +0,0 @@
-# 🚀 From Boilerplate to One-Liner: The simdjson Revolution
-
-## Conference Talk: JSON Parsing in Modern C++
-
-### 📋 Talk Abstract
-Discover how simdjson's new API combined with C++26 reflection transforms JSON parsing from a tedious, error-prone task into a single line of code. This talk showcases the dramatic evolution from manual parsing to automatic struct deserialization.
-
---
-
-## 🎯 Key Talking Points
-
-### 1. **The Problem** (2 minutes)
- JSON is everywhere: APIs, configs, data exchange
- C++ historically makes JSON parsing verbose
- Show other languages: `user = json.loads(data)` in Python
- "Why can't C++ be this simple?"
-
-### 2. **The Legacy Approach** (5 minutes)
- Live demo: `github_legacy.cpp`
- Walk through the boilerplate:
-  ```cpp
-  // 😓 Manual field extraction
-  user.login = std::string(doc["login"].get_string().value());
-  user.id = doc["id"].get_int64().value();
-  
-  // 😰 Handle optional fields
-  auto company_result = doc["company"];
-  if (!company_result.is_null()) {
-      user.company = std::string(company_result.get_string().value());
-  }
-  ```
- Count the lines: ~30 lines just for parsing!
- Error-prone: typos, missing fields, type mismatches
-
-### 3. **The Magic Moment** (3 minutes)
- "What if I told you it could be just ONE line?"
- Show `github_modern.cpp`
- The magic line:
-  ```cpp
-  GitHubUser user = simdjson::from(simdjson::padded_string(json_data));
-  ```
- Audience reaction: 🤯
-
-### 4. **How It Works** (5 minutes)
- C++26 static reflection
- Compile-time struct introspection
- simdjson generates parsing code automatically
- Zero runtime overhead - it's all compile-time!
-
-### 5. **Live Demo** (5 minutes)
- Compile both examples
- Run them side-by-side
- Show identical output
- Highlight the code difference
- Add a new field to the struct - watch it "just work"
-
-### 6. **Deserialization Performance** (3 minutes)
- "But is deserialization fast?"
- Live benchmark demonstration
- Both approaches achieve ~2.7 GB/s deserialization speed on real GitHub API data
- Reflection adds ZERO runtime overhead to deserialization
- "You get simplicity WITHOUT sacrificing speed!"
- Note: We're measuring JSON → struct deserialization performance
- Note: Performance scales with larger documents (up to 3+ GB/s)
-
-### 7. **The Future is Now** (2 minutes)
- Bloomberg clang fork available today
- C++26 coming soon
- Start preparing your codebases
- simdjson ready for the future
-
---
-
-## 💻 Live Coding Demo Script
-
-### Setup
-```bash
-# Show the two files
-ls -la github_*.cpp
-
-# Show line count difference
-wc -l github_legacy.cpp github_modern.cpp
-```
-
-### Demo 1: The Pain of Legacy
-```bash
-# Open github_legacy.cpp in editor
-# Highlight the parse_github_user function
-# Point out each manual field extraction
-# "Look at all this code just to parse 7 fields!"
-```
-
-### Demo 2: The Modern Magic
-```bash
-# Open github_modern.cpp
-# Show the struct - "Just a plain struct!"
-# Show the one-liner
-# "That's it. That's the entire parsing code."
-```
-
-### Demo 3: Compilation and Execution
-
-**Option 1: Use the demo script (Recommended)**
-```bash
-# The script handles everything - building cpr, compiling, and running
-./conference_demo.sh
-
-# For the extended demo with serialization:
-./conference_demo_serialization.sh
-```
-
-**Option 2: Manual compilation**
-```bash
-# Build cpr first (one-time setup)
-mkdir -p ../deps && cd ../deps
-git clone https://github.com/libcpr/cpr.git
-cd cpr && git checkout 1.10.5
-mkdir build && cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++ -DCPR_USE_SYSTEM_CURL=ON \
-         -DBUILD_SHARED_LIBS=OFF -DCPR_ENABLE_SSL=OFF
-make -j4
-cd ../../../examples
-
-# Compile legacy
-clang++ -std=c++20 \
-  -I../deps/cpr/include -I../deps/cpr/build/cpr_generated_includes \
-  -I../include -I.. github_legacy.cpp ../singleheader/simdjson.cpp \
-  ../deps/cpr/build/lib/libcpr.a -lcurl -pthread -o legacy_demo
-
-# Compile modern (with reflection)
-clang++ -std=c++26 -freflection -DSIMDJSON_STATIC_REFLECTION=1 \
-  -I../deps/cpr/include -I../deps/cpr/build/cpr_generated_includes \
-  -I../include -I.. github_modern.cpp ../singleheader/simdjson.cpp \
-  ../deps/cpr/build/lib/libcpr.a -lcurl -pthread -o modern_demo
-
-# Run both - they fetch real GitHub data!
-./legacy_demo
-./modern_demo
-```
-
-### Demo 4: Adding a New Field (Crowd Pleaser!)
-```cpp
-// Add to struct in both files:
-std::string twitter_username;
-
-// Legacy: Must add parsing code
-else if (key == "twitter_username") 
-    user.twitter_username = field.value().get_string().value();
-
-// Modern: Nothing to add! It just works!
-```
-
---
-
-## 🎤 Speaker Notes
-
-### Opening Hook
-"How many of you have written JSON parsing code in C++? Keep your hands up if you enjoyed it... Yeah, I thought so."
-
-### Transition to Modern
-"But what if I told you that in 2024, with simdjson and C++26, parsing JSON can be as simple as Python?"
-
-### After showing the one-liner
-"No, this isn't pseudocode. This is real, working C++ code. Let me prove it to you."
-
-### Addressing Skeptics
- "It's not magic, it's metaprogramming"
- "No runtime cost - it's all compile-time"
- "Yes, it handles errors properly"
- "Yes, it's production-ready"
-
-### Closing
-"The future of C++ is here. It's fast, it's simple, and it's beautiful. Stop writing boilerplate. Start writing the code that matters."
-
---
-
-## 📊 Slide Suggestions
-
-### Slide 1: Title
-**From 50 Lines to 1: The simdjson Revolution**
-*Your Name - Conference 2024*
-
-### Slide 2: The Problem
-```python
-# Python
-user = json.loads(data)
-
-# JavaScript  
-const user = JSON.parse(data);
-
-# C++ ???
-// 😭 50+ lines of boilerplate
-```
-
-### Slide 3: The Solution
-```cpp
-// C++26 with simdjson
-GitHubUser user = simdjson::from(simdjson::padded_string(data));
-```
-
-### Slide 4: Performance Graph
- Bar chart showing simdjson vs other parsers
- "Fast AND Simple"
-
-### Slide 5: Timeline
- 2018: simdjson introduced (fast but verbose)
- 2024: New API design  
- 2024: C++26 reflection support
- Future: It's here!
-
-### Slide 6: Call to Action
- Try it today: github.com/simdjson/simdjson
- Bloomberg clang: github.com/bloomberg/clang-p2996
- Join the revolution!
-
---
-
-## 🔥 Audience Engagement
-
-### Interactive Elements
-1. **Live Poll**: "How many lines of code for parsing JSON?"
-2. **Challenge**: "Spot the bug in this manual parsing code"
-3. **Q&A Focus**: Performance, error handling, compatibility
-
-### Memorable Moments
- The reveal of the one-liner
- Live compilation with reflection
- Adding a field without changing parsing code
- Performance numbers
-
-### Takeaway Message
-"C++ doesn't have to be painful. With modern tools and modern standards, C++ can be as elegant as any language - and faster than all of them."
@@ -1,72 +0,0 @@
-# Installing CPR Library
-
-The examples require the CPR library for making HTTP requests to the GitHub API.
-
-## Option 1: Install via Package Manager (Recommended)
-
-### Ubuntu/Debian
-```bash
-sudo apt-get update
-sudo apt-get install libcpr-dev
-```
-
-### macOS (Homebrew)
-```bash
-brew install cpr
-```
-
-### Arch Linux
-```bash
-sudo pacman -S cpr
-```
-
-## Option 2: Build from Source
-
-```bash
-# Clone cpr
-git clone https://github.com/libcpr/cpr.git
-cd cpr
-
-# Build and install
-mkdir build && cd build
-cmake .. -DCPR_USE_SYSTEM_CURL=ON
-make
-sudo make install
-```
-
-## Option 3: Using vcpkg
-
-```bash
-vcpkg install cpr
-```
-
-## Option 4: Using Conan
-
-```bash
-conan install cpr/1.10.5@
-```
-
-## Compilation
-
-Once cpr is installed, compile the examples:
-
-```bash
-# Legacy example
-clang++ -std=c++20 -I../include -I.. github_legacy.cpp -lcpr -lcurl -o github_legacy_demo
-
-# Modern example (requires Bloomberg clang)
-clang++ -std=c++26 -freflection -DSIMDJSON_STATIC_REFLECTION=1 \
-        -I../include -I.. github_modern.cpp -lcpr -lcurl -o github_modern_demo
-```
-
-## Troubleshooting
-
-If you get "cpr/cpr.h not found", check:
- `pkg-config --cflags --libs cpr`
- Add include path: `-I/usr/local/include`
- Add library path: `-L/usr/local/lib`
-
-For SSL issues, ensure OpenSSL is installed:
- Ubuntu/Debian: `sudo apt-get install libssl-dev`
- macOS: `brew install openssl`
- Link OpenSSL: `-lssl -lcrypto`
@@ -1,74 +0,0 @@
-# 🚀 simdjson One-Liner Demo: From Boilerplate to Magic
-
-This demo showcases the dramatic simplification of JSON parsing in C++ using simdjson's new API combined with C++26 reflection.
-
-## Files
-
- `github_legacy.cpp` - Traditional manual JSON parsing approach (~30 lines of parsing code)
- `github_modern.cpp` - Modern C++26 reflection approach (1 line of parsing code!)
- `CONFERENCE_TALK.md` - Complete conference presentation guide
- `BUILD_INSTRUCTIONS.md` - Detailed compilation instructions
- `conference_demo.sh` - Interactive demo script for presentations
-
-## Quick Start
-
-### Prerequisites
- Bloomberg clang for C++26: https://github.com/bloomberg/clang-p2996
- curl library (usually pre-installed)
- cpr library (built automatically by demo script)
-
-### Easy Demo
-```bash
-# Just run the demo script - it handles everything!
-./conference_demo.sh
-```
-
-The script will:
-1. Build cpr if needed
-2. Compile both examples
-3. Run interactive presentation
-
-### Manual Compilation
-
-If you want to compile manually:
-
-```bash
-# Build cpr first (if not installed)
-mkdir -p ../deps && cd ../deps
-git clone https://github.com/libcpr/cpr.git
-cd cpr && git checkout 1.10.5
-mkdir build && cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++ -DCPR_USE_SYSTEM_CURL=ON -DBUILD_SHARED_LIBS=OFF -DCPR_ENABLE_SSL=OFF
-make -j4
-cd ../../../examples
-
-# Compile examples
-# Legacy
-clang++ -std=c++20 -I../deps/cpr/include -I../deps/cpr/build/cpr_generated_includes \
-        -I../include -I.. github_legacy.cpp ../singleheader/simdjson.cpp \
-        ../deps/cpr/build/lib/libcpr.a -lcurl -pthread -o legacy_demo
-
-# Modern
-clang++ -std=c++26 -freflection -DSIMDJSON_STATIC_REFLECTION=1 \
-        -I../deps/cpr/include -I../deps/cpr/build/cpr_generated_includes \
-        -I../include -I.. github_modern.cpp ../singleheader/simdjson.cpp \
-        ../deps/cpr/build/lib/libcpr.a -lcurl -pthread -o modern_demo
-```
-
-## The Magic ✨
-
-**Before (Legacy):**
-```cpp
-// 30+ lines of manual parsing...
-user.login = std::string(doc["login"].get_string().value());
-user.id = doc["id"].get_int64().value();
-// ... etc for each field
-```
-
-**After (Modern):**
-```cpp
-// Just ONE line!
-GitHubUser user = simdjson::from(simdjson::padded_string(response.text));
-```
-
-Both examples fetch real data from GitHub API to demonstrate real-world usage!
@@ -1,53 +0,0 @@
-# simdjson Serialization with C++26 Reflection
-
-This directory now includes examples demonstrating **both** deserialization and serialization using C++26 reflection features.
-
-## 🚀 Quick Start
-
-### Basic Round-Trip Demo
-```bash
-# Compile and run the simple round-trip demo
-clang++ -std=c++26 -freflection -DSIMDJSON_STATIC_REFLECTION=1 \
-    reflection_roundtrip_demo.cpp ../singleheader/simdjson.cpp \
-    -o reflection_roundtrip_demo
-./reflection_roundtrip_demo
-```
-
-### Conference Demo with Serialization
-```bash
-# Run the extended conference demo that includes serialization
-./conference_demo_serialization.sh
-```
-
-## 📝 What's New?
-
-The experimental `simdjson::builder::to_json_string()` function enables one-line serialization:
-
-```cpp
-// Deserialize JSON → Struct
-MyStruct obj = simdjson::from(json);
-
-// Serialize Struct → JSON (NEW!)
-std::string json = simdjson::builder::to_json_string(obj);
-```
-
-## 🎯 Features
-
- **Zero boilerplate**: No need to write serialization code
- **Automatic handling**: Optional fields, containers, nested structures
- **Type-safe**: Compile-time checking with reflection
- **Performant**: Optimized string building
-
-## ⚠️ Requirements
-
- Bloomberg's clang fork (clang-p2996) with C++26 reflection support
- Build with `-DSIMDJSON_STATIC_REFLECTION=1`
- Include `simdjson/builder/json_builder.h`
-
-## 📊 Performance
-
-While serialization is generally slower than deserialization (due to string building vs parsing), the reflection-based approach is still highly optimized and significantly faster than manual string concatenation approaches.
-
-## 🔧 Status
-
-This serialization support is **experimental** and part of the builder API. The API may change as C++26 reflection features evolve.
@@ -1,167 +0,0 @@
-#!/bin/bash
-# Conference Demo Script - simdjson One-Liner Magic
-# Run this during your talk for a smooth demo experience
-
-# Check if cpr is built
-if [ ! -f "../deps/cpr/build/lib/libcpr.a" ]; then
-    echo "⚠️  CPR library not found. Building it first..."
-    echo ""
-    if [ ! -d "../deps/cpr" ]; then
-        mkdir -p ../deps
-        cd ../deps
-        git clone https://github.com/libcpr/cpr.git
-        cd cpr && git checkout 1.10.5
-        cd ../..
-    fi
-    cd ../deps/cpr
-    mkdir -p build && cd build
-    cmake .. -DCMAKE_CXX_COMPILER=clang++ -DCPR_USE_SYSTEM_CURL=ON -DBUILD_SHARED_LIBS=OFF -DCPR_ENABLE_SSL=OFF
-    make -j4
-    cd ../../../examples
-    echo "✅ CPR built successfully!"
-    echo ""
-fi
-
-clear
-echo "🚀 simdjson: From Boilerplate to One-Liner"
-echo "==========================================="
-echo ""
-echo "Press Enter to continue..."
-read
-
-# Show the legacy approach
-echo "📚 First, let's look at the LEGACY approach..."
-echo ""
-echo "Opening github_legacy.cpp..."
-sleep 1
-echo ""
-echo "Key points:"
-echo "  • Manual parse_github_user() function"
-echo "  • Extract each field individually"
-echo "  • Handle optional fields explicitly"
-echo "  • ~30 lines of parsing code"
-echo ""
-echo "Press Enter to see the code..."
-read
-
-# Display key parts of legacy code
-cat github_legacy.cpp | grep -A 20 "parse_github_user" | head -25
-
-echo ""
-echo "😓 That's a lot of boilerplate!"
-echo ""
-echo "Press Enter to compile and run..."
-read
-
-# Compile legacy
-echo "🔨 Compiling legacy version..."
-echo "Command: clang++ -std=c++20 -I../deps/cpr/include -I../deps/cpr/build/cpr_generated_includes -I../include -I.. github_legacy.cpp ../singleheader/simdjson.cpp ../deps/cpr/build/lib/libcpr.a -lcurl -pthread -o legacy_demo"
-clang++ -std=c++20 -I../deps/cpr/include -I../deps/cpr/build/cpr_generated_includes -I../include -I.. github_legacy.cpp ../singleheader/simdjson.cpp ../deps/cpr/build/lib/libcpr.a -lcurl -pthread -o legacy_demo
-echo "✅ Compiled!"
-echo ""
-echo "🏃 Running legacy demo (fetching real GitHub data)..."
-echo ""
-./legacy_demo
-
-echo ""
-echo "Press Enter to see the MODERN approach..."
-read
-
-clear
-echo "✨ Now, let's look at the MODERN approach with C++26 reflection..."
-echo ""
-echo "Opening github_modern.cpp..."
-sleep 1
-echo ""
-echo "Key points:"
-echo "  • Just declare your struct"
-echo "  • ONE line of parsing code"
-echo "  • C++26 reflection handles everything"
-echo "  • No manual field extraction!"
-echo ""
-echo "Press Enter to see the magic..."
-read
-
-# Show the struct and the one-liner
-echo "The struct (just a plain struct!):"
-echo ""
-cat github_modern.cpp | grep -A 10 "struct GitHubUser" | head -12
-echo ""
-echo "The parsing code (ONE LINE!):"
-echo ""
-echo "    GitHubUser user = simdjson::from(simdjson::padded_string(response.text));"
-echo ""
-echo "🤯 That's it! That's all the parsing code!"
-echo ""
-echo "Press Enter to compile with C++26 reflection..."
-read
-
-# Compile modern
-echo "🔨 Compiling modern version with Bloomberg clang..."
-echo "Command: clang++ -std=c++26 -freflection -DSIMDJSON_STATIC_REFLECTION=1 -I../deps/cpr/include -I../deps/cpr/build/cpr_generated_includes -I../include -I.. github_modern.cpp ../singleheader/simdjson.cpp ../deps/cpr/build/lib/libcpr.a -lcurl -pthread -o modern_demo"
-clang++ -std=c++26 -freflection -DSIMDJSON_STATIC_REFLECTION=1 -I../deps/cpr/include -I../deps/cpr/build/cpr_generated_includes -I../include -I.. github_modern.cpp ../singleheader/simdjson.cpp ../deps/cpr/build/lib/libcpr.a -lcurl -pthread -o modern_demo
-echo "✅ Compiled!"
-echo ""
-echo "🏃 Running modern demo (fetching real GitHub data)..."
-echo ""
-./modern_demo
-
-echo ""
-echo "Press Enter to see side-by-side comparison..."
-read
-
-clear
-echo "📊 SIDE-BY-SIDE COMPARISON"
-echo "========================="
-echo ""
-echo "Legacy Approach:                    Modern Approach (C++26):"
-echo "----------------                    ------------------------"
-echo "❌ 30+ lines of parsing code        ✅ 1 line of parsing code"
-echo "❌ Manual field extraction          ✅ Automatic with reflection"
-echo "❌ Error-prone                      ✅ Type-safe"
-echo "❌ Hard to maintain                 ✅ Just update the struct"
-echo "❌ Boilerplate for each type        ✅ Works for any struct"
-echo ""
-echo ""
-echo "Press Enter to run PERFORMANCE BENCHMARKS..."
-read
-
-clear
-echo "⚡ DESERIALIZATION PERFORMANCE BENCHMARKS"
-echo "========================================"
-echo ""
-echo "Let's measure the actual JSON → struct deserialization speed..."
-echo ""
-
-# Compile benchmarks if not exist
-if [ ! -f "./legacy_benchmark" ] || [ ! -f "./modern_benchmark" ]; then
-    echo "🔨 Compiling benchmark versions..."
-    
-    clang++ -std=c++20 -O3 -march=native \
-      -I../deps/cpr/include -I../deps/cpr/build/cpr_generated_includes \
-      -I../include -I.. github_legacy_benchmark.cpp ../singleheader/simdjson.cpp \
-      ../deps/cpr/build/lib/libcpr.a -lcurl -pthread -o legacy_benchmark 2>/dev/null
-    
-    clang++ -std=c++26 -freflection -O3 -march=native \
-      -DSIMDJSON_STATIC_REFLECTION=1 \
-      -I../deps/cpr/include -I../deps/cpr/build/cpr_generated_includes \
-      -I../include -I.. github_modern_benchmark.cpp ../singleheader/simdjson.cpp \
-      ../deps/cpr/build/lib/libcpr.a -lcurl -pthread -o modern_benchmark 2>/dev/null
-fi
-
-echo "🏃 Running legacy benchmark..."
-echo ""
-./legacy_benchmark
-
-echo ""
-echo "Press Enter to run modern benchmark..."
-read
-
-echo "🏃 Running modern benchmark..."
-echo ""
-./modern_benchmark
-
-echo ""
-echo "🎉 The future of C++ is here!"
-echo ""
-echo "Questions?"
@@ -1,322 +0,0 @@
-#!/bin/bash
-# Conference Demo Script - simdjson One-Liner Magic (WITH SERIALIZATION!)
-# Extended demo showcasing both deserialization AND serialization with C++26 reflection
-
-# Check if cpr is built
-if [ ! -f "../deps/cpr/build/lib/libcpr.a" ]; then
-    echo "⚠️  CPR library not found. Building it first..."
-    echo ""
-    if [ ! -d "../deps/cpr" ]; then
-        mkdir -p ../deps
-        cd ../deps
-        git clone https://github.com/libcpr/cpr.git
-        cd cpr && git checkout 1.10.5
-        cd ../..
-    fi
-    cd ../deps/cpr
-    mkdir -p build && cd build
-    cmake .. -DCMAKE_CXX_COMPILER=clang++ -DCPR_USE_SYSTEM_CURL=ON -DBUILD_SHARED_LIBS=OFF -DCPR_ENABLE_SSL=OFF
-    make -j4
-    cd ../../../examples
-    echo "✅ CPR built successfully!"
-    echo ""
-fi
-
-clear
-echo "🚀 simdjson: Complete JSON Round-Trip with C++26 Reflection"
-echo "============================================================"
-echo ""
-echo "Today we'll showcase BOTH deserialization AND serialization!"
-echo ""
-echo "Press Enter to continue..."
-read
-
-# Create a demo program that shows serialization
-cat > github_serialization_demo.cpp << 'EOF'
-#include <iostream>
-#include <iomanip>
-#include "simdjson.h"
-#include <cpr/cpr.h>
-
-struct GitHubUser {
-    std::string login;
-    std::optional<std::string> name;
-    std::optional<std::string> company;
-    std::optional<std::string> blog;
-    std::optional<std::string> location;
-    std::optional<std::string> email;
-    std::optional<std::string> bio;
-    int64_t public_repos;
-    int64_t followers;
-    int64_t following;
-};
-
-int main() {
-    std::cout << "🔄 C++26 Reflection: Complete JSON Round-Trip Demo\n";
-    std::cout << "================================================\n\n";
-    
-    // Step 1: Fetch real data from GitHub
-    std::cout << "📡 Fetching GitHub user data...\n";
-    auto response = cpr::Get(cpr::Url{"https://api.github.com/users/simdjson"});
-    
-    if (response.status_code != 200) {
-        std::cerr << "Error: Failed to fetch data\n";
-        return 1;
-    }
-    
-    std::cout << "✅ Received " << response.text.length() << " bytes of JSON\n\n";
-    
-    // Step 2: Deserialize with ONE LINE
-    std::cout << "📥 DESERIALIZATION (JSON → Struct)\n";
-    std::cout << "Code: GitHubUser user = simdjson::from(simdjson::padded_string(response.text));\n\n";
-    
-    GitHubUser user = simdjson::from(simdjson::padded_string(response.text));
-    
-    // Show the data we parsed
-    std::cout << "Parsed data:\n";
-    std::cout << "  • Login: " << user.login << "\n";
-    std::cout << "  • Name: " << (user.name.has_value() ? *user.name : "<not set>") << "\n";
-    std::cout << "  • Company: " << (user.company.has_value() ? *user.company : "<not set>") << "\n";
-    std::cout << "  • Location: " << (user.location.has_value() ? *user.location : "<not set>") << "\n";
-    std::cout << "  • Bio: " << (user.bio.has_value() ? *user.bio : "<not set>") << "\n";
-    std::cout << "  • Repos: " << user.public_repos << "\n";
-    std::cout << "  • Followers: " << user.followers << "\n\n";
-    
-    // Step 3: Modify the data
-    std::cout << "✏️  Modifying data...\n";
-    user.followers += 1000;  // Wishful thinking!
-    user.name = "simdjson - JSON at the speed of light";  // Set a name
-    user.bio = user.bio.value_or("") + " (Now with C++26 reflection!)";
-    std::cout << "  • Added 1000 followers (we can dream!)\n";
-    std::cout << "  • Set organization name\n";
-    std::cout << "  • Updated bio\n\n";
-    
-    // Step 4: Serialize back to JSON with ONE LINE
-    std::cout << "📤 SERIALIZATION (Struct → JSON)\n";
-    std::cout << "Code: std::string json = simdjson::builder::to_json_string(user);\n\n";
-    
-    auto json_result = simdjson::builder::to_json_string(user);
-    if (json_result.error()) {
-        std::cerr << "Serialization error!\n";
-        return 1;
-    }
-    std::string json = json_result.value();
-    
-    std::cout << "Generated JSON (" << json.length() << " bytes):\n";
-    // Pretty print first 200 chars
-    if (json.length() > 200) {
-        std::cout << json.substr(0, 200) << "...\n\n";
-    } else {
-        std::cout << json << "\n\n";
-    }
-    
-    // Step 5: Verify round-trip
-    std::cout << "🔄 ROUND-TRIP VERIFICATION\n";
-    std::cout << "Parsing our generated JSON back...\n";
-    
-    GitHubUser user2 = simdjson::from(simdjson::padded_string(json));
-    
-    std::cout << "✅ Round-trip successful!\n";
-    std::cout << "  • Original followers: " << user.followers << "\n";
-    std::cout << "  • Parsed followers: " << user2.followers << "\n";
-    std::cout << "  • Name set correctly: " << (user2.name.has_value() && *user2.name == *user.name ? "YES" : "NO") << "\n";
-    std::cout << "  • Bio preserved: " << (user2.bio.has_value() ? "YES" : "NO") << "\n\n";
-    
-    std::cout << "🎉 That's it! Two lines of code for complete JSON handling:\n";
-    std::cout << "   • Deserialization: simdjson::from(...)\n";
-    std::cout << "   • Serialization: simdjson::builder::to_json_string(...)\n";
-    
-    return 0;
-}
-EOF
-
-# Create a benchmark that includes serialization
-cat > serialization_benchmark.cpp << 'EOF'
-#include <iostream>
-#include <iomanip>
-#include <chrono>
-#include "simdjson.h"
-#include <map>
-
-struct TestData {
-    std::string name;
-    std::vector<int> numbers;
-    std::map<std::string, double> metrics;
-    bool active;
-    std::optional<std::string> description;
-};
-
-int main() {
-    std::cout << "⚡ Serialization Performance Benchmark\n";
-    std::cout << "=====================================\n\n";
-    
-    // Create test data
-    TestData data{
-        .name = "Performance Test",
-        .numbers = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
-        .metrics = {{"latency", 1.23}, {"throughput", 456.78}, {"cpu", 89.01}},
-        .active = true,
-        .description = "Testing reflection-based serialization performance"
-    };
-    
-    const int iterations = 100000;
-    
-    // Benchmark serialization
-    std::cout << "📤 Benchmarking serialization (" << iterations << " iterations)...\n";
-    
-    auto start = std::chrono::high_resolution_clock::now();
-    
-    std::string json;
-    for (int i = 0; i < iterations; i++) {
-        auto result = simdjson::builder::to_json_string(data);
-        if (i == 0 && !result.error()) {
-            json = result.value();
-        }
-    }
-    
-    auto end = std::chrono::high_resolution_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-    
-    std::cout << "\nResults:\n";
-    std::cout << "  • Generated JSON size: " << json.length() << " bytes\n";
-    std::cout << "  • Total time: " << duration.count() / 1000.0 << " ms\n";
-    
-    double time_per_iteration_us = duration.count() / double(iterations);
-    double time_per_iteration_s = time_per_iteration_us / 1000000.0;
-    double bytes_per_second = json.length() / time_per_iteration_s;
-    double mb_per_second = bytes_per_second / (1024.0 * 1024.0);
-    
-    std::cout << "  • Time per serialization: " << std::fixed << std::setprecision(2) << time_per_iteration_us << " μs\n";
-    std::cout << "  • Throughput: " << std::fixed << std::setprecision(2) << mb_per_second << " MB/s\n";
-    
-    std::cout << "\nGenerated JSON:\n" << json << "\n\n";
-    
-    // Benchmark deserialization for comparison
-    std::cout << "📥 Benchmarking deserialization (for comparison)...\n";
-    
-    simdjson::padded_string padded_json(json);
-    start = std::chrono::high_resolution_clock::now();
-    
-    for (int i = 0; i < iterations; i++) {
-        TestData parsed = simdjson::from(padded_json);
-    }
-    
-    end = std::chrono::high_resolution_clock::now();
-    duration = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-    
-    std::cout << "\nResults:\n";
-    time_per_iteration_us = duration.count() / double(iterations);
-    time_per_iteration_s = time_per_iteration_us / 1000000.0;
-    bytes_per_second = json.length() / time_per_iteration_s;
-    mb_per_second = bytes_per_second / (1024.0 * 1024.0);
-    
-    std::cout << "  • Time per deserialization: " << std::fixed << std::setprecision(2) << time_per_iteration_us << " μs\n";
-    std::cout << "  • Throughput: " << std::fixed << std::setprecision(2) << mb_per_second << " MB/s\n";
-    
-    std::cout << "\n✅ Both serialization and deserialization work with reflection!\n";
-    
-    return 0;
-}
-EOF
-
-echo "📝 First, let's see the traditional approach to serialization..."
-echo ""
-echo "Press Enter to see manual serialization code..."
-read
-
-cat > manual_serialization_example.cpp << 'EOF'
-// The OLD way - Manual serialization
-std::string serialize_github_user(const GitHubUser& user) {
-    std::string json = "{";
-    json += "\"login\":\"" + user.login + "\",";
-    json += "\"name\":\"" + user.name + "\",";
-    json += "\"company\":\"" + user.company + "\",";
-    json += "\"blog\":\"" + user.blog + "\",";
-    json += "\"location\":\"" + user.location + "\",";
-    
-    if (user.email.has_value()) {
-        json += "\"email\":\"" + *user.email + "\",";
-    }
-    if (user.bio.has_value()) {
-        json += "\"bio\":\"" + *user.bio + "\",";
-    }
-    
-    json += "\"public_repos\":" + std::to_string(user.public_repos) + ",";
-    json += "\"followers\":" + std::to_string(user.followers) + ",";
-    json += "\"following\":" + std::to_string(user.following);
-    json += "}";
-    
-    return json;
-}
-EOF
-
-cat manual_serialization_example.cpp
-echo ""
-echo "😓 That's error-prone and doesn't handle escaping!"
-echo ""
-echo "Press Enter to see the MODERN approach..."
-read
-
-clear
-echo "✨ The MODERN approach with C++26 reflection:"
-echo ""
-echo "Deserialization:"
-echo "    GitHubUser user = simdjson::from(json);"
-echo ""
-echo "Serialization:"
-echo "    std::string json = simdjson::builder::to_json_string(user);"
-echo ""
-echo "🤯 That's it! Bidirectional JSON handling in TWO lines!"
-echo ""
-echo "Press Enter to compile and run the complete demo..."
-read
-
-# Compile and run serialization demo
-echo "🔨 Compiling serialization demo..."
-clang++ -std=c++26 -freflection -DSIMDJSON_STATIC_REFLECTION=1 \
-    -I../deps/cpr/include -I../deps/cpr/build/cpr_generated_includes \
-    -I../include -I.. github_serialization_demo.cpp ../singleheader/simdjson.cpp \
-    ../deps/cpr/build/lib/libcpr.a -lcurl -pthread -o serialization_demo
-
-echo "✅ Compiled!"
-echo ""
-echo "🏃 Running complete round-trip demo..."
-echo ""
-./serialization_demo
-
-echo ""
-echo "Press Enter to run performance benchmarks..."
-read
-
-clear
-echo "⚡ PERFORMANCE BENCHMARKS"
-echo "========================"
-echo ""
-
-# Compile benchmark
-echo "🔨 Compiling performance benchmark..."
-clang++ -std=c++26 -freflection -O3 -march=native \
-    -DSIMDJSON_STATIC_REFLECTION=1 \
-    -I../include -I.. serialization_benchmark.cpp ../singleheader/simdjson.cpp \
-    -pthread -o serialization_benchmark
-
-echo "✅ Compiled!"
-echo ""
-echo "🏃 Running benchmark..."
-echo ""
-./serialization_benchmark
-
-echo ""
-echo "🎉 Summary:"
-echo "==========="
-echo "• ONE line for deserialization"
-echo "• ONE line for serialization"
-echo "• Works with complex nested structures"
-echo "• Handles optional fields automatically"
-echo "• Type-safe and performant"
-echo "• No manual parsing/building code needed!"
-echo ""
-echo "The future of C++ JSON handling is here! 🚀"
-
-# Cleanup
-rm -f manual_serialization_example.cpp
@@ -1,83 +0,0 @@
-// Legacy approach - manual JSON parsing with simdjson
-#include <simdjson.h>
-#include <cpr/cpr.h>
-#include <iostream>
-#include <string>
-#include <optional>
-
-struct GitHubUser {
-    std::string login;
-    int64_t id;
-    std::string name;
-    std::optional<std::string> company;
-    std::optional<std::string> location;
-    int64_t public_repos;
-    int64_t followers;
-};
-
-// Legacy approach - manual parsing with lots of boilerplate
-GitHubUser parse_github_user(const std::string& json_str) {
-    GitHubUser user;
-    
-    simdjson::ondemand::parser parser;
-    simdjson::padded_string json(json_str);
-    simdjson::ondemand::document doc = parser.iterate(json);
-    
-    // Manual field extraction with error checking
-    user.login = std::string(doc["login"].get_string().value());
-    user.id = doc["id"].get_int64().value();
-    user.name = std::string(doc["name"].get_string().value());
-    
-    // Handle optional fields
-    auto company_result = doc["company"];
-    if (!company_result.is_null()) {
-        user.company = std::string(company_result.get_string().value());
-    }
-    
-    auto location_result = doc["location"];
-    if (!location_result.is_null()) {
-        user.location = std::string(location_result.get_string().value());
-    }
-    
-    user.public_repos = doc["public_repos"].get_int64().value();
-    user.followers = doc["followers"].get_int64().value();
-    
-    return user;
-}
-
-int main() {
-    std::cout << "📚 Legacy Approach - Manual JSON Parsing\n";
-    std::cout << "========================================\n\n";
-    
-    // Fetch data from GitHub API
-    auto response = cpr::Get(
-        cpr::Url{"https://api.github.com/users/lemire"},
-        cpr::Header{{"User-Agent", "simdjson-legacy-demo"}}
-    );
-    
-    if (response.status_code != 200) {
-        std::cerr << "❌ Failed to fetch data: HTTP " << response.status_code << "\n";
-        return 1;
-    }
-    
-    try {
-        // 😓 The old way - manual parsing with lots of code
-        GitHubUser user = parse_github_user(response.text);
-        
-        // Display results
-        std::cout << "GitHub User: " << user.name << " (@" << user.login << ")\n";
-        std::cout << "ID: " << user.id << "\n";
-        if (user.company) std::cout << "Company: " << *user.company << "\n";
-        if (user.location) std::cout << "Location: " << *user.location << "\n";
-        std::cout << "Public Repos: " << user.public_repos << "\n";
-        std::cout << "Followers: " << user.followers << "\n";
-        
-        std::cout << "\n⚠️  Notice all the manual parsing code required!\n";
-        
-    } catch (const simdjson::simdjson_error& e) {
-        std::cerr << "❌ Parsing error: " << e.what() << "\n";
-        return 1;
-    }
-    
-    return 0;
-}
@@ -1,165 +0,0 @@
-// Legacy approach with performance measurement
-#include <simdjson.h>
-#include <cpr/cpr.h>
-#include <iostream>
-#include <string>
-#include <optional>
-#include <chrono>
-#include <iomanip>
-#include <sstream>
-
-struct GitHubUser {
-    std::string login;
-    int64_t id;
-    std::string name;
-    std::optional<std::string> company;
-    std::optional<std::string> location;
-    int64_t public_repos;
-    int64_t followers;
-};
-
-// Manual parsing function (the old way)
-GitHubUser parse_github_user(const std::string& json_str) {
-    GitHubUser user;
-    
-    simdjson::ondemand::parser parser;
-    simdjson::padded_string json(json_str);
-    simdjson::ondemand::document doc = parser.iterate(json);
-    
-    // Manual field extraction with error checking
-    user.login = std::string(doc["login"].get_string().value());
-    user.id = doc["id"].get_int64().value();
-    user.name = std::string(doc["name"].get_string().value());
-    
-    // Handle optional fields
-    auto company_result = doc["company"];
-    if (!company_result.is_null()) {
-        user.company = std::string(company_result.get_string().value());
-    }
-    
-    auto location_result = doc["location"];
-    if (!location_result.is_null()) {
-        user.location = std::string(location_result.get_string().value());
-    }
-    
-    user.public_repos = doc["public_repos"].get_int64().value();
-    user.followers = doc["followers"].get_int64().value();
-    
-    return user;
-}
-
-// Manual serialization function (the old way)
-std::string serialize_github_user(const GitHubUser& user) {
-    std::ostringstream json;
-    json << "{";
-    json << "\"login\":\"" << user.login << "\",";
-    json << "\"id\":" << user.id << ",";
-    json << "\"name\":\"" << user.name << "\",";
-    
-    if (user.company.has_value()) {
-        json << "\"company\":\"" << *user.company << "\",";
-    } else {
-        json << "\"company\":null,";
-    }
-    
-    if (user.location.has_value()) {
-        json << "\"location\":\"" << *user.location << "\",";
-    } else {
-        json << "\"location\":null,";
-    }
-    
-    json << "\"public_repos\":" << user.public_repos << ",";
-    json << "\"followers\":" << user.followers;
-    json << "}";
-    
-    return json.str();
-}
-
-int main() {
-    std::cout << "📚 Legacy Approach - Deserialization Performance Benchmark\n";
-    std::cout << "=========================================================\n\n";
-    
-    // Fetch data from GitHub API
-    auto response = cpr::Get(
-        cpr::Url{"https://api.github.com/users/lemire"},
-        cpr::Header{{"User-Agent", "simdjson-benchmark"}}
-    );
-    
-    if (response.status_code != 200) {
-        std::cerr << "❌ Failed to fetch data: HTTP " << response.status_code << "\n";
-        return 1;
-    }
-    
-    // Warm up
-    for (int i = 0; i < 100; ++i) {
-        auto user = parse_github_user(response.text);
-    }
-    
-    // Benchmark
-    const int iterations = 10000;
-    auto start = std::chrono::high_resolution_clock::now();
-    
-    for (int i = 0; i < iterations; ++i) {
-        auto user = parse_github_user(response.text);
-        // Prevent optimization
-        if (i == 0) {
-            std::cout << "Parsing: " << user.name << " (@" << user.login << ")\n\n";
-        }
-    }
-    
-    auto end = std::chrono::high_resolution_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-    
-    // Calculate performance metrics
-    double time_per_parse = duration.count() / static_cast<double>(iterations);
-    double bytes_per_parse = response.text.size();
-    double gb_per_second = (bytes_per_parse * iterations) / (duration.count() * 1000.0);
-    
-    std::cout << "📊 Deserialization Performance Results:\n";
-    std::cout << "  • JSON size: " << bytes_per_parse << " bytes\n";
-    std::cout << "  • Iterations: " << iterations << "\n";
-    std::cout << "  • Total time: " << duration.count() / 1000.0 << " ms\n";
-    std::cout << "  • Time per deserialization: " << std::fixed << std::setprecision(2) << time_per_parse << " μs\n";
-    std::cout << "  • Deserialization speed: " << std::fixed << std::setprecision(2) << gb_per_second << " GB/s\n";
-    
-    // Now benchmark serialization
-    std::cout << "\n📝 Serialization Performance Benchmark\n";
-    std::cout << "=====================================\n\n";
-    
-    // Parse once to get a user object
-    auto user = parse_github_user(response.text);
-    
-    // Warm up serialization
-    for (int i = 0; i < 100; ++i) {
-        auto json_str = serialize_github_user(user);
-    }
-    
-    // Benchmark serialization
-    start = std::chrono::high_resolution_clock::now();
-    
-    for (int i = 0; i < iterations; ++i) {
-        auto json_str = serialize_github_user(user);
-        // Prevent optimization
-        if (i == 0) {
-            std::cout << "Serialized JSON size: " << json_str.length() << " bytes\n\n";
-        }
-    }
-    
-    end = std::chrono::high_resolution_clock::now();
-    duration = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-    
-    // Calculate serialization performance metrics
-    time_per_parse = duration.count() / static_cast<double>(iterations);
-    double serialized_size = serialize_github_user(user).length();
-    gb_per_second = (serialized_size * iterations) / (duration.count() * 1000.0);
-    
-    std::cout << "📊 Serialization Performance Results:\n";
-    std::cout << "  • JSON size: " << serialized_size << " bytes\n";
-    std::cout << "  • Iterations: " << iterations << "\n";
-    std::cout << "  • Total time: " << duration.count() / 1000.0 << " ms\n";
-    std::cout << "  • Time per serialization: " << std::fixed << std::setprecision(2) << time_per_parse << " μs\n";
-    std::cout << "  • Serialization speed: " << std::fixed << std::setprecision(2) << gb_per_second << " GB/s\n";
-    std::cout << "\n⚠️  Note: Manual serialization with string concatenation\n";
-    
-    return 0;
-}
@@ -1,61 +0,0 @@
-// Modern approach - C++26 reflection with simdjson
-// Compile with Bloomberg clang fork:
-// clang++ -std=c++26 -freflection -DSIMDJSON_STATIC_REFLECTION=1 ...
-#include <simdjson.h>
-#include <simdjson/convert.h>
-#include <cpr/cpr.h>
-#include <iostream>
-#include <string>
-#include <optional>
-
-// 🎯 JUST DECLARE YOUR STRUCT - THAT'S IT!
-// No serialization code needed with C++26 reflection
-struct GitHubUser {
-    std::string login;
-    int64_t id;
-    std::string name;
-    std::optional<std::string> company;
-    std::optional<std::string> location;
-    int64_t public_repos;
-    int64_t followers;
-};
-// NO BOILERPLATE CODE NEEDED! 🎉
-
-int main() {
-    std::cout << "✨ Modern Approach - C++26 Reflection\n";
-    std::cout << "=====================================\n\n";
-    
-    // Fetch data from GitHub API
-    auto response = cpr::Get(
-        cpr::Url{"https://api.github.com/users/lemire"},
-        cpr::Header{{"User-Agent", "simdjson-modern-demo"}}
-    );
-    
-    if (response.status_code != 200) {
-        std::cerr << "❌ Failed to fetch data: HTTP " << response.status_code << "\n";
-        return 1;
-    }
-    
-    try {
-        // ✨ THE MAGIC - Just one line, no boilerplate!
-        // C++26 reflection handles everything automatically
-        GitHubUser user = simdjson::from(simdjson::padded_string(response.text));
-        
-        // Display results
-        std::cout << "GitHub User: " << user.name << " (@" << user.login << ")\n";
-        std::cout << "ID: " << user.id << "\n";
-        if (user.company) std::cout << "Company: " << *user.company << "\n";
-        if (user.location) std::cout << "Location: " << *user.location << "\n";
-        std::cout << "Public Repos: " << user.public_repos << "\n";
-        std::cout << "Followers: " << user.followers << "\n";
-        
-        std::cout << "\n🚀 That's it! No manual parsing code needed!\n";
-        std::cout << "   C++26 reflection generates everything automatically.\n";
-        
-    } catch (const simdjson::simdjson_error& e) {
-        std::cerr << "❌ Parsing error: " << e.what() << "\n";
-        return 1;
-    }
-    
-    return 0;
-}
@@ -1,86 +0,0 @@
-// Modern approach with performance measurement - C++26 reflection
-#include <simdjson.h>
-#include <simdjson/convert.h>
-#include <cpr/cpr.h>
-#include <iostream>
-#include <string>
-#include <optional>
-#include <chrono>
-#include <iomanip>
-#include <sstream>
-
-// Just declare your struct - reflection handles the rest!
-struct GitHubUser {
-    std::string login;
-    int64_t id;
-    std::string name;
-    std::optional<std::string> company;
-    std::optional<std::string> location;
-    int64_t public_repos;
-    int64_t followers;
-};
-
-int main() {
-    std::cout << "✨ Modern Approach - Deserialization Performance Benchmark (C++26)\n";
-    std::cout << "================================================================\n\n";
-    
-    // Fetch data from GitHub API
-    auto response = cpr::Get(
-        cpr::Url{"https://api.github.com/users/lemire"},
-        cpr::Header{{"User-Agent", "simdjson-benchmark"}}
-    );
-    
-    if (response.status_code != 200) {
-        std::cerr << "❌ Failed to fetch data: HTTP " << response.status_code << "\n";
-        return 1;
-    }
-    
-    // Warm up
-    for (int i = 0; i < 100; ++i) {
-        GitHubUser user = simdjson::from(simdjson::padded_string(response.text));
-    }
-    
-    // Benchmark
-    const int iterations = 10000;
-    auto start = std::chrono::high_resolution_clock::now();
-    
-    for (int i = 0; i < iterations; ++i) {
-        GitHubUser user = simdjson::from(simdjson::padded_string(response.text));
-        // Prevent optimization
-        if (i == 0) {
-            std::cout << "Parsing: " << user.name << " (@" << user.login << ")\n\n";
-        }
-    }
-    
-    auto end = std::chrono::high_resolution_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-    
-    // Calculate performance metrics
-    double time_per_parse = duration.count() / static_cast<double>(iterations);
-    double bytes_per_parse = response.text.size();
-    double gb_per_second = (bytes_per_parse * iterations) / (duration.count() * 1000.0);
-    
-    std::cout << "📊 Deserialization Performance Results:\n";
-    std::cout << "  • JSON size: " << bytes_per_parse << " bytes\n";
-    std::cout << "  • Iterations: " << iterations << "\n";
-    std::cout << "  • Total time: " << duration.count() / 1000.0 << " ms\n";
-    std::cout << "  • Time per deserialization: " << std::fixed << std::setprecision(2) << time_per_parse << " μs\n";
-    std::cout << "  • Deserialization speed: " << std::fixed << std::setprecision(2) << gb_per_second << " GB/s\n";
-    
-    std::cout << "\n🚀 Same performance, just ONE line of deserialization code!\n";
-    
-    // Serialization note
-    std::cout << "\n📝 Serialization with Reflection\n";
-    std::cout << "================================\n\n";
-    std::cout << "⚠️  NOTE: simdjson doesn't yet support reflection-based serialization.\n";
-    std::cout << "   The `simdjson::to` function is not yet implemented.\n";
-    std::cout << "   This is a future enhancement that would provide:\n";
-    std::cout << "   • One-line serialization: simdjson::to<std::string>(user)\n";
-    std::cout << "   • Automatic JSON generation from C++ structs\n";
-    std::cout << "   • No manual string building required\n";
-    std::cout << "\n";
-    std::cout << "   For now, serialization still requires manual implementation,\n";
-    std::cout << "   but deserialization is fully automated with reflection! 🎉\n";
-    
-    return 0;
-}
@@ -1,95 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include "simdjson.h"
-#include <cpr/cpr.h>
-
-struct GitHubUser {
-    std::string login;
-    std::optional<std::string> name;
-    std::optional<std::string> company;
-    std::optional<std::string> blog;
-    std::optional<std::string> location;
-    std::optional<std::string> email;
-    std::optional<std::string> bio;
-    int64_t public_repos;
-    int64_t followers;
-    int64_t following;
-};
-
-int main() {
-    std::cout << "🔄 C++26 Reflection: Complete JSON Round-Trip Demo\n";
-    std::cout << "================================================\n\n";
-    
-    // Step 1: Fetch real data from GitHub
-    std::cout << "📡 Fetching GitHub user data...\n";
-    auto response = cpr::Get(cpr::Url{"https://api.github.com/users/simdjson"});
-    
-    if (response.status_code != 200) {
-        std::cerr << "Error: Failed to fetch data\n";
-        return 1;
-    }
-    
-    std::cout << "✅ Received " << response.text.length() << " bytes of JSON\n\n";
-    
-    // Step 2: Deserialize with ONE LINE
-    std::cout << "📥 DESERIALIZATION (JSON → Struct)\n";
-    std::cout << "Code: GitHubUser user = simdjson::from(simdjson::padded_string(response.text));\n\n";
-    
-    GitHubUser user = simdjson::from(simdjson::padded_string(response.text));
-    
-    // Show the data we parsed
-    std::cout << "Parsed data:\n";
-    std::cout << "  • Login: " << user.login << "\n";
-    std::cout << "  • Name: " << (user.name.has_value() ? *user.name : "<not set>") << "\n";
-    std::cout << "  • Company: " << (user.company.has_value() ? *user.company : "<not set>") << "\n";
-    std::cout << "  • Location: " << (user.location.has_value() ? *user.location : "<not set>") << "\n";
-    std::cout << "  • Bio: " << (user.bio.has_value() ? *user.bio : "<not set>") << "\n";
-    std::cout << "  • Repos: " << user.public_repos << "\n";
-    std::cout << "  • Followers: " << user.followers << "\n\n";
-    
-    // Step 3: Modify the data
-    std::cout << "✏️  Modifying data...\n";
-    user.followers += 1000;  // Wishful thinking!
-    user.name = "simdjson - JSON at the speed of light";  // Set a name
-    user.bio = user.bio.value_or("") + " (Now with C++26 reflection!)";
-    std::cout << "  • Added 1000 followers (we can dream!)\n";
-    std::cout << "  • Set organization name\n";
-    std::cout << "  • Updated bio\n\n";
-    
-    // Step 4: Serialize back to JSON with ONE LINE
-    std::cout << "📤 SERIALIZATION (Struct → JSON)\n";
-    std::cout << "Code: std::string json = simdjson::builder::to_json_string(user);\n\n";
-    
-    auto json_result = simdjson::builder::to_json_string(user);
-    if (json_result.error()) {
-        std::cerr << "Serialization error!\n";
-        return 1;
-    }
-    std::string json = json_result.value();
-    
-    std::cout << "Generated JSON (" << json.length() << " bytes):\n";
-    // Pretty print first 200 chars
-    if (json.length() > 200) {
-        std::cout << json.substr(0, 200) << "...\n\n";
-    } else {
-        std::cout << json << "\n\n";
-    }
-    
-    // Step 5: Verify round-trip
-    std::cout << "🔄 ROUND-TRIP VERIFICATION\n";
-    std::cout << "Parsing our generated JSON back...\n";
-    
-    GitHubUser user2 = simdjson::from(simdjson::padded_string(json));
-    
-    std::cout << "✅ Round-trip successful!\n";
-    std::cout << "  • Original followers: " << user.followers << "\n";
-    std::cout << "  • Parsed followers: " << user2.followers << "\n";
-    std::cout << "  • Name set correctly: " << (user2.name.has_value() && *user2.name == *user.name ? "YES" : "NO") << "\n";
-    std::cout << "  • Bio preserved: " << (user2.bio.has_value() ? "YES" : "NO") << "\n\n";
-    
-    std::cout << "🎉 That's it! Two lines of code for complete JSON handling:\n";
-    std::cout << "   • Deserialization: simdjson::from(...)\n";
-    std::cout << "   • Serialization: simdjson::builder::to_json_string(...)\n";
-    
-    return 0;
-}
@@ -20,14 +20,10 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  endif()

  add_quickstart_test(quickstart_noexceptions   quickstart_noexceptions.cpp NO_EXCEPTIONS LABELS acceptance)
-  if(NOT SIMDJSON_STATIC_REFLECTION)
-    add_quickstart_test(quickstart_noexceptions11 quickstart_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11)
-  endif(NOT SIMDJSON_STATIC_REFLECTION)
+  add_quickstart_test(quickstart_noexceptions11 quickstart_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11)

  add_quickstart_test(quickstart2_noexceptions   quickstart2_noexceptions.cpp NO_EXCEPTIONS LABELS acceptance)
-  if(NOT SIMDJSON_STATIC_REFLECTION)
-    add_quickstart_test(quickstart2_noexceptions11 quickstart2_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11)
-  endif(NOT SIMDJSON_STATIC_REFLECTION)
+  add_quickstart_test(quickstart2_noexceptions11 quickstart2_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11)

  # On-Demand Quick Start
  if (SIMDJSON_EXCEPTIONS)
@@ -37,8 +33,6 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  endif()

  add_quickstart_test(quickstart_ondemand_noexceptions   quickstart_ondemand_noexceptions.cpp NO_EXCEPTIONS LABELS quickstart_ondemand acceptance)
-  if(NOT SIMDJSON_STATIC_REFLECTION)
-    add_quickstart_test(quickstart_ondemand_noexceptions11 quickstart_ondemand_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11 LABELS quickstart_ondemand)
-  endif(NOT SIMDJSON_STATIC_REFLECTION)
+  add_quickstart_test(quickstart_ondemand_noexceptions11 quickstart_ondemand_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11 LABELS quickstart_ondemand)

 endif()
@@ -1,86 +0,0 @@
-// Complete JSON Round-Trip Demo with C++26 Reflection
-// Compile with: clang++ -std=c++26 -freflection -DSIMDJSON_STATIC_REFLECTION=1 reflection_roundtrip_demo.cpp ../singleheader/simdjson.cpp -o reflection_roundtrip_demo
-#include <iostream>
-#include <vector>
-#include <optional>
-#include "simdjson.h"
-
-// Define our data structure - just a plain struct!
-struct Product {
-    std::string name;
-    double price;
-    std::vector<std::string> tags;
-    std::optional<std::string> description;
-    bool in_stock;
-};
-
-int main() {
-    std::cout << "🔄 simdjson C++26 Reflection Round-Trip Demo\n";
-    std::cout << "============================================\n\n";
-    
-    // Original JSON data
-    const char* json_data = R"({
-        "name": "High-Performance JSON Parser",
-        "price": 0.0,
-        "tags": ["C++", "performance", "json", "reflection"],
-        "description": "The fastest JSON parser with C++26 reflection support",
-        "in_stock": true
-    })";
-    
-    std::cout << "📄 Original JSON:\n" << json_data << "\n\n";
-    
-    // Step 1: Deserialize JSON to struct with ONE line
-    std::cout << "📥 Deserializing JSON → Struct...\n";
-    Product product = simdjson::from(simdjson::padded_string(json_data));
-    
-    std::cout << "✅ Deserialized successfully!\n";
-    std::cout << "   • Name: " << product.name << "\n";
-    std::cout << "   • Price: $" << product.price << "\n";
-    std::cout << "   • Tags: ";
-    for (const auto& tag : product.tags) {
-        std::cout << tag << " ";
-    }
-    std::cout << "\n   • In stock: " << (product.in_stock ? "Yes" : "No") << "\n\n";
-    
-    // Step 2: Modify the data
-    std::cout << "✏️  Modifying data...\n";
-    product.price = 99.99;  // It's worth something now!
-    product.tags.push_back("C++26");
-    product.description = "Now with serialization support!";
-    std::cout << "   • Changed price to $99.99\n";
-    std::cout << "   • Added 'C++26' tag\n";
-    std::cout << "   • Updated description\n\n";
-    
-    // Step 3: Serialize struct back to JSON with ONE line
-    std::cout << "📤 Serializing Struct → JSON...\n";
-    auto json_result = simdjson::builder::to_json_string(product);
-    
-    if (json_result.error()) {
-        std::cerr << "❌ Serialization failed!\n";
-        return 1;
-    }
-    
-    std::string new_json = json_result.value();
-    std::cout << "✅ Serialized successfully!\n\n";
-    
-    std::cout << "📄 Generated JSON:\n" << new_json << "\n\n";
-    
-    // Step 4: Verify round-trip by parsing again
-    std::cout << "🔍 Verifying round-trip...\n";
-    Product product2 = simdjson::from(simdjson::padded_string(new_json));
-    
-    std::cout << "✅ Round-trip successful!\n";
-    std::cout << "   • Price preserved: $" << product2.price << "\n";
-    std::cout << "   • New tag present: " 
-              << (std::find(product2.tags.begin(), product2.tags.end(), "C++26") != product2.tags.end() ? "Yes" : "No") 
-              << "\n";
-    std::cout << "   • Description updated: " << (product2.description.has_value() ? "Yes" : "No") << "\n\n";
-    
-    std::cout << "🎉 That's it! Complete JSON handling in just 2 lines:\n";
-    std::cout << "   • Deserialize: auto obj = simdjson::from(json);\n";
-    std::cout << "   • Serialize: auto json = simdjson::builder::to_json_string(obj);\n\n";
-    
-    std::cout << "⚡ No manual parsing, no boilerplate, just pure C++26 magic!\n";
-    
-    return 0;
-}
@@ -1,85 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include <chrono>
-#include "simdjson.h"
-#include <map>
-
-struct TestData {
-    std::string name;
-    std::vector<int> numbers;
-    std::map<std::string, double> metrics;
-    bool active;
-    std::optional<std::string> description;
-};
-
-int main() {
-    std::cout << "⚡ Serialization Performance Benchmark\n";
-    std::cout << "=====================================\n\n";
-    
-    // Create test data
-    TestData data{
-        .name = "Performance Test",
-        .numbers = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
-        .metrics = {{"latency", 1.23}, {"throughput", 456.78}, {"cpu", 89.01}},
-        .active = true,
-        .description = "Testing reflection-based serialization performance"
-    };
-    
-    const int iterations = 100000;
-    
-    // Benchmark serialization
-    std::cout << "📤 Benchmarking serialization (" << iterations << " iterations)...\n";
-    
-    auto start = std::chrono::high_resolution_clock::now();
-    
-    std::string json;
-    for (int i = 0; i < iterations; i++) {
-        auto result = simdjson::builder::to_json_string(data);
-        if (i == 0 && !result.error()) {
-            json = result.value();
-        }
-    }
-    
-    auto end = std::chrono::high_resolution_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-    
-    std::cout << "\nResults:\n";
-    std::cout << "  • Generated JSON size: " << json.length() << " bytes\n";
-    std::cout << "  • Total time: " << duration.count() / 1000.0 << " ms\n";
-    
-    double time_per_iteration_us = duration.count() / double(iterations);
-    double time_per_iteration_s = time_per_iteration_us / 1000000.0;
-    double bytes_per_second = json.length() / time_per_iteration_s;
-    double mb_per_second = bytes_per_second / (1024.0 * 1024.0);
-    
-    std::cout << "  • Time per serialization: " << std::fixed << std::setprecision(2) << time_per_iteration_us << " μs\n";
-    std::cout << "  • Throughput: " << std::fixed << std::setprecision(2) << mb_per_second << " MB/s\n";
-    
-    std::cout << "\nGenerated JSON:\n" << json << "\n\n";
-    
-    // Benchmark deserialization for comparison
-    std::cout << "📥 Benchmarking deserialization (for comparison)...\n";
-    
-    simdjson::padded_string padded_json(json);
-    start = std::chrono::high_resolution_clock::now();
-    
-    for (int i = 0; i < iterations; i++) {
-        TestData parsed = simdjson::from(padded_json);
-    }
-    
-    end = std::chrono::high_resolution_clock::now();
-    duration = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-    
-    std::cout << "\nResults:\n";
-    time_per_iteration_us = duration.count() / double(iterations);
-    time_per_iteration_s = time_per_iteration_us / 1000000.0;
-    bytes_per_second = json.length() / time_per_iteration_s;
-    mb_per_second = bytes_per_second / (1024.0 * 1024.0);
-    
-    std::cout << "  • Time per deserialization: " << std::fixed << std::setprecision(2) << time_per_iteration_us << " μs\n";
-    std::cout << "  • Throughput: " << std::fixed << std::setprecision(2) << mb_per_second << " MB/s\n";
-    
-    std::cout << "\n✅ Both serialization and deserialization work with reflection!\n";
-    
-    return 0;
-}
@@ -53,5 +53,4 @@

 #include "simdjson/dom.h"
 #include "simdjson/ondemand.h"
-#include "simdjson/convert.h"
 #endif // SIMDJSON_H
@@ -134,12 +134,6 @@ namespace {
      tmp = vpaddq_u8(tmp, tmp);
      return vgetq_lane_u16(vreinterpretq_u16_u8(tmp), 0);
    }
-    // Returns 4-bit out of each byte, alternating between the high 4 bits and low
-    // bits result it is 64 bit.
-    simdjson_inline uint64_t to_bitmask64() const {
-      return vget_lane_u64(
-          vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(*this), 4)), 0);
-    }
    simdjson_inline bool any() const { return vmaxvq_u32(vreinterpretq_u32_u8(*this)) != 0; }
  };

@@ -216,7 +210,7 @@ namespace {

    // Bit-specific operations
    simdjson_inline simd8<bool> any_bits_set(simd8<uint8_t> bits) const { return vtstq_u8(*this, bits); }
-    simdjson_inline bool any_bits_set_anywhere() const { return vmaxvq_u32(vreinterpretq_u32_u8(*this)) != 0; }
+    simdjson_inline bool any_bits_set_anywhere() const { return this->max_val() != 0; }
    simdjson_inline bool any_bits_set_anywhere(simd8<uint8_t> bits) const { return (*this & bits).any_bits_set_anywhere(); }
    template<int N>
    simdjson_inline simd8<uint8_t> shr() const { return vshrq_n_u8(*this, N); }
@@ -229,12 +223,7 @@ namespace {
      return lookup_table.apply_lookup_16_to(*this);
    }

-    // Returns 4-bit out of each byte, alternating between the high 4 bits and low
-    // bits result it is 64 bit.
-    simdjson_inline uint64_t to_bitmask64() const {
-      return vget_lane_u64(
-          vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(*this), 4)), 0);
-    }
+
    // Copies to 'output" all bytes corresponding to a 0 in the mask (interpreted as a bitset).
    // Passing a 0 value for mask would be equivalent to writing out every byte to output.
    // Only the first 16 - count_ones(mask) bytes of the result are significant but 16 bytes
@@ -46,32 +46,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits) / 4; }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    (is_backslash | is_quote | is_control).to_bitmask64()
-  };
-}
-
-
-
 } // unnamed namespace
 } // namespace arm64
 } // namespace simdjson
@@ -199,6 +199,17 @@ double from_chars(const char *first, const char* end) noexcept;
    // We assume by default static linkage
    #define SIMDJSON_DLLIMPORTEXPORT
    #endif
+
+/**
+ * Workaround for the vcpkg package manager. Only vcpkg should
+ * ever touch the next line. The SIMDJSON_USING_LIBRARY macro is otherwise unused.
+ */
+#if SIMDJSON_USING_LIBRARY
+#define SIMDJSON_DLLIMPORTEXPORT __declspec(dllimport)
+#endif
+/**
+ * End of workaround for the vcpkg package manager.
+ */
 #else
    #define SIMDJSON_DLLIMPORTEXPORT
 #endif
@@ -345,16 +356,4 @@ namespace std {
 #define SIMDJSON_AVX512_ALLOWED 1
 #endif

-
-#ifndef __has_cpp_attribute
-#define simdjson_lifetime_bound
-#elif __has_cpp_attribute(msvc::lifetimebound)
-#define simdjson_lifetime_bound [[msvc::lifetimebound]]
-#elif __has_cpp_attribute(clang::lifetimebound)
-#define simdjson_lifetime_bound [[clang::lifetimebound]]
-#elif __has_cpp_attribute(lifetimebound)
-#define simdjson_lifetime_bound [[lifetimebound]]
-#else
-#define simdjson_lifetime_bound
-#endif
 #endif // SIMDJSON_COMMON_DEFS_H
@@ -50,31 +50,12 @@
 #endif
 #endif

-#ifndef SIMDJSON_CONSTEXPR_LAMBDA
-#if SIMDJSON_CPLUSPLUS17
-#define SIMDJSON_CONSTEXPR_LAMBDA constexpr
-#else
-#define SIMDJSON_CONSTEXPR_LAMBDA
-#endif
-#endif
-
-
-
 #ifdef __has_include
 #if __has_include(<version>)
 #include <version>
 #endif
 #endif

-// The current specification is unclear on how we detect
-// static reflection, both __cpp_lib_reflection and
-// __cpp_impl_reflection are proposed in the draft specification.
-// For now, we disable static reflect by default. It must be
-// specified at compiler time.
-#ifndef SIMDJSON_STATIC_REFLECTION
-#define SIMDJSON_STATIC_REFLECTION 0 // disabled by default.
-#endif
-
 #if defined(__apple_build_version__)
 #if __apple_build_version__ < 14000000
 #define SIMDJSON_CONCEPT_DISABLED 1 // apple-clang/13 doesn't support std::convertible_to
@@ -93,12 +74,4 @@
 #define SIMDJSON_SUPPORTS_DESERIALIZATION 0
 #endif // defined(__cpp_concepts) && !defined(SIMDJSON_CONCEPT_DISABLED)

-#if !defined(SIMDJSON_CONSTEVAL)
-#if defined(__cpp_consteval) && __cpp_consteval >= 201811L
-#define SIMDJSON_CONSTEVAL 1
-#else
-#define SIMDJSON_CONSTEVAL 0
-#endif // defined(__cpp_consteval) && __cpp_consteval >= 201811L
-#endif // !defined(SIMDJSON_CONSTEVAL)
-
 #endif // SIMDJSON_COMPILER_CHECK_H
@@ -115,6 +115,7 @@ concept optional_type = requires(std::remove_cvref_t<T> obj) {
  { obj.value() } -> std::same_as<typename std::remove_cvref_t<T>::value_type&>;
  requires requires(typename std::remove_cvref_t<T>::value_type &&val) {
    obj.emplace(std::move(val));
+    obj = std::move(val);
    {
      obj.value_or(val)
    } -> std::convertible_to<typename std::remove_cvref_t<T>::value_type>;
@@ -1,307 +0,0 @@
-#ifndef SIMDJSON_CONVERT_H
-#define SIMDJSON_CONVERT_H
-#if __cpp_concepts
-
-#include "simdjson/ondemand.h"
-#include <optional>
-#ifdef __cpp_lib_ranges
-#include <ranges>
-#endif
-
-namespace simdjson {
-
-struct [[nodiscard]] auto_iterator_end {};
-
-/**
- * A Wrapper for simdjson_result<ondemand::array_iterator> in order to make it
- * compatible with ranges (to satisfy std::ranges::input_range).
- */
-struct [[nodiscard]] auto_iterator {
-  using iterator_category = std::forward_iterator_tag;
-  using type = simdjson_result<ondemand::array_iterator>;
-  using value_type = simdjson_result<ondemand::value>; // type::value_type
-  using reference = value_type &;
-  using const_reference = const value_type &;
-  using difference_type = std::ptrdiff_t;
-
-  struct auto_iterator_storage {
-    type m_iter{};
-    mutable value_type m_value{};
-  };
-
-private:
-  auto_iterator_storage *m_storage = nullptr;
-
-public:
-  constexpr auto_iterator() noexcept = default;
-  explicit auto_iterator(auto_iterator_storage &storage) noexcept
-      : m_storage{&storage} {};
-  auto_iterator(auto_iterator const &) = default;
-  auto_iterator(auto_iterator &&) = default;
-  auto_iterator &operator=(auto_iterator const &) = default;
-  auto_iterator &operator=(auto_iterator &&) noexcept = default;
-  ~auto_iterator() = default;
-
-  reference operator*() const noexcept { return m_storage->m_value; }
-  reference operator*() noexcept { return m_storage->m_value; }
-
-  auto_iterator &operator++() noexcept {
-    ++m_storage->m_iter;
-    m_storage->m_value =
-        m_storage->m_iter.at_end() || m_storage->m_iter.error() != SUCCESS
-            ? value_type{}
-            : *m_storage->m_iter;
-    return *this;
-  }
-  auto_iterator operator++(int) noexcept {
-    auto_iterator const tmp = *this;
-    operator++();
-    return tmp;
-  }
-
-  [[nodiscard]] bool operator==(auto_iterator const &other) const noexcept {
-    return m_storage == other.m_storage &&
-           m_storage->m_iter == other.m_storage->m_iter;
-  }
-
-  [[nodiscard]] bool operator==(auto_iterator_end) const noexcept {
-    return m_storage != nullptr && m_storage->m_iter.at_end();
-  }
-};
-
-template <typename ParserType = ondemand::parser>
-struct [[nodiscard]] auto_parser
-#if __cpp_lib_ranges
-    : std::ranges::view_interface<auto_parser<ParserType>>
-#endif
-{
-  using value_type = simdjson_result<ondemand::value>;
-  using size_type = size_t;
-  using difference_type = std::ptrdiff_t;
-  using pointer = value_type *;
-  using const_pointer = const value_type *;
-  using reference = value_type &;
-  using const_reference = const value_type &;
-  using iterator = auto_iterator;
-  using const_iterator = auto_iterator; // auto_iterator is already const
-
-private:
-  ParserType m_parser;
-  ondemand::document m_doc;
-  error_code m_error{SUCCESS};
-
-  // Caching the iterator here:
-  iterator::auto_iterator_storage iter_storage{};
-
-  template <typename T>
-  static constexpr bool is_nothrow_gettable = requires(ondemand::document doc) {
-    { doc.get<T>() } noexcept;
-  };
-
-public:
-  // non-pointer constructors:
-  explicit auto_parser(ParserType &&parser, ondemand::document &&doc) noexcept
-    requires(!std::is_pointer_v<ParserType>)
-      : m_parser{std::move(parser)}, m_doc{std::move(doc)} {}
-
-  explicit auto_parser(ParserType &&parser,
-                       padded_string_view const str) noexcept
-    requires(!std::is_pointer_v<ParserType>)
-      : m_parser{std::move(parser)}, m_doc{}, m_error{SUCCESS} {
-    m_error = m_parser.iterate(str).get(m_doc);
-  }
-
-  explicit auto_parser(padded_string_view const str) noexcept
-    requires(!std::is_pointer_v<ParserType>)
-      : auto_parser{ParserType{}, str} {}
-
-  // pointer constructors:
-  explicit auto_parser(std::remove_pointer_t<ParserType> &parser,
-                       ondemand::document &&doc) noexcept
-    requires(std::is_pointer_v<ParserType>)
-      : m_parser{&parser}, m_doc{std::move(doc)} {}
-
-  explicit auto_parser(std::remove_pointer_t<ParserType> &parser,
-                       padded_string_view const str) noexcept
-    requires(std::is_pointer_v<ParserType>)
-      : m_parser{&parser}, m_doc{}, m_error{SUCCESS} {
-    m_error = m_parser->iterate(str).get(m_doc);
-  }
-
-  explicit auto_parser(ParserType parser, ondemand::document &&doc) noexcept
-    requires(std::is_pointer_v<ParserType>)
-      : auto_parser{*parser, std::move(doc)} {}
-
-  auto_parser(auto_parser const &) = delete;
-  auto_parser &operator=(auto_parser const &) = delete;
-  auto_parser(auto_parser &&) noexcept = default;
-  auto_parser &operator=(auto_parser &&) noexcept = default;
-  ~auto_parser() = default;
-
-  /// Get the parser
-  [[nodiscard]] std::remove_pointer_t<ParserType> &parser() noexcept {
-    if constexpr (std::is_pointer_v<ParserType>) {
-      return *m_parser;
-    } else {
-      return m_parser;
-    }
-  }
-
-  template <typename T>
-  [[nodiscard]] simdjson_inline simdjson_result<T>
-  result() noexcept(is_nothrow_gettable<T>) {
-    if (m_error != SUCCESS) {
-      return m_error;
-    }
-    // For array and object types, we need to be at the start of the document
-    return m_doc.get<T>();
-  }
-
-  [[nodiscard]] simdjson_inline simdjson_result<ondemand::array>
-  array() noexcept {
-    return result<ondemand::array>();
-  }
-
-  [[nodiscard]] simdjson_inline simdjson_result<ondemand::object>
-  object() noexcept {
-    return result<ondemand::object>();
-  }
-
-  [[nodiscard]] simdjson_inline simdjson_result<ondemand::number>
-  number() noexcept {
-    return result<ondemand::number>();
-  }
-
-  template <typename T>
-  [[nodiscard]] simdjson_inline explicit(false)
-  operator simdjson_result<T>() noexcept(is_nothrow_gettable<T>) {
-    return result<T>();
-  }
-
-  template <typename T>
-  [[nodiscard]] simdjson_inline explicit(false) operator T() noexcept(false) {
-    if (m_error != SUCCESS) {
-      throw simdjson_error(m_error);
-    }
-    return m_doc.get<T>();
-  }
-
-  // We can't have "operator std::optional<T>" because it would create an
-  // ambiguity for the compiler.
-  // We also cannot have "operator T*" without manual memory management.
-  // We also cannot have "operator T&" without manual memory management either.
-
-  template <typename T>
-  [[nodiscard]] simdjson_inline std::optional<T>
-  optional() noexcept(is_nothrow_gettable<T>) {
-    if (m_error != SUCCESS) {
-      return std::nullopt;
-    }
-    T value;
-    // For std::optional<T>
-    if (m_doc.get<T>().get(value)) [[unlikely]] {
-      return std::nullopt;
-    }
-    return {std::move(value)};
-  }
-
-  simdjson_inline auto_iterator begin() noexcept {
-    if (m_error != SUCCESS) {
-      // Create an iterator with the error
-      iter_storage.m_iter = iterator::type(m_error);
-      iter_storage.m_value = value_type{};
-      return auto_iterator{iter_storage};
-    }
-    if (iter_storage.m_iter.error() != SUCCESS &&
-        !iter_storage.m_iter.at_end()) {
-      // Try to get the document as an array
-      ondemand::array arr;
-      if(auto error = m_doc.get_array().get(arr); error == SUCCESS) {
-        iter_storage = {.m_iter = iterator::type{arr.begin()},
-                        .m_value = iterator::value_type{
-                            iter_storage.m_iter.at_end() ||
-                                    iter_storage.m_iter.error() != SUCCESS
-                                ? value_type{}
-                                : *iter_storage.m_iter}};
-      } else {
-        // If it's not an array, create an error iterator
-        iter_storage.m_iter = iterator::type(error);
-        iter_storage.m_value = value_type{};
-      }
-    }
-    return auto_iterator{iter_storage};
-  }
-  simdjson_inline auto_iterator_end end() noexcept { return {}; }
-};
-
-#ifdef __cpp_lib_ranges
-
-// For C++20, we implement our own pipe operator since range_adaptor_closure is C++23
-static constexpr struct [[nodiscard]] no_errors_adaptor {
-
-  [[nodiscard]] bool
-  operator()(simdjson_result<ondemand::value> const &val) const noexcept {
-    return val.error() == SUCCESS;
-  }
-
-  template <std::ranges::range Range>
-  auto operator()(Range &&rng) const noexcept {
-    return std::forward<Range>(rng) | std::views::filter(*this);
-  }
-} no_errors;
-
-template <typename T = void>
-struct [[nodiscard]] to_adaptor {
-
-  /// Convert to T
-  [[nodiscard]] T
-  operator()(simdjson_result<ondemand::value> &val) const noexcept {
-    return val.get<T>();
-  }
-
-  /// Make it an adaptor
-  template <std::ranges::range Range>
-  auto operator()(Range &&rng) const noexcept {
-    return std::forward<Range>(rng) | no_errors | std::views::transform(*this);
-  }
-
-  /**
-   * Parse input string into any object if possible.
-   */
-  auto operator()(padded_string_view const str) const noexcept {
-    return auto_parser{str};
-  }
-
-  /**
-   * Parse the input using the specified parser into any object if possible.
-   */
-  auto operator()(ondemand::parser &parser,
-                            padded_string_view const str) const noexcept {
-    return auto_parser<ondemand::parser *>{parser, str};
-  }
-};
-
-template <typename T> static constexpr to_adaptor<T> to{};
-
-static constexpr to_adaptor<> from{};
-
-template <typename T = void>
-using as = to_adaptor<T>;
-
-// For C++20 ranges without range_adaptor_closure, we need to define pipe operators
-template <std::ranges::range Range>
-inline auto operator|(Range&& range, const no_errors_adaptor& adaptor) {
-  return adaptor(std::forward<Range>(range));
-}
-
-template <std::ranges::range Range, typename T>
-inline auto operator|(Range&& range, const to_adaptor<T>& adaptor) {
-  return adaptor(std::forward<Range>(range));
-}
-
-#endif // __cpp_lib_ranges
-
-} // namespace simdjson
-
-#endif // __cpp_concepts
-#endif // SIMDJSON_CONVERT_H
@@ -3,8 +3,8 @@
 #define SIMDJSON_SERIALIZATION_INL_H

 #include "simdjson/dom/base.h"
-#include "simdjson/dom/parser.h"
 #include "simdjson/dom/serialization.h"
+#include "simdjson/dom/parser.h"
 #include "simdjson/internal/tape_type.h"

 #include "simdjson/dom/array-inl.h"
@@ -16,9 +16,7 @@
 namespace simdjson {
 namespace dom {
 inline bool parser::print_json(std::ostream &os) const noexcept {
-  if (!valid) {
-    return false;
-  }
+  if (!valid) { return false; }
  simdjson::internal::string_builder<> sb;
  sb.append(doc.root());
  std::string_view answer = sb.str();
@@ -26,51 +24,37 @@ inline bool parser::print_json(std::ostream &os) const noexcept {
  return true;
 }

-inline std::ostream &operator<<(std::ostream &out,
-                                simdjson::dom::element value) {
-  simdjson::internal::string_builder<> sb;
-  sb.append(value);
-  return (out << sb.str());
+inline std::ostream& operator<<(std::ostream& out, simdjson::dom::element value) {
+    simdjson::internal::string_builder<> sb;
+    sb.append(value);
+    return (out << sb.str());
 }
 #if SIMDJSON_EXCEPTIONS
-inline std::ostream &
-operator<<(std::ostream &out,
-           simdjson::simdjson_result<simdjson::dom::element> x) {
-  if (x.error()) {
-    throw simdjson::simdjson_error(x.error());
-  }
-  return (out << x.value());
+inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result<simdjson::dom::element> x) {
+    if (x.error()) { throw simdjson::simdjson_error(x.error()); }
+    return (out << x.value());
 }
 #endif
-inline std::ostream &operator<<(std::ostream &out, simdjson::dom::array value) {
-  simdjson::internal::string_builder<> sb;
-  sb.append(value);
-  return (out << sb.str());
+inline std::ostream& operator<<(std::ostream& out, simdjson::dom::array value)  {
+    simdjson::internal::string_builder<> sb;
+    sb.append(value);
+    return (out << sb.str());
 }
 #if SIMDJSON_EXCEPTIONS
-inline std::ostream &
-operator<<(std::ostream &out,
-           simdjson::simdjson_result<simdjson::dom::array> x) {
-  if (x.error()) {
-    throw simdjson::simdjson_error(x.error());
-  }
-  return (out << x.value());
+inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result<simdjson::dom::array> x) {
+    if (x.error()) { throw simdjson::simdjson_error(x.error()); }
+    return (out << x.value());
 }
 #endif
-inline std::ostream &operator<<(std::ostream &out,
-                                simdjson::dom::object value) {
-  simdjson::internal::string_builder<> sb;
-  sb.append(value);
-  return (out << sb.str());
+inline std::ostream& operator<<(std::ostream& out, simdjson::dom::object value)   {
+    simdjson::internal::string_builder<> sb;
+    sb.append(value);
+    return (out << sb.str());
 }
 #if SIMDJSON_EXCEPTIONS
-inline std::ostream &
-operator<<(std::ostream &out,
-           simdjson::simdjson_result<simdjson::dom::object> x) {
-  if (x.error()) {
-    throw simdjson::simdjson_error(x.error());
-  }
-  return (out << x.value());
+inline std::ostream& operator<<(std::ostream& out,  simdjson::simdjson_result<simdjson::dom::object> x) {
+    if (x.error()) { throw  simdjson::simdjson_error(x.error()); }
+    return (out << x.value());
 }
 #endif

@@ -85,9 +69,8 @@ namespace {
 * We expect that most compilers will use 8 bytes for this data structure.
 **/
 struct escape_sequence {
-  uint8_t length;
-  const char
-      string[7]; // technically, we only ever need 6 characters, we pad to 8
+    uint8_t length;
+    const char string[7]; // technically, we only ever need 6 characters, we pad to 8
 };
 /**@private
 * This converts a signed integer into a character sequence.
@@ -103,7 +86,7 @@ static char *fast_itoa(char *output, int64_t value) noexcept {
  char buffer[20];
  uint64_t value_positive;
  // In general, negating a signed integer is unsafe.
-  if (value < 0) {
+  if(value < 0) {
    *output++ = '-';
    // Doing value_positive = -value; while avoiding
    // undefined behavior warnings.
@@ -122,7 +105,7 @@ static char *fast_itoa(char *output, int64_t value) noexcept {
  // A faster approach is possible if we expect large integers:
  // unroll the loop (work in 100s, 1000s) and use some kind of
  // memoization.
-  while (value_positive >= 10) {
+  while(value_positive >= 10) {
    *write_pointer-- = char('0' + (value_positive % 10));
    value_positive /= 10;
  }
@@ -148,7 +131,7 @@ static char *fast_itoa(char *output, uint64_t value) noexcept {
  // A faster approach is possible if we expect large integers:
  // unroll the loop (work in 100s, 1000s) and use some kind of
  // memoization.
-  while (value >= 10) {
+  while(value >= 10) {
    *write_pointer-- = char('0' + (value % 10));
    value /= 10;
  };
@@ -158,6 +141,7 @@ static char *fast_itoa(char *output, uint64_t value) noexcept {
  return output + len;
 }

+
 } // anonymous namespace
 namespace internal {

@@ -165,208 +149,193 @@ namespace internal {
 * Minifier/formatter code.
 **/

-template <class formatter>
+template<class formatter>
 simdjson_inline void base_formatter<formatter>::number(uint64_t x) {
  char number_buffer[24];
  char *newp = fast_itoa(number_buffer, x);
-  chars(number_buffer, newp);
+  buffer.insert(buffer.end(), number_buffer, newp);
 }

-template <class formatter>
+template<class formatter>
 simdjson_inline void base_formatter<formatter>::number(int64_t x) {
  char number_buffer[24];
  char *newp = fast_itoa(number_buffer, x);
-  chars(number_buffer, newp);
+  buffer.insert(buffer.end(), number_buffer, newp);
 }

-template <class formatter>
+template<class formatter>
 simdjson_inline void base_formatter<formatter>::number(double x) {
  char number_buffer[24];
  // Currently, passing the nullptr to the second argument is
  // safe because our implementation does not check the second
  // argument.
  char *newp = internal::to_chars(number_buffer, nullptr, x);
-  chars(number_buffer, newp);
+  buffer.insert(buffer.end(), number_buffer, newp);
 }

-template <class formatter>
-simdjson_inline void base_formatter<formatter>::start_array() {
-  one_char('[');
-}
+template<class formatter>
+simdjson_inline void base_formatter<formatter>::start_array() { one_char('['); }

-template <class formatter>
-simdjson_inline void base_formatter<formatter>::end_array() {
-  one_char(']');
-}

-template <class formatter>
-simdjson_inline void base_formatter<formatter>::start_object() {
-  one_char('{');
-}
+template<class formatter>
+simdjson_inline void base_formatter<formatter>::end_array() { one_char(']'); }

-template <class formatter>
-simdjson_inline void base_formatter<formatter>::end_object() {
-  one_char('}');
-}
+template<class formatter>
+simdjson_inline void base_formatter<formatter>::start_object() { one_char('{'); }

-template <class formatter>
-simdjson_inline void base_formatter<formatter>::comma() {
-  one_char(',');
-}
+template<class formatter>
+simdjson_inline void base_formatter<formatter>::end_object() { one_char('}'); }

-template <class formatter>
+template<class formatter>
+simdjson_inline void base_formatter<formatter>::comma() { one_char(','); }
+
+template<class formatter>
 simdjson_inline void base_formatter<formatter>::true_atom() {
-  const char *s = "true";
-  chars(s, s + 4);
+  const char * s = "true";
+  buffer.insert(buffer.end(), s, s + 4);
 }

-template <class formatter>
+template<class formatter>
 simdjson_inline void base_formatter<formatter>::false_atom() {
-  const char *s = "false";
-  chars(s, s + 5);
+  const char * s = "false";
+  buffer.insert(buffer.end(), s, s + 5);
 }

-template <class formatter>
+template<class formatter>
 simdjson_inline void base_formatter<formatter>::null_atom() {
-  const char *s = "null";
-  chars(s, s + 4);
+  const char * s = "null";
+  buffer.insert(buffer.end(), s, s + 4);
 }

-template <class formatter>
-simdjson_inline void base_formatter<formatter>::one_char(char c) {
-  buffer.push_back(c);
-}
+template<class formatter>
+simdjson_inline void base_formatter<formatter>::one_char(char c) { buffer.push_back(c); }

-template <class formatter>
-simdjson_inline void base_formatter<formatter>::chars(const char *begin,
-                                                      const char *end) {
-  buffer.append(begin, end);
-}
-
-template <class formatter>
-simdjson_inline void
-base_formatter<formatter>::key(std::string_view unescaped) {
+template<class formatter>
+simdjson_inline void base_formatter<formatter>::key(std::string_view unescaped) {
  string(unescaped);
  one_char(':');
 }

-template <class formatter>
-simdjson_inline void
-base_formatter<formatter>::string(std::string_view unescaped) {
+template<class formatter>
+simdjson_inline void base_formatter<formatter>::string(std::string_view unescaped) {
  one_char('\"');
  size_t i = 0;
-  // Fast path for the case where we have no control character, no ", and no
-  // backslash. This should include most keys.
+  // Fast path for the case where we have no control character, no ", and no backslash.
+  // This should include most keys.
  //
-  // We would like to use 'bool' but some compilers take offense to bitwise
-  // operation with bool types.
-  constexpr static char needs_escaping[] = {
-      1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-      1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-  for (; i + 8 <= unescaped.length(); i += 8) {
+  // We would like to use 'bool' but some compilers take offense to bitwise operation
+  // with bool types.
+  constexpr static char needs_escaping[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+  for(;i + 8 <= unescaped.length(); i += 8) {
    // Poor's man vectorization. This could get much faster if we used SIMD.
    //
-    // It is not the case that replacing '|' with '||' would be neutral
-    // performance-wise.
-    if (needs_escaping[uint8_t(unescaped[i])] |
-        needs_escaping[uint8_t(unescaped[i + 1])] |
-        needs_escaping[uint8_t(unescaped[i + 2])] |
-        needs_escaping[uint8_t(unescaped[i + 3])] |
-        needs_escaping[uint8_t(unescaped[i + 4])] |
-        needs_escaping[uint8_t(unescaped[i + 5])] |
-        needs_escaping[uint8_t(unescaped[i + 6])] |
-        needs_escaping[uint8_t(unescaped[i + 7])]) {
-      break;
-    }
+    // It is not the case that replacing '|' with '||' would be neutral performance-wise.
+    if(needs_escaping[uint8_t(unescaped[i])] | needs_escaping[uint8_t(unescaped[i+1])]
+      | needs_escaping[uint8_t(unescaped[i+2])] | needs_escaping[uint8_t(unescaped[i+3])]
+      | needs_escaping[uint8_t(unescaped[i+4])] | needs_escaping[uint8_t(unescaped[i+5])]
+      | needs_escaping[uint8_t(unescaped[i+6])] | needs_escaping[uint8_t(unescaped[i+7])]
+      ) { break; }
  }
-  for (; i < unescaped.length(); i++) {
-    if (needs_escaping[uint8_t(unescaped[i])]) {
-      break;
-    }
+  for(;i < unescaped.length(); i++) {
+    if(needs_escaping[uint8_t(unescaped[i])]) { break; }
  }
-  // The following is also possible and omits a 256-byte table, but it is
-  // slower: for (; (i < unescaped.length()) && (uint8_t(unescaped[i]) > 0x1F)
+  // The following is also possible and omits a 256-byte table, but it is slower:
+  // for (; (i < unescaped.length()) && (uint8_t(unescaped[i]) > 0x1F)
  //      && (unescaped[i] != '\"') && (unescaped[i] != '\\'); i++) {}

  // At least for long strings, the following should be fast. We could
  // do better by integrating the checks and the insertion.
-  chars(unescaped.data(), unescaped.data() + i);
+  buffer.insert(buffer.end(), unescaped.data(), unescaped.data() + i);
  // We caught a control character if we enter this loop (slow).
  // Note that we are do not restart from the beginning, but rather we continue
  // from the point where we encountered something that requires escaping.
  for (; i < unescaped.length(); i++) {
    switch (unescaped[i]) {
-    case '\"': {
-      const char *s = "\\\"";
-      chars(s, s + 2);
-    } break;
-    case '\\': {
-      const char *s = "\\\\";
-      chars(s, s + 2);
-    } break;
+    case '\"':
+      {
+        const char * s = "\\\"";
+        buffer.insert(buffer.end(), s, s + 2);
+      }
+      break;
+    case '\\':
+      {
+        const char * s = "\\\\";
+        buffer.insert(buffer.end(), s, s + 2);
+      }
+      break;
    default:
      if (uint8_t(unescaped[i]) <= 0x1F) {
        // If packed, this uses 8 * 32 bytes.
        // Note that we expect most compilers to embed this code in the data
        // section.
        constexpr static escape_sequence escaped[32] = {
-            {6, "\\u0000"}, {6, "\\u0001"}, {6, "\\u0002"}, {6, "\\u0003"},
-            {6, "\\u0004"}, {6, "\\u0005"}, {6, "\\u0006"}, {6, "\\u0007"},
-            {2, "\\b"},     {2, "\\t"},     {2, "\\n"},     {6, "\\u000b"},
-            {2, "\\f"},     {2, "\\r"},     {6, "\\u000e"}, {6, "\\u000f"},
-            {6, "\\u0010"}, {6, "\\u0011"}, {6, "\\u0012"}, {6, "\\u0013"},
-            {6, "\\u0014"}, {6, "\\u0015"}, {6, "\\u0016"}, {6, "\\u0017"},
-            {6, "\\u0018"}, {6, "\\u0019"}, {6, "\\u001a"}, {6, "\\u001b"},
-            {6, "\\u001c"}, {6, "\\u001d"}, {6, "\\u001e"}, {6, "\\u001f"}};
+          {6, "\\u0000"}, {6, "\\u0001"}, {6, "\\u0002"}, {6, "\\u0003"},
+          {6, "\\u0004"}, {6, "\\u0005"}, {6, "\\u0006"}, {6, "\\u0007"},
+          {2, "\\b"},     {2, "\\t"},     {2, "\\n"},     {6, "\\u000b"},
+          {2, "\\f"},     {2, "\\r"},     {6, "\\u000e"}, {6, "\\u000f"},
+          {6, "\\u0010"}, {6, "\\u0011"}, {6, "\\u0012"}, {6, "\\u0013"},
+          {6, "\\u0014"}, {6, "\\u0015"}, {6, "\\u0016"}, {6, "\\u0017"},
+          {6, "\\u0018"}, {6, "\\u0019"}, {6, "\\u001a"}, {6, "\\u001b"},
+          {6, "\\u001c"}, {6, "\\u001d"}, {6, "\\u001e"}, {6, "\\u001f"}};
        auto u = escaped[uint8_t(unescaped[i])];
-        chars(u.string, u.string + u.length);
+        buffer.insert(buffer.end(), u.string, u.string + u.length);
      } else {
        one_char(unescaped[i]);
      }
    } // switch
-  } // for
+  }   // for
  one_char('\"');
 }

-template <class formatter> inline void base_formatter<formatter>::clear() {
+
+template<class formatter>
+inline void base_formatter<formatter>::clear() {
  buffer.clear();
 }

-template <class formatter>
+template<class formatter>
 simdjson_inline std::string_view base_formatter<formatter>::str() const {
-  return buffer.str();
+  return std::string_view(buffer.data(), buffer.size());
 }

-simdjson_inline void mini_formatter::print_newline() { return; }
+simdjson_inline void mini_formatter::print_newline() {
+    return;
+}

 simdjson_inline void mini_formatter::print_indents(size_t depth) {
-  (void)depth;
-  return;
+    (void)depth;
+    return;
 }

-simdjson_inline void mini_formatter::print_space() { return; }
+simdjson_inline void mini_formatter::print_space() {
+    return;
+}

-simdjson_inline void pretty_formatter::print_newline() { one_char('\n'); }
+simdjson_inline void pretty_formatter::print_newline() {
+    one_char('\n');
+}

 simdjson_inline void pretty_formatter::print_indents(size_t depth) {
-  if (this->indent_step <= 0) {
-    return;
-  }
-  for (size_t i = 0; i < this->indent_step * depth; i++) {
-    one_char(' ');
-  }
+    if(this->indent_step <= 0) {
+        return;
+    }
+    for(size_t i = 0; i < this->indent_step * depth; i++) {
+        one_char(' ');
+    }
 }

-simdjson_inline void pretty_formatter::print_space() { one_char(' '); }
+simdjson_inline void pretty_formatter::print_space() {
+    one_char(' ');
+}

 /***
 * String building code.
@@ -545,8 +514,7 @@ inline void string_builder<serializer>::append(simdjson::dom::array value) {
 }

 template <class serializer>
-simdjson_inline void
-string_builder<serializer>::append(simdjson::dom::key_value_pair kv) {
+simdjson_inline void string_builder<serializer>::append(simdjson::dom::key_value_pair kv) {
  format.key(kv.key);
  append(kv.value);
 }
@@ -561,6 +529,7 @@ simdjson_inline std::string_view string_builder<serializer>::str() const {
  return format.str();
 }

+
 } // namespace internal
 } // namespace simdjson

@@ -5,6 +5,8 @@
 #include "simdjson/dom/element.h"
 #include "simdjson/dom/object.h"

+#include <vector>
+
 namespace simdjson {

 /**
@@ -14,7 +16,8 @@ namespace simdjson {
 */
 namespace internal {

-template <class formatter> class base_formatter {
+template<class formatter>
+class base_formatter {
 public:
  /** Add a comma **/
  simdjson_inline void comma();
@@ -53,77 +56,25 @@ public:
  /** Prints one character **/
  simdjson_inline void one_char(char c);

-  /** Prints characters in [begin, end) verbatim. **/
-  simdjson_inline void chars(const char *begin, const char *end);
-
  simdjson_inline void call_print_newline() {
-    static_cast<formatter *>(this)->print_newline();
+      static_cast<formatter*>(this)->print_newline();
  }

  simdjson_inline void call_print_indents(size_t depth) {
-    static_cast<formatter *>(this)->print_indents(depth);
+      static_cast<formatter*>(this)->print_indents(depth);
  }

  simdjson_inline void call_print_space() {
-    static_cast<formatter *>(this)->print_space();
+      static_cast<formatter*>(this)->print_space();
  }

 protected:
  // implementation details (subject to change)
  /** Backing buffer **/
-  struct vector_with_small_buffer {
-    vector_with_small_buffer() = default;
-    ~vector_with_small_buffer() { free_buffer(); }
-
-    vector_with_small_buffer(const vector_with_small_buffer &) = delete;
-    vector_with_small_buffer &
-    operator=(const vector_with_small_buffer &) = delete;
-
-    void clear() {
-      size = 0;
-      capacity = StaticCapacity;
-      free_buffer();
-      buffer = array;
-    }
-
-    simdjson_inline void push_back(char c) {
-      if (capacity < size + 1)
-        grow(capacity * 2);
-      buffer[size++] = c;
-    }
-
-    simdjson_inline void append(const char *begin, const char *end) {
-      const size_t new_size = size + (end - begin);
-      if (capacity < new_size)
-        // std::max(new_size, capacity * 2); is broken in tests on Windows
-        grow(new_size < capacity * 2 ? capacity * 2 : new_size);
-      std::copy(begin, end, buffer + size);
-      size = new_size;
-    }
-
-    std::string_view str() const { return std::string_view(buffer, size); }
-
-  private:
-    void free_buffer() {
-      if (buffer != array)
-        delete[] buffer;
-    }
-    void grow(size_t new_capacity) {
-      auto new_buffer = new char[new_capacity];
-      std::copy(buffer, buffer + size, new_buffer);
-      free_buffer();
-      buffer = new_buffer;
-      capacity = new_capacity;
-    }
-
-    static const size_t StaticCapacity = 64;
-    char array[StaticCapacity];
-    char *buffer = array;
-    size_t size = 0;
-    size_t capacity = StaticCapacity;
-  } buffer{};
+  std::vector<char> buffer{}; // not ideal!
 };

+
 /**
 * @private This is the class that we expect to use with the string_builder
 * template. It tries to produce a compact version of the JSON element
@@ -156,11 +107,9 @@ protected:
 * by a "formatter" which handles the details. Thus
 * the string_builder template could support both minification
 * and prettification, and various other tradeoffs.
- *
- * This is not to be confused with the simdjson::builder::string_builder
- * which is a different class.
 */
-template <class formatter = mini_formatter> class string_builder {
+template <class formatter = mini_formatter>
+class string_builder {
 public:
  /** Construct an initially empty builder, would print the empty string **/
  string_builder() = default;
@@ -182,12 +131,11 @@ public:
  simdjson_inline std::string_view str() const;
  /** Append a key_value_pair to the builder (to be printed) **/
  simdjson_inline void append(simdjson::dom::key_value_pair value);
-
 private:
  formatter format{};
 };

-} // namespace internal
+} // internal

 namespace dom {

@@ -196,43 +144,33 @@ namespace dom {
 *
 * @param out The output stream.
 * @param value The element.
- * @throw if there is an error with the underlying output stream. simdjson
- * itself will not throw.
+ * @throw if there is an error with the underlying output stream. simdjson itself will not throw.
 */
-inline std::ostream &operator<<(std::ostream &out,
-                                simdjson::dom::element value);
+inline std::ostream& operator<<(std::ostream& out, simdjson::dom::element value);
 #if SIMDJSON_EXCEPTIONS
-inline std::ostream &
-operator<<(std::ostream &out,
-           simdjson::simdjson_result<simdjson::dom::element> x);
+inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result<simdjson::dom::element> x);
 #endif
 /**
 * Print JSON to an output stream.
 *
 * @param out The output stream.
 * @param value The array.
- * @throw if there is an error with the underlying output stream. simdjson
- * itself will not throw.
+ * @throw if there is an error with the underlying output stream. simdjson itself will not throw.
 */
-inline std::ostream &operator<<(std::ostream &out, simdjson::dom::array value);
+inline std::ostream& operator<<(std::ostream& out, simdjson::dom::array value);
 #if SIMDJSON_EXCEPTIONS
-inline std::ostream &
-operator<<(std::ostream &out,
-           simdjson::simdjson_result<simdjson::dom::array> x);
+inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result<simdjson::dom::array> x);
 #endif
 /**
 * Print JSON to an output stream.
 *
 * @param out The output stream.
 * @param value The object.
- * @throw if there is an error with the underlying output stream. simdjson
- * itself will not throw.
+ * @throw if there is an error with the underlying output stream. simdjson itself will not throw.
 */
-inline std::ostream &operator<<(std::ostream &out, simdjson::dom::object value);
+inline std::ostream& operator<<(std::ostream& out, simdjson::dom::object value);
 #if SIMDJSON_EXCEPTIONS
-inline std::ostream &
-operator<<(std::ostream &out,
-           simdjson::simdjson_result<simdjson::dom::object> x);
+inline std::ostream& operator<<(std::ostream& out,  simdjson::simdjson_result<simdjson::dom::object> x);
 #endif
 } // namespace dom

@@ -244,47 +182,47 @@ operator<<(std::ostream &out,
 *   cout << to_string(doc) << endl; // prints [1,2,3]
 *
 */
-template <class T> std::string to_string(T x) {
-  // in C++, to_string is standard:
-  // http://www.cplusplus.com/reference/string/to_string/ Currently minify and
-  // to_string are identical but in the future, they may differ.
-  simdjson::internal::string_builder<> sb;
-  sb.append(x);
-  std::string_view answer = sb.str();
-  return std::string(answer.data(), answer.size());
+template <class T>
+std::string to_string(T x)   {
+    // in C++, to_string is standard: http://www.cplusplus.com/reference/string/to_string/
+    // Currently minify and to_string are identical but in the future, they may
+    // differ.
+    simdjson::internal::string_builder<> sb;
+    sb.append(x);
+    std::string_view answer = sb.str();
+    return std::string(answer.data(), answer.size());
 }
 #if SIMDJSON_EXCEPTIONS
-template <class T> std::string to_string(simdjson_result<T> x) {
-  if (x.error()) {
-    throw simdjson_error(x.error());
-  }
-  return to_string(x.value());
+template <class T>
+std::string to_string(simdjson_result<T> x) {
+    if (x.error()) { throw simdjson_error(x.error()); }
+    return to_string(x.value());
 }
 #endif

 /**
- * Minifies a JSON element or document, printing the smallest possible valid
- * JSON.
+ * Minifies a JSON element or document, printing the smallest possible valid JSON.
 *
 *   dom::parser parser;
 *   element doc = parser.parse("   [ 1 , 2 , 3 ] "_padded);
 *   cout << minify(doc) << endl; // prints [1,2,3]
 *
 */
-template <class T> std::string minify(T x) { return to_string(x); }
+template <class T>
+std::string minify(T x)  {
+  return to_string(x);
+}

 #if SIMDJSON_EXCEPTIONS
-template <class T> std::string minify(simdjson_result<T> x) {
-  if (x.error()) {
-    throw simdjson_error(x.error());
-  }
-  return to_string(x.value());
+template <class T>
+std::string minify(simdjson_result<T> x) {
+    if (x.error()) { throw simdjson_error(x.error()); }
+    return to_string(x.value());
 }
 #endif

 /**
- * Prettifies a JSON element or document, printing the valid JSON with
- * indentation.
+ * Prettifies a JSON element or document, printing the valid JSON with indentation.
 *
 *   dom::parser parser;
 *   element doc = parser.parse("   [ 1 , 2 , 3 ] "_padded);
@@ -300,22 +238,23 @@ template <class T> std::string minify(simdjson_result<T> x) {
 *   cout << prettify(doc) << endl;
 *
 */
-template <class T> std::string prettify(T x) {
-  simdjson::internal::string_builder<simdjson::internal::pretty_formatter> sb;
-  sb.append(x);
-  std::string_view answer = sb.str();
-  return std::string(answer.data(), answer.size());
+template <class T>
+std::string prettify(T x)  {
+    simdjson::internal::string_builder<simdjson::internal::pretty_formatter> sb;
+    sb.append(x);
+    std::string_view answer = sb.str();
+    return std::string(answer.data(), answer.size());
 }

 #if SIMDJSON_EXCEPTIONS
-template <class T> std::string prettify(simdjson_result<T> x) {
-  if (x.error()) {
-    throw simdjson_error(x.error());
-  }
-  return to_string(x.value());
+template <class T>
+std::string prettify(simdjson_result<T> x) {
+    if (x.error()) { throw simdjson_error(x.error()); }
+    return to_string(x.value());
 }
 #endif

 } // namespace simdjson

+
 #endif
@@ -49,8 +49,7 @@ enum error_code {
  SCALAR_DOCUMENT_AS_VALUE,   ///< A scalar document is treated as a value.
  OUT_OF_BOUNDS,              ///< Attempted to access location outside of document.
  TRAILING_CONTENT,           ///< Unexpected trailing content in the JSON input
-  OUT_OF_CAPACITY,            ///< The capacity was exceeded, we cannot allocate enough memory.
-  NUM_ERROR_CODES             ///< Placeholder for end of error code list.
+  NUM_ERROR_CODES
 };

 /**
@@ -29,24 +29,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  return { src[0] };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 1;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits; }
-  simdjson_inline int escape_index() { return 0; }
-
-  bool escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  dst[0] = src[0];
-  return { (src[0] == '\\') || (src[0] == '"') || (src[0] < 32) };
-}
-
 } // unnamed namespace
 } // namespace fallback
 } // namespace simdjson
@@ -122,7 +122,6 @@ struct implementation_simdjson_result_base {
   * the error() method returns a value that evaluates to false.
   */
  simdjson_inline T&& value_unsafe() && noexcept;
-
 protected:
  /** users should never directly access first and second. **/
  T first{}; /** Users should never directly access 'first'. **/
@@ -49,5 +49,4 @@
 // but it is convenient for now to have them here.
 #include "simdjson/generic/ondemand/json_string_builder.h"
 #include "simdjson/generic/ondemand/json_string_builder-inl.h"
-#include "simdjson/generic/ondemand/json_builder.h"

@@ -131,37 +131,6 @@ public:
   *         - INDEX_OUT_OF_BOUNDS if the array index is larger than an array length
   */
  simdjson_inline simdjson_result<value> at(size_t index) noexcept;
-
-#if SIMDJSON_SUPPORTS_DESERIALIZATION
-  /**
-   * Get this array as the given type.
-   *
-   * @param out This is set to a value of the given type, parsed from the JSON. If there is an error, this may not be initialized.
-   * @returns INCORRECT_TYPE If the JSON array is not of the given type.
-   * @returns SUCCESS If the parse succeeded and the out parameter was set to the value.
-   */
-  template <typename T>
-  simdjson_inline error_code get(T &out)
-     noexcept(custom_deserializable<T, array> ? nothrow_custom_deserializable<T, array> : true) {
-    static_assert(custom_deserializable<T, array>);
-    return deserialize(*this, out);
-  }
-  /**
-   * Get this array as the given type.
-   *
-   * @returns A value of the given type, parsed from the JSON.
-   * @returns INCORRECT_TYPE If the JSON value is not the given type.
-   */
-  template <typename T>
-  simdjson_inline simdjson_result<T> get()
-    noexcept(custom_deserializable<T, value> ? nothrow_custom_deserializable<T, value> : true)
-  {
-    static_assert(std::is_default_constructible<T>::value, "The specified type is not default constructible.");
-    T out{};
-    SIMDJSON_TRY(get<T>(out));
-    return out;
-  }
-#endif // SIMDJSON_SUPPORTS_DESERIALIZATION
 protected:
  /**
   * Go to the end of the array, no matter where you are right now.
@@ -240,28 +209,7 @@ public:
  simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> at_pointer(std::string_view json_pointer) noexcept;
  simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> at_path(std::string_view json_path) noexcept;
  simdjson_inline simdjson_result<std::string_view> raw_json() noexcept;
-#if SIMDJSON_SUPPORTS_DESERIALIZATION
-  // TODO: move this code into object-inl.h

-  template<typename T>
-  simdjson_inline simdjson_result<T> get() noexcept {
-    if (error()) { return error(); }
-    if constexpr (std::is_same_v<T, SIMDJSON_IMPLEMENTATION::ondemand::array>) {
-      return first;
-    }
-    return first.get<T>();
-  }
-  template<typename T>
-  simdjson_inline error_code get(T& out) noexcept {
-    if (error()) { return error(); }
-    if constexpr (std::is_same_v<T, SIMDJSON_IMPLEMENTATION::ondemand::array>) {
-      out = first;
-    } else {
-      SIMDJSON_TRY( first.get<T>(out) );
-    }
-    return SUCCESS;
-  }
-#endif // SIMDJSON_SUPPORTS_DESERIALIZATION
 };

 } // namespace simdjson
@@ -36,9 +36,6 @@ simdjson_inline array_iterator &array_iterator::operator++() noexcept {
  return *this;
 }

-simdjson_inline bool array_iterator::at_end() const noexcept {
-  return iter.at_end();
-}
 } // namespace ondemand
 } // namespace SIMDJSON_IMPLEMENTATION
 } // namespace simdjson
@@ -75,9 +72,7 @@ simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterato
  ++(first);
  return *this;
 }
-simdjson_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator>::at_end() const noexcept {
-  return !first.iter.is_valid() || first.at_end();
-}
+
 } // namespace simdjson

 #endif // SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_INL_H
@@ -34,8 +34,7 @@ public:
   *
   * Part of the std::iterator interface.
   */
-  simdjson_inline simdjson_result<value>
-  operator*() noexcept; // MUST ONLY BE CALLED ONCE PER ITERATION.
+  simdjson_inline simdjson_result<value> operator*() noexcept; // MUST ONLY BE CALLED ONCE PER ITERATION.
  /**
   * Check if we are at the end of the JSON.
   *
@@ -59,11 +58,6 @@ public:
   */
  simdjson_inline array_iterator &operator++() noexcept;

-  /**
-   * Check if the array is at the end.
-   */
-  [[nodiscard]] simdjson_inline bool at_end() const noexcept;
-
 private:
  value_iterator iter{};

@@ -82,6 +76,7 @@ namespace simdjson {

 template<>
 struct simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator> : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator> {
+public:
  simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::array_iterator &&value) noexcept; ///< @private
  simdjson_inline simdjson_result(error_code error) noexcept; ///< @private
  simdjson_inline simdjson_result() noexcept = default;
@@ -94,8 +89,6 @@ struct simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator> : publ
  simdjson_inline bool operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator> &) const noexcept;
  simdjson_inline bool operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator> &) const noexcept;
  simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator> &operator++() noexcept;
-
-  [[nodiscard]] simdjson_inline bool at_end() const noexcept;
 };

 } // namespace simdjson
@@ -8,7 +8,6 @@
 // Internal headers needed for ondemand generics.
 // All includes not under simdjson/generic/ondemand must be here!
 // Otherwise, amalgamation will fail.
-#include "simdjson/concepts.h"
 #include "simdjson/dom/base.h" // for MINIMAL_DOCUMENT_CAPACITY
 #include "simdjson/implementation.h"
 #include "simdjson/padded_string.h"
@@ -77,7 +77,7 @@ template <typename T, typename ValT = SIMDJSON_IMPLEMENTATION::ondemand::value>
 concept custom_deserializable = tag_invocable<deserialize_tag, ValT&, T&>;

 template <typename T, typename ValT = SIMDJSON_IMPLEMENTATION::ondemand::value>
-concept deserializable = custom_deserializable<T, ValT> || is_builtin_deserializable_v<T> || concepts::optional_type<T>;
+concept deserializable = custom_deserializable<T, ValT> || is_builtin_deserializable_v<T>;

 template <typename T, typename ValT = SIMDJSON_IMPLEMENTATION::ondemand::value>
 concept nothrow_custom_deserializable = nothrow_tag_invocable<deserialize_tag, ValT&, T&>;
@@ -88,26 +88,10 @@ concept nothrow_deserializable = nothrow_custom_deserializable<T, ValT> || is_bu

 /// Deserialize Tag
 inline constexpr struct deserialize_tag {
-  using array_type = SIMDJSON_IMPLEMENTATION::ondemand::array;
-  using object_type = SIMDJSON_IMPLEMENTATION::ondemand::object;
  using value_type = SIMDJSON_IMPLEMENTATION::ondemand::value;
  using document_type = SIMDJSON_IMPLEMENTATION::ondemand::document;
  using document_reference_type = SIMDJSON_IMPLEMENTATION::ondemand::document_reference;

-  // Customization Point for array
-  template <typename T>
-    requires custom_deserializable<T, value_type>
-  [[nodiscard]] constexpr /* error_code */ auto operator()(array_type &object, T& output) const noexcept(nothrow_custom_deserializable<T, value_type>) {
-    return tag_invoke(*this, object, output);
-  }
-
-  // Customization Point for object
-  template <typename T>
-    requires custom_deserializable<T, value_type>
-  [[nodiscard]] constexpr /* error_code */ auto operator()(object_type &object, T& output) const noexcept(nothrow_custom_deserializable<T, value_type>) {
-    return tag_invoke(*this, object, output);
-  }
-
  // Customization Point for value
  template <typename T>
    requires custom_deserializable<T, value_type>
@@ -195,8 +195,8 @@ simdjson_inline document::operator object() & noexcept(false) { return get_objec
 simdjson_inline document::operator uint64_t() noexcept(false) { return get_uint64(); }
 simdjson_inline document::operator int64_t() noexcept(false) { return get_int64(); }
 simdjson_inline document::operator double() noexcept(false) { return get_double(); }
-simdjson_inline document::operator std::string_view() noexcept(false) simdjson_lifetime_bound { return get_string(false); }
-simdjson_inline document::operator raw_json_string() noexcept(false) simdjson_lifetime_bound { return get_raw_json_string(); }
+simdjson_inline document::operator std::string_view() noexcept(false) { return get_string(false); }
+simdjson_inline document::operator raw_json_string() noexcept(false) { return get_raw_json_string(); }
 simdjson_inline document::operator bool() noexcept(false) { return get_bool(); }
 simdjson_inline document::operator value() noexcept(false) { return get_value(); }

@@ -224,7 +224,7 @@ public:
   * Be mindful that the document instance must remain in scope while you are accessing object, array and value instances.
   *
   * @param out This is set to a value of the given type, parsed from the JSON. If there is an error, this may not be initialized.
-   * @returns INCORRECT_TYPE If the JSON value is of the given type.
+   * @returns INCORRECT_TYPE If the JSON value is not an object.
   * @returns SUCCESS If the parse succeeded and the out parameter was set to the value.
   */
  template<typename T>
@@ -322,7 +322,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.
   */
-  simdjson_inline operator std::string_view() noexcept(false) simdjson_lifetime_bound;
+  simdjson_inline operator std::string_view() noexcept(false);
  /**
   * Cast this JSON value to a raw_json_string.
   *
@@ -331,7 +331,7 @@ 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.
   */
-  simdjson_inline operator raw_json_string() noexcept(false) simdjson_lifetime_bound;
+  simdjson_inline operator raw_json_string() noexcept(false);
  /**
   * Cast this JSON value to a bool.
   *
@@ -1,307 +0,0 @@
-/**
- * This file is part of the builder API. It is temporarily in the ondemand directory
- * but we will move it to a builder directory later.
- */
-#ifndef SIMDJSON_GENERIC_BUILDER_H
-
-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
-#define SIMDJSON_GENERIC_STRING_BUILDER_H
-#include "simdjson/generic/builder/json_string_builder.h"
-#include "simdjson/concepts.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
-#if SIMDJSON_STATIC_REFLECTION
-
-#include <charconv>
-#include <cstring>
-#include <experimental/meta>
-#include <memory>
-#include <optional>
-#include <string_view>
-#include <type_traits>
-#include <utility>
-// #include <static_reflection> // for std::define_static_string - header not available yet
-
-namespace simdjson {
-namespace SIMDJSON_IMPLEMENTATION {
-namespace builder {
-
-// Concept that checks if a type is a container but not a string (because
-// strings handling must be handled differently)
-template <typename T>
-concept container_but_not_string =
-    requires(T a) {
-      { a.size() } -> std::convertible_to<std::size_t>;
-      {
-        a[std::declval<std::size_t>()]
-      }; // check if elements are accessible for the subscript operator
-    } && !std::is_same_v<T, std::string> &&
-    !std::is_same_v<T, std::string_view> && !std::is_same_v<T, const char *>;
-
-template <class T>
-  requires(container_but_not_string<T>)
-constexpr void atom(string_builder &b, const T &t) {
-  if (t.size() == 0) {
-    b.append_raw("[]");
-    return;
-  }
-  b.append('[');
-  atom(b, t[0]);
-  for (size_t i = 1; i < t.size(); ++i) {
-    b.append(',');
-    atom(b, t[i]);
-  }
-  b.append(']');
-}
-
-template <class T>
-  requires(std::is_same_v<T, std::string> ||
-           std::is_same_v<T, std::string_view> ||
-           std::is_same_v<T, const char *> ||
-           std::is_same_v<T, char>)
-constexpr void atom(string_builder &b, const T &t) {
-  b.escape_and_append_with_quotes(t);
-}
-
-template <concepts::string_view_keyed_map T>
-constexpr void atom(string_builder &b, const T &m) {
-  if (m.empty()) {
-    b.append_raw("{}");
-    return;
-  }
-  b.append('{');
-  bool first = true;
-  for (const auto& [key, value] : m) {
-    if (!first) {
-      b.append(',');
-    }
-    first = false;
-    // Keys must be convertible to string_view per the concept
-    b.escape_and_append_with_quotes(key);
-    b.append(':');
-    atom(b, value);
-  }
-  b.append('}');
-}
-
-
-template<typename number_type,
-         typename = typename std::enable_if<std::is_arithmetic<number_type>::value && !std::is_same_v<number_type, char>>::type>
-constexpr void atom(string_builder &b, const number_type t) {
-  b.append(t);
-}
-#if SIMDJSON_CONSTEVAL
-consteval std::string consteval_to_quoted_escaped(std::string_view input);
-#endif
-
-template <class T>
-  requires(std::is_class_v<T> && !container_but_not_string<T> &&
-           !concepts::string_view_keyed_map<T> &&
-           !concepts::optional_type<T> &&
-           !concepts::smart_pointer<T> &&
-           !concepts::appendable_containers<T> &&
-           !std::is_same_v<T, std::string> &&
-           !std::is_same_v<T, std::string_view> &&
-           !std::is_same_v<T, const char*> &&
-           !std::is_same_v<T, char>)
-constexpr void atom(string_builder &b, const T &t) {
-  int i = 0;
-  b.append('{');
-  [:expand(std::meta::nonstatic_data_members_of(^^T, std::meta::access_context::unchecked())):] >> [&]<auto dm>() {
-    if (i != 0)
-      b.append(',');
-    constexpr auto key = std::define_static_string(consteval_to_quoted_escaped(std::meta::identifier_of(dm)));
-    b.append_raw(key);
-    b.append(':');
-    atom(b, t.[:dm:]);
-    i++;
-  };
-  b.append('}');
-}
-
-// Support for optional types (std::optional, etc.)
-template <concepts::optional_type T>
-constexpr void atom(string_builder &b, const T &opt) {
-  if (opt) {
-    atom(b, opt.value());
-  } else {
-    b.append_raw("null");
-  }
-}
-
-// Support for smart pointers (std::unique_ptr, std::shared_ptr, etc.)
-template <concepts::smart_pointer T>
-constexpr void atom(string_builder &b, const T &ptr) {
-  if (ptr) {
-    atom(b, *ptr);
-  } else {
-    b.append_raw("null");
-  }
-}
-
-// Support for enums - serialize as string representation using expand approach from P2996R12
-template <typename T>
-  requires(std::is_enum_v<T>)
-void atom(string_builder &b, const T &e) {
-#if SIMDJSON_STATIC_REFLECTION
-  std::string_view result = "<unnamed>";
-  [:expand(std::meta::enumerators_of(^^T)):] >> [&]<auto enum_val>{
-    if (e == [:enum_val:]) {
-      result = std::meta::identifier_of(enum_val);
-    }
-  };
-
-  if (result != "<unnamed>") {
-    b.append_raw("\"");
-    b.append_raw(result);
-    b.append_raw("\"");
-  } else {
-    // Fallback to integer if enum value not found
-    atom(b, static_cast<std::underlying_type_t<T>>(e));
-  }
-#else
-  // Fallback: serialize as integer if reflection not available
-  atom(b, static_cast<std::underlying_type_t<T>>(e));
-#endif
-}
-
-// Support for appendable containers that don't have operator[] (sets, etc.)
-template <concepts::appendable_containers T>
-  requires(!container_but_not_string<T> && !concepts::string_view_keyed_map<T> &&
-           !concepts::optional_type<T> && !concepts::smart_pointer<T> &&
-           !std::is_same_v<T, std::string> &&
-           !std::is_same_v<T, std::string_view> && !std::is_same_v<T, const char*>)
-constexpr void atom(string_builder &b, const T &container) {
-  if (container.empty()) {
-    b.append_raw("[]");
-    return;
-  }
-  b.append('[');
-  bool first = true;
-  for (const auto& item : container) {
-    if (!first) {
-      b.append(',');
-    }
-    first = false;
-    atom(b, item);
-  }
-  b.append(']');
-}
-
-// append functions that delegate to atom functions for primitive types
-template <class T>
-  requires(std::is_arithmetic_v<T> && !std::is_same_v<T, char>)
-void append(string_builder &b, const T &t) {
-  atom(b, t);
-}
-
-template <class T>
-  requires(std::is_same_v<T, std::string> ||
-           std::is_same_v<T, std::string_view> ||
-           std::is_same_v<T, const char *> ||
-           std::is_same_v<T, char>)
-void append(string_builder &b, const T &t) {
-  atom(b, t);
-}
-
-template <concepts::optional_type T>
-void append(string_builder &b, const T &t) {
-  atom(b, t);
-}
-
-template <concepts::smart_pointer T>
-void append(string_builder &b, const T &t) {
-  atom(b, t);
-}
-
-template <concepts::appendable_containers T>
-  requires(!container_but_not_string<T> && !concepts::string_view_keyed_map<T> &&
-           !concepts::optional_type<T> && !concepts::smart_pointer<T> &&
-           !std::is_same_v<T, std::string> &&
-           !std::is_same_v<T, std::string_view> && !std::is_same_v<T, const char*>)
-void append(string_builder &b, const T &t) {
-  atom(b, t);
-}
-
-template <concepts::string_view_keyed_map T>
-void append(string_builder &b, const T &t) {
-  atom(b, t);
-}
-
-// works for struct
-template <class Z>
-  requires(std::is_class_v<Z> && !container_but_not_string<Z> &&
-           !concepts::string_view_keyed_map<Z> &&
-           !concepts::optional_type<Z> &&
-           !concepts::smart_pointer<Z> &&
-           !concepts::appendable_containers<Z> &&
-           !std::is_same_v<Z, std::string> &&
-           !std::is_same_v<Z, std::string_view> &&
-           !std::is_same_v<Z, const char*> &&
-           !std::is_same_v<Z, char>)
-void append(string_builder &b, const Z &z) {
-  int i = 0;
-  b.append('{');
-  [:expand(std::meta::nonstatic_data_members_of(^^Z, std::meta::access_context::unchecked())):] >> [&]<auto dm>() {
-    if (i != 0)
-      b.append(',');
-    constexpr auto key = std::define_static_string(consteval_to_quoted_escaped(std::meta::identifier_of(dm)));
-    b.append_raw(key);
-    b.append(':');
-    atom(b, z.[:dm:]);
-    i++;
-  };
-  b.append('}');
-}
-
-// works for container
-template <class Z>
-  requires(container_but_not_string<Z>)
-void append(string_builder &b, const Z &z) {
-  if (z.size() == 0) {
-    b.append_raw("[]");
-    return;
-  }
-  b.append('[');
-  atom(b, z[0]);
-  for (size_t i = 1; i < z.size(); ++i) {
-    b.append(',');
-    atom(b, z[i]);
-  }
-  b.append(']');
-}
-
-template <class Z>
-simdjson_result<std::string> to_json_string(const Z &z, size_t initial_capacity = 1024) {
-  string_builder b(initial_capacity);
-  append(b, z);
-  std::string_view s;
-  if(auto e = b.view().get(s); e) { return e; }
-  return std::string(s);
-}
-
-template <class Z>
-simdjson_error to_json(const Z &z, std::string &s) {
-  string_builder b;
-  append(b, z);
-  std::string_view view;
-  if(auto e = b.view().get(view); e) { return e; }
-  s.assign(view);
-  return SUCCESS;
-}
-
-template <class Z>
-string_builder& operator<<(string_builder& b, const Z& z) {
-  append(b, z);
-  return b;
-}
-} // namespace builder
-} // namespace SIMDJSON_IMPLEMENTATION
-// Alias the function template to 'to' in the global namespace
-template <class Z>
-simdjson_result<std::string> to_json(const Z &z, size_t initial_capacity = 1024) {
-  return SIMDJSON_IMPLEMENTATION::builder::to_json_string(z, initial_capacity);
-}
-} // namespace simdjson
-#endif // SIMDJSON_STATIC_REFLECTION
-
-#endif
@@ -218,8 +218,6 @@ simdjson_inline void json_iterator::assert_valid_position(token_position positio
 #ifndef SIMDJSON_CLANG_VISUAL_STUDIO
  SIMDJSON_ASSUME( position >= &parser->implementation->structural_indexes[0] );
  SIMDJSON_ASSUME( position < &parser->implementation->structural_indexes[parser->implementation->n_structural_indexes] );
-#else
-  (void)position; // Suppress unused parameter warning
 #endif
 }

@@ -1,617 +1,54 @@
 /**
- * This file is part of the builder API. It is temporarily in the ondemand
- * directory but we will move it to a builder directory later.
+ * This file is part of the builder API. It is temporarily in the ondemand directory
+ * but we will move it to a builder directory later.
 */
-#include <array>
-#include <cstring>
-#include <type_traits>
-#ifndef SIMDJSON_GENERIC_STRING_BUILDER_INL_H
+#ifndef SIMDJSON_GENERIC_BUILDER_INL_H

 #ifndef SIMDJSON_CONDITIONAL_INCLUDE
-#define SIMDJSON_GENERIC_STRING_BUILDER_INL_H
+#define SIMDJSON_GENERIC_BUILDER_INL_H
 #include "simdjson/generic/builder/json_string_builder.h"
 #endif // SIMDJSON_CONDITIONAL_INCLUDE

-/*
- * Empirically, we have found that an inlined optimization is important for
- * performance. The following macros are not ideal. We should find a better
- * way to inline the code.
- */
-
-#if defined(__SSE2__) || defined(__x86_64__) || defined(__x86_64) ||           \
-    (defined(_M_AMD64) || defined(_M_X64) ||                                   \
-     (defined(_M_IX86_FP) && _M_IX86_FP == 2))
-#ifndef SIMDJSON_EXPERIMENTAL_HAS_SSE2
-#define SIMDJSON_EXPERIMENTAL_HAS_SSE2 1
-#endif
-#endif
-
-#if defined(__aarch64__) || defined(_M_ARM64)
-#ifndef SIMDJSON_EXPERIMENTAL_HAS_NEON
-#define SIMDJSON_EXPERIMENTAL_HAS_NEON 1
-#endif
-#endif
-#if SIMDJSON_EXPERIMENTAL_HAS_NEON
-#include <arm_neon.h>
-#endif
-#if SIMDJSON_EXPERIMENTAL_HAS_SSE2
-#include <emmintrin.h>
-#endif
-
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 namespace builder {
-
-static SIMDJSON_CONSTEXPR_LAMBDA std::array<uint8_t, 256> json_quotable_character = {
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-
-/**
-
-A possible SWAR implementation of has_json_escapable_byte. It is not used because
-it is slower than the current implementation. It is kept here for reference (to show
-that we tried it).
-
-inline bool has_json_escapable_byte(uint64_t x) {
-  uint64_t is_ascii = 0x8080808080808080ULL & ~x;
-  uint64_t xor2 = x ^ 0x0202020202020202ULL;
-  uint64_t lt32_or_eq34 = xor2 - 0x2121212121212121ULL;
-  uint64_t sub92 = x ^ 0x5C5C5C5C5C5C5C5CULL;
-  uint64_t eq92 = (sub92 - 0x0101010101010101ULL);
-  return ((lt32_or_eq34 | eq92) & is_ascii) != 0;
-}
-
-**/
-
-SIMDJSON_CONSTEXPR_LAMBDA simdjson_inline bool
-simple_needs_escaping(std::string_view v) {
-  for (char c : v) {
-    // a table lookup is faster than a series of comparisons
-    if(json_quotable_character[static_cast<uint8_t>(c)]) {
-      return true;
-    }
+simdjson_inline string_builder::string_builder(size_t initial_capacity) :
+  buffer(new (std::nothrow) char[initial_capacity]),
+  position(0), capacity(buffer.get() != nullptr ? initial_capacity : 0),
+  is_valid(buffer.get() != nullptr) {}
+    /***
+      char *padded_buffer = new (std::nothrow) char[totalpaddedlength];
+  if (padded_buffer == nullptr) {
+    return nullptr;
  }
-  return false;
-}
-
-#if SIMDJSON_EXPERIMENTAL_HAS_NEON
-simdjson_inline bool fast_needs_escaping(std::string_view view) {
-  if (view.size() < 16) {
-    return simple_needs_escaping(view);
-  }
-  size_t i = 0;
-  uint8x16_t running = vdupq_n_u8(0);
-  uint8x16_t v34 = vdupq_n_u8(34);
-  uint8x16_t v92 = vdupq_n_u8(92);
-
-  for (; i + 15 < view.size(); i += 16) {
-    uint8x16_t word = vld1q_u8((const uint8_t *)view.data() + i);
-    running = vorrq_u8(running, vceqq_u8(word, v34));
-    running = vorrq_u8(running, vceqq_u8(word, v92));
-    running = vorrq_u8(running, vcltq_u8(word, vdupq_n_u8(32)));
-  }
-  if (i < view.size()) {
-    uint8x16_t word =
-        vld1q_u8((const uint8_t *)view.data() + view.length() - 16);
-    running = vorrq_u8(running, vceqq_u8(word, v34));
-    running = vorrq_u8(running, vceqq_u8(word, v92));
-    running = vorrq_u8(running, vcltq_u8(word, vdupq_n_u8(32)));
-  }
-  return vmaxvq_u32(vreinterpretq_u32_u8(running)) != 0;
-}
-#elif SIMDJSON_EXPERIMENTAL_HAS_SSE2
-simdjson_inline bool fast_needs_escaping(std::string_view view) {
-  if (view.size() < 16) {
-    return simple_needs_escaping(view);
-  }
-  size_t i = 0;
-  __m128i running = _mm_setzero_si128();
-  for (; i + 15 < view.size(); i += 16) {
-
-    __m128i word = _mm_loadu_si128(reinterpret_cast<const __m128i *>(view.data() + i));
-    running = _mm_or_si128(running, _mm_cmpeq_epi8(word, _mm_set1_epi8(34)));
-    running = _mm_or_si128(running, _mm_cmpeq_epi8(word, _mm_set1_epi8(92)));
-    running = _mm_or_si128(
-        running, _mm_cmpeq_epi8(_mm_subs_epu8(word, _mm_set1_epi8(31)),
-                                _mm_setzero_si128()));
-  }
-  if (i < view.size()) {
-    __m128i word =
-        _mm_loadu_si128(reinterpret_cast<const __m128i *>(view.data() + view.length() - 16));
-    running = _mm_or_si128(running, _mm_cmpeq_epi8(word, _mm_set1_epi8(34)));
-    running = _mm_or_si128(running, _mm_cmpeq_epi8(word, _mm_set1_epi8(92)));
-    running = _mm_or_si128(
-        running, _mm_cmpeq_epi8(_mm_subs_epu8(word, _mm_set1_epi8(31)),
-                                _mm_setzero_si128()));
-  }
-  return _mm_movemask_epi8(running) != 0;
-}
-#else
-simdjson_inline bool fast_needs_escaping(std::string_view view) {
-  return simple_needs_escaping(view);
-}
-#endif
-
-
-SIMDJSON_CONSTEXPR_LAMBDA inline size_t
-find_next_json_quotable_character(const std::string_view view,
-                                  size_t location) noexcept {
-
-  for (auto pos = view.begin() + location; pos != view.end(); ++pos) {
-    if (json_quotable_character[static_cast<uint8_t>(*pos)]) {
-      return pos - view.begin();
-    }
-  }
-  return size_t(view.size());
-}
-
-SIMDJSON_CONSTEXPR_LAMBDA static std::string_view control_chars[] = {
-    "\\x0000", "\\x0001", "\\x0002", "\\x0003", "\\x0004", "\\x0005", "\\x0006",
-    "\\x0007", "\\x0008", "\\t",     "\\n",     "\\x000b", "\\f",     "\\r",
-    "\\x000e", "\\x000f", "\\x0010", "\\x0011", "\\x0012", "\\x0013", "\\x0014",
-    "\\x0015", "\\x0016", "\\x0017", "\\x0018", "\\x0019", "\\x001a", "\\x001b",
-    "\\x001c", "\\x001d", "\\x001e", "\\x001f"};
-
-SIMDJSON_CONSTEXPR_LAMBDA void escape_json_char(char c, char *&out) {
-  if (c == '"') {
-    memcpy(out, "\\\"", 2);
-    out += 2;
-  } else if (c == '\\') {
-    memcpy(out, "\\\\", 2);
-    out += 2;
-  } else {
-    std::string_view v = control_chars[uint8_t(c)];
-    memcpy(out, v.data(), v.size());
-    out += v.size();
-  }
-}
-
-inline size_t write_string_escaped(const std::string_view input, char *out) {
-  size_t mysize = input.size();
-  if (!fast_needs_escaping(input)) { // fast path!
-    memcpy(out, input.data(), input.size());
-    return input.size();
-  }
-  const char *const initout = out;
-  size_t location = find_next_json_quotable_character(input, 0);
-  memcpy(out, input.data(), location);
-  out += location;
-  escape_json_char(input[location], out);
-  location += 1;
-  while (location < mysize) {
-    size_t newlocation = find_next_json_quotable_character(input, location);
-    memcpy(out, input.data() + location, newlocation - location);
-    out += newlocation - location;
-    location = newlocation;
-    if (location == mysize) {
-      break;
-    }
-    escape_json_char(input[location], out);
-    location += 1;
-  }
-  return out - initout;
-}
-
-#if SIMDJSON_CONSTEVAL
-// unoptimized, meant for compile-time execution
-consteval std::string consteval_to_quoted_escaped(std::string_view input) {
-  std::string out = "\"";
-  for (char c : input) {
-    if (json_quotable_character[uint8_t(c)]) {
-      if (c == '"') {
-        out.append("\\\"");
-      } else if (c == '\\') {
-        out.append("\\\\");
-      } else {
-        std::string_view v = control_chars[uint8_t(c)];
-        out.append(v);
-      }
-    } else {
-      out.push_back(c);
-    }
-  }
-  out.push_back('"');
-  return out;
-}
-#endif // SIMDJSON_CONSTEVAL
-
-simdjson_inline string_builder::string_builder(size_t initial_capacity)
-    : buffer(new(std::nothrow) char[initial_capacity]), position(0),
-      capacity(buffer.get() != nullptr ? initial_capacity : 0),
-      is_valid(buffer.get() != nullptr) {}
-
+     */
 simdjson_inline bool string_builder::capacity_check(size_t upcoming_bytes) {
-  // We use the convention that when is_valid is false, then the capacity and
-  // the position are 0.
-  // Most of the time, this function will return true.
-  if (simdjson_likely(upcoming_bytes <= capacity - position)) {
-    return true;
-  }
-  // check for overflow, most of the time there is no overflow
-  if (simdjson_likely(position + upcoming_bytes < position)) {
-    return false;
-  }
-  // We will rarely get here.
-  grow_buffer((std::max)(capacity * 2, position + upcoming_bytes));
-  // If the buffer allocation failed, we set is_valid to false.
+  if (upcoming_bytes <= capacity - position) { return true; }
+  // check for overflow:
+  if (position + upcoming_bytes < position) { return false; }
+  grow_buffer(std::max(capacity * 2, position + upcoming_bytes));
  return is_valid;
 }

 simdjson_inline void string_builder::grow_buffer(size_t desired_capacity) {
-  if (!is_valid) {
-    return;
-  }
+  if (!is_valid) { return; }
  std::unique_ptr<char[]> new_buffer(new (std::nothrow) char[desired_capacity]);
  if (new_buffer.get() == nullptr) {
-    set_valid(false);
+    is_valid = false;
+    capacity = 0;
    return;
  }
-  std::memcpy(new_buffer.get(), buffer.get(), position);
+  memcpy(new_buffer.get(), buffer.get(), position);
  buffer.swap(new_buffer);
  capacity = desired_capacity;
 }

-simdjson_inline void string_builder::set_valid(bool valid) noexcept {
-  if (!valid) {
-    is_valid = false;
-    capacity = 0;
-    position = 0;
-    buffer.reset();
-  } else {
-    is_valid = true;
-  }
-}
-
-simdjson_inline size_t string_builder::size() const noexcept {
-  return position;
-}
-
-simdjson_inline void string_builder::append(char c) noexcept {
-  if (capacity_check(1)) {
-    buffer.get()[position++] = c;
-  }
-}
-
-simdjson_inline void string_builder::append_null() noexcept {
-  constexpr char null_literal[] = "null";
-  constexpr size_t null_len = sizeof(null_literal) - 1;
-  if (capacity_check(null_len)) {
-    std::memcpy(buffer.get() + position, null_literal, null_len);
-    position += null_len;
-  }
-}
-
-simdjson_inline void string_builder::clear() noexcept {
-  position = 0;
-  // if it was invalid, we should try to repair it
-  if (!is_valid) {
-    capacity = 0;
-    buffer.reset();
-    is_valid = true;
-  }
-}
-
-namespace internal {
-
-// We could specialize further for 32-bit integers.
-simdjson_really_inline int int_log2(uint32_t x) { return (63 - leading_zeroes(x | 1)); }
-
-simdjson_really_inline int fast_digit_count(uint32_t x) {
-  static uint64_t table[] = {
-      4294967296,  8589934582,  8589934582,  8589934582,  12884901788,
-      12884901788, 12884901788, 17179868184, 17179868184, 17179868184,
-      21474826480, 21474826480, 21474826480, 21474826480, 25769703776,
-      25769703776, 25769703776, 30063771072, 30063771072, 30063771072,
-      34349738368, 34349738368, 34349738368, 34349738368, 38554705664,
-      38554705664, 38554705664, 41949672960, 41949672960, 41949672960,
-      42949672960, 42949672960};
-  return uint32_t((x + table[int_log2(x)]) >> 32);
-}
-
-simdjson_really_inline int int_log2(uint64_t x) { return 63 - leading_zeroes(x | 1); }
-
-simdjson_really_inline int fast_digit_count(uint64_t x) {
-  static uint64_t table[] = {9,
-                             99,
-                             999,
-                             9999,
-                             99999,
-                             999999,
-                             9999999,
-                             99999999,
-                             999999999,
-                             9999999999,
-                             99999999999,
-                             999999999999,
-                             9999999999999,
-                             99999999999999,
-                             999999999999999ULL,
-                             9999999999999999ULL,
-                             99999999999999999ULL,
-                             999999999999999999ULL,
-                             9999999999999999999ULL};
-  int y = (19 * int_log2(x) >> 6);
-  y += x > table[y];
-  return y + 1;
-}
-
-template <typename number_type, typename = typename std::enable_if<
-                                    std::is_unsigned<number_type>::value>::type>
-simdjson_really_inline size_t digit_count(number_type v) noexcept {
-  static_assert(sizeof(number_type) == 8 || sizeof(number_type) == 4 ||
-                    sizeof(number_type) == 2 || sizeof(number_type) == 1,
-                "We only support 8-bit, 16-bit, 32-bit and 64-bit numbers");
-  return fast_digit_count(v);
-}
-static const char decimal_table[200] = {
-  0x30, 0x30, 0x30, 0x31, 0x30, 0x32, 0x30, 0x33, 0x30, 0x34, 0x30, 0x35,
-  0x30, 0x36, 0x30, 0x37, 0x30, 0x38, 0x30, 0x39, 0x31, 0x30, 0x31, 0x31,
-  0x31, 0x32, 0x31, 0x33, 0x31, 0x34, 0x31, 0x35, 0x31, 0x36, 0x31, 0x37,
-  0x31, 0x38, 0x31, 0x39, 0x32, 0x30, 0x32, 0x31, 0x32, 0x32, 0x32, 0x33,
-  0x32, 0x34, 0x32, 0x35, 0x32, 0x36, 0x32, 0x37, 0x32, 0x38, 0x32, 0x39,
-  0x33, 0x30, 0x33, 0x31, 0x33, 0x32, 0x33, 0x33, 0x33, 0x34, 0x33, 0x35,
-  0x33, 0x36, 0x33, 0x37, 0x33, 0x38, 0x33, 0x39, 0x34, 0x30, 0x34, 0x31,
-  0x34, 0x32, 0x34, 0x33, 0x34, 0x34, 0x34, 0x35, 0x34, 0x36, 0x34, 0x37,
-  0x34, 0x38, 0x34, 0x39, 0x35, 0x30, 0x35, 0x31, 0x35, 0x32, 0x35, 0x33,
-  0x35, 0x34, 0x35, 0x35, 0x35, 0x36, 0x35, 0x37, 0x35, 0x38, 0x35, 0x39,
-  0x36, 0x30, 0x36, 0x31, 0x36, 0x32, 0x36, 0x33, 0x36, 0x34, 0x36, 0x35,
-  0x36, 0x36, 0x36, 0x37, 0x36, 0x38, 0x36, 0x39, 0x37, 0x30, 0x37, 0x31,
-  0x37, 0x32, 0x37, 0x33, 0x37, 0x34, 0x37, 0x35, 0x37, 0x36, 0x37, 0x37,
-  0x37, 0x38, 0x37, 0x39, 0x38, 0x30, 0x38, 0x31, 0x38, 0x32, 0x38, 0x33,
-  0x38, 0x34, 0x38, 0x35, 0x38, 0x36, 0x38, 0x37, 0x38, 0x38, 0x38, 0x39,
-  0x39, 0x30, 0x39, 0x31, 0x39, 0x32, 0x39, 0x33, 0x39, 0x34, 0x39, 0x35,
-  0x39, 0x36, 0x39, 0x37, 0x39, 0x38, 0x39, 0x39,
-};
-} // namespace internal
-
-template <typename number_type, typename>
-simdjson_inline void string_builder::append(number_type v) noexcept {
-  static_assert(std::is_same<number_type, bool>::value ||
-                    std::is_integral<number_type>::value ||
-                    std::is_floating_point<number_type>::value,
-                "Unsupported number type");
-  // If C++17 is available, we can 'if constexpr' here.
-  SIMDJSON_IF_CONSTEXPR(std::is_same<number_type, bool>::value) {
-    if (v) {
-      constexpr char true_literal[] = "true";
-      constexpr size_t true_len = sizeof(true_literal) - 1;
-      if (capacity_check(true_len)) {
-        std::memcpy(buffer.get() + position, true_literal, true_len);
-        position += true_len;
-      }
-    } else {
-      constexpr char false_literal[] = "false";
-      constexpr size_t false_len = sizeof(false_literal) - 1;
-      if (capacity_check(false_len)) {
-        std::memcpy(buffer.get() + position, false_literal, false_len);
-        position += false_len;
-      }
-    }
-  }
-  else SIMDJSON_IF_CONSTEXPR(std::is_unsigned<number_type>::value) {
-    constexpr size_t max_number_size = 20;
-    if (capacity_check(max_number_size)) {
-      using unsigned_type = typename std::make_unsigned<number_type>::type;
-      unsigned_type pv = static_cast<unsigned_type>(v);
-      size_t dc = internal::digit_count(pv);
-      char *write_pointer = buffer.get() + position + dc - 1;
-      while (pv >= 100) {
-        memcpy(write_pointer - 1, &internal::decimal_table[(pv % 100)*2], 2);
-        write_pointer -= 2;
-        pv /= 100;
-      }
-      if (pv >= 10) {
-        *write_pointer-- = char('0' + (pv % 10));
-        pv /= 10;
-      }
-      *write_pointer = char('0' + pv);
-      position += dc;
-    }
-  }
-  else SIMDJSON_IF_CONSTEXPR(std::is_integral<number_type>::value) {
-    constexpr size_t max_number_size = 20;
-    if (capacity_check(max_number_size)) {
-      using unsigned_type = typename std::make_unsigned<number_type>::type;
-      bool negative = v < 0;
-      unsigned_type pv = static_cast<unsigned_type>(v);
-      if (negative) {
-        pv = 0 - pv; // the 0 is for Microsoft
-      }
-      size_t dc = internal::digit_count(pv);
-      if (negative) {
-        buffer.get()[position++] = '-';
-      }
-      char *write_pointer = buffer.get() + position + dc - 1;
-      while (pv >= 100) {
-        memcpy(write_pointer - 1, &internal::decimal_table[(pv % 100)*2], 2);
-        write_pointer -= 2;
-        pv /= 100;
-      }
-      if (pv >= 10) {
-        *write_pointer-- = char('0' + (pv % 10));
-        pv /= 10;
-      }
-      *write_pointer = char('0' + pv);
-      position += dc;
-    }
-  }
-  else SIMDJSON_IF_CONSTEXPR(std::is_floating_point<number_type>::value) {
-    constexpr size_t max_number_size = 24;
-    if (capacity_check(max_number_size)) {
-      // We could specialize for float.
-      char *end = simdjson::internal::to_chars(buffer.get() + position, nullptr,
-                                               double(v));
-      position = end - buffer.get();
-    }
-  }
-}
-
-simdjson_inline void
-string_builder::escape_and_append(std::string_view input) noexcept {
-  // escaping might turn a control character into \x00xx so 6 characters.
-  if (capacity_check(6 * input.size())) {
-    position += write_string_escaped(input, buffer.get() + position);
-  }
-}
-
-simdjson_inline void
-string_builder::escape_and_append_with_quotes(std::string_view input) noexcept {
-  // escaping might turn a control character into \x00xx so 6 characters.
-  if (capacity_check(2 + 6 * input.size())) {
-    buffer.get()[position++] = '"';
-    position += write_string_escaped(input, buffer.get() + position);
-    buffer.get()[position++] = '"';
-  }
-}
-
-simdjson_inline void
-string_builder::escape_and_append_with_quotes(char input) noexcept {
-  // escaping might turn a control character into \x00xx so 6 characters.
-  if (capacity_check(2 + 6 * 1)) {
-    buffer.get()[position++] = '"';
-    std::string_view cinput(&input, 1);
-    position += write_string_escaped(cinput, buffer.get() + position);
-    buffer.get()[position++] = '"';
-  }
-}
-
-simdjson_inline void string_builder::escape_and_append_with_quotes(const char* input)  noexcept {
-  std::string_view cinput(input);
-  escape_and_append_with_quotes(cinput);
-}
-
-simdjson_inline void string_builder::append_raw(const char *c) noexcept {
-  size_t len = std::strlen(c);
-  append_raw(c, len);
-}
-
-simdjson_inline void
-string_builder::append_raw(std::string_view input) noexcept {
-  if (capacity_check(input.size())) {
-    std::memcpy(buffer.get() + position, input.data(), input.size());
-    position += input.size();
-  }
-}
-
-simdjson_inline void string_builder::append_raw(const char *str,
-                                                size_t len) noexcept {
-  if (capacity_check(len)) {
-    std::memcpy(buffer.get() + position, str, len);
-    position += len;
-  }
-}
-
-#if SIMDJSON_EXCEPTIONS
-simdjson_inline string_builder::operator std::string() const noexcept(false) {
-  return std::string(std::string_view());
-}
-
-simdjson_inline string_builder::operator std::string_view() const
-    noexcept(false) simdjson_lifetime_bound {
-  return view();
-}
-#endif
-
-simdjson_inline simdjson_result<std::string_view>
-string_builder::view() const noexcept {
-  if (!is_valid) {
-    return simdjson::OUT_OF_CAPACITY;
-  }
-  return std::string_view(buffer.get(), position);
-}
-
-simdjson_inline simdjson_result<const char *> string_builder::c_str() noexcept {
-  if (capacity_check(1)) {
-    buffer.get()[position] = '\0';
-    return buffer.get();
-  }
-  return simdjson::OUT_OF_CAPACITY;
-}
-
-simdjson_inline bool string_builder::validate_unicode() const noexcept {
-  return simdjson::validate_utf8(buffer.get(), position);
-}
-
-simdjson_inline void string_builder::start_object()  noexcept {
-  if (capacity_check(1)) {
-    buffer.get()[position++] = '{';
-  }
-}
-
-
-simdjson_inline void string_builder::end_object()  noexcept {
-  if (capacity_check(1)) {
-    buffer.get()[position++] = '}';
-  }
-}
-
-
-simdjson_inline void string_builder::start_array()  noexcept {
-  if (capacity_check(1)) {
-    buffer.get()[position++] = '[';
-  }
-}
-
-
-simdjson_inline void string_builder::end_array()  noexcept {
-  if (capacity_check(1)) {
-    buffer.get()[position++] = ']';
-  }
-}
-
-
-simdjson_inline void string_builder::append_comma()  noexcept {
-  if (capacity_check(1)) {
-    buffer.get()[position++] = ',';
-  }
-}
-
-
-simdjson_inline void string_builder::append_colon()  noexcept {
-  if (capacity_check(1)) {
-    buffer.get()[position++] = ':';
-  }
-}
-
-template<typename key_type, typename value_type>
-simdjson_inline void string_builder::append_key_value(key_type key, value_type value) noexcept {
-  static_assert(
-    std::is_arithmetic<value_type>::value ||
-    std::is_same<value_type, char>::value ||
-    std::is_same<value_type, const char*>::value ||
-    std::is_convertible<value_type, std::string_view>::value ||
-    std::is_same<value_type, std::nullptr_t>::value,
-    "Unsupported value type");
-  static_assert(
-    std::is_same<key_type, const char*>::value ||
-    std::is_convertible<key_type, std::string_view>::value,
-    "Unsupported key type");
-  escape_and_append_with_quotes(key);
-  append_colon();
-  SIMDJSON_IF_CONSTEXPR(std::is_same<value_type, std::nullptr_t>::value) {
-    append_null();
-  } else SIMDJSON_IF_CONSTEXPR(std::is_same<value_type, char>::value) {
-    escape_and_append_with_quotes(value);
-  } else SIMDJSON_IF_CONSTEXPR(std::is_convertible<value_type, std::string_view>::value) {
-    escape_and_append_with_quotes(value);
-  } else SIMDJSON_IF_CONSTEXPR(std::is_same<value_type, const char*>::value) {
-    escape_and_append_with_quotes(value);
-  } else {
-    append(value);
-  }
+simdjson_inline size_t string_builder::size() const {
+  return is_valid ? position : 0;
 }

 } // namespace builder
 } // namespace SIMDJSON_IMPLEMENTATION
 } // namespace simdjson

-#endif // SIMDJSON_GENERIC_STRING_BUILDER_INL_H
+#endif // SIMDJSON_GENERIC_BUILDER_INL_H
@@ -2,10 +2,10 @@
 * This file is part of the builder API. It is temporarily in the ondemand directory
 * but we will move it to a builder directory later.
 */
-#ifndef SIMDJSON_GENERIC_STRING_BUILDER_H
+#ifndef SIMDJSON_GENERIC_BUILDER_H

 #ifndef SIMDJSON_CONDITIONAL_INCLUDE
-#define SIMDJSON_GENERIC_STRING_BUILDER_H
+#define SIMDJSON_GENERIC_BUILDER_H
 #include "simdjson/generic/implementation_simdjson_result_base.h"
 #endif // SIMDJSON_CONDITIONAL_INCLUDE

@@ -13,18 +13,22 @@ namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 namespace builder {

+//////////////////////////
+// TODO: at the end of the processing, possibly as an optional step, we should
+// validate the UTF-8 of the string.
+/////////////////////////
 /**
 * A builder for JSON strings representing documents. This is a low-level
 * builder that is not meant to be used directly by end-users. Though it
 * supports atomic types (Booleans, strings), it does not support composed
 * types (arrays and objects).
 *
- * Ultimately, this class can support kernel-specific optimizations. E.g.,
+ * Ultimately, this class should support kernel-specific optimizations. E.g.,
 * it may make use of SIMD instructions to escape strings faster.
 */
 class string_builder {
 public:
-  simdjson_inline string_builder(size_t initial_capacity = 1024);
+  simdjson_inline string_builder(size_t initial_capacity);

  /**
   * Append number (includes Booleans). Booleans are mapped to the strings
@@ -63,66 +67,17 @@ public:
   */
  simdjson_inline void escape_and_append_with_quotes(std::string_view input)  noexcept;

-  /**
-   * Append the character surrounded by double quotes, after escaping it.
-   * There is no UTF-8 validation.
-   */
-  simdjson_inline void escape_and_append_with_quotes(char input)  noexcept;
-
-  /**
-   * Append the character surrounded by double quotes, after escaping it.
-   * There is no UTF-8 validation.
-   */
-   simdjson_inline void escape_and_append_with_quotes(const char* input)  noexcept;
-
  /**
   * Append the C string directly, without escaping.
   * There is no UTF-8 validation.
   */
  simdjson_inline void append_raw(const char *c)  noexcept;

-  /**
-   * Append "{" to the buffer.
-   */
-  simdjson_inline void start_object()  noexcept;
-
-  /**
-   * Append "}" to the buffer.
-   */
-  simdjson_inline void end_object()  noexcept;
-
-  /**
-   * Append "[" to the buffer.
-   */
-  simdjson_inline void start_array()  noexcept;
-
-  /**
-   * Append "]" to the buffer.
-   */
-  simdjson_inline void end_array()  noexcept;
-
-  /**
-   * Append "," to the buffer.
-   */
-  simdjson_inline void append_comma()  noexcept;
-
-  /**
-   * Append ":" to the buffer.
-   */
-  simdjson_inline void append_colon()  noexcept;
-
-  /**
-   * Append a key-value pair to the buffer.
-   * The key is escaped and surrounded by double quotes.
-   * The value is escaped if it is a string.
-   */
-   template<typename key_type, typename value_type>
-  simdjson_inline void append_key_value(key_type key, value_type value) noexcept;
  /**
   * Append the std::string_view directly, without escaping.
   * There is no UTF-8 validation.
   */
-  simdjson_inline void append_raw(std::string_view input)  noexcept;
+  simdjson_inline void append_raw(std::string_view str)  noexcept;

  /**
   * Append len characters from str.
@@ -133,28 +88,19 @@ public:
  /**
   * Creates an std::string from the written JSON buffer.
   * Throws if memory allocation failed
-   *
-   * The result may not be valid UTF-8 if some of your content was not valid UTF-8.
-   * Use validate_unicode() to check the content if needed.
   */
  simdjson_inline operator std::string() const noexcept(false);

  /**
   * Creates an std::string_view from the written JSON buffer.
-   * Throws if memory allocation failed.
-   *
-   * The result may not be valid UTF-8 if some of your content was not valid UTF-8.
-   * Use validate_unicode() to check the content if needed.
+   * Throws if memory allocation failed
   */
-  simdjson_inline operator std::string_view() const noexcept(false) simdjson_lifetime_bound;
+  simdjson_inline operator std::string_view() const noexcept(false);
 #endif

  /**
   * Returns a view on the written JSON buffer. Returns an error
   * if memory allocation failed.
-   *
-   * The result may not be valid UTF-8 if some of your content was not valid UTF-8.
-   * Use validate_unicode() to check the content.
   */
  simdjson_inline simdjson_result<std::string_view> view() const noexcept;

@@ -162,23 +108,14 @@ public:
   * Appends the null character to the buffer and returns
   * a pointer to the beginning of the written JSON buffer.
   * Returns an error if memory allocation failed.
-   * The result is null-terminated.
-   *
-   * The result may not be valid UTF-8 if some of your content was not valid UTF-8.
-   * Use validate_unicode() to check the content.
   */
-  simdjson_inline simdjson_result<const char *> c_str() noexcept;
-
-  /**
-   * Return true if the content is valid UTF-8.
-   */
-  simdjson_inline bool validate_unicode() const noexcept;
+  simdjson_inline simdjson_result<const char *> c_str();

  /**
   * Returns the current size of the written JSON buffer.
   * If an error occurred, returns 0.
   */
-  simdjson_inline size_t size() const noexcept;
+  simdjson_inline size_t size() const;

 private:
  /**
@@ -194,15 +131,9 @@ private:
   * that this function would not be repeatedly called.
   */
  simdjson_inline void grow_buffer(size_t desired_capacity);
-
-  /**
-   * We use this helper function to make sure that is_valid is kept consistent.
-   */
-  simdjson_inline void set_valid(bool valid) noexcept;
-
-  std::unique_ptr<char[]> buffer{};
-  size_t position{0};
-  size_t capacity{0};
+  std::unique_ptr<char[]> buffer;
+  size_t position;
+  size_t capacity;
  bool is_valid{true};
 };

@@ -212,4 +143,4 @@ private:
 }
 } // namespace simdjson

-#endif // SIMDJSON_GENERIC_STRING_BUILDER_H
+#endif // SIMDJSON_GENERIC_BUILDER_H
@@ -271,7 +271,6 @@ simdjson_inline  simdjson_result<std::string_view> simdjson_result<SIMDJSON_IMPL
  if (error()) { return error(); }
  return first.raw_json();
 }
-
 } // namespace simdjson

 #endif // SIMDJSON_GENERIC_ONDEMAND_OBJECT_INL_H
@@ -202,36 +202,6 @@ public:
   */
  simdjson_inline simdjson_result<std::string_view> raw_json() noexcept;

-#if SIMDJSON_SUPPORTS_DESERIALIZATION
-  /**
-   * Get this object as the given type.
-   *
-   * @param out This is set to a value of the given type, parsed from the JSON. If there is an error, this may not be initialized.
-   * @returns INCORRECT_TYPE If the JSON object is not of the given type.
-   * @returns SUCCESS If the parse succeeded and the out parameter was set to the value.
-   */
-  template <typename T>
-  simdjson_inline error_code get(T &out)
-     noexcept(custom_deserializable<T, object> ? nothrow_custom_deserializable<T, object> : true) {
-    static_assert(custom_deserializable<T, object>);
-    return deserialize(*this, out);
-  }
-  /**
-   * Get this array as the given type.
-   *
-   * @returns A value of the given type, parsed from the JSON.
-   * @returns INCORRECT_TYPE If the JSON value is not the given type.
-   */
-  template <typename T>
-  simdjson_inline simdjson_result<T> get()
-    noexcept(custom_deserializable<T, value> ? nothrow_custom_deserializable<T, value> : true)
-  {
-    static_assert(std::is_default_constructible<T>::value, "The specified type is not default constructible.");
-    T out{};
-    SIMDJSON_TRY(get<T>(out));
-    return out;
-  }
-#endif // SIMDJSON_SUPPORTS_DESERIALIZATION
 protected:
  /**
   * Go to the end of the object, no matter where you are right now.
@@ -275,32 +245,12 @@ public:
  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;
  simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> at_path(std::string_view json_path) noexcept;
+
  inline simdjson_result<bool> reset() noexcept;
  inline simdjson_result<bool> is_empty() noexcept;
  inline simdjson_result<size_t> count_fields() & noexcept;
  inline simdjson_result<std::string_view> raw_json() noexcept;
-  #if SIMDJSON_SUPPORTS_DESERIALIZATION
-  // TODO: move this code into object-inl.h

-  template<typename T>
-  simdjson_inline simdjson_result<T> get() noexcept {
-    if (error()) { return error(); }
-    if constexpr (std::is_same_v<T, SIMDJSON_IMPLEMENTATION::ondemand::object>) {
-      return first;
-    }
-    return first.get<T>();
-  }
-  template<typename T>
-  simdjson_inline error_code get(T& out) noexcept {
-    if (error()) { return error(); }
-    if constexpr (std::is_same_v<T, SIMDJSON_IMPLEMENTATION::ondemand::object>) {
-      out = first;
-    } else {
-      SIMDJSON_TRY( first.get<T>(out) );
-    }
-    return SUCCESS;
-  }
-#endif // SIMDJSON_SUPPORTS_DESERIALIZATION
 };

 } // namespace simdjson
@@ -9,9 +9,6 @@
 #include "simdjson/generic/ondemand/object.h"
 #include "simdjson/generic/ondemand/serialization.h"
 #include "simdjson/generic/ondemand/value.h"
-#if SIMDJSON_STATIC_REFLECTION
-#include "simdjson/generic/ondemand/json_builder.h"
-#endif
 #endif // SIMDJSON_CONDITIONAL_INCLUDE

 namespace simdjson {
@@ -35,20 +35,6 @@ inline simdjson_result<std::string_view> to_json_string(simdjson_result<SIMDJSON
 inline simdjson_result<std::string_view> to_json_string(simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> x);
 inline simdjson_result<std::string_view> to_json_string(simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object> x);
 inline simdjson_result<std::string_view> to_json_string(simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array> x);
-
-#if SIMDJSON_STATIC_REFLECTION
-/**
- * Create a JSON string from any user-defined type using static reflection.
- * Only available when SIMDJSON_STATIC_REFLECTION is enabled.
- */
-template<typename T>
-  requires(!std::same_as<T, SIMDJSON_IMPLEMENTATION::ondemand::document> &&
-           !std::same_as<T, SIMDJSON_IMPLEMENTATION::ondemand::value> &&
-           !std::same_as<T, SIMDJSON_IMPLEMENTATION::ondemand::object> &&
-           !std::same_as<T, SIMDJSON_IMPLEMENTATION::ondemand::array>)
-inline std::string to_json_string(const T& obj);
-#endif
-
 } // namespace simdjson

 /**
@@ -3,17 +3,12 @@
 #ifndef SIMDJSON_ONDEMAND_DESERIALIZE_H
 #ifndef SIMDJSON_CONDITIONAL_INCLUDE
 #define SIMDJSON_ONDEMAND_DESERIALIZE_H
-#include "simdjson/generic/ondemand/object.h"
 #include "simdjson/generic/ondemand/array.h"
 #include "simdjson/generic/ondemand/base.h"
 #endif // SIMDJSON_CONDITIONAL_INCLUDE

 #include <concepts>
 #include <limits>
-#if SIMDJSON_STATIC_REFLECTION
-#include <meta>
-// #include <static_reflection> // for std::define_static_string - header not available yet
-#endif

 namespace simdjson {
 template <typename T>
@@ -60,22 +55,6 @@ error_code tag_invoke(deserialize_tag, auto &val, T &out) noexcept {
  return SUCCESS;
 }

-//////////////////////////////
-// String deserialization
-//////////////////////////////
-
-// just a character!
-error_code tag_invoke(deserialize_tag, auto &val, char &out) noexcept {
-  std::string_view x;
-  SIMDJSON_TRY(val.get_string().get(x));
-  if(x.size() != 1) {
-    return INCORRECT_TYPE;
-  }
-  out = x[0];
-  return SUCCESS;
-}
-
-// any string-like type (can be constructed from std::string_view)
 template <concepts::constructible_from_string_view T, typename ValT>
  requires(!require_custom_serialization<T>)
 error_code tag_invoke(deserialize_tag, ValT &val, T &out) noexcept(std::is_nothrow_constructible_v<T, std::string_view>) {
@@ -97,20 +76,15 @@ template <concepts::appendable_containers T, typename ValT>
  requires(!require_custom_serialization<T>)
 error_code tag_invoke(deserialize_tag, ValT &val, T &out) noexcept(false) {
  using value_type = typename std::remove_cvref_t<T>::value_type;
-  /*static_assert(
+  static_assert(
      deserializable<value_type, ValT>,
-      "The specified type inside the container must itself be deserializable");*/
+      "The specified type inside the container must itself be deserializable");
  static_assert(
      std::is_default_constructible_v<value_type>,
      "The specified type inside the container must default constructible.");

  SIMDJSON_IMPLEMENTATION::ondemand::array arr;
-  if constexpr (std::is_same_v<std::remove_cvref_t<ValT>, SIMDJSON_IMPLEMENTATION::ondemand::array>) {
-    arr = val;
-  } else {
-    SIMDJSON_TRY(val.get_array().get(arr));
-  }
-
+  SIMDJSON_TRY(val.get_array().get(arr));
  for (auto v : arr) {
    if constexpr (concepts::returns_reference<T>) {
      if (auto const err = v.get<value_type>().get(concepts::emplace_one(out));
@@ -167,45 +141,7 @@ error_code tag_invoke(deserialize_tag, ValT &val, T &out) noexcept(false) {
 return SUCCESS;
 }

-template <concepts::string_view_keyed_map T>
-error_code tag_invoke(deserialize_tag, SIMDJSON_IMPLEMENTATION::ondemand::object &obj, T &out) noexcept {
-  using value_type = typename std::remove_cvref_t<T>::mapped_type;

-  out.clear();
-  for (auto field : obj) {
-    std::string_view key;
-    SIMDJSON_TRY(field.unescaped_key().get(key));
-
-    SIMDJSON_IMPLEMENTATION::ondemand::value value_obj;
-    SIMDJSON_TRY(field.value().get(value_obj));
-
-    value_type this_value;
-    SIMDJSON_TRY(value_obj.get(this_value));
-    out.emplace(typename T::key_type(key), std::move(this_value));
-  }
-  return SUCCESS;
-}
-
-template <concepts::string_view_keyed_map T>
-error_code tag_invoke(deserialize_tag, SIMDJSON_IMPLEMENTATION::ondemand::value &val, T &out) noexcept {
-  SIMDJSON_IMPLEMENTATION::ondemand::object obj;
-  SIMDJSON_TRY(val.get_object().get(obj));
-  return simdjson::deserialize(obj, out);
-}
-
-template <concepts::string_view_keyed_map T>
-error_code tag_invoke(deserialize_tag, SIMDJSON_IMPLEMENTATION::ondemand::document &doc, T &out) noexcept {
-  SIMDJSON_IMPLEMENTATION::ondemand::object obj;
-  SIMDJSON_TRY(doc.get_object().get(obj));
-  return simdjson::deserialize(obj, out);
-}
-
-template <concepts::string_view_keyed_map T>
-error_code tag_invoke(deserialize_tag, SIMDJSON_IMPLEMENTATION::ondemand::document_reference &doc, T &out) noexcept {
-  SIMDJSON_IMPLEMENTATION::ondemand::object obj;
-  SIMDJSON_TRY(doc.get_object().get(obj));
-  return simdjson::deserialize(obj, out);
-}


 /**
@@ -248,16 +184,17 @@ error_code tag_invoke(deserialize_tag, ValT &val, T &out) noexcept(nothrow_deser
 /**
 * This CPO (Customization Point Object) will help deserialize into optional types.
 */
-template <concepts::optional_type T>
+template <concepts::optional_type T, typename ValT>
  requires(!require_custom_serialization<T>)
-error_code tag_invoke(deserialize_tag, auto &val, T &out) noexcept(nothrow_deserializable<typename std::remove_cvref_t<T>::value_type, decltype(val)>) {
+error_code tag_invoke(deserialize_tag, ValT &val, T &out) noexcept(nothrow_deserializable<typename std::remove_cvref_t<T>::value_type, ValT>) {
  using value_type = typename std::remove_cvref_t<T>::value_type;

-  // Check if the value is null
-  if (val.is_null()) {
-    out.reset(); // Set to nullopt
-    return SUCCESS;
-  }
+  static_assert(
+      deserializable<value_type, ValT>,
+      "The specified type inside the unique_ptr must itself be deserializable");
+  static_assert(
+      std::is_default_constructible_v<value_type>,
+      "The specified type inside the unique_ptr must default constructible.");

  if (!out) {
    out.emplace();
@@ -266,319 +203,6 @@ error_code tag_invoke(deserialize_tag, auto &val, T &out) noexcept(nothrow_deser
  return SUCCESS;
 }

-
-#if SIMDJSON_STATIC_REFLECTION
-
-
-template <typename T>
-constexpr bool user_defined_type = (std::is_class_v<T>
-&& !std::is_same_v<T, std::string> && !std::is_same_v<T, std::string_view> && !concepts::optional_type<T> &&
-!concepts::appendable_containers<T> && !require_custom_serialization<T>);
-
-
-// workaround from
-// https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2024/p2996r10.html#back-and-forth
-// for missing expansion statements
-namespace __impl {
-  template<auto... vals>
-  struct replicator_type {
-    template<typename F>
-      constexpr void operator>>(F body) const {
-        (body.template operator()<vals>(), ...);
-      }
-  };
-
-  template<auto... vals>
-  replicator_type<vals...> replicator = {};
-}
-
-template<typename R>
-consteval auto expand(R range) {
-  std::vector<std::meta::info> args;
-  for (auto r : range) {
-    args.push_back(reflect_constant(r));
-  }
-  return substitute(^^__impl::replicator, args);
-}
-// end of workaround
-
-template <typename T, typename ValT>
-  requires(user_defined_type<T> && std::is_class_v<T>)
-error_code tag_invoke(deserialize_tag, ValT &val, T &out) noexcept {
-  SIMDJSON_IMPLEMENTATION::ondemand::object obj;
-  if constexpr (std::is_same_v<std::remove_cvref_t<ValT>, SIMDJSON_IMPLEMENTATION::ondemand::object>) {
-    obj = val;
-  } else {
-    SIMDJSON_TRY(val.get_object().get(obj));
-  }
-  error_code e = simdjson::SUCCESS;
-
-  [:expand(std::meta::nonstatic_data_members_of(^^T, std::meta::access_context::unchecked())):] >> [&]<auto mem>() {
-    if constexpr (!std::meta::is_const(mem) && std::meta::is_public(mem)) {
-      constexpr std::string_view key = std::define_static_string(std::meta::identifier_of(mem));
-      // Note: removed static assert as optional types are now handled generically
-      // as long we are succesful or the field is not found, we continue
-      if(e == simdjson::SUCCESS || e == simdjson::NO_SUCH_FIELD) {
-        e = obj[key].get(out.[:mem:]);
-      }
-    }
-  };
-  return e;
-}
-
-// Support for enum deserialization - deserialize from string representation using expand approach from P2996R12
-template <typename T, typename ValT>
-  requires(std::is_enum_v<T>)
-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));
-
-  bool found = false;
-  [:expand(std::meta::enumerators_of(^^T)):] >> [&]<auto enum_val>{
-    if (!found && str == std::meta::identifier_of(enum_val)) {
-      out = [:enum_val:];
-      found = true;
-    }
-  };
-
-  return found ? SUCCESS : INCORRECT_TYPE;
-#else
-  // Fallback: deserialize as integer if reflection not available
-  std::underlying_type_t<T> int_val;
-  SIMDJSON_TRY(val.get(int_val));
-  out = static_cast<T>(int_val);
-  return SUCCESS;
-#endif
-}
-
-template <typename simdjson_value, typename T>
-  requires(user_defined_type<std::remove_cvref_t<T>>)
-error_code tag_invoke(deserialize_tag, simdjson_value &val, std::unique_ptr<T> &out) noexcept {
-  if (!out) {
-    out = std::make_unique<T>();
-    if (!out) {
-      return MEMALLOC;
-    }
-  }
-  if (auto err = val.get(*out)) {
-    out.reset();
-    return err;
-  }
-  return SUCCESS;
-}
-
-template <typename simdjson_value, typename T>
-  requires(user_defined_type<std::remove_cvref_t<T>>)
-error_code tag_invoke(deserialize_tag, simdjson_value &val, std::shared_ptr<T> &out) noexcept {
-  if (!out) {
-    out = std::make_shared<T>();
-    if (!out) {
-      return MEMALLOC;
-    }
-  }
-  if (auto err = val.get(*out)) {
-    out.reset();
-    return err;
-  }
-  return SUCCESS;
-}
-
-#endif // SIMDJSON_STATIC_REFLECTION
-
-////////////////////////////////////////
-// Unique pointers
-////////////////////////////////////////
-error_code tag_invoke(deserialize_tag, auto &val, std::unique_ptr<bool> &out) noexcept {
-  if (val.is_null()) {
-    out.reset();
-    return SUCCESS;
-  }
-  if (!out) {
-    out = std::make_unique<bool>();
-    if (!out) { return MEMALLOC; }
-  }
-  SIMDJSON_TRY(val.get_bool().get(*out));
-  return SUCCESS;
-}
-
-error_code tag_invoke(deserialize_tag, auto &val, std::unique_ptr<int64_t> &out) noexcept {
-  if (val.is_null()) {
-    out.reset();
-    return SUCCESS;
-  }
-  if (!out) {
-    out = std::make_unique<int64_t>();
-    if (!out) { return MEMALLOC; }
-  }
-  SIMDJSON_TRY(val.get_int64().get(*out));
-  return SUCCESS;
-}
-
-error_code tag_invoke(deserialize_tag, auto &val, std::unique_ptr<uint64_t> &out) noexcept {
-  if (val.is_null()) {
-    out.reset();
-    return SUCCESS;
-  }
-  if (!out) {
-    out = std::make_unique<uint64_t>();
-    if (!out) { return MEMALLOC; }
-  }
-  SIMDJSON_TRY(val.get_uint64().get(*out));
-  return SUCCESS;
-}
-
-error_code tag_invoke(deserialize_tag, auto &val, std::unique_ptr<double> &out) noexcept {
-  if (val.is_null()) {
-    out.reset();
-    return SUCCESS;
-  }
-  if (!out) {
-    out = std::make_unique<double>();
-    if (!out) { return MEMALLOC; }
-  }
-  SIMDJSON_TRY(val.get_double().get(*out));
-  return SUCCESS;
-}
-
-error_code tag_invoke(deserialize_tag, auto &val, std::unique_ptr<std::string_view> &out) noexcept {
-  if (val.is_null()) {
-    out.reset();
-    return SUCCESS;
-  }
-  if (!out) {
-    out = std::make_unique<std::string_view>();
-    if (!out) { return MEMALLOC; }
-  }
-  SIMDJSON_TRY(val.get_string().get(*out));
-  return SUCCESS;
-}
-
-
-////////////////////////////////////////
-// Shared pointers
-////////////////////////////////////////
-error_code tag_invoke(deserialize_tag, auto &val, std::shared_ptr<bool> &out) noexcept {
-  if (val.is_null()) {
-    out.reset();
-    return SUCCESS;
-  }
-  if (!out) {
-    out = std::make_shared<bool>();
-    if (!out) { return MEMALLOC; }
-  }
-  SIMDJSON_TRY(val.get_bool().get(*out));
-  return SUCCESS;
-}
-
-error_code tag_invoke(deserialize_tag, auto &val, std::shared_ptr<int64_t> &out) noexcept {
-  if (val.is_null()) {
-    out.reset();
-    return SUCCESS;
-  }
-  if (!out) {
-    out = std::make_shared<int64_t>();
-    if (!out) { return MEMALLOC; }
-  }
-  SIMDJSON_TRY(val.get_int64().get(*out));
-  return SUCCESS;
-}
-
-error_code tag_invoke(deserialize_tag, auto &val, std::shared_ptr<uint64_t> &out) noexcept {
-  if (val.is_null()) {
-    out.reset();
-    return SUCCESS;
-  }
-  if (!out) {
-    out = std::make_shared<uint64_t>();
-    if (!out) { return MEMALLOC; }
-  }
-  SIMDJSON_TRY(val.get_uint64().get(*out));
-  return SUCCESS;
-}
-
-error_code tag_invoke(deserialize_tag, auto &val, std::shared_ptr<double> &out) noexcept {
-  if (val.is_null()) {
-    out.reset();
-    return SUCCESS;
-  }
-  if (!out) {
-    out = std::make_shared<double>();
-    if (!out) { return MEMALLOC; }
-  }
-  SIMDJSON_TRY(val.get_double().get(*out));
-  return SUCCESS;
-}
-
-error_code tag_invoke(deserialize_tag, auto &val, std::shared_ptr<std::string_view> &out) noexcept {
-  if (val.is_null()) {
-    out.reset();
-    return SUCCESS;
-  }
-  if (!out) {
-    out = std::make_shared<std::string_view>();
-    if (!out) { return MEMALLOC; }
-  }
-  SIMDJSON_TRY(val.get_string().get(*out));
-  return SUCCESS;
-}
-
-
-////////////////////////////////////////
-// Explicit optional specializations
-////////////////////////////////////////
-
-////////////////////////////////////////
-// Explicit smart pointer specializations for string and int types
-////////////////////////////////////////
-error_code tag_invoke(deserialize_tag, auto &val, std::unique_ptr<std::string> &out) noexcept {
-  // Check if the value is null
-  if (val.is_null()) {
-    out.reset(); // Set to nullptr
-    return SUCCESS;
-  }
-
-  if (!out) {
-    out = std::make_unique<std::string>();
-  }
-  std::string_view str;
-  SIMDJSON_TRY(val.get_string().get(str));
-  *out = std::string{str};
-  return SUCCESS;
-}
-
-error_code tag_invoke(deserialize_tag, auto &val, std::shared_ptr<std::string> &out) noexcept {
-  // Check if the value is null
-  if (val.is_null()) {
-    out.reset(); // Set to nullptr
-    return SUCCESS;
-  }
-
-  if (!out) {
-    out = std::make_shared<std::string>();
-  }
-  std::string_view str;
-  SIMDJSON_TRY(val.get_string().get(str));
-  *out = std::string{str};
-  return SUCCESS;
-}
-
-error_code tag_invoke(deserialize_tag, auto &val, std::unique_ptr<int> &out) noexcept {
-  // Check if the value is null
-  if (val.is_null()) {
-    out.reset(); // Set to nullptr
-    return SUCCESS;
-  }
-
-  if (!out) {
-    out = std::make_unique<int>();
-  }
-  int64_t temp;
-  SIMDJSON_TRY(val.get_int64().get(temp));
-  *out = static_cast<int>(temp);
-  return SUCCESS;
-}
-
 } // namespace simdjson

 #endif // SIMDJSON_ONDEMAND_DESERIALIZE_H
@@ -34,7 +34,6 @@ public:
   *
   * You may use get_double(), get_bool(), get_uint64(), get_int64(),
   * get_object(), get_array(), get_raw_json_string(), or get_string() instead.
-   * When SIMDJSON_SUPPORTS_DESERIALIZATION is set, custom types are also supported.
   *
   * @returns A value of the given type, parsed from the JSON.
   * @returns INCORRECT_TYPE If the JSON value is not the given type.
@@ -58,7 +57,6 @@ public:
   * Get this value as the given type.
   *
   * Supported types: object, array, raw_json_string, string_view, uint64_t, int64_t, double, bool
-   * If the macro SIMDJSON_SUPPORTS_DESERIALIZATION is set, then custom types are also supported.
   *
   * @param out This is set to a value of the given type, parsed from the JSON. If there is an error, this may not be initialized.
   * @returns INCORRECT_TYPE If the JSON value is not an object.
@@ -75,19 +73,6 @@ public:
  #if SIMDJSON_SUPPORTS_DESERIALIZATION
  if constexpr (custom_deserializable<T, value>) {
      return deserialize(*this, out);
-  } else if constexpr (concepts::optional_type<T>) {
-      using value_type = typename std::remove_cvref_t<T>::value_type;
-
-      // Check if the value is null
-      if (is_null()) {
-        out.reset(); // Set to nullopt
-        return SUCCESS;
-      }
-
-      if (!out) {
-        out.emplace();
-      }
-      return get<value_type>(out.value());
  } else {
    static_assert(!sizeof(T), "The get<T> method with type T is not implemented by the simdjson library. "
      "And you do not seem to have added support for it. Indeed, we have that "
@@ -41,31 +41,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 32;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    uint64_t((is_backslash | is_quote | is_control).to_bitmask())
-  };
-}
-
 } // unnamed namespace
 } // namespace haswell
 } // namespace simdjson
@@ -77,6 +77,7 @@ namespace simd {
    friend simdjson_really_inline uint64_t operator==(const simd8<T> lhs, const simd8<T> rhs) {
      return _mm512_cmpeq_epi8_mask(lhs, rhs);
    }
+
    static const int SIZE = sizeof(base<T>::value);

    template<int N=1>
@@ -41,35 +41,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 64;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(uint64_t(escape_bits)); }
-
-  __mmask64 escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  __mmask64 is_quote = _mm512_cmpeq_epi8_mask(v, _mm512_set1_epi8('"'));
-  __mmask64 is_backslash = _mm512_cmpeq_epi8_mask(v, _mm512_set1_epi8('\\'));
-  __mmask64 is_control = _mm512_cmplt_epi8_mask(v, _mm512_set1_epi8(32));
-  return {
-    (is_backslash | is_quote | is_control)
-  };
-}
-
-
-
-
 } // unnamed namespace
 } // namespace icelake
 } // namespace simdjson
@@ -40,31 +40,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

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

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    (is_backslash | is_quote | is_control).to_bitmask()
-  };
-}
-
 } // unnamed namespace
 } // namespace lsx
 } // namespace simdjson
@@ -8,32 +8,6 @@ namespace simdjson {
   * @copydoc simdjson::builtin::ondemand
   */
  namespace ondemand = builtin::ondemand;
-  /**
-   * @copydoc simdjson::builtin::builder
-   */
-  namespace builder = builtin::builder;
-
-#if SIMDJSON_STATIC_REFLECTION
-  /**
-   * Create a JSON string from any user-defined type using static reflection.
-   * Only available when SIMDJSON_STATIC_REFLECTION is enabled.
-   */
-  template<typename T>
-    requires(!std::same_as<T, builtin::ondemand::document> &&
-             !std::same_as<T, builtin::ondemand::value> &&
-             !std::same_as<T, builtin::ondemand::object> &&
-             !std::same_as<T, builtin::ondemand::array>)
-  inline std::string to_json_string(const T& obj) {
-    builder::string_builder str_builder;
-    append(str_builder, obj);
-    std::string_view view;
-    if (str_builder.view().get(view) == SUCCESS) {
-      return std::string(view);
-    }
-    return "";
-  }
-#endif
-
 } // namespace simdjson

 #endif // SIMDJSON_ONDEMAND_H
@@ -125,9 +125,9 @@ inline const char *padded_string::data() const noexcept { return data_ptr; }

 inline char *padded_string::data() noexcept { return data_ptr; }

-inline padded_string::operator std::string_view() const simdjson_lifetime_bound { return std::string_view(data(), length()); }
+inline padded_string::operator std::string_view() const { return std::string_view(data(), length()); }

-inline padded_string::operator padded_string_view() const noexcept simdjson_lifetime_bound {
+inline padded_string::operator padded_string_view() const noexcept {
  return padded_string_view(data(), length(), length() + SIMDJSON_PADDING);
 }

@@ -58,32 +58,6 @@ backslash_and_quote::copy_and_find(const uint8_t *src, uint8_t *dst) {
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    // We store it as a 64-bit bitmask even though we only need 16 bits.
-    uint64_t((is_backslash | is_quote | is_control).to_bitmask())
-  };
-}
-
 } // unnamed namespace
 } // namespace ppc64
 } // namespace simdjson
@@ -4,18 +4,18 @@
 #define SIMDJSON_SIMDJSON_VERSION_H

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

 namespace simdjson {
 enum {
  /**
   * The major version (MAJOR.minor.revision) of simdjson being used.
   */
-  SIMDJSON_VERSION_MAJOR = 4,
+  SIMDJSON_VERSION_MAJOR = 3,
  /**
   * The minor version (major.MINOR.revision) of simdjson being used.
   */
-  SIMDJSON_VERSION_MINOR = 0,
+  SIMDJSON_VERSION_MINOR = 13,
  /**
   * The revision (major.minor.REVISION) of simdjson being used.
   */
@@ -40,31 +40,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    uint64_t((is_backslash | is_quote | is_control).to_bitmask())
-  };
-}
-
 } // unnamed namespace
 } // namespace westmere
 } // namespace simdjson
@@ -1,7 +1,6 @@
 # The bulk of our data files is found in https://github.com/simdjson/simdjson-data
 set(EXAMPLE_JSON ${CMAKE_CURRENT_BINARY_DIR}/twitter.json PARENT_SCOPE)
 set(EXAMPLE_NDJSON ${CMAKE_CURRENT_BINARY_DIR}/amazon_cellphones.ndjson PARENT_SCOPE)
-set(BENCH_CITM_JSON ${CMAKE_CURRENT_BINARY_DIR}/citm_catalog.json PARENT_SCOPE)

 # Copy static files to the build dir so they live alongside the generated ones
 file(GLOB_RECURSE example_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.json *.ndjson)
@@ -1,46 +0,0 @@
-# Stage 1. Check out LLVM source code and run the build.
-FROM debian:12 AS builder
-# First, Update the apt's source list and include the sources of the packages.
-RUN grep deb /etc/apt/sources.list | \
-    sed 's/^deb/deb-src /g' >> /etc/apt/sources.list
-# Install compiler, python and subversion.
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ca-certificates gnupg \
-           build-essential cmake make python3 zlib1g wget subversion unzip ninja-build git linux-perf && \
-    rm -rf /var/lib/apt/lists/*
-ARG CLANG_COMMIT=d77eff1cbd78fd065668acf93b1f5f400d39134d
-RUN git clone --depth=1 https://github.com/bloomberg/clang-p2996.git /tmp/clang-source && \
-    cd /tmp/clang-source && \
-    git fetch origin $CLANG_COMMIT --depth=1 && \
-    git checkout $CLANG_COMMIT
-RUN cmake -S /tmp/clang-source/llvm -B /tmp/clang-source/build-llvm -DCMAKE_BUILD_TYPE=Release \
-    -DLLVM_ENABLE_ASSERTIONS=ON \
-    -DLLVM_UNREACHABLE_OPTIMIZE=ON \
-    -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
-    -DCLANG_DEFAULT_CXX_STDLIB=libc++ \
-    -DLLVM_ENABLE_PROJECTS=clang -G Ninja
-RUN cmake --build /tmp/clang-source/build-llvm -j
-RUN cmake --install /tmp/clang-source/build-llvm --prefix /tmp/clang-install
-
-
-# Stage 2. Produce a minimal release image with build results.
-FROM debian:12
-ARG USER_NAME
-ARG USER_ID
-ARG GROUP_ID
-LABEL maintainer "LLVM Developers"
-# Install packages for minimal useful image.
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends build-essential  ca-certificates rust-all libcurl4-openssl-dev cmake make wget python3 python3-dev sudo curl ninja-build vim git binutils linux-perf && \
-    rm -rf /var/lib/apt/lists/*
-# Copy build results of stage 1 to /usr/local.
-COPY --from=builder /tmp/clang-install/ /usr/local/
-RUN P=`/usr/local/bin/clang++ -v 2>&1 | grep Target | cut -d' ' -f2-`; echo /usr/local/lib/$P > /etc/ld.so.conf.d/$P.conf
-RUN ldconfig
-RUN addgroup --gid $GROUP_ID user; exit 0
-RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID $USER_NAME; exit 0
-RUN echo "$USER_NAME:$USER_NAME" | chpasswd && adduser $USER_NAME sudo
-RUN echo '----->'
-RUN echo 'root:Docker!' | chpasswd
-ENV TERM xterm-256color
-USER $USER_NAME
@@ -1,80 +0,0 @@
-# Building the experimental LLVM compiler for static reflection
-
-The simdjson has experimental support for static reflection, when the compiler supports it.
-We focus on the [latest p2996 paper](https://isocpp.org/files/papers/P2996R10.html) that is targeting C++26.
-
-## Current status
-There are 2 versions of compiler that aim to support the C++26 reflection paper ([p2996](https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2024/p2996r10.html)).
-
-1. [Clang-p2996 llvm branch](https://github.com/bloomberg/clang-p2996/tree/p2996) that open-source and available in the [Compiler Explorer](https://godbolt.org/z/eoEej3E6j).
-2. EDG reflection branch that is only publicly available in the [Compiler Explorer](https://godbolt.org).
-
-For now, we will resort to #1, since it is open-source.
-
-We are excited to hear that this reflection proposal seems to be on-track for C++26. [As per Herb Sutter](https://herbsutter.com/2024/03/22/trip-report-winter-iso-c-standards-meeting-tokyo-japan/).
-
-## Instructions for building simdjson for static reflection (using docker)
-
-We are assuming that you are running Linux or macOS. We recommend that Windows users rely on WSL.
-
-Follow the following two steps:
-
-1. Clone the project
-
-```bash
-git clone https://github.com/simdjson/simdjson.git
-cd simdjson
-```
-
-As of March 2025, support for static reflection is available only in the `json_builder_init` branch, so you should switch:
-
-```bash
-git checkout -B json_builder_init
-```
-
-2. Make sure that you have [docker installed and running](https://docs.docker.com/engine/install/) on your system. Most Linux distributions support docker though some (like RedHat) have the equivalent (Podman). Users of Apple systems may want to [consider OrbStack](https://orbstack.dev). You do not need to familiar with docker, you just need to make sure that you are have it running.
-
-3. While inside the `simdjson` repository, run the following bash script:
-
-```bash
-bash ./p2996/run_docker.sh bash
-```
-
-This will enter a bash shell with access to the repo directory. Note that this will take some time when running it for the first time, since the specific container image has to be built.
-
-This step builds and executes a docker container defined by our Dockerfile which provides the necessary environment.
-
-Importantly, we build the experimental LLVM compiler based on the current state of the
-`p2996` branch of the `https://github.com/bloomberg/clang-p2996.git` repository. It is possible that the build could fail. Furthermore, you may need to refresh the build from time to time. We provide a script which allows you to delete the docker image you have built (`bash ./p2996/remove_docker.sh`) so you can start anew.
-
-
-
-
-4. While inside the docker shell, configure the build system with cmake:
-```bash
-CXX=clang++ cmake -B buildreflect -D SIMDJSON_STATIC_REFLECTION=ON -DSIMDJSON_DEVELOPER_MODE=ON
-```
-This only needs to be done once.
-
-5. Build the code...
-```bash
-cmake --build buildreflect --target benchmark_serialization_citm_catalog benchmark_serialization_twitter
-```
-
-
-6. Run the tests...
-```bash
-cmake --build buildreflect
-ctest --test-dir buildreflect --output-on-failure
-```
-
-7. Run the benchmarks.
-```bash
-./buildreflect/benchmark/static_reflect/citm_catalog_benchmark/benchmark_serialization_citm_catalog
-./buildreflect/benchmark/static_reflect/twitter_benchmark/benchmark_serialization_twitter
-```
-
-You can modify the source code with your favorite editor and run again steps 5 (Build the code) and 6 (Run the tests) and 7 (Run the benchmark). Importantly, you should remain in the docker shell.
-
-You can create a new docker shell at any time by running step 3 (bash script).
-
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-tuser=$(echo $USER | tr -dc 'a-z')
-container_name=${CONTAINER_NAME:-"debian12-clang-p2996-programming_station-for-$tuser-simdjson"}
-echo $container_name
-echo " Removing the container "
-docker ps -a | awk '{ print $1,$2 }' | grep $container_name| awk '{print $1 }' | xargs -I {} docker stop -t 1 {} | xargs docker rm
-# removing image
-docker image rm $container_name
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$1" ]
-  then
-    echo "The run-docker-station script takes a command as a argument. E.g., try ./run-docker-station 'ls' "
-    exit 1
-fi
-
-set -o noglob
-SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
-
-COMMAND=$@
-
-tuser=$(echo $USER | tr -dc 'a-z')
-
-container_name=${CONTAINER_NAME:-"debian12-clang-p2996-programming_station-for-$tuser-simdjson"}
-
-command -v docker >/dev/null 2>&1 || { echo >&2 "Please install docker. E.g., go to https://www.docker.com/products/docker-desktop Type 'docker' to diagnose the problem."; exit 1; }
-
-docker info >/dev/null 2>&1 || { echo >&2 "Docker server is not running? type 'docker info'."; exit 1; }
-
-SSHPARAM=""
-[ -e "${SSH_AUTH_SOCK}" ] && SSHPARAM="--volume /run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock  --env SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock"
-[ -e "${HOME}/.ssh" ] && SSHPARAM="--volume ${HOME}/.ssh:/home/$tuser/.ssh:ro"
-
-
-docker image inspect $container_name >/dev/null 2>&1 || ( echo "instantiating the container" ; docker build --no-cache -t $container_name -f $SCRIPTPATH/Dockerfile --build-arg USER_NAME="$tuser"  --build-arg USER_ID=$(id -u)  --build-arg GROUP_ID=$(id -g) .  )
-
-if [ -t 0 ]; then DOCKER_ARGS=-it; fi
-docker run --rm $DOCKER_ARGS -h $container_name $SSHPARAM -v $(pwd):$(pwd):Z --privileged  -w $(pwd)  $container_name sh -c "$COMMAND"
@@ -296,10 +296,10 @@ class SimdjsonRepository:

 class Amalgamator:
    @classmethod
-    def amalgamate(cls, output_path: str, filename: str, roots: List[RelativeRoot], timestamp: str, version: str):
+    def amalgamate(cls, output_path: str, filename: str, roots: List[RelativeRoot], timestamp: str):
        print(f"Creating {output_path}")
        fid = open(output_path, 'w')
-        print(f"/* auto-generated on {timestamp}. version {version} Do not edit! */", file=fid)
+        print(f"/* auto-generated on {timestamp}. Do not edit! */", file=fid)
        amalgamator = cls(fid, SimdjsonRepository(PROJECTPATH, roots))
        file = amalgamator.repository[filename]
        assert file, f"{filename} not found in {[os.path.join(PROJECTPATH, root) for root in roots]}!"
@@ -480,13 +480,8 @@ AMAL_C = os.path.join(AMALGAMATE_OUTPUT_PATH, "simdjson.cpp")
 DEMOCPP = os.path.join(AMALGAMATE_OUTPUT_PATH, "amalgamate_demo.cpp")
 README = os.path.join(AMALGAMATE_OUTPUT_PATH, "README.md")

-def read_version():
-    with open(os.path.join(PROJECTPATH, 'include/simdjson/simdjson_version.h')) as f:
-        return re.search(r'\d+\.\d+\.\d+', f.read()).group(0)
-
-version = read_version()
-Amalgamator.amalgamate(AMAL_H, "simdjson.h", ['include'], timestamp, version).validate_all_files_used('include')
-Amalgamator.amalgamate(AMAL_C, "simdjson.cpp", ['src', 'include'], timestamp, version).validate_all_files_used('src')
+Amalgamator.amalgamate(AMAL_H, "simdjson.h", ['include'], timestamp).validate_all_files_used('include')
+Amalgamator.amalgamate(AMAL_C, "simdjson.cpp", ['src', 'include'], timestamp).validate_all_files_used('src')

 # copy the README and DEMOCPP
 if SCRIPTPATH != AMALGAMATE_OUTPUT_PATH:
@@ -1,4 +1,4 @@
-/* auto-generated on 2025-08-05 16:29:59 +0000. version 4.0.0 Do not edit! */
+/* auto-generated on 2025-07-14 11:45:25 -0400. Do not edit! */
 /* including simdjson.cpp:  */
 /* begin file simdjson.cpp */
 #define SIMDJSON_SRC_SIMDJSON_CPP
@@ -77,31 +77,12 @@
 #endif
 #endif

-#ifndef SIMDJSON_CONSTEXPR_LAMBDA
-#if SIMDJSON_CPLUSPLUS17
-#define SIMDJSON_CONSTEXPR_LAMBDA constexpr
-#else
-#define SIMDJSON_CONSTEXPR_LAMBDA
-#endif
-#endif
-
-
-
 #ifdef __has_include
 #if __has_include(<version>)
 #include <version>
 #endif
 #endif

-// The current specification is unclear on how we detect
-// static reflection, both __cpp_lib_reflection and
-// __cpp_impl_reflection are proposed in the draft specification.
-// For now, we disable static reflect by default. It must be
-// specified at compiler time.
-#ifndef SIMDJSON_STATIC_REFLECTION
-#define SIMDJSON_STATIC_REFLECTION 0 // disabled by default.
-#endif
-
 #if defined(__apple_build_version__)
 #if __apple_build_version__ < 14000000
 #define SIMDJSON_CONCEPT_DISABLED 1 // apple-clang/13 doesn't support std::convertible_to
@@ -120,14 +101,6 @@
 #define SIMDJSON_SUPPORTS_DESERIALIZATION 0
 #endif // defined(__cpp_concepts) && !defined(SIMDJSON_CONCEPT_DISABLED)

-#if !defined(SIMDJSON_CONSTEVAL)
-#if defined(__cpp_consteval) && __cpp_consteval >= 201811L
-#define SIMDJSON_CONSTEVAL 1
-#else
-#define SIMDJSON_CONSTEVAL 0
-#endif // defined(__cpp_consteval) && __cpp_consteval >= 201811L
-#endif // !defined(SIMDJSON_CONSTEVAL)
-
 #endif // SIMDJSON_COMPILER_CHECK_H
 /* end file simdjson/compiler_check.h */
 /* including simdjson/portability.h: #include "simdjson/portability.h" */
@@ -577,6 +550,17 @@ double from_chars(const char *first, const char* end) noexcept;
    // We assume by default static linkage
    #define SIMDJSON_DLLIMPORTEXPORT
    #endif
+
+/**
+ * Workaround for the vcpkg package manager. Only vcpkg should
+ * ever touch the next line. The SIMDJSON_USING_LIBRARY macro is otherwise unused.
+ */
+#if SIMDJSON_USING_LIBRARY
+#define SIMDJSON_DLLIMPORTEXPORT __declspec(dllimport)
+#endif
+/**
+ * End of workaround for the vcpkg package manager.
+ */
 #else
    #define SIMDJSON_DLLIMPORTEXPORT
 #endif
@@ -2433,18 +2417,6 @@ namespace std {
 #define SIMDJSON_AVX512_ALLOWED 1
 #endif

-
-#ifndef __has_cpp_attribute
-#define simdjson_lifetime_bound
-#elif __has_cpp_attribute(msvc::lifetimebound)
-#define simdjson_lifetime_bound [[msvc::lifetimebound]]
-#elif __has_cpp_attribute(clang::lifetimebound)
-#define simdjson_lifetime_bound [[clang::lifetimebound]]
-#elif __has_cpp_attribute(lifetimebound)
-#define simdjson_lifetime_bound [[lifetimebound]]
-#else
-#define simdjson_lifetime_bound
-#endif
 #endif // SIMDJSON_COMMON_DEFS_H
 /* end file simdjson/common_defs.h */
 /* skipped duplicate #include "simdjson/compiler_check.h" */
@@ -2501,8 +2473,7 @@ enum error_code {
  SCALAR_DOCUMENT_AS_VALUE,   ///< A scalar document is treated as a value.
  OUT_OF_BOUNDS,              ///< Attempted to access location outside of document.
  TRAILING_CONTENT,           ///< Unexpected trailing content in the JSON input
-  OUT_OF_CAPACITY,            ///< The capacity was exceeded, we cannot allocate enough memory.
-  NUM_ERROR_CODES             ///< Placeholder for end of error code list.
+  NUM_ERROR_CODES
 };

 /**
@@ -2909,6 +2880,7 @@ concept optional_type = requires(std::remove_cvref_t<T> obj) {
  { obj.value() } -> std::same_as<typename std::remove_cvref_t<T>::value_type&>;
  requires requires(typename std::remove_cvref_t<T>::value_type &&val) {
    obj.emplace(std::move(val));
+    obj = std::move(val);
    {
      obj.value_or(val)
    } -> std::convertible_to<typename std::remove_cvref_t<T>::value_type>;
@@ -8247,12 +8219,6 @@ namespace {
      tmp = vpaddq_u8(tmp, tmp);
      return vgetq_lane_u16(vreinterpretq_u16_u8(tmp), 0);
    }
-    // Returns 4-bit out of each byte, alternating between the high 4 bits and low
-    // bits result it is 64 bit.
-    simdjson_inline uint64_t to_bitmask64() const {
-      return vget_lane_u64(
-          vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(*this), 4)), 0);
-    }
    simdjson_inline bool any() const { return vmaxvq_u32(vreinterpretq_u32_u8(*this)) != 0; }
  };

@@ -8329,7 +8295,7 @@ namespace {

    // Bit-specific operations
    simdjson_inline simd8<bool> any_bits_set(simd8<uint8_t> bits) const { return vtstq_u8(*this, bits); }
-    simdjson_inline bool any_bits_set_anywhere() const { return vmaxvq_u32(vreinterpretq_u32_u8(*this)) != 0; }
+    simdjson_inline bool any_bits_set_anywhere() const { return this->max_val() != 0; }
    simdjson_inline bool any_bits_set_anywhere(simd8<uint8_t> bits) const { return (*this & bits).any_bits_set_anywhere(); }
    template<int N>
    simdjson_inline simd8<uint8_t> shr() const { return vshrq_n_u8(*this, N); }
@@ -8342,12 +8308,7 @@ namespace {
      return lookup_table.apply_lookup_16_to(*this);
    }

-    // Returns 4-bit out of each byte, alternating between the high 4 bits and low
-    // bits result it is 64 bit.
-    simdjson_inline uint64_t to_bitmask64() const {
-      return vget_lane_u64(
-          vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(*this), 4)), 0);
-    }
+
    // Copies to 'output" all bytes corresponding to a 0 in the mask (interpreted as a bitset).
    // Passing a 0 value for mask would be equivalent to writing out every byte to output.
    // Only the first 16 - count_ones(mask) bytes of the result are significant but 16 bytes
@@ -8670,32 +8631,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits) / 4; }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    (is_backslash | is_quote | is_control).to_bitmask64()
-  };
-}
-
-
-
 } // unnamed namespace
 } // namespace arm64
 } // namespace simdjson
@@ -9170,7 +9105,6 @@ struct implementation_simdjson_result_base {
   * the error() method returns a value that evaluates to false.
   */
  simdjson_inline T&& value_unsafe() && noexcept;
-
 protected:
  /** users should never directly access first and second. **/
  T first{}; /** Users should never directly access 'first'. **/
@@ -11067,12 +11001,6 @@ namespace {
      tmp = vpaddq_u8(tmp, tmp);
      return vgetq_lane_u16(vreinterpretq_u16_u8(tmp), 0);
    }
-    // Returns 4-bit out of each byte, alternating between the high 4 bits and low
-    // bits result it is 64 bit.
-    simdjson_inline uint64_t to_bitmask64() const {
-      return vget_lane_u64(
-          vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(*this), 4)), 0);
-    }
    simdjson_inline bool any() const { return vmaxvq_u32(vreinterpretq_u32_u8(*this)) != 0; }
  };

@@ -11149,7 +11077,7 @@ namespace {

    // Bit-specific operations
    simdjson_inline simd8<bool> any_bits_set(simd8<uint8_t> bits) const { return vtstq_u8(*this, bits); }
-    simdjson_inline bool any_bits_set_anywhere() const { return vmaxvq_u32(vreinterpretq_u32_u8(*this)) != 0; }
+    simdjson_inline bool any_bits_set_anywhere() const { return this->max_val() != 0; }
    simdjson_inline bool any_bits_set_anywhere(simd8<uint8_t> bits) const { return (*this & bits).any_bits_set_anywhere(); }
    template<int N>
    simdjson_inline simd8<uint8_t> shr() const { return vshrq_n_u8(*this, N); }
@@ -11162,12 +11090,7 @@ namespace {
      return lookup_table.apply_lookup_16_to(*this);
    }

-    // Returns 4-bit out of each byte, alternating between the high 4 bits and low
-    // bits result it is 64 bit.
-    simdjson_inline uint64_t to_bitmask64() const {
-      return vget_lane_u64(
-          vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(*this), 4)), 0);
-    }
+
    // Copies to 'output" all bytes corresponding to a 0 in the mask (interpreted as a bitset).
    // Passing a 0 value for mask would be equivalent to writing out every byte to output.
    // Only the first 16 - count_ones(mask) bytes of the result are significant but 16 bytes
@@ -11490,32 +11413,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits) / 4; }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    (is_backslash | is_quote | is_control).to_bitmask64()
-  };
-}
-
-
-
 } // unnamed namespace
 } // namespace arm64
 } // namespace simdjson
@@ -13621,7 +13518,6 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V
 /* end file generic/stage2/json_iterator.h for arm64 */
 /* including generic/stage2/stringparsing.h for arm64: #include <generic/stage2/stringparsing.h> */
 /* begin file generic/stage2/stringparsing.h for arm64 */
-#include <cstdint>
 #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H

 /* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */
@@ -13861,7 +13757,6 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t
 }

 } // namespace stringparsing
-
 } // unnamed namespace
 } // namespace arm64
 } // namespace simdjson
@@ -15113,31 +15008,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 32;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    uint64_t((is_backslash | is_quote | is_control).to_bitmask())
-  };
-}
-
 } // unnamed namespace
 } // namespace haswell
 } // namespace simdjson
@@ -15610,7 +15480,6 @@ struct implementation_simdjson_result_base {
   * the error() method returns a value that evaluates to false.
   */
  simdjson_inline T&& value_unsafe() && noexcept;
-
 protected:
  /** users should never directly access first and second. **/
  T first{}; /** Users should never directly access 'first'. **/
@@ -17792,31 +17661,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 32;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    uint64_t((is_backslash | is_quote | is_control).to_bitmask())
-  };
-}
-
 } // unnamed namespace
 } // namespace haswell
 } // namespace simdjson
@@ -19920,7 +19764,6 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V
 /* end file generic/stage2/json_iterator.h for haswell */
 /* including generic/stage2/stringparsing.h for haswell: #include <generic/stage2/stringparsing.h> */
 /* begin file generic/stage2/stringparsing.h for haswell */
-#include <cstdint>
 #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H

 /* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */
@@ -20160,7 +20003,6 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t
 }

 } // namespace stringparsing
-
 } // unnamed namespace
 } // namespace haswell
 } // namespace simdjson
@@ -21002,6 +20844,7 @@ namespace simd {
    friend simdjson_really_inline uint64_t operator==(const simd8<T> lhs, const simd8<T> rhs) {
      return _mm512_cmpeq_epi8_mask(lhs, rhs);
    }
+
    static const int SIZE = sizeof(base<T>::value);

    template<int N=1>
@@ -21344,35 +21187,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 64;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(uint64_t(escape_bits)); }
-
-  __mmask64 escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  __mmask64 is_quote = _mm512_cmpeq_epi8_mask(v, _mm512_set1_epi8('"'));
-  __mmask64 is_backslash = _mm512_cmpeq_epi8_mask(v, _mm512_set1_epi8('\\'));
-  __mmask64 is_control = _mm512_cmplt_epi8_mask(v, _mm512_set1_epi8(32));
-  return {
-    (is_backslash | is_quote | is_control)
-  };
-}
-
-
-
-
 } // unnamed namespace
 } // namespace icelake
 } // namespace simdjson
@@ -21905,7 +21719,6 @@ struct implementation_simdjson_result_base {
   * the error() method returns a value that evaluates to false.
   */
  simdjson_inline T&& value_unsafe() && noexcept;
-
 protected:
  /** users should never directly access first and second. **/
  T first{}; /** Users should never directly access 'first'. **/
@@ -23680,6 +23493,7 @@ namespace simd {
    friend simdjson_really_inline uint64_t operator==(const simd8<T> lhs, const simd8<T> rhs) {
      return _mm512_cmpeq_epi8_mask(lhs, rhs);
    }
+
    static const int SIZE = sizeof(base<T>::value);

    template<int N=1>
@@ -24022,35 +23836,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 64;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(uint64_t(escape_bits)); }
-
-  __mmask64 escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  __mmask64 is_quote = _mm512_cmpeq_epi8_mask(v, _mm512_set1_epi8('"'));
-  __mmask64 is_backslash = _mm512_cmpeq_epi8_mask(v, _mm512_set1_epi8('\\'));
-  __mmask64 is_control = _mm512_cmplt_epi8_mask(v, _mm512_set1_epi8(32));
-  return {
-    (is_backslash | is_quote | is_control)
-  };
-}
-
-
-
-
 } // unnamed namespace
 } // namespace icelake
 } // namespace simdjson
@@ -26214,7 +25999,6 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V
 /* end file generic/stage2/json_iterator.h for icelake */
 /* including generic/stage2/stringparsing.h for icelake: #include <generic/stage2/stringparsing.h> */
 /* begin file generic/stage2/stringparsing.h for icelake */
-#include <cstdint>
 #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H

 /* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */
@@ -26454,7 +26238,6 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t
 }

 } // namespace stringparsing
-
 } // unnamed namespace
 } // namespace icelake
 } // namespace simdjson
@@ -27857,32 +27640,6 @@ backslash_and_quote::copy_and_find(const uint8_t *src, uint8_t *dst) {
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    // We store it as a 64-bit bitmask even though we only need 16 bits.
-    uint64_t((is_backslash | is_quote | is_control).to_bitmask())
-  };
-}
-
 } // unnamed namespace
 } // namespace ppc64
 } // namespace simdjson
@@ -28357,7 +28114,6 @@ struct implementation_simdjson_result_base {
   * the error() method returns a value that evaluates to false.
   */
  simdjson_inline T&& value_unsafe() && noexcept;
-
 protected:
  /** users should never directly access first and second. **/
  T first{}; /** Users should never directly access 'first'. **/
@@ -30648,32 +30404,6 @@ backslash_and_quote::copy_and_find(const uint8_t *src, uint8_t *dst) {
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    // We store it as a 64-bit bitmask even though we only need 16 bits.
-    uint64_t((is_backslash | is_quote | is_control).to_bitmask())
-  };
-}
-
 } // unnamed namespace
 } // namespace ppc64
 } // namespace simdjson
@@ -32779,7 +32509,6 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V
 /* end file generic/stage2/json_iterator.h for ppc64 */
 /* including generic/stage2/stringparsing.h for ppc64: #include <generic/stage2/stringparsing.h> */
 /* begin file generic/stage2/stringparsing.h for ppc64 */
-#include <cstdint>
 #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H

 /* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */
@@ -33019,7 +32748,6 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t
 }

 } // namespace stringparsing
-
 } // unnamed namespace
 } // namespace ppc64
 } // namespace simdjson
@@ -34671,31 +34399,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    uint64_t((is_backslash | is_quote | is_control).to_bitmask())
-  };
-}
-
 } // unnamed namespace
 } // namespace westmere
 } // namespace simdjson
@@ -35168,7 +34871,6 @@ struct implementation_simdjson_result_base {
   * the error() method returns a value that evaluates to false.
   */
  simdjson_inline T&& value_unsafe() && noexcept;
-
 protected:
  /** users should never directly access first and second. **/
  T first{}; /** Users should never directly access 'first'. **/
@@ -37776,31 +37478,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    uint64_t((is_backslash | is_quote | is_control).to_bitmask())
-  };
-}
-
 } // unnamed namespace
 } // namespace westmere
 } // namespace simdjson
@@ -39904,7 +39581,6 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V
 /* end file generic/stage2/json_iterator.h for westmere */
 /* including generic/stage2/stringparsing.h for westmere: #include <generic/stage2/stringparsing.h> */
 /* begin file generic/stage2/stringparsing.h for westmere */
-#include <cstdint>
 #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H

 /* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */
@@ -40144,7 +39820,6 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t
 }

 } // namespace stringparsing
-
 } // unnamed namespace
 } // namespace westmere
 } // namespace simdjson
@@ -40673,6 +40348,7 @@ simdjson_warn_unused error_code dom_parser_implementation::parse(const uint8_t *
  if (error) { return error; }
  return stage2(_doc);
 }
+
 } // namespace westmere
 } // namespace simdjson

@@ -41302,31 +40978,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    (is_backslash | is_quote | is_control).to_bitmask()
-  };
-}
-
 } // unnamed namespace
 } // namespace lsx
 } // namespace simdjson
@@ -41801,7 +41452,6 @@ struct implementation_simdjson_result_base {
   * the error() method returns a value that evaluates to false.
   */
  simdjson_inline T&& value_unsafe() && noexcept;
-
 protected:
  /** users should never directly access first and second. **/
  T first{}; /** Users should never directly access 'first'. **/
@@ -43877,31 +43527,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    (is_backslash | is_quote | is_control).to_bitmask()
-  };
-}
-
 } // unnamed namespace
 } // namespace lsx
 } // namespace simdjson
@@ -46007,7 +45632,6 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V
 /* end file generic/stage2/json_iterator.h for lsx */
 /* including generic/stage2/stringparsing.h for lsx: #include <generic/stage2/stringparsing.h> */
 /* begin file generic/stage2/stringparsing.h for lsx */
-#include <cstdint>
 #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H

 /* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */
@@ -46247,7 +45871,6 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t
 }

 } // namespace stringparsing
-
 } // unnamed namespace
 } // namespace lsx
 } // namespace simdjson
@@ -47381,31 +47004,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    (is_backslash | is_quote | is_control).to_bitmask()
-  };
-}
-
 } // unnamed namespace
 } // namespace lasx
 } // namespace simdjson
@@ -47880,7 +47478,6 @@ struct implementation_simdjson_result_base {
   * the error() method returns a value that evaluates to false.
   */
  simdjson_inline T&& value_unsafe() && noexcept;
-
 protected:
  /** users should never directly access first and second. **/
  T first{}; /** Users should never directly access 'first'. **/
@@ -49972,31 +49569,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 16;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits != 0; }
-  simdjson_inline int escape_index() { return trailing_zeroes(escape_bits); }
-
-  uint64_t escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  static_assert(SIMDJSON_PADDING >= (BYTES_PROCESSED - 1), "escaping finder must process fewer than SIMDJSON_PADDING bytes");
-  simd8<uint8_t> v(src);
-  v.store(dst);
-  simd8<bool> is_quote = (v == '"');
-  simd8<bool> is_backslash = (v == '\\');
-  simd8<bool> is_control = (v < 32);
-  return {
-    (is_backslash | is_quote | is_control).to_bitmask()
-  };
-}
-
 } // unnamed namespace
 } // namespace lasx
 } // namespace simdjson
@@ -52102,7 +51674,6 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V
 /* end file generic/stage2/json_iterator.h for lasx */
 /* including generic/stage2/stringparsing.h for lasx: #include <generic/stage2/stringparsing.h> */
 /* begin file generic/stage2/stringparsing.h for lasx */
-#include <cstdint>
 #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H

 /* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */
@@ -52342,7 +51913,6 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t
 }

 } // namespace stringparsing
-
 } // unnamed namespace
 } // namespace lasx
 } // namespace simdjson
@@ -52972,24 +52542,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  return { src[0] };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 1;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits; }
-  simdjson_inline int escape_index() { return 0; }
-
-  bool escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  dst[0] = src[0];
-  return { (src[0] == '\\') || (src[0] == '"') || (src[0] < 32) };
-}
-
 } // unnamed namespace
 } // namespace fallback
 } // namespace simdjson
@@ -53551,7 +53103,6 @@ struct implementation_simdjson_result_base {
   * the error() method returns a value that evaluates to false.
   */
  simdjson_inline T&& value_unsafe() && noexcept;
-
 protected:
  /** users should never directly access first and second. **/
  T first{}; /** Users should never directly access 'first'. **/
@@ -55145,24 +54696,6 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
  return { src[0] };
 }

-
-struct escaping {
-  static constexpr uint32_t BYTES_PROCESSED = 1;
-  simdjson_inline static escaping copy_and_find(const uint8_t *src, uint8_t *dst);
-
-  simdjson_inline bool has_escape() { return escape_bits; }
-  simdjson_inline int escape_index() { return 0; }
-
-  bool escape_bits;
-}; // struct escaping
-
-
-
-simdjson_inline escaping escaping::copy_and_find(const uint8_t *src, uint8_t *dst) {
-  dst[0] = src[0];
-  return { (src[0] == '\\') || (src[0] == '"') || (src[0] < 32) };
-}
-
 } // unnamed namespace
 } // namespace fallback
 } // namespace simdjson
@@ -55369,7 +54902,6 @@ simdjson_inline uint32_t find_next_document_index(dom_parser_implementation &par
 /* end file generic/stage1/find_next_document_index.h for fallback */
 /* including generic/stage2/stringparsing.h for fallback: #include <generic/stage2/stringparsing.h> */
 /* begin file generic/stage2/stringparsing.h for fallback */
-#include <cstdint>
 #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H

 /* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */
@@ -55609,7 +55141,6 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t
 }

 } // namespace stringparsing
-
 } // unnamed namespace
 } // namespace fallback
 } // namespace simdjson
@@ -56576,78 +56107,10 @@ simdjson_inline void validate_utf8_character() {
  idx += 4;
 }

-static const uint8_t CHAR_TYPE_SPACE     = 1 << 0;
-static const uint8_t CHAR_TYPE_OPERATOR  = 1 << 1;
-static const uint8_t CHAR_TYPE_ESC_ASCII = 1 << 2;
-static const uint8_t CHAR_TYPE_NON_ASCII = 1 << 3;
-
-const uint8_t char_table[256] = {
-  0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-  0x04, 0x05, 0x05, 0x04, 0x04, 0x05, 0x04, 0x04,
-  0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-  0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-  0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x02, 0x04, 0x02, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08
-};
-
-simdjson_inline bool char_is_type(uint8_t c, uint8_t type) {
-  return (char_table[c] & type);
-}
-
-simdjson_inline bool char_is_space(uint8_t c) {
-  return char_is_type(c, CHAR_TYPE_SPACE);
-}
-
-simdjson_inline bool char_is_operator(uint8_t c) {
-  return char_is_type(c, CHAR_TYPE_OPERATOR);
-}
-
-simdjson_inline bool char_is_space_or_operator(uint8_t c) {
-  return char_is_type(c, CHAR_TYPE_SPACE | CHAR_TYPE_OPERATOR);
-}
-
-simdjson_inline bool char_is_ascii_stop(uint8_t c) {
-  return char_is_type(c, CHAR_TYPE_ESC_ASCII | CHAR_TYPE_NON_ASCII);
-}
-
 // Returns true if the string is unclosed.
 simdjson_inline bool validate_string() {
  idx++; // skip first quote
-  while (idx < len) {
-    do {
-      if (char_is_ascii_stop(buf[idx])) { break; }
-      idx++;
-    } while (idx < len);
-    if (idx >= len) { return true; }
-    if (buf[idx] == '"') {
-      return false;
-    }
+  while (idx < len && buf[idx] != '"') {
    if (buf[idx] == '\\') {
      idx += 2;
    } else if (simdjson_unlikely(buf[idx] & 0x80)) {
@@ -56661,31 +56124,43 @@ simdjson_inline bool validate_string() {
  return false;
 }

+simdjson_inline bool is_whitespace_or_operator(uint8_t c) {
+  switch (c) {
+    case '{': case '}': case '[': case ']': case ',': case ':':
+    case ' ': case '\r': case '\n': case '\t':
+      return true;
+    default:
+      return false;
+  }
+}
+
 //
 // Parse the entire input in STEP_SIZE-byte chunks.
 //
 simdjson_inline error_code scan() {
  bool unclosed_string = false;
  for (;idx<len;idx++) {
-    do {
-      if (!char_is_space(buf[idx])) { break; }
-      idx++;
-    } while (idx < len);
-    if (idx >= len) { break; }
-    // String
-    if (buf[idx] == '"') {
-      add_structural();
-      unclosed_string |= validate_string();
-    // Operator
-    } else if (char_is_operator(buf[idx])) {
-      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
-      add_structural();
-      while (idx+1<len && !char_is_space_or_operator(buf[idx+1])) {
-        idx++;
-      };
+    switch (buf[idx]) {
+      // String
+      case '"':
+        add_structural();
+        unclosed_string |= validate_string();
+        break;
+      // Operator
+      case '{': case '}': case '[': case ']': case ',': case ':':
+        add_structural();
+        break;
+      // Whitespace
+      case ' ': case '\r': case '\n': case '\t':
+        break;
+      // Primitive or invalid character (invalid characters will be checked in stage 2)
+      default:
+        // Anything else, add the structural and go until we find the next one
+        add_structural();
+        while (idx+1<len && !is_whitespace_or_operator(buf[idx+1])) {
+          idx++;
+        };
+        break;
    }
  }
  // We pad beyond.
@@ -121,78 +121,10 @@ simdjson_inline void validate_utf8_character() {
  idx += 4;
 }

-static const uint8_t CHAR_TYPE_SPACE     = 1 << 0;
-static const uint8_t CHAR_TYPE_OPERATOR  = 1 << 1;
-static const uint8_t CHAR_TYPE_ESC_ASCII = 1 << 2;
-static const uint8_t CHAR_TYPE_NON_ASCII = 1 << 3;
-
-const uint8_t char_table[256] = {
-  0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-  0x04, 0x05, 0x05, 0x04, 0x04, 0x05, 0x04, 0x04,
-  0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-  0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-  0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x02, 0x04, 0x02, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08
-};
-
-simdjson_inline bool char_is_type(uint8_t c, uint8_t type) {
-  return (char_table[c] & type);
-}
-
-simdjson_inline bool char_is_space(uint8_t c) {
-  return char_is_type(c, CHAR_TYPE_SPACE);
-}
-
-simdjson_inline bool char_is_operator(uint8_t c) {
-  return char_is_type(c, CHAR_TYPE_OPERATOR);
-}
-
-simdjson_inline bool char_is_space_or_operator(uint8_t c) {
-  return char_is_type(c, CHAR_TYPE_SPACE | CHAR_TYPE_OPERATOR);
-}
-
-simdjson_inline bool char_is_ascii_stop(uint8_t c) {
-  return char_is_type(c, CHAR_TYPE_ESC_ASCII | CHAR_TYPE_NON_ASCII);
-}
-
 // Returns true if the string is unclosed.
 simdjson_inline bool validate_string() {
  idx++; // skip first quote
-  while (idx < len) {
-    do {
-      if (char_is_ascii_stop(buf[idx])) { break; }
-      idx++;
-    } while (idx < len);
-    if (idx >= len) { return true; }
-    if (buf[idx] == '"') {
-      return false;
-    }
+  while (idx < len && buf[idx] != '"') {
    if (buf[idx] == '\\') {
      idx += 2;
    } else if (simdjson_unlikely(buf[idx] & 0x80)) {
@@ -206,31 +138,43 @@ simdjson_inline bool validate_string() {
  return false;
 }

+simdjson_inline bool is_whitespace_or_operator(uint8_t c) {
+  switch (c) {
+    case '{': case '}': case '[': case ']': case ',': case ':':
+    case ' ': case '\r': case '\n': case '\t':
+      return true;
+    default:
+      return false;
+  }
+}
+
 //
 // Parse the entire input in STEP_SIZE-byte chunks.
 //
 simdjson_inline error_code scan() {
  bool unclosed_string = false;
  for (;idx<len;idx++) {
-    do {
-      if (!char_is_space(buf[idx])) { break; }
-      idx++;
-    } while (idx < len);
-    if (idx >= len) { break; }
-    // String
-    if (buf[idx] == '"') {
-      add_structural();
-      unclosed_string |= validate_string();
-    // Operator
-    } else if (char_is_operator(buf[idx])) {
-      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
-      add_structural();
-      while (idx+1<len && !char_is_space_or_operator(buf[idx+1])) {
-        idx++;
-      };
+    switch (buf[idx]) {
+      // String
+      case '"':
+        add_structural();
+        unclosed_string |= validate_string();
+        break;
+      // Operator
+      case '{': case '}': case '[': case ']': case ',': case ':':
+        add_structural();
+        break;
+      // Whitespace
+      case ' ': case '\r': case '\n': case '\t':
+        break;
+      // Primitive or invalid character (invalid characters will be checked in stage 2)
+      default:
+        // Anything else, add the structural and go until we find the next one
+        add_structural();
+        while (idx+1<len && !is_whitespace_or_operator(buf[idx+1])) {
+          idx++;
+        };
+        break;
    }
  }
  // We pad beyond.
@@ -1,4 +1,3 @@
-#include <cstdint>
 #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H

 #ifndef SIMDJSON_CONDITIONAL_INCLUDE
@@ -238,7 +237,6 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t
 }

 } // namespace stringparsing
-
 } // unnamed namespace
 } // namespace SIMDJSON_IMPLEMENTATION
 } // namespace simdjson
@@ -166,6 +166,7 @@ simdjson_warn_unused error_code dom_parser_implementation::parse(const uint8_t *
  if (error) { return error; }
  return stage2(_doc);
 }
+
 } // namespace westmere
 } // namespace simdjson

@@ -26,4 +26,3 @@ endif()
 add_cpp_test(checkimplementation LABELS other per_implementation)

 add_subdirectory(compilation_failure_tests)
-add_subdirectory(builder)
@@ -1,16 +0,0 @@
-# All remaining tests link with simdjson proper
-include_directories(..)
-add_cpp_test(builder_string_builder_tests              LABELS ondemand acceptance per_implementation)
-if(SIMDJSON_STATIC_REFLECTION)
-  add_cpp_test(static_reflection_builder_tests           LABELS ondemand acceptance per_implementation)
-  add_cpp_test(static_reflection_comprehensive_tests     LABELS ondemand acceptance per_implementation)
-  add_cpp_test(static_reflection_edge_cases_tests        LABELS ondemand acceptance per_implementation)
-  add_cpp_test(static_reflection_enum_tests              LABELS ondemand acceptance per_implementation)
-endif(SIMDJSON_STATIC_REFLECTION)
-# Copy the simdjson dll into the tests directory
-if(MSVC AND BUILD_SHARED_LIBS)
-  add_custom_command(TARGET builder_string_builder_tests POST_BUILD        # Adds a post-build event
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different  # which executes "cmake -E copy_if_different..."
-        "$<TARGET_FILE:simdjson>"      # <--this is in-file
-        "$<TARGET_FILE_DIR:builder_string_builder_tests>")                 # <--this is out-file path
-endif(MSVC AND BUILD_SHARED_LIBS)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Lemire	8ad452459c	moving the files back to ondemand for now.	2025-07-14 11:46:06 -04:00
Daniel Lemire	d987f1871c	Initial work on JSON builder	2025-07-14 11:45:25 -04:00