Index: TODO =================================================================== diff -u -rac2bbda827dff056beb23cf8400ab77b6996d1e8 -rb337f38c9e541e733674aac902eddb0fe44c0164 --- TODO (.../TODO) (revision ac2bbda827dff056beb23cf8400ab77b6996d1e8) +++ TODO (.../TODO) (revision b337f38c9e541e733674aac902eddb0fe44c0164) @@ -4513,6 +4513,17 @@ (not fully implemented/tested) - fixed property/variable inheritance in traits. +nsf.c: +- changed enumeration values for "-source" in + "info lookup methods" + "info lookup slots" + "info methods" + "info slots" + of "all|application|baseclasses" + to "all|application|system" + for consistencey with "nsf::my" and "nsf::dispatch" + which uses "-system" as well + ======================================================================== TODO: @@ -4563,22 +4574,7 @@ /cls/ property ?-accessor /value/? ?-config /boolean/? ?-incremental? ?-type /class/? /spec/ ?/initblock/? - * naming: application vs. baseclasses -> applicationclasses - vs. baseclasses ... - /obj/ info lookup methods ?-callprotection all|public|protected|private? ?-incontext? ?-methodtype all|scripted|builtin|alias|forwarder|object|setter|nsfproc? ?-nomixins? ?-path? ?-source all|application|baseclasses? ?/pattern/? - - better: - -/obj/ info lookup methods ?-callprotection all|public|protected|private? ?-incontext? ?-methodtype all|scripted|builtin|alias|forwarder|object|setter|nsfproc? ?-nomixins? ?-path? ?-source all|applicationclasses|baseclasses? ?/pattern/? - - should be consistent, either way. - - or: - - -class all|application|base - -classes all|application|base - * - naming in slots: "incremental", "reconfigure" * Currently, in NX, specifying mandatory parameters may break Index: generic/nsf.c =================================================================== diff -u -r240cd3e5e7bfd197336735684cbac012ad84563b -rb337f38c9e541e733674aac902eddb0fe44c0164 --- generic/nsf.c (.../nsf.c) (revision 240cd3e5e7bfd197336735684cbac012ad84563b) +++ generic/nsf.c (.../nsf.c) (revision b337f38c9e541e733674aac902eddb0fe44c0164) @@ -18217,7 +18217,7 @@ * MethodSourceMatches -- * * Check, whether the provided class or object (mutually exclusive) matches - * with the required method source (typically all|application|baseclasses). + * with the required method source (typically all|application|system). * * Results: * Returns true or false @@ -18244,7 +18244,7 @@ } isBaseClass = IsBaseClass(&cl->object); - if (withSource == SourceBaseclassesIdx && isBaseClass) { + if (withSource == SourceSystemIdx && isBaseClass) { return 1; } else if (withSource == SourceApplicationIdx && !isBaseClass) { return 1; @@ -23929,7 +23929,7 @@ {-argName "-type" -nrargs 1 -typeName "methodtype" -type "all|scripted|builtin|alias|forwarder|object|setter"} {-argName "-nomixins"} {-argName "-path" -nrargs 0} - {-argName "-source" -nrargs 1 -type "all|application|baseclasses"} + {-argName "-source" -nrargs 1 -type "all|application|system"} {-argName "pattern" -required 0} } */ @@ -24030,7 +24030,7 @@ /* objectInfoMethod lookupslots NsfObjInfoLookupSlotsMethod { - {-argName "-source" -nrargs 1 -type "all|application|baseclasses" -default all} + {-argName "-source" -nrargs 1 -type "all|application|system" -default all} {-argName "-type" -required 0 -nrargs 1 -type class} {-argName "pattern" -required 0} } @@ -24524,7 +24524,7 @@ {-argName "-closure" -nrargs 0} {-argName "-type" -typeName "methodtype" -nrargs 1 -type "all|scripted|builtin|alias|forwarder|object|setter"} {-argName "-path" -nrargs 0} - {-argName "-source" -nrargs 1 -type "all|application|baseclasses"} + {-argName "-source" -nrargs 1 -type "all|application|system"} {-argName "pattern"} } */ @@ -24711,7 +24711,7 @@ /* classInfoMethod slots NsfClassInfoSlotobjectsMethod { {-argName "-closure" -nrargs 0} - {-argName "-source" -nrargs 1 -type "all|application|baseclasses"} + {-argName "-source" -nrargs 1 -type "all|application|system"} {-argName "-type" -required 0 -nrargs 1 -type class} {-argName "pattern" -required 0} } Index: generic/nsfAPI.decls =================================================================== diff -u -r240cd3e5e7bfd197336735684cbac012ad84563b -rb337f38c9e541e733674aac902eddb0fe44c0164 --- generic/nsfAPI.decls (.../nsfAPI.decls) (revision 240cd3e5e7bfd197336735684cbac012ad84563b) +++ generic/nsfAPI.decls (.../nsfAPI.decls) (revision b337f38c9e541e733674aac902eddb0fe44c0164) @@ -406,11 +406,11 @@ {-argName "-type" -typeName "methodtype" -type "all|scripted|builtin|alias|forwarder|object|setter|nsfproc"} {-argName "-nomixins" -nrargs 0} {-argName "-path" -nrargs 0} - {-argName "-source" -type "all|application|baseclasses" -default all} + {-argName "-source" -type "all|application|system" -default all} {-argName "pattern" -required 0} } objectInfoMethod lookupslots NsfObjInfoLookupSlotsMethod { - {-argName "-source" -type "all|application|baseclasses" -default all} + {-argName "-source" -type "all|application|system" -default all} {-argName "-type" -required 0 -type class} {-argName "pattern" -required 0} } @@ -484,7 +484,7 @@ {-argName "-closure" -nrargs 0} {-argName "-type" -nrargs 1 -typeName "methodtype" -type "all|scripted|builtin|alias|forwarder|object|setter|nsfproc"} {-argName "-path" -nrargs 0} - {-argName "-source" -nrargs 1 -type "all|application|baseclasses" -default all} + {-argName "-source" -nrargs 1 -type "all|application|system" -default all} {-argName "pattern"} } classInfoMethod mixinclasses NsfClassInfoMixinclassesMethod { @@ -503,7 +503,7 @@ } classInfoMethod slotobjects NsfClassInfoSlotobjectsMethod { {-argName "-closure" -nrargs 0} - {-argName "-source" -type "all|application|baseclasses" -default all} + {-argName "-source" -type "all|application|system" -default all} {-argName "-type" -required 0 -type class} {-argName "pattern" -required 0} } Index: generic/nsfAPI.h =================================================================== diff -u -r240cd3e5e7bfd197336735684cbac012ad84563b -rb337f38c9e541e733674aac902eddb0fe44c0164 --- generic/nsfAPI.h (.../nsfAPI.h) (revision 240cd3e5e7bfd197336735684cbac012ad84563b) +++ generic/nsfAPI.h (.../nsfAPI.h) (revision b337f38c9e541e733674aac902eddb0fe44c0164) @@ -58,12 +58,12 @@ return result; } -enum SourceIdx {SourceNULL, SourceAllIdx, SourceApplicationIdx, SourceBaseclassesIdx}; +enum SourceIdx {SourceNULL, SourceAllIdx, SourceApplicationIdx, SourceSystemIdx}; static int ConvertToSource(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, ClientData *clientData, Tcl_Obj **outObjPtr) { int index, result; - static CONST char *opts[] = {"all", "application", "baseclasses", NULL}; + static CONST char *opts[] = {"all", "application", "system", NULL}; (void)pPtr; result = Tcl_GetIndexFromObj(interp, objPtr, opts, "-source", 0, &index); *clientData = (ClientData) INT2PTR(index + 1); @@ -226,7 +226,7 @@ {ConvertToObjectkind, "class|baseclass|metaclass"}, {ConvertToMethodproperty, "class-only|call-private|call-protected|redefine-protected|returns|slotobj"}, {ConvertToRelationtype, "object-mixin|class-mixin|object-filter|class-filter|class|superclass|rootclass"}, - {ConvertToSource, "all|application|baseclasses"}, + {ConvertToSource, "all|application|system"}, {ConvertToConfigureoption, "debug|dtrace|filter|profile|softrecreate|objectsystems|keepinitcmd|checkresults|checkarguments"}, {ConvertToObjectproperty, "initialized|class|rootmetaclass|rootclass|volatile|slotcontainer|hasperobjectslots|keepcallerself|perobjectdispatch"}, {ConvertToAssertionsubcmd, "check|object-invar|class-invar"}, Index: tests/info-method.test =================================================================== diff -u -r9cead8929011bb4dcc6c44630a91bc5d597520b2 -rb337f38c9e541e733674aac902eddb0fe44c0164 --- tests/info-method.test (.../info-method.test) (revision 9cead8929011bb4dcc6c44630a91bc5d597520b2) +++ tests/info-method.test (.../info-method.test) (revision b337f38c9e541e733674aac902eddb0fe44c0164) @@ -131,16 +131,16 @@ set object_methods "cget configure contains copy delete destroy eval info move object private protected public require volatile" set class_methods "alias cget configure contains copy create delete destroy eval filter forward info method mixin move new object private property protected public require variable volatile" - ? {lsort [::nx::Object info lookup methods -source baseclasses]} $class_methods - ? {lsort [::nx::Class info lookup methods -source baseclasses]} $class_methods + ? {lsort [::nx::Object info lookup methods -source system]} $class_methods + ? {lsort [::nx::Class info lookup methods -source system]} $class_methods ? {lsort [::nx::Object info lookup methods -source all]} $class_methods ? {lsort [::nx::Class info lookup methods -source all]} $class_methods ? {lsort [::nx::Object info lookup methods]} $class_methods ? {lsort [::nx::Class info lookup methods]} $class_methods ? {lsort [C info lookup methods -source application]} "add1 apo fpo mpo spo" ? {lsort [c1 info lookup methods -source application]} "a addOne foo m m-with-assertions s" - ? {lsort [C info lookup methods -source baseclasses]} $class_methods - ? {lsort [c1 info lookup methods -source baseclasses]} $object_methods + ? {lsort [C info lookup methods -source system]} $class_methods + ? {lsort [c1 info lookup methods -source system]} $object_methods ::nx::configure defaultMethodCallProtection true # @@ -679,7 +679,7 @@ ? {nx::Object info method parameters "info lookup methods"} \ "-callprotection -incontext:switch -type -nomixins:switch -path:switch -source pattern:optional" ? {nx::Object info method syntax "info lookup methods"} \ - "/cls/ info lookup methods ?-callprotection all|public|protected|private? ?-incontext? ?-type all|scripted|builtin|alias|forwarder|object|setter|nsfproc? ?-nomixins? ?-path? ?-source all|application|baseclasses? ?/pattern/?" + "/cls/ info lookup methods ?-callprotection all|public|protected|private? ?-incontext? ?-type all|scripted|builtin|alias|forwarder|object|setter|nsfproc? ?-nomixins? ?-path? ?-source all|application|system? ?/pattern/?" ? {o info object method parameters "foo b"} "x:int y:upper"