From 6026401e3bc55e0b5974c0aa18aefe4d7135fe89 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Wed, 2 Mar 2022 23:18:40 +0800
Subject: improve table.wrap

---
 xmake/core/base/table.lua | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'xmake/core/base/table.lua')

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
-- 
cgit v1.3.1