implement suggestions

2 files changed, 4 insertions, 9 deletions

diff --git a/xmake/rules/c++/modules/modules_support/common.lua b/xmake/rules/c++/modules/modules_support/common.lua
index 5f1f72599..ace8f2c56 100644
--- a/xmake/rules/c++/modules/modules_support/common.lua
+++ b/xmake/rules/c++/modules/modules_support/common.lua
@@ -160,24 +160,19 @@ function cull_unused_modules(target, modules, package_modules_data)
     for _, module in pairs(modules) do
         if module.requires then
             for required, _ in pairs(module.requires) do
-                table.append(needed_modules, required)
+                table.insert(needed_modules, required)
             end
         end
     end
 
     -- append all package dependencies
-    local module_names = {}
-    for name, _ in pairs(package_modules_data) do
-        table.append(module_names, name)
-    end
-
+    local module_names = table.keys(package_modules_data) or {}
     local culled
-    for i, name in ipairs(module_names) do
+    for _, name in ipairs(module_names) do
         culled = culled or {}
         if table.find(needed_modules, name) and package_modules_data[name] and not culled[name] then
             culled[name] = package_modules_data[name]
 
-            -- table.remove(module_names, i)
             if culled[name].metadata.imports then
                  table.join2(needed_modules, culled[name].metadata.imports)
                  table.join2(module_names, culled[name].metadata.imports)
diff --git a/xmake/rules/c++/modules/xmake.lua b/xmake/rules/c++/modules/xmake.lua
index 1d2852644..b62ec0f36 100644
--- a/xmake/rules/c++/modules/xmake.lua
+++ b/xmake/rules/c++/modules/xmake.lua
@@ -75,7 +75,7 @@ rule("c++.build.modules.builder")
                 if package_modules_data then
                     -- append to sourcebatch
                     for name, package_module_data in pairs(package_modules_data) do
-                        table.append(sourcebatch.sourcefiles, package_module_data.file)
+                        table.insert(sourcebatch.sourcefiles, package_module_data.file)
                     end
 
                     -- we need to repatch and regenerate dependencies at this point