From a442842f0df5cec11df74116db8fd6a5386f400b Mon Sep 17 00:00:00 2001 From: John Keiser Date: Sat, 15 Jul 2023 14:53:02 -0700 Subject: [PATCH] Use SIMDJSON_AMALGAMATED (which works in-editor and out) instead of editor-specific tweaks --- .clangd | 49 - .vscode/extensions.json | 11 +- include/simdjson/amalgamated.h | 2 + include/simdjson/arm64/base.h | 4 +- include/simdjson/arm64/simd.h | 4 +- .../simdjson/builtin/ondemand/amalgamated.h | 4 +- include/simdjson/dom/amalgamated.h | 4 +- include/simdjson/fallback/base.h | 4 +- include/simdjson/generic/amalgamated.h | 4 +- include/simdjson/generic/atomparsing.h | 4 +- include/simdjson/generic/base.h | 8 +- .../generic/dom_parser_implementation.h | 4 +- .../implementation_simdjson_result_base-inl.h | 4 +- .../implementation_simdjson_result_base.h | 4 +- include/simdjson/generic/jsoncharutils.h | 4 +- include/simdjson/generic/numberparsing.h | 4 +- .../simdjson/generic/ondemand/amalgamated.h | 4 +- include/simdjson/generic/ondemand/array-inl.h | 4 +- include/simdjson/generic/ondemand/array.h | 4 +- .../generic/ondemand/array_iterator-inl.h | 4 +- .../generic/ondemand/array_iterator.h | 4 +- include/simdjson/generic/ondemand/base.h | 4 +- .../simdjson/generic/ondemand/document-inl.h | 4 +- include/simdjson/generic/ondemand/document.h | 4 +- .../generic/ondemand/document_stream-inl.h | 4 +- .../generic/ondemand/document_stream.h | 4 +- include/simdjson/generic/ondemand/field-inl.h | 4 +- include/simdjson/generic/ondemand/field.h | 4 +- .../generic/ondemand/json_iterator-inl.h | 4 +- .../simdjson/generic/ondemand/json_iterator.h | 4 +- .../simdjson/generic/ondemand/json_type-inl.h | 4 +- include/simdjson/generic/ondemand/json_type.h | 4 +- .../simdjson/generic/ondemand/logger-inl.h | 4 +- include/simdjson/generic/ondemand/logger.h | 4 +- .../simdjson/generic/ondemand/object-inl.h | 4 +- include/simdjson/generic/ondemand/object.h | 4 +- .../generic/ondemand/object_iterator-inl.h | 4 +- .../generic/ondemand/object_iterator.h | 4 +- .../simdjson/generic/ondemand/parser-inl.h | 4 +- include/simdjson/generic/ondemand/parser.h | 4 +- .../generic/ondemand/raw_json_string-inl.h | 4 +- .../generic/ondemand/raw_json_string.h | 4 +- .../generic/ondemand/serialization-inl.h | 4 +- .../simdjson/generic/ondemand/serialization.h | 4 +- .../generic/ondemand/token_iterator-inl.h | 4 +- .../generic/ondemand/token_iterator.h | 4 +- include/simdjson/generic/ondemand/value-inl.h | 4 +- include/simdjson/generic/ondemand/value.h | 4 +- .../generic/ondemand/value_iterator-inl.h | 4 +- .../generic/ondemand/value_iterator.h | 4 +- include/simdjson/haswell/base.h | 4 +- include/simdjson/icelake/base.h | 4 +- include/simdjson/ppc64/base.h | 4 +- include/simdjson/westmere/base.h | 4 +- singleheader/amalgamate.py | 71 +- singleheader/simdjson.cpp | 758 ++++----- singleheader/simdjson.h | 1418 +++++++++-------- src/arm64.cpp | 4 +- src/fallback.cpp | 4 +- src/generic/amalgamated.h | 4 +- src/generic/base.h | 4 +- src/generic/dependencies.h | 4 +- src/generic/dom_parser_implementation.h | 4 +- src/generic/json_character_block.h | 4 +- src/generic/stage1/amalgamated.h | 4 +- src/generic/stage1/base.h | 4 +- src/generic/stage1/buf_block_reader.h | 4 +- src/generic/stage1/find_next_document_index.h | 4 +- src/generic/stage1/json_minifier.h | 4 +- src/generic/stage1/json_scanner.h | 4 +- src/generic/stage1/json_string_scanner.h | 4 +- src/generic/stage1/json_structural_indexer.h | 4 +- src/generic/stage1/utf8_lookup4_algorithm.h | 4 +- src/generic/stage1/utf8_validator.h | 4 +- src/generic/stage2/amalgamated.h | 4 +- src/generic/stage2/base.h | 4 +- src/generic/stage2/json_iterator.h | 4 +- src/generic/stage2/logger.h | 4 +- src/generic/stage2/stringparsing.h | 4 +- src/generic/stage2/structural_iterator.h | 4 +- src/generic/stage2/tape_builder.h | 4 +- src/generic/stage2/tape_writer.h | 4 +- src/haswell.cpp | 4 +- src/icelake.cpp | 4 +- src/ppc64.cpp | 4 +- src/westmere.cpp | 4 +- 86 files changed, 1305 insertions(+), 1328 deletions(-) diff --git a/.clangd b/.clangd index b4a7422cb..d6223f275 100644 --- a/.clangd +++ b/.clangd @@ -15,7 +15,6 @@ If: - src/simdjson.cpp CompileFlags: Add: - - -DSIMDJSON_IN_EDITOR=1 - -Wno-unneeded-internal-declaration - -Wno-undefined-inline # TODO fix and remove these violations - -Wno-undefined-internal # TODO fix and remove these violations @@ -24,51 +23,3 @@ CompileFlags: Diagnostics: Suppress: - pp_including_mainfile_in_preamble ---- -# Implementation-specific files (which require SIMDJSON_IMPLEMENTATION already defined) -If: - PathMatch: - - include/simdjson/arm64/.* - - include/simdjson/builtin/.* - - include/simdjson/fallback/.* - - include/simdjson/generic/.* - - include/simdjson/haswell/.* - - include/simdjson/icelake/.* - - include/simdjson/ppc64/.* - - include/simdjson/westmere/.* - - src/generic/.* - - src/arm64.cpp - - src/fallback.cpp - - src/haswell.cpp - - src/icelake.cpp - - src/ppc64.cpp - - src/westmere.cpp - PathExclude: - - .*/dependencies\.h -CompileFlags: - Add: - - -DSIMDJSON_IN_EDITOR_IMPL=1 ---- -# Generic implementation specific files (which require SIMDJSON_IMPLEMENTATION already defined) -If: - PathMatch: - - include/simdjson/generic/.*\.h - - src/generic/.*\.h -CompileFlags: - Add: - - -DSIMDJSON_IN_EDITOR_GENERIC=1 ---- -If: - PathMatch: - - include/.*/amalgamated\.h - - src/.*/amalgamated\.h -CompileFlags: - Add: - - -DSIMDJSON_IN_EDITOR_AMALGAMATED=1 ---- -If: - PathMatch: - - .*/dependencies\.h -CompileFlags: - Add: - - -DSIMDJSON_IN_EDITOR_DEPENDENCIES=1 diff --git a/.vscode/extensions.json b/.vscode/extensions.json index dc01c54da..42ee1fa23 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -4,10 +4,15 @@ // List of extensions which should be recommended for users of this workspace. "recommendations": [ - // Syntax - "ms-vscode.cpptools", - "ms-vscode.cmake-tools", + // C++ + "llvm-vs-code-extensions.vscode-clangd", + "xaver.clang-format", + // Python "ms-python.python", + // .github/* + "github.vscode-github-actions", + // cmake + "ms-vscode.cmake-tools", "twxs.cmake" ], // List of extensions recommended by VS Code that should not be recommended for users of this workspace. diff --git a/include/simdjson/amalgamated.h b/include/simdjson/amalgamated.h index b771dc398..180f643c7 100644 --- a/include/simdjson/amalgamated.h +++ b/include/simdjson/amalgamated.h @@ -1,6 +1,8 @@ #ifndef SIMDJSON_AMALGAMATED_H #define SIMDJSON_AMALGAMATED_H +#define SIMDJSON_AMALGAMATED + // This provides the public API for simdjson. // DOM and ondemand are amalgamated separately, in simdjson.h #include "simdjson/simdjson_version.h" diff --git a/include/simdjson/arm64/base.h b/include/simdjson/arm64/base.h index 3033031df..06a294ca5 100644 --- a/include/simdjson/arm64/base.h +++ b/include/simdjson/arm64/base.h @@ -21,11 +21,11 @@ template struct simd8x64; } // namespace arm64 } // namespace simdjson -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED #endif // SIMDJSON_ARM64_BASE_H diff --git a/include/simdjson/arm64/simd.h b/include/simdjson/arm64/simd.h index a18ef857e..3f5d75d8b 100644 --- a/include/simdjson/arm64/simd.h +++ b/include/simdjson/arm64/simd.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_ARM64_SIMD_H #define SIMDJSON_ARM64_SIMD_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #include "simdjson/internal/simdprune_tables.h" #include "simdjson/arm64/base.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED #include "simdjson/arm64/bitmanipulation.h" diff --git a/include/simdjson/builtin/ondemand/amalgamated.h b/include/simdjson/builtin/ondemand/amalgamated.h index 94d50bf62..91c138daf 100644 --- a/include/simdjson/builtin/ondemand/amalgamated.h +++ b/include/simdjson/builtin/ondemand/amalgamated.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_BUILTIN_ONDEMAND_AMALGAMATED_H #define SIMDJSON_BUILTIN_ONDEMAND_AMALGAMATED_H -#ifdef SIMDJSON_IN_EDITOR_AMALGAMATED +#ifndef SIMDJSON_AMALGAMATED #include "simdjson/builtin/amalgamated.h" -#endif // SIMDJSON_IN_EDITOR_AMALGAMATED +#endif // SIMDJSON_AMALGAMATED #include "simdjson/builtin/begin.h" #include "simdjson/generic/ondemand/amalgamated.h" diff --git a/include/simdjson/dom/amalgamated.h b/include/simdjson/dom/amalgamated.h index eacfece5f..f4b2caf30 100644 --- a/include/simdjson/dom/amalgamated.h +++ b/include/simdjson/dom/amalgamated.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_DOM_AMALGAMATED_H #define SIMDJSON_DOM_AMALGAMATED_H -#ifdef SIMDJSON_IN_EDITOR_AMALGAMATED +#ifndef SIMDJSON_AMALGAMATED #include "simdjson/amalgamated.h" -#endif // SIMDJSON_IN_EDITOR_AMALGAMATED +#endif // SIMDJSON_AMALGAMATED #include "simdjson/dom/base.h" #include "simdjson/dom/array.h" diff --git a/include/simdjson/fallback/base.h b/include/simdjson/fallback/base.h index 2abd3fadd..1bcf5c632 100644 --- a/include/simdjson/fallback/base.h +++ b/include/simdjson/fallback/base.h @@ -14,11 +14,11 @@ class implementation; } // namespace fallback } // namespace simdjson -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED #endif // SIMDJSON_FALLBACK_BASE_H diff --git a/include/simdjson/generic/amalgamated.h b/include/simdjson/generic/amalgamated.h index e186d7c5a..ad9b9a01d 100644 --- a/include/simdjson/generic/amalgamated.h +++ b/include/simdjson/generic/amalgamated.h @@ -1,7 +1,7 @@ -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #include "simdjson/amalgamated.h" #include "simdjson/generic/dependencies.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! diff --git a/include/simdjson/generic/atomparsing.h b/include/simdjson/generic/atomparsing.h index 6bc521314..f91d9a9fd 100644 --- a/include/simdjson/generic/atomparsing.h +++ b/include/simdjson/generic/atomparsing.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ATOMPARSING_H #include "simdjson/generic/base.h" #include "simdjson/generic/jsoncharutils.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/base.h b/include/simdjson/generic/base.h index 7bc3580ee..65aa29881 100644 --- a/include/simdjson/generic/base.h +++ b/include/simdjson/generic/base.h @@ -1,15 +1,13 @@ #ifndef SIMDJSON_GENERIC_BASE_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_BASE_H #include "simdjson/base.h" -#endif // SIMDJSON_IN_EDITOR_IMPL - -#ifdef SIMDJSON_IN_EDITOR_GENERIC +// If we haven't got an implementation yet, just use the builtin one (for the editor) #ifndef SIMDJSON_IMPLEMENTATION #include "simdjson/builtin/begin.h" #endif -#endif // SIMDJSON_IN_EDITOR_GENERIC +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/dom_parser_implementation.h b/include/simdjson/generic/dom_parser_implementation.h index dd820446d..20861971b 100644 --- a/include/simdjson/generic/dom_parser_implementation.h +++ b/include/simdjson/generic/dom_parser_implementation.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H #include "simdjson/generic/base.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/implementation_simdjson_result_base-inl.h b/include/simdjson/generic/implementation_simdjson_result_base-inl.h index eec6122a0..1dce1cb8b 100644 --- a/include/simdjson/generic/implementation_simdjson_result_base-inl.h +++ b/include/simdjson/generic/implementation_simdjson_result_base-inl.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/implementation_simdjson_result_base.h b/include/simdjson/generic/implementation_simdjson_result_base.h index bcf9d7e58..14ff77d7c 100644 --- a/include/simdjson/generic/implementation_simdjson_result_base.h +++ b/include/simdjson/generic/implementation_simdjson_result_base.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H #include "simdjson/generic/base.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/jsoncharutils.h b/include/simdjson/generic/jsoncharutils.h index 38b1cb2fc..3d8784d13 100644 --- a/include/simdjson/generic/jsoncharutils.h +++ b/include/simdjson/generic/jsoncharutils.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED #if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS #include diff --git a/include/simdjson/generic/numberparsing.h b/include/simdjson/generic/numberparsing.h index cc3f3a1ca..ec962f826 100644 --- a/include/simdjson/generic/numberparsing.h +++ b/include/simdjson/generic/numberparsing.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED #include #include diff --git a/include/simdjson/generic/ondemand/amalgamated.h b/include/simdjson/generic/ondemand/amalgamated.h index ac815925a..e6d60583d 100644 --- a/include/simdjson/generic/ondemand/amalgamated.h +++ b/include/simdjson/generic/ondemand/amalgamated.h @@ -1,6 +1,6 @@ -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #include "simdjson/generic/amalgamated.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED // Stuff other things depend on #include "simdjson/generic/ondemand/base.h" diff --git a/include/simdjson/generic/ondemand/array-inl.h b/include/simdjson/generic/ondemand/array-inl.h index 7a354fc45..1d4109b03 100644 --- a/include/simdjson/generic/ondemand/array-inl.h +++ b/include/simdjson/generic/ondemand/array-inl.h @@ -1,6 +1,6 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/array.h b/include/simdjson/generic/ondemand/array.h index 2775cca25..29f19d3bf 100644 --- a/include/simdjson/generic/ondemand/array.h +++ b/include/simdjson/generic/ondemand/array.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/array_iterator-inl.h b/include/simdjson/generic/ondemand/array_iterator-inl.h index 03b670269..aadc6a04a 100644 --- a/include/simdjson/generic/ondemand/array_iterator-inl.h +++ b/include/simdjson/generic/ondemand/array_iterator-inl.h @@ -1,12 +1,12 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/array_iterator.h b/include/simdjson/generic/ondemand/array_iterator.h index f5528696f..e34d3dc4b 100644 --- a/include/simdjson/generic/ondemand/array_iterator.h +++ b/include/simdjson/generic/ondemand/array_iterator.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { diff --git a/include/simdjson/generic/ondemand/base.h b/include/simdjson/generic/ondemand/base.h index a8584f037..3236b34b3 100644 --- a/include/simdjson/generic/ondemand/base.h +++ b/include/simdjson/generic/ondemand/base.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_BASE_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_BASE_H #include "simdjson/generic/base.h" #include "simdjson/generic/ondemand/dependencies.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/document-inl.h b/include/simdjson/generic/ondemand/document-inl.h index a018aee6c..87f92ff20 100644 --- a/include/simdjson/generic/ondemand/document-inl.h +++ b/include/simdjson/generic/ondemand/document-inl.h @@ -1,6 +1,6 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/document.h b/include/simdjson/generic/ondemand/document.h index fe4d45b44..f997dadb7 100644 --- a/include/simdjson/generic/ondemand/document.h +++ b/include/simdjson/generic/ondemand/document.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/ondemand/json_iterator.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/document_stream-inl.h b/include/simdjson/generic/ondemand/document_stream-inl.h index ba7158c6c..3376243e4 100644 --- a/include/simdjson/generic/ondemand/document_stream-inl.h +++ b/include/simdjson/generic/ondemand/document_stream-inl.h @@ -1,12 +1,12 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED #include #include diff --git a/include/simdjson/generic/ondemand/document_stream.h b/include/simdjson/generic/ondemand/document_stream.h index 5848f5466..1831310ae 100644 --- a/include/simdjson/generic/ondemand/document_stream.h +++ b/include/simdjson/generic/ondemand/document_stream.h @@ -1,12 +1,12 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED #ifdef SIMDJSON_THREADS_ENABLED #include diff --git a/include/simdjson/generic/ondemand/field-inl.h b/include/simdjson/generic/ondemand/field-inl.h index d85662c85..256fc4711 100644 --- a/include/simdjson/generic/ondemand/field-inl.h +++ b/include/simdjson/generic/ondemand/field-inl.h @@ -1,12 +1,12 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/field.h b/include/simdjson/generic/ondemand/field.h index 8ca9f01bf..8d7cce17a 100644 --- a/include/simdjson/generic/ondemand/field.h +++ b/include/simdjson/generic/ondemand/field.h @@ -1,12 +1,12 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/json_iterator-inl.h b/include/simdjson/generic/ondemand/json_iterator-inl.h index 924005ab3..cc6163e18 100644 --- a/include/simdjson/generic/ondemand/json_iterator-inl.h +++ b/include/simdjson/generic/ondemand/json_iterator-inl.h @@ -1,6 +1,6 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_INL_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/ondemand/json_iterator.h" @@ -9,7 +9,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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/json_iterator.h b/include/simdjson/generic/ondemand/json_iterator.h index 9634a4ec2..692ed3e59 100644 --- a/include/simdjson/generic/ondemand/json_iterator.h +++ b/include/simdjson/generic/ondemand/json_iterator.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/json_type-inl.h b/include/simdjson/generic/ondemand/json_type-inl.h index 2d9101cfd..c49f3080f 100644 --- a/include/simdjson/generic/ondemand/json_type-inl.h +++ b/include/simdjson/generic/ondemand/json_type-inl.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/json_type.h b/include/simdjson/generic/ondemand/json_type.h index 16c53ac06..d02a46e0a 100644 --- a/include/simdjson/generic/ondemand/json_type.h +++ b/include/simdjson/generic/ondemand/json_type.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/logger-inl.h b/include/simdjson/generic/ondemand/logger-inl.h index f16599838..934c4df42 100644 --- a/include/simdjson/generic/ondemand/logger-inl.h +++ b/include/simdjson/generic/ondemand/logger-inl.h @@ -1,12 +1,12 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/logger.h b/include/simdjson/generic/ondemand/logger.h index 118fb3a40..dc6ba52e2 100644 --- a/include/simdjson/generic/ondemand/logger.h +++ b/include/simdjson/generic/ondemand/logger.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_LOGGER_H #include "simdjson/generic/ondemand/base.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/object-inl.h b/include/simdjson/generic/ondemand/object-inl.h index 863964c39..0d37dd502 100644 --- a/include/simdjson/generic/ondemand/object-inl.h +++ b/include/simdjson/generic/ondemand/object-inl.h @@ -1,6 +1,6 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/object.h b/include/simdjson/generic/ondemand/object.h index cd3d79bef..4cf7603d2 100644 --- a/include/simdjson/generic/ondemand/object.h +++ b/include/simdjson/generic/ondemand/object.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/object_iterator-inl.h b/include/simdjson/generic/ondemand/object_iterator-inl.h index cae851c87..f845e6124 100644 --- a/include/simdjson/generic/ondemand/object_iterator-inl.h +++ b/include/simdjson/generic/ondemand/object_iterator-inl.h @@ -1,12 +1,12 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/object_iterator.h b/include/simdjson/generic/ondemand/object_iterator.h index 1d852665b..e1a434156 100644 --- a/include/simdjson/generic/ondemand/object_iterator.h +++ b/include/simdjson/generic/ondemand/object_iterator.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/parser-inl.h b/include/simdjson/generic/ondemand/parser-inl.h index f376f597f..50fe6c36f 100644 --- a/include/simdjson/generic/ondemand/parser-inl.h +++ b/include/simdjson/generic/ondemand/parser-inl.h @@ -1,12 +1,12 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/ondemand/document_stream.h" #include "simdjson/generic/ondemand/parser.h" #include "simdjson/generic/ondemand/raw_json_string.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/parser.h b/include/simdjson/generic/ondemand/parser.h index 4401a05e3..3724dfa05 100644 --- a/include/simdjson/generic/ondemand/parser.h +++ b/include/simdjson/generic/ondemand/parser.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/raw_json_string-inl.h b/include/simdjson/generic/ondemand/raw_json_string-inl.h index ea5545973..ab83c151b 100644 --- a/include/simdjson/generic/ondemand/raw_json_string-inl.h +++ b/include/simdjson/generic/ondemand/raw_json_string-inl.h @@ -1,12 +1,12 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { diff --git a/include/simdjson/generic/ondemand/raw_json_string.h b/include/simdjson/generic/ondemand/raw_json_string.h index ae4d4d1ab..e71bd4f71 100644 --- a/include/simdjson/generic/ondemand/raw_json_string.h +++ b/include/simdjson/generic/ondemand/raw_json_string.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#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_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/serialization-inl.h b/include/simdjson/generic/ondemand/serialization-inl.h index 6b438d569..80b81e3f9 100644 --- a/include/simdjson/generic/ondemand/serialization-inl.h +++ b/include/simdjson/generic/ondemand/serialization-inl.h @@ -1,6 +1,6 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_INL_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/ondemand/array.h" @@ -9,7 +9,7 @@ #include "simdjson/generic/ondemand/object.h" #include "simdjson/generic/ondemand/serialization.h" #include "simdjson/generic/ondemand/value.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { diff --git a/include/simdjson/generic/ondemand/serialization.h b/include/simdjson/generic/ondemand/serialization.h index 4acfd7b15..4f75a6733 100644 --- a/include/simdjson/generic/ondemand/serialization.h +++ b/include/simdjson/generic/ondemand/serialization.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_H #include "simdjson/generic/ondemand/base.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { /** diff --git a/include/simdjson/generic/ondemand/token_iterator-inl.h b/include/simdjson/generic/ondemand/token_iterator-inl.h index a55ef05b6..e905942f6 100644 --- a/include/simdjson/generic/ondemand/token_iterator-inl.h +++ b/include/simdjson/generic/ondemand/token_iterator-inl.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_INL_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/ondemand/token_iterator.h" #include "simdjson/generic/implementation_simdjson_result_base-inl.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/token_iterator.h b/include/simdjson/generic/ondemand/token_iterator.h index 813e291fa..8026057e8 100644 --- a/include/simdjson/generic/ondemand/token_iterator.h +++ b/include/simdjson/generic/ondemand/token_iterator.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/implementation_simdjson_result_base.h" #include "simdjson/generic/ondemand/logger.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/value-inl.h b/include/simdjson/generic/ondemand/value-inl.h index 46130cf86..4fce1fadb 100644 --- a/include/simdjson/generic/ondemand/value-inl.h +++ b/include/simdjson/generic/ondemand/value-inl.h @@ -1,6 +1,6 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/ondemand/array.h" @@ -10,7 +10,7 @@ #include "simdjson/generic/ondemand/object.h" #include "simdjson/generic/ondemand/raw_json_string.h" #include "simdjson/generic/ondemand/value.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/value.h b/include/simdjson/generic/ondemand/value.h index ae671d9bf..8ca5ecb51 100644 --- a/include/simdjson/generic/ondemand/value.h +++ b/include/simdjson/generic/ondemand/value.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_VALUE_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/implementation_simdjson_result_base.h" #include "simdjson/generic/ondemand/value_iterator.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/value_iterator-inl.h b/include/simdjson/generic/ondemand/value_iterator-inl.h index f1d39e92a..e282de1ec 100644 --- a/include/simdjson/generic/ondemand/value_iterator-inl.h +++ b/include/simdjson/generic/ondemand/value_iterator-inl.h @@ -1,6 +1,6 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_INL_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_INL_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/atomparsing.h" @@ -9,7 +9,7 @@ #include "simdjson/generic/ondemand/json_type-inl.h" #include "simdjson/generic/ondemand/raw_json_string-inl.h" #include "simdjson/generic/ondemand/value_iterator.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/value_iterator.h b/include/simdjson/generic/ondemand/value_iterator.h index 51d2ee50a..29826bd3d 100644 --- a/include/simdjson/generic/ondemand/value_iterator.h +++ b/include/simdjson/generic/ondemand/value_iterator.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_H -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED #define SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/implementation_simdjson_result_base.h" -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/haswell/base.h b/include/simdjson/haswell/base.h index 3aa87a8e7..c5f87a8b2 100644 --- a/include/simdjson/haswell/base.h +++ b/include/simdjson/haswell/base.h @@ -22,11 +22,11 @@ template struct simd8x64; } // namespace haswell } // namespace simdjson -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED // If we're editing one of the files in this directory, begin the implementation! #ifndef SIMDJSON_IMPLEMENTATION #include "simdjson/haswell/begin.h" #endif -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED #endif // SIMDJSON_HASWELL_BASE_H diff --git a/include/simdjson/icelake/base.h b/include/simdjson/icelake/base.h index 0e3af4b67..c529a8e17 100644 --- a/include/simdjson/icelake/base.h +++ b/include/simdjson/icelake/base.h @@ -15,11 +15,11 @@ class implementation; } // namespace icelake } // namespace simdjson -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED // If we're editing one of the files in this directory, begin the implementation! #ifndef SIMDJSON_IMPLEMENTATION #include "simdjson/icelake/begin.h" #endif -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED #endif // SIMDJSON_ICELAKE_BASE_H diff --git a/include/simdjson/ppc64/base.h b/include/simdjson/ppc64/base.h index cb56454e6..b614a4e96 100644 --- a/include/simdjson/ppc64/base.h +++ b/include/simdjson/ppc64/base.h @@ -21,11 +21,11 @@ template struct simd8x64; } // namespace ppc64 } // namespace simdjson -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED // If we're editing one of the files in this directory, begin the implementation! #ifndef SIMDJSON_IMPLEMENTATION #include "simdjson/ppc64/begin.h" #endif -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED #endif // SIMDJSON_PPC64_BASE_H diff --git a/include/simdjson/westmere/base.h b/include/simdjson/westmere/base.h index 51cf944c9..046a74e3b 100644 --- a/include/simdjson/westmere/base.h +++ b/include/simdjson/westmere/base.h @@ -22,11 +22,11 @@ template struct simd8x64; } // namespace westmere } // namespace simdjson -#ifdef SIMDJSON_IN_EDITOR_IMPL +#ifndef SIMDJSON_AMALGAMATED // If we're editing one of the files in this directory, begin the implementation! #ifndef SIMDJSON_IMPLEMENTATION #include "simdjson/westmere/begin.h" #endif -#endif // SIMDJSON_IN_EDITOR_IMPL +#endif // SIMDJSON_AMALGAMATED #endif // SIMDJSON_WESTMERE_BASE_H diff --git a/singleheader/amalgamate.py b/singleheader/amalgamate.py index ce583665a..be5492385 100755 --- a/singleheader/amalgamate.py +++ b/singleheader/amalgamate.py @@ -10,7 +10,7 @@ import os import re import shutil import datetime -from typing import Iterable, List, Optional, TextIO +from typing import Dict, Iterable, List, Optional, TextIO if sys.version_info < (3, 0): sys.stdout.write("Sorry, requires Python 3.x or better\n") @@ -52,6 +52,7 @@ class Amalgamator: def __init__(self, fid: TextIO, roots: List[str]): self.fid = fid self.roots = roots + self.builtin_implementation = False self.implementation: Optional[str] = None self.found_includes: List[str] = [] self.found_generic_includes: List[tuple[str, str]] = [] @@ -127,61 +128,60 @@ class Amalgamator: redefines_simdjson_implementation = re.compile(r'^#define\s+SIMDJSON_IMPLEMENTATION\s+(.*)') undefines_simdjson_implementation = re.compile(r'^#undef\s+SIMDJSON_IMPLEMENTATION\s*$') uses_simdjson_implementation = re.compile(r'\bSIMDJSON_IMPLEMENTATION\b') + uses_simdjson_amalgamated = re.compile(r'\bSIMDJSON_AMALGAMATED\b') if filename.endswith('/builtin/begin.h'): + self.builtin_implementation = True self.implementation = "SIMDJSON_BUILTIN_IMPLEMENTATION" with open(file, 'r') as fid2: ignoring = False for line in fid2: line = line.rstrip('\n') - if line.startswith("#ifdef SIMDJSON_IN_EDITOR"): - assert not ignoring - ignoring = True - elif line.startswith("#endif // SIMDJSON_IN_EDITOR"): - assert ignoring - self.write(f"/* amalgamation skipped (editor-only): {line} */") - ignoring = False - continue + if uses_simdjson_amalgamated.search(line): + if line == "#ifndef SIMDJSON_AMALGAMATED": + assert not ignoring, "{file} includes two #ifndef SIMDJSON_AMALGAMATED in a row" + ignoring = True + elif line == "#endif // SIMDJSON_AMALGAMATED": + assert ignoring, "{file} has #endif // SIMDJSON_AMALGAMATED without #ifndef SIMDJSON_AMALGAMATED" + self.write(f"/* amalgamation skipped (editor-only): {line} */") + ignoring = False + continue + else: + assert line == "#define SIMDJSON_AMALGAMATED", "{file} uses SIMDJSON_AMALGAMATED for unknown purpose: {line}" + if ignoring: self.write(f"/* amalgamation skipped (editor-only): {line} */") continue - s = includepattern.search(line) - if s: - includedfile = s.group(1) - # include all from simdjson.cpp except simdjson.h - if includedfile == "simdjson.h" and filename == "simdjson.cpp": - self.write(line) - continue + included = includepattern.search(line) + if included: + includedfile = included.group(1) if includedfile.startswith('../'): includedfile = includedfile[2:] # we explicitly include simdjson headers, one time each (unless they are generic, in which case multiple times is fine) self.maybe_write_file(includedfile, line) - elif self.implementation == "SIMDJSON_BUILTIN_IMPLEMENTATION": - self.write(line) - else: + elif uses_simdjson_implementation.search(line): # does it contain a redefinition of SIMDJSON_IMPLEMENTATION ? - s=redefines_simdjson_implementation.search(line) - if s: + redefined = redefines_simdjson_implementation.search(line) + if redefined: old_implementation = self.implementation - self.implementation=s.group(1) + self.implementation = redefined.group(1) if old_implementation is None: self.write(f"/* defining SIMDJSON_IMPLEMENTATION to \"{self.implementation}\": {line} */") else: self.write(f"/* redefining SIMDJSON_IMPLEMENTATION from \"{old_implementation}\" to \"{self.implementation}\": {line} */") elif undefines_simdjson_implementation.search(line): # Don't include #undef SIMDJSON_IMPLEMENTATION since we're handling it ourselves - # print(f"// {line}") self.write(f"/* undefining SIMDJSON_IMPLEMENTATION from \"{self.implementation}\": {line} */") - assert self.implementation is not None self.implementation = None - continue - elif (not filename.endswith('/implementation_detection.h')) and uses_simdjson_implementation.search(line): - # copy the line, with SIMDJSON_IMPLEMENTATION replace to what it is currently defined to - assert self.implementation, line - self.write(uses_simdjson_implementation.sub(self.implementation,line)) - else: + elif filename.endswith('/implementation_detection.h'): self.write(line) - assert not ignoring # Make sure we found the #endif for the #ifdef SIMDJSON_IN_EDITOR + else: + # copy the line, with SIMDJSON_IMPLEMENTATION replace to what it is currently defined to + assert self.implementation, f"Use of SIMDJSON_IMPLEMENTATION while not defined in {file}: {line}" + self.write(uses_simdjson_implementation.sub(self.implementation,line)) + else: + self.write(line) + assert not ignoring, f"{filename} ended without #endif // SIMDJSON_AMALGAMATED" if self.is_generic(filename): suffix = f" for {self.implementation}" @@ -189,8 +189,13 @@ class Amalgamator: suffix = "" self.write(f"/* end file {OSRELFILE}{suffix} */") - if filename.endswith('/builtin/end.h'): - assert self.implementation == "SIMDJSON_BUILTIN_IMPLEMENTATION" + if filename.endswith('/builtin/begin.h'): + # begin.h redefined SIMDJSON_IMPLEMENTATION multiple times + assert self.builtin_implementation + self.implementation = "SIMDJSON_BUILTIN_IMPLEMENTATION" + elif filename.endswith('/builtin/end.h'): + assert self.implementation is None + assert self.builtin_implementation self.implementation = None diff --git a/singleheader/simdjson.cpp b/singleheader/simdjson.cpp index d2dc34d3c..1d0f093d5 100644 --- a/singleheader/simdjson.cpp +++ b/singleheader/simdjson.cpp @@ -1,4 +1,4 @@ -/* auto-generated on 2023-07-14 15:10:30 -0700. Do not edit! */ +/* auto-generated on 2023-07-14 20:57:24 -0700. Do not edit! */ /* begin file src/simdjson.cpp */ #define SIMDJSON_SRC_SIMDJSON_CPP @@ -6651,12 +6651,12 @@ class implementation; } // namespace icelake } // namespace simdjson -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): // If we're editing one of the files in this directory, begin the implementation! */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #endif // SIMDJSON_ICELAKE_BASE_H /* end file include/simdjson/icelake/base.h */ @@ -7183,9 +7183,9 @@ inline std::ostream& operator<<(std::ostream& out, simdjson_result struct simd8x64; } // namespace arm64 } // namespace simdjson -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): // If we're editing one of the files in this directory, begin the implementation! */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #endif // SIMDJSON_ARM64_BASE_H /* end file include/simdjson/arm64/base.h */ @@ -7946,10 +7948,10 @@ static simdjson_inline uint32_t parse_eight_digits_unrolled(const uint8_t *chars #ifndef SIMDJSON_ARM64_SIMD_H #define SIMDJSON_ARM64_SIMD_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* skipped duplicate #include "simdjson/arm64/bitmanipulation.h" */ @@ -8533,10 +8535,10 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* end file include/simdjson/arm64/stringparsing_defs.h */ /* end file include/simdjson/arm64/begin.h */ /* begin file include/simdjson/generic/amalgamated.h for arm64 */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! @@ -8548,16 +8550,14 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* begin file include/simdjson/generic/base.h for arm64 */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ - -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): // If we haven't got an implementation yet, just use the builtin one (for the editor) */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -8582,13 +8582,16 @@ enum class number_type { /* begin file include/simdjson/generic/jsoncharutils.h for arm64 */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_JSONCHARUTILS_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/jsoncharutils_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS +#include +#endif namespace simdjson { namespace arm64 { namespace { @@ -8708,11 +8711,11 @@ simdjson_inline value128 full_multiplication(uint64_t value1, uint64_t value2) { /* begin file include/simdjson/generic/atomparsing.h for arm64 */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ATOMPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -8785,10 +8788,10 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file include/simdjson/generic/dom_parser_implementation.h for arm64 */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -8875,10 +8878,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file include/simdjson/generic/implementation_simdjson_result_base.h for arm64 */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -9011,12 +9014,12 @@ protected: /* begin file include/simdjson/generic/numberparsing.h for arm64 */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_NUMBERPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include @@ -10281,11 +10284,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file include/simdjson/generic/implementation_simdjson_result_base-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -10389,18 +10392,18 @@ simdjson_inline implementation_simdjson_result_base::implementation_simdjson_ /* skipped duplicate #include "simdjson/arm64/stringparsing_defs.h" */ /* end file include/simdjson/arm64/begin.h */ /* begin file src/generic/amalgamated.h for arm64 */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* begin file src/generic/base.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/dependencies.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -10417,11 +10420,11 @@ struct json_character_block; /* begin file src/generic/dom_parser_implementation.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Interface a dom parser implementation must fulfill namespace simdjson { @@ -10440,10 +10443,10 @@ simdjson_inline bool is_ascii(const simd8x64& input); /* begin file src/generic/json_character_block.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_JSON_CHARACTER_BLOCK_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_JSON_CHARACTER_BLOCK_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -10468,18 +10471,18 @@ struct json_character_block { /* end file src/generic/json_character_block.h for arm64 */ /* end file src/generic/amalgamated.h for arm64 */ /* begin file src/generic/stage1/amalgamated.h for arm64 */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Stuff other things depend on /* begin file src/generic/stage1/base.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -10513,10 +10516,10 @@ using utf8_validation::utf8_checker; /* begin file src/generic/stage1/json_string_scanner.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRING_SCANNER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRING_SCANNER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -10677,11 +10680,11 @@ simdjson_inline error_code json_string_scanner::finish() { /* begin file src/generic/stage1/utf8_lookup4_algorithm.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_UTF8_LOOKUP4_ALGORITHM_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_UTF8_LOOKUP4_ALGORITHM_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -10896,12 +10899,12 @@ using namespace simd; /* begin file src/generic/stage1/json_scanner.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_SCANNER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_SCANNER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/json_character_block.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_string_scanner.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -11068,10 +11071,10 @@ simdjson_inline error_code json_scanner::finish() { /* begin file src/generic/stage1/buf_block_reader.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_BUF_BLOCK_READER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_BUF_BLOCK_READER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -11173,11 +11176,11 @@ simdjson_inline void buf_block_reader::advance() { /* begin file src/generic/stage1/find_next_document_index.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -11280,12 +11283,12 @@ simdjson_inline uint32_t find_next_document_index(dom_parser_implementation &par /* begin file src/generic/stage1/json_minifier.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_MINIFIER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_MINIFIER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_scanner.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/buf_block_reader.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses in stage1 // It is intended to be included multiple times and compiled multiple times @@ -11386,7 +11389,7 @@ error_code json_minifier::minify(const uint8_t *buf, size_t len, uint8_t *dst, s /* begin file src/generic/stage1/json_structural_indexer.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRUCTURAL_INDEXER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRUCTURAL_INDEXER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/utf8_lookup4_algorithm.h" */ @@ -11395,7 +11398,7 @@ error_code json_minifier::minify(const uint8_t *buf, size_t len, uint8_t *dst, s /* amalgamation skipped (editor-only): #include "generic/stage1/json_scanner.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_minifier.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/find_next_document_index.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses in stage1 // It is intended to be included multiple times and compiled multiple times @@ -11756,12 +11759,12 @@ simdjson_inline error_code json_structural_indexer::finish(dom_parser_implementa /* begin file src/generic/stage1/utf8_validator.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_UTF8_VALIDATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_UTF8_VALIDATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/buf_block_reader.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/utf8_lookup4_algorithm.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -11802,18 +11805,18 @@ bool generic_validate_utf8(const char * input, size_t length) { /* end file src/generic/stage1/utf8_validator.h for arm64 */ /* end file src/generic/stage1/amalgamated.h for arm64 */ /* begin file src/generic/stage2/amalgamated.h for arm64 */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Stuff other things depend on /* begin file src/generic/stage2/base.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -11835,10 +11838,10 @@ struct tape_writer; /* begin file src/generic/stage2/tape_writer.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -11951,10 +11954,10 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern /* begin file src/generic/stage2/logger.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This is for an internal-only stage 2 specific logger. // Set LOG_ENABLED = true to log what stage 2 is doing! @@ -12052,12 +12055,12 @@ namespace logger { /* begin file src/generic/stage2/json_iterator.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage2/logger.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -12380,11 +12383,11 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V /* begin file src/generic/stage2/stringparsing.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses // It is intended to be included multiple times and compiled multiple times @@ -12630,11 +12633,11 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t /* begin file src/generic/stage2/structural_iterator.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRUCTURAL_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_STRUCTURAL_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -12696,7 +12699,7 @@ public: /* begin file src/generic/stage2/tape_builder.h for arm64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage2/json_iterator.h" */ @@ -12705,7 +12708,7 @@ public: /* amalgamation skipped (editor-only): #include "simdjson/generic/atomparsing.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/numberparsing.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { @@ -13171,9 +13174,9 @@ simdjson_warn_unused error_code dom_parser_implementation::parse(const uint8_t * #ifndef SIMDJSON_SRC_FALLBACK_CPP #define SIMDJSON_SRC_FALLBACK_CPP -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* skipped duplicate #include "simdjson/fallback/implementation.h" */ /* begin file include/simdjson/fallback/amalgamated.h */ @@ -13199,12 +13202,12 @@ class implementation; } // namespace fallback } // namespace simdjson -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): // If we're editing one of the files in this directory, begin the implementation! */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/fallback/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #endif // SIMDJSON_FALLBACK_BASE_H /* end file include/simdjson/fallback/base.h */ @@ -13332,10 +13335,10 @@ static simdjson_inline uint32_t parse_eight_digits_unrolled(const uint8_t *chars /* end file include/simdjson/fallback/numberparsing_defs.h */ /* end file include/simdjson/fallback/begin.h */ /* begin file include/simdjson/generic/amalgamated.h for fallback */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! @@ -13347,16 +13350,14 @@ static simdjson_inline uint32_t parse_eight_digits_unrolled(const uint8_t *chars /* begin file include/simdjson/generic/base.h for fallback */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ - -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): // If we haven't got an implementation yet, just use the builtin one (for the editor) */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -13381,13 +13382,16 @@ enum class number_type { /* begin file include/simdjson/generic/jsoncharutils.h for fallback */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_JSONCHARUTILS_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/jsoncharutils_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS +#include +#endif namespace simdjson { namespace fallback { namespace { @@ -13507,11 +13511,11 @@ simdjson_inline value128 full_multiplication(uint64_t value1, uint64_t value2) { /* begin file include/simdjson/generic/atomparsing.h for fallback */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ATOMPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -13584,10 +13588,10 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file include/simdjson/generic/dom_parser_implementation.h for fallback */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -13674,10 +13678,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file include/simdjson/generic/implementation_simdjson_result_base.h for fallback */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -13810,12 +13814,12 @@ protected: /* begin file include/simdjson/generic/numberparsing.h for fallback */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_NUMBERPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include @@ -15080,11 +15084,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file include/simdjson/generic/implementation_simdjson_result_base-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -15187,11 +15191,11 @@ simdjson_inline implementation_simdjson_result_base::implementation_simdjson_ /* begin file src/generic/stage1/find_next_document_index.h for fallback */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -15294,11 +15298,11 @@ simdjson_inline uint32_t find_next_document_index(dom_parser_implementation &par /* begin file src/generic/stage2/stringparsing.h for fallback */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses // It is intended to be included multiple times and compiled multiple times @@ -15544,10 +15548,10 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t /* begin file src/generic/stage2/logger.h for fallback */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This is for an internal-only stage 2 specific logger. // Set LOG_ENABLED = true to log what stage 2 is doing! @@ -15643,12 +15647,12 @@ namespace logger { /* begin file src/generic/stage2/json_iterator.h for fallback */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage2/logger.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -15971,10 +15975,10 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V /* begin file src/generic/stage2/tape_writer.h for fallback */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -16087,7 +16091,7 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern /* begin file src/generic/stage2/tape_builder.h for fallback */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage2/json_iterator.h" */ @@ -16096,7 +16100,7 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern /* amalgamation skipped (editor-only): #include "simdjson/generic/atomparsing.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/numberparsing.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { @@ -16784,9 +16788,9 @@ simdjson_warn_unused error_code dom_parser_implementation::parse(const uint8_t * #ifndef SIMDJSON_SRC_HASWELL_CPP #define SIMDJSON_SRC_HASWELL_CPP -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* skipped duplicate #include "generic/dependencies.h" */ /* skipped duplicate #include "simdjson/haswell/implementation.h" */ @@ -16821,12 +16825,12 @@ template struct simd8x64; } // namespace haswell } // namespace simdjson -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): // If we're editing one of the files in this directory, begin the implementation! */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #endif // SIMDJSON_HASWELL_BASE_H /* end file include/simdjson/haswell/base.h */ @@ -17447,10 +17451,10 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* end file include/simdjson/haswell/stringparsing_defs.h */ /* end file include/simdjson/haswell/begin.h */ /* begin file include/simdjson/generic/amalgamated.h for haswell */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! @@ -17462,16 +17466,14 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* begin file include/simdjson/generic/base.h for haswell */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ - -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): // If we haven't got an implementation yet, just use the builtin one (for the editor) */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -17496,13 +17498,16 @@ enum class number_type { /* begin file include/simdjson/generic/jsoncharutils.h for haswell */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_JSONCHARUTILS_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/jsoncharutils_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS +#include +#endif namespace simdjson { namespace haswell { namespace { @@ -17622,11 +17627,11 @@ simdjson_inline value128 full_multiplication(uint64_t value1, uint64_t value2) { /* begin file include/simdjson/generic/atomparsing.h for haswell */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ATOMPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -17699,10 +17704,10 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file include/simdjson/generic/dom_parser_implementation.h for haswell */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -17789,10 +17794,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file include/simdjson/generic/implementation_simdjson_result_base.h for haswell */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -17925,12 +17930,12 @@ protected: /* begin file include/simdjson/generic/numberparsing.h for haswell */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_NUMBERPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include @@ -19195,11 +19200,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file include/simdjson/generic/implementation_simdjson_result_base-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -19314,18 +19319,18 @@ SIMDJSON_TARGET_REGION("avx2,bmi,pclmul,lzcnt,popcnt") /* skipped duplicate #include "simdjson/haswell/stringparsing_defs.h" */ /* end file include/simdjson/haswell/begin.h */ /* begin file src/generic/amalgamated.h for haswell */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* begin file src/generic/base.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/dependencies.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -19342,11 +19347,11 @@ struct json_character_block; /* begin file src/generic/dom_parser_implementation.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Interface a dom parser implementation must fulfill namespace simdjson { @@ -19365,10 +19370,10 @@ simdjson_inline bool is_ascii(const simd8x64& input); /* begin file src/generic/json_character_block.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_JSON_CHARACTER_BLOCK_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_JSON_CHARACTER_BLOCK_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -19393,18 +19398,18 @@ struct json_character_block { /* end file src/generic/json_character_block.h for haswell */ /* end file src/generic/amalgamated.h for haswell */ /* begin file src/generic/stage1/amalgamated.h for haswell */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Stuff other things depend on /* begin file src/generic/stage1/base.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -19438,10 +19443,10 @@ using utf8_validation::utf8_checker; /* begin file src/generic/stage1/json_string_scanner.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRING_SCANNER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRING_SCANNER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -19602,11 +19607,11 @@ simdjson_inline error_code json_string_scanner::finish() { /* begin file src/generic/stage1/utf8_lookup4_algorithm.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_UTF8_LOOKUP4_ALGORITHM_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_UTF8_LOOKUP4_ALGORITHM_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -19821,12 +19826,12 @@ using namespace simd; /* begin file src/generic/stage1/json_scanner.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_SCANNER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_SCANNER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/json_character_block.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_string_scanner.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -19993,10 +19998,10 @@ simdjson_inline error_code json_scanner::finish() { /* begin file src/generic/stage1/buf_block_reader.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_BUF_BLOCK_READER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_BUF_BLOCK_READER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -20098,11 +20103,11 @@ simdjson_inline void buf_block_reader::advance() { /* begin file src/generic/stage1/find_next_document_index.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -20205,12 +20210,12 @@ simdjson_inline uint32_t find_next_document_index(dom_parser_implementation &par /* begin file src/generic/stage1/json_minifier.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_MINIFIER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_MINIFIER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_scanner.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/buf_block_reader.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses in stage1 // It is intended to be included multiple times and compiled multiple times @@ -20311,7 +20316,7 @@ error_code json_minifier::minify(const uint8_t *buf, size_t len, uint8_t *dst, s /* begin file src/generic/stage1/json_structural_indexer.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRUCTURAL_INDEXER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRUCTURAL_INDEXER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/utf8_lookup4_algorithm.h" */ @@ -20320,7 +20325,7 @@ error_code json_minifier::minify(const uint8_t *buf, size_t len, uint8_t *dst, s /* amalgamation skipped (editor-only): #include "generic/stage1/json_scanner.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_minifier.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/find_next_document_index.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses in stage1 // It is intended to be included multiple times and compiled multiple times @@ -20681,12 +20686,12 @@ simdjson_inline error_code json_structural_indexer::finish(dom_parser_implementa /* begin file src/generic/stage1/utf8_validator.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_UTF8_VALIDATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_UTF8_VALIDATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/buf_block_reader.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/utf8_lookup4_algorithm.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -20727,18 +20732,18 @@ bool generic_validate_utf8(const char * input, size_t length) { /* end file src/generic/stage1/utf8_validator.h for haswell */ /* end file src/generic/stage1/amalgamated.h for haswell */ /* begin file src/generic/stage2/amalgamated.h for haswell */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Stuff other things depend on /* begin file src/generic/stage2/base.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -20760,10 +20765,10 @@ struct tape_writer; /* begin file src/generic/stage2/tape_writer.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -20876,10 +20881,10 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern /* begin file src/generic/stage2/logger.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This is for an internal-only stage 2 specific logger. // Set LOG_ENABLED = true to log what stage 2 is doing! @@ -20977,12 +20982,12 @@ namespace logger { /* begin file src/generic/stage2/json_iterator.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage2/logger.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -21305,11 +21310,11 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V /* begin file src/generic/stage2/stringparsing.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses // It is intended to be included multiple times and compiled multiple times @@ -21555,11 +21560,11 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t /* begin file src/generic/stage2/structural_iterator.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRUCTURAL_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_STRUCTURAL_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -21621,7 +21626,7 @@ public: /* begin file src/generic/stage2/tape_builder.h for haswell */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage2/json_iterator.h" */ @@ -21630,7 +21635,7 @@ public: /* amalgamation skipped (editor-only): #include "simdjson/generic/atomparsing.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/numberparsing.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { @@ -22098,9 +22103,9 @@ SIMDJSON_UNTARGET_REGION #ifndef SIMDJSON_SRC_ICELAKE_CPP #define SIMDJSON_SRC_ICELAKE_CPP -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* skipped duplicate #include "simdjson/icelake/implementation.h" */ /* begin file include/simdjson/icelake/amalgamated.h */ @@ -22731,10 +22736,10 @@ static simdjson_inline uint32_t parse_eight_digits_unrolled(const uint8_t *chars /* end file include/simdjson/icelake/numberparsing_defs.h */ /* end file include/simdjson/icelake/begin.h */ /* begin file include/simdjson/generic/amalgamated.h for icelake */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! @@ -22746,16 +22751,14 @@ static simdjson_inline uint32_t parse_eight_digits_unrolled(const uint8_t *chars /* begin file include/simdjson/generic/base.h for icelake */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ - -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): // If we haven't got an implementation yet, just use the builtin one (for the editor) */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -22780,13 +22783,16 @@ enum class number_type { /* begin file include/simdjson/generic/jsoncharutils.h for icelake */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_JSONCHARUTILS_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/jsoncharutils_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS +#include +#endif namespace simdjson { namespace icelake { namespace { @@ -22906,11 +22912,11 @@ simdjson_inline value128 full_multiplication(uint64_t value1, uint64_t value2) { /* begin file include/simdjson/generic/atomparsing.h for icelake */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ATOMPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -22983,10 +22989,10 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file include/simdjson/generic/dom_parser_implementation.h for icelake */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -23073,10 +23079,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file include/simdjson/generic/implementation_simdjson_result_base.h for icelake */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -23209,12 +23215,12 @@ protected: /* begin file include/simdjson/generic/numberparsing.h for icelake */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_NUMBERPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include @@ -24479,11 +24485,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file include/simdjson/generic/implementation_simdjson_result_base-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -24598,18 +24604,18 @@ SIMDJSON_TARGET_REGION("avx512f,avx512dq,avx512cd,avx512bw,avx512vbmi,avx512vbmi /* skipped duplicate #include "simdjson/icelake/numberparsing_defs.h" */ /* end file include/simdjson/icelake/begin.h */ /* begin file src/generic/amalgamated.h for icelake */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* begin file src/generic/base.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/dependencies.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -24626,11 +24632,11 @@ struct json_character_block; /* begin file src/generic/dom_parser_implementation.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Interface a dom parser implementation must fulfill namespace simdjson { @@ -24649,10 +24655,10 @@ simdjson_inline bool is_ascii(const simd8x64& input); /* begin file src/generic/json_character_block.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_JSON_CHARACTER_BLOCK_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_JSON_CHARACTER_BLOCK_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -24679,18 +24685,18 @@ struct json_character_block { // defining SIMDJSON_GENERIC_JSON_STRUCTURAL_INDEXER_CUSTOM_BIT_INDEXER allows us to provide our own bit_indexer::write #define SIMDJSON_GENERIC_JSON_STRUCTURAL_INDEXER_CUSTOM_BIT_INDEXER /* begin file src/generic/stage1/amalgamated.h for icelake */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Stuff other things depend on /* begin file src/generic/stage1/base.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -24724,10 +24730,10 @@ using utf8_validation::utf8_checker; /* begin file src/generic/stage1/json_string_scanner.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRING_SCANNER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRING_SCANNER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -24888,11 +24894,11 @@ simdjson_inline error_code json_string_scanner::finish() { /* begin file src/generic/stage1/utf8_lookup4_algorithm.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_UTF8_LOOKUP4_ALGORITHM_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_UTF8_LOOKUP4_ALGORITHM_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -25107,12 +25113,12 @@ using namespace simd; /* begin file src/generic/stage1/json_scanner.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_SCANNER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_SCANNER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/json_character_block.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_string_scanner.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -25279,10 +25285,10 @@ simdjson_inline error_code json_scanner::finish() { /* begin file src/generic/stage1/buf_block_reader.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_BUF_BLOCK_READER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_BUF_BLOCK_READER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -25384,11 +25390,11 @@ simdjson_inline void buf_block_reader::advance() { /* begin file src/generic/stage1/find_next_document_index.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -25491,12 +25497,12 @@ simdjson_inline uint32_t find_next_document_index(dom_parser_implementation &par /* begin file src/generic/stage1/json_minifier.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_MINIFIER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_MINIFIER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_scanner.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/buf_block_reader.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses in stage1 // It is intended to be included multiple times and compiled multiple times @@ -25597,7 +25603,7 @@ error_code json_minifier::minify(const uint8_t *buf, size_t len, uint8_t *dst, s /* begin file src/generic/stage1/json_structural_indexer.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRUCTURAL_INDEXER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRUCTURAL_INDEXER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/utf8_lookup4_algorithm.h" */ @@ -25606,7 +25612,7 @@ error_code json_minifier::minify(const uint8_t *buf, size_t len, uint8_t *dst, s /* amalgamation skipped (editor-only): #include "generic/stage1/json_scanner.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_minifier.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/find_next_document_index.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses in stage1 // It is intended to be included multiple times and compiled multiple times @@ -25967,12 +25973,12 @@ simdjson_inline error_code json_structural_indexer::finish(dom_parser_implementa /* begin file src/generic/stage1/utf8_validator.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_UTF8_VALIDATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_UTF8_VALIDATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/buf_block_reader.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/utf8_lookup4_algorithm.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -26013,18 +26019,18 @@ bool generic_validate_utf8(const char * input, size_t length) { /* end file src/generic/stage1/utf8_validator.h for icelake */ /* end file src/generic/stage1/amalgamated.h for icelake */ /* begin file src/generic/stage2/amalgamated.h for icelake */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Stuff other things depend on /* begin file src/generic/stage2/base.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -26046,10 +26052,10 @@ struct tape_writer; /* begin file src/generic/stage2/tape_writer.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -26162,10 +26168,10 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern /* begin file src/generic/stage2/logger.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This is for an internal-only stage 2 specific logger. // Set LOG_ENABLED = true to log what stage 2 is doing! @@ -26263,12 +26269,12 @@ namespace logger { /* begin file src/generic/stage2/json_iterator.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage2/logger.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -26591,11 +26597,11 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V /* begin file src/generic/stage2/stringparsing.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses // It is intended to be included multiple times and compiled multiple times @@ -26841,11 +26847,11 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t /* begin file src/generic/stage2/structural_iterator.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRUCTURAL_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_STRUCTURAL_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -26907,7 +26913,7 @@ public: /* begin file src/generic/stage2/tape_builder.h for icelake */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage2/json_iterator.h" */ @@ -26916,7 +26922,7 @@ public: /* amalgamation skipped (editor-only): #include "simdjson/generic/atomparsing.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/numberparsing.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { @@ -27425,9 +27431,9 @@ SIMDJSON_UNTARGET_REGION #ifndef SIMDJSON_SRC_PPC64_CPP #define SIMDJSON_SRC_PPC64_CPP -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* skipped duplicate #include "simdjson/ppc64/implementation.h" */ /* begin file include/simdjson/ppc64/amalgamated.h */ @@ -27460,12 +27466,12 @@ template struct simd8x64; } // namespace ppc64 } // namespace simdjson -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): // If we're editing one of the files in this directory, begin the implementation! */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #endif // SIMDJSON_PPC64_BASE_H /* end file include/simdjson/ppc64/base.h */ @@ -28196,10 +28202,10 @@ backslash_and_quote::copy_and_find(const uint8_t *src, uint8_t *dst) { /* end file include/simdjson/ppc64/stringparsing_defs.h */ /* end file include/simdjson/ppc64/begin.h */ /* begin file include/simdjson/generic/amalgamated.h for ppc64 */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! @@ -28211,16 +28217,14 @@ backslash_and_quote::copy_and_find(const uint8_t *src, uint8_t *dst) { /* begin file include/simdjson/generic/base.h for ppc64 */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ - -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): // If we haven't got an implementation yet, just use the builtin one (for the editor) */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -28245,13 +28249,16 @@ enum class number_type { /* begin file include/simdjson/generic/jsoncharutils.h for ppc64 */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_JSONCHARUTILS_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/jsoncharutils_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS +#include +#endif namespace simdjson { namespace ppc64 { namespace { @@ -28371,11 +28378,11 @@ simdjson_inline value128 full_multiplication(uint64_t value1, uint64_t value2) { /* begin file include/simdjson/generic/atomparsing.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ATOMPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -28448,10 +28455,10 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file include/simdjson/generic/dom_parser_implementation.h for ppc64 */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -28538,10 +28545,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file include/simdjson/generic/implementation_simdjson_result_base.h for ppc64 */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -28674,12 +28681,12 @@ protected: /* begin file include/simdjson/generic/numberparsing.h for ppc64 */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_NUMBERPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include @@ -29944,11 +29951,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file include/simdjson/generic/implementation_simdjson_result_base-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -30052,18 +30059,18 @@ simdjson_inline implementation_simdjson_result_base::implementation_simdjson_ /* skipped duplicate #include "simdjson/ppc64/stringparsing_defs.h" */ /* end file include/simdjson/ppc64/begin.h */ /* begin file src/generic/amalgamated.h for ppc64 */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* begin file src/generic/base.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/dependencies.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -30080,11 +30087,11 @@ struct json_character_block; /* begin file src/generic/dom_parser_implementation.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Interface a dom parser implementation must fulfill namespace simdjson { @@ -30103,10 +30110,10 @@ simdjson_inline bool is_ascii(const simd8x64& input); /* begin file src/generic/json_character_block.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_JSON_CHARACTER_BLOCK_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_JSON_CHARACTER_BLOCK_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -30131,18 +30138,18 @@ struct json_character_block { /* end file src/generic/json_character_block.h for ppc64 */ /* end file src/generic/amalgamated.h for ppc64 */ /* begin file src/generic/stage1/amalgamated.h for ppc64 */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Stuff other things depend on /* begin file src/generic/stage1/base.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -30176,10 +30183,10 @@ using utf8_validation::utf8_checker; /* begin file src/generic/stage1/json_string_scanner.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRING_SCANNER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRING_SCANNER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -30340,11 +30347,11 @@ simdjson_inline error_code json_string_scanner::finish() { /* begin file src/generic/stage1/utf8_lookup4_algorithm.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_UTF8_LOOKUP4_ALGORITHM_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_UTF8_LOOKUP4_ALGORITHM_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -30559,12 +30566,12 @@ using namespace simd; /* begin file src/generic/stage1/json_scanner.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_SCANNER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_SCANNER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/json_character_block.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_string_scanner.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -30731,10 +30738,10 @@ simdjson_inline error_code json_scanner::finish() { /* begin file src/generic/stage1/buf_block_reader.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_BUF_BLOCK_READER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_BUF_BLOCK_READER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -30836,11 +30843,11 @@ simdjson_inline void buf_block_reader::advance() { /* begin file src/generic/stage1/find_next_document_index.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -30943,12 +30950,12 @@ simdjson_inline uint32_t find_next_document_index(dom_parser_implementation &par /* begin file src/generic/stage1/json_minifier.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_MINIFIER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_MINIFIER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_scanner.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/buf_block_reader.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses in stage1 // It is intended to be included multiple times and compiled multiple times @@ -31049,7 +31056,7 @@ error_code json_minifier::minify(const uint8_t *buf, size_t len, uint8_t *dst, s /* begin file src/generic/stage1/json_structural_indexer.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRUCTURAL_INDEXER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRUCTURAL_INDEXER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/utf8_lookup4_algorithm.h" */ @@ -31058,7 +31065,7 @@ error_code json_minifier::minify(const uint8_t *buf, size_t len, uint8_t *dst, s /* amalgamation skipped (editor-only): #include "generic/stage1/json_scanner.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_minifier.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/find_next_document_index.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses in stage1 // It is intended to be included multiple times and compiled multiple times @@ -31419,12 +31426,12 @@ simdjson_inline error_code json_structural_indexer::finish(dom_parser_implementa /* begin file src/generic/stage1/utf8_validator.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_UTF8_VALIDATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_UTF8_VALIDATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/buf_block_reader.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/utf8_lookup4_algorithm.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -31465,18 +31472,18 @@ bool generic_validate_utf8(const char * input, size_t length) { /* end file src/generic/stage1/utf8_validator.h for ppc64 */ /* end file src/generic/stage1/amalgamated.h for ppc64 */ /* begin file src/generic/stage2/amalgamated.h for ppc64 */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Stuff other things depend on /* begin file src/generic/stage2/base.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -31498,10 +31505,10 @@ struct tape_writer; /* begin file src/generic/stage2/tape_writer.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -31614,10 +31621,10 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern /* begin file src/generic/stage2/logger.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This is for an internal-only stage 2 specific logger. // Set LOG_ENABLED = true to log what stage 2 is doing! @@ -31715,12 +31722,12 @@ namespace logger { /* begin file src/generic/stage2/json_iterator.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage2/logger.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -32043,11 +32050,11 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V /* begin file src/generic/stage2/stringparsing.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses // It is intended to be included multiple times and compiled multiple times @@ -32293,11 +32300,11 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t /* begin file src/generic/stage2/structural_iterator.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRUCTURAL_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_STRUCTURAL_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -32359,7 +32366,7 @@ public: /* begin file src/generic/stage2/tape_builder.h for ppc64 */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage2/json_iterator.h" */ @@ -32368,7 +32375,7 @@ public: /* amalgamation skipped (editor-only): #include "simdjson/generic/atomparsing.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/numberparsing.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { @@ -32811,9 +32818,9 @@ simdjson_warn_unused error_code dom_parser_implementation::parse(const uint8_t * #ifndef SIMDJSON_SRC_WESTMERE_CPP #define SIMDJSON_SRC_WESTMERE_CPP -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* skipped duplicate #include "generic/dependencies.h" */ /* skipped duplicate #include "simdjson/westmere/implementation.h" */ @@ -32848,12 +32855,12 @@ template struct simd8x64; } // namespace westmere } // namespace simdjson -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): // If we're editing one of the files in this directory, begin the implementation! */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #endif // SIMDJSON_WESTMERE_BASE_H /* end file include/simdjson/westmere/base.h */ @@ -33425,10 +33432,10 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* end file include/simdjson/westmere/stringparsing_defs.h */ /* end file include/simdjson/westmere/begin.h */ /* begin file include/simdjson/generic/amalgamated.h for westmere */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! @@ -33440,16 +33447,14 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* begin file include/simdjson/generic/base.h for westmere */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ - -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): // If we haven't got an implementation yet, just use the builtin one (for the editor) */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -33474,13 +33479,16 @@ enum class number_type { /* begin file include/simdjson/generic/jsoncharutils.h for westmere */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_JSONCHARUTILS_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/jsoncharutils_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS +#include +#endif namespace simdjson { namespace westmere { namespace { @@ -33600,11 +33608,11 @@ simdjson_inline value128 full_multiplication(uint64_t value1, uint64_t value2) { /* begin file include/simdjson/generic/atomparsing.h for westmere */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ATOMPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -33677,10 +33685,10 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file include/simdjson/generic/dom_parser_implementation.h for westmere */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -33767,10 +33775,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file include/simdjson/generic/implementation_simdjson_result_base.h for westmere */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -33903,12 +33911,12 @@ protected: /* begin file include/simdjson/generic/numberparsing.h for westmere */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_NUMBERPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include @@ -35173,11 +35181,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file include/simdjson/generic/implementation_simdjson_result_base-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -35292,18 +35300,18 @@ SIMDJSON_TARGET_REGION("sse4.2,pclmul,popcnt") /* skipped duplicate #include "simdjson/westmere/stringparsing_defs.h" */ /* end file include/simdjson/westmere/begin.h */ /* begin file src/generic/amalgamated.h for westmere */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* begin file src/generic/base.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/dependencies.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -35320,11 +35328,11 @@ struct json_character_block; /* begin file src/generic/dom_parser_implementation.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Interface a dom parser implementation must fulfill namespace simdjson { @@ -35343,10 +35351,10 @@ simdjson_inline bool is_ascii(const simd8x64& input); /* begin file src/generic/json_character_block.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_JSON_CHARACTER_BLOCK_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_JSON_CHARACTER_BLOCK_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -35371,18 +35379,18 @@ struct json_character_block { /* end file src/generic/json_character_block.h for westmere */ /* end file src/generic/amalgamated.h for westmere */ /* begin file src/generic/stage1/amalgamated.h for westmere */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Stuff other things depend on /* begin file src/generic/stage1/base.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -35416,10 +35424,10 @@ using utf8_validation::utf8_checker; /* begin file src/generic/stage1/json_string_scanner.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRING_SCANNER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRING_SCANNER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -35580,11 +35588,11 @@ simdjson_inline error_code json_string_scanner::finish() { /* begin file src/generic/stage1/utf8_lookup4_algorithm.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_UTF8_LOOKUP4_ALGORITHM_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_UTF8_LOOKUP4_ALGORITHM_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -35799,12 +35807,12 @@ using namespace simd; /* begin file src/generic/stage1/json_scanner.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_SCANNER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_SCANNER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/json_character_block.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_string_scanner.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -35971,10 +35979,10 @@ simdjson_inline error_code json_scanner::finish() { /* begin file src/generic/stage1/buf_block_reader.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_BUF_BLOCK_READER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_BUF_BLOCK_READER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -36076,11 +36084,11 @@ simdjson_inline void buf_block_reader::advance() { /* begin file src/generic/stage1/find_next_document_index.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -36183,12 +36191,12 @@ simdjson_inline uint32_t find_next_document_index(dom_parser_implementation &par /* begin file src/generic/stage1/json_minifier.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_MINIFIER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_MINIFIER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_scanner.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/buf_block_reader.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses in stage1 // It is intended to be included multiple times and compiled multiple times @@ -36289,7 +36297,7 @@ error_code json_minifier::minify(const uint8_t *buf, size_t len, uint8_t *dst, s /* begin file src/generic/stage1/json_structural_indexer.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRUCTURAL_INDEXER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRUCTURAL_INDEXER_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/utf8_lookup4_algorithm.h" */ @@ -36298,7 +36306,7 @@ error_code json_minifier::minify(const uint8_t *buf, size_t len, uint8_t *dst, s /* amalgamation skipped (editor-only): #include "generic/stage1/json_scanner.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/json_minifier.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/find_next_document_index.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses in stage1 // It is intended to be included multiple times and compiled multiple times @@ -36659,12 +36667,12 @@ simdjson_inline error_code json_structural_indexer::finish(dom_parser_implementa /* begin file src/generic/stage1/utf8_validator.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_UTF8_VALIDATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE1_UTF8_VALIDATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage1/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/buf_block_reader.h" */ /* amalgamation skipped (editor-only): #include "generic/stage1/utf8_lookup4_algorithm.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -36705,18 +36713,18 @@ bool generic_validate_utf8(const char * input, size_t length) { /* end file src/generic/stage1/utf8_validator.h for westmere */ /* end file src/generic/stage1/amalgamated.h for westmere */ /* begin file src/generic/stage2/amalgamated.h for westmere */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Stuff other things depend on /* begin file src/generic/stage2/base.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_BASE_H */ /* amalgamation skipped (editor-only): #include "generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -36738,10 +36746,10 @@ struct tape_writer; /* begin file src/generic/stage2/tape_writer.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -36854,10 +36862,10 @@ simdjson_inline void tape_writer::write(uint64_t &tape_loc, uint64_t val, intern /* begin file src/generic/stage2/logger.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This is for an internal-only stage 2 specific logger. // Set LOG_ENABLED = true to log what stage 2 is doing! @@ -36955,12 +36963,12 @@ namespace logger { /* begin file src/generic/stage2/json_iterator.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage2/logger.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -37283,11 +37291,11 @@ simdjson_warn_unused simdjson_inline error_code json_iterator::visit_primitive(V /* begin file src/generic/stage2/stringparsing.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // This file contains the common code every implementation uses // It is intended to be included multiple times and compiled multiple times @@ -37533,11 +37541,11 @@ simdjson_warn_unused simdjson_inline uint8_t *parse_wobbly_string(const uint8_t /* begin file src/generic/stage2/structural_iterator.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRUCTURAL_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_STRUCTURAL_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -37599,7 +37607,7 @@ public: /* begin file src/generic/stage2/tape_builder.h for westmere */ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H */ /* amalgamation skipped (editor-only): #include "generic/stage2/base.h" */ /* amalgamation skipped (editor-only): #include "generic/stage2/json_iterator.h" */ @@ -37608,7 +37616,7 @@ public: /* amalgamation skipped (editor-only): #include "simdjson/generic/atomparsing.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dom_parser_implementation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/numberparsing.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { diff --git a/singleheader/simdjson.h b/singleheader/simdjson.h index 0a3a62be4..387e6ef96 100644 --- a/singleheader/simdjson.h +++ b/singleheader/simdjson.h @@ -1,4 +1,4 @@ -/* auto-generated on 2023-07-14 15:10:30 -0700. Do not edit! */ +/* auto-generated on 2023-07-14 20:57:24 -0700. Do not edit! */ /* begin file include/simdjson.h */ #ifndef SIMDJSON_H #define SIMDJSON_H @@ -2306,6 +2306,8 @@ SIMDJSON_PUSH_DISABLE_UNUSED_WARNINGS #ifndef SIMDJSON_AMALGAMATED_H #define SIMDJSON_AMALGAMATED_H +#define SIMDJSON_AMALGAMATED + // This provides the public API for simdjson. // DOM and ondemand are amalgamated separately, in simdjson.h /* begin file include/simdjson/simdjson_version.h */ @@ -3929,9 +3931,9 @@ extern SIMDJSON_DLLIMPORTEXPORT const uint64_t thintable_epi8[256]; #ifndef SIMDJSON_DOM_AMALGAMATED_H #define SIMDJSON_DOM_AMALGAMATED_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* begin file include/simdjson/dom/base.h */ #ifndef SIMDJSON_DOM_BASE_H @@ -9856,12 +9858,12 @@ class implementation; } // namespace icelake } // namespace simdjson -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): // If we're editing one of the files in this directory, begin the implementation! */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #endif // SIMDJSON_ICELAKE_BASE_H /* end file include/simdjson/icelake/base.h */ @@ -10029,12 +10031,12 @@ template struct simd8x64; } // namespace arm64 } // namespace simdjson -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): // If we're editing one of the files in this directory, begin the implementation! */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #endif // SIMDJSON_ARM64_BASE_H /* end file include/simdjson/arm64/base.h */ @@ -10236,10 +10238,10 @@ static simdjson_inline uint32_t parse_eight_digits_unrolled(const uint8_t *chars #ifndef SIMDJSON_ARM64_SIMD_H #define SIMDJSON_ARM64_SIMD_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* skipped duplicate #include "simdjson/arm64/bitmanipulation.h" */ @@ -10823,10 +10825,10 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* end file include/simdjson/arm64/stringparsing_defs.h */ /* end file include/simdjson/arm64/begin.h */ /* begin file include/simdjson/generic/amalgamated.h for arm64 */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! @@ -10838,16 +10840,14 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* begin file include/simdjson/generic/base.h for arm64 */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ - -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): // If we haven't got an implementation yet, just use the builtin one (for the editor) */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -10872,13 +10872,16 @@ enum class number_type { /* begin file include/simdjson/generic/jsoncharutils.h for arm64 */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_JSONCHARUTILS_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/jsoncharutils_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS +#include +#endif namespace simdjson { namespace arm64 { namespace { @@ -10998,11 +11001,11 @@ simdjson_inline value128 full_multiplication(uint64_t value1, uint64_t value2) { /* begin file include/simdjson/generic/atomparsing.h for arm64 */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ATOMPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -11075,10 +11078,10 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file include/simdjson/generic/dom_parser_implementation.h for arm64 */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -11165,10 +11168,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file include/simdjson/generic/implementation_simdjson_result_base.h for arm64 */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -11301,12 +11304,12 @@ protected: /* begin file include/simdjson/generic/numberparsing.h for arm64 */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_NUMBERPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include @@ -12571,11 +12574,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file include/simdjson/generic/implementation_simdjson_result_base-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace arm64 { @@ -12691,12 +12694,12 @@ class implementation; } // namespace fallback } // namespace simdjson -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): // If we're editing one of the files in this directory, begin the implementation! */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/fallback/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #endif // SIMDJSON_FALLBACK_BASE_H /* end file include/simdjson/fallback/base.h */ @@ -12824,10 +12827,10 @@ static simdjson_inline uint32_t parse_eight_digits_unrolled(const uint8_t *chars /* end file include/simdjson/fallback/numberparsing_defs.h */ /* end file include/simdjson/fallback/begin.h */ /* begin file include/simdjson/generic/amalgamated.h for fallback */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! @@ -12839,16 +12842,14 @@ static simdjson_inline uint32_t parse_eight_digits_unrolled(const uint8_t *chars /* begin file include/simdjson/generic/base.h for fallback */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ - -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): // If we haven't got an implementation yet, just use the builtin one (for the editor) */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -12873,13 +12874,16 @@ enum class number_type { /* begin file include/simdjson/generic/jsoncharutils.h for fallback */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_JSONCHARUTILS_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/jsoncharutils_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS +#include +#endif namespace simdjson { namespace fallback { namespace { @@ -12999,11 +13003,11 @@ simdjson_inline value128 full_multiplication(uint64_t value1, uint64_t value2) { /* begin file include/simdjson/generic/atomparsing.h for fallback */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ATOMPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -13076,10 +13080,10 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file include/simdjson/generic/dom_parser_implementation.h for fallback */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -13166,10 +13170,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file include/simdjson/generic/implementation_simdjson_result_base.h for fallback */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -13302,12 +13306,12 @@ protected: /* begin file include/simdjson/generic/numberparsing.h for fallback */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_NUMBERPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include @@ -14572,11 +14576,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file include/simdjson/generic/implementation_simdjson_result_base-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace fallback { @@ -14700,12 +14704,12 @@ template struct simd8x64; } // namespace haswell } // namespace simdjson -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): // If we're editing one of the files in this directory, begin the implementation! */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #endif // SIMDJSON_HASWELL_BASE_H /* end file include/simdjson/haswell/base.h */ @@ -15326,10 +15330,10 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* end file include/simdjson/haswell/stringparsing_defs.h */ /* end file include/simdjson/haswell/begin.h */ /* begin file include/simdjson/generic/amalgamated.h for haswell */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! @@ -15341,16 +15345,14 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* begin file include/simdjson/generic/base.h for haswell */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ - -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): // If we haven't got an implementation yet, just use the builtin one (for the editor) */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -15375,13 +15377,16 @@ enum class number_type { /* begin file include/simdjson/generic/jsoncharutils.h for haswell */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_JSONCHARUTILS_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/jsoncharutils_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS +#include +#endif namespace simdjson { namespace haswell { namespace { @@ -15501,11 +15506,11 @@ simdjson_inline value128 full_multiplication(uint64_t value1, uint64_t value2) { /* begin file include/simdjson/generic/atomparsing.h for haswell */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ATOMPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -15578,10 +15583,10 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file include/simdjson/generic/dom_parser_implementation.h for haswell */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -15668,10 +15673,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file include/simdjson/generic/implementation_simdjson_result_base.h for haswell */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -15804,12 +15809,12 @@ protected: /* begin file include/simdjson/generic/numberparsing.h for haswell */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_NUMBERPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include @@ -17074,11 +17079,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file include/simdjson/generic/implementation_simdjson_result_base-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace haswell { @@ -17805,10 +17810,10 @@ static simdjson_inline uint32_t parse_eight_digits_unrolled(const uint8_t *chars /* end file include/simdjson/icelake/numberparsing_defs.h */ /* end file include/simdjson/icelake/begin.h */ /* begin file include/simdjson/generic/amalgamated.h for icelake */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! @@ -17820,16 +17825,14 @@ static simdjson_inline uint32_t parse_eight_digits_unrolled(const uint8_t *chars /* begin file include/simdjson/generic/base.h for icelake */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ - -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): // If we haven't got an implementation yet, just use the builtin one (for the editor) */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -17854,13 +17857,16 @@ enum class number_type { /* begin file include/simdjson/generic/jsoncharutils.h for icelake */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_JSONCHARUTILS_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/jsoncharutils_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS +#include +#endif namespace simdjson { namespace icelake { namespace { @@ -17980,11 +17986,11 @@ simdjson_inline value128 full_multiplication(uint64_t value1, uint64_t value2) { /* begin file include/simdjson/generic/atomparsing.h for icelake */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ATOMPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -18057,10 +18063,10 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file include/simdjson/generic/dom_parser_implementation.h for icelake */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -18147,10 +18153,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file include/simdjson/generic/implementation_simdjson_result_base.h for icelake */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -18283,12 +18289,12 @@ protected: /* begin file include/simdjson/generic/numberparsing.h for icelake */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_NUMBERPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include @@ -19553,11 +19559,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file include/simdjson/generic/implementation_simdjson_result_base-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace icelake { @@ -19686,12 +19692,12 @@ template struct simd8x64; } // namespace ppc64 } // namespace simdjson -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): // If we're editing one of the files in this directory, begin the implementation! */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #endif // SIMDJSON_PPC64_BASE_H /* end file include/simdjson/ppc64/base.h */ @@ -20422,10 +20428,10 @@ backslash_and_quote::copy_and_find(const uint8_t *src, uint8_t *dst) { /* end file include/simdjson/ppc64/stringparsing_defs.h */ /* end file include/simdjson/ppc64/begin.h */ /* begin file include/simdjson/generic/amalgamated.h for ppc64 */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! @@ -20437,16 +20443,14 @@ backslash_and_quote::copy_and_find(const uint8_t *src, uint8_t *dst) { /* begin file include/simdjson/generic/base.h for ppc64 */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ - -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): // If we haven't got an implementation yet, just use the builtin one (for the editor) */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -20471,13 +20475,16 @@ enum class number_type { /* begin file include/simdjson/generic/jsoncharutils.h for ppc64 */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_JSONCHARUTILS_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/jsoncharutils_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS +#include +#endif namespace simdjson { namespace ppc64 { namespace { @@ -20597,11 +20604,11 @@ simdjson_inline value128 full_multiplication(uint64_t value1, uint64_t value2) { /* begin file include/simdjson/generic/atomparsing.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ATOMPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -20674,10 +20681,10 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file include/simdjson/generic/dom_parser_implementation.h for ppc64 */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -20764,10 +20771,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file include/simdjson/generic/implementation_simdjson_result_base.h for ppc64 */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -20900,12 +20907,12 @@ protected: /* begin file include/simdjson/generic/numberparsing.h for ppc64 */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_NUMBERPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include @@ -22170,11 +22177,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file include/simdjson/generic/implementation_simdjson_result_base-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace ppc64 { @@ -22298,12 +22305,12 @@ template struct simd8x64; } // namespace westmere } // namespace simdjson -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): // If we're editing one of the files in this directory, begin the implementation! */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #endif // SIMDJSON_WESTMERE_BASE_H /* end file include/simdjson/westmere/base.h */ @@ -22875,10 +22882,10 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* end file include/simdjson/westmere/stringparsing_defs.h */ /* end file include/simdjson/westmere/begin.h */ /* begin file include/simdjson/generic/amalgamated.h for westmere */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/amalgamated.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifndef SIMDJSON_AMALGAMATED_H #error simdjson/amalgamated.h must be included before generic/amalgamated.h! @@ -22890,16 +22897,14 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* begin file include/simdjson/generic/base.h for westmere */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ - -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): // If we haven't got an implementation yet, just use the builtin one (for the editor) */ /* amalgamation skipped (editor-only): #ifndef SIMDJSON_IMPLEMENTATION */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/begin.h" */ /* amalgamation skipped (editor-only): #endif */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_GENERIC */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -22924,13 +22929,16 @@ enum class number_type { /* begin file include/simdjson/generic/jsoncharutils.h for westmere */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_JSONCHARUTILS_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/jsoncharutils_tables.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS +#include +#endif namespace simdjson { namespace westmere { namespace { @@ -23050,11 +23058,11 @@ simdjson_inline value128 full_multiplication(uint64_t value1, uint64_t value2) { /* begin file include/simdjson/generic/atomparsing.h for westmere */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ATOMPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -23127,10 +23135,10 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file include/simdjson/generic/dom_parser_implementation.h for westmere */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -23217,10 +23225,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file include/simdjson/generic/implementation_simdjson_result_base.h for westmere */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -23353,12 +23361,12 @@ protected: /* begin file include/simdjson/generic/numberparsing.h for westmere */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_NUMBERPARSING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/jsoncharutils.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include @@ -24623,11 +24631,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file include/simdjson/generic/implementation_simdjson_result_base-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { namespace westmere { @@ -24735,16 +24743,16 @@ SIMDJSON_UNTARGET_REGION #ifndef SIMDJSON_BUILTIN_ONDEMAND_AMALGAMATED_H #define SIMDJSON_BUILTIN_ONDEMAND_AMALGAMATED_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/builtin/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ /* begin file include/simdjson/builtin/begin.h */ /* skipped duplicate #include "simdjson/builtin.h" */ #if SIMDJSON_BUILTIN_IMPLEMENTATION_IS(arm64) /* begin file include/simdjson/arm64/begin.h */ -#define SIMDJSON_IMPLEMENTATION arm64 +/* redefining SIMDJSON_IMPLEMENTATION from "SIMDJSON_BUILTIN_IMPLEMENTATION" to "arm64": #define SIMDJSON_IMPLEMENTATION arm64 */ /* skipped duplicate #include "simdjson/arm64/base.h" */ /* skipped duplicate #include "simdjson/arm64/intrinsics.h" */ /* skipped duplicate #include "simdjson/arm64/bitmanipulation.h" */ @@ -24755,7 +24763,7 @@ SIMDJSON_UNTARGET_REGION /* end file include/simdjson/arm64/begin.h */ #elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(fallback) /* begin file include/simdjson/fallback/begin.h */ -#define SIMDJSON_IMPLEMENTATION fallback +/* redefining SIMDJSON_IMPLEMENTATION from "arm64" to "fallback": #define SIMDJSON_IMPLEMENTATION fallback */ /* skipped duplicate #include "simdjson/fallback/base.h" */ /* skipped duplicate #include "simdjson/fallback/bitmanipulation.h" */ /* skipped duplicate #include "simdjson/fallback/stringparsing_defs.h" */ @@ -24763,7 +24771,7 @@ SIMDJSON_UNTARGET_REGION /* end file include/simdjson/fallback/begin.h */ #elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(haswell) /* begin file include/simdjson/haswell/begin.h */ -#define SIMDJSON_IMPLEMENTATION haswell +/* redefining SIMDJSON_IMPLEMENTATION from "fallback" to "haswell": #define SIMDJSON_IMPLEMENTATION haswell */ /* skipped duplicate #include "simdjson/haswell/base.h" */ /* skipped duplicate #include "simdjson/haswell/intrinsics.h" */ @@ -24779,7 +24787,7 @@ SIMDJSON_TARGET_REGION("avx2,bmi,pclmul,lzcnt,popcnt") /* end file include/simdjson/haswell/begin.h */ #elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(icelake) /* begin file include/simdjson/icelake/begin.h */ -#define SIMDJSON_IMPLEMENTATION icelake +/* redefining SIMDJSON_IMPLEMENTATION from "haswell" to "icelake": #define SIMDJSON_IMPLEMENTATION icelake */ /* skipped duplicate #include "simdjson/icelake/base.h" */ /* skipped duplicate #include "simdjson/icelake/intrinsics.h" */ @@ -24795,7 +24803,7 @@ SIMDJSON_TARGET_REGION("avx512f,avx512dq,avx512cd,avx512bw,avx512vbmi,avx512vbmi /* end file include/simdjson/icelake/begin.h */ #elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(ppc64) /* begin file include/simdjson/ppc64/begin.h */ -#define SIMDJSON_IMPLEMENTATION ppc64 +/* redefining SIMDJSON_IMPLEMENTATION from "icelake" to "ppc64": #define SIMDJSON_IMPLEMENTATION ppc64 */ /* skipped duplicate #include "simdjson/ppc64/base.h" */ /* skipped duplicate #include "simdjson/ppc64/intrinsics.h" */ /* skipped duplicate #include "simdjson/ppc64/bitmanipulation.h" */ @@ -24806,7 +24814,7 @@ SIMDJSON_TARGET_REGION("avx512f,avx512dq,avx512cd,avx512bw,avx512vbmi,avx512vbmi /* end file include/simdjson/ppc64/begin.h */ #elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(westmere) /* begin file include/simdjson/westmere/begin.h */ -#define SIMDJSON_IMPLEMENTATION westmere +/* redefining SIMDJSON_IMPLEMENTATION from "ppc64" to "westmere": #define SIMDJSON_IMPLEMENTATION westmere */ /* skipped duplicate #include "simdjson/westmere/base.h" */ /* skipped duplicate #include "simdjson/westmere/intrinsics.h" */ @@ -24825,22 +24833,22 @@ SIMDJSON_TARGET_REGION("sse4.2,pclmul,popcnt") #endif /* end file include/simdjson/builtin/begin.h */ /* begin file include/simdjson/generic/ondemand/amalgamated.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #include "simdjson/generic/amalgamated.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ // Stuff other things depend on /* begin file include/simdjson/generic/ondemand/base.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_BASE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/dependencies.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { /** * A fast, simple, DOM-like interface that parses JSON as you use it. * @@ -24851,8 +24859,8 @@ namespace ondemand { /** Represents the depth of a JSON value (number of nested arrays/objects). */ using depth_t = int32_t; -/** @copydoc simdjson::SIMDJSON_IMPLEMENTATION::number_type */ -using number_type = simdjson::SIMDJSON_IMPLEMENTATION::number_type; +/** @copydoc simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::number_type */ +using number_type = simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::number_type; /** @private Position in the JSON buffer indexes */ using token_position = const uint32_t *; @@ -24875,7 +24883,7 @@ class value; class value_iterator; } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson #endif // SIMDJSON_GENERIC_ONDEMAND_BASE_H @@ -24883,14 +24891,14 @@ class value_iterator; /* begin file include/simdjson/generic/ondemand/value_iterator.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { /** @@ -25351,15 +25359,15 @@ protected: }; // value_iterator } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::value_iterator &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value_iterator &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; }; @@ -25371,15 +25379,15 @@ public: /* begin file include/simdjson/generic/ondemand/value.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_VALUE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { /** @@ -25951,20 +25959,20 @@ protected: }; } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::value &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; - simdjson_inline simdjson_result get_array() noexcept; - simdjson_inline simdjson_result get_object() noexcept; + simdjson_inline simdjson_result get_array() noexcept; + simdjson_inline simdjson_result get_object() noexcept; simdjson_inline simdjson_result get_uint64() noexcept; simdjson_inline simdjson_result get_uint64_in_string() noexcept; @@ -25974,7 +25982,7 @@ public: simdjson_inline simdjson_result get_double_in_string() noexcept; simdjson_inline simdjson_result get_string(bool allow_replacement = false) noexcept; simdjson_inline simdjson_result get_wobbly_string() noexcept; - simdjson_inline simdjson_result get_raw_json_string() noexcept; + simdjson_inline simdjson_result get_raw_json_string() noexcept; simdjson_inline simdjson_result get_bool() noexcept; simdjson_inline simdjson_result is_null() noexcept; @@ -25983,20 +25991,20 @@ public: template simdjson_inline error_code get(T &out) noexcept; #if SIMDJSON_EXCEPTIONS - simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::array() noexcept(false); - simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::object() noexcept(false); + simdjson_inline operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array() noexcept(false); + simdjson_inline operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object() noexcept(false); simdjson_inline operator uint64_t() noexcept(false); simdjson_inline operator int64_t() noexcept(false); simdjson_inline operator double() noexcept(false); simdjson_inline operator std::string_view() noexcept(false); - simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false); + simdjson_inline operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false); simdjson_inline operator bool() noexcept(false); #endif simdjson_inline simdjson_result count_elements() & noexcept; simdjson_inline simdjson_result count_fields() & noexcept; - simdjson_inline simdjson_result at(size_t index) noexcept; - simdjson_inline simdjson_result begin() & noexcept; - simdjson_inline simdjson_result end() & noexcept; + simdjson_inline simdjson_result at(size_t index) noexcept; + simdjson_inline simdjson_result begin() & noexcept; + simdjson_inline simdjson_result end() & noexcept; /** * Look up a field by name on an object (order-sensitive). @@ -26018,9 +26026,9 @@ public: * @param key The key to look up. * @returns The value of the field, or NO_SUCH_FIELD if the field is not in the object. */ - simdjson_inline simdjson_result find_field(std::string_view key) noexcept; - /** @overload simdjson_inline simdjson_result find_field(std::string_view key) noexcept; */ - simdjson_inline simdjson_result find_field(const char *key) noexcept; + simdjson_inline simdjson_result find_field(std::string_view key) noexcept; + /** @overload simdjson_inline simdjson_result find_field(std::string_view key) noexcept; */ + simdjson_inline simdjson_result find_field(const char *key) noexcept; /** * Look up a field by name on an object, without regard to key order. @@ -26041,13 +26049,13 @@ public: * @param key The key to look up. * @returns The value of the field, or NO_SUCH_FIELD if the field is not in the object. */ - simdjson_inline simdjson_result find_field_unordered(std::string_view key) noexcept; - /** @overload simdjson_inline simdjson_result find_field_unordered(std::string_view key) noexcept; */ - simdjson_inline simdjson_result find_field_unordered(const char *key) noexcept; - /** @overload simdjson_inline simdjson_result find_field_unordered(std::string_view key) noexcept; */ - simdjson_inline simdjson_result operator[](std::string_view key) noexcept; - /** @overload simdjson_inline simdjson_result find_field_unordered(std::string_view key) noexcept; */ - simdjson_inline simdjson_result operator[](const char *key) noexcept; + simdjson_inline simdjson_result find_field_unordered(std::string_view key) noexcept; + /** @overload simdjson_inline simdjson_result find_field_unordered(std::string_view key) noexcept; */ + simdjson_inline simdjson_result find_field_unordered(const char *key) noexcept; + /** @overload simdjson_inline simdjson_result find_field_unordered(std::string_view key) noexcept; */ + simdjson_inline simdjson_result operator[](std::string_view key) noexcept; + /** @overload simdjson_inline simdjson_result find_field_unordered(std::string_view key) noexcept; */ + simdjson_inline simdjson_result operator[](const char *key) noexcept; /** * Get the type of this JSON value. @@ -26056,12 +26064,12 @@ public: * better to just call .get_double, .get_string, etc. and check for INCORRECT_TYPE (or just * let it throw an exception). */ - simdjson_inline simdjson_result type() noexcept; + simdjson_inline simdjson_result type() noexcept; simdjson_inline simdjson_result is_scalar() noexcept; simdjson_inline simdjson_result is_negative() noexcept; simdjson_inline simdjson_result is_integer() noexcept; - simdjson_inline simdjson_result get_number_type() noexcept; - simdjson_inline simdjson_result get_number() noexcept; + simdjson_inline simdjson_result get_number_type() noexcept; + simdjson_inline simdjson_result get_number() noexcept; /** @copydoc simdjson_inline std::string_view value::raw_json_token() const noexcept */ simdjson_inline simdjson_result raw_json_token() noexcept; @@ -26070,7 +26078,7 @@ public: simdjson_inline simdjson_result current_location() noexcept; /** @copydoc simdjson_inline int32_t current_depth() const noexcept */ simdjson_inline simdjson_result current_depth() const noexcept; - simdjson_inline simdjson_result at_pointer(std::string_view json_pointer) noexcept; + simdjson_inline simdjson_result at_pointer(std::string_view json_pointer) noexcept; }; } // namespace simdjson @@ -26080,13 +26088,13 @@ public: /* begin file include/simdjson/generic/ondemand/logger.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_LOGGER_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { // Logging should be free unless SIMDJSON_VERBOSE_LOGGING is set. Importantly, it is critical @@ -26123,7 +26131,7 @@ static inline void log_error(const value_iterator &iter, const char *error, cons } // namespace logger } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson #endif // SIMDJSON_GENERIC_ONDEMAND_LOGGER_H @@ -26131,15 +26139,15 @@ static inline void log_error(const value_iterator &iter, const char *error, cons /* begin file include/simdjson/generic/ondemand/token_iterator.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/logger.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { /** @@ -26261,15 +26269,15 @@ protected: }; } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::token_iterator &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::token_iterator &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; simdjson_inline ~simdjson_result() noexcept = default; ///< @private @@ -26282,15 +26290,15 @@ public: /* begin file include/simdjson/generic/ondemand/json_iterator.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/token_iterator.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { /** @@ -26586,15 +26594,15 @@ protected: }; // json_iterator } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::json_iterator &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::json_iterator &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; @@ -26607,15 +26615,15 @@ public: /* begin file include/simdjson/generic/ondemand/json_type.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/numberparsing.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { /** @@ -26750,15 +26758,15 @@ inline std::ostream& operator<<(std::ostream& out, simdjson_result &t #endif } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::json_type &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::json_type &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; simdjson_inline ~simdjson_result() noexcept = default; ///< @private @@ -26771,14 +26779,14 @@ public: /* begin file include/simdjson/generic/ondemand/raw_json_string.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { /** @@ -26954,22 +26962,22 @@ simdjson_unused simdjson_inline bool operator!=(std::string_view c, const raw_js } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::raw_json_string &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; simdjson_inline ~simdjson_result() noexcept = default; ///< @private simdjson_inline simdjson_result raw() const noexcept; - simdjson_inline simdjson_warn_unused simdjson_result unescape(SIMDJSON_IMPLEMENTATION::ondemand::json_iterator &iter, bool allow_replacement) const noexcept; - simdjson_inline simdjson_warn_unused simdjson_result unescape_wobbly(SIMDJSON_IMPLEMENTATION::ondemand::json_iterator &iter) const noexcept; + simdjson_inline simdjson_warn_unused simdjson_result unescape(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::json_iterator &iter, bool allow_replacement) const noexcept; + simdjson_inline simdjson_warn_unused simdjson_result unescape_wobbly(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::json_iterator &iter) const noexcept; }; } // namespace simdjson @@ -26979,14 +26987,14 @@ public: /* begin file include/simdjson/generic/ondemand/parser.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_PARSER_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { /** @@ -27314,15 +27322,15 @@ private: }; } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::parser &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::parser &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; }; @@ -27336,15 +27344,15 @@ public: /* begin file include/simdjson/generic/ondemand/array.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_ARRAY_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { /** @@ -27507,25 +27515,25 @@ protected: }; } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::array &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; - simdjson_inline simdjson_result begin() noexcept; - simdjson_inline simdjson_result end() noexcept; + simdjson_inline simdjson_result begin() noexcept; + simdjson_inline simdjson_result end() noexcept; inline simdjson_result count_elements() & noexcept; inline simdjson_result is_empty() & noexcept; inline simdjson_result reset() & noexcept; - simdjson_inline simdjson_result at(size_t index) noexcept; - simdjson_inline simdjson_result at_pointer(std::string_view json_pointer) noexcept; + simdjson_inline simdjson_result at(size_t index) noexcept; + simdjson_inline simdjson_result at_pointer(std::string_view json_pointer) noexcept; simdjson_inline simdjson_result raw_json() noexcept; }; @@ -27537,16 +27545,16 @@ public: /* begin file include/simdjson/generic/ondemand/array_iterator.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { /** @@ -27606,15 +27614,15 @@ private: }; } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::array_iterator &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array_iterator &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; @@ -27622,10 +27630,10 @@ public: // Iterator interface // - simdjson_inline simdjson_result operator*() noexcept; // MUST ONLY BE CALLED ONCE PER ITERATION. - simdjson_inline bool operator==(const simdjson_result &) const noexcept; - simdjson_inline bool operator!=(const simdjson_result &) const noexcept; - simdjson_inline simdjson_result &operator++() noexcept; + simdjson_inline simdjson_result operator*() noexcept; // MUST ONLY BE CALLED ONCE PER ITERATION. + simdjson_inline bool operator==(const simdjson_result &) const noexcept; + simdjson_inline bool operator!=(const simdjson_result &) const noexcept; + simdjson_inline simdjson_result &operator++() noexcept; }; } // namespace simdjson @@ -27635,14 +27643,14 @@ public: /* begin file include/simdjson/generic/ondemand/document.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/json_iterator.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { /** @@ -28300,21 +28308,21 @@ private: document *doc{nullptr}; }; } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::document &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; simdjson_inline error_code rewind() noexcept; - simdjson_inline simdjson_result get_array() & noexcept; - simdjson_inline simdjson_result get_object() & noexcept; + simdjson_inline simdjson_result get_array() & noexcept; + simdjson_inline simdjson_result get_object() & noexcept; simdjson_inline simdjson_result get_uint64() noexcept; simdjson_inline simdjson_result get_uint64_in_string() noexcept; simdjson_inline simdjson_result get_int64() noexcept; @@ -28323,9 +28331,9 @@ public: simdjson_inline simdjson_result get_double_in_string() noexcept; simdjson_inline simdjson_result get_string(bool allow_replacement = false) noexcept; simdjson_inline simdjson_result get_wobbly_string() noexcept; - simdjson_inline simdjson_result get_raw_json_string() noexcept; + simdjson_inline simdjson_result get_raw_json_string() noexcept; simdjson_inline simdjson_result get_bool() noexcept; - simdjson_inline simdjson_result get_value() noexcept; + simdjson_inline simdjson_result get_value() noexcept; simdjson_inline simdjson_result is_null() noexcept; template simdjson_inline simdjson_result get() & noexcept; @@ -28335,40 +28343,40 @@ public: template simdjson_inline error_code get(T &out) && noexcept; #if SIMDJSON_EXCEPTIONS - simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::array() & noexcept(false); - simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::object() & noexcept(false); + simdjson_inline operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array() & noexcept(false); + simdjson_inline operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object() & noexcept(false); simdjson_inline operator uint64_t() noexcept(false); simdjson_inline operator int64_t() noexcept(false); simdjson_inline operator double() noexcept(false); simdjson_inline operator std::string_view() noexcept(false); - simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false); + simdjson_inline operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false); simdjson_inline operator bool() noexcept(false); - simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::value() noexcept(false); + simdjson_inline operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value() noexcept(false); #endif simdjson_inline simdjson_result count_elements() & noexcept; simdjson_inline simdjson_result count_fields() & noexcept; - simdjson_inline simdjson_result at(size_t index) & noexcept; - simdjson_inline simdjson_result begin() & noexcept; - simdjson_inline simdjson_result end() & noexcept; - simdjson_inline simdjson_result find_field(std::string_view key) & noexcept; - simdjson_inline simdjson_result find_field(const char *key) & noexcept; - simdjson_inline simdjson_result operator[](std::string_view key) & noexcept; - simdjson_inline simdjson_result operator[](const char *key) & noexcept; - simdjson_inline simdjson_result find_field_unordered(std::string_view key) & noexcept; - simdjson_inline simdjson_result find_field_unordered(const char *key) & noexcept; - simdjson_inline simdjson_result type() noexcept; + simdjson_inline simdjson_result at(size_t index) & noexcept; + simdjson_inline simdjson_result begin() & noexcept; + simdjson_inline simdjson_result end() & noexcept; + simdjson_inline simdjson_result find_field(std::string_view key) & noexcept; + simdjson_inline simdjson_result find_field(const char *key) & noexcept; + simdjson_inline simdjson_result operator[](std::string_view key) & noexcept; + simdjson_inline simdjson_result operator[](const char *key) & noexcept; + simdjson_inline simdjson_result find_field_unordered(std::string_view key) & noexcept; + simdjson_inline simdjson_result find_field_unordered(const char *key) & noexcept; + simdjson_inline simdjson_result type() noexcept; simdjson_inline simdjson_result is_scalar() noexcept; simdjson_inline simdjson_result current_location() noexcept; simdjson_inline int32_t current_depth() const noexcept; simdjson_inline bool at_end() const noexcept; simdjson_inline bool is_negative() noexcept; simdjson_inline simdjson_result is_integer() noexcept; - simdjson_inline simdjson_result get_number_type() noexcept; - simdjson_inline simdjson_result get_number() noexcept; + simdjson_inline simdjson_result get_number_type() noexcept; + simdjson_inline simdjson_result get_number() noexcept; /** @copydoc simdjson_inline std::string_view document::raw_json_token() const noexcept */ simdjson_inline simdjson_result raw_json_token() noexcept; - simdjson_inline simdjson_result at_pointer(std::string_view json_pointer) noexcept; + simdjson_inline simdjson_result at_pointer(std::string_view json_pointer) noexcept; }; @@ -28379,14 +28387,14 @@ public: namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::document_reference value, error_code error) noexcept; + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document_reference value, error_code error) noexcept; simdjson_inline simdjson_result() noexcept = default; simdjson_inline error_code rewind() noexcept; - simdjson_inline simdjson_result get_array() & noexcept; - simdjson_inline simdjson_result get_object() & noexcept; + simdjson_inline simdjson_result get_array() & noexcept; + simdjson_inline simdjson_result get_object() & noexcept; simdjson_inline simdjson_result get_uint64() noexcept; simdjson_inline simdjson_result get_uint64_in_string() noexcept; simdjson_inline simdjson_result get_int64() noexcept; @@ -28395,45 +28403,45 @@ public: simdjson_inline simdjson_result get_double_in_string() noexcept; simdjson_inline simdjson_result get_string(bool allow_replacement = false) noexcept; simdjson_inline simdjson_result get_wobbly_string() noexcept; - simdjson_inline simdjson_result get_raw_json_string() noexcept; + simdjson_inline simdjson_result get_raw_json_string() noexcept; simdjson_inline simdjson_result get_bool() noexcept; - simdjson_inline simdjson_result get_value() noexcept; + simdjson_inline simdjson_result get_value() noexcept; simdjson_inline simdjson_result is_null() noexcept; #if SIMDJSON_EXCEPTIONS - simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::array() & noexcept(false); - simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::object() & noexcept(false); + simdjson_inline operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array() & noexcept(false); + simdjson_inline operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object() & noexcept(false); simdjson_inline operator uint64_t() noexcept(false); simdjson_inline operator int64_t() noexcept(false); simdjson_inline operator double() noexcept(false); simdjson_inline operator std::string_view() noexcept(false); - simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false); + simdjson_inline operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false); simdjson_inline operator bool() noexcept(false); - simdjson_inline operator SIMDJSON_IMPLEMENTATION::ondemand::value() noexcept(false); + simdjson_inline operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value() noexcept(false); #endif simdjson_inline simdjson_result count_elements() & noexcept; simdjson_inline simdjson_result count_fields() & noexcept; - simdjson_inline simdjson_result at(size_t index) & noexcept; - simdjson_inline simdjson_result begin() & noexcept; - simdjson_inline simdjson_result end() & noexcept; - simdjson_inline simdjson_result find_field(std::string_view key) & noexcept; - simdjson_inline simdjson_result find_field(const char *key) & noexcept; - simdjson_inline simdjson_result operator[](std::string_view key) & noexcept; - simdjson_inline simdjson_result operator[](const char *key) & noexcept; - simdjson_inline simdjson_result find_field_unordered(std::string_view key) & noexcept; - simdjson_inline simdjson_result find_field_unordered(const char *key) & noexcept; - simdjson_inline simdjson_result type() noexcept; + simdjson_inline simdjson_result at(size_t index) & noexcept; + simdjson_inline simdjson_result begin() & noexcept; + simdjson_inline simdjson_result end() & noexcept; + simdjson_inline simdjson_result find_field(std::string_view key) & noexcept; + simdjson_inline simdjson_result find_field(const char *key) & noexcept; + simdjson_inline simdjson_result operator[](std::string_view key) & noexcept; + simdjson_inline simdjson_result operator[](const char *key) & noexcept; + simdjson_inline simdjson_result find_field_unordered(std::string_view key) & noexcept; + simdjson_inline simdjson_result find_field_unordered(const char *key) & noexcept; + simdjson_inline simdjson_result type() noexcept; simdjson_inline simdjson_result is_scalar() noexcept; simdjson_inline simdjson_result current_location() noexcept; simdjson_inline simdjson_result current_depth() const noexcept; simdjson_inline simdjson_result is_negative() noexcept; simdjson_inline simdjson_result is_integer() noexcept; - simdjson_inline simdjson_result get_number_type() noexcept; - simdjson_inline simdjson_result get_number() noexcept; + simdjson_inline simdjson_result get_number_type() noexcept; + simdjson_inline simdjson_result get_number() noexcept; /** @copydoc simdjson_inline std::string_view document_reference::raw_json_token() const noexcept */ simdjson_inline simdjson_result raw_json_token() noexcept; - simdjson_inline simdjson_result at_pointer(std::string_view json_pointer) noexcept; + simdjson_inline simdjson_result at_pointer(std::string_view json_pointer) noexcept; }; @@ -28444,13 +28452,13 @@ public: /* begin file include/simdjson/generic/ondemand/document_stream.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/document.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/parser.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #ifdef SIMDJSON_THREADS_ENABLED #include @@ -28459,7 +28467,7 @@ public: #endif namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { #ifdef SIMDJSON_THREADS_ENABLED @@ -28766,14 +28774,14 @@ private: }; // document_stream } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::document_stream &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document_stream &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; }; @@ -28785,16 +28793,16 @@ public: /* begin file include/simdjson/generic/ondemand/field.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_FIELD_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/raw_json_string.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { /** @@ -28845,21 +28853,21 @@ protected: }; } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::field &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::field &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; simdjson_inline simdjson_result unescaped_key(bool allow_replacement = false) noexcept; - simdjson_inline simdjson_result key() noexcept; - simdjson_inline simdjson_result value() noexcept; + simdjson_inline simdjson_result key() noexcept; + simdjson_inline simdjson_result value() noexcept; }; } // namespace simdjson @@ -28869,15 +28877,15 @@ public: /* begin file include/simdjson/generic/ondemand/object.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_OBJECT_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { /** @@ -29075,27 +29083,27 @@ protected: }; } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::object &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; - simdjson_inline simdjson_result begin() noexcept; - simdjson_inline simdjson_result end() noexcept; - simdjson_inline simdjson_result find_field(std::string_view key) & noexcept; - simdjson_inline simdjson_result find_field(std::string_view key) && noexcept; - simdjson_inline simdjson_result find_field_unordered(std::string_view key) & noexcept; - simdjson_inline simdjson_result find_field_unordered(std::string_view key) && noexcept; - simdjson_inline simdjson_result operator[](std::string_view key) & noexcept; - simdjson_inline simdjson_result operator[](std::string_view key) && noexcept; - simdjson_inline simdjson_result at_pointer(std::string_view json_pointer) noexcept; + simdjson_inline simdjson_result begin() noexcept; + simdjson_inline simdjson_result end() noexcept; + simdjson_inline simdjson_result find_field(std::string_view key) & noexcept; + simdjson_inline simdjson_result find_field(std::string_view key) && noexcept; + simdjson_inline simdjson_result find_field_unordered(std::string_view key) & noexcept; + simdjson_inline simdjson_result find_field_unordered(std::string_view key) && noexcept; + simdjson_inline simdjson_result operator[](std::string_view key) & noexcept; + simdjson_inline simdjson_result operator[](std::string_view key) && noexcept; + simdjson_inline simdjson_result at_pointer(std::string_view json_pointer) noexcept; inline simdjson_result reset() noexcept; inline simdjson_result is_empty() noexcept; inline simdjson_result count_fields() & noexcept; @@ -29110,15 +29118,15 @@ public: /* begin file include/simdjson/generic/ondemand/object_iterator.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { class object_iterator { @@ -29159,15 +29167,15 @@ private: }; } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { template<> -struct simdjson_result : public SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base { +struct simdjson_result : public SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base { public: - simdjson_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::object_iterator &&value) noexcept; ///< @private + simdjson_inline simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object_iterator &&value) noexcept; ///< @private simdjson_inline simdjson_result(error_code error) noexcept; ///< @private simdjson_inline simdjson_result() noexcept = default; @@ -29176,13 +29184,13 @@ public: // // Reads key and value, yielding them to the user. - simdjson_inline simdjson_result operator*() noexcept; // MUST ONLY BE CALLED ONCE PER ITERATION. + simdjson_inline simdjson_result operator*() noexcept; // MUST ONLY BE CALLED ONCE PER ITERATION. // Assumes it's being compared with the end. true if depth < iter->depth. - simdjson_inline bool operator==(const simdjson_result &) const noexcept; + simdjson_inline bool operator==(const simdjson_result &) const noexcept; // Assumes it's being compared with the end. true if depth >= iter->depth. - simdjson_inline bool operator!=(const simdjson_result &) const noexcept; + simdjson_inline bool operator!=(const simdjson_result &) const noexcept; // Checks for ']' and ',' - simdjson_inline simdjson_result &operator++() noexcept; + simdjson_inline simdjson_result &operator++() noexcept; }; } // namespace simdjson @@ -29192,10 +29200,10 @@ public: /* begin file include/simdjson/generic/ondemand/serialization.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { /** @@ -29203,30 +29211,30 @@ namespace simdjson { * contains JSON text that is suitable to be parsed as JSON again. It does not * validate the content. */ -inline simdjson_result to_json_string(SIMDJSON_IMPLEMENTATION::ondemand::document& x) noexcept; +inline simdjson_result to_json_string(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document& x) noexcept; /** * Create a string-view instance out of a value instance. The string-view instance * contains JSON text that is suitable to be parsed as JSON again. The value must * not have been accessed previously. It does not * validate the content. */ -inline simdjson_result to_json_string(SIMDJSON_IMPLEMENTATION::ondemand::value& x) noexcept; +inline simdjson_result to_json_string(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value& x) noexcept; /** * Create a string-view instance out of an object instance. The string-view instance * contains JSON text that is suitable to be parsed as JSON again. It does not * validate the content. */ -inline simdjson_result to_json_string(SIMDJSON_IMPLEMENTATION::ondemand::object& x) noexcept; +inline simdjson_result to_json_string(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object& x) noexcept; /** * Create a string-view instance out of an array instance. The string-view instance * contains JSON text that is suitable to be parsed as JSON again. It does not * validate the content. */ -inline simdjson_result to_json_string(SIMDJSON_IMPLEMENTATION::ondemand::array& x) noexcept; -inline simdjson_result to_json_string(simdjson_result x); -inline simdjson_result to_json_string(simdjson_result x); -inline simdjson_result to_json_string(simdjson_result x); -inline simdjson_result to_json_string(simdjson_result x); +inline simdjson_result to_json_string(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array& x) noexcept; +inline simdjson_result to_json_string(simdjson_result x); +inline simdjson_result to_json_string(simdjson_result x); +inline simdjson_result to_json_string(simdjson_result x); +inline simdjson_result to_json_string(simdjson_result x); } // namespace simdjson /** @@ -29236,7 +29244,7 @@ inline simdjson_result to_json_string(simdjson_result x); +inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result x); #endif /** * Print JSON to an output stream. It does not @@ -29258,9 +29266,9 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result x); +inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result x); #endif /** * Print JSON to an output stream. It does not @@ -29270,13 +29278,13 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result&& x); +inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result&& x); #endif -inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTATION::ondemand::document_reference& value); +inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document_reference& value); #if SIMDJSON_EXCEPTIONS -inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result&& x); +inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result&& x); #endif /** * Print JSON to an output stream. It does not @@ -29286,11 +29294,11 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result x); +inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result x); #endif -}}} // namespace simdjson::SIMDJSON_IMPLEMENTATION::ondemand +}}} // namespace simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand #endif // SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_H /* end file include/simdjson/generic/ondemand/serialization.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ @@ -29299,7 +29307,7 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result array::at(size_t index) noexcept { } } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { -simdjson_inline simdjson_result::simdjson_result( - SIMDJSON_IMPLEMENTATION::ondemand::array &&value +simdjson_inline simdjson_result::simdjson_result( + SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array &&value ) noexcept - : implementation_simdjson_result_base( - std::forward(value) + : implementation_simdjson_result_base( + std::forward(value) ) { } -simdjson_inline simdjson_result::simdjson_result( +simdjson_inline simdjson_result::simdjson_result( error_code error ) noexcept - : implementation_simdjson_result_base(error) + : implementation_simdjson_result_base(error) { } -simdjson_inline simdjson_result simdjson_result::begin() noexcept { +simdjson_inline simdjson_result simdjson_result::begin() noexcept { if (error()) { return error(); } return first.begin(); } -simdjson_inline simdjson_result simdjson_result::end() noexcept { +simdjson_inline simdjson_result simdjson_result::end() noexcept { if (error()) { return error(); } return first.end(); } -simdjson_inline simdjson_result simdjson_result::count_elements() & noexcept { +simdjson_inline simdjson_result simdjson_result::count_elements() & noexcept { if (error()) { return error(); } return first.count_elements(); } -simdjson_inline simdjson_result simdjson_result::is_empty() & noexcept { +simdjson_inline simdjson_result simdjson_result::is_empty() & noexcept { if (error()) { return error(); } return first.is_empty(); } -simdjson_inline simdjson_result simdjson_result::at(size_t index) noexcept { +simdjson_inline simdjson_result simdjson_result::at(size_t index) noexcept { if (error()) { return error(); } return first.at(index); } -simdjson_inline simdjson_result simdjson_result::at_pointer(std::string_view json_pointer) noexcept { +simdjson_inline simdjson_result simdjson_result::at_pointer(std::string_view json_pointer) noexcept { if (error()) { return error(); } return first.at_pointer(json_pointer); } -simdjson_inline simdjson_result simdjson_result::raw_json() noexcept { +simdjson_inline simdjson_result simdjson_result::raw_json() noexcept { if (error()) { return error(); } return first.raw_json(); } @@ -29527,16 +29535,16 @@ simdjson_inline simdjson_result simdjson_result::simdjson_result( - SIMDJSON_IMPLEMENTATION::ondemand::array_iterator &&value +simdjson_inline simdjson_result::simdjson_result( + SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array_iterator &&value ) noexcept - : SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base(std::forward(value)) + : SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base(std::forward(value)) { first.iter.assert_is_valid(); } -simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept - : SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base({}, error) +simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept + : SIMDJSON_BUILTIN_IMPLEMENTATION::implementation_simdjson_result_base({}, error) { } -simdjson_inline simdjson_result simdjson_result::operator*() noexcept { +simdjson_inline simdjson_result simdjson_result::operator*() noexcept { if (error()) { return error(); } return *first; } -simdjson_inline bool simdjson_result::operator==(const simdjson_result &other) const noexcept { +simdjson_inline bool simdjson_result::operator==(const simdjson_result &other) const noexcept { if (!first.iter.is_valid()) { return !error(); } return first == other.first; } -simdjson_inline bool simdjson_result::operator!=(const simdjson_result &other) const noexcept { +simdjson_inline bool simdjson_result::operator!=(const simdjson_result &other) const noexcept { if (!first.iter.is_valid()) { return error(); } return first != other.first; } -simdjson_inline simdjson_result &simdjson_result::operator++() noexcept { +simdjson_inline simdjson_result &simdjson_result::operator++() noexcept { // Clear the error if there is one, so we don't yield it twice if (error()) { second = SUCCESS; return *this; } ++(first); @@ -29607,7 +29615,7 @@ simdjson_inline simdjson_result document::at_pointer(std::string_view jso } } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { -simdjson_inline simdjson_result::simdjson_result( - SIMDJSON_IMPLEMENTATION::ondemand::document &&value +simdjson_inline simdjson_result::simdjson_result( + SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document &&value ) noexcept : - implementation_simdjson_result_base( - std::forward(value) + implementation_simdjson_result_base( + std::forward(value) ) { } -simdjson_inline simdjson_result::simdjson_result( +simdjson_inline simdjson_result::simdjson_result( error_code error ) noexcept : - implementation_simdjson_result_base( + implementation_simdjson_result_base( error ) { } -simdjson_inline simdjson_result simdjson_result::count_elements() & noexcept { +simdjson_inline simdjson_result simdjson_result::count_elements() & noexcept { if (error()) { return error(); } return first.count_elements(); } -simdjson_inline simdjson_result simdjson_result::count_fields() & noexcept { +simdjson_inline simdjson_result simdjson_result::count_fields() & noexcept { if (error()) { return error(); } return first.count_fields(); } -simdjson_inline simdjson_result simdjson_result::at(size_t index) & noexcept { +simdjson_inline simdjson_result simdjson_result::at(size_t index) & noexcept { if (error()) { return error(); } return first.at(index); } -simdjson_inline error_code simdjson_result::rewind() noexcept { +simdjson_inline error_code simdjson_result::rewind() noexcept { if (error()) { return error(); } first.rewind(); return SUCCESS; } -simdjson_inline simdjson_result simdjson_result::begin() & noexcept { +simdjson_inline simdjson_result simdjson_result::begin() & noexcept { if (error()) { return error(); } return first.begin(); } -simdjson_inline simdjson_result simdjson_result::end() & noexcept { +simdjson_inline simdjson_result simdjson_result::end() & noexcept { return {}; } -simdjson_inline simdjson_result simdjson_result::find_field_unordered(std::string_view key) & noexcept { +simdjson_inline simdjson_result simdjson_result::find_field_unordered(std::string_view key) & noexcept { if (error()) { return error(); } return first.find_field_unordered(key); } -simdjson_inline simdjson_result simdjson_result::find_field_unordered(const char *key) & noexcept { +simdjson_inline simdjson_result simdjson_result::find_field_unordered(const char *key) & noexcept { if (error()) { return error(); } return first.find_field_unordered(key); } -simdjson_inline simdjson_result simdjson_result::operator[](std::string_view key) & noexcept { +simdjson_inline simdjson_result simdjson_result::operator[](std::string_view key) & noexcept { if (error()) { return error(); } return first[key]; } -simdjson_inline simdjson_result simdjson_result::operator[](const char *key) & noexcept { +simdjson_inline simdjson_result simdjson_result::operator[](const char *key) & noexcept { if (error()) { return error(); } return first[key]; } -simdjson_inline simdjson_result simdjson_result::find_field(std::string_view key) & noexcept { +simdjson_inline simdjson_result simdjson_result::find_field(std::string_view key) & noexcept { if (error()) { return error(); } return first.find_field(key); } -simdjson_inline simdjson_result simdjson_result::find_field(const char *key) & noexcept { +simdjson_inline simdjson_result simdjson_result::find_field(const char *key) & noexcept { if (error()) { return error(); } return first.find_field(key); } -simdjson_inline simdjson_result simdjson_result::get_array() & noexcept { +simdjson_inline simdjson_result simdjson_result::get_array() & noexcept { if (error()) { return error(); } return first.get_array(); } -simdjson_inline simdjson_result simdjson_result::get_object() & noexcept { +simdjson_inline simdjson_result simdjson_result::get_object() & noexcept { if (error()) { return error(); } return first.get_object(); } -simdjson_inline simdjson_result simdjson_result::get_uint64() noexcept { +simdjson_inline simdjson_result simdjson_result::get_uint64() noexcept { if (error()) { return error(); } return first.get_uint64(); } -simdjson_inline simdjson_result simdjson_result::get_uint64_in_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_uint64_in_string() noexcept { if (error()) { return error(); } return first.get_uint64_in_string(); } -simdjson_inline simdjson_result simdjson_result::get_int64() noexcept { +simdjson_inline simdjson_result simdjson_result::get_int64() noexcept { if (error()) { return error(); } return first.get_int64(); } -simdjson_inline simdjson_result simdjson_result::get_int64_in_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_int64_in_string() noexcept { if (error()) { return error(); } return first.get_int64_in_string(); } -simdjson_inline simdjson_result simdjson_result::get_double() noexcept { +simdjson_inline simdjson_result simdjson_result::get_double() noexcept { if (error()) { return error(); } return first.get_double(); } -simdjson_inline simdjson_result simdjson_result::get_double_in_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_double_in_string() noexcept { if (error()) { return error(); } return first.get_double_in_string(); } -simdjson_inline simdjson_result simdjson_result::get_string(bool allow_replacement) noexcept { +simdjson_inline simdjson_result simdjson_result::get_string(bool allow_replacement) noexcept { if (error()) { return error(); } return first.get_string(allow_replacement); } -simdjson_inline simdjson_result simdjson_result::get_wobbly_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_wobbly_string() noexcept { if (error()) { return error(); } return first.get_wobbly_string(); } -simdjson_inline simdjson_result simdjson_result::get_raw_json_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_raw_json_string() noexcept { if (error()) { return error(); } return first.get_raw_json_string(); } -simdjson_inline simdjson_result simdjson_result::get_bool() noexcept { +simdjson_inline simdjson_result simdjson_result::get_bool() noexcept { if (error()) { return error(); } return first.get_bool(); } -simdjson_inline simdjson_result simdjson_result::get_value() noexcept { +simdjson_inline simdjson_result simdjson_result::get_value() noexcept { if (error()) { return error(); } return first.get_value(); } -simdjson_inline simdjson_result simdjson_result::is_null() noexcept { +simdjson_inline simdjson_result simdjson_result::is_null() noexcept { if (error()) { return error(); } return first.is_null(); } template -simdjson_inline simdjson_result simdjson_result::get() & noexcept { +simdjson_inline simdjson_result simdjson_result::get() & noexcept { if (error()) { return error(); } return first.get(); } template -simdjson_inline simdjson_result simdjson_result::get() && noexcept { +simdjson_inline simdjson_result simdjson_result::get() && noexcept { if (error()) { return error(); } - return std::forward(first).get(); + return std::forward(first).get(); } template -simdjson_inline error_code simdjson_result::get(T &out) & noexcept { +simdjson_inline error_code simdjson_result::get(T &out) & noexcept { if (error()) { return error(); } return first.get(out); } template -simdjson_inline error_code simdjson_result::get(T &out) && noexcept { +simdjson_inline error_code simdjson_result::get(T &out) && noexcept { if (error()) { return error(); } - return std::forward(first).get(out); + return std::forward(first).get(out); } -template<> simdjson_inline simdjson_result simdjson_result::get() & noexcept = delete; -template<> simdjson_inline simdjson_result simdjson_result::get() && noexcept { +template<> simdjson_inline simdjson_result simdjson_result::get() & noexcept = delete; +template<> simdjson_inline simdjson_result simdjson_result::get() && noexcept { if (error()) { return error(); } - return std::forward(first); + return std::forward(first); } -template<> simdjson_inline error_code simdjson_result::get(SIMDJSON_IMPLEMENTATION::ondemand::document &out) & noexcept = delete; -template<> simdjson_inline error_code simdjson_result::get(SIMDJSON_IMPLEMENTATION::ondemand::document &out) && noexcept { +template<> simdjson_inline error_code simdjson_result::get(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document &out) & noexcept = delete; +template<> simdjson_inline error_code simdjson_result::get(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document &out) && noexcept { if (error()) { return error(); } - out = std::forward(first); + out = std::forward(first); return SUCCESS; } -simdjson_inline simdjson_result simdjson_result::type() noexcept { +simdjson_inline simdjson_result simdjson_result::type() noexcept { if (error()) { return error(); } return first.type(); } -simdjson_inline simdjson_result simdjson_result::is_scalar() noexcept { +simdjson_inline simdjson_result simdjson_result::is_scalar() noexcept { if (error()) { return error(); } return first.is_scalar(); } -simdjson_inline bool simdjson_result::is_negative() noexcept { +simdjson_inline bool simdjson_result::is_negative() noexcept { if (error()) { return error(); } return first.is_negative(); } -simdjson_inline simdjson_result simdjson_result::is_integer() noexcept { +simdjson_inline simdjson_result simdjson_result::is_integer() noexcept { if (error()) { return error(); } return first.is_integer(); } -simdjson_inline simdjson_result simdjson_result::get_number_type() noexcept { +simdjson_inline simdjson_result simdjson_result::get_number_type() noexcept { if (error()) { return error(); } return first.get_number_type(); } -simdjson_inline simdjson_result simdjson_result::get_number() noexcept { +simdjson_inline simdjson_result simdjson_result::get_number() noexcept { if (error()) { return error(); } return first.get_number(); } #if SIMDJSON_EXCEPTIONS -simdjson_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::array() & noexcept(false) { +simdjson_inline simdjson_result::operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array() & noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::object() & noexcept(false) { +simdjson_inline simdjson_result::operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object() & noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator uint64_t() noexcept(false) { +simdjson_inline simdjson_result::operator uint64_t() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator int64_t() noexcept(false) { +simdjson_inline simdjson_result::operator int64_t() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator double() noexcept(false) { +simdjson_inline simdjson_result::operator double() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator std::string_view() noexcept(false) { +simdjson_inline simdjson_result::operator std::string_view() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false) { +simdjson_inline simdjson_result::operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator bool() noexcept(false) { +simdjson_inline simdjson_result::operator bool() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::value() noexcept(false) { +simdjson_inline simdjson_result::operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } #endif -simdjson_inline simdjson_result simdjson_result::current_location() noexcept { +simdjson_inline simdjson_result simdjson_result::current_location() noexcept { if (error()) { return error(); } return first.current_location(); } -simdjson_inline bool simdjson_result::at_end() const noexcept { +simdjson_inline bool simdjson_result::at_end() const noexcept { if (error()) { return error(); } return first.at_end(); } -simdjson_inline int32_t simdjson_result::current_depth() const noexcept { +simdjson_inline int32_t simdjson_result::current_depth() const noexcept { if (error()) { return error(); } return first.current_depth(); } -simdjson_inline simdjson_result simdjson_result::raw_json_token() noexcept { +simdjson_inline simdjson_result simdjson_result::raw_json_token() noexcept { if (error()) { return error(); } return first.raw_json_token(); } -simdjson_inline simdjson_result simdjson_result::at_pointer(std::string_view json_pointer) noexcept { +simdjson_inline simdjson_result simdjson_result::at_pointer(std::string_view json_pointer) noexcept { if (error()) { return error(); } return first.at_pointer(json_pointer); } @@ -30161,7 +30169,7 @@ simdjson_inline simdjson_result simdjs namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { simdjson_inline document_reference::document_reference() noexcept : doc{nullptr} {} @@ -30232,194 +30240,194 @@ simdjson_inline simdjson_result document_reference::raw_json() simdjson_inline document_reference::operator document&() const noexcept { return *doc; } } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { -simdjson_inline simdjson_result::simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::document_reference value, error_code error) - noexcept : implementation_simdjson_result_base(std::forward(value), error) {} +simdjson_inline simdjson_result::simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document_reference value, error_code error) + noexcept : implementation_simdjson_result_base(std::forward(value), error) {} -simdjson_inline simdjson_result simdjson_result::count_elements() & noexcept { +simdjson_inline simdjson_result simdjson_result::count_elements() & noexcept { if (error()) { return error(); } return first.count_elements(); } -simdjson_inline simdjson_result simdjson_result::count_fields() & noexcept { +simdjson_inline simdjson_result simdjson_result::count_fields() & noexcept { if (error()) { return error(); } return first.count_fields(); } -simdjson_inline simdjson_result simdjson_result::at(size_t index) & noexcept { +simdjson_inline simdjson_result simdjson_result::at(size_t index) & noexcept { if (error()) { return error(); } return first.at(index); } -simdjson_inline error_code simdjson_result::rewind() noexcept { +simdjson_inline error_code simdjson_result::rewind() noexcept { if (error()) { return error(); } first.rewind(); return SUCCESS; } -simdjson_inline simdjson_result simdjson_result::begin() & noexcept { +simdjson_inline simdjson_result simdjson_result::begin() & noexcept { if (error()) { return error(); } return first.begin(); } -simdjson_inline simdjson_result simdjson_result::end() & noexcept { +simdjson_inline simdjson_result simdjson_result::end() & noexcept { return {}; } -simdjson_inline simdjson_result simdjson_result::find_field_unordered(std::string_view key) & noexcept { +simdjson_inline simdjson_result simdjson_result::find_field_unordered(std::string_view key) & noexcept { if (error()) { return error(); } return first.find_field_unordered(key); } -simdjson_inline simdjson_result simdjson_result::find_field_unordered(const char *key) & noexcept { +simdjson_inline simdjson_result simdjson_result::find_field_unordered(const char *key) & noexcept { if (error()) { return error(); } return first.find_field_unordered(key); } -simdjson_inline simdjson_result simdjson_result::operator[](std::string_view key) & noexcept { +simdjson_inline simdjson_result simdjson_result::operator[](std::string_view key) & noexcept { if (error()) { return error(); } return first[key]; } -simdjson_inline simdjson_result simdjson_result::operator[](const char *key) & noexcept { +simdjson_inline simdjson_result simdjson_result::operator[](const char *key) & noexcept { if (error()) { return error(); } return first[key]; } -simdjson_inline simdjson_result simdjson_result::find_field(std::string_view key) & noexcept { +simdjson_inline simdjson_result simdjson_result::find_field(std::string_view key) & noexcept { if (error()) { return error(); } return first.find_field(key); } -simdjson_inline simdjson_result simdjson_result::find_field(const char *key) & noexcept { +simdjson_inline simdjson_result simdjson_result::find_field(const char *key) & noexcept { if (error()) { return error(); } return first.find_field(key); } -simdjson_inline simdjson_result simdjson_result::get_array() & noexcept { +simdjson_inline simdjson_result simdjson_result::get_array() & noexcept { if (error()) { return error(); } return first.get_array(); } -simdjson_inline simdjson_result simdjson_result::get_object() & noexcept { +simdjson_inline simdjson_result simdjson_result::get_object() & noexcept { if (error()) { return error(); } return first.get_object(); } -simdjson_inline simdjson_result simdjson_result::get_uint64() noexcept { +simdjson_inline simdjson_result simdjson_result::get_uint64() noexcept { if (error()) { return error(); } return first.get_uint64(); } -simdjson_inline simdjson_result simdjson_result::get_uint64_in_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_uint64_in_string() noexcept { if (error()) { return error(); } return first.get_uint64_in_string(); } -simdjson_inline simdjson_result simdjson_result::get_int64() noexcept { +simdjson_inline simdjson_result simdjson_result::get_int64() noexcept { if (error()) { return error(); } return first.get_int64(); } -simdjson_inline simdjson_result simdjson_result::get_int64_in_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_int64_in_string() noexcept { if (error()) { return error(); } return first.get_int64_in_string(); } -simdjson_inline simdjson_result simdjson_result::get_double() noexcept { +simdjson_inline simdjson_result simdjson_result::get_double() noexcept { if (error()) { return error(); } return first.get_double(); } -simdjson_inline simdjson_result simdjson_result::get_double_in_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_double_in_string() noexcept { if (error()) { return error(); } return first.get_double_in_string(); } -simdjson_inline simdjson_result simdjson_result::get_string(bool allow_replacement) noexcept { +simdjson_inline simdjson_result simdjson_result::get_string(bool allow_replacement) noexcept { if (error()) { return error(); } return first.get_string(allow_replacement); } -simdjson_inline simdjson_result simdjson_result::get_wobbly_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_wobbly_string() noexcept { if (error()) { return error(); } return first.get_wobbly_string(); } -simdjson_inline simdjson_result simdjson_result::get_raw_json_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_raw_json_string() noexcept { if (error()) { return error(); } return first.get_raw_json_string(); } -simdjson_inline simdjson_result simdjson_result::get_bool() noexcept { +simdjson_inline simdjson_result simdjson_result::get_bool() noexcept { if (error()) { return error(); } return first.get_bool(); } -simdjson_inline simdjson_result simdjson_result::get_value() noexcept { +simdjson_inline simdjson_result simdjson_result::get_value() noexcept { if (error()) { return error(); } return first.get_value(); } -simdjson_inline simdjson_result simdjson_result::is_null() noexcept { +simdjson_inline simdjson_result simdjson_result::is_null() noexcept { if (error()) { return error(); } return first.is_null(); } -simdjson_inline simdjson_result simdjson_result::type() noexcept { +simdjson_inline simdjson_result simdjson_result::type() noexcept { if (error()) { return error(); } return first.type(); } -simdjson_inline simdjson_result simdjson_result::is_scalar() noexcept { +simdjson_inline simdjson_result simdjson_result::is_scalar() noexcept { if (error()) { return error(); } return first.is_scalar(); } -simdjson_inline simdjson_result simdjson_result::is_negative() noexcept { +simdjson_inline simdjson_result simdjson_result::is_negative() noexcept { if (error()) { return error(); } return first.is_negative(); } -simdjson_inline simdjson_result simdjson_result::is_integer() noexcept { +simdjson_inline simdjson_result simdjson_result::is_integer() noexcept { if (error()) { return error(); } return first.is_integer(); } -simdjson_inline simdjson_result simdjson_result::get_number_type() noexcept { +simdjson_inline simdjson_result simdjson_result::get_number_type() noexcept { if (error()) { return error(); } return first.get_number_type(); } -simdjson_inline simdjson_result simdjson_result::get_number() noexcept { +simdjson_inline simdjson_result simdjson_result::get_number() noexcept { if (error()) { return error(); } return first.get_number(); } #if SIMDJSON_EXCEPTIONS -simdjson_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::array() & noexcept(false) { +simdjson_inline simdjson_result::operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array() & noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::object() & noexcept(false) { +simdjson_inline simdjson_result::operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object() & noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator uint64_t() noexcept(false) { +simdjson_inline simdjson_result::operator uint64_t() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator int64_t() noexcept(false) { +simdjson_inline simdjson_result::operator int64_t() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator double() noexcept(false) { +simdjson_inline simdjson_result::operator double() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator std::string_view() noexcept(false) { +simdjson_inline simdjson_result::operator std::string_view() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false) { +simdjson_inline simdjson_result::operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator bool() noexcept(false) { +simdjson_inline simdjson_result::operator bool() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::value() noexcept(false) { +simdjson_inline simdjson_result::operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } #endif -simdjson_inline simdjson_result simdjson_result::current_location() noexcept { +simdjson_inline simdjson_result simdjson_result::current_location() noexcept { if (error()) { return error(); } return first.current_location(); } -simdjson_inline simdjson_result simdjson_result::raw_json_token() noexcept { +simdjson_inline simdjson_result simdjson_result::raw_json_token() noexcept { if (error()) { return error(); } return first.raw_json_token(); } -simdjson_inline simdjson_result simdjson_result::at_pointer(std::string_view json_pointer) noexcept { +simdjson_inline simdjson_result simdjson_result::at_pointer(std::string_view json_pointer) noexcept { if (error()) { return error(); } return first.at_pointer(json_pointer); } @@ -30432,19 +30440,19 @@ simdjson_inline simdjson_result simdjs /* begin file include/simdjson/generic/ondemand/document_stream-inl.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/document_stream.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/document-inl.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ #include #include namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { #ifdef SIMDJSON_THREADS_ENABLED @@ -30831,22 +30839,22 @@ inline void document_stream::start_stage1_thread() noexcept { #endif // SIMDJSON_THREADS_ENABLED } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { -simdjson_inline simdjson_result::simdjson_result( +simdjson_inline simdjson_result::simdjson_result( error_code error ) noexcept : - implementation_simdjson_result_base(error) + implementation_simdjson_result_base(error) { } -simdjson_inline simdjson_result::simdjson_result( - SIMDJSON_IMPLEMENTATION::ondemand::document_stream &&value +simdjson_inline simdjson_result::simdjson_result( + SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document_stream &&value ) noexcept : - implementation_simdjson_result_base( - std::forward(value) + implementation_simdjson_result_base( + std::forward(value) ) { } @@ -30858,16 +30866,16 @@ simdjson_inline simdjson_result::simdjson_result( - SIMDJSON_IMPLEMENTATION::ondemand::field &&value +simdjson_inline simdjson_result::simdjson_result( + SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::field &&value ) noexcept : - implementation_simdjson_result_base( - std::forward(value) + implementation_simdjson_result_base( + std::forward(value) ) { } -simdjson_inline simdjson_result::simdjson_result( +simdjson_inline simdjson_result::simdjson_result( error_code error ) noexcept : - implementation_simdjson_result_base(error) + implementation_simdjson_result_base(error) { } -simdjson_inline simdjson_result simdjson_result::key() noexcept { +simdjson_inline simdjson_result simdjson_result::key() noexcept { if (error()) { return error(); } return first.key(); } -simdjson_inline simdjson_result simdjson_result::unescaped_key(bool allow_replacement) noexcept { +simdjson_inline simdjson_result simdjson_result::unescaped_key(bool allow_replacement) noexcept { if (error()) { return error(); } return first.unescaped_key(allow_replacement); } -simdjson_inline simdjson_result simdjson_result::value() noexcept { +simdjson_inline simdjson_result simdjson_result::value() noexcept { if (error()) { return error(); } return std::move(first.value()); } @@ -30950,7 +30958,7 @@ simdjson_inline simdjson_result simdjs /* begin file include/simdjson/generic/ondemand/json_iterator-inl.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/json_iterator.h" */ @@ -30959,10 +30967,10 @@ simdjson_inline simdjson_result simdjs /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/logger-inl.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/parser-inl.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/token_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { simdjson_inline json_iterator::json_iterator(json_iterator &&other) noexcept @@ -31343,15 +31351,15 @@ simdjson_warn_unused simdjson_inline bool json_iterator::copy_to_buffer(const ui } } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { -simdjson_inline simdjson_result::simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::json_iterator &&value) noexcept - : implementation_simdjson_result_base(std::forward(value)) {} -simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept - : implementation_simdjson_result_base(error) {} +simdjson_inline simdjson_result::simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::json_iterator &&value) noexcept + : implementation_simdjson_result_base(std::forward(value)) {} +simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept + : implementation_simdjson_result_base(error) {} } // namespace simdjson @@ -31360,15 +31368,15 @@ simdjson_inline simdjson_result::simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::json_type &&value) noexcept - : implementation_simdjson_result_base(std::forward(value)) {} -simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept - : implementation_simdjson_result_base(error) {} +simdjson_inline simdjson_result::simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::json_type &&value) noexcept + : implementation_simdjson_result_base(std::forward(value)) {} +simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept + : implementation_simdjson_result_base(error) {} } // namespace simdjson @@ -31480,16 +31488,16 @@ simdjson_inline simdjson_result::s /* begin file include/simdjson/generic/ondemand/logger-inl.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_LOGGER_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/logger.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/json_iterator.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { namespace logger { @@ -31657,7 +31665,7 @@ inline void log_line(const json_iterator &iter, token_position index, depth_t de } // namespace logger } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson #endif // SIMDJSON_GENERIC_ONDEMAND_LOGGER_INL_H @@ -31665,7 +31673,7 @@ inline void log_line(const json_iterator &iter, token_position index, depth_t de /* begin file include/simdjson/generic/ondemand/object-inl.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_OBJECT_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/field.h" */ @@ -31674,10 +31682,10 @@ inline void log_line(const json_iterator &iter, token_position index, depth_t de /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/raw_json_string.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/json_iterator.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { simdjson_inline simdjson_result object::find_field_unordered(const std::string_view key) & noexcept { @@ -31841,70 +31849,70 @@ simdjson_inline simdjson_result object::reset() & noexcept { } } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { -simdjson_inline simdjson_result::simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::object &&value) noexcept - : implementation_simdjson_result_base(std::forward(value)) {} -simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept - : implementation_simdjson_result_base(error) {} +simdjson_inline simdjson_result::simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object &&value) noexcept + : implementation_simdjson_result_base(std::forward(value)) {} +simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept + : implementation_simdjson_result_base(error) {} -simdjson_inline simdjson_result simdjson_result::begin() noexcept { +simdjson_inline simdjson_result simdjson_result::begin() noexcept { if (error()) { return error(); } return first.begin(); } -simdjson_inline simdjson_result simdjson_result::end() noexcept { +simdjson_inline simdjson_result simdjson_result::end() noexcept { if (error()) { return error(); } return first.end(); } -simdjson_inline simdjson_result simdjson_result::find_field_unordered(std::string_view key) & noexcept { +simdjson_inline simdjson_result simdjson_result::find_field_unordered(std::string_view key) & noexcept { if (error()) { return error(); } return first.find_field_unordered(key); } -simdjson_inline simdjson_result simdjson_result::find_field_unordered(std::string_view key) && noexcept { +simdjson_inline simdjson_result simdjson_result::find_field_unordered(std::string_view key) && noexcept { if (error()) { return error(); } - return std::forward(first).find_field_unordered(key); + return std::forward(first).find_field_unordered(key); } -simdjson_inline simdjson_result simdjson_result::operator[](std::string_view key) & noexcept { +simdjson_inline simdjson_result simdjson_result::operator[](std::string_view key) & noexcept { if (error()) { return error(); } return first[key]; } -simdjson_inline simdjson_result simdjson_result::operator[](std::string_view key) && noexcept { +simdjson_inline simdjson_result simdjson_result::operator[](std::string_view key) && noexcept { if (error()) { return error(); } - return std::forward(first)[key]; + return std::forward(first)[key]; } -simdjson_inline simdjson_result simdjson_result::find_field(std::string_view key) & noexcept { +simdjson_inline simdjson_result simdjson_result::find_field(std::string_view key) & noexcept { if (error()) { return error(); } return first.find_field(key); } -simdjson_inline simdjson_result simdjson_result::find_field(std::string_view key) && noexcept { +simdjson_inline simdjson_result simdjson_result::find_field(std::string_view key) && noexcept { if (error()) { return error(); } - return std::forward(first).find_field(key); + return std::forward(first).find_field(key); } -simdjson_inline simdjson_result simdjson_result::at_pointer(std::string_view json_pointer) noexcept { +simdjson_inline simdjson_result simdjson_result::at_pointer(std::string_view json_pointer) noexcept { if (error()) { return error(); } return first.at_pointer(json_pointer); } -inline simdjson_result simdjson_result::reset() noexcept { +inline simdjson_result simdjson_result::reset() noexcept { if (error()) { return error(); } return first.reset(); } -inline simdjson_result simdjson_result::is_empty() noexcept { +inline simdjson_result simdjson_result::is_empty() noexcept { if (error()) { return error(); } return first.is_empty(); } -simdjson_inline simdjson_result simdjson_result::count_fields() & noexcept { +simdjson_inline simdjson_result simdjson_result::count_fields() & noexcept { if (error()) { return error(); } return first.count_fields(); } -simdjson_inline simdjson_result simdjson_result::raw_json() noexcept { +simdjson_inline simdjson_result simdjson_result::raw_json() noexcept { if (error()) { return error(); } return first.raw_json(); } @@ -31915,16 +31923,16 @@ simdjson_inline simdjson_result simdjson_result::simdjson_result( - SIMDJSON_IMPLEMENTATION::ondemand::object_iterator &&value +simdjson_inline simdjson_result::simdjson_result( + SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object_iterator &&value ) noexcept - : implementation_simdjson_result_base(std::forward(value)) + : implementation_simdjson_result_base(std::forward(value)) { first.iter.assert_is_valid(); } -simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept - : implementation_simdjson_result_base({}, error) +simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept + : implementation_simdjson_result_base({}, error) { } -simdjson_inline simdjson_result simdjson_result::operator*() noexcept { +simdjson_inline simdjson_result simdjson_result::operator*() noexcept { if (error()) { return error(); } return *first; } // If we're iterating and there is an error, return the error once. -simdjson_inline bool simdjson_result::operator==(const simdjson_result &other) const noexcept { +simdjson_inline bool simdjson_result::operator==(const simdjson_result &other) const noexcept { if (!first.iter.is_valid()) { return !error(); } return first == other.first; } // If we're iterating and there is an error, return the error once. -simdjson_inline bool simdjson_result::operator!=(const simdjson_result &other) const noexcept { +simdjson_inline bool simdjson_result::operator!=(const simdjson_result &other) const noexcept { if (!first.iter.is_valid()) { return error(); } return first != other.first; } // Checks for ']' and ',' -simdjson_inline simdjson_result &simdjson_result::operator++() noexcept { +simdjson_inline simdjson_result &simdjson_result::operator++() noexcept { // Clear the error if there is one, so we don't yield it twice if (error()) { second = SUCCESS; return *this; } ++first; @@ -32055,16 +32063,16 @@ simdjson_inline simdjson_result parser::u } } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { -simdjson_inline simdjson_result::simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::parser &&value) noexcept - : implementation_simdjson_result_base(std::forward(value)) {} -simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept - : implementation_simdjson_result_base(error) {} +simdjson_inline simdjson_result::simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::parser &&value) noexcept + : implementation_simdjson_result_base(std::forward(value)) {} +simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept + : implementation_simdjson_result_base(error) {} } // namespace simdjson @@ -32216,17 +32224,17 @@ simdjson_inline simdjson_result::simd /* begin file include/simdjson/generic/ondemand/raw_json_string-inl.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/raw_json_string.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/json_iterator-inl.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { simdjson_inline raw_json_string::raw_json_string(const uint8_t * _buf) noexcept : buf{_buf} {} @@ -32392,25 +32400,25 @@ simdjson_unused simdjson_inline std::ostream &operator<<(std::ostream &out, cons } } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { -simdjson_inline simdjson_result::simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string &&value) noexcept - : implementation_simdjson_result_base(std::forward(value)) {} -simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept - : implementation_simdjson_result_base(error) {} +simdjson_inline simdjson_result::simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::raw_json_string &&value) noexcept + : implementation_simdjson_result_base(std::forward(value)) {} +simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept + : implementation_simdjson_result_base(error) {} -simdjson_inline simdjson_result simdjson_result::raw() const noexcept { +simdjson_inline simdjson_result simdjson_result::raw() const noexcept { if (error()) { return error(); } return first.raw(); } -simdjson_inline simdjson_warn_unused simdjson_result simdjson_result::unescape(SIMDJSON_IMPLEMENTATION::ondemand::json_iterator &iter, bool allow_replacement) const noexcept { +simdjson_inline simdjson_warn_unused simdjson_result simdjson_result::unescape(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::json_iterator &iter, bool allow_replacement) const noexcept { if (error()) { return error(); } return first.unescape(iter, allow_replacement); } -simdjson_inline simdjson_warn_unused simdjson_result simdjson_result::unescape_wobbly(SIMDJSON_IMPLEMENTATION::ondemand::json_iterator &iter) const noexcept { +simdjson_inline simdjson_warn_unused simdjson_result simdjson_result::unescape_wobbly(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::json_iterator &iter) const noexcept { if (error()) { return error(); } return first.unescape_wobbly(iter); } @@ -32421,7 +32429,7 @@ simdjson_inline simdjson_warn_unused simdjson_result simdjson_ /* begin file include/simdjson/generic/ondemand/serialization-inl.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array.h" */ @@ -32430,7 +32438,7 @@ simdjson_inline simdjson_warn_unused simdjson_result simdjson_ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/object.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/serialization.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { @@ -32445,43 +32453,43 @@ inline std::string_view trim(const std::string_view str) noexcept { } -inline simdjson_result to_json_string(SIMDJSON_IMPLEMENTATION::ondemand::document& x) noexcept { +inline simdjson_result to_json_string(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document& x) noexcept { std::string_view v; auto error = x.raw_json().get(v); if(error) {return error; } return trim(v); } -inline simdjson_result to_json_string(SIMDJSON_IMPLEMENTATION::ondemand::document_reference& x) noexcept { +inline simdjson_result to_json_string(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document_reference& x) noexcept { std::string_view v; auto error = x.raw_json().get(v); if(error) {return error; } return trim(v); } -inline simdjson_result to_json_string(SIMDJSON_IMPLEMENTATION::ondemand::value& x) noexcept { +inline simdjson_result to_json_string(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value& x) noexcept { /** * If we somehow receive a value that has already been consumed, * then the following code could be in trouble. E.g., we create * an array as needed, but if an array was already created, then * it could be bad. */ - using namespace SIMDJSON_IMPLEMENTATION::ondemand; - SIMDJSON_IMPLEMENTATION::ondemand::json_type t; + using namespace SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand; + SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::json_type t; auto error = x.type().get(t); if(error != SUCCESS) { return error; } switch (t) { case json_type::array: { - SIMDJSON_IMPLEMENTATION::ondemand::array array; + SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array array; error = x.get_array().get(array); if(error) { return error; } return to_json_string(array); } case json_type::object: { - SIMDJSON_IMPLEMENTATION::ondemand::object object; + SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object object; error = x.get_object().get(object); if(error) { return error; } return to_json_string(object); @@ -32491,50 +32499,50 @@ inline simdjson_result to_json_string(SIMDJSON_IMPLEMENTATION: } } -inline simdjson_result to_json_string(SIMDJSON_IMPLEMENTATION::ondemand::object& x) noexcept { +inline simdjson_result to_json_string(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object& x) noexcept { std::string_view v; auto error = x.raw_json().get(v); if(error) {return error; } return trim(v); } -inline simdjson_result to_json_string(SIMDJSON_IMPLEMENTATION::ondemand::array& x) noexcept { +inline simdjson_result to_json_string(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array& x) noexcept { std::string_view v; auto error = x.raw_json().get(v); if(error) {return error; } return trim(v); } -inline simdjson_result to_json_string(simdjson_result x) { +inline simdjson_result to_json_string(simdjson_result x) { if (x.error()) { return x.error(); } return to_json_string(x.value_unsafe()); } -inline simdjson_result to_json_string(simdjson_result x) { +inline simdjson_result to_json_string(simdjson_result x) { if (x.error()) { return x.error(); } return to_json_string(x.value_unsafe()); } -inline simdjson_result to_json_string(simdjson_result x) { +inline simdjson_result to_json_string(simdjson_result x) { if (x.error()) { return x.error(); } return to_json_string(x.value_unsafe()); } -inline simdjson_result to_json_string(simdjson_result x) { +inline simdjson_result to_json_string(simdjson_result x) { if (x.error()) { return x.error(); } return to_json_string(x.value_unsafe()); } -inline simdjson_result to_json_string(simdjson_result x) { +inline simdjson_result to_json_string(simdjson_result x) { if (x.error()) { return x.error(); } return to_json_string(x.value_unsafe()); } } // namespace simdjson -namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { namespace ondemand { +namespace simdjson { namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { #if SIMDJSON_EXCEPTIONS -inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTATION::ondemand::value x) { +inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value x) { std::string_view v; auto error = simdjson::to_json_string(x).get(v); if(error == simdjson::SUCCESS) { @@ -32543,12 +32551,12 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTA throw simdjson::simdjson_error(error); } } -inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result x) { +inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result x) { if (x.error()) { throw simdjson::simdjson_error(x.error()); } return (out << x.value()); } #else -inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTATION::ondemand::value x) { +inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value x) { std::string_view v; auto error = simdjson::to_json_string(x).get(v); if(error == simdjson::SUCCESS) { @@ -32560,7 +32568,7 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTA #endif #if SIMDJSON_EXCEPTIONS -inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTATION::ondemand::array value) { +inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array value) { std::string_view v; auto error = simdjson::to_json_string(value).get(v); if(error == simdjson::SUCCESS) { @@ -32569,12 +32577,12 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTA throw simdjson::simdjson_error(error); } } -inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result x) { +inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result x) { if (x.error()) { throw simdjson::simdjson_error(x.error()); } return (out << x.value()); } #else -inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTATION::ondemand::array value) { +inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array value) { std::string_view v; auto error = simdjson::to_json_string(value).get(v); if(error == simdjson::SUCCESS) { @@ -32586,7 +32594,7 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTA #endif #if SIMDJSON_EXCEPTIONS -inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTATION::ondemand::document& value) { +inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document& value) { std::string_view v; auto error = simdjson::to_json_string(value).get(v); if(error == simdjson::SUCCESS) { @@ -32595,7 +32603,7 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTA throw simdjson::simdjson_error(error); } } -inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTATION::ondemand::document_reference& value) { +inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document_reference& value) { std::string_view v; auto error = simdjson::to_json_string(value).get(v); if(error == simdjson::SUCCESS) { @@ -32604,16 +32612,16 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTA throw simdjson::simdjson_error(error); } } -inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result&& x) { +inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result&& x) { if (x.error()) { throw simdjson::simdjson_error(x.error()); } return (out << x.value()); } -inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result&& x) { +inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result&& x) { if (x.error()) { throw simdjson::simdjson_error(x.error()); } return (out << x.value()); } #else -inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTATION::ondemand::document& value) { +inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::document& value) { std::string_view v; auto error = simdjson::to_json_string(value).get(v); if(error == simdjson::SUCCESS) { @@ -32625,7 +32633,7 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTA #endif #if SIMDJSON_EXCEPTIONS -inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTATION::ondemand::object value) { +inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object value) { std::string_view v; auto error = simdjson::to_json_string(value).get(v); if(error == simdjson::SUCCESS) { @@ -32634,12 +32642,12 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTA throw simdjson::simdjson_error(error); } } -inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result x) { +inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result x) { if (x.error()) { throw simdjson::simdjson_error(x.error()); } return (out << x.value()); } #else -inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTATION::ondemand::object value) { +inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object value) { std::string_view v; auto error = simdjson::to_json_string(value).get(v); if(error == simdjson::SUCCESS) { @@ -32649,22 +32657,22 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::SIMDJSON_IMPLEMENTA } } #endif -}}} // namespace simdjson::SIMDJSON_IMPLEMENTATION::ondemand +}}} // namespace simdjson::SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand #endif // SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_INL_H /* end file include/simdjson/generic/ondemand/serialization-inl.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ /* begin file include/simdjson/generic/ondemand/token_iterator-inl.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/token_iterator.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { simdjson_inline token_iterator::token_iterator( @@ -32730,15 +32738,15 @@ simdjson_inline bool token_iterator::operator<=(const token_iterator &other) con } } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { -simdjson_inline simdjson_result::simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::token_iterator &&value) noexcept - : implementation_simdjson_result_base(std::forward(value)) {} -simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept - : implementation_simdjson_result_base(error) {} +simdjson_inline simdjson_result::simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::token_iterator &&value) noexcept + : implementation_simdjson_result_base(std::forward(value)) {} +simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept + : implementation_simdjson_result_base(error) {} } // namespace simdjson @@ -32747,7 +32755,7 @@ simdjson_inline simdjson_result value::at_pointer(std::string_view json_p } } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { -simdjson_inline simdjson_result::simdjson_result( - SIMDJSON_IMPLEMENTATION::ondemand::value &&value +simdjson_inline simdjson_result::simdjson_result( + SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value &&value ) noexcept : - implementation_simdjson_result_base( - std::forward(value) + implementation_simdjson_result_base( + std::forward(value) ) { } -simdjson_inline simdjson_result::simdjson_result( +simdjson_inline simdjson_result::simdjson_result( error_code error ) noexcept : - implementation_simdjson_result_base(error) + implementation_simdjson_result_base(error) { } -simdjson_inline simdjson_result simdjson_result::count_elements() & noexcept { +simdjson_inline simdjson_result simdjson_result::count_elements() & noexcept { if (error()) { return error(); } return first.count_elements(); } -simdjson_inline simdjson_result simdjson_result::count_fields() & noexcept { +simdjson_inline simdjson_result simdjson_result::count_fields() & noexcept { if (error()) { return error(); } return first.count_fields(); } -simdjson_inline simdjson_result simdjson_result::at(size_t index) noexcept { +simdjson_inline simdjson_result simdjson_result::at(size_t index) noexcept { if (error()) { return error(); } return first.at(index); } -simdjson_inline simdjson_result simdjson_result::begin() & noexcept { +simdjson_inline simdjson_result simdjson_result::begin() & noexcept { if (error()) { return error(); } return first.begin(); } -simdjson_inline simdjson_result simdjson_result::end() & noexcept { +simdjson_inline simdjson_result simdjson_result::end() & noexcept { if (error()) { return error(); } return {}; } -simdjson_inline simdjson_result simdjson_result::find_field(std::string_view key) noexcept { +simdjson_inline simdjson_result simdjson_result::find_field(std::string_view key) noexcept { if (error()) { return error(); } return first.find_field(key); } -simdjson_inline simdjson_result simdjson_result::find_field(const char *key) noexcept { +simdjson_inline simdjson_result simdjson_result::find_field(const char *key) noexcept { if (error()) { return error(); } return first.find_field(key); } -simdjson_inline simdjson_result simdjson_result::find_field_unordered(std::string_view key) noexcept { +simdjson_inline simdjson_result simdjson_result::find_field_unordered(std::string_view key) noexcept { if (error()) { return error(); } return first.find_field_unordered(key); } -simdjson_inline simdjson_result simdjson_result::find_field_unordered(const char *key) noexcept { +simdjson_inline simdjson_result simdjson_result::find_field_unordered(const char *key) noexcept { if (error()) { return error(); } return first.find_field_unordered(key); } -simdjson_inline simdjson_result simdjson_result::operator[](std::string_view key) noexcept { +simdjson_inline simdjson_result simdjson_result::operator[](std::string_view key) noexcept { if (error()) { return error(); } return first[key]; } -simdjson_inline simdjson_result simdjson_result::operator[](const char *key) noexcept { +simdjson_inline simdjson_result simdjson_result::operator[](const char *key) noexcept { if (error()) { return error(); } return first[key]; } -simdjson_inline simdjson_result simdjson_result::get_array() noexcept { +simdjson_inline simdjson_result simdjson_result::get_array() noexcept { if (error()) { return error(); } return first.get_array(); } -simdjson_inline simdjson_result simdjson_result::get_object() noexcept { +simdjson_inline simdjson_result simdjson_result::get_object() noexcept { if (error()) { return error(); } return first.get_object(); } -simdjson_inline simdjson_result simdjson_result::get_uint64() noexcept { +simdjson_inline simdjson_result simdjson_result::get_uint64() noexcept { if (error()) { return error(); } return first.get_uint64(); } -simdjson_inline simdjson_result simdjson_result::get_uint64_in_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_uint64_in_string() noexcept { if (error()) { return error(); } return first.get_uint64_in_string(); } -simdjson_inline simdjson_result simdjson_result::get_int64() noexcept { +simdjson_inline simdjson_result simdjson_result::get_int64() noexcept { if (error()) { return error(); } return first.get_int64(); } -simdjson_inline simdjson_result simdjson_result::get_int64_in_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_int64_in_string() noexcept { if (error()) { return error(); } return first.get_int64_in_string(); } -simdjson_inline simdjson_result simdjson_result::get_double() noexcept { +simdjson_inline simdjson_result simdjson_result::get_double() noexcept { if (error()) { return error(); } return first.get_double(); } -simdjson_inline simdjson_result simdjson_result::get_double_in_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_double_in_string() noexcept { if (error()) { return error(); } return first.get_double_in_string(); } -simdjson_inline simdjson_result simdjson_result::get_string(bool allow_replacement) noexcept { +simdjson_inline simdjson_result simdjson_result::get_string(bool allow_replacement) noexcept { if (error()) { return error(); } return first.get_string(allow_replacement); } -simdjson_inline simdjson_result simdjson_result::get_wobbly_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_wobbly_string() noexcept { if (error()) { return error(); } return first.get_wobbly_string(); } -simdjson_inline simdjson_result simdjson_result::get_raw_json_string() noexcept { +simdjson_inline simdjson_result simdjson_result::get_raw_json_string() noexcept { if (error()) { return error(); } return first.get_raw_json_string(); } -simdjson_inline simdjson_result simdjson_result::get_bool() noexcept { +simdjson_inline simdjson_result simdjson_result::get_bool() noexcept { if (error()) { return error(); } return first.get_bool(); } -simdjson_inline simdjson_result simdjson_result::is_null() noexcept { +simdjson_inline simdjson_result simdjson_result::is_null() noexcept { if (error()) { return error(); } return first.is_null(); } -template simdjson_inline simdjson_result simdjson_result::get() noexcept { +template simdjson_inline simdjson_result simdjson_result::get() noexcept { if (error()) { return error(); } return first.get(); } -template simdjson_inline error_code simdjson_result::get(T &out) noexcept { +template simdjson_inline error_code simdjson_result::get(T &out) noexcept { if (error()) { return error(); } return first.get(out); } -template<> simdjson_inline simdjson_result simdjson_result::get() noexcept { +template<> simdjson_inline simdjson_result simdjson_result::get() noexcept { if (error()) { return error(); } return std::move(first); } -template<> simdjson_inline error_code simdjson_result::get(SIMDJSON_IMPLEMENTATION::ondemand::value &out) noexcept { +template<> simdjson_inline error_code simdjson_result::get(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value &out) noexcept { if (error()) { return error(); } out = first; return SUCCESS; } -simdjson_inline simdjson_result simdjson_result::type() noexcept { +simdjson_inline simdjson_result simdjson_result::type() noexcept { if (error()) { return error(); } return first.type(); } -simdjson_inline simdjson_result simdjson_result::is_scalar() noexcept { +simdjson_inline simdjson_result simdjson_result::is_scalar() noexcept { if (error()) { return error(); } return first.is_scalar(); } -simdjson_inline simdjson_result simdjson_result::is_negative() noexcept { +simdjson_inline simdjson_result simdjson_result::is_negative() noexcept { if (error()) { return error(); } return first.is_negative(); } -simdjson_inline simdjson_result simdjson_result::is_integer() noexcept { +simdjson_inline simdjson_result simdjson_result::is_integer() noexcept { if (error()) { return error(); } return first.is_integer(); } -simdjson_inline simdjson_result simdjson_result::get_number_type() noexcept { +simdjson_inline simdjson_result simdjson_result::get_number_type() noexcept { if (error()) { return error(); } return first.get_number_type(); } -simdjson_inline simdjson_result simdjson_result::get_number() noexcept { +simdjson_inline simdjson_result simdjson_result::get_number() noexcept { if (error()) { return error(); } return first.get_number(); } #if SIMDJSON_EXCEPTIONS -simdjson_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::array() noexcept(false) { +simdjson_inline simdjson_result::operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::array() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::object() noexcept(false) { +simdjson_inline simdjson_result::operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::object() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator uint64_t() noexcept(false) { +simdjson_inline simdjson_result::operator uint64_t() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator int64_t() noexcept(false) { +simdjson_inline simdjson_result::operator int64_t() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator double() noexcept(false) { +simdjson_inline simdjson_result::operator double() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator std::string_view() noexcept(false) { +simdjson_inline simdjson_result::operator std::string_view() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false) { +simdjson_inline simdjson_result::operator SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::raw_json_string() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } -simdjson_inline simdjson_result::operator bool() noexcept(false) { +simdjson_inline simdjson_result::operator bool() noexcept(false) { if (error()) { throw simdjson_error(error()); } return first; } #endif -simdjson_inline simdjson_result simdjson_result::raw_json_token() noexcept { +simdjson_inline simdjson_result simdjson_result::raw_json_token() noexcept { if (error()) { return error(); } return first.raw_json_token(); } -simdjson_inline simdjson_result simdjson_result::current_location() noexcept { +simdjson_inline simdjson_result simdjson_result::current_location() noexcept { if (error()) { return error(); } return first.current_location(); } -simdjson_inline simdjson_result simdjson_result::current_depth() const noexcept { +simdjson_inline simdjson_result simdjson_result::current_depth() const noexcept { if (error()) { return error(); } return first.current_depth(); } -simdjson_inline simdjson_result simdjson_result::at_pointer(std::string_view json_pointer) noexcept { +simdjson_inline simdjson_result simdjson_result::at_pointer(std::string_view json_pointer) noexcept { if (error()) { return error(); } return first.at_pointer(json_pointer); } @@ -33188,7 +33196,7 @@ simdjson_inline simdjson_result simdjs /* begin file include/simdjson/generic/ondemand/value_iterator-inl.h for SIMDJSON_BUILTIN_IMPLEMENTATION */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_INL_H -/* amalgamation skipped (editor-only): #ifdef SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/atomparsing.h" */ @@ -33197,10 +33205,10 @@ simdjson_inline simdjson_result simdjs /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/json_type-inl.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/raw_json_string-inl.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_IN_EDITOR_IMPL */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ namespace simdjson { -namespace SIMDJSON_IMPLEMENTATION { +namespace SIMDJSON_BUILTIN_IMPLEMENTATION { namespace ondemand { simdjson_inline value_iterator::value_iterator( @@ -33785,7 +33793,7 @@ simdjson_inline simdjson_result value_iterator::is_root_integer(bool check return answer; } -simdjson_inline simdjson_result value_iterator::get_root_number_type(bool check_trailing) noexcept { +simdjson_inline simdjson_result value_iterator::get_root_number_type(bool check_trailing) noexcept { auto max_len = peek_start_length(); auto json = peek_root_scalar("number"); // Per https://www.exploringbinary.com/maximum-number-of-decimal-digits-in-binary-floating-point-numbers/, @@ -34224,15 +34232,15 @@ simdjson_inline error_code value_iterator::report_error(error_code error, const } } // namespace ondemand -} // namespace SIMDJSON_IMPLEMENTATION +} // namespace SIMDJSON_BUILTIN_IMPLEMENTATION } // namespace simdjson namespace simdjson { -simdjson_inline simdjson_result::simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::value_iterator &&value) noexcept - : implementation_simdjson_result_base(std::forward(value)) {} -simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept - : implementation_simdjson_result_base(error) {} +simdjson_inline simdjson_result::simdjson_result(SIMDJSON_BUILTIN_IMPLEMENTATION::ondemand::value_iterator &&value) noexcept + : implementation_simdjson_result_base(std::forward(value)) {} +simdjson_inline simdjson_result::simdjson_result(error_code error) noexcept + : implementation_simdjson_result_base(error) {} } // namespace simdjson @@ -34244,11 +34252,11 @@ simdjson_inline simdjson_result