diff --git a/HACKING.md b/HACKING.md index 695500dac..77f4e614d 100644 --- a/HACKING.md +++ b/HACKING.md @@ -43,7 +43,7 @@ simdjson's source structure, from the top level, looks like this: * simdjson.h: A "main include" that includes files from include/simdjson/. This is equivalent to the distributed simdjson.h. * simdjson/*.h: Declarations for public simdjson classes and functions. - * simdjson/inline/*.h: Definitions for public simdjson classes and functions. + * simdjson/*-inl.h: Definitions for public simdjson classes and functions. * **src:** The source files for non-inlined functionality (e.g. the architecture-specific parser implementations). * simdjson.cpp: A "main source" that includes all implementation files from src/. This is diff --git a/include/simdjson.h b/include/simdjson.h index fe461cb14..eef1acedf 100644 --- a/include/simdjson.h +++ b/include/simdjson.h @@ -58,16 +58,16 @@ SIMDJSON_DISABLE_UNDESIRED_WARNINGS #include "simdjson/dom/parsedjson_iterator.h" // Inline functions -#include "simdjson/inline/array.h" -#include "simdjson/inline/document_stream.h" -#include "simdjson/inline/document.h" -#include "simdjson/inline/element.h" -#include "simdjson/inline/error.h" -#include "simdjson/inline/object.h" -#include "simdjson/inline/padded_string.h" -#include "simdjson/inline/parsedjson_iterator.h" -#include "simdjson/inline/parser.h" -#include "simdjson/inline/tape_ref.h" +#include "simdjson/dom/array-inl.h" +#include "simdjson/dom/document_stream-inl.h" +#include "simdjson/dom/document-inl.h" +#include "simdjson/dom/element-inl.h" +#include "simdjson/error-inl.h" +#include "simdjson/dom/object-inl.h" +#include "simdjson/padded_string-inl.h" +#include "simdjson/dom/parsedjson_iterator-inl.h" +#include "simdjson/dom/parser-inl.h" +#include "simdjson/internal/tape_ref-inl.h" SIMDJSON_POP_DISABLE_WARNINGS diff --git a/include/simdjson/inline/array.h b/include/simdjson/dom/array-inl.h similarity index 99% rename from include/simdjson/inline/array.h rename to include/simdjson/dom/array-inl.h index a01624751..de9f44a7f 100644 --- a/include/simdjson/inline/array.h +++ b/include/simdjson/dom/array-inl.h @@ -181,7 +181,7 @@ inline std::ostream& operator<<(std::ostream& out, const simdjson_result); diff --git a/include/simdjson/inline/document.h b/include/simdjson/dom/document-inl.h similarity index 100% rename from include/simdjson/inline/document.h rename to include/simdjson/dom/document-inl.h diff --git a/include/simdjson/inline/document_stream.h b/include/simdjson/dom/document_stream-inl.h similarity index 100% rename from include/simdjson/inline/document_stream.h rename to include/simdjson/dom/document_stream-inl.h diff --git a/include/simdjson/inline/element.h b/include/simdjson/dom/element-inl.h similarity index 100% rename from include/simdjson/inline/element.h rename to include/simdjson/dom/element-inl.h diff --git a/include/simdjson/inline/object.h b/include/simdjson/dom/object-inl.h similarity index 100% rename from include/simdjson/inline/object.h rename to include/simdjson/dom/object-inl.h diff --git a/include/simdjson/inline/parsedjson_iterator.h b/include/simdjson/dom/parsedjson_iterator-inl.h similarity index 100% rename from include/simdjson/inline/parsedjson_iterator.h rename to include/simdjson/dom/parsedjson_iterator-inl.h diff --git a/include/simdjson/inline/parser.h b/include/simdjson/dom/parser-inl.h similarity index 100% rename from include/simdjson/inline/parser.h rename to include/simdjson/dom/parser-inl.h diff --git a/include/simdjson/inline/error.h b/include/simdjson/error-inl.h similarity index 100% rename from include/simdjson/inline/error.h rename to include/simdjson/error-inl.h diff --git a/include/simdjson/inline/tape_ref.h b/include/simdjson/internal/tape_ref-inl.h similarity index 100% rename from include/simdjson/inline/tape_ref.h rename to include/simdjson/internal/tape_ref-inl.h diff --git a/include/simdjson/inline/padded_string.h b/include/simdjson/padded_string-inl.h similarity index 100% rename from include/simdjson/inline/padded_string.h rename to include/simdjson/padded_string-inl.h