merged tcl 8.1 branch back into the main trunk

1 files changed, 25 insertions, 3 deletions

diff --git a/tests/var.test b/tests/var.test
index 981c649..9145fc5 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -9,14 +9,17 @@
 # errors. No output means no errors were found.
 #
 # Copyright (c) 1997 Sun Microsystems, Inc.
+# Copyright (c) 1998-1999 by Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: var.test,v 1.4 1999/02/03 00:55:07 stanton Exp $
+# RCS: @(#) $Id: var.test,v 1.5 1999/04/16 00:47:36 stanton Exp $
 #
 
-if {[string compare test [info procs test]] == 1} then {source defs}
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
+}
 
 catch {rename p ""}
 catch {namespace delete test_ns_var}
@@ -27,7 +30,7 @@ catch {unset i}
 catch {unset a}
 catch {unset arr}
 
-test var-1.1 {TclLookupVar, TCL_PARSE_PART1 flag set} {
+test var-1.1 {TclLookupVar, Array handling} {
     catch {unset a}
     set x "incr"  ;# force no compilation and runtime call to Tcl_IncrCmd 
     set i 10
@@ -570,6 +573,10 @@ test var-9.12 {behaviour of TclSetVar write trace error} {
        [catch {testseterr v 3} msg] $msg $v
 } {1 {before set} 2 1 {can't set "v": read-only} 3}
 }
+test var-10.1 {can't nest arrays with array set} {
+   catch {unset arr}
+   list [catch {array set arr(x) {a 1 b 2}} res] $res
+} {1 {can't set "arr(x)(a)": variable isn't array}}
 
 catch {namespace delete ns}
 catch {unset arr}
@@ -586,3 +593,18 @@ catch {unset a}
 catch {unset xxxxx}
 catch {unset aaaaa}
 
+# cleanup
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+