Issue #792: fixed curly-brace usage consistency for functions from TCL modulefiles

Author: mrcawood

rt/mode_select/mf/TCL_Core/edge_cases_test/1.0

@@ -0,0 +1,17 @@
+#%Module
+# Test module for edge cases and special scenarios
+
+# Test with special characters in values
+setenv SPECIAL_CHARS_VAR "value with spaces and \$symbols"
+setenv QUOTES_VAR "value with \"quotes\" and 'apostrophes'"
+
+# Test with empty values
+setenv EMPTY_VAR ""
+unsetenv UNSET_EMPTY_VAR
+
+# Test mode-specific with special characters
+setenv --mode load SPECIAL_MODE_VAR "mode value with \$pecial chars"
+
+# Test unsetenv and pushenv with modes
+unsetenv --mode unload MODE_UNSET_VAR
+pushenv --mode load MODE_PUSH_VAR "mode_push_value"

rt/mode_select/mf/TCL_Core/mixed_syntax_test/1.0

@@ -0,0 +1,24 @@
+#%Module
+# Test module for mixed syntax scenarios
+# Tests edge cases and combinations
+
+# Simple calls - should use parentheses
+setenv BASIC_VAR "basic"
+unsetenv CLEANUP_VAR  
+pushenv PUSH_VAR "pushed"
+
+# Mode-specific calls - should use curly braces
+setenv --mode load LOAD_ONLY_VAR "load_value"
+setenv --mode unload UNLOAD_ONLY_VAR "unload_value"
+setenv --mode {load unload} BOTH_MODE_VAR "both_value"
+
+# Respect flag - should use curly braces
+setenv -respect EXISTING_VAR "new_value"
+
+# Path operations - should use curly braces (always have extra params)
+prepend-path MY_PATH "/my/path"
+append-path MY_LIB "/my/lib"
+remove-path OLD_PATH "/old/path"
+
+# Combined mode and respect - should use curly braces
+setenv --mode load -respect COMBO_VAR "combo_value"

rt/mode_select/mf/TCL_Core/simple_test/1.0

@@ -0,0 +1,12 @@
+#%Module
+# Test module for simple TCL function calls
+# These should display with parentheses after the fix
+
+setenv SIMPLE_VAR "simple_value"
+unsetenv OLD_VAR
+pushenv STACK_VAR "stack_value"
+
+# These should continue to use curly braces (have mode or other options)
+setenv --mode load MODE_VAR "mode_value"
+setenv -respect RESPECT_VAR "respect_value"
+prepend-path SIMPLE_PATH "/simple/path"

rt/mode_select/mode_select.tdesc

@@ -90,6 +90,15 @@ testdescript = {
      runLmod load   load_test           #31
      runLmod unload load_test           #32
 
+     # Test module show with TCL syntax formatting
+     # These tests demonstrate the curly brace vs parentheses issue
+     runLmod show simple_test           #33 (Test simple TCL calls - should show parentheses after fix)
+     runLmod show mixed_syntax_test     #34 (Test mixed simple/mode calls - mixed parentheses/braces)
+     runLmod show edge_cases_test       #35 (Test edge cases with special characters)
+     
+     # Compare with existing env_test to show current problematic behavior
+     runLmod show env_test              #36 (Current TCL env_test - shows curly braces for simple calls)
+
      HOME=$ORIG_HOME
 
      cat _stdout.[0-9][0-9][0-9] > _stdout.orig

src/tcl2lua.tcl

@@ -523,10 +523,16 @@ proc setenv { args } {
    if {$mode == "display"} {
       set-env $var $val
    }
-   if {$respect == "true"} {
-      cmdargs_w_mode_select "setenv" $resultA(mode) $var $val $respect
+   if {$resultA(mode) != "modeA={\"normal\"}" || $respect == "true"} {
+      # Has mode selection or respect - use curly braces
+      if {$respect == "true"} {
+         cmdargs_w_mode_select "setenv" $resultA(mode) $var $val $respect
+      } else {
+         cmdargs_w_mode_select "setenv" $resultA(mode) $var $val
+      }
    } else {
-      cmdargs_w_mode_select "setenv" $resultA(mode) $var $val
+      # Simple call - use parentheses
+      cmdargs "setenv" $var $val
    }
 }
 
@@ -553,7 +559,13 @@ proc unsetenv { args } {
           set-env $var $val
        }
     }
-   cmdargs_w_mode_select "unsetenv" $resultA(mode) $var $val
+   if {$resultA(mode) != "modeA={\"normal\"}"} {
+      # Has mode selection - use curly braces
+      cmdargs_w_mode_select "unsetenv" $resultA(mode) $var $val
+   } else {
+      # Simple call - use parentheses
+      cmdargs "unsetenv" $var
+   }
 }
 
 proc require-fullname {} {
@@ -592,7 +604,13 @@ proc pushenv { args } {
    set-env $var $val
    set g_varsT($var) $val
 
-   cmdargs_w_mode_select "pushenv" $resultA(mode) $var $val
+   if {$resultA(mode) != "modeA={\"normal\"}"} {
+      # Has mode selection - use curly braces
+      cmdargs_w_mode_select "pushenv" $resultA(mode) $var $val
+   } else {
+      # Simple call - use parentheses
+      cmdargs "pushenv" $var $val
+   }
 }
 
 proc prepend-path { args } {