Index: tests/protected.test =================================================================== diff -u -rc52c4d07b0c6921e5a94baa31e905ae21241eb25 -r275da34d3d7a874a451eced58242b738c8a37d1a --- tests/protected.test (.../protected.test) (revision c52c4d07b0c6921e5a94baa31e905ae21241eb25) +++ tests/protected.test (.../protected.test) (revision 275da34d3d7a874a451eced58242b738c8a37d1a) @@ -93,11 +93,11 @@ ? {c1 foo} foo # add a protected filter - c1 object filter add f1 + c1 object filters add f1 ? {c1 foo} foo # add a private filter - c1 object filter add f2 + c1 object filters add f2 ? {c1 foo} foo } @@ -191,7 +191,7 @@ # Behavior with mixin . THe private helper methods are "invisible" # for invocation and next path. - B mixin add M + B mixins add M ? {b1 bar} "B.bar " ? {b1 baz} "b1.baz B.baz " @@ -248,7 +248,7 @@ :public method bar {} {return "M.bar [next]"} :public method baz {} {return "M.baz [next]"} } - B mixin add M + B mixins add M ? {b1 bar} "M.bar B.bar " ? {b1 baz} "M.baz B.baz " @@ -280,13 +280,13 @@ # add a filter; be sure that we still can call the private -local # method - d1 object filter add f1 + d1 object filters add f1 ? {d1 baz} "f1 D.baz C.baz " ? {d1 foo} "f1 C.foo f1 bar" ? {d1 bar} "::d1: unable to dispatch method 'bar'" # remove the filter - d1 object filter set "" + d1 object filters set "" # define call to private method via method handle C public method foo {} { return "C.foo [[self] [C info method registrationhandle bar]]"} @@ -296,7 +296,7 @@ ? {d1 bar} "::d1: unable to dispatch method 'bar'" # add a filter; be sure that we still can call the private method - d1 object filter add f1 + d1 object filters add f1 ? {d1 baz} "f1 D.baz C.baz " ? {d1 foo} "f1 C.foo f1 bar" ? {d1 bar} "::d1: unable to dispatch method 'bar'" @@ -429,7 +429,7 @@ ? {o1 bar} o1 ? {o1 foo2} o1 - o1 object mixin add M + o1 object mixins add M ? {o1 foo} "M o1" ? {o1 bar} "o1" @@ -559,7 +559,7 @@ :public method foo {a b} {: -local baz $a $b} } - b1 object mixin add Mix + b1 object mixins add Mix # we can call Mix.baz only through Mix.foo ? {b1 foo 4 5} 1024 @@ -597,7 +597,7 @@ ? {s1 bar 4 5} 20 # add per-class mixin - Sub mixin add Mix + Sub mixins add Mix # foo is shadowed in the mixin and calls the mixin-private method ? {s1 foo 4 5} 1024