Index: generic/gentclAPI.tcl =================================================================== diff -u -r6e5500ed599d989bb841560bd64d086d85482ce4 -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- generic/gentclAPI.tcl (.../gentclAPI.tcl) (revision 6e5500ed599d989bb841560bd64d086d85482ce4) +++ generic/gentclAPI.tcl (.../gentclAPI.tcl) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -30,7 +30,7 @@ # set ::converter "" -set ::objCmdProc "(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv)" +set ::objCmdProc "(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv)" proc convertername {type typename} { if {[info exists ::registeredConverter($type)]} { @@ -244,14 +244,14 @@ "args" { set type "int " set calledArg "objc - pc.lastObjc, objv + pc.lastObjc" - lappend if "int trailingObjc" "Tcl_Obj *CONST* trailingObjv" + lappend if "int trailingObjc" "Tcl_Obj *const* trailingObjv" set ifSet 1 set cVar 0 } "allargs" { set type "int " set calledArg "objc, objv" - lappend if "int objc" "Tcl_Obj *CONST* objv" + lappend if "int objc" "Tcl_Obj *const* objv" set ifSet 1 set cVar 0 } @@ -333,7 +333,7 @@ } return [subst -nocommands { static int -${stub}(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +${stub}(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; $intro if (likely(ArgumentParse(interp, objc, objv, $obj, objv[0], @@ -356,7 +356,7 @@ if {$cleanup ne ""} {error "$stub cleanup code '$cleanup' must be empty"} return [subst -nocommands { static int -${stub}(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +${stub}(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { $intro $cDefs $pre Index: generic/nsf.c =================================================================== diff -u -rd4863566dd3f7bf13ae90a86fb7a1c1cb79be11b -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- generic/nsf.c (.../nsf.c) (revision d4863566dd3f7bf13ae90a86fb7a1c1cb79be11b) +++ generic/nsf.c (.../nsf.c) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -241,15 +241,15 @@ nonnull(1) nonnull(2); static int NsfCAllocMethod_(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *nameObj, Tcl_Namespace *parentNsPtr) nonnull(1) nonnull(2) nonnull(3); -static int NsfCCreateMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *CONST objv[]) +static int NsfCCreateMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(2) nonnull(3) nonnull(5); static int NsfOCleanupMethod(Tcl_Interp *interp, NsfObject *object) nonnull(1) nonnull(2); -static int NsfOConfigureMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST objv[], Tcl_Obj *objv0) +static int NsfOConfigureMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *const objv[], Tcl_Obj *objv0) nonnull(1) nonnull(2) nonnull(4) nonnull(5); static int NsfODestroyMethod(Tcl_Interp *interp, NsfObject *object) nonnull(1) nonnull(2); -static int MethodDispatch(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +static int MethodDispatch(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Tcl_Command cmd, NsfObject *object, NsfClass *class, const char *methodName, unsigned short frameType, unsigned int flags) nonnull(1) nonnull(3) nonnull(4) nonnull(5) nonnull(7); @@ -258,12 +258,12 @@ static int DispatchDestroyMethod(Tcl_Interp *interp, NsfObject *object, unsigned int flags) nonnull(1) nonnull(2); static int DispatchUnknownMethod(Tcl_Interp *interp, NsfObject *object, - int objc, Tcl_Obj *CONST objv[], Tcl_Obj *callInfoObj, + int objc, Tcl_Obj *const objv[], Tcl_Obj *callInfoObj, Tcl_Obj *methodObj, unsigned int flags) nonnull(1) nonnull(2) nonnull(4) nonnull(6); NSF_INLINE static int ObjectDispatch(ClientData clientData, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[], unsigned int flags) + Tcl_Obj *const objv[], unsigned int flags) nonnull(1) nonnull(2) nonnull(4); NSF_INLINE static int ObjectDispatchFinalize(Tcl_Interp *interp, NsfCallStackContent *cscPtr, @@ -273,7 +273,7 @@ /* * Prototypes for object life-cycle management */ -static int RecreateObject(Tcl_Interp *interp, NsfClass *class, NsfObject *object, int objc, Tcl_Obj *CONST objv[]) +static int RecreateObject(Tcl_Interp *interp, NsfClass *class, NsfObject *object, int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(2) nonnull(3) nonnull(5); static void FinalObjectDeletion(Tcl_Interp *interp, NsfObject *object) nonnull(1) nonnull(2); @@ -354,7 +354,7 @@ Tcl_Obj *withDefault, int withEarlybinding, Tcl_Obj *withOnerror, Tcl_Obj *withMethodprefix, int withFrame, bool withVerbose, - Tcl_Obj *target, int objc, Tcl_Obj * CONST objv[], + Tcl_Obj *target, int objc, Tcl_Obj * const objv[], ForwardCmdClientData **tcdPtr) nonnull(1) nonnull(2) nonnull(11); @@ -400,7 +400,7 @@ unsigned int processFlags, NsfParamDefs *paramDefs, Tcl_Obj *methodNameObj, - int objc, Tcl_Obj *CONST objv[]) + int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(2) nonnull(5) nonnull(6) nonnull(8); static int ParameterCheck(Tcl_Interp *interp, Tcl_Obj *paramObjPtr, Tcl_Obj *valueObj, @@ -439,7 +439,7 @@ static int ArgumentParse( Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj *const objv[], NsfObject *object, Tcl_Obj *procNameObj, Nsf_Param const *paramPtr, @@ -519,7 +519,7 @@ nonnull(1) nonnull(3) nonnull(4); static int NextSearchAndInvoke(Tcl_Interp *interp, - const char *methodName, int objc, Tcl_Obj *CONST objv[], + const char *methodName, int objc, Tcl_Obj *const objv[], NsfCallStackContent *cscPtr, bool freeArgumentVector) nonnull(1) nonnull(2) nonnull(4) nonnull(5); @@ -532,7 +532,7 @@ static Tcl_Command GetOriginalCommand(Tcl_Command cmd) nonnull(1) returns_nonnull; -EXTERN void NsfDStringArgv(Tcl_DString *dsPtr, int objc, Tcl_Obj *CONST objv[]) +EXTERN void NsfDStringArgv(Tcl_DString *dsPtr, int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(3); static NsfObjectOpt *NsfRequireObjectOpt(NsfObject *object) @@ -627,11 +627,14 @@ * *---------------------------------------------------------------------- */ -static void NsfErrorContext(Tcl_Interp *interp, const char *context) - nonnull(1) nonnull(2); +static void NsfErrorContext( + Tcl_Interp *interp, const char *context +) nonnull(1) nonnull(2); static void -NsfErrorContext(Tcl_Interp *interp, const char *context) { +NsfErrorContext( + Tcl_Interp *interp, const char *context +) { Tcl_DString ds, *dsPtr = &ds; nonnull_assert(interp != NULL); @@ -647,7 +650,9 @@ #if 0 static char * -NsfErrorInfo(Tcl_Interp *interp) { +NsfErrorInfo( + Tcl_Interp *interp +) { Tcl_Obj *valueObj; nonnull_assert(interp != NULL); @@ -676,8 +681,10 @@ *---------------------------------------------------------------------- */ int -NsfDStringEval(Tcl_Interp *interp, Tcl_DString *dsPtr, const char *context, - unsigned int traceEvalFlags) { +NsfDStringEval( + Tcl_Interp *interp, Tcl_DString *dsPtr, const char *context, + unsigned int traceEvalFlags +) { Tcl_InterpState state; NsfRuntimeState *rst; int result, prevDoProfile; @@ -757,8 +764,9 @@ */ void -NsfLog(Tcl_Interp *interp, int requiredLevel, const char *fmt, ...) { - +NsfLog( + Tcl_Interp *interp, int requiredLevel, const char *fmt, ... +) { nonnull_assert(interp != NULL); nonnull_assert(fmt != NULL); @@ -819,7 +827,9 @@ *---------------------------------------------------------------------- */ void -NsfDeprecatedCmd(Tcl_Interp *interp, const char *what, const char *oldCmd, const char *newCmd) { +NsfDeprecatedCmd( + Tcl_Interp *interp, const char *what, const char *oldCmd, const char *newCmd +) { Tcl_DString ds, *dsPtr = &ds; nonnull_assert(interp != NULL); @@ -859,12 +869,14 @@ * *---------------------------------------------------------------------- */ -static void ParseContextInit(ParseContext *pcPtr, int objc, NsfObject *object, Tcl_Obj *procName) - nonnull(1) nonnull(4); +static void ParseContextInit( + ParseContext *pcPtr, int objc, NsfObject *object, Tcl_Obj *procName +) nonnull(1) nonnull(4); static void -ParseContextInit(ParseContext *pcPtr, int objc, NsfObject *object, Tcl_Obj *procName) { - +ParseContextInit( + ParseContext *pcPtr, int objc, NsfObject *object, Tcl_Obj *procName +) { nonnull_assert(pcPtr != NULL); nonnull_assert(procName != NULL); @@ -914,11 +926,14 @@ *---------------------------------------------------------------------- */ -static void ParseContextExtendObjv(ParseContext *pcPtr, unsigned from, unsigned elts, Tcl_Obj *CONST source[]) - nonnull(1) nonnull(4); +static void ParseContextExtendObjv( + ParseContext *pcPtr, unsigned from, unsigned elts, Tcl_Obj *const source[] +) nonnull(1) nonnull(4); static void -ParseContextExtendObjv(ParseContext *pcPtr, unsigned from, unsigned elts, Tcl_Obj *CONST source[]) { +ParseContextExtendObjv( + ParseContext *pcPtr, unsigned from, unsigned elts, Tcl_Obj *const source[] +) { unsigned requiredSize = from + elts + 1; nonnull_assert(pcPtr != NULL); @@ -1103,12 +1118,12 @@ */ static int CallMethod(ClientData clientData, Tcl_Interp *interp, Tcl_Obj *methodObj, - int objc, Tcl_Obj *CONST objv[], unsigned int flags) + int objc, Tcl_Obj *const objv[], unsigned int flags) nonnull(1) nonnull(2) nonnull(3); static int CallMethod(ClientData clientData, Tcl_Interp *interp, Tcl_Obj *methodObj, - int objc, Tcl_Obj *CONST objv[], unsigned int flags) { + int objc, Tcl_Obj *const objv[], unsigned int flags) { NsfObject *object; int result; ALLOC_ON_STACK(Tcl_Obj*, objc, tov); @@ -1157,12 +1172,12 @@ */ int NsfCallMethodWithArgs(Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, - Tcl_Obj *arg1, int givenObjc, Tcl_Obj *CONST objv[], unsigned int flags) + Tcl_Obj *arg1, int givenObjc, Tcl_Obj *const objv[], unsigned int flags) nonnull(1) nonnull(2) nonnull(3); int NsfCallMethodWithArgs(Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, - Tcl_Obj *arg1, int givenObjc, Tcl_Obj *CONST objv[], unsigned int flags) { + Tcl_Obj *arg1, int givenObjc, Tcl_Obj *const objv[], unsigned int flags) { int objc = givenObjc + 2; int result; ALLOC_ON_STACK(Tcl_Obj*, objc, tov); @@ -1337,7 +1352,7 @@ nonnull(1) nonnull(2) nonnull(3) nonnull(5); Tcl_Obj * Nsf_ObjGetVar2(Nsf_Object *object, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, unsigned int flags) nonnull(1) nonnull(2) nonnull(3); -int NsfCreate(Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *CONST objv[]) +int NsfCreate(Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(2) nonnull(3) nonnull(5); int NsfDeleteObject(Tcl_Interp *interp, Nsf_Object *object) nonnull(1) nonnull(2); @@ -1463,7 +1478,7 @@ int NsfCreate(Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, - int objc, Tcl_Obj *CONST objv[]) { + int objc, Tcl_Obj *const objv[]) { NsfClass *cl = (NsfClass *) class; int result; ALLOC_ON_STACK(Tcl_Obj *, objc+2, ov); @@ -2411,11 +2426,11 @@ */ static NsfClasses **NsfClassListAddNoDup(NsfClasses **firstPtrPtr, NsfClass *class, - ClientData clientData, int *isNewPtr) + ClientData clientData) nonnull(1) nonnull(2); static NsfClasses ** -NsfClassListAddNoDup(NsfClasses **firstPtrPtr, NsfClass *class, ClientData clientData, int *isNewPtr) { +NsfClassListAddNoDup(NsfClasses **firstPtrPtr, NsfClass *class, ClientData clientData) { NsfClasses *clPtr, **nextPtr; nonnull_assert(firstPtrPtr != NULL); @@ -2436,13 +2451,6 @@ element->clientData = clientData; element->nextPtr = NULL; *nextPtr = element; - if (isNewPtr != NULL) { - *isNewPtr = 1; - } - } else { - if (isNewPtr != NULL) { - *isNewPtr = 0; - } } return nextPtr; } @@ -3595,22 +3603,30 @@ * *---------------------------------------------------------------------- */ -static Tcl_Command ResolveMethodName(Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *methodObj, - Tcl_DString *methodNameDs, - NsfObject **regObject, - NsfObject **defObject, - const char **methodName1, bool *fromClassNS) - nonnull(1) nonnull(3) nonnull(8); +static Tcl_Command ResolveMethodName( + Tcl_Interp *interp, + Tcl_Namespace *nsPtr, + Tcl_Obj *methodObj, + Tcl_DString *methodNameDs, + NsfObject **regObject, + NsfObject **defObject, + const char **methodName1, bool *fromClassNS +) nonnull(1) nonnull(3) nonnull(8); static Tcl_Command -ResolveMethodName(Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *methodObj, - Tcl_DString *methodNameDs, - NsfObject **regObject, - NsfObject **defObject, - const char **methodName1, bool *fromClassNS) { +ResolveMethodName( + Tcl_Interp *interp, + Tcl_Namespace *nsPtr, + Tcl_Obj *methodObj, + Tcl_DString *methodNameDs, + NsfObject **regObject, + NsfObject **defObject, + const char **methodName1, + bool *fromClassNS +) { const char *methodName; NsfObject *referencedObject; - int containsSpace, tailContainsSpace; + bool containsSpace, tailContainsSpace; Tcl_Command cmd; nonnull_assert(interp != NULL); @@ -3624,30 +3640,32 @@ if (methodObj->typePtr == Nsf_OT_listType) { int length; + Tcl_ListObjLength(interp, methodObj, &length); - containsSpace = length > 1; + containsSpace = (length > 1); + } else if (methodObj->typePtr == Nsf_OT_tclCmdNameType) { - containsSpace = 0; + containsSpace = NSF_FALSE; } else { containsSpace = NsfHasTclSpace(methodName); } - if (containsSpace != 0) { + if (containsSpace) { tailContainsSpace = NsfHasTclSpace(NSTail(methodName)); } else { - tailContainsSpace = 0; + tailContainsSpace = NSF_FALSE; } /*fprintf(stderr, "<%s> containsSpace %d tailContainsSpace %d\n", methodName, containsSpace, tailContainsSpace);*/ #if !defined(NDEBUG) - if (containsSpace != 0) { + if (containsSpace) { assert(NsfHasTclSpace(methodName)); } else { - assert(tailContainsSpace == 0); + assert(!tailContainsSpace); } #endif - if (tailContainsSpace != 0) { + if (tailContainsSpace) { const char *firstElementString; const Tcl_Namespace *parentNsPtr; const NsfObject *ensembleObject; @@ -5375,13 +5393,13 @@ * *---------------------------------------------------------------------- */ -static int InterpCompiledColonVarResolver(Tcl_Interp *interp, CONST84 char *name, int length, +static int InterpCompiledColonVarResolver(Tcl_Interp *interp, const char *name, int length, Tcl_Namespace *UNUSED(context), Tcl_ResolvedVarInfo **rPtr) nonnull(1) nonnull(2) nonnull(5); static int InterpCompiledColonVarResolver(Tcl_Interp *interp, - CONST84 char *name, int length, Tcl_Namespace *UNUSED(context), + const char *name, int length, Tcl_Namespace *UNUSED(context), Tcl_ResolvedVarInfo **rPtr) { /* * The variable handler is registered, when we have an active Next @@ -8152,7 +8170,7 @@ static void AssertionAddProc(Tcl_Interp *interp, const char *name, NsfAssertionStore *aStore, Tcl_Obj *pre, Tcl_Obj *post) { - int new = 0; + int isNew = 0; Tcl_HashEntry *hPtr; NsfProcAssertion *procs = NEW(NsfProcAssertion); @@ -8163,8 +8181,8 @@ AssertionRemoveProc(aStore, name); procs->pre = AssertionNewList(interp, pre); procs->post = AssertionNewList(interp, post); - hPtr = Tcl_CreateHashEntry(&aStore->procs, name, &new); - if (new != 0) { + hPtr = Tcl_CreateHashEntry(&aStore->procs, name, &isNew); + if (isNew != 0) { Tcl_SetHashValue(hPtr, procs); } } @@ -8561,7 +8579,7 @@ } /*fprintf(stderr, "+++ add to mixinClasses %p path: %s clPtr %p\n", mixinClasses, ClassName(pl->cl), clPtr);*/ - clPtr = NsfClassListAddNoDup(clPtr, pl->cl, m->clientData, NULL); + clPtr = NsfClassListAddNoDup(clPtr, pl->cl, m->clientData); } } } @@ -8684,7 +8702,7 @@ for (m = object->opt->objMixins; m != NULL; m = m->nextPtr) { NsfClass *mCl = NsfGetClassFromCmdPtr(m->cmdPtr); if (mCl != NULL) { - NsfClassListAddNoDup(&checkList, mCl, NULL, NULL); + NsfClassListAddNoDup(&checkList, mCl, NULL); } } } @@ -9040,28 +9058,31 @@ * *---------------------------------------------------------------------- */ -static bool AddToResultSet(Tcl_Interp *interp, Tcl_HashTable *destTablePtr, - Tcl_Obj *resultSet, NsfObject *object, int *new, - int appendResult, const char *pattern, NsfObject *matchObject) - nonnull(1) nonnull(2) nonnull(3) nonnull(4) nonnull(5); +static bool AddToResultSet( + Tcl_Interp *interp, Tcl_HashTable *destTablePtr, + Tcl_Obj *resultSet, NsfObject *object, int *isNewPtr, + bool appendResult, const char *pattern, NsfObject *matchObject +) nonnull(1) nonnull(2) nonnull(3) nonnull(4) nonnull(5); static bool -AddToResultSet(Tcl_Interp *interp, Tcl_HashTable *destTablePtr, - Tcl_Obj *resultSet, NsfObject *object, int *new, - int appendResult, const char *pattern, NsfObject *matchObject) { +AddToResultSet( + Tcl_Interp *interp, Tcl_HashTable *destTablePtr, + Tcl_Obj *resultSet, NsfObject *object, int *isNewPtr, + bool appendResult, const char *pattern, NsfObject *matchObject +) { nonnull_assert(interp != NULL); nonnull_assert(destTablePtr != NULL); nonnull_assert(resultSet != NULL); nonnull_assert(object != NULL); - nonnull_assert(new != NULL); + nonnull_assert(isNewPtr != NULL); - Tcl_CreateHashEntry(destTablePtr, (char *)object, new); - if (*new != 0) { + Tcl_CreateHashEntry(destTablePtr, (char *)object, isNewPtr); + if (*isNewPtr != 0) { if (matchObject != NULL && matchObject == object) { return NSF_TRUE; } - if (appendResult != 0) { + if (appendResult) { AppendMatchingElement(interp, resultSet, object->cmdName, pattern); } } @@ -9084,28 +9105,32 @@ * *---------------------------------------------------------------------- */ -static bool AddToResultSetWithGuards(Tcl_Interp *interp, Tcl_HashTable *destTablePtr, - Tcl_Obj *resultSet, NsfClass *class, - ClientData clientData, int *new, int appendResult, - const char *pattern, NsfObject *matchObject) - nonnull(1) nonnull(2) nonnull(3) nonnull(4) nonnull(6) nonnull(5); +static bool AddToResultSetWithGuards( + Tcl_Interp *interp, Tcl_HashTable *destTablePtr, + Tcl_Obj *resultSet, NsfClass *class, + ClientData clientData, int *isNewPtr, bool appendResult, + const char *pattern, NsfObject *matchObject +) nonnull(1) nonnull(2) nonnull(3) nonnull(4) nonnull(6) nonnull(5); static bool -AddToResultSetWithGuards(Tcl_Interp *interp, Tcl_HashTable *destTablePtr, - Tcl_Obj *resultSet, NsfClass *class, - ClientData clientData, int *new, int appendResult, - const char *pattern, NsfObject *matchObject) { +AddToResultSetWithGuards( + Tcl_Interp *interp, Tcl_HashTable *destTablePtr, + Tcl_Obj *resultSet, NsfClass *class, + ClientData clientData, int *isNewPtr, bool appendResult, + const char *pattern, NsfObject *matchObject +) { + bool result; nonnull_assert(clientData != NULL); nonnull_assert(interp != NULL); nonnull_assert(destTablePtr != NULL); nonnull_assert(class != NULL); nonnull_assert(resultSet != NULL); - nonnull_assert(new != NULL); + nonnull_assert(isNewPtr != NULL); - Tcl_CreateHashEntry(destTablePtr, (char *)class, new); - if (*new != 0) { - if (appendResult != 0) { + Tcl_CreateHashEntry(destTablePtr, (char *)class, isNewPtr); + if (*isNewPtr != 0) { + if (appendResult) { if (pattern == NULL || Tcl_StringMatch(ClassName_(class), pattern)) { Tcl_Obj *listObj = Tcl_NewListObj(0, NULL); Tcl_Obj *g = (Tcl_Obj *)clientData; @@ -9118,12 +9143,12 @@ DECR_REF_COUNT(listObj); } } - if (matchObject != NULL && matchObject == (NsfObject *)class) { - return NSF_TRUE; - } + result = (matchObject != NULL && matchObject == (NsfObject *)class); + } else { + result = NSF_FALSE; } - return NSF_FALSE; + return result; } /* @@ -9153,7 +9178,7 @@ GetAllObjectMixinsOf(Tcl_Interp *interp, Tcl_HashTable *destTablePtr, Tcl_Obj *resultSet, NsfClass *startClass, bool isMixin, bool appendResult, const char *pattern, NsfObject *matchObject) { - int new = 0; + int isNew = 0; NsfClasses *sc; bool done = NSF_FALSE; @@ -9217,7 +9242,7 @@ assert(object != NULL); done = AddToResultSet(interp, destTablePtr, resultSet, - object, &new, appendResult, + object, &isNew, appendResult, pattern, matchObject); if (done) { return done; @@ -9268,7 +9293,7 @@ for (m = mixinOfs; m != NULL; m = m->nextPtr) { NsfClass *cl; - int new; + int isNew; bool done; /* @@ -9280,12 +9305,12 @@ assert(cl != NULL); done = AddToResultSet(interp, destTablePtr, resultSet, - &cl->object, &new, + &cl->object, &isNew, appendResult, pattern, matchObject); if (done) { return done; } - if (new != 0) { + if (isNew != 0) { /*fprintf(stderr, "... new mixin -closure of %s => %s\n", ClassName(startCl), ClassName(cl));*/ done = GetAllClassMixinsOf(interp, destTablePtr, resultSet, cl, @@ -9322,7 +9347,7 @@ bool isPCM, bool appendResult, const char *pattern, NsfObject *matchObject) { NsfClasses *sc; - int new = 0; + int isNew = 0; bool done = NSF_FALSE; nonnull_assert(interp != NULL); @@ -9338,7 +9363,7 @@ */ if (isPCM) { done = AddToResultSet(interp, destTablePtr, resultSet, - &startCl->object, &new, + &startCl->object, &isNew, appendResult, pattern, matchObject); if (done) { return done; @@ -9439,7 +9464,7 @@ GetAllClassMixins(Tcl_Interp *interp, Tcl_HashTable *destTablePtr, Tcl_Obj *resultObj, NsfClass *startClass, bool withGuards, const char *pattern, NsfObject *matchObject) { - int new = 0; + int isNew = 0; NsfClass *class; NsfClasses *sc; bool done = NSF_FALSE; @@ -9468,19 +9493,19 @@ if (withGuards && (m->clientData)) { /* fprintf(stderr, "AddToResultSetWithGuards: %s\n", ClassName(class)); */ done = AddToResultSetWithGuards(interp, destTablePtr, resultObj, - class, m->clientData, &new, - 1, pattern, matchObject); + class, m->clientData, &isNew, + NSF_TRUE, pattern, matchObject); } else { /* fprintf(stderr, "AddToResultSet: %s\n", ClassName(class)); */ done = AddToResultSet(interp, destTablePtr, resultObj, - &class->object, &new, - 1, pattern, matchObject); + &class->object, &isNew, + NSF_TRUE, pattern, matchObject); } if (done) { return done; } - if (new != 0) { + if (isNew != 0) { /* fprintf(stderr, "class mixin GetAllClassMixins for: %s (%s)\n", ClassName(cl), ClassName(startCl)); */ done = GetAllClassMixins(interp, destTablePtr, resultObj, @@ -11678,17 +11703,21 @@ * *---------------------------------------------------------------------- */ -static int VarExists(Tcl_Interp *interp, NsfObject *object, - const char *name1, const char *name2, unsigned int flags) - nonnull(1) nonnull(2) nonnull(3); +static bool VarExists( + Tcl_Interp *interp, NsfObject *object, + const char *name1, const char *name2, unsigned int flags +) nonnull(1) nonnull(2) nonnull(3); -static int -VarExists(Tcl_Interp *interp, NsfObject *object, const char *name1, const char *name2, - unsigned int flags) { +static bool +VarExists( + Tcl_Interp *interp, NsfObject *object, + const char *name1, const char *name2, + unsigned int flags +) { CallFrame frame, *framePtr = &frame; const Var *varPtr; Var *arrayPtr; - int result; + bool result; nonnull_assert(interp != NULL); nonnull_assert(object != NULL); @@ -11710,7 +11739,7 @@ */ result = ((varPtr != NULL) && ((flags & NSF_VAR_REQUIRE_DEFINED) == 0u || !TclIsVarUndefined(varPtr))); if (result && ((flags & NSF_VAR_ISARRAY) != 0u) && !TclIsVarArray(varPtr)) { - result = 0; + result = NSF_FALSE; } Nsf_PopFrameObj(interp, framePtr); @@ -11867,14 +11896,14 @@ *---------------------------------------------------------------------- */ static int PushProcCallFrame(Proc *procPtr, Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj *const objv[], Tcl_Namespace *execNsPtr, NsfCallStackContent *cscPtr) nonnull(1) nonnull(2) nonnull(4) nonnull(6); static int PushProcCallFrame(Proc *procPtr, Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj *const objv[], Tcl_Namespace *execNsPtr, NsfCallStackContent *cscPtr) { Tcl_CallFrame *framePtr; @@ -13446,13 +13475,13 @@ * *---------------------------------------------------------------------- */ -static int ProcMethodDispatch(ClientData cp, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +static int ProcMethodDispatch(ClientData cp, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], const char *methodName, NsfObject *object, NsfClass *class, Tcl_Command cmdPtr, NsfCallStackContent *cscPtr) nonnull(1) nonnull(2) nonnull(4) nonnull(5) nonnull(6) nonnull(8) nonnull(9); static int -ProcMethodDispatch(ClientData cp, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +ProcMethodDispatch(ClientData cp, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], const char *methodName, NsfObject *object, NsfClass *class, Tcl_Command cmdPtr, NsfCallStackContent *cscPtr) { NsfParamDefs *paramDefs; @@ -13652,12 +13681,12 @@ * *---------------------------------------------------------------------- */ -static int CmdMethodDispatch(ClientData cp, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +static int CmdMethodDispatch(ClientData cp, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], NsfObject *object, Tcl_Command cmd, NsfCallStackContent *cscPtr) nonnull(2) nonnull(4) nonnull(5) nonnull(6); static int -CmdMethodDispatch(ClientData cp, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +CmdMethodDispatch(ClientData cp, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], NsfObject *object, Tcl_Command cmd, NsfCallStackContent *cscPtr) { CallFrame frame, *framePtr = &frame; @@ -13726,12 +13755,12 @@ *---------------------------------------------------------------------- */ -static int ObjectCmdMethodDispatch(NsfObject *invokedObject, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +static int ObjectCmdMethodDispatch(NsfObject *invokedObject, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], const char *methodName, NsfObject *callerSelf, NsfCallStackContent *cscPtr) nonnull(1) nonnull(2) nonnull(4) nonnull(5) nonnull(6) nonnull(7); static int -ObjectCmdMethodDispatch(NsfObject *invokedObject, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +ObjectCmdMethodDispatch(NsfObject *invokedObject, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], const char *methodName, NsfObject *callerSelf, NsfCallStackContent *cscPtr) { CallFrame frame, *framePtr = &frame; Tcl_Command cmd, subMethodCmd; @@ -14091,7 +14120,7 @@ #if !defined(NSF_ASSEMBLE) static int NsfAsmProc(ClientData UNUSED(clientData), Tcl_Interp *UNUSED(interp), - int UNUSED(objc), Tcl_Obj *CONST UNUSED(objv[])) { + int UNUSED(objc), Tcl_Obj *const UNUSED(objv[])) { return TCL_OK; } #endif @@ -14170,15 +14199,15 @@ *---------------------------------------------------------------------- */ static int MethodDispatchCsc(ClientData clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj *const objv[], Tcl_Command cmd, NsfCallStackContent *cscPtr, const char *methodName, int *validCscPtr) nonnull(1) nonnull(2) nonnull(4) nonnull(5) nonnull(6) nonnull(7) nonnull(8); static int MethodDispatchCsc(ClientData clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj *const objv[], Tcl_Command cmd, NsfCallStackContent *cscPtr, const char *methodName, int *validCscPtr) { @@ -14363,7 +14392,7 @@ *---------------------------------------------------------------------- */ static int -MethodDispatch(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +MethodDispatch(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Tcl_Command cmd, NsfObject *object, NsfClass *class, const char *methodName, unsigned short frameType, unsigned int flags) { NsfCallStackContent csc, *cscPtr; @@ -14837,7 +14866,7 @@ *---------------------------------------------------------------------- */ NSF_INLINE static int ObjectDispatch(ClientData clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj *const objv[], unsigned int flags) nonnull(1) nonnull(2) nonnull(4); @@ -14846,7 +14875,7 @@ ClientData clientData, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[], + Tcl_Obj *const objv[], unsigned int flags ) { int result = TCL_OK, shift, isValidCsc = 1; @@ -15536,12 +15565,12 @@ *---------------------------------------------------------------------- */ static int DispatchInitMethod(Tcl_Interp *interp, NsfObject *object, - int objc, Tcl_Obj *CONST objv[], unsigned int flags) + int objc, Tcl_Obj *const objv[], unsigned int flags) nonnull(1) nonnull(2); static int DispatchInitMethod(Tcl_Interp *interp, NsfObject *object, - int objc, Tcl_Obj *CONST objv[], unsigned int flags) { + int objc, Tcl_Obj *const objv[], unsigned int flags) { int result; Tcl_Obj *methodObj; @@ -15598,7 +15627,7 @@ static int DispatchUnknownMethod(Tcl_Interp *interp, NsfObject *object, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj *const objv[], Tcl_Obj *callInfoObj, Tcl_Obj *methodObj, unsigned int flags) { int result; Tcl_Obj *unknownObj; @@ -15698,24 +15727,24 @@ #if defined(NRE) Tcl_ObjCmdProc NsfObjDispatchNRE; int -NsfObjDispatch(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +NsfObjDispatch(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { nonnull_assert(clientData != NULL); nonnull_assert(interp != NULL); nonnull_assert(objv != NULL); return Tcl_NRCallObjProc(interp, NsfObjDispatchNRE, clientData, objc, objv); } -int NsfObjDispatchNRE(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) +int NsfObjDispatchNRE(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(2) nonnull(4); int -NsfObjDispatchNRE(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) +NsfObjDispatchNRE(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) #else EXTERN int -NsfObjDispatch(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) +NsfObjDispatch(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) #endif { @@ -18196,7 +18225,7 @@ static int InvokeShadowedProc(Tcl_Interp *interp, Tcl_Obj *procNameObj, Tcl_Command cmd, ParseContext *pcPtr, struct Tcl_Time *trtPtr, unsigned int cmdFlags) { - Tcl_Obj *CONST *objv; + Tcl_Obj *const *objv; int objc, result, includeTiming; const char *fullMethodName; Tcl_CallFrame *framePtr; @@ -18327,7 +18356,7 @@ */ int -NsfProcStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +NsfProcStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { NsfProcClientData *tcd; int result; ParseContext *pcPtr; @@ -18644,7 +18673,7 @@ static int ProcessMethodArguments(ParseContext *pcPtr, Tcl_Interp *interp, NsfObject *object, unsigned int processFlags, NsfParamDefs *paramDefs, - Tcl_Obj *methodNameObj, int objc, Tcl_Obj *CONST objv[]) { + Tcl_Obj *methodNameObj, int objc, Tcl_Obj *const objv[]) { int result; CallFrame frame, *framePtr = &frame; @@ -18949,7 +18978,7 @@ Tcl_Obj *withMethodprefix, int withFrame, bool withVerbose, - Tcl_Obj *target, int objc, Tcl_Obj * CONST objv[], + Tcl_Obj *target, int objc, Tcl_Obj * const objv[], ForwardCmdClientData **tcdPtr) { ForwardCmdClientData *tcd; int i, result = 0; @@ -19481,13 +19510,13 @@ * *---------------------------------------------------------------------- */ -static int NextGetArguments(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +static int NextGetArguments(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], NsfCallStackContent **cscPtrPtr, const char **methodNamePtr, int *outObjc, Tcl_Obj ***outObjv, bool *freeArgumentVector) nonnull(1) nonnull(4) nonnull(5) nonnull(6) nonnull(7) nonnull(8); static int -NextGetArguments(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +NextGetArguments(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], NsfCallStackContent **cscPtrPtr, const char **methodNamePtr, int *outObjc, Tcl_Obj ***outObjv, bool *freeArgumentVector) { Tcl_Obj **nobjv; @@ -19680,7 +19709,7 @@ */ static int NextSearchAndInvoke(Tcl_Interp *interp, const char *methodName, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj *const objv[], NsfCallStackContent *cscPtr, bool freeArgumentVector) { Tcl_Command cmd = NULL, currentCmd = NULL; @@ -19895,11 +19924,11 @@ *---------------------------------------------------------------------- */ static int -NsfNextObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) +NsfNextObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) nonnull(2) nonnull(4); static int -NsfNextObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +NsfNextObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { int result, nobjc = 0; bool freeArgumentVector; const char *methodName = NULL; @@ -20050,7 +20079,7 @@ /* int - NsfKObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { + NsfKObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { if (objc < 2) { return NsfPrintError(interp, "wrong # of args for K"); } @@ -21422,11 +21451,11 @@ * *---------------------------------------------------------------------- */ -static int DoObjInitialization(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST objv[]) +static int DoObjInitialization(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(2) nonnull(4); static int -DoObjInitialization(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST objv[]) { +DoObjInitialization(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *const objv[]) { Tcl_Obj *methodObj, *savedObjResult; int result; @@ -22053,11 +22082,11 @@ * *---------------------------------------------------------------------- */ -static int NsfSetterMethod(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) +static int NsfSetterMethod(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(2) nonnull(4); static int -NsfSetterMethod(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +NsfSetterMethod(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { SetterCmdClientData *cd; NsfObject *object; int result; @@ -22142,13 +22171,13 @@ */ static int NsfForwardPrintError(Tcl_Interp *interp, ForwardCmdClientData *tcd, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj *const objv[], const char *fmt, ...) nonnull(1) nonnull(2) nonnull(5) NSF_attribute_format((printf,5,6)); static int NsfForwardPrintError(Tcl_Interp *interp, ForwardCmdClientData *tcd, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj *const objv[], const char *fmt, ...) { Tcl_DString ds; va_list ap; @@ -22218,7 +22247,7 @@ *---------------------------------------------------------------------- */ static int ForwardArg( - Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], + Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Tcl_Obj *forwardArgObj, ForwardCmdClientData *tcd, Tcl_Obj **out, Tcl_Obj **freeListObjPtr, int *inputArg, long *mapvalue, int firstPosArg, int *outputincr @@ -22227,7 +22256,7 @@ static int ForwardArg( Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj *const objv[], Tcl_Obj *forwardArgObj, ForwardCmdClientData *tcd, Tcl_Obj **out, @@ -22508,11 +22537,11 @@ *---------------------------------------------------------------------- */ -static int CallForwarder(ForwardCmdClientData *tcd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) +static int CallForwarder(ForwardCmdClientData *tcd, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(2) nonnull(4); static int -CallForwarder(ForwardCmdClientData *tcd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +CallForwarder(ForwardCmdClientData *tcd, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { int result; NsfObject *object; CallFrame frame, *framePtr = &frame; @@ -22581,12 +22610,12 @@ */ static int NsfForwardMethod(ClientData clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[]) + int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(2) nonnull(4); static int NsfForwardMethod(ClientData clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[]) { + int objc, Tcl_Obj *const objv[]) { ForwardCmdClientData *tcd = (ForwardCmdClientData *)clientData; int result, inputArg = 1; @@ -22812,13 +22841,13 @@ static int NsfProcAliasMethod(ClientData clientData, Tcl_Interp *interp, int UNUSED(objc), - Tcl_Obj *CONST UNUSED(objv[])) + Tcl_Obj *const UNUSED(objv[])) nonnull(1) nonnull(2) nonnull(4); static int NsfProcAliasMethod(ClientData clientData, Tcl_Interp *interp, int UNUSED(objc), - Tcl_Obj *CONST UNUSED(objv[])) { + Tcl_Obj *const UNUSED(objv[])) { AliasCmdClientData *tcd; nonnull_assert(clientData != NULL); @@ -22845,11 +22874,11 @@ *---------------------------------------------------------------------- */ -static int NsfObjscopedMethod(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) +static int NsfObjscopedMethod(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(2) nonnull(4); static int -NsfObjscopedMethod(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +NsfObjscopedMethod(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { AliasCmdClientData *tcd; NsfObject *object; CallFrame frame, *framePtr = &frame; @@ -22960,13 +22989,13 @@ */ static int CallConfigureMethod(Tcl_Interp *interp, NsfObject *object, const char *initString, const char *methodName, - int argc, Tcl_Obj *CONST argv[]) + int argc, Tcl_Obj *const argv[]) nonnull(1) nonnull(2) nonnull(3) nonnull(4); static int CallConfigureMethod(Tcl_Interp *interp, NsfObject *object, const char *initString, const char *methodName, - int argc, Tcl_Obj *CONST argv[]) { + int argc, Tcl_Obj *const argv[]) { int result; Tcl_Obj *methodObj = Tcl_NewStringObj(methodName, -1); @@ -23530,7 +23559,7 @@ *---------------------------------------------------------------------- */ int -Nsf_ArgumentParse(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +Nsf_ArgumentParse(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Nsf_Object *object, Tcl_Obj *procNameObj, Nsf_Param const *paramPtr, int nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr) { @@ -23593,7 +23622,7 @@ for (; (++(cPtr) <= lastParamPtr) && (*(cPtr)->name == '-'); ) static int -ArgumentParse(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], +ArgumentParse(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], NsfObject *object, Tcl_Obj *procNameObj, Nsf_Param const *paramPtr, int nrParams, int serial, unsigned int processFlags, ParseContext *pcPtr @@ -26948,7 +26977,7 @@ } */ static int -NsfColonCmd(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +NsfColonCmd(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { const char *methodName = ObjStr(objv[0]); NsfObject *self; int result; @@ -27069,7 +27098,7 @@ */ static int NsfDirectDispatchCmd(Tcl_Interp *interp, NsfObject *object, FrameIdx_t withFrame, - Tcl_Obj *commandObj, int trailingObjc, Tcl_Obj *CONST trailingObjv[]) { + Tcl_Obj *commandObj, int trailingObjc, Tcl_Obj *const trailingObjv[]) { int result; const char *methodName; Tcl_Command cmd, importedCmd; @@ -27183,9 +27212,9 @@ NsfDispatchCmd(Tcl_Interp *interp, NsfObject *object, int withIntrinsic, int withSystem, Tcl_Obj *commandObj, - int trailingObjc, Tcl_Obj *CONST trailingObjv[]) { + int trailingObjc, Tcl_Obj *const trailingObjv[]) { unsigned int flags = NSF_CM_NO_UNKNOWN|NSF_CSC_IMMEDIATE|NSF_CM_IGNORE_PERMISSIONS|NSF_CM_NO_SHIFT; - Tcl_Obj *CONST *objv = trailingObjv-1; + Tcl_Obj *const *objv = trailingObjv-1; nonnull_assert(interp != NULL); nonnull_assert(object != NULL); @@ -27333,7 +27362,7 @@ * Create a slave interp that calls Next Scripting Init */ static int -NsfInterpObjCmd(Tcl_Interp *interp, const char *name, int objc, Tcl_Obj *CONST objv[]) { +NsfInterpObjCmd(Tcl_Interp *interp, const char *name, int objc, Tcl_Obj *const objv[]) { nonnull_assert(interp != NULL); nonnull_assert(name != NULL); @@ -27903,7 +27932,7 @@ FrameIdx_t withFrame, int withVerbose, Tcl_Obj *targetObj, - int trailingObjc, Tcl_Obj *CONST trailingObjv[]) { + int trailingObjc, Tcl_Obj *const trailingObjv[]) { ForwardCmdClientData *tcd = NULL; int result; @@ -28645,7 +28674,7 @@ NsfMyCmd(Tcl_Interp *interp, int withIntrinsic, int withLocal, int withSystem, Tcl_Obj *methodNameObj, - int trailingObjc, Tcl_Obj *CONST trailingObjv[]) { + int trailingObjc, Tcl_Obj *const trailingObjv[]) { NsfObject *self; int result; @@ -29906,12 +29935,12 @@ } */ static int NsfVarImport(Tcl_Interp *interp, NsfObject *object, const char *cmdName, - int objc, Tcl_Obj *CONST objv[]) + int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(2) nonnull(3) nonnull(5); static int NsfVarImport(Tcl_Interp *interp, NsfObject *object, const char *cmdName, - int objc, Tcl_Obj *CONST objv[]) { + int objc, Tcl_Obj *const objv[]) { int i, result = TCL_OK; nonnull_assert(interp != NULL); @@ -29944,7 +29973,7 @@ } static int -NsfVarImportCmd(Tcl_Interp *interp, NsfObject *object, int trailingObjc, Tcl_Obj *CONST trailingObjv[]) { +NsfVarImportCmd(Tcl_Interp *interp, NsfObject *object, int trailingObjc, Tcl_Obj *const trailingObjv[]) { nonnull_assert(interp != NULL); nonnull_assert(object != NULL); @@ -30013,7 +30042,7 @@ typedef struct NsfParamWrapper { Nsf_Param *paramPtr; int refCount; - int canFree; + bool canFree; } NsfParamWrapper; static Tcl_DupInternalRepProc ParamDupInteralRep; @@ -30070,7 +30099,7 @@ paramWrapperPtr, paramWrapperPtr->paramPtr, paramWrapperPtr->refCount, paramWrapperPtr->canFree);*/ - if (paramWrapperPtr->canFree == 1) { + if (paramWrapperPtr->canFree) { ParamsFree(paramWrapperPtr->paramPtr); FREE(NsfParamWrapper, paramWrapperPtr); } else { @@ -30115,7 +30144,7 @@ paramWrapperPtr->paramPtr = ParamsNew(1u); paramWrapperPtr->refCount = 1; - paramWrapperPtr->canFree = 0; + paramWrapperPtr->canFree = NSF_FALSE; Tcl_AppendLimitedToObj(fullParamObj, ObjStr(objPtr), -1, INT_MAX, NULL); INCR_REF_COUNT(fullParamObj); @@ -30426,7 +30455,7 @@ paramPtr, paramWrapperPtr->refCount, paramWrapperPtr->canFree, flags);*/ assert(paramWrapperPtr->refCount > 0); - paramWrapperPtr->canFree = 1; + paramWrapperPtr->canFree = NSF_TRUE; if ((flags & NSF_PC_MUST_DECR) != 0u) { DECR_REF_COUNT2("valueObj", outObjPtr); @@ -30543,7 +30572,7 @@ static int -NsfOConfigureMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST objv[], Tcl_Obj *objv0) { +NsfOConfigureMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *const objv[], Tcl_Obj *objv0) { int result, i; NsfParsedParam parsedParam; Nsf_Param *paramPtr; @@ -31171,7 +31200,7 @@ */ static int -NsfOInstvarMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST objv[]) { +NsfOInstvarMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *const objv[]) { callFrameContext ctx = {NULL, NULL, 0}; int result; @@ -31269,7 +31298,7 @@ } */ static int -NsfOResidualargsMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST objv[]) { +NsfOResidualargsMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *const objv[]) { int i, start = 1, argc, nextArgc, normalArgs, result = TCL_OK; dashArgType isdasharg = NO_DASH; const char *methodName, *nextMethodName, *initString = NULL; @@ -31385,7 +31414,7 @@ } */ static int -NsfOUplevelMethod(Tcl_Interp *interp, NsfObject *UNUSED(object), int objc, Tcl_Obj *CONST objv[]) { +NsfOUplevelMethod(Tcl_Interp *interp, NsfObject *UNUSED(object), int objc, Tcl_Obj *const objv[]) { int i, result = TCL_ERROR; Tcl_CallFrame *framePtr = NULL, *savedVarFramePtr; @@ -31460,7 +31489,7 @@ } */ static int -NsfOUpvarMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST objv[]) { +NsfOUpvarMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *const objv[]) { Tcl_Obj *frameInfoObj = NULL; int i, result = TCL_ERROR; const char *frameInfo; @@ -31660,7 +31689,7 @@ } */ static int -NsfCCreateMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *CONST objv[]) { +NsfCCreateMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *const objv[]) { NsfObject *newObject = NULL; Tcl_Obj *actualNameObj, *methodObj, *tmpObj = NULL; int result, nameLength; @@ -31983,7 +32012,7 @@ static int NsfCNewMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *childofObj, - int trailingObjc, Tcl_Obj *CONST trailingObjv[]) { + int trailingObjc, Tcl_Obj *const trailingObjv[]) { Tcl_Obj *fullnameObj; Tcl_DString dFullname, *dsPtr = &dFullname; int result; @@ -32074,7 +32103,7 @@ */ static int RecreateObject(Tcl_Interp *interp, NsfClass *class, NsfObject *object, - int objc, Tcl_Obj *CONST objv[]) { + int objc, Tcl_Obj *const objv[]) { int result; nonnull_assert(interp != NULL); @@ -32135,7 +32164,7 @@ static int NsfCRecreateMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *objectNameObj, - int trailingObjc, Tcl_Obj *CONST trailingObjv[]) { + int trailingObjc, Tcl_Obj *const trailingObjv[]) { NsfObject *object; nonnull_assert(interp != NULL); @@ -32936,13 +32965,16 @@ *---------------------------------------------------------------------- */ -static Tcl_Obj *InstancesFromClassList(Tcl_Interp *interp, NsfClasses *subClasses, - const char *pattern, NsfObject *matchObject) - nonnull(1) nonnull(2) returns_nonnull; +static Tcl_Obj *InstancesFromClassList( + Tcl_Interp *interp, NsfClasses *subClasses, + const char *pattern, NsfObject *matchObject +) nonnull(1) nonnull(2) returns_nonnull; static Tcl_Obj * -InstancesFromClassList(Tcl_Interp *interp, NsfClasses *subClasses, - const char *pattern, NsfObject *matchObject) { +InstancesFromClassList( + Tcl_Interp *interp, NsfClasses *subClasses, + const char *pattern, NsfObject *matchObject +) { Tcl_Obj *resultObj = Tcl_NewObj(); nonnull_assert(interp != NULL); @@ -32977,9 +33009,11 @@ } */ static int -NsfClassInfoInstancesMethod(Tcl_Interp *interp, NsfClass *class, - int withClosure, const char *patternString, - NsfObject *patternObject) { +NsfClassInfoInstancesMethod( + Tcl_Interp *interp, NsfClass *class, + int withClosure, const char *patternString, + NsfObject *patternObject +) { NsfClasses clElement, *subClasses; nonnull_assert(interp != NULL); @@ -33009,9 +33043,10 @@ } */ static int -NsfClassInfoMethodMethod(Tcl_Interp *interp, NsfClass *class, - InfomethodsubcmdIdx_t subcmd, Tcl_Obj *nameObj) { - +NsfClassInfoMethodMethod( + Tcl_Interp *interp, NsfClass *class, + InfomethodsubcmdIdx_t subcmd, Tcl_Obj *nameObj +) { return ListMethodResolve(interp, subcmd, NULL, NULL, class->nsPtr, &class->object, nameObj, NSF_TRUE); } @@ -33026,14 +33061,15 @@ } */ static int -NsfClassInfoMethodsMethod(Tcl_Interp *interp, NsfClass *class, - CallprotectionIdx_t withCallprotection, - int withClosure, - MethodtypeIdx_t withType, - int withPath, - DefinitionsourceIdx_t withSource, - const char *pattern) { - +NsfClassInfoMethodsMethod( + Tcl_Interp *interp, NsfClass *class, + CallprotectionIdx_t withCallprotection, + int withClosure, + MethodtypeIdx_t withType, + int withPath, + DefinitionsourceIdx_t withSource, + const char *pattern +) { nonnull_assert(interp != NULL); nonnull_assert(class != NULL); @@ -33091,9 +33127,11 @@ } */ static int -NsfClassInfoMixinsMethod(Tcl_Interp *interp, NsfClass *class, - int withClosure, int withGuards, int withHeritage, - const char *patternString, NsfObject *patternObject) { +NsfClassInfoMixinsMethod( + Tcl_Interp *interp, NsfClass *class, + int withClosure, int withGuards, int withHeritage, + const char *patternString, NsfObject *patternObject +) { NsfClassOpt *opt; Tcl_Obj *resultObj; int result = TCL_OK; @@ -33173,15 +33211,16 @@ } */ static int -NsfClassInfoMixinOfMethod(Tcl_Interp *interp, NsfClass *class, - int withClosure, - MixinscopeIdx_t withScope, - const char *patternString, - NsfObject *patternObject) { +NsfClassInfoMixinOfMethod( + Tcl_Interp *interp, NsfClass *class, + int withClosure, + MixinscopeIdx_t withScope, + const char *patternString, + NsfObject *patternObject +) { NsfClassOpt *opt; - int perClass, perObject; + bool perClass, perObject, done = NSF_FALSE; Tcl_Obj *resultObj; - bool done = NSF_FALSE; nonnull_assert(interp != NULL); nonnull_assert(class != NULL); @@ -33191,25 +33230,25 @@ resultObj = Tcl_GetObjResult(interp); if (withScope == MixinscopeNULL || withScope == MixinscopeAllIdx) { - perClass = 1; - perObject = 1; + perClass = NSF_TRUE; + perObject = NSF_TRUE; } else if (withScope == MixinscopeClassIdx) { - perClass = 1; - perObject = 0; + perClass = NSF_TRUE; + perObject = NSF_FALSE; } else { - perClass = 0; - perObject = 1; + perClass = NSF_FALSE; + perObject = NSF_TRUE; } if (opt != NULL && !withClosure) { - if (perClass == 1 && opt->isClassMixinOf != NULL) { + if (perClass && opt->isClassMixinOf != NULL) { done = AppendMatchingElementsFromCmdList(interp, opt->isClassMixinOf, resultObj, patternString, patternObject); if (done && patternObject) { goto finished; } } - if (perObject == 1 && opt->isObjectMixinOf) { + if (perObject && opt->isObjectMixinOf) { done = AppendMatchingElementsFromCmdList(interp, opt->isObjectMixinOf, resultObj, patternString, patternObject); } @@ -33218,14 +33257,14 @@ MEM_COUNT_ALLOC("Tcl_InitHashTable", commandTable); Tcl_InitHashTable(commandTable, TCL_ONE_WORD_KEYS); - if (perClass == 1) { + if (perClass) { done = GetAllClassMixinsOf(interp, commandTable, resultObj, class, NSF_FALSE, NSF_TRUE, patternString, patternObject); if (done && patternObject) { goto finished;} } - if (perObject == 1) { + if (perObject) { done = GetAllObjectMixinsOf(interp, commandTable, resultObj, class, NSF_FALSE, NSF_TRUE, patternString, patternObject); } @@ -33387,11 +33426,14 @@ #ifdef DO_FULL_CLEANUP /* delete global variables and procs */ -static void DeleteProcsAndVars(Tcl_Interp *interp, Tcl_Namespace *nsPtr, bool withKeepvars) - nonnull(1) nonnull(2); +static void DeleteProcsAndVars( + Tcl_Interp *interp, Tcl_Namespace *nsPtr, bool withKeepvars +) nonnull(1) nonnull(2); static void -DeleteProcsAndVars(Tcl_Interp *interp, Tcl_Namespace *nsPtr, bool withKeepvars) { +DeleteProcsAndVars( + Tcl_Interp *interp, Tcl_Namespace *nsPtr, bool withKeepvars +) { Tcl_HashTable *varTablePtr, *cmdTablePtr, *childTablePtr; Tcl_HashSearch search; Tcl_Command cmd; @@ -33465,7 +33507,9 @@ *---------------------------------------------------------------------- */ static void -FinalObjectDeletion(Tcl_Interp *interp, NsfObject *object) { +FinalObjectDeletion( + Tcl_Interp *interp, NsfObject *object +) { nonnull_assert(interp != NULL); nonnull_assert(object != NULL); @@ -33529,11 +33573,14 @@ * *---------------------------------------------------------------------- */ -static void DeleteNsfProcs(Tcl_Interp *interp, Tcl_Namespace *nsPtr) - nonnull(1); +static void DeleteNsfProcs( + Tcl_Interp *interp, Tcl_Namespace *nsPtr +) nonnull(1); static void -DeleteNsfProcs(Tcl_Interp *interp, Tcl_Namespace *nsPtr) { +DeleteNsfProcs( + Tcl_Interp *interp, Tcl_Namespace *nsPtr +) { Tcl_HashTable *cmdTablePtr, *childTablePtr; register Tcl_HashEntry *entryPtr; Tcl_HashSearch search; @@ -33585,12 +33632,14 @@ * *---------------------------------------------------------------------- */ -static bool ClassHasSubclasses(NsfClass *cl) - nonnull(1) pure; +static bool ClassHasSubclasses( + NsfClass *cl +) nonnull(1) pure; static bool -ClassHasSubclasses(NsfClass *cl) { - +ClassHasSubclasses( + NsfClass *cl +) { nonnull_assert(cl != NULL); return (cl->sub != NULL); @@ -33611,11 +33660,14 @@ * *---------------------------------------------------------------------- */ -static bool ClassHasInstances(NsfClass *cl) - nonnull(1) pure; +static bool ClassHasInstances( + NsfClass *cl +) nonnull(1) pure; static bool -ClassHasInstances(NsfClass *cl) { +ClassHasInstances( + NsfClass *cl +) { Tcl_HashSearch hSrch; nonnull_assert(cl != NULL); @@ -33638,11 +33690,14 @@ * *---------------------------------------------------------------------- */ -static bool ObjectHasChildren(const NsfObject *object) - nonnull(1) pure; +static bool ObjectHasChildren( + const NsfObject *object +) nonnull(1) pure; static bool -ObjectHasChildren(const NsfObject *object) { +ObjectHasChildren( + const NsfObject *object +) { const Tcl_Namespace *ns; bool result = NSF_FALSE; @@ -33684,13 +33739,16 @@ * *---------------------------------------------------------------------- */ -static void FreeAllNsfObjectsAndClasses(Tcl_Interp *interp, NsfCmdList **instances) - nonnull(1) nonnull(2); +static void FreeAllNsfObjectsAndClasses( + Tcl_Interp *interp, NsfCmdList **instances +) nonnull(1) nonnull(2); static void -FreeAllNsfObjectsAndClasses(Tcl_Interp *interp, NsfCmdList **instances) { +FreeAllNsfObjectsAndClasses( + Tcl_Interp *interp, NsfCmdList **instances +) { NsfCmdList *entry, *lastEntry; - int deleted = 0; + int nrDeleted = 0; nonnull_assert(interp != NULL); nonnull_assert(instances != NULL); @@ -33725,7 +33783,7 @@ continue; } Tcl_DeleteCommandFromToken(interp, cmd); - deleted ++; + nrDeleted ++; } } } @@ -33752,7 +33810,7 @@ } } - /*fprintf(stderr, "deleted %d cmds\n", deleted);*/ + /*fprintf(stderr, "deleted %d cmds\n", nrDeleted);*/ /* * Finally delete the object/class tree in a bottom up manner, @@ -33765,7 +33823,7 @@ /* * Delete all plain objects without dependencies. */ - deleted = 0; + nrDeleted = 0; for (entry = *instances, lastEntry = NULL; entry != NULL; lastEntry = entry, entry = entry->nextPtr) { @@ -33802,12 +33860,12 @@ } assert(entry != NULL); - deleted++; + nrDeleted++; } } - /*fprintf(stderr, "deleted %d Objects without dependencies\n", deleted);*/ + /*fprintf(stderr, "deleted %d Objects without dependencies\n", nrDeleted);*/ - if (deleted > 0) { + if (nrDeleted > 0) { continue; } @@ -33817,11 +33875,11 @@ for (entry = *instances, lastEntry = NULL; entry != NULL; lastEntry = entry, entry = entry->nextPtr) { - NsfClass *cl = entry->clorobj; + NsfClass *class = entry->clorobj; - assert(cl != NULL); + assert(class != NULL); - if (!NsfObjectIsClass(&cl->object)) { + if (!NsfObjectIsClass(&class->object)) { continue; } @@ -33832,22 +33890,22 @@ * order. Otherwise, refcount checking for NsfObjects complains during * shutdown (and dangling references would be a consequence). */ - if (cl->opt != NULL && cl->opt->mixinRegObjs != NULL) { - NsfMixinregInvalidate(interp, cl->opt->mixinRegObjs); - DECR_REF_COUNT2("mixinRegObjs", cl->opt->mixinRegObjs); - cl->opt->mixinRegObjs = NULL; + if (class->opt != NULL && class->opt->mixinRegObjs != NULL) { + NsfMixinregInvalidate(interp, class->opt->mixinRegObjs); + DECR_REF_COUNT2("mixinRegObjs", class->opt->mixinRegObjs); + class->opt->mixinRegObjs = NULL; } - if (!ObjectHasChildren((NsfObject *)cl) - && !ClassHasInstances(cl) - && !ClassHasSubclasses(cl) - && !IsBaseClass(&cl->object) + if (!ObjectHasChildren((NsfObject *)class) + && !ClassHasInstances(class) + && !ClassHasSubclasses(class) + && !IsBaseClass(&class->object) ) { /*fprintf(stderr, " ... delete class %s %p\n", ClassName(cl), cl); */ - assert(cl->object.id); + assert(class->object.id); - FreeUnsetTraceVariable(interp, &cl->object); - FinalObjectDeletion(interp, &cl->object); + FreeUnsetTraceVariable(interp, &class->object); + FinalObjectDeletion(interp, &class->object); if (entry == *instances) { *instances = entry->nextPtr; @@ -33861,14 +33919,14 @@ entry = lastEntry; } - deleted++; + nrDeleted++; } } - /*fprintf(stderr, "deleted %d Classes\n", deleted);*/ + /*fprintf(stderr, "deleted %d Classes\n", nrDeleted);*/ - if (deleted == 0) { - int reclassed = 0; + if (nrDeleted == 0) { + int nrReclassed = 0; /* * Final check. If there are no cyclical dependencies, we should have @@ -33899,8 +33957,9 @@ for (sc = cl->super; sc != NULL; sc = sc->nextPtr) { if (sc->cl != osPtr->rootClass) { Tcl_Obj *objectName = osPtr->rootClass->object.cmdName; + SuperclassAdd(interp, cl, 1, &objectName, objectName); - reclassed ++; + nrReclassed ++; break; } } @@ -33912,12 +33971,12 @@ baseClass = NsfObjectIsClass(object) ? osPtr->rootMetaClass : osPtr->rootClass; if (object->cl != baseClass) { ChangeClass(interp, object, baseClass); - reclassed ++; + nrReclassed ++; } } - /*fprintf(stderr, "We have reclassed %d objects\n", reclassed);*/ + /*fprintf(stderr, "We have reclassed %d objects\n", nrReclassed);*/ - if (reclassed == 0) { + if (nrReclassed == 0) { break; } } @@ -34003,6 +34062,7 @@ /* free "global" (per main interp) objects */ { int i; + for (i = 0; i < nr_elements(NsfGlobalStrings); i++) { DECR_REF_COUNT(NsfGlobalObjs[i]); } @@ -34135,11 +34195,14 @@ #include #endif -int Nsf_Init(Tcl_Interp *interp) - nonnull(1); +int Nsf_Init( + Tcl_Interp *interp +) nonnull(1); int -Nsf_Init(Tcl_Interp *interp) { +Nsf_Init( + Tcl_Interp *interp +) { static NsfMutex initMutex = 0; ClientData runtimeState; NsfRuntimeState *rst; @@ -34475,8 +34538,9 @@ } -EXTERN int Nsf_SafeInit(Tcl_Interp *interp) - nonnull(1); +EXTERN int Nsf_SafeInit( + Tcl_Interp *interp +) nonnull(1); EXTERN int Nsf_SafeInit(Tcl_Interp *interp) { @@ -34495,5 +34559,6 @@ * c-basic-offset: 2 * fill-column: 78 * indent-tabs-mode: nil + * eval: (c-guess) * End: */ Index: generic/nsf.decls =================================================================== diff -u -r8552f707c011bfc24be22e1e8332f5558227cde3 -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- generic/nsf.decls (.../nsf.decls) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) +++ generic/nsf.decls (.../nsf.decls) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -129,29 +129,29 @@ declare 21 generic { int NsfCallMethodWithArgs(Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, Tcl_Obj *arg1, - int givenObjc, Tcl_Obj *CONST objv[], + int givenObjc, Tcl_Obj *const objv[], unsigned int flags) } declare 22 generic { int NsfAddObjectMethod(Tcl_Interp *interp, struct Nsf_Object *object, - CONST char *methodName, Tcl_ObjCmdProc *proc, + const char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags) } declare 23 generic { int NsfAddClassMethod(Tcl_Interp *interp, struct Nsf_Class *class, - CONST char *methodName, Tcl_ObjCmdProc *proc, + const char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags) } declare 24 generic { int NsfCreate(Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, - int objc, Tcl_Obj *CONST objv[]) + int objc, Tcl_Obj *const objv[]) } declare 25 generic { - int Nsf_ArgumentParse(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], + int Nsf_ArgumentParse(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Nsf_Object *object, Tcl_Obj *procNameObj, - Nsf_Param CONST *paramPtr, int nrParams, int serial, + Nsf_Param const *paramPtr, int nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr) } declare 26 generic { @@ -163,7 +163,7 @@ } declare 28 generic { - int Nsf_PointerDelete(CONST char *key, void *valuePtr, int free) + int Nsf_PointerDelete(const char *key, void *valuePtr, int free) } declare 29 generic { int Nsf_PointerTypeRegister(Tcl_Interp *interp, const char* typeName, int *counterPtr) Index: generic/nsfAPI.h =================================================================== diff -u -r6e5500ed599d989bb841560bd64d086d85482ce4 -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- generic/nsfAPI.h (.../nsfAPI.h) (revision 6e5500ed599d989bb841560bd64d086d85482ce4) +++ generic/nsfAPI.h (.../nsfAPI.h) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -289,248 +289,248 @@ "::nsf::methods::class::info", "::nsf::methods::class" }; -static int NsfCAllocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCAllocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCCreateMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCCreateMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCDeallocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCDeallocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCFilterGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCFilterGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCGetCachendParametersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCGetCachendParametersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCMixinGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCMixinGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCNewMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCNewMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCRecreateMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCRecreateMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCSuperclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCSuperclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoFilterguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoFilterguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoForwardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoForwardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoHeritageMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoHeritageMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoInstancesMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoInstancesMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoMixinOfMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoMixinOfMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoMixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoMixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoSlotobjectsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoSlotobjectsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoSubclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoSubclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoSuperclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfClassInfoSuperclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfAsmMethodCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfAsmMethodCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfAsmProcCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfAsmProcCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCallgrindDumpStatsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCallgrindDumpStatsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCallgrindStartInstrumentationCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCallgrindStartInstrumentationCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCallgrindStopInstrumentationCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCallgrindStopInstrumentationCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCallgrindToggleCollectCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCallgrindToggleCollectCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCallgrindZeroStatsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCallgrindZeroStatsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCmdInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCmdInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfColonCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfColonCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfConfigureCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfConfigureCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCurrentCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCurrentCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfDebugCompileEpochStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfDebugCompileEpochStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfDebugGetDictStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfDebugGetDictStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfDebugRunAssertionsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfDebugRunAssertionsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfDebugShowObjStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfDebugShowObjStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfDefinitionNamespaceCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfDefinitionNamespaceCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfDirectDispatchCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfDirectDispatchCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfDispatchCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfDispatchCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfFinalizeCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfFinalizeCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfForwardPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfForwardPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfInterpObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfInterpObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfIsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfIsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMethodAliasCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMethodAliasCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMethodAssertionCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMethodAssertionCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMethodCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMethodCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMethodDeleteCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMethodDeleteCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMethodForwardCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMethodForwardCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMethodPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMethodPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMethodRegisteredCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMethodRegisteredCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMethodSetterCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMethodSetterCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfNSCopyVarsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfNSCopyVarsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfNextCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfNextCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjectAllocCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjectAllocCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjectExistsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjectExistsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjectPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjectPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjectQualifyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjectQualifyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjectSystemCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjectSystemCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfParameterCacheClassInvalidateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfParameterCacheClassInvalidateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfParameterCacheObjectInvalidateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfParameterCacheObjectInvalidateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfParameterInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfParameterInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfParameterSpecsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfParameterSpecsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfParseArgsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfParseArgsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfProcCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfProcCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfProfileClearDataStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfProfileClearDataStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfProfileGetDataStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfProfileGetDataStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfProfileTraceStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfProfileTraceStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfRelationGetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfRelationGetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfRelationSetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfRelationSetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfSelfCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfSelfCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfShowStackCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfShowStackCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfUnsetUnknownArgsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfUnsetUnknownArgsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfVarExistsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfVarExistsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfVarGetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfVarGetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfVarImportCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfVarImportCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfVarSetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfVarSetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfVarUnsetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfVarUnsetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOAutonameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOAutonameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOCgetMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOCgetMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOCleanupMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOCleanupMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOConfigureMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOConfigureMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfODestroyMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfODestroyMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOExistsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOExistsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOFilterGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOFilterGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOInstvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOInstvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOMixinGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOMixinGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfONoinitMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfONoinitMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfORequireNamespaceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfORequireNamespaceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOResidualargsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOResidualargsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOUplevelMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOUplevelMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOUpvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOUpvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfOVolatileMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfOVolatileMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoBaseclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoBaseclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoChildrenMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoChildrenMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoFilterguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoFilterguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoForwardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoForwardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoHasMixinMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoHasMixinMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoHasTypeMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoHasTypeMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoHasnamespaceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoHasnamespaceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoLookupFilterMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoLookupFilterMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoLookupFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoLookupFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoLookupMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoLookupMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoLookupMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoLookupMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoLookupMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoLookupMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoLookupSlotsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoLookupSlotsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoMixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoMixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoNameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoNameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoParentMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoParentMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoPrecedenceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoPrecedenceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoSlotobjectsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoSlotobjectsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoVarsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfObjInfoVarsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); static int NsfCAllocMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *objectNameObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfCCreateMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *objectNameObj, int trailingObjc, Tcl_Obj *CONST* trailingObjv) +static int NsfCCreateMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *objectNameObj, int trailingObjc, Tcl_Obj *const* trailingObjv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); static int NsfCDeallocMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *objectObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); @@ -540,9 +540,9 @@ NSF_nonnull(1) NSF_nonnull(2); static int NsfCMixinGuardMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *mixinObj, Tcl_Obj *guardObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3) NSF_nonnull(4); -static int NsfCNewMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *childofObj, int trailingObjc, Tcl_Obj *CONST* trailingObjv) +static int NsfCNewMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *childofObj, int trailingObjc, Tcl_Obj *const* trailingObjv) NSF_nonnull(1) NSF_nonnull(2); -static int NsfCRecreateMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *objectNameObj, int trailingObjc, Tcl_Obj *CONST* trailingObjv) +static int NsfCRecreateMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *objectNameObj, int trailingObjc, Tcl_Obj *const* trailingObjv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); static int NsfCSuperclassMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *superclassesObj) NSF_nonnull(1) NSF_nonnull(2); @@ -588,7 +588,7 @@ NSF_nonnull(1); static int NsfCmdInfoCmd(Tcl_Interp *interp, InfomethodsubcmdIdx_t subcmd, NsfObject *contextObject, Tcl_Obj *methodNameObj, const char *pattern) NSF_nonnull(1) NSF_nonnull(4); -static int NsfColonCmd(Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfColonCmd(Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(1); static int NsfConfigureCmd(Tcl_Interp *interp, ConfigureoptionIdx_t option, Tcl_Obj *valueObj) NSF_nonnull(1); @@ -604,15 +604,15 @@ NSF_nonnull(1) NSF_nonnull(2); static int NsfDefinitionNamespaceCmd(Tcl_Interp *interp) NSF_nonnull(1); -static int NsfDirectDispatchCmd(Tcl_Interp *interp, NsfObject *object, FrameIdx_t withFrame, Tcl_Obj *commandObj, int trailingObjc, Tcl_Obj *CONST* trailingObjv) +static int NsfDirectDispatchCmd(Tcl_Interp *interp, NsfObject *object, FrameIdx_t withFrame, Tcl_Obj *commandObj, int trailingObjc, Tcl_Obj *const* trailingObjv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfDispatchCmd(Tcl_Interp *interp, NsfObject *object, int withIntrinsic, int withSystem, Tcl_Obj *commandObj, int trailingObjc, Tcl_Obj *CONST* trailingObjv) +static int NsfDispatchCmd(Tcl_Interp *interp, NsfObject *object, int withIntrinsic, int withSystem, Tcl_Obj *commandObj, int trailingObjc, Tcl_Obj *const* trailingObjv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(5); static int NsfFinalizeCmd(Tcl_Interp *interp, int withKeepvars) NSF_nonnull(1); static int NsfForwardPropertyCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *methodNameObj, ForwardpropertyIdx_t forwardProperty, Tcl_Obj *valueObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfInterpObjCmd(Tcl_Interp *interp, const char *name, int objc, Tcl_Obj *CONST* objv) +static int NsfInterpObjCmd(Tcl_Interp *interp, const char *name, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2); static int NsfIsCmd(Tcl_Interp *interp, int withComplain, int withConfigure, const char *withName, Tcl_Obj *constraintObj, Tcl_Obj *valueObj) NSF_nonnull(1) NSF_nonnull(5) NSF_nonnull(6); @@ -624,15 +624,15 @@ NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(7) NSF_nonnull(8) NSF_nonnull(9); static int NsfMethodDeleteCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *methodNameObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMethodForwardCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *methodObj, Tcl_Obj *defaultObj, int withEarlybinding, Tcl_Obj *onerrorObj, Tcl_Obj *prefixObj, FrameIdx_t withFrame, int withVerbose, Tcl_Obj *targetObj, int trailingObjc, Tcl_Obj *CONST* trailingObjv) +static int NsfMethodForwardCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *methodObj, Tcl_Obj *defaultObj, int withEarlybinding, Tcl_Obj *onerrorObj, Tcl_Obj *prefixObj, FrameIdx_t withFrame, int withVerbose, Tcl_Obj *targetObj, int trailingObjc, Tcl_Obj *const* trailingObjv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); static int NsfMethodPropertyCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *methodNameObj, MethodpropertyIdx_t methodProperty, Tcl_Obj *valueObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); static int NsfMethodRegisteredCmd(Tcl_Interp *interp, Tcl_Obj *handleObj) NSF_nonnull(1) NSF_nonnull(2); static int NsfMethodSetterCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *parameterObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMyCmd(Tcl_Interp *interp, int withIntrinsic, int withLocal, int withSystem, Tcl_Obj *methodNameObj, int trailingObjc, Tcl_Obj *CONST* trailingObjv) +static int NsfMyCmd(Tcl_Interp *interp, int withIntrinsic, int withLocal, int withSystem, Tcl_Obj *methodNameObj, int trailingObjc, Tcl_Obj *const* trailingObjv) NSF_nonnull(1) NSF_nonnull(5); static int NsfNSCopyVarsCmd(Tcl_Interp *interp, Tcl_Obj *fromNsObj, Tcl_Obj *toNsObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); @@ -680,7 +680,7 @@ NSF_nonnull(1) NSF_nonnull(3) NSF_nonnull(4); static int NsfVarGetCmd(Tcl_Interp *interp, int withArray, int withNotrace, NsfObject *object, Tcl_Obj *varNameObj) NSF_nonnull(1) NSF_nonnull(4) NSF_nonnull(5); -static int NsfVarImportCmd(Tcl_Interp *interp, NsfObject *object, int trailingObjc, Tcl_Obj *CONST* trailingObjv) +static int NsfVarImportCmd(Tcl_Interp *interp, NsfObject *object, int trailingObjc, Tcl_Obj *const* trailingObjv) NSF_nonnull(1) NSF_nonnull(2); static int NsfVarSetCmd(Tcl_Interp *interp, int withArray, int withNotrace, NsfObject *object, Tcl_Obj *varNameObj, Tcl_Obj *valueObj) NSF_nonnull(1) NSF_nonnull(4) NSF_nonnull(5); @@ -694,27 +694,27 @@ NSF_nonnull(1) NSF_nonnull(2); static int NsfOCleanupMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfOConfigureMethod(Tcl_Interp *interp, NsfObject *object, int trailingObjc, Tcl_Obj *CONST* trailingObjv, Tcl_Obj *objv0) +static int NsfOConfigureMethod(Tcl_Interp *interp, NsfObject *object, int trailingObjc, Tcl_Obj *const* trailingObjv, Tcl_Obj *objv0) NSF_nonnull(1) NSF_nonnull(2); static int NsfODestroyMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); static int NsfOExistsMethod(Tcl_Interp *interp, NsfObject *object, const char *varName) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); static int NsfOFilterGuardMethod(Tcl_Interp *interp, NsfObject *object, const char *filter, Tcl_Obj *guardObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3) NSF_nonnull(4); -static int NsfOInstvarMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST* objv) +static int NsfOInstvarMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2); static int NsfOMixinGuardMethod(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *mixinObj, Tcl_Obj *guardObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3) NSF_nonnull(4); static int NsfONoinitMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); static int NsfORequireNamespaceMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfOResidualargsMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST* objv) +static int NsfOResidualargsMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2); -static int NsfOUplevelMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST* objv) +static int NsfOUplevelMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2); -static int NsfOUpvarMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST* objv) +static int NsfOUpvarMethod(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *const* objv) NSF_nonnull(1) NSF_nonnull(2); static int NsfOVolatileMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); @@ -891,7 +891,7 @@ static int -NsfCAllocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCAllocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfClass *class; NSF_nonnull_assert(clientData != NULL); @@ -915,7 +915,7 @@ } static int -NsfCCreateMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCCreateMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -943,7 +943,7 @@ } static int -NsfCDeallocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCDeallocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfClass *class; NSF_nonnull_assert(clientData != NULL); @@ -967,7 +967,7 @@ } static int -NsfCFilterGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCFilterGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -996,7 +996,7 @@ } static int -NsfCGetCachendParametersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCGetCachendParametersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfClass *class; NSF_nonnull_assert(clientData != NULL); @@ -1020,7 +1020,7 @@ } static int -NsfCMixinGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCMixinGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1049,7 +1049,7 @@ } static int -NsfCNewMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCNewMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1077,7 +1077,7 @@ } static int -NsfCRecreateMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCRecreateMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1105,7 +1105,7 @@ } static int -NsfCSuperclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCSuperclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfClass *class; NSF_nonnull_assert(clientData != NULL); @@ -1129,7 +1129,7 @@ } static int -NsfClassInfoFilterguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoFilterguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1157,7 +1157,7 @@ } static int -NsfClassInfoFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1186,7 +1186,7 @@ } static int -NsfClassInfoForwardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoForwardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1215,7 +1215,7 @@ } static int -NsfClassInfoHeritageMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoHeritageMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1243,7 +1243,7 @@ } static int -NsfClassInfoInstancesMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoInstancesMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1291,7 +1291,7 @@ } static int -NsfClassInfoMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1320,7 +1320,7 @@ } static int -NsfClassInfoMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1353,7 +1353,7 @@ } static int -NsfClassInfoMixinOfMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoMixinOfMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1402,7 +1402,7 @@ } static int -NsfClassInfoMixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoMixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1430,7 +1430,7 @@ } static int -NsfClassInfoMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1480,7 +1480,7 @@ } static int -NsfClassInfoSlotobjectsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoSlotobjectsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1511,7 +1511,7 @@ } static int -NsfClassInfoSubclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoSubclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1560,7 +1560,7 @@ } static int -NsfClassInfoSuperclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfClassInfoSuperclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfClass *class; @@ -1589,7 +1589,7 @@ } static int -NsfAsmMethodCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfAsmMethodCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -1616,7 +1616,7 @@ } static int -NsfAsmProcCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfAsmProcCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -1640,7 +1640,7 @@ } static int -NsfCallgrindDumpStatsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCallgrindDumpStatsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -1660,7 +1660,7 @@ } static int -NsfCallgrindStartInstrumentationCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCallgrindStartInstrumentationCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -1676,7 +1676,7 @@ } static int -NsfCallgrindStopInstrumentationCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCallgrindStopInstrumentationCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -1692,7 +1692,7 @@ } static int -NsfCallgrindToggleCollectCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCallgrindToggleCollectCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -1708,7 +1708,7 @@ } static int -NsfCallgrindZeroStatsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCallgrindZeroStatsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -1724,7 +1724,7 @@ } static int -NsfCmdInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCmdInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -1747,7 +1747,7 @@ } static int -NsfColonCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfColonCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -1757,7 +1757,7 @@ } static int -NsfConfigureCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfConfigureCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -1778,7 +1778,7 @@ } static int -NsfCurrentCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCurrentCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -1798,7 +1798,7 @@ } static int -NsfDebugCompileEpochStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfDebugCompileEpochStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -1814,7 +1814,7 @@ } static int -NsfDebugGetDictStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfDebugGetDictStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -1830,7 +1830,7 @@ } static int -NsfDebugRunAssertionsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfDebugRunAssertionsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -1846,7 +1846,7 @@ } static int -NsfDebugShowObjStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfDebugShowObjStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -1862,7 +1862,7 @@ } static int -NsfDefinitionNamespaceCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfDefinitionNamespaceCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -1878,7 +1878,7 @@ } static int -NsfDirectDispatchCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfDirectDispatchCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -1900,7 +1900,7 @@ } static int -NsfDispatchCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfDispatchCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -1923,7 +1923,7 @@ } static int -NsfFinalizeCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfFinalizeCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -1943,7 +1943,7 @@ } static int -NsfForwardPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfForwardPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -1967,7 +1967,7 @@ } static int -NsfInterpObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfInterpObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -1987,7 +1987,7 @@ } static int -NsfIsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfIsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2011,7 +2011,7 @@ } static int -NsfMethodAliasCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMethodAliasCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2036,7 +2036,7 @@ } static int -NsfMethodAssertionCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMethodAssertionCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2058,7 +2058,7 @@ } static int -NsfMethodCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMethodCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2087,7 +2087,7 @@ } static int -NsfMethodDeleteCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMethodDeleteCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2109,7 +2109,7 @@ } static int -NsfMethodForwardCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMethodForwardCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2138,7 +2138,7 @@ } static int -NsfMethodPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMethodPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2162,7 +2162,7 @@ } static int -NsfMethodRegisteredCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMethodRegisteredCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -2178,7 +2178,7 @@ } static int -NsfMethodSetterCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMethodSetterCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2200,7 +2200,7 @@ } static int -NsfMyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2223,7 +2223,7 @@ } static int -NsfNSCopyVarsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfNSCopyVarsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2244,7 +2244,7 @@ } static int -NsfNextCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfNextCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -2260,7 +2260,7 @@ } static int -NsfObjectAllocCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjectAllocCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2282,7 +2282,7 @@ } static int -NsfObjectExistsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjectExistsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -2298,7 +2298,7 @@ } static int -NsfObjectPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjectPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2320,7 +2320,7 @@ } static int -NsfObjectQualifyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjectQualifyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -2336,7 +2336,7 @@ } static int -NsfObjectSystemCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjectSystemCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2358,7 +2358,7 @@ } static int -NsfParameterCacheClassInvalidateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfParameterCacheClassInvalidateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2378,7 +2378,7 @@ } static int -NsfParameterCacheObjectInvalidateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfParameterCacheObjectInvalidateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2398,7 +2398,7 @@ } static int -NsfParameterInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfParameterInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2420,7 +2420,7 @@ } static int -NsfParameterSpecsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfParameterSpecsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2442,7 +2442,7 @@ } static int -NsfParseArgsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfParseArgsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2463,7 +2463,7 @@ } static int -NsfProcCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfProcCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2489,7 +2489,7 @@ } static int -NsfProfileClearDataStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfProfileClearDataStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -2505,7 +2505,7 @@ } static int -NsfProfileGetDataStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfProfileGetDataStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -2521,7 +2521,7 @@ } static int -NsfProfileTraceStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfProfileTraceStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2544,7 +2544,7 @@ } static int -NsfRelationGetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfRelationGetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2565,7 +2565,7 @@ } static int -NsfRelationSetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfRelationSetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2587,7 +2587,7 @@ } static int -NsfSelfCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfSelfCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -2603,7 +2603,7 @@ } static int -NsfShowStackCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfShowStackCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -2619,7 +2619,7 @@ } static int -NsfUnsetUnknownArgsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfUnsetUnknownArgsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -2635,7 +2635,7 @@ } static int -NsfVarExistsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfVarExistsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2657,7 +2657,7 @@ } static int -NsfVarGetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfVarGetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2680,7 +2680,7 @@ } static int -NsfVarImportCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfVarImportCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2700,7 +2700,7 @@ } static int -NsfVarSetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfVarSetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2724,7 +2724,7 @@ } static int -NsfVarUnsetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfVarUnsetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -2746,7 +2746,7 @@ } static int -NsfOAutonameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOAutonameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -2772,7 +2772,7 @@ } static int -NsfOCgetMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOCgetMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -2792,7 +2792,7 @@ } static int -NsfOClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -2812,7 +2812,7 @@ } static int -NsfOCleanupMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOCleanupMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -2832,7 +2832,7 @@ } static int -NsfOConfigureMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOConfigureMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -2856,7 +2856,7 @@ } static int -NsfODestroyMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfODestroyMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -2876,7 +2876,7 @@ } static int -NsfOExistsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOExistsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -2900,7 +2900,7 @@ } static int -NsfOFilterGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOFilterGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -2925,7 +2925,7 @@ } static int -NsfOInstvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOInstvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -2949,7 +2949,7 @@ } static int -NsfOMixinGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOMixinGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -2974,7 +2974,7 @@ } static int -NsfONoinitMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfONoinitMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -2994,7 +2994,7 @@ } static int -NsfORequireNamespaceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfORequireNamespaceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -3014,7 +3014,7 @@ } static int -NsfOResidualargsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOResidualargsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3038,7 +3038,7 @@ } static int -NsfOUplevelMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOUplevelMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3062,7 +3062,7 @@ } static int -NsfOUpvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOUpvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3086,7 +3086,7 @@ } static int -NsfOVolatileMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfOVolatileMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -3106,7 +3106,7 @@ } static int -NsfObjInfoBaseclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoBaseclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -3126,7 +3126,7 @@ } static int -NsfObjInfoChildrenMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoChildrenMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3151,7 +3151,7 @@ } static int -NsfObjInfoClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -3171,7 +3171,7 @@ } static int -NsfObjInfoFilterguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoFilterguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3195,7 +3195,7 @@ } static int -NsfObjInfoFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3220,7 +3220,7 @@ } static int -NsfObjInfoForwardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoForwardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3245,7 +3245,7 @@ } static int -NsfObjInfoHasMixinMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoHasMixinMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3269,7 +3269,7 @@ } static int -NsfObjInfoHasTypeMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoHasTypeMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3293,7 +3293,7 @@ } static int -NsfObjInfoHasnamespaceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoHasnamespaceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -3313,7 +3313,7 @@ } static int -NsfObjInfoLookupFilterMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoLookupFilterMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3337,7 +3337,7 @@ } static int -NsfObjInfoLookupFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoLookupFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3362,7 +3362,7 @@ } static int -NsfObjInfoLookupMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoLookupMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -3382,7 +3382,7 @@ } static int -NsfObjInfoLookupMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoLookupMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3412,7 +3412,7 @@ } static int -NsfObjInfoLookupMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoLookupMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3456,7 +3456,7 @@ } static int -NsfObjInfoLookupSlotsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoLookupSlotsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3482,7 +3482,7 @@ } static int -NsfObjInfoMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3507,7 +3507,7 @@ } static int -NsfObjInfoMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3534,7 +3534,7 @@ } static int -NsfObjInfoMixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoMixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3558,7 +3558,7 @@ } static int -NsfObjInfoMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3602,7 +3602,7 @@ } static int -NsfObjInfoNameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoNameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -3622,7 +3622,7 @@ } static int -NsfObjInfoParentMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoParentMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { NsfObject *object; NSF_nonnull_assert(clientData != NULL); @@ -3642,7 +3642,7 @@ } static int -NsfObjInfoPrecedenceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoPrecedenceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3667,7 +3667,7 @@ } static int -NsfObjInfoSlotobjectsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoSlotobjectsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; @@ -3692,7 +3692,7 @@ } static int -NsfObjInfoVarsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfObjInfoVarsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; NsfObject *object; Index: generic/nsfError.c =================================================================== diff -u -r8552f707c011bfc24be22e1e8332f5558227cde3 -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- generic/nsfError.c (.../nsfError.c) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) +++ generic/nsfError.c (.../nsfError.c) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -225,7 +225,7 @@ *---------------------------------------------------------------------- */ void -NsfDStringArgv(Tcl_DString *dsPtr, int objc, Tcl_Obj *CONST objv[]) { +NsfDStringArgv(Tcl_DString *dsPtr, int objc, Tcl_Obj *const objv[]) { nonnull_assert(dsPtr != NULL); nonnull_assert(objv != NULL); Index: generic/nsfFunPtrHashTable.c =================================================================== diff -u -r0de05aaed50fced1cd80a9408560a38fb2454bcf -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- generic/nsfFunPtrHashTable.c (.../nsfFunPtrHashTable.c) (revision 0de05aaed50fced1cd80a9408560a38fb2454bcf) +++ generic/nsfFunPtrHashTable.c (.../nsfFunPtrHashTable.c) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -5,7 +5,7 @@ * as hash keys, and a slim wrapper around Tcl's hashtable * API to manage them. * - * Copyright (C) 2016-2017 Gustaf Neumann + * Copyright (C) 2016-2018 Gustaf Neumann * Copyright (C) 2016 Stefan Sobernig * * Vienna University of Economics and Business @@ -52,9 +52,9 @@ * pointers safely. * */ -static unsigned int FunPtrKey(Tcl_HashTable *tablePtr, VOID *keyPtr); -static int CompareFunPtrKeys(VOID *keyPtr, Tcl_HashEntry *hPtr); -static Tcl_HashEntry *AllocFunPtrEntry(Tcl_HashTable *tablePtr, VOID *keyPtr); +static unsigned int FunPtrKey(Tcl_HashTable *tablePtr, void *keyPtr); +static int CompareFunPtrKeys(void *keyPtr, Tcl_HashEntry *hPtr); +static Tcl_HashEntry *AllocFunPtrEntry(Tcl_HashTable *tablePtr, void *keyPtr); typedef struct funPtrEntry_t { @@ -88,11 +88,11 @@ static unsigned int FunPtrKey( - Tcl_HashTable *UNUSED(tablePtr), /* Hash table. */ - VOID *keyPtr) /* Key from which to compute hash value. */ -{ - funPtrEntry_t *e = (funPtrEntry_t *)keyPtr; - Nsf_AnyFun *value = e->funPtr; + Tcl_HashTable *UNUSED(tablePtr), /* Hash table. */ + void *keyPtr /* Key from which to compute hash value. */ +) { + funPtrEntry_t *e = (funPtrEntry_t *)keyPtr; + Nsf_AnyFun *value = e->funPtr; /* * This is a very simple approach for obtaining a hash value. Maybe one @@ -121,11 +121,11 @@ static int CompareFunPtrKeys( - VOID *keyPtr, /* New key to compare. */ - Tcl_HashEntry *hPtr) /* Existing key to compare. */ -{ - funPtrEntry_t *e = (funPtrEntry_t *)keyPtr; - Nsf_AnyFun *existingValue; + void *keyPtr, /* New key to compare. */ + Tcl_HashEntry *hPtr /* Existing key to compare. */ +) { + funPtrEntry_t *e = (funPtrEntry_t *)keyPtr; + Nsf_AnyFun *existingValue; memcpy(&existingValue, &hPtr->key.oneWordValue, sizeof(Nsf_AnyFun *)); @@ -149,13 +149,13 @@ */ static Tcl_HashEntry * AllocFunPtrEntry( - Tcl_HashTable *UNUSED(tablePtr), /* Hash table. */ - VOID *keyPtr) /* Key to store in the hash table entry. */ -{ - funPtrEntry_t *e = (funPtrEntry_t *)keyPtr; - Tcl_HashEntry *hPtr; - unsigned int size; - Nsf_AnyFun *value = e->funPtr; + Tcl_HashTable *UNUSED(tablePtr), /* Hash table. */ + void *keyPtr /* Key to store in the hash table entry. */ +) { + funPtrEntry_t *e = (funPtrEntry_t *)keyPtr; + Tcl_HashEntry *hPtr; + unsigned int size; + Nsf_AnyFun *value = e->funPtr; size = sizeof(Tcl_HashEntry) + (sizeof(Nsf_AnyFun *)) - sizeof(hPtr->key); if (size < sizeof(Tcl_HashEntry)) { @@ -191,7 +191,7 @@ Nsf_InitFunPtrHashTable(Tcl_HashTable *tablePtr) { nonnull_assert(tablePtr != NULL); - + Tcl_InitCustomHashTable(tablePtr, TCL_CUSTOM_PTR_KEYS, &funPtrHashKeyType); } @@ -213,17 +213,21 @@ */ Tcl_HashEntry * -Nsf_CreateFunPtrHashEntry(Tcl_HashTable *tablePtr, Nsf_AnyFun *key, int *isNew) { +Nsf_CreateFunPtrHashEntry( + Tcl_HashTable *tablePtr, + Nsf_AnyFun *key, + int *isNew +) { Tcl_HashEntry *hPtr; - funPtrEntry_t entry; - + funPtrEntry_t entry; + nonnull_assert(tablePtr != NULL); nonnull_assert(key != NULL); entry.funPtr = key; hPtr = Tcl_CreateHashEntry(tablePtr, (const char *)&entry, isNew); + return hPtr; - } /* @@ -245,15 +249,15 @@ Tcl_HashEntry * Nsf_FindFunPtrHashEntry(Tcl_HashTable *tablePtr, Nsf_AnyFun *key) { Tcl_HashEntry *hPtr; - funPtrEntry_t entry; - + funPtrEntry_t entry; + nonnull_assert(tablePtr != NULL); nonnull_assert(key != NULL); entry.funPtr = key; hPtr = Tcl_FindHashEntry(tablePtr, (const char *)&entry); return hPtr; - + } /* @@ -262,5 +266,6 @@ * c-basic-offset: 2 * fill-column: 78 * indent-tabs-mode: nil + * eval: (c-guess) * End: */ Index: generic/nsfInt.h =================================================================== diff -u -r23843225a71772ef49efb6ee84423fde1b4cd762 -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- generic/nsfInt.h (.../nsfInt.h) (revision 23843225a71772ef49efb6ee84423fde1b4cd762) +++ generic/nsfInt.h (.../nsfInt.h) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -691,9 +691,9 @@ } SystemMethodsIdx; #if !defined(NSF_C) -EXTERN CONST char *Nsf_SystemMethodOpts[]; +EXTERN const char *Nsf_SystemMethodOpts[]; #else -CONST char *Nsf_SystemMethodOpts[] = { +const char *Nsf_SystemMethodOpts[] = { "-class.alloc", "-class.create", "-class.dealloc", @@ -815,7 +815,7 @@ NSF_PARAMS_PARAMETER, NSF_PARAMS_SYNTAX} NsfParamsPrintStyle; int NsfCallCommand(Tcl_Interp *interp, NsfGlobalNames name, - int objc, Tcl_Obj *CONST objv[]) + int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(4); int NsfShadowTclCommands(Tcl_Interp *interp, NsfShadowOperations load) @@ -842,13 +842,13 @@ NsfClass *cl; Tcl_Command cmdPtr; NsfFilterStack *filterStackEntry; - Tcl_Obj *CONST* objv; + Tcl_Obj *const* objv; int objc; unsigned int flags; #if defined(NSF_PROFILE) || defined(NSF_DTRACE) long int startUsec; long int startSec; - CONST char *methodName; + const char *methodName; #endif unsigned short frameType; } NsfCallStackContent; @@ -1171,7 +1171,7 @@ EXTERN NsfCompEnv *NsfGetCompEnv(void); int NsfDirectSelfDispatch(ClientData cd, Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[]) + int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(2); #endif @@ -1184,13 +1184,13 @@ const char *arglist) nonnull(1) nonnull(2); -EXTERN CONST char *NsfMethodName(Tcl_Obj *methodObj) +EXTERN const char *NsfMethodName(Tcl_Obj *methodObj) nonnull(1) returns_nonnull; EXTERN void NsfInitPkgConfig(Tcl_Interp *interp) nonnull(1); -EXTERN void NsfDStringArgv(Tcl_DString *dsPtr, int objc, Tcl_Obj *CONST objv[]) +EXTERN void NsfDStringArgv(Tcl_DString *dsPtr, int objc, Tcl_Obj *const objv[]) nonnull(1) nonnull(3); EXTERN Tcl_Obj *NsfMethodNamePath(Tcl_Interp *interp, @@ -1236,8 +1236,8 @@ Tcl_Obj *payload, unsigned int flags); typedef struct { - CONST Nsf_Param *signature; - Nsf_Param CONST *paramPtr; + const Nsf_Param *signature; + Nsf_Param const *paramPtr; Tcl_Obj *payload; int serial; unsigned int flags; Index: generic/nsfProfile.c =================================================================== diff -u -r625e5b42ce67fb5b427852f477e9dac8746e8025 -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- generic/nsfProfile.c (.../nsfProfile.c) (revision 625e5b42ce67fb5b427852f477e9dac8746e8025) +++ generic/nsfProfile.c (.../nsfProfile.c) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -310,7 +310,7 @@ *---------------------------------------------------------------------- */ static int -Nsf_ProfileFilterObjCmd(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +Nsf_ProfileFilterObjCmd(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { NsfShadowTclCommandInfo *ti; int result; struct Tcl_Time start; Index: generic/nsfShadow.c =================================================================== diff -u -r0de05aaed50fced1cd80a9408560a38fb2454bcf -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- generic/nsfShadow.c (.../nsfShadow.c) (revision 0de05aaed50fced1cd80a9408560a38fb2454bcf) +++ generic/nsfShadow.c (.../nsfShadow.c) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -199,7 +199,7 @@ */ static int -Nsf_InfoBodyObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +Nsf_InfoBodyObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { Tcl_Command cmd; nonnull_assert(interp != NULL); @@ -249,7 +249,7 @@ */ static int -Nsf_RenameObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +Nsf_RenameObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { Tcl_Command cmd; if (objc != 3) { @@ -299,7 +299,7 @@ */ static int -Nsf_InfoFrameObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +Nsf_InfoFrameObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { int result; result = NsfCallCommand(interp, NSF_INFO_FRAME, objc, objv); @@ -475,7 +475,7 @@ *---------------------------------------------------------------------- */ int NsfCallCommand(Tcl_Interp *interp, NsfGlobalNames name, - int objc, Tcl_Obj *CONST objv[]) { + int objc, Tcl_Obj *const objv[]) { int result; NsfShadowTclCommandInfo *ti = &RUNTIME_STATE(interp)->tclCommands[name-NSF_EXPR]; ALLOC_ON_STACK(Tcl_Obj*, objc, ov); Index: generic/stubs8.5/nsfDecls.h =================================================================== diff -u -r8552f707c011bfc24be22e1e8332f5558227cde3 -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- generic/stubs8.5/nsfDecls.h (.../nsfDecls.h) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) +++ generic/stubs8.5/nsfDecls.h (.../nsfDecls.h) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -146,8 +146,7 @@ /* 14 */ EXTERN int NsfObjErrType(Tcl_Interp *interp, CONST char *context, Tcl_Obj *value, - CONST char *type, - Nsf_Param CONST *NsfObjErrType); + CONST char *type, Nsf_Param CONST *paramPtr); #endif #ifndef NsfStackDump_TCL_DECLARED #define NsfStackDump_TCL_DECLARED @@ -357,7 +356,7 @@ void (*nsfDStringVPrintf) (Tcl_DString *dsPtr, CONST char *fmt, va_list argPtr); /* 11 */ int (*nsfPrintError) (Tcl_Interp *interp, CONST char *fmt, ...); /* 12 */ int (*nsfErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, CONST char *procName); /* 13 */ - int (*nsfObjErrType) (Tcl_Interp *interp, CONST char *context, Tcl_Obj *value, CONST char *type, Nsf_Param CONST *NsfObjErrType); /* 14 */ + int (*nsfObjErrType) (Tcl_Interp *interp, CONST char *context, Tcl_Obj *value, CONST char *type, Nsf_Param CONST *paramPtr); /* 14 */ void (*nsfStackDump) (Tcl_Interp *interp); /* 15 */ void (*nsfSetObjClientData) (Tcl_Interp *interp, Nsf_Object *object, ClientData data); /* 16 */ ClientData (*nsfGetObjClientData) (Tcl_Interp *interp, Nsf_Object *object); /* 17 */ Index: generic/stubs8.6/nsfDecls.h =================================================================== diff -u -r8552f707c011bfc24be22e1e8332f5558227cde3 -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- generic/stubs8.6/nsfDecls.h (.../nsfDecls.h) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) +++ generic/stubs8.6/nsfDecls.h (.../nsfDecls.h) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -105,8 +105,7 @@ /* 14 */ EXTERN int NsfObjErrType(Tcl_Interp *interp, const char *context, Tcl_Obj *value, - const char *type, - Nsf_Param const *NsfObjErrType); + const char *type, Nsf_Param const *paramPtr); /* 15 */ EXTERN void NsfStackDump(Tcl_Interp *interp); /* 16 */ @@ -128,28 +127,28 @@ EXTERN int NsfCallMethodWithArgs(Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, Tcl_Obj *arg1, int givenObjc, - Tcl_Obj *CONST objv[], unsigned int flags); + Tcl_Obj *const objv[], unsigned int flags); /* 22 */ EXTERN int NsfAddObjectMethod(Tcl_Interp *interp, struct Nsf_Object *object, - CONST char *methodName, Tcl_ObjCmdProc *proc, + const char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */ EXTERN int NsfAddClassMethod(Tcl_Interp *interp, struct Nsf_Class *class, - CONST char *methodName, Tcl_ObjCmdProc *proc, + const char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 24 */ EXTERN int NsfCreate(Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, - Tcl_Obj *CONST objv[]); + Tcl_Obj *const objv[]); /* 25 */ EXTERN int Nsf_ArgumentParse(Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[], Nsf_Object *object, + Tcl_Obj *const objv[], Nsf_Object *object, Tcl_Obj *procNameObj, - Nsf_Param CONST *paramPtr, int nrParams, + Nsf_Param const *paramPtr, int nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr); /* 26 */ @@ -160,7 +159,7 @@ size_t size, const char *typeName, void *valuePtr); /* 28 */ -EXTERN int Nsf_PointerDelete(CONST char *key, void *valuePtr, +EXTERN int Nsf_PointerDelete(const char *key, void *valuePtr, int free); /* 29 */ EXTERN int Nsf_PointerTypeRegister(Tcl_Interp *interp, @@ -234,21 +233,21 @@ void (*nsfDStringVPrintf) (Tcl_DString *dsPtr, const char *fmt, va_list argPtr); /* 11 */ int (*nsfPrintError) (Tcl_Interp *interp, const char *fmt, ...); /* 12 */ int (*nsfErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, const char *procName); /* 13 */ - int (*nsfObjErrType) (Tcl_Interp *interp, const char *context, Tcl_Obj *value, const char *type, Nsf_Param const *NsfObjErrType); /* 14 */ + int (*nsfObjErrType) (Tcl_Interp *interp, const char *context, Tcl_Obj *value, const char *type, Nsf_Param const *paramPtr); /* 14 */ void (*nsfStackDump) (Tcl_Interp *interp); /* 15 */ void (*nsfSetObjClientData) (Tcl_Interp *interp, Nsf_Object *object, ClientData data); /* 16 */ ClientData (*nsfGetObjClientData) (Tcl_Interp *interp, Nsf_Object *object); /* 17 */ void (*nsfSetClassClientData) (Tcl_Interp *interp, Nsf_Class *cl, ClientData data); /* 18 */ ClientData (*nsfGetClassClientData) (Tcl_Interp *interp, Nsf_Class *cl); /* 19 */ void (*nsfRequireObjNamespace) (Tcl_Interp *interp, Nsf_Object *object); /* 20 */ - int (*nsfCallMethodWithArgs) (Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, Tcl_Obj *arg1, int givenObjc, Tcl_Obj *CONST objv[], unsigned int flags); /* 21 */ - int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, CONST char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 22 */ - int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *class, CONST char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */ - int (*nsfCreate) (Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *CONST objv[]); /* 24 */ - int (*nsf_ArgumentParse) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], Nsf_Object *object, Tcl_Obj *procNameObj, Nsf_Param CONST *paramPtr, int nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr); /* 25 */ + int (*nsfCallMethodWithArgs) (Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, Tcl_Obj *arg1, int givenObjc, Tcl_Obj *const objv[], unsigned int flags); /* 21 */ + int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, const char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 22 */ + int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *class, const char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */ + int (*nsfCreate) (Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *const objv[]); /* 24 */ + int (*nsf_ArgumentParse) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Nsf_Object *object, Tcl_Obj *procNameObj, Nsf_Param const *paramPtr, int nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr); /* 25 */ void (*nsfLog) (Tcl_Interp *interp, int requiredLevel, const char *fmt, ...); /* 26 */ int (*nsf_PointerAdd) (Tcl_Interp *interp, char *buffer, size_t size, const char *typeName, void *valuePtr); /* 27 */ - int (*nsf_PointerDelete) (CONST char *key, void *valuePtr, int free); /* 28 */ + int (*nsf_PointerDelete) (const char *key, void *valuePtr, int free); /* 28 */ int (*nsf_PointerTypeRegister) (Tcl_Interp *interp, const char*typeName, int *counterPtr); /* 29 */ int (*nsf_ConvertToBoolean) (Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param const *pPtr, ClientData *clientData, Tcl_Obj **outObjPtr); /* 30 */ int (*nsf_ConvertToClass) (Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param const *pPtr, ClientData *clientData, Tcl_Obj **outObjPtr); /* 31 */ Index: generic/stubs8.7/nsfDecls.h =================================================================== diff -u -r8552f707c011bfc24be22e1e8332f5558227cde3 -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- generic/stubs8.7/nsfDecls.h (.../nsfDecls.h) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) +++ generic/stubs8.7/nsfDecls.h (.../nsfDecls.h) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -105,8 +105,7 @@ /* 14 */ EXTERN int NsfObjErrType(Tcl_Interp *interp, const char *context, Tcl_Obj *value, - const char *type, - Nsf_Param const *NsfObjErrType); + const char *type, Nsf_Param const *paramPtr); /* 15 */ EXTERN void NsfStackDump(Tcl_Interp *interp); /* 16 */ @@ -128,28 +127,28 @@ EXTERN int NsfCallMethodWithArgs(Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, Tcl_Obj *arg1, int givenObjc, - Tcl_Obj *CONST objv[], unsigned int flags); + Tcl_Obj *const objv[], unsigned int flags); /* 22 */ EXTERN int NsfAddObjectMethod(Tcl_Interp *interp, struct Nsf_Object *object, - CONST char *methodName, Tcl_ObjCmdProc *proc, + const char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */ EXTERN int NsfAddClassMethod(Tcl_Interp *interp, struct Nsf_Class *class, - CONST char *methodName, Tcl_ObjCmdProc *proc, + const char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 24 */ EXTERN int NsfCreate(Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, - Tcl_Obj *CONST objv[]); + Tcl_Obj *const objv[]); /* 25 */ EXTERN int Nsf_ArgumentParse(Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[], Nsf_Object *object, + Tcl_Obj *const objv[], Nsf_Object *object, Tcl_Obj *procNameObj, - Nsf_Param CONST *paramPtr, int nrParams, + Nsf_Param const *paramPtr, int nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr); /* 26 */ @@ -160,7 +159,7 @@ size_t size, const char *typeName, void *valuePtr); /* 28 */ -EXTERN int Nsf_PointerDelete(CONST char *key, void *valuePtr, +EXTERN int Nsf_PointerDelete(const char *key, void *valuePtr, int free); /* 29 */ EXTERN int Nsf_PointerTypeRegister(Tcl_Interp *interp, @@ -234,21 +233,21 @@ void (*nsfDStringVPrintf) (Tcl_DString *dsPtr, const char *fmt, va_list argPtr); /* 11 */ int (*nsfPrintError) (Tcl_Interp *interp, const char *fmt, ...); /* 12 */ int (*nsfErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, const char *procName); /* 13 */ - int (*nsfObjErrType) (Tcl_Interp *interp, const char *context, Tcl_Obj *value, const char *type, Nsf_Param const *NsfObjErrType); /* 14 */ + int (*nsfObjErrType) (Tcl_Interp *interp, const char *context, Tcl_Obj *value, const char *type, Nsf_Param const *paramPtr); /* 14 */ void (*nsfStackDump) (Tcl_Interp *interp); /* 15 */ void (*nsfSetObjClientData) (Tcl_Interp *interp, Nsf_Object *object, ClientData data); /* 16 */ ClientData (*nsfGetObjClientData) (Tcl_Interp *interp, Nsf_Object *object); /* 17 */ void (*nsfSetClassClientData) (Tcl_Interp *interp, Nsf_Class *cl, ClientData data); /* 18 */ ClientData (*nsfGetClassClientData) (Tcl_Interp *interp, Nsf_Class *cl); /* 19 */ void (*nsfRequireObjNamespace) (Tcl_Interp *interp, Nsf_Object *object); /* 20 */ - int (*nsfCallMethodWithArgs) (Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, Tcl_Obj *arg1, int givenObjc, Tcl_Obj *CONST objv[], unsigned int flags); /* 21 */ - int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, CONST char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 22 */ - int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *class, CONST char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */ - int (*nsfCreate) (Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *CONST objv[]); /* 24 */ - int (*nsf_ArgumentParse) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], Nsf_Object *object, Tcl_Obj *procNameObj, Nsf_Param CONST *paramPtr, int nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr); /* 25 */ + int (*nsfCallMethodWithArgs) (Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, Tcl_Obj *arg1, int givenObjc, Tcl_Obj *const objv[], unsigned int flags); /* 21 */ + int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, const char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 22 */ + int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *class, const char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */ + int (*nsfCreate) (Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *const objv[]); /* 24 */ + int (*nsf_ArgumentParse) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Nsf_Object *object, Tcl_Obj *procNameObj, Nsf_Param const *paramPtr, int nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr); /* 25 */ void (*nsfLog) (Tcl_Interp *interp, int requiredLevel, const char *fmt, ...); /* 26 */ int (*nsf_PointerAdd) (Tcl_Interp *interp, char *buffer, size_t size, const char *typeName, void *valuePtr); /* 27 */ - int (*nsf_PointerDelete) (CONST char *key, void *valuePtr, int free); /* 28 */ + int (*nsf_PointerDelete) (const char *key, void *valuePtr, int free); /* 28 */ int (*nsf_PointerTypeRegister) (Tcl_Interp *interp, const char*typeName, int *counterPtr); /* 29 */ int (*nsf_ConvertToBoolean) (Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param const *pPtr, ClientData *clientData, Tcl_Obj **outObjPtr); /* 30 */ int (*nsf_ConvertToClass) (Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param const *pPtr, ClientData *clientData, Tcl_Obj **outObjPtr); /* 31 */ Index: library/mongodb/mongoAPI.h =================================================================== diff -u -r8552f707c011bfc24be22e1e8332f5558227cde3 -r9d1dfb6417294dbdc13ce4d249931055f7bd5ef8 --- library/mongodb/mongoAPI.h (.../mongoAPI.h) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) +++ library/mongodb/mongoAPI.h (.../mongoAPI.h) (revision 9d1dfb6417294dbdc13ce4d249931055f7bd5ef8) @@ -90,65 +90,65 @@ static const char *method_command_namespace_names[] = { "::mongo" }; -static int NsfCollectionCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCollectionCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfCollectionOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfCollectionOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoCollectionCountStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoCollectionCountStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoCollectionDeleteStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoCollectionDeleteStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoCollectionIndexStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoCollectionIndexStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoCollectionInsertStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoCollectionInsertStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoCollectionQueryStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoCollectionQueryStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoCollectionStatsStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoCollectionStatsStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoCollectionUpdateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoCollectionUpdateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoConnectStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoConnectStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoCursorAggregateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoCursorAggregateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoCursorCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoCursorCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoCursorFindStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoCursorFindStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoCursorNextStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoCursorNextStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoGridFSCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoGridFSCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoGridFSOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoGridFSOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoGridFileCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoGridFileCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoGridFileCreateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoGridFileCreateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoGridFileDeleteStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoGridFileDeleteStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoGridFileGetContentTypeStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoGridFileGetContentTypeStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoGridFileGetContentlengthStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoGridFileGetContentlengthStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoGridFileGetMetaDataStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoGridFileGetMetaDataStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoGridFileOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoGridFileOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoGridFileReadStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoGridFileReadStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoGridFileSeekStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoGridFileSeekStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoJsonGenerateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoJsonGenerateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoJsonParseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoJsonParseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoRunCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoRunCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMongoStatusStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) +static int NsfMongoStatusStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) NSF_nonnull(2) NSF_nonnull(4); static int NsfCollectionClose(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *collectionObj) @@ -247,7 +247,7 @@ static int -NsfCollectionCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCollectionCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -267,7 +267,7 @@ } static int -NsfCollectionOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfCollectionOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -289,7 +289,7 @@ } static int -NsfMongoCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -309,7 +309,7 @@ } static int -NsfMongoCollectionCountStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoCollectionCountStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -330,7 +330,7 @@ } static int -NsfMongoCollectionDeleteStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoCollectionDeleteStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -351,7 +351,7 @@ } static int -NsfMongoCollectionIndexStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoCollectionIndexStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -378,7 +378,7 @@ } static int -NsfMongoCollectionInsertStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoCollectionInsertStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -399,7 +399,7 @@ } static int -NsfMongoCollectionQueryStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoCollectionQueryStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -421,7 +421,7 @@ } static int -NsfMongoCollectionStatsStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoCollectionStatsStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -442,7 +442,7 @@ } static int -NsfMongoCollectionUpdateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoCollectionUpdateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -466,7 +466,7 @@ } static int -NsfMongoConnectStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoConnectStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -486,7 +486,7 @@ } static int -NsfMongoCursorAggregateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoCursorAggregateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -510,7 +510,7 @@ } static int -NsfMongoCursorCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoCursorCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -530,7 +530,7 @@ } static int -NsfMongoCursorFindStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoCursorFindStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -552,7 +552,7 @@ } static int -NsfMongoCursorNextStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoCursorNextStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -572,7 +572,7 @@ } static int -NsfMongoGridFSCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoGridFSCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -592,7 +592,7 @@ } static int -NsfMongoGridFSOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoGridFSOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -614,7 +614,7 @@ } static int -NsfMongoGridFileCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoGridFileCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -634,7 +634,7 @@ } static int -NsfMongoGridFileCreateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoGridFileCreateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -659,7 +659,7 @@ } static int -NsfMongoGridFileDeleteStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoGridFileDeleteStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -680,7 +680,7 @@ } static int -NsfMongoGridFileGetContentTypeStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoGridFileGetContentTypeStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -700,7 +700,7 @@ } static int -NsfMongoGridFileGetContentlengthStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoGridFileGetContentlengthStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -720,7 +720,7 @@ } static int -NsfMongoGridFileGetMetaDataStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoGridFileGetMetaDataStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -740,7 +740,7 @@ } static int -NsfMongoGridFileOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoGridFileOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -761,7 +761,7 @@ } static int -NsfMongoGridFileReadStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoGridFileReadStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -782,7 +782,7 @@ } static int -NsfMongoGridFileSeekStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoGridFileSeekStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -803,7 +803,7 @@ } static int -NsfMongoJsonGenerateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoJsonGenerateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -819,7 +819,7 @@ } static int -NsfMongoJsonParseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoJsonParseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { (void)clientData; @@ -835,7 +835,7 @@ } static int -NsfMongoRunCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoRunCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData; @@ -858,7 +858,7 @@ } static int -NsfMongoStatusStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { +NsfMongoStatusStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const* objv) { ParseContext pc; (void)clientData;