diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tclBasic.c | 5 | ||||
| -rw-r--r-- | generic/tclExecute.c | 4 | ||||
| -rw-r--r-- | generic/tclProc.c | 4 |
4 files changed, 8 insertions, 11 deletions
@@ -1,5 +1,10 @@ 2008-07-14 Miguel Sofer <msofer@users.sf.net> + * generic/tclBasic.c.: NRE left too many calls to + * generic/tclExecute.c: TclResetCancellation lying around: it + * generic/tclProc.c: only needs to be called prior to any + iPtr->numLevels++. Thanks mistachkin. + * generic/tclBasic.c: TclResetCancellation() calls were misplaced (merge mishap); stray //. Thanks patthoyts. @@ -44,7 +49,6 @@ * unix/tclUnixTest.c: * win/tclWin32Dll.c: - 2008-07-08 Don Porter <dgp@users.sourceforge.net> * generic/tclGet.c: Corrected out of date comments and removed diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 174a74f..07b3fb5 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -16,7 +16,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclBasic.c,v 1.307 2008/07/13 22:42:25 msofer Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.308 2008/07/14 00:11:32 msofer Exp $ */ #include "tclInt.h" @@ -5041,9 +5041,6 @@ TclEvalEx( eeFramePtr->line = lines; iPtr->cmdFramePtr = eeFramePtr; - - TclResetCancellation(interp, 0); - code = Tcl_EvalObjv(interp, objectsUsed, objv, TCL_EVAL_NOERR); iPtr->cmdFramePtr = iPtr->cmdFramePtr->nextPtr; diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 1299cce..0412034 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -14,7 +14,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.377 2008/07/13 09:29:51 msofer Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.378 2008/07/14 00:11:33 msofer Exp $ */ #include "tclInt.h" @@ -1502,8 +1502,6 @@ TclCompileObj( * performance is noticeable. */ - TclResetCancellation(interp, 0); - if (TclInterpReady(interp) == TCL_ERROR) { return NULL; } diff --git a/generic/tclProc.c b/generic/tclProc.c index 90cac16..70f2921 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.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: tclProc.c,v 1.143 2008/07/13 09:03:35 msofer Exp $ + * RCS: @(#) $Id: tclProc.c,v 1.144 2008/07/14 00:11:33 msofer Exp $ */ #include "tclInt.h" @@ -1811,8 +1811,6 @@ TclNRInterpProcCore( * Invoke the commands in the procedure's body. */ - TclResetCancellation(interp, 0); - procPtr->refCount++; codePtr = procPtr->bodyPtr->internalRep.otherValuePtr; if (TCL_DTRACE_PROC_ENTRY_ENABLED()) { |