diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 7 | ||||
| -rw-r--r-- | generic/tclParse.c | 16 |
2 files changed, 4 insertions, 19 deletions
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) |