diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-07-10 18:02:20 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-07-10 18:02:20 (GMT) |
| commit | c8a526a72209d5f16d6d264b5849d4ea211d7139 (patch) | |
| tree | d704f849b811eb463408d28f75fffe1993131c51 /generic | |
| parent | acd32d6e7090b829a7d5e1aec2e6b09f987aaccc (diff) | |
| parent | fceaf9997d7c45ba92c6c61930207823446f1e50 (diff) | |
| download | tcl-c8a526a72209d5f16d6d264b5849d4ea211d7139.zip tcl-c8a526a72209d5f16d6d264b5849d4ea211d7139.tar.gz tcl-c8a526a72209d5f16d6d264b5849d4ea211d7139.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclEnsemble.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c index e0aa0c4..d654bbf 100644 --- a/generic/tclEnsemble.c +++ b/generic/tclEnsemble.c @@ -3049,6 +3049,7 @@ CompileToCompiledCommand( int savedNumCmds = envPtr->numCommands; int savedStackDepth = envPtr->currStackDepth; unsigned savedCodeNext = envPtr->codeNext - envPtr->codeStart; + DefineLineInformation; if (cmdPtr->compileProc == NULL) { return TCL_ERROR; @@ -3097,12 +3098,27 @@ CompileToCompiledCommand( } /* + * Shift the line information arrays to account for different word + * index values. + */ + + mapPtr->loc[eclIndex].line += (depth - 1); + mapPtr->loc[eclIndex].next += (depth - 1); + + /* * Hand off compilation to the subcommand compiler. At last! */ result = cmdPtr->compileProc(interp, &synthetic, cmdPtr, envPtr); /* + * Undo the shift. + */ + + mapPtr->loc[eclIndex].line -= (depth - 1); + mapPtr->loc[eclIndex].next -= (depth - 1); + + /* * If our target fails to compile, revert the number of commands and the * pointer to the place to issue the next instruction. [Bug 3600328] */ |