improve table.wrap

3 files changed, 27 insertions, 9 deletions

diff --git a/tests/modules/table/test.lua b/tests/modules/table/test.lua
index 5ed17620c..426dfe516 100644
--- a/tests/modules/table/test.lua
+++ b/tests/modules/table/test.lua
@@ -9,3 +9,19 @@ function test_find_if(t)
     t:are_equal(table.find({1, 2, 4, 4, 5, 6}, 4), {3, 4})
     t:are_equal(table.find_first({1, 2, 3, 4, 5, 6}, 4), 4)
 end
+
+function test_wrap()
+    t:are_equal(talbe.wrap(1), {1})
+    t:are_equal(talbe.wrap(nil), {})
+    t:are_equal(talbe.wrap({}), {})
+    t:are_equal(talbe.wrap({1}), {1})
+    t:are_equal(talbe.wrap({{}}), {{}})
+end
+
+function test_unwrap()
+    t:are_equal(talbe.unwrap(1), 1)
+    t:are_equal(talbe.unwrap(nil), nil)
+    t:are_equal(talbe.unwrap({}), nil)
+    t:are_equal(talbe.unwrap({1}), 1)
+    t:are_equal(talbe.unwrap({{}}), {})
+end
diff --git a/xmake/core/base/scopeinfo.lua b/xmake/core/base/scopeinfo.lua
index 8a69a9299..e3d9a8500 100644
--- a/xmake/core/base/scopeinfo.lua
+++ b/xmake/core/base/scopeinfo.lua
@@ -154,8 +154,14 @@ function _instance:_api_add_values(name, ...)
         extra_config = nil
     end
 
-    -- expand values
-    if not extra_config or extra_config.expand ~= false then
+    if extra_config and extra_config.expand == false then
+        for _, value in ipairs(values) do
+            if type(value) == "table" then
+                setmetatable(value, {})
+            end
+        end
+    else
+        -- expand values
         values = table.join(table.unpack(values))
     end
 
diff --git a/xmake/core/base/table.lua b/xmake/core/base/table.lua
index 2cf617f3b..1c19f588d 100644
--- a/xmake/core/base/table.lua
+++ b/xmake/core/base/table.lua
@@ -165,13 +165,9 @@ end
 
 -- copy the table to self
 function table.copy2(self, copied)
-
-    -- clear self first
+    assert(type(copied) == "table")
     table.clear(self)
-
-    -- copy it
-    copied = copied or {}
-    for k, v in pairs(table.wrap(copied)) do
+    for k, v in pairs(copied) do
         self[k] = v
     end
 end
@@ -327,7 +323,7 @@ function table.wrap(object)
     if nil == object then
         return {}
     end
-    if type(object) ~= "table" then
+    if type(object) ~= "table" or getmetatable(object) then -- maybe object, we need wrap it too
         return {object}
     end
     return object