diff options
author | dgp <dgp@users.sourceforge.net> | 2007-05-18 18:39:29 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2007-05-18 18:39:29 (GMT) |
commit | 9190f533c5cb5bf91aa76adf0fb9cfcc90775c07 (patch) | |
tree | 4e15601582fe82e692cfbe52544661ca2ea65098 /tests | |
parent | 236ba37a303671d6a3c75177016c755bf1003c3c (diff) | |
download | tcl-9190f533c5cb5bf91aa76adf0fb9cfcc90775c07.zip tcl-9190f533c5cb5bf91aa76adf0fb9cfcc90775c07.tar.gz tcl-9190f533c5cb5bf91aa76adf0fb9cfcc90775c07.tar.bz2 |
* unix/configure: autoconf-2.59 (FC6 fork)
* win/configure:
* README: Bump version number to 8.5a7
* generic/tcl.h:
* library/init.tcl:
* tools/tcl.wse.in:
* unix/configure.in:
* unix/tcl.spec:
* win/configure.in:
* generic/tclParse.c: Disable and remove the ALLOW_EXPAND sections
* tests/info.test: that continued to support the deprecated
* tests/mathop.test: {expand} syntax. Updated the few remaining
users of that syntax in the test suite.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/info.test | 34 | ||||
-rw-r--r-- | tests/mathop.test | 30 |
2 files changed, 32 insertions, 32 deletions
diff --git a/tests/info.test b/tests/info.test index dbca511..527d217 100644 --- a/tests/info.test +++ b/tests/info.test @@ -13,7 +13,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: info.test,v 1.43 2006/12/17 03:43:40 das Exp $ +# RCS: @(#) $Id: info.test,v 1.44 2007/05/18 18:39:31 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -1066,12 +1066,12 @@ namespace delete foo # ------------------------------------------------------------------------- -namespace {expand}{ +namespace {*}{ eval foo {proc bar {} {info frame 0}} } -test info-33.0 {expand, literal, direct} { +test info-33.0 {{*}, literal, direct} { reduce [foo::bar] } {type source line 1072 file info.test cmd {info frame 0} proc ::foo::bar level 0} @@ -1082,12 +1082,12 @@ namespace delete foo namespace eval foo {} proc foo::bar {} { set flag 1 - if {expand}{ + if {*}{ {$flag} {info frame 0} } } -test info-33.1 {expand, literal, simple, bytecompiled} { +test info-33.1 {{*}, literal, simple, bytecompiled} { reduce [foo::bar] } {type source line 1087 file info.test cmd {info frame 0} proc ::foo::bar level 0} @@ -1102,8 +1102,8 @@ set body { info frame 0 }} } -namespace {expand}$body -test info-34.0 {expand, dynamic, direct} { +namespace {*}$body +test info-34.0 {{*}, dynamic, direct} { reduce [foo::bar] } {type proc line 2 cmd {info frame 0} proc ::foo::bar level 0} @@ -1119,9 +1119,9 @@ set body { } proc foo::bar {} { global body ; set flag 1 - if {expand}$body + if {*}$body } -test info-34.1 {expand, literal, bytecompiled} { +test info-34.1 {{*}, literal, bytecompiled} { reduce [foo::bar] } {type eval line 1 cmd {info frame 0} proc ::foo::bar level 0} @@ -1248,12 +1248,12 @@ namespace delete foo # ------------------------------------------------------------------------- -namespace {expand}" +namespace {*}" eval foo {proc bar {} {info frame 0}} " -test info-33.2 {expand, literal, direct} { +test info-33.2 {{*}, literal, direct} { reduce [foo::bar] } {type source line 1254 file info.test cmd {info frame 0} proc ::foo::bar level 0} @@ -1261,9 +1261,9 @@ namespace delete foo # ------------------------------------------------------------------------- -namespace {expand}"eval\nfoo\n{proc bar {} {info frame 0}}\n" +namespace {*}"eval\nfoo\n{proc bar {} {info frame 0}}\n" -test info-33.2a {expand, literal, not simple, direct} { +test info-33.2a {{*}, literal, not simple, direct} { reduce [foo::bar] } {type proc line 1 cmd {info frame 0} proc ::foo::bar level 0} @@ -1274,12 +1274,12 @@ namespace delete foo namespace eval foo {} proc foo::bar {} { set flag 1 - if {expand}" + if {*}" {1} {info frame 0} " } -test info-33.3 {expand, literal, simple, bytecompiled} { +test info-33.3 {{*}, literal, simple, bytecompiled} { reduce [foo::bar] } {type source line 1279 file info.test cmd {info frame 0} proc ::foo::bar level 0} @@ -1290,9 +1290,9 @@ namespace delete foo namespace eval foo {} proc foo::bar {} { set flag 1 - if {expand}"\n{1}\n{info frame 0}" + if {*}"\n{1}\n{info frame 0}" } -test info-33.3a {expand, literal, not simple, bytecompiled} { +test info-33.3a {{*}, literal, not simple, bytecompiled} { reduce [foo::bar] } {type eval line 1 cmd {info frame 0} proc ::foo::bar level 0} diff --git a/tests/mathop.test b/tests/mathop.test index b7e886b..c3888cb 100644 --- a/tests/mathop.test +++ b/tests/mathop.test @@ -10,7 +10,7 @@ # See the file "license.terms" for information on usage and redistribution of # this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: mathop.test,v 1.7 2006/12/08 20:48:09 dgp Exp $ +# RCS: @(#) $Id: mathop.test,v 1.8 2007/05/18 18:39:31 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2.1 @@ -32,7 +32,7 @@ proc TestOp {op args} { set results {} # Non byte compiled version, shared args - if {[catch {::tcl::mathop::$op {expand}$args} res]} { + if {[catch {::tcl::mathop::$op {*}$args} res]} { append res " $::errorCode" } lappend results $res @@ -48,7 +48,7 @@ proc TestOp {op args} { lappend results $res # Non byte compiled imported - if {[catch {::testmathop2::$op {expand}$args} res]} { + if {[catch {::testmathop2::$op {*}$args} res]} { append res " $::errorCode" } lappend results [string map {testmathop2 tcl::mathop} $res] @@ -70,18 +70,18 @@ proc TestOp {op args} { proc _TestOp3 $argList1 "::testmathop2::$op [join $argList2]" set ::tcl_traceCompile 0 ;# Set to 2 to help with debug - if {[catch {_TestOp {expand}$args} res]} { + if {[catch {_TestOp {*}$args} res]} { append res " $::errorCode" } set ::tcl_traceCompile 0 lappend results $res - if {[catch {_TestOp2 {expand}$args} res]} { + if {[catch {_TestOp2 {*}$args} res]} { append res " $::errorCode" } lappend results $res - if {[catch {_TestOp3 {expand}$args} res]} { + if {[catch {_TestOp3 {*}$args} res]} { append res " $::errorCode" } lappend results [string map {testmathop2 tcl::mathop} $res] @@ -776,7 +776,7 @@ test mathop-20.6 { one arg, error } { foreach vals {x {1 x} {1 1 x} {1 x 1}} { # skipping - for now, knownbug... foreach op {+ * / & | ^ **} { - lappend res [TestOp $op {expand}$vals] + lappend res [TestOp $op {*}$vals] lappend exp "can't use non-numeric string as operand of \"$op\" NONE" } } @@ -786,7 +786,7 @@ test mathop-20.7 { multi arg } { set res {} foreach vals {{1 2} {3 4 5} {4 3 2 1}} { foreach op {+ - * /} { - lappend res [TestOp $op {expand}$vals] + lappend res [TestOp $op {*}$vals] } } set res @@ -795,7 +795,7 @@ test mathop-20.8 { multi arg, double } { set res {} foreach vals {{1.0 2} {3.0 4 5} {4 3.0 2 1}} { foreach op {+ - * /} { - lappend res [TestOp $op {expand}$vals] + lappend res [TestOp $op {*}$vals] } } set res @@ -873,7 +873,7 @@ test mathop-22.1 { bitwise ops } { set res {} foreach vals {5 {1 6} {1 2 3} {1 2 3 4}} { foreach op {& | ^} { - lappend res [TestOp $op {expand}$vals] + lappend res [TestOp $op {*}$vals] } } set res @@ -890,7 +890,7 @@ test mathop-22.2 { bitwise ops on bignums } { foreach vals [list [list $a $b] [list $a $c] [list $b $c] \ [list $a $bn] [list $bn $c] [list $bn $cn]] { foreach op {& | ^} { - lappend res [TestOp $op {expand}$vals] + lappend res [TestOp $op {*}$vals] } } set exp {} @@ -981,7 +981,7 @@ test mathop-23.1 { comparison ops, numerical } { lappend todo [list $a $a] ;# Same object foreach vals $todo { foreach op {< <= > >= == eq} { - lappend res [TestOp $op {expand}$vals] + lappend res [TestOp $op {*}$vals] } } set res @@ -1007,7 +1007,7 @@ test mathop-23.2 { comparison ops, string } { lappend todo [list $a $a] foreach vals $todo { foreach op {< <= > >= == eq} { - lappend res [TestOp $op {expand}$vals] + lappend res [TestOp $op {*}$vals] } } set res @@ -1023,7 +1023,7 @@ test mathop-23.3 { comparison ops, nonequal} { set res {} foreach vals {{a b} {17.0 0x11} {foo foo} {10 10}} { foreach op {!= ne} { - lappend res [TestOp $op {expand}$vals] + lappend res [TestOp $op {*}$vals] } } set res @@ -1034,7 +1034,7 @@ test mathop-24.1 { binary ops } { foreach vals {{3 5} {17 7} {199 5} {293234675763434238476239486 17} \ {5 1} {0 7}} { foreach op {% << >> in ni} { - lappend res [TestOp $op {expand}$vals] + lappend res [TestOp $op {*}$vals] } } set res |