refactor: create a dedicated Ark/VM/Value/ folder for better organization

SuperFola · SuperFola · commit 94afc3bdfcb3 · 2026-01-12T18:06:09.000+01:00
diff --git a/include/Ark/Ark.hpp b/include/Ark/Ark.hpp
@@ -14,9 +14,10 @@
 #include <Ark/Error/Exceptions.hpp>
 #include <Ark/Constants.hpp>
 #include <Ark/Utils/Utils.hpp>
+#include <Ark/Compiler/Welder.hpp>
+#include <Ark/State.hpp>
 #include <Ark/VM/VM.hpp>
 #include <Ark/VM/DefaultValues.hpp>
-#include <Ark/Compiler/Welder.hpp>
 #include <Ark/TypeChecker.hpp>
 
 #endif  // ARK_ARK_HPP
diff --git a/include/Ark/State.hpp b/include/Ark/State.hpp
@@ -17,7 +17,7 @@
 #include <filesystem>
 #include <Ark/Constants.hpp>
 
-#include <Ark/VM/Value.hpp>
+#include <Ark/VM/Value/Value.hpp>
 #include <Ark/VM/Value/Procedure.hpp>
 #include <Ark/Compiler/Common.hpp>
 #include <Ark/Error/Exceptions.hpp>
diff --git a/include/Ark/TypeChecker.hpp b/include/Ark/TypeChecker.hpp
@@ -17,7 +17,7 @@
 #include <sstream>
 
 #include <Ark/Error/Exceptions.hpp>
