Index: TODO =================================================================== diff -u -r76bdfab614f658464ee9e020d0275868cdd61026 -rd86805a2250aaa861470d4f4a13945d603585aca --- TODO (.../TODO) (revision 76bdfab614f658464ee9e020d0275868cdd61026) +++ TODO (.../TODO) (revision d86805a2250aaa861470d4f4a13945d603585aca) @@ -5340,8 +5340,12 @@ - use functions IsRootClass(), IsRootMetaClass() and IsBaseClass() to access object/class properties +- add gcc attribute "pure" - +- rename + nsf::parameter:invalidate::classcache -> nsf::parameter::cache::classinvalidate + nsf::parameter:invalidate::objectcache -> nsf::parameter::cache::objectinvalidate + reasons: (a) remove single colon inside the name, (b) put verb to the end ======================================================================== TODO: Index: generic/nsf.c =================================================================== diff -u -r76bdfab614f658464ee9e020d0275868cdd61026 -rd86805a2250aaa861470d4f4a13945d603585aca --- generic/nsf.c (.../nsf.c) (revision 76bdfab614f658464ee9e020d0275868cdd61026) +++ generic/nsf.c (.../nsf.c) (revision d86805a2250aaa861470d4f4a13945d603585aca) @@ -326,7 +326,7 @@ /* prototypes for parameter and argument management */ -static int NsfParameterInvalidateClassCacheCmd(Tcl_Interp *interp, NsfClass *cl) +static int NsfParameterCacheClassInvalidateCmd(Tcl_Interp *interp, NsfClass *cl) nonnull(1) nonnull(2); static int ProcessMethodArguments(ParseContext *pcPtr, Tcl_Interp *interp, NsfObject *object, int processFlags, NsfParamDefs *paramDefs, @@ -356,7 +356,7 @@ nonnull(1) nonnull(4) nonnull(5); static void NsfProcDeleteProc(ClientData clientData) nonnull(1); -static int NsfParameterInvalidateObjectCacheCmd(Tcl_Interp *interp, NsfObject *object) +static int NsfParameterCacheObjectInvalidateCmd(Tcl_Interp *interp, NsfObject *object) nonnull(1) nonnull(2); static int GetObjectParameterDefinition(Tcl_Interp *interp, Tcl_Obj *procNameObj, @@ -8794,7 +8794,7 @@ * parameter definitions. */ /*fprintf(stderr, "MixinInvalidateObjOrders via class mixin %s calls ifd invalidate \n", ClassName(ncl));*/ - NsfParameterInvalidateClassCacheCmd(interp, ncl); + NsfParameterCacheClassInvalidateCmd(interp, ncl); } } Tcl_DeleteHashTable(commandTable); @@ -17856,7 +17856,7 @@ #if defined(PER_OBJECT_PARAMETER_CACHING) if (object->opt->parsedParamPtr) { - NsfParameterInvalidateObjectCacheCmd(interp, object); + NsfParameterCacheObjectInvalidateCmd(interp, object); } #endif @@ -25473,12 +25473,12 @@ } /* -cmd parameter:invalidate::classcache NsfParameterInvalidateClassCacheCmd { +cmd parameter::cache::classinvalidate NsfParameterCacheClassInvalidateCmd { {-argName "class" -required 1 -type class} } */ static int -NsfParameterInvalidateClassCacheCmd(Tcl_Interp *interp, NsfClass *cl) { +NsfParameterCacheClassInvalidateCmd(Tcl_Interp *interp, NsfClass *cl) { NsfClasses *subClasses; NsfClasses *clPtr; int isMixinOf = 0, nrSubClasses = 0; @@ -25492,7 +25492,7 @@ */ #if defined(PER_OBJECT_PARAMETER_CACHING) if (unlikely(cl->parsedParamPtr != NULL)) { - NsfClassParamPtrEpochIncr("NsfParameterInvalidateClassCacheCmd"); + NsfClassParamPtrEpochIncr("NsfParameterCacheClassInvalidateCmd"); } #endif @@ -25581,12 +25581,12 @@ /* -cmd parameter:invalidate::objectcache NsfParameterInvalidateObjectCacheCmd { +cmd parameter::cache::objectinvalidate NsfParameterCacheObjectInvalidateCmd { {-argName "object" -required 1 -type object} } */ static int -NsfParameterInvalidateObjectCacheCmd(Tcl_Interp *interp, NsfObject *object) { +NsfParameterCacheObjectInvalidateCmd(Tcl_Interp *interp, NsfObject *object) { assert(interp); assert(object); @@ -25935,7 +25935,7 @@ /* * Invalidate per-object infos */ - NsfParameterInvalidateObjectCacheCmd(interp, object); + NsfParameterCacheObjectInvalidateCmd(interp, object); object->flags &= ~NSF_MIXIN_ORDER_VALID; /* * Since mixin procs may be used as filters -> we have to invalidate @@ -26611,7 +26611,7 @@ } else if (object) { NsfObjectOpt *opt = NsfRequireObjectOpt(object); if (object->opt->parsedParamPtr) { - NsfParameterInvalidateObjectCacheCmd(interp, object); + NsfParameterCacheObjectInvalidateCmd(interp, object); } opt->parsedParamPtr = ppDefPtr; opt->classParamPtrEpoch = RUNTIME_STATE(interp)->classParamPtrEpoch; Index: generic/nsfAPI.decls =================================================================== diff -u -ra093703e9836fc152fcbbce96d4f880ace6a6170 -rd86805a2250aaa861470d4f4a13945d603585aca --- generic/nsfAPI.decls (.../nsfAPI.decls) (revision a093703e9836fc152fcbbce96d4f880ace6a6170) +++ generic/nsfAPI.decls (.../nsfAPI.decls) (revision d86805a2250aaa861470d4f4a13945d603585aca) @@ -80,11 +80,11 @@ {-argName "varname" -required 0 -type tclobj} } -cmd parameter:invalidate::classcache NsfParameterInvalidateClassCacheCmd { +cmd parameter::cache::classinvalidate NsfParameterCacheClassInvalidateCmd { {-argName "class" -required 1 -type class} } -cmd parameter:invalidate::objectcache NsfParameterInvalidateObjectCacheCmd { +cmd parameter::cache::objectinvalidate NsfParameterCacheObjectInvalidateCmd { {-argName "object" -required 1 -type object} } Index: generic/nsfAPI.h =================================================================== diff -u -ra093703e9836fc152fcbbce96d4f880ace6a6170 -rd86805a2250aaa861470d4f4a13945d603585aca --- generic/nsfAPI.h (.../nsfAPI.h) (revision a093703e9836fc152fcbbce96d4f880ace6a6170) +++ generic/nsfAPI.h (.../nsfAPI.h) (revision d86805a2250aaa861470d4f4a13945d603585aca) @@ -393,11 +393,11 @@ NSF_nonnull(2) NSF_nonnull(4); static int NsfObjectSystemCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) NSF_nonnull(2) NSF_nonnull(4); -static int NsfParameterInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) +static int NsfParameterCacheClassInvalidateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) NSF_nonnull(2) NSF_nonnull(4); -static int NsfParameterInvalidateClassCacheCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) +static int NsfParameterCacheObjectInvalidateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) NSF_nonnull(2) NSF_nonnull(4); -static int NsfParameterInvalidateObjectCacheCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) +static int NsfParameterInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) NSF_nonnull(2) NSF_nonnull(4); static int NsfParameterSpecsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) NSF_nonnull(2) NSF_nonnull(4); @@ -614,12 +614,12 @@ NSF_nonnull(1) NSF_nonnull(2); static int NsfObjectSystemCreateCmd(Tcl_Interp *interp, Tcl_Obj *rootClass, Tcl_Obj *rootMetaClass, Tcl_Obj *systemMethods) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfParameterInfoCmd(Tcl_Interp *interp, int subcmd, Tcl_Obj *spec, Tcl_Obj *varname) - NSF_nonnull(1) NSF_nonnull(3); -static int NsfParameterInvalidateClassCacheCmd(Tcl_Interp *interp, NsfClass *class) +static int NsfParameterCacheClassInvalidateCmd(Tcl_Interp *interp, NsfClass *class) NSF_nonnull(1) NSF_nonnull(2); -static int NsfParameterInvalidateObjectCacheCmd(Tcl_Interp *interp, NsfObject *object) +static int NsfParameterCacheObjectInvalidateCmd(Tcl_Interp *interp, NsfObject *object) NSF_nonnull(1) NSF_nonnull(2); +static int NsfParameterInfoCmd(Tcl_Interp *interp, int subcmd, Tcl_Obj *spec, Tcl_Obj *varname) + NSF_nonnull(1) NSF_nonnull(3); static int NsfParameterSpecsCmd(Tcl_Interp *interp, int withConfigure, int withNonposargs, Tcl_Obj *slotobjs) NSF_nonnull(1) NSF_nonnull(4); static int NsfProcCmd(Tcl_Interp *interp, int withAd, int withCheckalways, Tcl_Obj *procName, Tcl_Obj *arguments, Tcl_Obj *body) @@ -784,9 +784,9 @@ NsfObjectPropertyCmdIdx, NsfObjectQualifyCmdIdx, NsfObjectSystemCreateCmdIdx, + NsfParameterCacheClassInvalidateCmdIdx, + NsfParameterCacheObjectInvalidateCmdIdx, NsfParameterInfoCmdIdx, - NsfParameterInvalidateClassCacheCmdIdx, - NsfParameterInvalidateObjectCacheCmdIdx, NsfParameterSpecsCmdIdx, NsfProcCmdIdx, NsfProfileClearDataStubIdx, @@ -2001,58 +2001,58 @@ } static int -NsfParameterInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +NsfParameterCacheClassInvalidateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { ParseContext pc; (void)clientData; if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], - method_definitions[NsfParameterInfoCmdIdx].paramDefs, - method_definitions[NsfParameterInfoCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, + method_definitions[NsfParameterCacheClassInvalidateCmdIdx].paramDefs, + method_definitions[NsfParameterCacheClassInvalidateCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { - int subcmd = (int )PTR2INT(pc.clientData[0]); - Tcl_Obj *spec = (Tcl_Obj *)pc.clientData[1]; - Tcl_Obj *varname = (Tcl_Obj *)pc.clientData[2]; + NsfClass *class = (NsfClass *)pc.clientData[0]; assert(pc.status == 0); - return NsfParameterInfoCmd(interp, subcmd, spec, varname); + return NsfParameterCacheClassInvalidateCmd(interp, class); } else { return TCL_ERROR; } } static int -NsfParameterInvalidateClassCacheCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +NsfParameterCacheObjectInvalidateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { ParseContext pc; (void)clientData; if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], - method_definitions[NsfParameterInvalidateClassCacheCmdIdx].paramDefs, - method_definitions[NsfParameterInvalidateClassCacheCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, + method_definitions[NsfParameterCacheObjectInvalidateCmdIdx].paramDefs, + method_definitions[NsfParameterCacheObjectInvalidateCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { - NsfClass *class = (NsfClass *)pc.clientData[0]; + NsfObject *object = (NsfObject *)pc.clientData[0]; assert(pc.status == 0); - return NsfParameterInvalidateClassCacheCmd(interp, class); + return NsfParameterCacheObjectInvalidateCmd(interp, object); } else { return TCL_ERROR; } } static int -NsfParameterInvalidateObjectCacheCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +NsfParameterInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { ParseContext pc; (void)clientData; if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], - method_definitions[NsfParameterInvalidateObjectCacheCmdIdx].paramDefs, - method_definitions[NsfParameterInvalidateObjectCacheCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, + method_definitions[NsfParameterInfoCmdIdx].paramDefs, + method_definitions[NsfParameterInfoCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { - NsfObject *object = (NsfObject *)pc.clientData[0]; + int subcmd = (int )PTR2INT(pc.clientData[0]); + Tcl_Obj *spec = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *varname = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfParameterInvalidateObjectCacheCmd(interp, object); + return NsfParameterInfoCmd(interp, subcmd, spec, varname); } else { return TCL_ERROR; @@ -3454,17 +3454,17 @@ {"rootMetaClass", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}, {"systemMethods", 0, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}} }, +{"::nsf::parameter::cache::classinvalidate", NsfParameterCacheClassInvalidateCmdStub, 1, { + {"class", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Class, NULL,NULL,"class",NULL,NULL,NULL,NULL,NULL}} +}, +{"::nsf::parameter::cache::objectinvalidate", NsfParameterCacheObjectInvalidateCmdStub, 1, { + {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Object, NULL,NULL,"object",NULL,NULL,NULL,NULL,NULL}} +}, {"::nsf::parameter::info", NsfParameterInfoCmdStub, 3, { {"subcmd", NSF_ARG_REQUIRED|NSF_ARG_IS_ENUMERATION, 1, ConvertToParametersubcmd, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}, {"spec", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}, {"varname", 0, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}} }, -{"::nsf::parameter:invalidate::classcache", NsfParameterInvalidateClassCacheCmdStub, 1, { - {"class", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Class, NULL,NULL,"class",NULL,NULL,NULL,NULL,NULL}} -}, -{"::nsf::parameter:invalidate::objectcache", NsfParameterInvalidateObjectCacheCmdStub, 1, { - {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Object, NULL,NULL,"object",NULL,NULL,NULL,NULL,NULL}} -}, {"::nsf::parameter::specs", NsfParameterSpecsCmdStub, 3, { {"-configure", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL}, {"-nonposargs", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL}, Index: generic/nsfAPI.nxdocindex =================================================================== diff -u -r729b49eb1dcb08183a0ed41588416a923271811a -rd86805a2250aaa861470d4f4a13945d603585aca --- generic/nsfAPI.nxdocindex (.../nsfAPI.nxdocindex) (revision 729b49eb1dcb08183a0ed41588416a923271811a) +++ generic/nsfAPI.nxdocindex (.../nsfAPI.nxdocindex) (revision d86805a2250aaa861470d4f4a13945d603585aca) @@ -14,8 +14,8 @@ set ::nxdoc::include(::nsf::interp) 1 set ::nxdoc::include(::nsf::is) 1 set ::nxdoc::include(::nsf::parameter::info) 0 -set ::nxdoc::include(::nsf::parameter:invalidate::classcache) 0 -set ::nxdoc::include(::nsf::parameter:invalidate::objectcache) 0 +set ::nxdoc::include(::nsf::parameter::cache::classinvalidate) 0 +set ::nxdoc::include(::nsf::parameter::cache::objectinvalidate) 0 set ::nxdoc::include(::nsf::parameter::specs) 0 set ::nxdoc::include(::nsf::cmd::info) 1 set ::nxdoc::include(::nsf::method::alias) 1 Index: library/nx/nx.tcl =================================================================== diff -u -r9bb3f16fc720a197d6665e0ca3f7bc98fda7c8cd -rd86805a2250aaa861470d4f4a13945d603585aca --- library/nx/nx.tcl (.../nx.tcl) (revision 9bb3f16fc720a197d6665e0ca3f7bc98fda7c8cd) +++ library/nx/nx.tcl (.../nx.tcl) (revision d86805a2250aaa861470d4f4a13945d603585aca) @@ -1132,8 +1132,8 @@ ::nsf::var::set $slotObj configurable 1 } - #puts stderr "Bootstrap-slot for $class calls parameter:invalidate::classcache" - ::nsf::parameter:invalidate::classcache $class + #puts stderr "Bootstrap-slot for $class calls parameter::cache::classinvalidate" + ::nsf::parameter::cache::classinvalidate $class } ObjectParameterSlot protected method namedParameterSpec {-map-private:switch prefix name options} { @@ -1255,9 +1255,9 @@ set :methodname ${:name} } if {${:per-object}} { - ::nsf::parameter:invalidate::objectcache ${:domain} + ::nsf::parameter::cache::objectinvalidate ${:domain} } else { - ::nsf::parameter:invalidate::classcache ${:domain} + ::nsf::parameter::cache::classinvalidate ${:domain} } nsf::object::property [self] initialized 1 # @@ -1274,12 +1274,12 @@ #puts stderr "*** slot destroy of [self], domain ${:domain} per-object ${:per-object}" if {${:per-object}} { - ::nsf::parameter:invalidate::objectcache ${:domain} + ::nsf::parameter::cache::objectinvalidate ${:domain} if {[${:domain} ::nsf::methods::object::info::method exists ${:name}]} { ::nsf::method::delete ${:domain} -per-object ${:name} } } else { - ::nsf::parameter:invalidate::classcache ${:domain} + ::nsf::parameter::cache::classinvalidate ${:domain} if {[${:domain} ::nsf::methods::class::info::method exists ${:name}]} { ::nsf::method::delete ${:domain} ${:name} } @@ -1467,7 +1467,7 @@ # Invalidate previously defined object parameter (built with the # empty objectparameter definition. # - ::nsf::parameter:invalidate::classcache MetaSlot + ::nsf::parameter::cache::classinvalidate MetaSlot ###################################################################### # Define objectparameter method @@ -1660,7 +1660,7 @@ # # Make sure the invalidate all ObjectParameterSlots # - ::nsf::parameter:invalidate::classcache ::nx::ObjectParameterSlot + ::nsf::parameter::cache::classinvalidate ::nx::ObjectParameterSlot # # Define method "guard" for mixin- and filter-slots of Object and Class @@ -1711,7 +1711,7 @@ ###################################################################### # Variable slots ###################################################################### - ::nsf::parameter:invalidate::classcache MetaSlot + ::nsf::parameter::cache::classinvalidate MetaSlot MetaSlot create ::nx::VariableSlot -superclass ::nx::ObjectParameterSlot @@ -1868,7 +1868,7 @@ :setCheckedInstVar -nocomplain=[info exists :nocomplain] ${:domain} ${:default} } if {[::nsf::is class ${:domain}]} { - ::nsf::parameter:invalidate::classcache ${:domain} + ::nsf::parameter::cache::classinvalidate ${:domain} } } Index: tests/disposition.test =================================================================== diff -u -rd9344280c05990c0254aa652a08a09da3e5822b1 -rd86805a2250aaa861470d4f4a13945d603585aca --- tests/disposition.test (.../disposition.test) (revision d9344280c05990c0254aa652a08a09da3e5822b1) +++ tests/disposition.test (.../disposition.test) (revision d86805a2250aaa861470d4f4a13945d603585aca) @@ -27,7 +27,7 @@ # :public object method setObjectParams {spec} { :protected method __object_configureparameter {} [list return $spec] - ::nsf::parameter:invalidate::classcache [current] + ::nsf::parameter::cache::classinvalidate [current] } :setObjectParams "" @@ -322,7 +322,7 @@ Class create S { :public object method setObjectParams {spec} { :protected method __object_configureparameter {} [list return $spec] - ::nsf::parameter:invalidate::classcache [current] + ::nsf::parameter::cache::classinvalidate [current] } #:object method __object_configureparameter {} { # return ${:objectparams} @@ -385,7 +385,7 @@ Class create R { :public object method setObjectParams {spec} { :protected method __object_configureparameter {} [list return $spec] - ::nsf::parameter:invalidate::classcache [current] + ::nsf::parameter::cache::classinvalidate [current] } } @@ -449,7 +449,7 @@ Class create Callee { :public object method setObjectParams {spec} { :protected method __object_configureparameter {} [list return $spec] - ::nsf::parameter:invalidate::classcache [current] + ::nsf::parameter::cache::classinvalidate [current] } } @@ -617,7 +617,7 @@ Class create C { :public object method setObjectParams {spec} { :protected method __object_configureparameter {} [list return $spec] - ::nsf::parameter:invalidate::classcache [current] + ::nsf::parameter::cache::classinvalidate [current] } :public method foo {args} { set :foo $args @@ -758,7 +758,7 @@ Class create C { :public object method setObjectParams {spec} { :protected method __object_configureparameter {} [list return $spec] - ::nsf::parameter:invalidate::classcache [current] + ::nsf::parameter::cache::classinvalidate [current] } } @@ -773,7 +773,7 @@ Class create C { :public object method setObjectParams {spec} { :protected method __object_configureparameter {} [list return $spec] - ::nsf::parameter:invalidate::classcache [current] + ::nsf::parameter::cache::classinvalidate [current] } :public method Residualargs args { #puts stderr "aliased RESIDUALARGS <[llength $args]>" @@ -863,7 +863,7 @@ Class create C { :public object method setObjectParams {spec} { :protected method __object_configureparameter {} [list return $spec] - ::nsf::parameter:invalidate::classcache [current] + ::nsf::parameter::cache::classinvalidate [current] } :method init {} { incr :y @@ -884,7 +884,7 @@ Class create C { :public object method setObjectParams {spec} { :protected method __object_configureparameter {} [list return $spec] - ::nsf::parameter:invalidate::classcache [current] + ::nsf::parameter::cache::classinvalidate [current] } } @@ -1084,7 +1084,7 @@ Class create C { :public object method setObjectParams {spec} { :protected method __object_configureparameter {} [list return $spec] - ::nsf::parameter:invalidate::classcache [current] + ::nsf::parameter::cache::classinvalidate [current] } } @@ -1175,7 +1175,7 @@ Class create T { :public object method setObjectParams {spec} { :protected method __object_configureparameter {} [list return $spec] - ::nsf::parameter:invalidate::classcache [current] + ::nsf::parameter::cache::classinvalidate [current] } } Index: tests/parameters.test =================================================================== diff -u -r2f793442bb2a7860acc5620811dcafddc43074d3 -rd86805a2250aaa861470d4f4a13945d603585aca --- tests/parameters.test (.../parameters.test) (revision 2f793442bb2a7860acc5620811dcafddc43074d3) +++ tests/parameters.test (.../parameters.test) (revision d86805a2250aaa861470d4f4a13945d603585aca) @@ -1935,7 +1935,7 @@ # Invalidate the object parameter and expect that the per-class # mixin does not harm # - ::nsf::parameter:invalidate::classcache C + ::nsf::parameter::cache::classinvalidate C # # We have now "-b1:required" in the configure parameters. @@ -2037,7 +2037,7 @@ # invalidate object parameter and expect that the per-class mixin # does not harm # - ::nsf::parameter:invalidate::classcache C + ::nsf::parameter::cache::classinvalidate C ? {c1 __configure -a1 x} \ "required argument 'b1' is missing, should be: @@ -2642,7 +2642,7 @@ nx::Class create C { :public object method setObjectParams {spec} { :protected method __object_configureparameter {} [list return $spec] - ::nsf::parameter:invalidate::classcache [self] + ::nsf::parameter::cache::classinvalidate [self] } :setObjectParams "" } Index: tests/properties.test =================================================================== diff -u -rb3b35e7780dcdaf8c2d07aaba4b01128f9dd2683 -rd86805a2250aaa861470d4f4a13945d603585aca --- tests/properties.test (.../properties.test) (revision b3b35e7780dcdaf8c2d07aaba4b01128f9dd2683) +++ tests/properties.test (.../properties.test) (revision d86805a2250aaa861470d4f4a13945d603585aca) @@ -1065,7 +1065,7 @@ puts stderr ========= ? {C info heritage} "::M2 ::M1 ::M0 ::nx::Object" - #::nsf::parameter:invalidate::classcache ::C + #::nsf::parameter::cache::classinvalidate ::C ? {lmap p [C info lookup parameters create] {nsf::parameter::info name $p}} \ "objectName y x object-mixin class object-filter __initblock"