WIP Tcl TIP 484, types not registered in Tcl 9.0

Author: chrstphrchvz

Tcl.xs

@@ -546,13 +546,31 @@ SvFromTclObj(pTHX_ Tcl_Obj *objPtr)
 	 */
 	sv = newSV(0);
     }
-    else if (objPtr->typePtr == tclIntTypePtr) {
-	sv = newSViv(objPtr->internalRep.longValue);
+    else if (objPtr->typePtr == NULL) {
+	goto handle_as_string;
+    }
+    else if ((tclIntTypePtr != NULL && objPtr->typePtr == tclIntTypePtr) ||
+	     (tclWideIntTypePtr != NULL && objPtr->typePtr == tclWideIntTypePtr)) {
+	/*
+	 * Tcl TIP 484 means that value type 'int' may be 64-bit (or wider?)
+	 * even on 32-bit systems
+	 */
+	Tcl_WideInt w;
+	int code = Tcl_GetWideIntFromObj(NULL, objPtr, &w); /* this must return TCL_OK */
+	if (IVSIZE >= sizeof(Tcl_WideInt) ||
+	    (w >= (Tcl_WideInt)IV_MIN && w <= (Tcl_WideInt)IV_MAX)
+	   ) {
+	    sv = newSViv(w);
+	} else if (w >= (Tcl_WideInt)UV_MIN && w <= (Tcl_WideInt)UV_MAX) {
+	    sv = newSVuv(w);
+	} else {
+	    goto handle_as_string;
+	}
     }
     else if (objPtr->typePtr == tclDoubleTypePtr) {
 	sv = newSVnv(objPtr->internalRep.doubleValue);
     }
-    else if (objPtr->typePtr == tclBooleanTypePtr) {
+    else if (tclBooleanTypePtr != NULL && objPtr->typePtr == tclBooleanTypePtr) {
 	/*
 	 * Booleans can originate as words (yes/true/...), so if there is a
 	 * string rep, use it instead.  We could check if the first byte
@@ -566,7 +584,7 @@ SvFromTclObj(pTHX_ Tcl_Obj *objPtr)
 	    sv = newSVpvn(str, len);
 	}
     }
-    else if (objPtr->typePtr == tclByteArrayTypePtr) {
+    else if (tclByteArrayTypePtr != NULL && objPtr->typePtr == tclByteArrayTypePtr) {
 	str = (const char *) Tcl_GetByteArrayFromObj(objPtr, &len);
 	sv = newSVpvn(str, len);
     }
@@ -601,8 +619,9 @@ SvFromTclObj(pTHX_ Tcl_Obj *objPtr)
 	}
     }
     /* tclStringTypePtr is true unicode */
-    /* tclWideIntTypePtr is 64-bit int */
+    /* may also be handling int/wideInt outside of [IV_MIN,UV_MAX] */
     else {
+handle_as_string:
 	str = Tcl_GetStringFromObj(objPtr, &len);
 	sv = newSVpvn(str, len);
 	/* should turn on, but let's check this first for efficiency */
@@ -1838,13 +1857,38 @@ BOOT:
 	hvInterps = newHV();
     }
 
-    tclBooleanTypePtr   = Tcl_GetObjType("boolean");
-    tclByteArrayTypePtr = Tcl_GetObjType("bytearray");
     tclDoubleTypePtr    = Tcl_GetObjType("double");
-    tclIntTypePtr       = Tcl_GetObjType("int");
     tclListTypePtr      = Tcl_GetObjType("list");
     tclStringTypePtr    = Tcl_GetObjType("string");
-    tclWideIntTypePtr   = Tcl_GetObjType("wideInt");
+    {
+	/* As of Tcl 9.0, Tcl_GetObjType() returns NULL for these types */
+	Tcl_Obj *objPtr;
+
+	objPtr = Tcl_NewBooleanObj(0);
+	if (strcmp("boolean", objPtr->typePtr->name) == 0) {
+	    tclBooleanTypePtr = objPtr->typePtr;
+	}
+	Tcl_DecrRefCount(objPtr);
+
+	objPtr = Tcl_NewIntObj(0);
+	if (strcmp("int", objPtr->typePtr->name) == 0) {
+	    tclIntTypePtr = objPtr->typePtr;
+	}
+	Tcl_DecrRefCount(objPtr);
+#if !defined(TCL_WIDE_INT_IS_LONG) && LONGLONGSIZE > IVSIZE
+	objPtr = Tcl_NewWideIntObj((Tcl_WideInt)IV_MIN - 1);
+	if (strcmp("wideInt", objPtr->typePtr->name) == 0) {
+	    tclWideIntTypePtr = objPtr->typePtr;
+	}
+	Tcl_DecrRefCount(objPtr);
+#endif
+
+	objPtr = Tcl_NewByteArrayObj(NULL, 0);
+	if(strcmp("bytearray", objPtr->typePtr->name) == 0) {
+	    tclByteArrayTypePtr = objPtr->typePtr;
+	}
+	Tcl_DecrRefCount(objPtr);
+    }
 
     /* set up constant subs */
     {