summaryrefslogtreecommitdiffstats
path: root/generic/tclExecute.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-09-09 19:28:30 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-09-09 19:28:30 (GMT)
commit1aec3f216c9ebfc5dd9d7e8146dc452e9f76b7ae (patch)
treedc288f72c9331c09129c27b60b55930645fd7521 /generic/tclExecute.c
parentc751a324c1745d7c554ff34f1a85d4d18c2dfa86 (diff)
downloadtcl-1aec3f216c9ebfc5dd9d7e8146dc452e9f76b7ae.zip
tcl-1aec3f216c9ebfc5dd9d7e8146dc452e9f76b7ae.tar.gz
tcl-1aec3f216c9ebfc5dd9d7e8146dc452e9f76b7ae.tar.bz2
* generic/tclInt.h: Removed the "nsName" Tcl_ObjType from the
* generic/tclNamesp.c: registered set. Revised the management of * generic/tclObj.c: the intrep of that Tcl_ObjType. Revised the * tests/obj.test: TclGetNamespaceFromObj() routine to return TCL_ERROR and write a consistent error message when a namespace is not found. [Bug 1588842. Patch 1686862] ***POTENTIAL INCOMPATIBILITY*** For callers of Tcl_GetObjType() on the name "nsName". * generic/tclExecute.c: Update TclGetNamespaceFromObj() callers. * generic/tclProc.c: * tests/apply.test: Updated tests to expect new consistent * tests/namespace-old.test: error message when a namespace is not * tests/namespace.test: found. * tests/upvar.test:
Diffstat (limited to 'generic/tclExecute.c')
-rw-r--r--generic/tclExecute.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index e133c55..c9eabbe 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.331 2007/09/09 16:51:19 dgp Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.332 2007/09/09 19:28:30 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;
}