fix some unpack

33 files changed, 47 insertions, 47 deletions

diff --git a/xmake/actions/run/main.lua b/xmake/actions/run/main.lua
index a74845f95..f79a5d6b2 100644
--- a/xmake/actions/run/main.lua
+++ b/xmake/actions/run/main.lua
@@ -48,10 +48,10 @@ function _do_run_target(target)
     -- add run environments
     local addrunenvs, setrunenvs = make_runenvs(target)
     for name, values in pairs(addrunenvs) do
-        os.addenv(name, unpack(table.wrap(values)))
+        os.addenv(name, table.unpack(table.wrap(values)))
     end
     for name, value in pairs(setrunenvs) do
-        os.setenv(name, unpack(table.wrap(value)))
+        os.setenv(name, table.unpack(table.wrap(value)))
     end
 
     -- debugging?
diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua
index 312d5705d..a4fdb570e 100644
--- a/xmake/core/base/os.lua
+++ b/xmake/core/base/os.lua
@@ -377,7 +377,7 @@ end
 
 -- match directories
 --
--- @note only return {} without count to simplify code, e.g. unpack(os.dirs(""))
+-- @note only return {} without count to simplify code, e.g. table.unpack(os.dirs(""))
 --
 function os.dirs(pattern, callback)
     return (os.match(pattern, 'd', callback))
diff --git a/xmake/core/base/pipe.lua b/xmake/core/base/pipe.lua
index 5f7c46c06..92ad42bc6 100644
--- a/xmake/core/base/pipe.lua
+++ b/xmake/core/base/pipe.lua
@@ -67,7 +67,7 @@ function _instance:write(data, opt)
         return -1, errors
     end
 
-    -- data is bytes? unpack the raw address
+    -- data is bytes? table.unpack the raw address
     local datasize = #data
     if type(data) == "table" and data.caddr then
         datasize = data:size()
diff --git a/xmake/core/base/scopeinfo.lua b/xmake/core/base/scopeinfo.lua
index 1f07e236f..6c0563da2 100644
--- a/xmake/core/base/scopeinfo.lua
+++ b/xmake/core/base/scopeinfo.lua
@@ -451,7 +451,7 @@ function _instance:apival_set(name, ...)
         local array = name
         for _, dict in ipairs(array) do
             for k, v in pairs(dict) do
-                self:apival_set(k, unpack(table.wrap(v)))
+                self:apival_set(k, table.unpack(table.wrap(v)))
             end
         end
 
@@ -459,7 +459,7 @@ function _instance:apival_set(name, ...)
     elseif table.is_dictionary(name) then
         local dict = name
         for k, v in pairs(dict) do
-            self:apival_set(k, unpack(table.wrap(v)))
+            self:apival_set(k, table.unpack(table.wrap(v)))
         end
     elseif name ~= nil then
         os.raise("unknown type(%s) for %s:set(%s, ...)", type(name), self:kind(), name)
@@ -487,7 +487,7 @@ function _instance:apival_add(name, ...)
         local array = name
         for _, dict in ipairs(array) do
             for k, v in pairs(dict) do
-                self:apival_add(k, unpack(table.wrap(v)))
+                self:apival_add(k, table.unpack(table.wrap(v)))
             end
         end
 
@@ -495,7 +495,7 @@ function _instance:apival_add(name, ...)
     elseif table.is_dictionary(name) then
         local dict = name
         for k, v in pairs(dict) do
-            self:apival_add(k, unpack(table.wrap(v)))
+            self:apival_add(k, table.unpack(table.wrap(v)))
         end
     elseif name ~= nil then
         os.raise("unknown type(%s) for %s:add(%s, ...)", type(name), self:kind(), name)
diff --git a/xmake/core/base/socket.lua b/xmake/core/base/socket.lua
index 7269cb504..4e6435c09 100644
--- a/xmake/core/base/socket.lua
+++ b/xmake/core/base/socket.lua
@@ -244,7 +244,7 @@ function _instance:send(data, opt)
         return -1, errors
     end
 
-    -- data is bytes? unpack the raw address
+    -- data is bytes? table.unpack the raw address
     local datasize = #data
     if type(data) == "table" and data.caddr then
         datasize = data:size()
