refactor: create new pch file and fix some header include problem (#1440

)
LiteLDev · Jan 18, 2024 · 8db100a · 8db100a
1 parent 6895366
commit 8db100a
Show file tree

Hide file tree

Showing 66 changed files with 176 additions and 155 deletions.
diff --git a/.clangd b/.clangd
@@ -1,15 +1,15 @@
 Diagnostics:
-  Suppress: 
+  Suppress:
     - "-Wmicrosoft-enum-forward-reference"
     - "-Wc++11-narrowing"
     - "-Wc++2b-extensions"
     - "-Wmicrosoft-cast"
 CompileFlags:
-  Add: 
+  Add:
     - "-ferror-limit=0"
-    - "-D__FUNCTION__=\"dummy\""
-    - "-Yumc/_HeaderOutputPredefine.h"
-    - "-FImc/_HeaderOutputPredefine.h" # clangd bug can't find pch file
-  Remove: 
-    - "/Yu_HeaderOutputPredefine.h"
-    - "/FI_HeaderOutputPredefine.h"
+    - '-D__FUNCTION__="dummy"'
+    - "-Yusrc/ll/api/Global.h"
+    - "-FIsrc/ll/api/Global.h" # clangd bug can't find pch file
+  Remove:
+    - "/YuGlobal.h"
+    - "/FIGlobal.h"
diff --git a/.gitignore b/.gitignore
@@ -557,3 +557,6 @@ fabric.properties
 
 # MkDocs
 /site/
+
+# Test
+src/ll/test/include_all.cpp
diff --git a/src/ll/api/Global.h b/src/ll/api/Global.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "mc/_HeaderOutputPredefine.h"
+
+#include "ll/api/base/Concepts.h"
+#include "ll/api/base/Containers.h"
+#include "ll/api/base/Macro.h"
+#include "ll/api/base/Meta.h"
+#include "ll/api/base/StdInt.h"
+#include "ll/api/base/ToString.h"
diff --git a/src/ll/api/Logger.cpp b/src/ll/api/Logger.cpp
@@ -2,9 +2,9 @@
 
 #include "ll/api/Logger.h"
 
-#include "ll/api/base/ErrorInfo.h"
-#include "ll/api/base/Hash.h"
 #include "ll/api/io/FileUtils.h"
+#include "ll/api/utils/ErrorUtils.h"
+#include "ll/api/utils/HashUtils.h"
 #include "ll/api/utils/StringUtils.h"
 #include "ll/core/Config.h"
 
