diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-09-10 03:06:44 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-09-10 03:06:44 (GMT) |
| commit | 5d8202dc7a685c31d2b97e534f4112e78d118c57 (patch) | |
| tree | 9a63c3fd0aff5efb144a43bfa6c94a16c2ddab29 /generic/tclExecute.c | |
| parent | f37ed6d9e8a193b1c47410bc8ac13f48399af268 (diff) | |
| download | tcl-5d8202dc7a685c31d2b97e534f4112e78d118c57.zip tcl-5d8202dc7a685c31d2b97e534f4112e78d118c57.tar.gz tcl-5d8202dc7a685c31d2b97e534f4112e78d118c57.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'generic/tclExecute.c')
| -rw-r--r-- | generic/tclExecute.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index c4e1449..f57482f 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -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: tclExecute.c,v 1.285.2.15 2007/09/09 17:26:38 dgp Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.285.2.16 2007/09/10 03:06:45 dgp Exp $ */ #include "tclInt.h" @@ -3107,7 +3107,7 @@ TclExecuteByteCode( Tcl_Namespace *nsPtr, *savedNsPtr; result = TclGetNamespaceFromObj(interp, OBJ_UNDER_TOS, &nsPtr); - if ((result == TCL_OK) && nsPtr) { + if (result == TCL_OK) { /* * Locate the other variable. */ @@ -3119,18 +3119,9 @@ TclExecuteByteCode( /*createPart1*/ 1, /*createPart2*/ 1, &varPtr); iPtr->varFramePtr->nsPtr = (Namespace *) savedNsPtr; if (otherPtr) { - result = TCL_OK; goto doLinkVars; } } - if (!nsPtr) { - /* - * The namespace does not exist, leave an error message. - */ - - Tcl_SetObjResult(interp, Tcl_Format(NULL, - "namespace \"%s\" does not exist", 1,&OBJ_UNDER_TOS)); - } result = TCL_ERROR; goto checkForCatch; } |