Remove document_stream from singlestage

Update powerpolicy to include singlestage (whatever that is?)
Make trim a common file
2026-06-08 17:27:07 +00:00 · 2023-07-17 16:31:37 -07:00 · 2023-07-17 16:23:03 -07:00 · 2023-07-17 16:23:03 -07:00 · 2023-07-17 16:23:03 -07:00 · 2023-07-17 16:23:03 -07:00
276 changed files with 53881 additions and 10800 deletions
@@ -1,8 +1,5 @@
 CompileFlags:
    CompilationDatabase: build
-    Add:
-        - -Werror -Wall -Wextra -Weffc++ -Wsign-compare -Wshadow -Wwrite-strings -Wpointer-arith -Winit-self -Wconversion -Wno-sign-conversion
-        - -Wundefined-inline
 Diagnostics:
    Suppress:
        - misc-unused-alias-decls
@@ -19,28 +16,10 @@ If:
 CompileFlags:
    Add:
        - -Wno-unneeded-internal-declaration
+        - -Wno-undefined-inline # TODO fix and remove these violations
        - -Wno-undefined-internal # TODO fix and remove these violations
        - -Wno-unused-function
        - -Wno-unused-const-variable
 Diagnostics:
    Suppress:
        - pp_including_mainfile_in_preamble
---
-# Amalgamated files that require or partly define an implementation
-If:
-    PathMatch:
-        - .*/(arm64|fallback|haswell|icelake|ppc64|westmere)/begin.h
-        - .*/generic/.*
-Diagnostics:
-    Suppress:
-        - pragma_attribute_no_pop_eof
---
-# clang has a bad time detecting the push/pop together in src/ for some reason
-If:
-    PathMatch:
-        - include/simdjson/.*/end.h
-        - src/(arm64|fallback|haswell|icelake|ppc64|westmere).cpp
-Diagnostics:
-    Suppress:
-        - pragma_attribute_no_pop_eof
-        - pragma_attribute_stack_mismatch
@@ -49,7 +49,7 @@ It is fine to report bugs against our main branch, but if that is what you are d
 - Version [e.g. 22]
 - Optimization setting (e.g., -O3)

-We support up-to-date 64-bit ARM and x64 FreeBSD, macOS, Windows and Linux systems. Please ensure that your configuration is supported before labelling the issue as a bug.
+We support up-to-date 64-bit ARM and x64 FreeBSD, macOS, Windows and Linux systems. Please ensure that your configuration is supported before labelling the issue as a bug. In particular, we do not support legacy 32-bit systems.

 **Indicate whether you are willing or able to provide a bug fix as a pull request**

@@ -20,7 +20,7 @@ jobs:
      # fuzzers that change behaviour with SIMDJSON_FORCE_IMPLEMENTATION
      defaultimplfuzzers: atpointer dump dump_raw_tape element minify parser print_json
      # fuzzers that loop over the implementations themselves, or don't need to switch.
-      implfuzzers: implementations minifyimpl ndjson ondemand padded utf8
+      implfuzzers: implementations minifyimpl ndjson ondemand padded utf8 # TODO add singlestage
      implementations: haswell westmere fallback
      UBSAN_OPTIONS: halt_on_error=1
      MAXLEN: -max_len=4000
@@ -34,7 +34,6 @@ jobs:
        sudo apt update
        sudo apt-get install --quiet ninja-build valgrind zip unzip lsb-release wget software-properties-common gnupg
        wget https://apt.llvm.org/llvm.sh
-        sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
        chmod +x llvm.sh
        sudo ./llvm.sh $CLANGVERSION

@@ -3,7 +3,7 @@ name: Ubuntu 20.04 CI (GCC 9) With Memory Sanitizer
 on: [push, pull_request]

 jobs:
-  ubuntu-build-address-sanitizier:
+  ubuntu-build:
    if: >-
      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
@@ -21,18 +21,6 @@ jobs:
          cmake -DSIMDJSON_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
          cmake --build .   &&
          ctest --output-on-failure -LE explicitonly -j
-  ubuntu-build-undefined-sanitizer:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-          ctest --output-on-failure -LE explicitonly -j
      - name: Use cmake with undefined sanitizer
        run: |
          mkdir builddebugundefsani &&
@@ -14,20 +14,6 @@ jobs:
        with:
          path: dependencies/.cache
          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake to build just the library
-        run: |
-          mkdir buildjustlib &&
-          cd buildjustlib &&
-          cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_DEVELOPER_MODE=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          cmake --install . &&
-          echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp &&
-          c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson &&
-          cd ../tests/installation_tests/find &&
-          mkdir buildjustlib &&
-          cd buildjustlib &&
-          cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../buildjustlib/destination .. &&
-          cmake --build .
      - name: Use cmake
        run: |
          mkdir builddebug &&
@@ -14,6 +14,8 @@ jobs:
        with:
          path: dependencies/.cache
          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+      - name: Install clang++-13
+        run: sudo apt-get install -y clang++-13
      - name: Use cmake
        run: |
          mkdir build &&
@@ -14,6 +14,8 @@ jobs:
        with:
          path: dependencies/.cache
          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+      - name: Install clang++-14
+        run: sudo apt-get install -y clang++-14
      - name: Use cmake
        run: |
          mkdir build &&
@@ -14,20 +14,6 @@ jobs:
        with:
          path: dependencies/.cache
          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake to build just the library
