diff options
| author | Arthur LAURENT <[email protected]> | 2024-07-23 23:25:48 +0200 |
|---|---|---|
| committer | Arthur LAURENT <[email protected]> | 2024-07-23 23:25:48 +0200 |
| commit | df5cb9cce6cbb757c12f07677edf27b4be219f48 (patch) | |
| tree | 80742d0b51636b6667f3ca5da8f6ccc4518f114a /xmake/rules/c++/modules | |
| parent | d84b42ace51b952a7433c2d966b5a3cc763717dc (diff) | |
prompt an error when multiple module with the same names are detected
Diffstat (limited to 'xmake/rules/c++/modules')
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/dependency_scanner.lua | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua index 7db818cf4..fe544ee77 100644 --- a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua +++ b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua @@ -175,15 +175,21 @@ end -- generate edges for DAG function _get_edges(nodes, modules) local edges = {} + local module_names = {} + local named_module_names = hashset.new() for _, node in ipairs(nodes) do local module = modules[node] + local module_name, _, _ = compiler_support.get_provided_module(module) + if module_name then + assert(not named_module_names:has(module_name), "duplicate module name detected \"" .. module_name .. "\"") + named_module_names:insert(module_name) + end if module.requires then for required_name, _ in table.orderpairs(module.requires) do for _, required_node in ipairs(nodes) do local name, _, _ = compiler_support.get_provided_module(modules[required_node]) if name and name == required_name then table.insert(edges, {required_node, node}) - break end end end @@ -200,8 +206,7 @@ function _get_package_modules(target, package, opt) for _, metafile in ipairs(metafiles) do package_modules = package_modules or {} local modulefile, name, metadata = _parse_meta_info(target, metafile) - local package_data = package["_INFO"] - local moduleonly = not package_data["libfiles"] + local moduleonly = not package:libraryfiles() package_modules[name] = {file = path.join(modulesdir, modulefile), metadata = metadata, external = {moduleonly = moduleonly}} end |
