summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorhobbs <hobbs>2006-11-03 00:34:51 (GMT)
committerhobbs <hobbs>2006-11-03 00:34:51 (GMT)
commitc399e676c8dbdec3ce1fe4b694d7c269f9b1f675 (patch)
tree13086bc5f8998596d202f1bdeaa9df4ed46bc3cd /library
parentee75480f2f9483654c8f665acd984569f3234ca8 (diff)
downloadtcl-c399e676c8dbdec3ce1fe4b694d7c269f9b1f675.zip
tcl-c399e676c8dbdec3ce1fe4b694d7c269f9b1f675.tar.gz
tcl-c399e676c8dbdec3ce1fe4b694d7c269f9b1f675.tar.bz2
* doc/ParseCmd.3, doc/Tcl.n, doc/eval.n, doc/exec.n:
* doc/fconfigure.n, doc/interp.n, doc/unknown.n: * library/auto.tcl, library/init.tcl, library/package.tcl: * library/safe.tcl, library/tm.tcl, library/msgcat/msgcat.tcl: * tests/all.tcl, tests/basic.test, tests/cmdInfo.test: * tests/compile.test, tests/encoding.test, tests/execute.test: * tests/fCmd.test, tests/http.test, tests/init.test: * tests/interp.test, tests/io.test, tests/ioUtil.test: * tests/iogt.test, tests/namespace-old.test, tests/namespace.test: * tests/parse.test, tests/pkg.test, tests/pkgMkIndex.test: * tests/proc.test, tests/reg.test, tests/trace.test: * tests/upvar.test, tests/winConsole.test, tests/winFCmd.test: * tools/tclZIC.tcl: * generic/tclParse.c (Tcl_ParseCommand): Replace {expand} with {*} officially (TIP #293). Leave -DALLOW_EXPAND=0|1 option to keep {expand} syntax for transition users. [Bug 1589629]
Diffstat (limited to 'library')
-rw-r--r--library/auto.tcl6
-rw-r--r--library/init.tcl6
-rw-r--r--library/msgcat/msgcat.tcl10
-rw-r--r--library/package.tcl8
-rw-r--r--library/safe.tcl16
-rw-r--r--library/tm.tcl2
6 files changed, 24 insertions, 24 deletions
diff --git a/library/auto.tcl b/library/auto.tcl
index 63260e7..881e6b9 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -3,7 +3,7 @@
# utility procs formerly in init.tcl dealing with auto execution
# of commands and can be auto loaded themselves.
#
-# RCS: @(#) $Id: auto.tcl,v 1.27 2005/07/23 04:12:48 dgp Exp $
+# RCS: @(#) $Id: auto.tcl,v 1.28 2006/11/03 00:34:52 hobbs Exp $
#
# Copyright (c) 1991-1993 The Regents of the University of California.
# Copyright (c) 1994-1998 Sun Microsystems, Inc.
@@ -212,7 +212,7 @@ proc auto_mkindex {dir args} {
}
auto_mkindex_parser::init
- foreach file [glob -- {expand}$args] {
+ foreach file [glob -- {*}$args] {
if {[catch {auto_mkindex_parser::mkindex $file} msg opts] == 0} {
append index $msg
} else {
@@ -245,7 +245,7 @@ proc auto_mkindex_old {dir args} {
if {[llength $args] == 0} {
set args *.tcl
}
- foreach file [glob -- {expand}$args] {
+ foreach file [glob -- {*}$args] {
set f ""
set error [catch {
set f [open $file]
diff --git a/library/init.tcl b/library/init.tcl
index 815965c..1c7a3a9 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.87 2006/10/23 20:26:11 dgp Exp $
+# RCS: @(#) $Id: init.tcl,v 1.88 2006/11/03 00:34:52 hobbs Exp $
#
# Copyright (c) 1991-1993 The Regents of the University of California.
# Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -266,7 +266,7 @@ proc unknown args {
set cmd [lindex $args 0]
if {[regexp "^:*namespace\[ \t\n\]+inscope" $cmd] && [llength $cmd] == 4} {
- #return -code error "You need an {expand}"
+ #return -code error "You need an {*}"
set arglist [lrange $args 1 end]
set ret [catch {uplevel 1 ::$cmd $arglist} result opts]
dict unset opts -errorinfo
@@ -809,7 +809,7 @@ proc tcl::CopyDirectory {action src dest} {
# can be returned in various combinations. Anyway,
# if any other file is returned, we must signal an error.
set existing [glob -nocomplain -directory $dest * .*]
- lappend existing {expand}[glob -nocomplain -directory $dest \
+ lappend existing {*}[glob -nocomplain -directory $dest \
-type hidden * .*]
foreach s $existing {
if {([file tail $s] ne ".") && ([file tail $s] ne "..")} {
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index 2aa321e..ccf4054 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -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: msgcat.tcl,v 1.25 2006/09/11 14:38:03 dgp Exp $
+# RCS: @(#) $Id: msgcat.tcl,v 1.26 2006/11/03 00:34:52 hobbs Exp $
package require Tcl 8.5
# When the version number changes, be sure to update the pkgIndex.tcl file,
@@ -35,7 +35,7 @@ namespace eval msgcat {
# Map of language codes used in Windows registry to those of ISO-639
if { $::tcl_platform(platform) eq "windows" } {
- variable WinRegToISO639 [dict create {expand}{
+ variable WinRegToISO639 [dict create {*}{
01 ar 0401 ar_SA 0801 ar_IQ 0c01 ar_EG 1001 ar_LY 1401 ar_DZ
1801 ar_MA 1c01 ar_TN 2001 ar_OM 2401 ar_YE 2801 ar_SY
2c01 ar_JO 3001 ar_LB 3401 ar_KW 3801 ar_AE 3c01 ar_BH
@@ -196,7 +196,7 @@ proc msgcat::mc {src args} {
if {[llength $args] == 0} {
return [dict get $Msgs $loc $ns $src]
} else {
- return [format [dict get $Msgs $loc $ns $src] {expand}$args]
+ return [format [dict get $Msgs $loc $ns $src] {*}$args]
}
}
}
@@ -204,7 +204,7 @@ proc msgcat::mc {src args} {
}
# we have not found the translation
return [uplevel 1 [list [namespace origin mcunknown] \
- $Locale $src {expand}$args]]
+ $Locale $src {*}$args]]
}
# msgcat::mclocale --
@@ -382,7 +382,7 @@ proc msgcat::mcmset {locale pairs } {
proc msgcat::mcunknown {locale src args} {
if {[llength $args]} {
- return [format $src {expand}$args]
+ return [format $src {*}$args]
} else {
return $src
}
diff --git a/library/package.tcl b/library/package.tcl
index bd3ecf6..64197f7 100644
--- a/library/package.tcl
+++ b/library/package.tcl
@@ -3,7 +3,7 @@
# utility procs formerly in init.tcl which can be loaded on demand
# for package management.
#
-# RCS: @(#) $Id: package.tcl,v 1.34 2006/09/22 18:13:29 andreas_kupries Exp $
+# RCS: @(#) $Id: package.tcl,v 1.35 2006/11/03 00:34:52 hobbs Exp $
#
# Copyright (c) 1991-1993 The Regents of the University of California.
# Copyright (c) 1994-1998 Sun Microsystems, Inc.
@@ -135,7 +135,7 @@ proc pkg_mkIndex {args} {
}
if {[catch {
- glob -directory $dir -tails -types {r f} -- {expand}$patternList
+ glob -directory $dir -tails -types {r f} -- {*}$patternList
} fileList o]} {
return -options $o $fileList
}
@@ -194,7 +194,7 @@ proc pkg_mkIndex {args} {
proc package {what args} {
switch -- $what {
require { return ; # ignore transitive requires }
- default { __package_orig $what {expand}$args }
+ default { __package_orig $what {*}$args }
}
}
proc tclPkgUnknown args {}
@@ -252,7 +252,7 @@ proc pkg_mkIndex {args} {
proc ::tcl::GetAllNamespaces {{root ::}} {
set list $root
foreach ns [namespace children $root] {
- lappend list {expand}[::tcl::GetAllNamespaces $ns]
+ lappend list {*}[::tcl::GetAllNamespaces $ns]
}
return $list
}
diff --git a/library/safe.tcl b/library/safe.tcl
index 61246e8..186c2e7 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -12,7 +12,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: safe.tcl,v 1.15 2005/07/23 04:12:49 dgp Exp $
+# RCS: @(#) $Id: safe.tcl,v 1.16 2006/11/03 00:34:52 hobbs Exp $
#
# The implementation is based on namespaces. These naming conventions
@@ -517,7 +517,7 @@ proc ::safe::interpDelete {slave} {
# remove the hook now, otherwise if the hook
# calls us somehow, we'll loop
Unset $hookname
- if {[catch {{expand}$hook $slave} err]} {
+ if {[catch {{*}$hook $slave} err]} {
Log $slave "Delete hook error ($err)"
}
}
@@ -628,15 +628,15 @@ proc ::safe::setLogCmd {args} {
}
# set/get values
proc Set {args} {
- Toplevel set {expand}$args
+ Toplevel set {*}$args
}
# lappend on toplevel vars
proc Lappend {args} {
- Toplevel lappend {expand}$args
+ Toplevel lappend {*}$args
}
# unset a var/token (currently just an global level eval)
proc Unset {args} {
- Toplevel unset {expand}$args
+ Toplevel unset {*}$args
}
# test existance
proc Exists {varname} {
@@ -683,7 +683,7 @@ proc ::safe::setLogCmd {args} {
proc Log {slave msg {type ERROR}} {
variable Log
if {[info exists Log] && [llength $Log]} {
- {expand}$Log "$type for slave $slave : $msg"
+ {*}$Log "$type for slave $slave : $msg"
}
}
@@ -846,7 +846,7 @@ proc ::safe::setLogCmd {args} {
proc Subset {slave command okpat args} {
set subcommand [lindex $args 0]
if {[regexp $okpat $subcommand]} {
- return [$command {expand}$args]
+ return [$command {*}$args]
}
set msg "not allowed to invoke subcommand $subcommand of $command"
Log $slave $msg
@@ -881,7 +881,7 @@ proc ::safe::setLogCmd {args} {
set subcommand [lindex $args 0]
if {[regexp $okpat $subcommand]} {
- return [::interp invokehidden $slave encoding {expand}$args]
+ return [::interp invokehidden $slave encoding {*}$args]
}
if {[string first $subcommand system] == 0} {
diff --git a/library/tm.tcl b/library/tm.tcl
index 31779ae..8fac14a 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -264,7 +264,7 @@ proc ::tcl::tm::UnknownHandler {original name args} {
if {
($pkgname eq $name) &&
- [package vsatisfies $pkgversion {expand}$args]
+ [package vsatisfies $pkgversion {*}$args]
} then {
set satisfied 1
# We do not abort the loop, and keep adding