Merge 9.0. Fix testcases

7 files changed, 56 insertions, 57 deletions

diff --git a/generic/tcl.h b/generic/tcl.h
index c86b24e..afadbd0 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -318,9 +318,7 @@ typedef int Tcl_Size;
 #endif
 
 #ifdef _WIN32
-#   if TCL_MAJOR_VERSION > 8
-	typedef struct __stat64 Tcl_StatBuf;
-#   elif defined(_WIN64) || defined(_USE_64BIT_TIME_T)
+#   if TCL_MAJOR_VERSION > 8 || defined(_WIN64) || defined(_USE_64BIT_TIME_T)
 	typedef struct __stat64 Tcl_StatBuf;
 #   elif defined(_USE_32BIT_TIME_T)
 	typedef struct _stati64	Tcl_StatBuf;
@@ -329,26 +327,19 @@ typedef int Tcl_Size;
 #   endif
 #elif defined(__CYGWIN__)
     typedef struct {
-	dev_t st_dev;
+	unsigned st_dev;
 	unsigned short st_ino;
 	unsigned short st_mode;
 	short st_nlink;
 	short st_uid;
 	short st_gid;
 	/* Here is a 2-byte gap */
-	dev_t st_rdev;
+	unsigned st_rdev;
 	/* Here is a 4-byte gap */
 	long long st_size;
-#if TCL_MAJOR_VERSION > 8
-	struct {long long tv_sec;} st_atim;
-	struct {long long tv_sec;} st_mtim;
-	struct {long long tv_sec;} st_ctim;
-#else
 	struct {long tv_sec;} st_atim;
 	struct {long tv_sec;} st_mtim;
 	struct {long tv_sec;} st_ctim;
-	/* Here is a 4-byte gap */
-#endif
     } Tcl_StatBuf;
 #elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__)
     typedef struct stat64 Tcl_StatBuf;
