summaryrefslogtreecommitdiff
path: root/xmake/rules/c++/modules/modules_support
diff options
context:
space:
mode:
authorruki <[email protected]>2024-02-04 09:31:33 +0800
committerGitHub <[email protected]>2024-02-04 09:31:33 +0800
commit7f4af3b1df794fe2990ad23a75316514c70f6a44 (patch)
tree31859195fcae7dd4a0bfc0b19a02b8b9569065b1 /xmake/rules/c++/modules/modules_support
parent0d72b2ef9a60ee5a56cfc4f2d5d0eb7fc8176084 (diff)
Update dependency_scanner.lua
Diffstat (limited to 'xmake/rules/c++/modules/modules_support')
-rw-r--r--xmake/rules/c++/modules/modules_support/dependency_scanner.lua16
1 files changed, 8 insertions, 8 deletions
diff --git a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
index 6d93985bf..7ad344750 100644
--- a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
+++ b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
@@ -397,7 +397,7 @@ end
-- topological sort
function sort_modules_by_dependencies(objectfiles, modules)
- local output = {}
+ local result = {}
local edges, nodeps_nodes = _get_edges(objectfiles, modules)
local dag = graph.new(true)
for _, e in ipairs(edges) do
@@ -414,17 +414,17 @@ function sort_modules_by_dependencies(objectfiles, modules)
table.insert(names, name or cppfile)
raise("circular modules dependency detected!\n%s", table.concat(names, "\n -> import "))
end
- local sorted = dag:topological_sort()
- for _, objectfile in ipairs(sorted) do
- table.insert(output, objectfile)
+ local objectfiles_sorted = dag:topological_sort()
+ for _, objectfile in ipairs(objectfiles_sorted) do
+ table.insert(result, objectfile)
end
- local _objectfiles = hashset.from(sorted)
+ local objectfiles_sorted_set = hashset.from(objectfiles_sorted)
for _, objectfile in ipairs(objectfiles) do
- if not _objectfiles:has(objectfile) then
- table.insert(output, objectfile)
+ if not objectfiles_sorted_set:has(objectfile) then
+ table.insert(result, objectfile)
end
end
- return output
+ return result
end
-- get source modulefile for external target deps