Fix comments referring to {expand}. [Bug 1600859]

4 files changed, 17 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 7020f32..eda8394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+2007-06-21  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
+
+	* generic/tcl.h, generic/tclCompile.h, generic/tclCompile.c: Remove
+	references in comments to obsolete {expand} notation. [Bug 1740859]
+
 2007-06-20  Miguel Sofer  <msofer@users.sf.net>
 
-	* generic/tclVar.c: streamline namespace vars deletion: only
-	compute the variable's full name if the variable is traced.
+	* generic/tclVar.c: streamline namespace vars deletion: only compute
+	the variable's full name if the variable is traced.
 
 2007-06-20  Don Porter  <dgp@users.sourceforge.net>
 
@@ -9,8 +14,8 @@
 	* generic/tclExecute.c:	TclStackAlloc and TclStackFree to make them
 	easier for callers to use (or more precisely, harder to misuse).
 	TclStackFree now takes a (void *) argument which is the pointer
-	intended to be freed.  TclStackFree will panic if that's not actually
-	the memory the call will free.  TSA/TSF also now tolerate receiving
+	intended to be freed. TclStackFree will panic if that's not actually
+	the memory the call will free. TSA/TSF also now tolerate receiving
 	(interp == NULL), in which case they simply fall back to be calls to
 	Tcl_Alloc/Tcl_Free.
 
diff --git a/generic/tcl.h b/generic/tcl.h
index 657fa6b..873a72c 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tcl.h,v 1.231 2007/05/18 18:39:30 dgp Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.232 2007/06/21 12:43:17 dkf Exp $
  */
 
 #ifndef _TCL
@@ -2010,9 +2010,9 @@ typedef struct Tcl_Token {
  *				operands. NumComponents is always 0.
  * TCL_TOKEN_EXPAND_WORD -	This token is just like TCL_TOKEN_WORD except
  *				that it marks a word that began with the
- *				literal character prefix "{expand}". This word
- *				is marked to be expanded - that is, broken
- *				into words after substitution is complete.
+ *				literal character prefix "{*}". This word is
+ *				marked to be expanded - that is, broken into
+ *				words after substitution is complete.
  */
 
 #define TCL_TOKEN_WORD		1
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 30520ed..cc917e1 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.121 2007/06/20 18:46:11 dgp Exp $
+ * RCS: @(#) $Id: tclCompile.c,v 1.122 2007/06/21 12:43:18 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -289,7 +289,7 @@ InstructionDesc tclInstructionTable[] = {
      * is emitted.
      */
     {"expandStart",       1,    0,          0,	{OPERAND_NONE}},
-	/* Start of command with {expand}ed arguments */
+	/* Start of command with {*} (expanded) arguments */
     {"expandStkTop",      5,    0,          1,	{OPERAND_UINT4}},
 	/* Expand the list at stacktop: push its elements on the stack */
     {"invokeExpanded",    1,    0,          0,	{OPERAND_NONE}},
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index fc61542..691d673 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -8,7 +8,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.h,v 1.73 2007/06/15 19:58:13 msofer Exp $
+ * RCS: @(#) $Id: tclCompile.h,v 1.74 2007/06/21 12:43:18 dkf Exp $
  */
 
 #ifndef _TCLCOMPILATION
@@ -569,7 +569,7 @@ typedef struct ByteCode {
 
 #define INST_EXPON			99
 
-/* TIP #157 - {expand}... language syntax support. */
+/* TIP #157 - {*}... (word expansion) language syntax support. */
 
 #define INST_EXPAND_START		100
 #define INST_EXPAND_STKTOP		101