From 0f67d4faac5372c251720b6f818d319392f0b868 Mon Sep 17 00:00:00 2001 From: nijtmans Date: Mon, 17 May 2010 21:51:21 +0000 Subject: Fix [Bug 2996549]: Failure in expr.test on Win32 --- ChangeLog | 4 ++++ generic/tclStrToD.c | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4499fed..b6f9f34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-05-17 Jan Nijtmans + + * generic/tclStrToD.c: Fix [Bug 2996549]: Failure in expr.test on Win32 + 2010-05-17 Donal K. Fellows * generic/tclCmdIL.c (TclInfoFrame): Change this code to use diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c index 8094e87..1ee4c74 100755 --- a/generic/tclStrToD.c +++ b/generic/tclStrToD.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: tclStrToD.c,v 1.44 2010/05/03 14:36:41 nijtmans Exp $ + * RCS: @(#) $Id: tclStrToD.c,v 1.45 2010/05/17 21:51:21 nijtmans Exp $ * *---------------------------------------------------------------------- */ @@ -105,6 +105,7 @@ static int log2FLT_RADIX; /* Logarithm of the floating point radix. */ static int mantBits; /* Number of bits in a double's significand */ static mp_int pow5[9]; /* Table of powers of 5**(2**n), up to * 5**256 */ +static double tiny = 0.0; /* The smallest representable double */ static int maxDigits; /* The maximum number of digits to the left of * the decimal point of a double. */ static int minDigits; /* The maximum number of digits to the right @@ -1484,8 +1485,11 @@ MakeHighPrecisionDouble( goto returnValue; } retval = SafeLdExp(retval, machexp); - if (retval <= 0.0) { - retval = SafeLdExp(1.0, DBL_MIN_EXP * log2FLT_RADIX - mantBits); + if (tiny == 0.0) { + tiny = SafeLdExp(1.0, DBL_MIN_EXP * log2FLT_RADIX - mantBits); + } + if (retval < tiny) { + retval = tiny; } /* -- cgit v0.12