summaryrefslogtreecommitdiffstats
path: root/library/opt
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2000-12-11 04:17:38 (GMT)
committerdgp <dgp@users.sourceforge.net>2000-12-11 04:17:38 (GMT)
commitab4eb3fe6a6e7f494057f9bc9af0c1a4489c5f88 (patch)
tree3558459e0bea4593330821ed820ea77f36f43326 /library/opt
parent19df5d993a9f6e55e773ea93d3632c770756358b (diff)
downloadtcl-ab4eb3fe6a6e7f494057f9bc9af0c1a4489c5f88.zip
tcl-ab4eb3fe6a6e7f494057f9bc9af0c1a4489c5f88.tar.gz
tcl-ab4eb3fe6a6e7f494057f9bc9af0c1a4489c5f88.tar.bz2
2000-12-10 Don Porter <dgp@users.sourceforge.net>
* library/init.tcl: * library/msgcat/msgcat.tcl: * library/msgcat/pkgIndex.tcl: * library/opt/optparse.tcl: * library/opt/pkgIndex.tcl: Where [uplevel] is used in a proc to evaluate a Tcl built-in command in the caller's context, the built-in commands are now fully namespace-qualified. This prevents problems when the caller context is in a namespace where the built-in command name has been used by a command in the namespace. (For example, [::ns::set] might be called instead of the intended [::set]). [Bug #119422, Patch #102545]
Diffstat (limited to 'library/opt')
-rw-r--r--library/opt/optparse.tcl16
-rw-r--r--library/opt/pkgIndex.tcl2
2 files changed, 9 insertions, 9 deletions
diff --git a/library/opt/optparse.tcl b/library/opt/optparse.tcl
index 0f6019a..f3c82a1 100644
--- a/library/opt/optparse.tcl
+++ b/library/opt/optparse.tcl
@@ -8,9 +8,9 @@
# on it. If your code does rely on this package you
# may directly incorporate this code into your application.
#
-# RCS: @(#) $Id: optparse.tcl,v 1.4 2000/07/18 21:30:41 ericm Exp $
+# RCS: @(#) $Id: optparse.tcl,v 1.5 2000/12/11 04:17:39 dgp Exp $
-package provide opt 0.4.1
+package provide opt 0.4.2
namespace eval ::tcl {
@@ -239,7 +239,7 @@ proc ::tcl::OptKeyDelete {key} {
# Assign a temporary key, call OptKeyParse and then free the storage
proc ::tcl::OptParse {desc arglist} {
set tempkey [OptKeyRegister $desc];
- set ret [catch {uplevel [list ::tcl::OptKeyParse $tempkey $arglist]} res];
+ set ret [catch {uplevel 1 [list ::tcl::OptKeyParse $tempkey $arglist]} res];
OptKeyDelete $tempkey;
return -code $ret $res;
}
@@ -252,7 +252,7 @@ proc ::tcl::OptParse {desc arglist} {
# (the other will be sets to their default value)
# into local variable named "Args".
proc ::tcl::OptProc {name desc body} {
- set namespace [uplevel namespace current];
+ set namespace [uplevel 1 [list ::namespace current]];
if { ([string match "::*" $name])
|| ([string compare $namespace "::"]==0)} {
# absolute name or global namespace, name is the key
@@ -262,7 +262,7 @@ proc ::tcl::OptProc {name desc body} {
set key "${namespace}::${name}";
}
OptKeyRegister $desc $key;
- uplevel [list proc $name args "set Args \[::tcl::OptKeyParse $key \$args\]\n$body"];
+ uplevel 1 [list ::proc $name args "set Args \[::tcl::OptKeyParse $key \$args\]\n$body"];
return $key;
}
# Check that a argument has been given
@@ -307,7 +307,7 @@ proc ::tcl::OptProcArgGiven {argname} {
# Advance to next description
proc OptNextDesc {descName} {
- uplevel [list Lvarincr $descName {0 1}];
+ uplevel 1 [list Lvarincr $descName {0 1}];
}
# Get the current description, eventually descend
@@ -365,7 +365,7 @@ proc ::tcl::OptProcArgGiven {argname} {
}
# Advance to next argument
proc OptNextArg {argsName} {
- uplevel [list Lvarpop1 $argsName];
+ uplevel 1 [list Lvarpop1 $argsName];
}
#######
@@ -1055,7 +1055,7 @@ proc ::tcl::Lassign {list args} {
set lg [llength $list];
foreach vname $args {
if {$i>=$lg} break
- uplevel [list set $vname [lindex $list $i]];
+ uplevel 1 [list ::set $vname [lindex $list $i]];
incr i;
}
return $lg;
diff --git a/library/opt/pkgIndex.tcl b/library/opt/pkgIndex.tcl
index 260e572..2de9531 100644
--- a/library/opt/pkgIndex.tcl
+++ b/library/opt/pkgIndex.tcl
@@ -8,4 +8,4 @@
# script is sourced, the variable $dir must contain the
# full path name of this file's directory.
-package ifneeded opt 0.4.1 [list source [file join $dir optparse.tcl]]
+package ifneeded opt 0.4.2 [list source [file join $dir optparse.tcl]]