@@ -768,8 +759,6 @@ typedef struct Tcl_Obj {
     (objPtr)->typePtr->setElementProc((interp), (objPtr), (indexCount), (indexArray), (valueObj))
 #define Tcl_ObjTypeReplace(interp, objPtr, first, numToDelete, numToInsert, insertObjs) \
     (objPtr)->typePtr->replaceProc((interp), (objPtr), (first), (numToDelete), (numToInsert), (insertObjs))
-#define Tcl_ObjTypeGetDouble(interp, objPtr, doublePtr) \
-    (objPtr)->typePtr->getDoubleProc((interp), (objPtr), (doublePtr))
 
 
 /*
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 4884818..bf42e4e 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -2736,7 +2736,7 @@ EachloopCmd(
 		result = TCL_ERROR;
 		goto done;
 	    }
-	    /* Don't compute values here, wait until the last momement */
+	    /* Don't compute values here, wait until the last moment */
 	    statePtr->argcList[i] = Tcl_ObjTypeLength(statePtr->aCopyList[i]);
 	} else {
 	    statePtr->aCopyList[i] = TclListObjCopy(interp, objv[2+i*2]);
@@ -2871,18 +2871,17 @@ ForeachAssignments(
 
     for (i=0 ; i<statePtr->numLists ; i++) {
 	int isAbstractList =
-	    ABSTRACTLIST_PROC(statePtr->aCopyList[i],indexProc) != NULL;
+		ABSTRACTLIST_PROC(statePtr->aCopyList[i],indexProc) != NULL;
 
 	for (v=0 ; v<statePtr->varcList[i] ; v++) {
 	    k = statePtr->index[i]++;
 	    if (k < statePtr->argcList[i]) {
 		if (isAbstractList) {
-		    if (Tcl_ObjTypeIndex(interp, statePtr->aCopyList[i], k, &valuePtr)
-                        != TCL_OK) {
+		    if (Tcl_ObjTypeIndex(interp, statePtr->aCopyList[i], k, &valuePtr) != TCL_OK) {
 			Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
-			    "\n    (setting %s loop variable \"%s\")",
-			    (statePtr->resultList != NULL ? "lmap" : "foreach"),
-			    TclGetString(statePtr->varvList[i][v])));
+				"\n    (setting %s loop variable \"%s\")",
+				(statePtr->resultList != NULL ? "lmap" : "foreach"),
+				TclGetString(statePtr->varvList[i][v])));
 			return TCL_ERROR;
 		    }
 		} else {
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 64b309d..93d1d46 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8251,7 +8251,6 @@ Tcl_SetChannelOption(
 	    return TCL_ERROR;
 	}
 	if (newMode) {
-	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
 	    SetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 	} else {
 	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
@@ -8264,7 +8263,6 @@ Tcl_SetChannelOption(
 	    return TCL_ERROR;
 	}
 	if (newMode) {
-	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 	    SetFlag(statePtr, CHANNEL_ENCODING_STRICT);
 	} else {
 	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 6bedfea..a05adec 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -2452,9 +2452,10 @@ Tcl_GetDoubleFromObj(
     double *dblPtr)	/* Place to store resulting double. */
 {
     do {
-        if (ABSTRACTLIST_PROC(objPtr, getDoubleProc)) {
-            return Tcl_ObjTypeGetDouble(interp, objPtr, dblPtr);
-        }
+	Tcl_ALGetDblProc *dblProc = ABSTRACTLIST_PROC(objPtr, getDoubleProc);
+	if (dblProc) {
+	    return dblProc(interp, objPtr, dblPtr);
+	}
 	if (objPtr->typePtr == &tclDoubleType) {
 	    if (isnan(objPtr->internalRep.doubleValue)) {
 		if (interp != NULL) {
diff --git a/generic/tclTest.c b/generic/tclTest.c
index e216ae9..6da598f 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -3090,15 +3090,16 @@ TestlinkCmd(
 	tmp = Tcl_NewWideIntObj(longVar);
 	Tcl_AppendElement(interp, Tcl_GetString(tmp));
 	Tcl_DecrRefCount(tmp);
+#ifdef TCL_WIDE_INT_IS_LONG
 	if (ulongVar > WIDE_MAX) {
 		mp_int bignumValue;
 		if (mp_init_u64(&bignumValue, ulongVar) != MP_OKAY) {
 		    Tcl_Panic("%s: memory overflow", "Tcl_SetWideUIntObj");
 		}
 		tmp = Tcl_NewBignumObj(&bignumValue);
-	} else {
-	    tmp = Tcl_NewWideIntObj((Tcl_WideInt)ulongVar);
-	}
+	} else
+#endif /* TCL_WIDE_INT_IS_LONG */
+	tmp = Tcl_NewWideIntObj((Tcl_WideInt)ulongVar);
 	Tcl_AppendElement(interp, Tcl_GetString(tmp));
 	Tcl_DecrRefCount(tmp);
 	Tcl_PrintDouble(NULL, (double)floatVar, buffer);
diff --git a/generic/tclTestABSList.c b/generic/tclTestABSList.c
index ec7f8fb..07d04ec 100644
--- a/generic/tclTestABSList.c
+++ b/generic/tclTestABSList.c
@@ -69,9 +69,10 @@ static const Tcl_ObjType lstringTypes[11] = {
 	my_LStringObjIndex,
 	my_LStringObjRange,/*ObjRange*/
 	my_LStringObjReverse,
-        my_LStringGetElements,
+	my_LStringGetElements,
 	my_LStringObjSetElem, /* use default update string */
-	my_LStringReplace)
+	my_LStringReplace,
+	NULL)
     },
     {
 	"lstring",
@@ -80,13 +81,14 @@ static const Tcl_ObjType lstringTypes[11] = {
 	UpdateStringOfLString,
 	NULL,
 	TCL_OBJTYPE_V1(
-/**/	NULL, /*default my_LStringObjLength,*/
+	NULL, /*default my_LStringObjLength,*/
 	my_LStringObjIndex,
 	my_LStringObjRange,/*ObjRange*/
 	my_LStringObjReverse,
-        my_LStringGetElements,
+	my_LStringGetElements,
 	my_LStringObjSetElem, /* use default update string */
-	my_LStringReplace)
+	my_LStringReplace,
+	NULL)
     },
     {
 	"lstring",
@@ -96,13 +98,14 @@ static const Tcl_ObjType lstringTypes[11] = {
 	NULL,
 	TCL_OBJTYPE_V1(
 	my_LStringObjLength,
-/**/	NULL, /*default my_LStringObjIndex,*/
+	NULL, /*default my_LStringObjIndex,*/
 	my_LStringObjRange,/*ObjRange*/
 	my_LStringObjReverse,
-        my_LStringGetElements,
+	my_LStringGetElements,
 
 	my_LStringObjSetElem, /* use default update string */
-	my_LStringReplace)
+	my_LStringReplace,
+	NULL)
     },
     {
 	"lstring",
@@ -113,11 +116,12 @@ static const Tcl_ObjType lstringTypes[11] = {
 	TCL_OBJTYPE_V1(
 	my_LStringObjLength,
 	my_LStringObjIndex,
-/**/	NULL, /*default my_LStringObjRange,*/
+	NULL, /*default my_LStringObjRange,*/
 	my_LStringObjReverse,
-        my_LStringGetElements,
+	my_LStringGetElements,
 	my_LStringObjSetElem, /* use default update string */
-	my_LStringReplace)
+	my_LStringReplace,
+	NULL)
     },
     {
 	"lstring",
@@ -129,10 +133,11 @@ static const Tcl_ObjType lstringTypes[11] = {
 	my_LStringObjLength,
 	my_LStringObjIndex,
 	my_LStringObjRange,/*ObjRange*/
-/**/	NULL, /*defaults my_LStringObjReverse,*/
-        my_LStringGetElements,
+	NULL, /*defaults my_LStringObjReverse,*/
+	my_LStringGetElements,
 	my_LStringObjSetElem, /* use default update string */
-	my_LStringReplace)
+	my_LStringReplace,
+	NULL)
     },
     {
 	"lstring",
@@ -145,9 +150,10 @@ static const Tcl_ObjType lstringTypes[11] = {
 	my_LStringObjIndex,
 	my_LStringObjRange,/*ObjRange*/
 	my_LStringObjReverse,
-/**/	NULL, /*default NULL / *my_LStringGetElements,*/
+	NULL, /*default NULL / *my_LStringGetElements,*/
 	my_LStringObjSetElem, /* use default update string */
-	my_LStringReplace)
+	my_LStringReplace,
+	NULL)
     },
     {
 	"lstring",
@@ -160,9 +166,10 @@ static const Tcl_ObjType lstringTypes[11] = {
 	my_LStringObjIndex,
 	my_LStringObjRange,/*ObjRange*/
 	my_LStringObjReverse,
-        my_LStringGetElements,
+	my_LStringGetElements,
 	my_LStringObjSetElem, /* use default update string */
-	my_LStringReplace)
+	my_LStringReplace,
+	NULL)
     },
     {
 	"lstring",
@@ -175,9 +182,10 @@ static const Tcl_ObjType lstringTypes[11] = {
 	my_LStringObjIndex,
 	my_LStringObjRange,/*ObjRange*/
 	my_LStringObjReverse,
-        my_LStringGetElements,
+	my_LStringGetElements,
 	my_LStringObjSetElem, /* use default update string */
-	my_LStringReplace)
+	my_LStringReplace,
+	NULL)
     },
     {
 	"lstring",
@@ -190,9 +198,10 @@ static const Tcl_ObjType lstringTypes[11] = {
 	my_LStringObjIndex,
 	my_LStringObjRange,/*ObjRange*/
 	my_LStringObjReverse,
-        my_LStringGetElements,
-/**/	NULL, /*default my_LStringObjSetElem, / * use default update string */
-	NULL) /*default my_LStringReplace*/
+	my_LStringGetElements,
+	NULL, /*default my_LStringObjSetElem, / * use default update string */
+	NULL, /*default my_LStringReplace*/
+	NULL)
     },
     {
 	"lstring",
@@ -205,9 +214,10 @@ static const Tcl_ObjType lstringTypes[11] = {
 	my_LStringObjIndex,
 	my_LStringObjRange,/*ObjRange*/
 	my_LStringObjReverse,
-        my_LStringGetElements,
+	my_LStringGetElements,
 	my_LStringObjSetElem, /* use default update string */
-/**/	NULL) /*default my_LStringReplace*/
+	NULL, /*default my_LStringReplace*/
+	NULL)
     },
     {
 	"lstring",
@@ -220,9 +230,10 @@ static const Tcl_ObjType lstringTypes[11] = {
 	my_LStringObjIndex,
 	my_LStringObjRange,/*ObjRange*/
 	my_LStringObjReverse,
-        my_LStringGetElements,
+	my_LStringGetElements,
 	my_LStringObjSetElem, /* use default update string */
-	my_LStringReplace)
+	my_LStringReplace,
+	NULL)
     }
 };
 
diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h
index b421cde..40a4e9d 100644
--- a/generic/tclTomMath.h
+++ b/generic/tclTomMath.h
@@ -4,7 +4,7 @@
 #ifdef MP_NO_STDINT
 #   ifdef HAVE_STDINT_H
 #	include <stdint.h>
-#else
+#   else
 #	include "../compat/stdint.h"
 #   endif
 #endif