diff options
author | andreas_kupries <akupries@shaw.ca> | 2008-07-25 22:11:18 (GMT) |
---|---|---|
committer | andreas_kupries <akupries@shaw.ca> | 2008-07-25 22:11:18 (GMT) |
commit | e6ab7a094e17c5ecfaed583a37feb06afbc6bd94 (patch) | |
tree | 39a2112341211435426b708bc1f762560a383c9a /generic/tclBasic.c | |
parent | 492567dd1a47ceb460e19a20e233ff6d1efeb5ab (diff) | |
download | tcl-e6ab7a094e17c5ecfaed583a37feb06afbc6bd94.zip tcl-e6ab7a094e17c5ecfaed583a37feb06afbc6bd94.tar.gz tcl-e6ab7a094e17c5ecfaed583a37feb06afbc6bd94.tar.bz2 |
* tests/info.test: Tests 38.* added, exactly testing the tracking
of location for uplevel scripts. Resolved merge conflict on
info-37.0, switched !singleTestInterp constraint to glob matching
instead. Ditto info-22.8, removed constraint, more glob matching,
and reduced the depth of the stack we check. More is coming, right
now I want to commit the bug fixes.
* tests/oo.test: Updated oo-22.1 for expanded location tracking.
* generic/tclCompile.c (TclInitCompileEnv): Reorganized the
initialization of the #280 location information to match the flow
in TclEvalObjEx to get more absolute contexts.
* generic/tclBasic.c (TclEvalObjEx): Added missing cleanup of
extended location information.
Diffstat (limited to 'generic/tclBasic.c')
-rw-r--r-- | generic/tclBasic.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index da81e9c..eb5e1c8 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.330 2008/07/23 20:49:50 andreas_kupries Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.331 2008/07/25 22:11:19 andreas_kupries Exp $ */ #include "tclInt.h" @@ -1515,6 +1515,10 @@ DeleteInterpProc( ckfree((char *) eclPtr->loc); } + if (eclPtr->eiloc != NULL) { + ckfree((char *) eclPtr->eiloc); + } + ckfree((char *) eclPtr); Tcl_DeleteHashEntry(hPtr); } @@ -5741,6 +5745,9 @@ TclNREvalObjEx( * execution speed. This is because it allows us to avoid a setFromAny * step that would just pack everything into a string and back out again. * + * This also preserves any associations between list elements and location + * information for such elements. + * * This restriction has been relaxed a bit by storing in lists whether * they are "canonical" or not (a canonical list being one that is either * pure or that has its string rep derived by UpdateStringOfList from the |