Refactor include paths to use atom/macro.hpp

ElementAstro · Oct 27, 2024 · 7f3402d · 7f3402d
1 parent 4ef1173
commit 7f3402d
Show file tree

Hide file tree

Showing 125 changed files with 1,368 additions and 525 deletions.
diff --git a/libs b/libs
diff --git a/modules/atom.system/_component.cpp b/modules/atom.system/_component.cpp
@@ -18,7 +18,7 @@ Description: Component of Atom-System
 
 #include "command.hpp"
 #include "crash.hpp"
-#include "macro.hpp"
+#include "atom/macro.hpp"
 #include "pidwatcher.hpp"
 #include "platform.hpp"
 #include "user.hpp"

diff --git a/modules/atom.system/_main.cpp b/modules/atom.system/_main.cpp
@@ -13,7 +13,7 @@ Description: Main Entry
 **************************************************/
 
 #include "_component.hpp"
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 #include "atom/type/json.hpp"
 using json = nlohmann::json;

diff --git a/modules/lithium.cxxtools/_main.cpp b/modules/lithium.cxxtools/_main.cpp
@@ -15,7 +15,7 @@ Description: Main Entry
 #include "_component.hpp"
 
 #include "atom/type/json.hpp"
-#include "macro.hpp"
+#include "atom/macro.hpp"
 using json = nlohmann::json;
 
 ATOM_C {

diff --git a/modules/lithium.cxxtools/src/pci_generator.cpp b/modules/lithium.cxxtools/src/pci_generator.cpp
@@ -26,7 +26,7 @@ Description: PCI info generator
 #include "atom/error/exception.hpp"
 #include "atom/log/loguru.hpp"
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace fs = std::filesystem;
 

diff --git a/modules/lithium.cxxtools/src/symbol.cpp b/modules/lithium.cxxtools/src/symbol.cpp
@@ -15,7 +15,7 @@
 #include "atom/function/abi.hpp"
 #include "atom/log/loguru.hpp"
 #include "atom/type/json.hpp"
-#include "macro.hpp"
+#include "atom/macro.hpp"
 #include "yaml-cpp/yaml.h"
 
 using json = nlohmann::json;

diff --git a/modules/lithium.cxxtools/tests/ini2json.cpp b/modules/lithium.cxxtools/tests/ini2json.cpp
@@ -2,7 +2,7 @@
 
 #include <gtest/gtest.h>
 #include <fstream>
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 using namespace lithium::cxxtools;
 

diff --git a/modules/lithium.cxxtools/tests/json2ini.cpp b/modules/lithium.cxxtools/tests/json2ini.cpp
@@ -2,7 +2,7 @@
 
 #include <gtest/gtest.h>
 #include <fstream>
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 using namespace lithium::cxxtools;
 

diff --git a/modules/lithium.image/include/solver.hpp b/modules/lithium.image/include/solver.hpp
@@ -4,7 +4,7 @@
 #include <libstellarsolver/stellarsolver.h>
 #include <cstdint>
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 struct LoadFitsResult {
     bool success{};

diff --git a/modules/lithium.indiserver/include/driverlist.hpp b/modules/lithium.indiserver/include/driverlist.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 struct Device {
     std::string label;

diff --git a/src/LithiumApp.hpp b/src/LithiumApp.hpp
@@ -24,7 +24,7 @@ Description: Lithium App Enter
 #include "atom/type/json_fwd.hpp"
 #include "atom/type/message.hpp"
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 using json = nlohmann::json;
 namespace fs = std::filesystem;

diff --git a/src/addon/analysts.hpp b/src/addon/analysts.hpp
@@ -8,7 +8,7 @@
 #include "atom/type/json_fwd.hpp"
 using json = nlohmann::json;
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace lithium {
 

diff --git a/src/addon/command.cpp b/src/addon/command.cpp
@@ -11,7 +11,7 @@
 #include "atom/type/json.hpp"
 using json = nlohmann::json;
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace lithium {
 struct CompileCommand {

diff --git a/src/addon/compiler.hpp b/src/addon/compiler.hpp
@@ -17,7 +17,7 @@
 #include <string>
 #include <string_view>
 #include <vector>
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 #include "atom/type/json_fwd.hpp"
 using json = nlohmann::json;

diff --git a/src/addon/debug/elf.hpp b/src/addon/debug/elf.hpp
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace lithium {
 

diff --git a/src/addon/debug/pdb.hpp b/src/addon/debug/pdb.hpp
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace lithium {
 

diff --git a/src/addon/manager.cpp b/src/addon/manager.cpp
@@ -37,7 +37,7 @@
 #include "utils/constant.hpp"
 #include "utils/marco.hpp"
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 #if defined(_WIN32) || defined(_WIN64)
 // clang-format off

diff --git a/src/addon/module.hpp b/src/addon/module.hpp
@@ -20,7 +20,7 @@ Description: Module Information
 #include <vector>
 
 #include "atom/function/ffi.hpp"
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace lithium {
 struct FunctionInfo {

diff --git a/src/addon/platform/base.hpp b/src/addon/platform/base.hpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "atom/macro.hpp"
+#include "atom/atom/macro.hpp"
 
 namespace lithium {
 

diff --git a/src/addon/project/base.hpp b/src/addon/project/base.hpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace lithium {
 

diff --git a/src/addon/template/standalone.cpp b/src/addon/template/standalone.cpp
@@ -8,7 +8,7 @@
 #include <span>
 #include <thread>
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <fcntl.h>

diff --git a/src/addon/version.hpp b/src/addon/version.hpp
@@ -8,7 +8,7 @@
 
 #include "atom/error/exception.hpp"
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace lithium {
 

diff --git a/src/app/counter.hpp b/src/app/counter.hpp
@@ -8,7 +8,7 @@
 #include <string_view>
 #include <vector>
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 /**
  * @brief Macro to count and time a function call.

diff --git a/src/atom/algorithm/base.hpp b/src/atom/algorithm/base.hpp
@@ -22,7 +22,7 @@ Description: A collection of algorithms for C++
 
 #include "atom/type/static_string.hpp"
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace atom::algorithm {
 namespace detail {

diff --git a/src/atom/algorithm/bignumber.hpp b/src/atom/algorithm/bignumber.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace atom::algorithm {
 

diff --git a/src/atom/algorithm/hash.hpp b/src/atom/algorithm/hash.hpp
@@ -15,6 +15,7 @@ Description: A collection of hash algorithms
 #ifndef ATOM_ALGORITHM_HASH_HPP
 #define ATOM_ALGORITHM_HASH_HPP
 
+#include <any>
 #include <array>
 #include <functional>
 #include <tuple>
@@ -101,6 +102,12 @@ auto computeHash(const std::array<T, N>& array) -> std::size_t {
     return result;
 }
 
+inline auto computeHash(const std::any& value) -> std::size_t {
+    if (value.has_value()) {
+        return value.type().hash_code();
+    }
+    return 0;
+}
 }  // namespace atom::algorithm
 
 /**

diff --git a/src/atom/algorithm/mhash.hpp b/src/atom/algorithm/mhash.hpp
@@ -26,7 +26,7 @@ Description: Implementation of murmur3 hash and quick hash
 #include <CL/cl.h>
 #endif
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace atom::algorithm {
 constexpr size_t K_HASH_SIZE = 32;

diff --git a/src/atom/async/daemon.cpp b/src/atom/async/daemon.cpp
@@ -19,7 +19,7 @@ still some problems on Windows, especially the console.
 #include <ostream>
 #include <sstream>
 #include <thread>
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 #ifndef _WIN32
 #include <unistd.h>

diff --git a/src/atom/async/message_bus.hpp b/src/atom/async/message_bus.hpp
@@ -30,7 +30,7 @@ Description: Main Message Bus with Asio support
 #include <unordered_set>
 #include <vector>
 
-#include "atom/macro.hpp"
+#include "atom/atom/macro.hpp"
 
 namespace atom::async {
 

diff --git a/src/atom/async/pool.hpp b/src/atom/async/pool.hpp
@@ -27,7 +27,7 @@ Description: A very simple thread pool for preload
 #include <thread>
 #include <type_traits>
 #include <utility>
-#include "macro.hpp"
+#include "atom/macro.hpp"
 #ifdef __has_include
 #if __has_include(<version>)
 #include <version>

diff --git a/src/atom/components/component.hpp b/src/atom/components/component.hpp
@@ -22,7 +22,7 @@ Description: Basic Component Definition
 #include <vector>
 
 #include "dispatch.hpp"
-#include "module_macro.hpp"
+#include "module_atom/macro.hpp"
 #include "var.hpp"
 
 #include "atom/function/concept.hpp"

diff --git a/src/atom/components/dispatch.hpp b/src/atom/components/dispatch.hpp
@@ -26,7 +26,7 @@
 #include "atom/function/type_caster.hpp"
 #include "atom/type/json.hpp"
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 using json = nlohmann::json;
 

diff --git a/src/atom/components/var.hpp b/src/atom/components/var.hpp
@@ -22,7 +22,7 @@ Description: Variable Manager
 #include <utility>
 #include <vector>
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 #if ENABLE_FASTHASH
 #include "emhash/hash_table8.hpp"

diff --git a/src/atom/connection/sshserver.hpp b/src/atom/connection/sshserver.hpp
@@ -22,7 +22,7 @@ Description: SSH Server
 
 #include "atom/type/noncopyable.hpp"
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace atom::connection {
 /**

diff --git a/src/atom/error/exception.hpp b/src/atom/error/exception.hpp
@@ -20,7 +20,7 @@ Description: Better Exception Library
 #include <string>
 #include <thread>
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 #include "stacktrace.hpp"
 
 namespace atom::error {

diff --git a/src/atom/extra/inicpp/common.hpp b/src/atom/extra/inicpp/common.hpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <string_view>
 
-#include "macro.hpp"
+#include "atom/macro.hpp"
 
 namespace inicpp {