Index: generic/nsf.c =================================================================== diff -u -r76cc1aa8be57663ae41f0709084f084e495601bc -r3f78bdd8db9ec3b80bd2a280a5f148ad81d7c9f5 --- generic/nsf.c (.../nsf.c) (revision 76cc1aa8be57663ae41f0709084f084e495601bc) +++ generic/nsf.c (.../nsf.c) (revision 3f78bdd8db9ec3b80bd2a280a5f148ad81d7c9f5) @@ -544,7 +544,7 @@ if ((traceEvalFlags & NSF_EVAL_PREVENT_RECURSION) != 0u) { /* * We do not want to debug the debug statements, since this would cause an - * inifinite recursion. Check, if we allow execution of the eval call. + * infinite recursion. Check, if we allow execution of the eval call. */ if ((rst->preventRecursionFlags & traceEvalFlags) != 0) { /* @@ -639,7 +639,7 @@ } else { /* * On physical destroy, we can't rely on NsfDStringEval() working - * proplerly. + * properly. */ fprintf(stderr, "%s", cmdString.string); } @@ -4403,7 +4403,7 @@ *---------------------------------------------------------------------- * GetVarAndNameFromHash -- * - * Conveniance function to obtain variable and name from + * Convenience function to obtain variable and name from * a variable hash entry * * Results: @@ -4875,7 +4875,7 @@ * The Tcl var resolver protocol dictates that per-namespace * compiling var resolvers take precedence over this per-interp * compiling var resolver. That is, per-namespace resolvers are - * processed first and can effectively outrule per-interp + * processed first and can effectively out-rule per-interp * resolvers by signaling TCL_OK or TCL_BREAK. * * Results: @@ -4994,7 +4994,7 @@ * The Tcl var resolver protocol dictates that per-namespace, * non-compiling var resolvers take precedence over this per-interp * non-compiling var resolver. That is, per-namespace resolvers are - * processed first and can effectively outrule per-interp resolvers + * processed first and can effectively out-rule per-interp resolvers * by signaling TCL_OK or TCL_BREAK. See * e.g. TclLookupSimpleVar(). * @@ -5571,7 +5571,7 @@ * * Delete a child of an object in cases, when the parent object is * deleted. It is designed to delete either objects or classes to - * be a little bit more graceful on destuctors. Not perfect yet. + * be a little bit more graceful on destructors. Not perfect yet. * * Results: * None. @@ -11074,7 +11074,7 @@ *---------------------------------------------------------------------- * ByteCompiled -- * - * Function to determine whether a proc is already byted compiled or not. + * Function to determine whether a proc is already byte compiled or not. * * Results: * 0 or 1 based on success @@ -13231,7 +13231,7 @@ object = cscPtr->self; /* - * Privide DTrace with calling info + * Provide DTrace with calling info */ if (NSF_DTRACE_METHOD_ENTRY_ENABLED()) { NSF_DTRACE_METHOD_ENTRY(ObjectName(object), (cscPtr->cl != NULL) ? ClassName(cscPtr->cl) : ObjectName(object), @@ -13427,7 +13427,7 @@ /* * cscAlloc uses for resolvedCmd for allocating the call stack content and * sets the IS_NRE flag based on it. We use the original cmd in the - * callstack content structure for introspection. + * call-stack content structure for introspection. */ cscPtr = CscAlloc(interp, &csc, resolvedCmd); @@ -13867,7 +13867,7 @@ if (cmd != NULL) { /* * Reject call when - * a) trying to call a private method without the local flag or ignore permssions, or + * a) trying to call a private method without the local flag or ignore permissions, or * b) trying to call an object with no method interface */ if (((flags & (NSF_CM_LOCAL_METHOD|NSF_CM_IGNORE_PERMISSIONS)) == 0u @@ -14014,7 +14014,7 @@ /* * cscAlloc uses for resolvedCmd for allocating the call stack content and * sets the IS_NRE flag based on it. We use the original cmd in the - * callstack content structure for introspection. + * call-stack content structure for introspection. */ cscPtr = CscAlloc(interp, &csc, resolvedCmd); @@ -15257,7 +15257,7 @@ *---------------------------------------------------------------------- * ParamCheckObj -- * - * Ths function returns a fresh Tcl_Obj in the form of a method name for a + * This function returns a fresh Tcl_Obj in the form of a method name for a * checker method. * * Results: @@ -15285,7 +15285,7 @@ *---------------------------------------------------------------------- * ParamOptionSetConverter -- * - * Fill in the fields int to the specifed paramPtr structure + * Fill in the fields int to the specified paramPtr structure * checker method and perform sanity checking. * * Results: @@ -15330,7 +15330,7 @@ * None * * Side effects: - * Potentially shortend string content + * Potentially shortened string content * *---------------------------------------------------------------------- */ @@ -17747,7 +17747,7 @@ *---------------------------------------------------------------------- * FindCalledClass -- * - * Find the called class of the called proc on the callstack. + * Find the called class of the called proc on the call-stack. * * Results: * NsfClass * or NULL @@ -18323,7 +18323,7 @@ * 2) An explicit "next" cmd from within a leaf sub-method (a "leaf * next"): Remain silent, do not dispatch to unknown. - * 3) An implicit "next" triggered for unresolved submethods that might be + * 3) An implicit "next" triggered for unresolved sub-methods that might be * resolved along the next path: Dispatch to unknown, the requested * sub-cmd is not resolvable to a cmd. * @@ -18473,7 +18473,7 @@ NsfCallStackContent *cscPtr; int result; Tcl_CallFrame *framePtr; - + nonnull_assert(interp != NULL); cscPtr = CallStackGetTopFrame(interp, &framePtr); @@ -18485,7 +18485,7 @@ Tcl_Command cmd = NULL, currentCmd = NULL; const char *lookupMethodName, *methodName; int isEnsemble = (cscPtr->frameType & NSF_CSC_TYPE_ENSEMBLE) != 0u; - + Tcl_ResetResult(interp); methodName = Tcl_GetCommandName(interp, cscPtr->cmdPtr); @@ -18506,7 +18506,7 @@ int isMixinEntry = 0, isFilterEntry = 0, endOfFilterChain = 0; NsfClass *cl = cscPtr->cl; NsfObject *object = cscPtr->self; - + result = NextSearchMethod(object, interp, cscPtr, &cl, &lookupMethodName, &cmd, &isMixinEntry, &isFilterEntry, &endOfFilterChain, ¤tCmd); if (cmd != NULL) { @@ -18810,7 +18810,7 @@ } } - /* Unset object variables with unset traces pre-emptively. */ + /* Unset object variables with unset traces preemptively. */ UnsetTracedVars(interp, object); if (object->nsPtr != NULL) { @@ -18884,7 +18884,7 @@ * None. * * Side effects: - * Updateing the object structure + * Updating the object structure * *---------------------------------------------------------------------- */ @@ -19009,7 +19009,7 @@ * None. * * Side effects: - * Free obejct contents. + * Free object contents. * *---------------------------------------------------------------------- */ @@ -19658,7 +19658,7 @@ * None. * * Side effects: - * Free obejct contents. + * Free object contents. * *---------------------------------------------------------------------- */ @@ -20215,7 +20215,7 @@ *---------------------------------------------------------------------- * ImportInstVarIntoCurrentScope -- * - * Import an instance variable into the corrent variable scope + * Import an instance variable into the current variable scope * (e.g. function scope). * * Results: @@ -21644,7 +21644,7 @@ Tcl_ListObjAppendElement(interp, *outObjPtr, elementObjPtr); /* * If the refCount of the valueObj was already incremented, we have to - * decrement it here, since we want the valuObj reclaimed when the list + * decrement it here, since we want the valueObj reclaimed when the list * containing the valueObj is freed. */ ArgumentResetRefCounts(pPtr, elementObjPtr); @@ -22276,7 +22276,7 @@ nonposArgError = 1; } else if ((nextParamPtr->flags & NSF_ARG_NODASHALNUM) != 0u) { /* - * Check if argment is numeric, since we want to allow it as + * Check if argument is numeric, since we want to allow it as * value even when NSF_ARG_NODASHALNUM was specified. */ nonposArgError = 1; @@ -22983,7 +22983,7 @@ *---------------------------------------------------------------------- * AppendReturnsClause -- * - * Append to the listObj a returns clause, if it was spefified for the + * Append to the listObj a returns clause, if it was specified for the * current cmd. * * Results: @@ -23018,7 +23018,7 @@ *---------------------------------------------------------------------- * ListMethod -- * - * Constuct a command to regenerate the specified method. The method might + * Construct a command to regenerate the specified method. The method might * be scripted or not (alias, forwarder, ...). The command is returned in * the interp result. * @@ -23468,7 +23468,7 @@ } } else { /* - * The cmd must be a plain unregisted cmd + * The cmd must be a plain unregistered cmd */ switch (subcmd) { @@ -23775,7 +23775,7 @@ } /* * Aliased objects methods return 1 but lookup from cmd returns - * NULL. Below, we are just interested on true subobjects. + * NULL. Below, we are just interested on true sub-objects. */ origCmd = GetOriginalCommand(cmd); childObject = (isObject == 1) ? NsfGetObjectFromCmdPtr(origCmd) : NULL; @@ -23836,7 +23836,7 @@ withPer_object, &isObject); /* * Aliased objects methods return 1 but lookup from cmd returns - * NULL. Below, we are just interested on true subobjects. + * NULL. Below, we are just interested on true sub-objects. */ origCmd = GetOriginalCommand(cmd); childObject = (isObject == 1) ? NsfGetObjectFromCmdPtr(origCmd) : NULL; @@ -24021,7 +24021,7 @@ * * ListForward -- * - * List registered forwareder defined in the hash table. The result can be filtered + * List registered forwarder defined in the hash table. The result can be filtered * via a pattern, optionally the forward definition is returned. * * Results: @@ -25088,7 +25088,7 @@ break; case ConfigureoptionNULL: - /* do nothing; just for detection if option was specfied */ + /* do nothing; just for detection if option was specified */ break; case ConfigureoptionFilterIdx: @@ -25882,7 +25882,7 @@ } case AssertionsubcmdNULL: - /* do nothing; just for detection if option was specfied */ + /* do nothing; just for detection if option was specified */ break; } #endif @@ -26125,7 +26125,7 @@ break; case ForwardpropertyNULL: - /* do nothing; just for detection if option was specfied */ + /* do nothing; just for detection if option was specified */ break; } @@ -26300,7 +26300,7 @@ break; case MethodpropertyNULL: - /* do nothing; just for detection if option was specfied */ + /* do nothing; just for detection if option was specified */ break; } @@ -26525,7 +26525,7 @@ case ObjectpropertyPerobjectdispatchIdx: flags = NSF_PER_OBJECT_DISPATCH; allowSet = 1; break; case ObjectpropertyHasperobjectslotsIdx: flags = NSF_HAS_PER_OBJECT_SLOTS; allowSet = 1; break; case ObjectpropertyNULL: - /* do nothing; just for detection if option was specfied */ + /* do nothing; just for detection if option was specified */ break; } @@ -27081,7 +27081,7 @@ break; case ParametersubcmdNULL: - /* do nothing; just for detection if option was specfied */ + /* do nothing; just for detection if option was specified */ break; } @@ -27358,7 +27358,7 @@ * Tcl result code. * * Side effects: - * class mixins are set, various kinds of invlidations. + * class mixins are set, various kinds of invalidations. * *---------------------------------------------------------------------- */ @@ -27558,7 +27558,7 @@ } case RelationtypeNULL: - /* do nothing; just for detection if option was specfied */ + /* do nothing; just for detection if option was specified */ return TCL_OK; } @@ -27860,7 +27860,7 @@ case CurrentoptionCallinglevelIdx: /* - * Special case of object==NULL handeled above. + * Special case of object==NULL handled above. */ Tcl_SetObjResult(interp, ComputeLevelObj(interp, CALLING_LEVEL)); break; @@ -27882,15 +27882,15 @@ case CurrentoptionIsnextcallIdx: { cscPtr = CallStackGetTopFrame(interp, &framePtr); - + if ((cscPtr->frameType & NSF_CSC_TYPE_ENSEMBLE) != 0u) { (void)CallStackFindEnsembleCsc(framePtr, &framePtr); } - + framePtr = CallStackNextFrameOfType(Tcl_CallFrame_callerPtr(framePtr), FRAME_IS_NSF_METHOD|FRAME_IS_NSF_CMETHOD); cscPtr = (framePtr != NULL) ? Tcl_CallFrame_clientData(framePtr) : NULL; - + Tcl_SetBooleanObj(Tcl_GetObjResult(interp), (cscPtr != NULL && ((cscPtr->flags & NSF_CSC_CALL_IS_NEXT) != 0u))); break; @@ -28978,9 +28978,9 @@ assert(parsedParam.paramDefs != NULL); /* - * We do not stack a plain stack fraom NSF_CSC_TYPE_PLAIN here, as we do in + * We do not stack a plain stack from NSF_CSC_TYPE_PLAIN here, as we do in * NsfOConfigureMethod (but maybe we have to for full compatibility TODO: - * check and compar with configure stack setup). Therefore we pass NULL as + * check and compare with configure stack setup). Therefore we pass NULL as * cscPtr to ParameterMethodForwardDispatch). */ @@ -31509,7 +31509,7 @@ * FinalObjectDeletion -- * * The method is to be called, when an object is finally deleted, - * typically during the final cleanup. It tests as well the actication + * typically during the final cleanup. It tests as well the activation * count of the object. * * Results: @@ -31959,7 +31959,7 @@ } /* - * In all cases, straigthen the class to the base case. + * In all cases, straighten the class to the base case. */ baseClass = NsfObjectIsClass(object) ? osPtr->rootMetaClass : osPtr->rootClass; if (object->cl != baseClass) { @@ -32310,7 +32310,7 @@ /* * Note that Nsf_Init() is called typically via a package require, which * is therefore not really the bottom of the stack, but just a first - * approximization. + * approximation. */ rst->bottomOfStack = &someVar; rst->maxStack = rst->bottomOfStack; Index: generic/nsf.h =================================================================== diff -u -r263d34eedc5cdfe86ceb0f1f81fb45528c68598c -r3f78bdd8db9ec3b80bd2a280a5f148ad81d7c9f5 --- generic/nsf.h (.../nsf.h) (revision 263d34eedc5cdfe86ceb0f1f81fb45528c68598c) +++ generic/nsf.h (.../nsf.h) (revision 3f78bdd8db9ec3b80bd2a280a5f148ad81d7c9f5) @@ -1,10 +1,10 @@ /* * Next Scripting Framework * - * Copyright (C) 1999-2016 Gustaf Neumann (a) (b) + * Copyright (C) 1999-2017 Gustaf Neumann (a) (b) * Copyright (C) 1999-2007 Uwe Zdun (a) (b) * Copyright (C) 2007-2008 Martin Matuska (b) - * Copyright (C) 2010-2016 Stefan Sobernig (b) + * Copyright (C) 2010-2017 Stefan Sobernig (b) * * (a) University of Essen * Specification of Software Systems @@ -291,7 +291,7 @@ 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); @@ -324,7 +324,7 @@ /* Argument parse processing flags */ #define NSF_ARGPARSE_CHECK 0x0001 #define NSF_ARGPARSE_FORCE_REQUIRED 0x0002 -#define NSF_ARGPARSE_BUILTIN (NSF_ARGPARSE_CHECK|NSF_ARGPARSE_FORCE_REQUIRED) +#define NSF_ARGPARSE_BUILTIN (NSF_ARGPARSE_CHECK|NSF_ARGPARSE_FORCE_REQUIRED) #define NSF_ARGPARSE_START_ZERO 0x0010 /* Special flags for process method arguments */ #define NSF_ARGPARSE_METHOD_PUSH 0x0100 @@ -334,18 +334,18 @@ #define NSF_ARG_REQUIRED 0x00000001u #define NSF_ARG_MULTIVALUED 0x00000002u -#define NSF_ARG_NOARG 0x00000004u -#define NSF_ARG_NOCONFIG 0x00000008u +#define NSF_ARG_NOARG 0x00000004u +#define NSF_ARG_NOCONFIG 0x00000008u #define NSF_ARG_CURRENTLY_UNKNOWN 0x00000010u #define NSF_ARG_SUBST_DEFAULT 0x00000020u #define NSF_ARG_ALLOW_EMPTY 0x00000040u -#define NSF_ARG_INITCMD 0x00000080u -#define NSF_ARG_CMD 0x00000100u -#define NSF_ARG_ALIAS 0x00000200u -#define NSF_ARG_FORWARD 0x00000400u -#define NSF_ARG_SWITCH 0x00000800u -#define NSF_ARG_BASECLASS 0x00001000u -#define NSF_ARG_METACLASS 0x00002000u +#define NSF_ARG_INITCMD 0x00000080u +#define NSF_ARG_CMD 0x00000100u +#define NSF_ARG_ALIAS 0x00000200u +#define NSF_ARG_FORWARD 0x00000400u +#define NSF_ARG_SWITCH 0x00000800u +#define NSF_ARG_BASECLASS 0x00001000u +#define NSF_ARG_METACLASS 0x00002000u #define NSF_ARG_HAS_DEFAULT 0x00004000u #define NSF_ARG_IS_CONVERTER 0x00008000u #define NSF_ARG_IS_ENUMERATION 0x00010000u @@ -361,7 +361,7 @@ #undef __GNUC_PREREQ #if defined __GNUC__ && defined __GNUC_MINOR__ # define __GNUC_PREREQ(maj, min) \ - ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) #else # define __GNUC_PREREQ(maj, min) (0) #endif Index: generic/nsfInt.h =================================================================== diff -u -r394c8d712c6840f9227664b90bbcb9fa14d57b87 -r3f78bdd8db9ec3b80bd2a280a5f148ad81d7c9f5 --- generic/nsfInt.h (.../nsfInt.h) (revision 394c8d712c6840f9227664b90bbcb9fa14d57b87) +++ generic/nsfInt.h (.../nsfInt.h) (revision 3f78bdd8db9ec3b80bd2a280a5f148ad81d7c9f5) @@ -4,9 +4,9 @@ * Declarations of the internally used API Functions of the Next * Scripting Framework. * - * Copyright (C) 1999-2016 Gustaf Neumann (a, b) + * Copyright (C) 1999-2017 Gustaf Neumann (a, b) * Copyright (C) 1999-2007 Uwe Zdun (a, b) - * Copyright (C) 2011-2016 Stefan Sobernig (b) + * Copyright (C) 2011-2017 Stefan Sobernig (b) * * (a) University of Essen * Specification of Software Systems @@ -122,27 +122,27 @@ #if defined(NSF_DTRACE) # include "nsfDTrace.h" -# define NSF_DTRACE_METHOD_ENTRY_ENABLED() unlikely(NSF_METHOD_ENTRY_ENABLED()) -# define NSF_DTRACE_METHOD_RETURN_ENABLED() unlikely(NSF_METHOD_RETURN_ENABLED()) +# define NSF_DTRACE_METHOD_ENTRY_ENABLED() unlikely(NSF_METHOD_ENTRY_ENABLED()) +# define NSF_DTRACE_METHOD_RETURN_ENABLED() unlikely(NSF_METHOD_RETURN_ENABLED()) # define NSF_DTRACE_OBJECT_ALLOC_ENABLED() unlikely(NSF_OBJECT_ALLOC_ENABLED()) -# define NSF_DTRACE_OBJECT_FREE_ENABLED() unlikely(NSF_OBJECT_FREE_ENABLED()) -# define NSF_DTRACE_CONFIGURE_PROBE_ENABLED() unlikely(NSF_CONFIGURE_PROBE_ENABLED()) +# define NSF_DTRACE_OBJECT_FREE_ENABLED() unlikely(NSF_OBJECT_FREE_ENABLED()) +# define NSF_DTRACE_CONFIGURE_PROBE_ENABLED() unlikely(NSF_CONFIGURE_PROBE_ENABLED()) # define NSF_DTRACE_METHOD_ENTRY(a0, a1, a2, a3, a4) NSF_METHOD_ENTRY((a0), (a1), (a2), (a3), (a4)) -# define NSF_DTRACE_METHOD_RETURN(a0, a1, a2, a3) NSF_METHOD_RETURN((a0), (a1), (a2), (a3)) +# define NSF_DTRACE_METHOD_RETURN(a0, a1, a2, a3) NSF_METHOD_RETURN((a0), (a1), (a2), (a3)) # define NSF_DTRACE_OBJECT_ALLOC(a0, a1) NSF_OBJECT_ALLOC((a0), (a1)) -# define NSF_DTRACE_OBJECT_FREE(a0, a1) NSF_OBJECT_FREE((a0), (a1)) -# define NSF_DTRACE_CONFIGURE_PROBE(a0, a1) NSF_CONFIGURE_PROBE((a0), (a1)) +# define NSF_DTRACE_OBJECT_FREE(a0, a1) NSF_OBJECT_FREE((a0), (a1)) +# define NSF_DTRACE_CONFIGURE_PROBE(a0, a1) NSF_CONFIGURE_PROBE((a0), (a1)) #else -# define NSF_DTRACE_METHOD_ENTRY_ENABLED() 0 -# define NSF_DTRACE_METHOD_RETURN_ENABLED() 0 +# define NSF_DTRACE_METHOD_ENTRY_ENABLED() 0 +# define NSF_DTRACE_METHOD_RETURN_ENABLED() 0 # define NSF_DTRACE_OBJECT_ALLOC_ENABLED() 0 -# define NSF_DTRACE_OBJECT_FREE_ENABLED() 0 +# define NSF_DTRACE_OBJECT_FREE_ENABLED() 0 # define NSF_DTRACE_CONFIGURE_PROBE_ENABLED() 0 -# define NSF_DTRACE_METHOD_ENTRY(a0, a1, a2, a3, a4) {} -# define NSF_DTRACE_METHOD_RETURN(a0, a1, a2, a3) {} +# define NSF_DTRACE_METHOD_ENTRY(a0, a1, a2, a3, a4) {} +# define NSF_DTRACE_METHOD_RETURN(a0, a1, a2, a3) {} # define NSF_DTRACE_OBJECT_ALLOC(a0, a1) {} -# define NSF_DTRACE_OBJECT_FREE(a0, a1) {} -# define NSF_DTRACE_CONFIGURE_PROBE(a0, a1) {} +# define NSF_DTRACE_OBJECT_FREE(a0, a1) {} +# define NSF_DTRACE_CONFIGURE_PROBE(a0, a1) {} #endif @@ -212,7 +212,7 @@ *(m) == 'c' && (m)[1] == 'h' && (m)[2] == 'e' && (m)[3] == 'c' && \ (m)[4] == 'k' && (m)[5] == '\0') #define isCheckObjString(m) (\ - *(m) == 'c' && (m)[1] == 'h' && (m)[2] == 'e' && (m)[3] == 'c' && \ + *(m) == 'c' && (m)[1] == 'h' && (m)[2] == 'e' && (m)[3] == 'c' && \ (m)[4] == 'k' && (m)[5] == 'o' && (m)[6] == 'b' && (m)[7] == 'j' && \ (m)[8] == '\0') #define isCreateString(m) (\ @@ -314,8 +314,8 @@ # define PRINTOBJ(ctx,obj) \ fprintf(stderr, " %s %p %s oid=%p teardown=%p destroyCalled=%d\n", \ (ctx),(obj),(obj)->teardown?ObjStr((obj)->cmdName):"(deleted)", \ - (obj)->id, (obj)->teardown, \ - ((obj)->flags & NSF_DESTROY_CALLED)) + (obj)->id, (obj)->teardown, \ + ((obj)->flags & NSF_DESTROY_CALLED)) #else # define PRINTOBJ(ctx,obj) #endif @@ -433,7 +433,7 @@ * cmd flags */ -#define NSF_CMD_CALL_PROTECTED_METHOD 0x00010000 +#define NSF_CMD_CALL_PROTECTED_METHOD 0x00010000 #define NSF_CMD_CALL_PRIVATE_METHOD 0x00020000 #define NSF_CMD_REDEFINE_PROTECTED_METHOD 0x00040000 /* NSF_CMD_NONLEAF_METHOD is used to flag, if a Method implemented via cmd calls "next" */ @@ -501,7 +501,7 @@ /* flags for ParseContext */ #define NSF_PC_MUST_DECR 0x0001u #define NSF_PC_IS_DEFAULT 0x0002u -#define NSF_PC_INVERT_DEFAULT 0x0010u +#define NSF_PC_INVERT_DEFAULT 0x0010u #define NSF_PC_STATUS_MUST_DECR 0x0001u #define NSF_PC_STATUS_FREE_OBJV 0x0002u @@ -910,14 +910,14 @@ Tcl_Namespace *NsfClassesNS; /* the ::nsf::classes namespace, where classes are created physically */ Tcl_ObjCmdProc *objInterpProc; /* cached result of TclGetObjInterpProc() */ Tcl_Command colonCmd; /* cmdPtr of cmd ":" to dispatch via cmdResolver */ - Proc fakeProc; /* dummy proc strucure, used for C-implemented methods with local scope */ + Proc fakeProc; /* dummy proc structure, used for C-implemented methods with local scope */ Tcl_Command currentMixinCmdPtr; /* cmdPtr of currently active mixin, used for "info activemixin" */ int objectMethodEpoch; int instanceMethodEpoch; #if defined(PER_OBJECT_PARAMETER_CACHING) int classParamPtrEpoch; #endif - unsigned int overloadedMethods; /* bitarray for tracking overloaded methods */ + unsigned int overloadedMethods; /* bit-array for tracking overloaded methods */ Tcl_Obj **methodObjNames; /* global objects of nsf */ struct NsfShadowTclCommandInfo *tclCommands; /* shadowed Tcl commands */ @@ -928,7 +928,7 @@ int unknown; /* keep track whether an unknown method is currently called */ /* * Configure options. The following do*-flags could be moved into a - * bitarray, but we have only one state per interp, so the win on + * bit-array, but we have only one state per interp, so the win on * memory is very little. */ int logSeverity; @@ -942,7 +942,7 @@ unsigned int preventRecursionFlags; int doClassConverterOmitUnknown; int doSoftrecreate; - int exitHandlerDestroyRound; /* shutdown handling */ + int exitHandlerDestroyRound; /* shutdown handling */ Tcl_HashTable activeFilterTablePtr; /* keep track of defined filters */ @@ -1031,7 +1031,7 @@ int objc, Tcl_Obj **objv) nonnull(1) nonnull(4); EXTERN void NsfProfileDebugExit(Tcl_Interp *interp, NsfObject *object, NsfClass *cl, const char *methodName, - long startSec, long startUsec) + long startSec, long startUsec) nonnull(1) nonnull(4); #if defined(NSF_PROFILE) @@ -1272,7 +1272,7 @@ versions provide a prefixed (__*) one. The by-feature test below falls back to the prefixed version, if available, and provides a more general fallback to a simple assignment; this is primarily for - MSVC; admittedly, this simplifcation is not generally portable to + MSVC; admittedly, this simplification is not generally portable to platform/compiler combos other then x86, but the best I can think of right now. One might constrain the assignment-fallback to a platform and leave va_copy undefined in uncaught platform cases (?).