envmodules/modules
1
0
Fork 0
mirror of https://github.com/envmodules/modules.git synced 2026-06-14 00:42:43 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Add --ignore-refcount opt to add-path/unload-path proc

Browse Source 
Add the '--ignore-refcount' option to the add-path and unload-path
procedures (parsed by parsePathCommandArgs procedure). When set this
option makes the reference counter value ignored.

Which means on add-path that the reference counter of each path element
passed is not increased unless if the duplication mode is enabled.

On unload-path it means that the reference counter is not take into
account and each path element is removed (even if the reference counter
is greater than 1).
This commit is contained in:
Xavier Delaruelle
2021-08-10 10:39:03 +02:00
parent 9541295010
commit 04f2e2ead2
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tcl/envmngt.tcl.in
View File

@@ -1176,7 +1176,7 @@ proc unload-path {args} {
reportDebug ($args)
lassign [parsePathCommandArgs unload-path {*}$args] separator allow_dup\
idx_val var path_list
idx_val ign_refcount var path_list
# no reference count management when no share variable is returned
set isrefcount [expr {[set sharevar [getModshareVarName $var]] ne {}}]
@@ -1215,10 +1215,17 @@ proc unload-path {args} {
# update reference counter array
if {[info exists countarr($dir)]} {
incr countarr($dir) -1
set newcount $countarr($dir)
# unload value in any case if counter ignored (--ignore-refcount set)
if {$ign_refcount} {
set countarr($dir) 0
} else {
incr countarr($dir) -1
}
if {$countarr($dir) <= 0} {
unset countarr($dir)
set newcount 0
} else {
set newcount $countarr($dir)
}
} else {
set newcount 0
@@ -1282,7 +1289,7 @@ proc add-path {pos args} {
reportDebug "($args) pos=$pos"
lassign [parsePathCommandArgs add-path {*}$args] separator allow_dup\
idx_val var path_list
idx_val ign_refcount var path_list
# no reference count management when no share variable is returned
set isrefcount [expr {[set sharevar [getModshareVarName $var]] ne {}}]
@@ -1309,7 +1316,11 @@ proc add-path {pos args} {
}
}
if {[info exists countarr($dir)]} {
incr countarr($dir)
# do not increase counter if it is ignored (--ignore-refcount set)
# unless if duplicate mode is enabled (--duplicates set)
if {!$ign_refcount || $allow_dup} {
incr countarr($dir)
}
} else {
set countarr($dir) 1
}
@@ -1330,6 +1341,7 @@ proc parsePathCommandArgs {cmd args} {
set next_is_delim 0
set allow_dup 0
set idx_val 0
set ign_refcount 0
foreach arg $args {
# everything passed after variable name is considered a value
if {[info exists var]} {
@@ -1357,6 +1369,9 @@ proc parsePathCommandArgs {cmd args} {
--delim=* {
set delim [string range $arg 8 end]
}
--ignore-refcount {
set ign_refcount 1
}
-* {
knerror "invalid option '$arg' for $cmd"
}
@@ -1410,9 +1425,10 @@ proc parsePathCommandArgs {cmd args} {
}
reportDebug "(delim=$delim, allow_dup=$allow_dup, idx_val=$idx_val,\
var=$var, val=$val_list, nbval=[llength $val_list])"
ign_refcount=$ign_refcount, var=$var, val=$val_list, nbval=[llength\
$val_list])"
return [list $delim $allow_dup $idx_val $var $val_list]
return [list $delim $allow_dup $idx_val $ign_refcount $var $val_list]
}
# ;;; Local Variables: ***

4
tcl/mfinterp.tcl.in
View File

@@ -1338,7 +1338,7 @@ proc remove-path-un {args} {
# clear variable if it does not exist on unload mode for later use
# during the modulefile evaluation
lassign [parsePathCommandArgs unload-path {*}$args] separator allow_dup\
idx_val var path_list
idx_val ign_refcount var path_list
if {![info exists ::env($var)]} {
reset-to-unset-env $var
}
@@ -1352,7 +1352,7 @@ proc edit-path-wh {args} {
# get variable name
lassign [parsePathCommandArgs edit-path-wh {*}$args] separator allow_dup\
idx_val var path_list
idx_val ign_refcount var path_list
if {![info exists ::env($var)]} {
set ::env($var) {}