From fb7684bbbf09e0c6e6328056be102e5069ab600f Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 15 Mar 2022 16:00:23 +0000 Subject: Make framePtr->level size_t --- generic/tcl.h | 2 +- generic/tclCmdIL.c | 4 ++-- generic/tclExecute.c | 4 ++-- generic/tclInt.h | 2 +- generic/tclNamesp.c | 4 ++-- generic/tclProc.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/generic/tcl.h b/generic/tcl.h index e522a78..a4dec97 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -722,7 +722,7 @@ typedef struct Tcl_CallFrame { void *dummy3; void *dummy4; void *dummy5; - int dummy6; + size_t dummy6; void *dummy7; void *dummy8; size_t dummy9; diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index 07e42ef..004cdb2 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -1564,7 +1564,7 @@ InfoLevelCmd( Interp *iPtr = (Interp *) interp; if (objc == 1) { /* Just "info level" */ - Tcl_SetObjResult(interp, Tcl_NewWideIntObj(iPtr->varFramePtr->level)); + Tcl_SetObjResult(interp, Tcl_NewWideIntObj((int)iPtr->varFramePtr->level)); return TCL_OK; } @@ -1583,7 +1583,7 @@ InfoLevelCmd( } for (framePtr=iPtr->varFramePtr ; framePtr!=rootFramePtr; framePtr=framePtr->callerVarPtr) { - if (framePtr->level == level) { + if ((int)framePtr->level == level) { break; } } diff --git a/generic/tclExecute.c b/generic/tclExecute.c index adbfd2d..0483bec 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -4265,7 +4265,7 @@ TEBCresume( } break; case INST_INFO_LEVEL_NUM: - TclNewIntObj(objResultPtr, iPtr->varFramePtr->level); + TclNewIntObj(objResultPtr, (int)iPtr->varFramePtr->level); TRACE_WITH_OBJ(("=> "), objResultPtr); NEXT_INST_F(1, 0, 1); break; @@ -4282,7 +4282,7 @@ TEBCresume( if (level <= 0) { level += framePtr->level; } - for (; (framePtr->level!=level) && (framePtr!=rootFramePtr) ; + for (; ((int)framePtr->level!=level) && (framePtr!=rootFramePtr) ; framePtr = framePtr->callerVarPtr) { /* Empty loop body */ } diff --git a/generic/tclInt.h b/generic/tclInt.h index baf3d81..54d9ef9 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -1124,7 +1124,7 @@ typedef struct CallFrame { * callerPtr unless an "uplevel" command or * something equivalent was active in the * caller). */ - int level; /* Level of this procedure, for "uplevel" + size_t level; /* Level of this procedure, for "uplevel" * purposes (i.e. corresponds to nesting of * callerVarPtr's, not callerPtr's). 1 for * outermost procedure, 0 for top-level. */ diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index e1e298f..7bd5907 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -326,7 +326,7 @@ Tcl_PushCallFrame( framePtr->callerPtr = iPtr->framePtr; framePtr->callerVarPtr = iPtr->varFramePtr; if (iPtr->varFramePtr != NULL) { - framePtr->level = (iPtr->varFramePtr->level + 1); + framePtr->level = iPtr->varFramePtr->level + 1U; } else { framePtr->level = 0; } @@ -5048,7 +5048,7 @@ TclLogCommandInfo( Tcl_ListObjAppendElement(NULL, iPtr->errorStack, iPtr->upLiteral); Tcl_ListObjAppendElement(NULL, iPtr->errorStack, Tcl_NewWideIntObj( - iPtr->framePtr->level - iPtr->varFramePtr->level)); + (int)(iPtr->framePtr->level - iPtr->varFramePtr->level))); } else if (iPtr->framePtr != iPtr->rootFramePtr) { /* * normal case, [lappend errorstack CALL [info level 0]] diff --git a/generic/tclProc.c b/generic/tclProc.c index 75f4eb2..37821d2 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -829,7 +829,7 @@ TclObjGetFrame( CallFrame *framePtr; for (framePtr = iPtr->varFramePtr; framePtr != NULL; framePtr = framePtr->callerVarPtr) { - if (framePtr->level == level) { + if ((int)framePtr->level == level) { *framePtrPtr = framePtr; return result; } -- cgit v0.12