summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-07-10 17:58:45 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-07-10 17:58:45 (GMT)
commitfceaf9997d7c45ba92c6c61930207823446f1e50 (patch)
tree3545359bbc4d7c3ed48ce1c00843e579ad74696f
parent17ffd6902101268bd8cc522ed62049279e2894d5 (diff)
downloadtcl-fceaf9997d7c45ba92c6c61930207823446f1e50.zip
tcl-fceaf9997d7c45ba92c6c61930207823446f1e50.tar.gz
tcl-fceaf9997d7c45ba92c6c61930207823446f1e50.tar.bz2
Fix for [86fb5ea28e]. Test will eventually merge in from tip280-test-coverage.
-rw-r--r--generic/tclEnsemble.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 813e056..a718d0e 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -3059,6 +3059,7 @@ CompileToCompiledCommand(
int savedNumCmds = envPtr->numCommands;
int savedStackDepth = envPtr->currStackDepth;
unsigned savedCodeNext = envPtr->codeNext - envPtr->codeStart;
+ DefineLineInformation;
if (cmdPtr->compileProc == NULL) {
return TCL_ERROR;
@@ -3107,12 +3108,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]
*/