path_entry_reorder code reviewed

Author: gsell

tcl/envmngt.tcl.in

@@ -1816,46 +1816,45 @@ proc add-path {cmd mode dflbhv args} {
    set val [get-env $var]
 
    foreach dir $path_list {
+      # if path_entry_reorder is TRUE && dir is in path
+      #    && duplicates are NOT allowed:
+      #    path: remove all occurences of $dir
+      # if path_entry_reorder is TRUE || dir is NOT in path
+      #   || duplicates are allowed:
+      #    path: append/prepend $dir
       if {[getConf path_entry_reorder] && [info exists countarr($dir)]\
          && ! $allow_dup} {
-         # if $dir is in $val and duplicates are not allowed:
-         # first remove all occurences of $dir in $val
-         # and add $dir at the beginning or end if $val
-         # is not the empty string
          set mpath_list [split $val $separator]
          set mpath_list [lsearch -inline -all -not -exact $mpath_list $dir]
          set val [join $mpath_list $separator]
-         if {$val ne {}} {
+      }
+      if {[getConf path_entry_reorder] || ![info exists countarr($dir)]\
+         || $allow_dup} {
+         # ignore env var set empty if no empty entry found in reference
+         # counter array (sometimes var is cleared by setting it empty not
+         # unsetting it)
+         if {$val ne {} || [info exists countarr()]} {
             set sep [expr {$val eq $separator ? {} : $separator}]
             set val [expr {$bhv eq {prepend} ? "$dir$sep$val" :\
-               "$val$sep$dir"}]
+                              "$val$sep$dir"}]
          } else {
             set val $dir
          }
-         set countarr($dir) 1
-      } else {
-         if {![info exists countarr($dir)] || $allow_dup} {
-            # ignore env var set empty if no empty entry found in reference
-            # counter array (sometimes var is cleared by setting it empty not
-            # unsetting it)
-            if {$val ne {} || [info exists countarr()]} {
-               set sep [expr {$val eq $separator ? {} : $separator}]
-               set val [expr {$bhv eq {prepend} ? "$dir$sep$val" :\
-                  "$val$sep$dir"}]
-            } else {
-               set val $dir
-            }
-         }
-         if {[info exists countarr($dir)]} {
-            # do not increase counter if bare separator string is added or if
-            # reference count is ignored (--ignore-refcount set) unless if
-            # duplicate mode is enabled (--duplicates set)
-            if {!$val_set_is_delim && (!$ign_refcount || $allow_dup)} {
-               incr countarr($dir)
-            }
-         } else {
-            set countarr($dir) 1
+      }
+      #### ref-counting
+      # if $dir is NOT in path
+      #    set ref-count 1
+      # else if duplicates are allowed || ref-counting is NOT ignored
+      #    incr ref-count
+       if {[info exists countarr($dir)]} {
+         # do not increase counter if bare separator string is added or if
+         # reference count is ignored (--ignore-refcount set) unless if
+         # duplicate mode is enabled (--duplicates set)
+         if {!$val_set_is_delim && (!$ign_refcount || $allow_dup)} {
+            incr countarr($dir)
          }
+      } else {
+         set countarr($dir) 1
       }
    }