diff options
Diffstat (limited to 'xmake/scripts/base/table.lua')
| -rw-r--r-- | xmake/scripts/base/table.lua | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xmake/scripts/base/table.lua b/xmake/scripts/base/table.lua index d6f6990d7..52b726412 100644 --- a/xmake/scripts/base/table.lua +++ b/xmake/scripts/base/table.lua @@ -31,8 +31,9 @@ function table.join(...) local result = {} for _, t in ipairs(args) do if type(t) == "table" then - for _, v in ipairs(t) do - table.insert(result, v) + for k, v in pairs(t) do + if type(k) == "number" then table.insert(result, v) + else result[k] = v end end else table.insert(result, t) @@ -53,8 +54,9 @@ function table.join2(self, ...) local args = {...} for _, t in ipairs(args) do if type(t) == "table" then - for _, v in ipairs(t) do - table.insert(self, v) + for k, v in pairs(t) do + if type(k) == "number" then table.insert(self, v) + else self[k] = v end end else table.insert(self, t) |