-        run: |
-          mkdir buildjustlib &&
-          cd buildjustlib &&
-          cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_DEVELOPER_MODE=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          cmake --install . &&
-          echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp &&
-          c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson &&
-          cd ../tests/installation_tests/find &&
-          mkdir buildjustlib &&
-          cd buildjustlib &&
-          cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../buildjustlib/destination .. &&
-          cmake --build .
      - name: Use cmake
        run: |
          mkdir builddebug &&
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14)
 project(
    simdjson
    # The version number is modified by tools/release.py
-    VERSION 3.2.2
+    VERSION 3.2.1
    DESCRIPTION "Parsing gigabytes of JSON per second"
    HOMEPAGE_URL "https://simdjson.org/"
    LANGUAGES CXX C
@@ -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         = "3.2.2"
+PROJECT_NUMBER         = "3.2.1"

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -0,0 +1,72 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "amazon_cellphones.h"
+
+namespace amazon_cellphones {
+
+using namespace simdjson;
+
+template<bool threaded>
+struct simdjson_singlestage {
+  using StringType = std::string;
+
+  singlestage::parser parser{};
+
+  bool run(simdjson::padded_string &json, std::map<StringType, brand> &result) {
+#ifdef SIMDJSON_THREADS_ENABLED
+    parser.threaded = threaded;
+#endif
+    singlestage::document_stream stream = parser.iterate_many(json);
+    singlestage::document_stream::iterator i = stream.begin();
+    ++i;  // Skip first line
+    for (;i != stream.end(); ++i) {
+      auto doc = *i;
+      size_t index{0};
+      StringType copy;
+      double rating;
+      uint64_t reviews;
+      for ( auto value : doc ) {
+        switch (index)
+        {
+        case 1:
+          copy = StringType(std::string_view(value));
+          break;
+        case 5:
+          rating = double(value);
+          break;
+        case 7:
+          reviews = uint64_t(value);
+          break;
+        default:
+          break;
+        }
+        index++;
+      }
+
+      auto x = result.find(copy);
+      if (x == result.end()) {  // If key not found, add new key
+        result.emplace(copy, amazon_cellphones::brand{
+          rating * reviews,
+          reviews
+        });
+      } else {  // Otherwise, update key data
+        x->second.cumulative_rating += rating * reviews;
+        x->second.reviews_count += reviews;
+      }
+    }
+
+    return true;
+  }
+
+};
+
+BENCHMARK_TEMPLATE(amazon_cellphones, simdjson_singlestage<UNTHREADED>)->UseManualTime();
+#ifdef SIMDJSON_THREADS_ENABLED
+BENCHMARK_TEMPLATE(amazon_cellphones, simdjson_singlestage<THREADED>)->UseManualTime();
+#endif
+
+} // namespace amazon_cellphones
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -26,6 +26,7 @@ SIMDJSON_PUSH_DISABLE_ALL_WARNINGS

 SIMDJSON_POP_DISABLE_WARNINGS
 #include "json2msgpack/simdjson_ondemand.h"
+#include "json2msgpack/simdjson_singlestage.h"
 #include "json2msgpack/simdjson_dom.h"
 #include "json2msgpack/yyjson.h"
 #include "json2msgpack/rapidjson.h"
@@ -35,6 +36,7 @@ SIMDJSON_POP_DISABLE_WARNINGS
 #include "json2msgpack/nlohmann_json.h"

 #include "partial_tweets/simdjson_ondemand.h"
+#include "partial_tweets/simdjson_singlestage.h"
 #include "partial_tweets/simdjson_dom.h"
 #include "partial_tweets/yyjson.h"
 #if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
@@ -52,6 +54,8 @@ SIMDJSON_POP_DISABLE_WARNINGS

 #include "distinct_user_id/simdjson_ondemand.h"
 #include "distinct_user_id/simdjson_ondemand_json_pointer.h"
+#include "distinct_user_id/simdjson_singlestage.h"
+#include "distinct_user_id/simdjson_singlestage_json_pointer.h"
 #include "distinct_user_id/simdjson_dom.h"
 #include "distinct_user_id/simdjson_dom_json_pointer.h"
 #include "distinct_user_id/yyjson.h"
@@ -68,6 +72,7 @@ SIMDJSON_POP_DISABLE_WARNINGS
 #endif // SIMDJSON_COMPETITION_SAX

 #include "find_tweet/simdjson_ondemand.h"
+#include "find_tweet/simdjson_singlestage.h"
 #include "find_tweet/simdjson_dom.h"
 #include "find_tweet/yyjson.h"
 #if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
@@ -83,6 +88,7 @@ SIMDJSON_POP_DISABLE_WARNINGS
 #endif // SIMDJSON_COMPETITION_SAX

 #include "top_tweet/simdjson_ondemand.h"
+#include "top_tweet/simdjson_singlestage.h"
 #include "top_tweet/simdjson_dom.h"
 #include "top_tweet/yyjson.h"
 #if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
@@ -99,6 +105,7 @@ SIMDJSON_POP_DISABLE_WARNINGS


 #include "kostya/simdjson_ondemand.h"
+#include "kostya/simdjson_singlestage.h"
 #include "kostya/simdjson_dom.h"
 #include "kostya/yyjson.h"
 #if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
@@ -117,6 +124,10 @@ SIMDJSON_POP_DISABLE_WARNINGS
 #if SIMDJSON_COMPETITION_ONDEMAND_UNORDERED
 #include "large_random/simdjson_ondemand_unordered.h"
 #endif // SIMDJSON_COMPETITION_ONDEMAND_UNORDERED
+#include "large_random/simdjson_singlestage.h"
+#if SIMDJSON_COMPETITION_SINGLESTAGE_UNORDERED
+#include "large_random/simdjson_singlestage_unordered.h"
+#endif // SIMDJSON_COMPETITION_SINGLESTAGE_UNORDERED
 #include "large_random/simdjson_dom.h"
 #include "large_random/yyjson.h"
 #if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
@@ -133,8 +144,10 @@ SIMDJSON_POP_DISABLE_WARNINGS

 #include "amazon_cellphones/simdjson_dom.h"
 #include "amazon_cellphones/simdjson_ondemand.h"
+#include "amazon_cellphones/simdjson_singlestage.h"

 #include "large_amazon_cellphones/simdjson_dom.h"
 #include "large_amazon_cellphones/simdjson_ondemand.h"
+#include "large_amazon_cellphones/simdjson_singlestage.h"

 BENCHMARK_MAIN();
@@ -0,0 +1,37 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "distinct_user_id.h"
+
+namespace distinct_user_id {
+
+using namespace simdjson;
+
+struct simdjson_singlestage {
+  singlestage::parser parser{};
+
+  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
+    // Walk the document, parsing as we go
+    auto doc = parser.iterate(json);
+    for (singlestage::object tweet : doc.find_field("statuses")) {
+      // We believe that all statuses have a matching
+      // user, and we are willing to throw when they do not.
+      result.push_back(tweet.find_field("user").find_field("id"));
+      // Not all tweets have a "retweeted_status", but when they do
+      // we want to go and find the user within.
+      auto retweet = tweet.find_field("retweeted_status");
+      if (!retweet.error()) {
+        result.push_back(retweet.find_field("user").find_field("id"));
+      }
+    }
+
+    return true;
+  }
+};
+
+BENCHMARK_TEMPLATE(distinct_user_id, simdjson_singlestage)->UseManualTime();
+
+} // namespace distinct_user_id
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -0,0 +1,37 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "distinct_user_id.h"
+
+namespace distinct_user_id {
+
+using namespace simdjson;
+
+struct simdjson_singlestage_json_pointer {
+  singlestage::parser parser{};
+
+  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
+    // Walk the document, parsing as we go
+    auto doc = parser.iterate(json);
+    for (singlestage::object tweet : doc.find_field("statuses")) {
+      // We believe that all statuses have a matching
+      // user, and we are willing to throw when they do not.
+      result.push_back(tweet.at_pointer("/user/id"));
+      // Not all tweets have a "retweeted_status", but when they do
+      // we want to go and find the user within.
+      auto retweet_id = tweet.at_pointer("/retweeted_status/user/id");
+      if (retweet_id.error() != NO_SUCH_FIELD) {
+        result.push_back(retweet_id);
+      }
+    }
+
+    return true;
+  }
+};
+
+BENCHMARK_TEMPLATE(distinct_user_id, simdjson_singlestage_json_pointer)->UseManualTime();
+
+} // namespace distinct_user_id
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -0,0 +1,33 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "find_tweet.h"
+
+namespace find_tweet {
+
+using namespace simdjson;
+
+struct simdjson_singlestage {
+  using StringType=std::string_view;
+
+  singlestage::parser parser{};
+
+  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
+    // Walk the document, parsing as we go
+    auto doc = parser.iterate(json);
+    for (auto tweet : doc.find_field("statuses")) {
+      if (uint64_t(tweet.find_field("id")) == find_id) {
+        result = tweet.find_field("text");
+        return true;
+      }
+    }
+    return false;
+  }
+};
+
+BENCHMARK_TEMPLATE(find_tweet, simdjson_singlestage)->UseManualTime();
+
+} // namespace find_tweet
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -8,7 +8,7 @@ namespace json2msgpack {
 using namespace simdjson;

 /**
- * @brief The simdjson2msgpack struct is used to quickly convert
+ * @brief The simdjsonondemand2msgpack struct is used to quickly convert
 * JSON strings to msgpack views. You must provide a pointer to
 * a large memory region where the msgpack gets written. The
 * buffer should be large enough to store the msgpack output (which
@@ -17,7 +17,7 @@ using namespace simdjson;
 *
 * Recommended usage:
 *
- * simdjson2msgpack parser{};
+ * simdjsonondemand2msgpack parser{};
 * simdjson::padded_string json = "[1,2]"_padded; // some JSON
 * uint8_t * buffer = new uint8_t[3*json.size() + simdjson::SIMDJSON_PADDING]; // large buffer
 *
@@ -26,10 +26,10 @@ using namespace simdjson;
 * The result (msgpack) is a string view to a msgpack serialization of the input JSON,
 * it points inside the buffer you provided.
 *
- * You may reuse the simdjson2msgpack instance though you should use
+ * You may reuse the simdjsonondemand2msgpack instance though you should use
 * one per thread.
 */
-struct simdjson2msgpack {
+struct simdjsonondemand2msgpack {
  /**
   * @brief Converts the provided JSON into msgpack.
   *
@@ -58,7 +58,7 @@ private:
 };

 std::string_view
-simdjson2msgpack::to_msgpack(const simdjson::padded_string &json,
+simdjsonondemand2msgpack::to_msgpack(const simdjson::padded_string &json,
                             uint8_t *buf) {
  buff = buf;
  ondemand::document doc = parser.iterate(json);
@@ -106,33 +106,33 @@ simdjson2msgpack::to_msgpack(const simdjson::padded_string &json,
  return std::string_view(reinterpret_cast<char *>(buf), size_t(buff - buf));
 }

-void simdjson2msgpack::write_double(const double d) noexcept {
+void simdjsonondemand2msgpack::write_double(const double d) noexcept {
  *buff++ = 0xcb;
  ::memcpy(buff, &d, sizeof(d));
  buff += sizeof(d);
 }

-void simdjson2msgpack::write_byte(const uint8_t b) noexcept {
+void simdjsonondemand2msgpack::write_byte(const uint8_t b) noexcept {
  *buff = b;
  buff++;
 }

-void simdjson2msgpack::write_uint32(const uint32_t w) noexcept {
+void simdjsonondemand2msgpack::write_uint32(const uint32_t w) noexcept {
  ::memcpy(buff, &w, sizeof(w));
  buff += sizeof(w);
 }

-uint8_t *simdjson2msgpack::skip_uint32() noexcept {
+uint8_t *simdjsonondemand2msgpack::skip_uint32() noexcept {
  uint8_t *ret = buff;
  buff += sizeof(uint32_t);
  return ret;
 }

-void simdjson2msgpack::write_uint32_at(const uint32_t w, uint8_t *p) noexcept {
+void simdjsonondemand2msgpack::write_uint32_at(const uint32_t w, uint8_t *p) noexcept {
  ::memcpy(p, &w, sizeof(w));
 }

-void simdjson2msgpack::write_raw_string(
+void simdjsonondemand2msgpack::write_raw_string(
    simdjson::ondemand::raw_json_string in) {
  write_byte(0xdb);
  uint8_t *location = skip_uint32();
@@ -140,7 +140,7 @@ void simdjson2msgpack::write_raw_string(
  write_uint32_at(uint32_t(v.size()), location);
 }

-void simdjson2msgpack::recursive_processor(simdjson::ondemand::value element) {
+void simdjsonondemand2msgpack::recursive_processor(simdjson::ondemand::value element) {
  switch (element.type()) {
  case simdjson::ondemand::json_type::array: {
    uint32_t counter = 0;
@@ -185,7 +185,7 @@ void simdjson2msgpack::recursive_processor(simdjson::ondemand::value element) {
 }


-void simdjson2msgpack::recursive_processor_ref(simdjson::ondemand::value& element) {
+void simdjsonondemand2msgpack::recursive_processor_ref(simdjson::ondemand::value& element) {
  switch (element.type()) {
  case simdjson::ondemand::json_type::array: {
    uint32_t counter = 0;
@@ -234,7 +234,7 @@ void simdjson2msgpack::recursive_processor_ref(simdjson::ondemand::value& elemen
 struct simdjson_ondemand {
  using StringType = std::string_view;

-  simdjson2msgpack parser{};
+  simdjsonondemand2msgpack parser{};

  bool run(simdjson::padded_string &json, char *buffer,
           std::string_view &result) {
@@ -0,0 +1,250 @@
+#pragma once
+#if SIMDJSON_EXCEPTIONS
+
+#include "json2msgpack.h"
+
+namespace json2msgpack {
+
+using namespace simdjson;
+
+/**
+ * @brief The simdjsonsinglestage2msgpack struct is used to quickly convert
+ * JSON strings to msgpack views. You must provide a pointer to
+ * a large memory region where the msgpack gets written. The
+ * buffer should be large enough to store the msgpack output (which
+ * can never be 3x larger than the input JSON) with an additional
+ * simdjson::SIMDJSON_PADDING bytes.
+ *
+ * Recommended usage:
+ *
+ * simdjsonsinglestage2msgpack parser{};
+ * simdjson::padded_string json = "[1,2]"_padded; // some JSON
+ * uint8_t * buffer = new uint8_t[3*json.size() + simdjson::SIMDJSON_PADDING]; // large buffer
+ *
+ * std::string_view msgpack = parser.to_msgpack(json, buffer);
+ *
+ * The result (msgpack) is a string view to a msgpack serialization of the input JSON,
+ * it points inside the buffer you provided.
+ *
+ * You may reuse the simdjsonsinglestage2msgpack instance though you should use
+ * one per thread.
+ */
+struct simdjsonsinglestage2msgpack {
+  /**
+   * @brief Converts the provided JSON into msgpack.
+   *
+   * @param json JSON input
+   * @param buf temporary buffer (must be large enough, with simdjson::SIMDJSON_PADDING bytes
+   * of padding)
+   * @return std::string_view msgpack output, writing to the temporary buffer
+   */
+  inline std::string_view to_msgpack(const simdjson::padded_string &json,
+                                     uint8_t *buf);
+
+private:
+  simdjson_inline void write_double(const double d) noexcept;
+  simdjson_inline void write_byte(const uint8_t b) noexcept;
+  simdjson_inline void write_uint32(const uint32_t w) noexcept;
+  simdjson_inline uint8_t *skip_uint32() noexcept;
+  simdjson_inline void write_uint32_at(const uint32_t w,
+                                              uint8_t *p) noexcept;
+  simdjson_inline void
+  write_raw_string(simdjson::singlestage::raw_json_string rjs);
+  inline void recursive_processor(simdjson::singlestage::value element);
+  inline void recursive_processor_ref(simdjson::singlestage::value& element);
+
+  simdjson::singlestage::parser parser;
+  uint8_t *buff{};
+};
+
+std::string_view
+simdjsonsinglestage2msgpack::to_msgpack(const simdjson::padded_string &json,
+                             uint8_t *buf) {
+  buff = buf;
+  singlestage::document doc = parser.iterate(json);
+  if (doc.is_scalar()) {
+    // we have a special case where the JSON document is a single document...
+    switch (doc.type()) {
+    case simdjson::singlestage::json_type::number:
+      write_double(doc.get_double());
+      break;
+    case simdjson::singlestage::json_type::string:
+      write_raw_string(doc.get_raw_json_string());
+      break;
+    case simdjson::singlestage::json_type::boolean:
+      write_byte(0xc2 + doc.get_bool());
+      break;
+    case simdjson::singlestage::json_type::null:
+      // We check that the value is indeed null
+      // otherwise: an error is thrown.
+      if(doc.is_null()) {
+        write_byte(0xc0);
+      }
+      break;
+    case simdjson::singlestage::json_type::array:
+    case simdjson::singlestage::json_type::object:
+    default:
+      // impossible
+      SIMDJSON_UNREACHABLE();
+    }
+  } else {
+    simdjson::singlestage::value val = doc;
+#define SIMDJSON_GCC_COMPILER ((__GNUC__) && !(__clang__) && !(__INTEL_COMPILER))
+#if SIMDJSON_GCC_COMPILER
+    // the GCC compiler does well with by-value passing.
+    // GCC has superior recursive inlining:
+    // https://stackoverflow.com/questions/29186186/why-does-gcc-generate-a-faster-program-than-clang-in-this-recursive-fibonacci-co
+    // https://godbolt.org/z/TeK4doE51
+    recursive_processor(val);
+#else
+    recursive_processor_ref(val);
+#endif
+  }
+  if (!doc.at_end()) {
+     throw "There are unexpectedly tokens after the end of the json in the json2msgpack sample data";
+  }
+  return std::string_view(reinterpret_cast<char *>(buf), size_t(buff - buf));
+}
+
+void simdjsonsinglestage2msgpack::write_double(const double d) noexcept {
+  *buff++ = 0xcb;
+  ::memcpy(buff, &d, sizeof(d));
+  buff += sizeof(d);
+}
+
+void simdjsonsinglestage2msgpack::write_byte(const uint8_t b) noexcept {
+  *buff = b;
+  buff++;
+}
+
+void simdjsonsinglestage2msgpack::write_uint32(const uint32_t w) noexcept {
+  ::memcpy(buff, &w, sizeof(w));
+  buff += sizeof(w);
+}
+
+uint8_t *simdjsonsinglestage2msgpack::skip_uint32() noexcept {
+  uint8_t *ret = buff;
+  buff += sizeof(uint32_t);
+  return ret;
+}
+
+void simdjsonsinglestage2msgpack::write_uint32_at(const uint32_t w, uint8_t *p) noexcept {
+  ::memcpy(p, &w, sizeof(w));
+}
+
+void simdjsonsinglestage2msgpack::write_raw_string(
+    simdjson::singlestage::raw_json_string in) {
+  write_byte(0xdb);
+  uint8_t *location = skip_uint32();
+  std::string_view v = parser.unescape(in, buff);
+  write_uint32_at(uint32_t(v.size()), location);
+}
+
+void simdjsonsinglestage2msgpack::recursive_processor(simdjson::singlestage::value element) {
+  switch (element.type()) {
+  case simdjson::singlestage::json_type::array: {
+    uint32_t counter = 0;
+    write_byte(0xdd);
+    uint8_t *location = skip_uint32();
+    for (auto child : element.get_array()) {
+      counter++;
+      recursive_processor(child.value());
+    }
+    write_uint32_at(counter, location);
+  } break;
+  case simdjson::singlestage::json_type::object: {
+    uint32_t counter = 0;
+    write_byte(0xdf);
+    uint8_t *location = skip_uint32();
+    for (auto field : element.get_object()) {
+      counter++;
+      write_raw_string(field.key());
+      recursive_processor(field.value());
+    }
+    write_uint32_at(counter, location);
+  } break;
+  case simdjson::singlestage::json_type::number:
+    write_double(element.get_double());
+    break;
+  case simdjson::singlestage::json_type::string:
+    write_raw_string(element.get_raw_json_string());
+    break;
+  case simdjson::singlestage::json_type::boolean:
+    write_byte(0xc2 + element.get_bool());
+    break;
+  case simdjson::singlestage::json_type::null:
+    // We check that the value is indeed null
+    // otherwise: an error is thrown.
+    if(element.is_null()) {
+      write_byte(0xc0);
+    }
+    break;
+  default:
+    SIMDJSON_UNREACHABLE();
+  }
+}
+
+
+void simdjsonsinglestage2msgpack::recursive_processor_ref(simdjson::singlestage::value& element) {
+  switch (element.type()) {
+  case simdjson::singlestage::json_type::array: {
+    uint32_t counter = 0;
+    write_byte(0xdd);
+    uint8_t *location = skip_uint32();
+    for (auto child : element.get_array()) {
+      counter++;
+      simdjson::singlestage::value v = child.value();
+      recursive_processor_ref(v);
+    }
+    write_uint32_at(counter, location);
+  } break;
+  case simdjson::singlestage::json_type::object: {
+    uint32_t counter = 0;
+    write_byte(0xdf);
+    uint8_t *location = skip_uint32();
+    for (auto field : element.get_object()) {
+      counter++;
+      write_raw_string(field.key());
+      simdjson::singlestage::value v = field.value();
+      recursive_processor_ref(v);
+    }
+    write_uint32_at(counter, location);
+  } break;
+  case simdjson::singlestage::json_type::number:
+    write_double(element.get_double());
+    break;
+  case simdjson::singlestage::json_type::string:
+    write_raw_string(element.get_raw_json_string());
+    break;
+  case simdjson::singlestage::json_type::boolean:
+    write_byte(0xc2 + element.get_bool());
+    break;
+  case simdjson::singlestage::json_type::null:
+    // We check that the value is indeed null
+    // otherwise: an error is thrown.
+    if(element.is_null()) {
+      write_byte(0xc0);
+    }
+    break;
+  default:
+    SIMDJSON_UNREACHABLE();
+  }
+}
+
+struct simdjson_singlestage {
+  using StringType = std::string_view;
+
+  simdjsonsinglestage2msgpack parser{};
+
+  bool run(simdjson::padded_string &json, char *buffer,
+           std::string_view &result) {
+    result = parser.to_msgpack(json, reinterpret_cast<uint8_t *>(buffer));
+    return true;
+  }
+};
+
+BENCHMARK_TEMPLATE(json2msgpack, simdjson_singlestage)->UseManualTime();
+
+} // namespace json2msgpack
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -13,6 +13,8 @@ void maybe_display_implementation() {
    std::cout << "simdjson::dom implementation:      " << simdjson::get_active_implementation()->name() << std::endl;
    std::cout << "simdjson::ondemand implementation (stage 1): " << simdjson::get_active_implementation()->name() << std::endl;
    std::cout << "simdjson::ondemand implementation (stage 2): " << simdjson::builtin_implementation()->name() << std::endl;
+    std::cout << "simdjson::singlestage implementation (stage 1): " << simdjson::get_active_implementation()->name() << std::endl;
+    std::cout << "simdjson::singlestage implementation (stage 2): " << simdjson::builtin_implementation()->name() << std::endl;
  }
 }

@@ -0,0 +1,29 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "kostya.h"
+
+namespace kostya {
+
+using namespace simdjson;
+
+struct simdjson_singlestage {
+  static constexpr diff_flags DiffFlags = diff_flags::NONE;
+
+  singlestage::parser parser{};
+
+  bool run(simdjson::padded_string &json, std::vector<point> &result) {
+    auto doc = parser.iterate(json);
+    for (singlestage::object point : doc.find_field("coordinates")) {
+      result.emplace_back(json_benchmark::point{point.find_field("x"), point.find_field("y"), point.find_field("z")});
+    }
+    return true;
+  }
+};
+
+BENCHMARK_TEMPLATE(kostya, simdjson_singlestage)->UseManualTime();
+
+} // namespace kostya
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -0,0 +1,72 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "large_amazon_cellphones.h"
+
+namespace large_amazon_cellphones {
+
+using namespace simdjson;
+
+template<bool threaded>
+struct simdjson_singlestage {
+  using StringType = std::string;
+
+  singlestage::parser parser{};
+
+  bool run(simdjson::padded_string &json, std::map<StringType, brand> &result) {
+#ifdef SIMDJSON_THREADS_ENABLED
+    parser.threaded = threaded;
+#endif
+    singlestage::document_stream stream = parser.iterate_many(json);
+    singlestage::document_stream::iterator i = stream.begin();
+    ++i;  // Skip first line
+    for (;i != stream.end(); ++i) {
+      auto doc = *i;
+      size_t index{0};
+      StringType copy;
+      double rating;
+      uint64_t reviews;
+      for ( auto value : doc ) {
+        switch (index)
+        {
+        case 1:
+          copy = StringType(std::string_view(value));
+          break;
+        case 5:
+          rating = double(value);
+          break;
+        case 7:
+          reviews = uint64_t(value);
+          break;
+        default:
+          break;
+        }
+        index++;
+      }
+
+      auto x = result.find(copy);
+      if (x == result.end()) {  // If key not found, add new key
+        result.emplace(copy, large_amazon_cellphones::brand{
+          rating * reviews,
+          reviews
+        });
+      } else {  // Otherwise, update key data
+        x->second.cumulative_rating += rating * reviews;
+        x->second.reviews_count += reviews;
+      }
+    }
+
+    return true;
+  }
+
+};
+
+BENCHMARK_TEMPLATE(large_amazon_cellphones, simdjson_singlestage<UNTHREADED>)->UseManualTime();
+#ifdef SIMDJSON_THREADS_ENABLED
+BENCHMARK_TEMPLATE(large_amazon_cellphones, simdjson_singlestage<THREADED>)->UseManualTime();
+#endif
+
+} // namespace amazon_cellphones
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -0,0 +1,29 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "large_random.h"
+
+namespace large_random {
+
+using namespace simdjson;
+
+struct simdjson_singlestage {
+  static constexpr diff_flags DiffFlags = diff_flags::NONE;
+
+  singlestage::parser parser{};
+
+  bool run(simdjson::padded_string &json, std::vector<point> &result) {
+    auto doc = parser.iterate(json);
+    for (singlestage::object coord : doc) {
+      result.emplace_back(json_benchmark::point{coord.find_field("x"), coord.find_field("y"), coord.find_field("z")});
+    }
+    return true;
+  }
+};
+
+BENCHMARK_TEMPLATE(large_random, simdjson_singlestage)->UseManualTime();
+
+} // namespace large_random
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -0,0 +1,29 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "large_random.h"
+
+namespace large_random {
+
+using namespace simdjson;
+
+struct simdjson_singlestage_unordered {
+  static constexpr diff_flags DiffFlags = diff_flags::NONE;
+
+  singlestage::parser parser{};
+
+  bool run(simdjson::padded_string &json, std::vector<point> &result) {
+    auto doc = parser.iterate(json);
+    for (singlestage::object coord : doc) {
+      result.emplace_back(json_benchmark::point{coord["x"], coord["y"], coord["z"]});
+    }
+    return true;
+  }
+};
+
+BENCHMARK_TEMPLATE(large_random, simdjson_singlestage_unordered)->UseManualTime();
+
+} // namespace large_random
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -0,0 +1,37 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "largerandom.h"
+
+namespace largerandom {
+
+using namespace simdjson;
+
+class OnDemand {
+public:
+  simdjson_inline bool Run(const padded_string &json);
+  simdjson_inline const std::vector<my_point> &Result() { return container; }
+  simdjson_inline size_t ItemCount() { return container.size(); }
+
+private:
+  singlestage::parser parser{};
+  std::vector<my_point> container{};
+};
+
+simdjson_inline bool OnDemand::Run(const padded_string &json) {
+  container.clear();
+
+  auto doc = parser.iterate(json);
+  for (singlestage::object coord : doc) {
+    container.emplace_back(my_point{coord.find_field("x"), coord.find_field("y"), coord.find_field("z")});
+  }
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(LargeRandom, OnDemand);
+
+} // namespace largerandom
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -0,0 +1,48 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "partial_tweets.h"
+
+namespace partial_tweets {
+
+using namespace simdjson;
+
+struct simdjson_singlestage {
+  using StringType=std::string_view;
+
+  singlestage::parser parser{};
+
+  simdjson_inline uint64_t nullable_int(singlestage::value value) {
+    if (value.is_null()) { return 0; }
+    return value;
+  }
+
+  simdjson_inline twitter_user<std::string_view> read_user(singlestage::object user) {
+    return { user.find_field("id"), user.find_field("screen_name") };
+  }
+
+  bool run(simdjson::padded_string &json, std::vector<tweet<std::string_view>> &result) {
+    // Walk the document, parsing the tweets as we go
+    auto doc = parser.iterate(json);
+    for (singlestage::object tweet : doc.find_field("statuses")) {
+      result.emplace_back(partial_tweets::tweet<std::string_view>{
+        tweet.find_field("created_at"),
+        tweet.find_field("id"),
+        tweet.find_field("text"),
+        nullable_int(tweet.find_field("in_reply_to_status_id")),
+        read_user(tweet.find_field("user")),
+        tweet.find_field("retweet_count"),
+        tweet.find_field("favorite_count")
+      });
+    }
+
+    return true;
+  }
+};
+
+BENCHMARK_TEMPLATE(partial_tweets, simdjson_singlestage)->UseManualTime();
+
+} // namespace partial_tweets
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -0,0 +1,63 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "partial_tweets.h"
+
+namespace partial_tweets {
+
+using namespace simdjson;
+
+
+class SingleStage {
+public:
+  SingleStage() {
+    if(!displayed_implementation) {
+      std::cout << "On Demand implementation: " << builtin_implementation()->name() << std::endl;
+      displayed_implementation = true;
+    }
+  }
+  simdjson_inline bool Run(const padded_string &json);
+  simdjson_inline const std::vector<tweet> &Result() { return tweets; }
+  simdjson_inline size_t ItemCount() { return tweets.size(); }
+
+private:
+  singlestage::parser parser{};
+  std::vector<tweet> tweets{};
+
+  simdjson_inline uint64_t nullable_int(singlestage::value value) {
+    if (value.is_null()) { return 0; }
+    return value;
+  }
+
+  simdjson_inline twitter_user read_user(singlestage::object user) {
+    return { user.find_field("id"), user.find_field("screen_name") };
+  }
+
+  static inline bool displayed_implementation = false;
+};
+
+simdjson_inline bool SingleStage::Run(const padded_string &json) {
+  tweets.clear();
+
+  // Walk the document, parsing the tweets as we go
+  auto doc = parser.iterate(json);
+  for (singlestage::object tweet : doc.find_field("statuses")) {
+    tweets.emplace_back(partial_tweets::tweet{
+      tweet.find_field("created_at"),
+      tweet.find_field("id"),
+      tweet.find_field("text"),
+      nullable_int(tweet.find_field("in_reply_to_status_id")),
+      read_user(tweet.find_field("user")),
+      tweet.find_field("retweet_count"),
+      tweet.find_field("favorite_count")
+    });
+  }
+  return true;
+}
+
+BENCHMARK_TEMPLATE(PartialTweets, SingleStage);
+
+} // namespace partial_tweets
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -0,0 +1,80 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "top_tweet.h"
+
+namespace top_tweet {
+
+using namespace simdjson;
+
+struct simdjson_singlestage {
+  using StringType=std::string_view;
+
+  singlestage::parser parser{};
+
+  bool run(simdjson::padded_string &json, int64_t max_retweet_count, top_tweet_result<StringType> &result) {
+    result.retweet_count = -1;
+    // We save these DOM values for later so we don't have to parse them
+    // into string_views until we're sure which ones we want to parse
+    // NOTE: simdjson does not presently support reuse of objects or arrays--just scalars. This is
+    // why we have to grab the text and screen_name fields instead of just saving the tweet object.
+    singlestage::value screen_name, text;
+
+    auto doc = parser.iterate(json);
+    for (auto tweet : doc["statuses"]) {
+      // Since text, user.screen_name, and retweet_count generally appear in order, it's nearly free
+      // for us to retrieve them here (and will cost a bit more if we do it in the if
+      // statement).
+      auto tweet_text = tweet["text"];
+      auto tweet_screen_name = tweet["user"]["screen_name"];
+      int64_t retweet_count = tweet["retweet_count"];
+      if (retweet_count <= max_retweet_count && retweet_count >= result.retweet_count) {
+        result.retweet_count = retweet_count;
+        // TODO std::move should not be necessary
+        text = std::move(tweet_text);
+        screen_name = std::move(tweet_screen_name);
+      }
+    }
+
+    // Now that we know which was the most retweeted, parse the values in it
+    result.screen_name = screen_name;
+    result.text = text;
+    return result.retweet_count != -1;
+  }
+};
+
+BENCHMARK_TEMPLATE(top_tweet, simdjson_singlestage)->UseManualTime();
+
+struct simdjson_singlestage_forward_only {
+  using StringType=std::string_view;
+
+  singlestage::parser parser{};
+
+  bool run(simdjson::padded_string &json, int64_t max_retweet_count, top_tweet_result<StringType> &result) {
+    result.retweet_count = -1;
+
+    auto doc = parser.iterate(json);
+    for (auto tweet : doc["statuses"]) {
+      // Since text, user.screen_name, and retweet_count generally appear in order, it's nearly free
+      // for us to retrieve them here (and will cost a bit more if we do it in the if
+      // statement).
+      auto tweet_text = tweet["text"];
+      auto tweet_screen_name = tweet["user"]["screen_name"];
+      int64_t retweet_count = tweet["retweet_count"];
+      if (retweet_count <= max_retweet_count && retweet_count >= result.retweet_count) {
+        result.retweet_count = retweet_count;
+        result.text = tweet_text;
+        result.screen_name = tweet_screen_name;
+      }
+    }
+
+    return result.retweet_count != -1;
+  }
+};
+
+BENCHMARK_TEMPLATE(top_tweet, simdjson_singlestage_forward_only)->UseManualTime();
+
+} // namespace top_tweet
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -35,4 +35,14 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  add_quickstart_test(quickstart_ondemand_noexceptions   quickstart_ondemand_noexceptions.cpp NO_EXCEPTIONS LABELS quickstart_ondemand acceptance)
  add_quickstart_test(quickstart_ondemand_noexceptions11 quickstart_ondemand_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11 LABELS quickstart_ondemand)

+  # SingleStage Quick Start
+  if (SIMDJSON_EXCEPTIONS)
+    add_quickstart_test(quickstart_singlestage   quickstart_singlestage.cpp LABELS quickstart_singlestage acceptance)
+    add_quickstart_test(quickstart_singlestage11 quickstart_singlestage.cpp CXX_STANDARD c++11 LABELS quickstart_singlestage acceptance)
+    add_quickstart_test(quickstart_singlestage14 quickstart_singlestage.cpp CXX_STANDARD c++14 LABELS quickstart_singlestage)
+  endif()
+
+  add_quickstart_test(quickstart_singlestage_noexceptions   quickstart_singlestage_noexceptions.cpp NO_EXCEPTIONS LABELS quickstart_singlestage acceptance)
+  add_quickstart_test(quickstart_singlestage_noexceptions11 quickstart_singlestage_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11 LABELS quickstart_singlestage)
+
 endif()
@@ -0,0 +1,9 @@
+#include <iostream>
+#include "simdjson.h"
+using namespace simdjson;
+int main(void) {
+    ondemand::parser parser;
+    padded_string json = padded_string::load("twitter.json");
+    ondemand::document tweets = parser.iterate(json);
+    std::cout << uint64_t(tweets["search_metadata"]["count"]) << " results." << std::endl;
+}
@@ -0,0 +1,21 @@
+#include <iostream>
+#include "simdjson.h"
+using namespace simdjson;
+int main(void) {
+    padded_string json;
+    auto error = padded_string::load("twitter.json").get(json);
+    if (error) { std::cerr << error << std::endl; return EXIT_FAILURE; }
+
+    ondemand::parser parser;
+    ondemand::document tweets;
+    error = parser.iterate(json).get(tweets);
+    if (error) { std::cerr << error << std::endl; return EXIT_FAILURE; }
+
+    uint64_t count;
+    error = tweets["search_metadata"]["count"].get(count);
+    if (error) { std::cerr << error << std::endl; return EXIT_FAILURE; }
+
+    std::cout << count << " results." << std::endl;
+
+    return EXIT_SUCCESS;
+}
@@ -63,6 +63,7 @@ if(SIMDJSON_ENABLE_FUZZING)
  implement_fuzzer(fuzz_minifyimpl)      # minify *without* parsing, plus compare implementations
  implement_fuzzer(fuzz_ndjson)          # the ndjson api
  implement_fuzzer(fuzz_ondemand)
+  # implement_fuzzer(fuzz_singlestage) # TODO why no worky
  implement_fuzzer(fuzz_padded)
  implement_fuzzer(fuzz_parser)
  implement_fuzzer(fuzz_print_json)
@@ -0,0 +1,74 @@
+#include "FuzzUtils.h"
+#include "simdjson.h"
+#include <cstddef>
+#include <cstdint>
+#include <string>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
+  FuzzData fd(Data, Size);
+  const int action = fd.getInt<0, 12>();
+
+  // split the remainder of the document into strings
+  auto strings = fd.splitIntoStrings();
+  while (strings.size() < 1) {
+    strings.emplace_back();
+  }
+#if SIMDJSON_EXCEPTIONS
+  try {
+#endif
+    simdjson::singlestage::parser parser;
+    simdjson::padded_string padded(strings[0]);
+    auto doc = parser.iterate(padded);
+    if (doc.error()) {
+      return 0;
+    }
+    for (auto item : doc) {
+      switch (action) {
+      case 0: {
+        simdjson_unused auto x = item.get_string();
+      } break;
+      case 1: {
+        simdjson_unused auto x = item.get_bool();
+      } break;
+      case 2: {
+        simdjson_unused auto x = item.get_array();
+      } break;
+      case 3: {
+        simdjson_unused auto x = item.get_int64();
+      } break;
+      case 4: {
+        simdjson_unused auto x = item.get_double();
+      } break;
+      case 5: {
+        simdjson_unused auto x = item.get_object();
+      } break;
+      case 6: {
+        simdjson_unused auto x = item.get_uint64();
+      } break;
+      case 7: {
+        simdjson_unused auto x = item.get_raw_json_string();
+      } break;
+      case 8: {
+        simdjson_unused auto x = item.is_null();
+      } break;
+      case 9: {
+        simdjson_unused auto x = item.begin();
+      } break;
+      case 10: {
+        simdjson_unused auto x = item.end();
+      } break;
+      case 11: {
+        for (auto e : item) {
+          simdjson_unused auto x = e.is_null();
+        }
+      } break;
+      default:;
+      }
+    }
+#if SIMDJSON_EXCEPTIONS
+  } catch (...) {
+  }
+#endif
+
+  return 0;
+}
@@ -53,5 +53,6 @@

 #include "simdjson/dom.h"
 #include "simdjson/ondemand.h"
+#include "simdjson/singlestage.h"

 #endif // SIMDJSON_H
@@ -1,9 +1,9 @@
 #ifndef SIMDJSON_ARM64_BASE_H
 #define SIMDJSON_ARM64_BASE_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #include "simdjson/base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 /**
@@ -23,4 +23,11 @@ template <typename T> struct simd8x64;
 } // namespace arm64
 } // namespace simdjson

