* generic/tclIOUtil.c: Changed default configuration to

        * generic/tclInt.decls: #undef USE_OBSOLETE_FS_HOOKS which disables
        * generic/tclTest.c:    access to the Tcl 8.3 internal routines for
        hooking into filesystem operations.  Everyone ought to have migrated
        to Tcl_Filesystems by now.
        ***POTENTIAL INCOMPATIBILITY*** for any code still stuck in the
        pre-Tcl_Filesystem era.

        * generic/tclIntDecls.h:        make genstubs
        * generic/tclStubInit.c:

        * generic/tclStrToD.c:  Removed dead code that permitted disabling
        of recognition of the new 0b and 0o numeric formats.

        * generic/tclExecute.c: Removed dead code that implemented alternative
        * generic/tclObj.c:     design where numeric values did not
        automatically narrow to the smallest Tcl_ObjType required to hold
        them.

8 files changed, 78 insertions, 158 deletions

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 42976d2..917f0ac 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclExecute.c,v 1.236 2006/03/30 01:03:24 msofer Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.237 2006/06/21 03:10:38 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -3725,7 +3725,6 @@ TclExecuteByteCode(
 	}
 
 	if (*pc == INST_MOD) {
-	    /* Following section assumes BIGNUM_AUTO_NARROW */
 	    /* TODO: Attempts to re-use unshared operands on stack */
 
 	    long l2 = 0; /* silence gcc warning */
@@ -4693,7 +4692,6 @@ TclExecuteByteCode(
 	    NEXT_INST_F(1, 1, 0);
 	}
 
-	/* Following section assumes BIGNUM_AUTO_NARROW */
 	/* TODO: Attempts to re-use unshared operands on stack */
 	if (*pc == INST_EXPON) {
 	    long l2 = 0;
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 1196352..c35e319 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -17,7 +17,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclIOUtil.c,v 1.131 2006/03/28 10:28:36 das Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.132 2006/06/21 03:10:39 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -240,7 +240,7 @@ Tcl_EvalFile(
  * support, I suggest all these hooks are removed.
  */
 
-#define USE_OBSOLETE_FS_HOOKS
+#undef USE_OBSOLETE_FS_HOOKS
 
 #ifdef USE_OBSOLETE_FS_HOOKS
 
@@ -807,9 +807,11 @@ TclFinalizeFilesystem(void)
      * filesystem is likely to fail.
      */
 
+#ifdef USE_OBSOLETE_FS_HOOKS
     statProcList = NULL;
     accessProcList = NULL;
     openFileChannelProcList = NULL;
+#endif
 #ifdef __WIN32__
     TclWinEncodingsCleanup();
 #endif
@@ -2149,9 +2151,9 @@ Tcl_FSOpenFileChannel(
 				 * what modes to create it? */
 {
     Tcl_Filesystem *fsPtr;
-#ifdef USE_OBSOLETE_FS_HOOKS
     Tcl_Channel retVal = NULL;
 
+#ifdef USE_OBSOLETE_FS_HOOKS
     /*
      * Call each of the "Tcl_OpenFileChannel" functions in succession. A
      * non-NULL return value indicates the particular function has succeeded.
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 47ce454..208ca9e 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: tclInt.decls,v 1.96 2006/03/21 11:06:22 das Exp $
+# RCS: @(#) $Id: tclInt.decls,v 1.97 2006/06/21 03:10:39 dgp Exp $
 
 library tcl
 
@@ -29,12 +29,12 @@ interface tclInt
 #declare 0 generic {
 #    int TclAccess(CONST char *path, int mode)
 #}
-declare 1 generic {
-    int TclAccessDeleteProc(TclAccessProc_ *proc)
-}
-declare 2 generic {
-    int TclAccessInsertProc(TclAccessProc_ *proc)
-}
+#declare 1 generic {
+#    int TclAccessDeleteProc(TclAccessProc_ *proc)
+#}
+#declare 2 generic {
+#    int TclAccessInsertProc(TclAccessProc_ *proc)
+#}
 declare 3 generic {
     void TclAllocateFreeObjects(void)
 }
@@ -278,12 +278,12 @@ declare 64 generic {
 #    int TclObjInvokeGlobal(Tcl_Interp *interp, int objc,
 #	    Tcl_Obj *CONST objv[], int flags)
 #}
-declare 66 generic {
-    int TclOpenFileChannelDeleteProc(TclOpenFileChannelProc_ *proc)
-}
-declare 67 generic {
-    int TclOpenFileChannelInsertProc(TclOpenFileChannelProc_ *proc)
-}
+#declare 66 generic {
+#    int TclOpenFileChannelDeleteProc(TclOpenFileChannelProc_ *proc)
+#}
+#declare 67 generic {
+#    int TclOpenFileChannelInsertProc(TclOpenFileChannelProc_ *proc)
+#}
 # Replaced by Tcl_FSAccess in 8.4:
 #declare 68 generic {
 #    int TclpAccess(CONST char *path, int mode)
@@ -425,12 +425,12 @@ declare 104 {unix win} {
 #declare 105 generic {
 #    int TclStat(CONST char *path, Tcl_StatBuf *buf)
 #}
-declare 106 generic {
-    int TclStatDeleteProc(TclStatProc_ *proc)
-}
-declare 107 generic {
-    int TclStatInsertProc(TclStatProc_ *proc)
-}
+#declare 106 generic {
+#    int TclStatDeleteProc(TclStatProc_ *proc)
+#}
+#declare 107 generic {
+#    int TclStatInsertProc(TclStatProc_ *proc)
+#}
 declare 108 generic {
     void TclTeardownNamespace(Namespace *nsPtr)
 }
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 2eeaa4d..1912451 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -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: tclIntDecls.h,v 1.86 2006/02/08 21:41:27 dgp Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.87 2006/06/21 03:10:39 dgp Exp $
  */
 
 #ifndef _TCLINTDECLS
@@ -43,18 +43,8 @@
  */
 
 /* Slot 0 is reserved */
-#ifndef TclAccessDeleteProc_TCL_DECLARED
-#define TclAccessDeleteProc_TCL_DECLARED
-/* 1 */
-EXTERN int		TclAccessDeleteProc _ANSI_ARGS_((
-				TclAccessProc_ * proc));
-#endif
-#ifndef TclAccessInsertProc_TCL_DECLARED
-#define TclAccessInsertProc_TCL_DECLARED
-/* 2 */
-EXTERN int		TclAccessInsertProc _ANSI_ARGS_((
-				TclAccessProc_ * proc));
-#endif
+/* Slot 1 is reserved */
+/* Slot 2 is reserved */
 #ifndef TclAllocateFreeObjects_TCL_DECLARED
 #define TclAllocateFreeObjects_TCL_DECLARED
 /* 3 */
@@ -345,18 +335,8 @@ EXTERN int		TclObjInvoke _ANSI_ARGS_((Tcl_Interp * interp,
 				int objc, Tcl_Obj *CONST objv[], int flags));
 #endif
 /* Slot 65 is reserved */
-#ifndef TclOpenFileChannelDeleteProc_TCL_DECLARED
-#define TclOpenFileChannelDeleteProc_TCL_DECLARED
-/* 66 */
-EXTERN int		TclOpenFileChannelDeleteProc _ANSI_ARGS_((
-				TclOpenFileChannelProc_ * proc));
-#endif
-#ifndef TclOpenFileChannelInsertProc_TCL_DECLARED
-#define TclOpenFileChannelInsertProc_TCL_DECLARED
-/* 67 */
-EXTERN int		TclOpenFileChannelInsertProc _ANSI_ARGS_((
-				TclOpenFileChannelProc_ * proc));
-#endif
+/* Slot 66 is reserved */
+/* Slot 67 is reserved */
 /* Slot 68 is reserved */
 #ifndef TclpAlloc_TCL_DECLARED
 #define TclpAlloc_TCL_DECLARED
@@ -492,16 +472,8 @@ EXTERN int		TclSockMinimumBuffers _ANSI_ARGS_((int sock,
 #endif
 #endif /* __WIN32__ */
 /* Slot 105 is reserved */
-#ifndef TclStatDeleteProc_TCL_DECLARED
-#define TclStatDeleteProc_TCL_DECLARED
-/* 106 */
-EXTERN int		TclStatDeleteProc _ANSI_ARGS_((TclStatProc_ * proc));
-#endif
-#ifndef TclStatInsertProc_TCL_DECLARED
-#define TclStatInsertProc_TCL_DECLARED
-/* 107 */
-EXTERN int		TclStatInsertProc _ANSI_ARGS_((TclStatProc_ * proc));
-#endif
+/* Slot 106 is reserved */
+/* Slot 107 is reserved */
 #ifndef TclTeardownNamespace_TCL_DECLARED
 #define TclTeardownNamespace_TCL_DECLARED
 /* 108 */
@@ -1054,8 +1026,8 @@ typedef struct TclIntStubs {
     struct TclIntStubHooks *hooks;
 
     void *reserved0;
-    int (*tclAccessDeleteProc) _ANSI_ARGS_((TclAccessProc_ * proc)); /* 1 */
-    int (*tclAccessInsertProc) _ANSI_ARGS_((TclAccessProc_ * proc)); /* 2 */
+    void *reserved1;
+    void *reserved2;
     void (*tclAllocateFreeObjects) _ANSI_ARGS_((void)); /* 3 */
     void *reserved4;
 #if !defined(__WIN32__) /* UNIX */
@@ -1129,8 +1101,8 @@ typedef struct TclIntStubs {
     int (*tclObjInterpProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 63 */
     int (*tclObjInvoke) _ANSI_ARGS_((Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags)); /* 64 */
     void *reserved65;
-    int (*tclOpenFileChannelDeleteProc) _ANSI_ARGS_((TclOpenFileChannelProc_ * proc)); /* 66 */
-    int (*tclOpenFileChannelInsertProc) _ANSI_ARGS_((TclOpenFileChannelProc_ * proc)); /* 67 */
+    void *reserved66;
+    void *reserved67;
     void *reserved68;
     char * (*tclpAlloc) _ANSI_ARGS_((unsigned int size)); /* 69 */
     void *reserved70;
@@ -1174,8 +1146,8 @@ typedef struct TclIntStubs {
     int (*tclSockMinimumBuffers) _ANSI_ARGS_((int sock, int size)); /* 104 */
 #endif /* __WIN32__ */
     void *reserved105;
-    int (*tclStatDeleteProc) _ANSI_ARGS_((TclStatProc_ * proc)); /* 106 */
-    int (*tclStatInsertProc) _ANSI_ARGS_((TclStatProc_ * proc)); /* 107 */
+    void *reserved106;
+    void *reserved107;
     void (*tclTeardownNamespace) _ANSI_ARGS_((Namespace * nsPtr)); /* 108 */
     int (*tclUpdateReturnInfo) _ANSI_ARGS_((Interp * iPtr)); /* 109 */
     void *reserved110;
@@ -1311,14 +1283,8 @@ extern TclIntStubs *tclIntStubsPtr;
  */
 
 /* Slot 0 is reserved */
-#ifndef TclAccessDeleteProc
-#define TclAccessDeleteProc \
-	(tclIntStubsPtr->tclAccessDeleteProc) /* 1 */
-#endif
-#ifndef TclAccessInsertProc
-#define TclAccessInsertProc \
-	(tclIntStubsPtr->tclAccessInsertProc) /* 2 */
-#endif
+/* Slot 1 is reserved */
+/* Slot 2 is reserved */
 #ifndef TclAllocateFreeObjects
 #define TclAllocateFreeObjects \
 	(tclIntStubsPtr->tclAllocateFreeObjects) /* 3 */
@@ -1515,14 +1481,8 @@ extern TclIntStubs *tclIntStubsPtr;
 	(tclIntStubsPtr->tclObjInvoke) /* 64 */
 #endif
 /* Slot 65 is reserved */
-#ifndef TclOpenFileChannelDeleteProc
-#define TclOpenFileChannelDeleteProc \
-	(tclIntStubsPtr->tclOpenFileChannelDeleteProc) /* 66 */
-#endif
-#ifndef TclOpenFileChannelInsertProc
-#define TclOpenFileChannelInsertProc \
-	(tclIntStubsPtr->tclOpenFileChannelInsertProc) /* 67 */
-#endif
+/* Slot 66 is reserved */
+/* Slot 67 is reserved */
 /* Slot 68 is reserved */
 #ifndef TclpAlloc
 #define TclpAlloc \
@@ -1626,14 +1586,8 @@ extern TclIntStubs *tclIntStubsPtr;
 #endif
 #endif /* __WIN32__ */
 /* Slot 105 is reserved */
-#ifndef TclStatDeleteProc
-#define TclStatDeleteProc \
-	(tclIntStubsPtr->tclStatDeleteProc) /* 106 */
-#endif
-#ifndef TclStatInsertProc
-#define TclStatInsertProc \
-	(tclIntStubsPtr->tclStatInsertProc) /* 107 */
-#endif
+/* Slot 106 is reserved */
+/* Slot 107 is reserved */
 #ifndef TclTeardownNamespace
 #define TclTeardownNamespace \
 	(tclIntStubsPtr->tclTeardownNamespace) /* 108 */
diff --git a/generic/tclObj.c b/generic/tclObj.c
index dca6e8d..7d89f98 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclObj.c,v 1.107 2006/03/29 15:09:04 dgp Exp $
+ * RCS: @(#) $Id: tclObj.c,v 1.108 2006/06/21 03:10:39 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -20,8 +20,6 @@
 #include "tommath.h"
 #include <float.h>
 
-#define BIGNUM_AUTO_NARROW 1
-
 /*
  * Table of all object types.
  */
@@ -1300,11 +1298,7 @@ Tcl_GetBooleanFromObj(
 	    return TCL_OK;
 	}
 	if (objPtr->typePtr == &tclBignumType) {
-#ifdef BIGNUM_AUTO_NARROW
 	    *boolPtr = 1;
-#else
-	    *boolPtr = ((objPtr->internalRep.ptrAndLongRep.value & 0x7fff)!=0);
-#endif
 	    return TCL_OK;
 	}
 #ifndef NO_WIDE_TYPE
@@ -1358,22 +1352,14 @@ SetBooleanFromAny(
 	    goto badBoolean;
 	}
 
-#ifdef BIGNUM_AUTO_NARROW
 	if (objPtr->typePtr == &tclBignumType) {
 	    goto badBoolean;
 	}
-#else
-	/*
-	 * TODO: Consider tests to discover values 0 and 1 while preserving
-	 * pure bignum. For now, pass through string rep.
-	 */
-#endif
 
 #ifndef NO_WIDE_TYPE
-	/*
-	 * TODO: Consider tests to discover values 0 and 1 while preserving
-	 * pure wide. For now, pass through string rep.
-	 */
+	if (objPtr->typePtr == &tclWideIntType) {
+	    goto badBoolean;
+	}
 #endif
 
 	if (objPtr->typePtr == &tclDoubleType) {
@@ -2607,11 +2593,7 @@ UpdateStringOfBignum(
     if (status != MP_OKAY) {
 	Tcl_Panic("radix size failure in UpdateStringOfBignum");
     }
-    if (size == 3
-#ifndef BIGNUM_AUTO_NARROW
-	    && bignumVal.used > 1
-#endif
-	    ) {
+    if (size == 3) {
 	/*
 	 * mp_radix_size() returns 3 when more than INT_MAX bytes would be
 	 * needed to hold the string rep (because mp_radix_size ignores
@@ -2889,7 +2871,6 @@ Tcl_SetBignumObj(
     if (Tcl_IsShared(objPtr)) {
 	Tcl_Panic("Tcl_SetBignumObj called with shared object");
     }
-#ifdef BIGNUM_AUTO_NARROW
     if (bignumValue->used
 	    <= (CHAR_BIT * sizeof(long) + DIGIT_BIT - 1) / DIGIT_BIT) {
 	unsigned long value = 0, numBytes = sizeof(long);
@@ -2939,7 +2920,6 @@ Tcl_SetBignumObj(
     }
   tooLargeForWide:
 #endif
-#endif
     TclInvalidateStringRep(objPtr);
     TclFreeIntRep(objPtr);
     TclSetBignumIntRep(objPtr, bignumValue);
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 369dab9..5b7993c 100755
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclStrToD.c,v 1.22 2006/04/26 13:42:43 dgp Exp $
+ * RCS: @(#) $Id: tclStrToD.c,v 1.23 2006/06/21 03:10:39 dgp Exp $
  *
  *----------------------------------------------------------------------
  */
@@ -29,19 +29,12 @@
 #include <tommath.h>
 
 /*
- * Define TIP_114_FORMATS to accept 0b and 0o for binary and octal strings.
- * Define KILL_OCTAL as well as TIP_114_FORMATS to suppress interpretation of
- * numbers with leading zero as octal. (Ceterum censeo: numeros octonarios
- * delendos esse.)
+ * Define KILL_OCTAL to suppress interpretation of numbers with leading zero
+ * as octal. (Ceterum censeo: numeros octonarios delendos esse.)
  */
 
-#define	TIP_114_FORMATS
 #undef	KILL_OCTAL
 
-#ifndef TIP_114_FORMATS
-#undef	KILL_OCTAL
-#endif
-
 /*
  * This code supports (at least hypothetically), IBM, Cray, VAX and IEEE-754
  * floating point; of these, only IEEE-754 can represent NaN. IEEE-754 can be
@@ -262,9 +255,7 @@ TclParseNumber(
 {
     enum State {
 	INITIAL, SIGNUM, ZERO, ZERO_X, 
-#ifdef TIP_114_FORMATS
 	ZERO_O, ZERO_B, BINARY,
-#endif
 	HEXADECIMAL, OCTAL, BAD_OCTAL, DECIMAL, 
 	LEADING_RADIX_POINT, FRACTION,
 	EXPONENT_START, EXPONENT_SIGNUM, EXPONENT,
@@ -310,9 +301,7 @@ TclParseNumber(
     char d = 0;			/* Last hexadecimal digit scanned; initialized
 				 * to avoid a compiler warning. */
     int shift = 0;		/* Amount to shift when accumulating binary */
-#ifdef TIP_114_FORMATS
     int explicitOctal = 0;
-#endif
 
 #define ALL_BITS	(~(Tcl_WideUInt)0)
 #define MOST_BITS	(ALL_BITS >> 1)
@@ -411,7 +400,6 @@ TclParseNumber(
 	    if (flags & TCL_PARSE_HEXADECIMAL_ONLY) {
 		goto zerox;
 	    }
-#ifdef TIP_114_FORMATS 
 	    if (flags & TCL_PARSE_SCAN_PREFIXES) {
 		goto zeroo;
 	    }
@@ -427,7 +415,6 @@ TclParseNumber(
 #ifdef KILL_OCTAL
 	    goto decimal;
 #endif
-#endif
 	    /* FALLTHROUGH */
 
 	case OCTAL:
@@ -440,10 +427,8 @@ TclParseNumber(
 	    acceptState = state;
 	    acceptPoint = p;
 	    acceptLen = len;
-#ifdef TIP_114_FORMATS
 	    /* FALLTHROUGH */
 	case ZERO_O:
-#endif
 	zeroo:
 	    if (c == '0') {
 		++numTrailZeros;
@@ -495,7 +480,6 @@ TclParseNumber(
 	    /* FALLTHROUGH */
 
 	case BAD_OCTAL:
-#ifdef TIP_114_FORMATS
 	    if (explicitOctal) {
 		/*
 		 * No forgiveness for bad digits in explicitly octal
@@ -504,7 +488,6 @@ TclParseNumber(
 
 		goto endgame;
 	    }
-#endif
 	    if (flags & TCL_PARSE_INTEGER_ONLY) {
 		/*
 		 * No seeking floating point when parsing only integer.
@@ -604,7 +587,6 @@ TclParseNumber(
 	    state = HEXADECIMAL;
 	    break;
 
-#ifdef TIP_114_FORMATS
 	case BINARY:
 	    acceptState = state;
 	    acceptPoint = p;
@@ -644,7 +626,6 @@ TclParseNumber(
 	    numTrailZeros = 0;
 	    state = BINARY;
 	    break;
-#endif
 
 	case DECIMAL:
 	    /*
@@ -928,10 +909,8 @@ TclParseNumber(
 	case SIGNUM:
 	case BAD_OCTAL:
 	case ZERO_X:
-#ifdef TIP_114_FORMATS
 	case ZERO_O:
 	case ZERO_B:
-#endif
 	case LEADING_RADIX_POINT:
 	case EXPONENT_START:
 	case EXPONENT_SIGNUM:
@@ -948,7 +927,6 @@ TclParseNumber(
 	    Tcl_Panic("TclParseNumber: bad acceptState %d parsing '%s'",
 		    acceptState, bytes);
 
-#ifdef TIP_114_FORMATS
 	case BINARY:
 	    shift = numTrailZeros;
 	    if (!significandOverflow && significandWide != 0 &&
@@ -965,7 +943,6 @@ TclParseNumber(
 		}
 	    }
 	    goto returnInteger;
-#endif
 
 	case HEXADECIMAL:
 	    /*
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 79130e2..9d52015 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -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: tclStubInit.c,v 1.130 2006/03/21 11:06:22 das Exp $
+ * RCS: @(#) $Id: tclStubInit.c,v 1.131 2006/06/21 03:10:39 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -77,8 +77,8 @@ TclIntStubs tclIntStubs = {
     TCL_STUB_MAGIC,
     NULL,
     NULL, /* 0 */
-    TclAccessDeleteProc, /* 1 */
-    TclAccessInsertProc, /* 2 */
+    NULL, /* 1 */
+    NULL, /* 2 */
     TclAllocateFreeObjects, /* 3 */
     NULL, /* 4 */
 #if !defined(__WIN32__) /* UNIX */
@@ -152,8 +152,8 @@ TclIntStubs tclIntStubs = {
     TclObjInterpProc, /* 63 */
     TclObjInvoke, /* 64 */
     NULL, /* 65 */
-    TclOpenFileChannelDeleteProc, /* 66 */
-    TclOpenFileChannelInsertProc, /* 67 */
+    NULL, /* 66 */
+    NULL, /* 67 */
     NULL, /* 68 */
     TclpAlloc, /* 69 */
     NULL, /* 70 */
@@ -197,8 +197,8 @@ TclIntStubs tclIntStubs = {
     TclSockMinimumBuffers, /* 104 */
 #endif /* __WIN32__ */
     NULL, /* 105 */
-    TclStatDeleteProc, /* 106 */
-    TclStatInsertProc, /* 107 */
+    NULL, /* 106 */
+    NULL, /* 107 */
     TclTeardownNamespace, /* 108 */
     TclUpdateReturnInfo, /* 109 */
     NULL, /* 110 */
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 1249eb9..5f62096 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclTest.c,v 1.102 2006/03/14 19:34:27 vincentdarley Exp $
+ * RCS: @(#) $Id: tclTest.c,v 1.103 2006/06/21 03:10:40 dgp Exp $
  */
 
 #define TCL_TEST
@@ -203,8 +203,16 @@ static void		ObjTraceDeleteProc(ClientData clientData);
 static void		PrintParse(Tcl_Interp *interp, Tcl_Parse *parsePtr);
 static void		SpecialFree(char *blockPtr);
 static int		StaticInitProc(Tcl_Interp *interp);
+#undef USE_OBSOLETE_FS_HOOKS
+#ifdef USE_OBSOLETE_FS_HOOKS
 static int		TestaccessprocCmd(ClientData dummy,
 			    Tcl_Interp *interp, int argc, CONST char **argv);
+static int		TestopenfilechannelprocCmd(
+			    ClientData dummy, Tcl_Interp *interp, int argc,
+			    CONST char **argv);
+static int		TeststatprocCmd(ClientData dummy,
+			    Tcl_Interp *interp, int argc, CONST char **argv);
+#endif
 static int		PretendTclpAccess(CONST char *path, int mode);
 static int		TestAccessProc1(CONST char *path, int mode);
 static int		TestAccessProc2(CONST char *path, int mode);
@@ -337,9 +345,6 @@ static int		TestseterrorcodeCmd(ClientData dummy,
 static int		TestsetobjerrorcodeCmd(
 			    ClientData dummy, Tcl_Interp *interp,
 			    int objc, Tcl_Obj *CONST objv[]);
-static int		TestopenfilechannelprocCmd(
-			    ClientData dummy, Tcl_Interp *interp, int argc,
-			    CONST char **argv);
 static int		TestsetplatformCmd(ClientData dummy,
 			    Tcl_Interp *interp, int argc, CONST char **argv);
 static int		TeststaticpkgCmd(ClientData dummy,
@@ -352,8 +357,6 @@ static int		TestStatProc2(CONST char *path,
 			    struct stat *buf);
 static int		TestStatProc3(CONST char *path,
 			    struct stat *buf);
-static int		TeststatprocCmd(ClientData dummy,
-			    Tcl_Interp *interp, int argc, CONST char **argv);
 static int		TesttranslatefilenameCmd(ClientData dummy,
 			    Tcl_Interp *interp, int argc, CONST char **argv);
 static int		TestupvarCmd(ClientData dummy,
@@ -576,8 +579,14 @@ Tcltest_Init(
 	    (ClientData) 0, NULL);
     Tcl_CreateObjCommand(interp, "testgetindexfromobjstruct",
 	    TestGetIndexFromObjStructObjCmd, (ClientData) 0, NULL);
+#ifdef USE_OBSOLETE_FS_HOOKS
     Tcl_CreateCommand(interp, "testaccessproc", TestaccessprocCmd, (ClientData) 0,
 	    NULL);
+    Tcl_CreateCommand(interp, "testopenfilechannelproc",
+    	    TestopenfilechannelprocCmd, (ClientData) 0, NULL);
+    Tcl_CreateCommand(interp, "teststatproc", TeststatprocCmd, (ClientData) 0,
+	    NULL);
+#endif
     Tcl_CreateCommand(interp, "testasync", TestasyncCmd, (ClientData) 0, NULL);
     Tcl_CreateCommand(interp, "testchannel", TestChannelCmd,
             (ClientData) 0, NULL);
@@ -641,8 +650,6 @@ Tcltest_Init(
     Tcl_CreateCommand(interp, "testlink", TestlinkCmd, (ClientData) 0, NULL);
     Tcl_CreateObjCommand(interp, "testlocale", TestlocaleCmd, (ClientData) 0,
 	    NULL);
-    Tcl_CreateCommand(interp, "testopenfilechannelproc",
-    	    TestopenfilechannelprocCmd, (ClientData) 0, NULL);
     Tcl_CreateCommand(interp, "testpanic", TestpanicCmd, (ClientData) 0, NULL);
     Tcl_CreateObjCommand(interp, "testparser", TestparserObjCmd,
 	    (ClientData) 0, NULL);
@@ -677,8 +684,6 @@ Tcltest_Init(
     Tcl_CreateCommand(interp, "testupvar", TestupvarCmd, (ClientData) 0, NULL);
     Tcl_CreateMathFunc(interp, "T1", 0, NULL, TestMathFunc, (ClientData) 123);
     Tcl_CreateMathFunc(interp, "T2", 0, NULL, TestMathFunc, (ClientData) 345);
-    Tcl_CreateCommand(interp, "teststatproc", TeststatprocCmd, (ClientData) 0,
-	    NULL);
     Tcl_CreateCommand(interp, "testmainthread", TestmainthreadCmd, (ClientData) 0,
 	    NULL);
     Tcl_CreateCommand(interp, "testsetmainloop", TestsetmainloopCmd,
@@ -4962,6 +4967,7 @@ TestsaveresultFree(blockPtr)
 {
     freeCount++;
 }
+#ifdef USE_OBSOLETE_FS_HOOKS
 
 /*
  *----------------------------------------------------------------------
@@ -5154,6 +5160,7 @@ TestStatProc3(path, buf)
     buf->st_size = 3456;
     return ((strstr(path, "testStat3%.fil") == NULL) ? -1 : 0);
 }
+#endif
 
 /*
  *----------------------------------------------------------------------
@@ -5271,6 +5278,7 @@ TestexitmainloopCmd (dummy, interp, argc, argv)
   exitMainLoop = 1;
   return TCL_OK;
 }
+#ifdef USE_OBSOLETE_FS_HOOKS
 
 /*
  *----------------------------------------------------------------------
@@ -5576,6 +5584,7 @@ TestOpenFileChannelProc3(interp, fileName, modeString, permissions)
 	return (NULL);
     }
 }
+#endif
 
 /*
  *----------------------------------------------------------------------