diff options
| -rwxr-xr-x[-rw-r--r--] | doc/GetCwd.3 | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/GetVersion.3 | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/lset.n | 0 | ||||
| -rw-r--r-- | generic/tclExecute.c | 8 | ||||
| -rw-r--r-- | generic/tclParse.c | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | generic/tclThreadAlloc.c | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/lsetComp.test | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/notify.test | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/tcltest.test | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/checkLibraryDoc.tcl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/configure | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | win/buildall.vc.bat | 0 |
12 files changed, 8 insertions, 2 deletions
diff --git a/doc/GetCwd.3 b/doc/GetCwd.3 index 964e237..964e237 100644..100755 --- a/doc/GetCwd.3 +++ b/doc/GetCwd.3 diff --git a/doc/GetVersion.3 b/doc/GetVersion.3 index 47034d0..47034d0 100644..100755 --- a/doc/GetVersion.3 +++ b/doc/GetVersion.3 diff --git a/doc/lset.n b/doc/lset.n index 5efcbae..5efcbae 100644..100755 --- a/doc/lset.n +++ b/doc/lset.n diff --git a/generic/tclExecute.c b/generic/tclExecute.c index f2efa0f..2abee9a 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -1257,7 +1257,9 @@ Tcl_ExprObj( */ codePtr->refCount++; + iPtr->numLevels++; result = TclExecuteByteCode(interp, codePtr); + iPtr->numLevels--; codePtr->refCount--; if (codePtr->refCount <= 0) { TclCleanupByteCode(codePtr); @@ -2769,8 +2771,11 @@ TclExecuteByteCode( */ DECACHE_STACK_INFO(); + iPtr->numLevels--; /* Decrement here because path through + * TclEvalEx will increment */ objResultPtr = TclPtrGetVar(interp, varPtr, arrayPtr, part1Ptr, part2Ptr, TCL_LEAVE_ERR_MSG, opnd); + iPtr->numLevels++; CACHE_STACK_INFO(); if (objResultPtr) { TRACE_APPEND(("%.30s\n", O2S(objResultPtr))); @@ -3029,8 +3034,11 @@ TclExecuteByteCode( doCallPtrSetVar: DECACHE_STACK_INFO(); + iPtr->numLevels--; /* Decrement here because path through + * TclEvalEx will increment */ objResultPtr = TclPtrSetVar(interp, varPtr, arrayPtr, part1Ptr, part2Ptr, valuePtr, storeFlags, opnd); + iPtr->numLevels++; CACHE_STACK_INFO(); if (objResultPtr) { #ifndef TCL_COMPILE_DEBUG diff --git a/generic/tclParse.c b/generic/tclParse.c index 96c2a10..ff4f384 100644 --- a/generic/tclParse.c +++ b/generic/tclParse.c @@ -2275,7 +2275,6 @@ TclSubstTokens( case TCL_TOKEN_COMMAND: { Interp *iPtr = (Interp *) interp; - iPtr->numLevels++; code = TclInterpReady(interp); if (code == TCL_OK) { /* @@ -2297,7 +2296,6 @@ TclSubstTokens( iPtr->evalFlags |= TCL_EVAL_FILE; } } - iPtr->numLevels--; appendObj = Tcl_GetObjResult(interp); break; } diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c index 9008d52..9008d52 100644..100755 --- a/generic/tclThreadAlloc.c +++ b/generic/tclThreadAlloc.c diff --git a/tests/lsetComp.test b/tests/lsetComp.test index 2b89a47..2b89a47 100644..100755 --- a/tests/lsetComp.test +++ b/tests/lsetComp.test diff --git a/tests/notify.test b/tests/notify.test index ba52c50..ba52c50 100644..100755 --- a/tests/notify.test +++ b/tests/notify.test diff --git a/tests/tcltest.test b/tests/tcltest.test index 86aca6f..86aca6f 100644..100755 --- a/tests/tcltest.test +++ b/tests/tcltest.test diff --git a/tools/checkLibraryDoc.tcl b/tools/checkLibraryDoc.tcl index cd08c2a..cd08c2a 100644..100755 --- a/tools/checkLibraryDoc.tcl +++ b/tools/checkLibraryDoc.tcl diff --git a/tools/configure b/tools/configure index 98b5867..98b5867 100644..100755 --- a/tools/configure +++ b/tools/configure diff --git a/win/buildall.vc.bat b/win/buildall.vc.bat index 0c9b3ac..0c9b3ac 100644..100755 --- a/win/buildall.vc.bat +++ b/win/buildall.vc.bat |