+#ifndef SIMDJSON_AMALGAMATED
+// If we're editing one of the files in this directory, begin the implementation!
+#ifndef SIMDJSON_IMPLEMENTATION
+#include "simdjson/arm64/begin.h"
+#endif
+#endif // SIMDJSON_AMALGAMATED
+
 #endif // SIMDJSON_ARM64_BASE_H
@@ -6,5 +6,3 @@
 #include "simdjson/arm64/numberparsing_defs.h"
 #include "simdjson/arm64/simd.h"
 #include "simdjson/arm64/stringparsing_defs.h"
-
-#define SIMDJSON_SKIP_BACKSLASH_SHORT_CIRCUIT 1
@@ -1,13 +1,11 @@
 #ifndef SIMDJSON_ARM64_BITMANIPULATION_H
 #define SIMDJSON_ARM64_BITMANIPULATION_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
 #include "simdjson/arm64/base.h"
 #include "simdjson/arm64/intrinsics.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE

 namespace simdjson {
-namespace arm64 {
+namespace SIMDJSON_IMPLEMENTATION {
 namespace {

 // We sometimes call trailing_zero on inputs that are zero,
@@ -100,7 +98,7 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, uint64_t *re
 }

 } // unnamed namespace
-} // namespace arm64
+} // namespace SIMDJSON_IMPLEMENTATION
 } // namespace simdjson

 #endif // SIMDJSON_ARM64_BITMANIPULATION_H
