From 1a21edb59250cdae54af5eab910e283beb0a12e0 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 8 Dec 2022 17:17:48 +0000 Subject: Eliminate TclArithSeriesObjLength and TclArithSeriesObjStep from tclArithSeries.h: they can be static internal. --- generic/tclArithSeries.c | 19 ++++++++++--------- generic/tclArithSeries.h | 3 --- generic/tclCmdAH.c | 4 ++-- generic/tclCmdIL.c | 2 +- generic/tclExecute.c | 4 ++-- generic/tclListObj.c | 4 ++-- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c index 632d812..ab4258a 100755 --- a/generic/tclArithSeries.c +++ b/generic/tclArithSeries.c @@ -42,6 +42,7 @@ static void DupArithSeriesInternalRep (Tcl_Obj *srcPtr, Tcl_Obj *copyPtr); static void FreeArithSeriesInternalRep (Tcl_Obj *listPtr); static int SetArithSeriesFromAny (Tcl_Interp *interp, Tcl_Obj *objPtr); static void UpdateStringOfArithSeries (Tcl_Obj *listPtr); +static Tcl_Size ArithSeriesObjLength(Tcl_Obj *arithSeriesPtr); /* * The structure below defines the arithmetic series Tcl object type by @@ -77,7 +78,7 @@ const TclObjTypeWithAbstractList tclArithSeriesType = { UpdateStringOfArithSeries, /* updateStringProc */ SetArithSeriesFromAny, /* setFromAnyProc */ TCL_OBJTYPE_V0_1( - TclArithSeriesObjLength + ArithSeriesObjLength )} }; @@ -364,7 +365,7 @@ TclNewArithSeriesObj( /* *---------------------------------------------------------------------- * - * TclArithSeriesObjStep -- + * ArithSeriesObjStep -- * * Return a Tcl_Obj with the step value from the give ArithSeries Obj. * refcount = 0. @@ -380,10 +381,10 @@ TclNewArithSeriesObj( *---------------------------------------------------------------------- */ /* - * TclArithSeriesObjStep -- + * ArithSeriesObjStep -- */ -int -TclArithSeriesObjStep( +static int +ArithSeriesObjStep( Tcl_Obj *arithSeriesPtr, Tcl_Obj **stepObj) { @@ -448,7 +449,7 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele /* *---------------------------------------------------------------------- * - * TclArithSeriesObjLength + * ArithSeriesObjLength * * Returns the length of the arithmetic series. * @@ -462,7 +463,7 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele * *---------------------------------------------------------------------- */ -Tcl_Size TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr) +Tcl_Size ArithSeriesObjLength(Tcl_Obj *arithSeriesPtr) { ArithSeries *arithSeriesRepPtr = (ArithSeries*) arithSeriesPtr->internalRep.twoPtrValue.ptr1; @@ -749,7 +750,7 @@ TclArithSeriesObjRange( return NULL; } Tcl_IncrRefCount(endObj); - TclArithSeriesObjStep(arithSeriesPtr, &stepObj); + ArithSeriesObjStep(arithSeriesPtr, &stepObj); Tcl_IncrRefCount(stepObj); if (Tcl_IsShared(arithSeriesPtr) || @@ -941,7 +942,7 @@ TclArithSeriesObjReverse( Tcl_IncrRefCount(startObj); TclArithSeriesObjIndex(arithSeriesPtr, 0, &endObj); Tcl_IncrRefCount(endObj); - TclArithSeriesObjStep(arithSeriesPtr, &stepObj); + ArithSeriesObjStep(arithSeriesPtr, &stepObj); Tcl_IncrRefCount(stepObj); if (isDouble) { diff --git a/generic/tclArithSeries.h b/generic/tclArithSeries.h index 28fd993..91243db 100644 --- a/generic/tclArithSeries.h +++ b/generic/tclArithSeries.h @@ -35,11 +35,8 @@ typedef struct { MODULE_SCOPE Tcl_Obj * TclArithSeriesObjCopy(Tcl_Interp *interp, Tcl_Obj *arithSeriesPtr); -MODULE_SCOPE int TclArithSeriesObjStep(Tcl_Obj *arithSeriesPtr, - Tcl_Obj **stepObj); MODULE_SCOPE int TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **elementObj); -MODULE_SCOPE Tcl_Size TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr); MODULE_SCOPE Tcl_Obj * TclArithSeriesObjRange(Tcl_Interp *interp, Tcl_Obj *arithSeriesPtr, Tcl_Size fromIdx, Tcl_Size toIdx); MODULE_SCOPE Tcl_Obj * TclArithSeriesObjReverse(Tcl_Interp *interp, diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c index 6a1de71..875bbdd 100644 --- a/generic/tclCmdAH.c +++ b/generic/tclCmdAH.c @@ -2735,8 +2735,8 @@ EachloopCmd( result = TCL_ERROR; goto done; } - /* Don't compute values here, wait until the last momement */ - statePtr->argcList[i] = TclArithSeriesObjLength(statePtr->aCopyList[i]); + /* Don't compute values here, wait until the last moment */ + statePtr->argcList[i] = ABSTRACTLIST_PROC(statePtr->aCopyList[i], lengthProc)(statePtr->aCopyList[i]); } else { /* List values */ statePtr->aCopyList[i] = TclListObjCopy(interp, objv[2+i*2]); diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index 552548b..fbc4995 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -2217,7 +2217,7 @@ Tcl_JoinObjCmd( if (TclHasInternalRep(objv[1],&tclArithSeriesType.objType)) { isArithSeries = 1; - listLen = TclArithSeriesObjLength(objv[1]); + listLen = ABSTRACTLIST_PROC(objv[1], lengthProc)(objv[1]); } else { if (TclListObjGetElementsM(interp, objv[1], &listLen, &elemPtrs) != TCL_OK) { diff --git a/generic/tclExecute.c b/generic/tclExecute.c index c1a2bfd..d1d7df1 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -4661,7 +4661,7 @@ TEBCresume( /* special case for ArithSeries */ if (TclHasInternalRep(valuePtr,&tclArithSeriesType.objType)) { - length = TclArithSeriesObjLength(valuePtr); + length = ABSTRACTLIST_PROC(valuePtr, lengthProc)(valuePtr); if (TclGetIntForIndexM(interp, value2Ptr, length-1, &index)!=TCL_OK) { CACHE_STACK_INFO(); TRACE_ERROR(interp); @@ -4724,7 +4724,7 @@ TEBCresume( /* special case for ArithSeries */ if (TclHasInternalRep(valuePtr,&tclArithSeriesType.objType)) { - length = TclArithSeriesObjLength(valuePtr); + length = ABSTRACTLIST_PROC(valuePtr, lengthProc)(valuePtr); /* Decode end-offset index values. */ diff --git a/generic/tclListObj.c b/generic/tclListObj.c index e29c307..8583bad 100644 --- a/generic/tclListObj.c +++ b/generic/tclListObj.c @@ -2641,7 +2641,7 @@ TclLindexFlat( /* Handle ArithSeries as special case */ if (TclHasInternalRep(listObj,&tclArithSeriesType.objType)) { - Tcl_Size listLen = TclArithSeriesObjLength(listObj); + Tcl_Size listLen = ABSTRACTLIST_PROC(listObj, lengthProc)(listObj); Tcl_Size index; Tcl_Obj *elemObj = NULL; for (i=0 ; i