diff options
| author | dgp <dgp@users.sourceforge.net> | 2004-10-15 21:02:30 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2004-10-15 21:02:30 (GMT) |
| commit | 7118dbc976774fdef3cc20ad168c22f23ed582f0 (patch) | |
| tree | f7b7bc5b3c31a0c3f348987c7b5b21feac0477c3 /generic/tclProc.c | |
| parent | 0821784e04e2aa7a2582947073659cde9e421abd (diff) | |
| download | tcl-7118dbc976774fdef3cc20ad168c22f23ed582f0.zip tcl-7118dbc976774fdef3cc20ad168c22f23ed582f0.tar.gz tcl-7118dbc976774fdef3cc20ad168c22f23ed582f0.tar.bz2 | |
* generic/tclCmdMZ.c (TclProcessReturn): Now that primary
* generic/tclProc.c (TclUpdateReturnInfo): storage for the
errorInfo and errorCode values are internal fields, we can set
them at the time of the [return] command, and not have to wait
until the specified number of "-level"s have popped.
Diffstat (limited to 'generic/tclProc.c')
| -rw-r--r-- | generic/tclProc.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/generic/tclProc.c b/generic/tclProc.c index 1be2e09..3756024 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -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: tclProc.c,v 1.60 2004/10/15 04:01:33 dgp Exp $ + * RCS: @(#) $Id: tclProc.c,v 1.61 2004/10/15 21:02:36 dgp Exp $ */ #include "tclInt.h" @@ -1471,20 +1471,6 @@ TclUpdateReturnInfo(iPtr) Tcl_DictObjGet(NULL, iPtr->returnOpts, iPtr->returnCodeKey, &valuePtr); Tcl_GetIntFromObj(NULL, valuePtr, &code); } - if (code == TCL_ERROR) { - Tcl_DictObjGet(NULL, iPtr->returnOpts, - iPtr->returnErrorcodeKey, &valuePtr); - if (valuePtr != NULL) { - Tcl_SetObjErrorCode((Tcl_Interp *)iPtr, valuePtr); - } - - Tcl_DictObjGet(NULL, iPtr->returnOpts, - iPtr->returnErrorinfoKey, &valuePtr); - if (valuePtr != NULL) { - iPtr->errorInfo = valuePtr; - Tcl_IncrRefCount(iPtr->errorInfo); - } - } return code; } |