Index: tests/parameters.test =================================================================== diff -u -r729b49eb1dcb08183a0ed41588416a923271811a -rd9344280c05990c0254aa652a08a09da3e5822b1 --- tests/parameters.test (.../parameters.test) (revision 729b49eb1dcb08183a0ed41588416a923271811a) +++ tests/parameters.test (.../parameters.test) (revision d9344280c05990c0254aa652a08a09da3e5822b1) @@ -282,11 +282,11 @@ } C create c1 - ? {C eval :__objectparameter} \ + ? {C eval :__object_configureparameter} \ "{-superclass:class,alias,method=::nsf::methods::class::superclass,1..n ::nx::Object} -mixin:mixinreg,slot=::nx::Class::slot::mixin,slotset,method=class-mixin,0..n $::filter $::objectMixin -class:class,alias,method=::nsf::methods::object::class $::objectFilter $::initBlock" #### TOOD: remove or add - #? {c1 eval :__objectparameter} \ + #? {c1 eval :__object_configureparameter} \ # "::c1: unable to dispatch method '__objectparameter'" } @@ -314,7 +314,7 @@ ? {d1 info lookup slots -source application} \ "::D::slot::d ::C::slot::a ::C::slot::b ::C::slot::c" - ? {d1 eval :__objectparameter} \ + ? {d1 eval :__object_configureparameter} \ "-d:required -a -b:boolean {-c 1} $::trailer" } @@ -343,29 +343,29 @@ } D mixin set M - ? {d1 eval :__objectparameter} \ + ? {d1 eval :__object_configureparameter} \ "-b -m1 -m2 -d:required -a {-c 1} $::trailer" \ "mixin added" M mixin set M2 - ? {d1 eval :__objectparameter} \ + ? {d1 eval :__object_configureparameter} \ "-b2 -b -m1 -m2 -d:required -a {-c 1} $::trailer" \ "transitive mixin added" D mixin set "" #we should have again the old interface - ? {d1 eval :__objectparameter} \ + ? {d1 eval :__object_configureparameter} \ "-d:required -a -b:boolean {-c 1} $::trailer" C mixin set M - ? {d1 eval :__objectparameter} \ + ? {d1 eval :__object_configureparameter} \ "-b2 -b -m1 -m2 -d:required -a {-c 1} $::trailer" \ "mixin added" C mixin set "" #we should have again the old interface - ? {d1 eval :__objectparameter} \ + ? {d1 eval :__object_configureparameter} \ "-d:required -a -b:boolean {-c 1} $::trailer" } @@ -1923,13 +1923,13 @@ nx::Class create M1 {:property b1:required} nx::Class create M2 {:property b2:required} - ? {c1 eval :__objectparameter} "-a1 $::trailer" + ? {c1 eval :__object_configureparameter} "-a1 $::trailer" c1 object mixin set M1 ? {c1 info precedence} "::M1 ::C ::nx::Object" - ? {c1 eval :__objectparameter} "-b1:required -a1 $::trailer" + ? {c1 eval :__object_configureparameter} "-b1:required -a1 $::trailer" # # Invalidate the object parameter and expect that the per-class @@ -2030,7 +2030,7 @@ ? {C info slots -closure} \ "::C::slot::a1 ::nx::Object::slot::__initblock ::nx::Object::slot::object-mixin ::nx::Object::slot::class ::nx::Object::slot::object-filter" - ? {c1 eval :__objectparameter} \ + ? {c1 eval :__object_configureparameter} \ "-a2 -b1:required -a1 $::trailer" # @@ -2047,7 +2047,7 @@ ? {C info slots -closure} \ "::C::slot::a1 ::nx::Object::slot::__initblock ::nx::Object::slot::object-mixin ::nx::Object::slot::class ::nx::Object::slot::object-filter" - ? {c1 eval :__objectparameter} "-a2 -b1:required -a1 $::trailer" + ? {c1 eval :__object_configureparameter} "-a2 -b1:required -a1 $::trailer" # should not require b1 ? {C create c2} ::c2 @@ -2641,7 +2641,7 @@ nx::Class create C { :public object method setObjectParams {spec} { - :protected method __objectparameter {} [list return $spec] + :protected method __object_configureparameter {} [list return $spec] ::nsf::parameter:invalidate::classcache [self] } :setObjectParams ""