Skip to content

Commit 6221191

Browse files
committed
Refactor setModuleTag call in setLoadedModule
As setModuleTag now ensures no duplicate tag are set, no need to check if auto-loaded tag is already set. Simplify also the if/else branch as same commands are applied whether the loaded or auto-loaded tag need to be set.
1 parent aeda40b commit 6221191

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

tcl/modfind.tcl.in

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,24 +1212,15 @@ proc setLoadedModule {mod modfile uasked {modvr {}}} {
12121212
set ::g_loadedModules($mod) $modfile
12131213
# a loaded modfile may correspond to multiple loaded virtual modules
12141214
lappend ::g_loadedModuleFiles($modfile) $mod
1215+
12151216
# record if mod has been asked by user and relative loaded/auto-loaded tag
1216-
if {$uasked} {
1217-
setModuleTag $mod loaded
1218-
# also record tag for module designation including variants if specified
1219-
if {$modvr ne {} && $mod ne $modvr} {
1220-
setModuleTag $modvr loaded
1221-
}
1222-
# do not register auto-loaded tag if already done (when called from
1223-
# cacheCurrentModules proc)
1224-
} else {
1225-
if {![isModuleTagged $mod auto-loaded 1]} {
1226-
setModuleTag $mod auto-loaded
1227-
}
1228-
if {$modvr ne {} && $mod ne $modvr && ![isModuleTagged $modvr\
1229-
auto-loaded 1]} {
1230-
setModuleTag $modvr auto-loaded
1231-
}
1217+
set loadedtag [expr {$uasked ? {loaded} : {auto-loaded}}]
1218+
setModuleTag $mod $loadedtag
1219+
# also record tag for module designation including variants if specified
1220+
if {$modvr ne {} && $mod ne $modvr} {
1221+
setModuleTag $modvr $loadedtag
12321222
}
1223+
12331224
# build dependency chain
12341225
setModuleDependency $mod
12351226
}

0 commit comments

Comments
 (0)