Arranging code

Author: refvalue

Dependencies.cmake

@@ -80,7 +80,7 @@ es_make_install_third_party_library(
     CMAKE_ARGS
     -DJSON_BuildTests=OFF
     ${extra_cmake_args}
-    SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/third-party/nlohmann-json
+    SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/third-party/json
     INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
 )
 

src/abi/list.ixx

@@ -21,8 +21,9 @@
  */
 
 export module essence.basic:abi.list;
-import :abi.memory;
+
 import std;
+import :abi.memory;
 
 export namespace essence::abi {
     template <typename T>

src/abi/map.ixx

@@ -21,8 +21,9 @@
  */
 
 export module essence.basic:abi.map;
-import :abi.memory;
+
 import std;
+import :abi.memory;
 
 export namespace essence::abi {
     template <typename Key, typename Value, typename Compare = std::less<Key>>

src/abi/memory.cpp

@@ -21,6 +21,7 @@
  */
 
 module essence.basic;
+
 import std;
 
 void* es_alloc(std::size_t size) noexcept {

src/abi/memory.ixx

@@ -25,6 +25,7 @@ module;
 #include <essence/compat.hpp>
 
 export module essence.basic:abi.memory;
+
 import std;
 
 export {

src/abi/string.ixx

@@ -21,8 +21,9 @@
  */
 
 export module essence.basic:abi.string;
-import :abi.memory;
+
 import std;
+import :abi.memory;
 
 export namespace essence::abi {
     template <typename T>

src/abi/vector.ixx

@@ -21,8 +21,9 @@
  */
 
 export module essence.basic:abi.vector;
-import :abi.memory;
+
 import std;
+import :abi.memory;
 
 export namespace essence::abi {
     template <typename T>

src/argb_color.ixx

@@ -21,6 +21,7 @@
  */
 
 export module essence.basic:argb_color;
+
 import std;
 
 export namespace essence {

src/array.ixx

@@ -21,6 +21,7 @@
  */
 
 export module essence.basic:array;
+
 import std;
 
 export namespace essence {

src/basic.ixx

@@ -34,7 +34,6 @@ export import :basic_string;
 export import :basic_vector;
 export import :boolean;
 export import :char_and_byte;
-export import :char8_t_remediation;
 export import :delegate;
 export import :encoding;
 export import :environment;