Index: library/nx/nx.tcl =================================================================== diff -u -N -r9e766c226c7ddb35a4aa20ca7a9e8d6678a7c9e2 -r5cb647f407e85768c452ee22eaf881d628511c87 --- library/nx/nx.tcl (.../nx.tcl) (revision 9e766c226c7ddb35a4aa20ca7a9e8d6678a7c9e2) +++ library/nx/nx.tcl (.../nx.tcl) (revision 5cb647f407e85768c452ee22eaf881d628511c87) @@ -721,25 +721,25 @@ :alias "info object methods" ::nsf::methods::object::info::methods :alias "info object mixin guard" ::nsf::methods::object::info::mixinguard :alias "info object mixin classes" ::nsf::methods::object::info::mixinclasses - :alias "info parent" ::nsf::methods::object::info::parent - :alias "info precedence" ::nsf::methods::object::info::precedence - :method "info slot definitions" {{-type:class ::nx::Slot} pattern:optional} { + :method "info object slot definitions" {{-type:class ::nx::Slot} pattern:optional} { set result {} foreach slot [: ::nsf::methods::object::info::slotobjects -type $type {*}[current args]] { lappend result [$slot getPropertyDefinition] } return $result } - :method "info slot names" {{-type:class ::nx::Slot} pattern:optional} { + :method "info object slot names" {{-type:class ::nx::Slot} pattern:optional} { set result {} foreach slot [: ::nsf::methods::object::info::slotobjects -type $type {*}[current args]] { lappend result [$slot name] } return $result } - :method "info slot objects" {{-type:class ::nx::Slot} pattern:optional} { + :method "info object slot objects" {{-type:class ::nx::Slot} pattern:optional} { return [: ::nsf::methods::object::info::slotobjects -type $type {*}[current args]] } + :alias "info parent" ::nsf::methods::object::info::parent + :alias "info precedence" ::nsf::methods::object::info::precedence # "info properties" is a short form of "info slot definition" #:alias "info properties" ::nx::Object::slot::__info::slot::definition :alias "info vars" ::nsf::methods::object::info::vars @@ -2452,14 +2452,14 @@ #interp alias {} ::nx::self {} ::nsf::self set value "?classes?|?add class?|?delete class?" - set ::nsf::parametersyntax(::nsf::classes::nx::Object::mixin) $value - set ::nsf::parametersyntax(::nsf::classes::nx::Class::mixin) $value - set ::nsf::parametersyntax(::nsf::classes::nx::Class::superclass) $value - set ::nsf::parametersyntax(::nsf::classes::nx::Object::class) "?className?" + set "::nsf::parametersyntax(::nsf::classes::nx::Object::object mixin)" $value + set "::nsf::parametersyntax(::nsf::classes::nx::Class::mixin)" $value + set "::nsf::parametersyntax(::nsf::classes::nx::Class::superclass)" $value + set "::nsf::parametersyntax(::nsf::classes::nx::Object::class)" "?className?" set value "?filters?|?add filter?|?delete filter?" - set ::nsf::parametersyntax(::nsf::classes::nx::Object::filter) $value - set ::nsf::parametersyntax(::nsf::classes::nx::Class::filter) $value - set ::nsf::parametersyntax(::nsf::classes::nx::Object::eval) "arg ?arg ...?" + set "::nsf::parametersyntax(::nsf::classes::nx::Object::object filter)" $value + set "::nsf::parametersyntax(::nsf::classes::nx::Class::filter)" $value + set "::nsf::parametersyntax(::nsf::classes::nx::Object::eval)" "arg ?arg ...?" unset value ::nsf::configure debug 1 Index: tests/info-method.test =================================================================== diff -u -N -rb531a50ecc43d0c13e2432b099a436c3260c7a49 -r5cb647f407e85768c452ee22eaf881d628511c87 --- tests/info-method.test (.../info-method.test) (revision b531a50ecc43d0c13e2432b099a436c3260c7a49) +++ tests/info-method.test (.../info-method.test) (revision 5cb647f407e85768c452ee22eaf881d628511c87) @@ -481,7 +481,7 @@ ? {d1 info lookup slots -source application} "::d1::per-object-slot::a3 ::D::slot::b ::D::slot::c ::C::slot::a" ? {D info object slot objects} "::D::per-object-slot::a2" - ? {d1 info slot objects} "::d1::per-object-slot::a3" + ? {d1 info object slot objects} "::d1::per-object-slot::a3" ? {C info object slot objects} "" } @@ -733,7 +733,7 @@ ? {lsort [::nx::Object info methods "slots"]} "" ? {lsort [::nx::Object info methods "*slots*"]} "" ? {lsort [::nx::Object info methods -path "*slot*"]} \ - "{info lookup slots} {info slot definitions} {info slot names} {info slot objects}" + "{info lookup slots} {info object slot definitions} {info object slot names} {info object slot objects}" ? {lsort [::nx::Object info methods -path "*filter*"]} \ "{info lookup filter} {info object filter guard} {info object filter methods} {object filter}" Index: tests/parameters.test =================================================================== diff -u -N -rb531a50ecc43d0c13e2432b099a436c3260c7a49 -r5cb647f407e85768c452ee22eaf881d628511c87 --- tests/parameters.test (.../parameters.test) (revision b531a50ecc43d0c13e2432b099a436c3260c7a49) +++ tests/parameters.test (.../parameters.test) (revision 5cb647f407e85768c452ee22eaf881d628511c87) @@ -2079,12 +2079,12 @@ ? {o a} newvalue o eval {unset :a} ? {o eval {info exists :a}} 0 - [o info slot objects a] default anothervalue + [o info object slot objects a] default anothervalue ? {o eval {info exists :a}} 0 # # re-assignment must be requested by a reconfigure call # - [o info slot objects a] reconfigure + [o info object slot objects a] reconfigure ? {o eval {info exists :a}} 1 ? {o a} anothervalue } @@ -2480,8 +2480,8 @@ } # only the variables with slots show up in "info slot ..." - ? {o1 info slot objects} "::o1::per-object-slot::v2 ::o1::per-object-slot::v1" - ? {o1 info slot definitions} "{::o1 variable -accessor public v2:0..n 100} {::o1 variable -accessor public v1 100}" + ? {o1 info object slot objects} "::o1::per-object-slot::v2 ::o1::per-object-slot::v1" + ? {o1 info object slot definitions} "{::o1 variable -accessor public v2:0..n 100} {::o1 variable -accessor public v1 100}" nx::Object create o2 { :object property {p0 200} @@ -2494,8 +2494,8 @@ ? {o2 info object methods} "p0 p3" # all properties with slots show up in "info slot" - ? {o2 info slot objects} "::o2::per-object-slot::p0 ::o2::per-object-slot::p1 ::o2::per-object-slot::p3" - ? {o2 info slot definitions} "{::o2 property {p0 200}} {::o2 property -accessor none {p1 201}} {::o2 variable -accessor public p3 203}" + ? {o2 info object slot objects} "::o2::per-object-slot::p0 ::o2::per-object-slot::p1 ::o2::per-object-slot::p3" + ? {o2 info object slot definitions} "{::o2 property {p0 200}} {::o2 property -accessor none {p1 201}} {::o2 variable -accessor public p3 203}" #? {o2 info properties} "{p0 200} {p1 201} {p3:noconfig 203}" } Index: tests/plain-object-method.test =================================================================== diff -u -N -rf858f142f5fab4f88996b3eb709c3afa55114be9 -r5cb647f407e85768c452ee22eaf881d628511c87 --- tests/plain-object-method.test (.../plain-object-method.test) (revision f858f142f5fab4f88996b3eb709c3afa55114be9) +++ tests/plain-object-method.test (.../plain-object-method.test) (revision 5cb647f407e85768c452ee22eaf881d628511c87) @@ -11,7 +11,7 @@ ? {o filter f} "::o: unable to dispatch method 'filter'" ? {lsort [o info object methods]} "f" - ? {lsort [o info]} "valid submethods of ::o info: children class has info is lookup name object parent precedence slot vars" + ? {lsort [o info]} "valid submethods of ::o info: children class has info is lookup name object parent precedence vars" } package require nx::plain-object-method @@ -37,5 +37,5 @@ ? {o info filter methods} "" ? {lsort [o info object methods]} "f foo" - ? {lsort [o info]} "valid submethods of ::o info: children class filter has info is lookup method methods mixin name object parent precedence slot vars" + ? {lsort [o info]} "valid submethods of ::o info: children class filter has info is lookup method methods mixin name object parent precedence vars" } Index: tests/submethods.test =================================================================== diff -u -N -rf858f142f5fab4f88996b3eb709c3afa55114be9 -r5cb647f407e85768c452ee22eaf881d628511c87 --- tests/submethods.test (.../submethods.test) (revision f858f142f5fab4f88996b3eb709c3afa55114be9) +++ tests/submethods.test (.../submethods.test) (revision 5cb647f407e85768c452ee22eaf881d628511c87) @@ -229,7 +229,7 @@ # defaultcmd has to return also subcmds of other shadowed ensembles ? {lsort [o1 info has]} "valid submethods of ::o1 info has: mixin namespace something type" - ? {lsort [o1 info]} "valid submethods of ::o1 info: children class has info is lookup name object parent precedence slot vars" + ? {lsort [o1 info]} "valid submethods of ::o1 info: children class has info is lookup name object parent precedence vars" # returning methodpath in ensemble ? {o1 info has something path} "info has something path"