From ae9ba2bed26c58fad70c02d8436178953f9d8cb1 Mon Sep 17 00:00:00 2001 From: John Keiser Date: Thu, 20 Jul 2023 11:43:19 -0700 Subject: [PATCH] Rename SIMDJSON_AMALGAMATED to SIMDJSON_CONDITIONAL_INCLUDE --- include/simdjson/arm64/base.h | 4 +- include/simdjson/arm64/bitmanipulation.h | 4 +- include/simdjson/arm64/bitmask.h | 4 +- include/simdjson/arm64/end.h | 4 +- include/simdjson/arm64/implementation.h | 4 +- include/simdjson/arm64/intrinsics.h | 4 +- include/simdjson/arm64/numberparsing_defs.h | 4 +- include/simdjson/arm64/simd.h | 4 +- include/simdjson/arm64/stringparsing_defs.h | 4 +- include/simdjson/builtin.h | 4 +- include/simdjson/builtin/implementation.h | 4 +- include/simdjson/builtin/ondemand.h | 4 +- include/simdjson/fallback/base.h | 4 +- include/simdjson/fallback/bitmanipulation.h | 4 +- include/simdjson/fallback/end.h | 4 +- include/simdjson/fallback/implementation.h | 4 +- .../simdjson/fallback/numberparsing_defs.h | 4 +- .../simdjson/fallback/stringparsing_defs.h | 4 +- include/simdjson/generic/amalgamated.h | 2 +- include/simdjson/generic/atomparsing.h | 4 +- include/simdjson/generic/base.h | 4 +- include/simdjson/generic/dependencies.h | 4 +- .../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 | 2 +- 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/dependencies.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/haswell/bitmanipulation.h | 4 +- include/simdjson/haswell/bitmask.h | 4 +- include/simdjson/haswell/end.h | 4 +- include/simdjson/haswell/implementation.h | 4 +- include/simdjson/haswell/intrinsics.h | 4 +- include/simdjson/haswell/numberparsing_defs.h | 8 +- include/simdjson/haswell/simd.h | 4 +- include/simdjson/haswell/stringparsing_defs.h | 4 +- include/simdjson/icelake/base.h | 4 +- include/simdjson/icelake/bitmanipulation.h | 4 +- include/simdjson/icelake/bitmask.h | 4 +- include/simdjson/icelake/end.h | 4 +- include/simdjson/icelake/implementation.h | 4 +- include/simdjson/icelake/intrinsics.h | 4 +- include/simdjson/icelake/numberparsing_defs.h | 4 +- include/simdjson/icelake/simd.h | 4 +- include/simdjson/icelake/stringparsing_defs.h | 4 +- include/simdjson/ppc64/base.h | 4 +- include/simdjson/ppc64/bitmanipulation.h | 4 +- include/simdjson/ppc64/bitmask.h | 4 +- include/simdjson/ppc64/end.h | 4 +- include/simdjson/ppc64/implementation.h | 4 +- include/simdjson/ppc64/intrinsics.h | 4 +- include/simdjson/ppc64/numberparsing_defs.h | 4 +- include/simdjson/ppc64/simd.h | 4 +- include/simdjson/ppc64/stringparsing_defs.h | 4 +- include/simdjson/westmere/base.h | 4 +- include/simdjson/westmere/bitmanipulation.h | 4 +- include/simdjson/westmere/bitmask.h | 4 +- include/simdjson/westmere/end.h | 4 +- include/simdjson/westmere/implementation.h | 4 +- include/simdjson/westmere/intrinsics.h | 4 +- .../simdjson/westmere/numberparsing_defs.h | 4 +- include/simdjson/westmere/simd.h | 4 +- singleheader/amalgamate.py | 102 +- singleheader/simdjson.cpp | 10 +- singleheader/simdjson.h | 1434 ++++++++--------- src/arm64.cpp | 4 +- src/fallback.cpp | 4 +- src/generic/amalgamated.h | 2 +- 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/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/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/implementation.cpp | 4 +- src/ppc64.cpp | 4 +- src/simdjson.cpp | 4 +- src/westmere.cpp | 4 +- 129 files changed, 1015 insertions(+), 1033 deletions(-) diff --git a/include/simdjson/arm64/base.h b/include/simdjson/arm64/base.h index 0b657a06f..8f23d18d8 100644 --- a/include/simdjson/arm64/base.h +++ b/include/simdjson/arm64/base.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_ARM64_BASE_H #define SIMDJSON_ARM64_BASE_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { /** diff --git a/include/simdjson/arm64/bitmanipulation.h b/include/simdjson/arm64/bitmanipulation.h index 916ca4951..019869b1b 100644 --- a/include/simdjson/arm64/bitmanipulation.h +++ b/include/simdjson/arm64/bitmanipulation.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_ARM64_BITMANIPULATION_H #define SIMDJSON_ARM64_BITMANIPULATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/arm64/base.h" #include "simdjson/arm64/intrinsics.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace arm64 { diff --git a/include/simdjson/arm64/bitmask.h b/include/simdjson/arm64/bitmask.h index 5e3a7dbda..5d6121bcc 100644 --- a/include/simdjson/arm64/bitmask.h +++ b/include/simdjson/arm64/bitmask.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_ARM64_BITMASK_H #define SIMDJSON_ARM64_BITMASK_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/arm64/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace arm64 { diff --git a/include/simdjson/arm64/end.h b/include/simdjson/arm64/end.h index 5cd33cbfc..d797a3f5f 100644 --- a/include/simdjson/arm64/end.h +++ b/include/simdjson/arm64/end.h @@ -1,5 +1,5 @@ -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/arm64/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #undef SIMDJSON_IMPLEMENTATION diff --git a/include/simdjson/arm64/implementation.h b/include/simdjson/arm64/implementation.h index d055358d2..c9b7dd753 100644 --- a/include/simdjson/arm64/implementation.h +++ b/include/simdjson/arm64/implementation.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_ARM64_IMPLEMENTATION_H #define SIMDJSON_ARM64_IMPLEMENTATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/base.h" #include "simdjson/implementation.h" #include "simdjson/internal/instruction_set.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace arm64 { diff --git a/include/simdjson/arm64/intrinsics.h b/include/simdjson/arm64/intrinsics.h index 5ea8372d3..049d99861 100644 --- a/include/simdjson/arm64/intrinsics.h +++ b/include/simdjson/arm64/intrinsics.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_ARM64_INTRINSICS_H #define SIMDJSON_ARM64_INTRINSICS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/arm64/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE // This should be the correct header whether // you use visual studio or other compilers. diff --git a/include/simdjson/arm64/numberparsing_defs.h b/include/simdjson/arm64/numberparsing_defs.h index eec90987f..61a8c9b28 100644 --- a/include/simdjson/arm64/numberparsing_defs.h +++ b/include/simdjson/arm64/numberparsing_defs.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_ARM64_NUMBERPARSING_DEFS_H #define SIMDJSON_ARM64_NUMBERPARSING_DEFS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/arm64/base.h" #include "simdjson/arm64/intrinsics.h" #include "simdjson/internal/numberparsing_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include diff --git a/include/simdjson/arm64/simd.h b/include/simdjson/arm64/simd.h index 153a55502..5bbdf7f4f 100644 --- a/include/simdjson/arm64/simd.h +++ b/include/simdjson/arm64/simd.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_ARM64_SIMD_H #define SIMDJSON_ARM64_SIMD_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/arm64/base.h" #include "simdjson/arm64/bitmanipulation.h" #include "simdjson/internal/simdprune_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace arm64 { diff --git a/include/simdjson/arm64/stringparsing_defs.h b/include/simdjson/arm64/stringparsing_defs.h index 0c4d55584..30d02faff 100644 --- a/include/simdjson/arm64/stringparsing_defs.h +++ b/include/simdjson/arm64/stringparsing_defs.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_ARM64_STRINGPARSING_DEFS_H #define SIMDJSON_ARM64_STRINGPARSING_DEFS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/arm64/base.h" #include "simdjson/arm64/simd.h" #include "simdjson/arm64/bitmanipulation.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace arm64 { diff --git a/include/simdjson/builtin.h b/include/simdjson/builtin.h index f60f0bd5b..9d15d9834 100644 --- a/include/simdjson/builtin.h +++ b/include/simdjson/builtin.h @@ -6,7 +6,7 @@ #include "simdjson/generic/dependencies.h" -#define SIMDJSON_AMALGAMATED +#define SIMDJSON_CONDITIONAL_INCLUDE #if SIMDJSON_BUILTIN_IMPLEMENTATION_IS(arm64) #include "simdjson/arm64.h" @@ -24,6 +24,6 @@ #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION #endif -#undef SIMDJSON_AMALGAMATED +#undef SIMDJSON_CONDITIONAL_INCLUDE #endif // SIMDJSON_BUILTIN_H diff --git a/include/simdjson/builtin/implementation.h b/include/simdjson/builtin/implementation.h index e028ba8c9..5df5b1ad0 100644 --- a/include/simdjson/builtin/implementation.h +++ b/include/simdjson/builtin/implementation.h @@ -5,7 +5,7 @@ #include "simdjson/generic/dependencies.h" -#define SIMDJSON_AMALGAMATED +#define SIMDJSON_CONDITIONAL_INCLUDE #if SIMDJSON_BUILTIN_IMPLEMENTATION_IS(arm64) #include "simdjson/arm64/implementation.h" @@ -23,7 +23,7 @@ #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION #endif -#undef SIMDJSON_AMALGAMATED +#undef SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { /** diff --git a/include/simdjson/builtin/ondemand.h b/include/simdjson/builtin/ondemand.h index 80bccf48f..6be128466 100644 --- a/include/simdjson/builtin/ondemand.h +++ b/include/simdjson/builtin/ondemand.h @@ -6,7 +6,7 @@ #include "simdjson/generic/ondemand/dependencies.h" -#define SIMDJSON_AMALGAMATED +#define SIMDJSON_CONDITIONAL_INCLUDE #if SIMDJSON_BUILTIN_IMPLEMENTATION_IS(arm64) #include "simdjson/arm64/ondemand.h" @@ -24,7 +24,7 @@ #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION #endif -#undef SIMDJSON_AMALGAMATED +#undef SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { /** diff --git a/include/simdjson/fallback/base.h b/include/simdjson/fallback/base.h index 8afb9463e..99cb37423 100644 --- a/include/simdjson/fallback/base.h +++ b/include/simdjson/fallback/base.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_FALLBACK_BASE_H #define SIMDJSON_FALLBACK_BASE_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { /** diff --git a/include/simdjson/fallback/bitmanipulation.h b/include/simdjson/fallback/bitmanipulation.h index e765d9140..ba47dcccf 100644 --- a/include/simdjson/fallback/bitmanipulation.h +++ b/include/simdjson/fallback/bitmanipulation.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_FALLBACK_BITMANIPULATION_H #define SIMDJSON_FALLBACK_BITMANIPULATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/fallback/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace fallback { diff --git a/include/simdjson/fallback/end.h b/include/simdjson/fallback/end.h index ed8eef30a..fbd14132b 100644 --- a/include/simdjson/fallback/end.h +++ b/include/simdjson/fallback/end.h @@ -1,5 +1,5 @@ -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/fallback/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #undef SIMDJSON_IMPLEMENTATION diff --git a/include/simdjson/fallback/implementation.h b/include/simdjson/fallback/implementation.h index 105f65f8b..523f06d2e 100644 --- a/include/simdjson/fallback/implementation.h +++ b/include/simdjson/fallback/implementation.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_FALLBACK_IMPLEMENTATION_H #define SIMDJSON_FALLBACK_IMPLEMENTATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/fallback/base.h" #include "simdjson/implementation.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace fallback { diff --git a/include/simdjson/fallback/numberparsing_defs.h b/include/simdjson/fallback/numberparsing_defs.h index 5abd439e0..dfa0e6b98 100644 --- a/include/simdjson/fallback/numberparsing_defs.h +++ b/include/simdjson/fallback/numberparsing_defs.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_FALLBACK_NUMBERPARSING_DEFS_H #define SIMDJSON_FALLBACK_NUMBERPARSING_DEFS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/fallback/base.h" #include "simdjson/internal/numberparsing_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include diff --git a/include/simdjson/fallback/stringparsing_defs.h b/include/simdjson/fallback/stringparsing_defs.h index 7a8824f1a..64f23c4b0 100644 --- a/include/simdjson/fallback/stringparsing_defs.h +++ b/include/simdjson/fallback/stringparsing_defs.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_FALLBACK_STRINGPARSING_DEFS_H #define SIMDJSON_FALLBACK_STRINGPARSING_DEFS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/fallback/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace fallback { diff --git a/include/simdjson/generic/amalgamated.h b/include/simdjson/generic/amalgamated.h index 4c4ff98f4..4b235fa9f 100644 --- a/include/simdjson/generic/amalgamated.h +++ b/include/simdjson/generic/amalgamated.h @@ -1,4 +1,4 @@ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) #error simdjson/generic/dependencies.h must be included before simdjson/generic/amalgamated.h! #endif diff --git a/include/simdjson/generic/atomparsing.h b/include/simdjson/generic/atomparsing.h index 1c26fdc77..2eeb7b81a 100644 --- a/include/simdjson/generic/atomparsing.h +++ b/include/simdjson/generic/atomparsing.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_ATOMPARSING_H #include "simdjson/generic/base.h" #include "simdjson/generic/jsoncharutils.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include diff --git a/include/simdjson/generic/base.h b/include/simdjson/generic/base.h index baa36aed2..c7ba6ad56 100644 --- a/include/simdjson/generic/base.h +++ b/include/simdjson/generic/base.h @@ -1,6 +1,6 @@ #ifndef SIMDJSON_GENERIC_BASE_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_BASE_H #include "simdjson/base.h" // If we haven't got an implementation yet, we're in the editor, editing a generic file! Just @@ -23,7 +23,7 @@ #error "All possible implementations (including fallback) have been disabled! simdjson will not run." #endif #endif // SIMDJSON_IMPLEMENTATION -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/dependencies.h b/include/simdjson/generic/dependencies.h index a36241809..28d9749f2 100644 --- a/include/simdjson/generic/dependencies.h +++ b/include/simdjson/generic/dependencies.h @@ -1,5 +1,5 @@ -#ifdef SIMDJSON_AMALGAMATED -#error simdjson/generic/dependencies.h must be included before defining SIMDJSON_AMALGAMATED! +#ifdef SIMDJSON_CONDITIONAL_INCLUDE +#error simdjson/generic/dependencies.h must be included before defining SIMDJSON_CONDITIONAL_INCLUDE! #endif #ifndef SIMDJSON_GENERIC_DEPENDENCIES_H diff --git a/include/simdjson/generic/dom_parser_implementation.h b/include/simdjson/generic/dom_parser_implementation.h index 7841cb0d0..e51d2c127 100644 --- a/include/simdjson/generic/dom_parser_implementation.h +++ b/include/simdjson/generic/dom_parser_implementation.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H #include "simdjson/generic/base.h" #include "simdjson/internal/dom_parser_implementation.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE 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 1dce1cb8b..4990ad7ea 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H #include "simdjson/generic/base.h" #include "simdjson/generic/implementation_simdjson_result_base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE 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 14ff77d7c..aaf2bce12 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H #include "simdjson/generic/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/jsoncharutils.h b/include/simdjson/generic/jsoncharutils.h index 6748a8b69..a79b1f850 100644 --- a/include/simdjson/generic/jsoncharutils.h +++ b/include/simdjson/generic/jsoncharutils.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_JSONCHARUTILS_H #include "simdjson/generic/base.h" #include "simdjson/internal/jsoncharutils_tables.h" #include "simdjson/internal/numberparsing_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/numberparsing.h b/include/simdjson/generic/numberparsing.h index a5db4d93e..48db21731 100644 --- a/include/simdjson/generic/numberparsing.h +++ b/include/simdjson/generic/numberparsing.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_NUMBERPARSING_H #include "simdjson/generic/base.h" #include "simdjson/generic/jsoncharutils.h" #include "simdjson/internal/numberparsing_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include #include diff --git a/include/simdjson/generic/ondemand/amalgamated.h b/include/simdjson/generic/ondemand/amalgamated.h index 426a0d353..d53e7316d 100644 --- a/include/simdjson/generic/ondemand/amalgamated.h +++ b/include/simdjson/generic/ondemand/amalgamated.h @@ -1,4 +1,4 @@ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) #error simdjson/generic/ondemand/dependencies.h must be included before simdjson/generic/ondemand/amalgamated.h! #endif diff --git a/include/simdjson/generic/ondemand/array-inl.h b/include/simdjson/generic/ondemand/array-inl.h index 1d4109b03..7e696e62d 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/array.h b/include/simdjson/generic/ondemand/array.h index 29f19d3bf..38f3fe536 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE 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 aadc6a04a..6e4ba8140 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/array_iterator.h b/include/simdjson/generic/ondemand/array_iterator.h index e34d3dc4b..0957be9c7 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { diff --git a/include/simdjson/generic/ondemand/base.h b/include/simdjson/generic/ondemand/base.h index 1938cfc41..89bd0c01b 100644 --- a/include/simdjson/generic/ondemand/base.h +++ b/include/simdjson/generic/ondemand/base.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_BASE_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_ONDEMAND_BASE_H #include "simdjson/generic/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/dependencies.h b/include/simdjson/generic/ondemand/dependencies.h index 2fb0787dc..7fd9da72e 100644 --- a/include/simdjson/generic/ondemand/dependencies.h +++ b/include/simdjson/generic/ondemand/dependencies.h @@ -1,5 +1,5 @@ -#ifdef SIMDJSON_AMALGAMATED -#error simdjson/generic/ondemand/dependencies.h must be included before defining SIMDJSON_AMALGAMATED! +#ifdef SIMDJSON_CONDITIONAL_INCLUDE +#error simdjson/generic/ondemand/dependencies.h must be included before defining SIMDJSON_CONDITIONAL_INCLUDE! #endif #ifndef SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H diff --git a/include/simdjson/generic/ondemand/document-inl.h b/include/simdjson/generic/ondemand/document-inl.h index 87f92ff20..e8c222864 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/document.h b/include/simdjson/generic/ondemand/document.h index f997dadb7..caa14e65e 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/ondemand/json_iterator.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE 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 3376243e4..7f0cc57ff 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include #include diff --git a/include/simdjson/generic/ondemand/document_stream.h b/include/simdjson/generic/ondemand/document_stream.h index 1831310ae..fa2b1a663 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #ifdef SIMDJSON_THREADS_ENABLED #include diff --git a/include/simdjson/generic/ondemand/field-inl.h b/include/simdjson/generic/ondemand/field-inl.h index 256fc4711..c7d189ce1 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/field.h b/include/simdjson/generic/ondemand/field.h index 8d7cce17a..2be04fee8 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE 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 26f122a39..84db89077 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_INL_H #include "simdjson/internal/dom_parser_implementation.h" #include "simdjson/generic/ondemand/base.h" @@ -10,7 +10,7 @@ #include "simdjson/generic/ondemand/logger-inl.h" #include "simdjson/generic/ondemand/parser-inl.h" #include "simdjson/generic/ondemand/token_iterator-inl.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/json_iterator.h b/include/simdjson/generic/ondemand/json_iterator.h index 8264ab8bb..eee53a88d 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE 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 c49f3080f..4ef04c18e 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/json_type.h b/include/simdjson/generic/ondemand/json_type.h index d02a46e0a..d0cde165c 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/logger-inl.h b/include/simdjson/generic/ondemand/logger-inl.h index a0ad4b893..268fb2d1b 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include #include diff --git a/include/simdjson/generic/ondemand/logger.h b/include/simdjson/generic/ondemand/logger.h index e728ae52c..7696600f9 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_ONDEMAND_LOGGER_H #include "simdjson/generic/ondemand/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/object-inl.h b/include/simdjson/generic/ondemand/object-inl.h index f0e2ba2db..64d141c08 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/object.h b/include/simdjson/generic/ondemand/object.h index 4cf7603d2..fbdfd0cc7 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE 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 f845e6124..36294ce71 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/object_iterator.h b/include/simdjson/generic/ondemand/object_iterator.h index e1a434156..1cdc3f43b 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/parser-inl.h b/include/simdjson/generic/ondemand/parser-inl.h index 667122242..8d68b060d 100644 --- a/include/simdjson/generic/ondemand/parser-inl.h +++ b/include/simdjson/generic/ondemand/parser-inl.h @@ -1,6 +1,6 @@ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H #include "simdjson/padded_string.h" #include "simdjson/padded_string_view.h" @@ -11,7 +11,7 @@ #include "simdjson/generic/ondemand/document_stream.h" #include "simdjson/generic/ondemand/parser.h" #include "simdjson/generic/ondemand/raw_json_string.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/parser.h b/include/simdjson/generic/ondemand/parser.h index 316306700..fca6005bc 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_ONDEMAND_PARSER_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/implementation_simdjson_result_base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include diff --git a/include/simdjson/generic/ondemand/raw_json_string-inl.h b/include/simdjson/generic/ondemand/raw_json_string-inl.h index ab83c151b..5b814dd80 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { diff --git a/include/simdjson/generic/ondemand/raw_json_string.h b/include/simdjson/generic/ondemand/raw_json_string.h index e71bd4f71..be50a402d 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/implementation_simdjson_result_base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/serialization-inl.h b/include/simdjson/generic/ondemand/serialization-inl.h index 80b81e3f9..77be39a11 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { diff --git a/include/simdjson/generic/ondemand/serialization.h b/include/simdjson/generic/ondemand/serialization.h index 4f75a6733..048c73cda 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_H #include "simdjson/generic/ondemand/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { /** diff --git a/include/simdjson/generic/ondemand/token_iterator-inl.h b/include/simdjson/generic/ondemand/token_iterator-inl.h index e905942f6..2b9e65876 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/token_iterator.h b/include/simdjson/generic/ondemand/token_iterator.h index 1a7c594cc..968281f2f 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/value-inl.h b/include/simdjson/generic/ondemand/value-inl.h index 4fce1fadb..d21f5ccd4 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/value.h b/include/simdjson/generic/ondemand/value.h index 8ca5ecb51..e2b5591e0 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE 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 e282de1ec..9929c3a89 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #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_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/generic/ondemand/value_iterator.h b/include/simdjson/generic/ondemand/value_iterator.h index 29826bd3d..909dcd2da 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 -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_H #include "simdjson/generic/ondemand/base.h" #include "simdjson/generic/implementation_simdjson_result_base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/include/simdjson/haswell/base.h b/include/simdjson/haswell/base.h index b8315d189..73cc3ef1b 100644 --- a/include/simdjson/haswell/base.h +++ b/include/simdjson/haswell/base.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_HASWELL_BASE_H #define SIMDJSON_HASWELL_BASE_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_HASWELL namespace simdjson { diff --git a/include/simdjson/haswell/bitmanipulation.h b/include/simdjson/haswell/bitmanipulation.h index f4992be4d..0cd168664 100644 --- a/include/simdjson/haswell/bitmanipulation.h +++ b/include/simdjson/haswell/bitmanipulation.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_HASWELL_BITMANIPULATION_H #define SIMDJSON_HASWELL_BITMANIPULATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/haswell/base.h" #include "simdjson/haswell/intrinsics.h" #include "simdjson/haswell/bitmask.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace haswell { diff --git a/include/simdjson/haswell/bitmask.h b/include/simdjson/haswell/bitmask.h index 97f545110..310c3280b 100644 --- a/include/simdjson/haswell/bitmask.h +++ b/include/simdjson/haswell/bitmask.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_HASWELL_BITMASK_H #define SIMDJSON_HASWELL_BITMASK_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/haswell/base.h" #include "simdjson/haswell/intrinsics.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace haswell { diff --git a/include/simdjson/haswell/end.h b/include/simdjson/haswell/end.h index e5bdfdce2..421df3653 100644 --- a/include/simdjson/haswell/end.h +++ b/include/simdjson/haswell/end.h @@ -1,6 +1,6 @@ -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/haswell/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #if !SIMDJSON_CAN_ALWAYS_RUN_HASWELL SIMDJSON_UNTARGET_REGION diff --git a/include/simdjson/haswell/implementation.h b/include/simdjson/haswell/implementation.h index 8f63e05eb..6861e4298 100644 --- a/include/simdjson/haswell/implementation.h +++ b/include/simdjson/haswell/implementation.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_HASWELL_IMPLEMENTATION_H #define SIMDJSON_HASWELL_IMPLEMENTATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/haswell/base.h" #include "simdjson/implementation.h" #include "simdjson/internal/instruction_set.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_HASWELL namespace simdjson { diff --git a/include/simdjson/haswell/intrinsics.h b/include/simdjson/haswell/intrinsics.h index f761713cd..a4593dbb6 100644 --- a/include/simdjson/haswell/intrinsics.h +++ b/include/simdjson/haswell/intrinsics.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_HASWELL_INTRINSICS_H #define SIMDJSON_HASWELL_INTRINSICS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/haswell/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #if SIMDJSON_VISUAL_STUDIO // under clang within visual studio, this will include diff --git a/include/simdjson/haswell/numberparsing_defs.h b/include/simdjson/haswell/numberparsing_defs.h index ddeb47348..a4406a202 100644 --- a/include/simdjson/haswell/numberparsing_defs.h +++ b/include/simdjson/haswell/numberparsing_defs.h @@ -1,14 +1,14 @@ #ifndef SIMDJSON_HASWELL_NUMBERPARSING_DEFS_H #define SIMDJSON_HASWELL_NUMBERPARSING_DEFS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/haswell/base.h" #include "simdjson/haswell/intrinsics.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/internal/numberparsing_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace haswell { diff --git a/include/simdjson/haswell/simd.h b/include/simdjson/haswell/simd.h index 5d14a86e8..b0cdb9f0e 100644 --- a/include/simdjson/haswell/simd.h +++ b/include/simdjson/haswell/simd.h @@ -1,12 +1,12 @@ #ifndef SIMDJSON_HASWELL_SIMD_H #define SIMDJSON_HASWELL_SIMD_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/haswell/base.h" #include "simdjson/haswell/intrinsics.h" #include "simdjson/haswell/bitmanipulation.h" #include "simdjson/internal/simdprune_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace haswell { diff --git a/include/simdjson/haswell/stringparsing_defs.h b/include/simdjson/haswell/stringparsing_defs.h index 2004f58a9..f896a10e2 100644 --- a/include/simdjson/haswell/stringparsing_defs.h +++ b/include/simdjson/haswell/stringparsing_defs.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_HASWELL_STRINGPARSING_DEFS_H #define SIMDJSON_HASWELL_STRINGPARSING_DEFS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/haswell/base.h" #include "simdjson/haswell/simd.h" #include "simdjson/haswell/bitmanipulation.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace haswell { diff --git a/include/simdjson/icelake/base.h b/include/simdjson/icelake/base.h index 79fbba1f3..f44c0d32a 100644 --- a/include/simdjson/icelake/base.h +++ b/include/simdjson/icelake/base.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_ICELAKE_BASE_H #define SIMDJSON_ICELAKE_BASE_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_ICELAKE namespace simdjson { diff --git a/include/simdjson/icelake/bitmanipulation.h b/include/simdjson/icelake/bitmanipulation.h index e9b09250b..5bcf71160 100644 --- a/include/simdjson/icelake/bitmanipulation.h +++ b/include/simdjson/icelake/bitmanipulation.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_ICELAKE_BITMANIPULATION_H #define SIMDJSON_ICELAKE_BITMANIPULATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/icelake/base.h" #include "simdjson/icelake/intrinsics.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace icelake { diff --git a/include/simdjson/icelake/bitmask.h b/include/simdjson/icelake/bitmask.h index 4c03b2d3c..ed55962fa 100644 --- a/include/simdjson/icelake/bitmask.h +++ b/include/simdjson/icelake/bitmask.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_ICELAKE_BITMASK_H #define SIMDJSON_ICELAKE_BITMASK_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/icelake/base.h" #include "simdjson/icelake/intrinsics.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace icelake { diff --git a/include/simdjson/icelake/end.h b/include/simdjson/icelake/end.h index 80f0cf243..2accd5fb0 100644 --- a/include/simdjson/icelake/end.h +++ b/include/simdjson/icelake/end.h @@ -1,6 +1,6 @@ -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/icelake/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #if !SIMDJSON_CAN_ALWAYS_RUN_ICELAKE SIMDJSON_UNTARGET_REGION diff --git a/include/simdjson/icelake/implementation.h b/include/simdjson/icelake/implementation.h index 40cd02ad5..940c5f992 100644 --- a/include/simdjson/icelake/implementation.h +++ b/include/simdjson/icelake/implementation.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_ICELAKE_IMPLEMENTATION_H #define SIMDJSON_ICELAKE_IMPLEMENTATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/icelake/base.h" #include "simdjson/implementation.h" #include "simdjson/internal/instruction_set.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_ICELAKE namespace simdjson { diff --git a/include/simdjson/icelake/intrinsics.h b/include/simdjson/icelake/intrinsics.h index b2261f037..4c68c290c 100644 --- a/include/simdjson/icelake/intrinsics.h +++ b/include/simdjson/icelake/intrinsics.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_ICELAKE_INTRINSICS_H #define SIMDJSON_ICELAKE_INTRINSICS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/icelake/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #if SIMDJSON_VISUAL_STUDIO // under clang within visual studio, this will include diff --git a/include/simdjson/icelake/numberparsing_defs.h b/include/simdjson/icelake/numberparsing_defs.h index 3a18186ba..bdc9298d1 100644 --- a/include/simdjson/icelake/numberparsing_defs.h +++ b/include/simdjson/icelake/numberparsing_defs.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_ICELAKE_NUMBERPARSING_DEFS_H #define SIMDJSON_ICELAKE_NUMBERPARSING_DEFS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/icelake/base.h" #include "simdjson/icelake/intrinsics.h" #include "simdjson/internal/numberparsing_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace icelake { diff --git a/include/simdjson/icelake/simd.h b/include/simdjson/icelake/simd.h index 543e6ade0..2f280bf90 100644 --- a/include/simdjson/icelake/simd.h +++ b/include/simdjson/icelake/simd.h @@ -1,12 +1,12 @@ #ifndef SIMDJSON_ICELAKE_SIMD_H #define SIMDJSON_ICELAKE_SIMD_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/icelake/base.h" #include "simdjson/icelake/intrinsics.h" #include "simdjson/icelake/bitmanipulation.h" #include "simdjson/internal/simdprune_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #if defined(__GNUC__) && !defined(__clang__) #if __GNUC__ == 8 diff --git a/include/simdjson/icelake/stringparsing_defs.h b/include/simdjson/icelake/stringparsing_defs.h index 833d3ea7f..c9f1dd70e 100644 --- a/include/simdjson/icelake/stringparsing_defs.h +++ b/include/simdjson/icelake/stringparsing_defs.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_ICELAKE_STRINGPARSING_DEFS_H #define SIMDJSON_ICELAKE_STRINGPARSING_DEFS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/icelake/base.h" #include "simdjson/icelake/simd.h" #include "simdjson/icelake/bitmanipulation.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace icelake { diff --git a/include/simdjson/ppc64/base.h b/include/simdjson/ppc64/base.h index 91c82e16c..6e460dfb8 100644 --- a/include/simdjson/ppc64/base.h +++ b/include/simdjson/ppc64/base.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_PPC64_BASE_H #define SIMDJSON_PPC64_BASE_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { /** diff --git a/include/simdjson/ppc64/bitmanipulation.h b/include/simdjson/ppc64/bitmanipulation.h index decf49b6b..d8cf1b9c5 100644 --- a/include/simdjson/ppc64/bitmanipulation.h +++ b/include/simdjson/ppc64/bitmanipulation.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_PPC64_BITMANIPULATION_H #define SIMDJSON_PPC64_BITMANIPULATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/ppc64/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace ppc64 { diff --git a/include/simdjson/ppc64/bitmask.h b/include/simdjson/ppc64/bitmask.h index b122a6721..14a761d88 100644 --- a/include/simdjson/ppc64/bitmask.h +++ b/include/simdjson/ppc64/bitmask.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_PPC64_BITMASK_H #define SIMDJSON_PPC64_BITMASK_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/ppc64/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace ppc64 { diff --git a/include/simdjson/ppc64/end.h b/include/simdjson/ppc64/end.h index 630c9f12b..d6ad657e0 100644 --- a/include/simdjson/ppc64/end.h +++ b/include/simdjson/ppc64/end.h @@ -1,5 +1,5 @@ -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/ppc64/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #undef SIMDJSON_IMPLEMENTATION diff --git a/include/simdjson/ppc64/implementation.h b/include/simdjson/ppc64/implementation.h index be2d25cb5..33436f534 100644 --- a/include/simdjson/ppc64/implementation.h +++ b/include/simdjson/ppc64/implementation.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_PPC64_IMPLEMENTATION_H #define SIMDJSON_PPC64_IMPLEMENTATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/ppc64/base.h" #include "simdjson/implementation.h" #include "simdjson/internal/instruction_set.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { diff --git a/include/simdjson/ppc64/intrinsics.h b/include/simdjson/ppc64/intrinsics.h index f94168129..e856489fd 100644 --- a/include/simdjson/ppc64/intrinsics.h +++ b/include/simdjson/ppc64/intrinsics.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_PPC64_INTRINSICS_H #define SIMDJSON_PPC64_INTRINSICS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/ppc64/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE // This should be the correct header whether // you use visual studio or other compilers. diff --git a/include/simdjson/ppc64/numberparsing_defs.h b/include/simdjson/ppc64/numberparsing_defs.h index 77d4395d5..cb39c8e61 100644 --- a/include/simdjson/ppc64/numberparsing_defs.h +++ b/include/simdjson/ppc64/numberparsing_defs.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_PPC64_NUMBERPARSING_DEFS_H #define SIMDJSON_PPC64_NUMBERPARSING_DEFS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/ppc64/base.h" #include "simdjson/ppc64/intrinsics.h" #include "simdjson/internal/numberparsing_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include diff --git a/include/simdjson/ppc64/simd.h b/include/simdjson/ppc64/simd.h index f018edb62..ae7d7c4d5 100644 --- a/include/simdjson/ppc64/simd.h +++ b/include/simdjson/ppc64/simd.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_PPC64_SIMD_H #define SIMDJSON_PPC64_SIMD_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/ppc64/base.h" #include "simdjson/ppc64/bitmanipulation.h" #include "simdjson/internal/simdprune_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include diff --git a/include/simdjson/ppc64/stringparsing_defs.h b/include/simdjson/ppc64/stringparsing_defs.h index 77c45aee9..82e442435 100644 --- a/include/simdjson/ppc64/stringparsing_defs.h +++ b/include/simdjson/ppc64/stringparsing_defs.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_PPC64_STRINGPARSING_DEFS_H #define SIMDJSON_PPC64_STRINGPARSING_DEFS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/ppc64/base.h" #include "simdjson/ppc64/bitmanipulation.h" #include "simdjson/ppc64/simd.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace ppc64 { diff --git a/include/simdjson/westmere/base.h b/include/simdjson/westmere/base.h index b610d164a..82ad333a8 100644 --- a/include/simdjson/westmere/base.h +++ b/include/simdjson/westmere/base.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_WESTMERE_BASE_H #define SIMDJSON_WESTMERE_BASE_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_WESTMERE namespace simdjson { diff --git a/include/simdjson/westmere/bitmanipulation.h b/include/simdjson/westmere/bitmanipulation.h index 9062a6c9d..89be7fb62 100644 --- a/include/simdjson/westmere/bitmanipulation.h +++ b/include/simdjson/westmere/bitmanipulation.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_WESTMERE_BITMANIPULATION_H #define SIMDJSON_WESTMERE_BITMANIPULATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/westmere/base.h" #include "simdjson/westmere/intrinsics.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace westmere { diff --git a/include/simdjson/westmere/bitmask.h b/include/simdjson/westmere/bitmask.h index dac28111a..cd79b7241 100644 --- a/include/simdjson/westmere/bitmask.h +++ b/include/simdjson/westmere/bitmask.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_WESTMERE_BITMASK_H #define SIMDJSON_WESTMERE_BITMASK_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/westmere/base.h" #include "simdjson/westmere/intrinsics.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace westmere { diff --git a/include/simdjson/westmere/end.h b/include/simdjson/westmere/end.h index 766c52f0c..bd4a94049 100644 --- a/include/simdjson/westmere/end.h +++ b/include/simdjson/westmere/end.h @@ -1,6 +1,6 @@ -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/westmere/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #if !SIMDJSON_CAN_ALWAYS_RUN_WESTMERE SIMDJSON_UNTARGET_REGION diff --git a/include/simdjson/westmere/implementation.h b/include/simdjson/westmere/implementation.h index 80f5ef6bd..37392be2a 100644 --- a/include/simdjson/westmere/implementation.h +++ b/include/simdjson/westmere/implementation.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_WESTMERE_IMPLEMENTATION_H #define SIMDJSON_WESTMERE_IMPLEMENTATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/westmere/base.h" #include "simdjson/implementation.h" #include "simdjson/internal/instruction_set.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_WESTMERE namespace simdjson { diff --git a/include/simdjson/westmere/intrinsics.h b/include/simdjson/westmere/intrinsics.h index e66eaa699..63a351c80 100644 --- a/include/simdjson/westmere/intrinsics.h +++ b/include/simdjson/westmere/intrinsics.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_WESTMERE_INTRINSICS_H #define SIMDJSON_WESTMERE_INTRINSICS_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/westmere/base.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #if SIMDJSON_VISUAL_STUDIO // under clang within visual studio, this will include diff --git a/include/simdjson/westmere/numberparsing_defs.h b/include/simdjson/westmere/numberparsing_defs.h index 04ae9e5bd..9ba7af8f3 100644 --- a/include/simdjson/westmere/numberparsing_defs.h +++ b/include/simdjson/westmere/numberparsing_defs.h @@ -4,9 +4,9 @@ #include "simdjson/westmere/base.h" #include "simdjson/westmere/intrinsics.h" -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/internal/numberparsing_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace westmere { diff --git a/include/simdjson/westmere/simd.h b/include/simdjson/westmere/simd.h index 31ce91a83..d3c239e6c 100644 --- a/include/simdjson/westmere/simd.h +++ b/include/simdjson/westmere/simd.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_WESTMERE_SIMD_H #define SIMDJSON_WESTMERE_SIMD_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include "simdjson/westmere/base.h" #include "simdjson/westmere/bitmanipulation.h" #include "simdjson/internal/simdprune_tables.h" -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace westmere { diff --git a/singleheader/amalgamate.py b/singleheader/amalgamate.py index 24af0ced1..fd31f567f 100755 --- a/singleheader/amalgamate.py +++ b/singleheader/amalgamate.py @@ -91,8 +91,8 @@ class SimdjsonFile: return cast(Implementation, str(match.group(2))) @property - def free_dependency_file(self): - if self.is_free_dependency_file: + def dependency_file(self): + if self.is_dependency_file: return None if self.implementation: @@ -120,52 +120,34 @@ class SimdjsonFile: else: return self.filename == 'amalgamated.h' - # The file that is authorized to include this file in amalgamation. If this is blank, it's - # generally because it *is* an amalgamator file. - @property - def amalgamator_file(self): - # generic/dependencies.h and things like amd64.h must not be in dependencies - if self.is_free_dependency_file or self.is_amalgamator or self.implementation: - return None - - # generic/*.h -> generic/amalgamated.h - # generic/stage1/*.h -> generic/stage1/amalgamated.h - # simdjson/generic/*.h -> simdjson/generic/amalgamated.h - # simdjson/generic/ondemand/*.h -> simdjson/generic/ondemand/amalgamated.h - if self.is_generic: - return self.repository[f"{self.include_dir}/amalgamated.h"] - - return None - @property def is_free_dependency(self): - return self.free_dependency_file is None + return self.dependency_file is None @property - def is_amalgamated(self): - return not self.is_free_dependency + def is_conditional_include(self): + return self.dependency_file is not None @property - def is_free_dependency_file(self): + def is_dependency_file(self): return self.filename == 'dependencies.h' def add_include(self, include: 'SimdjsonFile'): - # If there's a place we have to put dependencies, figure out if this is valid to include - if self.is_free_dependency: - assert include.is_free_dependency or include.is_amalgamator, f"{self} cannot include {include} because it is an amalgamated file." - else: - assert not include.is_free_dependency, f"{self} cannot include {include} without #ifndef SIMDJSON_AMALGAMATED." + if self.is_conditional_include: + assert include.is_conditional_include, f"{self} cannot include {include} without #ifndef SIMDJSON_CONDITIONAL_INCLUDE." # TODO make sure we only include amalgamated files that are guaranteed to be included with us (or before us) # if include.amalgamator_file: # assert include.amalgamator_file == self, f"{self} cannot include {include}: it should be included from {include.amalgamator_file} instead." + else: + assert include.is_amalgamator or not include.is_conditional_include, f"{self} cannot include {include} because it is an amalgamated file." self.includes.append(include) include.included_from.add(self) def add_editor_only_include(self, include: 'SimdjsonFile'): - assert self.is_amalgamated, f"Cannot use #ifndef SIMDJSON_AMALGAMATED in {self} because it is not an amalgamated file." - if include.is_free_dependency: - assert self.free_dependency_file, f"{self} cannot include {include} without #ifndef SIMDJSON_AMALGAMATED." + assert self.is_conditional_include, f"Cannot use #ifndef SIMDJSON_CONDITIONAL_INCLUDE in {self} because it is not an amalgamated file." + if not include.is_conditional_include: + assert self.dependency_file, f"{self} cannot include {include} without #ifndef SIMDJSON_CONDITIONAL_INCLUDE." # TODO make sure we only include amalgamated files that are guaranteed to be included with us (or before us) # elif include.amalgamator_file: # assert self.is_amalgamated_before(self.amalgamator_file), f"{self} cannot include {include}: it should be included from {include.amalgamator_file} instead." @@ -174,12 +156,12 @@ class SimdjsonFile: include.editor_only_included_from.add(self) def validate_free_dependency_file(self): - if self.is_free_dependency_file: + if self.is_dependency_file: extra_include_set = set(self.includes) for file in self.repository: - if file.free_dependency_file == self: + if file.dependency_file == self: for editor_only_include in file.editor_only_includes: - if editor_only_include.is_free_dependency: + if not editor_only_include.is_conditional_include: assert editor_only_include in self.includes, f"{file} includes {editor_only_include}, but it is not included from {self}. It must be added to {self}." if editor_only_include in extra_include_set: extra_include_set.remove(editor_only_include) @@ -240,14 +222,14 @@ class Amalgamator: self.builtin_implementation = False self.implementation: Optional[str] = None self.found_includes: Set[SimdjsonFile] = set() - self.found_includes_per_amalgamation: Set[SimdjsonFile] = set() + self.found_includes_per_conditional_block: Set[SimdjsonFile] = set() self.found_generic_includes: List[tuple[SimdjsonFile, str]] = [] - self.amalgamated_defined = False + self.in_conditional_include_block = False self.editor_only_region = False self.include_stack: List[SimdjsonFile] = [] def maybe_write_file(self, file: SimdjsonFile, including_file: Optional[SimdjsonFile], else_line: str): - if file.is_amalgamated: + if file.is_conditional_include: if file.is_generic: # Generic files get written out once per implementation in a well-defined order assert (file, self.implementation) not in self.found_generic_includes, f"generic file {file} included from {including_file} a second time for {self.implementation}!" @@ -255,8 +237,8 @@ class Amalgamator: self.found_generic_includes.append((file, self.implementation)) else: # Other amalgamated files, on the other hand, may only be included once per *amalgamation* - if file not in self.found_includes_per_amalgamation: - self.found_includes_per_amalgamation.add(file) + if file not in self.found_includes_per_conditional_block: + self.found_includes_per_conditional_block.add(file) else: if file in self.found_includes: self.write(f"/* skipped duplicate {else_line} */") @@ -270,7 +252,7 @@ class Amalgamator: print(line, file=self.fid) def file_to_str(self, file: SimdjsonFile): - if file.is_generic and file.is_amalgamated: + if file.is_generic and file.is_conditional_include: assert self.implementation, file return f"{file} for {self.implementation}" return file @@ -295,15 +277,15 @@ class Amalgamator: for line in fid2: line = line.rstrip('\n') - # Ignore lines inside #ifndef SIMDJSON_AMALGAMATED - if re.search(r'^#ifndef\s+SIMDJSON_AMALGAMATED\s*$', line): - assert file.is_amalgamated, f"{file} uses #ifndef SIMDJSON_AMALGAMATED but is not an amalgamated file!" - assert self.amalgamated_defined, f"{file} uses #ifndef SIMDJSON_AMALGAMATED without a prior #define SIMDJSON_AMALGAMATED: {self.include_stack}" - assert not self.editor_only_region, f"{file} uses #ifndef SIMDJSON_AMALGAMATED twice in a row" + # Ignore lines inside #ifndef SIMDJSON_CONDITIONAL_INCLUDE + if re.search(r'^#ifndef\s+SIMDJSON_CONDITIONAL_INCLUDE\s*$', line): + assert file.is_conditional_include, f"{file} uses #ifndef SIMDJSON_CONDITIONAL_INCLUDE but is not an amalgamated file!" + assert self.in_conditional_include_block, f"{file} uses #ifndef SIMDJSON_CONDITIONAL_INCLUDE without a prior #define SIMDJSON_CONDITIONAL_INCLUDE: {self.include_stack}" + assert not self.editor_only_region, f"{file} uses #ifndef SIMDJSON_CONDITIONAL_INCLUDE twice in a row" self.editor_only_region = True # Handle ignored lines (and ending ignore blocks) - end_ignore = re.search(r'^#endif\s*//\s*SIMDJSON_AMALGAMATED\s*$', line) + end_ignore = re.search(r'^#endif\s*//\s*SIMDJSON_CONDITIONAL_INCLUDE\s*$', line) if self.editor_only_region: self.write(f"/* amalgamation skipped (editor-only): {line} */") @@ -315,7 +297,7 @@ class Amalgamator: self.editor_only_region = False continue - assert not end_ignore, f"{file} has #endif // SIMDJSON_AMALGAMATED without #ifndef SIMDJSON_AMALGAMATED" + assert not end_ignore, f"{file} has #endif // SIMDJSON_CONDITIONAL_INCLUDE without #ifndef SIMDJSON_CONDITIONAL_INCLUDE" # Handle #include lines included = re.search(r'^#include "([^"]*)"', line) @@ -344,23 +326,23 @@ class Amalgamator: assert self.implementation, f"Use of SIMDJSON_IMPLEMENTATION while not defined in {file}: {line}" line = re.sub(r'\bSIMDJSON_IMPLEMENTATION\b',self.implementation,line) - # Handle defining and undefining SIMDJSON_AMALGAMATED - defined = re.search(r'^#define\s+SIMDJSON_AMALGAMATED\s*$', line) + # Handle defining and undefining SIMDJSON_CONDITIONAL_INCLUDE + defined = re.search(r'^#define\s+SIMDJSON_CONDITIONAL_INCLUDE\s*$', line) if defined: - assert not file.is_amalgamated, "SIMDJSON_AMALGAMATED defined in amalgamated file {file}! Not allowed." - assert not self.amalgamated_defined, f"{file} redefines SIMDJSON_AMALGAMATED" - self.amalgamated_defined = True - self.found_includes_per_amalgamation.clear() - self.write(f'/* defining SIMDJSON_AMALGAMATED */') - elif re.search(r'^#undef\s+SIMDJSON_AMALGAMATED\s*$', line): - assert not file.is_amalgamated, "SIMDJSON_AMALGAMATED undefined in amalgamated file {file}! Not allowed." - assert self.amalgamated_defined, f"{file} undefines SIMDJSON_AMALGAMATED without defining it" - self.write(f'/* undefining SIMDJSON_AMALGAMATED */') - self.amalgamated_defined = False + assert not file.is_conditional_include, "SIMDJSON_CONDITIONAL_INCLUDE defined in amalgamated file {file}! Not allowed." + assert not self.in_conditional_include_block, f"{file} redefines SIMDJSON_CONDITIONAL_INCLUDE" + self.in_conditional_include_block = True + self.found_includes_per_conditional_block.clear() + self.write(f'/* defining SIMDJSON_CONDITIONAL_INCLUDE */') + elif re.search(r'^#undef\s+SIMDJSON_CONDITIONAL_INCLUDE\s*$', line): + assert not file.is_conditional_include, "SIMDJSON_CONDITIONAL_INCLUDE undefined in amalgamated file {file}! Not allowed." + assert self.in_conditional_include_block, f"{file} undefines SIMDJSON_CONDITIONAL_INCLUDE without defining it" + self.write(f'/* undefining SIMDJSON_CONDITIONAL_INCLUDE */') + self.in_conditional_include_block = False self.write(line) - assert not self.editor_only_region, f"{file} ended without #endif // SIMDJSON_AMALGAMATED" + assert not self.editor_only_region, f"{file} ended without #endif // SIMDJSON_CONDITIONAL_INCLUDE" self.write(f"/* end file {self.file_to_str(file)} */") diff --git a/singleheader/simdjson.cpp b/singleheader/simdjson.cpp index d4f5bb4a6..125e59ecc 100644 --- a/singleheader/simdjson.cpp +++ b/singleheader/simdjson.cpp @@ -1,4 +1,4 @@ -/* auto-generated on 2023-07-20 10:01:22 -0700. Do not edit! */ +/* auto-generated on 2023-07-20 10:48:25 -0700. Do not edit! */ /* including simdjson.cpp: */ /* begin file simdjson.cpp */ #define SIMDJSON_SRC_SIMDJSON_CPP @@ -21,8 +21,8 @@ SIMDJSON_PUSH_DISABLE_UNUSED_WARNINGS #include -/* defining SIMDJSON_AMALGAMATED */ -#define SIMDJSON_AMALGAMATED +/* defining SIMDJSON_CONDITIONAL_INCLUDE */ +#define SIMDJSON_CONDITIONAL_INCLUDE #if SIMDJSON_IMPLEMENTATION_ARM64 #include @@ -43,8 +43,8 @@ SIMDJSON_PUSH_DISABLE_UNUSED_WARNINGS #include #endif -/* undefining SIMDJSON_AMALGAMATED */ -#undef SIMDJSON_AMALGAMATED +/* undefining SIMDJSON_CONDITIONAL_INCLUDE */ +#undef SIMDJSON_CONDITIONAL_INCLUDE SIMDJSON_POP_DISABLE_UNUSED_WARNINGS diff --git a/singleheader/simdjson.h b/singleheader/simdjson.h index 3f87d95e8..f746db0ec 100644 --- a/singleheader/simdjson.h +++ b/singleheader/simdjson.h @@ -1,4 +1,4 @@ -/* auto-generated on 2023-07-20 10:01:22 -0700. Do not edit! */ +/* auto-generated on 2023-07-20 10:48:25 -0700. Do not edit! */ /* including simdjson.h: */ /* begin file simdjson.h */ #ifndef SIMDJSON_H @@ -9815,8 +9815,8 @@ namespace simdjson { /* including simdjson/generic/dependencies.h: #include "simdjson/generic/dependencies.h" */ /* begin file simdjson/generic/dependencies.h */ -#ifdef SIMDJSON_AMALGAMATED -#error simdjson/generic/dependencies.h must be included before defining SIMDJSON_AMALGAMATED! +#ifdef SIMDJSON_CONDITIONAL_INCLUDE +#error simdjson/generic/dependencies.h must be included before defining SIMDJSON_CONDITIONAL_INCLUDE! #endif #ifndef SIMDJSON_GENERIC_DEPENDENCIES_H @@ -10026,8 +10026,8 @@ extern SIMDJSON_DLLIMPORTEXPORT const uint64_t thintable_epi8[256]; #endif // SIMDJSON_GENERIC_DEPENDENCIES_H /* end file simdjson/generic/dependencies.h */ -/* defining SIMDJSON_AMALGAMATED */ -#define SIMDJSON_AMALGAMATED +/* defining SIMDJSON_CONDITIONAL_INCLUDE */ +#define SIMDJSON_CONDITIONAL_INCLUDE #if SIMDJSON_BUILTIN_IMPLEMENTATION_IS(arm64) /* including simdjson/arm64/implementation.h: #include "simdjson/arm64/implementation.h" */ @@ -10035,11 +10035,11 @@ extern SIMDJSON_DLLIMPORTEXPORT const uint64_t thintable_epi8[256]; #ifndef SIMDJSON_ARM64_IMPLEMENTATION_H #define SIMDJSON_ARM64_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/implementation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/instruction_set.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -10070,10 +10070,10 @@ public: #ifndef SIMDJSON_FALLBACK_IMPLEMENTATION_H #define SIMDJSON_FALLBACK_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/fallback/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -10108,11 +10108,11 @@ public: #ifndef SIMDJSON_HASWELL_IMPLEMENTATION_H #define SIMDJSON_HASWELL_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/implementation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/instruction_set.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_HASWELL namespace simdjson { @@ -10148,11 +10148,11 @@ public: #ifndef SIMDJSON_ICELAKE_IMPLEMENTATION_H #define SIMDJSON_ICELAKE_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/implementation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/instruction_set.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_ICELAKE namespace simdjson { @@ -10188,11 +10188,11 @@ public: #ifndef SIMDJSON_PPC64_IMPLEMENTATION_H #define SIMDJSON_PPC64_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/implementation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/instruction_set.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -10232,11 +10232,11 @@ public: #ifndef SIMDJSON_WESTMERE_IMPLEMENTATION_H #define SIMDJSON_WESTMERE_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/implementation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/instruction_set.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_WESTMERE namespace simdjson { @@ -10266,8 +10266,8 @@ public: #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION #endif -/* undefining SIMDJSON_AMALGAMATED */ -#undef SIMDJSON_AMALGAMATED +/* undefining SIMDJSON_CONDITIONAL_INCLUDE */ +#undef SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { /** @@ -10284,8 +10284,8 @@ namespace simdjson { /* skipped duplicate #include "simdjson/generic/dependencies.h" */ -/* defining SIMDJSON_AMALGAMATED */ -#define SIMDJSON_AMALGAMATED +/* defining SIMDJSON_CONDITIONAL_INCLUDE */ +#define SIMDJSON_CONDITIONAL_INCLUDE #if SIMDJSON_BUILTIN_IMPLEMENTATION_IS(arm64) /* including simdjson/arm64.h: #include "simdjson/arm64.h" */ @@ -10302,9 +10302,9 @@ namespace simdjson { #ifndef SIMDJSON_ARM64_BASE_H #define SIMDJSON_ARM64_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { /** @@ -10331,9 +10331,9 @@ template struct simd8x64; #ifndef SIMDJSON_ARM64_INTRINSICS_H #define SIMDJSON_ARM64_INTRINSICS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // This should be the correct header whether // you use visual studio or other compilers. @@ -10348,10 +10348,10 @@ static_assert(sizeof(uint8x16_t) <= simdjson::SIMDJSON_PADDING, "insufficient pa #ifndef SIMDJSON_ARM64_BITMANIPULATION_H #define SIMDJSON_ARM64_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -10457,9 +10457,9 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, uint64_t *re #ifndef SIMDJSON_ARM64_BITMASK_H #define SIMDJSON_ARM64_BITMASK_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -10504,11 +10504,11 @@ simdjson_inline uint64_t prefix_xor(uint64_t bitmask) { #ifndef SIMDJSON_ARM64_NUMBERPARSING_DEFS_H #define SIMDJSON_ARM64_NUMBERPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/intrinsics.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -10563,11 +10563,11 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t #ifndef SIMDJSON_ARM64_SIMD_H #define SIMDJSON_ARM64_SIMD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -11099,11 +11099,11 @@ simdjson_inline int8x16_t make_int8x16_t(int8_t x1, int8_t x2, int8_t x3, int #ifndef SIMDJSON_ARM64_STRINGPARSING_DEFS_H #define SIMDJSON_ARM64_STRINGPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/simd.h" */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/bitmanipulation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -11153,7 +11153,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* end file simdjson/arm64/begin.h */ /* including simdjson/generic/amalgamated.h for arm64: #include "simdjson/generic/amalgamated.h" */ /* begin file simdjson/generic/amalgamated.h for arm64 */ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) #error simdjson/generic/dependencies.h must be included before simdjson/generic/amalgamated.h! #endif @@ -11161,7 +11161,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* begin file simdjson/generic/base.h for arm64 */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ /* amalgamation skipped (editor-only): // If we haven't got an implementation yet, we're in the editor, editing a generic file! Just */ @@ -11184,7 +11184,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* amalgamation skipped (editor-only): #error "All possible implementations (including fallback) have been disabled! simdjson will not run." */ /* amalgamation skipped (editor-only): #endif */ /* amalgamation skipped (editor-only): #endif // SIMDJSON_IMPLEMENTATION */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -11210,12 +11210,12 @@ enum class number_type { /* begin file simdjson/generic/jsoncharutils.h for arm64 */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -11317,11 +11317,11 @@ static simdjson_inline uint64_t _umul128(uint64_t ab, uint64_t cd, uint64_t *hi) /* begin file simdjson/generic/atomparsing.h for arm64 */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -11397,11 +11397,11 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file simdjson/generic/dom_parser_implementation.h for arm64 */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -11489,10 +11489,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file simdjson/generic/implementation_simdjson_result_base.h for arm64 */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -11626,12 +11626,12 @@ protected: /* begin file simdjson/generic/numberparsing.h for arm64 */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include #include @@ -12898,11 +12898,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file simdjson/generic/implementation_simdjson_result_base-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -12990,9 +12990,9 @@ simdjson_inline implementation_simdjson_result_base::implementation_simdjson_ /* end file simdjson/generic/amalgamated.h for arm64 */ /* including simdjson/arm64/end.h: #include "simdjson/arm64/end.h" */ /* begin file simdjson/arm64/end.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ /* undefining SIMDJSON_IMPLEMENTATION from "arm64" */ #undef SIMDJSON_IMPLEMENTATION @@ -13015,9 +13015,9 @@ simdjson_inline implementation_simdjson_result_base::implementation_simdjson_ #ifndef SIMDJSON_FALLBACK_BASE_H #define SIMDJSON_FALLBACK_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { /** @@ -13037,9 +13037,9 @@ class implementation; #ifndef SIMDJSON_FALLBACK_BITMANIPULATION_H #define SIMDJSON_FALLBACK_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/fallback/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -13088,9 +13088,9 @@ simdjson_inline int leading_zeroes(uint64_t input_num) { #ifndef SIMDJSON_FALLBACK_STRINGPARSING_DEFS_H #define SIMDJSON_FALLBACK_STRINGPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/fallback/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -13127,10 +13127,10 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin #ifndef SIMDJSON_FALLBACK_NUMBERPARSING_DEFS_H #define SIMDJSON_FALLBACK_NUMBERPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/fallback/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -13208,7 +13208,7 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t /* end file simdjson/fallback/begin.h */ /* including simdjson/generic/amalgamated.h for fallback: #include "simdjson/generic/amalgamated.h" */ /* begin file simdjson/generic/amalgamated.h for fallback */ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) #error simdjson/generic/dependencies.h must be included before simdjson/generic/amalgamated.h! #endif @@ -13216,7 +13216,7 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t /* begin file simdjson/generic/base.h for fallback */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ /* amalgamation skipped (editor-only): // If we haven't got an implementation yet, we're in the editor, editing a generic file! Just */ @@ -13239,7 +13239,7 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t /* amalgamation skipped (editor-only): #error "All possible implementations (including fallback) have been disabled! simdjson will not run." */ /* amalgamation skipped (editor-only): #endif */ /* amalgamation skipped (editor-only): #endif // SIMDJSON_IMPLEMENTATION */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -13265,12 +13265,12 @@ enum class number_type { /* begin file simdjson/generic/jsoncharutils.h for fallback */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -13372,11 +13372,11 @@ static simdjson_inline uint64_t _umul128(uint64_t ab, uint64_t cd, uint64_t *hi) /* begin file simdjson/generic/atomparsing.h for fallback */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -13452,11 +13452,11 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file simdjson/generic/dom_parser_implementation.h for fallback */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -13544,10 +13544,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file simdjson/generic/implementation_simdjson_result_base.h for fallback */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -13681,12 +13681,12 @@ protected: /* begin file simdjson/generic/numberparsing.h for fallback */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include #include @@ -14953,11 +14953,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file simdjson/generic/implementation_simdjson_result_base-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -15045,9 +15045,9 @@ simdjson_inline implementation_simdjson_result_base::implementation_simdjson_ /* end file simdjson/generic/amalgamated.h for fallback */ /* including simdjson/fallback/end.h: #include "simdjson/fallback/end.h" */ /* begin file simdjson/fallback/end.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/fallback/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ /* undefining SIMDJSON_IMPLEMENTATION from "fallback" */ #undef SIMDJSON_IMPLEMENTATION @@ -15071,9 +15071,9 @@ simdjson_inline implementation_simdjson_result_base::implementation_simdjson_ #ifndef SIMDJSON_HASWELL_BASE_H #define SIMDJSON_HASWELL_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_HASWELL namespace simdjson { @@ -15101,9 +15101,9 @@ template struct simd8x64; #ifndef SIMDJSON_HASWELL_INTRINSICS_H #define SIMDJSON_HASWELL_INTRINSICS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if SIMDJSON_VISUAL_STUDIO // under clang within visual studio, this will include @@ -15161,11 +15161,11 @@ SIMDJSON_TARGET_REGION("avx2,bmi,pclmul,lzcnt,popcnt") #ifndef SIMDJSON_HASWELL_BITMANIPULATION_H #define SIMDJSON_HASWELL_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/intrinsics.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/bitmask.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -15235,10 +15235,10 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, #ifndef SIMDJSON_HASWELL_BITMASK_H #define SIMDJSON_HASWELL_BITMASK_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -15268,14 +15268,14 @@ simdjson_inline uint64_t prefix_xor(const uint64_t bitmask) { #ifndef SIMDJSON_HASWELL_NUMBERPARSING_DEFS_H #define SIMDJSON_HASWELL_NUMBERPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -15332,12 +15332,12 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t #ifndef SIMDJSON_HASWELL_SIMD_H #define SIMDJSON_HASWELL_SIMD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/intrinsics.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -15707,11 +15707,11 @@ namespace simd { #ifndef SIMDJSON_HASWELL_STRINGPARSING_DEFS_H #define SIMDJSON_HASWELL_STRINGPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/simd.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/bitmanipulation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -15756,7 +15756,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* end file simdjson/haswell/begin.h */ /* including simdjson/generic/amalgamated.h for haswell: #include "simdjson/generic/amalgamated.h" */ /* begin file simdjson/generic/amalgamated.h for haswell */ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) #error simdjson/generic/dependencies.h must be included before simdjson/generic/amalgamated.h! #endif @@ -15764,7 +15764,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* begin file simdjson/generic/base.h for haswell */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ /* amalgamation skipped (editor-only): // If we haven't got an implementation yet, we're in the editor, editing a generic file! Just */ @@ -15787,7 +15787,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* amalgamation skipped (editor-only): #error "All possible implementations (including fallback) have been disabled! simdjson will not run." */ /* amalgamation skipped (editor-only): #endif */ /* amalgamation skipped (editor-only): #endif // SIMDJSON_IMPLEMENTATION */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -15813,12 +15813,12 @@ enum class number_type { /* begin file simdjson/generic/jsoncharutils.h for haswell */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -15920,11 +15920,11 @@ static simdjson_inline uint64_t _umul128(uint64_t ab, uint64_t cd, uint64_t *hi) /* begin file simdjson/generic/atomparsing.h for haswell */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -16000,11 +16000,11 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file simdjson/generic/dom_parser_implementation.h for haswell */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -16092,10 +16092,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file simdjson/generic/implementation_simdjson_result_base.h for haswell */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -16229,12 +16229,12 @@ protected: /* begin file simdjson/generic/numberparsing.h for haswell */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include #include @@ -17501,11 +17501,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file simdjson/generic/implementation_simdjson_result_base-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -17593,9 +17593,9 @@ simdjson_inline implementation_simdjson_result_base::implementation_simdjson_ /* end file simdjson/generic/amalgamated.h for haswell */ /* including simdjson/haswell/end.h: #include "simdjson/haswell/end.h" */ /* begin file simdjson/haswell/end.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if !SIMDJSON_CAN_ALWAYS_RUN_HASWELL SIMDJSON_UNTARGET_REGION @@ -17622,9 +17622,9 @@ SIMDJSON_UNTARGET_REGION #ifndef SIMDJSON_ICELAKE_BASE_H #define SIMDJSON_ICELAKE_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_ICELAKE namespace simdjson { @@ -17645,9 +17645,9 @@ class implementation; #ifndef SIMDJSON_ICELAKE_INTRINSICS_H #define SIMDJSON_ICELAKE_INTRINSICS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if SIMDJSON_VISUAL_STUDIO // under clang within visual studio, this will include @@ -17713,10 +17713,10 @@ SIMDJSON_TARGET_REGION("avx512f,avx512dq,avx512cd,avx512bw,avx512vbmi,avx512vbmi #ifndef SIMDJSON_ICELAKE_BITMANIPULATION_H #define SIMDJSON_ICELAKE_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -17786,10 +17786,10 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, #ifndef SIMDJSON_ICELAKE_BITMASK_H #define SIMDJSON_ICELAKE_BITMASK_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -17819,12 +17819,12 @@ simdjson_inline uint64_t prefix_xor(const uint64_t bitmask) { #ifndef SIMDJSON_ICELAKE_SIMD_H #define SIMDJSON_ICELAKE_SIMD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/intrinsics.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if defined(__GNUC__) && !defined(__clang__) #if __GNUC__ == 8 @@ -18194,11 +18194,11 @@ namespace simd { #ifndef SIMDJSON_ICELAKE_STRINGPARSING_DEFS_H #define SIMDJSON_ICELAKE_STRINGPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/simd.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/bitmanipulation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -18245,11 +18245,11 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin #ifndef SIMDJSON_ICELAKE_NUMBERPARSING_DEFS_H #define SIMDJSON_ICELAKE_NUMBERPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/intrinsics.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -18303,7 +18303,7 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t /* end file simdjson/icelake/begin.h */ /* including simdjson/generic/amalgamated.h for icelake: #include "simdjson/generic/amalgamated.h" */ /* begin file simdjson/generic/amalgamated.h for icelake */ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) #error simdjson/generic/dependencies.h must be included before simdjson/generic/amalgamated.h! #endif @@ -18311,7 +18311,7 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t /* begin file simdjson/generic/base.h for icelake */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ /* amalgamation skipped (editor-only): // If we haven't got an implementation yet, we're in the editor, editing a generic file! Just */ @@ -18334,7 +18334,7 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t /* amalgamation skipped (editor-only): #error "All possible implementations (including fallback) have been disabled! simdjson will not run." */ /* amalgamation skipped (editor-only): #endif */ /* amalgamation skipped (editor-only): #endif // SIMDJSON_IMPLEMENTATION */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -18360,12 +18360,12 @@ enum class number_type { /* begin file simdjson/generic/jsoncharutils.h for icelake */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -18467,11 +18467,11 @@ static simdjson_inline uint64_t _umul128(uint64_t ab, uint64_t cd, uint64_t *hi) /* begin file simdjson/generic/atomparsing.h for icelake */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -18547,11 +18547,11 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file simdjson/generic/dom_parser_implementation.h for icelake */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -18639,10 +18639,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file simdjson/generic/implementation_simdjson_result_base.h for icelake */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -18776,12 +18776,12 @@ protected: /* begin file simdjson/generic/numberparsing.h for icelake */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include #include @@ -20048,11 +20048,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file simdjson/generic/implementation_simdjson_result_base-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -20140,9 +20140,9 @@ simdjson_inline implementation_simdjson_result_base::implementation_simdjson_ /* end file simdjson/generic/amalgamated.h for icelake */ /* including simdjson/icelake/end.h: #include "simdjson/icelake/end.h" */ /* begin file simdjson/icelake/end.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if !SIMDJSON_CAN_ALWAYS_RUN_ICELAKE SIMDJSON_UNTARGET_REGION @@ -20169,9 +20169,9 @@ SIMDJSON_UNTARGET_REGION #ifndef SIMDJSON_PPC64_BASE_H #define SIMDJSON_PPC64_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { /** @@ -20198,9 +20198,9 @@ template struct simd8x64; #ifndef SIMDJSON_PPC64_INTRINSICS_H #define SIMDJSON_PPC64_INTRINSICS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // This should be the correct header whether // you use visual studio or other compilers. @@ -20224,9 +20224,9 @@ static_assert(sizeof(__vector unsigned char) <= simdjson::SIMDJSON_PADDING, "ins #ifndef SIMDJSON_PPC64_BITMANIPULATION_H #define SIMDJSON_PPC64_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -20305,9 +20305,9 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, #ifndef SIMDJSON_PPC64_BITMASK_H #define SIMDJSON_PPC64_BITMASK_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -20354,11 +20354,11 @@ simdjson_inline uint64_t prefix_xor(uint64_t bitmask) { #ifndef SIMDJSON_PPC64_NUMBERPARSING_DEFS_H #define SIMDJSON_PPC64_NUMBERPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/intrinsics.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -20422,11 +20422,11 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t #ifndef SIMDJSON_PPC64_SIMD_H #define SIMDJSON_PPC64_SIMD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -20897,11 +20897,11 @@ template struct simd8x64 { #ifndef SIMDJSON_PPC64_STRINGPARSING_DEFS_H #define SIMDJSON_PPC64_STRINGPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/simd.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -20963,7 +20963,7 @@ backslash_and_quote::copy_and_find(const uint8_t *src, uint8_t *dst) { /* end file simdjson/ppc64/begin.h */ /* including simdjson/generic/amalgamated.h for ppc64: #include "simdjson/generic/amalgamated.h" */ /* begin file simdjson/generic/amalgamated.h for ppc64 */ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) #error simdjson/generic/dependencies.h must be included before simdjson/generic/amalgamated.h! #endif @@ -20971,7 +20971,7 @@ backslash_and_quote::copy_and_find(const uint8_t *src, uint8_t *dst) { /* begin file simdjson/generic/base.h for ppc64 */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ /* amalgamation skipped (editor-only): // If we haven't got an implementation yet, we're in the editor, editing a generic file! Just */ @@ -20994,7 +20994,7 @@ backslash_and_quote::copy_and_find(const uint8_t *src, uint8_t *dst) { /* amalgamation skipped (editor-only): #error "All possible implementations (including fallback) have been disabled! simdjson will not run." */ /* amalgamation skipped (editor-only): #endif */ /* amalgamation skipped (editor-only): #endif // SIMDJSON_IMPLEMENTATION */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -21020,12 +21020,12 @@ enum class number_type { /* begin file simdjson/generic/jsoncharutils.h for ppc64 */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -21127,11 +21127,11 @@ static simdjson_inline uint64_t _umul128(uint64_t ab, uint64_t cd, uint64_t *hi) /* begin file simdjson/generic/atomparsing.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -21207,11 +21207,11 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file simdjson/generic/dom_parser_implementation.h for ppc64 */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -21299,10 +21299,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file simdjson/generic/implementation_simdjson_result_base.h for ppc64 */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -21436,12 +21436,12 @@ protected: /* begin file simdjson/generic/numberparsing.h for ppc64 */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include #include @@ -22708,11 +22708,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file simdjson/generic/implementation_simdjson_result_base-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -22800,9 +22800,9 @@ simdjson_inline implementation_simdjson_result_base::implementation_simdjson_ /* end file simdjson/generic/amalgamated.h for ppc64 */ /* including simdjson/ppc64/end.h: #include "simdjson/ppc64/end.h" */ /* begin file simdjson/ppc64/end.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ /* undefining SIMDJSON_IMPLEMENTATION from "ppc64" */ #undef SIMDJSON_IMPLEMENTATION @@ -22825,9 +22825,9 @@ simdjson_inline implementation_simdjson_result_base::implementation_simdjson_ #ifndef SIMDJSON_WESTMERE_BASE_H #define SIMDJSON_WESTMERE_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_WESTMERE namespace simdjson { @@ -22857,9 +22857,9 @@ template struct simd8x64; #ifndef SIMDJSON_WESTMERE_INTRINSICS_H #define SIMDJSON_WESTMERE_INTRINSICS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if SIMDJSON_VISUAL_STUDIO // under clang within visual studio, this will include @@ -22896,10 +22896,10 @@ SIMDJSON_TARGET_REGION("sse4.2,pclmul,popcnt") #ifndef SIMDJSON_WESTMERE_BITMANIPULATION_H #define SIMDJSON_WESTMERE_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -22978,10 +22978,10 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, #ifndef SIMDJSON_WESTMERE_BITMASK_H #define SIMDJSON_WESTMERE_BITMASK_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -23016,9 +23016,9 @@ simdjson_inline uint64_t prefix_xor(const uint64_t bitmask) { #ifndef SIMDJSON_WESTMERE_BASE_H #define SIMDJSON_WESTMERE_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_WESTMERE namespace simdjson { @@ -23048,9 +23048,9 @@ template struct simd8x64; #ifndef SIMDJSON_WESTMERE_INTRINSICS_H #define SIMDJSON_WESTMERE_INTRINSICS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if SIMDJSON_VISUAL_STUDIO // under clang within visual studio, this will include @@ -23078,9 +23078,9 @@ static_assert(sizeof(__m128i) <= simdjson::SIMDJSON_PADDING, "insufficient paddi #endif // SIMDJSON_WESTMERE_INTRINSICS_H /* end file simdjson/westmere/intrinsics.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -23137,11 +23137,11 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t #ifndef SIMDJSON_WESTMERE_SIMD_H #define SIMDJSON_WESTMERE_SIMD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -23483,10 +23483,10 @@ namespace simd { #ifndef SIMDJSON_WESTMERE_BITMANIPULATION_H #define SIMDJSON_WESTMERE_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -23565,11 +23565,11 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, #ifndef SIMDJSON_WESTMERE_SIMD_H #define SIMDJSON_WESTMERE_SIMD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -23947,7 +23947,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* end file simdjson/westmere/begin.h */ /* including simdjson/generic/amalgamated.h for westmere: #include "simdjson/generic/amalgamated.h" */ /* begin file simdjson/generic/amalgamated.h for westmere */ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_DEPENDENCIES_H) #error simdjson/generic/dependencies.h must be included before simdjson/generic/amalgamated.h! #endif @@ -23955,7 +23955,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* begin file simdjson/generic/base.h for westmere */ #ifndef SIMDJSON_GENERIC_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ /* amalgamation skipped (editor-only): // If we haven't got an implementation yet, we're in the editor, editing a generic file! Just */ @@ -23978,7 +23978,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* amalgamation skipped (editor-only): #error "All possible implementations (including fallback) have been disabled! simdjson will not run." */ /* amalgamation skipped (editor-only): #endif */ /* amalgamation skipped (editor-only): #endif // SIMDJSON_IMPLEMENTATION */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -24004,12 +24004,12 @@ enum class number_type { /* begin file simdjson/generic/jsoncharutils.h for westmere */ #ifndef SIMDJSON_GENERIC_JSONCHARUTILS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -24111,11 +24111,11 @@ static simdjson_inline uint64_t _umul128(uint64_t ab, uint64_t cd, uint64_t *hi) /* begin file simdjson/generic/atomparsing.h for westmere */ #ifndef SIMDJSON_GENERIC_ATOMPARSING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -24191,11 +24191,11 @@ simdjson_inline bool is_valid_null_atom(const uint8_t *src, size_t len) { /* begin file simdjson/generic/dom_parser_implementation.h for westmere */ #ifndef SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_DOM_PARSER_IMPLEMENTATION_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/dom_parser_implementation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -24283,10 +24283,10 @@ inline simdjson_warn_unused error_code dom_parser_implementation::set_max_depth( /* begin file simdjson/generic/implementation_simdjson_result_base.h for westmere */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -24420,12 +24420,12 @@ protected: /* begin file simdjson/generic/numberparsing.h for westmere */ #ifndef SIMDJSON_GENERIC_NUMBERPARSING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include #include @@ -25692,11 +25692,11 @@ inline std::ostream& operator<<(std::ostream& out, number_type type) noexcept { /* begin file simdjson/generic/implementation_simdjson_result_base-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_IMPLEMENTATION_SIMDJSON_RESULT_BASE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -25784,9 +25784,9 @@ simdjson_inline implementation_simdjson_result_base::implementation_simdjson_ /* end file simdjson/generic/amalgamated.h for westmere */ /* including simdjson/westmere/end.h: #include "simdjson/westmere/end.h" */ /* begin file simdjson/westmere/end.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if !SIMDJSON_CAN_ALWAYS_RUN_WESTMERE SIMDJSON_UNTARGET_REGION @@ -25802,8 +25802,8 @@ SIMDJSON_UNTARGET_REGION #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION #endif -/* undefining SIMDJSON_AMALGAMATED */ -#undef SIMDJSON_AMALGAMATED +/* undefining SIMDJSON_CONDITIONAL_INCLUDE */ +#undef SIMDJSON_CONDITIONAL_INCLUDE #endif // SIMDJSON_BUILTIN_H /* end file simdjson/builtin.h */ @@ -25811,8 +25811,8 @@ SIMDJSON_UNTARGET_REGION /* including simdjson/generic/ondemand/dependencies.h: #include "simdjson/generic/ondemand/dependencies.h" */ /* begin file simdjson/generic/ondemand/dependencies.h */ -#ifdef SIMDJSON_AMALGAMATED -#error simdjson/generic/ondemand/dependencies.h must be included before defining SIMDJSON_AMALGAMATED! +#ifdef SIMDJSON_CONDITIONAL_INCLUDE +#error simdjson/generic/ondemand/dependencies.h must be included before defining SIMDJSON_CONDITIONAL_INCLUDE! #endif #ifndef SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H @@ -25830,8 +25830,8 @@ SIMDJSON_UNTARGET_REGION #endif // SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H /* end file simdjson/generic/ondemand/dependencies.h */ -/* defining SIMDJSON_AMALGAMATED */ -#define SIMDJSON_AMALGAMATED +/* defining SIMDJSON_CONDITIONAL_INCLUDE */ +#define SIMDJSON_CONDITIONAL_INCLUDE #if SIMDJSON_BUILTIN_IMPLEMENTATION_IS(arm64) /* including simdjson/arm64/ondemand.h: #include "simdjson/arm64/ondemand.h" */ @@ -25848,9 +25848,9 @@ SIMDJSON_UNTARGET_REGION #ifndef SIMDJSON_ARM64_BASE_H #define SIMDJSON_ARM64_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { /** @@ -25877,9 +25877,9 @@ template struct simd8x64; #ifndef SIMDJSON_ARM64_INTRINSICS_H #define SIMDJSON_ARM64_INTRINSICS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // This should be the correct header whether // you use visual studio or other compilers. @@ -25894,10 +25894,10 @@ static_assert(sizeof(uint8x16_t) <= simdjson::SIMDJSON_PADDING, "insufficient pa #ifndef SIMDJSON_ARM64_BITMANIPULATION_H #define SIMDJSON_ARM64_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -26003,9 +26003,9 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, uint64_t *re #ifndef SIMDJSON_ARM64_BITMASK_H #define SIMDJSON_ARM64_BITMASK_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -26050,11 +26050,11 @@ simdjson_inline uint64_t prefix_xor(uint64_t bitmask) { #ifndef SIMDJSON_ARM64_NUMBERPARSING_DEFS_H #define SIMDJSON_ARM64_NUMBERPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/intrinsics.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -26109,11 +26109,11 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t #ifndef SIMDJSON_ARM64_SIMD_H #define SIMDJSON_ARM64_SIMD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -26645,11 +26645,11 @@ simdjson_inline int8x16_t make_int8x16_t(int8_t x1, int8_t x2, int8_t x3, int #ifndef SIMDJSON_ARM64_STRINGPARSING_DEFS_H #define SIMDJSON_ARM64_STRINGPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/simd.h" */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/bitmanipulation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -26699,7 +26699,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* end file simdjson/arm64/begin.h */ /* including simdjson/generic/ondemand/amalgamated.h for arm64: #include "simdjson/generic/ondemand/amalgamated.h" */ /* begin file simdjson/generic/ondemand/amalgamated.h for arm64 */ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) #error simdjson/generic/ondemand/dependencies.h must be included before simdjson/generic/ondemand/amalgamated.h! #endif @@ -26708,10 +26708,10 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* begin file simdjson/generic/ondemand/base.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -26758,11 +26758,11 @@ class value_iterator; /* begin file simdjson/generic/ondemand/value_iterator.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -27247,12 +27247,12 @@ public: /* begin file simdjson/generic/ondemand/value.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -27957,10 +27957,10 @@ public: /* begin file simdjson/generic/ondemand/logger.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -28018,12 +28018,12 @@ static inline void log_error(const value_iterator &iter, const char *error, cons /* begin file simdjson/generic/ondemand/token_iterator.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -28172,12 +28172,12 @@ public: /* begin file simdjson/generic/ondemand/json_iterator.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -28500,12 +28500,12 @@ public: /* begin file simdjson/generic/ondemand/json_type.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -28665,11 +28665,11 @@ public: /* begin file simdjson/generic/ondemand/raw_json_string.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -28874,11 +28874,11 @@ public: /* begin file simdjson/generic/ondemand/parser.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -29234,12 +29234,12 @@ public: /* begin file simdjson/generic/ondemand/array.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -29436,12 +29436,12 @@ public: /* begin file simdjson/generic/ondemand/array_iterator.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -29535,11 +29535,11 @@ public: /* begin file simdjson/generic/ondemand/document.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -30345,13 +30345,13 @@ public: /* begin file simdjson/generic/ondemand/document_stream.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #ifdef SIMDJSON_THREADS_ENABLED #include @@ -30687,13 +30687,13 @@ public: /* begin file simdjson/generic/ondemand/field.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -30772,12 +30772,12 @@ public: /* begin file simdjson/generic/ondemand/object.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -31014,12 +31014,12 @@ public: /* begin file simdjson/generic/ondemand/object_iterator.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -31097,10 +31097,10 @@ public: /* begin file simdjson/generic/ondemand/serialization.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { /** @@ -31205,7 +31205,7 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result simdjson_result &simdjson_resul /* begin file simdjson/generic/ondemand/document-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array-inl.h" */ @@ -31527,7 +31527,7 @@ simdjson_inline simdjson_result &simdjson_resul /* 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): #include "simdjson/generic/ondemand/value_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -32341,13 +32341,13 @@ simdjson_inline simdjson_result simdjson_result #include @@ -32768,13 +32768,13 @@ simdjson_inline simdjson_result::simdjson_resu /* begin file simdjson/generic/ondemand/field-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/field.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value-inl.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -32861,7 +32861,7 @@ simdjson_inline simdjson_result simdjson_result simdjson_result::simdjson_result /* begin file simdjson/generic/ondemand/json_type-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/json_type.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -33394,13 +33394,13 @@ simdjson_inline simdjson_result::simdjson_result(err /* begin file simdjson/generic/ondemand/logger-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include #include @@ -33622,7 +33622,7 @@ inline void log_line(const json_iterator &iter, token_position index, depth_t de /* begin file simdjson/generic/ondemand/object-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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" */ @@ -33631,7 +33631,7 @@ 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -33885,13 +33885,13 @@ simdjson_inline simdjson_result simdjson_result &simdjson_resu /* begin file simdjson/generic/ondemand/parser-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/padded_string.h" */ /* amalgamation skipped (editor-only): #include "simdjson/padded_string_view.h" */ @@ -34037,7 +34037,7 @@ simdjson_inline simdjson_result &simdjson_resu /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/document_stream.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/parser.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/raw_json_string.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -34193,13 +34193,13 @@ simdjson_inline simdjson_result::simdjson_result(error_ /* begin file simdjson/generic/ondemand/raw_json_string-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -34399,7 +34399,7 @@ simdjson_inline simdjson_warn_unused simdjson_result simdjson_ /* begin file simdjson/generic/ondemand/serialization-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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" */ @@ -34408,7 +34408,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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -34635,12 +34635,12 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::arm64::ondemand::ob /* begin file simdjson/generic/ondemand/token_iterator-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -34727,7 +34727,7 @@ simdjson_inline simdjson_result::simdjson_resul /* begin file simdjson/generic/ondemand/value-inl.h for arm64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array.h" */ @@ -34737,7 +34737,7 @@ simdjson_inline simdjson_result::simdjson_resul /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/object.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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace arm64 { @@ -35169,7 +35169,7 @@ simdjson_inline simdjson_result simdjson_result simdjson_result::simdjson_resul /* end file simdjson/generic/ondemand/amalgamated.h for arm64 */ /* including simdjson/arm64/end.h: #include "simdjson/arm64/end.h" */ /* begin file simdjson/arm64/end.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/arm64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ /* undefining SIMDJSON_IMPLEMENTATION from "arm64" */ #undef SIMDJSON_IMPLEMENTATION @@ -36247,9 +36247,9 @@ simdjson_inline simdjson_result::simdjson_resul #ifndef SIMDJSON_FALLBACK_BASE_H #define SIMDJSON_FALLBACK_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { /** @@ -36269,9 +36269,9 @@ class implementation; #ifndef SIMDJSON_FALLBACK_BITMANIPULATION_H #define SIMDJSON_FALLBACK_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/fallback/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -36320,9 +36320,9 @@ simdjson_inline int leading_zeroes(uint64_t input_num) { #ifndef SIMDJSON_FALLBACK_STRINGPARSING_DEFS_H #define SIMDJSON_FALLBACK_STRINGPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/fallback/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -36359,10 +36359,10 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin #ifndef SIMDJSON_FALLBACK_NUMBERPARSING_DEFS_H #define SIMDJSON_FALLBACK_NUMBERPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/fallback/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -36440,7 +36440,7 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t /* end file simdjson/fallback/begin.h */ /* including simdjson/generic/ondemand/amalgamated.h for fallback: #include "simdjson/generic/ondemand/amalgamated.h" */ /* begin file simdjson/generic/ondemand/amalgamated.h for fallback */ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) #error simdjson/generic/ondemand/dependencies.h must be included before simdjson/generic/ondemand/amalgamated.h! #endif @@ -36449,10 +36449,10 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t /* begin file simdjson/generic/ondemand/base.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -36499,11 +36499,11 @@ class value_iterator; /* begin file simdjson/generic/ondemand/value_iterator.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -36988,12 +36988,12 @@ public: /* begin file simdjson/generic/ondemand/value.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -37698,10 +37698,10 @@ public: /* begin file simdjson/generic/ondemand/logger.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -37759,12 +37759,12 @@ static inline void log_error(const value_iterator &iter, const char *error, cons /* begin file simdjson/generic/ondemand/token_iterator.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -37913,12 +37913,12 @@ public: /* begin file simdjson/generic/ondemand/json_iterator.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -38241,12 +38241,12 @@ public: /* begin file simdjson/generic/ondemand/json_type.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -38406,11 +38406,11 @@ public: /* begin file simdjson/generic/ondemand/raw_json_string.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -38615,11 +38615,11 @@ public: /* begin file simdjson/generic/ondemand/parser.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -38975,12 +38975,12 @@ public: /* begin file simdjson/generic/ondemand/array.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -39177,12 +39177,12 @@ public: /* begin file simdjson/generic/ondemand/array_iterator.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -39276,11 +39276,11 @@ public: /* begin file simdjson/generic/ondemand/document.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -40086,13 +40086,13 @@ public: /* begin file simdjson/generic/ondemand/document_stream.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #ifdef SIMDJSON_THREADS_ENABLED #include @@ -40428,13 +40428,13 @@ public: /* begin file simdjson/generic/ondemand/field.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -40513,12 +40513,12 @@ public: /* begin file simdjson/generic/ondemand/object.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -40755,12 +40755,12 @@ public: /* begin file simdjson/generic/ondemand/object_iterator.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -40838,10 +40838,10 @@ public: /* begin file simdjson/generic/ondemand/serialization.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { /** @@ -40946,7 +40946,7 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result simdjson_result &simdjson_re /* begin file simdjson/generic/ondemand/document-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array-inl.h" */ @@ -41268,7 +41268,7 @@ simdjson_inline simdjson_result &simdjson_re /* 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): #include "simdjson/generic/ondemand/value_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -42082,13 +42082,13 @@ simdjson_inline simdjson_result simdjson_result #include @@ -42509,13 +42509,13 @@ simdjson_inline simdjson_result::simdjson_r /* begin file simdjson/generic/ondemand/field-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/field.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value-inl.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -42602,7 +42602,7 @@ simdjson_inline simdjson_result simdjson_result simdjson_result::simdjson_res /* begin file simdjson/generic/ondemand/json_type-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/json_type.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -43135,13 +43135,13 @@ simdjson_inline simdjson_result::simdjson_result( /* begin file simdjson/generic/ondemand/logger-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include #include @@ -43363,7 +43363,7 @@ inline void log_line(const json_iterator &iter, token_position index, depth_t de /* begin file simdjson/generic/ondemand/object-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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" */ @@ -43372,7 +43372,7 @@ 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -43626,13 +43626,13 @@ simdjson_inline simdjson_result simdjson_result &simdjson_r /* begin file simdjson/generic/ondemand/parser-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/padded_string.h" */ /* amalgamation skipped (editor-only): #include "simdjson/padded_string_view.h" */ @@ -43778,7 +43778,7 @@ simdjson_inline simdjson_result &simdjson_r /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/document_stream.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/parser.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/raw_json_string.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -43934,13 +43934,13 @@ simdjson_inline simdjson_result::simdjson_result(err /* begin file simdjson/generic/ondemand/raw_json_string-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -44140,7 +44140,7 @@ simdjson_inline simdjson_warn_unused simdjson_result simdjson_ /* begin file simdjson/generic/ondemand/serialization-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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" */ @@ -44149,7 +44149,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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -44376,12 +44376,12 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::fallback::ondemand: /* begin file simdjson/generic/ondemand/token_iterator-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -44468,7 +44468,7 @@ simdjson_inline simdjson_result::simdjson_re /* begin file simdjson/generic/ondemand/value-inl.h for fallback */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array.h" */ @@ -44478,7 +44478,7 @@ simdjson_inline simdjson_result::simdjson_re /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/object.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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace fallback { @@ -44910,7 +44910,7 @@ simdjson_inline simdjson_result simdjson_result simdjson_result::simdjson_re /* end file simdjson/generic/ondemand/amalgamated.h for fallback */ /* including simdjson/fallback/end.h: #include "simdjson/fallback/end.h" */ /* begin file simdjson/fallback/end.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/fallback/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ /* undefining SIMDJSON_IMPLEMENTATION from "fallback" */ #undef SIMDJSON_IMPLEMENTATION @@ -45989,9 +45989,9 @@ simdjson_inline simdjson_result::simdjson_re #ifndef SIMDJSON_HASWELL_BASE_H #define SIMDJSON_HASWELL_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_HASWELL namespace simdjson { @@ -46019,9 +46019,9 @@ template struct simd8x64; #ifndef SIMDJSON_HASWELL_INTRINSICS_H #define SIMDJSON_HASWELL_INTRINSICS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if SIMDJSON_VISUAL_STUDIO // under clang within visual studio, this will include @@ -46079,11 +46079,11 @@ SIMDJSON_TARGET_REGION("avx2,bmi,pclmul,lzcnt,popcnt") #ifndef SIMDJSON_HASWELL_BITMANIPULATION_H #define SIMDJSON_HASWELL_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/intrinsics.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/bitmask.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -46153,10 +46153,10 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, #ifndef SIMDJSON_HASWELL_BITMASK_H #define SIMDJSON_HASWELL_BITMASK_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -46186,14 +46186,14 @@ simdjson_inline uint64_t prefix_xor(const uint64_t bitmask) { #ifndef SIMDJSON_HASWELL_NUMBERPARSING_DEFS_H #define SIMDJSON_HASWELL_NUMBERPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -46250,12 +46250,12 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t #ifndef SIMDJSON_HASWELL_SIMD_H #define SIMDJSON_HASWELL_SIMD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/intrinsics.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -46625,11 +46625,11 @@ namespace simd { #ifndef SIMDJSON_HASWELL_STRINGPARSING_DEFS_H #define SIMDJSON_HASWELL_STRINGPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/simd.h" */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/bitmanipulation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -46674,7 +46674,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* end file simdjson/haswell/begin.h */ /* including simdjson/generic/ondemand/amalgamated.h for haswell: #include "simdjson/generic/ondemand/amalgamated.h" */ /* begin file simdjson/generic/ondemand/amalgamated.h for haswell */ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) #error simdjson/generic/ondemand/dependencies.h must be included before simdjson/generic/ondemand/amalgamated.h! #endif @@ -46683,10 +46683,10 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* begin file simdjson/generic/ondemand/base.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -46733,11 +46733,11 @@ class value_iterator; /* begin file simdjson/generic/ondemand/value_iterator.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -47222,12 +47222,12 @@ public: /* begin file simdjson/generic/ondemand/value.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -47932,10 +47932,10 @@ public: /* begin file simdjson/generic/ondemand/logger.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -47993,12 +47993,12 @@ static inline void log_error(const value_iterator &iter, const char *error, cons /* begin file simdjson/generic/ondemand/token_iterator.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -48147,12 +48147,12 @@ public: /* begin file simdjson/generic/ondemand/json_iterator.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -48475,12 +48475,12 @@ public: /* begin file simdjson/generic/ondemand/json_type.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -48640,11 +48640,11 @@ public: /* begin file simdjson/generic/ondemand/raw_json_string.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -48849,11 +48849,11 @@ public: /* begin file simdjson/generic/ondemand/parser.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -49209,12 +49209,12 @@ public: /* begin file simdjson/generic/ondemand/array.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -49411,12 +49411,12 @@ public: /* begin file simdjson/generic/ondemand/array_iterator.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -49510,11 +49510,11 @@ public: /* begin file simdjson/generic/ondemand/document.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -50320,13 +50320,13 @@ public: /* begin file simdjson/generic/ondemand/document_stream.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #ifdef SIMDJSON_THREADS_ENABLED #include @@ -50662,13 +50662,13 @@ public: /* begin file simdjson/generic/ondemand/field.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -50747,12 +50747,12 @@ public: /* begin file simdjson/generic/ondemand/object.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -50989,12 +50989,12 @@ public: /* begin file simdjson/generic/ondemand/object_iterator.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -51072,10 +51072,10 @@ public: /* begin file simdjson/generic/ondemand/serialization.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { /** @@ -51180,7 +51180,7 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result simdjson_result &simdjson_res /* begin file simdjson/generic/ondemand/document-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array-inl.h" */ @@ -51502,7 +51502,7 @@ simdjson_inline simdjson_result &simdjson_res /* 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): #include "simdjson/generic/ondemand/value_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -52316,13 +52316,13 @@ simdjson_inline simdjson_result simdjson_result #include @@ -52743,13 +52743,13 @@ simdjson_inline simdjson_result::simdjson_re /* begin file simdjson/generic/ondemand/field-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/field.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value-inl.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -52836,7 +52836,7 @@ simdjson_inline simdjson_result simdjson_result simdjson_result::simdjson_resu /* begin file simdjson/generic/ondemand/json_type-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/json_type.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -53369,13 +53369,13 @@ simdjson_inline simdjson_result::simdjson_result(e /* begin file simdjson/generic/ondemand/logger-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include #include @@ -53597,7 +53597,7 @@ inline void log_line(const json_iterator &iter, token_position index, depth_t de /* begin file simdjson/generic/ondemand/object-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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" */ @@ -53606,7 +53606,7 @@ 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -53860,13 +53860,13 @@ simdjson_inline simdjson_result simdjson_result &simdjson_re /* begin file simdjson/generic/ondemand/parser-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/padded_string.h" */ /* amalgamation skipped (editor-only): #include "simdjson/padded_string_view.h" */ @@ -54012,7 +54012,7 @@ simdjson_inline simdjson_result &simdjson_re /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/document_stream.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/parser.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/raw_json_string.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -54168,13 +54168,13 @@ simdjson_inline simdjson_result::simdjson_result(erro /* begin file simdjson/generic/ondemand/raw_json_string-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -54374,7 +54374,7 @@ simdjson_inline simdjson_warn_unused simdjson_result simdjson_ /* begin file simdjson/generic/ondemand/serialization-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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" */ @@ -54383,7 +54383,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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -54610,12 +54610,12 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::haswell::ondemand:: /* begin file simdjson/generic/ondemand/token_iterator-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -54702,7 +54702,7 @@ simdjson_inline simdjson_result::simdjson_res /* begin file simdjson/generic/ondemand/value-inl.h for haswell */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array.h" */ @@ -54712,7 +54712,7 @@ simdjson_inline simdjson_result::simdjson_res /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/object.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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace haswell { @@ -55144,7 +55144,7 @@ simdjson_inline simdjson_result simdjson_result simdjson_result::simdjson_res /* end file simdjson/generic/ondemand/amalgamated.h for haswell */ /* including simdjson/haswell/end.h: #include "simdjson/haswell/end.h" */ /* begin file simdjson/haswell/end.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/haswell/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if !SIMDJSON_CAN_ALWAYS_RUN_HASWELL SIMDJSON_UNTARGET_REGION @@ -56226,9 +56226,9 @@ SIMDJSON_UNTARGET_REGION #ifndef SIMDJSON_ICELAKE_BASE_H #define SIMDJSON_ICELAKE_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_ICELAKE namespace simdjson { @@ -56249,9 +56249,9 @@ class implementation; #ifndef SIMDJSON_ICELAKE_INTRINSICS_H #define SIMDJSON_ICELAKE_INTRINSICS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if SIMDJSON_VISUAL_STUDIO // under clang within visual studio, this will include @@ -56317,10 +56317,10 @@ SIMDJSON_TARGET_REGION("avx512f,avx512dq,avx512cd,avx512bw,avx512vbmi,avx512vbmi #ifndef SIMDJSON_ICELAKE_BITMANIPULATION_H #define SIMDJSON_ICELAKE_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -56390,10 +56390,10 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, #ifndef SIMDJSON_ICELAKE_BITMASK_H #define SIMDJSON_ICELAKE_BITMASK_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -56423,12 +56423,12 @@ simdjson_inline uint64_t prefix_xor(const uint64_t bitmask) { #ifndef SIMDJSON_ICELAKE_SIMD_H #define SIMDJSON_ICELAKE_SIMD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/intrinsics.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if defined(__GNUC__) && !defined(__clang__) #if __GNUC__ == 8 @@ -56798,11 +56798,11 @@ namespace simd { #ifndef SIMDJSON_ICELAKE_STRINGPARSING_DEFS_H #define SIMDJSON_ICELAKE_STRINGPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/simd.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/bitmanipulation.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -56849,11 +56849,11 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin #ifndef SIMDJSON_ICELAKE_NUMBERPARSING_DEFS_H #define SIMDJSON_ICELAKE_NUMBERPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/intrinsics.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -56907,7 +56907,7 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t /* end file simdjson/icelake/begin.h */ /* including simdjson/generic/ondemand/amalgamated.h for icelake: #include "simdjson/generic/ondemand/amalgamated.h" */ /* begin file simdjson/generic/ondemand/amalgamated.h for icelake */ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) #error simdjson/generic/ondemand/dependencies.h must be included before simdjson/generic/ondemand/amalgamated.h! #endif @@ -56916,10 +56916,10 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t /* begin file simdjson/generic/ondemand/base.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -56966,11 +56966,11 @@ class value_iterator; /* begin file simdjson/generic/ondemand/value_iterator.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -57455,12 +57455,12 @@ public: /* begin file simdjson/generic/ondemand/value.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -58165,10 +58165,10 @@ public: /* begin file simdjson/generic/ondemand/logger.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -58226,12 +58226,12 @@ static inline void log_error(const value_iterator &iter, const char *error, cons /* begin file simdjson/generic/ondemand/token_iterator.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -58380,12 +58380,12 @@ public: /* begin file simdjson/generic/ondemand/json_iterator.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -58708,12 +58708,12 @@ public: /* begin file simdjson/generic/ondemand/json_type.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -58873,11 +58873,11 @@ public: /* begin file simdjson/generic/ondemand/raw_json_string.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -59082,11 +59082,11 @@ public: /* begin file simdjson/generic/ondemand/parser.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -59442,12 +59442,12 @@ public: /* begin file simdjson/generic/ondemand/array.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -59644,12 +59644,12 @@ public: /* begin file simdjson/generic/ondemand/array_iterator.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -59743,11 +59743,11 @@ public: /* begin file simdjson/generic/ondemand/document.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -60553,13 +60553,13 @@ public: /* begin file simdjson/generic/ondemand/document_stream.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #ifdef SIMDJSON_THREADS_ENABLED #include @@ -60895,13 +60895,13 @@ public: /* begin file simdjson/generic/ondemand/field.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -60980,12 +60980,12 @@ public: /* begin file simdjson/generic/ondemand/object.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -61222,12 +61222,12 @@ public: /* begin file simdjson/generic/ondemand/object_iterator.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -61305,10 +61305,10 @@ public: /* begin file simdjson/generic/ondemand/serialization.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { /** @@ -61413,7 +61413,7 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result simdjson_result &simdjson_res /* begin file simdjson/generic/ondemand/document-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array-inl.h" */ @@ -61735,7 +61735,7 @@ simdjson_inline simdjson_result &simdjson_res /* 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): #include "simdjson/generic/ondemand/value_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -62549,13 +62549,13 @@ simdjson_inline simdjson_result simdjson_result #include @@ -62976,13 +62976,13 @@ simdjson_inline simdjson_result::simdjson_re /* begin file simdjson/generic/ondemand/field-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/field.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value-inl.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -63069,7 +63069,7 @@ simdjson_inline simdjson_result simdjson_result simdjson_result::simdjson_resu /* begin file simdjson/generic/ondemand/json_type-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/json_type.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -63602,13 +63602,13 @@ simdjson_inline simdjson_result::simdjson_result(e /* begin file simdjson/generic/ondemand/logger-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include #include @@ -63830,7 +63830,7 @@ inline void log_line(const json_iterator &iter, token_position index, depth_t de /* begin file simdjson/generic/ondemand/object-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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" */ @@ -63839,7 +63839,7 @@ 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -64093,13 +64093,13 @@ simdjson_inline simdjson_result simdjson_result &simdjson_re /* begin file simdjson/generic/ondemand/parser-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/padded_string.h" */ /* amalgamation skipped (editor-only): #include "simdjson/padded_string_view.h" */ @@ -64245,7 +64245,7 @@ simdjson_inline simdjson_result &simdjson_re /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/document_stream.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/parser.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/raw_json_string.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -64401,13 +64401,13 @@ simdjson_inline simdjson_result::simdjson_result(erro /* begin file simdjson/generic/ondemand/raw_json_string-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -64607,7 +64607,7 @@ simdjson_inline simdjson_warn_unused simdjson_result simdjson_ /* begin file simdjson/generic/ondemand/serialization-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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" */ @@ -64616,7 +64616,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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -64843,12 +64843,12 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::icelake::ondemand:: /* begin file simdjson/generic/ondemand/token_iterator-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -64935,7 +64935,7 @@ simdjson_inline simdjson_result::simdjson_res /* begin file simdjson/generic/ondemand/value-inl.h for icelake */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array.h" */ @@ -64945,7 +64945,7 @@ simdjson_inline simdjson_result::simdjson_res /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/object.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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace icelake { @@ -65377,7 +65377,7 @@ simdjson_inline simdjson_result simdjson_result simdjson_result::simdjson_res /* end file simdjson/generic/ondemand/amalgamated.h for icelake */ /* including simdjson/icelake/end.h: #include "simdjson/icelake/end.h" */ /* begin file simdjson/icelake/end.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/icelake/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if !SIMDJSON_CAN_ALWAYS_RUN_ICELAKE SIMDJSON_UNTARGET_REGION @@ -66459,9 +66459,9 @@ SIMDJSON_UNTARGET_REGION #ifndef SIMDJSON_PPC64_BASE_H #define SIMDJSON_PPC64_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { /** @@ -66488,9 +66488,9 @@ template struct simd8x64; #ifndef SIMDJSON_PPC64_INTRINSICS_H #define SIMDJSON_PPC64_INTRINSICS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // This should be the correct header whether // you use visual studio or other compilers. @@ -66514,9 +66514,9 @@ static_assert(sizeof(__vector unsigned char) <= simdjson::SIMDJSON_PADDING, "ins #ifndef SIMDJSON_PPC64_BITMANIPULATION_H #define SIMDJSON_PPC64_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -66595,9 +66595,9 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, #ifndef SIMDJSON_PPC64_BITMASK_H #define SIMDJSON_PPC64_BITMASK_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -66644,11 +66644,11 @@ simdjson_inline uint64_t prefix_xor(uint64_t bitmask) { #ifndef SIMDJSON_PPC64_NUMBERPARSING_DEFS_H #define SIMDJSON_PPC64_NUMBERPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/intrinsics.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -66712,11 +66712,11 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t #ifndef SIMDJSON_PPC64_SIMD_H #define SIMDJSON_PPC64_SIMD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -67187,11 +67187,11 @@ template struct simd8x64 { #ifndef SIMDJSON_PPC64_STRINGPARSING_DEFS_H #define SIMDJSON_PPC64_STRINGPARSING_DEFS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/simd.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -67253,7 +67253,7 @@ backslash_and_quote::copy_and_find(const uint8_t *src, uint8_t *dst) { /* end file simdjson/ppc64/begin.h */ /* including simdjson/generic/ondemand/amalgamated.h for ppc64: #include "simdjson/generic/ondemand/amalgamated.h" */ /* begin file simdjson/generic/ondemand/amalgamated.h for ppc64 */ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) #error simdjson/generic/ondemand/dependencies.h must be included before simdjson/generic/ondemand/amalgamated.h! #endif @@ -67262,10 +67262,10 @@ backslash_and_quote::copy_and_find(const uint8_t *src, uint8_t *dst) { /* begin file simdjson/generic/ondemand/base.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -67312,11 +67312,11 @@ class value_iterator; /* begin file simdjson/generic/ondemand/value_iterator.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -67801,12 +67801,12 @@ public: /* begin file simdjson/generic/ondemand/value.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -68511,10 +68511,10 @@ public: /* begin file simdjson/generic/ondemand/logger.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -68572,12 +68572,12 @@ static inline void log_error(const value_iterator &iter, const char *error, cons /* begin file simdjson/generic/ondemand/token_iterator.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -68726,12 +68726,12 @@ public: /* begin file simdjson/generic/ondemand/json_iterator.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -69054,12 +69054,12 @@ public: /* begin file simdjson/generic/ondemand/json_type.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -69219,11 +69219,11 @@ public: /* begin file simdjson/generic/ondemand/raw_json_string.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -69428,11 +69428,11 @@ public: /* begin file simdjson/generic/ondemand/parser.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -69788,12 +69788,12 @@ public: /* begin file simdjson/generic/ondemand/array.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -69990,12 +69990,12 @@ public: /* begin file simdjson/generic/ondemand/array_iterator.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -70089,11 +70089,11 @@ public: /* begin file simdjson/generic/ondemand/document.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -70899,13 +70899,13 @@ public: /* begin file simdjson/generic/ondemand/document_stream.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #ifdef SIMDJSON_THREADS_ENABLED #include @@ -71241,13 +71241,13 @@ public: /* begin file simdjson/generic/ondemand/field.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -71326,12 +71326,12 @@ public: /* begin file simdjson/generic/ondemand/object.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -71568,12 +71568,12 @@ public: /* begin file simdjson/generic/ondemand/object_iterator.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -71651,10 +71651,10 @@ public: /* begin file simdjson/generic/ondemand/serialization.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { /** @@ -71759,7 +71759,7 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result simdjson_result &simdjson_resul /* begin file simdjson/generic/ondemand/document-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array-inl.h" */ @@ -72081,7 +72081,7 @@ simdjson_inline simdjson_result &simdjson_resul /* 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): #include "simdjson/generic/ondemand/value_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -72895,13 +72895,13 @@ simdjson_inline simdjson_result simdjson_result #include @@ -73322,13 +73322,13 @@ simdjson_inline simdjson_result::simdjson_resu /* begin file simdjson/generic/ondemand/field-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/field.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value-inl.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -73415,7 +73415,7 @@ simdjson_inline simdjson_result simdjson_result simdjson_result::simdjson_result /* begin file simdjson/generic/ondemand/json_type-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/json_type.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -73948,13 +73948,13 @@ simdjson_inline simdjson_result::simdjson_result(err /* begin file simdjson/generic/ondemand/logger-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include #include @@ -74176,7 +74176,7 @@ inline void log_line(const json_iterator &iter, token_position index, depth_t de /* begin file simdjson/generic/ondemand/object-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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" */ @@ -74185,7 +74185,7 @@ 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -74439,13 +74439,13 @@ simdjson_inline simdjson_result simdjson_result &simdjson_resu /* begin file simdjson/generic/ondemand/parser-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/padded_string.h" */ /* amalgamation skipped (editor-only): #include "simdjson/padded_string_view.h" */ @@ -74591,7 +74591,7 @@ simdjson_inline simdjson_result &simdjson_resu /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/document_stream.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/parser.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/raw_json_string.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -74747,13 +74747,13 @@ simdjson_inline simdjson_result::simdjson_result(error_ /* begin file simdjson/generic/ondemand/raw_json_string-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -74953,7 +74953,7 @@ simdjson_inline simdjson_warn_unused simdjson_result simdjson_ /* begin file simdjson/generic/ondemand/serialization-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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" */ @@ -74962,7 +74962,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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -75189,12 +75189,12 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::ppc64::ondemand::ob /* begin file simdjson/generic/ondemand/token_iterator-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -75281,7 +75281,7 @@ simdjson_inline simdjson_result::simdjson_resul /* begin file simdjson/generic/ondemand/value-inl.h for ppc64 */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array.h" */ @@ -75291,7 +75291,7 @@ simdjson_inline simdjson_result::simdjson_resul /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/object.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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace ppc64 { @@ -75723,7 +75723,7 @@ simdjson_inline simdjson_result simdjson_result simdjson_result::simdjson_resul /* end file simdjson/generic/ondemand/amalgamated.h for ppc64 */ /* including simdjson/ppc64/end.h: #include "simdjson/ppc64/end.h" */ /* begin file simdjson/ppc64/end.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/ppc64/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ /* undefining SIMDJSON_IMPLEMENTATION from "ppc64" */ #undef SIMDJSON_IMPLEMENTATION @@ -76801,9 +76801,9 @@ simdjson_inline simdjson_result::simdjson_resul #ifndef SIMDJSON_WESTMERE_BASE_H #define SIMDJSON_WESTMERE_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_WESTMERE namespace simdjson { @@ -76833,9 +76833,9 @@ template struct simd8x64; #ifndef SIMDJSON_WESTMERE_INTRINSICS_H #define SIMDJSON_WESTMERE_INTRINSICS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if SIMDJSON_VISUAL_STUDIO // under clang within visual studio, this will include @@ -76872,10 +76872,10 @@ SIMDJSON_TARGET_REGION("sse4.2,pclmul,popcnt") #ifndef SIMDJSON_WESTMERE_BITMANIPULATION_H #define SIMDJSON_WESTMERE_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -76954,10 +76954,10 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, #ifndef SIMDJSON_WESTMERE_BITMASK_H #define SIMDJSON_WESTMERE_BITMASK_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -76992,9 +76992,9 @@ simdjson_inline uint64_t prefix_xor(const uint64_t bitmask) { #ifndef SIMDJSON_WESTMERE_BASE_H #define SIMDJSON_WESTMERE_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ // The constructor may be executed on any host, so we take care not to use SIMDJSON_TARGET_WESTMERE namespace simdjson { @@ -77024,9 +77024,9 @@ template struct simd8x64; #ifndef SIMDJSON_WESTMERE_INTRINSICS_H #define SIMDJSON_WESTMERE_INTRINSICS_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if SIMDJSON_VISUAL_STUDIO // under clang within visual studio, this will include @@ -77054,9 +77054,9 @@ static_assert(sizeof(__m128i) <= simdjson::SIMDJSON_PADDING, "insufficient paddi #endif // SIMDJSON_WESTMERE_INTRINSICS_H /* end file simdjson/westmere/intrinsics.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/internal/numberparsing_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -77113,11 +77113,11 @@ simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t #ifndef SIMDJSON_WESTMERE_SIMD_H #define SIMDJSON_WESTMERE_SIMD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -77459,10 +77459,10 @@ namespace simd { #ifndef SIMDJSON_WESTMERE_BITMANIPULATION_H #define SIMDJSON_WESTMERE_BITMANIPULATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/intrinsics.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -77541,11 +77541,11 @@ simdjson_inline bool add_overflow(uint64_t value1, uint64_t value2, #ifndef SIMDJSON_WESTMERE_SIMD_H #define SIMDJSON_WESTMERE_SIMD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/bitmanipulation.h" */ /* amalgamation skipped (editor-only): #include "simdjson/internal/simdprune_tables.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -77923,7 +77923,7 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* end file simdjson/westmere/begin.h */ /* including simdjson/generic/ondemand/amalgamated.h for westmere: #include "simdjson/generic/ondemand/amalgamated.h" */ /* begin file simdjson/generic/ondemand/amalgamated.h for westmere */ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_GENERIC_ONDEMAND_DEPENDENCIES_H) #error simdjson/generic/ondemand/dependencies.h must be included before simdjson/generic/ondemand/amalgamated.h! #endif @@ -77932,10 +77932,10 @@ simdjson_inline backslash_and_quote backslash_and_quote::copy_and_find(const uin /* begin file simdjson/generic/ondemand/base.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_BASE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_BASE_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -77982,11 +77982,11 @@ class value_iterator; /* begin file simdjson/generic/ondemand/value_iterator.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -78471,12 +78471,12 @@ public: /* begin file simdjson/generic/ondemand/value.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -79181,10 +79181,10 @@ public: /* begin file simdjson/generic/ondemand/logger.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -79242,12 +79242,12 @@ static inline void log_error(const value_iterator &iter, const char *error, cons /* begin file simdjson/generic/ondemand/token_iterator.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -79396,12 +79396,12 @@ public: /* begin file simdjson/generic/ondemand/json_iterator.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -79724,12 +79724,12 @@ public: /* begin file simdjson/generic/ondemand/json_type.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -79889,11 +79889,11 @@ public: /* begin file simdjson/generic/ondemand/raw_json_string.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -80098,11 +80098,11 @@ public: /* begin file simdjson/generic/ondemand/parser.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include @@ -80458,12 +80458,12 @@ public: /* begin file simdjson/generic/ondemand/array.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -80660,12 +80660,12 @@ public: /* begin file simdjson/generic/ondemand/array_iterator.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_ARRAY_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -80759,11 +80759,11 @@ public: /* begin file simdjson/generic/ondemand/document.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -81569,13 +81569,13 @@ public: /* begin file simdjson/generic/ondemand/document_stream.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_STREAM_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #ifdef SIMDJSON_THREADS_ENABLED #include @@ -81911,13 +81911,13 @@ public: /* begin file simdjson/generic/ondemand/field.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -81996,12 +81996,12 @@ public: /* begin file simdjson/generic/ondemand/object.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -82238,12 +82238,12 @@ public: /* begin file simdjson/generic/ondemand/object_iterator.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_ITERATOR_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -82321,10 +82321,10 @@ public: /* begin file simdjson/generic/ondemand/serialization.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { /** @@ -82429,7 +82429,7 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::simdjson_result simdjson_result &simdjson_re /* begin file simdjson/generic/ondemand/document-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array-inl.h" */ @@ -82751,7 +82751,7 @@ simdjson_inline simdjson_result &simdjson_re /* 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): #include "simdjson/generic/ondemand/value_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -83565,13 +83565,13 @@ simdjson_inline simdjson_result simdjson_result #include @@ -83992,13 +83992,13 @@ simdjson_inline simdjson_result::simdjson_r /* begin file simdjson/generic/ondemand/field-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_FIELD_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/field.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value-inl.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/value_iterator-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -84085,7 +84085,7 @@ simdjson_inline simdjson_result simdjson_result simdjson_result::simdjson_res /* begin file simdjson/generic/ondemand/json_type-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_JSON_TYPE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/json_type.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/implementation_simdjson_result_base-inl.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -84618,13 +84618,13 @@ simdjson_inline simdjson_result::simdjson_result( /* begin file simdjson/generic/ondemand/logger-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_LOGGER_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #include #include @@ -84846,7 +84846,7 @@ inline void log_line(const json_iterator &iter, token_position index, depth_t de /* begin file simdjson/generic/ondemand/object-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_OBJECT_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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" */ @@ -84855,7 +84855,7 @@ 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -85109,13 +85109,13 @@ simdjson_inline simdjson_result simdjson_result &simdjson_r /* begin file simdjson/generic/ondemand/parser-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_PARSER_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/padded_string.h" */ /* amalgamation skipped (editor-only): #include "simdjson/padded_string_view.h" */ @@ -85261,7 +85261,7 @@ simdjson_inline simdjson_result &simdjson_r /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/document_stream.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/parser.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/raw_json_string.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -85417,13 +85417,13 @@ simdjson_inline simdjson_result::simdjson_result(err /* begin file simdjson/generic/ondemand/raw_json_string-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_RAW_JSON_STRING_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -85623,7 +85623,7 @@ simdjson_inline simdjson_warn_unused simdjson_result simdjson_ /* begin file simdjson/generic/ondemand/serialization-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_SERIALIZATION_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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" */ @@ -85632,7 +85632,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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { @@ -85859,12 +85859,12 @@ inline std::ostream& operator<<(std::ostream& out, simdjson::westmere::ondemand: /* begin file simdjson/generic/ondemand/token_iterator-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_TOKEN_ITERATOR_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* 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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -85951,7 +85951,7 @@ simdjson_inline simdjson_result::simdjson_re /* begin file simdjson/generic/ondemand/value-inl.h for westmere */ #ifndef SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #define SIMDJSON_GENERIC_ONDEMAND_VALUE_INL_H */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/base.h" */ /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/array.h" */ @@ -85961,7 +85961,7 @@ simdjson_inline simdjson_result::simdjson_re /* amalgamation skipped (editor-only): #include "simdjson/generic/ondemand/object.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_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ namespace simdjson { namespace westmere { @@ -86393,7 +86393,7 @@ simdjson_inline simdjson_result simdjson_result simdjson_result::simdjson_re /* end file simdjson/generic/ondemand/amalgamated.h for westmere */ /* including simdjson/westmere/end.h: #include "simdjson/westmere/end.h" */ /* begin file simdjson/westmere/end.h */ -/* amalgamation skipped (editor-only): #ifndef SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #ifndef SIMDJSON_CONDITIONAL_INCLUDE */ /* amalgamation skipped (editor-only): #include "simdjson/westmere/base.h" */ -/* amalgamation skipped (editor-only): #endif // SIMDJSON_AMALGAMATED */ +/* amalgamation skipped (editor-only): #endif // SIMDJSON_CONDITIONAL_INCLUDE */ #if !SIMDJSON_CAN_ALWAYS_RUN_WESTMERE SIMDJSON_UNTARGET_REGION @@ -87464,8 +87464,8 @@ SIMDJSON_UNTARGET_REGION #error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION #endif -/* undefining SIMDJSON_AMALGAMATED */ -#undef SIMDJSON_AMALGAMATED +/* undefining SIMDJSON_CONDITIONAL_INCLUDE */ +#undef SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { /** diff --git a/src/arm64.cpp b/src/arm64.cpp index d09576dc2..5ec7d0cd8 100644 --- a/src/arm64.cpp +++ b/src/arm64.cpp @@ -1,9 +1,9 @@ #ifndef SIMDJSON_SRC_ARM64_CPP #define SIMDJSON_SRC_ARM64_CPP -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include #include diff --git a/src/fallback.cpp b/src/fallback.cpp index bf525c1df..f8e87be06 100644 --- a/src/fallback.cpp +++ b/src/fallback.cpp @@ -1,9 +1,9 @@ #ifndef SIMDJSON_SRC_FALLBACK_CPP #define SIMDJSON_SRC_FALLBACK_CPP -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include #include diff --git a/src/generic/amalgamated.h b/src/generic/amalgamated.h index 7508457d0..32154f602 100644 --- a/src/generic/amalgamated.h +++ b/src/generic/amalgamated.h @@ -1,4 +1,4 @@ -#if defined(SIMDJSON_AMALGAMATED) && !defined(SIMDJSON_SRC_GENERIC_DEPENDENCIES_H) +#if defined(SIMDJSON_CONDITIONAL_INCLUDE) && !defined(SIMDJSON_SRC_GENERIC_DEPENDENCIES_H) #error generic/dependencies.h must be included before generic/amalgamated.h! #endif diff --git a/src/generic/base.h b/src/generic/base.h index 5a5bfe8a4..77947651a 100644 --- a/src/generic/base.h +++ b/src/generic/base.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_SRC_GENERIC_BASE_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_BASE_H #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/src/generic/dependencies.h b/src/generic/dependencies.h index d5202f8fa..ce5a2f011 100644 --- a/src/generic/dependencies.h +++ b/src/generic/dependencies.h @@ -1,5 +1,5 @@ -#ifdef SIMDJSON_AMALGAMATED -#error generic/dependencies.h must be included before defining SIMDJSON_AMALGAMATED! +#ifdef SIMDJSON_CONDITIONAL_INCLUDE +#error generic/dependencies.h must be included before defining SIMDJSON_CONDITIONAL_INCLUDE! #endif #ifndef SIMDJSON_SRC_GENERIC_DEPENDENCIES_H diff --git a/src/generic/dom_parser_implementation.h b/src/generic/dom_parser_implementation.h index e408cbd9f..9ec3fe8c0 100644 --- a/src/generic/dom_parser_implementation.h +++ b/src/generic/dom_parser_implementation.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_SRC_GENERIC_DOM_PARSER_IMPLEMENTATION_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_DOM_PARSER_IMPLEMENTATION_H #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE // Interface a dom parser implementation must fulfill namespace simdjson { diff --git a/src/generic/json_character_block.h b/src/generic/json_character_block.h index 5f6954ff9..7cce34c83 100644 --- a/src/generic/json_character_block.h +++ b/src/generic/json_character_block.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_SRC_GENERIC_JSON_CHARACTER_BLOCK_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_JSON_CHARACTER_BLOCK_H #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/src/generic/stage1/base.h b/src/generic/stage1/base.h index 2dde8a416..a6413fadb 100644 --- a/src/generic/stage1/base.h +++ b/src/generic/stage1/base.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_BASE_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE1_BASE_H #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/src/generic/stage1/buf_block_reader.h b/src/generic/stage1/buf_block_reader.h index e84f2859b..4efbae1c8 100644 --- a/src/generic/stage1/buf_block_reader.h +++ b/src/generic/stage1/buf_block_reader.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_BUF_BLOCK_READER_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE1_BUF_BLOCK_READER_H #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include diff --git a/src/generic/stage1/find_next_document_index.h b/src/generic/stage1/find_next_document_index.h index ca12e078f..162595438 100644 --- a/src/generic/stage1/find_next_document_index.h +++ b/src/generic/stage1/find_next_document_index.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE1_FIND_NEXT_DOCUMENT_INDEX_H #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/src/generic/stage1/json_minifier.h b/src/generic/stage1/json_minifier.h index 02e244282..22ddaf2dd 100644 --- a/src/generic/stage1/json_minifier.h +++ b/src/generic/stage1/json_minifier.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_MINIFIER_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_MINIFIER_H #include #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE // This file contains the common code every implementation uses in stage1 // It is intended to be included multiple times and compiled multiple times diff --git a/src/generic/stage1/json_scanner.h b/src/generic/stage1/json_scanner.h index e2294bf0d..9ef41fb34 100644 --- a/src/generic/stage1/json_scanner.h +++ b/src/generic/stage1/json_scanner.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_SCANNER_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_SCANNER_H #include #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/src/generic/stage1/json_string_scanner.h b/src/generic/stage1/json_string_scanner.h index d850db934..95d719cf3 100644 --- a/src/generic/stage1/json_string_scanner.h +++ b/src/generic/stage1/json_string_scanner.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRING_SCANNER_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRING_SCANNER_H #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/src/generic/stage1/json_structural_indexer.h b/src/generic/stage1/json_structural_indexer.h index c8b41a694..a6ac4be2d 100644 --- a/src/generic/stage1/json_structural_indexer.h +++ b/src/generic/stage1/json_structural_indexer.h @@ -1,6 +1,6 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRUCTURAL_INDEXER_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE1_JSON_STRUCTURAL_INDEXER_H #include #include @@ -9,7 +9,7 @@ #include #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE // This file contains the common code every implementation uses in stage1 // It is intended to be included multiple times and compiled multiple times diff --git a/src/generic/stage1/utf8_lookup4_algorithm.h b/src/generic/stage1/utf8_lookup4_algorithm.h index ce7a35e5d..a49ba54f9 100644 --- a/src/generic/stage1/utf8_lookup4_algorithm.h +++ b/src/generic/stage1/utf8_lookup4_algorithm.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_UTF8_LOOKUP4_ALGORITHM_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE1_UTF8_LOOKUP4_ALGORITHM_H #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/src/generic/stage1/utf8_validator.h b/src/generic/stage1/utf8_validator.h index d1d7895d9..ffc651ad9 100644 --- a/src/generic/stage1/utf8_validator.h +++ b/src/generic/stage1/utf8_validator.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE1_UTF8_VALIDATOR_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE1_UTF8_VALIDATOR_H #include #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/src/generic/stage2/base.h b/src/generic/stage2/base.h index 7b1f73b68..b2e987c40 100644 --- a/src/generic/stage2/base.h +++ b/src/generic/stage2/base.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_BASE_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE2_BASE_H #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/src/generic/stage2/json_iterator.h b/src/generic/stage2/json_iterator.h index 170236f5a..a9ddf47d8 100644 --- a/src/generic/stage2/json_iterator.h +++ b/src/generic/stage2/json_iterator.h @@ -1,11 +1,11 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE2_JSON_ITERATOR_H #include #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/src/generic/stage2/logger.h b/src/generic/stage2/logger.h index 15e163391..60955495e 100644 --- a/src/generic/stage2/logger.h +++ b/src/generic/stage2/logger.h @@ -1,9 +1,9 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE2_LOGGER_H #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include diff --git a/src/generic/stage2/stringparsing.h b/src/generic/stage2/stringparsing.h index c0d49a2d4..2007661f6 100644 --- a/src/generic/stage2/stringparsing.h +++ b/src/generic/stage2/stringparsing.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE2_STRINGPARSING_H #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE // This file contains the common code every implementation uses // It is intended to be included multiple times and compiled multiple times diff --git a/src/generic/stage2/structural_iterator.h b/src/generic/stage2/structural_iterator.h index c662f2851..3f5ec4ff4 100644 --- a/src/generic/stage2/structural_iterator.h +++ b/src/generic/stage2/structural_iterator.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_STRUCTURAL_ITERATOR_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE2_STRUCTURAL_ITERATOR_H #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace SIMDJSON_IMPLEMENTATION { diff --git a/src/generic/stage2/tape_builder.h b/src/generic/stage2/tape_builder.h index 6932b9324..52931010f 100644 --- a/src/generic/stage2/tape_builder.h +++ b/src/generic/stage2/tape_builder.h @@ -1,6 +1,6 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_BUILDER_H #include #include @@ -10,7 +10,7 @@ #include #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { diff --git a/src/generic/stage2/tape_writer.h b/src/generic/stage2/tape_writer.h index fd8a27854..947aa6d09 100644 --- a/src/generic/stage2/tape_writer.h +++ b/src/generic/stage2/tape_writer.h @@ -1,10 +1,10 @@ #ifndef SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #define SIMDJSON_SRC_GENERIC_STAGE2_TAPE_WRITER_H #include #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include diff --git a/src/haswell.cpp b/src/haswell.cpp index 0e40a6c34..1524e8655 100644 --- a/src/haswell.cpp +++ b/src/haswell.cpp @@ -1,9 +1,9 @@ #ifndef SIMDJSON_SRC_HASWELL_CPP #define SIMDJSON_SRC_HASWELL_CPP -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include #include diff --git a/src/icelake.cpp b/src/icelake.cpp index 4892a0888..ca1adf057 100644 --- a/src/icelake.cpp +++ b/src/icelake.cpp @@ -1,9 +1,9 @@ #ifndef SIMDJSON_SRC_ICELAKE_CPP #define SIMDJSON_SRC_ICELAKE_CPP -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include #include diff --git a/src/implementation.cpp b/src/implementation.cpp index 0eb5f7566..704f3187f 100644 --- a/src/implementation.cpp +++ b/src/implementation.cpp @@ -18,7 +18,7 @@ bool implementation::supported_by_runtime_system() const { } // namespace simdjson -#define SIMDJSON_AMALGAMATED +#define SIMDJSON_CONDITIONAL_INCLUDE #if SIMDJSON_IMPLEMENTATION_ARM64 #include @@ -93,7 +93,7 @@ static const simdjson::westmere::implementation* get_westmere_singleton() { } // namespace simdjson #endif // SIMDJSON_IMPLEMENTATION_WESTMERE -#undef SIMDJSON_AMALGAMATED +#undef SIMDJSON_CONDITIONAL_INCLUDE namespace simdjson { namespace internal { diff --git a/src/ppc64.cpp b/src/ppc64.cpp index bada4c374..0de9e42f2 100644 --- a/src/ppc64.cpp +++ b/src/ppc64.cpp @@ -1,9 +1,9 @@ #ifndef SIMDJSON_SRC_PPC64_CPP #define SIMDJSON_SRC_PPC64_CPP -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include #include diff --git a/src/simdjson.cpp b/src/simdjson.cpp index 401699638..5e5cb14e9 100644 --- a/src/simdjson.cpp +++ b/src/simdjson.cpp @@ -18,7 +18,7 @@ SIMDJSON_PUSH_DISABLE_UNUSED_WARNINGS #include -#define SIMDJSON_AMALGAMATED +#define SIMDJSON_CONDITIONAL_INCLUDE #if SIMDJSON_IMPLEMENTATION_ARM64 #include @@ -39,7 +39,7 @@ SIMDJSON_PUSH_DISABLE_UNUSED_WARNINGS #include #endif -#undef SIMDJSON_AMALGAMATED +#undef SIMDJSON_CONDITIONAL_INCLUDE SIMDJSON_POP_DISABLE_UNUSED_WARNINGS diff --git a/src/westmere.cpp b/src/westmere.cpp index 7cd0f350f..2b1dba47b 100644 --- a/src/westmere.cpp +++ b/src/westmere.cpp @@ -1,9 +1,9 @@ #ifndef SIMDJSON_SRC_WESTMERE_CPP #define SIMDJSON_SRC_WESTMERE_CPP -#ifndef SIMDJSON_AMALGAMATED +#ifndef SIMDJSON_CONDITIONAL_INCLUDE #include -#endif // SIMDJSON_AMALGAMATED +#endif // SIMDJSON_CONDITIONAL_INCLUDE #include #include