Index: tests/interp.test =================================================================== diff -u -r4bc60e16c10fdbbb640b3019d4bdebdc469fdf55 -r275da34d3d7a874a451eced58242b738c8a37d1a --- tests/interp.test (.../interp.test) (revision 4bc60e16c10fdbbb640b3019d4bdebdc469fdf55) +++ tests/interp.test (.../interp.test) (revision 275da34d3d7a874a451eced58242b738c8a37d1a) @@ -83,8 +83,8 @@ ? {interp eval $i {::C create ::c}} ::c # set some relationships to test later ... - ? {interp eval $i {::C mixin add ::M}} ::M - ? {interp eval $i {::C object mixin add ::M}} ::M + ? {interp eval $i {::C mixins add ::M}} ::M + ? {interp eval $i {::C object mixins add ::M}} ::M $i hide C ? {interp eval $i {::C create ::c2}} {invalid command name "::C"} @@ -660,7 +660,7 @@ return <[current class]>[next]<[current class]> } } - x object mixin M + x object mixins set M } ? {$i eval {x foo}} <::M>OK<::M> @@ -692,8 +692,8 @@ $i hide MM M $i eval {nx::Class create ::M2} - ? {$i eval {x object mixin add M2}} {mixin: expected a class as mixin but got "::M"} - ? {$i invokehidden M mixin add M2} {expected object but got "::M" for parameter "object"} + ? {$i eval {x object mixins add M2}} {mixin: expected a class as mixin but got "::M"} + ? {$i invokehidden M mixins add M2} {expected object but got "::M" for parameter "object"} interp delete $i unset i @@ -712,15 +712,15 @@ nx::Class create M1 nx::Class create M2 nx::Class create M3 - o object mixin {M1 M2} + o object mixins set {M1 M2} } ? {$i eval {o info precedence}} "::M1 ::M2 ::nx::Object" ? {$i eval {o info object mixin classes}} {::M1 ::M2} ? {$i hidden} "" $i hide M1 ? {$i hidden} M1 - $i eval {M2 mixin add M3} + $i eval {M2 mixins add M3} ? {$i eval {o info precedence}} "::M1 ::M3 ::M2 ::nx::Object" # # Now, have the mixin list invalidated; The next time we request the list,