Tcl_RegisterObjType() in alphabetical order. Backport some formatting and type-casts from 8.7/9.0

1 files changed, 97 insertions, 93 deletions

diff --git a/generic/tclObj.c b/generic/tclObj.c
index 35c62c3..ec4655e 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -5,9 +5,9 @@
  *	Tcl commands.
  *
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- * Copyright (c) 1999 by Scriptics Corporation.
- * Copyright (c) 2001 by ActiveState Corporation.
- * Copyright (c) 2005 by Kevin B. Kenny.  All rights reserved.
+ * Copyright (c) 1999 Scriptics Corporation.
+ * Copyright (c) 2001 ActiveState Corporation.
+ * Copyright (c) 2005 Kevin B. Kenny.  All rights reserved.
  * Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net>
  *
  * See the file "license.terms" for information on usage and redistribution of
@@ -78,20 +78,20 @@ typedef struct ObjData {
 
 typedef struct ThreadSpecificData {
     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 defined(TCL_MEM_DEBUG) && defined(TCL_THREADS)
     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;
 
@@ -169,7 +169,7 @@ static __thread PendingObjData pendingObjData;
 static Tcl_ThreadDataKey pendingObjDataKey;
 #define ObjInitDeletionContext(contextPtr) \
     PendingObjData *const contextPtr =     \
-	    Tcl_GetThreadData(&pendingObjDataKey, sizeof(PendingObjData))
+	    (PendingObjData *)Tcl_GetThreadData(&pendingObjDataKey, sizeof(PendingObjData))
 #endif
 
 /*
@@ -195,7 +195,7 @@ static Tcl_ThreadDataKey pendingObjDataKey;
     if ((objPtr)->internalRep.twoPtrValue.ptr2 == INT2PTR(-1)) {        \
 	(bignum) = *((mp_int *) ((objPtr)->internalRep.twoPtrValue.ptr1));  \
     } else {                                                            \
-	(bignum).dp = (objPtr)->internalRep.twoPtrValue.ptr1;               \
+	(bignum).dp = (mp_digit *)(objPtr)->internalRep.twoPtrValue.ptr1;               \
 	(bignum).sign = PTR2INT((objPtr)->internalRep.twoPtrValue.ptr2) >> 30; \
 	(bignum).alloc =                                                    \
 		(PTR2INT((objPtr)->internalRep.twoPtrValue.ptr2) >> 15) & 0x7FFF; \
@@ -394,18 +394,18 @@ TclInitObjSubsystem(void)
     Tcl_InitHashTable(&typeTable, TCL_STRING_KEYS);
     Tcl_MutexUnlock(&tableMutex);
 
+    Tcl_RegisterObjType(&tclArraySearchType);
     Tcl_RegisterObjType(&tclByteArrayType);
+    Tcl_RegisterObjType(&tclByteCodeType);
+    Tcl_RegisterObjType(&tclCmdNameType);
+    Tcl_RegisterObjType(&tclDictType);
     Tcl_RegisterObjType(&tclDoubleType);
     Tcl_RegisterObjType(&tclEndOffsetType);
     Tcl_RegisterObjType(&tclIntType);
-    Tcl_RegisterObjType(&tclStringType);
     Tcl_RegisterObjType(&tclListType);
-    Tcl_RegisterObjType(&tclDictType);
-    Tcl_RegisterObjType(&tclByteCodeType);
-    Tcl_RegisterObjType(&tclArraySearchType);
-    Tcl_RegisterObjType(&tclCmdNameType);
-    Tcl_RegisterObjType(&tclRegexpType);
     Tcl_RegisterObjType(&tclProcBodyType);
+    Tcl_RegisterObjType(&tclRegexpType);
+    Tcl_RegisterObjType(&tclStringType);
 
     /* For backward compatibility only ... */
     Tcl_RegisterObjType(&oldBooleanType);
@@ -457,7 +457,7 @@ TclFinalizeThreadObjects(void)
     if (tablePtr != NULL) {
 	for (hPtr = Tcl_FirstHashEntry(tablePtr, &hSearch);
 		hPtr != NULL; hPtr = Tcl_NextHashEntry(&hSearch)) {
-	    ObjData *objData = Tcl_GetHashValue(hPtr);
+	    ObjData *objData = (ObjData *)Tcl_GetHashValue(hPtr);
 
 	    if (objData != NULL) {
 		ckfree(objData);
@@ -636,7 +636,8 @@ TclContinuationsEnterDerived(
     int start,
     int *clNext)
 {
-    int length, end, num;
+    int length;
+    int end, num;
     int *wordCLLast = clNext;
 
     /*
@@ -730,10 +731,10 @@ TclContinuationsCopy(
 {
     ThreadSpecificData *tsdPtr = TclGetContLineTable();
     Tcl_HashEntry *hPtr =
-            Tcl_FindHashEntry(tsdPtr->lineCLPtr, originObjPtr);
+	    Tcl_FindHashEntry(tsdPtr->lineCLPtr, originObjPtr);
 
     if (hPtr) {
-	ContLineLoc *clLocPtr = Tcl_GetHashValue(hPtr);
+	ContLineLoc *clLocPtr = (ContLineLoc *)Tcl_GetHashValue(hPtr);
 
 	TclContinuationsEnter(objPtr, clLocPtr->num, clLocPtr->loc);
     }
@@ -764,12 +765,12 @@ TclContinuationsGet(
 {
     ThreadSpecificData *tsdPtr = TclGetContLineTable();
     Tcl_HashEntry *hPtr =
-            Tcl_FindHashEntry(tsdPtr->lineCLPtr, objPtr);
+	    Tcl_FindHashEntry(tsdPtr->lineCLPtr, objPtr);
 
     if (!hPtr) {
-        return NULL;
+	return NULL;
     }
-    return Tcl_GetHashValue(hPtr);
+    return (ContLineLoc *)Tcl_GetHashValue(hPtr);
 }
 
 /*
@@ -897,7 +898,7 @@ Tcl_AppendAllObjTypes(
     for (hPtr = Tcl_FirstHashEntry(&typeTable, &search);
 	    hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
 	Tcl_ListObjAppendElement(NULL, objPtr,
-		Tcl_NewStringObj(Tcl_GetHashKey(&typeTable, hPtr), -1));
+		Tcl_NewStringObj((char *)Tcl_GetHashKey(&typeTable, hPtr), -1));
     }
     Tcl_MutexUnlock(&tableMutex);
     return TCL_OK;
@@ -930,7 +931,7 @@ Tcl_GetObjType(
     Tcl_MutexLock(&tableMutex);
     hPtr = Tcl_FindHashEntry(&typeTable, typeName);
     if (hPtr != NULL) {
-	typePtr = Tcl_GetHashValue(hPtr);
+	typePtr = (const Tcl_ObjType *)Tcl_GetHashValue(hPtr);
     }
     Tcl_MutexUnlock(&tableMutex);
     return typePtr;
@@ -1017,7 +1018,7 @@ TclDbDumpActiveObjects(
 	fprintf(outFile, "total objects: %d\n", tablePtr->numEntries);
 	for (hPtr = Tcl_FirstHashEntry(tablePtr, &hSearch); hPtr != NULL;
 		hPtr = Tcl_NextHashEntry(&hSearch)) {
-	    ObjData *objData = Tcl_GetHashValue(hPtr);
+	    ObjData *objData = (ObjData *)Tcl_GetHashValue(hPtr);
 
 	    if (objData != NULL) {
 		fprintf(outFile,
@@ -1317,13 +1318,13 @@ 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.
 	     */
 
-	    ObjData *objData = Tcl_GetHashValue(hPtr);
+	    ObjData *objData = (ObjData *)Tcl_GetHashValue(hPtr);
 
 	    if (objData != NULL) {
 		ckfree(objData);
@@ -1401,10 +1402,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);
@@ -1492,10 +1493,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);
@@ -2005,14 +2006,15 @@ static int
 ParseBoolean(
     Tcl_Obj *objPtr)	/* The object to parse/convert. */
 {
-    int i, length, newBool;
+    int newBool;
     char lowerCase[6];
+    int i, length;
     const char *str = TclGetStringFromObj(objPtr, &length);
 
     if ((length < 1) || (length > 5)) {
 	/*
-         * Longest valid boolean string rep. is "false".
-         */
+	 * Longest valid boolean string rep. is "false".
+	 */
 
 	return TCL_ERROR;
     }
@@ -2284,8 +2286,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;
 	    }
@@ -2794,9 +2796,9 @@ Tcl_GetLongFromObj(
 #endif
 	if (objPtr->typePtr == &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;
@@ -3090,9 +3092,9 @@ Tcl_GetWideIntFromObj(
 	}
 	if (objPtr->typePtr == &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;
@@ -3426,9 +3428,9 @@ GetBignumFromObj(
 #endif
 	if (objPtr->typePtr == &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;
@@ -3678,8 +3680,8 @@ TclGetNumberFromObj(
 #endif
 	if (objPtr->typePtr == &tclBignumType) {
 	    static Tcl_ThreadDataKey bignumKey;
-	    mp_int *bigPtr = Tcl_GetThreadData(&bignumKey,
-		    (int) sizeof(mp_int));
+	    mp_int *bigPtr = (mp_int *)Tcl_GetThreadData(&bignumKey,
+		    (int)sizeof(mp_int));
 
 	    UNPACK_BIGNUM(objPtr, *bigPtr);
 	    *typePtr = TCL_NUMBER_BIG;
@@ -3746,7 +3748,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 */
@@ -3809,7 +3811,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 */
@@ -3874,7 +3876,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 */
@@ -3976,8 +3978,8 @@ TclCompareObjKeys(
     void *keyPtr,		/* New key to compare. */
     Tcl_HashEntry *hPtr)	/* Existing key to compare. */
 {
-    Tcl_Obj *objPtr1 = keyPtr;
-    Tcl_Obj *objPtr2 = (Tcl_Obj *) hPtr->key.oneWordValue;
+    Tcl_Obj *objPtr1 = (Tcl_Obj *)keyPtr;
+    Tcl_Obj *objPtr2 = (Tcl_Obj *)hPtr->key.oneWordValue;
     const char *p1, *p2;
     size_t l1, l2;
 
@@ -3985,7 +3987,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;
+       }
     */
 
     /*
@@ -4065,7 +4069,7 @@ TclHashObjKey(
     Tcl_HashTable *tablePtr,	/* Hash table. */
     void *keyPtr)		/* Key from which to compute hash value. */
 {
-    Tcl_Obj *objPtr = keyPtr;
+    Tcl_Obj *objPtr = (Tcl_Obj *)keyPtr;
     int length;
     const char *string = TclGetStringFromObj(objPtr, &length);
     unsigned int result = 0;
@@ -4163,24 +4167,24 @@ Tcl_GetCommandFromObj(
      * to discard the old rep and create a new one.
      */
 
-    resPtr = objPtr->internalRep.twoPtrValue.ptr1;
+    resPtr = (ResolvedCmdName *)objPtr->internalRep.twoPtrValue.ptr1;
     if ((objPtr->typePtr == &tclCmdNameType) && (resPtr != NULL)) {
-        Command *cmdPtr = resPtr->cmdPtr;
-
-        if ((cmdPtr->cmdEpoch == resPtr->cmdEpoch)
-                && !(cmdPtr->flags & CMD_IS_DELETED)
-                && (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)
+		&& !(cmdPtr->flags & CMD_IS_DELETED)
+		&& (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;
+	    }
+	}
     }
 
     /*
@@ -4188,11 +4192,11 @@ Tcl_GetCommandFromObj(
      * had is invalid one way or another.
      */
 
-    /* See [] why we cannot call SetCmdNameFromAny() directly here. */
+    /* See [07d13d99b0a9] why we cannot call SetCmdNameFromAny() directly here. */
     if (tclCmdNameType.setFromAnyProc(interp, objPtr) != TCL_OK) {
-        return NULL;
+	return NULL;
     }
-    resPtr = objPtr->internalRep.twoPtrValue.ptr1;
+    resPtr = (ResolvedCmdName *)objPtr->internalRep.twoPtrValue.ptr1;
     return (Tcl_Command) (resPtr ? resPtr->cmdPtr : NULL);
 }
 
@@ -4225,13 +4229,13 @@ TclSetCmdNameObj(
     Command *cmdPtr)		/* Points to Command structure that the
 				 * CmdName object should refer to. */
 {
-    Interp *iPtr = (Interp *) interp;
+    Interp *iPtr = (Interp *)interp;
     ResolvedCmdName *resPtr;
     Namespace *currNsPtr;
     const char *name;
 
     if (objPtr->typePtr == &tclCmdNameType) {
-	resPtr = objPtr->internalRep.twoPtrValue.ptr1;
+	resPtr = (ResolvedCmdName *)objPtr->internalRep.twoPtrValue.ptr1;
 	if (resPtr != NULL && resPtr->cmdPtr == cmdPtr) {
 	    return;
 	}
@@ -4295,9 +4299,9 @@ FreeCmdNameInternalRep(
     Tcl_Obj *objPtr)	/* CmdName object with internal
 				 * representation to free. */
 {
-    ResolvedCmdName *resPtr = objPtr->internalRep.twoPtrValue.ptr1;
+    ResolvedCmdName *resPtr = (ResolvedCmdName *)objPtr->internalRep.twoPtrValue.ptr1;
 
-    if (resPtr != NULL) {
+    if (resPtr != (ResolvedCmdName *)NULL) {
 	/*
 	 * Decrement the reference count of the ResolvedCmdName structure. If
 	 * there are no more uses, free the ResolvedCmdName structure.
@@ -4344,7 +4348,7 @@ DupCmdNameInternalRep(
     Tcl_Obj *srcPtr,		/* Object with internal rep to copy. */
     Tcl_Obj *copyPtr)	/* Object with internal rep to set. */
 {
-    ResolvedCmdName *resPtr = srcPtr->internalRep.twoPtrValue.ptr1;
+    ResolvedCmdName *resPtr = (ResolvedCmdName *)srcPtr->internalRep.twoPtrValue.ptr1;
 
     copyPtr->internalRep.twoPtrValue.ptr1 = resPtr;
     copyPtr->internalRep.twoPtrValue.ptr2 = NULL;
@@ -4380,7 +4384,7 @@ SetCmdNameFromAny(
     Tcl_Interp *interp,		/* Used for error reporting if not NULL. */
     Tcl_Obj *objPtr)	/* The object to convert. */
 {
-    Interp *iPtr = (Interp *) interp;
+    Interp *iPtr = (Interp *)interp;
     const char *name;
     Command *cmdPtr;
     Namespace *currNsPtr;
@@ -4410,7 +4414,7 @@ SetCmdNameFromAny(
 
     if (cmdPtr) {
 	cmdPtr->refCount++;
-	resPtr = objPtr->internalRep.twoPtrValue.ptr1;
+	resPtr = (ResolvedCmdName *)objPtr->internalRep.twoPtrValue.ptr1;
 	if ((objPtr->typePtr == &tclCmdNameType)
 		&& resPtr && (resPtr->refCount == 1)) {
 	    /*
@@ -4498,8 +4502,8 @@ Tcl_RepresentationCmd(
 
     snprintf(ptrBuffer, sizeof(ptrBuffer), "%p", (void *) objv[1]);
     descObj = Tcl_ObjPrintf("value is a %s with a refcount of %d,"
-            " object pointer at %s",
-            objv[1]->typePtr ? objv[1]->typePtr->name : "pure string",
+	    " object pointer at %s",
+	    objv[1]->typePtr ? objv[1]->typePtr->name : "pure string",
 	    objv[1]->refCount, ptrBuffer);
 
     /*
@@ -4529,9 +4533,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);