@@ -442,7 +442,7 @@ function _instance:sendto(data, addr, port, opt)
         return -1, string.format("%s: sendto empty address!", self)
     end
 
-    -- data is bytes? unpack the raw address
+    -- data is bytes? table.unpack the raw address
     if type(data) == "table" and data.caddr then
         data = {data = data:caddr(), size = data:size()}
     end
diff --git a/xmake/core/base/table.lua b/xmake/core/base/table.lua
index 372e5f975..72987c1b6 100644
--- a/xmake/core/base/table.lua
+++ b/xmake/core/base/table.lua
@@ -327,9 +327,9 @@ function table.pack(...)
     return { n = select("#", ...), ... }
 end
 
--- unpack table values
+-- table.unpack table values
 -- polyfill of lua 5.2, @see https://www.lua.org/manual/5.2/manual.html#pdf-table.unpack
-table.unpack = table.unpack or unpack
+table.unpack = table.unpack or table.unpack
 
 -- get keys of a table
 function table.keys(tab)
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index e636cfbf5..80f7e9904 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -731,7 +731,7 @@ function _instance:envs_enter()
                 end
             end
         else
-            os.addenv(name, unpack(table.wrap(values)))
+            os.addenv(name, table.unpack(table.wrap(values)))
         end
     end
 end
diff --git a/xmake/core/sandbox/modules/interpreter/unpack.lua b/xmake/core/sandbox/modules/interpreter/unpack.lua
index d05c3ce3d..5d3b9c811 100644
--- a/xmake/core/sandbox/modules/interpreter/unpack.lua
+++ b/xmake/core/sandbox/modules/interpreter/unpack.lua
@@ -15,7 +15,7 @@
 -- Copyright (C) 2015-present, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        unpack.lua
+-- @file        table.unpack.lua
 --
 
 -- load module
diff --git a/xmake/core/sandbox/modules/unpack.lua b/xmake/core/sandbox/modules/unpack.lua
index d05c3ce3d..5d3b9c811 100644
--- a/xmake/core/sandbox/modules/unpack.lua
+++ b/xmake/core/sandbox/modules/unpack.lua
@@ -15,7 +15,7 @@
 -- Copyright (C) 2015-present, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        unpack.lua
+-- @file        table.unpack.lua
 --
 
 -- load module
diff --git a/xmake/core/sandbox/modules/utils.lua b/xmake/core/sandbox/modules/utils.lua
index 528f59b9e..59b4cf628 100644
--- a/xmake/core/sandbox/modules/utils.lua
+++ b/xmake/core/sandbox/modules/utils.lua
@@ -75,7 +75,7 @@ function sandbox_utils.print(format, ...)
         {
             function ()
                 -- attempt to format message
-                local message = vformat(format, unpack(args))
+                local message = vformat(format, table.unpack(args))
 
                 -- trace
                 utils._print(message)
@@ -87,7 +87,7 @@ function sandbox_utils.print(format, ...)
             {
                 function (errors)
                     -- print multi-variables with raw lua action
-                    sandbox_utils._print(format, unpack(args))
+                    sandbox_utils._print(format, table.unpack(args))
                 end
             }
         }
