You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2005/08/29 15:14:36 UTC
cvs commit: tcl-websh/src/tests context.test
ronnie 2005/08/29 06:14:36
Modified: src/generic context.tcl
src/tests context.test
Log:
- modified context::dump so output is always sorted and fixed test
(compatibility with Tcl8.5, which obviously has different order in [array get]
Revision Changes Path
1.4 +8 -3 tcl-websh/src/generic/context.tcl
Index: context.tcl
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/context.tcl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- context.tcl 19 Nov 2001 13:11:50 -0000 1.3
+++ context.tcl 29 Aug 2005 13:14:35 -0000 1.4
@@ -92,10 +92,15 @@
# dump content
proc dump {} {
set result ""
+ # dump sorted variables (easier to compare)
foreach var [lsort [cnames]] {
if {[array exists vars::$var]} {
- # we have an array
- lappend result [list carray set $var [array get vars::$var]]
+ # we have an array (and we also dump its sorted content)
+ set array {}
+ foreach arrayvar [lsort [array names vars::$var]] {
+ lappend array $arrayvar [set vars::${var}($arrayvar)]
+ }
+ lappend result [list carray set $var $array]
} else {
# we have a scalar
lappend result [list cset $var [set vars::$var]]
1.4 +7 -4 tcl-websh/src/tests/context.test
Index: context.test
===================================================================
RCS file: /home/cvs/tcl-websh/src/tests/context.test,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- context.test 19 Nov 2001 17:41:51 -0000 1.3
+++ context.test 29 Aug 2005 13:14:36 -0000 1.4
@@ -101,13 +101,16 @@
ctxa::cset d 2
ctxa::cset ad(1st) 3
ctxa::cset ad(2nd) [list a long list]
- set res [ctxa::dump]
+ set res {}
+ lappend res [ctxa::dump]
ctxa::cunset c
lappend res [ctxa::dump]
ctxa::cunset
lappend res [ctxa::dump]
-
-} {carray set ad {2nd {a long list} 1st 3} cset c 1 cset d 2 {carray set ad {2nd {a long list} 1st 3}
+ set res
+} {{carray set ad {1st 3 2nd {a long list}}
+cset c 1
+cset d 2} {carray set ad {1st 3 2nd {a long list}}
cset d 2} {}}
test context-1.10 {dump long context} {} {
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org