move sandbox files

19 files changed, 14 insertions, 14 deletions

diff --git a/xmake/core/base/deprecated/interpreter.lua b/xmake/core/base/deprecated/interpreter.lua
index 44c8314d7..8ed452588 100644
--- a/xmake/core/base/deprecated/interpreter.lua
+++ b/xmake/core/base/deprecated/interpreter.lua
@@ -29,7 +29,7 @@ local path      = require("base/path")
 local table     = require("base/table")
 local utils     = require("base/utils")
 local string    = require("base/string")
-local sandbox   = require("base/sandbox")
+local sandbox   = require("sandbox/sandbox")
 
 -- register api for set_scope()
 function deprecated_interpreter.api_register_set_scope(self, ...)
diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua
index 551dad5fc..490da9405 100644
--- a/xmake/core/base/interpreter.lua
+++ b/xmake/core/base/interpreter.lua
@@ -29,7 +29,7 @@ local path      = require("base/path")
 local table     = require("base/table")
 local utils     = require("base/utils")
 local string    = require("base/string")
-local sandbox   = require("base/sandbox")
+local sandbox   = require("sandbox/sandbox")
 
 -- traceback
 function interpreter._traceback(errors)
diff --git a/xmake/core/base/task.lua b/xmake/core/base/task.lua
index c7eb18f5a..d77c58710 100644
--- a/xmake/core/base/task.lua
+++ b/xmake/core/base/task.lua
@@ -29,7 +29,7 @@ local table         = require("base/table")
 local utils         = require("base/utils")
 local filter        = require("base/filter")
 local string        = require("base/string")
-local sandbox       = require("base/sandbox")
+local sandbox       = require("sandbox/sandbox")
 local interpreter   = require("base/interpreter")
 
 -- the directories of tasks
diff --git a/xmake/core/sandbox/assert.lua b/xmake/core/sandbox/modules/assert.lua
index 1e64c73db..1e64c73db 100644
--- a/xmake/core/sandbox/assert.lua
+++ b/xmake/core/sandbox/modules/assert.lua
diff --git a/xmake/core/sandbox/format.lua b/xmake/core/sandbox/modules/format.lua
index efcea0682..3f7465098 100644
--- a/xmake/core/sandbox/format.lua
+++ b/xmake/core/sandbox/modules/format.lua
@@ -21,6 +21,6 @@
 --
 
 -- return module
-return require("sandbox/string").format
+return require("sandbox/modules/string").format
 
 
diff --git a/xmake/core/sandbox/ifelse.lua b/xmake/core/sandbox/modules/ifelse.lua
index bbd032704..02e84a276 100644
--- a/xmake/core/sandbox/ifelse.lua
+++ b/xmake/core/sandbox/modules/ifelse.lua
@@ -21,5 +21,5 @@
 --
 
 -- load module
-return require("sandbox/utils").ifelse
+return require("sandbox/modules/utils").ifelse
 
diff --git a/xmake/core/sandbox/import.lua b/xmake/core/sandbox/modules/import.lua
index 626554600..bdb23f896 100644
--- a/xmake/core/sandbox/import.lua
+++ b/xmake/core/sandbox/modules/import.lua
@@ -29,7 +29,7 @@ local path      = require("base/path")
 local utils     = require("base/utils")
 local table     = require("base/table")
 local string    = require("base/string")
-local sandbox   = require("base/sandbox")
+local sandbox   = require("sandbox/sandbox")
 
 -- get module name
 function sandbox_import._modulename(name)
@@ -215,7 +215,7 @@ function sandbox_import.import(name, alias)
     local module, errors = sandbox_import._load(rootdir, name, instance)
     if not module then
         -- load module from the sandbox core directory
-        module, errors = sandbox_import._load(path.join(xmake._CORE_DIR, "sandbox/import"), name)
+        module, errors = sandbox_import._load(path.join(xmake._CORE_DIR, "sandbox/modules/import"), name)
     end
 
     -- check
diff --git a/xmake/core/sandbox/ipairs.lua b/xmake/core/sandbox/modules/ipairs.lua
index a3d2f636e..a3d2f636e 100644
--- a/xmake/core/sandbox/ipairs.lua
+++ b/xmake/core/sandbox/modules/ipairs.lua
diff --git a/xmake/core/sandbox/os.lua b/xmake/core/sandbox/modules/os.lua
index 52945efbc..89e07ca96 100644
--- a/xmake/core/sandbox/os.lua
+++ b/xmake/core/sandbox/modules/os.lua
@@ -24,7 +24,7 @@
 local io        = require("base/io")
 local os        = require("base/os")
 local utils     = require("base/utils")
