* doc/ParseCmd.3: Implementation of TIP 157. Adds recognition

        * doc/Tcl.n:            of the new leading {expand} syntax on words.
        * generic/tcl.h:        Parses such words as the new Tcl_Token type
        * generic/tclBasic.c:   TCL_TOKEN_EXPAND_WORD.  Updated Tcl_EvalEx
        * generic/tclCompile.c: and the bytecode compiler/execution engine
        * generic/tclCompile.h: to recognize the new token type.  New opcodes
        * generic/tclExecute.c: INST_LIST_VERIFY and INST_INVOKE_EXP and a new
        * generic/tclParse.c:   operand type OPERAND_ULIST1 are defined.  Docs
        * generic/tclTest.c:    and tests are included.
        * tests/basic.test:
        * tests/compile.test:
        * tests/parse.test:

        * library/auto.tcl:     Replaced several [eval]s used to perform
        * library/package.tcl:  argument expansion with the new syntax.
        * library/safe.tcl:     In the test files lindex.test and lset.test,
        * tests/cmdInfo.test:   replaced use of [eval] to force direct
        * tests/encoding.test:  string evaluation with use of [testevalex]
        * tests/execute.test:   which more directly and robustly serves the
        * tests/fCmd.test:      same purpose.
        * tests/http.test:
        * tests/init.test:
        * tests/interp.test:
        * tests/io.test:
        * tests/ioUtil.test:
        * tests/iogt.test:
        * tests/lindex.test:
        * tests/lset.test:
        * tests/namespace-old.test:
        * tests/namespace.test:
        * tests/pkg.test:
        * tests/pkgMkIndex.test:
        * tests/proc.test:
        * tests/reg.test:
        * tests/trace.test:
        * tests/upvar.test:
        * tests/winConsole.test:
        * tests/winFCmd.test:

1 files changed, 151 insertions, 151 deletions

diff --git a/tests/lset.test b/tests/lset.test
index 6bf412f..048e9ba 100644
--- a/tests/lset.test
+++ b/tests/lset.test
@@ -22,427 +22,427 @@ proc failTrace {name1 name2 op} {
     error "trace failed"
 }
 
-set lset lset
+testConstraint testevalex [llength [info commands testevalex]]
 
 set noRead {}
 trace add variable noRead read failTrace
 set noWrite {a b c}
 trace add variable noWrite write failTrace
 
