Subject: The routines StartExpanding() and EnterCmdWordData() are orthogonal, so it's ok to reverse the order in which they are called.

From: dgp <[email-masked]>
Date: Mon, 8 Jul 2013 14:31:14 +0000

---
 generic/tclCompile.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 5aab69c..0dc30e2 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -1802,10 +1802,6 @@ CompileCommandTokens(
     EnterCmdStartData(envPtr, cmdIdx,
 	    parsePtr->commandStart - envPtr->source, startCodeOffset);
 
-    if (expand && !cmdPtr) {
-	StartExpanding(envPtr);
-    }
-
     /*
      * TIP #280. Scan the words and compute the extended location
      * information. The map first contain full per-word line
@@ -1823,6 +1819,9 @@ CompileCommandTokens(
     envPtr->line = eclPtr->loc[wlineat].line[0];
     envPtr->clNext = eclPtr->loc[wlineat].next[0];
 
+    if (expand && !cmdPtr) {
+	StartExpanding(envPtr);
+    }
     if (cmdPtr) {
 	int savedNumCmds = envPtr->numCommands;
 	int update = 0;
-- 
cgit v0.12