refactor: move utility files to Ark/Utils/

SuperFola · SuperFola · commit 9b7e3bc489ec · 2025-07-26T16:49:23.000+02:00
diff --git a/include/Ark/Ark.hpp b/include/Ark/Ark.hpp
@@ -13,7 +13,7 @@
 
 #include <Ark/Exceptions.hpp>
 #include <Ark/Constants.hpp>
-#include <Ark/Utils.hpp>
+#include <Ark/Utils/Utils.hpp>
 #include <Ark/VM/VM.hpp>
 #include <Ark/Compiler/Welder.hpp>
 #include <Ark/TypeChecker.hpp>
diff --git a/include/Ark/Compiler/AST/BaseParser.hpp b/include/Ark/Compiler/AST/BaseParser.hpp
@@ -5,7 +5,7 @@
 #include <vector>
 #include <initializer_list>
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 #include <Ark/Exceptions.hpp>
 #include <Ark/Compiler/AST/Predicates.hpp>
 #include <Ark/Compiler/AST/utf8_char.hpp>
diff --git a/include/Ark/Compiler/AST/Import.hpp b/include/Ark/Compiler/AST/Import.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <numeric>
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 
 namespace Ark::internal
 {
diff --git a/include/Ark/Compiler/AST/Node.hpp b/include/Ark/Compiler/AST/Node.hpp
@@ -18,7 +18,7 @@
 
 #include <Ark/Compiler/AST/Namespace.hpp>
 #include <Ark/Compiler/Common.hpp>
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 
 namespace Ark::internal
 {
diff --git a/include/Ark/Compiler/AST/Optimizer.hpp b/include/Ark/Compiler/AST/Optimizer.hpp
@@ -15,7 +15,7 @@
 #include <unordered_map>
 #include <string>
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 #include <Ark/Compiler/Pass.hpp>
 #include <Ark/Compiler/AST/Node.hpp>
 
diff --git a/include/Ark/Compiler/AST/Parser.hpp b/include/Ark/Compiler/AST/Parser.hpp
@@ -14,9 +14,9 @@
 #include <Ark/Compiler/AST/BaseParser.hpp>
 #include <Ark/Compiler/AST/Node.hpp>
 #include <Ark/Compiler/AST/Import.hpp>
-#include <Ark/Logger.hpp>
-#include <Ark/Utils.hpp>
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Logger.hpp>
+#include <Ark/Utils/Utils.hpp>
+#include <Ark/Utils/Platform.hpp>
 
 #include <string>
 #include <vector>
diff --git a/include/Ark/Compiler/BytecodeReader.hpp b/include/Ark/Compiler/BytecodeReader.hpp
@@ -16,7 +16,7 @@
 #include <cinttypes>
 #include <optional>
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 #include <Ark/Compiler/Common.hpp>
 #include <Ark/VM/Value.hpp>
 #include <Ark/Compiler/IntermediateRepresentation/InstLoc.hpp>
diff --git a/include/Ark/Compiler/IntermediateRepresentation/IRCompiler.hpp b/include/Ark/Compiler/IntermediateRepresentation/IRCompiler.hpp
@@ -14,8 +14,8 @@
 #include <vector>
 #include <string>
 
-#include <Ark/Platform.hpp>
-#include <Ark/Logger.hpp>
+#include <Ark/Utils/Platform.hpp>
+#include <Ark/Utils/Logger.hpp>
 #include <Ark/Compiler/Common.hpp>
 #include <Ark/Compiler/ValTableElem.hpp>
 #include <Ark/Compiler/IntermediateRepresentation/Entity.hpp>
diff --git a/include/Ark/Compiler/IntermediateRepresentation/IROptimizer.hpp b/include/Ark/Compiler/IntermediateRepresentation/IROptimizer.hpp
@@ -10,8 +10,8 @@
 #ifndef ARK_COMPILER_INTERMEDIATEREPRESENTATION_IROPTIMIZER_HPP
 #define ARK_COMPILER_INTERMEDIATEREPRESENTATION_IROPTIMIZER_HPP
 
-#include <Ark/Platform.hpp>
-#include <Ark/Logger.hpp>
+#include <Ark/Utils/Platform.hpp>
+#include <Ark/Utils/Logger.hpp>
 #include <Ark/Compiler/ValTableElem.hpp>
 #include <Ark/Compiler/IntermediateRepresentation/Entity.hpp>
 
diff --git a/include/Ark/Compiler/Lowerer/ASTLowerer.hpp b/include/Ark/Compiler/Lowerer/ASTLowerer.hpp
@@ -17,8 +17,8 @@
 #include <cinttypes>
 #include <optional>
 
-#include <Ark/Platform.hpp>
-#include <Ark/Logger.hpp>
+#include <Ark/Utils/Platform.hpp>
+#include <Ark/Utils/Logger.hpp>
 #include <Ark/Compiler/Instructions.hpp>
 #include <Ark/Compiler/IntermediateRepresentation/Entity.hpp>
 #include <Ark/Compiler/AST/Node.hpp>
diff --git a/include/Ark/Compiler/Macros/Processor.hpp b/include/Ark/Compiler/Macros/Processor.hpp
@@ -11,7 +11,7 @@
 #ifndef COMPILER_MACROS_PROCESSOR_HPP
 #define COMPILER_MACROS_PROCESSOR_HPP
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 #include <Ark/Compiler/AST/Node.hpp>
 #include <Ark/Compiler/Macros/MacroScope.hpp>
 #include <Ark/Compiler/Pass.hpp>
diff --git a/include/Ark/Compiler/NameResolution/NameResolutionPass.hpp b/include/Ark/Compiler/NameResolution/NameResolutionPass.hpp
@@ -15,7 +15,7 @@
 #include <string>
 #include <unordered_set>
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 #include <Ark/Compiler/Pass.hpp>
 #include <Ark/Compiler/NameResolution/ScopeResolver.hpp>
 
diff --git a/include/Ark/Compiler/NameResolution/StaticScope.hpp b/include/Ark/Compiler/NameResolution/StaticScope.hpp
@@ -18,7 +18,7 @@
 #include <ranges>
 #include <unordered_set>
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 
 namespace Ark::internal
 {
diff --git a/include/Ark/Compiler/Package/ImportSolver.hpp b/include/Ark/Compiler/Package/ImportSolver.hpp
@@ -17,7 +17,7 @@
 #include <filesystem>
 #include <unordered_map>
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 #include <Ark/Compiler/Pass.hpp>
 #include <Ark/Compiler/AST/Node.hpp>
 #include <Ark/Compiler/AST/Import.hpp>
diff --git a/include/Ark/Compiler/Pass.hpp b/include/Ark/Compiler/Pass.hpp
@@ -10,9 +10,9 @@
 #ifndef ARK_COMPILER_PASS_HPP
 #define ARK_COMPILER_PASS_HPP
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 #include <Ark/Compiler/AST/Node.hpp>
-#include <Ark/Logger.hpp>
+#include <Ark/Utils/Logger.hpp>
 
 namespace Ark::internal
 {
diff --git a/include/Ark/Compiler/Welder.hpp b/include/Ark/Compiler/Welder.hpp
@@ -22,7 +22,7 @@
 #include <Ark/Compiler/IntermediateRepresentation/IROptimizer.hpp>
 #include <Ark/Compiler/IntermediateRepresentation/IRCompiler.hpp>
 #include <Ark/Constants.hpp>
-#include <Ark/Logger.hpp>
+#include <Ark/Utils/Logger.hpp>
 #include <Ark/Compiler/Package/ImportSolver.hpp>
 #include <Ark/Compiler/Macros/Processor.hpp>
 #include <Ark/Compiler/AST/Optimizer.hpp>
diff --git a/include/Ark/Exceptions.hpp b/include/Ark/Exceptions.hpp
@@ -20,7 +20,7 @@
 #include <iostream>
 
 #include <Ark/Compiler/AST/utf8_char.hpp>
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 
 namespace Ark
 {
diff --git a/include/Ark/Utils/Files.hpp b/include/Ark/Utils/Files.hpp
diff --git a/include/Ark/Utils/Literals.hpp b/include/Ark/Utils/Literals.hpp
diff --git a/include/Ark/Utils/Logger.hpp b/include/Ark/Utils/Logger.hpp
diff --git a/include/Ark/Utils/Platform.hpp b/include/Ark/Utils/Platform.hpp
diff --git a/include/Ark/Utils/Utils.hpp b/include/Ark/Utils/Utils.hpp
@@ -11,7 +11,7 @@
 #ifndef INCLUDE_ARK_UTILS_HPP
 #define INCLUDE_ARK_UTILS_HPP
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 
 #include <algorithm>
 #include <string>
diff --git a/include/Ark/VM/Plugin.hpp b/include/Ark/VM/Plugin.hpp
@@ -11,7 +11,7 @@
 #ifndef ARK_VM_PLUGIN_HPP
 #define ARK_VM_PLUGIN_HPP
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 
 #if defined(ARK_OS_WINDOWS)
 #    include <Proxy/MiniWindows.h>
diff --git a/include/Ark/VM/ScopeView.hpp b/include/Ark/VM/ScopeView.hpp
@@ -14,7 +14,7 @@
 #include <array>
 #include <cinttypes>
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 #include <Ark/VM/Value.hpp>
 
 namespace Ark::internal
diff --git a/include/Ark/VM/VM.hpp b/include/Ark/VM/VM.hpp
@@ -30,7 +30,7 @@
 #include <Ark/VM/ErrorKind.hpp>
 #include <Ark/VM/ExecutionContext.hpp>
 #include <Ark/Builtins/Builtins.hpp>
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 #include <Ark/VM/Plugin.hpp>
 #include <Ark/VM/Future.hpp>
 
diff --git a/include/Ark/VM/Value.hpp b/include/Ark/VM/Value.hpp
@@ -20,7 +20,7 @@
 #include <Ark/VM/Value/Closure.hpp>
 #include <Ark/VM/Value/UserType.hpp>
 #include <Ark/VM/Value/Procedure.hpp>
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 
 namespace Ark
 {
diff --git a/include/Ark/VM/Value/Closure.hpp b/include/Ark/VM/Value/Closure.hpp
@@ -15,7 +15,7 @@
 #include <iostream>
 #include <string>
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 
 namespace Ark
 {
diff --git a/include/Ark/VM/Value/ClosureScope.hpp b/include/Ark/VM/Value/ClosureScope.hpp
@@ -15,7 +15,7 @@
 #include <utility>
 #include <cinttypes>
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 #include <Ark/VM/Value.hpp>
 
 namespace Ark::internal
diff --git a/include/Ark/VM/Value/UserType.hpp b/include/Ark/VM/Value/UserType.hpp
@@ -14,7 +14,7 @@
 #include <iostream>
 #include <cinttypes>
 
-#include <Ark/Platform.hpp>
+#include <Ark/Utils/Platform.hpp>
 
 namespace Ark
 {
diff --git a/src/arkreactor/Builtins/IO.cpp b/src/arkreactor/Builtins/IO.cpp
@@ -4,7 +4,7 @@
 #include <filesystem>
 #include <fmt/core.h>
 
-#include <Ark/Files.hpp>
+#include <Ark/Utils/Files.hpp>
 #include <Ark/VM/VM.hpp>
 #include <Ark/Exceptions.hpp>
 #include <Ark/TypeChecker.hpp>
diff --git a/src/arkreactor/Compiler/IntermediateRepresentation/IRCompiler.cpp b/src/arkreactor/Compiler/IntermediateRepresentation/IRCompiler.cpp
@@ -8,7 +8,7 @@
 #include <fmt/ostream.h>
 
 #include <Ark/Constants.hpp>
-#include <Ark/Literals.hpp>
+#include <Ark/Utils/Literals.hpp>
 #include <Ark/Compiler/IntermediateRepresentation/InstLoc.hpp>
 #include <Ark/Compiler/Serialization/IntegerSerializer.hpp>
 #include <Ark/Compiler/Serialization/IEEE754Serializer.hpp>
diff --git a/src/arkreactor/Compiler/Lowerer/ASTLowerer.cpp b/src/arkreactor/Compiler/Lowerer/ASTLowerer.cpp
@@ -8,7 +8,7 @@
 #include <fmt/core.h>
 #include <fmt/color.h>
 
-#include <Ark/Literals.hpp>
+#include <Ark/Utils/Literals.hpp>
 #include <Ark/Builtins/Builtins.hpp>
 
 namespace Ark::internal
diff --git a/src/arkreactor/Compiler/NameResolution/NameResolutionPass.cpp b/src/arkreactor/Compiler/NameResolution/NameResolutionPass.cpp
@@ -1,7 +1,7 @@
 #include <Ark/Compiler/NameResolution/NameResolutionPass.hpp>
 
 #include <Ark/Exceptions.hpp>
-#include <Ark/Utils.hpp>
+#include <Ark/Utils/Utils.hpp>
 #include <Ark/Builtins/Builtins.hpp>
 
 namespace Ark::internal
diff --git a/src/arkreactor/Compiler/Package/ImportSolver.cpp b/src/arkreactor/Compiler/Package/ImportSolver.cpp
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <fmt/core.h>
 
-#include <Ark/Files.hpp>
+#include <Ark/Utils/Files.hpp>
 #include <Ark/Exceptions.hpp>
 #include <Ark/Compiler/AST/Parser.hpp>
 
diff --git a/src/arkreactor/Compiler/Welder.cpp b/src/arkreactor/Compiler/Welder.cpp
@@ -5,7 +5,7 @@
 #include <Ark/Compiler/AST/Optimizer.hpp>
 #include <Ark/Compiler/Macros/Processor.hpp>
 #include <Ark/Compiler/NameResolution/NameResolutionPass.hpp>
-#include <Ark/Files.hpp>
+#include <Ark/Utils/Files.hpp>
 #include <Ark/Exceptions.hpp>
 
 #include <sstream>
diff --git a/src/arkreactor/Exceptions.cpp b/src/arkreactor/Exceptions.cpp
@@ -8,9 +8,9 @@
 #include <fmt/ostream.h>
 
 #include <Ark/Constants.hpp>
-#include <Ark/Utils.hpp>
-#include <Ark/Files.hpp>
-#include <Ark/Literals.hpp>
+#include <Ark/Utils/Utils.hpp>
+#include <Ark/Utils/Files.hpp>
+#include <Ark/Utils/Literals.hpp>
 #include <Ark/Compiler/AST/Node.hpp>
 
 namespace Ark::Diagnostics
diff --git a/src/arkreactor/Utils/Logger.cpp b/src/arkreactor/Utils/Logger.cpp
@@ -1,4 +1,4 @@
-#include <Ark/Logger.hpp>
+#include <Ark/Utils/Logger.hpp>
 
 #include <array>
 #include <utility>
diff --git a/src/arkreactor/Utils/Utils.cpp b/src/arkreactor/Utils/Utils.cpp
@@ -1,4 +1,4 @@
-#include <Ark/Utils.hpp>
+#include <Ark/Utils/Utils.hpp>
 
 namespace Ark::Utils
 {
diff --git a/src/arkreactor/VM/State.cpp b/src/arkreactor/VM/State.cpp
@@ -1,7 +1,7 @@
 #include <Ark/VM/State.hpp>
 
 #include <Ark/Constants.hpp>
-#include <Ark/Files.hpp>
+#include <Ark/Utils/Files.hpp>
 #include <Ark/Compiler/Welder.hpp>
 
 #ifdef _MSC_VER
diff --git a/src/arkreactor/VM/VM.cpp b/src/arkreactor/VM/VM.cpp
@@ -7,8 +7,8 @@
 #include <fmt/color.h>
 #include <fmt/ostream.h>
 
-#include <Ark/Files.hpp>
-#include <Ark/Utils.hpp>
+#include <Ark/Utils/Files.hpp>
+#include <Ark/Utils/Utils.hpp>
 #include <Ark/TypeChecker.hpp>
 #include <Ark/Compiler/Instructions.hpp>
 
diff --git a/src/arkscript/Formatter.cpp b/src/arkscript/Formatter.cpp
@@ -4,7 +4,7 @@
 #include <fmt/core.h>
 #include <fmt/color.h>
 
-#include <Ark/Files.hpp>
+#include <Ark/Utils/Files.hpp>
 #include <Ark/Exceptions.hpp>
 #include <Ark/Compiler/Common.hpp>
 
diff --git a/src/arkscript/main.cpp b/src/arkscript/main.cpp
@@ -8,7 +8,7 @@
 #include <fmt/core.h>
 #include <fmt/color.h>
 
-#include <Ark/Files.hpp>
+#include <Ark/Utils/Files.hpp>
 #include <Ark/Compiler/BytecodeReader.hpp>
 #include <CLI/JsonCompiler.hpp>
 #include <CLI/REPL/Repl.hpp>
diff --git a/tests/unittests/Suites/BytecodeReaderSuite.cpp b/tests/unittests/Suites/BytecodeReaderSuite.cpp
@@ -2,7 +2,7 @@
 
 #include <Ark/Compiler/BytecodeReader.hpp>
 #include <Ark/Compiler/Welder.hpp>
-#include <Ark/Literals.hpp>
+#include <Ark/Utils/Literals.hpp>
 #include <Proxy/Picosha2.hpp>
 
 #include <string>
diff --git a/tests/unittests/Suites/EmbeddingSuite.cpp b/tests/unittests/Suites/EmbeddingSuite.cpp
@@ -1,7 +1,7 @@
 #include <boost/ut.hpp>
 
 #include <Ark/Ark.hpp>
-#include <Ark/Literals.hpp>
+#include <Ark/Utils/Literals.hpp>
 #include <vector>
 #include <iostream>
 
diff --git a/tests/unittests/Suites/ParserSuite.cpp b/tests/unittests/Suites/ParserSuite.cpp
@@ -1,6 +1,6 @@
 #include <boost/ut.hpp>
 
-#include <Ark/Files.hpp>
+#include <Ark/Utils/Files.hpp>
 #include <Ark/Compiler/AST/Parser.hpp>
 #include <Ark/Exceptions.hpp>
 
diff --git a/tests/unittests/Suites/ToolsSuite.cpp b/tests/unittests/Suites/ToolsSuite.cpp
@@ -1,8 +1,8 @@
 #include <boost/ut.hpp>
 
-#include <Ark/Literals.hpp>
-#include <Ark/Utils.hpp>
-#include <Ark/Files.hpp>
+#include <Ark/Utils/Literals.hpp>
+#include <Ark/Utils/Utils.hpp>
+#include <Ark/Utils/Files.hpp>
 
 using namespace boost;
 
diff --git a/tests/unittests/Suites/TypeCheckerSuite.cpp b/tests/unittests/Suites/TypeCheckerSuite.cpp
diff --git a/tests/unittests/TestsHelper.cpp b/tests/unittests/TestsHelper.cpp
diff --git a/tests/unittests/TestsHelper.hpp b/tests/unittests/TestsHelper.hpp

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include <string>`
`6`	`6`	`#include <numeric>`
`7`	`7`
`8`		`-#include <Ark/Platform.hpp>`
	`8`	`+#include <Ark/Utils/Platform.hpp>`
`9`	`9`
`10`	`10`	`namespace Ark::internal`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`#include <Ark/Compiler/AST/Namespace.hpp>`
`20`	`20`	`#include <Ark/Compiler/Common.hpp>`
`21`		`-#include <Ark/Platform.hpp>`
	`21`	`+#include <Ark/Utils/Platform.hpp>`
`22`	`22`
`23`	`23`	`namespace Ark::internal`
`24`	`24`	`{`