Merge 8.6

1 files changed, 67 insertions, 66 deletions

diff --git a/generic/tclObj.c b/generic/tclObj.c
index a00588a..0057c43 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -78,20 +78,20 @@ typedef struct {
 
 typedef struct {
     Tcl_HashTable *lineCLPtr;   /* This table remembers for each Tcl_Obj
-                                 * generated by a call to the function
-                                 * TclSubstTokens() from a literal text
-                                 * where bs+nl sequences occurred in it, if
-                                 * any. I.e. this table keeps track of
-                                 * invisible and stripped continuation lines.
-                                 * Its keys are Tcl_Obj pointers, the values
-                                 * are ContLineLoc pointers. See the file
-                                 * tclCompile.h for the definition of this
-                                 * structure, and for references to all
-                                 * related places in the core. */
+				 * generated by a call to the function
+				 * TclSubstTokens() from a literal text
+				 * where bs+nl sequences occurred in it, if
+				 * any. I.e. this table keeps track of
+				 * invisible and stripped continuation lines.
+				 * Its keys are Tcl_Obj pointers, the values
+				 * are ContLineLoc pointers. See the file
+				 * tclCompile.h for the definition of this
+				 * structure, and for references to all
+				 * related places in the core. */
 #if TCL_THREADS && defined(TCL_MEM_DEBUG)
     Tcl_HashTable *objThreadMap;/* Thread local table that is used to check
-                                 * that a Tcl_Obj was not allocated by some
-                                 * other thread. */
+				 * that a Tcl_Obj was not allocated by some
+				 * other thread. */
 #endif /* TCL_MEM_DEBUG && TCL_THREADS */
 } ThreadSpecificData;
 
@@ -386,19 +386,19 @@ TclInitObjSubsystem(void)
     Tcl_MutexUnlock(&tableMutex);
 
     Tcl_RegisterObjType(&tclByteArrayType);
+    Tcl_RegisterObjType(&tclByteCodeType);
+    Tcl_RegisterObjType(&tclCmdNameType);
+    Tcl_RegisterObjType(&tclDictType);
     Tcl_RegisterObjType(&tclDoubleType);
+    Tcl_RegisterObjType(&tclListType);
+    Tcl_RegisterObjType(&tclProcBodyType);
+    Tcl_RegisterObjType(&tclRegexpType);
 #if !defined(TCL_NO_DEPRECATED)
     Tcl_RegisterObjType(&tclStringType);
     /* Only registered for 8.7, not for 9.0 any more.
      * See [https://core.tcl-lang.org/tk/tktview/6b49149b4e] */
     Tcl_RegisterObjType(&tclUniCharStringType);
 #endif
-    Tcl_RegisterObjType(&tclListType);
-    Tcl_RegisterObjType(&tclDictType);
-    Tcl_RegisterObjType(&tclByteCodeType);
-    Tcl_RegisterObjType(&tclCmdNameType);
-    Tcl_RegisterObjType(&tclRegexpType);
-    Tcl_RegisterObjType(&tclProcBodyType);
 
     /* For backward compatibility only ... */
 #if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
@@ -727,7 +727,7 @@ TclContinuationsCopy(
 {
     ThreadSpecificData *tsdPtr = TclGetContLineTable();
     Tcl_HashEntry *hPtr =
-            Tcl_FindHashEntry(tsdPtr->lineCLPtr, originObjPtr);
+	    Tcl_FindHashEntry(tsdPtr->lineCLPtr, originObjPtr);
 
     if (hPtr) {
 	ContLineLoc *clLocPtr = (ContLineLoc *)Tcl_GetHashValue(hPtr);
@@ -761,10 +761,10 @@ TclContinuationsGet(
 {
     ThreadSpecificData *tsdPtr = TclGetContLineTable();
     Tcl_HashEntry *hPtr =
-            Tcl_FindHashEntry(tsdPtr->lineCLPtr, objPtr);
+	    Tcl_FindHashEntry(tsdPtr->lineCLPtr, objPtr);
 
     if (!hPtr) {
-        return NULL;
+	return NULL;
     }
     return (ContLineLoc *)Tcl_GetHashValue(hPtr);
 }
@@ -1319,7 +1319,7 @@ TclFreeObj(
 	if (!tablePtr) {
 	    Tcl_Panic("TclFreeObj: object table not initialized");
 	}
-	hPtr = Tcl_FindHashEntry(tablePtr, (char *) objPtr);
+	hPtr = Tcl_FindHashEntry(tablePtr, (char *)objPtr);
 	if (hPtr) {
 	    /*
 	     * As the Tcl_Obj is going to be deleted we remove the entry.
@@ -1403,10 +1403,10 @@ TclFreeObj(
 
     {
 	ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-        Tcl_HashEntry *hPtr;
+	Tcl_HashEntry *hPtr;
 
 	if (tsdPtr->lineCLPtr) {
-            hPtr = Tcl_FindHashEntry(tsdPtr->lineCLPtr, objPtr);
+	    hPtr = Tcl_FindHashEntry(tsdPtr->lineCLPtr, objPtr);
 	    if (hPtr) {
 		ckfree(Tcl_GetHashValue(hPtr));
 		Tcl_DeleteHashEntry(hPtr);
@@ -1494,10 +1494,10 @@ TclFreeObj(
 
     {
 	ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-        Tcl_HashEntry *hPtr;
+	Tcl_HashEntry *hPtr;
 
 	if (tsdPtr->lineCLPtr) {
-            hPtr = Tcl_FindHashEntry(tsdPtr->lineCLPtr, objPtr);
+	    hPtr = Tcl_FindHashEntry(tsdPtr->lineCLPtr, objPtr);
 	    if (hPtr) {
 		ckfree(Tcl_GetHashValue(hPtr));
 		Tcl_DeleteHashEntry(hPtr);
@@ -1785,7 +1785,7 @@ Tcl_InitStringRep(
 	} else {
 	    objPtr->bytes = (char *)attemptckalloc(numBytes + 1);
 	    if (objPtr->bytes) {
-		objPtr->length = (int) numBytes;
+		objPtr->length = numBytes;
 		if (bytes) {
 		    memcpy(objPtr->bytes, bytes, numBytes);
 		}
@@ -1799,7 +1799,7 @@ Tcl_InitStringRep(
 	} else {
 	    objPtr->bytes = (char *)attemptckalloc(numBytes + 1);
 	    if (objPtr->bytes) {
-		objPtr->length = (int) numBytes;
+		objPtr->length = numBytes;
 		objPtr->bytes[objPtr->length] = '\0';
 	    }
 	}
@@ -1813,7 +1813,7 @@ Tcl_InitStringRep(
 	    objPtr->bytes = (char *)attemptckrealloc(objPtr->bytes,
 		    numBytes + 1);
 	    if (objPtr->bytes) {
-		objPtr->length = (int) numBytes;
+		objPtr->length = numBytes;
 		objPtr->bytes[objPtr->length] = '\0';
 	    }
 	}
@@ -2556,8 +2556,8 @@ Tcl_GetDoubleFromObj(
 		if (interp != NULL) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			    "floating point value is Not a Number", -1));
-                    Tcl_SetErrorCode(interp, "TCL", "VALUE", "DOUBLE", "NAN",
-                            (char *)NULL);
+		    Tcl_SetErrorCode(interp, "TCL", "VALUE", "DOUBLE", "NAN",
+			    (char *)NULL);
 		}
 		return TCL_ERROR;
 	    }
@@ -2781,7 +2781,6 @@ Tcl_GetIntFromObj(
     return TCL_OK;
 #endif
 }
-
 
 /*
  *----------------------------------------------------------------------
@@ -3067,9 +3066,9 @@ Tcl_GetLongFromObj(
 #endif
 	if (TclHasInternalRep(objPtr, &tclDoubleType)) {
 	    if (interp != NULL) {
-                Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                        "expected integer but got \"%s\"",
-                        TclGetString(objPtr)));
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"expected integer but got \"%s\"",
+			TclGetString(objPtr)));
 		Tcl_SetErrorCode(interp, "TCL", "VALUE", "INTEGER", (char *)NULL);
 	    }
 	    return TCL_ERROR;
@@ -3375,9 +3374,9 @@ Tcl_GetWideIntFromObj(
 	}
 	if (TclHasInternalRep(objPtr, &tclDoubleType)) {
 	    if (interp != NULL) {
-                Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                        "expected integer but got \"%s\"",
-                        TclGetString(objPtr)));
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"expected integer but got \"%s\"",
+			TclGetString(objPtr)));
 		Tcl_SetErrorCode(interp, "TCL", "VALUE", "INTEGER", (char *)NULL);
 	    }
 	    return TCL_ERROR;
@@ -3544,9 +3543,9 @@ TclGetWideBitsFromObj(
 	}
 	if (TclHasInternalRep(objPtr, &tclDoubleType)) {
 	    if (interp != NULL) {
-                Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                        "expected integer but got \"%s\"",
-                        TclGetString(objPtr)));
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"expected integer but got \"%s\"",
+			TclGetString(objPtr)));
 		Tcl_SetErrorCode(interp, "TCL", "VALUE", "INTEGER", (char *)NULL);
 	    }
 	    return TCL_ERROR;
@@ -3834,9 +3833,9 @@ GetBignumFromObj(
 	}
 	if (TclHasInternalRep(objPtr, &tclDoubleType)) {
 	    if (interp != NULL) {
-                Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                        "expected integer but got \"%s\"",
-                        TclGetString(objPtr)));
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"expected integer but got \"%s\"",
+			TclGetString(objPtr)));
 		Tcl_SetErrorCode(interp, "TCL", "VALUE", "INTEGER", (char *)NULL);
 	    }
 	    return TCL_ERROR;
@@ -4212,7 +4211,7 @@ Tcl_DbIncrRefCount(
 	hPtr = Tcl_FindHashEntry(tablePtr, objPtr);
 	if (!hPtr) {
 	    Tcl_Panic("Trying to %s of Tcl_Obj allocated in another thread",
-                    "incr ref count");
+		    "incr ref count");
 	}
     }
 # endif /* TCL_THREADS */
@@ -4285,7 +4284,7 @@ Tcl_DbDecrRefCount(
 	hPtr = Tcl_FindHashEntry(tablePtr, objPtr);
 	if (!hPtr) {
 	    Tcl_Panic("Trying to %s of Tcl_Obj allocated in another thread",
-                    "decr ref count");
+		    "decr ref count");
 	}
     }
 # endif /* TCL_THREADS */
@@ -4367,7 +4366,7 @@ Tcl_DbIsShared(
 	hPtr = Tcl_FindHashEntry(tablePtr, objPtr);
 	if (!hPtr) {
 	    Tcl_Panic("Trying to %s of Tcl_Obj allocated in another thread",
-                    "check shared status");
+		    "check shared status");
 	}
     }
 # endif /* TCL_THREADS */
@@ -4478,7 +4477,9 @@ TclCompareObjKeys(
      * If the object pointers are the same then they match.
      * OPT: this comparison was moved to the caller
 
-       if (objPtr1 == objPtr2) return 1;
+       if (objPtr1 == objPtr2) {
+	   return 1;
+       }
     */
 
     /*
@@ -4658,21 +4659,21 @@ Tcl_GetCommandFromObj(
 
     resPtr = (ResolvedCmdName *)objPtr->internalRep.twoPtrValue.ptr1;
     if (TclHasInternalRep(objPtr, &tclCmdNameType)) {
-        Command *cmdPtr = resPtr->cmdPtr;
-
-        if ((cmdPtr->cmdEpoch == resPtr->cmdEpoch)
-                && (interp == cmdPtr->nsPtr->interp)
-                && !(cmdPtr->nsPtr->flags & NS_DYING)) {
-            Namespace *refNsPtr = (Namespace *)
-                    TclGetCurrentNamespace(interp);
-
-            if ((resPtr->refNsPtr == NULL)
-                || ((refNsPtr == resPtr->refNsPtr)
-                    && (resPtr->refNsId == refNsPtr->nsId)
-                    && (resPtr->refNsCmdEpoch == refNsPtr->cmdRefEpoch))) {
-                return (Tcl_Command) cmdPtr;
-            }
-        }
+	Command *cmdPtr = resPtr->cmdPtr;
+
+	if ((cmdPtr->cmdEpoch == resPtr->cmdEpoch)
+		&& (interp == cmdPtr->nsPtr->interp)
+		&& !(cmdPtr->nsPtr->flags & NS_DYING)) {
+	    Namespace *refNsPtr = (Namespace *)
+		    TclGetCurrentNamespace(interp);
+
+	    if ((resPtr->refNsPtr == NULL)
+		    || ((refNsPtr == resPtr->refNsPtr)
+		    && (resPtr->refNsId == refNsPtr->nsId)
+		    && (resPtr->refNsCmdEpoch == refNsPtr->cmdRefEpoch))) {
+		return (Tcl_Command) cmdPtr;
+	    }
+	}
     }
 
     /*
@@ -4682,7 +4683,7 @@ Tcl_GetCommandFromObj(
 
     /* See [07d13d99b0a9] why we cannot call SetCmdNameFromAny() directly here. */
     if (tclCmdNameType.setFromAnyProc(interp, objPtr) != TCL_OK) {
-        return NULL;
+	return NULL;
     }
     resPtr = (ResolvedCmdName *)objPtr->internalRep.twoPtrValue.ptr1;
     return (Tcl_Command) (resPtr ? resPtr->cmdPtr : NULL);
@@ -4991,9 +4992,9 @@ Tcl_RepresentationCmd(
     }
 
     if (objv[1]->bytes) {
-        Tcl_AppendToObj(descObj, ", string representation \"", -1);
+	Tcl_AppendToObj(descObj, ", string representation \"", -1);
 	Tcl_AppendLimitedToObj(descObj, objv[1]->bytes, objv[1]->length,
-                16, "...");
+		16, "...");
 	Tcl_AppendToObj(descObj, "\"", -1);
     } else {
 	Tcl_AppendToObj(descObj, ", no string representation", -1);