diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2008-07-22 21:02:25 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2008-07-22 21:02:25 (GMT) |
| commit | 63d4144a37db8c69be1a8090936516467f684480 (patch) | |
| tree | 1663f0612dec0cf4dd6c42e85fe06a3f56d993d2 /generic | |
| parent | 35e3d899aaa7f90fdf39652a2a4fdd45fc14965b (diff) | |
| download | tcl-63d4144a37db8c69be1a8090936516467f684480.zip tcl-63d4144a37db8c69be1a8090936516467f684480.tar.gz tcl-63d4144a37db8c69be1a8090936516467f684480.tar.bz2 | |
* generic/tclBasic.c: Added numLevels field to CommandFrame,
* generic/tclExecute.c: let GetCommandSource use it. This solves
* generic/tclInt.h: [Bug 2017146]. Thx dgp for the analysis.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBasic.c | 6 | ||||
| -rw-r--r-- | generic/tclExecute.c | 3 | ||||
| -rw-r--r-- | generic/tclInt.h | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 8c4f69a..f7c667a 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.323 2008/07/21 23:46:51 das Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.324 2008/07/22 21:02:27 msofer Exp $ */ #include "tclInt.h" @@ -3161,7 +3161,7 @@ GetCommandSource( int numChars; objPtr = Tcl_NewListObj(objc, objv); - if (lookup && cfPtr) { + if (lookup && cfPtr && (cfPtr->numLevels == iPtr->numLevels-1)) { switch (cfPtr->type) { case TCL_LOCATION_EVAL: case TCL_LOCATION_SOURCE: @@ -4910,6 +4910,7 @@ TclEvalEx( } eeFramePtr->level = iPtr->cmdFramePtr ? iPtr->cmdFramePtr->level + 1 : 1; + eeFramePtr->numLevels = iPtr->numLevels; eeFramePtr->framePtr = iPtr->framePtr; eeFramePtr->nextPtr = iPtr->cmdFramePtr; eeFramePtr->nline = 0; @@ -5640,6 +5641,7 @@ TclNREvalObjEx( eoFramePtr->type = TCL_LOCATION_EVAL_LIST; eoFramePtr->level = (iPtr->cmdFramePtr == NULL? 1 : iPtr->cmdFramePtr->level + 1); + eoFramePtr->numLevels = iPtr->numLevels; eoFramePtr->framePtr = iPtr->framePtr; eoFramePtr->nextPtr = iPtr->cmdFramePtr; diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 148b3e9..b26d77e 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.385 2008/07/21 19:41:42 msofer Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.386 2008/07/22 21:02:28 msofer Exp $ */ #include "tclInt.h" @@ -1867,6 +1867,7 @@ TclExecuteByteCode( bcFramePtr->type = ((codePtr->flags & TCL_BYTECODE_PRECOMPILED) ? TCL_LOCATION_PREBC : TCL_LOCATION_BC); bcFramePtr->level = (iPtr->cmdFramePtr ? iPtr->cmdFramePtr->level+1 : 1); + bcFramePtr->numLevels = iPtr->numLevels; bcFramePtr->framePtr = iPtr->framePtr; bcFramePtr->nextPtr = iPtr->cmdFramePtr; bcFramePtr->nline = 0; diff --git a/generic/tclInt.h b/generic/tclInt.h index 7614f32..dad62a8 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -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: tclInt.h,v 1.376 2008/07/21 22:50:34 andreas_kupries Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.377 2008/07/22 21:02:30 msofer Exp $ */ #ifndef _TCLINT @@ -1094,6 +1094,8 @@ typedef struct CmdFrame { int type; /* Values see below. */ int level; /* #Frames in stack, prevent O(n) scan of * list. */ + int numLevels; /* value of interp's numLevels when the frame + * was pushed */ int *line; /* Lines the words of the command start on. */ int nline; |