diff options
author | dgp <dgp@noemail.net> | 2005-04-22 16:29:57 (GMT) |
---|---|---|
committer | dgp <dgp@noemail.net> | 2005-04-22 16:29:57 (GMT) |
commit | cbaeabcc5ab8525f0cb7311a26f53decc59fc50c (patch) | |
tree | 3eafbed9214dc65b3107a5a8200d660379db2c50 /generic/tclCmdMZ.c | |
parent | 2a25760bcc34355c3afc59f6824684fafb079d04 (diff) | |
download | tcl-cbaeabcc5ab8525f0cb7311a26f53decc59fc50c.zip tcl-cbaeabcc5ab8525f0cb7311a26f53decc59fc50c.tar.gz tcl-cbaeabcc5ab8525f0cb7311a26f53decc59fc50c.tar.bz2 |
* generic/tclCmdMZ.c: Corrected intrep-dependence of
* tests/string.test: [string is boolean] [Bug 1187123]
FossilOrigin-Name: 8c298ec89cec67a299becb8e763550d6c47b53e3
Diffstat (limited to 'generic/tclCmdMZ.c')
-rw-r--r-- | generic/tclCmdMZ.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c index ce28e54..45a2bed 100644 --- a/generic/tclCmdMZ.c +++ b/generic/tclCmdMZ.c @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCmdMZ.c,v 1.82.2.15 2005/03/18 16:33:42 dgp Exp $ + * RCS: @(#) $Id: tclCmdMZ.c,v 1.82.2.16 2005/04/22 16:30:02 dgp Exp $ */ #include "tclInt.h" @@ -1592,14 +1592,8 @@ Tcl_StringObjCmd(dummy, interp, objc, objv) case STR_IS_BOOL: case STR_IS_TRUE: case STR_IS_FALSE: - if (objPtr->typePtr == &tclBooleanType) { - if ((((enum isOptions) index == STR_IS_TRUE) && - objPtr->internalRep.longValue == 0) || - (((enum isOptions) index == STR_IS_FALSE) && - objPtr->internalRep.longValue != 0)) { - result = 0; - } - } else if ((Tcl_GetBoolean(NULL, string1, &i) + /* Optimizers, beware Bug 1187123 ! */ + if ((Tcl_GetBoolean(NULL, string1, &i) == TCL_ERROR) || (((enum isOptions) index == STR_IS_TRUE) && i == 0) || |