More expr syntax error improvements

1 files changed, 227 insertions, 227 deletions

diff --git a/tests/compExpr-old.test b/tests/compExpr-old.test
index ea54db1..b7df34c 100644
--- a/tests/compExpr-old.test
+++ b/tests/compExpr-old.test
@@ -2,7 +2,7 @@
 #
 # This file contains the original set of tests for the compilation (and
 # indirectly execution) of Tcl's expr command. A new set of tests covering
-# the new implementation are in the files "parseExpr.test and
+# the new implementation are in the files "parseExpr.test" and
 # "compExpr.test". Sourcing this file into Tcl runs the tests and generates
 # output for errors. No output means no errors were found.
 #
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: compExpr-old.test,v 1.6 2001/12/04 15:36:29 dkf Exp $
+# RCS: @(#) $Id: compExpr-old.test,v 1.7 2001/12/06 10:59:17 dkf Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -76,393 +76,393 @@ proc do_twelve_days {} {
 
 catch {unset a b i x}
 
-test expr-1.1 {TclCompileExprCmd: no expression} {
+test compExpr-old-1.1 {TclCompileExprCmd: no expression} {
     list [catch {expr  } msg] $msg
 } {1 {wrong # args: should be "expr arg ?arg ...?"}}
-test expr-1.2 {TclCompileExprCmd: one expression word} {
+test compExpr-old-1.2 {TclCompileExprCmd: one expression word} {
     expr -25
 } -25
-test expr-1.3 {TclCompileExprCmd: two expression words} {
+test compExpr-old-1.3 {TclCompileExprCmd: two expression words} {
     expr -8.2   -6
 } -14.2
-test expr-1.4 {TclCompileExprCmd: five expression words} {
+test compExpr-old-1.4 {TclCompileExprCmd: five expression words} {
     expr 20 - 5 +10 -7
 } 18
-test expr-1.5 {TclCompileExprCmd: quoted expression word} {
+test compExpr-old-1.5 {TclCompileExprCmd: quoted expression word} {
     expr "0005"
 } 5
-test expr-1.6 {TclCompileExprCmd: quoted expression word} {
+test compExpr-old-1.6 {TclCompileExprCmd: quoted expression word} {
     catch {expr "0005"zxy} msg
     set msg
 } {extra characters after close-quote}
-test expr-1.7 {TclCompileExprCmd: expression word in braces} {
+test compExpr-old-1.7 {TclCompileExprCmd: expression word in braces} {
     expr {-0005}
 } -5
-test expr-1.8 {TclCompileExprCmd: expression word in braces} {
+test compExpr-old-1.8 {TclCompileExprCmd: expression word in braces} {
     expr {{-0x1234}}
 } -4660
-test expr-1.9 {TclCompileExprCmd: expression word in braces} {
+test compExpr-old-1.9 {TclCompileExprCmd: expression word in braces} {
     catch {expr {-0005}foo} msg
     set msg
 } {extra characters after close-brace}
-test expr-1.10 {TclCompileExprCmd: other expression word in braces} {
+test compExpr-old-1.10 {TclCompileExprCmd: other expression word in braces} {
     expr 4*[llength "6 2"]
 } 8
-test expr-1.11 {TclCompileExprCmd: expression word terminated by ;} {
+test compExpr-old-1.11 {TclCompileExprCmd: expression word terminated by ;} {
     expr 4*[llength "6 2"];
 } 8
-test expr-1.12 {TclCompileExprCmd: inlined expr (in "catch") inside other catch} {
+test compExpr-old-1.12 {TclCompileExprCmd: inlined expr (in "catch") inside other catch} {
     set a xxx
     catch {
 	# Might not be a number
 	set a [expr 10*$a]
     }
 } 1
-test expr-1.13 {TclCompileExprCmd: second level of substitutions in expr not in braces with single var reference} {
+test compExpr-old-1.13 {TclCompileExprCmd: second level of substitutions in expr not in braces with single var reference} {
     set a xxx
     set x 27;  set bool {$x};  if $bool {set a foo}
     set a
 } foo
-test expr-1.14 {TclCompileExprCmd: second level of substitutions in expr with comparison as top-level operator} {
+test compExpr-old-1.14 {TclCompileExprCmd: second level of substitutions in expr with comparison as top-level operator} {
     set a xxx
     set x 2;  set b {$x};  set a [expr $b == 2]
     set a
 } 1
 
-test expr-2.1 {TclCompileExpr: are builtin functions registered?} {
+test compExpr-old-2.1 {TclCompileExpr: are builtin functions registered?} {
     expr double(5*[llength "6 2"])
 } 10.0
-test expr-2.2 {TclCompileExpr: error in expr} {
+test compExpr-old-2.2 {TclCompileExpr: error in expr} {
     catch {expr 2**3} msg
     set msg
-} {syntax error in expression "2**3": unexpected operator}
-test expr-2.3 {TclCompileExpr: junk after legal expr} {
+} {syntax error in expression "2**3": unexpected operator *}
+test compExpr-old-2.3 {TclCompileExpr: junk after legal expr} {
     catch {expr 7*[llength "a b"]foo} msg
     set msg
 } {syntax error in expression "7*2foo": extra tokens at end of expression}
-test expr-2.4 {TclCompileExpr: numeric expr string rep == formatted int rep} {
+test compExpr-old-2.4 {TclCompileExpr: numeric expr string rep == formatted int rep} {
     expr {0001}
 } 1
 
-test expr-3.1 {CompileCondExpr: just lor expr} {expr 3||0} 1
-test expr-3.2 {CompileCondExpr: error in lor expr} {
+test compExpr-old-3.1 {CompileCondExpr: just lor expr} {expr 3||0} 1
+test compExpr-old-3.2 {CompileCondExpr: error in lor expr} {
     catch {expr x||3} msg
     set msg
-} {syntax error in expression "x||3": expected a parenthesis enclosing function arguments} 
-test expr-3.3 {CompileCondExpr: test true arm} {expr 3>2?44:66} 44
-test expr-3.4 {CompileCondExpr: error compiling true arm} {
+} {syntax error in expression "x||3": variable references require preceding $} 
+test compExpr-old-3.3 {CompileCondExpr: test true arm} {expr 3>2?44:66} 44
+test compExpr-old-3.4 {CompileCondExpr: error compiling true arm} {
     catch {expr 3>2?2**3:66} msg
     set msg
-} {syntax error in expression "3>2?2**3:66": unexpected operator}
-test expr-3.5 {CompileCondExpr: test false arm} {expr 2>3?44:66} 66
-test expr-3.6 {CompileCondExpr: error compiling false arm} {
+} {syntax error in expression "3>2?2**3:66": unexpected operator *}
+test compExpr-old-3.5 {CompileCondExpr: test false arm} {expr 2>3?44:66} 66
+test compExpr-old-3.6 {CompileCondExpr: error compiling false arm} {
     catch {expr 2>3?44:2**3} msg
     set msg
-} {syntax error in expression "2>3?44:2**3": unexpected operator}
-test expr-3.7 {CompileCondExpr: long arms & nested cond exprs} {nonPortable} {
-    puts "Note: doing test expr-3.7 which can take several minutes to run"
+} {syntax error in expression "2>3?44:2**3": unexpected operator *}
+test compExpr-old-3.7 {CompileCondExpr: long arms & nested cond exprs} {nonPortable} {
+    puts "Note: doing test compExpr-old-3.7 which can take several minutes to run"
     hello_world
 } {Hello world}
 catch {unset xxx}
-test expr-3.8 {CompileCondExpr: long arms & nested cond exprs} {nonPortable} {
-    puts "Note: doing test expr-3.8 which can take several minutes to run"
+test compExpr-old-3.8 {CompileCondExpr: long arms & nested cond exprs} {nonPortable} {
+    puts "Note: doing test compExpr-old-3.8 which can take several minutes to run"
     do_twelve_days
 } 2358
 catch {unset xxx}
 
-test expr-4.1 {CompileLorExpr: just land expr} {expr 1.3&&3.3} 1
-test expr-4.2 {CompileLorExpr: error in land expr} {
+test compExpr-old-4.1 {CompileLorExpr: just land expr} {expr 1.3&&3.3} 1
+test compExpr-old-4.2 {CompileLorExpr: error in land expr} {
     catch {expr x&&3} msg
     set msg
-} {syntax error in expression "x&&3": expected a parenthesis enclosing function arguments} 
-test expr-4.3 {CompileLorExpr: simple lor exprs} {expr 0||1.0} 1
-test expr-4.4 {CompileLorExpr: simple lor exprs} {expr 3.0||0.0} 1
-test expr-4.5 {CompileLorExpr: simple lor exprs} {expr 0||0||1} 1
-test expr-4.6 {CompileLorExpr: error compiling lor arm} {
+} {syntax error in expression "x&&3": variable references require preceding $} 
+test compExpr-old-4.3 {CompileLorExpr: simple lor exprs} {expr 0||1.0} 1
+test compExpr-old-4.4 {CompileLorExpr: simple lor exprs} {expr 3.0||0.0} 1
+test compExpr-old-4.5 {CompileLorExpr: simple lor exprs} {expr 0||0||1} 1
+test compExpr-old-4.6 {CompileLorExpr: error compiling lor arm} {
     catch {expr 2**3||4.0} msg
     set msg
-} {syntax error in expression "2**3||4.0": unexpected operator}
-test expr-4.7 {CompileLorExpr: error compiling lor arm} {
+} {syntax error in expression "2**3||4.0": unexpected operator *}
+test compExpr-old-4.7 {CompileLorExpr: error compiling lor arm} {
     catch {expr 1.3||2**3} msg
     set msg
-} {syntax error in expression "1.3||2**3": unexpected operator}
-test expr-4.8 {CompileLorExpr: error compiling lor arms} {
+} {syntax error in expression "1.3||2**3": unexpected operator *}
+test compExpr-old-4.8 {CompileLorExpr: error compiling lor arms} {
     list [catch {expr {"a"||"b"}} msg] $msg
 } {1 {expected boolean value but got "a"}}
-test expr-4.9 {CompileLorExpr: long lor arm} {
+test compExpr-old-4.9 {CompileLorExpr: long lor arm} {
     set a "abcdefghijkl"
     set i 7
     expr {[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]] || [string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]] || [string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]] || [string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]}
 } 1
 
-test expr-5.1 {CompileLandExpr: just bitor expr} {expr 7|0x13} 23
-test expr-5.2 {CompileLandExpr: error in bitor expr} {
+test compExpr-old-5.1 {CompileLandExpr: just bitor expr} {expr 7|0x13} 23
+test compExpr-old-5.2 {CompileLandExpr: error in bitor expr} {
     catch {expr x|3} msg
     set msg
-} {syntax error in expression "x|3": expected a parenthesis enclosing function arguments} 
-test expr-5.3 {CompileLandExpr: simple land exprs} {expr 0&&1.0} 0
-test expr-5.4 {CompileLandExpr: simple land exprs} {expr 0&&0} 0
-test expr-5.5 {CompileLandExpr: simple land exprs} {expr 3.0&&1.2} 1
-test expr-5.6 {CompileLandExpr: simple land exprs} {expr 1&&1&&2} 1
-test expr-5.7 {CompileLandExpr: error compiling land arm} {
+} {syntax error in expression "x|3": variable references require preceding $} 
+test compExpr-old-5.3 {CompileLandExpr: simple land exprs} {expr 0&&1.0} 0
+test compExpr-old-5.4 {CompileLandExpr: simple land exprs} {expr 0&&0} 0
+test compExpr-old-5.5 {CompileLandExpr: simple land exprs} {expr 3.0&&1.2} 1
+test compExpr-old-5.6 {CompileLandExpr: simple land exprs} {expr 1&&1&&2} 1
+test compExpr-old-5.7 {CompileLandExpr: error compiling land arm} {
     catch {expr 2**3&&4.0} msg
     set msg
-} {syntax error in expression "2**3&&4.0": unexpected operator}
-test expr-5.8 {CompileLandExpr: error compiling land arm} {
+} {syntax error in expression "2**3&&4.0": unexpected operator *}
+test compExpr-old-5.8 {CompileLandExpr: error compiling land arm} {
     catch {expr 1.3&&2**3} msg
     set msg
-} {syntax error in expression "1.3&&2**3": unexpected operator}
-test expr-5.9 {CompileLandExpr: error compiling land arm} {
+} {syntax error in expression "1.3&&2**3": unexpected operator *}
+test compExpr-old-5.9 {CompileLandExpr: error compiling land arm} {
     list [catch {expr {"a"&&"b"}} msg] $msg
 } {1 {expected boolean value but got "a"}}
-test expr-5.10 {CompileLandExpr: long land arms} {
+test compExpr-old-5.10 {CompileLandExpr: long land arms} {
     set a "abcdefghijkl"
     set i 7
     expr {[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]] && [string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]] && [string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]] && [string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]}
 } 1
 
-test expr-6.1 {CompileBitXorExpr: just bitand expr} {expr 7&0x13} 3
-test expr-6.2 {CompileBitXorExpr: error in bitand expr} {
+test compExpr-old-6.1 {CompileBitXorExpr: just bitand expr} {expr 7&0x13} 3
+test compExpr-old-6.2 {CompileBitXorExpr: error in bitand expr} {
     catch {expr x|3} msg
     set msg
-} {syntax error in expression "x|3": expected a parenthesis enclosing function arguments} 
-test expr-6.3 {CompileBitXorExpr: simple bitxor exprs} {expr 7^0x13} 20
-test expr-6.4 {CompileBitXorExpr: simple bitxor exprs} {expr 3^0x10} 19
-test expr-6.5 {CompileBitXorExpr: simple bitxor exprs} {expr 0^7} 7
-test expr-6.6 {CompileBitXorExpr: simple bitxor exprs} {expr -1^7} -8
-test expr-6.7 {CompileBitXorExpr: error compiling bitxor arm} {
+} {syntax error in expression "x|3": variable references require preceding $} 
+test compExpr-old-6.3 {CompileBitXorExpr: simple bitxor exprs} {expr 7^0x13} 20
+test compExpr-old-6.4 {CompileBitXorExpr: simple bitxor exprs} {expr 3^0x10} 19
+test compExpr-old-6.5 {CompileBitXorExpr: simple bitxor exprs} {expr 0^7} 7
+test compExpr-old-6.6 {CompileBitXorExpr: simple bitxor exprs} {expr -1^7} -8
+test compExpr-old-6.7 {CompileBitXorExpr: error compiling bitxor arm} {
     catch {expr 2**3|6} msg
     set msg
-} {syntax error in expression "2**3|6": unexpected operator}
-test expr-6.8 {CompileBitXorExpr: error compiling bitxor arm} {
+} {syntax error in expression "2**3|6": unexpected operator *}
+test compExpr-old-6.8 {CompileBitXorExpr: error compiling bitxor arm} {
     catch {expr 2^x} msg
     set msg
-} {syntax error in expression "2^x": expected a parenthesis enclosing function arguments}
-test expr-6.9 {CompileBitXorExpr: runtime error in bitxor arm} {
+} {syntax error in expression "2^x": variable references require preceding $}
+test compExpr-old-6.9 {CompileBitXorExpr: runtime error in bitxor arm} {
     list [catch {expr {24.0^3}} msg] $msg
 } {1 {can't use floating-point value as operand of "^"}}
-test expr-6.10 {CompileBitXorExpr: runtime error in bitxor arm} {
+test compExpr-old-6.10 {CompileBitXorExpr: runtime error in bitxor arm} {
     list [catch {expr {"a"^"b"}} msg] $msg
 } {1 {can't use non-numeric string as operand of "^"}}
 
-test expr-7.1 {CompileBitAndExpr: just equality expr} {expr 3==2} 0
-test expr-7.2 {CompileBitAndExpr: just equality expr} {expr 2.0==2} 1
-test expr-7.3 {CompileBitAndExpr: just equality expr} {expr 3.2!=2.2} 1
-test expr-7.4 {CompileBitAndExpr: just equality expr} {expr {"abc" == "abd"}} 0
-test expr-7.5 {CompileBitAndExpr: error in equality expr} {
+test compExpr-old-7.1 {CompileBitAndExpr: just equality expr} {expr 3==2} 0
+test compExpr-old-7.2 {CompileBitAndExpr: just equality expr} {expr 2.0==2} 1
+test compExpr-old-7.3 {CompileBitAndExpr: just equality expr} {expr 3.2!=2.2} 1
+test compExpr-old-7.4 {CompileBitAndExpr: just equality expr} {expr {"abc" == "abd"}} 0
+test compExpr-old-7.5 {CompileBitAndExpr: error in equality expr} {
     catch {expr x==3} msg
     set msg
-} {syntax error in expression "x==3": expected a parenthesis enclosing function arguments} 
-test expr-7.6 {CompileBitAndExpr: simple bitand exprs} {expr 7&0x13} 3
-test expr-7.7 {CompileBitAndExpr: simple bitand exprs} {expr 0xf2&0x53} 82
-test expr-7.8 {CompileBitAndExpr: simple bitand exprs} {expr 3&6} 2
-test expr-7.9 {CompileBitAndExpr: simple bitand exprs} {expr -1&-7} -7
-test expr-7.10 {CompileBitAndExpr: error compiling bitand arm} {
+} {syntax error in expression "x==3": variable references require preceding $} 
+test compExpr-old-7.6 {CompileBitAndExpr: simple bitand exprs} {expr 7&0x13} 3
+test compExpr-old-7.7 {CompileBitAndExpr: simple bitand exprs} {expr 0xf2&0x53} 82
+test compExpr-old-7.8 {CompileBitAndExpr: simple bitand exprs} {expr 3&6} 2
+test compExpr-old-7.9 {CompileBitAndExpr: simple bitand exprs} {expr -1&-7} -7
+test compExpr-old-7.10 {CompileBitAndExpr: error compiling bitand arm} {
     catch {expr 2**3&6} msg
     set msg
-} {syntax error in expression "2**3&6": unexpected operator}
-test expr-7.11 {CompileBitAndExpr: error compiling bitand arm} {
+} {syntax error in expression "2**3&6": unexpected operator *}
+test compExpr-old-7.11 {CompileBitAndExpr: error compiling bitand arm} {
     catch {expr 2&x} msg
     set msg
-} {syntax error in expression "2&x": expected a parenthesis enclosing function arguments}
-test expr-7.12 {CompileBitAndExpr: runtime error in bitand arm} {
+} {syntax error in expression "2&x": variable references require preceding $}
+test compExpr-old-7.12 {CompileBitAndExpr: runtime error in bitand arm} {
     list [catch {expr {24.0&3}} msg] $msg
 } {1 {can't use floating-point value as operand of "&"}}
-test expr-7.13 {CompileBitAndExpr: runtime error in bitand arm} {
+test compExpr-old-7.13 {CompileBitAndExpr: runtime error in bitand arm} {
     list [catch {expr {"a"&"b"}} msg] $msg
 } {1 {can't use non-numeric string as operand of "&"}}
 
-test expr-8.1 {CompileEqualityExpr: just relational expr} {expr 3>=2} 1
-test expr-8.2 {CompileEqualityExpr: just relational expr} {expr 2<=2.1} 1
-test expr-8.3 {CompileEqualityExpr: just relational expr} {expr 3.2>"2.2"} 1
-test expr-8.4 {CompileEqualityExpr: just relational expr} {expr {"0y"<"0x12"}} 0
-test expr-8.5 {CompileEqualityExpr: error in relational expr} {
+test compExpr-old-8.1 {CompileEqualityExpr: just relational expr} {expr 3>=2} 1
+test compExpr-old-8.2 {CompileEqualityExpr: just relational expr} {expr 2<=2.1} 1
+test compExpr-old-8.3 {CompileEqualityExpr: just relational expr} {expr 3.2>"2.2"} 1
+test compExpr-old-8.4 {CompileEqualityExpr: just relational expr} {expr {"0y"<"0x12"}} 0
+test compExpr-old-8.5 {CompileEqualityExpr: error in relational expr} {
     catch {expr x>3} msg
     set msg
-} {syntax error in expression "x>3": expected a parenthesis enclosing function arguments} 
-test expr-8.6 {CompileEqualityExpr: simple equality exprs} {expr 7==0x13} 0
-test expr-8.7 {CompileEqualityExpr: simple equality exprs} {expr -0xf2!=0x53} 1
-test expr-8.8 {CompileEqualityExpr: simple equality exprs} {expr {"12398712938788234-1298379" != ""}} 1
-test expr-8.9 {CompileEqualityExpr: simple equality exprs} {expr -1!="abc"} 1
-test expr-8.10 {CompileEqualityExpr: error compiling equality arm} {
+} {syntax error in expression "x>3": variable references require preceding $} 
+test compExpr-old-8.6 {CompileEqualityExpr: simple equality exprs} {expr 7==0x13} 0
+test compExpr-old-8.7 {CompileEqualityExpr: simple equality exprs} {expr -0xf2!=0x53} 1
+test compExpr-old-8.8 {CompileEqualityExpr: simple equality exprs} {expr {"12398712938788234-1298379" != ""}} 1
+test compExpr-old-8.9 {CompileEqualityExpr: simple equality exprs} {expr -1!="abc"} 1
+test compExpr-old-8.10 {CompileEqualityExpr: error compiling equality arm} {
     catch {expr 2**3==6} msg
     set msg
-} {syntax error in expression "2**3==6": unexpected operator}
-test expr-8.11 {CompileEqualityExpr: error compiling equality arm} {
+} {syntax error in expression "2**3==6": unexpected operator *}
+test compExpr-old-8.11 {CompileEqualityExpr: error compiling equality arm} {
     catch {expr 2!=x} msg
     set msg
-} {syntax error in expression "2!=x": expected a parenthesis enclosing function arguments}
+} {syntax error in expression "2!=x": variable references require preceding $}
 
 
-test expr-9.1 {CompileRelationalExpr: just shift expr} {expr 3<<2} 12
-test expr-9.2 {CompileRelationalExpr: just shift expr} {expr 0xff>>2} 63
-test expr-9.3 {CompileRelationalExpr: just shift expr} {expr -1>>2} -1
-test expr-9.4 {CompileRelationalExpr: just shift expr} {expr {1<<3}} 8
+test compExpr-old-9.1 {CompileRelationalExpr: just shift expr} {expr 3<<2} 12
+test compExpr-old-9.2 {CompileRelationalExpr: just shift expr} {expr 0xff>>2} 63
+test compExpr-old-9.3 {CompileRelationalExpr: just shift expr} {expr -1>>2} -1
+test compExpr-old-9.4 {CompileRelationalExpr: just shift expr} {expr {1<<3}} 8
 
 # The following test is different for 32-bit versus 64-bit
 # architectures because LONG_MIN is different
 
 if {0x80000000 > 0} {
-    test expr-9.5 {CompileRelationalExpr: shift expr producing LONG_MIN} {nonPortable} {
+    test compExpr-old-9.5 {CompileRelationalExpr: shift expr producing LONG_MIN} {nonPortable} {
 	expr {1<<63}
     } -9223372036854775808
 } else {
-    test expr-9.5 {CompileRelationalExpr: shift expr producing LONG_MIN} {nonPortable} {
+    test compExpr-old-9.5 {CompileRelationalExpr: shift expr producing LONG_MIN} {nonPortable} {
 	expr {1<<31}
     } -2147483648
 }
-test expr-9.6 {CompileRelationalExpr: error in shift expr} {
+test compExpr-old-9.6 {CompileRelationalExpr: error in shift expr} {
     catch {expr x>>3} msg
     set msg
-} {syntax error in expression "x>>3": expected a parenthesis enclosing function arguments} 
-test expr-9.7 {CompileRelationalExpr: simple relational exprs} {expr 0xff>=+0x3} 1
-test expr-9.8 {CompileRelationalExpr: simple relational exprs} {expr -0xf2<0x3} 1
-test expr-9.9 {CompileRelationalExpr: error compiling relational arm} {
+} {syntax error in expression "x>>3": variable references require preceding $} 
+test compExpr-old-9.7 {CompileRelationalExpr: simple relational exprs} {expr 0xff>=+0x3} 1
+test compExpr-old-9.8 {CompileRelationalExpr: simple relational exprs} {expr -0xf2<0x3} 1
+test compExpr-old-9.9 {CompileRelationalExpr: error compiling relational arm} {
     catch {expr 2**3>6} msg
     set msg
-} {syntax error in expression "2**3>6": unexpected operator}
-test expr-9.10 {CompileRelationalExpr: error compiling relational arm} {
+} {syntax error in expression "2**3>6": unexpected operator *}
+test compExpr-old-9.10 {CompileRelationalExpr: error compiling relational arm} {
     catch {expr 2<x} msg
     set msg
-} {syntax error in expression "2<x": expected a parenthesis enclosing function arguments}
+} {syntax error in expression "2<x": variable references require preceding $}
 
-test expr-10.1 {CompileShiftExpr: just add expr} {expr 4+-2} 2
-test expr-10.2 {CompileShiftExpr: just add expr} {expr 0xff-2} 253
-test expr-10.3 {CompileShiftExpr: just add expr} {expr -1--2} 1
-test expr-10.4 {CompileShiftExpr: just add expr} {expr 1-0123} -82
-test expr-10.5 {CompileShiftExpr: error in add expr} {
+test compExpr-old-10.1 {CompileShiftExpr: just add expr} {expr 4+-2} 2
+test compExpr-old-10.2 {CompileShiftExpr: just add expr} {expr 0xff-2} 253
+test compExpr-old-10.3 {CompileShiftExpr: just add expr} {expr -1--2} 1
+test compExpr-old-10.4 {CompileShiftExpr: just add expr} {expr 1-0123} -82
+test compExpr-old-10.5 {CompileShiftExpr: error in add expr} {
     catch {expr x+3} msg
     set msg
-} {syntax error in expression "x+3": expected a parenthesis enclosing function arguments}
-test expr-10.6 {CompileShiftExpr: simple shift exprs} {expr 0xff>>0x3} 31
-test expr-10.7 {CompileShiftExpr: simple shift exprs} {expr -0xf2<<0x3} -1936
-test expr-10.8 {CompileShiftExpr: error compiling shift arm} {
+} {syntax error in expression "x+3": variable references require preceding $}
+test compExpr-old-10.6 {CompileShiftExpr: simple shift exprs} {expr 0xff>>0x3} 31
+test compExpr-old-10.7 {CompileShiftExpr: simple shift exprs} {expr -0xf2<<0x3} -1936
+test compExpr-old-10.8 {CompileShiftExpr: error compiling shift arm} {
     catch {expr 2**3>>6} msg
     set msg
-} {syntax error in expression "2**3>>6": unexpected operator}
-test expr-10.9 {CompileShiftExpr: error compiling shift arm} {
+} {syntax error in expression "2**3>>6": unexpected operator *}
+test compExpr-old-10.9 {CompileShiftExpr: error compiling shift arm} {
     catch {expr 2<<x} msg
     set msg
-} {syntax error in expression "2<<x": expected a parenthesis enclosing function arguments}
-test expr-10.10 {CompileShiftExpr: runtime error} {
+} {syntax error in expression "2<<x": variable references require preceding $}
+test compExpr-old-10.10 {CompileShiftExpr: runtime error} {
     list [catch {expr {24.0>>43}} msg] $msg
 } {1 {can't use floating-point value as operand of ">>"}}
-test expr-10.11 {CompileShiftExpr: runtime error} {
+test compExpr-old-10.11 {CompileShiftExpr: runtime error} {
     list [catch {expr {"a"<<"b"}} msg] $msg
 } {1 {can't use non-numeric string as operand of "<<"}}
 
-test expr-11.1 {CompileAddExpr: just multiply expr} {expr 4*-2} -8
-test expr-11.2 {CompileAddExpr: just multiply expr} {expr 0xff%2} 1
-test expr-11.3 {CompileAddExpr: just multiply expr} {expr -1/2} -1
-test expr-11.4 {CompileAddExpr: just multiply expr} {expr 7891%0123} 6
-test expr-11.5 {CompileAddExpr: error in multiply expr} {
+test compExpr-old-11.1 {CompileAddExpr: just multiply expr} {expr 4*-2} -8
+test compExpr-old-11.2 {CompileAddExpr: just multiply expr} {expr 0xff%2} 1
+test compExpr-old-11.3 {CompileAddExpr: just multiply expr} {expr -1/2} -1
+test compExpr-old-11.4 {CompileAddExpr: just multiply expr} {expr 7891%0123} 6
+test compExpr-old-11.5 {CompileAddExpr: error in multiply expr} {
     catch {expr x*3} msg
     set msg
-} {syntax error in expression "x*3": expected a parenthesis enclosing function arguments}
-test expr-11.6 {CompileAddExpr: simple add exprs} {expr 0xff++0x3} 258
-test expr-11.7 {CompileAddExpr: simple add exprs} {expr -0xf2--0x3} -239
-test expr-11.8 {CompileAddExpr: error compiling add arm} {
+} {syntax error in expression "x*3": variable references require preceding $}
+test compExpr-old-11.6 {CompileAddExpr: simple add exprs} {expr 0xff++0x3} 258
+test compExpr-old-11.7 {CompileAddExpr: simple add exprs} {expr -0xf2--0x3} -239
+test compExpr-old-11.8 {CompileAddExpr: error compiling add arm} {
     catch {expr 2**3+6} msg
     set msg
-} {syntax error in expression "2**3+6": unexpected operator}
-test expr-11.9 {CompileAddExpr: error compiling add arm} {
+} {syntax error in expression "2**3+6": unexpected operator *}
+test compExpr-old-11.9 {CompileAddExpr: error compiling add arm} {
     catch {expr 2-x} msg
     set msg
-} {syntax error in expression "2-x": expected a parenthesis enclosing function arguments}
-test expr-11.10 {CompileAddExpr: runtime error} {
+} {syntax error in expression "2-x": variable references require preceding $}
+test compExpr-old-11.10 {CompileAddExpr: runtime error} {
     list [catch {expr {24.0+"xx"}} msg] $msg
 } {1 {can't use non-numeric string as operand of "+"}}
-test expr-11.11 {CompileAddExpr: runtime error} {
+test compExpr-old-11.11 {CompileAddExpr: runtime error} {
     list [catch {expr {"a"-"b"}} msg] $msg
 } {1 {can't use non-numeric string as operand of "-"}}
-test expr-11.12 {CompileAddExpr: runtime error} {
+test compExpr-old-11.12 {CompileAddExpr: runtime error} {
     list [catch {expr {3/0}} msg] $msg
 } {1 {divide by zero}}
-test expr-11.13 {CompileAddExpr: runtime error} {
+test compExpr-old-11.13 {CompileAddExpr: runtime error} {
     list [catch {expr {2.3/0.0}} msg] $msg
 } {1 {divide by zero}}
 
-test expr-12.1 {CompileMultiplyExpr: just unary expr} {expr ~4} -5
-test expr-12.2 {CompileMultiplyExpr: just unary expr} {expr --5} 5
-test expr-12.3 {CompileMultiplyExpr: just unary expr} {expr !27} 0
-test expr-12.4 {CompileMultiplyExpr: just unary expr} {expr ~0xff00ff} -16711936
-test expr-12.5 {CompileMultiplyExpr: error in unary expr} {
+test compExpr-old-12.1 {CompileMultiplyExpr: just unary expr} {expr ~4} -5
+test compExpr-old-12.2 {CompileMultiplyExpr: just unary expr} {expr --5} 5
+test compExpr-old-12.3 {CompileMultiplyExpr: just unary expr} {expr !27} 0
+test compExpr-old-12.4 {CompileMultiplyExpr: just unary expr} {expr ~0xff00ff} -16711936
+test compExpr-old-12.5 {CompileMultiplyExpr: error in unary expr} {
     catch {expr ~x} msg
     set msg
-} {syntax error in expression "~x": expected a parenthesis enclosing function arguments}
-test expr-12.6 {CompileMultiplyExpr: simple multiply exprs} {expr 0xff*0x3} 765
-test expr-12.7 {CompileMultiplyExpr: simple multiply exprs} {expr -0xf2%-0x3} -2
-test expr-12.8 {CompileMultiplyExpr: error compiling multiply arm} {
+} {syntax error in expression "~x": variable references require preceding $}
+test compExpr-old-12.6 {CompileMultiplyExpr: simple multiply exprs} {expr 0xff*0x3} 765
+test compExpr-old-12.7 {CompileMultiplyExpr: simple multiply exprs} {expr -0xf2%-0x3} -2
+test compExpr-old-12.8 {CompileMultiplyExpr: error compiling multiply arm} {
     catch {expr 2*3%%6} msg
     set msg
-} {syntax error in expression "2*3%%6": unexpected operator}
-test expr-12.9 {CompileMultiplyExpr: error compiling multiply arm} {
+} {syntax error in expression "2*3%%6": unexpected operator %}
+test compExpr-old-12.9 {CompileMultiplyExpr: error compiling multiply arm} {
     catch {expr 2*x} msg
     set msg
-} {syntax error in expression "2*x": expected a parenthesis enclosing function arguments}
-test expr-12.10 {CompileMultiplyExpr: runtime error} {
+} {syntax error in expression "2*x": variable references require preceding $}
+test compExpr-old-12.10 {CompileMultiplyExpr: runtime error} {
     list [catch {expr {24.0*"xx"}} msg] $msg
 } {1 {can't use non-numeric string as operand of "*"}}
-test expr-12.11 {CompileMultiplyExpr: runtime error} {
+test compExpr-old-12.11 {CompileMultiplyExpr: runtime error} {
     list [catch {expr {"a"/"b"}} msg] $msg
 } {1 {can't use non-numeric string as operand of "/"}}
 
-test expr-13.1 {CompileUnaryExpr: unary exprs} {expr -0xff} -255
-test expr-13.2 {CompileUnaryExpr: unary exprs} {expr +000123} 83
-test expr-13.3 {CompileUnaryExpr: unary exprs} {expr +--++36} 36
-test expr-13.4 {CompileUnaryExpr: unary exprs} {expr !2} 0
-test expr-13.5 {CompileUnaryExpr: unary exprs} {expr +--+-62.0} -62.0
-test expr-13.6 {CompileUnaryExpr: unary exprs} {expr !0.0} 1
-test expr-13.7 {CompileUnaryExpr: unary exprs} {expr !0xef} 0
-test expr-13.8 {CompileUnaryExpr: error compiling unary expr} {
+test compExpr-old-13.1 {CompileUnaryExpr: unary exprs} {expr -0xff} -255
+test compExpr-old-13.2 {CompileUnaryExpr: unary exprs} {expr +000123} 83
+test compExpr-old-13.3 {CompileUnaryExpr: unary exprs} {expr +--++36} 36
+test compExpr-old-13.4 {CompileUnaryExpr: unary exprs} {expr !2} 0
+test compExpr-old-13.5 {CompileUnaryExpr: unary exprs} {expr +--+-62.0} -62.0
+test compExpr-old-13.6 {CompileUnaryExpr: unary exprs} {expr !0.0} 1
+test compExpr-old-13.7 {CompileUnaryExpr: unary exprs} {expr !0xef} 0
+test compExpr-old-13.8 {CompileUnaryExpr: error compiling unary expr} {
     catch {expr ~x} msg
     set msg
-} {syntax error in expression "~x": expected a parenthesis enclosing function arguments}
-test expr-13.9 {CompileUnaryExpr: error compiling unary expr} {
+} {syntax error in expression "~x": variable references require preceding $}
+test compExpr-old-13.9 {CompileUnaryExpr: error compiling unary expr} {
     catch {expr !1.x} msg
     set msg
 } {syntax error in expression "!1.x": extra tokens at end of expression}
-test expr-13.10 {CompileUnaryExpr: runtime error} {
+test compExpr-old-13.10 {CompileUnaryExpr: runtime error} {
     list [catch {expr {~"xx"}} msg] $msg
 } {1 {can't use non-numeric string as operand of "~"}}
-test expr-13.11 {CompileUnaryExpr: runtime error} {
+test compExpr-old-13.11 {CompileUnaryExpr: runtime error} {
     list [catch {expr ~4.0} msg] $msg
 } {1 {can't use floating-point value as operand of "~"}}
-test expr-13.12 {CompileUnaryExpr: just primary expr} {expr 0x123} 291
-test expr-13.13 {CompileUnaryExpr: just primary expr} {
+test compExpr-old-13.12 {CompileUnaryExpr: just primary expr} {expr 0x123} 291
+test compExpr-old-13.13 {CompileUnaryExpr: just primary expr} {
     set a 27
     expr $a
 } 27
-test expr-13.14 {CompileUnaryExpr: just primary expr} {
+test compExpr-old-13.14 {CompileUnaryExpr: just primary expr} {
     expr double(27)
 } 27.0
-test expr-13.15 {CompileUnaryExpr: just primary expr} {expr "123"} 123
-test expr-13.16 {CompileUnaryExpr: error in primary expr} {
+test compExpr-old-13.15 {CompileUnaryExpr: just primary expr} {expr "123"} 123
+test compExpr-old-13.16 {CompileUnaryExpr: error in primary expr} {
     catch {expr [set]} msg
     set msg
 } {wrong # args: should be "set varName ?newValue?"}
-test expr-14.1 {CompilePrimaryExpr: literal primary} {expr 1} 1
-test expr-14.2 {CompilePrimaryExpr: literal primary} {expr 123} 123
-test expr-14.3 {CompilePrimaryExpr: literal primary} {expr 0xff} 255
-test expr-14.4 {CompilePrimaryExpr: literal primary} {expr 00010} 8
-test expr-14.5 {CompilePrimaryExpr: literal primary} {expr 62.0} 62.0
-test expr-14.6 {CompilePrimaryExpr: literal primary} {
+test compExpr-old-14.1 {CompilePrimaryExpr: literal primary} {expr 1} 1
+test compExpr-old-14.2 {CompilePrimaryExpr: literal primary} {expr 123} 123
+test compExpr-old-14.3 {CompilePrimaryExpr: literal primary} {expr 0xff} 255
+test compExpr-old-14.4 {CompilePrimaryExpr: literal primary} {expr 00010} 8
+test compExpr-old-14.5 {CompilePrimaryExpr: literal primary} {expr 62.0} 62.0
+test compExpr-old-14.6 {CompilePrimaryExpr: literal primary} {
     expr 3.1400000
 } 3.14
-test expr-14.7 {CompilePrimaryExpr: literal primary} {expr {{abcde}<{abcdef}}} 1
-test expr-14.8 {CompilePrimaryExpr: literal primary} {expr {{abc\
+test compExpr-old-14.7 {CompilePrimaryExpr: literal primary} {expr {{abcde}<{abcdef}}} 1
+test compExpr-old-14.8 {CompilePrimaryExpr: literal primary} {expr {{abc\
 def} < {abcdef}}} 1
-test expr-14.9 {CompilePrimaryExpr: literal primary} {expr {{abc\tde} > {abc\tdef}}} 0
-test expr-14.10 {CompilePrimaryExpr: literal primary} {expr {{123}}} 123
-test expr-14.11 {CompilePrimaryExpr: var reference primary} {
+test compExpr-old-14.9 {CompilePrimaryExpr: literal primary} {expr {{abc\tde} > {abc\tdef}}} 0
+test compExpr-old-14.10 {CompilePrimaryExpr: literal primary} {expr {{123}}} 123
+test compExpr-old-14.11 {CompilePrimaryExpr: var reference primary} {
     set i 789
     list [expr {$i}] [expr $i]
 } {789 789}
-test expr-14.12 {CompilePrimaryExpr: var reference primary} {
+test compExpr-old-14.12 {CompilePrimaryExpr: var reference primary} {
     set i {789}    ;# test expr's aggressive conversion to numeric semantics
     list [expr {$i}] [expr $i]
 } {789 789}
-test expr-14.13 {CompilePrimaryExpr: var reference primary} {
+test compExpr-old-14.13 {CompilePrimaryExpr: var reference primary} {
     catch {unset a}
     set a(foo) foo
     set a(bar) bar
@@ -472,45 +472,45 @@ test expr-14.13 {CompilePrimaryExpr: var reference primary} {
     catch {unset a}
     set result
 } {123 1}
-test expr-14.14 {CompilePrimaryExpr: var reference primary} {
+test compExpr-old-14.14 {CompilePrimaryExpr: var reference primary} {
     set i 123    ;# test "$var.0" floating point conversion hack
     list [expr $i] [expr $i.0] [expr $i.0/12.0]
 } {123 123.0 10.25}
-test expr-14.15 {CompilePrimaryExpr: var reference primary} {
+test compExpr-old-14.15 {CompilePrimaryExpr: var reference primary} {
     set i 123
     catch {expr $i.2} msg
     set msg
 } 123.2
-test expr-14.16 {CompilePrimaryExpr: error compiling var reference primary} {
+test compExpr-old-14.16 {CompilePrimaryExpr: error compiling var reference primary} {
     catch {expr {$a(foo}} msg
     set errorInfo
 } {missing )
     while compiling
 "expr {$a(foo}"}
-test expr-14.17 {CompilePrimaryExpr: string primary that looks like var ref} {
+test compExpr-old-14.17 {CompilePrimaryExpr: string primary that looks like var ref} {
     expr $
 } $
-test expr-14.18 {CompilePrimaryExpr: quoted string primary} {
+test compExpr-old-14.18 {CompilePrimaryExpr: quoted string primary} {
     expr "21"
 } 21
-test expr-14.19 {CompilePrimaryExpr: quoted string primary} {
+test compExpr-old-14.19 {CompilePrimaryExpr: quoted string primary} {
     set i 123
     set x 456
     expr "$i+$x"
 } 579
-test expr-14.20 {CompilePrimaryExpr: quoted string primary} {
+test compExpr-old-14.20 {CompilePrimaryExpr: quoted string primary} {
     set i 3
     set x 6
     expr 2+"$i.$x"
 } 5.6
-test expr-14.21 {CompilePrimaryExpr: error in quoted string primary} {
+test compExpr-old-14.21 {CompilePrimaryExpr: error in quoted string primary} {
     catch {expr "[set]"} msg
     set msg
 } {wrong # args: should be "set varName ?newValue?"}
-test expr-14.22 {CompilePrimaryExpr: subcommand primary} {
+test compExpr-old-14.22 {CompilePrimaryExpr: subcommand primary} {
     expr {[set i 123; set i]}
 } 123
-test expr-14.23 {CompilePrimaryExpr: error in subcommand primary} {
+test compExpr-old-14.23 {CompilePrimaryExpr: error in subcommand primary} {
     catch {expr {[set]}} msg
     set errorInfo
 } {wrong # args: should be "set varName ?newValue?"
@@ -518,28 +518,28 @@ test expr-14.23 {CompilePrimaryExpr: error in subcommand primary} {
 "set"
     while compiling
 "expr {[set]}"}
-test expr-14.24 {CompilePrimaryExpr: error in subcommand primary} {
+test compExpr-old-14.24 {CompilePrimaryExpr: error in subcommand primary} {
     catch {expr {[set i}} msg
     set errorInfo
 } {missing close-bracket
     while compiling
 "expr {[set i}"}
-test expr-14.25 {CompilePrimaryExpr: math function primary} {
+test compExpr-old-14.25 {CompilePrimaryExpr: math function primary} {
     format %.6g [expr exp(1.0)]
 } 2.71828
-test expr-14.26 {CompilePrimaryExpr: math function primary} {
+test compExpr-old-14.26 {CompilePrimaryExpr: math function primary} {
     format %.6g [expr pow(2.0+0.1,3.0+0.1)]
 } 9.97424
-test expr-14.27 {CompilePrimaryExpr: error in math function primary} {
+test compExpr-old-14.27 {CompilePrimaryExpr: error in math function primary} {
     catch {expr sinh::(2.0)} msg
     set errorInfo
-} {syntax error in expression "sinh::(2.0)": expected a parenthesis enclosing function arguments
+} {syntax error in expression "sinh::(2.0)": expected parenthesis enclosing function arguments
     while compiling
 "expr sinh::(2.0)"}
-test expr-14.28 {CompilePrimaryExpr: subexpression primary} {
+test compExpr-old-14.28 {CompilePrimaryExpr: subexpression primary} {
     expr 2+(3*4)
 } 14
-test expr-14.29 {CompilePrimaryExpr: error in subexpression primary} {
+test compExpr-old-14.29 {CompilePrimaryExpr: error in subexpression primary} {
     catch {expr 2+(3*[set])} msg
     set errorInfo
 } {wrong # args: should be "set varName ?newValue?"
@@ -547,79 +547,79 @@ test expr-14.29 {CompilePrimaryExpr: error in subexpression primary} {
 "set"
     while compiling
 "expr 2+(3*[set])"}
-test expr-14.30 {CompilePrimaryExpr: missing paren in subexpression primary} {
+test compExpr-old-14.30 {CompilePrimaryExpr: missing paren in subexpression primary} {
     catch {expr 2+(3*(4+5)} msg
     set errorInfo
 } {syntax error in expression "2+(3*(4+5)": looking for close parenthesis
     while compiling
 "expr 2+(3*(4+5)"}
-test expr-14.31 {CompilePrimaryExpr: just var ref in subexpression primary} {
+test compExpr-old-14.31 {CompilePrimaryExpr: just var ref in subexpression primary} {
     set i "5+10"
     list "[expr $i] == 15" "[expr ($i)] == 15" "[eval expr ($i)] == 15"
 } {{15 == 15} {15 == 15} {15 == 15}}
-test expr-14.32 {CompilePrimaryExpr: unexpected token} {
+test compExpr-old-14.32 {CompilePrimaryExpr: unexpected token} {
     catch {expr @} msg
     set errorInfo
 } {syntax error in expression "@": character not legal in expressions
     while compiling
 "expr @"}
 
-test expr-15.1 {CompileMathFuncCall: missing parenthesis} {
+test compExpr-old-15.1 {CompileMathFuncCall: missing parenthesis} {
     catch {expr sinh2.0)} msg
     set errorInfo
-} {syntax error in expression "sinh2.0)": expected a parenthesis enclosing function arguments
+} {syntax error in expression "sinh2.0)": variable references require preceding $
     while compiling
 "expr sinh2.0)"}
-test expr-15.2 {CompileMathFuncCall: unknown math function} {
+test compExpr-old-15.2 {CompileMathFuncCall: unknown math function} {
     catch {expr whazzathuh(1)} msg
     set errorInfo
 } {unknown math function "whazzathuh"
     while compiling
 "expr whazzathuh(1)"}
-test expr-15.3 {CompileMathFuncCall: too many arguments} {
+test compExpr-old-15.3 {CompileMathFuncCall: too many arguments} {
     catch {expr sin(1,2,3)} msg
     set errorInfo
 } {too many arguments for math function
     while compiling
 "expr sin(1,2,3)"}
-test expr-15.4 {CompileMathFuncCall: ')' found before last required arg} {
+test compExpr-old-15.4 {CompileMathFuncCall: ')' found before last required arg} {
     catch {expr sin()} msg
     set errorInfo
 } {too few arguments for math function
     while compiling
 "expr sin()"}
-test expr-15.5 {CompileMathFuncCall: too few arguments} {
+test compExpr-old-15.5 {CompileMathFuncCall: too few arguments} {
     catch {expr pow(1)} msg
     set errorInfo
 } {too few arguments for math function
     while compiling
 "expr pow(1)"}
-test expr-15.6 {CompileMathFuncCall: missing ')'} {
+test compExpr-old-15.6 {CompileMathFuncCall: missing ')'} {
     catch {expr sin(1} msg
     set errorInfo
 } {syntax error in expression "sin(1": missing close parenthesis at end of function call
     while compiling
 "expr sin(1"}
 if $gotT1 {
-    test expr-15.7 {CompileMathFuncCall: call registered math function} {
+    test compExpr-old-15.7 {CompileMathFuncCall: call registered math function} {
 	expr 2*T1()
     } 246
-    test expr-15.8 {CompileMathFuncCall: call registered math function} {
+    test compExpr-old-15.8 {CompileMathFuncCall: call registered math function} {
 	expr T2()*3
     } 1035
 
-    test expr-15.9 {CompileMathFuncCall: call registered math function} {
+    test compExpr-old-15.9 {CompileMathFuncCall: call registered math function} {
 	expr T3(21, 37)
     } 37
-    test expr-15.10 {CompileMathFuncCall: call registered math function} {
+    test compExpr-old-15.10 {CompileMathFuncCall: call registered math function} {
 	expr T3(21.2, 37)
     } 37.0
-    test expr-15.11 {CompileMathFuncCall: call registered math function} {
+    test compExpr-old-15.11 {CompileMathFuncCall: call registered math function} {
 	expr T3(-21.2, -17.5)
     } -17.5
 }
 
-test expr-16.1 {GetToken: checks whether integer token starting with "0x" (e.g., "0x$") is invalid} {
+test compExpr-old-16.1 {GetToken: checks whether integer token starting with "0x" (e.g., "0x$") is invalid} {
     catch {unset a}
     set a(VALUE) ff15
     set i 123
@@ -628,13 +628,13 @@ test expr-16.1 {GetToken: checks whether integer token starting with "0x" (e.g.,
     }
     set i
 } {}
-test expr-16.2 {GetToken: check for string literal in braces} {
+test compExpr-old-16.2 {GetToken: check for string literal in braces} {
     expr {{1}}
 } {1}
 
 # Check "expr" and computed command names.
 
-test expr-17.1 {expr and computed command names} {
+test compExpr-old-17.1 {expr and computed command names} {
     set i 0
     set z expr
     $z 1+2
@@ -644,7 +644,7 @@ test expr-17.1 {expr and computed command names} {
 # an integer, convert to integer. Otherwise, if the string looks like a
 # double, convert to double.
 
-test expr-18.1 {expr and conversion of operands to numbers} {
+test compExpr-old-18.1 {expr and conversion of operands to numbers} {
     set x [lindex 11 0]
     catch {expr int($x)}
     expr {$x}
@@ -653,7 +653,7 @@ test expr-18.1 {expr and conversion of operands to numbers} {
 # Check "expr" and interpreter result object resetting before appending
 # an error msg during evaluation of exprs not in {}s
 
-test expr-19.1 {expr and interpreter result object resetting} {
+test compExpr-old-19.1 {expr and interpreter result object resetting} {
     proc p {} {
         set t  10.0
         set x  2.0