Index: tests/info-method.test =================================================================== diff -u -rfc77eaadabdd690239694a6f1cf155a7d16b5cd4 -r31404a50d429bd67e904a70797c4f67674fab09f --- tests/info-method.test (.../info-method.test) (revision fc77eaadabdd690239694a6f1cf155a7d16b5cd4) +++ tests/info-method.test (.../info-method.test) (revision 31404a50d429bd67e904a70797c4f67674fab09f) @@ -475,14 +475,14 @@ } } - ? {C info slot objects} "::C::slot::a ::C::slot::b" - ? {D info slot objects} "::D::slot::b ::D::slot::c" - ? {D info slot objects -closure -source application} "::D::slot::b ::D::slot::c ::C::slot::a" + ? {C info slots} "::C::slot::a ::C::slot::b" + ? {D info slots} "::D::slot::b ::D::slot::c" + ? {D info slots -closure -source application} "::D::slot::b ::D::slot::c ::C::slot::a" ? {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 object slot objects} "::d1::per-object-slot::a3" - ? {C info object slot objects} "" + ? {D info object slots} "::D::per-object-slot::a2" + ? {d1 info object slots} "::d1::per-object-slot::a3" + ? {C info object slots} "" } # @@ -507,25 +507,25 @@ C create c1 ? {c1 info precedence} "::C ::nx::Object" ? {C info heritage} "::nx::Object" - ? {C info slot objects -closure -source application} "::C::slot::a ::C::slot::b" - ? {C info slot objects -closure} "::C::slot::a ::C::slot::b ::nx::Object::slot::volatile ::nx::Object::slot::noinit ::nx::Object::slot::object-mixin ::nx::Object::slot::__initcmd ::nx::Object::slot::class ::nx::Object::slot::object-filter" + ? {C info slots -closure -source application} "::C::slot::a ::C::slot::b" + ? {C info slots -closure} "::C::slot::a ::C::slot::b ::nx::Object::slot::volatile ::nx::Object::slot::noinit ::nx::Object::slot::object-mixin ::nx::Object::slot::__initcmd ::nx::Object::slot::class ::nx::Object::slot::object-filter" - ? {C info slot objects} "::C::slot::a ::C::slot::b" + ? {C info slots} "::C::slot::a ::C::slot::b" - # Test patterns for "info slot objects" + # Test patterns for "info slots" # Partial name, no metachars - ? {C info slot objects -closure object-mixin} "::nx::Object::slot::object-mixin" + ? {C info slots -closure object-mixin} "::nx::Object::slot::object-mixin" # Partial name with metachars - ? {C info slot objects -closure *in*} \ + ? {C info slots -closure *in*} \ "::nx::Object::slot::noinit ::nx::Object::slot::object-mixin ::nx::Object::slot::__initcmd" # Fully qualified name, no metachars - ? {C info slot objects -closure ::nx::Object::slot::object-mixin} "::nx::Object::slot::object-mixin" + ? {C info slots -closure ::nx::Object::slot::object-mixin} "::nx::Object::slot::object-mixin" # Fully qualified name, with metachars - # The following command returns the same as "C info slot objects" - ? {C info slot objects -closure ::C::*} "::C::slot::a ::C::slot::b" + # The following command returns the same as "C info slots" + ? {C info slots -closure ::C::*} "::C::slot::a ::C::slot::b" # The following command returns the slots of D inherited from # C. Slot "b" is shadoed by D. - ? {D info slot objects -closure ::C::*} "::C::slot::a" + ? {D info slots -closure ::C::*} "::C::slot::a" # Test patterns for "info lookup slots" # Partial name, no metachars @@ -539,8 +539,8 @@ ? {c1 info lookup slots ::C::*} "::C::slot::a ::C::slot::b" D create d1 - ? {D info slot objects} "::D::slot::b ::D::slot::c" - ? {D info slot objects -closure -source application} "::D::slot::b ::D::slot::c ::C::slot::a" + ? {D info slots} "::D::slot::b ::D::slot::c" + ? {D info slots -closure -source application} "::D::slot::b ::D::slot::c ::C::slot::a" ? {::nx::Object info method parameters info} "" @@ -705,13 +705,13 @@ # ? {C info parameter list} "-a -b -volatile -noinit -object-mixin -class -object-filter __initcmd" # ? {C info parameter names} "a b volatile noinit object-mixin class object-filter __initcmd" - ? {lsort [C info slot objects -closure]} "::C::slot::a ::C::slot::b ::nx::Object::slot::__initcmd ::nx::Object::slot::class ::nx::Object::slot::noinit ::nx::Object::slot::object-filter ::nx::Object::slot::object-mixin ::nx::Object::slot::volatile" + ? {lsort [C info slots -closure]} "::C::slot::a ::C::slot::b ::nx::Object::slot::__initcmd ::nx::Object::slot::class ::nx::Object::slot::noinit ::nx::Object::slot::object-filter ::nx::Object::slot::object-mixin ::nx::Object::slot::volatile" ? {C info configure parameters b} "{-b 1}" ? {D info configure parameters b} "{-b 2}" - ? {D info slot objects -closure b} "::D::slot::b" - ? {D info slot objects -closure a} "::C::slot::a" - ? {D info slot objects -closure class} "::nx::Object::slot::class" + ? {D info slots -closure b} "::D::slot::b" + ? {D info slots -closure a} "::C::slot::a" + ? {D info slots -closure class} "::nx::Object::slot::class" # ? {D info parameter list} "-b -c -a -volatile -noinit -object-mixin -class -object-filter __initcmd" # ? {D info parameter names} "b c a volatile noinit object-mixin class object-filter __initcmd" @@ -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 object slot definitions} {info object slot names} {info object slot objects}" + "{info lookup slots} {info object slots} {info slot definition}" ? {lsort [::nx::Object info methods -path "*filter*"]} \ "{info lookup filter} {info object filter guard} {info object filter methods} {object filter}"