1 files changed, 30 insertions, 21 deletions

diff --git a/tests/proc-old.test b/tests/proc-old.test
index e45cf5c..4246f91 100644
--- a/tests/proc-old.test
+++ b/tests/proc-old.test
@@ -14,7 +14,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-if {[lsearch [namespace children] ::tcltest] == -1} {
+if {"::tcltest" ni [namespace children]} {
     package require tcltest
     namespace import -force ::tcltest::*
 }
@@ -22,10 +22,13 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 catch {rename t1 ""}
 catch {rename foo ""}
 
-proc tproc {} {return a; return b}
+proc tproc {} {
+    return a
+    return b
+}
 test proc-old-1.1 {simple procedure call and return} {tproc} a
-proc tproc x {
-    set x [expr $x+1]
+proc tproc {x} {
+    set x [expr {$x + 1}]
     return $x
 }
 test proc-old-1.2 {simple procedure call and return} {tproc 2} 3
@@ -36,8 +39,14 @@ test proc-old-1.4 {simple procedure call and return} {
     proc tproc {} {return}
     tproc
 } {}
-proc tproc1 {a}   {incr a; return $a}
-proc tproc2 {a b} {incr a; return $a}
+proc tproc1 {a}   {
+    incr a
+    return $a
+}
+proc tproc2 {a b} {
+    incr a
+    return $a
+}
 test proc-old-1.5 {simple procedure call and return (2 procs with same body but different parameters)} {
     list [tproc1 123] [tproc2 456 789]
 } {124 457}
@@ -80,7 +89,7 @@ test proc-old-2.4 {local and global variables} {
     set y 189
     list [tproc 6] $y
 } {195 189}
-catch {unset _undefined_}
+unset -nocomplain _undefined_
 test proc-old-2.5 {local and global variables} {
     proc tproc x {
 	global _undefined_
@@ -97,37 +106,37 @@ test proc-old-2.6 {local and global variables} {
 
 proc do {cmd} {eval $cmd}
 test proc-old-3.1 {local and global arrays} {
-    catch {unset a}
+    unset -nocomplain a
     set a(0) 22
     list [catch {do {global a; set a(0)}} msg] $msg
 } {0 22}
 test proc-old-3.2 {local and global arrays} {
-    catch {unset a}
+    unset -nocomplain a
     set a(x) 22
     list [catch {do {global a; set a(x) newValue}} msg] $msg $a(x)
 } {0 newValue newValue}
 test proc-old-3.3 {local and global arrays} {
-    catch {unset a}
+    unset -nocomplain a
     set a(x) 22
     set a(y) 33
     list [catch {do {global a; unset a(y)}; array names a} msg] $msg
 } {0 x}
 test proc-old-3.4 {local and global arrays} {
-    catch {unset a}
+    unset -nocomplain a
     set a(x) 22
     set a(y) 33
     list [catch {do {global a; unset a; info exists a}} msg] $msg \
 	    [info exists a]
 } {0 0 0}
 test proc-old-3.5 {local and global arrays} {
-    catch {unset a}
+    unset -nocomplain a
     set a(x) 22
     set a(y) 33
     list [catch {do {global a; unset a(y); array names a}} msg] $msg
 } {0 x}
-catch {unset a}
+unset -nocomplain a
 test proc-old-3.6 {local and global arrays} {
-    catch {unset a}
+    unset -nocomplain a
     set a(x) 22
     set a(y) 33
     do {global a; do {global a; unset a}; set a(z) 22}
@@ -135,7 +144,7 @@ test proc-old-3.6 {local and global arrays} {
 } {0 z}
 test proc-old-3.7 {local and global arrays} {
     proc t1 {args} {global info; set info 1}
-    catch {unset a}
+    unset -nocomplain a
     set info {}
     do {global a; trace var a(1) w t1}
     set a(1) 44
@@ -143,7 +152,7 @@ test proc-old-3.7 {local and global arrays} {
 } 1
 test proc-old-3.8 {local and global arrays} {
     proc t1 {args} {global info; set info 1}
-    catch {unset a}
+    unset -nocomplain a
     trace var a(1) w t1
     set info {}
     do {global a; trace vdelete a(1) w t1}
@@ -152,11 +161,11 @@ test proc-old-3.8 {local and global arrays} {
 } {}
 test proc-old-3.9 {local and global arrays} {
     proc t1 {args} {global info; set info 1}
-    catch {unset a}
+    unset -nocomplain a
     trace var a(1) w t1
     do {global a; trace vinfo a(1)}
 } {{w t1}}
-catch {unset a}
+unset -nocomplain a
 
 test proc-old-30.1 {arguments and defaults} {
     proc tproc {x y z} {
@@ -377,13 +386,13 @@ test proc-old-6.1 {procedure that redefines itself} {
 } 45
 test proc-old-6.2 {procedure that deletes itself} {
     proc tproc {} {
-	rename tproc {}
+	rename tproc ""
 	return 45
     }
     tproc
 } 45
 
-proc tproc code {
+proc tproc {code} {
     return -code $code abc
 }
 test proc-old-7.1 {return with special completion code} {
@@ -483,7 +492,7 @@ test proc-old-7.15 {return with special completion code} {
 test proc-old-8.1 {unset and undefined local arrays} {
     proc t1 {} {
         foreach v {xxx, yyy} {
-            catch {unset $v}
+            unset -nocomplain $v
         }
         set yyy(foo) bar
     }