@@ -68,7 +68,7 @@ void Logger::OutputStream::print(std::string_view s) const noexcept {
         try {
             fmt::print(
                 "\x1b[31mERROR IN LOGGER API:\n{}\x1b[91m\n{}\x1b[0m\n",
-                error_info::makeExceptionString(std::current_exception()),
+                error_utils::makeExceptionString(std::current_exception()),
                 tou8str(s)
             );
         } catch (...) {

diff --git a/src/ll/api/base/UnorderedStringMap.h → src/ll/api/base/Containers.h b/src/ll/api/base/UnorderedStringMap.h → src/ll/api/base/Containers.h
diff --git a/src/ll/api/command/DynamicCommand.cpp b/src/ll/api/command/DynamicCommand.cpp
@@ -1,8 +1,8 @@
 #include "ll/api/command/DynamicCommand.h"
 
 #include "ll/api/Logger.h"
-#include "ll/api/base/ErrorInfo.h"
 #include "ll/api/memory/Closure.h"
+#include "ll/api/utils/ErrorUtils.h"
 #include "ll/core/Config.h"
 #include "ll/core/LeviLamina.h"
 
@@ -97,7 +97,7 @@ auto const ParameterSizeMap = std::unordered_map<ParameterType, size_t>{
 
 inline void OutputError(const std::string& command, const std::string& func = __builtin_FUNCTION()) {
     auto lock = ll::Logger::lock();
-    ll::error_info::printCurrentException(logger);
+    ll::error_utils::printCurrentException(logger);
     logger.error("In Function ({})", func);
     logger.error("In Command <{}>", command);
 }

diff --git a/src/ll/api/base/DependencyGraph.h → src/ll/api/data/DependencyGraph.h b/src/ll/api/base/DependencyGraph.h → src/ll/api/data/DependencyGraph.h
@@ -1,11 +1,10 @@
 #pragma once
 
-#include <queue>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
-namespace ll {
+namespace ll::inline data {
 template <class T>
 class DependencyGraph {
     struct Data {
@@ -121,4 +120,4 @@ class DependencyGraph {
         return {sorted, unsorted};
     }
 };
-} // namespace ll
+} // namespace ll::inline data
diff --git a/src/ll/api/base/KeyValueDB.cpp → src/ll/api/data/KeyValueDB.cpp b/src/ll/api/base/KeyValueDB.cpp → src/ll/api/data/KeyValueDB.cpp
@@ -10,7 +10,7 @@
 #include "ll/api/io/FileUtils.h"
 #include "ll/core/LeviLamina.h"
 
-using namespace ll;
+using namespace ll::data;
 
 class KeyValueDB::KeyValueDBImpl {
 public:

diff --git a/src/ll/api/base/KeyValueDB.h → src/ll/api/data/KeyValueDB.h b/src/ll/api/base/KeyValueDB.h → src/ll/api/data/KeyValueDB.h
@@ -9,7 +9,7 @@
 
 #include "ll/api/base/Macro.h"
 
-namespace ll {
+namespace ll::inline data {
 class KeyValueDB {
 private:
     class KeyValueDBImpl;
@@ -40,4 +40,4 @@ class KeyValueDB {
     LLNDAPI std::vector<std::string> getAllKeys() const;
 };
 
-} // namespace ll
+} // namespace ll::inline data
diff --git a/src/ll/api/base/Version.h → src/ll/api/data/Version.h b/src/ll/api/base/Version.h → src/ll/api/data/Version.h
@@ -9,7 +9,7 @@
 
 #include "ll/api/utils/StringUtils.h"
 
-namespace ll {
+namespace ll::inline data {
 
 namespace detail {
 
@@ -301,4 +301,4 @@ namespace literals {
 }
 } // namespace literals
 
-} // namespace ll
+} // namespace ll::inline data
diff --git a/src/ll/api/event/EventBus.cpp b/src/ll/api/event/EventBus.cpp
@@ -6,9 +6,9 @@
 #include <unordered_set>
 
 #include "ll/api/Logger.h"
-#include "ll/api/base/ErrorInfo.h"
 #include "ll/api/event/EmitterBase.h"
 #include "ll/api/thread/SharedRecursiveMutex.h"
+#include "ll/api/utils/ErrorUtils.h"
 #include "ll/core/LeviLamina.h"
 
 namespace ll::event {
@@ -43,7 +43,7 @@ class CallbackStream {
                         l->pluginPtr.expired() ? "unknown plugin" : l->pluginPtr.lock()->getManifest().name
                     );
                 } catch (...) {}
-                error_info::printCurrentException(logger);
+                error_utils::printCurrentException(logger);
             }
         }
     }
@@ -66,7 +66,7 @@ class CallbackStream {
                         pluginName
                     );
                 } catch (...) {}
-                error_info::printCurrentException(logger);
+                error_utils::printCurrentException(logger);
             }
         }
     }

diff --git a/src/ll/api/event/EventId.h b/src/ll/api/event/EventId.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ll/api/base/Hash.h"
 #include "ll/api/reflection/Reflection.h"