-test lset-1.1 {lset, not compiled, arg count} {
-    list [catch {eval $lset} msg] $msg
+test lset-1.1 {lset, not compiled, arg count} testevalex {
+    list [catch {testevalex lset} msg] $msg
 } "1 {wrong \# args: should be \"lset listVar index ?index...? value\"}"
 
-test lset-1.2 {lset, not compiled, no such var} {
-    list [catch {eval [list $lset noSuchVar 0 {}]} msg] $msg
+test lset-1.2 {lset, not compiled, no such var} testevalex {
+    list [catch {testevalex {lset noSuchVar 0 {}}} msg] $msg
 } "1 {can't read \"noSuchVar\": no such variable}"
 
-test lset-1.3 {lset, not compiled, var not readable} {
-    list [catch {eval [list $lset noRead 0 {}]} msg] $msg
+test lset-1.3 {lset, not compiled, var not readable} testevalex {
+    list [catch {testevalex {lset noRead 0 {}}} msg] $msg
 } "1 {can't read \"noRead\": trace failed}"
 
-test lset-2.1 {lset, not compiled, 3 args, second arg a plain index} {
+test lset-2.1 {lset, not compiled, 3 args, second arg a plain index} testevalex {
     set x {0 1 2}
-    list [eval [list $lset x 0 3]] $x
+    list [testevalex {lset x 0 3}] $x
 } {{3 1 2} {3 1 2}}
 
-test lset-2.2 {lset, not compiled, 3 args, second arg neither index nor list} {
+test lset-2.2 {lset, not compiled, 3 args, second arg neither index nor list} testevalex {
     set x {0 1 2}
     list [catch {
-	eval [list $lset x {{bad}1} 3]
+	testevalex {lset x {{bad}1} 3}
     } msg] $msg
 } "1 {bad index \"{bad}1\": must be integer or end?-integer?}"
 
-test lset-3.1 {lset, not compiled, 3 args, data duplicated} {
+test lset-3.1 {lset, not compiled, 3 args, data duplicated} testevalex {
     set x {0 1 2}
-    list [eval [list $lset x 0 $x]] $x
+    list [testevalex {lset x 0 $x}] $x
 } {{{0 1 2} 1 2} {{0 1 2} 1 2}}
 
-test lset-3.2 {lset, not compiled, 3 args, data duplicated} {
+test lset-3.2 {lset, not compiled, 3 args, data duplicated} testevalex {
     set x {0 1}
     set y $x
-    list [eval [list $lset x 0 2]] $x $y
+    list [testevalex {lset x 0 2}] $x $y
 } {{2 1} {2 1} {0 1}}
 
-test lset-3.3 {lset, not compiled, 3 args, data duplicated} {
+test lset-3.3 {lset, not compiled, 3 args, data duplicated} testevalex {
     set x {0 1}
     set y $x
-    list [eval [list $lset x 0 $x]] $x $y
+    list [testevalex {lset x 0 $x}] $x $y
 } {{{0 1} 1} {{0 1} 1} {0 1}}
 
-test lset-3.4 {lset, not compiled, 3 args, data duplicated} {
+test lset-3.4 {lset, not compiled, 3 args, data duplicated} testevalex {
     set x {0 1 2}
-    list [eval [list $lset x [list 0] $x]] $x
+    list [testevalex {lset x [list 0] $x}] $x
 } {{{0 1 2} 1 2} {{0 1 2} 1 2}}
 
-test lset-3.5 {lset, not compiled, 3 args, data duplicated} {
+test lset-3.5 {lset, not compiled, 3 args, data duplicated} testevalex {
     set x {0 1}
     set y $x
-    list [eval [list $lset x [list 0] 2]] $x $y
+    list [testevalex {lset x [list 0] 2}] $x $y
 } {{2 1} {2 1} {0 1}}
 
-test lset-3.6 {lset, not compiled, 3 args, data duplicated} {
+test lset-3.6 {lset, not compiled, 3 args, data duplicated} testevalex {
     set x {0 1}
     set y $x
-    list [eval [list $lset x [list 0] $x]] $x $y
+    list [testevalex {lset x [list 0] $x}] $x $y
 } {{{0 1} 1} {{0 1} 1} {0 1}}
 
-test lset-4.1 {lset, not compiled, 3 args, not a list} {
+test lset-4.1 {lset, not compiled, 3 args, not a list} testevalex {
     set a "x \{"
     list [catch {
-	eval [list $lset a [list 0] y]
+	testevalex {lset a [list 0] y}
     } msg] $msg
 } {1 {unmatched open brace in list}}
 
-test lset-4.2 {lset, not compiled, 3 args, bad index} {
+test lset-4.2 {lset, not compiled, 3 args, bad index} testevalex {
     set a {x y z}
     list [catch {
-	eval [list $lset a [list 2a2] w]
+	testevalex {lset a [list 2a2] w}
     } msg] $msg
 } {1 {bad index "2a2": must be integer or end?-integer?}}
 
-test lset-4.3 {lset, not compiled, 3 args, index out of range} {
+test lset-4.3 {lset, not compiled, 3 args, index out of range} testevalex {
     set a {x y z}
     list [catch {
-	eval [list $lset a [list -1] w]
+	testevalex {lset a [list -1] w}
     } msg] $msg
 } {1 {list index out of range}}
 
-test lset-4.4 {lset, not compiled, 3 args, index out of range} {
+test lset-4.4 {lset, not compiled, 3 args, index out of range} testevalex {
     set a {x y z}
     list [catch {
-	eval [list $lset a [list 3] w]
+	testevalex {lset a [list 3] w}
     } msg] $msg
 } {1 {list index out of range}}
 
-test lset-4.5 {lset, not compiled, 3 args, index out of range} {
+test lset-4.5 {lset, not compiled, 3 args, index out of range} testevalex {
     set a {x y z}
     list [catch {
-	eval [list $lset a [list end--1] w]
+	testevalex {lset a [list end--1] w}
     } msg] $msg
 } {1 {list index out of range}}
 
-test lset-4.6 {lset, not compiled, 3 args, index out of range} {
+test lset-4.6 {lset, not compiled, 3 args, index out of range} testevalex {
     set a {x y z}
     list [catch {
-	eval [list $lset a [list end-3] w]
+	testevalex {lset a [list end-3] w}
     } msg] $msg
 } {1 {list index out of range}}
 
-test lset-4.7 {lset, not compiled, 3 args, not a list} {
+test lset-4.7 {lset, not compiled, 3 args, not a list} testevalex {
     set a "x \{"
     list [catch {
-	eval [list $lset a 0 y]
+	testevalex {lset a 0 y}
     } msg] $msg
 } {1 {unmatched open brace in list}}
 
-test lset-4.8 {lset, not compiled, 3 args, bad index} {
+test lset-4.8 {lset, not compiled, 3 args, bad index} testevalex {
     set a {x y z}
     list [catch {
-	eval [list $lset a 2a2 w]
+	testevalex {lset a 2a2 w}
     } msg] $msg
 } {1 {bad index "2a2": must be integer or end?-integer?}}
 
-test lset-4.9 {lset, not compiled, 3 args, index out of range} {
+test lset-4.9 {lset, not compiled, 3 args, index out of range} testevalex {
     set a {x y z}
     list [catch {
-	eval [list $lset a -1 w]
+	testevalex {lset a -1 w}
     } msg] $msg
 } {1 {list index out of range}}
 
-test lset-4.10 {lset, not compiled, 3 args, index out of range} {
+test lset-4.10 {lset, not compiled, 3 args, index out of range} testevalex {
     set a {x y z}
     list [catch {
-	eval [list $lset a 3 w]
+	testevalex {lset a 3 w}
     } msg] $msg
 } {1 {list index out of range}}
 
-test lset-4.11 {lset, not compiled, 3 args, index out of range} {
+test lset-4.11 {lset, not compiled, 3 args, index out of range} testevalex {
     set a {x y z}
     list [catch {
-	eval [list $lset a end--1 w]
+	testevalex {lset a end--1 w}
     } msg] $msg
 } {1 {list index out of range}}
 
-test lset-4.12 {lset, not compiled, 3 args, index out of range} {
+test lset-4.12 {lset, not compiled, 3 args, index out of range} testevalex {
     set a {x y z}
     list [catch {
-	eval [list $lset a end-3 w]
+	testevalex {lset a end-3 w}
     } msg] $msg
 } {1 {list index out of range}}
 
-test lset-5.1 {lset, not compiled, 3 args, can't set variable} {
+test lset-5.1 {lset, not compiled, 3 args, can't set variable} testevalex {
     list [catch {
-	eval [list $lset noWrite 0 d]
+	testevalex {lset noWrite 0 d}
     } msg] $msg $noWrite
 } {1 {can't set "noWrite": trace failed} {d b c}}
 
-test lset-5.2 {lset, not compiled, 3 args, can't set variable} {
+test lset-5.2 {lset, not compiled, 3 args, can't set variable} testevalex {
     list [catch {
-	eval [list $lset noWrite [list 0] d]
+	testevalex {lset noWrite [list 0] d}
     } msg] $msg $noWrite
 } {1 {can't set "noWrite": trace failed} {d b c}}
 
-test lset-6.1 {lset, not compiled, 3 args, 1-d list basics} {
+test lset-6.1 {lset, not compiled, 3 args, 1-d list basics} testevalex {
     set a {x y z}
-    list [eval [list $lset a 0 a]] $a
+    list [testevalex {lset a 0 a}] $a
 } {{a y z} {a y z}}
 
-test lset-6.2 {lset, not compiled, 3 args, 1-d list basics} {
+test lset-6.2 {lset, not compiled, 3 args, 1-d list basics} testevalex {
     set a {x y z}
-    list [eval [list $lset a [list 0] a]] $a
+    list [testevalex {lset a [list 0] a}] $a
 } {{a y z} {a y z}}
 
-test lset-6.3 {lset, not compiled, 1-d list basics} {
+test lset-6.3 {lset, not compiled, 1-d list basics} testevalex {
     set a {x y z}
-    list [eval [list $lset a 2 a]] $a
+    list [testevalex {lset a 2 a}] $a
 } {{x y a} {x y a}}
 
-test lset-6.4 {lset, not compiled, 1-d list basics} {
+test lset-6.4 {lset, not compiled, 1-d list basics} testevalex {
     set a {x y z}
-    list [eval [list $lset a [list 2] a]] $a
+    list [testevalex {lset a [list 2] a}] $a
 } {{x y a} {x y a}}
 
-test lset-6.5 {lset, not compiled, 1-d list basics} {
+test lset-6.5 {lset, not compiled, 1-d list basics} testevalex {
     set a {x y z}
-    list [eval [list $lset a end a]] $a
+    list [testevalex {lset a end a}] $a
 } {{x y a} {x y a}}
 
-test lset-6.6 {lset, not compiled, 1-d list basics} {
+test lset-6.6 {lset, not compiled, 1-d list basics} testevalex {
     set a {x y z}
-    list [eval [list $lset a [list end] a]] $a
+    list [testevalex {lset a [list end] a}] $a
 } {{x y a} {x y a}}
 
-test lset-6.7 {lset, not compiled, 1-d list basics} {
+test lset-6.7 {lset, not compiled, 1-d list basics} testevalex {
     set a {x y z}
-    list [eval [list $lset a end-0 a]] $a
+    list [testevalex {lset a end-0 a}] $a
 } {{x y a} {x y a}}
 
-test lset-6.8 {lset, not compiled, 1-d list basics} {
+test lset-6.8 {lset, not compiled, 1-d list basics} testevalex {
     set a {x y z}
-    list [eval [list $lset a [list end-0] a]] $a
+    list [testevalex {lset a [list end-0] a}] $a
 } {{x y a} {x y a}}
 
-test lset-6.9 {lset, not compiled, 1-d list basics} {
+test lset-6.9 {lset, not compiled, 1-d list basics} testevalex {
     set a {x y z}
-    list [eval [list $lset a end-2 a]] $a
+    list [testevalex {lset a end-2 a}] $a
 } {{a y z} {a y z}}
 
-test lset-6.10 {lset, not compiled, 1-d list basics} {
+test lset-6.10 {lset, not compiled, 1-d list basics} testevalex {
     set a {x y z}
-    list [eval [list $lset a [list end-2] a]] $a
+    list [testevalex {lset a [list end-2] a}] $a
 } {{a y z} {a y z}}
 
-test lset-7.1 {lset, not compiled, data sharing} {
+test lset-7.1 {lset, not compiled, data sharing} testevalex {
     set a 0
-    list [eval [list $lset a $a {gag me}]] $a
+    list [testevalex {lset a $a {gag me}}] $a
 } {{{gag me}} {{gag me}}}
 
-test lset-7.2 {lset, not compiled, data sharing} {
+test lset-7.2 {lset, not compiled, data sharing} testevalex {
     set a [list 0]
-    list [eval [list $lset a $a {gag me}]] $a
+    list [testevalex {lset a $a {gag me}}] $a
 } {{{gag me}} {{gag me}}}
 
-test lset-7.3 {lset, not compiled, data sharing} {
+test lset-7.3 {lset, not compiled, data sharing} testevalex {
     set a {x y}
-    list [eval [list $lset a 0 $a]] $a
+    list [testevalex {lset a 0 $a}] $a
 } {{{x y} y} {{x y} y}}
 
-test lset-7.4 {lset, not compiled, data sharing} {
+test lset-7.4 {lset, not compiled, data sharing} testevalex {
     set a {x y}
-    list [eval [list $lset a [list 0] $a]] $a
+    list [testevalex {lset a [list 0] $a}] $a
 } {{{x y} y} {{x y} y}}
 
-test lset-7.5 {lset, not compiled, data sharing} {
+test lset-7.5 {lset, not compiled, data sharing} testevalex {
     set n 0
     set a {x y}
-    list [eval [list $lset a $n $n]] $a $n
+    list [testevalex {lset a $n $n}] $a $n
 } {{0 y} {0 y} 0}
 
-test lset-7.6 {lset, not compiled, data sharing} {
+test lset-7.6 {lset, not compiled, data sharing} testevalex {
     set n [list 0]
     set a {x y}
-    list [eval [list $lset a $n $n]] $a $n
+    list [testevalex {lset a $n $n}] $a $n
 } {{0 y} {0 y} 0}
 
-test lset-7.7 {lset, not compiled, data sharing} {
+test lset-7.7 {lset, not compiled, data sharing} testevalex {
     set n 0
     set a [list $n $n]
-    list [eval [list $lset a $n 1]] $a $n
+    list [testevalex {lset a $n 1}] $a $n
 } {{1 0} {1 0} 0}
 
-test lset-7.8 {lset, not compiled, data sharing} {
+test lset-7.8 {lset, not compiled, data sharing} testevalex {
     set n [list 0]
     set a [list $n $n]
-    list [eval [list $lset a $n 1]] $a $n
+    list [testevalex {lset a $n 1}] $a $n
 } {{1 0} {1 0} 0}
 
-test lset-7.9 {lset, not compiled, data sharing} {
+test lset-7.9 {lset, not compiled, data sharing} testevalex {
     set a 0
-    list [eval [list $lset a $a $a]] $a
+    list [testevalex {lset a $a $a}] $a
 } {0 0}
 
-test lset-7.10 {lset, not compiled, data sharing} {
+test lset-7.10 {lset, not compiled, data sharing} testevalex {
     set a [list 0]
-    list [eval [list $lset a $a $a]] $a
+    list [testevalex {lset a $a $a}] $a
 } {0 0}
 
-test lset-8.1 {lset, not compiled, malformed sublist} {
+test lset-8.1 {lset, not compiled, malformed sublist} testevalex {
     set a [list "a \{" b]
-    list [catch {eval [list $lset a 0 1 c]} msg] $msg
+    list [catch {testevalex {lset a 0 1 c}} msg] $msg
 } {1 {unmatched open brace in list}}
 
-test lset-8.2 {lset, not compiled, malformed sublist} {
+test lset-8.2 {lset, not compiled, malformed sublist} testevalex {
     set a [list "a \{" b]
-    list [catch {eval [list $lset a {0 1} c]} msg] $msg
+    list [catch {testevalex {lset a {0 1} c}} msg] $msg
 } {1 {unmatched open brace in list}}
 
-test lset-8.3 {lset, not compiled, bad second index} {
+test lset-8.3 {lset, not compiled, bad second index} testevalex {
     set a {{b c} {d e}}
-    list [catch {eval [list $lset a 0 2a2 f]} msg] $msg
+    list [catch {testevalex {lset a 0 2a2 f}} msg] $msg
 } {1 {bad index "2a2": must be integer or end?-integer?}}
 
-test lset-8.4 {lset, not compiled, bad second index} {
+test lset-8.4 {lset, not compiled, bad second index} testevalex {
     set a {{b c} {d e}}
-    list [catch {eval [list $lset a {0 2a2} f]} msg] $msg
+    list [catch {testevalex {lset a {0 2a2} f}} msg] $msg
 } {1 {bad index "2a2": must be integer or end?-integer?}}
 
-test lset-8.5 {lset, not compiled, second index out of range} {
+test lset-8.5 {lset, not compiled, second index out of range} testevalex {
     set a {{b c} {d e} {f g}}
-    list [catch {eval [list $lset a 2 -1 h]} msg] $msg
+    list [catch {testevalex {lset a 2 -1 h}} msg] $msg
 } {1 {list index out of range}}
 
-test lset-8.6 {lset, not compiled, second index out of range} {
+test lset-8.6 {lset, not compiled, second index out of range} testevalex {
     set a {{b c} {d e} {f g}}
-    list [catch {eval [list $lset a {2 -1} h]} msg] $msg
+    list [catch {testevalex {lset a {2 -1} h}} msg] $msg
 } {1 {list index out of range}}
 
-test lset-8.7 {lset, not compiled, second index out of range} {
+test lset-8.7 {lset, not compiled, second index out of range} testevalex {
     set a {{b c} {d e} {f g}}
-    list [catch {eval [list $lset a 2 2 h]} msg] $msg
+    list [catch {testevalex {lset a 2 2 h}} msg] $msg
 } {1 {list index out of range}}
 
-test lset-8.8 {lset, not compiled, second index out of range} {
+test lset-8.8 {lset, not compiled, second index out of range} testevalex {
     set a {{b c} {d e} {f g}}
-    list [catch {eval [list $lset a {2 2} h]} msg] $msg
+    list [catch {testevalex {lset a {2 2} h}} msg] $msg
 } {1 {list index out of range}}
 
-test lset-8.9 {lset, not compiled, second index out of range} {
+test lset-8.9 {lset, not compiled, second index out of range} testevalex {
     set a {{b c} {d e} {f g}}
-    list [catch {eval [list $lset a 2 end--1 h]} msg] $msg
+    list [catch {testevalex {lset a 2 end--1 h}} msg] $msg
 } {1 {list index out of range}}
 
-test lset-8.10 {lset, not compiled, second index out of range} {
+test lset-8.10 {lset, not compiled, second index out of range} testevalex {
     set a {{b c} {d e} {f g}}
-    list [catch {eval [list $lset a {2 end--1} h]} msg] $msg
+    list [catch {testevalex {lset a {2 end--1} h}} msg] $msg
 } {1 {list index out of range}}
 
-test lset-8.11 {lset, not compiled, second index out of range} {
+test lset-8.11 {lset, not compiled, second index out of range} testevalex {
     set a {{b c} {d e} {f g}}
-    list [catch {eval [list $lset a 2 end-2 h]} msg] $msg
+    list [catch {testevalex {lset a 2 end-2 h}} msg] $msg
 } {1 {list index out of range}}
 
-test lset-8.12 {lset, not compiled, second index out of range} {
+test lset-8.12 {lset, not compiled, second index out of range} testevalex {
     set a {{b c} {d e} {f g}}
-    list [catch {eval [list $lset a {2 end-2} h]} msg] $msg
+    list [catch {testevalex {lset a {2 end-2} h}} msg] $msg
 } {1 {list index out of range}}
 
-test lset-9.1 {lset, not compiled, entire variable} {
+test lset-9.1 {lset, not compiled, entire variable} testevalex {
     set a x
-    list [eval [list $lset a y]] $a
+    list [testevalex {lset a y}] $a
 } {y y}
 
-test lset-9.2 {lset, not compiled, entire variable} {
+test lset-9.2 {lset, not compiled, entire variable} testevalex {
     set a x
-    list [eval [list $lset a {} y]] $a
+    list [testevalex {lset a {} y}] $a
 } {y y}
 
-test lset-10.1 {lset, not compiled, shared data} {
+test lset-10.1 {lset, not compiled, shared data} testevalex {
     set row {p q}
     set a [list $row $row]
-    list [eval [list $lset a 0 0 x]] $a
+    list [testevalex {lset a 0 0 x}] $a
 } {{{x q} {p q}} {{x q} {p q}}}
 
-test lset-10.2 {lset, not compiled, shared data} {
+test lset-10.2 {lset, not compiled, shared data} testevalex {
     set row {p q}
     set a [list $row $row]
-    list [eval [list $lset a {0 0} x]] $a
+    list [testevalex {lset a {0 0} x}] $a
 } {{{x q} {p q}} {{x q} {p q}}}
 
-test lset-11.1 {lset, not compiled, 2-d basics} {
+test lset-11.1 {lset, not compiled, 2-d basics} testevalex {
     set a {{b c} {d e}}
-    list [eval [list $lset a 0 0 f]] $a
+    list [testevalex {lset a 0 0 f}] $a
 } {{{f c} {d e}} {{f c} {d e}}}
 
-test lset-11.2 {lset, not compiled, 2-d basics} {
+test lset-11.2 {lset, not compiled, 2-d basics} testevalex {
     set a {{b c} {d e}}
-    list [eval [list $lset a {0 0} f]] $a
+    list [testevalex {lset a {0 0} f}] $a
 } {{{f c} {d e}} {{f c} {d e}}}
 
-test lset-11.3 {lset, not compiled, 2-d basics} {
+test lset-11.3 {lset, not compiled, 2-d basics} testevalex {
     set a {{b c} {d e}}
-    list [eval [list $lset a 0 1 f]] $a
+    list [testevalex {lset a 0 1 f}] $a
 } {{{b f} {d e}} {{b f} {d e}}}
 
-test lset-11.4 {lset, not compiled, 2-d basics} {
+test lset-11.4 {lset, not compiled, 2-d basics} testevalex {
     set a {{b c} {d e}}
-    list [eval [list $lset a {0 1} f]] $a
+    list [testevalex {lset a {0 1} f}] $a
 } {{{b f} {d e}} {{b f} {d e}}}
 
-test lset-11.5 {lset, not compiled, 2-d basics} {
+test lset-11.5 {lset, not compiled, 2-d basics} testevalex {
     set a {{b c} {d e}}
-    list [eval [list $lset a 1 0 f]] $a
+    list [testevalex {lset a 1 0 f}] $a
 } {{{b c} {f e}} {{b c} {f e}}}
 
-test lset-11.6 {lset, not compiled, 2-d basics} {
+test lset-11.6 {lset, not compiled, 2-d basics} testevalex {
     set a {{b c} {d e}}
-    list [eval [list $lset a {1 0} f]] $a
+    list [testevalex {lset a {1 0} f}] $a
 } {{{b c} {f e}} {{b c} {f e}}}
 
-test lset-11.7 {lset, not compiled, 2-d basics} {
+test lset-11.7 {lset, not compiled, 2-d basics} testevalex {
     set a {{b c} {d e}}
-    list [eval [list $lset a 1 1 f]] $a
+    list [testevalex {lset a 1 1 f}] $a
 } {{{b c} {d f}} {{b c} {d f}}}
 
-test lset-11.8 {lset, not compiled, 2-d basics} {
+test lset-11.8 {lset, not compiled, 2-d basics} testevalex {
     set a {{b c} {d e}}
-    list [eval [list $lset a {1 1} f]] $a
+    list [testevalex {lset a {1 1} f}] $a
 } {{{b c} {d f}} {{b c} {d f}}}
 
-test lset-12.0 {lset, not compiled, typical sharing pattern} {
+test lset-12.0 {lset, not compiled, typical sharing pattern} testevalex {
     set zero 0
     set row [list $zero $zero $zero $zero]
     set ident [list $row $row $row $row]
     for { set i 0 } { $i < 4 } { incr i } {
-	eval [list $lset ident $i $i 1]
+	testevalex {lset ident $i $i 1}
     }
     set ident
 } {{1 0 0 0} {0 1 0 0} {0 0 1 0} {0 0 0 1}}
 
-test lset-13.0 {lset, not compiled, shimmering hell} {
+test lset-13.0 {lset, not compiled, shimmering hell} testevalex {
     set a 0
-    list [eval [list $lset a $a $a $a $a {gag me}]] $a
+    list [testevalex {lset a $a $a $a $a {gag me}}] $a
 } {{{{{{gag me}}}}} {{{{{gag me}}}}}}
 
-test lset-13.1 {lset, not compiled, shimmering hell} {
+test lset-13.1 {lset, not compiled, shimmering hell} testevalex {
     set a [list 0]
-    list [eval [list $lset a $a $a $a $a {gag me}]] $a
+    list [testevalex {lset a $a $a $a $a {gag me}}] $a
 } {{{{{{gag me}}}}} {{{{{gag me}}}}}}
 
-test lset-13.2 {lset, not compiled, shimmering hell} {
+test lset-13.2 {lset, not compiled, shimmering hell} testevalex {
     set a [list 0 0 0 0]
-    list [eval [list $lset a $a {gag me}]] $a
+    list [testevalex {lset a $a {gag me}}] $a
 } {{{{{{gag me}}}} 0 0 0} {{{{{gag me}}}} 0 0 0}}
 
-test lset-14.1 {lset, not compiled, list args, is string rep preserved?} {
+test lset-14.1 {lset, not compiled, list args, is string rep preserved?} testevalex {
     set a { { 1 2 } { 3 4 } }
-    catch { eval [list $lset a {1 5} 5] }
+    catch { testevalex {lset a {1 5} 5} }
     list $a [lindex $a 1]
 } "{ { 1 2 } { 3 4 } } { 3 4 }"
 
-test lset-14.2 {lset, not compiled, flat args, is string rep preserved?} {
+test lset-14.2 {lset, not compiled, flat args, is string rep preserved?} testevalex {
     set a { { 1 2 } { 3 4 } }
-    catch { eval [list $lset a 1 5 5] }
+    catch { testevalex {lset a 1 5 5} }
     list $a [lindex $a 1]
 } "{ { 1 2 } { 3 4 } } { 3 4 }"