Subject: Use the TokenAfter() macro.

From: dgp <[email-masked]>
Date: Mon, 8 Jul 2013 23:02:44 +0000

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

diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 656f700..afe34b0 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -1755,7 +1755,7 @@ ExpandRequested(
 	if (tokenPtr->type == TCL_TOKEN_EXPAND_WORD) {
 	    return 1;
 	}
-	tokenPtr += tokenPtr->numComponents + 1;
+	tokenPtr = TokenAfter(tokenPtr);
     }
     return 0;
 }
@@ -1792,11 +1792,10 @@ CompileInvocation(
     if (cmdObj) {
 	CompileCmdLiteral(interp, cmdObj, envPtr);
 	wordIdx = 1;
-	tokenPtr += tokenPtr->numComponents + 1;
+	tokenPtr = TokenAfter(tokenPtr);
     }
 
-    for (; wordIdx < numWords;
-	    wordIdx++, tokenPtr += tokenPtr->numComponents + 1) {
+    for (; wordIdx < numWords; wordIdx++, tokenPtr = TokenAfter(tokenPtr)) {
 	int objIdx;
 
 	envPtr->line = eclPtr->loc[wlineat].line[wordIdx];
@@ -1848,11 +1847,10 @@ CompileExpanded(
     if (cmdObj) {
 	CompileCmdLiteral(interp, cmdObj, envPtr);
 	wordIdx = 1;
-	tokenPtr += tokenPtr->numComponents + 1;
+	tokenPtr = TokenAfter(tokenPtr);
     }
 
-    for (; wordIdx < numWords;
-	    wordIdx++, tokenPtr += tokenPtr->numComponents + 1) {
+    for (; wordIdx < numWords; wordIdx++, tokenPtr = TokenAfter(tokenPtr)) {
 	int objIdx;
 
 	envPtr->line = eclPtr->loc[wlineat].line[wordIdx];
-- 
cgit v0.12