* generic/tclBasic.c: Updated callers to call new routine.

        * generic/tclCompCmds.c:        Updated callers to call new routine.

3 files changed, 8 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index c32e1f6..32aa41e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,8 @@
 
 	* generic/tclInt.h (TclGetTruthValueFromObj):	New routine.
 	* generic/tclExecute.c:	Updated callers to call new routine.
+	* generic/tclBasic.c:	Updated callers to call new routine.
+	* generic/tclCompCmds.c:	Updated callers to call new routine.
 	* tests/obj.test:	Corrected bad tests that actually expected
 	values like "47" and "0xac" to be accepted as booleans.
 
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 17da494..43a0a2a 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclBasic.c,v 1.145 2005/04/19 16:32:53 dgp Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.146 2005/04/21 21:24:03 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -4042,20 +4042,7 @@ Tcl_ExprBoolean(interp, string, ptr)
 	    /*
 	     * Store a boolean based on the expression result.
 	     */
-
-	    if (resultPtr->typePtr == &tclIntType) {
-		*ptr = (resultPtr->internalRep.longValue != 0);
-	    } else if (resultPtr->typePtr == &tclDoubleType) {
-		*ptr = (resultPtr->internalRep.doubleValue != 0.0);
-	    } else if (resultPtr->typePtr == &tclWideIntType) {
-#ifndef TCL_WIDE_INT_IS_LONG
-		*ptr = (resultPtr->internalRep.wideValue != 0);
-#else
-		*ptr = (resultPtr->internalRep.longValue != 0);
-#endif
-	    } else {
-		result = Tcl_GetBooleanFromObj(interp, resultPtr, ptr);
-	    }
+	    result = TclGetTruthValueFromObj(interp, resultPtr, ptr);
 	    Tcl_DecrRefCount(resultPtr);  /* discard the result object */
 	}
 	if (result != TCL_OK) {
@@ -4165,13 +4152,7 @@ Tcl_ExprBooleanObj(interp, objPtr, ptr)
 
     result = Tcl_ExprObj(interp, objPtr, &resultPtr);
     if (result == TCL_OK) {
-	if (resultPtr->typePtr == &tclIntType) {
-	    *ptr = (resultPtr->internalRep.longValue != 0);
-	} else if (resultPtr->typePtr == &tclDoubleType) {
-	    *ptr = (resultPtr->internalRep.doubleValue != 0.0);
-	} else {
-	    result = Tcl_GetBooleanFromObj(interp, resultPtr, ptr);
-	}
+	result = TclGetTruthValueFromObj(interp, resultPtr, ptr);
 	Tcl_DecrRefCount(resultPtr);  /* discard the result object */
     }
     return result;
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 5cecd9f..def3851 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclCompCmds.c,v 1.62 2005/04/08 10:42:51 dkf Exp $
+ * RCS: @(#) $Id: tclCompCmds.c,v 1.63 2005/04/21 21:24:07 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -1113,7 +1113,7 @@ TclCompileIfCmd(interp, parsePtr, envPtr)
 	    Tcl_Obj *boolObj = Tcl_NewStringObj(testTokenPtr[1].start,
 		    testTokenPtr[1].size);
 	    Tcl_IncrRefCount(boolObj);
-	    code = Tcl_GetBooleanFromObj(NULL, boolObj, &boolVal);
+	    code = TclGetTruthValueFromObj(NULL, boolObj, &boolVal);
 	    Tcl_DecrRefCount(boolObj);
 	    if (code == TCL_OK) {
 		/*
@@ -3247,7 +3247,7 @@ TclCompileWhileCmd(interp, parsePtr, envPtr)
 
     boolObj = Tcl_NewStringObj(testTokenPtr[1].start, testTokenPtr[1].size);
     Tcl_IncrRefCount(boolObj);
-    code = Tcl_GetBooleanFromObj(NULL, boolObj, &boolVal);
+    code = TclGetTruthValueFromObj(NULL, boolObj, &boolVal);
     Tcl_DecrRefCount(boolObj);
     if (code == TCL_OK) {
 	if (boolVal) {