diff options
| author | Joe Mistachkin <joe@mistachkin.com> | 2008-06-13 05:45:01 (GMT) |
|---|---|---|
| committer | Joe Mistachkin <joe@mistachkin.com> | 2008-06-13 05:45:01 (GMT) |
| commit | f7c3c0f0809266035acb3cdeaa624f903a3b0cf0 (patch) | |
| tree | 32ea63055bc449e3ffe1e3b813bb8c48326ac84c /generic/tclParse.c | |
| parent | 9c5b16baabde8f28eb258e1b9be4727afa812830 (diff) | |
| download | tcl-f7c3c0f0809266035acb3cdeaa624f903a3b0cf0.zip tcl-f7c3c0f0809266035acb3cdeaa624f903a3b0cf0.tar.gz tcl-f7c3c0f0809266035acb3cdeaa624f903a3b0cf0.tar.bz2 | |
TIP 285 Implementation
Diffstat (limited to 'generic/tclParse.c')
| -rw-r--r-- | generic/tclParse.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/generic/tclParse.c b/generic/tclParse.c index 620f54e..126ea4f 100644 --- a/generic/tclParse.c +++ b/generic/tclParse.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: tclParse.c,v 1.64 2008/05/21 20:28:14 dgp Exp $ + * RCS: @(#) $Id: tclParse.c,v 1.65 2008/06/13 05:45:14 mistachkin Exp $ */ #include "tclInt.h" @@ -2167,9 +2167,14 @@ TclSubstTokens( case TCL_TOKEN_COMMAND: { Interp *iPtr = (Interp *) interp; + TclResetCancellation(interp, 0); + iPtr->numLevels++; code = TclInterpReady(interp); if (code == TCL_OK) { + code = Tcl_Canceled(interp, TCL_LEAVE_ERR_MSG); + } + if (code == TCL_OK) { /* TIP #280: Transfer line information to nested command */ code = TclEvalEx(interp, tokenPtr->start+1, tokenPtr->size-2, 0, line); |