Backing out unwise changes.

1 files changed, 15 insertions, 18 deletions

diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 4f5c671..0d466bf 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclCompile.c,v 1.25.2.2 2001/09/26 14:23:10 dkf Exp $
+ * RCS: @(#) $Id: tclCompile.c,v 1.25.2.3 2001/09/27 13:46:00 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -339,8 +339,7 @@ TclSetByteCodeFromAny(interp, objPtr, hookProc, clientData)
     register AuxData *auxDataPtr;
     LiteralEntry *entryPtr;
     register int i;
-    Tcl_Length length;
-    int nested, result;
+    int length, nested, result;
     char *string;
 
 #ifdef TCL_COMPILE_DEBUG
@@ -359,8 +358,8 @@ TclSetByteCodeFromAny(interp, objPtr, hookProc, clientData)
 	nested = 0;
     }
     string = Tcl_GetStringFromObj(objPtr, &length);
-    TclInitCompileEnv(interp, &compEnv, string, (int)length);
-    result = TclCompileScript(interp, string, (int)length, nested, &compEnv);
+    TclInitCompileEnv(interp, &compEnv, string, length);
+    result = TclCompileScript(interp, string, length, nested, &compEnv);
 
     if (result == TCL_OK) {
 	/*
@@ -929,7 +928,7 @@ TclCompileScript(interp, script, numBytes, nested, envPtr)
 
 			Tcl_DStringSetLength(&ds, 0);
 			Tcl_DStringAppend(&ds, tokenPtr[1].start,
-				(int)tokenPtr[1].size);
+				tokenPtr[1].size);
 
 			cmdPtr = (Command *) Tcl_FindCommand(interp,
 				Tcl_DStringValue(&ds),
@@ -965,7 +964,7 @@ TclCompileScript(interp, script, numBytes, nested, envPtr)
 			 */
 
 			objIndex = TclRegisterLiteral(envPtr,
-				tokenPtr[1].start, (int)tokenPtr[1].size,
+				tokenPtr[1].start, tokenPtr[1].size,
 				/*onHeap*/ 0);
 			if (cmdPtr != NULL) {
 			    TclSetCmdNameObj(interp,
@@ -974,7 +973,7 @@ TclCompileScript(interp, script, numBytes, nested, envPtr)
 			}
 		    } else {
 			objIndex = TclRegisterLiteral(envPtr,
-				tokenPtr[1].start, (int)tokenPtr[1].size,
+				tokenPtr[1].start, tokenPtr[1].size,
 				/*onHeap*/ 0);
 		    }
 		    TclEmitPush(objIndex, envPtr);
@@ -1140,7 +1139,7 @@ TclCompileTokens(interp, tokenPtr, count, envPtr)
 	switch (tokenPtr->type) {
 	    case TCL_TOKEN_TEXT:
 		Tcl_DStringAppend(&textBuffer, tokenPtr->start,
-			(int)tokenPtr->size);
+			tokenPtr->size);
 		break;
 
 	    case TCL_TOKEN_BS:
@@ -1159,8 +1158,7 @@ TclCompileTokens(interp, tokenPtr, count, envPtr)
 		    
 		    literal = TclRegisterLiteral(envPtr,
 			    Tcl_DStringValue(&textBuffer),
-			    (int)Tcl_DStringLength(&textBuffer),
-			    /*onHeap*/ 0);
+			    Tcl_DStringLength(&textBuffer), /*onHeap*/ 0);
 		    TclEmitPush(literal, envPtr);
 		    numObjsToConcat++;
 		    maxDepth = TclMax(numObjsToConcat, maxDepth);
@@ -1168,7 +1166,7 @@ TclCompileTokens(interp, tokenPtr, count, envPtr)
 		}
 		
 		code = TclCompileScript(interp, tokenPtr->start+1,
-			(int)tokenPtr->size-2, /*nested*/ 1, envPtr);
+			tokenPtr->size-2, /*nested*/ 1,	envPtr);
 		if (code != TCL_OK) {
 		    goto error;
 		}
@@ -1187,8 +1185,7 @@ TclCompileTokens(interp, tokenPtr, count, envPtr)
 		    
 		    literal = TclRegisterLiteral(envPtr,
 			    Tcl_DStringValue(&textBuffer),
-			    (int)Tcl_DStringLength(&textBuffer),
-			    /*onHeap*/ 0);
+			    Tcl_DStringLength(&textBuffer), /*onHeap*/ 0);
 		    TclEmitPush(literal, envPtr);
 		    numObjsToConcat++;
 		    maxDepth = TclMax(numObjsToConcat, maxDepth);
@@ -1285,7 +1282,7 @@ TclCompileTokens(interp, tokenPtr, count, envPtr)
 	int literal;
 
 	literal = TclRegisterLiteral(envPtr, Tcl_DStringValue(&textBuffer),
-	        (int)Tcl_DStringLength(&textBuffer), /*onHeap*/ 0);
+	        Tcl_DStringLength(&textBuffer), /*onHeap*/ 0);
 	TclEmitPush(literal, envPtr);
 	numObjsToConcat++;
 	maxDepth = TclMax(numObjsToConcat, maxDepth);
@@ -1364,7 +1361,7 @@ TclCompileCmdWord(interp, tokenPtr, count, envPtr)
     
     envPtr->maxStackDepth = 0;
     if ((count == 1) && (tokenPtr->type == TCL_TOKEN_TEXT)) {
-	code = TclCompileScript(interp, tokenPtr->start, (int)tokenPtr->size,
+	code = TclCompileScript(interp, tokenPtr->start, tokenPtr->size,
 	        /*nested*/ 0, envPtr);
 	return code;
     }
@@ -3329,10 +3326,10 @@ TclPrintObject(outFile, objPtr, maxChars)
     int maxChars;		/* Maximum number of chars to print. */
 {
     char *bytes;
-    Tcl_Length length;
+    int length;
     
     bytes = Tcl_GetStringFromObj(objPtr, &length);
-    TclPrintSource(outFile, bytes, TclMin((int)length, maxChars));
+    TclPrintSource(outFile, bytes, TclMin(length, maxChars));
 }
 
 /*