Set tag on modvr desig of loaded mod

Correctly detect tags set on loaded modules when refreshing them.

Update the cacheCurrentModules procedure to record the tags of loaded
modules also on the module name version and variant list designation. So
when the `module-info tags` command is called from a modulefile loaded
with variant set, it correctly retrieves the tags defined on this module
if currently loaded.

Add the report mode '6' on getVariantList procedure to proceed like mode
'1' but without updating the key map reference.

Author: xdelaruelle

tcl/modfind.tcl.in

@@ -775,7 +775,7 @@ proc getVariantList {mod {report 0} {excl_dflval 0} {from_spec 0}} {
          3 {lappend ret $vrname [lindex $vrarr($vrname) 0] [lindex\
             $vrarr($vrname) 1]}
          2 {lappend ret [list $vrname $vrarr($vrname) $vrisbool($vrname)]}
-         1 - 5 {
+         1 - 5 - 6 {
             if {$vrisbool($vrname)} {
                if {$vrarr($vrname)} {
                   lappend ret +$vrname
@@ -797,13 +797,15 @@ proc getVariantList {mod {report 0} {excl_dflval 0} {from_spec 0}} {
                set sc $::g_variantShortcut($vrname)
                lappend ret $sc$vrarr($vrname)
                # track if variant shortcut has been reported to build key
-               if {![info exists ::g_used_va($sc)]} {
+               # unless if key should not be updated (report mode '6')
+               if {$report != 6 && ![info exists ::g_used_va($sc)]} {
                   set ::g_used_va($sc) $vrname
                }
             } else {
                lappend ret $vrname=$vrarr($vrname)
                # track if var=val variant has been reported to build key
-               if {![info exists ::g_used_va(val)]} {
+               # unless if key should not be updated (report mode '6')
+               if {$report != 6 && ![info exists ::g_used_va(val)]} {
                   set ::g_used_va(val) 1
                }
             }
@@ -1945,14 +1947,24 @@ proc cacheCurrentModules {{exitonerr 1}} {
       set modlist [getLoadedModuleList]
 
       if {[llength $modlist] == [llength $modfilelist]} {
-         # cache declared tags of loaded modules
-         foreach modtag [getLoadedModuleTagList] {
-            setModuleTag {*}$modtag
-         }
-
          # cache declared variant of loaded modules
          foreach modvrspec [getLoadedModuleVariantList] {
             setLoadedVariant {*}$modvrspec
+            # prepare modvr designation of loaded mod needed in next steps
+            set mod [lindex $modvrspec 0]
+            set vrlist [getVariantList $mod 6]
+            set modvr [list $mod {*}$vrlist]
+            set modvrarr($mod) $modvr
+         }
+
+         # cache declared tags of loaded modules
+         foreach modtag [getLoadedModuleTagList] {
+            setModuleTag {*}$modtag
+            # also record tag over full mod and vr designation
+            set mod [lindex $modtag 0]
+            if {[info exists modvrarr($mod)]} {
+               setModuleTag $modvrarr($mod) {*}[lrange $modtag 1 end]
+            }
          }
 
          # cache declared alternative names of loaded modules
@@ -1987,8 +1999,14 @@ proc cacheCurrentModules {{exitonerr 1}} {
          }
 
          foreach mod $modlist {
+            # get all tags also recorded on mod and vr designation
+            if {[info exists modvrarr($mod)]} {
+               set modvr $modvrarr($mod)
+            } else {
+               set modvr {}
+            }
             setLoadedModule $mod [lindex $modfilelist $i] [expr\
-               {![isModuleTagged $mod auto-loaded 1]}]
+               {![isModuleTagged $mod auto-loaded 1]}] $modvr
             incr i
          }
 

testsuite/modules.50-cmds/078-refresh.exp

@@ -100,16 +100,29 @@ lappend ans [list funcfoo "() {" "echo foo1; };"]
 lappend ans [list out {echo refresh/1.0}]
 testouterr_cmd sh {refresh} $ans {}
 
+# test tags
+setenv_var __MODULES_LMTAG refresh/1.0&bar
+
+set ans [list]
+lappend ans [list alias altags {echo bar loaded}]
+lappend ans [list alias alspec {echo refresh/1.0}]
+lappend ans [list alias alcmd {echo refresh}]
+lappend ans [list alias alfoo {echo foo1}]
+lappend ans [list alias almode {echo refresh}]
+lappend ans [list alias alisavail {echo is-avail ok}]
+lappend ans [list alias algetenv {echo getenv ok}]
+lappend ans [list funcfoo "() {" "echo foo1; };"]
+lappend ans [list out {echo refresh/1.0}]
+testouterr_cmd sh {refresh} $ans {}
+
 # test tags and variant
 setenv_loaded_module refresh/2.0 $mp/refresh/2.0
 setenv_var __MODULES_LMTAG refresh/2.0&bar
 setenv_var MODULES_ADVANCED_VERSION_SPEC 1
 setenv_var __MODULES_LMVARIANT refresh/2.0&foo|1|1|0
 
 set ans [list]
-#FIXME: tags associated with loaded module should be found
-#lappend ans [list alias altags {echo bar loaded}]
-lappend ans [list alias altags {echo }]
+lappend ans [list alias altags {echo bar loaded}]
 lappend ans [list alias alspec {echo refresh/2.0}]
 lappend ans [list alias alfoo {echo foo2}]
 lappend ans [list funcfoo "() {" "echo foo2; };"]
@@ -118,11 +131,10 @@ testouterr_cmd sh {refresh} $ans {}
 
 # test evaluation order
 setenv_loaded_module [list refresh/1.0 refresh/2.0] [list $mp/refresh/1.0 $mp/refresh/2.0]
+setenv_var __MODULES_LMTAG refresh/2.0&bar
 
 set ans [list]
-#FIXME: tags associated with loaded module should be found
-#lappend ans [list alias altags {echo bar loaded}]
-lappend ans [list alias altags {echo }]
+lappend ans [list alias altags {echo bar loaded}]
 lappend ans [list alias alspec {echo refresh/2.0}]
 lappend ans [list alias alisloaded2 {echo is-loaded ok}]
 lappend ans [list alias alcmd {echo refresh}]
@@ -143,10 +155,36 @@ testouterr_cmd sh {refresh -v} $ans $tserr2
 # verbose output and hidden-loaded module
 setenv_var __MODULES_LMTAG refresh/2.0&bar&hidden-loaded
 set tserr1 [msg_refresh refresh/1.0]
+set ans [list]
+lappend ans [list alias altags {echo bar hidden-loaded loaded}]
+lappend ans [list alias alspec {echo refresh/2.0}]
+lappend ans [list alias alisloaded2 {echo is-loaded ok}]
+lappend ans [list alias alcmd {echo refresh}]
+lappend ans [list alias alfoo {echo foo2}]
+lappend ans [list alias almode {echo refresh}]
+lappend ans [list alias alisavail {echo is-avail ok}]
+lappend ans [list alias algetenv {echo getenv ok}]
+lappend ans [list alias alisloaded1 {echo is-loaded ok}]
+lappend ans [list funcfoo "() {" "echo foo2; };"]
+lappend ans [list out {echo refresh/1.0}]
+lappend ans [list out {echo refresh/2.0}]
 testouterr_cmd sh {refresh -v} $ans $tserr2
 
 # verbose output and hidden-loaded module
 setenv_var __MODULES_LMTAG refresh/2.0&bar&hidden-loaded&auto-loaded
+set ans [list]
+lappend ans [list alias altags {echo auto-loaded bar hidden-loaded}]
+lappend ans [list alias alspec {echo refresh/2.0}]
+lappend ans [list alias alisloaded2 {echo is-loaded ok}]
+lappend ans [list alias alcmd {echo refresh}]
+lappend ans [list alias alfoo {echo foo2}]
+lappend ans [list alias almode {echo refresh}]
+lappend ans [list alias alisavail {echo is-avail ok}]
+lappend ans [list alias algetenv {echo getenv ok}]
+lappend ans [list alias alisloaded1 {echo is-loaded ok}]
+lappend ans [list funcfoo "() {" "echo foo2; };"]
+lappend ans [list out {echo refresh/1.0}]
+lappend ans [list out {echo refresh/2.0}]
 testouterr_cmd sh {refresh -v} $ans $tserr1
 testouterr_cmd sh {refresh -vv} $ans $tserr2
 setenv_var __MODULES_LMTAG refresh/1.0&hidden-loaded&auto-loaded:refresh/2.0&bar&hidden-loaded&auto-loaded
@@ -171,19 +209,17 @@ lappend ans [list funcsp "() { echo f\\\"o;
     echo f\\'o; };"]
 testouterr_cmd sh {refresh} $ans {}
 
-
 #
 # error during refresh evaluation
 #
 
 setenv_loaded_module [list refresh/1.0 refresh/2.0] [list $mp/refresh/1.0 $mp/refresh/2.0]
+setenv_var __MODULES_LMTAG refresh/2.0&bar
 
 # break during evaluation
 setenv_var TESTSUITE_REFRESH break1
 set ans1 [list]
-#FIXME: tags associated with loaded module should be found
-#lappend ans [list alias altags {echo bar loaded}]
-lappend ans1 [list alias altags {echo }]
+lappend ans1 [list alias altags {echo bar loaded}]
 lappend ans1 [list alias alspec {echo refresh/2.0}]
 lappend ans1 [list alias alfoo {echo foo2}]
 lappend ans1 [list alias alisloaded1 {echo is-loaded ok}]
@@ -195,10 +231,10 @@ testouterr_cmd sh {refresh} $ans1 [msg_refresh refresh/1.0 $err_evalabort]
 # verbose output
 testouterr_cmd sh {refresh -v} $ans1 [msg_refresh refresh/1.0 $err_evalabort]\n\n[msg_refresh refresh/2.0{+foo}]
 # hidden-loaded/auto-loaded
-setenv_var __MODULES_LMTAG refresh/1.0&bar&hidden-loaded&auto-loaded
+setenv_var __MODULES_LMTAG refresh/1.0&bar&hidden-loaded&auto-loaded:refresh/2.0&bar
 set tserr [msg_refresh refresh/1.0 $err_evalabort]
 testouterr_cmd sh {refresh} $ans1 $tserr
-unsetenv_var __MODULES_LMTAG
+setenv_var __MODULES_LMTAG refresh/2.0&bar
 
 # break in second loaded module
 setenv_var TESTSUITE_REFRESH break2
@@ -259,9 +295,7 @@ testouterr_cmd sh {refresh} $ans2 $tserr
 # continue command
 setenv_var TESTSUITE_REFRESH continue1
 set ans [list]
-#FIXME: tags associated with loaded module should be found
-#lappend ans [list alias altags {echo bar loaded}]
-lappend ans [list alias altags {echo }]
+lappend ans [list alias altags {echo bar loaded}]
 lappend ans [list alias alspec {echo refresh/2.0}]
 lappend ans [list alias alisloaded2 {echo is-loaded ok}]
 lappend ans [list alias alfoo {echo foo2}]
@@ -274,9 +308,7 @@ testouterr_cmd sh {refresh} $ans {}
 
 setenv_var TESTSUITE_REFRESH continue2
 set ans [list]
-#FIXME: tags associated with loaded module should be found
-#lappend ans [list alias altags {echo bar loaded}]
-lappend ans [list alias altags {echo }]
+lappend ans [list alias altags {echo bar loaded}]
 lappend ans [list alias alspec {echo refresh/2.0}]
 lappend ans [list alias alisloaded2 {echo is-loaded ok}]
 lappend ans [list alias alcmd {echo refresh}]