TIP#72 implementation. See ChangeLog for details.

This version builds clean on Solaris/SPARC, with GCC and CC, both with and
without threads and both in 32-bit and 64-bit mode.

1 files changed, 27 insertions, 1 deletions

diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 4a922fe..f7cdf29 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -15,7 +15,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclCmdIL.c,v 1.40 2002/01/26 01:10:08 dgp Exp $
+ * RCS: @(#) $Id: tclCmdIL.c,v 1.41 2002/02/15 14:28:48 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -323,10 +323,36 @@ Tcl_IncrObjCmd(dummy, interp, objc, objv)
     if (objc == 2) {
 	incrAmount = 1;
     } else {
+#ifdef TCL_WIDE_INT_IS_LONG
 	if (Tcl_GetLongFromObj(interp, objv[2], &incrAmount) != TCL_OK) {
 	    Tcl_AddErrorInfo(interp, "\n    (reading increment)");
 	    return TCL_ERROR;
 	}
+#else
+	/*
+	 * Need to be a bit cautious to ensure that [expr]-like rules
+	 * are enforced for interpretation of wide integers, despite
+	 * the fact that the underlying API itself is a 'long' only one.
+	 */
+	if (objv[2]->typePtr == &tclIntType) {
+	    incrAmount = objv[2]->internalRep.longValue;
+	} else if (objv[2]->typePtr == &tclWideIntType) {
+	    incrAmount = Tcl_WideAsLong(objv[2]->internalRep.wideValue);
+	} else {
+	    Tcl_WideInt wide;
+
+	    if (Tcl_GetWideIntFromObj(interp, objv[2], &wide) != TCL_OK) {
+		Tcl_AddErrorInfo(interp, "\n    (reading increment)");
+		return TCL_ERROR;
+	    }
+	    incrAmount = Tcl_WideAsLong(wide);
+	    if ((wide <= Tcl_LongAsWide(LONG_MAX))
+		    && (wide >= Tcl_LongAsWide(LONG_MIN))) {
+		objv[2]->typePtr = &tclIntType;
+		objv[2]->internalRep.longValue = incrAmount;
+	    }
+	}
+#endif
     }
     
     /*