diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2003-06-10 19:46:34 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2003-06-10 19:46:34 (GMT) |
| commit | 06dfd692f84e8dec06b42f65482a77a9f5c09136 (patch) | |
| tree | f99b43a3553ea52e187ef8667b27aa32ef732ad6 /generic/tclExecute.c | |
| parent | 2de53852436287ca9c97b41636e38df538506625 (diff) | |
| download | tcl-06dfd692f84e8dec06b42f65482a77a9f5c09136.zip tcl-06dfd692f84e8dec06b42f65482a77a9f5c09136.tar.gz tcl-06dfd692f84e8dec06b42f65482a77a9f5c09136.tar.bz2 | |
* generic/tclBasic.c:
* generic/tclExecute.c: let TclExecuteObjvInternal call
TclInterpReady instead of relying on its callers to do so; fix for
the part of [Bug 495830] that is new in 8.4.
* tests/interp.test: Added tests 18.9 (knownbug) and 18.10
Diffstat (limited to 'generic/tclExecute.c')
| -rw-r--r-- | generic/tclExecute.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 0697677..4c48584 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -11,7 +11,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.101 2003/05/05 20:54:39 dgp Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.102 2003/06/10 19:46:44 msofer Exp $ */ #include "tclInt.h" @@ -894,7 +894,9 @@ TclCompEvalObj(interp, objPtr) * Check that the interpreter is ready to execute scripts */ + iPtr->numLevels++; if (TclInterpReady(interp) == TCL_ERROR) { + iPtr->numLevels--; return TCL_ERROR; } @@ -980,9 +982,7 @@ TclCompEvalObj(interp, objPtr) iPtr->returnOpts = iPtr->defaultReturnOpts; Tcl_IncrRefCount(iPtr->returnOpts); } - iPtr->numLevels++; result = TclExecuteByteCode(interp, codePtr); - iPtr->numLevels--; codePtr->refCount--; if (codePtr->refCount <= 0) { TclCleanupByteCode(codePtr); @@ -990,6 +990,8 @@ TclCompEvalObj(interp, objPtr) } else { result = TCL_OK; } + iPtr->numLevels--; + /* * If no commands at all were executed, check for asynchronous |