+#include "ll/api/utils/HashUtils.h"
 
 namespace ll::event {
 class EventId {
@@ -11,7 +11,7 @@ class EventId {
 
     [[nodiscard]] constexpr explicit EventId(std::string_view name) noexcept
     : name(name),
-      hash(ll::hash::do_hash(name)) {}
+      hash(ll::hash_utils::do_hash(name)) {}
 
     [[nodiscard]] constexpr bool operator==(EventId other) const noexcept {
         return hash == other.hash && name == other.name;

diff --git a/src/ll/api/event/filesystem/FileActionEvent.cpp b/src/ll/api/event/filesystem/FileActionEvent.cpp
@@ -13,10 +13,10 @@
 #include <thread>
 #include <vector>
 
-#include "ll/api/base/ErrorInfo.h"
 #include "ll/api/event/Emitter.h"
 #include "ll/api/event/EventBus.h"
 #include "ll/api/io/FileUtils.h"
+#include "ll/api/utils/ErrorUtils.h"
 
 #include "windows.h"
 
@@ -58,7 +58,7 @@ class FileWatcher : public Emitter<emitterFactory, FileActionEvent> {
 
         closeEvent = CreateEventW(nullptr, TRUE, FALSE, nullptr);
         if (!closeEvent) {
-            throw ll::error_info::getWinLastError();
+            throw ll::error_utils::getWinLastError();
         }
 
 
@@ -121,7 +121,7 @@ class FileWatcher : public Emitter<emitterFactory, FileActionEvent> {
                     switch (WaitForMultipleObjects(2, handles.data(), FALSE, INFINITE)) {
                     case WAIT_OBJECT_0: {
                         if (!GetOverlappedResult(directoryHandle, &overlapped_buffer, &bytes_returned, TRUE)) {
-                            throw ll::error_info::getWinLastError();
+                            throw ll::error_utils::getWinLastError();
                         }
                         async_pending = false;
 
@@ -224,7 +224,7 @@ class FileWatcher : public Emitter<emitterFactory, FileActionEvent> {
         ); // file with attributes to copy
 
         if (directory == INVALID_HANDLE_VALUE) {
-            throw ll::error_info::getWinLastError();
+            throw ll::error_utils::getWinLastError();
         }
         return directory;
     }

diff --git a/src/ll/api/event/server/ServerStartedEvent.cpp b/src/ll/api/event/server/ServerStartedEvent.cpp
@@ -1,7 +1,7 @@
 #include "ll/api/event/server/ServerStartedEvent.h"
-#include "ll/api/ServerInfo.h"
 #include "ll/api/event/Emitter.h"
 #include "ll/api/memory/Hook.h"
+#include "ll/api/service/ServerInfo.h"
 
 #include "mc/world/events/ServerInstanceEventCoordinator.h"
 

diff --git a/src/ll/api/event/server/ServerStoppingEvent.cpp b/src/ll/api/event/server/ServerStoppingEvent.cpp
@@ -1,7 +1,7 @@
 #include "ll/api/event/server/ServerStoppingEvent.h"
-#include "ll/api/ServerInfo.h"
 #include "ll/api/event/Emitter.h"
 #include "ll/api/memory/Hook.h"
+#include "ll/api/service/ServerInfo.h"
 
 #include "mc/nbt/CompoundTag.h"
 

diff --git a/src/ll/api/form/ModalForm.cpp b/src/ll/api/form/ModalForm.cpp
@@ -82,12 +82,12 @@ ModalForm::ModalForm(
     Callback    callback
 )
 : impl(std::make_unique<ModalFormImpl>(
-    std::move(title),
-    std::move(content),
-    std::move(buttonLeft),
-    std::move(buttonRight),
-    std::move(callback)
-)) {}
+      std::move(title),
+      std::move(content),
+      std::move(buttonLeft),
+      std::move(buttonRight),
+      std::move(callback)
+  )) {}
 
 ModalForm::~ModalForm() = default;
 

diff --git a/src/ll/api/i18n/I18nAPI.h b/src/ll/api/i18n/I18nAPI.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ll/api/base/Concepts.h"
-#include "ll/api/base/UnorderedStringMap.h"
+#include "ll/api/base/Containers.h"
 #include "ll/api/io/FileUtils.h"
 #include "ll/api/utils/StringUtils.h"
 

diff --git a/src/ll/api/io/FileUtils.cpp b/src/ll/api/io/FileUtils.cpp
@@ -3,7 +3,7 @@
 #include <filesystem>
 
 #include "ll/api/Logger.h"
-#include "ll/api/ServerInfo.h"
+#include "ll/api/service/ServerInfo.h"
 #include "ll/api/utils/StringUtils.h"
 #include "ll/core/Config.h"
 

diff --git a/src/ll/api/io/FileUtils.h b/src/ll/api/io/FileUtils.h
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "ll/api/base/Macro.h"
-#include "ll/api/base/Version.h"
+#include "ll/api/data/Version.h"
 
 namespace ll::inline utils::file_utils {
 

diff --git a/src/ll/api/memory/Hook.cpp b/src/ll/api/memory/Hook.cpp
@@ -1,7 +1,7 @@
 #include "ll/api/memory/Hook.h"
 #include "ll/api/Logger.h"
-#include "ll/api/ServerInfo.h"
 #include "ll/api/memory/Memory.h"
+#include "ll/api/service/ServerInfo.h"
 #include "ll/api/utils/StacktraceUtils.h"
 #include "ll/api/utils/WinUtils.h"
 #include "pl/Hook.h"

diff --git a/src/ll/api/memory/Memory.cpp b/src/ll/api/memory/Memory.cpp
@@ -6,7 +6,7 @@
 #include "pl/SymbolProvider.h"
 
 #include "ll/api/Logger.h"
-#include "ll/api/ServerInfo.h"
+#include "ll/api/service/ServerInfo.h"
 #include "ll/api/thread/GlobalThreadPauser.h"
 #include "ll/api/utils/StringUtils.h"
 #include "ll/api/utils/WinUtils.h"

diff --git a/src/ll/api/memory/PatchHelper.h b/src/ll/api/memory/PatchHelper.h
@@ -51,11 +51,11 @@ namespace ll::utils {
 
 template <size_t len>
 struct PatchHelper {
-    uchar data[len];
+    uchar               data[len];
     using ref_t = uchar (&)[len];
-    constexpr bool operator==(ref_t ref) const noexcept { return memcmp(data, ref, sizeof data) == 0; }
-    constexpr bool operator!=(ref_t ref) const noexcept { return memcmp(data, ref, sizeof data) != 0; }
-    constexpr bool operator==(PatchHelper const& ref) const noexcept {
+    constexpr bool      operator==(ref_t ref) const noexcept { return memcmp(data, ref, sizeof data) == 0; }
+    constexpr bool      operator!=(ref_t ref) const noexcept { return memcmp(data, ref, sizeof data) != 0; }
+    constexpr bool      operator==(PatchHelper const& ref) const noexcept {
         return memcmp(data, ref.data, sizeof data) == 0;
     }
     constexpr bool operator!=(PatchHelper const& ref) const noexcept {

diff --git a/src/ll/api/plugin/Manifest.h b/src/ll/api/plugin/Manifest.h
@@ -5,8 +5,8 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "ll/api/base/Hash.h"
-#include "ll/api/base/Version.h"
+#include "ll/api/data/Version.h"
+#include "ll/api/utils/HashUtils.h"
 
 namespace ll::plugin {
 struct Dependency {
@@ -23,7 +23,7 @@ template <>
 struct hash<ll::plugin::Dependency> {
     size_t operator()(ll::plugin::Dependency const& d) const noexcept {
         size_t hash = std::hash<std::string>{}(d.name);
-        ll::hash::hashCombine(std::hash<std::optional<std::string>>{}(d.version), hash);
+        ll::hash_utils::hashCombine(std::hash<std::optional<std::string>>{}(d.version), hash);
         return hash;
     }
 };

diff --git a/src/ll/api/plugin/Plugin.cpp b/src/ll/api/plugin/Plugin.cpp
@@ -1,9 +1,9 @@
 #include "ll/api/plugin/Plugin.h"
 
-#include "ll/api/ServerInfo.h"
 #include "ll/api/event/EventBus.h"
 #include "ll/api/event/server/ServerStartedEvent.h"
 #include "ll/api/service/Bedrock.h"
+#include "ll/api/service/ServerInfo.h"
 
 namespace ll::plugin {
 

diff --git a/src/ll/api/plugin/Plugin.h b/src/ll/api/plugin/Plugin.h
@@ -4,7 +4,7 @@
 #include <filesystem>
 
 #include "ll/api/Logger.h"
-#include "ll/api/base/UnorderedStringMap.h"
+#include "ll/api/base/Containers.h"
 #include "ll/api/plugin/Manifest.h"
 
 #include "mc/common/wrapper/optional_ref.h"

diff --git a/src/ll/api/plugin/PluginManager.h b/src/ll/api/plugin/PluginManager.h
@@ -6,7 +6,7 @@
 #include <string_view>
 #include <vector>
 
-#include "ll/api/base/UnorderedStringMap.h"
+#include "ll/api/base/Containers.h"
 #include "ll/api/plugin/Plugin.h"
 
 namespace ll::plugin {

diff --git a/src/ll/api/plugin/PluginManagerRegistry.h b/src/ll/api/plugin/PluginManagerRegistry.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ll/api/base/DependencyGraph.h"
 #include "ll/api/base/Macro.h"
+#include "ll/api/data/DependencyGraph.h"
 #include "ll/api/plugin/PluginManager.h"
 
 namespace ll::plugin {

diff --git a/src/ll/api/schedule/Task.cpp b/src/ll/api/schedule/Task.cpp
@@ -3,7 +3,7 @@
 #include <spanstream>
 
 #include "ll/api/Logger.h"
-#include "ll/api/base/ErrorInfo.h"
+#include "ll/api/utils/ErrorUtils.h"
 
 namespace ll::schedule {
 inline namespace task {
@@ -42,7 +42,7 @@ void printScheduleError() noexcept {
     try {
         logger.error("Error in schedule thread [{}]:", std::this_thread::get_id());
     } catch (...) {}
-    error_info::printCurrentException(logger);
+    error_utils::printCurrentException(logger);
 }
 } // namespace detail
-Original file line number
+Diff line change
@@ Expand Up / @@ -557,3 +557,6 @@ fabric.properties @@
     # MkDocs
     /site/
+    # Test
+    src/ll/test/include_all.cpp