Namespace current modules under src/core (#1479)

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Jan 27, 2025 · 5c43c57 · 5c43c57 · github-actions · Jan 27, 2025
1 parent 9b74613
commit 5c43c57
Show file tree

Hide file tree

Showing 68 changed files with 44 additions and 81 deletions.
diff --git a/.github/workflows/website-build.yml b/.github/workflows/website-build.yml
@@ -16,11 +16,10 @@ jobs:
       - run: >
           cmake -S . -B ./build
           -DCMAKE_BUILD_TYPE:STRING=Release
-          -DJSONTOOLKIT_URI:BOOL=OFF
-          -DJSONTOOLKIT_JSON:BOOL=OFF
-          -DJSONTOOLKIT_JSONSCHEMA:BOOL=OFF
-          -DJSONTOOLKIT_JSONPOINTER:BOOL=OFF
-          -DJSONTOOLKIT_YAML:BOOL=OFF
-          -DJSONTOOLKIT_TESTS:BOOL=OFF
+          -DJSONTOOLKIT_CORE_URI:BOOL=OFF
+          -DJSONTOOLKIT_CORE_JSON:BOOL=OFF
+          -DJSONTOOLKIT_CORE_JSONSCHEMA:BOOL=OFF
+          -DJSONTOOLKIT_CORE_JSONPOINTER:BOOL=OFF
+          -DJSONTOOLKIT_CORE_YAML:BOOL=OFF
           -DJSONTOOLKIT_DOCS:BOOL=ON
       - run: cmake --build ./build --config Release --target doxygen
diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml
@@ -26,12 +26,11 @@ jobs:
       - run: >
           cmake -S . -B ./build
           -DCMAKE_BUILD_TYPE:STRING=Release
-          -DJSONTOOLKIT_URI:BOOL=OFF
-          -DJSONTOOLKIT_JSON:BOOL=OFF
-          -DJSONTOOLKIT_JSONSCHEMA:BOOL=OFF
-          -DJSONTOOLKIT_JSONPOINTER:BOOL=OFF
-          -DJSONTOOLKIT_YAML:BOOL=OFF
-          -DJSONTOOLKIT_TESTS:BOOL=OFF
+          -DJSONTOOLKIT_CORE_URI:BOOL=OFF
+          -DJSONTOOLKIT_CORE_JSON:BOOL=OFF
+          -DJSONTOOLKIT_CORE_JSONSCHEMA:BOOL=OFF
+          -DJSONTOOLKIT_CORE_JSONPOINTER:BOOL=OFF
+          -DJSONTOOLKIT_CORE_YAML:BOOL=OFF
           -DJSONTOOLKIT_DOCS:BOOL=ON
       - run: cmake --build ./build --config Release --target doxygen
       - name: Setup Pages

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,12 +5,12 @@ project(jsontoolkit VERSION 2.0.0 LANGUAGES C CXX
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 # Options
-option(JSONTOOLKIT_URI "Build the JSON Toolkit URI library" ON)
-option(JSONTOOLKIT_JSON "Build the JSON Toolkit JSON library" ON)
-option(JSONTOOLKIT_JSONSCHEMA "Build the JSON Toolkit JSON Schema library" ON)
-option(JSONTOOLKIT_JSONPOINTER "Build the JSON Toolkit JSON Pointer library" ON)
-option(JSONTOOLKIT_JSONL "Build the JSON Toolkit JSONL library" ON)
-option(JSONTOOLKIT_YAML "Build the JSON Toolkit YAML library" ON)
+option(JSONTOOLKIT_CORE_URI "Build the JSON Toolkit URI library" ON)
+option(JSONTOOLKIT_CORE_JSON "Build the JSON Toolkit JSON library" ON)
+option(JSONTOOLKIT_CORE_JSONSCHEMA "Build the JSON Toolkit JSON Schema library" ON)
+option(JSONTOOLKIT_CORE_JSONPOINTER "Build the JSON Toolkit JSON Pointer library" ON)
+option(JSONTOOLKIT_CORE_JSONL "Build the JSON Toolkit JSONL library" ON)
+option(JSONTOOLKIT_CORE_YAML "Build the JSON Toolkit YAML library" ON)
 option(JSONTOOLKIT_TESTS "Build the JSON Toolkit tests" OFF)
 option(JSONTOOLKIT_BENCHMARK "Build the JSON Toolkit benchmarks" OFF)
 option(JSONTOOLKIT_DOCS "Build the JSON Toolkit docs" OFF)
@@ -37,31 +37,31 @@ if(JSONTOOLKIT_INSTALL)
     COMPONENT sourcemeta_jsontoolkit_dev)
 endif()
 
-if(JSONTOOLKIT_URI)
+if(JSONTOOLKIT_CORE_URI)
   find_package(UriParser REQUIRED)
-  add_subdirectory(src/uri)
+  add_subdirectory(src/core/uri)
 endif()
 
-if(JSONTOOLKIT_JSON)
-  add_subdirectory(src/json)
+if(JSONTOOLKIT_CORE_JSON)
+  add_subdirectory(src/core/json)
 endif()
 
-if(JSONTOOLKIT_JSON AND JSONTOOLKIT_JSONPOINTER)
-  add_subdirectory(src/jsonpointer)
+if(JSONTOOLKIT_CORE_JSON AND JSONTOOLKIT_CORE_JSONPOINTER)
+  add_subdirectory(src/core/jsonpointer)
 endif()
 
-if(JSONTOOLKIT_URI AND JSONTOOLKIT_JSON AND
-   JSONTOOLKIT_JSONPOINTER AND JSONTOOLKIT_JSONSCHEMA)
-  add_subdirectory(src/jsonschema)
+if(JSONTOOLKIT_CORE_URI AND JSONTOOLKIT_CORE_JSON AND
+   JSONTOOLKIT_CORE_JSONPOINTER AND JSONTOOLKIT_CORE_JSONSCHEMA)
+  add_subdirectory(src/core/jsonschema)
 endif()
 
-if(JSONTOOLKIT_JSON AND JSONTOOLKIT_JSONL)
-  add_subdirectory(src/jsonl)
+if(JSONTOOLKIT_CORE_JSON AND JSONTOOLKIT_CORE_JSONL)
+  add_subdirectory(src/core/jsonl)
 endif()
 
-if(JSONTOOLKIT_JSON AND JSONTOOLKIT_YAML)
+if(JSONTOOLKIT_CORE_JSON AND JSONTOOLKIT_CORE_YAML)
   find_package(yaml REQUIRED)
-  add_subdirectory(src/yaml)
+  add_subdirectory(src/core/yaml)
 endif()
 
 if(JSONTOOLKIT_ADDRESS_SANITIZER)
@@ -88,28 +88,28 @@ endif()
 if(JSONTOOLKIT_TESTS)
   enable_testing()
 
-  if(JSONTOOLKIT_URI)
+  if(JSONTOOLKIT_CORE_URI)
     add_subdirectory(test/uri)
   endif()
 
-  if(JSONTOOLKIT_JSON)
+  if(JSONTOOLKIT_CORE_JSON)
     add_subdirectory(test/json)
   endif()
 
-  if(JSONTOOLKIT_JSON AND JSONTOOLKIT_JSONPOINTER)
+  if(JSONTOOLKIT_CORE_JSON AND JSONTOOLKIT_CORE_JSONPOINTER)
     add_subdirectory(test/jsonpointer)
   endif()
 
-  if(JSONTOOLKIT_URI AND JSONTOOLKIT_JSON AND
-     JSONTOOLKIT_JSONPOINTER AND JSONTOOLKIT_JSONSCHEMA)
+  if(JSONTOOLKIT_CORE_URI AND JSONTOOLKIT_CORE_JSON AND
+     JSONTOOLKIT_CORE_JSONPOINTER AND JSONTOOLKIT_CORE_JSONSCHEMA)
     add_subdirectory(test/jsonschema)
   endif()
 
-  if(JSONTOOLKIT_JSON AND JSONTOOLKIT_JSONL)
+  if(JSONTOOLKIT_CORE_JSON AND JSONTOOLKIT_CORE_JSONL)
     add_subdirectory(test/jsonl)
   endif()
 
-  if(JSONTOOLKIT_JSON AND JSONTOOLKIT_YAML)
+  if(JSONTOOLKIT_CORE_JSON AND JSONTOOLKIT_CORE_YAML)
     add_subdirectory(test/yaml)
   endif()
 

diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -1,10 +1,10 @@
 set(BENCHMARK_SOURCES)
 
-if(JSONTOOLKIT_JSON)
+if(JSONTOOLKIT_CORE_JSON)
   list(APPEND BENCHMARK_SOURCES json.cc)
 endif()
 
-if(JSONTOOLKIT_JSONPOINTER)
+if(JSONTOOLKIT_CORE_JSONPOINTER)
   list(APPEND BENCHMARK_SOURCES jsonpointer.cc)
 endif()
 
@@ -15,12 +15,12 @@ if(BENCHMARK_SOURCES)
   target_compile_definitions(sourcemeta_jsontoolkit_benchmark
     PRIVATE CURRENT_DIRECTORY="${CMAKE_CURRENT_SOURCE_DIR}")
 
-  if(JSONTOOLKIT_JSON)
+  if(JSONTOOLKIT_CORE_JSON)
     target_link_libraries(sourcemeta_jsontoolkit_benchmark
       PRIVATE sourcemeta::jsontoolkit::json)
   endif()
 
-  if(JSONTOOLKIT_JSONPOINTER)
+  if(JSONTOOLKIT_CORE_JSONPOINTER)
     target_link_libraries(sourcemeta_jsontoolkit_benchmark
       PRIVATE sourcemeta::jsontoolkit::jsonpointer)
   endif()

diff --git a/doxygen/index.markdown b/doxygen/index.markdown
@@ -69,32 +69,14 @@ target_link_libraries(my_executable_or_library PUBLIC sourcemeta::jsontoolkit::j
 target_link_libraries(my_executable_or_library PUBLIC sourcemeta::jsontoolkit::jsonl)
 ```
 
-At the moment of this writing, JSON Toolkit is available with `find_package`
-integration on the following package managers:
-
-```sh
-# Homebrew
-$ brew install jsontoolkit
-```
-
 CMake
 -----
 
 ### Options
 
-| Option                            | Type    | Default | Description                                           |
-|-----------------------------------|---------|---------|-------------------------------------------------------|
-| `JSONTOOLKIT_URI`                 | Boolean | `ON`    | Build the JSON Toolkit URI library                    |
-| `JSONTOOLKIT_JSON`                | Boolean | `ON`    | Build the JSON Toolkit JSON library                   |
-| `JSONTOOLKIT_JSONSCHEMA`          | Boolean | `ON`    | Build the JSON Toolkit JSON Schema library            |
-| `JSONTOOLKIT_JSONPOINTER`         | Boolean | `ON`    | Build the JSON Toolkit JSON Pointer library           |
-| `JSONTOOLKIT_JSONL`               | Boolean | `ON`    | Build the JSON Toolkit JSONL library                  |
-| `JSONTOOLKIT_YAML`                | Boolean | `ON`    | Build the JSON Toolkit YAML library                   |
-| `JSONTOOLKIT_TESTS`               | Boolean | `OFF`   | Build the JSON Toolkit tests                          |
-| `JSONTOOLKIT_DOCS`                | Boolean | `OFF`   | Build the JSON Toolkit docs                           |
-| `JSONTOOLKIT_INSTALL`             | Boolean | `ON`    | Install the JSON Toolkit library                      |
-| `JSONTOOLKIT_ADDRESS_SANITIZER`   | Boolean | `OFF`   | Enable the address sanitizer                          |
-| `JSONTOOLKIT_UNDEFINED_SANITIZER` | Boolean | `OFF`   | Enable the undefined behavior sanitizer               |
+Check the top-level
+[`CMakeLists.txt`](https://github.com/sourcemeta/jsontoolkit/blob/main/CMakeLists.txt)
+for the available CMake options.
 
 ### Components
 
@@ -109,24 +91,7 @@ into a set of CMake components:
 Contributing
 ------------
 
-JSON Toolkit makes use of the [CMake](https://cmake.org) build system. You can
-configure, build and test the project as follows:
-
-```sh
-cmake -S . -B ./build \
-  -DCMAKE_BUILD_TYPE:STRING=<Debug|Release> \
-  -DCMAKE_COMPILE_WARNING_AS_ERROR:BOOL=ON \
-  -DJSONTOOLKIT_DOCS:BOOL=ON \
-  -DJSONTOOLKIT_TESTS:BOOL=ON
-# Format the code
-cmake --build ./build --config <Debug|Release> --target clang_format
-# Build the project
-cmake --build ./build --config <Debug|Release>
-# Run the test suite
-ctest --test-dir ./build --build-config <Debug|Release> --output-on-failure --progress
-```
-
-Or simply run:
+You can configure, build and test the project by simply runnning:
 
 ```sh
 # On UNIX-based systems

diff --git a/src/json/CMakeLists.txt → src/core/json/CMakeLists.txt b/src/json/CMakeLists.txt → src/core/json/CMakeLists.txt
diff --git a/src/json/grammar.h → src/core/json/grammar.h b/src/json/grammar.h → src/core/json/grammar.h
diff --git a/...son/include/sourcemeta/jsontoolkit/json.h → ...son/include/sourcemeta/jsontoolkit/json.h b/...son/include/sourcemeta/jsontoolkit/json.h → ...son/include/sourcemeta/jsontoolkit/json.h
diff --git a/...clude/sourcemeta/jsontoolkit/json_array.h → ...clude/sourcemeta/jsontoolkit/json_array.h b/...clude/sourcemeta/jsontoolkit/json_array.h → ...clude/sourcemeta/jsontoolkit/json_array.h
diff --git a/...clude/sourcemeta/jsontoolkit/json_error.h → ...clude/sourcemeta/jsontoolkit/json_error.h b/...clude/sourcemeta/jsontoolkit/json_error.h → ...clude/sourcemeta/jsontoolkit/json_error.h
diff --git a/...nclude/sourcemeta/jsontoolkit/json_hash.h → ...nclude/sourcemeta/jsontoolkit/json_hash.h b/...nclude/sourcemeta/jsontoolkit/json_hash.h → ...nclude/sourcemeta/jsontoolkit/json_hash.h
diff --git a/...lude/sourcemeta/jsontoolkit/json_object.h → ...lude/sourcemeta/jsontoolkit/json_object.h b/...lude/sourcemeta/jsontoolkit/json_object.h → ...lude/sourcemeta/jsontoolkit/json_object.h
diff --git a/...clude/sourcemeta/jsontoolkit/json_value.h → ...clude/sourcemeta/jsontoolkit/json_value.h b/...clude/sourcemeta/jsontoolkit/json_value.h → ...clude/sourcemeta/jsontoolkit/json_value.h
diff --git a/src/json/json.cc → src/core/json/json.cc b/src/json/json.cc → src/core/json/json.cc
diff --git a/src/json/json_value.cc → src/core/json/json_value.cc b/src/json/json_value.cc → src/core/json/json_value.cc
diff --git a/src/json/parser.h → src/core/json/parser.h b/src/json/parser.h → src/core/json/parser.h
diff --git a/src/json/stringify.h → src/core/json/stringify.h b/src/json/stringify.h → src/core/json/stringify.h
diff --git a/src/jsonl/CMakeLists.txt → src/core/jsonl/CMakeLists.txt b/src/jsonl/CMakeLists.txt → src/core/jsonl/CMakeLists.txt
diff --git a/src/jsonl/grammar.h → src/core/jsonl/grammar.h b/src/jsonl/grammar.h → src/core/jsonl/grammar.h
diff --git a/...nl/include/sourcemeta/jsontoolkit/jsonl.h → ...nl/include/sourcemeta/jsontoolkit/jsonl.h b/...nl/include/sourcemeta/jsontoolkit/jsonl.h → ...nl/include/sourcemeta/jsontoolkit/jsonl.h
diff --git a/...e/sourcemeta/jsontoolkit/jsonl_iterator.h → ...e/sourcemeta/jsontoolkit/jsonl_iterator.h b/...e/sourcemeta/jsontoolkit/jsonl_iterator.h → ...e/sourcemeta/jsontoolkit/jsonl_iterator.h
diff --git a/src/jsonl/iterator.cc → src/core/jsonl/iterator.cc b/src/jsonl/iterator.cc → src/core/jsonl/iterator.cc
diff --git a/src/jsonl/jsonl.cc → src/core/jsonl/jsonl.cc b/src/jsonl/jsonl.cc → src/core/jsonl/jsonl.cc
diff --git a/src/jsonpointer/CMakeLists.txt → src/core/jsonpointer/CMakeLists.txt b/src/jsonpointer/CMakeLists.txt → src/core/jsonpointer/CMakeLists.txt
diff --git a/src/jsonpointer/grammar.h → src/core/jsonpointer/grammar.h b/src/jsonpointer/grammar.h → src/core/jsonpointer/grammar.h
diff --git a/...lude/sourcemeta/jsontoolkit/jsonpointer.h → ...lude/sourcemeta/jsontoolkit/jsonpointer.h b/...lude/sourcemeta/jsontoolkit/jsonpointer.h → ...lude/sourcemeta/jsontoolkit/jsonpointer.h
diff --git a/...ourcemeta/jsontoolkit/jsonpointer_error.h → ...ourcemeta/jsontoolkit/jsonpointer_error.h b/...ourcemeta/jsontoolkit/jsonpointer_error.h → ...ourcemeta/jsontoolkit/jsonpointer_error.h
diff --git a/...rcemeta/jsontoolkit/jsonpointer_pointer.h → ...rcemeta/jsontoolkit/jsonpointer_pointer.h b/...rcemeta/jsontoolkit/jsonpointer_pointer.h → ...rcemeta/jsontoolkit/jsonpointer_pointer.h
diff --git a/...cemeta/jsontoolkit/jsonpointer_position.h → ...cemeta/jsontoolkit/jsonpointer_position.h b/...cemeta/jsontoolkit/jsonpointer_position.h → ...cemeta/jsontoolkit/jsonpointer_position.h
diff --git a/...ontoolkit/jsonpointer_subpointer_walker.h → ...ontoolkit/jsonpointer_subpointer_walker.h b/...ontoolkit/jsonpointer_subpointer_walker.h → ...ontoolkit/jsonpointer_subpointer_walker.h
diff --git a/...ourcemeta/jsontoolkit/jsonpointer_token.h → ...ourcemeta/jsontoolkit/jsonpointer_token.h b/...ourcemeta/jsontoolkit/jsonpointer_token.h → ...ourcemeta/jsontoolkit/jsonpointer_token.h
diff --git a/...urcemeta/jsontoolkit/jsonpointer_walker.h → ...urcemeta/jsontoolkit/jsonpointer_walker.h b/...urcemeta/jsontoolkit/jsonpointer_walker.h → ...urcemeta/jsontoolkit/jsonpointer_walker.h
diff --git a/src/jsonpointer/jsonpointer.cc → src/core/jsonpointer/jsonpointer.cc b/src/jsonpointer/jsonpointer.cc → src/core/jsonpointer/jsonpointer.cc
diff --git a/src/jsonpointer/parser.h → src/core/jsonpointer/parser.h b/src/jsonpointer/parser.h → src/core/jsonpointer/parser.h
diff --git a/src/jsonpointer/position.cc → src/core/jsonpointer/position.cc b/src/jsonpointer/position.cc → src/core/jsonpointer/position.cc
diff --git a/src/jsonpointer/stringify.h → src/core/jsonpointer/stringify.h b/src/jsonpointer/stringify.h → src/core/jsonpointer/stringify.h
diff --git a/src/jsonschema/CMakeLists.txt → src/core/jsonschema/CMakeLists.txt b/src/jsonschema/CMakeLists.txt → src/core/jsonschema/CMakeLists.txt
diff --git a/src/jsonschema/anchor.cc → src/core/jsonschema/anchor.cc b/src/jsonschema/anchor.cc → src/core/jsonschema/anchor.cc
diff --git a/src/jsonschema/bundle.cc → src/core/jsonschema/bundle.cc b/src/jsonschema/bundle.cc → src/core/jsonschema/bundle.cc
diff --git a/src/jsonschema/default_walker.cc → src/core/jsonschema/default_walker.cc b/src/jsonschema/default_walker.cc → src/core/jsonschema/default_walker.cc
diff --git a/src/jsonschema/frame.cc → src/core/jsonschema/frame.cc b/src/jsonschema/frame.cc → src/core/jsonschema/frame.cc
diff --git a/...clude/sourcemeta/jsontoolkit/jsonschema.h → ...clude/sourcemeta/jsontoolkit/jsonschema.h b/...clude/sourcemeta/jsontoolkit/jsonschema.h → ...clude/sourcemeta/jsontoolkit/jsonschema.h
diff --git a/...ourcemeta/jsontoolkit/jsonschema_anchor.h → ...ourcemeta/jsontoolkit/jsonschema_anchor.h b/...ourcemeta/jsontoolkit/jsonschema_anchor.h → ...ourcemeta/jsontoolkit/jsonschema_anchor.h
diff --git a/...ourcemeta/jsontoolkit/jsonschema_bundle.h → ...ourcemeta/jsontoolkit/jsonschema_bundle.h b/...ourcemeta/jsontoolkit/jsonschema_bundle.h → ...ourcemeta/jsontoolkit/jsonschema_bundle.h
diff --git a/...sourcemeta/jsontoolkit/jsonschema_error.h → ...sourcemeta/jsontoolkit/jsonschema_error.h b/...sourcemeta/jsontoolkit/jsonschema_error.h → ...sourcemeta/jsontoolkit/jsonschema_error.h
diff --git a/...sourcemeta/jsontoolkit/jsonschema_frame.h → ...sourcemeta/jsontoolkit/jsonschema_frame.h b/...sourcemeta/jsontoolkit/jsonschema_frame.h → ...sourcemeta/jsontoolkit/jsonschema_frame.h
diff --git a/...rcemeta/jsontoolkit/jsonschema_keywords.h → ...rcemeta/jsontoolkit/jsonschema_keywords.h b/...rcemeta/jsontoolkit/jsonschema_keywords.h → ...rcemeta/jsontoolkit/jsonschema_keywords.h
diff --git a/...cemeta/jsontoolkit/jsonschema_reference.h → ...cemeta/jsontoolkit/jsonschema_reference.h b/...cemeta/jsontoolkit/jsonschema_reference.h → ...cemeta/jsontoolkit/jsonschema_reference.h
diff --git a/...rcemeta/jsontoolkit/jsonschema_resolver.h → ...rcemeta/jsontoolkit/jsonschema_resolver.h b/...rcemeta/jsontoolkit/jsonschema_resolver.h → ...rcemeta/jsontoolkit/jsonschema_resolver.h
diff --git a/...meta/jsontoolkit/jsonschema_unevaluated.h → ...meta/jsontoolkit/jsonschema_unevaluated.h b/...meta/jsontoolkit/jsonschema_unevaluated.h → ...meta/jsontoolkit/jsonschema_unevaluated.h
diff --git a/...ourcemeta/jsontoolkit/jsonschema_walker.h → ...ourcemeta/jsontoolkit/jsonschema_walker.h b/...ourcemeta/jsontoolkit/jsonschema_walker.h → ...ourcemeta/jsontoolkit/jsonschema_walker.h
diff --git a/src/jsonschema/jsonschema.cc → src/core/jsonschema/jsonschema.cc b/src/jsonschema/jsonschema.cc → src/core/jsonschema/jsonschema.cc
diff --git a/src/jsonschema/official_resolver.cmake → src/core/jsonschema/official_resolver.cmake b/src/jsonschema/official_resolver.cmake → src/core/jsonschema/official_resolver.cmake
diff --git a/src/jsonschema/official_resolver.in.cc → src/core/jsonschema/official_resolver.in.cc b/src/jsonschema/official_resolver.in.cc → src/core/jsonschema/official_resolver.in.cc
diff --git a/src/jsonschema/relativize.cc → src/core/jsonschema/relativize.cc b/src/jsonschema/relativize.cc → src/core/jsonschema/relativize.cc
diff --git a/src/jsonschema/resolver.cc → src/core/jsonschema/resolver.cc b/src/jsonschema/resolver.cc → src/core/jsonschema/resolver.cc
diff --git a/src/jsonschema/unevaluated.cc → src/core/jsonschema/unevaluated.cc b/src/jsonschema/unevaluated.cc → src/core/jsonschema/unevaluated.cc
diff --git a/src/jsonschema/unidentify.cc → src/core/jsonschema/unidentify.cc b/src/jsonschema/unidentify.cc → src/core/jsonschema/unidentify.cc
diff --git a/src/jsonschema/walker.cc → src/core/jsonschema/walker.cc b/src/jsonschema/walker.cc → src/core/jsonschema/walker.cc
diff --git a/src/uri/CMakeLists.txt → src/core/uri/CMakeLists.txt b/src/uri/CMakeLists.txt → src/core/uri/CMakeLists.txt
diff --git a/src/uri/escaping.cc → src/core/uri/escaping.cc b/src/uri/escaping.cc → src/core/uri/escaping.cc
diff --git a/src/uri/include/sourcemeta/jsontoolkit/uri.h → .../uri/include/sourcemeta/jsontoolkit/uri.h b/src/uri/include/sourcemeta/jsontoolkit/uri.h → .../uri/include/sourcemeta/jsontoolkit/uri.h
diff --git a/...nclude/sourcemeta/jsontoolkit/uri_error.h → ...nclude/sourcemeta/jsontoolkit/uri_error.h b/...nclude/sourcemeta/jsontoolkit/uri_error.h → ...nclude/sourcemeta/jsontoolkit/uri_error.h
diff --git a/src/uri/uri.cc → src/core/uri/uri.cc b/src/uri/uri.cc → src/core/uri/uri.cc
diff --git a/src/yaml/CMakeLists.txt → src/core/yaml/CMakeLists.txt b/src/yaml/CMakeLists.txt → src/core/yaml/CMakeLists.txt
diff --git a/...aml/include/sourcemeta/jsontoolkit/yaml.h → ...aml/include/sourcemeta/jsontoolkit/yaml.h b/...aml/include/sourcemeta/jsontoolkit/yaml.h → ...aml/include/sourcemeta/jsontoolkit/yaml.h
diff --git a/...clude/sourcemeta/jsontoolkit/yaml_error.h → ...clude/sourcemeta/jsontoolkit/yaml_error.h b/...clude/sourcemeta/jsontoolkit/yaml_error.h → ...clude/sourcemeta/jsontoolkit/yaml_error.h
diff --git a/src/yaml/yaml.cc → src/core/yaml/yaml.cc b/src/yaml/yaml.cc → src/core/yaml/yaml.cc
Benchmark suite	Current: `5c43c57`	Previous: `9b74613`	Ratio
`JSON_Array_Of_Objects_Unique`	`440.11919185294516` ns/iter	`436.22187759458865` ns/iter	`1.01`
`JSON_Parse_1`	`30329.69726128646` ns/iter	`30408.81740488369` ns/iter	`1.00`
`JSON_Fast_Hash_Helm_Chart_Lock`	`67.76065957675448` ns/iter	`67.82656578469151` ns/iter	`1.00`
`JSON_Equality_Helm_Chart_Lock`	`152.76412482785932` ns/iter	`161.86945847190574` ns/iter	`0.94`
`JSON_String_Equal/10`	`6.2240856029486045` ns/iter	`7.465866262694071` ns/iter	`0.83`
`JSON_String_Equal/100`	`6.867507839129812` ns/iter	`8.0858546426375` ns/iter	`0.85`
`JSON_String_Equal_Small_By_Perfect_Hash/10`	`0.9354408029152838` ns/iter	`0.9357270181393492` ns/iter	`1.00`
`JSON_String_Equal_Small_By_Runtime_Perfect_Hash/10`	`14.596118602216997` ns/iter	`10.278458106937462` ns/iter	`1.42`
`JSON_String_Fast_Hash/10`	`2.7978407109115055` ns/iter	`2.8017490308392308` ns/iter	`1.00`
`JSON_String_Fast_Hash/100`	`2.799385120017947` ns/iter	`2.799987041008567` ns/iter	`1.00`
`JSON_String_Key_Hash/10`	`2.6534658697846587` ns/iter	`2.179737938638085` ns/iter	`1.22`
`JSON_String_Key_Hash/100`	`2.1786176068607785` ns/iter	`2.180800161552326` ns/iter	`1.00`
`JSON_Object_Defines_Miss_Same_Length`	`3.7369289835782133` ns/iter	`3.7375954429965166` ns/iter	`1.00`
`JSON_Object_Defines_Miss_Too_Small`	`3.788544872433234` ns/iter	`3.7377523773746053` ns/iter	`1.01`
`JSON_Object_Defines_Miss_Too_Large`	`3.7378356585706927` ns/iter	`3.7356634998439207` ns/iter	`1.00`
`Pointer_Object_Traverse`	`44.08975463567291` ns/iter	`44.48432458645106` ns/iter	`0.99`
`Pointer_Object_Try_Traverse`	`52.67010059478814` ns/iter	`52.623055711962444` ns/iter	`1.00`
`Pointer_Push_Back_Pointer_To_Weak_Pointer`	`299.2667854545685` ns/iter	`289.44121132677975` ns/iter	`1.03`
Benchmark suite	Current: `5c43c57`	Previous: `9b74613`	Ratio
`JSON_Array_Of_Objects_Unique`	`378.5717937474394` ns/iter	`337.9728022463591` ns/iter	`1.12`
`JSON_Parse_1`	`24459.433013420705` ns/iter	`22167.730466000132` ns/iter	`1.10`
`JSON_Fast_Hash_Helm_Chart_Lock`	`53.73235842551286` ns/iter	`49.529839800309844` ns/iter	`1.08`
`JSON_Equality_Helm_Chart_Lock`	`147.60469130988508` ns/iter	`121.23083660608076` ns/iter	`1.22`
`JSON_String_Equal/10`	`9.994048361903628` ns/iter	`7.809872449821742` ns/iter	`1.28`
`JSON_String_Equal/100`	`6.546158361467281` ns/iter	`6.16364540635735` ns/iter	`1.06`
`JSON_String_Equal_Small_By_Perfect_Hash/10`	`0.3979760671190249` ns/iter	`0.3245314527207649` ns/iter	`1.23`
`JSON_String_Equal_Small_By_Runtime_Perfect_Hash/10`	`3.440482071988547` ns/iter	`2.99968476801909` ns/iter	`1.15`
`JSON_String_Fast_Hash/10`	`1.8278708771214827` ns/iter	`1.6280277061806478` ns/iter	`1.12`
`JSON_String_Fast_Hash/100`	`2.1114660332042527` ns/iter	`1.9484688736726654` ns/iter	`1.08`
`JSON_String_Key_Hash/10`	`1.387173442260979` ns/iter	`1.30087630770941` ns/iter	`1.07`
`JSON_String_Key_Hash/100`	`1.347126982772553` ns/iter	`1.2993030227829216` ns/iter	`1.04`
`JSON_Object_Defines_Miss_Same_Length`	`2.3565927069730472` ns/iter	`2.292717371297977` ns/iter	`1.03`
`JSON_Object_Defines_Miss_Too_Small`	`2.3758161014321963` ns/iter	`2.2710003162760963` ns/iter	`1.05`
`JSON_Object_Defines_Miss_Too_Large`	`2.3853800746725438` ns/iter	`2.274619182113396` ns/iter	`1.05`
`Pointer_Object_Traverse`	`16.341334989646974` ns/iter	`15.791090468469733` ns/iter	`1.03`
`Pointer_Object_Try_Traverse`	`23.46595478393305` ns/iter	`22.54151815918889` ns/iter	`1.04`
`Pointer_Push_Back_Pointer_To_Weak_Pointer`	`221.76062503357952` ns/iter	`176.43240699786648` ns/iter	`1.26`
Benchmark suite	Current: `5c43c57`	Previous: `9b74613`	Ratio
`JSON_Array_Of_Objects_Unique`	`405.74617946925065` ns/iter	`405.7664863497237` ns/iter	`1.00`
`JSON_Parse_1`	`79624.41964285258` ns/iter	`79160.78124999361` ns/iter	`1.01`
`JSON_Fast_Hash_Helm_Chart_Lock`	`59.59720000000744` ns/iter	`52.05780000000004` ns/iter	`1.14`
`JSON_Equality_Helm_Chart_Lock`	`188.15918644278597` ns/iter	`187.96150785368894` ns/iter	`1.00`
`JSON_String_Equal/10`	`8.992907366071533` ns/iter	`8.995963169642351` ns/iter	`1.00`
`JSON_String_Equal/100`	`10.05517499999975` ns/iter	`9.934084777080477` ns/iter	`1.01`
`JSON_String_Equal_Small_By_Perfect_Hash/10`	`2.172687812500129` ns/iter	`2.1709662499997506` ns/iter	`1.00`
`JSON_String_Equal_Small_By_Runtime_Perfect_Hash/10`	`14.486899553569948` ns/iter	`14.340526785713134` ns/iter	`1.01`
`JSON_String_Fast_Hash/10`	`3.110006696428818` ns/iter	`3.10123169642854` ns/iter	`1.00`
`JSON_String_Fast_Hash/100`	`3.1005147321430115` ns/iter	`3.100941071428411` ns/iter	`1.00`
`JSON_String_Key_Hash/10`	`7.6213136160710855` ns/iter	`7.454084821428048` ns/iter	`1.02`
`JSON_String_Key_Hash/100`	`4.032195870536143` ns/iter	`4.0431799179338075` ns/iter	`1.00`
`JSON_Object_Defines_Miss_Same_Length`	`3.779170707537118` ns/iter	`3.7284262433421778` ns/iter	`1.01`
`JSON_Object_Defines_Miss_Too_Small`	`3.7208493303569106` ns/iter	`3.718111064789328` ns/iter	`1.00`
`JSON_Object_Defines_Miss_Too_Large`	`4.9702000000002045` ns/iter	`4.96886160714232` ns/iter	`1.00`
`Pointer_Object_Traverse`	`52.00081250000567` ns/iter	`78.9933499999961` ns/iter	`0.66`
`Pointer_Object_Try_Traverse`	`74.17233258928084` ns/iter	`74.90871651785827` ns/iter	`0.99`
`Pointer_Push_Back_Pointer_To_Weak_Pointer`	`160.04131696428306` ns/iter	`159.0976758324301` ns/iter	`1.01`
Benchmark suite	Current: `5c43c57`	Previous: `9b74613`	Ratio
`JSON_Array_Of_Objects_Unique`	`213.16082221678118` ns/iter	`219.14733422424777` ns/iter	`0.97`
`JSON_Parse_1`	`24743.794661411925` ns/iter	`26912.816776120795` ns/iter	`0.92`
`JSON_Fast_Hash_Helm_Chart_Lock`	`23.964197394958717` ns/iter	`24.894568134591562` ns/iter	`0.96`
`JSON_Equality_Helm_Chart_Lock`	`118.5627746771994` ns/iter	`124.82002589499558` ns/iter	`0.95`
`JSON_String_Equal/10`	`5.586521176715103` ns/iter	`5.711702966497344` ns/iter	`0.98`
`JSON_String_Equal/100`	`5.173304823173108` ns/iter	`5.687145734028291` ns/iter	`0.91`
`JSON_String_Equal_Small_By_Perfect_Hash/10`	`0.751447749358146` ns/iter	`0.8416126530228605` ns/iter	`0.89`
`JSON_String_Equal_Small_By_Runtime_Perfect_Hash/10`	`2.889165597822071` ns/iter	`3.0477192408301303` ns/iter	`0.95`
`JSON_String_Fast_Hash/10`	`1.925764912723556` ns/iter	`2.0636424363533084` ns/iter	`0.93`
`JSON_String_Fast_Hash/100`	`1.9416774571528428` ns/iter	`2.052859906505919` ns/iter	`0.95`
`JSON_String_Key_Hash/10`	`1.3313075065309803` ns/iter	`1.4259180266350877` ns/iter	`0.93`
`JSON_String_Key_Hash/100`	`1.759109885357443` ns/iter	`1.9540152729368248` ns/iter	`0.90`
`JSON_Object_Defines_Miss_Same_Length`	`1.8071705888049658` ns/iter	`1.8932172587668006` ns/iter	`0.95`
`JSON_Object_Defines_Miss_Too_Small`	`1.908279626090417` ns/iter	`2.1184850944182076` ns/iter	`0.90`
`JSON_Object_Defines_Miss_Too_Large`	`1.8315607831399965` ns/iter	`1.9898031468362383` ns/iter	`0.92`
`Pointer_Object_Traverse`	`54.54814860958687` ns/iter	`57.632638825910846` ns/iter	`0.95`
`Pointer_Object_Try_Traverse`	`35.579475073552246` ns/iter	`39.37208243772645` ns/iter	`0.90`
`Pointer_Push_Back_Pointer_To_Weak_Pointer`	`162.24193108662723` ns/iter	`198.64684347828458` ns/iter	`0.82`
Benchmark suite	Current: `5c43c57`	Previous: `9b74613`	Ratio
`Pointer_Object_Traverse`	`46.81948405053563` ns/iter	`47.10697575208746` ns/iter	`0.99`
`Pointer_Object_Try_Traverse`	`23.35040526671802` ns/iter	`23.37206667833027` ns/iter	`1.00`
`Pointer_Push_Back_Pointer_To_Weak_Pointer`	`144.60734731187912` ns/iter	`144.5549168350998` ns/iter	`1.00`
`JSON_Array_Of_Objects_Unique`	`416.1996651348341` ns/iter	`408.78552886422165` ns/iter	`1.02`
`JSON_Parse_1`	`33484.409834498074` ns/iter	`33340.86420688826` ns/iter	`1.00`
`JSON_Fast_Hash_Helm_Chart_Lock`	`64.68807901719501` ns/iter	`63.242059969897` ns/iter	`1.02`
`JSON_Equality_Helm_Chart_Lock`	`140.85407308799236` ns/iter	`142.9349562742868` ns/iter	`0.99`
`JSON_String_Equal/10`	`5.990889548504845` ns/iter	`5.9941707079697615` ns/iter	`1.00`
`JSON_String_Equal/100`	`6.618697664852477` ns/iter	`6.637096973772274` ns/iter	`1.00`
`JSON_String_Equal_Small_By_Perfect_Hash/10`	`0.6243654983652781` ns/iter	`0.6232091774440333` ns/iter	`1.00`
`JSON_String_Equal_Small_By_Runtime_Perfect_Hash/10`	`14.292786757549674` ns/iter	`14.293066451799907` ns/iter	`1.00`
`JSON_String_Fast_Hash/10`	`2.2545450748408746` ns/iter	`2.2558898631455793` ns/iter	`1.00`
`JSON_String_Fast_Hash/100`	`2.2569238090838466` ns/iter	`2.2576594356528195` ns/iter	`1.00`
`JSON_String_Key_Hash/10`	`1.9924362223426606` ns/iter	`1.9835044798606571` ns/iter	`1.00`
`JSON_String_Key_Hash/100`	`1.6745506845823268` ns/iter	`1.6891024071729999` ns/iter	`0.99`
`JSON_Object_Defines_Miss_Same_Length`	`2.4874133643444183` ns/iter	`2.5080608468356154` ns/iter	`0.99`
`JSON_Object_Defines_Miss_Too_Small`	`3.107740380123038` ns/iter	`3.1095315571688333` ns/iter	`1.00`
`JSON_Object_Defines_Miss_Too_Large`	`2.797583849421831` ns/iter	`2.7966269026377963` ns/iter	`1.00`