summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclExecute.c5
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ea72ec8..9ec3292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-24 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * generic/tclExecute.c (VerifyExprObjType): use GET_WIDE_OR_INT to
+ properly have tclIntType used for smaller values. This corrects
+ TclX bug 896727 and any other 3rd party extension that created
+ math functions but was not yet WIDE_INT aware in them.
+
2004-05-24 Miguel Sofer <msofer@users.sf.net>
* doc/set.n: accurate description of name resolution process,
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 10980db..4f3dff4 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.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: tclExecute.c,v 1.94.2.5 2003/09/19 18:43:00 msofer Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.94.2.6 2004/05/25 00:08:23 hobbs Exp $
*/
#include "tclInt.h"
@@ -4739,8 +4739,9 @@ VerifyExprObjType(interp, objPtr)
char *s = Tcl_GetStringFromObj(objPtr, &length);
if (TclLooksLikeInt(s, length)) {
+ long i;
Tcl_WideInt w;
- result = Tcl_GetWideIntFromObj((Tcl_Interp *) NULL, objPtr, &w);
+ GET_WIDE_OR_INT(result, objPtr, i, w);
} else {
double d;
result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL, objPtr, &d);