Index: TODO =================================================================== diff -u -r67c92d72f53bd368ff0fce6555ec803e859d7300 -r1f666096846419774da5ef6c42150ae1388ba3cd --- TODO (.../TODO) (revision 67c92d72f53bd368ff0fce6555ec803e859d7300) +++ TODO (.../TODO) (revision 1f666096846419774da5ef6c42150ae1388ba3cd) @@ -4049,6 +4049,10 @@ - added summary at the end of "make test" via log file - updated .gitignore +nx.tcl: +- rename nx::Object.configure to nx::Object.__configure + to free method name "configure" for an e.g. tk-like configure + ======================================================================== TODO: Index: library/nx/nx.tcl =================================================================== diff -u -rc6ae466933f29c771d5045711fb89a0eb8b7d32e -r1f666096846419774da5ef6c42150ae1388ba3cd --- library/nx/nx.tcl (.../nx.tcl) (revision c6ae466933f29c771d5045711fb89a0eb8b7d32e) +++ library/nx/nx.tcl (.../nx.tcl) (revision 1f666096846419774da5ef6c42150ae1388ba3cd) @@ -55,7 +55,7 @@ -class.dealloc {dealloc ::nsf::methods::class::dealloc} -class.objectparameter objectparameter -class.recreate {recreate ::nsf::methods::class::recreate} - -object.configure configure + -object.configure __configure -object.defaultmethod {defaultmethod ::nsf::methods::object::defaultmethod} -object.destroy destroy -object.init {init ::nsf::methods::object::init} @@ -73,7 +73,7 @@ # provide the standard command set for ::nx::Object # ::nsf::method::alias Object volatile ::nsf::methods::object::volatile - ::nsf::method::alias Object configure ::nsf::methods::object::configure +# ::nsf::method::alias Object configure ::nsf::methods::object::configure ::nsf::method::alias Object upvar ::nsf::methods::object::upvar ::nsf::method::alias Object destroy ::nsf::methods::object::destroy ::nsf::method::alias Object uplevel ::nsf::methods::object::uplevel @@ -128,7 +128,7 @@ ::nsf::method::provide alloc {::nsf::method::alias alloc ::nsf::methods::class::alloc} ::nsf::method::provide dealloc {::nsf::method::alias dealloc ::nsf::methods::class::dealloc} ::nsf::method::provide recreate {::nsf::method::alias recreate ::nsf::methods::class::recreate} - ::nsf::method::provide configure {::nsf::method::alias configure ::nsf::methods::object::configure} + ::nsf::method::provide __configure {::nsf::method::alias __configure ::nsf::methods::object::configure} ::nsf::method::provide unknown {::nsf::method::alias unknown ::nsf::methods::object::unknown} # Index: library/xotcl/library/xotcl2.tcl =================================================================== diff -u -rbb3bac205696d90d3c8f4ca4ceffeb231f6f8f39 -r1f666096846419774da5ef6c42150ae1388ba3cd --- library/xotcl/library/xotcl2.tcl (.../xotcl2.tcl) (revision bb3bac205696d90d3c8f4ca4ceffeb231f6f8f39) +++ library/xotcl/library/xotcl2.tcl (.../xotcl2.tcl) (revision 1f666096846419774da5ef6c42150ae1388ba3cd) @@ -99,7 +99,7 @@ # provide the standard command set for ::xotcl::Object foreach cmd [info command ::nsf::methods::object::*] { set cmdName [namespace tail $cmd] - if {$cmdName in [list "setter" "requirenamespace"]} continue + if {$cmdName in {"setter" "requirenamespace"}} continue ::nsf::method::alias Object $cmdName $cmd } @@ -1129,7 +1129,7 @@ :public class method extend {name args} { :require $name - $name configure {*}$args + $name configure {*}$args } :public class method contains script { Index: tests/info-method.test =================================================================== diff -u -r2cca652c92b1933dd1b27f002a4c4886730f34f1 -r1f666096846419774da5ef6c42150ae1388ba3cd --- tests/info-method.test (.../info-method.test) (revision 2cca652c92b1933dd1b27f002a4c4886730f34f1) +++ tests/info-method.test (.../info-method.test) (revision 1f666096846419774da5ef6c42150ae1388ba3cd) @@ -128,8 +128,8 @@ ? {::nx::Object info lookup methods -source application} "" ? {::nx::Class info lookup methods -source application} "" - set object_methods "alias configure contains copy delete destroy eval filter forward info method mixin move private property protected public require variable volatile" - set class_methods "alias class configure contains copy create delete destroy eval filter forward info method mixin move new private property protected public require variable volatile" + set object_methods "alias contains copy delete destroy eval filter forward info method mixin move private property protected public require variable volatile" + set class_methods "alias class contains copy create delete destroy eval filter forward info method mixin move new private property protected public require variable volatile" ? {lsort [::nx::Object info lookup methods -source baseclasses]} $class_methods ? {lsort [::nx::Class info lookup methods -source baseclasses]} $class_methods Index: tests/object-system.test =================================================================== diff -u -rbd04645d1db6908ced09abb49ba31979b2fcd39b -r1f666096846419774da5ef6c42150ae1388ba3cd --- tests/object-system.test (.../object-system.test) (revision bd04645d1db6908ced09abb49ba31979b2fcd39b) +++ tests/object-system.test (.../object-system.test) (revision 1f666096846419774da5ef6c42150ae1388ba3cd) @@ -18,7 +18,7 @@ } } -? {::nsf::configure objectsystem} "{::nx::Object ::nx::Class {-class.alloc alloc -class.create create -class.dealloc dealloc -class.objectparameter objectparameter -class.recreate recreate -object.configure configure -object.defaultmethod defaultmethod -object.destroy destroy -object.init init -object.move move -object.unknown unknown}}" +? {::nsf::configure objectsystem} "{::nx::Object ::nx::Class {-class.alloc alloc -class.create create -class.dealloc dealloc -class.objectparameter objectparameter -class.recreate recreate -object.configure __configure -object.defaultmethod defaultmethod -object.destroy destroy -object.init init -object.move move -object.unknown unknown}}" ? {::nsf::object::exists nx::Object} 1 ? {::nsf::object::property nx::Object initialized} 1 Index: tests/parameters.test =================================================================== diff -u -r2cca652c92b1933dd1b27f002a4c4886730f34f1 -r1f666096846419774da5ef6c42150ae1388ba3cd --- tests/parameters.test (.../parameters.test) (revision 2cca652c92b1933dd1b27f002a4c4886730f34f1) +++ tests/parameters.test (.../parameters.test) (revision 1f666096846419774da5ef6c42150ae1388ba3cd) @@ -294,7 +294,7 @@ ? {c1 info lookup slots -source application} "::C::slot::a ::C::slot::b ::C::slot::c" - c1 configure -class nx::Object + nsf::relation c1 class nx::Object ? {c1 info lookup slots -source application} "" @@ -378,7 +378,7 @@ ? {D create d1} \ {required argument 'd' is missing, should be: - ::d1 configure -d ?-a value? ?-b boolean? ?-c value? ?-volatile? ?-properties value? ?-noinit? ?-mixin mixinreg ...? ?-class class? ?-filter filterreg ...? ?__initcmd?} + ::d1 __configure -d ?-a value? ?-b boolean? ?-c value? ?-volatile? ?-properties value? ?-noinit? ?-mixin mixinreg ...? ?-class class? ?-filter filterreg ...? ?__initcmd?} ? {D create d2 -d x -b a} \ {expected boolean but got "a" for parameter "-b"} \ @@ -940,13 +940,13 @@ # nx::Test case parameter-alias-default { - ::nsf::method::require nx::Object configure + ::nsf::method::require nx::Object __configure nx::Class create C { :property {a ""} :property {b 1} :method init {} { - :configure -b 1 + :__configure -b 1 } :create c1 :create c2 -a 0 @@ -1610,7 +1610,7 @@ ? {c1 a 2} 2 ? {c1 a} 2 # call configure ... - c1 configure + c1 __configure # ... and check, it did not reset the value to the default ? {c1 a} 2 } @@ -1853,7 +1853,7 @@ # ::nsf::invalidateobjectparameter C - c1 configure -a1 x + c1 __configure -a1 x ? {c1 info precedence} "::M ::C ::nx::Object"