Index: tests/cget.test =================================================================== diff -u -r74b7a4066526ff5f5a8080ed907f71c9ed5c7700 -r23b10a2c736cf33731b0d7b0381314ddec44f2d6 --- tests/cget.test (.../cget.test) (revision 74b7a4066526ff5f5a8080ed907f71c9ed5c7700) +++ tests/cget.test (.../cget.test) (revision 23b10a2c736cf33731b0d7b0381314ddec44f2d6) @@ -53,12 +53,14 @@ # # configure without arguments # - ? {p1 info configure} "?-sex /value/? -famnam /value/ ?-age /integer/? ?-friends /value .../? ?-object-mixin /mixinreg .../? ?-class /class/? ?-object-filter /filterreg .../? ?/__initblock/?" + ? {p1 configure} "" + + ? {p1 info lookup configure syntax} {?-sex /value/? -famnam /value/ ?-age /integer/? ?-friends /value .../? ?-object-mixin /mixinreg .../? ?-class /class/? ?-object-filter /filterreg .../? ?/__initblock/?} } # # The second test set checks redirection of configure / cget to slot -# methods "assign" and "get". +# methods "set" and "get". # nx::test configure -count 1 @@ -68,19 +70,19 @@ # Define a property with a "get" method :property bar1 { - :public object method get { object property} { + :public object method value=get { object property} { incr ::count(cget) nsf::var::set $object $property } } - # Define a property with a "get" and "assign" method + # Define a property with a "get" and "set" method :property bar2 { - :public object method get { object property} { + :public object method value=get { object property} { incr ::count(cget) nsf::var::set $object $property } - :public object method assign { object property value } { + :public object method value=set { object property value } { incr ::count(assign) nsf::var::set $object $property $value } @@ -93,8 +95,11 @@ # # configure without arguments # - ? {p1 info configure} "?-bar1 /value/? ?-bar2 /value/? ?-object-mixin /mixinreg .../? ?-class /class/? ?-object-filter /filterreg .../? ?/__initblock/?" + ? {p1 configure} "" + ? {p1 info lookup configure syntax} {?-bar1 /value/? ?-bar2 /value/? ?-object-mixin /mixinreg .../? ?-class /class/? ?-object-filter /filterreg .../? ?/__initblock/?} + + # # test gettin/setting via slots # @@ -137,7 +142,7 @@ # class-level lookup # ? {C info lookup configure syntax} \ - "/::C/ configure ?-superclass /class .../? ?-mixin /mixinreg .../? ?-filter /filterreg .../? ?-volatile? ?-object-mixin /mixinreg .../? ?-class /class/? ?-object-filter /filterreg .../? ?/__initblock/?" + "?-superclass /class .../? ?-mixin /mixinreg .../? ?-filter /filterreg .../? ?-volatile? ?-object-mixin /mixinreg .../? ?-class /class/? ?-object-filter /filterreg .../? ?/__initblock/?" ? {C cget -superclass} "::nx::Object" ? {C cget -object-mixin} "" ? {C cget -mixin} "" @@ -150,7 +155,7 @@ # object-level lookup # ? {c1 info lookup configure syntax} \ - "/::c1/ configure ?-foo /value/? ?-bar /value/? ?-volatile? ?-object-mixin /mixinreg .../? ?-class /class/? ?-object-filter /filterreg .../? ?/__initblock/?" + "?-foo /value/? ?-bar /value/? ?-volatile? ?-object-mixin /mixinreg .../? ?-class /class/? ?-object-filter /filterreg .../? ?/__initblock/?" # # query all properties from base classes @@ -186,12 +191,12 @@ :property {friends:0..n ""} :property sex - # Define a property with a "get" and "assign" method + # Define a property with a "get" and "set" method :property bar { - :public object method get { object property } { + :public object method value=get { object property } { nsf::var::set $object $property } - :public object method assign { object property value } { + :public object method value=set { object property value } { nsf::var::set $object $property $value } } @@ -206,7 +211,7 @@ # - cget # - dispatch of cget method with full path # - cget via slot method - ? {p1 age} 25 + ? {p1 age get} 25 ? {p1 cget -age} 25 ? {p1 ::nsf::methods::object::cget -age} 25 ? {p1 cget -bar} 101 @@ -216,7 +221,7 @@ # - built-in accessor # - configure # - configure via slot method - ? {p1 age 27} 27 + ? {p1 age set 27} 27 ? {p1 configure -age 27} "" ? {p1 configure -bar 102} ""