-#include <Ark/VM/Value.hpp>
+#include <Ark/VM/Value/Value.hpp>
 
 namespace Ark
 {
diff --git a/include/Ark/VM/DefaultValues.hpp b/include/Ark/VM/DefaultValues.hpp
@@ -11,7 +11,7 @@
 #ifndef ARK_VM_DEFAULTVALUES_HPP
 #define ARK_VM_DEFAULTVALUES_HPP
 
-#include <Ark/VM/Value.hpp>
+#include <Ark/VM/Value/Value.hpp>
 
 namespace Ark
 {
diff --git a/include/Ark/VM/ExecutionContext.hpp b/include/Ark/VM/ExecutionContext.hpp
@@ -17,7 +17,7 @@
 #include <atomic>
 
 #include <Ark/Constants.hpp>
-#include <Ark/VM/Value.hpp>
+#include <Ark/VM/Value/Value.hpp>
 #include <Ark/VM/ScopeView.hpp>
 #include <Ark/VM/Value/ClosureScope.hpp>
 
diff --git a/include/Ark/VM/ScopeView.hpp b/include/Ark/VM/ScopeView.hpp
@@ -1,5 +1,5 @@
 /**
- * @file Scope.hpp
+ * @file ScopeView.hpp
  * @author Lexy Plateau (lexplt.dev@gmail.com)
  * @brief The virtual machine scope system
  * @date 2020-10-27
@@ -15,7 +15,7 @@
 #include <cinttypes>
 
 #include <Ark/Utils/Platform.hpp>
-#include <Ark/VM/Value.hpp>
+#include <Ark/VM/Value/Value.hpp>
 
 namespace Ark::internal
 {
diff --git a/include/Ark/VM/VM.hpp b/include/Ark/VM/VM.hpp
@@ -24,16 +24,16 @@
 #include <fmt/ranges.h>
 
 #include <Ark/Compiler/Instructions.hpp>
-#include <Ark/VM/Value.hpp>
-#include <Ark/VM/State.hpp>
+#include <Ark/VM/Value/Value.hpp>
+#include <Ark/State.hpp>
 #include <Ark/VM/ScopeView.hpp>
 #include <Ark/VM/ErrorKind.hpp>
 #include <Ark/VM/ExecutionContext.hpp>
 #include <Ark/Builtins/Builtins.hpp>
 #include <Ark/Utils/Platform.hpp>
 #include <Ark/Utils/Literals.hpp>
 #include <Ark/VM/SharedLibrary.hpp>
-#include <Ark/VM/Future.hpp>
+#include <Ark/VM/Value/Future.hpp>
 
 namespace Ark
 {
diff --git a/include/Ark/VM/Value/ClosureScope.hpp b/include/Ark/VM/Value/ClosureScope.hpp
@@ -16,7 +16,7 @@
 #include <cinttypes>
 
 #include <Ark/Utils/Platform.hpp>
-#include <Ark/VM/Value.hpp>
+#include <Ark/VM/Value/Value.hpp>
 
 namespace Ark::internal
 {
diff --git a/include/Ark/VM/Value/Dict.hpp b/include/Ark/VM/Value/Dict.hpp
@@ -11,7 +11,7 @@
 #ifndef ARK_VM_VALUE_DICT_HPP
 #define ARK_VM_VALUE_DICT_HPP
 
-#include <Ark/VM/Value.hpp>
+#include <Ark/VM/Value/Value.hpp>
 #include <Ark/Utils/Platform.hpp>
 
 #include <ankerl/unordered_dense.h>
diff --git a/include/Ark/VM/Value/Future.hpp b/include/Ark/VM/Value/Future.hpp
@@ -14,7 +14,7 @@
 #include <future>
 #include <vector>
 
-#include <Ark/VM/Value.hpp>
+#include <Ark/VM/Value/Value.hpp>
 #include <Ark/VM/ExecutionContext.hpp>
 
 namespace Ark
diff --git a/include/Ark/VM/Value/Value.hpp b/include/Ark/VM/Value/Value.hpp
diff --git a/include/CLI/REPL/Repl.hpp b/include/CLI/REPL/Repl.hpp
@@ -15,7 +15,7 @@
 #include <optional>
 
 #include <Ark/VM/VM.hpp>
-#include <Ark/VM/State.hpp>
+#include <Ark/State.hpp>
 
 #include <replxx.hxx>
 
diff --git a/src/arkreactor/State.cpp b/src/arkreactor/State.cpp
@@ -1,4 +1,4 @@
-#include <Ark/VM/State.hpp>
+#include <Ark/State.hpp>
 
 #include <Ark/Constants.hpp>
 #include <Ark/Utils/Files.hpp>
diff --git a/src/arkreactor/VM/Value/Future.cpp b/src/arkreactor/VM/Value/Future.cpp
@@ -1,4 +1,4 @@
-#include <Ark/VM/Future.hpp>
+#include <Ark/VM/Value/Future.hpp>
 
 #include <Ark/VM/VM.hpp>
 #include <Ark/VM/DefaultValues.hpp>
diff --git a/src/arkreactor/VM/Value/Procedure.cpp b/src/arkreactor/VM/Value/Procedure.cpp
@@ -1,4 +1,4 @@
-#include <Ark/VM/Value.hpp>
+#include <Ark/VM/Value/Value.hpp>
 #include <Ark/VM/Value/Procedure.hpp>
 
 #include <utility>
diff --git a/src/arkreactor/VM/Value/Value.cpp b/src/arkreactor/VM/Value/Value.cpp
@@ -1,4 +1,4 @@
-#include <Ark/VM/Value.hpp>
+#include <Ark/VM/Value/Value.hpp>
 #include <Ark/VM/Value/Procedure.hpp>
 #include <Ark/VM/Value/Dict.hpp>
 
diff --git a/tests/benchmarks/main.cpp b/tests/benchmarks/main.cpp
@@ -5,7 +5,7 @@
 
 #include <Ark/Compiler/AST/Parser.hpp>
 #include <Ark/Compiler/Welder.hpp>
-#include <Ark/VM/State.hpp>
+#include <Ark/State.hpp>
 #include <Ark/VM/VM.hpp>
 
 #define ARK_CREATE_RUNTIME_BENCH(name)                                       \
diff --git a/tests/unittests/Suites/TypeCheckerSuite.cpp b/tests/unittests/Suites/TypeCheckerSuite.cpp
@@ -5,9 +5,9 @@
 #include <sstream>
 #include <fmt/core.h>
 
-#include <Ark/VM/State.hpp>
+#include <Ark/State.hpp>
 #include <Ark/VM/VM.hpp>
-#include <Ark/VM/Value.hpp>
+#include <Ark/VM/Value/Value.hpp>
 #include <Ark/TypeChecker.hpp>
 #include <Ark/Utils/Utils.hpp>
 #include <TestsHelper.hpp>

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`#include <sstream>`
`18`	`18`
`19`	`19`	`#include <Ark/Error/Exceptions.hpp>`
`20`		`-#include <Ark/VM/Value.hpp>`
	`20`	`+#include <Ark/VM/Value/Value.hpp>`
`21`	`21`
`22`	`22`	`namespace Ark`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#ifndef ARK_VM_DEFAULTVALUES_HPP`
`12`	`12`	`#define ARK_VM_DEFAULTVALUES_HPP`
`13`	`13`
`14`		`-#include <Ark/VM/Value.hpp>`
	`14`	`+#include <Ark/VM/Value/Value.hpp>`
`15`	`15`
`16`	`16`	`namespace Ark`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`#include <cinttypes>`
`17`	`17`
`18`	`18`	`#include <Ark/Utils/Platform.hpp>`
`19`		`-#include <Ark/VM/Value.hpp>`
	`19`	`+#include <Ark/VM/Value/Value.hpp>`
`20`	`20`
`21`	`21`	`namespace Ark::internal`
`22`	`22`	`{`