diff --git a/xmake/includes/check_cflags.lua b/xmake/includes/check_cflags.lua
index ef3f7866b..63354dfac 100644
--- a/xmake/includes/check_cflags.lua
+++ b/xmake/includes/check_cflags.lua
@@ -55,7 +55,7 @@ end
 function configvar_check_cflags(definition, flags, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         if opt.default == nil then
diff --git a/xmake/includes/check_cfuncs.lua b/xmake/includes/check_cfuncs.lua
index 1a64cb250..51352e424 100644
--- a/xmake/includes/check_cfuncs.lua
+++ b/xmake/includes/check_cfuncs.lua
@@ -76,7 +76,7 @@ end
 function configvar_check_cfuncs(definition, funcs, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         add_cfuncs(funcs)
diff --git a/xmake/includes/check_cincludes.lua b/xmake/includes/check_cincludes.lua
index dc0308a65..c954b5260 100644
--- a/xmake/includes/check_cincludes.lua
+++ b/xmake/includes/check_cincludes.lua
@@ -51,7 +51,7 @@ end
 function configvar_check_cincludes(definition, includes, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         add_cincludes(includes)
diff --git a/xmake/includes/check_csnippets.lua b/xmake/includes/check_csnippets.lua
index 9d2370ee0..19e87ab9e 100644
--- a/xmake/includes/check_csnippets.lua
+++ b/xmake/includes/check_csnippets.lua
@@ -87,7 +87,7 @@ end
 function configvar_check_csnippets(definition, snippets, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         add_csnippets(definition, snippets, {tryrun = opt.tryrun, output = opt.output})
diff --git a/xmake/includes/check_ctypes.lua b/xmake/includes/check_ctypes.lua
index b3f59b04e..d14c64aa7 100644
--- a/xmake/includes/check_ctypes.lua
+++ b/xmake/includes/check_ctypes.lua
@@ -64,7 +64,7 @@ end
 function configvar_check_ctypes(definition, types, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         add_ctypes(types)
diff --git a/xmake/includes/check_cxxflags.lua b/xmake/includes/check_cxxflags.lua
index 38ea5172e..c93745134 100644
--- a/xmake/includes/check_cxxflags.lua
+++ b/xmake/includes/check_cxxflags.lua
@@ -55,7 +55,7 @@ end
 function configvar_check_cxxflags(definition, flags, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         if opt.default == nil then
diff --git a/xmake/includes/check_cxxfuncs.lua b/xmake/includes/check_cxxfuncs.lua
index 1488f7312..241effd19 100644
--- a/xmake/includes/check_cxxfuncs.lua
+++ b/xmake/includes/check_cxxfuncs.lua
@@ -76,7 +76,7 @@ end
 function configvar_check_cxxfuncs(definition, funcs, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         add_cxxfuncs(funcs)
diff --git a/xmake/includes/check_cxxincludes.lua b/xmake/includes/check_cxxincludes.lua
index 45cb2d2c0..15f4fa1df 100644
--- a/xmake/includes/check_cxxincludes.lua
+++ b/xmake/includes/check_cxxincludes.lua
@@ -48,7 +48,7 @@ end
 function configvar_check_cxxincludes(definition, includes, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         add_cxxincludes(includes)
diff --git a/xmake/includes/check_cxxsnippets.lua b/xmake/includes/check_cxxsnippets.lua
index daa71780c..9405b5707 100644
--- a/xmake/includes/check_cxxsnippets.lua
+++ b/xmake/includes/check_cxxsnippets.lua
@@ -87,7 +87,7 @@ end
 function configvar_check_cxxsnippets(definition, snippets, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         add_cxxsnippets(definition, snippets, {tryrun = opt.tryrun, output = opt.output})
diff --git a/xmake/includes/check_cxxtypes.lua b/xmake/includes/check_cxxtypes.lua
index f5b8c677a..928ecbad5 100644
--- a/xmake/includes/check_cxxtypes.lua
+++ b/xmake/includes/check_cxxtypes.lua
@@ -64,7 +64,7 @@ end
 function configvar_check_cxxtypes(definition, types, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         add_cxxtypes(types)
diff --git a/xmake/includes/check_features.lua b/xmake/includes/check_features.lua
index 3e8fb47be..481d9b6fe 100644
--- a/xmake/includes/check_features.lua
+++ b/xmake/includes/check_features.lua
@@ -60,7 +60,7 @@ end
 function configvar_check_features(definition, features, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         add_features(features)
diff --git a/xmake/includes/check_links.lua b/xmake/includes/check_links.lua
index 54891361e..25ddaa619 100644
--- a/xmake/includes/check_links.lua
+++ b/xmake/includes/check_links.lua
@@ -48,7 +48,7 @@ end
 function configvar_check_links(definition, links, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         add_links(links)
diff --git a/xmake/includes/check_macros.lua b/xmake/includes/check_macros.lua
index 0ed879c95..352a2382f 100644
--- a/xmake/includes/check_macros.lua
+++ b/xmake/includes/check_macros.lua
@@ -81,7 +81,7 @@ end
 function configvar_check_macros(definition, macros, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     local snippets = {}
     save_scope()
     option(optname)
diff --git a/xmake/includes/check_syslinks.lua b/xmake/includes/check_syslinks.lua
index 8df32a1b8..379bb005a 100644
--- a/xmake/includes/check_syslinks.lua
+++ b/xmake/includes/check_syslinks.lua
@@ -48,7 +48,7 @@ end
 function configvar_check_syslinks(definition, links, opt)
     opt = opt or {}
     local optname = "__" .. (opt.name or definition)
-    local defname, defval = unpack(definition:split('='))
+    local defname, defval = table.unpack(definition:split('='))
     save_scope()
     option(optname)
         add_syslinks(links)
diff --git a/xmake/includes/qt_add_static_plugins.lua b/xmake/includes/qt_add_static_plugins.lua
index 8ecb06056..e65965972 100644
--- a/xmake/includes/qt_add_static_plugins.lua
+++ b/xmake/includes/qt_add_static_plugins.lua
@@ -34,10 +34,10 @@ function qt_add_static_plugins(plugin, opt)
     opt = opt or {}
     add_values("qt.plugins", plugin)
     if opt.links then
-        add_values("qt.links", unpack(table.wrap(opt.links)))
+        add_values("qt.links", table.unpack(table.wrap(opt.links)))
     end
     if opt.linkdirs then
-        add_values("qt.linkdirs", unpack(table.wrap(opt.linkdirs)))
+        add_values("qt.linkdirs", table.unpack(table.wrap(opt.linkdirs)))
     end
 end
 
diff --git a/xmake/modules/lib/detect/pkgconfig.lua b/xmake/modules/lib/detect/pkgconfig.lua
index 9cd07a1e7..57726bae0 100644
--- a/xmake/modules/lib/detect/pkgconfig.lua
+++ b/xmake/modules/lib/detect/pkgconfig.lua
@@ -46,7 +46,7 @@ function version(name, opt)
     local configdirs_old = os.getenv("PKG_CONFIG_PATH")
     local configdirs = table.wrap(opt.configdirs)
     if #configdirs > 0 then
-        os.setenv("PKG_CONFIG_PATH", unpack(configdirs))
+        os.setenv("PKG_CONFIG_PATH", table.unpack(configdirs))
     end
 
     -- get version
@@ -85,7 +85,7 @@ function variables(name, variables, opt)
     local configdirs_old = os.getenv("PKG_CONFIG_PATH")
     local configdirs = table.wrap(opt.configdirs)
     if #configdirs > 0 then
-        os.setenv("PKG_CONFIG_PATH", unpack(configdirs))
+        os.setenv("PKG_CONFIG_PATH", table.unpack(configdirs))
     end
 
     -- get variable value
diff --git a/xmake/modules/package/manager/find_package.lua b/xmake/modules/package/manager/find_package.lua
index 41c110796..7d82043b2 100644
--- a/xmake/modules/package/manager/find_package.lua
+++ b/xmake/modules/package/manager/find_package.lua
@@ -174,7 +174,7 @@ function main(name, opt)
     opt.mode = opt.mode or config.mode() or "release"
 
     -- get package manager name
-    local manager_name, package_name = unpack(name:split("::", {plain = true, strict = true}))
+    local manager_name, package_name = table.unpack(name:split("::", {plain = true, strict = true}))
     if package_name == nil then
         package_name = manager_name
         manager_name = nil
@@ -184,7 +184,7 @@ function main(name, opt)
 
     -- get package name and require version
     local require_version = nil
-    package_name, require_version = unpack(package_name:trim():split("%s"))
+    package_name, require_version = table.unpack(package_name:trim():split("%s"))
     opt.require_version = require_version or opt.require_version
 
     -- find package
diff --git a/xmake/modules/package/manager/install_package.lua b/xmake/modules/package/manager/install_package.lua
index 1c5d5ab07..05e13ed27 100644
--- a/xmake/modules/package/manager/install_package.lua
+++ b/xmake/modules/package/manager/install_package.lua
@@ -93,7 +93,7 @@ function main(name, opt)
     opt.mode = opt.mode or config.mode() or "release"
 
     -- get package manager name
-    local manager_name, package_name = unpack(name:split("::", {plain = true, strict = true}))
+    local manager_name, package_name = table.unpack(name:split("::", {plain = true, strict = true}))
     if package_name == nil then
         package_name = manager_name
         manager_name = nil
@@ -103,7 +103,7 @@ function main(name, opt)
 
     -- get package name and require version
     local require_version = nil
-    package_name, require_version = unpack(package_name:trim():split("%s"))
+    package_name, require_version = table.unpack(package_name:trim():split("%s"))
     opt.require_version = require_version or opt.require_version
 
     -- do install package
diff --git a/xmake/modules/private/action/require/impl/packagenv.lua b/xmake/modules/private/action/require/impl/packagenv.lua
index 12a98d36f..06a70df91 100644
--- a/xmake/modules/private/action/require/impl/packagenv.lua
+++ b/xmake/modules/private/action/require/impl/packagenv.lua
@@ -33,7 +33,7 @@ function _enter_package(package_name, envs, installdir)
                 end
             end
         else
-            os.addenv(name, unpack(table.wrap(values)))
+            os.addenv(name, table.unpack(table.wrap(values)))
         end
     end
 end
diff --git a/xmake/modules/private/action/require/impl/search_packages.lua b/xmake/modules/private/action/require/impl/search_packages.lua
index 00cf1ffbf..276747db4 100644
--- a/xmake/modules/private/action/require/impl/search_packages.lua
+++ b/xmake/modules/private/action/require/impl/search_packages.lua
@@ -22,7 +22,7 @@
 function _search_packages(name)
 
     -- get package manager name
-    local manager_name, package_name = unpack(name:split("::", {plain = true, strict = true}))
+    local manager_name, package_name = table.unpack(name:split("::", {plain = true, strict = true}))
     if package_name == nil then
         package_name = manager_name
         manager_name = "xmake"
diff --git a/xmake/modules/private/xrepo/action/env.lua b/xmake/modules/private/xrepo/action/env.lua
index b29d01623..742d30d12 100644
--- a/xmake/modules/private/xrepo/action/env.lua
+++ b/xmake/modules/private/xrepo/action/env.lua
@@ -208,7 +208,7 @@ function _package_addenvs(envs, instance)
                 end
             end
         else
-            _addenvs(envs, name, unpack(table.wrap(values)))
+            _addenvs(envs, name, table.unpack(table.wrap(values)))
         end
     end
 
@@ -237,7 +237,7 @@ function _toolchain_addenvs(envs)
         local toolchain_inst = toolchain.load(name, toolchain_opt)
         if toolchain_inst then
             for k, v in pairs(toolchain_inst:runenvs()) do
-                _addenvs(envs, k, unpack(path.splitenv(v)))
+                _addenvs(envs, k, table.unpack(path.splitenv(v)))
             end
         end
     end
diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua
index 1c4627f11..c5bec10af 100644
--- a/xmake/rules/qt/load.lua
+++ b/xmake/rules/qt/load.lua
@@ -81,10 +81,10 @@ function _add_plugins(target, plugins)
     for name, plugin in pairs(plugins) do
         target:values_add("qt.plugins", name)
         if plugin.links then
-            target:values_add("qt.links", unpack(table.wrap(plugin.links)))
+            target:values_add("qt.links", table.unpack(table.wrap(plugin.links)))
         end
         if plugin.linkdirs then
-            target:values_add("qt.linkdirs", unpack(table.wrap(plugin.linkdirs)))
+            target:values_add("qt.linkdirs", table.unpack(table.wrap(plugin.linkdirs)))
         end
     end
 end
diff --git a/xmake/rules/xcode/application/run.lua b/xmake/rules/xcode/application/run.lua
index e92397a29..0e0663207 100644
--- a/xmake/rules/xcode/application/run.lua
+++ b/xmake/rules/xcode/application/run.lua
@@ -40,10 +40,10 @@ function _run_on_macosx(target, opt)
     -- add run environments
     local addrunenvs, setrunenvs = make_runenvs(target)
     for name, values in pairs(addrunenvs) do
-        os.addenv(name, unpack(table.wrap(values)))
+        os.addenv(name, table.unpack(table.wrap(values)))
     end
     for name, value in pairs(setrunenvs) do
-        os.setenv(name, unpack(table.wrap(value)))
+        os.setenv(name, table.unpack(table.wrap(value)))
     end
 
     -- debugging?