Index: tests/info-method.test =================================================================== diff -u -re884c2b0d63fa1b5a691e866ccff8d4094a2a8e4 -r5d1617640ad71fd52b069f81cfcadbe4cbb6f2a2 --- tests/info-method.test (.../info-method.test) (revision e884c2b0d63fa1b5a691e866ccff8d4094a2a8e4) +++ tests/info-method.test (.../info-method.test) (revision 5d1617640ad71fd52b069f81cfcadbe4cbb6f2a2) @@ -661,7 +661,7 @@ # ? {nx::Object info method parameter "info lookup methods"} \ "-callprotection -incontext:switch -methodtype -nomixins:switch -path:switch -source pattern:optional" - ? {nx::Object info method parametersyntax "info lookup methods"} \ + ? {nx::Object info method syntax "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?" ? {o info method parameter "foo b"} "x:int y:upper" @@ -696,18 +696,20 @@ :class property -accessor public a2 :method "sub foo" args {;} } - +puts stderr ====1 + C new ? {C info parameter syntax} "?-a value? ?-b value? ?-volatile? ?-properties value? ?-noinit? ?-mixin mixinreg ...? ?-class class? ?-filter filterreg ...? ?__initcmd?" +puts stderr ====2 ? {C info parameter syntax a} "?-a value?" - ? {C info parameter definition} "-a {-b 1} -volatile:alias,noarg -properties:alias,method=::nx::internal::addProperties -noinit:alias,method=::nsf::methods::object::noinit,noarg -mixin:mixinreg,alias,0..n -class:class,alias,method=::nsf::methods::object::class -filter:filterreg,alias,0..n __initcmd:initcmd,optional,noleadingdash" + ? {C info parameter definitions} "-a {-b 1} -volatile:alias,noarg -properties:alias,method=::nx::internal::addProperties -noinit:alias,method=::nsf::methods::object::noinit,noarg -mixin:mixinreg,alias,0..n -class:class,alias,method=::nsf::methods::object::class -filter:filterreg,alias,0..n __initcmd:initcmd,optional,noleadingdash" ? {C info parameter list} "-a -b -volatile -properties -noinit -mixin -class -filter __initcmd" ? {C info parameter names} "a b volatile properties noinit mixin class 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::filter ::nx::Object::slot::mixin ::nx::Object::slot::noinit ::nx::Object::slot::properties ::nx::Object::slot::volatile" - ? {C info parameter definition b} "{-b 1}" - ? {D info parameter definition b} "{-b 2}" + ? {C info parameter definitions b} "{-b 1}" + ? {D info parameter definitions 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" @@ -726,7 +728,7 @@ ? {::nx::Object info methods "info"} "info" ? {::nx::Object info methods -path "info"} "" ? {lsort [::nx::Object info methods -path "info lookup *"]} \ - "{info lookup filter} {info lookup method} {info lookup methods} {info lookup slots}" + "{info lookup filter} {info lookup method} {info lookup methods} {info lookup parameter definitions} {info lookup parameter list} {info lookup parameter names} {info lookup parameter syntax} {info lookup slots}" ? {lsort [::nx::Object info methods -path "info *method*"]} \ "{info filter methods} {info lookup method} {info lookup methods} {info method} {info methods}" ? {lsort [::nx::Object info methods "slots"]} "" @@ -779,12 +781,12 @@ # nx::Test case parametersyntax { # a true method - ? {::nx::Object info method parametersyntax method} "name arguments ?-returns value? body ?-precondition value? ?-postcondition value?" - # a forwarder to ::nsf::relation; definition comes via ::nsf::parametersyntax - ? {::nx::Object info method parametersyntax mixin} "?classes?|?add class?|?delete class?" + ? {::nx::Object info method syntax method} "name arguments ?-returns value? body ?-precondition value? ?-postcondition value?" + # a forwarder to ::nsf::relation; definition comes via array ::nsf::parametersyntax + ? {::nx::Object info method syntax mixin} "?classes?|?add class?|?delete class?" - ? {::nx::Object info method parametersyntax ::nx::next} "?arguments?" - ? {::nx::Object info method parametersyntax ::nsf::xotclnext} "?--noArgs? ?arg ...?" + ? {::nx::Object info method syntax ::nx::next} "?arguments?" + ? {::nx::Object info method syntax ::nsf::xotclnext} "?--noArgs? ?arg ...?" } # @@ -1202,5 +1204,5 @@ # Test error messages within an ensemble call # nx::Test case error-in-ensemble { - ? {nx::Object info method definition foo 1} {invalid argument '1', maybe too many arguments; should be "::nx::Object info method args|body|definition|exists|registrationhandle|definitionhandle|handle|origin|parameter|parametersyntax|type|precondition|postcondition|submethods|returns name"} + ? {nx::Object info method definition foo 1} {invalid argument '1', maybe too many arguments; should be "::nx::Object info method args|body|definition|exists|registrationhandle|definitionhandle|handle|origin|parameter|syntax|type|precondition|postcondition|submethods|returns name"} } \ No newline at end of file