Index: tests/parameters.test =================================================================== diff -u -r7a302c7ea09da154a41bf29edf2b3f941ff9a03e -ra866226c4ca39c65f5f98539c140326c617da884 --- tests/parameters.test (.../parameters.test) (revision 7a302c7ea09da154a41bf29edf2b3f941ff9a03e) +++ tests/parameters.test (.../parameters.test) (revision a866226c4ca39c65f5f98539c140326c617da884) @@ -26,7 +26,7 @@ ? {::nsf::method::alias C foo ::set 1} \ {invalid argument '1', maybe too many arguments; should be "::nsf::method::alias object ?-per-object? methodName ?-frame method|object|default? cmdName"} - ? {C eval {:property x -class D}} {invalid argument 'D', maybe too many arguments; should be "::C property ?-accessor value? ?-incremental? ?-class value? spec ?initblock?"} "Test whether the colon prefix is suppressed" + ? {C eval {:property x -class D}} {invalid argument 'D', maybe too many arguments; should be "::C property ?-accessor value? ?-config boolean? ?-incremental? ?-class value? spec ?initblock?"} "Test whether the colon prefix is suppressed" } ####################################################### @@ -2261,7 +2261,7 @@ ? {C info parameter syntax a} "?-a value?" ? {C info parameter definitions v} "" - ? {C info slot definitions v} "{v:noconfig v0}" + ? {C info slot definitions v} "{::C variable v v0}" ? {C info parameter list v} "" ? {C info parameter syntax v} "" @@ -2441,7 +2441,7 @@ # "v" does show up in "info slot ..." ? {C info slot objects} "::C::slot::v" - ? {C info slot definitions} "{v:noconfig 100}" + ? {C info slot definitions} "{::C variable v 100}" nx::Class create D { :property {p0 200} @@ -2459,7 +2459,7 @@ # all properties show up in "info slot" ? {D info slot objects} "::D::slot::p0 ::D::slot::p1 ::D::slot::p2 ::D::slot::p3" - ? {D info slot definitions} "{p0 200} {p1 201} {p2:noconfig 202} {p3:noconfig 203}" + ? {D info slot definitions} "{::D property {p0 200}} {::D property -accessor none {p1 201}} {::D variable p2 202} {::D variable -accessor public p3 203}" #? {D info properties} "{p0 200} {p1 201} {p2:noconfig 202} {p3:noconfig 203}" } @@ -2480,7 +2480,7 @@ # 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} "{v2:0..n,noconfig 100} {v1:noconfig 100}" + ? {o1 info slot definitions} "{::o1 variable -accessor public v2:0..n 100} {::o1 variable -accessor public v1 100}" nx::Object create o2 { :property {p0 200} @@ -2494,7 +2494,7 @@ # 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} "{p0 200} {p1 201} {p3:noconfig 203}" + ? {o2 info 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}" } @@ -2511,7 +2511,7 @@ :property {b 1} } - ? {Foo info slot definitions} "a {b 1}" + ? {Foo info slot definitions} "{::Foo property a} {::Foo property {b 1}}" #? {Foo info properties} "a {b 1}" @@ -2520,22 +2520,22 @@ :property a:boolean :property {b:integer 1} } - ? {Foo info slot definitions} "a:boolean {b:integer 1}" + ? {Foo info slot definitions} "{::Foo property a:boolean} {::Foo property {b:integer 1}}" # required/optional properties nx::Class create Foo { :property a:required :property b:boolean,required } - ? {Foo info slot definitions} "a:required b:boolean,required" + ? {Foo info slot definitions} "{::Foo property a:required} {::Foo property b:boolean,required}" # properties with multiplicity nx::Class create Foo { :property {ints:integer,0..n ""} :property objs:object,1..n :property obj:object,0..1 } - ? {Foo info slot definitions} "objs:object,1..n {ints:integer,0..n {}} obj:object,0..1" + ? {Foo info slot definitions} "{::Foo property objs:object,1..n} {::Foo property {ints:integer,0..n {}}} {::Foo property obj:object,0..1}" } #