* unix/configure: autoconf-2.59 (FC6 fork)

        * win/configure:

        * README:               Bump version number to 8.5a7
        * generic/tcl.h:
        * library/init.tcl:
        * tools/tcl.wse.in:
        * unix/configure.in:
        * unix/tcl.spec:
        * win/configure.in:

        * generic/tclParse.c:   Disable and remove the ALLOW_EXPAND sections
        * tests/info.test:      that continued to support the deprecated
        * tests/mathop.test:    {expand} syntax.  Updated the few remaining
        users of that syntax in the test suite.

13 files changed, 67 insertions, 65 deletions

diff --git a/ChangeLog b/ChangeLog
index 7facb0a..67b8949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2007-05-18  Don Porter  <dgp@users.sourceforge.net>
+
+	* unix/configure:	autoconf-2.59 (FC6 fork)
+	* win/configure:
+
+	* README:		Bump version number to 8.5a7
+	* generic/tcl.h:
+	* library/init.tcl:
+	* tools/tcl.wse.in:
+	* unix/configure.in:
+	* unix/tcl.spec:
+	* win/configure.in:
+
+	* generic/tclParse.c:	Disable and remove the ALLOW_EXPAND sections
+	* tests/info.test:	that continued to support the deprecated
+	* tests/mathop.test:	{expand} syntax.  Updated the few remaining
+	users of that syntax in the test suite.
+
 2007-05-17  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tclExecute.c (TclLimitReady): Created a macro version of
@@ -20,7 +38,6 @@
 	be statically linked into an extended tclsh or Big Wish with a
 	dynamically-linked libtcl. [Bug 1716117]
 
-
 2007-05-15  Don Porter  <dgp@users.sourceforge.net>
 
 	* win/configure:	autoconf-2.59 (FC6 fork)
diff --git a/README b/README
index ad6c352..ec47a42 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
 README:  Tcl
-    This is the Tcl 8.5a6 source distribution.
+    This is the Tcl 8.5a7 source distribution.
     Tcl/Tk is also available through NetCVS:
 	http://tcl.sourceforge.net/
     You can get any source release of Tcl from the file distributions
     link at the above URL.
 
