diff options
| author | andreas_kupries <akupries@shaw.ca> | 2008-07-23 20:49:50 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2008-07-23 20:49:50 (GMT) |
| commit | a0900a49110c0eaf5ed791ee35c70b800d3d52ec (patch) | |
| tree | b3d4d81cfc5d42e2154a618ae44c9a9da166f612 /generic/tclCompile.c | |
| parent | 16253514a3a86502bec2e5b592f4c0789641535d (diff) | |
| download | tcl-a0900a49110c0eaf5ed791ee35c70b800d3d52ec.zip tcl-a0900a49110c0eaf5ed791ee35c70b800d3d52ec.tar.gz tcl-a0900a49110c0eaf5ed791ee35c70b800d3d52ec.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 c754ef1..f484d7b 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.152 2008/07/22 22:24:21 andreas_kupries Exp $ + * RCS: @(#) $Id: tclCompile.c,v 1.153 2008/07/23 20:49:52 andreas_kupries Exp $ */ #include "tclInt.h" @@ -914,9 +914,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; |