Fix [1acd172c424b57c9] (by just reverting the change causing this). Not crucial for TIP #688. Also, make it compile/run using -DTCL_NO_DEPRECATED=1

9 files changed, 26 insertions, 35 deletions

diff --git a/generic/tcl.h b/generic/tcl.h
index a4480a7..0d3da74 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -230,7 +230,7 @@ extern "C" {
  * Miscellaneous declarations.
  */
 
-typedef void *ClientData;
+// typedef void *ClientData;
 
 /*
  * Darwin specific configure overrides (to support fat compiles, where
diff --git a/generic/tclClock.c b/generic/tclClock.c
index c0be910..cf5b7d5 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -2164,7 +2164,7 @@ ConvertUTCToLocal(
 	if (dataPtr->gmtTZName == NULL) {
 	    Tcl_Obj *tzName;
 	    tzdata = ClockGetTZData(clientData, interp, timezoneObj);
-	    if ( TclListObjGetElements(interp, tzdata, &rowc, &rowv) != TCL_OK
+	    if ( TclListObjGetElementsM(interp, tzdata, &rowc, &rowv) != TCL_OK
 	      || Tcl_ListObjIndex(interp, rowv[0], 3, &tzName) != TCL_OK) {
 		return TCL_ERROR;
 	    }
diff --git a/generic/tclClockFmt.c b/generic/tclClockFmt.c
index bf566ff..9bf10ed 100644
--- a/generic/tclClockFmt.c
+++ b/generic/tclClockFmt.c
@@ -32,7 +32,7 @@ TCL_DECLARE_MUTEX(ClockFmtMutex); /* Serializes access to common format list. */
 
 static void ClockFmtScnStorageDelete(ClockFmtScnStorage *fss);
 
-static void ClockFrmScnFinalize(ClientData clientData);
+static void ClockFrmScnFinalize(void *clientData);
 
 /*
  * Clock scan and format facilities.
@@ -1103,7 +1103,7 @@ LocaleListSearch(ClockFmtScnCmdArgs *opts,
     int minLen, int maxLen)
 {
     Tcl_Obj **lstv;
-    int	      lstc;
+    Tcl_Size lstc;
     Tcl_Obj *valObj;
 
     /* get msgcat value */
@@ -1113,7 +1113,7 @@ LocaleListSearch(ClockFmtScnCmdArgs *opts,
     }
 
     /* is a list */
-    if (TclListObjGetElements(opts->interp, valObj, &lstc, &lstv) != TCL_OK) {
+    if (TclListObjGetElementsM(opts->interp, valObj, &lstc, &lstv) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -1159,7 +1159,7 @@ ClockMCGetListIdxTree(
 	/* build new index */
 
 	Tcl_Obj **lstv;
-	int	  lstc;
+	Tcl_Size lstc;
 	Tcl_Obj *valObj;
 
 	objPtr = TclStrIdxTreeNewObj();
@@ -1172,7 +1172,7 @@ ClockMCGetListIdxTree(
 	    goto done;
 	}
 
-	if (TclListObjGetElements(opts->interp, valObj,
+	if (TclListObjGetElementsM(opts->interp, valObj,
 		&lstc, &lstv) != TCL_OK) {
 	    goto done;
 	};
@@ -1232,7 +1232,7 @@ ClockMCGetMultiListIdxTree(
 	/* build new index */
 
 	Tcl_Obj **lstv;
-	int	  lstc;
+	Tcl_Size	  lstc;
 	Tcl_Obj *valObj;
 
 	objPtr = TclStrIdxTreeNewObj();
@@ -1247,7 +1247,7 @@ ClockMCGetMultiListIdxTree(
 		goto done;
 	    }
 
-	    if (TclListObjGetElements(opts->interp, valObj,
+	    if (TclListObjGetElementsM(opts->interp, valObj,
 		    &lstc, &lstv) != TCL_OK) {
 		goto done;
 	    };
@@ -2809,7 +2809,7 @@ ClockFmtToken_LocaleERAYear_Proc(
     ClockFormatToken *tok,
     int *val)
 {
-    int rowc;
+    Tcl_Size rowc;
     Tcl_Obj **rowv;
 
     if (dateFmt->localeEra == NULL) {
@@ -2817,7 +2817,7 @@ ClockFmtToken_LocaleERAYear_Proc(
 	if (mcObj == NULL) {
 	    return TCL_ERROR;
 	}
-	if (TclListObjGetElements(opts->interp, mcObj, &rowc, &rowv) != TCL_OK) {
+	if (TclListObjGetElementsM(opts->interp, mcObj, &rowc, &rowv) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (rowc != 0) {
@@ -3349,9 +3349,8 @@ ClockFrmScnClearCaches(void)
 
 static void
 ClockFrmScnFinalize(
-    ClientData clientData)  /* Not used. */
+    TCL_UNUSED(void *))
 {
-	(void)clientData;
     Tcl_MutexLock(&ClockFmtMutex);
 #if CLOCK_FMT_SCN_STORAGE_GC_SIZE > 0
     /* clear GC */
diff --git a/generic/tclDate.h b/generic/tclDate.h
index 6369e14..911e285 100644
--- a/generic/tclDate.h
+++ b/generic/tclDate.h
@@ -270,7 +270,7 @@ ClockInitDateInfo(DateInfo *info) {
 #define CLF_LOCALE_USED (1 << 15)
 
 typedef struct ClockFmtScnCmdArgs {
-    ClientData clientData;  /* Opaque pointer to literal pool, etc. */
+    void *clientData;  /* Opaque pointer to literal pool, etc. */
     Tcl_Interp *interp;	    /* Tcl interpreter */
 
     Tcl_Obj *formatObj;	    /* Format */
@@ -513,7 +513,7 @@ MODULE_SCOPE void
 MODULE_SCOPE void
 		    GetJulianDayFromEraYearDay(
 			    TclDateFields *fields, int changeover);
-MODULE_SCOPE int    ConvertUTCToLocal(ClientData clientData, Tcl_Interp *,
+MODULE_SCOPE int    ConvertUTCToLocal(void *clientData, Tcl_Interp *,
 			    TclDateFields *, Tcl_Obj *timezoneObj, int);
 MODULE_SCOPE Tcl_Obj *
 		    LookupLastTransition(Tcl_Interp *, Tcl_WideInt,
@@ -524,7 +524,7 @@ MODULE_SCOPE int    TclClockFreeScan(Tcl_Interp *interp, DateInfo *info);
 /* tclClock.c module declarations */
 
 MODULE_SCOPE Tcl_Obj *
-		    ClockSetupTimeZone(ClientData clientData,
+		    ClockSetupTimeZone(void *clientData,
 		Tcl_Interp *interp, Tcl_Obj *timezoneObj);
 
 MODULE_SCOPE Tcl_Obj *
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 1bab757..8614171 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -369,14 +369,6 @@ TclNamespaceEnsembleCmd(
 	Tcl_SetEnsembleMappingDict(interp, token, mapObj);
 	Tcl_SetEnsembleUnknownHandler(interp, token, unknownObj);
 	Tcl_SetEnsembleParameterList(interp, token, paramObj);
-	/*
-	 * Ensemble should be compiled if it has map (performance purposes)
-	 * Currently only for internal using namespace (like ::tcl::clock).
-	 * (An enhancement for completelly compile-feature is in work.)
-	 */
-	if (mapObj != NULL && strncmp("::tcl::", nsPtr->fullName, 7) == 0) {
-	    Tcl_SetEnsembleFlags(interp, token, ENSEMBLE_COMPILE);
-	}
 
 	/*
 	 * Tricky! Must ensure that the result is not shared (command delete
diff --git a/generic/tclStrIdxTree.c b/generic/tclStrIdxTree.c
index d52f0ff..bdb16f2 100644
--- a/generic/tclStrIdxTree.c
+++ b/generic/tclStrIdxTree.c
@@ -226,13 +226,14 @@ TclStrIdxTreeAppend(
 int
 TclStrIdxTreeBuildFromList(
     TclStrIdxTree *idxTree,
-    int	       lstc,
+    Tcl_Size lstc,
     Tcl_Obj  **lstv,
-    ClientData *values)
+    void **values)
 {
     Tcl_Obj  **lwrv;
-    int i, ret = TCL_ERROR;
-    ClientData val;
+    Tcl_Size i;
+    int ret = TCL_ERROR;
+    void *val;
     const char *s, *e, *f;
     TclStrIdx	*item;
 
diff --git a/generic/tclStrIdxTree.h b/generic/tclStrIdxTree.h
index 37931ed..19e7624 100644
--- a/generic/tclStrIdxTree.h
+++ b/generic/tclStrIdxTree.h
@@ -29,7 +29,7 @@ typedef struct TclStrIdx {
     struct TclStrIdx *prevPtr;
     Tcl_Obj	*key;
     int		 length;
-    ClientData	 value;
+    void	*value;
 } TclStrIdx;
 
 
@@ -139,7 +139,7 @@ MODULE_SCOPE const char*
 			const char *start, const char *end);
 
 MODULE_SCOPE int    TclStrIdxTreeBuildFromList(TclStrIdxTree *idxTree,
-			int lstc, Tcl_Obj **lstv, ClientData *values);
+			Tcl_Size lstc, Tcl_Obj **lstv, void **values);
 
 MODULE_SCOPE Tcl_Obj*
 		    TclStrIdxTreeNewObj();
@@ -149,8 +149,7 @@ MODULE_SCOPE TclStrIdxTree*
 
 #if 1
 
-MODULE_SCOPE int    TclStrIdxTreeTestObjCmd(ClientData, Tcl_Interp *,
-			int, Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclStrIdxTreeTestObjCmd;
 #endif
 
 #endif /* _TCLSTRIDXTREE_H */
diff --git a/tests/clock.test b/tests/clock.test
index 8a2218c..8f82b00 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -315,7 +315,7 @@ test clock-1.0 "clock format - wrong # args" {
 
 test clock-1.0.1 "clock format - wrong # args (compiled ensemble with invalid syntax)" {
     list [catch {clock format 0 -too-few-options-4-test} msg] $msg $::errorCode
-} [subst {1 {wrong # args: should be "::tcl::clock::format $syntax"} {CLOCK wrongNumArgs}}]
+} [subst {1 {wrong # args: should be "clock format $syntax"} {CLOCK wrongNumArgs}}]
 
 test clock-1.1 "clock format - bad time" {
     list [catch {clock format foo} msg] $msg
diff --git a/tests/http.test b/tests/http.test
index cd61b7b..f7bb723 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -759,7 +759,7 @@ test http-idna-1.1.$ThreadLevel {IDNA package: basics} -returnCodes error -body
 } -result {wrong # args: should be "::tcl::idna subcommand ?arg ...?"}
 test http-idna-1.2.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna ?
-} -result {unknown subcommand "?": must be decode, encode, puny, or version}
+} -result {unknown or ambiguous subcommand "?": must be decode, encode, puny, or version}
 test http-idna-1.3.$ThreadLevel {IDNA package: basics} -body {
     ::tcl::idna version
 } -result 1.0.1
@@ -771,7 +771,7 @@ test http-idna-1.5.$ThreadLevel {IDNA package: basics} -returnCodes error -body
 } -result {wrong # args: should be "::tcl::idna puny subcommand ?arg ...?"}
 test http-idna-1.6.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna puny ?
-} -result {unknown subcommand "?": must be decode, or encode}
+} -result {unknown or ambiguous subcommand "?": must be decode, or encode}
 test http-idna-1.7.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna puny encode
 } -result {wrong # args: should be "::tcl::idna puny encode string ?case?"}