-local vformat   = require("sandbox/vformat")
+local vformat   = require("sandbox/modules/vformat")
 
 -- define module
 local sandbox_os = sandbox_os or {}
diff --git a/xmake/core/sandbox/pairs.lua b/xmake/core/sandbox/modules/pairs.lua
index ce7729bd5..ce7729bd5 100644
--- a/xmake/core/sandbox/pairs.lua
+++ b/xmake/core/sandbox/modules/pairs.lua
diff --git a/xmake/core/sandbox/path.lua b/xmake/core/sandbox/modules/path.lua
index d46b09252..d46b09252 100644
--- a/xmake/core/sandbox/path.lua
+++ b/xmake/core/sandbox/modules/path.lua
diff --git a/xmake/core/sandbox/print.lua b/xmake/core/sandbox/modules/print.lua
index 9e8502c16..9e8502c16 100644
--- a/xmake/core/sandbox/print.lua
+++ b/xmake/core/sandbox/modules/print.lua
diff --git a/xmake/core/sandbox/printf.lua b/xmake/core/sandbox/modules/printf.lua
index 803514971..541a13a91 100644
--- a/xmake/core/sandbox/printf.lua
+++ b/xmake/core/sandbox/modules/printf.lua
@@ -21,5 +21,5 @@
 --
 
 -- load module
-return require("sandbox/utils").printf
+return require("sandbox/modules/utils").printf
 
diff --git a/xmake/core/sandbox/raise.lua b/xmake/core/sandbox/modules/raise.lua
index fb1996082..4038e5d36 100644
--- a/xmake/core/sandbox/raise.lua
+++ b/xmake/core/sandbox/modules/raise.lua
@@ -21,5 +21,5 @@
 --
 
 -- load module
-return require("sandbox/os").raise
+return require("sandbox/modules/os").raise
 
diff --git a/xmake/core/sandbox/string.lua b/xmake/core/sandbox/modules/string.lua
index 5812c40dd..69ddbb723 100644
--- a/xmake/core/sandbox/string.lua
+++ b/xmake/core/sandbox/modules/string.lua
@@ -22,7 +22,7 @@
 
 -- load modules
 local string    = require("base/string")
-local sandbox   = require("base/sandbox")
+local sandbox   = require("sandbox/sandbox")
 
 -- define module
 local sandbox_string = sandbox_string or {}
diff --git a/xmake/core/sandbox/table.lua b/xmake/core/sandbox/modules/table.lua
index bab0439b9..bab0439b9 100644
--- a/xmake/core/sandbox/table.lua
+++ b/xmake/core/sandbox/modules/table.lua
diff --git a/xmake/core/sandbox/utils.lua b/xmake/core/sandbox/modules/utils.lua
index edc23e032..f0cb95db9 100644
--- a/xmake/core/sandbox/utils.lua
+++ b/xmake/core/sandbox/modules/utils.lua
@@ -22,7 +22,7 @@
 
 -- load modules
 local utils     = require("base/utils")
-local vformat   = require("sandbox/vformat")
+local vformat   = require("sandbox/modules/vformat")
 
 -- define module
 local sandbox_utils = sandbox_utils or {}
diff --git a/xmake/core/sandbox/vformat.lua b/xmake/core/sandbox/modules/vformat.lua
index ad2c25529..f69e70fd7 100644
--- a/xmake/core/sandbox/vformat.lua
+++ b/xmake/core/sandbox/modules/vformat.lua
@@ -21,6 +21,6 @@
 --
 
 -- return module
-return require("sandbox/string").vformat
+return require("sandbox/modules/string").vformat
 
 
diff --git a/xmake/core/base/sandbox.lua b/xmake/core/sandbox/sandbox.lua
index 3c4d1aceb..6245acb1c 100644
--- a/xmake/core/base/sandbox.lua
+++ b/xmake/core/sandbox/sandbox.lua
@@ -96,7 +96,7 @@ function sandbox._init()
     end
 
     -- load builtin module files
-    local builtin_module_files = os.match(path.join(xmake._CORE_DIR, "sandbox/*.lua"))
+    local builtin_module_files = os.match(path.join(xmake._CORE_DIR, "sandbox/modules/*.lua"))
     if builtin_module_files then
         for _, builtin_module_file in ipairs(builtin_module_files) do