@@ -1,12 +1,10 @@
 #ifndef SIMDJSON_ARM64_BITMASK_H
 #define SIMDJSON_ARM64_BITMASK_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
 #include "simdjson/arm64/base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE

 namespace simdjson {
-namespace arm64 {
+namespace SIMDJSON_IMPLEMENTATION {
 namespace {

 //
@@ -1,6 +1 @@
-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
-#include "simdjson/arm64/base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
-
-#undef SIMDJSON_SKIP_BACKSLASH_SHORT_CIRCUIT
 #undef SIMDJSON_IMPLEMENTATION
@@ -1,11 +1,10 @@
 #ifndef SIMDJSON_ARM64_IMPLEMENTATION_H
 #define SIMDJSON_ARM64_IMPLEMENTATION_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
-#include "simdjson/base.h"
+#ifndef SIMDJSON_AMALGAMATED
 #include "simdjson/implementation.h"
 #include "simdjson/internal/instruction_set.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace arm64 {
@@ -1,14 +1,12 @@
 #ifndef SIMDJSON_ARM64_INTRINSICS_H
 #define SIMDJSON_ARM64_INTRINSICS_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
-#include "simdjson/arm64/base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
-
 // This should be the correct header whether
 // you use visual studio or other compilers.
 #include <arm_neon.h>

+#include "simdjson/arm64/base.h"
+
 static_assert(sizeof(uint8x16_t) <= simdjson::SIMDJSON_PADDING, "insufficient padding for arm64");

 #endif //  SIMDJSON_ARM64_INTRINSICS_H
@@ -1,21 +1,22 @@
 #ifndef SIMDJSON_ARM64_NUMBERPARSING_DEFS_H
 #define SIMDJSON_ARM64_NUMBERPARSING_DEFS_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
 #include "simdjson/arm64/base.h"
 #include "simdjson/arm64/intrinsics.h"
-#include "simdjson/internal/numberparsing_tables.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
-
-#include <cstring>

 #if _M_ARM64
 // __umulh requires intrin.h
 #include <intrin.h>
 #endif // _M_ARM64

+#include <cstring>
+
+#ifndef SIMDJSON_AMALGAMATED
+#include "simdjson/internal/numberparsing_tables.h"
+#endif // SIMDJSON_AMALGAMATED
+
 namespace simdjson {
-namespace arm64 {
+namespace SIMDJSON_IMPLEMENTATION {
 namespace numberparsing {

 // we don't have SSE, so let us use a scalar function
@@ -48,7 +49,7 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t
 }

 } // namespace numberparsing
-} // namespace arm64
+} // namespace SIMDJSON_IMPLEMENTATION
 } // namespace simdjson

 #define SIMDJSON_SWAR_NUMBER_PARSING 1
@@ -1,14 +1,15 @@
 #ifndef SIMDJSON_ARM64_SIMD_H
 #define SIMDJSON_ARM64_SIMD_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
 #include "simdjson/arm64/base.h"
 #include "simdjson/arm64/bitmanipulation.h"
+
+#ifndef SIMDJSON_AMALGAMATED
 #include "simdjson/internal/simdprune_tables.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
-namespace arm64 {
+namespace SIMDJSON_IMPLEMENTATION {
 namespace {
 namespace simd {

@@ -527,7 +528,7 @@ simdjson_inline int8x16_t make_int8x16_t(int8_t x1,  int8_t x2,  int8_t x3,  int

 } // namespace simd
 } // unnamed namespace
-} // namespace arm64
+} // namespace SIMDJSON_IMPLEMENTATION
 } // namespace simdjson

 #endif // SIMDJSON_ARM64_SIMD_H
@@ -0,0 +1,8 @@
+#ifndef SIMDJSON_ARM64_SINGLESTAGE_H
+#define SIMDJSON_ARM64_SINGLESTAGE_H
+
+#include "simdjson/arm64/begin.h"
+#include "simdjson/generic/singlestage/amalgamated.h"
+#include "simdjson/arm64/end.h"
+
+#endif // SIMDJSON_ARM64_SINGLESTAGE_H
@@ -1,14 +1,12 @@
 #ifndef SIMDJSON_ARM64_STRINGPARSING_DEFS_H
 #define SIMDJSON_ARM64_STRINGPARSING_DEFS_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
 #include "simdjson/arm64/base.h"
 #include "simdjson/arm64/simd.h"
 #include "simdjson/arm64/bitmanipulation.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE

 namespace simdjson {
-namespace arm64 {
+namespace SIMDJSON_IMPLEMENTATION {
 namespace {

 using namespace simd;
@@ -47,7 +45,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
 }

 } // unnamed namespace
-} // namespace arm64
+} // namespace SIMDJSON_IMPLEMENTATION
 } // namespace simdjson

 #endif // SIMDJSON_ARM64_STRINGPARSING_DEFS_H
@@ -6,7 +6,7 @@

 #include "simdjson/generic/dependencies.h"

-#define SIMDJSON_CONDITIONAL_INCLUDE
+#define SIMDJSON_AMALGAMATED

 #if SIMDJSON_BUILTIN_IMPLEMENTATION_IS(arm64)
 #include "simdjson/arm64.h"
@@ -24,6 +24,6 @@
 #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
 #endif

-#undef SIMDJSON_CONDITIONAL_INCLUDE
+#undef SIMDJSON_AMALGAMATED

 #endif // SIMDJSON_BUILTIN_H
@@ -5,7 +5,7 @@

 #include "simdjson/generic/dependencies.h"

-#define SIMDJSON_CONDITIONAL_INCLUDE
+#define SIMDJSON_AMALGAMATED

 #if SIMDJSON_BUILTIN_IMPLEMENTATION_IS(arm64)
 #include "simdjson/arm64/implementation.h"
@@ -23,7 +23,7 @@
 #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
 #endif

-#undef SIMDJSON_CONDITIONAL_INCLUDE
+#undef SIMDJSON_AMALGAMATED

 namespace simdjson {
  /**
@@ -6,7 +6,7 @@

 #include "simdjson/generic/ondemand/dependencies.h"

-#define SIMDJSON_CONDITIONAL_INCLUDE
+#define SIMDJSON_AMALGAMATED

 #if SIMDJSON_BUILTIN_IMPLEMENTATION_IS(arm64)
 #include "simdjson/arm64/ondemand.h"
@@ -24,7 +24,7 @@
 #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
 #endif

-#undef SIMDJSON_CONDITIONAL_INCLUDE
+#undef SIMDJSON_AMALGAMATED

 namespace simdjson {
  /**
@@ -0,0 +1,36 @@
+#ifndef SIMDJSON_BUILTIN_SINGLESTAGE_H
+#define SIMDJSON_BUILTIN_SINGLESTAGE_H
+
+#include "simdjson/builtin.h"
+#include "simdjson/builtin/base.h"
+
+#include "simdjson/generic/singlestage/dependencies.h"
+
+#define SIMDJSON_AMALGAMATED
+
+#if SIMDJSON_BUILTIN_IMPLEMENTATION_IS(arm64)
+#include "simdjson/arm64/singlestage.h"
+#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(fallback)
+#include "simdjson/fallback/singlestage.h"
+#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(haswell)
+#include "simdjson/haswell/singlestage.h"
+#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(icelake)
+#include "simdjson/icelake/singlestage.h"
+#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(ppc64)
+#include "simdjson/ppc64/singlestage.h"
+#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(westmere)
+#include "simdjson/westmere/singlestage.h"
+#else
+#error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
+#endif
+
+#undef SIMDJSON_AMALGAMATED
+
+namespace simdjson {
+  /**
+   * @copydoc simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::singlestage
+   */
+  namespace singlestage = SIMDJSON_BUILTIN_IMPLEMENTATION::singlestage;
+} // namespace simdjson
+
+#endif // SIMDJSON_BUILTIN_SINGLESTAGE_H
@@ -5,12 +5,10 @@

 #include "simdjson/dom/base.h"
 #include "simdjson/dom/document.h"
-#include "simdjson/dom/element-inl.h"
+#include "simdjson/dom/element.h"
 #include "simdjson/internal/tape_ref-inl.h"
 #include "simdjson/internal/jsonformatutils.h"

-#include <cstring>
-
 namespace simdjson {
 namespace dom {

@@ -7,12 +7,8 @@
 #include "simdjson/dom/object.h"
 #include "simdjson/internal/tape_type.h"

-#include "simdjson/dom/object-inl.h"
-#include "simdjson/error-inl.h"
-
 #include <ostream>
 #include <limits>
-
 namespace simdjson {

 //
@@ -7,8 +7,6 @@
 #include "simdjson/dom/parser.h"
 #include "simdjson/dom/element.h"

-#include "simdjson/dom/parser-inl.h"
-
 namespace simdjson {

 //
@@ -5,11 +5,6 @@
 #include "simdjson/dom/object.h"
 #include "simdjson/dom/document.h"

-#include "simdjson/dom/element-inl.h"
-#include "simdjson/error-inl.h"
-
-#include <cstring>
-
 namespace simdjson {

 //
@@ -3,15 +3,10 @@

 #include "simdjson/dom/base.h"
 #include "simdjson/dom/parsedjson_iterator.h"
-#include "simdjson/internal/jsonformatutils.h"
-
-#include "simdjson/dom/parser-inl.h"
 #include "simdjson/internal/tape_ref-inl.h"
-
-#include <cstring>
-#include <iterator>
-#include <limits>
+#include "simdjson/internal/jsonformatutils.h"
 #include <ostream>
+#include <iterator>

 #ifndef SIMDJSON_DISABLE_DEPRECATED_API

@@ -8,7 +8,6 @@

 #include "simdjson/error-inl.h"
 #include "simdjson/padded_string-inl.h"
-#include "simdjson/dom/document_stream-inl.h"
 #include "simdjson/dom/element-inl.h"

 #include <climits>
@@ -7,12 +7,6 @@
 #include "simdjson/dom/parser.h"
 #include "simdjson/internal/tape_type.h"

-#include "simdjson/dom/array-inl.h"
-#include "simdjson/dom/object-inl.h"
-#include "simdjson/internal/tape_ref-inl.h"
-
-#include <cstring>
-
 namespace simdjson {
 namespace dom {
 inline bool parser::print_json(std::ostream &os) const noexcept {
@@ -23,46 +17,12 @@ inline bool parser::print_json(std::ostream &os) const noexcept {
  os << answer;
  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());
 }
-#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());
-}
-#endif
-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());
-}
-#endif
-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());
-}
-#endif
-
-} // namespace dom
-
 /***
 * Number utility functions
 **/
+
+
 namespace {
 /**@private
 * Escape sequence like \b or \u0001
@@ -146,9 +146,16 @@ namespace dom {
 * @param value The element.
 * @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) {
+    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);
+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
 /**
 * Print JSON to an output stream.
@@ -157,9 +164,16 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result<sim
 * @param value The array.
 * @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)  {
+    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);
+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
 /**
 * Print JSON to an output stream.
@@ -168,9 +182,16 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result<sim
 * @param value The object.
 * @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)   {
+    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);
+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
 } // namespace dom

@@ -1,10 +1,10 @@
 #ifndef SIMDJSON_ERROR_INL_H
 #define SIMDJSON_ERROR_INL_H

-#include "simdjson/error.h"
-
 #include <iostream>

+#include "simdjson/error.h"
+
 namespace simdjson {
 namespace internal {
  // We store the error code so we can validate the error message is associated with the right code
@@ -2,9 +2,7 @@
 #define SIMDJSON_ERROR_H

 #include "simdjson/base.h"
-
 #include <string>
-#include <ostream>

 namespace simdjson {

@@ -1,9 +1,9 @@
 #ifndef SIMDJSON_FALLBACK_BASE_H
 #define SIMDJSON_FALLBACK_BASE_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #include "simdjson/base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 /**
@@ -16,4 +16,11 @@ class implementation;
 } // namespace fallback
 } // namespace simdjson

+#ifndef SIMDJSON_AMALGAMATED
+// If we're editing one of the files in this directory, begin the implementation!
+#ifndef SIMDJSON_IMPLEMENTATION
+#include "simdjson/fallback/begin.h"
+#endif
+#endif // SIMDJSON_AMALGAMATED
+
 #endif // SIMDJSON_FALLBACK_BASE_H
@@ -1,12 +1,10 @@
 #ifndef SIMDJSON_FALLBACK_BITMANIPULATION_H
 #define SIMDJSON_FALLBACK_BITMANIPULATION_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
 #include "simdjson/fallback/base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE

 namespace simdjson {
-namespace fallback {
+namespace SIMDJSON_IMPLEMENTATION {
 namespace {

 #if defined(_MSC_VER) && !defined(_M_ARM64) && !defined(_M_X64)
@@ -42,7 +40,7 @@ simdjson_inline int leading_zeroes(uint64_t input_num) {
 }

 } // unnamed namespace
-} // namespace fallback
+} // namespace SIMDJSON_IMPLEMENTATION
 } // namespace simdjson

 #endif // SIMDJSON_FALLBACK_BITMANIPULATION_H
@@ -1,5 +1 @@
-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
-#include "simdjson/fallback/base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
-
 #undef SIMDJSON_IMPLEMENTATION
@@ -1,10 +1,9 @@
 #ifndef SIMDJSON_FALLBACK_IMPLEMENTATION_H
 #define SIMDJSON_FALLBACK_IMPLEMENTATION_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
-#include "simdjson/fallback/base.h"
+#ifndef SIMDJSON_AMALGAMATED
 #include "simdjson/implementation.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace fallback {
@@ -1,12 +1,11 @@
 #ifndef SIMDJSON_FALLBACK_NUMBERPARSING_DEFS_H
 #define SIMDJSON_FALLBACK_NUMBERPARSING_DEFS_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
 #include "simdjson/fallback/base.h"
-#include "simdjson/internal/numberparsing_tables.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE

-#include <cstring>
+#ifndef SIMDJSON_AMALGAMATED
+#include "simdjson/internal/numberparsing_tables.h"
+#endif // SIMDJSON_AMALGAMATED

 #ifdef JSON_TEST_NUMBERS // for unit testing
 void found_invalid_number(const uint8_t *buf);
@@ -16,7 +15,7 @@ void found_float(double result, const uint8_t *buf);
 #endif

 namespace simdjson {
-namespace fallback {
+namespace SIMDJSON_IMPLEMENTATION {
 namespace numberparsing {

 // credit: https://johnnylee-sde.github.io/Fast-numeric-string-to-int/
@@ -72,7 +71,7 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t
 }

 } // namespace numberparsing
-} // namespace fallback
+} // namespace SIMDJSON_IMPLEMENTATION
 } // namespace simdjson

 #define SIMDJSON_SWAR_NUMBER_PARSING 1
@@ -0,0 +1,8 @@
+#ifndef SIMDJSON_FALLBACK_SINGLESTAGE_H
+#define SIMDJSON_FALLBACK_SINGLESTAGE_H
+
+#include "simdjson/fallback/begin.h"
+#include "simdjson/generic/singlestage/amalgamated.h"
+#include "simdjson/fallback/end.h"
+
+#endif // SIMDJSON_FALLBACK_SINGLESTAGE_H
@@ -1,12 +1,10 @@
 #ifndef SIMDJSON_FALLBACK_STRINGPARSING_DEFS_H
 #define SIMDJSON_FALLBACK_STRINGPARSING_DEFS_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
 #include "simdjson/fallback/base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE

 namespace simdjson {
-namespace fallback {
+namespace SIMDJSON_IMPLEMENTATION {
 namespace {

 // Holds backslashes and quotes locations.
@@ -30,7 +28,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin
 }

 } // unnamed namespace
-} // namespace fallback
+} // namespace SIMDJSON_IMPLEMENTATION
 } // namespace simdjson

 #endif // SIMDJSON_FALLBACK_STRINGPARSING_DEFS_H
@@ -1,4 +1,4 @@
-#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H)
+#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H)
 #error simdjson/generic/dependencies.h must be included before simdjson/generic/amalgamated.h!
 #endif

@@ -1,12 +1,10 @@
 #ifndef SIMDJSON_GENERIC_ATOMPARSING_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ATOMPARSING_H
 #include "simdjson/generic/base.h"
 #include "simdjson/generic/jsoncharutils.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
-
-#include <cstring>
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,6 +1,6 @@
 #ifndef SIMDJSON_GENERIC_BASE_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_BASE_H
 #include "simdjson/base.h"
 // If we haven't got an implementation yet, we're in the editor, editing a generic file! Just
@@ -23,7 +23,7 @@
 #error "All possible implementations (including fallback) have been disabled! simdjson will not run."
 #endif
 #endif // SIMDJSON_IMPLEMENTATION
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,5 +1,5 @@
-#ifdef SIMDJSON_CONDITIONAL_INCLUDE
-#error simdjson/generic/dependencies.h must be included before defining SIMDJSON_CONDITIONAL_INCLUDE!
+#ifdef SIMDJSON_AMALGAMATED
+#error simdjson/generic/dependencies.h must be included before defining SIMDJSON_AMALGAMATED!
 #endif

 #ifndef SIMDJSON_GENERIC_DEPENDENCIES_H
@@ -10,7 +10,6 @@
 // Otherwise, amalgamation will fail.
 #include "simdjson/base.h"
 #include "simdjson/implementation.h"
-#include "simdjson/implementation_detection.h"
 #include "simdjson/internal/instruction_set.h"
 #include "simdjson/internal/dom_parser_implementation.h"
 #include "simdjson/internal/jsoncharutils_tables.h"
@@ -1,10 +1,10 @@
 #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H
 #include "simdjson/generic/base.h"
 #include "simdjson/internal/dom_parser_implementation.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,10 +1,10 @@
 #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H
 #include "simdjson/generic/base.h"
 #include "simdjson/generic/implementation_simdjson_result_base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,9 +1,9 @@
 #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H
 #include "simdjson/generic/base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,11 +1,11 @@
 #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_JSONCHARUTILS_H
 #include "simdjson/generic/base.h"
 #include "simdjson/internal/jsoncharutils_tables.h"
 #include "simdjson/internal/numberparsing_tables.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -96,6 +96,16 @@ static simdjson_inline uint64_t _umul128(uint64_t ab, uint64_t cd, uint64_t *hi)
 }
 #endif

+inline std::string_view trim(const std::string_view str) noexcept {
+  // We can almost surely do better by rolling our own find_first_not_of function.
+  size_t first = str.find_first_not_of(" \t\n\r");
+  // If we have the empty string (just white space), then no trimming is possible, and
+  // we return the empty string_view.
+  if (std::string_view::npos == first) { return std::string_view(); }
+  size_t last = str.find_last_not_of(" \t\n\r");
+  return str.substr(first, (last - first + 1));
+}
+
 } // namespace jsoncharutils
 } // unnamed namespace
 } // namespace SIMDJSON_IMPLEMENTATION
@@ -1,15 +1,14 @@
 #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_NUMBERPARSING_H
 #include "simdjson/generic/base.h"
 #include "simdjson/generic/jsoncharutils.h"
 #include "simdjson/internal/numberparsing_tables.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 #include <limits>
 #include <ostream>
-#include <cstring>

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,4 +1,4 @@
-#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H)
+#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H)
 #error simdjson/generic/ondemand/dependencies.h must be included before simdjson/generic/ondemand/amalgamated.h!
 #endif

@@ -1,6 +1,6 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_ARRAY_INL_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/ondemand/array.h"
@@ -8,7 +8,7 @@
 #include "simdjson/generic/ondemand/json_iterator.h"
 #include "simdjson/generic/ondemand/value.h"
 #include "simdjson/generic/ondemand/value_iterator-inl.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,11 +1,11 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_ARRAY_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/implementation_simdjson_result_base.h"
 #include "simdjson/generic/ondemand/value_iterator.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,12 +1,12 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_INL_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/ondemand/array_iterator.h"
 #include "simdjson/generic/ondemand/value-inl.h"
 #include "simdjson/generic/ondemand/value_iterator-inl.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,11 +1,11 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_H
 #include "simdjson/generic/implementation_simdjson_result_base.h"
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/ondemand/value_iterator.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED


 namespace simdjson {
@@ -1,9 +1,9 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_BASE_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_BASE_H
 #include "simdjson/generic/base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,5 +1,5 @@
-#ifdef SIMDJSON_CONDITIONAL_INCLUDE
-#error simdjson/generic/ondemand/dependencies.h must be included before defining SIMDJSON_CONDITIONAL_INCLUDE!
+#ifdef SIMDJSON_AMALGAMATED
+#error simdjson/generic/ondemand/dependencies.h must be included before defining SIMDJSON_AMALGAMATED!
 #endif

 #ifndef SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H
@@ -1,6 +1,6 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/ondemand/array-inl.h"
@@ -12,7 +12,7 @@
 #include "simdjson/generic/ondemand/raw_json_string.h"
 #include "simdjson/generic/ondemand/value.h"
 #include "simdjson/generic/ondemand/value_iterator-inl.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,10 +1,10 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/ondemand/json_iterator.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,12 +1,12 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_INL_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/ondemand/document_stream.h"
 #include "simdjson/generic/ondemand/document-inl.h"
 #include "simdjson/generic/implementation_simdjson_result_base-inl.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 #include <algorithm>
 #include <stdexcept>
@@ -1,12 +1,12 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/implementation_simdjson_result_base.h"
 #include "simdjson/generic/ondemand/document.h"
 #include "simdjson/generic/ondemand/parser.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 #ifdef SIMDJSON_THREADS_ENABLED
 #include <thread>
@@ -1,12 +1,12 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/ondemand/field.h"
 #include "simdjson/generic/ondemand/value-inl.h"
 #include "simdjson/generic/ondemand/value_iterator-inl.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,12 +1,12 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_FIELD_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/implementation_simdjson_result_base.h"
 #include "simdjson/generic/ondemand/raw_json_string.h"
 #include "simdjson/generic/ondemand/value.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,6 +1,6 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_INL_H
 #include "simdjson/internal/dom_parser_implementation.h"
 #include "simdjson/generic/ondemand/base.h"
@@ -10,7 +10,7 @@
 #include "simdjson/generic/ondemand/logger-inl.h"
 #include "simdjson/generic/ondemand/parser-inl.h"
 #include "simdjson/generic/ondemand/token_iterator-inl.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -254,7 +254,7 @@ simdjson_inline const uint8_t *json_iterator::return_current_and_advance() noexc

 simdjson_inline const uint8_t *json_iterator::unsafe_pointer() const noexcept {
  // deliberately done without safety guard:
-  return token.peek();
+  return token.peek(0);
 }

 simdjson_inline const uint8_t *json_iterator::peek(int32_t delta) const noexcept {
@@ -1,11 +1,11 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/implementation_simdjson_result_base.h"
 #include "simdjson/generic/ondemand/token_iterator.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,11 +1,11 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/ondemand/json_type.h"
 #include "simdjson/generic/implementation_simdjson_result_base-inl.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,11 +1,11 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/implementation_simdjson_result_base.h"
 #include "simdjson/generic/numberparsing.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,15 +1,12 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_LOGGER_INL_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/ondemand/logger.h"
 #include "simdjson/generic/ondemand/json_iterator.h"
 #include "simdjson/generic/ondemand/value_iterator.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
-
-#include <memory>
-#include <cstring>
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,9 +1,9 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_LOGGER_H
 #include "simdjson/generic/ondemand/base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,6 +1,6 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_OBJECT_INL_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/ondemand/field.h"
@@ -9,7 +9,7 @@
 #include "simdjson/generic/ondemand/raw_json_string.h"
 #include "simdjson/generic/ondemand/json_iterator.h"
 #include "simdjson/generic/ondemand/value-inl.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -96,7 +96,7 @@ simdjson_inline simdjson_result<std::string_view> object::raw_json() noexcept {
  const uint8_t * starting_point{iter.peek_start()};
  auto error = consume();
  if(error) { return error; }
-  const uint8_t * final_point{iter._json_iter->peek()};
+  const uint8_t * final_point{iter._json_iter->peek(0)};
  return std::string_view(reinterpret_cast<const char*>(starting_point), size_t(final_point - starting_point));
 }

@@ -1,11 +1,11 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_OBJECT_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/implementation_simdjson_result_base.h"
 #include "simdjson/generic/ondemand/value_iterator.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,12 +1,12 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_INL_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/ondemand/object_iterator.h"
 #include "simdjson/generic/ondemand/field-inl.h"
 #include "simdjson/generic/ondemand/value_iterator-inl.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,11 +1,11 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/implementation_simdjson_result_base.h"
 #include "simdjson/generic/ondemand/value_iterator.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,6 +1,6 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H
 #include "simdjson/padded_string.h"
 #include "simdjson/padded_string_view.h"
@@ -11,7 +11,7 @@
 #include "simdjson/generic/ondemand/document_stream.h"
 #include "simdjson/generic/ondemand/parser.h"
 #include "simdjson/generic/ondemand/raw_json_string.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,12 +1,10 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_PARSER_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/implementation_simdjson_result_base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
-
-#include <memory>
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
@@ -1,12 +1,12 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_INL_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_INL_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/ondemand/raw_json_string.h"
 #include "simdjson/generic/ondemand/json_iterator-inl.h"
 #include "simdjson/generic/implementation_simdjson_result_base-inl.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {

@@ -1,10 +1,10 @@
 #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_H

-#ifndef SIMDJSON_CONDITIONAL_INCLUDE
+#ifndef SIMDJSON_AMALGAMATED
 #define SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_H
 #include "simdjson/generic/ondemand/base.h"
 #include "simdjson/generic/implementation_simdjson_result_base.h"
-#endif // SIMDJSON_CONDITIONAL_INCLUDE
+#endif // SIMDJSON_AMALGAMATED

 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Keiser	7edd32dc6b	Remove document_stream from singlestage	2023-07-17 16:31:37 -07:00
John Keiser	91b74c593c	Update powerpolicy to include singlestage (whatever that is?)	2023-07-17 16:23:03 -07:00
John Keiser	fa629bd783	Make trim a common file	2023-07-17 16:23:03 -07:00
John Keiser	7784aa86c2	Add (non-working) fuzzer for singlestage (copy of ondemand)	2023-07-17 16:23:03 -07:00
John Keiser	a47b64e0ff	Add quickstart for singlestage (copy of ondemand)	2023-07-17 16:23:03 -07:00
John Keiser	d92bc82b37	Add benchmarks for singlestage (copy of ondemand)	2023-07-17 16:23:03 -07:00
John Keiser	5b02e117bb	Add tests for singlestage (copy of ondemand)	2023-07-17 16:23:03 -07:00
John Keiser	ef6fc77861	Add initial singlestage implementation	2023-07-17 16:22:59 -07:00