-RCS: @(#) $Id: README,v 1.58 2006/10/23 19:42:18 dgp Exp $
+RCS: @(#) $Id: README,v 1.59 2007/05/18 18:39:29 dgp Exp $
 
 Contents
 --------
diff --git a/generic/tcl.h b/generic/tcl.h
index 92abc98..657fa6b 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.230 2007/01/28 01:42:05 das Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.231 2007/05/18 18:39:30 dgp Exp $
  */
 
 #ifndef _TCL
@@ -52,7 +52,6 @@ extern "C" {
  * macosx/Tcl-Common.xcconfig (not patchlevel) 1 LOC
  * win/README		(not patchlevel) (sections 0 and 2)
  * unix/tcl.spec	(1 LOC patch)
- * tests/basic.test	(1 LOC M/M, not patchlevel)
  * tools/tcl.hpj.in	(not patchlevel, for windows installer)
  * tools/tcl.wse.in	(for windows installer)
  * tools/tclSplash.bmp	(not patchlevel)
@@ -61,10 +60,10 @@ extern "C" {
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   5
 #define TCL_RELEASE_LEVEL   TCL_ALPHA_RELEASE
-#define TCL_RELEASE_SERIAL  6
+#define TCL_RELEASE_SERIAL  7
 
 #define TCL_VERSION	    "8.5"
-#define TCL_PATCH_LEVEL	    "8.5a6"
+#define TCL_PATCH_LEVEL	    "8.5a7"
 
 /*
  * The following definitions set up the proper options for Windows compilers.
diff --git a/generic/tclParse.c b/generic/tclParse.c
index aef6e0b..4e4379c 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -12,19 +12,12 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclParse.c,v 1.51 2007/04/10 22:13:20 dkf Exp $
+ * RCS: @(#) $Id: tclParse.c,v 1.52 2007/05/18 18:39:30 dgp Exp $
  */
 
 #include "tclInt.h"
 
 /*
- * For now, we enable the {expand} although it is deprecated - remove by final
- */
-#ifndef ALLOW_EXPAND
-#define ALLOW_EXPAND 1
-#endif
-
-/*
  * The following table provides parsing information about each possible 8-bit
  * character. The table is designed to be referenced with either signed or
  * unsigned characters, so it has 384 entries. The first 128 entries
@@ -388,13 +381,6 @@ Tcl_ParseCommand(
 		&& (((1 == (size_t) expPtr->size)
 			    /* Same length as prefix */
 			    && (expPtr->start[0] == '*'))
-#if defined(ALLOW_EXPAND) && ALLOW_EXPAND == 1
-			/*
-			 * Allow {expand} in addition to {*}
-			 */
-			|| ((6 == (size_t) expPtr->size)
-				&& (0 == memcmp("expand",expPtr->start,6)))
-#endif
 		    )
 		/* Is the prefix */
 		&& (numBytes > 0)
diff --git a/library/init.tcl b/library/init.tcl
index 838aa7b..e1ff2a3 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -3,7 +3,7 @@
 # Default system startup file for Tcl-based applications.  Defines
 # "unknown" procedure and auto-load facilities.
 #
-# RCS: @(#) $Id: init.tcl,v 1.90 2006/12/01 15:55:45 dgp Exp $
+# RCS: @(#) $Id: init.tcl,v 1.91 2007/05/18 18:39:30 dgp Exp $
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -17,7 +17,7 @@
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.5a6
+package require -exact Tcl 8.5a7
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
diff --git a/tests/info.test b/tests/info.test
index dbca511..527d217 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -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: info.test,v 1.43 2006/12/17 03:43:40 das Exp $
+# RCS: @(#) $Id: info.test,v 1.44 2007/05/18 18:39:31 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -1066,12 +1066,12 @@ namespace delete foo
 
 # -------------------------------------------------------------------------
 
-namespace {expand}{
+namespace {*}{
     eval
     foo
     {proc bar {} {info frame 0}}
 }
-test info-33.0 {expand, literal, direct} {
+test info-33.0 {{*}, literal, direct} {
     reduce [foo::bar]
 } {type source line 1072 file info.test cmd {info frame 0} proc ::foo::bar level 0}
 
@@ -1082,12 +1082,12 @@ namespace delete foo
 namespace eval foo {}
 proc foo::bar {} {
     set flag 1
-    if {expand}{
+    if {*}{
 	{$flag}
 	{info frame 0}
     }
 }
-test info-33.1 {expand, literal, simple, bytecompiled} {
+test info-33.1 {{*}, literal, simple, bytecompiled} {
     reduce [foo::bar]
 } {type source line 1087 file info.test cmd {info frame 0} proc ::foo::bar level 0}
 
@@ -1102,8 +1102,8 @@ set body {
 	info frame 0
     }}
 }
-namespace {expand}$body
-test info-34.0 {expand, dynamic, direct} {
+namespace {*}$body
+test info-34.0 {{*}, dynamic, direct} {
     reduce [foo::bar]
 } {type proc line 2 cmd {info frame 0} proc ::foo::bar level 0}
 
@@ -1119,9 +1119,9 @@ set body {
 }
 proc foo::bar {} {
     global body ; set flag 1
-    if {expand}$body
+    if {*}$body
 }
-test info-34.1 {expand, literal, bytecompiled} {
+test info-34.1 {{*}, literal, bytecompiled} {
     reduce [foo::bar]
 } {type eval line 1 cmd {info frame 0} proc ::foo::bar level 0}
 
@@ -1248,12 +1248,12 @@ namespace delete foo
 
 # -------------------------------------------------------------------------
 
-namespace {expand}"
+namespace {*}"
     eval
     foo
     {proc bar {} {info frame 0}}
 "
-test info-33.2 {expand, literal, direct} {
+test info-33.2 {{*}, literal, direct} {
     reduce [foo::bar]
 } {type source line 1254 file info.test cmd {info frame 0} proc ::foo::bar level 0}
 
@@ -1261,9 +1261,9 @@ namespace delete foo
 
 # -------------------------------------------------------------------------
 
-namespace {expand}"eval\nfoo\n{proc bar {} {info frame 0}}\n"
+namespace {*}"eval\nfoo\n{proc bar {} {info frame 0}}\n"
 
-test info-33.2a {expand, literal, not simple, direct} {
+test info-33.2a {{*}, literal, not simple, direct} {
     reduce [foo::bar]
 } {type proc line 1 cmd {info frame 0} proc ::foo::bar level 0}
 
@@ -1274,12 +1274,12 @@ namespace delete foo
 namespace eval foo {}
 proc foo::bar {} {
     set flag 1
-    if {expand}"
+    if {*}"
 	{1}
 	{info frame 0}
     "
 }
-test info-33.3 {expand, literal, simple, bytecompiled} {
+test info-33.3 {{*}, literal, simple, bytecompiled} {
     reduce [foo::bar]
 } {type source line 1279 file info.test cmd {info frame 0} proc ::foo::bar level 0}
 
@@ -1290,9 +1290,9 @@ namespace delete foo
 namespace eval foo {}
 proc foo::bar {} {
     set flag 1
-    if {expand}"\n{1}\n{info frame 0}"
+    if {*}"\n{1}\n{info frame 0}"
 }
-test info-33.3a {expand, literal, not simple, bytecompiled} {
+test info-33.3a {{*}, literal, not simple, bytecompiled} {
     reduce [foo::bar]
 } {type eval line 1 cmd {info frame 0} proc ::foo::bar level 0}
 
diff --git a/tests/mathop.test b/tests/mathop.test
index b7e886b..c3888cb 100644
--- a/tests/mathop.test
+++ b/tests/mathop.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: mathop.test,v 1.7 2006/12/08 20:48:09 dgp Exp $
+# RCS: @(#) $Id: mathop.test,v 1.8 2007/05/18 18:39:31 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2.1
@@ -32,7 +32,7 @@ proc TestOp {op args} {
     set results {}
 
     # Non byte compiled version, shared args
-    if {[catch {::tcl::mathop::$op {expand}$args} res]} {
+    if {[catch {::tcl::mathop::$op {*}$args} res]} {
         append res " $::errorCode"
     }
     lappend results $res
@@ -48,7 +48,7 @@ proc TestOp {op args} {
     lappend results $res
 
     # Non byte compiled imported
-    if {[catch {::testmathop2::$op {expand}$args} res]} {
+    if {[catch {::testmathop2::$op {*}$args} res]} {
         append res " $::errorCode"
     }
     lappend results [string map {testmathop2 tcl::mathop} $res]
@@ -70,18 +70,18 @@ proc TestOp {op args} {
     proc _TestOp3 $argList1 "::testmathop2::$op [join $argList2]"
 
     set ::tcl_traceCompile 0  ;# Set to 2 to help with debug
-    if {[catch {_TestOp {expand}$args} res]} {
+    if {[catch {_TestOp {*}$args} res]} {
         append res " $::errorCode"
     }
     set ::tcl_traceCompile 0
     lappend results $res
 
-    if {[catch {_TestOp2 {expand}$args} res]} {
+    if {[catch {_TestOp2 {*}$args} res]} {
         append res " $::errorCode"
     }
     lappend results $res
 
-    if {[catch {_TestOp3 {expand}$args} res]} {
+    if {[catch {_TestOp3 {*}$args} res]} {
         append res " $::errorCode"
     }
     lappend results [string map {testmathop2 tcl::mathop} $res]
@@ -776,7 +776,7 @@ test mathop-20.6 { one arg, error } {
     foreach vals {x {1 x} {1 1 x} {1 x 1}} {
         # skipping - for now, knownbug...
         foreach op {+ * / & | ^ **} {
-            lappend res [TestOp $op {expand}$vals]
+            lappend res [TestOp $op {*}$vals]
             lappend exp "can't use non-numeric string as operand of \"$op\" NONE"
         }
     }
@@ -786,7 +786,7 @@ test mathop-20.7 { multi arg } {
     set res {}
     foreach vals {{1 2} {3 4 5} {4 3 2 1}} {
         foreach op {+ - * /} {
-            lappend res [TestOp $op {expand}$vals]
+            lappend res [TestOp $op {*}$vals]
         }
     }
     set res
@@ -795,7 +795,7 @@ test mathop-20.8 { multi arg, double } {
     set res {}
     foreach vals {{1.0 2} {3.0 4 5} {4 3.0 2 1}} {
         foreach op {+ - * /} {
-            lappend res [TestOp $op {expand}$vals]
+            lappend res [TestOp $op {*}$vals]
         }
     }
     set res
@@ -873,7 +873,7 @@ test mathop-22.1 { bitwise ops } {
     set res {}
     foreach vals {5 {1 6} {1 2 3} {1 2 3 4}} {
         foreach op {& | ^} {
-            lappend res [TestOp $op {expand}$vals]
+            lappend res [TestOp $op {*}$vals]
         }
     }
     set res
@@ -890,7 +890,7 @@ test mathop-22.2 { bitwise ops on bignums } {
     foreach vals [list [list $a $b] [list $a $c] [list $b $c] \
                           [list $a $bn] [list $bn $c] [list $bn $cn]] {
         foreach op {& | ^} {
-            lappend res [TestOp $op {expand}$vals]
+            lappend res [TestOp $op {*}$vals]
         }
     }
     set exp {}
@@ -981,7 +981,7 @@ test mathop-23.1 { comparison ops, numerical } {
     lappend todo [list $a $a] ;# Same object
     foreach vals $todo {
         foreach op {< <= > >= == eq} {
-            lappend res [TestOp $op {expand}$vals]
+            lappend res [TestOp $op {*}$vals]
         }
     }
     set res
@@ -1007,7 +1007,7 @@ test mathop-23.2 { comparison ops, string } {
     lappend todo [list $a $a]
     foreach vals $todo {
         foreach op {< <= > >= == eq} {
-            lappend res [TestOp $op {expand}$vals]
+            lappend res [TestOp $op {*}$vals]
         }
     }
     set res
@@ -1023,7 +1023,7 @@ test mathop-23.3 { comparison ops, nonequal} {
     set res {}
     foreach vals {{a b} {17.0 0x11} {foo foo} {10 10}} {
         foreach op {!= ne} {
-            lappend res [TestOp $op {expand}$vals]
+            lappend res [TestOp $op {*}$vals]
         }
     }
     set res
@@ -1034,7 +1034,7 @@ test mathop-24.1 { binary ops } {
     foreach vals {{3 5} {17 7} {199 5} {293234675763434238476239486 17} \
                   {5 1} {0 7}} {
         foreach op {% << >> in ni} {
-            lappend res [TestOp $op {expand}$vals]
+            lappend res [TestOp $op {*}$vals]
         }
     }
     set res
diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
index 7ec1e63..4519de6 100644
--- a/tools/tcl.wse.in
+++ b/tools/tcl.wse.in
@@ -12,7 +12,7 @@ item: Global
   Log Pathname=%MAINDIR%\INSTALL.LOG
   Message Font=MS Sans Serif
   Font Size=8
-  Disk Label=tcl8.5a6
+  Disk Label=tcl8.5a7
   Disk Filename=setup
   Patch Flags=0000000000000001
   Patch Threshold=85
diff --git a/unix/configure b/unix/configure
index f4020f5..5a19050 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1333,7 +1333,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL="a6"
+TCL_PATCH_LEVEL="a7"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
diff --git a/unix/configure.in b/unix/configure.in
index 07648a6..4b907f1 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.156 2007/04/23 20:38:21 das Exp $
+# RCS: @(#) $Id: configure.in,v 1.157 2007/05/18 18:39:33 dgp Exp $
 
 AC_INIT([tcl],[8.5])
 AC_PREREQ(2.59)
@@ -27,7 +27,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL="a6"
+TCL_PATCH_LEVEL="a7"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
diff --git a/unix/tcl.spec b/unix/tcl.spec
index e62e476..351ad66 100644
--- a/unix/tcl.spec
+++ b/unix/tcl.spec
@@ -1,11 +1,11 @@
-# $Id: tcl.spec,v 1.26 2006/10/23 19:42:19 dgp Exp $
+# $Id: tcl.spec,v 1.27 2007/05/18 18:39:33 dgp Exp $
 # This file is the basis for a binary Tcl RPM for Linux.
 
 %{!?directory:%define directory /usr/local}
 
 Name:          tcl
 Summary:       Tcl scripting language development environment
-Version:       8.5a6
+Version:       8.5a7
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/win/configure b/win/configure
index 24017d0..ddb2099 100755
--- a/win/configure
+++ b/win/configure
@@ -1267,7 +1267,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL="a6"
+TCL_PATCH_LEVEL="a7"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.3
diff --git a/win/configure.in b/win/configure.in
index 2c01e16..0c8b38e 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tcl installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.91 2007/05/15 16:12:53 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.92 2007/05/18 18:39:34 dgp Exp $
 
 AC_INIT(../generic/tcl.h)
 AC_PREREQ(2.59)
@@ -16,7 +16,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL="a6"
+TCL_PATCH_LEVEL="a7"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.3