summaryrefslogtreecommitdiffstats
path: root/tests/upvar.test
diff options
context:
space:
mode:
Diffstat (limited to 'tests/upvar.test')
-rw-r--r--tests/upvar.test361
1 files changed, 162 insertions, 199 deletions
diff --git a/tests/upvar.test b/tests/upvar.test
index 8a1319e..d18fd3b 100644
--- a/tests/upvar.test
+++ b/tests/upvar.test
@@ -1,24 +1,21 @@
# Commands covered: 'upvar', 'namespace upvar'
#
-# This file contains a collection of tests for one or more of the Tcl built-in
-# commands. Sourcing this file into Tcl runs the tests and generates output
-# for errors. No output means no errors were found.
+# This file contains a collection of tests for one or more of the Tcl
+# built-in commands. Sourcing this file into Tcl runs the tests and
+# generates output for errors. No output means no errors were found.
#
-# Copyright © 1991-1993 The Regents of the University of California.
-# Copyright © 1994 Sun Microsystems, Inc.
-# Copyright © 1998-1999 Scriptics Corporation.
+# Copyright (c) 1991-1993 The Regents of the University of California.
+# Copyright (c) 1994 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.
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-if {"::tcltest" ni [namespace children]} {
- package require tcltest 2.5
+if {[lsearch [namespace children] ::tcltest] == -1} {
+ package require tcltest 2
namespace import -force ::tcltest::*
}
-::tcltest::loadTestedCommands
-catch [list package require -exact tcl::test [info patchlevel]]
-
testConstraint testupvar [llength [info commands testupvar]]
test upvar-1.1 {reading variables with upvar} {
@@ -149,7 +146,7 @@ test upvar-3.5 {unsetting array elements with upvar} {
array names a
}
proc p2 {} {upvar a(0) x; unset x}
- lsort [p1]
+ p1
} {1 2}
test upvar-3.6 {unsetting then resetting array elements with upvar} {
proc p1 {} {
@@ -157,7 +154,7 @@ test upvar-3.6 {unsetting then resetting array elements with upvar} {
set a(1) first
set a(2) second
p2
- list [lsort [array names a]] [catch {set a(0)} msg] $msg
+ list [array names a] [catch {set a(0)} msg] $msg
}
proc p2 {} {upvar a(0) x; unset x; set x 12345}
p1
@@ -187,26 +184,26 @@ test upvar-4.2 {nested upvars} {
proc tproc {args} {global x; set x [list $args [uplevel info vars]]}
test upvar-5.1 {traces involving upvars} {
- proc p1 {a b} {set c 22; set d 33; trace add var c {read write} tproc; p2}
+ proc p1 {a b} {set c 22; set d 33; trace var c rw tproc; p2}
proc p2 {} {upvar c x1; set x1 22}
set x ---
p1 foo bar
set x
-} {{x1 {} write} x1}
+} {{x1 {} w} x1}
test upvar-5.2 {traces involving upvars} {
- proc p1 {a b} {set c 22; set d 33; trace add var c {read write} tproc; p2}
+ proc p1 {a b} {set c 22; set d 33; trace var c rw tproc; p2}
proc p2 {} {upvar c x1; set x1}
set x ---
p1 foo bar
set x
-} {{x1 {} read} x1}
+} {{x1 {} r} x1}
test upvar-5.3 {traces involving upvars} {
- proc p1 {a b} {set c 22; set d 33; trace add var c {read write unset} tproc; p2}
+ proc p1 {a b} {set c 22; set d 33; trace var c rwu tproc; p2}
proc p2 {} {upvar c x1; unset x1}
set x ---
p1 foo bar
set x
-} {{x1 {} unset} x1}
+} {{x1 {} u} x1}
test upvar-6.1 {retargeting an upvar} {
proc p1 {} {
@@ -249,33 +246,6 @@ test upvar-6.3 {retargeting an upvar} {
p1
} {abcde 44}
-
-
-test upvar-6.4 {
- retargeting a variable created by upvar to itself is allowed
-} -body {
- catch {
- unset x
- }
- catch {
- unset y
- }
- set res {}
- set x abcde
- set res [catch {
- upvar 0 x x
- } cres copts]
- lappend res [dict get $copts -errorcode]
- upvar 0 x y
- lappend res $y
- upvar 0 y y
- lappend res $y
- return $res
-} -cleanup {
- upvar 0 {} y
-} -result {1 {TCL UPVAR SELF} abcde abcde}
-
-
test upvar-7.1 {upvar to same level} {
set x 44
set y 55
@@ -318,86 +288,65 @@ test upvar-7.5 {potential memory leak when deleting variable table} {
leak
} {}
-test upvar-8.1 {errors in upvar command} -returnCodes error -body {
- upvar
-} -result {wrong # args: should be "upvar ?level? otherVar localVar ?otherVar localVar ...?"}
-test upvar-8.2 {errors in upvar command} -returnCodes error -body {
- upvar 1
-} -result {wrong # args: should be "upvar ?level? otherVar localVar ?otherVar localVar ...?"}
-test upvar-8.2.1 {upvar with numeric first argument} {
- apply {{} {set 0 ok; apply {{} {upvar 0 x; return $x}}}}
-} ok
-test upvar-8.3 {errors in upvar command} -returnCodes error -body {
+test upvar-8.1 {errors in upvar command} {
+ list [catch upvar msg] $msg
+} {1 {wrong # args: should be "upvar ?level? otherVar localVar ?otherVar localVar ...?"}}
+test upvar-8.2 {errors in upvar command} {
+ list [catch {upvar 1} msg] $msg
+} {1 {wrong # args: should be "upvar ?level? otherVar localVar ?otherVar localVar ...?"}}
+test upvar-8.3 {errors in upvar command} {
proc p1 {} {upvar a b c}
- p1
-} -result {bad level "a"}
-test upvar-8.3.1 {bad level for upvar (upvar at top-level, bug [775ee88560])} -body {
- proc p1 {} { uplevel { upvar b b; lappend b UNEXPECTED } }
- uplevel #0 { p1 }
-} -returnCodes error -result {bad level "1"}
-test upvar-8.3.2 {bad level for upvar (upvar at top-level, bug [775ee88560])} -setup {
- interp create i
-} -body {
- i eval { upvar b b; lappend b UNEXPECTED }
-} -returnCodes error -result {bad level "1"} -cleanup {
- interp delete i
-}
-test upvar-8.4 {errors in upvar command} -returnCodes error -body {
+ list [catch p1 msg] $msg
+} {1 {wrong # args: should be "upvar ?level? otherVar localVar ?otherVar localVar ...?"}}
+test upvar-8.4 {errors in upvar command} {
proc p1 {} {upvar 0 b b}
- p1
-} -result {can't upvar from variable to itself}
-test upvar-8.5 {errors in upvar command} -returnCodes error -body {
+ list [catch p1 msg] $msg
+} {1 {can't upvar from variable to itself}}
+test upvar-8.5 {errors in upvar command} {
proc p1 {} {upvar 0 a b; upvar 0 b a}
- p1
-} -result {can't upvar from variable to itself}
-test upvar-8.6 {errors in upvar command} -returnCodes error -body {
+ list [catch p1 msg] $msg
+} {1 {can't upvar from variable to itself}}
+test upvar-8.6 {errors in upvar command} {
proc p1 {} {set a 33; upvar b a}
- p1
-} -result {variable "a" already exists}
-test upvar-8.7 {errors in upvar command} -returnCodes error -body {
- proc p1 {} {trace add variable a write foo; upvar b a}
- p1
-} -result {variable "a" has traces: can't use for upvar}
+ list [catch p1 msg] $msg
+} {1 {variable "a" already exists}}
+test upvar-8.7 {errors in upvar command} {
+ proc p1 {} {trace variable a w foo; upvar b a}
+ list [catch p1 msg] $msg
+} {1 {variable "a" has traces: can't use for upvar}}
test upvar-8.8 {create nested array with upvar} -body {
proc p1 {} {upvar x(a) b; set b(2) 44}
catch {unset x}
- p1
-} -returnCodes error -cleanup {
+ list [catch p1 msg] $msg
+} -cleanup {
unset x
-} -result {can't set "b(2)": variable isn't array}
-test upvar-8.9 {upvar won't create namespace variable that refers to procedure variable} -setup {
+} -result {1 {can't set "b(2)": variable isn't array}}
+test upvar-8.9 {upvar won't create namespace variable that refers to procedure variable} {
catch {namespace delete {*}[namespace children :: test_ns_*]}
catch {rename MakeLink ""}
namespace eval ::test_ns_1 {}
-} -returnCodes error -body {
proc MakeLink {a} {
- namespace eval ::test_ns_1 {
+ namespace eval ::test_ns_1 {
upvar a a
- }
- unset ::test_ns_1::a
+ }
+ unset ::test_ns_1::a
}
- MakeLink 1
-} -result {bad variable name "a": can't create namespace variable that refers to procedure variable}
-test upvar-8.10 {upvar will create element alias for new array element} -setup {
+ list [catch {MakeLink 1} msg] $msg
+} {1 {bad variable name "a": can't create namespace variable that refers to procedure variable}}
+test upvar-8.10 {upvar will create element alias for new array element} {
catch {unset upvarArray}
-} -body {
array set upvarArray {}
catch {upvar 0 upvarArray(elem) upvarArrayElemAlias}
-} -result {0}
-test upvar-8.11 {upvar will not create a variable that looks like an array} -setup {
+} {0}
+test upvar-8.11 {upvar will not create a variable that looks like an array} -body {
catch {unset upvarArray}
-} -body {
array set upvarArray {}
upvar 0 upvarArray(elem) upvarArrayElemAlias(elem)
} -returnCodes 1 -match glob -result *
test upvar-9.1 {Tcl_UpVar2 procedure} testupvar {
list [catch {testupvar xyz a {} x global} msg] $msg
-} {1 {bad level "1"}}
-test upvar-9.1.1 {TclGetFrame, via Tcl_UpVar2} testupvar {
- apply {{} {testupvar xyz a {} x local; set x foo}}
- set a
-} foo
+} {1 {bad level "xyz"}}
test upvar-9.2 {Tcl_UpVar2 procedure} testupvar {
catch {unset a}
catch {unset x}
@@ -467,128 +416,142 @@ test upvar-10.1 {CompileWord OBOE} -setup {
rename linenumber {}
} -result 1
+
#
# Tests for 'namespace upvar'. As the implementation is essentially the same as
-# for 'upvar', we only test that the variables are linked correctly, i.e., we
-# assume that the behaviour of variables once the link is established has
+# for 'upvar', we only test that the variables are linked correctly. Ie, we
+# assume that the behaviour of variables once the link is established has
# already been tested above.
#
+#
# Clear out any namespaces called test_ns_*
catch {namespace delete {*}[namespace children :: test_ns_*]}
+
namespace eval test_ns_0 {
variable x test_ns_0
}
-set ::x test_global
-test upvar-NS-1.1 {nsupvar links to correct variable} -body {
- namespace eval test_ns_1 {
- namespace upvar ::test_ns_0 x w
- set w
- }
-} -result {test_ns_0} -cleanup {
- namespace delete test_ns_1
-}
-test upvar-NS-1.2 {nsupvar links to correct variable} -body {
- namespace eval test_ns_1 {
- proc a {} {
+set x test_global
+
+test upvar-NS-1.1 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
namespace upvar ::test_ns_0 x w
set w
}
- return [a]
- }
-} -result {test_ns_0} -cleanup {
- namespace delete test_ns_1
-}
-test upvar-NS-1.3 {nsupvar links to correct variable} -body {
- namespace eval test_ns_1 {
- namespace upvar test_ns_0 x w
- set w
- }
-} -returnCodes error -cleanup {
- namespace delete test_ns_1
-} -result {namespace "test_ns_0" not found in "::test_ns_1"}
-test upvar-NS-1.4 {nsupvar links to correct variable} -body {
- namespace eval test_ns_1 {
- proc a {} {
- namespace upvar test_ns_0 x w
- set w
+ } \
+ -result {test_ns_0} \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.2 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ proc a {} {
+ namespace upvar ::test_ns_0 x w
+ set w
+ }
+ return [a]
}
- return [a]
- }
-} -returnCodes error -cleanup {
- namespace delete test_ns_1
-} -result {namespace "test_ns_0" not found in "::test_ns_1"}
+ } \
+ -result {test_ns_0} \
+ -cleanup {namespace delete test_ns_1}
-test upvar-NS-1.5 {nsupvar links to correct variable} -body {
- namespace eval test_ns_1 {
- namespace eval test_ns_0 {}
- namespace upvar test_ns_0 x w
- set w
- }
-} -cleanup {
- namespace delete test_ns_1
-} -result {can't read "w": no such variable} -returnCodes error
-test upvar-NS-1.6 {nsupvar links to correct variable} -body {
- namespace eval test_ns_1 {
- namespace eval test_ns_0 {}
- proc a {} {
+test upvar-NS-1.3 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
namespace upvar test_ns_0 x w
set w
}
- return [a]
- }
-} -cleanup {
- namespace delete test_ns_1
-} -result {can't read "w": no such variable} -returnCodes error
-test upvar-NS-1.7 {nsupvar links to correct variable} -body {
- namespace eval test_ns_1 {
- namespace eval test_ns_0 {
- variable x test_ns_1::test_ns_0
- }
- namespace upvar test_ns_0 x w
- set w
- }
-} -cleanup {
- namespace delete test_ns_1
-} -result {test_ns_1::test_ns_0}
-test upvar-NS-1.8 {nsupvar links to correct variable} -body {
- namespace eval test_ns_1 {
- namespace eval test_ns_0 {
- variable x test_ns_1::test_ns_0
+ } \
+ -result {namespace "test_ns_0" not found in "::test_ns_1"} \
+ -returnCodes error \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.4 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ proc a {} {
+ namespace upvar test_ns_0 x w
+ set w
+ }
+ return [a]
}
- proc a {} {
+ } \
+ -result {namespace "test_ns_0" not found in "::test_ns_1"} \
+ -returnCodes error \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.5 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ namespace eval test_ns_0 {}
namespace upvar test_ns_0 x w
set w
}
- return [a]
- }
-} -cleanup {
- namespace delete test_ns_1
-} -result {test_ns_1::test_ns_0}
-test upvar-NS-1.9 {nsupvar links to correct variable} -body {
- namespace eval test_ns_1 {
- variable x test_ns_1
- proc a {} {
+ } \
+ -result {can't read "w": no such variable} \
+ -returnCodes error \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.6 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ namespace eval test_ns_0 {}
+ proc a {} {
+ namespace upvar test_ns_0 x w
+ set w
+ }
+ return [a]
+ }
+ } \
+ -result {can't read "w": no such variable} \
+ -returnCodes error \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.7 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ namespace eval test_ns_0 {
+ variable x test_ns_1::test_ns_0
+ }
namespace upvar test_ns_0 x w
set w
}
- return [a]
- }
-} -returnCodes error -cleanup {
- namespace delete test_ns_1
-} -result {namespace "test_ns_0" not found in "::test_ns_1"}
+ } \
+ -result {test_ns_1::test_ns_0} \
+ -cleanup {namespace delete test_ns_1}
-test upvar-NS-2.1 {TIP 323} -returnCodes error -body {
- namespace upvar
-} -result {wrong # args: should be "namespace upvar ns ?otherVar myVar ...?"}
-test upvar-NS-2.2 {TIP 323} -setup {
- namespace eval test_ns_1 {}
-} -body {
- namespace upvar test_ns_1
-} -cleanup {
- namespace delete test_ns_1
-} -result {}
+test upvar-NS-1.8 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ namespace eval test_ns_0 {
+ variable x test_ns_1::test_ns_0
+ }
+ proc a {} {
+ namespace upvar test_ns_0 x w
+ set w
+ }
+ return [a]
+ }
+ } \
+ -result {test_ns_1::test_ns_0} \
+ -cleanup {namespace delete test_ns_1}
+
+test upvar-NS-1.9 {nsupvar links to correct variable} \
+ -body {
+ namespace eval test_ns_1 {
+ variable x test_ns_1
+ proc a {} {
+ namespace upvar test_ns_0 x w
+ set w
+ }
+ return [a]
+ }
+ } \
+ -result {namespace "test_ns_0" not found in "::test_ns_1"} \
+ -returnCodes error \
+ -cleanup {namespace delete test_ns_1}
test upvar-NS-3.1 {CompileWord OBOE} -setup {
proc linenumber {} {dict get [info frame -1] line}
generated by cgit v0.12 at 2025-12-20 18:52:23 (GMT)