Unset extra tags on cmdModuleTag

Add unset_extra argument to the cmdModuleTag procedure to remove, when
enabled, the extra tags currently set on designated modules that are not
part of the transmitted tag list.

Update every cmdModuleTag calls to take into account this new
unset_extra argument.

Author: xdelaruelle

tcl/main.tcl.in

@@ -530,7 +530,7 @@ proc module {command args} {
                      }
                      # update tags on already loaded modules
                      if {[info exists loadedmodlist]} {
-                        cmdModuleTag $tag_list {*}$loadedmodlist
+                        cmdModuleTag 0 $tag_list {*}$loadedmodlist
                      }
                   }
                }

tcl/mfinterp.tcl.in

@@ -1773,7 +1773,7 @@ proc prereq {args} {
       }
    } elseif {![getConf auto_handling]} {
       # apply missing tag to first loaded module found
-      cmdModuleTag $tag_list $loadedmod
+      cmdModuleTag 0 $tag_list $loadedmod
    }
 
    return {}

tcl/modeval.tcl

@@ -661,7 +661,7 @@ proc loadRequirementModuleList {tag_list args} {
       releaseHeldReport {*}$holdidlist
    } else {
       # apply missing tag to first loaded module found
-      cmdModuleTag $tag_list $loadedmod
+      cmdModuleTag 0 $tag_list $loadedmod
    }
 }
 

tcl/modfind.tcl.in

@@ -707,6 +707,28 @@ proc setModuleExtraTag {mod args} {
    appendNoDupToList ::g_extraTagHash($mod) {*}$args
 }
 
+proc unsetModuleTag {mod args} {
+   if {[info exists ::g_tagHash($mod)]} {
+      lassign [getDiffBetweenList $::g_tagHash($mod) $args] diff_list
+      if {[llength $diff_list] > 0} {
+         set ::g_tagHash($mod) $diff_list
+      } else {
+         unset ::g_tagHash($mod)
+      }
+   }
+}
+
+proc unsetModuleExtraTag {mod args} {
+   if {[info exists ::g_extraTagHash($mod)]} {
+      lassign [getDiffBetweenList $::g_extraTagHash($mod) $args] diff_list
+      if {[llength $diff_list] > 0} {
+         set ::g_extraTagHash($mod) $diff_list
+      } else {
+         unset ::g_extraTagHash($mod)
+      }
+   }
+}
+
 proc getTagList {mod {sort 1}} {
    if {[info exists ::g_tagHash($mod)]} {
       if {$sort} {

tcl/subcmd.tcl.in

@@ -912,7 +912,7 @@ proc cmdModuleLoad {context uasked tag_list args} {
                }
 
                # apply missing tag to loaded module
-               cmdModuleTag $tag_list $modname
+               cmdModuleTag 0 $tag_list $modname
 
                # exit treatment but no need to restore settings
                set loadok 1
@@ -2352,8 +2352,8 @@ proc cmdModuleHelp {args} {
    }
 }
 
-proc cmdModuleTag {tag_list args} {
-   reportDebug "tagging $args (tag_list=$tag_list)"
+proc cmdModuleTag {unset_extra tag_list args} {
+   reportDebug "tagging $args (unset_extra=$unset_extra, tag_list=$tag_list)"
 
    set ret 0
    foreach mod $args {
@@ -2367,9 +2367,13 @@ proc cmdModuleTag {tag_list args} {
          continue
       }
 
-      # record tags not already set
+      # record tags not already set and if asked unset extra tags not set
+      # anymore
       lassign [getDiffBetweenList $tag_list [getTagList $modname]] diff_list
-      if {[llength $diff_list] > 0} {
+      lassign [getDiffBetweenList [getExtraTagList $modname] $tag_list] \
+         unset_list
+      if {[llength $diff_list] > 0 || ($unset_extra && [llength $unset_list]\
+         > 0)} {
          lappendState mode unload
          # first unset tags declared for this module on LM env var
          if {[set modtag [getExportTagList $modname 1]] ne {}} {
@@ -2380,6 +2384,16 @@ proc cmdModuleTag {tag_list args} {
          }
          lpopState mode
 
+         # remove extra tags currently set not part of tag list if asked
+         if {$unset_extra && [llength $unset_list] > 0} {
+            unsetModuleTag $modname {*}$unset_list
+            unsetModuleExtraTag $modname {*}$unset_list
+            if {$modnamevr ne {} && $modname ne $modnamevr} {
+               unsetModuleTag $modnamevr {*}$unset_list
+               unsetModuleExtraTag $modnamevr {*}$unset_list
+            }
+         }
+
          # record new tags as extra tag excluding tags relative to the way
          # module is loaded (auto, keep)
          lassign [getDiffBetweenList $diff_list [list auto-loaded\