diff options
| author | andreas_kupries <akupries@shaw.ca> | 2008-07-23 20:47:28 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2008-07-23 20:47:28 (GMT) |
| commit | 28dc32c5df7599c1a91f586e9b87c70257bb6954 (patch) | |
| tree | 21c7a839952f44078b41504af48b37e2703f39a3 /generic/tclCompile.c | |
| parent | 4cfb7828a8f1b3a6686c44798c62431003363ff8 (diff) | |
| download | tcl-28dc32c5df7599c1a91f586e9b87c70257bb6954.zip tcl-28dc32c5df7599c1a91f586e9b87c70257bb6954.tar.gz tcl-28dc32c5df7599c1a91f586e9b87c70257bb6954.tar.bz2 | |
* generic/tclBasic.c: Modified TclArgumentGet to reject pure lists
* generic/tclCmdIL.c: immediately, without search. Reworked setup
* generic/tclCompile.c: of eoFramePtr, doesn't need the line
* tests/info.test: information, more sensible to have everything
on line 1 when eval'ing a pure list. Updated the users of the line
information to special case this based on the frame type (i.e.
TCL_LOCATION_EVAL_LIST). Added a testcase demonstrating the new
behaviour.
Diffstat (limited to 'generic/tclCompile.c')
| -rw-r--r-- | generic/tclCompile.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tclCompile.c b/generic/tclCompile.c index e3ce0c9..e557860 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCompile.c,v 1.146.2.4 2008/07/22 22:26:57 andreas_kupries Exp $ + * RCS: @(#) $Id: tclCompile.c,v 1.146.2.5 2008/07/23 20:47:32 andreas_kupries Exp $ */ #include "tclInt.h" @@ -915,9 +915,11 @@ TclInitCompileEnv( envPtr->extCmdMapPtr->neiloc = 0; envPtr->extCmdMapPtr->nueiloc = 0; - if (invoker == NULL) { + if (invoker == NULL || + (invoker->type == TCL_LOCATION_EVAL_LIST)) { /* - * Initialize the compiler for relative counting. + * Initialize the compiler for relative counting in case of a + * dynamic context. */ envPtr->line = 1; |