From ab7c4df02b91f86fd42936b1c44f131bf042fb3f Mon Sep 17 00:00:00 2001 From: dkf Date: Thu, 3 Oct 2002 13:34:30 +0000 Subject: [info exist]->[info exists]. [Bug 602566] --- ChangeLog | 6 ++++++ library/http/http.tcl | 6 +++--- library/init.tcl | 6 +++--- tests/autoMkindex.test | 10 +++++----- tests/binary.test | 6 +++--- tests/env.test | 6 +++--- tests/http.test | 6 +++--- tests/httpd | 4 ++-- tests/httpold.test | 4 ++-- tools/man2help2.tcl | 4 ++-- 10 files changed, 32 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48a5714..1641124 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2002-10-03 Donal K. Fellows + * tools/man2help2.tcl: + * tests/http.test, tests/httpd, tests/httpold.test: + * tests/env.test, tests/binary.test, tests/autoMkindex.test: + * library/init.tcl, library/http/http.tcl: [info exist] should + really be [info exists]. [Bug 602566] + * doc/lsearch.n: Better specification of what happens when -sorted is mixed with other options. [Bug 617816] diff --git a/library/http/http.tcl b/library/http/http.tcl index ed64ac9..7ae2286 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: http.tcl,v 1.42 2002/08/20 15:33:32 dgp Exp $ +# RCS: @(#) $Id: http.tcl,v 1.43 2002/10/03 13:34:32 dkf Exp $ # Rough version history: # 1.0 Old http_get interface @@ -171,7 +171,7 @@ proc http::Finish { token {errormsg ""} {skipCB 0}} { set state(status) error } } - if {[info exist state(-command)]} { + if {[info exists state(-command)]} { # Command callback may already have unset our state unset state(-command) } @@ -556,7 +556,7 @@ proc http::error {token} { proc http::cleanup {token} { variable $token upvar 0 $token state - if {[info exist state]} { + if {[info exists state]} { unset state } } diff --git a/library/init.tcl b/library/init.tcl index 0bf3f26..d875f2e 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -3,7 +3,7 @@ # Default system startup file for Tcl-based applications. Defines # "unknown" procedure and auto-load facilities. # -# RCS: @(#) $Id: init.tcl,v 1.52 2002/06/21 19:44:16 dgp Exp $ +# RCS: @(#) $Id: init.tcl,v 1.53 2002/10/03 13:34:32 dkf Exp $ # # Copyright (c) 1991-1993 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -40,7 +40,7 @@ package require -exact Tcl 8.4 # On Macintosh it is "Tool Command Language" in the Extensions folder if {![info exists auto_path]} { - if {[info exist env(TCLLIBPATH)]} { + if {[info exists env(TCLLIBPATH)]} { set auto_path $env(TCLLIBPATH) } else { set auto_path "" @@ -60,7 +60,7 @@ namespace eval tcl { if {[lsearch -exact $::auto_path $Dir] < 0} { lappend ::auto_path $Dir } - if {[info exist ::tcl_pkgPath]} { + if {[info exists ::tcl_pkgPath]} { foreach Dir $::tcl_pkgPath { if {[lsearch -exact $::auto_path $Dir] < 0} { lappend ::auto_path $Dir diff --git a/tests/autoMkindex.test b/tests/autoMkindex.test index 37b7f61..457e225 100644 --- a/tests/autoMkindex.test +++ b/tests/autoMkindex.test @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: autoMkindex.test,v 1.13 2002/07/01 04:06:51 dgp Exp $ +# RCS: @(#) $Id: autoMkindex.test,v 1.14 2002/10/03 13:34:32 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -104,14 +104,14 @@ proc ::parent::child::test {} {} # Save initial state of auto_mkindex_parser auto_load auto_mkindex -if {[info exist auto_mkindex_parser::initCommands]} { +if {[info exists auto_mkindex_parser::initCommands]} { set saveCommands $auto_mkindex_parser::initCommands } proc AutoMkindexTestReset {} { global saveCommands - if {[info exist saveCommands]} { + if {[info exists saveCommands]} { set auto_mkindex_parser::initCommands $saveCommands - } elseif {[info exist auto_mkindex_parser::initCommands]} { + } elseif {[info exists auto_mkindex_parser::initCommands]} { unset auto_mkindex_parser::initCommands } } @@ -344,7 +344,7 @@ removeDirectory pkg unset result AutoMkindexTestReset -if {[info exist saveCommands]} { +if {[info exists saveCommands]} { unset saveCommands } rename AutoMkindexTestReset "" diff --git a/tests/binary.test b/tests/binary.test index b01ae3c..7fd6871 100644 --- a/tests/binary.test +++ b/tests/binary.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: binary.test,v 1.9 2002/02/15 14:28:49 dkf Exp $ +# RCS: @(#) $Id: binary.test,v 1.10 2002/10/03 13:34:32 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -606,7 +606,7 @@ test binary-20.4 {Tcl_BinaryObjCmd: scan} { } {1 abc} test binary-20.5 {Tcl_BinaryObjCmd: scan} { catch {unset arg1} - list [binary scan abc a5 arg1] [info exist arg1] + list [binary scan abc a5 arg1] [info exists arg1] } {0 0} test binary-20.6 {Tcl_BinaryObjCmd: scan} { set arg1 foo @@ -645,7 +645,7 @@ test binary-21.4 {Tcl_BinaryObjCmd: scan} { } {1 abc} test binary-21.5 {Tcl_BinaryObjCmd: scan} { catch {unset arg1} - list [binary scan abc A5 arg1] [info exist arg1] + list [binary scan abc A5 arg1] [info exists arg1] } {0 0} test binary-21.6 {Tcl_BinaryObjCmd: scan} { set arg1 foo diff --git a/tests/env.test b/tests/env.test index 5b7c76b..9cc5d1b 100644 --- a/tests/env.test +++ b/tests/env.test @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: env.test,v 1.16 2002/07/10 11:56:44 dgp Exp $ +# RCS: @(#) $Id: env.test,v 1.17 2002/10/03 13:34:32 dkf Exp $ package require tcltest 2 namespace import -force ::tcltest::* @@ -198,7 +198,7 @@ test env-5.2 {corner cases - unset the env array} {} { interp create i i eval { unset env } i eval { set env(THIS_SHOULDNT_EXIST) a} - set result [info exist env(THIS_SHOULDNT_EXIST)] + set result [info exists env(THIS_SHOULDNT_EXIST)] interp delete i set result } {0} @@ -215,7 +215,7 @@ test env-5.3 {corner cases - unset the env in master should unset child} {} { set result } {a 1} test env-5.4 {corner cases - unset the env array} {} { - # The info exist command should be in synch with the env array. + # The info exists command should be in synch with the env array. # Know Bug: 1737 interp create i diff --git a/tests/http.test b/tests/http.test index 9b4b4d1..9d33802 100644 --- a/tests/http.test +++ b/tests/http.test @@ -12,7 +12,7 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # -# RCS: @(#) $Id: http.test,v 1.30 2002/09/02 19:27:27 hobbs Exp $ +# RCS: @(#) $Id: http.test,v 1.31 2002/10/03 13:34:32 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -20,7 +20,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} { } if {[catch {package require http 2} version]} { - if {[info exist http2]} { + if {[info exists http2]} { catch {puts "Cannot load http 2.* package"} return } else { @@ -494,7 +494,7 @@ if {[info exists httpthread]} { close $listen } -if {[info exist removeHttpd]} { +if {[info exists removeHttpd]} { removeFile $httpdFile } diff --git a/tests/httpd b/tests/httpd index fa553d6..2bef362 100644 --- a/tests/httpd +++ b/tests/httpd @@ -75,7 +75,7 @@ proc httpdRead { sock } { # Read the query data - if {![info exist data(length_orig)]} { + if {![info exists data(length_orig)]} { set data(length_orig) $data(length) } set line [read $sock $data(length)] @@ -103,7 +103,7 @@ proc httpdRead { sock } { } 0,mime,POST { # Empty line between headers and query data - if {![info exist data(mime,content-length)]} { + if {![info exists data(mime,content-length)]} { httpd_log $sock Error "No Content-Length for POST" httpdError $sock 400 httpdSockDone $sock diff --git a/tests/httpold.test b/tests/httpold.test index feb555a..9dddbf2 100644 --- a/tests/httpold.test +++ b/tests/httpold.test @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: httpold.test,v 1.10 2002/07/05 10:38:42 dkf Exp $ +# RCS: @(#) $Id: httpold.test,v 1.11 2002/10/03 13:34:32 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -19,7 +19,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} { } if {[catch {package require http 1.0}]} { - if {[info exist httpold]} { + if {[info exists httpold]} { catch {puts "Cannot load http 1.0 package"} ::tcltest::cleanupTests return diff --git a/tools/man2help2.tcl b/tools/man2help2.tcl index 0b70fec..df2678c 100644 --- a/tools/man2help2.tcl +++ b/tools/man2help2.tcl @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: man2help2.tcl,v 1.11 2002/05/08 23:48:13 davygrvy Exp $ +# RCS: @(#) $Id: man2help2.tcl,v 1.12 2002/10/03 13:34:32 dkf Exp $ # # Global variables used by these scripts: @@ -868,7 +868,7 @@ proc THmacro {argList} { tab text $curSect font R - if {[info exist bitmap]} { + if {[info exists bitmap]} { # a right justified bitmap puts $file "\\\{bmrt $bitmap\\\}" } -- cgit v0.12