Index: generic/gentclAPI.tcl =================================================================== diff -u -r96479aa72df034766d8d1866a23bc261b1402a30 -r8552f707c011bfc24be22e1e8332f5558227cde3 --- generic/gentclAPI.tcl (.../gentclAPI.tcl) (revision 96479aa72df034766d8d1866a23bc261b1402a30) +++ generic/gentclAPI.tcl (.../gentclAPI.tcl) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) @@ -150,23 +150,25 @@ switch $clientData { class { - set a [list cl] - set if [list "NsfClass *cl"] + set a [list class] + set if [list "NsfClass *class"] set argNum 3 append intro \ - " NsfClass *cl;" \n\n \ + " NsfClass *class;" \n\n \ " assert(objc > 0);" \n\n \ - " cl = NsfObjectToClass(clientData);" \n \ - " if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, \"class\", ObjStr(objv\[0\]));" + " class = NsfObjectToClass(clientData);" \n \ + " if (unlikely(class == NULL)) {" \n \ + " return NsfDispatchClientDataError(interp, clientData, \"class\", ObjStr(objv\[0\]));" \n \ + " }" \n } object { - set a [list obj] - set if [list "NsfObject *obj"] + set a [list object] + set if [list "NsfObject *object"] set argNum 3 append intro \ - " NsfObject *obj;" \n\n \ + " NsfObject *object;" \n\n \ " assert(objc > 0);" \n\n \ - " obj = (NsfObject *)clientData;" + " object = (NsfObject *)clientData;" } "" { append intro " (void)clientData;\n" @@ -185,7 +187,11 @@ # # non positional args # - set varName with[string totitle $switchName] + if {$(-type) eq "tclobj" && ${switchName} ne "obj"} { + set varName ${switchName}Obj + } else { + set varName with[string totitle $switchName] + } set calledArg $varName set type "int " if {$(-nrargs) == 1} { @@ -209,7 +215,13 @@ # # positionals # - set varName $(-argName) + if {$(-type) eq "tclobj" && $(-argName) ne "obj"} { + set varName $(-argName)Obj + puts stderr "POSNAME <$(-argName)> -> <$varName>" + + } else { + set varName $(-argName) + } set calledArg $varName switch -glob $(-type) { "" {set type "const char *"} @@ -444,8 +456,8 @@ append fns [genSimpleStub $d(stub) $intro $d(idx) "" $pre $call $post $cleanup] } else { switch $d(methodType) { - objectMethod {set obj "obj"} - classMethod {set obj "(NsfObject *) cl"} + objectMethod {set obj "object"} + classMethod {set obj "(NsfObject *) class"} default {set obj "NULL"} } append fns [genStub $d(stub) $intro $obj $d(idx) $cDefs $pre $call $post $cleanup] Index: generic/nsf.c =================================================================== diff -u -r866971d828a2ed5fdb8da757e94401f919bd3a8c -r8552f707c011bfc24be22e1e8332f5558227cde3 --- generic/nsf.c (.../nsf.c) (revision 866971d828a2ed5fdb8da757e94401f919bd3a8c) +++ generic/nsf.c (.../nsf.c) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) @@ -238,7 +238,7 @@ 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 *callInfo, + int objc, Tcl_Obj *CONST objv[], Tcl_Obj *callInfoObj, Tcl_Obj *methodObj, unsigned int flags) nonnull(1) nonnull(2) nonnull(4) nonnull(6); @@ -251,7 +251,7 @@ nonnull(1) nonnull(2); /* prototypes for object life-cycle management */ -static int RecreateObject(Tcl_Interp *interp, NsfClass *cl, 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); @@ -282,7 +282,7 @@ /* prototypes for namespace specific calls */ -static Tcl_Obj *NameInNamespaceObj(const char *name, Tcl_Namespace *ns) nonnull(1) nonnull(2); +static Tcl_Obj *NameInNamespaceObj(const char *name, Tcl_Namespace *nsPtr) nonnull(1) nonnull(2); static Tcl_Namespace *CallingNameSpace(Tcl_Interp *interp) nonnull(1) returns_nonnull; NSF_INLINE static Tcl_Command NSFindCommand(Tcl_Interp *interp, const char *name) nonnull(1) nonnull(2); static Tcl_Namespace *NSGetFreshNamespace(Tcl_Interp *interp, NsfObject *object, const char *name) @@ -297,11 +297,11 @@ /* prototypes for filters and mixins */ static void FilterComputeDefined(Tcl_Interp *interp, NsfObject *object) nonnull(1) nonnull(2); static void MixinComputeDefined(Tcl_Interp *interp, NsfObject *object) nonnull(1) nonnull(2); -NSF_INLINE static void GuardAdd(NsfCmdList *filterCL, Tcl_Obj *guardObj) nonnull(1) nonnull(2); +NSF_INLINE static void GuardAdd(NsfCmdList *guardList, Tcl_Obj *guardObj) nonnull(1) nonnull(2); static int GuardCall(NsfObject *object, Tcl_Interp *interp, Tcl_Obj *guardObj, NsfCallStackContent *cscPtr) nonnull(1) nonnull(2) nonnull(3); -static void GuardDel(NsfCmdList *filterCL) nonnull(1); +static void GuardDel(NsfCmdList *guardList) nonnull(1); /* prototypes for forwarders */ static void ForwardCmdDeleteProc(ClientData clientData) nonnull(1); @@ -314,12 +314,12 @@ nonnull(1) nonnull(2) nonnull(11); /* properties of objects and classes */ -static int IsRootClass(NsfClass *cl) nonnull(1) pure; +static int IsRootClass(NsfClass *cls) nonnull(1) pure; static int IsRootMetaClass(NsfClass *cl) nonnull(1) pure; -static int IsBaseClass(NsfObject *cl) nonnull(1) pure; +static int IsBaseClass(NsfObject *object) nonnull(1) pure; static int IsMetaClass(Tcl_Interp *interp, NsfClass *cl, int withMixins) nonnull(1) nonnull(2); static int IsSubType(NsfClass *subcl, NsfClass *cl) nonnull(1) nonnull(2); -static NsfClass *DefaultSuperClass(Tcl_Interp *interp, NsfClass *cl, NsfClass *mcl, int isMeta) +static NsfClass *DefaultSuperClass(Tcl_Interp *interp, NsfClass *cl, NsfClass *mCl, int isMeta) nonnull(1) nonnull(2) nonnull(3); @@ -367,9 +367,9 @@ static NsfProcContext *ProcContextRequire(Tcl_Command cmd) nonnull(1); static int ArgumentParse(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], - NsfObject *obj, Tcl_Obj *procName, - Nsf_Param const *paramPtr, int nrParameters, int serial, - unsigned int processFlags, ParseContext *pc) + NsfObject *object, Tcl_Obj *procNameObj, + Nsf_Param const *paramPtr, int nrParams, int serial, + unsigned int processFlags, ParseContext *pcPtr) nonnull(1) nonnull(3) nonnull(5) nonnull(6) nonnull(10); static int ArgumentCheck(Tcl_Interp *interp, Tcl_Obj *objPtr, struct Nsf_Param const *pPtr, @@ -378,7 +378,7 @@ nonnull(1) nonnull(2) nonnull(3) nonnull(5) nonnull(6) nonnull(7); static int GetMatchObject(Tcl_Interp *interp, Tcl_Obj *patternObj, Tcl_Obj *origObj, - NsfObject **matchObject, const char **pattern) + NsfObject **matchObjectPtr, const char **patternPtr) nonnull(1) nonnull(4) nonnull(5); static void NsfProcDeleteProc(ClientData clientData) nonnull(1); @@ -412,10 +412,6 @@ nonnull(1) nonnull(2) nonnull(3); static int AliasDeleteObjectReference(Tcl_Interp *interp, Tcl_Command cmd) nonnull(1) nonnull(2); -/*static int NsfMethodAliasCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, - const char *methodName, FrameIdx_t withFrame, ProtectionIdx_t withProtection, Tcl_Obj *cmdName) - nonnull(1) nonnull(2) nonnull(4); -*/ static int AliasRefetch(Tcl_Interp *interp, NsfObject *object, const char *methodName, AliasCmdClientData *tcd) @@ -3122,17 +3118,17 @@ static void FlushPrecedences(NsfClasses *subClasses) nonnull(1); static void -FlushPrecedences(NsfClasses *clPtr) { +FlushPrecedences(NsfClasses *subClasses) { - nonnull_assert(clPtr != NULL); + nonnull_assert(subClasses != NULL); do { - if (clPtr->cl->order != NULL) { - NsfClassListFree(clPtr->cl->order); + if (subClasses->cl->order != NULL) { + NsfClassListFree(subClasses->cl->order); } - clPtr->cl->order = NULL; - clPtr = clPtr->nextPtr; - } while (clPtr != NULL); + subClasses->cl->order = NULL; + subClasses = subClasses->nextPtr; + } while (subClasses != NULL); } @@ -6920,7 +6916,7 @@ */ static Tcl_Obj * AutonameIncr(Tcl_Interp *interp, Tcl_Obj *nameObj, NsfObject *object, - int instanceOpt, int resetOpt) nonnull(1) nonnull(2) nonnull(3); + int isInstanceOpt, int doResetOpt) nonnull(1) nonnull(2) nonnull(3); static Tcl_Obj * AutonameIncr(Tcl_Interp *interp, Tcl_Obj *nameObj, NsfObject *object, @@ -7174,7 +7170,7 @@ * *---------------------------------------------------------------------- */ -static NsfCmdList *CmdListAdd(NsfCmdList **cList, Tcl_Command c, NsfClass *clorobj, int noDuplicates, int atEnd) +static NsfCmdList *CmdListAdd(NsfCmdList **cList, Tcl_Command cmd, NsfClass *clorobj, int noDuplicates, int atEnd) nonnull(1) nonnull(2) returns_nonnull; static NsfCmdList * @@ -7257,7 +7253,7 @@ * *---------------------------------------------------------------------- */ -static NsfCmdList *CmdListAddSorted(NsfCmdList **cList, Tcl_Command c, NsfClass *clorobj) +static NsfCmdList *CmdListAddSorted(NsfCmdList **cList, Tcl_Command cmd, NsfClass *clorobj) nonnull(1) nonnull(2) returns_nonnull; static NsfCmdList * @@ -7514,7 +7510,7 @@ * simple list search proc to search a list of cmds * for a simple Name */ -static NsfCmdList * CmdListFindNameInList(Tcl_Interp *interp, const char *name, NsfCmdList *l) +static NsfCmdList * CmdListFindNameInList(Tcl_Interp *interp, const char *name, NsfCmdList *cmdList) nonnull(1) nonnull(2) nonnull(3); static NsfCmdList * @@ -7625,7 +7621,7 @@ * *---------------------------------------------------------------------- */ -static Tcl_Obj * TclObjListNewElement(NsfTclObjList **list, Tcl_Obj *obj, Tcl_Obj *value) +static Tcl_Obj * TclObjListNewElement(NsfTclObjList **list, Tcl_Obj *obj, Tcl_Obj *valueObj) nonnull(1) nonnull(2) returns_nonnull; static Tcl_Obj * @@ -8531,7 +8527,7 @@ * *---------------------------------------------------------------------- */ -static int AppendMatchingElementsFromCmdList(Tcl_Interp *interp, NsfCmdList *cmdl, +static int AppendMatchingElementsFromCmdList(Tcl_Interp *interp, NsfCmdList *cmdList, Tcl_Obj *resultObj, const char *pattern, NsfObject *matchObject) nonnull(1) nonnull(2) nonnull(3); @@ -8622,14 +8618,14 @@ *---------------------------------------------------------------------- */ static void -GetAllInstances(Tcl_Interp *interp, NsfCmdList **instances, NsfClass *startCl) { +GetAllInstances(Tcl_Interp *interp, NsfCmdList **instances, NsfClass *startClass) { NsfClasses *clPtr, *subClasses; nonnull_assert(interp != NULL); nonnull_assert(instances != NULL); - nonnull_assert(startCl != NULL); + nonnull_assert(startClass != NULL); - subClasses = TransitiveSubClasses(startCl); + subClasses = TransitiveSubClasses(startClass); for (clPtr = subClasses; clPtr != NULL; clPtr = clPtr->nextPtr) { Tcl_HashTable *tablePtr = &clPtr->cl->instances; Tcl_HashSearch search; @@ -8911,7 +8907,7 @@ static int GetAllClassMixinsOf(Tcl_Interp *interp, Tcl_HashTable *destTablePtr, Tcl_Obj *resultSet, /*@notnull@*/ NsfClass *startCl, - int isMixin, int appendResult, + int isPCM, int appendResult, const char *pattern, NsfObject *matchObject) nonnull(1) nonnull(2) nonnull(3) nonnull(4); @@ -9167,7 +9163,7 @@ *---------------------------------------------------------------------- */ -static void RemoveFromClassMixinsOf(Tcl_Command cmd, NsfCmdList *cmdlist) nonnull(1) nonnull(2); +static void RemoveFromClassMixinsOf(Tcl_Command cmd, NsfCmdList *cmdList) nonnull(1) nonnull(2); static void RemoveFromClassMixinsOf(Tcl_Command cmd, NsfCmdList *cmdList) { @@ -21261,7 +21257,7 @@ *---------------------------------------------------------------------- */ static int ForwardArg(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], - Tcl_Obj *ForwardArgObj, ForwardCmdClientData *tcd, Tcl_Obj **out, + Tcl_Obj *forwardArgObj, ForwardCmdClientData *tcd, Tcl_Obj **out, Tcl_Obj **freeList, int *inputArg, long *mapvalue, int firstPosArg, int *outputincr) nonnull(1) nonnull(3) nonnull(4) nonnull(5) nonnull(6) nonnull(7) nonnull(8) nonnull(9) nonnull(11); @@ -21924,7 +21920,7 @@ typedef enum {NO_DASH, SKALAR_DASH, LIST_DASH} dashArgType; static dashArgType IsDashArg(Tcl_Interp *interp, Tcl_Obj *obj, int isFirstArg, const char **methodName, - int *objc, Tcl_Obj **objv[]) nonnull(1) nonnull(2) nonnull(4) nonnull(5) nonnull(6); + int *objcPtr, Tcl_Obj **objvPtr[]) nonnull(1) nonnull(2) nonnull(4) nonnull(5) nonnull(6); static dashArgType IsDashArg(Tcl_Interp *interp, Tcl_Obj *obj, int isFirstArg, const char **methodName, @@ -25212,22 +25208,22 @@ {-argName "obj" -required 1 -type tclobj} } */ -static int NsfDebugShowObj(Tcl_Interp *interp, Tcl_Obj *objPtr) nonnull(1) nonnull(2); +static int NsfDebugShowObj(Tcl_Interp *interp, Tcl_Obj *obj) nonnull(1) nonnull(2); static int -NsfDebugShowObj(Tcl_Interp *interp, Tcl_Obj *objPtr) { +NsfDebugShowObj(Tcl_Interp *interp, Tcl_Obj *obj) { nonnull_assert(interp != NULL); - nonnull_assert(objPtr != NULL); + nonnull_assert(obj != NULL); fprintf(stderr, "*** obj %p refCount %d type <%s> ", - (void *)objPtr, objPtr->refCount, (objPtr->typePtr != NULL) ? objPtr->typePtr->name : ""); + (void *)obj, obj->refCount, (obj->typePtr != NULL) ? obj->typePtr->name : ""); - if (objPtr->typePtr == &NsfObjectMethodObjType - || objPtr->typePtr == &NsfInstanceMethodObjType + if (obj->typePtr == &NsfObjectMethodObjType + || obj->typePtr == &NsfInstanceMethodObjType ) { - NsfMethodContext *mcPtr = objPtr->internalRep.twoPtrValue.ptr1; - unsigned int currentMethodEpoch = objPtr->typePtr == &NsfObjectMethodObjType ? + NsfMethodContext *mcPtr = obj->internalRep.twoPtrValue.ptr1; + unsigned int currentMethodEpoch = obj->typePtr == &NsfObjectMethodObjType ? RUNTIME_STATE(interp)->objectMethodEpoch : RUNTIME_STATE(interp)->instanceMethodEpoch; Tcl_Command cmd = mcPtr->cmd; @@ -25243,8 +25239,8 @@ } assert(currentMethodEpoch >= mcPtr->methodEpoch); - } else if (objPtr->typePtr == Nsf_OT_tclCmdNameType) { - Tcl_Command cmd = Tcl_GetCommandFromObj(interp, objPtr); + } else if (obj->typePtr == Nsf_OT_tclCmdNameType) { + Tcl_Command cmd = Tcl_GetCommandFromObj(interp, obj); if (likely(cmd != NULL)) { Command *procPtr = (Command *)cmd; @@ -25253,16 +25249,16 @@ fprintf(stderr, "... cmd %p flags %.6x name '%s' ns '%s'", (void *)cmd, Tcl_Command_flags(cmd), tail, procPtr->nsPtr->name); } - } else if ((objPtr->typePtr == Nsf_OT_byteArrayType) - || (objPtr->typePtr == Nsf_OT_properByteArrayType)) { + } else if ((obj->typePtr == Nsf_OT_byteArrayType) + || (obj->typePtr == Nsf_OT_properByteArrayType)) { char *bytes; int i, length; - bytes = (char *)Tcl_GetByteArrayFromObj(objPtr, &length); + bytes = (char *)Tcl_GetByteArrayFromObj(obj, &length); fprintf(stderr, "bytearray proper %d length %d string rep %p: ", - (objPtr->typePtr == Nsf_OT_properByteArrayType), - length, (void*)objPtr->bytes); + (obj->typePtr == Nsf_OT_properByteArrayType), + length, (void*)obj->bytes); for (i = 0; i < length; i++) { fprintf(stderr, "%.2x", (unsigned)(*(bytes+i)) & 0xff); } @@ -25278,35 +25274,35 @@ } */ -static int NsfDebugGetDict(Tcl_Interp *interp, Tcl_Obj *objPtr) nonnull(1) nonnull(2); +static int NsfDebugGetDict(Tcl_Interp *interp, Tcl_Obj *obj) nonnull(1) nonnull(2); static int -NsfDebugGetDict(Tcl_Interp *interp, Tcl_Obj *objPtr) { +NsfDebugGetDict(Tcl_Interp *interp, Tcl_Obj *obj) { Tcl_Obj *resultObj; const char *typeString; nonnull_assert(interp != NULL); - nonnull_assert(objPtr != NULL); + nonnull_assert(obj != NULL); - typeString = (objPtr->typePtr != NULL) ? objPtr->typePtr->name : ""; + typeString = (obj->typePtr != NULL) ? obj->typePtr->name : ""; resultObj = Tcl_NewListObj(4, NULL); Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("type", -1)); Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj(typeString, -1)); Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("refcount", -1)); - Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewIntObj(objPtr->refCount)); + Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewIntObj(obj->refCount)); Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("length", -1)); - Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewIntObj(objPtr->length)); + Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewIntObj(obj->length)); Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("hex", -1)); - if (objPtr->bytes != NULL) { + if (obj->bytes != NULL) { int i; char buffer[24]; - for (i = 0; i < 10 && i < objPtr->length; i++) { - snprintf(buffer + i*2, 24, "%.2x", (unsigned)(*((objPtr->bytes)+i) & 0xff)); + for (i = 0; i < 10 && i < obj->length; i++) { + snprintf(buffer + i*2, 24, "%.2x", (unsigned)(*((obj->bytes)+i) & 0xff)); } - if (objPtr->length > 10) { + if (obj->length > 10) { strcat(buffer, "..."); } Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj(buffer, -1)); @@ -25423,7 +25419,7 @@ static int NsfProfileGetDataStub(Tcl_Interp *interp) nonnull(1); static int NsfProfileTraceStub(Tcl_Interp *interp, int withEnable, int withVerbose, int withDontsave, - Tcl_Obj *builtins) + Tcl_Obj *builtinsObj) NSF_nonnull(1); #if defined(NSF_PROFILE) @@ -25444,9 +25440,9 @@ } static int -NsfProfileTraceStub(Tcl_Interp *interp, int withEnable, int withVerbose, int withDontsave, Tcl_Obj *builtins) { +NsfProfileTraceStub(Tcl_Interp *interp, int withEnable, int withVerbose, int withDontsave, Tcl_Obj *builtinsObj) { nonnull_assert(interp != NULL); - NsfProfileTrace(interp, withEnable, withVerbose, withDontsave, builtins); + NsfProfileTrace(interp, withEnable, withVerbose, withDontsave, builtinsObj); return TCL_OK; } @@ -25640,7 +25636,8 @@ } {-nxdoc 1} */ static int -NsfCmdInfoCmd(Tcl_Interp *interp, InfomethodsubcmdIdx_t subcmd, NsfObject *context, Tcl_Obj *methodNameObj, const char *pattern) { +NsfCmdInfoCmd(Tcl_Interp *interp, InfomethodsubcmdIdx_t subcmd, NsfObject *context, + Tcl_Obj *methodNameObj, const char *pattern) { nonnull_assert(interp != NULL); nonnull_assert(methodNameObj != NULL); @@ -26196,7 +26193,7 @@ static int NsfIsCmd(Tcl_Interp *interp, int withComplain, - int doConfigureParameter, + int withConfigure, const char *name, Tcl_Obj *constraintObj, Tcl_Obj *valueObj) { @@ -26210,7 +26207,7 @@ result = ParameterCheck(interp, constraintObj, valueObj, (name != NULL) ? name : "value:", 1, (name != NULL), - doConfigureParameter, + withConfigure, ¶mPtr, Tcl_GetCurrentNamespace(interp)->fullName); @@ -26307,7 +26304,7 @@ static int NsfMethodAliasCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, const char *methodName, FrameIdx_t withFrame, ProtectionIdx_t withProtection, - Tcl_Obj *cmdName) { + Tcl_Obj *cmdNameObj) { Tcl_ObjCmdProc *objProc, *newObjProc; Tcl_CmdDeleteProc *deleteProc; AliasCmdClientData *tcd; @@ -26322,11 +26319,11 @@ nonnull_assert(object != NULL); nonnull_assert(methodName != NULL); assert(*methodName != ':'); - nonnull_assert(cmdName != NULL); + nonnull_assert(cmdNameObj != NULL); - cmd = Tcl_GetCommandFromObj(interp, cmdName); + cmd = Tcl_GetCommandFromObj(interp, cmdNameObj); if (cmd == NULL) { - return NsfPrintError(interp, "cannot lookup command '%s'", ObjStr(cmdName)); + return NsfPrintError(interp, "cannot lookup command '%s'", ObjStr(cmdNameObj)); } cmd = GetOriginalCommand(cmd); @@ -26433,7 +26430,7 @@ if (withFrame && withFrame != FrameDefaultIdx) { return NsfPrintError(interp, "cannot use -frame object|method in alias for scripted command '%s'", - ObjStr(cmdName)); + ObjStr(cmdNameObj)); } } @@ -26506,7 +26503,7 @@ #endif if (newCmd != NULL) { - AliasAdd(interp, object->cmdName, methodName, cl == NULL, cmdName); + AliasAdd(interp, object->cmdName, methodName, cl == NULL, cmdNameObj); if (withFrame == FrameMethodIdx) { Tcl_Command_flags(newCmd) |= NSF_CMD_NONLEAF_METHOD; @@ -26535,7 +26532,7 @@ */ static int -NsfMethodAssertionCmd(Tcl_Interp *interp, NsfObject *object, AssertionsubcmdIdx_t subcmd, Tcl_Obj *arg) { +NsfMethodAssertionCmd(Tcl_Interp *interp, NsfObject *object, AssertionsubcmdIdx_t subcmd, Tcl_Obj *argObj) { #if defined(NSF_WITH_ASSERTIONS) NsfClass *class; @@ -26544,17 +26541,17 @@ switch (subcmd) { case AssertionsubcmdCheckIdx: - if (arg != NULL) { - return AssertionSetCheckOptions(interp, object, arg); + if (argObj != NULL) { + return AssertionSetCheckOptions(interp, object, argObj); } else { return AssertionListCheckOption(interp, object); } break; case AssertionsubcmdObject_invarIdx: - if (arg != NULL) { + if (argObj != NULL) { NsfObjectOpt *opt = NsfRequireObjectOpt(object); - AssertionSetInvariants(interp, &opt->assertions, arg); + AssertionSetInvariants(interp, &opt->assertions, argObj); } else { if (object->opt != NULL && object->opt->assertions != NULL) { Tcl_SetObjResult(interp, AssertionList(interp, object->opt->assertions->invariants)); @@ -26569,9 +26566,9 @@ } class = (NsfClass *)object; - if (arg != NULL) { + if (argObj != NULL) { NsfClassOpt *opt = NsfRequireClassOpt(class); - AssertionSetInvariants(interp, &opt->assertions, arg); + AssertionSetInvariants(interp, &opt->assertions, argObj); } else { if (class->opt != NULL && class->opt->assertions != NULL) { Tcl_SetObjResult(interp, AssertionList(interp, class->opt->assertions->invariants)); @@ -26601,29 +26598,29 @@ } */ static int -NsfMethodCreateCmd(Tcl_Interp *interp, NsfObject *defObject, - int withCheckAlways, int withInner_namespace, +NsfMethodCreateCmd(Tcl_Interp *interp, NsfObject *object, + int withCheckalways, int withInner_namespace, int withPer_object, NsfObject *regObject, - Tcl_Obj *nameObj, Tcl_Obj *arguments, Tcl_Obj *body, - Tcl_Obj *withPrecondition, Tcl_Obj *withPostcondition) { + Tcl_Obj *methodNameObj, Tcl_Obj *argumentsObj, Tcl_Obj *bodyObj, + Tcl_Obj *preconditionObj, Tcl_Obj *postconditionObj) { NsfClass *cl = - (withPer_object || ! NsfObjectIsClass(defObject)) ? - NULL : (NsfClass *)defObject; + (withPer_object || ! NsfObjectIsClass(object)) ? + NULL : (NsfClass *)object; nonnull_assert(interp != NULL); - nonnull_assert(defObject != NULL); - nonnull_assert(nameObj != NULL); - nonnull_assert(arguments != NULL); - nonnull_assert(body != NULL); + nonnull_assert(object != NULL); + nonnull_assert(methodNameObj != NULL); + nonnull_assert(argumentsObj != NULL); + nonnull_assert(bodyObj != NULL); if (cl == NULL) { - RequireObjNamespace(interp, defObject); + RequireObjNamespace(interp, object); } - return MakeMethod(interp, defObject, regObject, cl, - nameObj, arguments, body, - withPrecondition, withPostcondition, - withInner_namespace, (withCheckAlways != 0) ? NSF_ARGPARSE_CHECK : 0); + return MakeMethod(interp, object, regObject, cl, + methodNameObj, argumentsObj, bodyObj, + preconditionObj, postconditionObj, + withInner_namespace, (withCheckalways != 0) ? NSF_ARGPARSE_CHECK : 0); } /* @@ -26702,12 +26699,12 @@ NsfObject *object, int withPer_object, Tcl_Obj *methodObj, - Tcl_Obj *withDefault, + Tcl_Obj *defaultObj, int withEarlybinding, - Tcl_Obj *withOnerror, - Tcl_Obj *withMethodprefix, + Tcl_Obj *onerrorObj, + Tcl_Obj *prefixObj, FrameIdx_t withFrame, int withVerbose, - Tcl_Obj *target, int nobjc, Tcl_Obj *CONST nobjv[]) { + Tcl_Obj *targetObj, int nobjc, Tcl_Obj *CONST nobjv[]) { ForwardCmdClientData *tcd = NULL; int result; @@ -26716,10 +26713,10 @@ nonnull_assert(methodObj != NULL); result = ForwardProcessOptions(interp, methodObj, - withDefault, withEarlybinding, - withOnerror, withMethodprefix, + defaultObj, withEarlybinding, + onerrorObj, prefixObj, withFrame, withVerbose, - target, nobjc, nobjv, &tcd); + targetObj, nobjc, nobjv, &tcd); if (likely(result == TCL_OK)) { const char *methodName = NSTail(ObjStr(methodObj)); @@ -26761,7 +26758,7 @@ */ static int NsfForwardPropertyCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, - Tcl_Obj *methodObj, ForwardpropertyIdx_t methodproperty, Tcl_Obj *valueObj) { + Tcl_Obj *methodNameObj, ForwardpropertyIdx_t methodproperty, Tcl_Obj *valueObj) { ForwardCmdClientData *tcd; Tcl_ObjCmdProc *procPtr; Tcl_Command cmd; @@ -26771,24 +26768,24 @@ nonnull_assert(interp != NULL); nonnull_assert(object != NULL); - nonnull_assert(methodObj != NULL); + nonnull_assert(methodNameObj != NULL); cl = withPer_object == 0 && NsfObjectIsClass(object) ? (NsfClass *)object : NULL; fromClassNS = cl != NULL; - cmd = ResolveMethodName(interp, (cl != NULL) ? cl->nsPtr : object->nsPtr, methodObj, + cmd = ResolveMethodName(interp, (cl != NULL) ? cl->nsPtr : object->nsPtr, methodNameObj, NULL, NULL, &defObject, NULL, &fromClassNS); if (unlikely(cmd == NULL)) { return NsfPrintError(interp, "cannot lookup %smethod '%s' for %s", cl == NULL ? "object " : "", - ObjStr(methodObj), ObjectName_(object)); + ObjStr(methodNameObj), ObjectName_(object)); } procPtr = Tcl_Command_objProc(cmd); if (procPtr != NsfForwardMethod) { return NsfPrintError(interp, "%s is not a forwarder method", - ObjStr(methodObj)); + ObjStr(methodNameObj)); } tcd = (ForwardCmdClientData *)Tcl_Command_objClientData(cmd); @@ -26841,7 +26838,7 @@ */ static int NsfMethodPropertyCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, - Tcl_Obj *methodObj, MethodpropertyIdx_t methodproperty, Tcl_Obj *valueObj) { + Tcl_Obj *methodNameObj, MethodpropertyIdx_t methodProperty, Tcl_Obj *valueObj) { NsfObject *defObject; Tcl_Command cmd; NsfClass *cl; @@ -26850,29 +26847,29 @@ nonnull_assert(interp != NULL); nonnull_assert(object != NULL); - nonnull_assert(methodObj != NULL); + nonnull_assert(methodNameObj != NULL); cl = withPer_object == 0 && NsfObjectIsClass(object) ? (NsfClass *)object : NULL; fromClassNS = (cl != NULL); - cmd = ResolveMethodName(interp, (cl != NULL) ? cl->nsPtr : object->nsPtr, methodObj, + cmd = ResolveMethodName(interp, (cl != NULL) ? cl->nsPtr : object->nsPtr, methodNameObj, NULL, NULL, &defObject, NULL, &fromClassNS); /*fprintf(stderr, "methodProperty for method '%s' prop %d value %s => cl %p cmd %p\n", - ObjStr(methodObj), methodproperty, (valueObj != NULL) ? ObjStr(valueObj) : "NULL", cl, cmd);*/ + ObjStr(methodNameObj), methodproperty, (valueObj != NULL) ? ObjStr(valueObj) : "NULL", cl, cmd);*/ if (unlikely(cmd == NULL)) { - if (methodproperty == MethodpropertyExistsIdx) { + if (methodProperty == MethodpropertyExistsIdx) { Tcl_SetObjResult(interp, Tcl_NewIntObj(0)); return TCL_OK; } else { return NsfPrintError(interp, "cannot lookup %smethod '%s' for %s", cl == NULL ? "object " : "", - ObjStr(methodObj), ObjectName_(object)); + ObjStr(methodNameObj), ObjectName_(object)); } } - switch (methodproperty) { + switch (methodProperty) { case MethodpropertyExistsIdx: Tcl_SetObjResult(interp, Tcl_NewIntObj(1)); break; @@ -26885,7 +26882,7 @@ { int impliedSetFlag = 0, impliedClearFlag = 0; - switch (methodproperty) { + switch (methodProperty) { case MethodpropertyClass_onlyIdx: flag = NSF_CMD_CLASS_ONLY_METHOD; break; @@ -26986,7 +26983,7 @@ */ paramDefs = ParamDefsNew(); ParamDefsStore(cmd, paramDefs, checkAlwaysFlag, execNsPtr); - /*fprintf(stderr, "new param definitions %p for cmd %p %s\n", paramDefs, cmd, ObjStr(methodObj));*/ + /*fprintf(stderr, "new param definitions %p for cmd %p %s\n", paramDefs, cmd, ObjStr(methodNameObj));*/ } objPtr = ¶mDefs->returns; @@ -27021,15 +27018,15 @@ } */ static int -NsfMethodRegisteredCmd(Tcl_Interp *interp, Tcl_Obj *methodNameObj) { +NsfMethodRegisteredCmd(Tcl_Interp *interp, Tcl_Obj *handleObj) { NsfObject *regObject; int fromClassNS = 0; Tcl_Command cmd; nonnull_assert(interp != NULL); - nonnull_assert(methodNameObj != NULL); + nonnull_assert(handleObj != NULL); - cmd = ResolveMethodName(interp, NULL, methodNameObj, + cmd = ResolveMethodName(interp, NULL, handleObj, NULL, ®Object, NULL, NULL, &fromClassNS); /* @@ -27050,7 +27047,7 @@ } */ static int -NsfMethodSetterCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *parameter) { +NsfMethodSetterCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *parameterObj) { SetterCmdClientData *setterClientData; NsfClass *cl; const char *methodName; @@ -27059,9 +27056,9 @@ nonnull_assert(interp != NULL); nonnull_assert(object != NULL); - nonnull_assert(parameter != NULL); + nonnull_assert(parameterObj != NULL); - methodName = ObjStr(parameter); + methodName = ObjStr(parameterObj); if (unlikely(*methodName == '-' || *methodName == ':')) { return NsfPrintError(interp, "invalid setter name \"%s\" (must not start with a dash or colon)", methodName); @@ -27088,7 +27085,7 @@ Tcl_Namespace *nsPtr = Tcl_Command_nsPtr(ctx->id); setterClientData->paramsPtr = ParamsNew(1u); - rc = ParamDefinitionParse(interp, NsfGlobalObjs[NSF_SETTER], parameter, + rc = ParamDefinitionParse(interp, NsfGlobalObjs[NSF_SETTER], parameterObj, NSF_DISALLOWED_ARG_SETTER|NSF_ARG_HAS_DEFAULT, setterClientData->paramsPtr, &possibleUnknowns, &plainParams, &nrNonposArgs, @@ -27212,13 +27209,13 @@ */ static int -NsfObjectPropertyCmd(Tcl_Interp *interp, NsfObject *object, ObjectpropertyIdx_t objectproperty, Tcl_Obj *valueObj) { +NsfObjectPropertyCmd(Tcl_Interp *interp, NsfObject *object, ObjectpropertyIdx_t objectProperty, Tcl_Obj *valueObj) { unsigned int flags = 0u, allowSet = 0u; nonnull_assert(interp != NULL); nonnull_assert(object != NULL); - switch (objectproperty) { + switch (objectProperty) { case ObjectpropertyInitializedIdx: flags = NSF_INIT_CALLED; allowSet = 1; break; case ObjectpropertyClassIdx: flags = NSF_IS_CLASS; break; case ObjectpropertyRootmetaclassIdx: flags = NSF_IS_ROOT_META_CLASS; break; @@ -27249,7 +27246,7 @@ return result; } - if (objectproperty == ObjectpropertySlotcontainerIdx) { + if (objectProperty == ObjectpropertySlotcontainerIdx) { assert(object->nsPtr != NULL); if (flagValue != 0) { /* @@ -27287,15 +27284,15 @@ } */ static int -NsfObjectQualifyCmd(Tcl_Interp *interp, Tcl_Obj *nameObj) { +NsfObjectQualifyCmd(Tcl_Interp *interp, Tcl_Obj *objectNameObj) { const char *nameString; nonnull_assert(interp != NULL); - nonnull_assert(nameObj != NULL); + nonnull_assert(objectNameObj != NULL); - nameString = ObjStr(nameObj); + nameString = ObjStr(objectNameObj); if (isAbsolutePath(nameString)) { - Tcl_SetObjResult(interp, nameObj); + Tcl_SetObjResult(interp, objectNameObj); } else { Tcl_SetObjResult(interp, NameInNamespaceObj(nameString, CallingNameSpace(interp))); } @@ -27310,26 +27307,26 @@ } */ static int -NsfObjectSystemCreateCmd(Tcl_Interp *interp, Tcl_Obj *Object, Tcl_Obj *Class, Tcl_Obj *systemMethodsObj) { +NsfObjectSystemCreateCmd(Tcl_Interp *interp, Tcl_Obj *rootClassObj, Tcl_Obj *rootMetaClassObj, Tcl_Obj *systemMethodsObj) { NsfClass *theobj = NULL, *thecls = NULL; Tcl_Obj *object, *class; const char *objectName; const char *className; NsfObjectSystem *osPtr; nonnull_assert(interp != NULL); - nonnull_assert(Object != NULL); - nonnull_assert(Class != NULL); + nonnull_assert(rootClassObj != NULL); + nonnull_assert(rootMetaClassObj != NULL); osPtr = NEW(NsfObjectSystem); memset(osPtr, 0, sizeof(NsfObjectSystem)); - objectName = ObjStr(Object); - object = isAbsolutePath(objectName) ? Object : + objectName = ObjStr(rootClassObj); + object = isAbsolutePath(objectName) ? rootClassObj : NameInNamespaceObj(objectName, CallingNameSpace(interp)); - className = ObjStr(Class); - class = isAbsolutePath(className) ? Class : + className = ObjStr(rootMetaClassObj); + class = isAbsolutePath(className) ? rootMetaClassObj : NameInNamespaceObj(className, CallingNameSpace(interp)); GetClassFromObj(interp, object, &theobj, 0); @@ -27450,13 +27447,13 @@ static int NsfMyCmd(Tcl_Interp *interp, int withIntrinsic, int withLocal, int withSystem, - Tcl_Obj *methodObj, int nobjc, Tcl_Obj *CONST nobjv[]) { + Tcl_Obj *methodNameObj, int nobjc, Tcl_Obj *CONST nobjv[]) { NsfObject *self; unsigned int flags; int result; nonnull_assert(interp != NULL); - nonnull_assert(methodObj != NULL); + nonnull_assert(methodNameObj != NULL); self = GetSelfObj(interp); if (unlikely(self == NULL)) { @@ -27477,18 +27474,18 @@ } else { flags = NsfImmediateFromCallerFlags(cscPtr->flags); fprintf(stderr, "XXX MY %s.%s frame has flags %.6x -> next-flags %.6x\n", - ObjectName(self), ObjStr(methodObj), cscPtr->flags, flags); + ObjectName(self), ObjStr(methodNameObj), cscPtr->flags, flags); } if (withIntrinsic != 0) {flags |= NSF_CM_INTRINSIC_METHOD;} if (withLocal != 0) {flags |= NSF_CM_LOCAL_METHOD;} if (withSystem != 0) {flags |= NSF_CM_SYSTEM_METHOD;} - result = CallMethod(self, interp, methodObj, nobjc+2, nobjv, flags); + result = CallMethod(self, interp, methodNameObj, nobjc+2, nobjv, flags); #else flags = NSF_CSC_IMMEDIATE; if (withIntrinsic != 0) {flags |= NSF_CM_INTRINSIC_METHOD;} if (withLocal != 0) {flags |= NSF_CM_LOCAL_METHOD;} if (withSystem != 0) {flags |= NSF_CM_SYSTEM_METHOD;} - result = CallMethod(self, interp, methodObj, nobjc+2, nobjv, flags); + result = CallMethod(self, interp, methodNameObj, nobjc+2, nobjv, flags); #endif return result; @@ -27518,17 +27515,17 @@ } */ static int -NsfNextCmd(Tcl_Interp *interp, Tcl_Obj *arguments) { +NsfNextCmd(Tcl_Interp *interp, Tcl_Obj *argumentsObj) { int freeArgumentVector, oc, nobjc = 0, result; NsfCallStackContent *cscPtr = NULL; const char *methodName = NULL; Tcl_Obj **nobjv = NULL, **ov; nonnull_assert(interp != NULL); - if (arguments != NULL) { + if (argumentsObj != NULL) { /* Arguments were provided. */ - int rc = Tcl_ListObjGetElements(interp, arguments, &oc, &ov); + int rc = Tcl_ListObjGetElements(interp, argumentsObj, &oc, &ov); if (unlikely(rc != TCL_OK)) { return rc; @@ -27555,7 +27552,7 @@ } */ static int -NsfNSCopyVarsCmd(Tcl_Interp *interp, Tcl_Obj *fromNs, Tcl_Obj *toNs) { +NsfNSCopyVarsCmd(Tcl_Interp *interp, Tcl_Obj *fromNsObj, Tcl_Obj *toNsObj) { Tcl_Namespace *fromNsPtr = NULL, *toNsPtr; Var *varPtr = NULL; Tcl_HashSearch hSrch; @@ -27569,18 +27566,18 @@ int result; nonnull_assert(interp != NULL); - nonnull_assert(fromNs != NULL); - nonnull_assert(toNs != NULL); + nonnull_assert(fromNsObj != NULL); + nonnull_assert(toNsObj != NULL); - TclGetNamespaceFromObj(interp, fromNs, &fromNsPtr); + TclGetNamespaceFromObj(interp, fromNsObj, &fromNsPtr); if (fromNsPtr != NULL) { - if (TclGetNamespaceFromObj(interp, toNs, &toNsPtr) != TCL_OK) { + if (TclGetNamespaceFromObj(interp, toNsObj, &toNsPtr) != TCL_OK) { return NsfPrintError(interp, "CopyVars: Destination namespace %s does not exist", - ObjStr(toNs)); + ObjStr(toNsObj)); } - object = GetObjectFromString(interp, ObjStr(fromNs)); + object = GetObjectFromString(interp, ObjStr(fromNsObj)); destFullName = toNsPtr->fullName; destFullNameObj = Tcl_NewStringObj(destFullName, -1); INCR_REF_COUNT(destFullNameObj); @@ -27589,13 +27586,13 @@ } else { NsfObject *newObject; - if (GetObjectFromObj(interp, fromNs, &object) != TCL_OK) { + if (GetObjectFromObj(interp, fromNsObj, &object) != TCL_OK) { return NsfPrintError(interp, "CopyVars: Origin object/namespace %s does not exist", - ObjStr(fromNs)); + ObjStr(fromNsObj)); } - if (GetObjectFromObj(interp, toNs, &newObject) != TCL_OK) { + if (GetObjectFromObj(interp, toNsObj, &newObject) != TCL_OK) { return NsfPrintError(interp, "CopyVars: Destination object/namespace %s does not exist", - ObjStr(toNs)); + ObjStr(toNsObj)); } varTablePtr = object->varTablePtr; destFullNameObj = newObject->cmdName; @@ -27689,20 +27686,20 @@ } */ static int -NsfParameterInfoCmd(Tcl_Interp *interp, ParametersubcmdIdx_t parametersubcmd, Tcl_Obj *parameterspec, Tcl_Obj *varname) { +NsfParameterInfoCmd(Tcl_Interp *interp, ParametersubcmdIdx_t parametersubcmd, Tcl_Obj *specObj, Tcl_Obj *varnameObj) { NsfParsedParam parsedParam; Tcl_Obj *paramsObj, *listObj = NULL; Nsf_Param *paramsPtr; int result; nonnull_assert(interp != NULL); - nonnull_assert(parameterspec != NULL); + nonnull_assert(specObj != NULL); - if (parametersubcmd != ParametersubcmdDefaultIdx && varname != NULL) { + if (parametersubcmd != ParametersubcmdDefaultIdx && varnameObj != NULL) { return NsfPrintError(interp, "parameter::info: provided third argument is only valid for querying defaults"); } - paramsObj = Tcl_NewListObj(1, ¶meterspec); + paramsObj = Tcl_NewListObj(1, &specObj); INCR_REF_COUNT(paramsObj); result = ParamDefsParse(interp, NULL, paramsObj, NSF_DISALLOWED_ARG_OBJECT_PARAMETER, 1, @@ -27727,8 +27724,8 @@ switch (parametersubcmd) { case ParametersubcmdDefaultIdx: if (paramsPtr->defaultValue != NULL) { - if (varname != NULL) { - Tcl_Obj *resultObj = Tcl_ObjSetVar2(interp, varname, NULL, + if (varnameObj != NULL) { + Tcl_Obj *resultObj = Tcl_ObjSetVar2(interp, varnameObj, NULL, paramsPtr->defaultValue, TCL_LEAVE_ERR_MSG); if (unlikely(resultObj == NULL)) { @@ -27891,15 +27888,15 @@ */ static int -NsfParameterSpecsCmd(Tcl_Interp *interp, int withConfigure, int withNonposargs, Tcl_Obj *slotListObj) { +NsfParameterSpecsCmd(Tcl_Interp *interp, int withConfigure, int withNonposargs, Tcl_Obj *slotobjsObj) { NsfTclObjList *objList = NULL, *elt; Tcl_Obj **objv, *resultObj; int result = TCL_OK, i, objc; nonnull_assert(interp != NULL); - nonnull_assert(slotListObj != NULL); + nonnull_assert(slotobjsObj != NULL); - if (Tcl_ListObjGetElements(interp, slotListObj, &objc, &objv) != TCL_OK) { + if (Tcl_ListObjGetElements(interp, slotobjsObj, &objc, &objv) != TCL_OK) { return NsfPrintError(interp, "NsfParameterSpecsCmd: invalid slot object list"); } @@ -28001,35 +27998,35 @@ } */ static int -NsfProcCmd(Tcl_Interp *interp, int with_ad, int with_checkAlways, int with_Debug, int with_Deprecated, - Tcl_Obj *nameObj, Tcl_Obj *arguments, Tcl_Obj *body) { +NsfProcCmd(Tcl_Interp *interp, int withAd, int withCheckalways, int withDebug, int withDeprecated, + Tcl_Obj *procNameObj, Tcl_Obj *argumentsObj, Tcl_Obj *bodyObj) { NsfParsedParam parsedParam; int result; nonnull_assert(interp != NULL); - nonnull_assert(nameObj != NULL); - nonnull_assert(arguments != NULL); - nonnull_assert(body != NULL); + nonnull_assert(procNameObj != NULL); + nonnull_assert(argumentsObj != NULL); + nonnull_assert(bodyObj != NULL); /* * Parse argument list "arguments" to determine if we should provide * nsf parameter handling. */ - result = ParamDefsParse(interp, nameObj, arguments, - NSF_DISALLOWED_ARG_METHOD_PARAMETER, (with_Debug != 0), + result = ParamDefsParse(interp, procNameObj, argumentsObj, + NSF_DISALLOWED_ARG_METHOD_PARAMETER, (withDebug != 0), &parsedParam, Tcl_GetCurrentNamespace(interp)->fullName); if (unlikely(result != TCL_OK)) { return result; } - if (parsedParam.paramDefs != NULL || with_Debug != 0 || with_Deprecated != 0) { + if (parsedParam.paramDefs != NULL || withDebug != 0 || withDeprecated != 0) { /* * We need parameter handling. In such cases, a thin C-based layer * is added which handles the parameter passing and calls the proc * later. */ - result = NsfProcAdd(interp, &parsedParam, ObjStr(nameObj), body, - with_ad, with_checkAlways, with_Debug, with_Deprecated); + result = NsfProcAdd(interp, &parsedParam, ObjStr(procNameObj), bodyObj, + withAd, withCheckalways, withDebug, withDeprecated); } else { /* @@ -28038,9 +28035,9 @@ Tcl_Obj *ov[4]; ov[0] = NULL; - ov[1] = nameObj; - ov[2] = arguments; - ov[3] = body; + ov[1] = procNameObj; + ov[2] = argumentsObj; + ov[3] = bodyObj; result = Tcl_ProcObjCmd(0, interp, 4, ov); } @@ -28429,7 +28426,7 @@ } */ static int -NsfCurrentCmd(Tcl_Interp *interp, CurrentoptionIdx_t selfoption) { +NsfCurrentCmd(Tcl_Interp *interp, CurrentoptionIdx_t option) { NsfObject *object; NsfCallStackContent *cscPtr; Tcl_CallFrame *framePtr; @@ -28444,7 +28441,7 @@ * (no object known). The commands are "nsf::current", "nsf::current * object", "nsf::current level", and "nsf::current activelevel" */ - if (selfoption == CurrentoptionNULL || selfoption == CurrentoptionObjectIdx) { + if (option == CurrentoptionNULL || option == CurrentoptionObjectIdx) { if (likely(object != NULL)) { Tcl_SetObjResult(interp, object->cmdName); } else { @@ -28454,9 +28451,9 @@ } if (unlikely(object == NULL)) { - if (selfoption == CurrentoptionCallinglevelIdx) { + if (option == CurrentoptionCallinglevelIdx) { Tcl_SetIntObj(Tcl_GetObjResult(interp), 1); - } else if (selfoption == CurrentoptionLevelIdx) { + } else if (option == CurrentoptionLevelIdx) { /* * Return empty, if we are not on a nsf level. */ @@ -28473,7 +28470,7 @@ */ assert(object != NULL); - switch (selfoption) { + switch (option) { case CurrentoptionMethodIdx: /* fall through */ case CurrentoptionProcIdx: cscPtr = CallStackGetTopFrame0(interp); @@ -28696,9 +28693,9 @@ */ static int NsfVarGetCmd(Tcl_Interp *interp, int withArray, int withNotrace, - NsfObject *object, Tcl_Obj *varName) { + NsfObject *object, Tcl_Obj *varNameObj) { - return NsfVarSetCmd(interp, withArray, withNotrace, object, varName, NULL); + return NsfVarSetCmd(interp, withArray, withNotrace, object, varNameObj, NULL); } /* @@ -28762,20 +28759,20 @@ */ static int NsfVarSetCmd(Tcl_Interp *interp, int withArray, int withNotrace, - NsfObject *object, Tcl_Obj *varName, Tcl_Obj *valueObj) { + NsfObject *object, Tcl_Obj *varNameObj, Tcl_Obj *valueObj) { nonnull_assert(interp != NULL); nonnull_assert(object != NULL); - nonnull_assert(varName != NULL); + nonnull_assert(varNameObj != NULL); - if (unlikely(CheckVarName(interp, ObjStr(varName)) != TCL_OK)) { + if (unlikely(CheckVarName(interp, ObjStr(varNameObj)) != TCL_OK)) { return TCL_ERROR; } if (withArray != 0) { - return SetInstArray(interp, object, varName, valueObj); + return SetInstArray(interp, object, varNameObj, valueObj); } else { - return SetInstVar(interp, object, varName, valueObj, withNotrace ? 0 : NSF_VAR_TRIGGER_TRACE); + return SetInstVar(interp, object, varNameObj, valueObj, withNotrace ? 0 : NSF_VAR_TRIGGER_TRACE); } } @@ -28824,7 +28821,7 @@ static void ParamFreeInternalRep(register Tcl_Obj *objPtr) nonnull(1); static int ParamSetFromAny(Tcl_Interp *interp, register Tcl_Obj *objPtr) nonnull(1) nonnull(2); static int ParamSetFromAny2(Tcl_Interp *interp, const char *varNamePrefix, - int configureParameter, register Tcl_Obj *objPtr, + int allowObjectParameter, register Tcl_Obj *objPtr, const char *qualifier) nonnull(1) nonnull(2) nonnull(4); @@ -28896,7 +28893,7 @@ ParamSetFromAny2( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ const char *varNamePrefix, /* shows up as varName in error message */ - int allowParameter, /* allow object parameters */ + int allowObjectParameter, /* allow object parameters */ register Tcl_Obj *objPtr, /* The object to convert. */ const char *qualifier) { @@ -28916,7 +28913,7 @@ INCR_REF_COUNT(fullParamObj); result = ParamDefinitionParse(interp, NsfGlobalObjs[NSF_VALUECHECK], fullParamObj, - (allowParameter == 1) ? NSF_DISALLOWED_ARG_OBJECT_PARAMETER : NSF_DISALLOWED_ARG_VALUECHECK, + (allowObjectParameter == 1) ? NSF_DISALLOWED_ARG_OBJECT_PARAMETER : NSF_DISALLOWED_ARG_VALUECHECK, paramWrapperPtr->paramPtr, &possibleUnknowns, &plainParams, &nrNonposArgs, qualifier); /* @@ -29927,14 +29924,14 @@ } */ static int -NsfOExistsMethod(Tcl_Interp *interp, NsfObject *object, const char *var) { +NsfOExistsMethod(Tcl_Interp *interp, NsfObject *object, const char *varName) { nonnull_assert(interp != NULL); nonnull_assert(object != NULL); - nonnull_assert(var != NULL); + nonnull_assert(varName != NULL); Tcl_SetIntObj(Tcl_GetObjResult(interp), - VarExists(interp, object, var, NULL, + VarExists(interp, object, varName, NULL, NSF_VAR_TRIGGER_TRACE|NSF_VAR_REQUIRE_DEFINED)); return TCL_OK; } @@ -30010,17 +30007,17 @@ */ static int -NsfOMixinGuardMethod(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *mixin, Tcl_Obj *guardObj) { +NsfOMixinGuardMethod(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *mixinObj, Tcl_Obj *guardObj) { NsfObjectOpt *opt; nonnull_assert(interp != NULL); nonnull_assert(object != NULL); - nonnull_assert(mixin != NULL); + nonnull_assert(mixinObj != NULL); nonnull_assert(guardObj != NULL); opt = object->opt; if (opt != NULL && opt->objMixins) { - Tcl_Command mixinCmd = Tcl_GetCommandFromObj(interp, mixin); + Tcl_Command mixinCmd = Tcl_GetCommandFromObj(interp, mixinObj); if (mixinCmd != NULL) { NsfClass *mixinCl = NsfGetClassFromCmdPtr(mixinCmd); @@ -30041,7 +30038,7 @@ } return NsfPrintError(interp, "mixinguard: can't find mixin %s on %s", - ObjStr(mixin), ObjectName_(object)); + ObjStr(mixinObj), ObjectName_(object)); } /* @@ -30466,30 +30463,30 @@ } */ static int -NsfCCreateMethod(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *specifiedNameObj, int objc, Tcl_Obj *CONST objv[]) { +NsfCCreateMethod(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *nameObj, int objc, Tcl_Obj *CONST objv[]) { NsfObject *newObject = NULL; - Tcl_Obj *nameObj, *methodObj, *tmpObj = NULL; + Tcl_Obj *actualNameObj, *methodObj, *tmpObj = NULL; int result, nameLength; const char *nameString; Tcl_Namespace *parentNsPtr; nonnull_assert(interp != NULL); nonnull_assert(cl != NULL); - nonnull_assert(specifiedNameObj != NULL); + nonnull_assert(nameObj != NULL); nonnull_assert(objv != NULL); - nameString = TclGetStringFromObj(specifiedNameObj, &nameLength); + nameString = TclGetStringFromObj(nameObj, &nameLength); #if 0 { int i; - fprintf(stderr, "NsfCCreateMethod %s create <%s> oc %d ", ClassName(cl), ObjStr(specifiedNameObj), objc); + fprintf(stderr, "NsfCCreateMethod %s create <%s> oc %d ", ClassName(cl), ObjStr(nameObj), objc); for(i = 0; i < objc; i++) {fprintf(stderr, " [%d]=%s,", i, ObjStr(objv[i]));} fprintf(stderr, "\n"); } #endif if (unlikely(RUNTIME_STATE(interp)->exitHandlerDestroyRound != NSF_EXITHANDLER_OFF)) { fprintf(stderr, "### Can't create instance %s of class %s during interp shutdown.\n", - ObjStr(specifiedNameObj), ClassName_(cl)); + ObjStr(nameObj), ClassName_(cl)); return TCL_OK; /* don't fail, if this happens during destroy, it might be canceled */ } @@ -30518,11 +30515,11 @@ nameString = ObjStr(tmpObj); /* fprintf(stderr, " **** fixed name is '%s'\n", nameString); */ INCR_REF_COUNT(tmpObj); - nameObj = tmpObj; + actualNameObj = tmpObj; } else { parentNsPtr = NULL; - nameObj = specifiedNameObj; + actualNameObj = nameObj; /* fprintf(stderr, " **** used specified name is '%s'\n", nameString); */ } @@ -30573,7 +30570,7 @@ && GetObjectSystem(newObject) == cl->osPtr) { /*fprintf(stderr, "%%%% recreate, call recreate method ... %s, objc=%d oldOs %p != newOs %p EQ %d\n", - ObjStr(nameObj), objc+1, + ObjStr(actualNameObj), objc+1, GetObjectSystem(newObject), cl->osPtr, GetObjectSystem(newObject) != cl->osPtr );*/ @@ -30591,7 +30588,7 @@ xov[0] = NULL; /* just a placeholder for passing conventions in ObjectDispatch() */ xov[1] = methodObj; - xov[2] = nameObj; + xov[2] = actualNameObj; if (objc >= 1) { memcpy(xov+3, objv, sizeof(Tcl_Obj *) * (size_t)objc); } @@ -30605,7 +30602,7 @@ } Tcl_SetObjResult(interp, newObject->cmdName); - nameObj = newObject->cmdName; + actualNameObj = newObject->cmdName; ObjTrace("RECREATE", newObject); } else { @@ -30617,19 +30614,19 @@ if (CallDirectly(interp, &cl->object, NSF_c_alloc_idx, &methodObj)) { NSF_PROFILE_TIME_DATA; NSF_PROFILE_CALL(interp, &cl->object, Nsf_SystemMethodOpts[NSF_c_alloc_idx]); - result = NsfCAllocMethod_(interp, cl, nameObj, parentNsPtr); + result = NsfCAllocMethod_(interp, cl, actualNameObj, parentNsPtr); NSF_PROFILE_EXIT(interp, &cl->object, Nsf_SystemMethodOpts[NSF_c_alloc_idx]); } else { result = CallMethod(cl, interp, methodObj, - 3, &nameObj, NSF_CSC_IMMEDIATE); + 3, &actualNameObj, NSF_CSC_IMMEDIATE); } if (unlikely(result != TCL_OK)) { goto create_method_exit; } - nameObj = Tcl_GetObjResult(interp); + actualNameObj = Tcl_GetObjResult(interp); - if (unlikely(GetObjectFromObj(interp, nameObj, &newObject) != TCL_OK)) { + if (unlikely(GetObjectFromObj(interp, actualNameObj, &newObject) != TCL_OK)) { result = NsfPrintError(interp, "couldn't find result of alloc"); goto create_method_exit; } @@ -30640,9 +30637,9 @@ * In case, the object is destroyed during initialization, we incr * refCount. */ - INCR_REF_COUNT(nameObj); + INCR_REF_COUNT(actualNameObj); result = DoObjInitialization(interp, newObject, objc, objv); - DECR_REF_COUNT(nameObj); + DECR_REF_COUNT(actualNameObj); } create_method_exit: @@ -30657,14 +30654,14 @@ */ static int -NsfCDeallocMethod(Tcl_Interp *interp, NsfClass *UNUSED(cl), Tcl_Obj *obj) { +NsfCDeallocMethod(Tcl_Interp *interp, NsfClass *UNUSED(class), Tcl_Obj *objectObj) { NsfObject *object; nonnull_assert(interp != NULL); - if (GetObjectFromObj(interp, obj, &object) != TCL_OK) { + if (GetObjectFromObj(interp, objectObj, &object) != TCL_OK) { return NsfPrintError(interp, "can't destroy object %s that does not exist", - ObjStr(obj)); + ObjStr(objectObj)); } return DoDealloc(interp, object); @@ -30678,21 +30675,21 @@ */ static int -NsfCFilterGuardMethod(Tcl_Interp *interp, NsfClass *cl, +NsfCFilterGuardMethod(Tcl_Interp *interp, NsfClass *class, const char *filter, Tcl_Obj *guardObj) { NsfClassOpt *opt; nonnull_assert(interp != NULL); - nonnull_assert(cl != NULL); + nonnull_assert(class != NULL); nonnull_assert(filter != NULL); nonnull_assert(guardObj != NULL); - opt = cl->opt; + opt = class->opt; if (opt != NULL && opt->classFilters) { NsfCmdList *h = CmdListFindNameInList(interp, filter, opt->classFilters); if (h != NULL) { - NsfClasses *subClasses = DependentSubClasses(cl); + NsfClasses *subClasses = DependentSubClasses(class); if (h->clientData != NULL) { GuardDel(h); @@ -30709,7 +30706,7 @@ } return NsfPrintError(interp, "filterguard: can't find filter %s on %s", - filter, ClassName_(cl)); + filter, ClassName_(class)); } /* @@ -30740,17 +30737,17 @@ } */ static int -NsfCMixinGuardMethod(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *mixin, Tcl_Obj *guardObj) { +NsfCMixinGuardMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *mixinObj, Tcl_Obj *guardObj) { NsfClassOpt *opt; nonnull_assert(interp != NULL); - nonnull_assert(cl != NULL); - nonnull_assert(mixin != NULL); + nonnull_assert(class != NULL); + nonnull_assert(mixinObj != NULL); nonnull_assert(guardObj != NULL); - opt = cl->opt; + opt = class->opt; if (opt != NULL && opt->classMixins != NULL) { - Tcl_Command mixinCmd = Tcl_GetCommandFromObj(interp, mixin); + Tcl_Command mixinCmd = Tcl_GetCommandFromObj(interp, mixinObj); if (mixinCmd != NULL) { NsfClass *mixinCl = NsfGetClassFromCmdPtr(mixinCmd); @@ -30765,7 +30762,7 @@ GuardDel((NsfCmdList *) h); } GuardAdd(h, guardObj); - subClasses = DependentSubClasses(cl); + subClasses = DependentSubClasses(class); MixinInvalidateObjOrders(subClasses); NsfClassListFree(subClasses); return TCL_OK; @@ -30775,7 +30772,7 @@ } return NsfPrintError(interp, "mixinguard: can't find mixin %s on %s", - ObjStr(mixin), ClassName_(cl)); + ObjStr(mixinObj), ClassName_(class)); } /* @@ -30786,26 +30783,26 @@ */ static int -NsfCNewMethod(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *withChildof, +NsfCNewMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *childofObj, int objc, Tcl_Obj *CONST objv[]) { Tcl_Obj *fullnameObj; Tcl_DString dFullname, *dsPtr = &dFullname; int result; nonnull_assert(interp != NULL); - nonnull_assert(cl != NULL); + nonnull_assert(class != NULL); #if 0 { int i; - fprintf(stderr, "NsfCNewMethod %s withChildof %p oc %d ", ClassName(cl), withChildof, objc); + fprintf(stderr, "NsfCNewMethod %s withChildof %p oc %d ", ClassName(class), childofObj, objc); for(i = 0; i < objc; i++) {fprintf(stderr, " [%d]=%s,", i, ObjStr(objv[i]));} fprintf(stderr, "\n"); } #endif Tcl_DStringInit(dsPtr); - if (withChildof != 0) { - const char *parentName = ObjStr(withChildof); + if (childofObj != 0) { + const char *parentName = ObjStr(childofObj); /* * If parentName is fully qualified, use it as prefix, else prepend the @@ -30843,13 +30840,13 @@ Tcl_Obj *methodObj; int callDirectly; - callDirectly = CallDirectly(interp, &cl->object, NSF_c_create_idx, &methodObj); + callDirectly = CallDirectly(interp, &class->object, NSF_c_create_idx, &methodObj); if (callDirectly != 0) { NSF_PROFILE_TIME_DATA; - NSF_PROFILE_CALL(interp, &cl->object, Nsf_SystemMethodOpts[NSF_c_create_idx]); - result = NsfCCreateMethod(interp, cl, fullnameObj, objc, objv); - NSF_PROFILE_EXIT(interp, &cl->object, Nsf_SystemMethodOpts[NSF_c_create_idx]); + NSF_PROFILE_CALL(interp, &class->object, Nsf_SystemMethodOpts[NSF_c_create_idx]); + result = NsfCCreateMethod(interp, class, fullnameObj, objc, objv); + NSF_PROFILE_EXIT(interp, &class->object, Nsf_SystemMethodOpts[NSF_c_create_idx]); } else { ALLOC_ON_STACK(Tcl_Obj*, objc+3, ov); @@ -30859,7 +30856,7 @@ if (objc >= 1) { memcpy(ov+3, objv, sizeof(Tcl_Obj *) * (size_t)objc); } - result = ObjectDispatch(cl, interp, objc+3, ov, NSF_CSC_IMMEDIATE); + result = ObjectDispatch(class, interp, objc+3, ov, NSF_CSC_IMMEDIATE); FREE_ON_STACK(Tcl_Obj *, ov); } } @@ -30938,18 +30935,18 @@ } static int -NsfCRecreateMethod(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *nameObj, +NsfCRecreateMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *objectNameObj, int objc, Tcl_Obj *CONST objv[]) { NsfObject *object; nonnull_assert(interp != NULL); - nonnull_assert(cl != NULL); - nonnull_assert(nameObj != NULL); + nonnull_assert(class != NULL); + nonnull_assert(objectNameObj != NULL); - if (GetObjectFromObj(interp, nameObj, &object) != TCL_OK) { - return NsfPrintError(interp, "can't recreate non existing object %s", ObjStr(nameObj)); + if (GetObjectFromObj(interp, objectNameObj, &object) != TCL_OK) { + return NsfPrintError(interp, "can't recreate non existing object %s", ObjStr(objectNameObj)); } - return RecreateObject(interp, cl, object, objc, objv); + return RecreateObject(interp, class, object, objc, objv); } /* @@ -30958,12 +30955,12 @@ } */ static int -NsfCSuperclassMethod(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *superClassesObj) { +NsfCSuperclassMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *superclassesObj) { nonnull_assert(interp != NULL); - nonnull_assert(cl != NULL); + nonnull_assert(class != NULL); - return NsfRelationSetCmd(interp, &cl->object, RelationtypeSuperclassIdx, superClassesObj); + return NsfRelationSetCmd(interp, &class->object, RelationtypeSuperclassIdx, superclassesObj); } /*********************************************************************** @@ -31113,13 +31110,13 @@ } */ static int -NsfObjInfoHasMixinMethod(Tcl_Interp *interp, NsfObject *object, NsfClass *mixinClass) { +NsfObjInfoHasMixinMethod(Tcl_Interp *interp, NsfObject *object, NsfClass *class) { nonnull_assert(interp != NULL); nonnull_assert(object != NULL); - nonnull_assert(mixinClass != NULL); + nonnull_assert(class != NULL); - Tcl_SetBooleanObj(Tcl_GetObjResult(interp), HasMixin(interp, object, mixinClass)); + Tcl_SetBooleanObj(Tcl_GetObjResult(interp), HasMixin(interp, object, class)); return TCL_OK; } @@ -31143,13 +31140,13 @@ } */ static int -NsfObjInfoHasTypeMethod(Tcl_Interp *interp, NsfObject *object, NsfClass *typeClass) { +NsfObjInfoHasTypeMethod(Tcl_Interp *interp, NsfObject *object, NsfClass *class) { nonnull_assert(interp != NULL); nonnull_assert(object != NULL); - nonnull_assert(typeClass != NULL); + nonnull_assert(class != NULL); - Tcl_SetBooleanObj(Tcl_GetObjResult(interp), IsSubType(object->cl, typeClass)); + Tcl_SetBooleanObj(Tcl_GetObjResult(interp), IsSubType(object->cl, class)); return TCL_OK; } @@ -31220,20 +31217,20 @@ } */ static int -NsfObjInfoLookupMethodMethod(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *methodObj) { +NsfObjInfoLookupMethodMethod(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *nameObj) { NsfClass *pcl = NULL; Tcl_Command cmd; nonnull_assert(interp != NULL); nonnull_assert(object != NULL); - nonnull_assert(methodObj != NULL); + nonnull_assert(nameObj != NULL); - cmd = ObjectFindMethod(interp, object, methodObj, &pcl); + cmd = ObjectFindMethod(interp, object, nameObj, &pcl); if (likely(cmd != NULL)) { NsfObject *pobj = (pcl != NULL) ? &pcl->object : object; int perObject = (pcl == NULL); - ListMethod(interp, pobj, pobj, ObjStr(methodObj), cmd, + ListMethod(interp, pobj, pobj, ObjStr(nameObj), cmd, InfomethodsubcmdRegistrationhandleIdx, NULL, NULL, perObject); } @@ -31299,14 +31296,14 @@ NsfObjInfoLookupMethodsMethod(Tcl_Interp *interp, NsfObject *object, CallprotectionIdx_t withCallprotection, int withIncontext, - MethodtypeIdx_t withMethodtype, + MethodtypeIdx_t withType, int withNomixins, int withPath, DefinitionsourceIdx_t withSource, const char *pattern) { int withPer_object = 1; Tcl_HashTable dupsTable, *dups = &dupsTable; - int result, methodType = AggregatedMethodType(withMethodtype); + int result, methodType = AggregatedMethodType(withType); nonnull_assert(interp != NULL); nonnull_assert(object != NULL); @@ -31381,14 +31378,14 @@ */ static int NsfObjInfoLookupMixinsMethod(Tcl_Interp *interp, NsfObject *object, int withGuards, - const char *patternString, NsfObject *patternObj) { + const char *patternString, NsfObject *patternObject) { nonnull_assert(interp != NULL); nonnull_assert(object != NULL); if ((object->flags & NSF_MIXIN_ORDER_VALID) == 0u) { MixinComputeDefined(interp, object); } - return MixinInfo(interp, object->mixinOrder, patternString, withGuards, patternObj); + return MixinInfo(interp, object->mixinOrder, patternString, withGuards, patternObject); } @@ -31454,8 +31451,8 @@ */ static int NsfObjInfoMethodMethod(Tcl_Interp *interp, NsfObject *object, - InfomethodsubcmdIdx_t subcmd, Tcl_Obj *methodNameObj) { - return ListMethodResolve(interp, subcmd, NULL, NULL, object->nsPtr, object, methodNameObj, 0); + InfomethodsubcmdIdx_t subcmd, Tcl_Obj *nameObj) { + return ListMethodResolve(interp, subcmd, NULL, NULL, object->nsPtr, object, nameObj, 0); } /* @@ -31469,15 +31466,15 @@ static int NsfObjInfoMethodsMethod(Tcl_Interp *interp, NsfObject *object, CallprotectionIdx_t withCallproctection, - MethodtypeIdx_t withMethodtype, + MethodtypeIdx_t withType, int withPath, const char *pattern) { nonnull_assert(interp != NULL); nonnull_assert(object != NULL); return ListDefinedMethods(interp, object, pattern, 1 /* per-object */, - AggregatedMethodType(withMethodtype), withCallproctection, + AggregatedMethodType(withType), withCallproctection, withPath); } @@ -31489,12 +31486,12 @@ */ static int NsfObjInfoMixinsMethod(Tcl_Interp *interp, NsfObject *object, int withGuards, - const char *patternString, NsfObject *patternObj) { + const char *patternString, NsfObject *patternObject) { nonnull_assert(interp != NULL); nonnull_assert(object != NULL); return (object->opt != NULL) ? - MixinInfo(interp, object->opt->objMixins, patternString, withGuards, patternObj) : + MixinInfo(interp, object->opt->objMixins, patternString, withGuards, patternObject) : TCL_OK; } @@ -31552,14 +31549,14 @@ */ static int NsfObjInfoPrecedenceMethod(Tcl_Interp *interp, NsfObject *object, - int withIntrinsicOnly, const char *pattern) { + int withIntrinsic, const char *pattern) { NsfClasses *precedenceList, *pl; Tcl_Obj *resultObj = Tcl_NewObj(); nonnull_assert(interp != NULL); nonnull_assert(object != NULL); - precedenceList = ComputePrecedenceList(interp, object, pattern, !withIntrinsicOnly, 1); + precedenceList = ComputePrecedenceList(interp, object, pattern, !withIntrinsic, 1); for (pl = precedenceList; pl != NULL; pl = pl->nextPtr) { assert(pl->cl != NULL); Tcl_ListObjAppendElement(interp, resultObj, pl->cl->object.cmdName); @@ -31690,17 +31687,17 @@ } */ static int -NsfClassInfoHeritageMethod(Tcl_Interp *interp, NsfClass *cl, const char *pattern) { +NsfClassInfoHeritageMethod(Tcl_Interp *interp, NsfClass *class, const char *pattern) { NsfClasses *pl, *intrinsic, *checkList = NULL, *mixinClasses = NULL; Tcl_Obj *resultObj; nonnull_assert(interp != NULL); - nonnull_assert(cl != NULL); + nonnull_assert(class != NULL); resultObj = Tcl_NewObj(); - intrinsic = PrecedenceOrder(cl); + intrinsic = PrecedenceOrder(class); - NsfClassListAddPerClassMixins(interp, cl, &mixinClasses, &checkList); + NsfClassListAddPerClassMixins(interp, class, &mixinClasses, &checkList); for (pl = mixinClasses; pl != NULL; pl = pl->nextPtr) { if (NsfClassListFind(pl->nextPtr, pl->cl) == NULL && NsfClassListFind(intrinsic, pl->cl) == NULL) { @@ -31784,22 +31781,23 @@ } */ static int -NsfClassInfoInstancesMethod(Tcl_Interp *interp, NsfClass *startCl, - int withClosure, const char *pattern, NsfObject *matchObject) { +NsfClassInfoInstancesMethod(Tcl_Interp *interp, NsfClass *class, + int withClosure, const char *patternString, + NsfObject *patternObject) { NsfClasses clElement, *subClasses; nonnull_assert(interp != NULL); - nonnull_assert(startCl != NULL); + nonnull_assert(class != NULL); if (withClosure != 0) { - subClasses = TransitiveSubClasses(startCl); + subClasses = TransitiveSubClasses(class); } else { subClasses = &clElement; - clElement.cl = startCl; + clElement.cl = class; clElement.nextPtr = NULL; } - Tcl_SetObjResult(interp, InstancesFromClassList(interp, subClasses, pattern, matchObject)); + Tcl_SetObjResult(interp, InstancesFromClassList(interp, subClasses, patternString, patternObject)); if (withClosure != 0) { NsfClassListFree(subClasses); @@ -31816,9 +31814,9 @@ */ static int NsfClassInfoMethodMethod(Tcl_Interp *interp, NsfClass *class, - InfomethodsubcmdIdx_t subcmd, Tcl_Obj *methodNameObj) { + InfomethodsubcmdIdx_t subcmd, Tcl_Obj *nameObj) { - return ListMethodResolve(interp, subcmd, NULL, NULL, class->nsPtr, &class->object, methodNameObj, 1); + return ListMethodResolve(interp, subcmd, NULL, NULL, class->nsPtr, &class->object, nameObj, 1); } /* @@ -31835,7 +31833,7 @@ NsfClassInfoMethodsMethod(Tcl_Interp *interp, NsfClass *class, CallprotectionIdx_t withCallprotection, int withClosure, - MethodtypeIdx_t withMethodtype, + MethodtypeIdx_t withType, int withPath, DefinitionsourceIdx_t withSource, const char *pattern) { @@ -31862,7 +31860,7 @@ NsfClassListAddPerClassMixins(interp, class, &mixinClasses, &checkList); (void) ListMethodKeysClassList(interp, mixinClasses, withSource, pattern, - AggregatedMethodType(withMethodtype), withCallprotection, + AggregatedMethodType(withType), withCallprotection, withPath, dups, &class->object, 0); if (checkList != NULL) { NsfClassListFree(checkList); @@ -31873,7 +31871,7 @@ result = ListMethodKeysClassList(interp, PrecedenceOrder(class), withSource, pattern, - AggregatedMethodType(withMethodtype), withCallprotection, + AggregatedMethodType(withType), withCallprotection, withPath, dups, &class->object, 0); Tcl_DeleteHashTable(dups); @@ -31883,7 +31881,7 @@ return NsfPrintError(interp, "-source cannot be used without -closure\n"); } return ListDefinedMethods(interp, &class->object, pattern, 0 /* per-object */, - AggregatedMethodType(withMethodtype), withCallprotection, + AggregatedMethodType(withType), withCallprotection, withPath); } } @@ -31899,7 +31897,7 @@ static int NsfClassInfoMixinsMethod(Tcl_Interp *interp, NsfClass *class, int withClosure, int withGuards, int withHeritage, - const char *patternString, NsfObject *patternObj) { + const char *patternString, NsfObject *patternObject) { NsfClassOpt *opt; Tcl_Obj *resultObj; int result = TCL_OK; @@ -31941,15 +31939,15 @@ Tcl_InitHashTable(commandTable, TCL_ONE_WORD_KEYS); rc = GetAllClassMixins(interp, commandTable, resultObj, class, withGuards, - patternString, patternObj); - if (patternObj != NULL && rc && !withGuards) { - Tcl_SetObjResult(interp, (rc != 0) ? patternObj->cmdName : NsfGlobalObjs[NSF_EMPTY]); + patternString, patternObject); + if (patternObject != NULL && rc && !withGuards) { + Tcl_SetObjResult(interp, (rc != 0) ? patternObject->cmdName : NsfGlobalObjs[NSF_EMPTY]); } Tcl_DeleteHashTable(commandTable); MEM_COUNT_FREE("Tcl_InitHashTable", commandTable); } else { - result = (opt != NULL) ? MixinInfo(interp, opt->classMixins, patternString, withGuards, patternObj) : TCL_OK; + result = (opt != NULL) ? MixinInfo(interp, opt->classMixins, patternString, withGuards, patternObject) : TCL_OK; } return result; @@ -31982,7 +31980,7 @@ int withClosure, MixinscopeIdx_t withScope, const char *patternString, - NsfObject *patternObj) { + NsfObject *patternObject) { NsfClassOpt *opt; int perClass, perObject, rc = TCL_OK; Tcl_Obj *resultObj; @@ -32008,12 +32006,12 @@ if (opt != NULL && !withClosure) { if (perClass == 1 && opt->isClassMixinOf != NULL) { rc = AppendMatchingElementsFromCmdList(interp, opt->isClassMixinOf, resultObj, - patternString, patternObj); - if (rc && patternObj) {goto finished;} + patternString, patternObject); + if (rc && patternObject) {goto finished;} } if (perObject == 1 && opt->isObjectMixinOf) { rc = AppendMatchingElementsFromCmdList(interp, opt->isObjectMixinOf, resultObj, - patternString, patternObj); + patternString, patternObject); } } else if (withClosure != 0) { Tcl_HashTable objTable, *commandTable = &objTable; @@ -32022,20 +32020,20 @@ Tcl_InitHashTable(commandTable, TCL_ONE_WORD_KEYS); if (perClass == 1) { rc = GetAllClassMixinsOf(interp, commandTable, resultObj, - class, 0, 1, patternString, patternObj); - if (rc && patternObj) {goto finished;} + class, 0, 1, patternString, patternObject); + if (rc && patternObject) {goto finished;} } if (perObject == 1) { rc = GetAllObjectMixinsOf(interp, commandTable, resultObj, - class, 0, 1, patternString, patternObj); + class, 0, 1, patternString, patternObject); } Tcl_DeleteHashTable(commandTable); MEM_COUNT_FREE("Tcl_InitHashTable", commandTable); } finished: - if (patternObj != NULL) { - Tcl_SetObjResult(interp, (rc != 0) ? patternObj->cmdName : NsfGlobalObjs[NSF_EMPTY]); + if (patternObject != NULL) { + Tcl_SetObjResult(interp, (rc != 0) ? patternObject->cmdName : NsfGlobalObjs[NSF_EMPTY]); } else { Tcl_SetObjResult(interp, resultObj); } @@ -32133,7 +32131,7 @@ static int NsfClassInfoSubclassMethod(Tcl_Interp *interp, NsfClass *class, int withClosure, int withDependent, - const char *patternString, NsfObject *patternObj) { + const char *patternString, NsfObject *patternObject) { int rc = 0; nonnull_assert(interp != NULL); @@ -32147,15 +32145,15 @@ NsfClasses *subClasses = (withClosure != 0) ? TransitiveSubClasses(class) : DependentSubClasses(class); if (subClasses != NULL) { - rc = AppendMatchingElementsFromClasses(interp, subClasses, patternString, patternObj); + rc = AppendMatchingElementsFromClasses(interp, subClasses, patternString, patternObject); NsfClassListFree(subClasses); } } else if (class->sub != NULL) { - rc = AppendMatchingElementsFromClasses(interp, class->sub, patternString, patternObj); + rc = AppendMatchingElementsFromClasses(interp, class->sub, patternString, patternObject); } - if (patternObj != NULL) { - Tcl_SetObjResult(interp, (rc != 0) ? patternObj->cmdName : NsfGlobalObjs[NSF_EMPTY]); + if (patternObject != NULL) { + Tcl_SetObjResult(interp, (rc != 0) ? patternObject->cmdName : NsfGlobalObjs[NSF_EMPTY]); } return TCL_OK; @@ -32168,12 +32166,12 @@ } */ static int -NsfClassInfoSuperclassMethod(Tcl_Interp *interp, NsfClass *class, int withClosure, Tcl_Obj *pattern) { +NsfClassInfoSuperclassMethod(Tcl_Interp *interp, NsfClass *class, int withClosure, Tcl_Obj *patternObj) { nonnull_assert(interp != NULL); nonnull_assert(class != NULL); - return ListSuperClasses(interp, class, pattern, withClosure); + return ListSuperClasses(interp, class, patternObj, withClosure); } /*********************************************************************** Index: generic/nsf.decls =================================================================== diff -u -r866971d828a2ed5fdb8da757e94401f919bd3a8c -r8552f707c011bfc24be22e1e8332f5558227cde3 --- generic/nsf.decls (.../nsf.decls) (revision 866971d828a2ed5fdb8da757e94401f919bd3a8c) +++ generic/nsf.decls (.../nsf.decls) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) @@ -105,7 +105,8 @@ } declare 14 generic { int NsfObjErrType(Tcl_Interp *interp, const char *context, - Tcl_Obj *value, const char *type, Nsf_Param const *pPtr) + Tcl_Obj *value, const char *type, + Nsf_Param const *paramPtr) } declare 15 generic { void NsfStackDump (Tcl_Interp *interp) Index: generic/nsf.h =================================================================== diff -u -r25212e40eb097eebcf48d54931bde2bc90e94e69 -r8552f707c011bfc24be22e1e8332f5558227cde3 --- generic/nsf.h (.../nsf.h) (revision 25212e40eb097eebcf48d54931bde2bc90e94e69) +++ generic/nsf.h (.../nsf.h) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) @@ -295,13 +295,13 @@ struct Nsf_Param; typedef int (Nsf_TypeConverter)(Tcl_Interp *interp, Tcl_Obj *obj, - struct Nsf_Param CONST *pPtr, + struct Nsf_Param const *pPtr, ClientData *clientData, Tcl_Obj **outObjPtr); typedef struct { Nsf_TypeConverter *converter; - CONST char *domain; + const char *domain; } Nsf_EnumeratorConverterEntry; EXTERN Nsf_TypeConverter Nsf_ConvertToBoolean, Nsf_ConvertToClass, @@ -317,7 +317,7 @@ Nsf_TypeConverter *converter; Tcl_Obj *converterArg; Tcl_Obj *defaultValue; - CONST char *type; + const char *type; Tcl_Obj *nameObj; Tcl_Obj *converterName; Tcl_Obj *paramObj; @@ -398,33 +398,33 @@ #endif EXTERN int -NsfArgumentError(Tcl_Interp *interp, CONST char *errorMsg, Nsf_Param CONST *paramPtr, - Tcl_Obj *cmdNameObj, Tcl_Obj *methodObj) +NsfArgumentError(Tcl_Interp *interp, const char *errorMsg, Nsf_Param const *paramPtr, + Tcl_Obj *cmdNameObj, Tcl_Obj *methodPathObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); EXTERN int NsfDispatchClientDataError(Tcl_Interp *interp, ClientData clientData, - CONST char *what, CONST char *methodName) + const char *what, const char *methodName) NSF_nonnull(1) NSF_nonnull(3) NSF_nonnull(4); EXTERN int -NsfNoCurrentObjectError(Tcl_Interp *interp, CONST char *methodName) +NsfNoCurrentObjectError(Tcl_Interp *interp, const char *methodName) NSF_nonnull(1); EXTERN int -NsfUnexpectedArgumentError(Tcl_Interp *interp, CONST char *argumentString, - Nsf_Object *object, Nsf_Param CONST *paramPtr, - Tcl_Obj *procNameObj) +NsfUnexpectedArgumentError(Tcl_Interp *interp, const char *argumentString, + Nsf_Object *object, Nsf_Param const *paramPtr, + Tcl_Obj *methodPathObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4) NSF_nonnull(5); EXTERN int NsfUnexpectedNonposArgumentError(Tcl_Interp *interp, - CONST char *argumentString, + const char *argumentString, Nsf_Object *object, - Nsf_Param CONST *currentParamPtr, - Nsf_Param CONST *paramPtr, - Tcl_Obj *procNameObj) + Nsf_Param const *currentParamPtr, + Nsf_Param const *paramPtr, + Tcl_Obj *methodPathObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4) NSF_nonnull(5) NSF_nonnull(6); /* @@ -436,17 +436,17 @@ #define NSF_LOG_DEBUG 0 EXTERN void -NsfLog(Tcl_Interp *interp, int requiredLevel, CONST char *fmt, ...) +NsfLog(Tcl_Interp *interp, int requiredLevel, const char *fmt, ...) NSF_nonnull(1) NSF_nonnull(3) NSF_attribute_format((printf,3,4)); /* * Nsf Pointer converter interface */ -EXTERN int Nsf_PointerAdd(Tcl_Interp *interp, char *buffer, size_t size, CONST char *typeName, void *valuePtr) +EXTERN int Nsf_PointerAdd(Tcl_Interp *interp, char *buffer, size_t size, const char *typeName, void *valuePtr) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4) NSF_nonnull(5); -EXTERN int Nsf_PointerDelete(CONST char *key, void *valuePtr, int free) +EXTERN int Nsf_PointerDelete(const char *key, void *valuePtr, int free) NSF_nonnull(2); EXTERN void Nsf_PointerInit(Tcl_Interp *interp) @@ -455,10 +455,10 @@ EXTERN void Nsf_PointerExit(Tcl_Interp *interp) NSF_nonnull(1); -EXTERN void *Nsf_PointerTypeLookup(Tcl_Interp *interp, CONST char* typeName) +EXTERN void *Nsf_PointerTypeLookup(Tcl_Interp *interp, const char* typeName) NSF_nonnull(1) NSF_nonnull(2); -EXTERN int Nsf_PointerTypeRegister(Tcl_Interp *interp, CONST char* typeName, int *counterPtr) +EXTERN int Nsf_PointerTypeRegister(Tcl_Interp *interp, const char* typeName, int *counterPtr) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); /* @@ -507,8 +507,8 @@ # ifdef __cplusplus EXTERN "C" # endif -CONST char * -Nsf_InitStubs(Tcl_Interp *interp, CONST char *version, int exact); +const char * +Nsf_InitStubs(Tcl_Interp *interp, const char *version, int exact); #else # define Nsf_InitStubs(interp, version, exact) \ Tcl_PkgRequire(interp, "nx", version, exact) Index: generic/nsfAPI.h =================================================================== diff -u -r7f58a3a3dd12990de3dfc8096a85d2341cf02075 -r8552f707c011bfc24be22e1e8332f5558227cde3 --- generic/nsfAPI.h (.../nsfAPI.h) (revision 7f58a3a3dd12990de3dfc8096a85d2341cf02075) +++ generic/nsfAPI.h (.../nsfAPI.h) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) @@ -528,53 +528,53 @@ 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 *cl, Tcl_Obj *objectName) +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 *cl, Tcl_Obj *objectName, int nobjc, Tcl_Obj *CONST* nobjv) +static int NsfCCreateMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *objectNameObj, int nobjc, Tcl_Obj *CONST* nobjv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfCDeallocMethod(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *object) +static int NsfCDeallocMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *objectObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfCFilterGuardMethod(Tcl_Interp *interp, NsfClass *cl, const char *filter, Tcl_Obj *guard) +static int NsfCFilterGuardMethod(Tcl_Interp *interp, NsfClass *class, const char *filter, Tcl_Obj *guardObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3) NSF_nonnull(4); -static int NsfCGetCachendParametersMethod(Tcl_Interp *interp, NsfClass *cl) +static int NsfCGetCachendParametersMethod(Tcl_Interp *interp, NsfClass *class) NSF_nonnull(1) NSF_nonnull(2); -static int NsfCMixinGuardMethod(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *mixin, Tcl_Obj *guard) +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 *cl, Tcl_Obj *withChildof, int nobjc, Tcl_Obj *CONST* nobjv) +static int NsfCNewMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *childofObj, int nobjc, Tcl_Obj *CONST* nobjv) NSF_nonnull(1) NSF_nonnull(2); -static int NsfCRecreateMethod(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *objectName, int nobjc, Tcl_Obj *CONST* nobjv) +static int NsfCRecreateMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *objectNameObj, int nobjc, Tcl_Obj *CONST* nobjv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfCSuperclassMethod(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *superclasses) +static int NsfCSuperclassMethod(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *superclassesObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfClassInfoFilterguardMethod(Tcl_Interp *interp, NsfClass *cl, const char *filter) +static int NsfClassInfoFilterguardMethod(Tcl_Interp *interp, NsfClass *class, const char *filter) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfClassInfoFiltersMethod(Tcl_Interp *interp, NsfClass *cl, int withGuards, const char *pattern) +static int NsfClassInfoFiltersMethod(Tcl_Interp *interp, NsfClass *class, int withGuards, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); -static int NsfClassInfoForwardMethod(Tcl_Interp *interp, NsfClass *cl, int withDefinition, const char *name) +static int NsfClassInfoForwardMethod(Tcl_Interp *interp, NsfClass *class, int withDefinition, const char *name) NSF_nonnull(1) NSF_nonnull(2); -static int NsfClassInfoHeritageMethod(Tcl_Interp *interp, NsfClass *cl, const char *pattern) +static int NsfClassInfoHeritageMethod(Tcl_Interp *interp, NsfClass *class, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); -static int NsfClassInfoInstancesMethod(Tcl_Interp *interp, NsfClass *cl, int withClosure, const char *patternString, NsfObject *patternObject) +static int NsfClassInfoInstancesMethod(Tcl_Interp *interp, NsfClass *class, int withClosure, const char *patternString, NsfObject *patternObject) NSF_nonnull(1) NSF_nonnull(2); -static int NsfClassInfoMethodMethod(Tcl_Interp *interp, NsfClass *cl, InfomethodsubcmdIdx_t subcmd, Tcl_Obj *name) +static int NsfClassInfoMethodMethod(Tcl_Interp *interp, NsfClass *class, InfomethodsubcmdIdx_t subcmd, Tcl_Obj *nameObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfClassInfoMethodsMethod(Tcl_Interp *interp, NsfClass *cl, CallprotectionIdx_t withCallprotection, int withClosure, MethodtypeIdx_t withType, int withPath, DefinitionsourceIdx_t withSource, const char *pattern) +static int NsfClassInfoMethodsMethod(Tcl_Interp *interp, NsfClass *class, CallprotectionIdx_t withCallprotection, int withClosure, MethodtypeIdx_t withType, int withPath, DefinitionsourceIdx_t withSource, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); -static int NsfClassInfoMixinOfMethod(Tcl_Interp *interp, NsfClass *cl, int withClosure, MixinscopeIdx_t withScope, const char *patternString, NsfObject *patternObject) +static int NsfClassInfoMixinOfMethod(Tcl_Interp *interp, NsfClass *class, int withClosure, MixinscopeIdx_t withScope, const char *patternString, NsfObject *patternObject) NSF_nonnull(1) NSF_nonnull(2); -static int NsfClassInfoMixinguardMethod(Tcl_Interp *interp, NsfClass *cl, const char *mixin) +static int NsfClassInfoMixinguardMethod(Tcl_Interp *interp, NsfClass *class, const char *mixin) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfClassInfoMixinsMethod(Tcl_Interp *interp, NsfClass *cl, int withClosure, int withGuards, int withHeritage, const char *patternString, NsfObject *patternObject) +static int NsfClassInfoMixinsMethod(Tcl_Interp *interp, NsfClass *class, int withClosure, int withGuards, int withHeritage, const char *patternString, NsfObject *patternObject) NSF_nonnull(1) NSF_nonnull(2); -static int NsfClassInfoSlotobjectsMethod(Tcl_Interp *interp, NsfClass *cl, int withClosure, DefinitionsourceIdx_t withSource, NsfClass *withType, const char *pattern) +static int NsfClassInfoSlotobjectsMethod(Tcl_Interp *interp, NsfClass *class, int withClosure, DefinitionsourceIdx_t withSource, NsfClass *withType, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); -static int NsfClassInfoSubclassMethod(Tcl_Interp *interp, NsfClass *cl, int withClosure, int withDependent, const char *patternString, NsfObject *patternObject) +static int NsfClassInfoSubclassMethod(Tcl_Interp *interp, NsfClass *class, int withClosure, int withDependent, const char *patternString, NsfObject *patternObject) NSF_nonnull(1) NSF_nonnull(2); -static int NsfClassInfoSuperclassMethod(Tcl_Interp *interp, NsfClass *cl, int withClosure, Tcl_Obj *pattern) +static int NsfClassInfoSuperclassMethod(Tcl_Interp *interp, NsfClass *class, int withClosure, Tcl_Obj *patternObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfAsmMethodCreateCmd(Tcl_Interp *interp, NsfObject *object, int withCheckalways, int withInner_namespace, int withPer_object, NsfObject *withReg_object, Tcl_Obj *methodName, Tcl_Obj *arguments, Tcl_Obj *body) +static int NsfAsmMethodCreateCmd(Tcl_Interp *interp, NsfObject *object, int withCheckalways, int withInner_namespace, int withPer_object, NsfObject *withReg_object, Tcl_Obj *methodNameObj, Tcl_Obj *argumentsObj, Tcl_Obj *bodyObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(7) NSF_nonnull(8) NSF_nonnull(9); -static int NsfAsmProcCmd(Tcl_Interp *interp, int withAd, int withCheckalways, Tcl_Obj *procName, Tcl_Obj *arguments, Tcl_Obj *body) +static int NsfAsmProcCmd(Tcl_Interp *interp, int withAd, int withCheckalways, Tcl_Obj *procNameObj, Tcl_Obj *argumentsObj, Tcl_Obj *bodyObj) NSF_nonnull(1) NSF_nonnull(4) NSF_nonnull(5) NSF_nonnull(6); static int NsfCallgrindDumpStatsCmd(Tcl_Interp *interp, const char *withName) NSF_nonnull(1); @@ -586,11 +586,11 @@ NSF_nonnull(1); static int NsfCallgrindZeroStatsCmd(Tcl_Interp *interp) NSF_nonnull(1); -static int NsfCmdInfoCmd(Tcl_Interp *interp, InfomethodsubcmdIdx_t subcmd, NsfObject *withContext, Tcl_Obj *methodName, const char *pattern) +static int NsfCmdInfoCmd(Tcl_Interp *interp, InfomethodsubcmdIdx_t subcmd, NsfObject *withContext, Tcl_Obj *methodNameObj, const char *pattern) NSF_nonnull(1) NSF_nonnull(4); 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 *value) +static int NsfConfigureCmd(Tcl_Interp *interp, ConfigureoptionIdx_t option, Tcl_Obj *valueObj) NSF_nonnull(1); static int NsfCurrentCmd(Tcl_Interp *interp, CurrentoptionIdx_t option) NSF_nonnull(1); @@ -604,71 +604,71 @@ 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 *command, int nobjc, Tcl_Obj *CONST* nobjv) +static int NsfDirectDispatchCmd(Tcl_Interp *interp, NsfObject *object, FrameIdx_t withFrame, Tcl_Obj *commandObj, int nobjc, Tcl_Obj *CONST* nobjv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfDispatchCmd(Tcl_Interp *interp, NsfObject *object, int withIntrinsic, int withSystem, Tcl_Obj *command, int nobjc, Tcl_Obj *CONST* nobjv) +static int NsfDispatchCmd(Tcl_Interp *interp, NsfObject *object, int withIntrinsic, int withSystem, Tcl_Obj *commandObj, int nobjc, Tcl_Obj *CONST* nobjv) 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 *methodName, ForwardpropertyIdx_t forwardProperty, Tcl_Obj *value) +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) NSF_nonnull(1) NSF_nonnull(2); -static int NsfIsCmd(Tcl_Interp *interp, int withComplain, int withConfigure, const char *withName, Tcl_Obj *constraint, Tcl_Obj *value) +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); -static int NsfMethodAliasCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, const char *methodName, FrameIdx_t withFrame, ProtectionIdx_t withProtection, Tcl_Obj *cmdName) +static int NsfMethodAliasCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, const char *methodName, FrameIdx_t withFrame, ProtectionIdx_t withProtection, Tcl_Obj *cmdNameObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4) NSF_nonnull(7); -static int NsfMethodAssertionCmd(Tcl_Interp *interp, NsfObject *object, AssertionsubcmdIdx_t subcmd, Tcl_Obj *arg) +static int NsfMethodAssertionCmd(Tcl_Interp *interp, NsfObject *object, AssertionsubcmdIdx_t subcmd, Tcl_Obj *argObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfMethodCreateCmd(Tcl_Interp *interp, NsfObject *object, int withCheckalways, int withInner_namespace, int withPer_object, NsfObject *withReg_object, Tcl_Obj *methodName, Tcl_Obj *arguments, Tcl_Obj *body, Tcl_Obj *withPrecondition, Tcl_Obj *withPostcondition) +static int NsfMethodCreateCmd(Tcl_Interp *interp, NsfObject *object, int withCheckalways, int withInner_namespace, int withPer_object, NsfObject *withReg_object, Tcl_Obj *methodNameObj, Tcl_Obj *argumentsObj, Tcl_Obj *bodyObj, Tcl_Obj *preconditionObj, Tcl_Obj *postconditionObj) 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 *methodName) +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 *method, Tcl_Obj *withDefault, int withEarlybinding, Tcl_Obj *withOnerror, Tcl_Obj *withPrefix, FrameIdx_t withFrame, int withVerbose, Tcl_Obj *target, int nobjc, Tcl_Obj *CONST* nobjv) +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 nobjc, Tcl_Obj *CONST* nobjv) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMethodPropertyCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *methodName, MethodpropertyIdx_t methodProperty, Tcl_Obj *value) +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 *handle) +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 *parameter) +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 *methodName, int nobjc, Tcl_Obj *CONST* nobjv) +static int NsfMyCmd(Tcl_Interp *interp, int withIntrinsic, int withLocal, int withSystem, Tcl_Obj *methodNameObj, int nobjc, Tcl_Obj *CONST* nobjv) NSF_nonnull(1) NSF_nonnull(5); -static int NsfNSCopyVarsCmd(Tcl_Interp *interp, Tcl_Obj *fromNs, Tcl_Obj *toNs) +static int NsfNSCopyVarsCmd(Tcl_Interp *interp, Tcl_Obj *fromNsObj, Tcl_Obj *toNsObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfNextCmd(Tcl_Interp *interp, Tcl_Obj *arguments) +static int NsfNextCmd(Tcl_Interp *interp, Tcl_Obj *argumentsObj) NSF_nonnull(1); -static int NsfObjectAllocCmd(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *name, Tcl_Obj *initcmd) +static int NsfObjectAllocCmd(Tcl_Interp *interp, NsfClass *class, Tcl_Obj *nameObj, Tcl_Obj *initcmdObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfObjectExistsCmd(Tcl_Interp *interp, Tcl_Obj *value) +static int NsfObjectExistsCmd(Tcl_Interp *interp, Tcl_Obj *valueObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjectPropertyCmd(Tcl_Interp *interp, NsfObject *objectName, ObjectpropertyIdx_t objectProperty, Tcl_Obj *value) +static int NsfObjectPropertyCmd(Tcl_Interp *interp, NsfObject *objectName, ObjectpropertyIdx_t objectProperty, Tcl_Obj *valueObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjectQualifyCmd(Tcl_Interp *interp, Tcl_Obj *objectName) +static int NsfObjectQualifyCmd(Tcl_Interp *interp, Tcl_Obj *objectNameObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjectSystemCreateCmd(Tcl_Interp *interp, Tcl_Obj *rootClass, Tcl_Obj *rootMetaClass, Tcl_Obj *systemMethods) +static int NsfObjectSystemCreateCmd(Tcl_Interp *interp, Tcl_Obj *rootClassObj, Tcl_Obj *rootMetaClassObj, Tcl_Obj *systemMethodsObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); static int NsfParameterCacheClassInvalidateCmd(Tcl_Interp *interp, NsfClass *class) NSF_nonnull(1) NSF_nonnull(2); static int NsfParameterCacheObjectInvalidateCmd(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfParameterInfoCmd(Tcl_Interp *interp, ParametersubcmdIdx_t subcmd, Tcl_Obj *spec, Tcl_Obj *varname) +static int NsfParameterInfoCmd(Tcl_Interp *interp, ParametersubcmdIdx_t subcmd, Tcl_Obj *specObj, Tcl_Obj *varnameObj) NSF_nonnull(1) NSF_nonnull(3); -static int NsfParameterSpecsCmd(Tcl_Interp *interp, int withConfigure, int withNonposargs, Tcl_Obj *slotobjs) +static int NsfParameterSpecsCmd(Tcl_Interp *interp, int withConfigure, int withNonposargs, Tcl_Obj *slotobjsObj) NSF_nonnull(1) NSF_nonnull(4); -static int NsfParseArgsCmd(Tcl_Interp *interp, Tcl_Obj *argspec, Tcl_Obj *arglist) +static int NsfParseArgsCmd(Tcl_Interp *interp, Tcl_Obj *argspecObj, Tcl_Obj *arglistObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfProcCmd(Tcl_Interp *interp, int withAd, int withCheckalways, int withDebug, int withDeprecated, Tcl_Obj *procName, Tcl_Obj *arguments, Tcl_Obj *body) +static int NsfProcCmd(Tcl_Interp *interp, int withAd, int withCheckalways, int withDebug, int withDeprecated, Tcl_Obj *procNameObj, Tcl_Obj *argumentsObj, Tcl_Obj *bodyObj) NSF_nonnull(1) NSF_nonnull(6) NSF_nonnull(7) NSF_nonnull(8); static int NsfProfileClearDataStub(Tcl_Interp *interp) NSF_nonnull(1); static int NsfProfileGetDataStub(Tcl_Interp *interp) NSF_nonnull(1); -static int NsfProfileTraceStub(Tcl_Interp *interp, int withEnable, int withVerbose, int withDontsave, Tcl_Obj *withBuiltins) +static int NsfProfileTraceStub(Tcl_Interp *interp, int withEnable, int withVerbose, int withDontsave, Tcl_Obj *builtinsObj) NSF_nonnull(1); static int NsfRelationGetCmd(Tcl_Interp *interp, NsfObject *object, RelationtypeIdx_t type) NSF_nonnull(1) NSF_nonnull(2); -static int NsfRelationSetCmd(Tcl_Interp *interp, NsfObject *object, RelationtypeIdx_t type, Tcl_Obj *value) +static int NsfRelationSetCmd(Tcl_Interp *interp, NsfObject *object, RelationtypeIdx_t type, Tcl_Obj *valueObj) NSF_nonnull(1) NSF_nonnull(2); static int NsfSelfCmd(Tcl_Interp *interp) NSF_nonnull(1); @@ -678,93 +678,93 @@ NSF_nonnull(1); static int NsfVarExistsCmd(Tcl_Interp *interp, int withArray, NsfObject *object, const char *varName) NSF_nonnull(1) NSF_nonnull(3) NSF_nonnull(4); -static int NsfVarGetCmd(Tcl_Interp *interp, int withArray, int withNotrace, NsfObject *object, Tcl_Obj *varName) +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 nobjc, Tcl_Obj *CONST* nobjv) NSF_nonnull(1) NSF_nonnull(2); -static int NsfVarSetCmd(Tcl_Interp *interp, int withArray, int withNotrace, NsfObject *object, Tcl_Obj *varName, Tcl_Obj *value) +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); -static int NsfVarUnsetCmd(Tcl_Interp *interp, int withNocomplain, NsfObject *object, Tcl_Obj *varName) +static int NsfVarUnsetCmd(Tcl_Interp *interp, int withNocomplain, NsfObject *object, Tcl_Obj *varNameObj) NSF_nonnull(1) NSF_nonnull(3) NSF_nonnull(4); -static int NsfOAutonameMethod(Tcl_Interp *interp, NsfObject *obj, int withInstance, int withReset, Tcl_Obj *name) +static int NsfOAutonameMethod(Tcl_Interp *interp, NsfObject *object, int withInstance, int withReset, Tcl_Obj *nameObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(5); -static int NsfOCgetMethod(Tcl_Interp *interp, NsfObject *obj, Tcl_Obj *name) +static int NsfOCgetMethod(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *nameObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfOClassMethod(Tcl_Interp *interp, NsfObject *obj, Tcl_Obj *class) +static int NsfOClassMethod(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *classObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfOCleanupMethod(Tcl_Interp *interp, NsfObject *obj) +static int NsfOCleanupMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfOConfigureMethod(Tcl_Interp *interp, NsfObject *obj, int nobjc, Tcl_Obj *CONST* nobjv, Tcl_Obj *objv0) +static int NsfOConfigureMethod(Tcl_Interp *interp, NsfObject *object, int nobjc, Tcl_Obj *CONST* nobjv, Tcl_Obj *objv0) NSF_nonnull(1) NSF_nonnull(2); -static int NsfODestroyMethod(Tcl_Interp *interp, NsfObject *obj) +static int NsfODestroyMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfOExistsMethod(Tcl_Interp *interp, NsfObject *obj, const char *varName) +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 *obj, const char *filter, Tcl_Obj *guard) +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 *obj, 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 *obj, Tcl_Obj *mixin, Tcl_Obj *guard) +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 *obj) +static int NsfONoinitMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfORequireNamespaceMethod(Tcl_Interp *interp, NsfObject *obj) +static int NsfORequireNamespaceMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfOResidualargsMethod(Tcl_Interp *interp, NsfObject *obj, 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 *obj, 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 *obj, 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 *obj) +static int NsfOVolatileMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoBaseclassMethod(Tcl_Interp *interp, NsfObject *obj) +static int NsfObjInfoBaseclassMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoChildrenMethod(Tcl_Interp *interp, NsfObject *obj, NsfClass *withType, const char *pattern) +static int NsfObjInfoChildrenMethod(Tcl_Interp *interp, NsfObject *object, NsfClass *withType, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoClassMethod(Tcl_Interp *interp, NsfObject *obj) +static int NsfObjInfoClassMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoFilterguardMethod(Tcl_Interp *interp, NsfObject *obj, const char *filter) +static int NsfObjInfoFilterguardMethod(Tcl_Interp *interp, NsfObject *object, const char *filter) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfObjInfoFiltersMethod(Tcl_Interp *interp, NsfObject *obj, int withGuards, const char *pattern) +static int NsfObjInfoFiltersMethod(Tcl_Interp *interp, NsfObject *object, int withGuards, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoForwardMethod(Tcl_Interp *interp, NsfObject *obj, int withDefinition, const char *name) +static int NsfObjInfoForwardMethod(Tcl_Interp *interp, NsfObject *object, int withDefinition, const char *name) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoHasMixinMethod(Tcl_Interp *interp, NsfObject *obj, NsfClass *class) +static int NsfObjInfoHasMixinMethod(Tcl_Interp *interp, NsfObject *object, NsfClass *class) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfObjInfoHasTypeMethod(Tcl_Interp *interp, NsfObject *obj, NsfClass *class) +static int NsfObjInfoHasTypeMethod(Tcl_Interp *interp, NsfObject *object, NsfClass *class) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfObjInfoHasnamespaceMethod(Tcl_Interp *interp, NsfObject *obj) +static int NsfObjInfoHasnamespaceMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoLookupFilterMethod(Tcl_Interp *interp, NsfObject *obj, const char *filter) +static int NsfObjInfoLookupFilterMethod(Tcl_Interp *interp, NsfObject *object, const char *filter) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfObjInfoLookupFiltersMethod(Tcl_Interp *interp, NsfObject *obj, int withGuards, const char *pattern) +static int NsfObjInfoLookupFiltersMethod(Tcl_Interp *interp, NsfObject *object, int withGuards, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoLookupMethodMethod(Tcl_Interp *interp, NsfObject *obj, Tcl_Obj *name) +static int NsfObjInfoLookupMethodMethod(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *nameObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfObjInfoLookupMethodsMethod(Tcl_Interp *interp, NsfObject *obj, CallprotectionIdx_t withCallprotection, int withIncontext, MethodtypeIdx_t withType, int withNomixins, int withPath, DefinitionsourceIdx_t withSource, const char *pattern) +static int NsfObjInfoLookupMethodsMethod(Tcl_Interp *interp, NsfObject *object, CallprotectionIdx_t withCallprotection, int withIncontext, MethodtypeIdx_t withType, int withNomixins, int withPath, DefinitionsourceIdx_t withSource, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoLookupMixinsMethod(Tcl_Interp *interp, NsfObject *obj, int withGuards, const char *patternString, NsfObject *patternObject) +static int NsfObjInfoLookupMixinsMethod(Tcl_Interp *interp, NsfObject *object, int withGuards, const char *patternString, NsfObject *patternObject) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoLookupSlotsMethod(Tcl_Interp *interp, NsfObject *obj, DefinitionsourceIdx_t withSource, NsfClass *withType, const char *pattern) +static int NsfObjInfoLookupSlotsMethod(Tcl_Interp *interp, NsfObject *object, DefinitionsourceIdx_t withSource, NsfClass *withType, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoMethodMethod(Tcl_Interp *interp, NsfObject *obj, InfomethodsubcmdIdx_t subcmd, Tcl_Obj *name) +static int NsfObjInfoMethodMethod(Tcl_Interp *interp, NsfObject *object, InfomethodsubcmdIdx_t subcmd, Tcl_Obj *nameObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfObjInfoMethodsMethod(Tcl_Interp *interp, NsfObject *obj, CallprotectionIdx_t withCallprotection, MethodtypeIdx_t withType, int withPath, const char *pattern) +static int NsfObjInfoMethodsMethod(Tcl_Interp *interp, NsfObject *object, CallprotectionIdx_t withCallprotection, MethodtypeIdx_t withType, int withPath, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoMixinguardMethod(Tcl_Interp *interp, NsfObject *obj, const char *mixin) +static int NsfObjInfoMixinguardMethod(Tcl_Interp *interp, NsfObject *object, const char *mixin) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfObjInfoMixinsMethod(Tcl_Interp *interp, NsfObject *obj, int withGuards, const char *patternString, NsfObject *patternObject) +static int NsfObjInfoMixinsMethod(Tcl_Interp *interp, NsfObject *object, int withGuards, const char *patternString, NsfObject *patternObject) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoNameMethod(Tcl_Interp *interp, NsfObject *obj) +static int NsfObjInfoNameMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoParentMethod(Tcl_Interp *interp, NsfObject *obj) +static int NsfObjInfoParentMethod(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoPrecedenceMethod(Tcl_Interp *interp, NsfObject *obj, int withIntrinsic, const char *pattern) +static int NsfObjInfoPrecedenceMethod(Tcl_Interp *interp, NsfObject *object, int withIntrinsic, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoSlotobjectsMethod(Tcl_Interp *interp, NsfObject *obj, NsfClass *withType, const char *pattern) +static int NsfObjInfoSlotobjectsMethod(Tcl_Interp *interp, NsfObject *object, NsfClass *withType, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); -static int NsfObjInfoVarsMethod(Tcl_Interp *interp, NsfObject *obj, const char *pattern) +static int NsfObjInfoVarsMethod(Tcl_Interp *interp, NsfObject *object, const char *pattern) NSF_nonnull(1) NSF_nonnull(2); enum { @@ -892,13 +892,16 @@ static int NsfCAllocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + if (objc != 2) { @@ -907,28 +910,31 @@ NULL, objv[0]); } - return NsfCAllocMethod(interp, cl, objv[1]); + return NsfCAllocMethod(interp, class, objv[1]); } static int NsfCCreateMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfCCreateMethodIdx].paramDefs, method_definitions[NsfCCreateMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { - Tcl_Obj *objectName = (Tcl_Obj *)pc.clientData[0]; + Tcl_Obj *objectNameObj = (Tcl_Obj *)pc.clientData[0]; assert(pc.status == 0); - return NsfCCreateMethod(interp, cl, objectName, objc-pc.lastObjc, objv+pc.lastObjc); + return NsfCCreateMethod(interp, class, objectNameObj, objc-pc.lastObjc, objv+pc.lastObjc); } else { @@ -938,13 +944,16 @@ static int NsfCDeallocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + if (objc != 2) { @@ -953,29 +962,32 @@ NULL, objv[0]); } - return NsfCDeallocMethod(interp, cl, objv[1]); + return NsfCDeallocMethod(interp, class, objv[1]); } static int NsfCFilterGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfCFilterGuardMethodIdx].paramDefs, method_definitions[NsfCFilterGuardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { const char *filter = (const char *)pc.clientData[0]; - Tcl_Obj *guard = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *guardObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfCFilterGuardMethod(interp, cl, filter, guard); + return NsfCFilterGuardMethod(interp, class, filter, guardObj); } else { @@ -985,13 +997,16 @@ static int NsfCGetCachendParametersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + if (unlikely(objc != 1)) { @@ -1000,29 +1015,32 @@ NULL, objv[0]); } - return NsfCGetCachendParametersMethod(interp, cl); + return NsfCGetCachendParametersMethod(interp, class); } static int NsfCMixinGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfCMixinGuardMethodIdx].paramDefs, method_definitions[NsfCMixinGuardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { - Tcl_Obj *mixin = (Tcl_Obj *)pc.clientData[0]; - Tcl_Obj *guard = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *mixinObj = (Tcl_Obj *)pc.clientData[0]; + Tcl_Obj *guardObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfCMixinGuardMethod(interp, cl, mixin, guard); + return NsfCMixinGuardMethod(interp, class, mixinObj, guardObj); } else { @@ -1033,21 +1051,24 @@ static int NsfCNewMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfCNewMethodIdx].paramDefs, method_definitions[NsfCNewMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { - Tcl_Obj *withChildof = (Tcl_Obj *)pc.clientData[0]; + Tcl_Obj *childofObj = (Tcl_Obj *)pc.clientData[0]; assert(pc.status == 0); - return NsfCNewMethod(interp, cl, withChildof, objc-pc.lastObjc, objv+pc.lastObjc); + return NsfCNewMethod(interp, class, childofObj, objc-pc.lastObjc, objv+pc.lastObjc); } else { @@ -1058,21 +1079,24 @@ static int NsfCRecreateMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfCRecreateMethodIdx].paramDefs, method_definitions[NsfCRecreateMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { - Tcl_Obj *objectName = (Tcl_Obj *)pc.clientData[0]; + Tcl_Obj *objectNameObj = (Tcl_Obj *)pc.clientData[0]; assert(pc.status == 0); - return NsfCRecreateMethod(interp, cl, objectName, objc-pc.lastObjc, objv+pc.lastObjc); + return NsfCRecreateMethod(interp, class, objectNameObj, objc-pc.lastObjc, objv+pc.lastObjc); } else { @@ -1082,13 +1106,16 @@ static int NsfCSuperclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + if (objc < 1 || objc > 2) { @@ -1097,28 +1124,31 @@ NULL, objv[0]); } - return NsfCSuperclassMethod(interp, cl, objc == 2 ? objv[1] : NULL); + return NsfCSuperclassMethod(interp, class, objc == 2 ? objv[1] : NULL); } static int NsfClassInfoFilterguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoFilterguardMethodIdx].paramDefs, method_definitions[NsfClassInfoFilterguardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { const char *filter = (const char *)pc.clientData[0]; assert(pc.status == 0); - return NsfClassInfoFilterguardMethod(interp, cl, filter); + return NsfClassInfoFilterguardMethod(interp, class, filter); } else { @@ -1129,22 +1159,25 @@ static int NsfClassInfoFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoFiltersMethodIdx].paramDefs, method_definitions[NsfClassInfoFiltersMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { int withGuards = (int )PTR2INT(pc.clientData[0]); const char *pattern = (const char *)pc.clientData[1]; assert(pc.status == 0); - return NsfClassInfoFiltersMethod(interp, cl, withGuards, pattern); + return NsfClassInfoFiltersMethod(interp, class, withGuards, pattern); } else { @@ -1155,22 +1188,25 @@ static int NsfClassInfoForwardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoForwardMethodIdx].paramDefs, method_definitions[NsfClassInfoForwardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { int withDefinition = (int )PTR2INT(pc.clientData[0]); const char *name = (const char *)pc.clientData[1]; assert(pc.status == 0); - return NsfClassInfoForwardMethod(interp, cl, withDefinition, name); + return NsfClassInfoForwardMethod(interp, class, withDefinition, name); } else { @@ -1181,21 +1217,24 @@ static int NsfClassInfoHeritageMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoHeritageMethodIdx].paramDefs, method_definitions[NsfClassInfoHeritageMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { const char *pattern = (const char *)pc.clientData[0]; assert(pc.status == 0); - return NsfClassInfoHeritageMethod(interp, cl, pattern); + return NsfClassInfoHeritageMethod(interp, class, pattern); } else { @@ -1206,14 +1245,17 @@ static int NsfClassInfoInstancesMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoInstancesMethodIdx].paramDefs, method_definitions[NsfClassInfoInstancesMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { @@ -1231,7 +1273,7 @@ } assert(pc.status == 0); - returnCode = NsfClassInfoInstancesMethod(interp, cl, withClosure, patternString, patternObject); + returnCode = NsfClassInfoInstancesMethod(interp, class, withClosure, patternString, patternObject); if (pattern) { DECR_REF_COUNT2("patternObj", pattern); @@ -1251,22 +1293,25 @@ static int NsfClassInfoMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoMethodMethodIdx].paramDefs, method_definitions[NsfClassInfoMethodMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { InfomethodsubcmdIdx_t subcmd = (InfomethodsubcmdIdx_t )pc.clientData[0]; - Tcl_Obj *name = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *nameObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfClassInfoMethodMethod(interp, cl, subcmd, name); + return NsfClassInfoMethodMethod(interp, class, subcmd, nameObj); } else { @@ -1277,14 +1322,17 @@ static int NsfClassInfoMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoMethodsMethodIdx].paramDefs, method_definitions[NsfClassInfoMethodsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { @@ -1296,7 +1344,7 @@ const char *pattern = (const char *)pc.clientData[5]; assert(pc.status == 0); - return NsfClassInfoMethodsMethod(interp, cl, withCallprotection, withClosure, withType, withPath, withSource, pattern); + return NsfClassInfoMethodsMethod(interp, class, withCallprotection, withClosure, withType, withPath, withSource, pattern); } else { @@ -1307,14 +1355,17 @@ static int NsfClassInfoMixinOfMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoMixinOfMethodIdx].paramDefs, method_definitions[NsfClassInfoMixinOfMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { @@ -1333,7 +1384,7 @@ } assert(pc.status == 0); - returnCode = NsfClassInfoMixinOfMethod(interp, cl, withClosure, withScope, patternString, patternObject); + returnCode = NsfClassInfoMixinOfMethod(interp, class, withClosure, withScope, patternString, patternObject); if (pattern) { DECR_REF_COUNT2("patternObj", pattern); @@ -1353,21 +1404,24 @@ static int NsfClassInfoMixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoMixinguardMethodIdx].paramDefs, method_definitions[NsfClassInfoMixinguardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { const char *mixin = (const char *)pc.clientData[0]; assert(pc.status == 0); - return NsfClassInfoMixinguardMethod(interp, cl, mixin); + return NsfClassInfoMixinguardMethod(interp, class, mixin); } else { @@ -1378,14 +1432,17 @@ static int NsfClassInfoMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoMixinsMethodIdx].paramDefs, method_definitions[NsfClassInfoMixinsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { @@ -1405,7 +1462,7 @@ } assert(pc.status == 0); - returnCode = NsfClassInfoMixinsMethod(interp, cl, withClosure, withGuards, withHeritage, patternString, patternObject); + returnCode = NsfClassInfoMixinsMethod(interp, class, withClosure, withGuards, withHeritage, patternString, patternObject); if (pattern) { DECR_REF_COUNT2("patternObj", pattern); @@ -1425,14 +1482,17 @@ static int NsfClassInfoSlotobjectsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoSlotobjectsMethodIdx].paramDefs, method_definitions[NsfClassInfoSlotobjectsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { @@ -1442,7 +1502,7 @@ const char *pattern = (const char *)pc.clientData[3]; assert(pc.status == 0); - return NsfClassInfoSlotobjectsMethod(interp, cl, withClosure, withSource, withType, pattern); + return NsfClassInfoSlotobjectsMethod(interp, class, withClosure, withSource, withType, pattern); } else { @@ -1453,14 +1513,17 @@ static int NsfClassInfoSubclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoSubclassMethodIdx].paramDefs, method_definitions[NsfClassInfoSubclassMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { @@ -1479,7 +1542,7 @@ } assert(pc.status == 0); - returnCode = NsfClassInfoSubclassMethod(interp, cl, withClosure, withDependent, patternString, patternObject); + returnCode = NsfClassInfoSubclassMethod(interp, class, withClosure, withDependent, patternString, patternObject); if (pattern) { DECR_REF_COUNT2("patternObj", pattern); @@ -1499,22 +1562,25 @@ static int NsfClassInfoSuperclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfClass *cl; + NsfClass *class; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - cl = NsfObjectToClass(clientData); - if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); - if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], + class = NsfObjectToClass(clientData); + if (unlikely(class == NULL)) { + return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0])); + } + + if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) class, objv[0], method_definitions[NsfClassInfoSuperclassMethodIdx].paramDefs, method_definitions[NsfClassInfoSuperclassMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { int withClosure = (int )PTR2INT(pc.clientData[0]); - Tcl_Obj *pattern = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *patternObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfClassInfoSuperclassMethod(interp, cl, withClosure, pattern); + return NsfClassInfoSuperclassMethod(interp, class, withClosure, patternObj); } else { @@ -1536,12 +1602,12 @@ int withInner_namespace = (int )PTR2INT(pc.clientData[2]); int withPer_object = (int )PTR2INT(pc.clientData[3]); NsfObject *withReg_object = (NsfObject *)pc.clientData[4]; - Tcl_Obj *methodName = (Tcl_Obj *)pc.clientData[5]; - Tcl_Obj *arguments = (Tcl_Obj *)pc.clientData[6]; - Tcl_Obj *body = (Tcl_Obj *)pc.clientData[7]; + Tcl_Obj *methodNameObj = (Tcl_Obj *)pc.clientData[5]; + Tcl_Obj *argumentsObj = (Tcl_Obj *)pc.clientData[6]; + Tcl_Obj *bodyObj = (Tcl_Obj *)pc.clientData[7]; assert(pc.status == 0); - return NsfAsmMethodCreateCmd(interp, object, withCheckalways, withInner_namespace, withPer_object, withReg_object, methodName, arguments, body); + return NsfAsmMethodCreateCmd(interp, object, withCheckalways, withInner_namespace, withPer_object, withReg_object, methodNameObj, argumentsObj, bodyObj); } else { @@ -1560,12 +1626,12 @@ &pc) == TCL_OK)) { int withAd = (int )PTR2INT(pc.clientData[0]); int withCheckalways = (int )PTR2INT(pc.clientData[1]); - Tcl_Obj *procName = (Tcl_Obj *)pc.clientData[2]; - Tcl_Obj *arguments = (Tcl_Obj *)pc.clientData[3]; - Tcl_Obj *body = (Tcl_Obj *)pc.clientData[4]; + Tcl_Obj *procNameObj = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *argumentsObj = (Tcl_Obj *)pc.clientData[3]; + Tcl_Obj *bodyObj = (Tcl_Obj *)pc.clientData[4]; assert(pc.status == 0); - return NsfAsmProcCmd(interp, withAd, withCheckalways, procName, arguments, body); + return NsfAsmProcCmd(interp, withAd, withCheckalways, procNameObj, argumentsObj, bodyObj); } else { @@ -1668,11 +1734,11 @@ &pc) == TCL_OK)) { InfomethodsubcmdIdx_t subcmd = (InfomethodsubcmdIdx_t )pc.clientData[0]; NsfObject *withContext = (NsfObject *)pc.clientData[1]; - Tcl_Obj *methodName = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *methodNameObj = (Tcl_Obj *)pc.clientData[2]; const char *pattern = (const char *)pc.clientData[3]; assert(pc.status == 0); - return NsfCmdInfoCmd(interp, subcmd, withContext, methodName, pattern); + return NsfCmdInfoCmd(interp, subcmd, withContext, methodNameObj, pattern); } else { @@ -1700,10 +1766,10 @@ method_definitions[NsfConfigureCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { ConfigureoptionIdx_t option = (ConfigureoptionIdx_t )pc.clientData[0]; - Tcl_Obj *value = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *valueObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfConfigureCmd(interp, option, value); + return NsfConfigureCmd(interp, option, valueObj); } else { @@ -1822,10 +1888,10 @@ &pc) == TCL_OK)) { NsfObject *object = (NsfObject *)pc.clientData[0]; FrameIdx_t withFrame = (FrameIdx_t )pc.clientData[1]; - Tcl_Obj *command = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *commandObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfDirectDispatchCmd(interp, object, withFrame, command, objc-pc.lastObjc, objv+pc.lastObjc); + return NsfDirectDispatchCmd(interp, object, withFrame, commandObj, objc-pc.lastObjc, objv+pc.lastObjc); } else { @@ -1845,10 +1911,10 @@ NsfObject *object = (NsfObject *)pc.clientData[0]; int withIntrinsic = (int )PTR2INT(pc.clientData[1]); int withSystem = (int )PTR2INT(pc.clientData[2]); - Tcl_Obj *command = (Tcl_Obj *)pc.clientData[3]; + Tcl_Obj *commandObj = (Tcl_Obj *)pc.clientData[3]; assert(pc.status == 0); - return NsfDispatchCmd(interp, object, withIntrinsic, withSystem, command, objc-pc.lastObjc, objv+pc.lastObjc); + return NsfDispatchCmd(interp, object, withIntrinsic, withSystem, commandObj, objc-pc.lastObjc, objv+pc.lastObjc); } else { @@ -1887,12 +1953,12 @@ &pc) == TCL_OK)) { NsfObject *object = (NsfObject *)pc.clientData[0]; int withPer_object = (int )PTR2INT(pc.clientData[1]); - Tcl_Obj *methodName = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *methodNameObj = (Tcl_Obj *)pc.clientData[2]; ForwardpropertyIdx_t forwardProperty = (ForwardpropertyIdx_t )pc.clientData[3]; - Tcl_Obj *value = (Tcl_Obj *)pc.clientData[4]; + Tcl_Obj *valueObj = (Tcl_Obj *)pc.clientData[4]; assert(pc.status == 0); - return NsfForwardPropertyCmd(interp, object, withPer_object, methodName, forwardProperty, value); + return NsfForwardPropertyCmd(interp, object, withPer_object, methodNameObj, forwardProperty, valueObj); } else { @@ -1932,11 +1998,11 @@ int withComplain = (int )PTR2INT(pc.clientData[0]); int withConfigure = (int )PTR2INT(pc.clientData[1]); const char *withName = (const char *)pc.clientData[2]; - Tcl_Obj *constraint = (Tcl_Obj *)pc.clientData[3]; - Tcl_Obj *value = (Tcl_Obj *)pc.clientData[4]; + Tcl_Obj *constraintObj = (Tcl_Obj *)pc.clientData[3]; + Tcl_Obj *valueObj = (Tcl_Obj *)pc.clientData[4]; assert(pc.status == 0); - return NsfIsCmd(interp, withComplain, withConfigure, withName, constraint, value); + return NsfIsCmd(interp, withComplain, withConfigure, withName, constraintObj, valueObj); } else { @@ -1958,10 +2024,10 @@ const char *methodName = (const char *)pc.clientData[2]; FrameIdx_t withFrame = (FrameIdx_t )pc.clientData[3]; ProtectionIdx_t withProtection = (ProtectionIdx_t )pc.clientData[4]; - Tcl_Obj *cmdName = (Tcl_Obj *)pc.clientData[5]; + Tcl_Obj *cmdNameObj = (Tcl_Obj *)pc.clientData[5]; assert(pc.status == 0); - return NsfMethodAliasCmd(interp, object, withPer_object, methodName, withFrame, withProtection, cmdName); + return NsfMethodAliasCmd(interp, object, withPer_object, methodName, withFrame, withProtection, cmdNameObj); } else { @@ -1980,10 +2046,10 @@ &pc) == TCL_OK)) { NsfObject *object = (NsfObject *)pc.clientData[0]; AssertionsubcmdIdx_t subcmd = (AssertionsubcmdIdx_t )pc.clientData[1]; - Tcl_Obj *arg = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *argObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfMethodAssertionCmd(interp, object, subcmd, arg); + return NsfMethodAssertionCmd(interp, object, subcmd, argObj); } else { @@ -2005,14 +2071,14 @@ int withInner_namespace = (int )PTR2INT(pc.clientData[2]); int withPer_object = (int )PTR2INT(pc.clientData[3]); NsfObject *withReg_object = (NsfObject *)pc.clientData[4]; - Tcl_Obj *methodName = (Tcl_Obj *)pc.clientData[5]; - Tcl_Obj *arguments = (Tcl_Obj *)pc.clientData[6]; - Tcl_Obj *body = (Tcl_Obj *)pc.clientData[7]; - Tcl_Obj *withPrecondition = (Tcl_Obj *)pc.clientData[8]; - Tcl_Obj *withPostcondition = (Tcl_Obj *)pc.clientData[9]; + Tcl_Obj *methodNameObj = (Tcl_Obj *)pc.clientData[5]; + Tcl_Obj *argumentsObj = (Tcl_Obj *)pc.clientData[6]; + Tcl_Obj *bodyObj = (Tcl_Obj *)pc.clientData[7]; + Tcl_Obj *preconditionObj = (Tcl_Obj *)pc.clientData[8]; + Tcl_Obj *postconditionObj = (Tcl_Obj *)pc.clientData[9]; assert(pc.status == 0); - return NsfMethodCreateCmd(interp, object, withCheckalways, withInner_namespace, withPer_object, withReg_object, methodName, arguments, body, withPrecondition, withPostcondition); + return NsfMethodCreateCmd(interp, object, withCheckalways, withInner_namespace, withPer_object, withReg_object, methodNameObj, argumentsObj, bodyObj, preconditionObj, postconditionObj); } else { @@ -2031,10 +2097,10 @@ &pc) == TCL_OK)) { NsfObject *object = (NsfObject *)pc.clientData[0]; int withPer_object = (int )PTR2INT(pc.clientData[1]); - Tcl_Obj *methodName = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *methodNameObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfMethodDeleteCmd(interp, object, withPer_object, methodName); + return NsfMethodDeleteCmd(interp, object, withPer_object, methodNameObj); } else { @@ -2053,17 +2119,17 @@ &pc) == TCL_OK)) { NsfObject *object = (NsfObject *)pc.clientData[0]; int withPer_object = (int )PTR2INT(pc.clientData[1]); - Tcl_Obj *method = (Tcl_Obj *)pc.clientData[2]; - Tcl_Obj *withDefault = (Tcl_Obj *)pc.clientData[3]; + Tcl_Obj *methodObj = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *defaultObj = (Tcl_Obj *)pc.clientData[3]; int withEarlybinding = (int )PTR2INT(pc.clientData[4]); - Tcl_Obj *withOnerror = (Tcl_Obj *)pc.clientData[5]; - Tcl_Obj *withPrefix = (Tcl_Obj *)pc.clientData[6]; + Tcl_Obj *onerrorObj = (Tcl_Obj *)pc.clientData[5]; + Tcl_Obj *prefixObj = (Tcl_Obj *)pc.clientData[6]; FrameIdx_t withFrame = (FrameIdx_t )pc.clientData[7]; int withVerbose = (int )PTR2INT(pc.clientData[8]); - Tcl_Obj *target = (Tcl_Obj *)pc.clientData[9]; + Tcl_Obj *targetObj = (Tcl_Obj *)pc.clientData[9]; assert(pc.status == 0); - return NsfMethodForwardCmd(interp, object, withPer_object, method, withDefault, withEarlybinding, withOnerror, withPrefix, withFrame, withVerbose, target, objc-pc.lastObjc, objv+pc.lastObjc); + return NsfMethodForwardCmd(interp, object, withPer_object, methodObj, defaultObj, withEarlybinding, onerrorObj, prefixObj, withFrame, withVerbose, targetObj, objc-pc.lastObjc, objv+pc.lastObjc); } else { @@ -2082,12 +2148,12 @@ &pc) == TCL_OK)) { NsfObject *object = (NsfObject *)pc.clientData[0]; int withPer_object = (int )PTR2INT(pc.clientData[1]); - Tcl_Obj *methodName = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *methodNameObj = (Tcl_Obj *)pc.clientData[2]; MethodpropertyIdx_t methodProperty = (MethodpropertyIdx_t )pc.clientData[3]; - Tcl_Obj *value = (Tcl_Obj *)pc.clientData[4]; + Tcl_Obj *valueObj = (Tcl_Obj *)pc.clientData[4]; assert(pc.status == 0); - return NsfMethodPropertyCmd(interp, object, withPer_object, methodName, methodProperty, value); + return NsfMethodPropertyCmd(interp, object, withPer_object, methodNameObj, methodProperty, valueObj); } else { @@ -2122,10 +2188,10 @@ &pc) == TCL_OK)) { NsfObject *object = (NsfObject *)pc.clientData[0]; int withPer_object = (int )PTR2INT(pc.clientData[1]); - Tcl_Obj *parameter = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *parameterObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfMethodSetterCmd(interp, object, withPer_object, parameter); + return NsfMethodSetterCmd(interp, object, withPer_object, parameterObj); } else { @@ -2145,10 +2211,10 @@ int withIntrinsic = (int )PTR2INT(pc.clientData[0]); int withLocal = (int )PTR2INT(pc.clientData[1]); int withSystem = (int )PTR2INT(pc.clientData[2]); - Tcl_Obj *methodName = (Tcl_Obj *)pc.clientData[3]; + Tcl_Obj *methodNameObj = (Tcl_Obj *)pc.clientData[3]; assert(pc.status == 0); - return NsfMyCmd(interp, withIntrinsic, withLocal, withSystem, methodName, objc-pc.lastObjc, objv+pc.lastObjc); + return NsfMyCmd(interp, withIntrinsic, withLocal, withSystem, methodNameObj, objc-pc.lastObjc, objv+pc.lastObjc); } else { @@ -2165,11 +2231,11 @@ method_definitions[NsfNSCopyVarsCmdIdx].paramDefs, method_definitions[NsfNSCopyVarsCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { - Tcl_Obj *fromNs = (Tcl_Obj *)pc.clientData[0]; - Tcl_Obj *toNs = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *fromNsObj = (Tcl_Obj *)pc.clientData[0]; + Tcl_Obj *toNsObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfNSCopyVarsCmd(interp, fromNs, toNs); + return NsfNSCopyVarsCmd(interp, fromNsObj, toNsObj); } else { @@ -2203,11 +2269,11 @@ method_definitions[NsfObjectAllocCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { NsfClass *class = (NsfClass *)pc.clientData[0]; - Tcl_Obj *name = (Tcl_Obj *)pc.clientData[1]; - Tcl_Obj *initcmd = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *nameObj = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *initcmdObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfObjectAllocCmd(interp, class, name, initcmd); + return NsfObjectAllocCmd(interp, class, nameObj, initcmdObj); } else { @@ -2242,10 +2308,10 @@ &pc) == TCL_OK)) { NsfObject *objectName = (NsfObject *)pc.clientData[0]; ObjectpropertyIdx_t objectProperty = (ObjectpropertyIdx_t )pc.clientData[1]; - Tcl_Obj *value = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *valueObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfObjectPropertyCmd(interp, objectName, objectProperty, value); + return NsfObjectPropertyCmd(interp, objectName, objectProperty, valueObj); } else { @@ -2278,12 +2344,12 @@ method_definitions[NsfObjectSystemCreateCmdIdx].paramDefs, method_definitions[NsfObjectSystemCreateCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { - Tcl_Obj *rootClass = (Tcl_Obj *)pc.clientData[0]; - Tcl_Obj *rootMetaClass = (Tcl_Obj *)pc.clientData[1]; - Tcl_Obj *systemMethods = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *rootClassObj = (Tcl_Obj *)pc.clientData[0]; + Tcl_Obj *rootMetaClassObj = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *systemMethodsObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfObjectSystemCreateCmd(interp, rootClass, rootMetaClass, systemMethods); + return NsfObjectSystemCreateCmd(interp, rootClassObj, rootMetaClassObj, systemMethodsObj); } else { @@ -2341,11 +2407,11 @@ method_definitions[NsfParameterInfoCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { ParametersubcmdIdx_t subcmd = (ParametersubcmdIdx_t )pc.clientData[0]; - Tcl_Obj *spec = (Tcl_Obj *)pc.clientData[1]; - Tcl_Obj *varname = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *specObj = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *varnameObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfParameterInfoCmd(interp, subcmd, spec, varname); + return NsfParameterInfoCmd(interp, subcmd, specObj, varnameObj); } else { @@ -2364,10 +2430,10 @@ &pc) == TCL_OK)) { int withConfigure = (int )PTR2INT(pc.clientData[0]); int withNonposargs = (int )PTR2INT(pc.clientData[1]); - Tcl_Obj *slotobjs = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *slotobjsObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfParameterSpecsCmd(interp, withConfigure, withNonposargs, slotobjs); + return NsfParameterSpecsCmd(interp, withConfigure, withNonposargs, slotobjsObj); } else { @@ -2384,11 +2450,11 @@ method_definitions[NsfParseArgsCmdIdx].paramDefs, method_definitions[NsfParseArgsCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { - Tcl_Obj *argspec = (Tcl_Obj *)pc.clientData[0]; - Tcl_Obj *arglist = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *argspecObj = (Tcl_Obj *)pc.clientData[0]; + Tcl_Obj *arglistObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfParseArgsCmd(interp, argspec, arglist); + return NsfParseArgsCmd(interp, argspecObj, arglistObj); } else { @@ -2409,12 +2475,12 @@ int withCheckalways = (int )PTR2INT(pc.clientData[1]); int withDebug = (int )PTR2INT(pc.clientData[2]); int withDeprecated = (int )PTR2INT(pc.clientData[3]); - Tcl_Obj *procName = (Tcl_Obj *)pc.clientData[4]; - Tcl_Obj *arguments = (Tcl_Obj *)pc.clientData[5]; - Tcl_Obj *body = (Tcl_Obj *)pc.clientData[6]; + Tcl_Obj *procNameObj = (Tcl_Obj *)pc.clientData[4]; + Tcl_Obj *argumentsObj = (Tcl_Obj *)pc.clientData[5]; + Tcl_Obj *bodyObj = (Tcl_Obj *)pc.clientData[6]; assert(pc.status == 0); - return NsfProcCmd(interp, withAd, withCheckalways, withDebug, withDeprecated, procName, arguments, body); + return NsfProcCmd(interp, withAd, withCheckalways, withDebug, withDeprecated, procNameObj, argumentsObj, bodyObj); } else { @@ -2466,10 +2532,10 @@ int withEnable = (int )PTR2INT(pc.clientData[0]); int withVerbose = (int )PTR2INT(pc.clientData[1]); int withDontsave = (int )PTR2INT(pc.clientData[2]); - Tcl_Obj *withBuiltins = (Tcl_Obj *)pc.clientData[3]; + Tcl_Obj *builtinsObj = (Tcl_Obj *)pc.clientData[3]; assert(pc.status == 0); - return NsfProfileTraceStub(interp, withEnable, withVerbose, withDontsave, withBuiltins); + return NsfProfileTraceStub(interp, withEnable, withVerbose, withDontsave, builtinsObj); } else { @@ -2509,10 +2575,10 @@ &pc) == TCL_OK)) { NsfObject *object = (NsfObject *)pc.clientData[0]; RelationtypeIdx_t type = (RelationtypeIdx_t )pc.clientData[1]; - Tcl_Obj *value = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *valueObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfRelationSetCmd(interp, object, type, value); + return NsfRelationSetCmd(interp, object, type, valueObj); } else { @@ -2602,10 +2668,10 @@ int withArray = (int )PTR2INT(pc.clientData[0]); int withNotrace = (int )PTR2INT(pc.clientData[1]); NsfObject *object = (NsfObject *)pc.clientData[2]; - Tcl_Obj *varName = (Tcl_Obj *)pc.clientData[3]; + Tcl_Obj *varNameObj = (Tcl_Obj *)pc.clientData[3]; assert(pc.status == 0); - return NsfVarGetCmd(interp, withArray, withNotrace, object, varName); + return NsfVarGetCmd(interp, withArray, withNotrace, object, varNameObj); } else { @@ -2645,11 +2711,11 @@ int withArray = (int )PTR2INT(pc.clientData[0]); int withNotrace = (int )PTR2INT(pc.clientData[1]); NsfObject *object = (NsfObject *)pc.clientData[2]; - Tcl_Obj *varName = (Tcl_Obj *)pc.clientData[3]; - Tcl_Obj *value = (Tcl_Obj *)pc.clientData[4]; + Tcl_Obj *varNameObj = (Tcl_Obj *)pc.clientData[3]; + Tcl_Obj *valueObj = (Tcl_Obj *)pc.clientData[4]; assert(pc.status == 0); - return NsfVarSetCmd(interp, withArray, withNotrace, object, varName, value); + return NsfVarSetCmd(interp, withArray, withNotrace, object, varNameObj, valueObj); } else { @@ -2668,10 +2734,10 @@ &pc) == TCL_OK)) { int withNocomplain = (int )PTR2INT(pc.clientData[0]); NsfObject *object = (NsfObject *)pc.clientData[1]; - Tcl_Obj *varName = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *varNameObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfVarUnsetCmd(interp, withNocomplain, object, varName); + return NsfVarUnsetCmd(interp, withNocomplain, object, varNameObj); } else { @@ -2682,22 +2748,22 @@ static int NsfOAutonameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfOAutonameMethodIdx].paramDefs, method_definitions[NsfOAutonameMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { int withInstance = (int )PTR2INT(pc.clientData[0]); int withReset = (int )PTR2INT(pc.clientData[1]); - Tcl_Obj *name = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *nameObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfOAutonameMethod(interp, obj, withInstance, withReset, name); + return NsfOAutonameMethod(interp, object, withInstance, withReset, nameObj); } else { @@ -2707,12 +2773,12 @@ static int NsfOCgetMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (objc != 2) { @@ -2721,18 +2787,18 @@ NULL, objv[0]); } - return NsfOCgetMethod(interp, obj, objv[1]); + return NsfOCgetMethod(interp, object, objv[1]); } static int NsfOClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (objc < 1 || objc > 2) { @@ -2741,18 +2807,18 @@ NULL, objv[0]); } - return NsfOClassMethod(interp, obj, objc == 2 ? objv[1] : NULL); + return NsfOClassMethod(interp, object, objc == 2 ? objv[1] : NULL); } static int NsfOCleanupMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (unlikely(objc != 1)) { @@ -2761,27 +2827,27 @@ NULL, objv[0]); } - return NsfOCleanupMethod(interp, obj); + return NsfOCleanupMethod(interp, object); } static int NsfOConfigureMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfOConfigureMethodIdx].paramDefs, method_definitions[NsfOConfigureMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { - return NsfOConfigureMethod(interp, obj, objc-pc.lastObjc, objv+pc.lastObjc, objv[0]); + return NsfOConfigureMethod(interp, object, objc-pc.lastObjc, objv+pc.lastObjc, objv[0]); } else { @@ -2791,12 +2857,12 @@ static int NsfODestroyMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (unlikely(objc != 1)) { @@ -2805,27 +2871,27 @@ NULL, objv[0]); } - return NsfODestroyMethod(interp, obj); + return NsfODestroyMethod(interp, object); } static int NsfOExistsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfOExistsMethodIdx].paramDefs, method_definitions[NsfOExistsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { const char *varName = (const char *)pc.clientData[0]; assert(pc.status == 0); - return NsfOExistsMethod(interp, obj, varName); + return NsfOExistsMethod(interp, object, varName); } else { @@ -2836,21 +2902,21 @@ static int NsfOFilterGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfOFilterGuardMethodIdx].paramDefs, method_definitions[NsfOFilterGuardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { const char *filter = (const char *)pc.clientData[0]; - Tcl_Obj *guard = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *guardObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfOFilterGuardMethod(interp, obj, filter, guard); + return NsfOFilterGuardMethod(interp, object, filter, guardObj); } else { @@ -2860,36 +2926,46 @@ static int NsfOInstvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + ParseContext pc; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], + method_definitions[NsfOInstvarMethodIdx].paramDefs, + method_definitions[NsfOInstvarMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, + &pc) == TCL_OK)) { - return NsfOInstvarMethod(interp, obj, objc, objv); + + return NsfOInstvarMethod(interp, object, objc, objv); + } else { + + return TCL_ERROR; + } } static int NsfOMixinGuardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfOMixinGuardMethodIdx].paramDefs, method_definitions[NsfOMixinGuardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { - Tcl_Obj *mixin = (Tcl_Obj *)pc.clientData[0]; - Tcl_Obj *guard = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *mixinObj = (Tcl_Obj *)pc.clientData[0]; + Tcl_Obj *guardObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfOMixinGuardMethod(interp, obj, mixin, guard); + return NsfOMixinGuardMethod(interp, object, mixinObj, guardObj); } else { @@ -2899,12 +2975,12 @@ static int NsfONoinitMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (unlikely(objc != 1)) { @@ -2913,18 +2989,18 @@ NULL, objv[0]); } - return NsfONoinitMethod(interp, obj); + return NsfONoinitMethod(interp, object); } static int NsfORequireNamespaceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (unlikely(objc != 1)) { @@ -2933,60 +3009,90 @@ NULL, objv[0]); } - return NsfORequireNamespaceMethod(interp, obj); + return NsfORequireNamespaceMethod(interp, object); } static int NsfOResidualargsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + ParseContext pc; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], + method_definitions[NsfOResidualargsMethodIdx].paramDefs, + method_definitions[NsfOResidualargsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, + &pc) == TCL_OK)) { - return NsfOResidualargsMethod(interp, obj, objc, objv); + + return NsfOResidualargsMethod(interp, object, objc, objv); + } else { + + return TCL_ERROR; + } } static int NsfOUplevelMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + ParseContext pc; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], + method_definitions[NsfOUplevelMethodIdx].paramDefs, + method_definitions[NsfOUplevelMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, + &pc) == TCL_OK)) { - return NsfOUplevelMethod(interp, obj, objc, objv); + + return NsfOUplevelMethod(interp, object, objc, objv); + } else { + + return TCL_ERROR; + } } static int NsfOUpvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + ParseContext pc; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], + method_definitions[NsfOUpvarMethodIdx].paramDefs, + method_definitions[NsfOUpvarMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, + &pc) == TCL_OK)) { - return NsfOUpvarMethod(interp, obj, objc, objv); + + return NsfOUpvarMethod(interp, object, objc, objv); + } else { + + return TCL_ERROR; + } } static int NsfOVolatileMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (unlikely(objc != 1)) { @@ -2995,18 +3101,18 @@ NULL, objv[0]); } - return NsfOVolatileMethod(interp, obj); + return NsfOVolatileMethod(interp, object); } static int NsfObjInfoBaseclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (unlikely(objc != 1)) { @@ -3015,28 +3121,28 @@ NULL, objv[0]); } - return NsfObjInfoBaseclassMethod(interp, obj); + return NsfObjInfoBaseclassMethod(interp, object); } static int NsfObjInfoChildrenMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoChildrenMethodIdx].paramDefs, method_definitions[NsfObjInfoChildrenMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { NsfClass *withType = (NsfClass *)pc.clientData[0]; const char *pattern = (const char *)pc.clientData[1]; assert(pc.status == 0); - return NsfObjInfoChildrenMethod(interp, obj, withType, pattern); + return NsfObjInfoChildrenMethod(interp, object, withType, pattern); } else { @@ -3046,12 +3152,12 @@ static int NsfObjInfoClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (unlikely(objc != 1)) { @@ -3060,27 +3166,27 @@ NULL, objv[0]); } - return NsfObjInfoClassMethod(interp, obj); + return NsfObjInfoClassMethod(interp, object); } static int NsfObjInfoFilterguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoFilterguardMethodIdx].paramDefs, method_definitions[NsfObjInfoFilterguardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { const char *filter = (const char *)pc.clientData[0]; assert(pc.status == 0); - return NsfObjInfoFilterguardMethod(interp, obj, filter); + return NsfObjInfoFilterguardMethod(interp, object, filter); } else { @@ -3091,21 +3197,21 @@ static int NsfObjInfoFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoFiltersMethodIdx].paramDefs, method_definitions[NsfObjInfoFiltersMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { int withGuards = (int )PTR2INT(pc.clientData[0]); const char *pattern = (const char *)pc.clientData[1]; assert(pc.status == 0); - return NsfObjInfoFiltersMethod(interp, obj, withGuards, pattern); + return NsfObjInfoFiltersMethod(interp, object, withGuards, pattern); } else { @@ -3116,21 +3222,21 @@ static int NsfObjInfoForwardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoForwardMethodIdx].paramDefs, method_definitions[NsfObjInfoForwardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { int withDefinition = (int )PTR2INT(pc.clientData[0]); const char *name = (const char *)pc.clientData[1]; assert(pc.status == 0); - return NsfObjInfoForwardMethod(interp, obj, withDefinition, name); + return NsfObjInfoForwardMethod(interp, object, withDefinition, name); } else { @@ -3141,20 +3247,20 @@ static int NsfObjInfoHasMixinMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoHasMixinMethodIdx].paramDefs, method_definitions[NsfObjInfoHasMixinMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { NsfClass *class = (NsfClass *)pc.clientData[0]; assert(pc.status == 0); - return NsfObjInfoHasMixinMethod(interp, obj, class); + return NsfObjInfoHasMixinMethod(interp, object, class); } else { @@ -3165,20 +3271,20 @@ static int NsfObjInfoHasTypeMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoHasTypeMethodIdx].paramDefs, method_definitions[NsfObjInfoHasTypeMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { NsfClass *class = (NsfClass *)pc.clientData[0]; assert(pc.status == 0); - return NsfObjInfoHasTypeMethod(interp, obj, class); + return NsfObjInfoHasTypeMethod(interp, object, class); } else { @@ -3188,12 +3294,12 @@ static int NsfObjInfoHasnamespaceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (unlikely(objc != 1)) { @@ -3202,27 +3308,27 @@ NULL, objv[0]); } - return NsfObjInfoHasnamespaceMethod(interp, obj); + return NsfObjInfoHasnamespaceMethod(interp, object); } static int NsfObjInfoLookupFilterMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoLookupFilterMethodIdx].paramDefs, method_definitions[NsfObjInfoLookupFilterMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { const char *filter = (const char *)pc.clientData[0]; assert(pc.status == 0); - return NsfObjInfoLookupFilterMethod(interp, obj, filter); + return NsfObjInfoLookupFilterMethod(interp, object, filter); } else { @@ -3233,21 +3339,21 @@ static int NsfObjInfoLookupFiltersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoLookupFiltersMethodIdx].paramDefs, method_definitions[NsfObjInfoLookupFiltersMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { int withGuards = (int )PTR2INT(pc.clientData[0]); const char *pattern = (const char *)pc.clientData[1]; assert(pc.status == 0); - return NsfObjInfoLookupFiltersMethod(interp, obj, withGuards, pattern); + return NsfObjInfoLookupFiltersMethod(interp, object, withGuards, pattern); } else { @@ -3257,12 +3363,12 @@ static int NsfObjInfoLookupMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (objc != 2) { @@ -3271,20 +3377,20 @@ NULL, objv[0]); } - return NsfObjInfoLookupMethodMethod(interp, obj, objv[1]); + return NsfObjInfoLookupMethodMethod(interp, object, objv[1]); } static int NsfObjInfoLookupMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoLookupMethodsMethodIdx].paramDefs, method_definitions[NsfObjInfoLookupMethodsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { @@ -3297,7 +3403,7 @@ const char *pattern = (const char *)pc.clientData[6]; assert(pc.status == 0); - return NsfObjInfoLookupMethodsMethod(interp, obj, withCallprotection, withIncontext, withType, withNomixins, withPath, withSource, pattern); + return NsfObjInfoLookupMethodsMethod(interp, object, withCallprotection, withIncontext, withType, withNomixins, withPath, withSource, pattern); } else { @@ -3308,13 +3414,13 @@ static int NsfObjInfoLookupMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoLookupMixinsMethodIdx].paramDefs, method_definitions[NsfObjInfoLookupMixinsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { @@ -3332,7 +3438,7 @@ } assert(pc.status == 0); - returnCode = NsfObjInfoLookupMixinsMethod(interp, obj, withGuards, patternString, patternObject); + returnCode = NsfObjInfoLookupMixinsMethod(interp, object, withGuards, patternString, patternObject); if (pattern) { DECR_REF_COUNT2("patternObj", pattern); @@ -3352,13 +3458,13 @@ static int NsfObjInfoLookupSlotsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoLookupSlotsMethodIdx].paramDefs, method_definitions[NsfObjInfoLookupSlotsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { @@ -3367,7 +3473,7 @@ const char *pattern = (const char *)pc.clientData[2]; assert(pc.status == 0); - return NsfObjInfoLookupSlotsMethod(interp, obj, withSource, withType, pattern); + return NsfObjInfoLookupSlotsMethod(interp, object, withSource, withType, pattern); } else { @@ -3378,21 +3484,21 @@ static int NsfObjInfoMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoMethodMethodIdx].paramDefs, method_definitions[NsfObjInfoMethodMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { InfomethodsubcmdIdx_t subcmd = (InfomethodsubcmdIdx_t )pc.clientData[0]; - Tcl_Obj *name = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *nameObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfObjInfoMethodMethod(interp, obj, subcmd, name); + return NsfObjInfoMethodMethod(interp, object, subcmd, nameObj); } else { @@ -3403,13 +3509,13 @@ static int NsfObjInfoMethodsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoMethodsMethodIdx].paramDefs, method_definitions[NsfObjInfoMethodsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { @@ -3419,7 +3525,7 @@ const char *pattern = (const char *)pc.clientData[3]; assert(pc.status == 0); - return NsfObjInfoMethodsMethod(interp, obj, withCallprotection, withType, withPath, pattern); + return NsfObjInfoMethodsMethod(interp, object, withCallprotection, withType, withPath, pattern); } else { @@ -3430,20 +3536,20 @@ static int NsfObjInfoMixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoMixinguardMethodIdx].paramDefs, method_definitions[NsfObjInfoMixinguardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { const char *mixin = (const char *)pc.clientData[0]; assert(pc.status == 0); - return NsfObjInfoMixinguardMethod(interp, obj, mixin); + return NsfObjInfoMixinguardMethod(interp, object, mixin); } else { @@ -3454,13 +3560,13 @@ static int NsfObjInfoMixinsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoMixinsMethodIdx].paramDefs, method_definitions[NsfObjInfoMixinsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { @@ -3478,7 +3584,7 @@ } assert(pc.status == 0); - returnCode = NsfObjInfoMixinsMethod(interp, obj, withGuards, patternString, patternObject); + returnCode = NsfObjInfoMixinsMethod(interp, object, withGuards, patternString, patternObject); if (pattern) { DECR_REF_COUNT2("patternObj", pattern); @@ -3497,12 +3603,12 @@ static int NsfObjInfoNameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (unlikely(objc != 1)) { @@ -3511,18 +3617,18 @@ NULL, objv[0]); } - return NsfObjInfoNameMethod(interp, obj); + return NsfObjInfoNameMethod(interp, object); } static int NsfObjInfoParentMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; + object = (NsfObject *)clientData; if (unlikely(objc != 1)) { @@ -3531,28 +3637,28 @@ NULL, objv[0]); } - return NsfObjInfoParentMethod(interp, obj); + return NsfObjInfoParentMethod(interp, object); } static int NsfObjInfoPrecedenceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoPrecedenceMethodIdx].paramDefs, method_definitions[NsfObjInfoPrecedenceMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { int withIntrinsic = (int )PTR2INT(pc.clientData[0]); const char *pattern = (const char *)pc.clientData[1]; assert(pc.status == 0); - return NsfObjInfoPrecedenceMethod(interp, obj, withIntrinsic, pattern); + return NsfObjInfoPrecedenceMethod(interp, object, withIntrinsic, pattern); } else { @@ -3563,21 +3669,21 @@ static int NsfObjInfoSlotobjectsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoSlotobjectsMethodIdx].paramDefs, method_definitions[NsfObjInfoSlotobjectsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { NsfClass *withType = (NsfClass *)pc.clientData[0]; const char *pattern = (const char *)pc.clientData[1]; assert(pc.status == 0); - return NsfObjInfoSlotobjectsMethod(interp, obj, withType, pattern); + return NsfObjInfoSlotobjectsMethod(interp, object, withType, pattern); } else { @@ -3588,20 +3694,20 @@ static int NsfObjInfoVarsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) { ParseContext pc; - NsfObject *obj; + NsfObject *object; NSF_nonnull_assert(clientData != NULL); assert(objc > 0); - obj = (NsfObject *)clientData; - if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], + object = (NsfObject *)clientData; + if (likely(ArgumentParse(interp, objc, objv, object, objv[0], method_definitions[NsfObjInfoVarsMethodIdx].paramDefs, method_definitions[NsfObjInfoVarsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { const char *pattern = (const char *)pc.clientData[0]; assert(pc.status == 0); - return NsfObjInfoVarsMethod(interp, obj, pattern); + return NsfObjInfoVarsMethod(interp, object, pattern); } else { Index: generic/nsfError.c =================================================================== diff -u -r866971d828a2ed5fdb8da757e94401f919bd3a8c -r8552f707c011bfc24be22e1e8332f5558227cde3 --- generic/nsfError.c (.../nsfError.c) (revision 866971d828a2ed5fdb8da757e94401f919bd3a8c) +++ generic/nsfError.c (.../nsfError.c) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) @@ -567,10 +567,10 @@ const char *context, Tcl_Obj *value, const char *type, - Nsf_Param const *paramPtr) + Nsf_Param const *NsfObjErrType) { - int named = (paramPtr && (paramPtr->flags & NSF_ARG_UNNAMED) == 0); - int returnValue = !named && paramPtr && (paramPtr->flags & NSF_ARG_IS_RETURNVALUE); + int named = (NsfObjErrType && (NsfObjErrType->flags & NSF_ARG_UNNAMED) == 0); + int returnValue = !named && NsfObjErrType && (NsfObjErrType->flags & NSF_ARG_IS_RETURNVALUE); int errMsgLen; const char *prevErrMsg = Tcl_GetStringFromObj(Tcl_GetObjResult(interp), &errMsgLen); Tcl_DString ds; @@ -588,7 +588,7 @@ Nsf_DStringPrintf(&ds, "expected %s but got \"%s\"", type, ObjStr(value)); if (named != 0) { - Nsf_DStringPrintf(&ds, " for parameter \"%s\"", paramPtr->name); + Nsf_DStringPrintf(&ds, " for parameter \"%s\"", NsfObjErrType->name); } else if (returnValue != 0) { Tcl_DStringAppend(&ds, " as return value", -1); } Index: generic/nsfInt.h =================================================================== diff -u -r88a4a36bce68febc0be48bf4828521f6a0d5ddcc -r8552f707c011bfc24be22e1e8332f5558227cde3 --- generic/nsfInt.h (.../nsfInt.h) (revision 88a4a36bce68febc0be48bf4828521f6a0d5ddcc) +++ generic/nsfInt.h (.../nsfInt.h) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) @@ -1045,11 +1045,12 @@ EXTERN void NsfProfileFree(Tcl_Interp *interp) nonnull(1); EXTERN void NsfProfileClearData(Tcl_Interp *interp) nonnull(1); EXTERN void NsfProfileGetData(Tcl_Interp *interp) nonnull(1); -EXTERN int NsfProfileTrace(Tcl_Interp *interp, int withEnable, int withVerbose, int withInmemory, Tcl_Obj *builtins); +EXTERN int NsfProfileTrace(Tcl_Interp *interp, int withEnable, int withVerbose, int withDontsave, Tcl_Obj *builtinObjs); EXTERN void NsfProfileTraceCall(Tcl_Interp *interp, NsfObject *object, NsfClass *cl, const char *methodName) nonnull(1) nonnull(2) nonnull(4); -EXTERN void NsfProfileTraceExit(Tcl_Interp *interp, NsfObject *object, NsfClass *cl, const char *methodName, struct Tcl_Time *trt) +EXTERN void NsfProfileTraceExit(Tcl_Interp *interp, NsfObject *object, NsfClass *cl, const char *methodName, + struct Tcl_Time *callTime) nonnull(1) nonnull(2) nonnull(4) nonnull(5); EXTERN void NsfProfileTraceCallAppend(Tcl_Interp *interp, const char *label) nonnull(1) nonnull(2); @@ -1116,8 +1117,8 @@ NsfClass **clPtr, int withUnknown) nonnull(1) nonnull(2) nonnull(3); -EXTERN int NsfObjWrongArgs(Tcl_Interp *interp, CONST char *msg, - Tcl_Obj *cmdName, Tcl_Obj *methodName, +EXTERN int NsfObjWrongArgs(Tcl_Interp *interp, const char *msg, + Tcl_Obj *cmdNameObj, Tcl_Obj *methodPathObj, const char *arglist) nonnull(1) nonnull(2); Index: generic/stubs8.5/nsfDecls.h =================================================================== diff -u -r866971d828a2ed5fdb8da757e94401f919bd3a8c -r8552f707c011bfc24be22e1e8332f5558227cde3 --- generic/stubs8.5/nsfDecls.h (.../nsfDecls.h) (revision 866971d828a2ed5fdb8da757e94401f919bd3a8c) +++ generic/stubs8.5/nsfDecls.h (.../nsfDecls.h) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) @@ -146,7 +146,8 @@ /* 14 */ EXTERN int NsfObjErrType(Tcl_Interp *interp, CONST char *context, Tcl_Obj *value, - CONST char *type, Nsf_Param CONST *pPtr); + CONST char *type, + Nsf_Param CONST *NsfObjErrType); #endif #ifndef NsfStackDump_TCL_DECLARED #define NsfStackDump_TCL_DECLARED @@ -356,7 +357,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 *pPtr); /* 14 */ + int (*nsfObjErrType) (Tcl_Interp *interp, CONST char *context, Tcl_Obj *value, CONST char *type, Nsf_Param CONST *NsfObjErrType); /* 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 -r866971d828a2ed5fdb8da757e94401f919bd3a8c -r8552f707c011bfc24be22e1e8332f5558227cde3 --- generic/stubs8.6/nsfDecls.h (.../nsfDecls.h) (revision 866971d828a2ed5fdb8da757e94401f919bd3a8c) +++ generic/stubs8.6/nsfDecls.h (.../nsfDecls.h) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) @@ -105,7 +105,8 @@ /* 14 */ EXTERN int NsfObjErrType(Tcl_Interp *interp, const char *context, Tcl_Obj *value, - const char *type, Nsf_Param const *pPtr); + const char *type, + Nsf_Param const *NsfObjErrType); /* 15 */ EXTERN void NsfStackDump(Tcl_Interp *interp); /* 16 */ @@ -233,7 +234,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 *pPtr); /* 14 */ + int (*nsfObjErrType) (Tcl_Interp *interp, const char *context, Tcl_Obj *value, const char *type, Nsf_Param const *NsfObjErrType); /* 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.7/nsfDecls.h =================================================================== diff -u -r866971d828a2ed5fdb8da757e94401f919bd3a8c -r8552f707c011bfc24be22e1e8332f5558227cde3 --- generic/stubs8.7/nsfDecls.h (.../nsfDecls.h) (revision 866971d828a2ed5fdb8da757e94401f919bd3a8c) +++ generic/stubs8.7/nsfDecls.h (.../nsfDecls.h) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) @@ -105,7 +105,8 @@ /* 14 */ EXTERN int NsfObjErrType(Tcl_Interp *interp, const char *context, Tcl_Obj *value, - const char *type, Nsf_Param const *pPtr); + const char *type, + Nsf_Param const *NsfObjErrType); /* 15 */ EXTERN void NsfStackDump(Tcl_Interp *interp); /* 16 */ @@ -233,7 +234,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 *pPtr); /* 14 */ + int (*nsfObjErrType) (Tcl_Interp *interp, const char *context, Tcl_Obj *value, const char *type, Nsf_Param const *NsfObjErrType); /* 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: library/mongodb/mongoAPI.h =================================================================== diff -u -r3d447c3c5b6f5b5becb6baa26950bbd06e60b9a4 -r8552f707c011bfc24be22e1e8332f5558227cde3 --- library/mongodb/mongoAPI.h (.../mongoAPI.h) (revision 3d447c3c5b6f5b5becb6baa26950bbd06e60b9a4) +++ library/mongodb/mongoAPI.h (.../mongoAPI.h) (revision 8552f707c011bfc24be22e1e8332f5558227cde3) @@ -157,27 +157,27 @@ NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3) NSF_nonnull(4); static int NsfMongoClose(Tcl_Interp *interp, mongoc_client_t *connPtr, Tcl_Obj *connObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfMongoCollectionCount(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *query) +static int NsfMongoCollectionCount(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *queryObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfMongoCollectionDelete(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *condition) +static int NsfMongoCollectionDelete(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *conditionObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfMongoCollectionIndex(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *attributes, const char *withName, int withBackground, int withDropdups, int withSparse, int withTtl, int withUnique) +static int NsfMongoCollectionIndex(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *attributesObj, const char *withName, int withBackground, int withDropdups, int withSparse, int withTtl, int withUnique) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfMongoCollectionInsert(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *values) +static int NsfMongoCollectionInsert(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *valuesObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfMongoCollectionQuery(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *filter, Tcl_Obj *withOpts) +static int NsfMongoCollectionQuery(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *filterObj, Tcl_Obj *optsObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfMongoCollectionStats(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *withOptions) +static int NsfMongoCollectionStats(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *optionsObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfMongoCollectionUpdate(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *cond, Tcl_Obj *values, int withUpsert, int withAll) +static int NsfMongoCollectionUpdate(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *condObj, Tcl_Obj *valuesObj, int withUpsert, int withAll) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3) NSF_nonnull(4); static int NsfMongoConnect(Tcl_Interp *interp, const char *withUri) NSF_nonnull(1); -static int NsfMongoCursorAggregate(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *pipeline, Tcl_Obj *options, int withTailable, int withAwaitdata) +static int NsfMongoCursorAggregate(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *pipelineObj, Tcl_Obj *optionsObj, int withTailable, int withAwaitdata) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3) NSF_nonnull(4); static int NsfMongoCursorClose(Tcl_Interp *interp, mongoc_cursor_t *cursorPtr, Tcl_Obj *cursorObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfMongoCursorFind(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *filter, Tcl_Obj *withOpts) +static int NsfMongoCursorFind(Tcl_Interp *interp, mongoc_collection_t *collectionPtr, Tcl_Obj *filterObj, Tcl_Obj *optsObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); static int NsfMongoCursorNext(Tcl_Interp *interp, mongoc_cursor_t *cursorPtr) NSF_nonnull(1) NSF_nonnull(2); @@ -187,27 +187,27 @@ NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3) NSF_nonnull(4); static int NsfMongoGridFileClose(Tcl_Interp *interp, mongoc_gridfs_file_t *gridfilePtr, Tcl_Obj *gridfileObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfMongoGridFileCreate(Tcl_Interp *interp, GridfilesourceIdx_t withSource, mongoc_gridfs_t *gfsPtr, const char *value, const char *name, const char *contenttype, Tcl_Obj *withMetadata) +static int NsfMongoGridFileCreate(Tcl_Interp *interp, GridfilesourceIdx_t withSource, mongoc_gridfs_t *gfsPtr, const char *value, const char *name, const char *contenttype, Tcl_Obj *metadataObj) NSF_nonnull(1) NSF_nonnull(3) NSF_nonnull(4) NSF_nonnull(5) NSF_nonnull(6); -static int NsfMongoGridFileDelete(Tcl_Interp *interp, mongoc_gridfs_t *gfsPtr, Tcl_Obj *query) +static int NsfMongoGridFileDelete(Tcl_Interp *interp, mongoc_gridfs_t *gfsPtr, Tcl_Obj *queryObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); static int NsfMongoGridFileGetContentType(Tcl_Interp *interp, mongoc_gridfs_file_t *gridfilePtr) NSF_nonnull(1) NSF_nonnull(2); static int NsfMongoGridFileGetContentlength(Tcl_Interp *interp, mongoc_gridfs_file_t *gridfilePtr) NSF_nonnull(1) NSF_nonnull(2); static int NsfMongoGridFileGetMetaData(Tcl_Interp *interp, mongoc_gridfs_file_t *gridfilePtr) NSF_nonnull(1) NSF_nonnull(2); -static int NsfMongoGridFileOpen(Tcl_Interp *interp, mongoc_gridfs_t *gfsPtr, Tcl_Obj *query) +static int NsfMongoGridFileOpen(Tcl_Interp *interp, mongoc_gridfs_t *gfsPtr, Tcl_Obj *queryObj) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); static int NsfMongoGridFileRead(Tcl_Interp *interp, mongoc_gridfs_file_t *gridfilePtr, int size) NSF_nonnull(1) NSF_nonnull(2); static int NsfMongoGridFileSeek(Tcl_Interp *interp, mongoc_gridfs_file_t *gridfilePtr, int offset) NSF_nonnull(1) NSF_nonnull(2); -static int NsfMongoJsonGenerate(Tcl_Interp *interp, Tcl_Obj *list) +static int NsfMongoJsonGenerate(Tcl_Interp *interp, Tcl_Obj *listObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfMongoJsonParse(Tcl_Interp *interp, Tcl_Obj *json) +static int NsfMongoJsonParse(Tcl_Interp *interp, Tcl_Obj *jsonObj) NSF_nonnull(1) NSF_nonnull(2); -static int NsfMongoRunCmd(Tcl_Interp *interp, int withNocomplain, mongoc_client_t *connPtr, const char *db, Tcl_Obj *cmd) +static int NsfMongoRunCmd(Tcl_Interp *interp, int withNocomplain, mongoc_client_t *connPtr, const char *db, Tcl_Obj *cmdObj) NSF_nonnull(1) NSF_nonnull(3) NSF_nonnull(4) NSF_nonnull(5); static int NsfMongoStatus(Tcl_Interp *interp, mongoc_client_t *connPtr, Tcl_Obj *connObj) NSF_nonnull(1) NSF_nonnull(2); @@ -318,10 +318,10 @@ method_definitions[NsfMongoCollectionCountIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0]; - Tcl_Obj *query = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *queryObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfMongoCollectionCount(interp, collectionPtr, query); + return NsfMongoCollectionCount(interp, collectionPtr, queryObj); } else { @@ -339,10 +339,10 @@ method_definitions[NsfMongoCollectionDeleteIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0]; - Tcl_Obj *condition = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *conditionObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfMongoCollectionDelete(interp, collectionPtr, condition); + return NsfMongoCollectionDelete(interp, collectionPtr, conditionObj); } else { @@ -360,7 +360,7 @@ method_definitions[NsfMongoCollectionIndexIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0]; - Tcl_Obj *attributes = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *attributesObj = (Tcl_Obj *)pc.clientData[1]; const char *withName = (const char *)pc.clientData[2]; int withBackground = (int )PTR2INT(pc.clientData[3]); int withDropdups = (int )PTR2INT(pc.clientData[4]); @@ -369,7 +369,7 @@ int withUnique = (int )PTR2INT(pc.clientData[7]); assert(pc.status == 0); - return NsfMongoCollectionIndex(interp, collectionPtr, attributes, withName, withBackground, withDropdups, withSparse, withTtl, withUnique); + return NsfMongoCollectionIndex(interp, collectionPtr, attributesObj, withName, withBackground, withDropdups, withSparse, withTtl, withUnique); } else { @@ -387,10 +387,10 @@ method_definitions[NsfMongoCollectionInsertIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0]; - Tcl_Obj *values = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *valuesObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfMongoCollectionInsert(interp, collectionPtr, values); + return NsfMongoCollectionInsert(interp, collectionPtr, valuesObj); } else { @@ -408,11 +408,11 @@ method_definitions[NsfMongoCollectionQueryIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0]; - Tcl_Obj *filter = (Tcl_Obj *)pc.clientData[1]; - Tcl_Obj *withOpts = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *filterObj = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *optsObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfMongoCollectionQuery(interp, collectionPtr, filter, withOpts); + return NsfMongoCollectionQuery(interp, collectionPtr, filterObj, optsObj); } else { @@ -430,10 +430,10 @@ method_definitions[NsfMongoCollectionStatsIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0]; - Tcl_Obj *withOptions = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *optionsObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfMongoCollectionStats(interp, collectionPtr, withOptions); + return NsfMongoCollectionStats(interp, collectionPtr, optionsObj); } else { @@ -451,13 +451,13 @@ method_definitions[NsfMongoCollectionUpdateIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0]; - Tcl_Obj *cond = (Tcl_Obj *)pc.clientData[1]; - Tcl_Obj *values = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *condObj = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *valuesObj = (Tcl_Obj *)pc.clientData[2]; int withUpsert = (int )PTR2INT(pc.clientData[3]); int withAll = (int )PTR2INT(pc.clientData[4]); assert(pc.status == 0); - return NsfMongoCollectionUpdate(interp, collectionPtr, cond, values, withUpsert, withAll); + return NsfMongoCollectionUpdate(interp, collectionPtr, condObj, valuesObj, withUpsert, withAll); } else { @@ -495,13 +495,13 @@ method_definitions[NsfMongoCursorAggregateIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0]; - Tcl_Obj *pipeline = (Tcl_Obj *)pc.clientData[1]; - Tcl_Obj *options = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *pipelineObj = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *optionsObj = (Tcl_Obj *)pc.clientData[2]; int withTailable = (int )PTR2INT(pc.clientData[3]); int withAwaitdata = (int )PTR2INT(pc.clientData[4]); assert(pc.status == 0); - return NsfMongoCursorAggregate(interp, collectionPtr, pipeline, options, withTailable, withAwaitdata); + return NsfMongoCursorAggregate(interp, collectionPtr, pipelineObj, optionsObj, withTailable, withAwaitdata); } else { @@ -539,11 +539,11 @@ method_definitions[NsfMongoCursorFindIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0]; - Tcl_Obj *filter = (Tcl_Obj *)pc.clientData[1]; - Tcl_Obj *withOpts = (Tcl_Obj *)pc.clientData[2]; + Tcl_Obj *filterObj = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *optsObj = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfMongoCursorFind(interp, collectionPtr, filter, withOpts); + return NsfMongoCursorFind(interp, collectionPtr, filterObj, optsObj); } else { @@ -647,10 +647,10 @@ const char *value = (const char *)pc.clientData[2]; const char *name = (const char *)pc.clientData[3]; const char *contenttype = (const char *)pc.clientData[4]; - Tcl_Obj *withMetadata = (Tcl_Obj *)pc.clientData[5]; + Tcl_Obj *metadataObj = (Tcl_Obj *)pc.clientData[5]; assert(pc.status == 0); - return NsfMongoGridFileCreate(interp, withSource, gfsPtr, value, name, contenttype, withMetadata); + return NsfMongoGridFileCreate(interp, withSource, gfsPtr, value, name, contenttype, metadataObj); } else { @@ -668,10 +668,10 @@ method_definitions[NsfMongoGridFileDeleteIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { mongoc_gridfs_t *gfsPtr = (mongoc_gridfs_t *)pc.clientData[0]; - Tcl_Obj *query = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *queryObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfMongoGridFileDelete(interp, gfsPtr, query); + return NsfMongoGridFileDelete(interp, gfsPtr, queryObj); } else { @@ -749,10 +749,10 @@ method_definitions[NsfMongoGridFileOpenIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { mongoc_gridfs_t *gfsPtr = (mongoc_gridfs_t *)pc.clientData[0]; - Tcl_Obj *query = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *queryObj = (Tcl_Obj *)pc.clientData[1]; assert(pc.status == 0); - return NsfMongoGridFileOpen(interp, gfsPtr, query); + return NsfMongoGridFileOpen(interp, gfsPtr, queryObj); } else { @@ -846,10 +846,10 @@ int withNocomplain = (int )PTR2INT(pc.clientData[0]); mongoc_client_t *connPtr = (mongoc_client_t *)pc.clientData[1]; const char *db = (const char *)pc.clientData[2]; - Tcl_Obj *cmd = (Tcl_Obj *)pc.clientData[3]; + Tcl_Obj *cmdObj = (Tcl_Obj *)pc.clientData[3]; assert(pc.status == 0); - return NsfMongoRunCmd(interp, withNocomplain, connPtr, db, cmd); + return NsfMongoRunCmd(interp, withNocomplain, connPtr, db, cmdObj); } else {