More refactoring

Author: jan.nijtmans

generic/tclObj.c

@@ -2006,7 +2006,6 @@ Tcl_GetBoolFromObj(
     char *charPtr)	/* Place to store resulting boolean. */
 {
     int result;
-    Tcl_Size length;
 
     if ((flags & TCL_NULL_OK) && (objPtr == NULL || Tcl_GetString(objPtr)[0] == '\0')) {
 	result = -1;
@@ -2062,22 +2061,6 @@ Tcl_GetBoolFromObj(
 	    }
 	    return TCL_OK;
 	}
-	/* Handle dict separately, because it doesn't have a lengthProc */
-	if (TclHasInternalRep(objPtr, &tclDictType)) {
-	    Tcl_DictObjSize(NULL, objPtr, &length);
-	    if (length > 0) {
-	    listRep:
-		if (interp) {
-		    Tcl_SetObjResult(interp, Tcl_ObjPrintf("expected boolean value%s but got a list",
-			    (flags & TCL_NULL_OK) ? " or \"\"" : ""));
-		}
-		return TCL_ERROR;
-	    }
-	}
-	Tcl_ObjTypeLengthProc *lengthProc = TclObjTypeHasProc(objPtr, lengthProc);
-	if (lengthProc && lengthProc(objPtr) > 1) {
-	    goto listRep;
-	}
     } while ((ParseBoolean(objPtr) == TCL_OK) || (TCL_OK ==
 	    TclParseNumber(interp, objPtr, (flags & TCL_NULL_OK)
 		    ? "boolean value or \"\"" : "boolean value", NULL,-1,NULL,0)));
@@ -2119,42 +2102,28 @@ TclSetBooleanFromAny(
     Tcl_Interp *interp,		/* Used for error reporting if not NULL. */
     Tcl_Obj *objPtr)	/* The object to convert. */
 {
-    /*
-     * For some "pure" numeric Tcl_ObjTypes (no string rep), we can determine
-     * whether a boolean conversion is possible without generating the string
-     * rep.
-     */
-
-    if (objPtr->bytes == NULL) {
-	if (TclHasInternalRep(objPtr, &tclIntType)) {
-	    if ((Tcl_WideUInt)objPtr->internalRep.wideValue < 2) {
-		return TCL_OK;
-	    }
-	    goto badBoolean;
-	}
-
-	if (TclHasInternalRep(objPtr, &tclBignumType)) {
-	    goto badBoolean;
-	}
-
-	if (TclHasInternalRep(objPtr, &tclDoubleType)) {
-	    goto badBoolean;
-	}
-    }
-
     if (ParseBoolean(objPtr) == TCL_OK) {
 	return TCL_OK;
     }
 
-  badBoolean:
     if (interp != NULL) {
-	Tcl_Size length;
-	const char *str = Tcl_GetStringFromObj(objPtr, &length);
 	Tcl_Obj *msg;
 
-	TclNewLiteralStringObj(msg, "expected boolean value but got \"");
-	Tcl_AppendLimitedToObj(msg, str, length, 50, "");
-	Tcl_AppendToObj(msg, "\"", -1);
+	TclNewLiteralStringObj(msg, "expected boolean value but got ");
+
+	Tcl_Size argc;
+	const char **argv = NULL;
+	if (!objPtr->bytes || ((TclMaxListLength(objPtr->bytes, TCL_INDEX_NONE, NULL) > 1)
+		&& Tcl_SplitList(NULL, objPtr->bytes, &argc, &argv) == TCL_OK)) {
+	    if (argv) {
+		Tcl_Free(argv);
+	    }
+	    Tcl_AppendToObj(msg, "a list", -1);
+	} else {
+	    Tcl_AppendToObj(msg, "\"", -1);
+	    Tcl_AppendLimitedToObj(msg, objPtr->bytes, objPtr->length, 50, "");
+	    Tcl_AppendToObj(msg, "\"", -1);
+	}
 	Tcl_SetObjResult(interp, msg);
 	Tcl_SetErrorCode(interp, "TCL", "VALUE", "BOOLEAN", (char *)NULL);
     }
@@ -2168,7 +2137,42 @@ ParseBoolean(
     int newBool;
     char lowerCase[6];
     Tcl_Size i, length;
-    const char *str = Tcl_GetStringFromObj(objPtr, &length);
+    const char *str;
+
+    /*
+     * For some "pure" numeric Tcl_ObjTypes (no string rep), we can determine
+     * whether a boolean conversion is possible without generating the string
+     * rep.
+     */
+
+    if (objPtr->bytes == NULL) {
+	if (TclHasInternalRep(objPtr, &tclIntType)) {
+	    if ((Tcl_WideUInt)objPtr->internalRep.wideValue < 2) {
+		return TCL_OK;
+	    }
+	    return TCL_ERROR;
+	}
+
+	if (TclHasInternalRep(objPtr, &tclBignumType)) {
+		return TCL_ERROR;
+	}
+
+	if (TclHasInternalRep(objPtr, &tclDoubleType)) {
+		return TCL_ERROR;
+	}
+	/* Handle dict separately, because it doesn't have a lengthProc */
+	if (TclHasInternalRep(objPtr, &tclDictType)) {
+	    Tcl_DictObjSize(NULL, objPtr, &length);
+	    if (length > 0) {
+		return TCL_ERROR;
+	    }
+	}
+	Tcl_ObjTypeLengthProc *lengthProc = TclObjTypeHasProc(objPtr, lengthProc);
+	if (lengthProc && lengthProc(objPtr) != 1) {
+	    return TCL_ERROR;
+	}
+    }
+    str = Tcl_GetStringFromObj(objPtr, &length);
 
     if ((length < 1) || (length > 5)) {
 	/*
@@ -2438,7 +2442,6 @@ Tcl_GetDoubleFromObj(
     Tcl_Obj *objPtr,	/* The object from which to get a double. */
     double *dblPtr)	/* Place to store resulting double. */
 {
-    Tcl_Size length;
     do {
 	if (TclHasInternalRep(objPtr, &tclDoubleType)) {
 	    if (isnan(objPtr->internalRep.doubleValue)) {
@@ -2464,22 +2467,6 @@ Tcl_GetDoubleFromObj(
 	    *dblPtr = TclBignumToDouble(&big);
 	    return TCL_OK;
 	}
-	/* Handle dict separately, because it doesn't have a lengthProc */
-	if (TclHasInternalRep(objPtr, &tclDictType)) {
-	    Tcl_DictObjSize(NULL, objPtr, &length);
-	    if (length > 0) {
-	    listRep:
-		if (interp) {
-		    Tcl_SetObjResult(interp,
-			    Tcl_NewStringObj("expected floating-point number but got a list", TCL_INDEX_NONE));
-		}
-		return TCL_ERROR;
-	    }
-	}
-	Tcl_ObjTypeLengthProc *lengthProc = TclObjTypeHasProc(objPtr, lengthProc);
-	if (lengthProc && lengthProc(objPtr) > 1) {
-	    goto listRep;
-	}
     } while (SetDoubleFromAny(interp, objPtr) == TCL_OK);
     return TCL_ERROR;
 }