Index: tests/info-method.test =================================================================== diff -u -N -r85ee1fdb043ed3f82fd272cc004c476c40861fdb -r12319faaf20df7116346558bd948b0edda9124eb --- tests/info-method.test (.../info-method.test) (revision 85ee1fdb043ed3f82fd272cc004c476c40861fdb) +++ tests/info-method.test (.../info-method.test) (revision 12319faaf20df7116346558bd948b0edda9124eb) @@ -364,7 +364,7 @@ ? {o info lookup methods bar} bar ? {o bar} Object.bar - o object mixin ::nx::Class + o object mixin set ::nx::Class ? {o info precedence} "::nx::Class ::nx::Object" ? {o info lookup method bar} "::nsf::classes::nx::Class::bar" ? {o info lookup methods bar} bar @@ -451,7 +451,7 @@ ? {Foo info lookup methods create} "create" ? {Foo info lookup method create} "::nsf::classes::nx::Class::create" - ? {o object mixin ""} "" + ? {o object mixin set ""} "" } @@ -721,7 +721,7 @@ ? {C info configure syntax} "/::C/ ?-a /value/? ?-b /value/? ?-object-mixin /mixinreg .../? ?-class /class/? ?-object-filter /filterreg .../? ?/__initblock/?" # ? {C info configure syntax a} "/::C/ ?-a /value/?" - ? {C info configure parameters } "-a {-b 1} -object-mixin:mixinreg,alias,method=::nx::Object::slot::__object::mixin,0..n -class:class,alias,method=::nsf::methods::object::class -object-filter:filterreg,alias,method=::nx::Object::slot::__object::filter,0..n __initblock:cmd,optional,noleadingdash" + ? {C info configure parameters } "-a {-b 1} -object-mixin:mixinreg,slot=::nx::Object::slot::object-mixin,slotassign,method=object-mixin,0..n -class:class,alias,method=::nsf::methods::object::class -object-filter:filterreg,alias,method=::nx::Object::slot::__object::filter,0..n __initblock:cmd,optional,noleadingdash" # ? {C info parameter list} "-a -b -noinit -object-mixin -class -object-filter __initblock" # ? {C info parameter names} "a b noinit object-mixin class object-filter __initblock" @@ -833,26 +833,26 @@ ? {B info heritage} "::M1 ::A ::nx::Object" ? {B info mixin classes -closure} "::M1" - B mixin M2 + B mixin set M2 ? {A info heritage} "::nx::Object" ? {B info heritage} "::M2 ::A ::nx::Object" ? {B info mixin classes -closure} "::M2" - B mixin A + B mixin set A ? {A info heritage} "::nx::Object" ? {B info heritage} "::A ::nx::Object" - B mixin C + B mixin set C ? {A info heritage} "::nx::Object" ? {B info heritage} "::C ::A ::nx::Object" - B mixin "" + B mixin set "" ? {BB info heritage} "::B ::A ::nx::Object" - BB mixin CC + BB mixin set CC ? {BB info heritage} "::CC ::C ::B ::A ::nx::Object" - BB mixin "" + BB mixin set "" ? {BB info heritage} "::B ::A ::nx::Object" } @@ -867,31 +867,31 @@ Class create D -superclass A # transitive case - C mixin D - B mixin C + C mixin set D + B mixin set C ? {C info heritage} "::D ::A ::O ::nx::Object" ? {D info heritage} "::A ::O ::nx::Object" ? {B info heritage} "::D ::C ::A ::O ::nx::Object" # reset - C mixin "" - B mixin "" + C mixin set "" + B mixin set "" ? {B info heritage} "::A ::O ::nx::Object" ? {C info heritage} "::A ::O ::nx::Object" ? {D info heritage} "::A ::O ::nx::Object" # transitve different order - B mixin C - C mixin D + B mixin set C + C mixin set D ? {B info heritage} "::D ::C ::A ::O ::nx::Object" ? {C info heritage} "::D ::A ::O ::nx::Object" ? {D info heritage} "::A ::O ::nx::Object" # reset - C mixin "" - B mixin "" + C mixin set "" + B mixin set "" ? {B info heritage} "::A ::O ::nx::Object" ? {C info heritage} "::A ::O ::nx::Object" ? {D info heritage} "::A ::O ::nx::Object" @@ -913,39 +913,39 @@ Class create M # circular case - B mixin C - C mixin B + B mixin set C + C mixin set B ? {B info heritage} "::C ::A ::O ::nx::Object" ? {C info heritage} "::B ::A ::O ::nx::Object" ? {D info heritage} "::A ::O ::nx::Object" # reset - C mixin "" - B mixin "" + C mixin set "" + B mixin set "" ? {B info heritage} "::A ::O ::nx::Object" ? {C info heritage} "::A ::O ::nx::Object" ? {D info heritage} "::A ::O ::nx::Object" # indirect circular case - B mixin C - C mixin BB + B mixin set C + C mixin set BB ? {B info heritage} "::BB ::C ::A ::O ::nx::Object" ? {C info heritage} "::BB ::B ::A ::O ::nx::Object" ? {D info heritage} "::A ::O ::nx::Object" # reset - C mixin "" - B mixin "" + C mixin set "" + B mixin set "" ? {B info heritage} "::A ::O ::nx::Object" ? {C info heritage} "::A ::O ::nx::Object" ? {D info heritage} "::A ::O ::nx::Object" - M3 mixin B + M3 mixin set B ? {A info heritage} "::O ::nx::Object" ? {B info heritage} "::A ::O ::nx::Object" ? {M3 info heritage} "::B ::A ::O ::nx::Object" - A mixin M3 + A mixin set M3 ? {A info heritage} "::B ::M3 ::O ::nx::Object" ? {B info heritage} "::M3 ::A ::O ::nx::Object" @@ -954,7 +954,7 @@ ? {m1 info precedence} "::B ::A ::O ::M3 ::nx::Object" ? {M3 info heritage} "::B ::A ::O ::nx::Object" - B mixin M3 + B mixin set M3 ? {B info heritage} "::M3 ::A ::O ::nx::Object" } @@ -966,13 +966,13 @@ Class create MovementTest Class create MovementLog - Agent mixin MovementTest + Agent mixin set MovementTest Agent create a1 ? {Agent info heritage} "::MovementTest ::nx::Object" ? {a1 info precedence} "::MovementTest ::Agent ::nx::Object" - a1 object mixin {MovementTest MovementLog} + a1 object mixin set {MovementTest MovementLog} ? {Agent info heritage} "::MovementTest ::nx::Object" ? {a1 info precedence} "::MovementTest ::MovementLog ::Agent ::nx::Object" @@ -995,17 +995,17 @@ ? {b1 info precedence} "::B ::A ::nx::Object" ? {b1 info precedence ::M*} "" - A mixin {M1 M2} + A mixin set {M1 M2} ? {B info heritage} "::M1 ::M2 ::A ::nx::Object" ? {b1 info precedence} "::M1 ::M2 ::B ::A ::nx::Object" ? {b1 info precedence ::M*} "::M1 ::M2" ? {b1 info precedence ::X*} "" - b1 object mixin {M1 M1 M4} + b1 object mixin set {M1 M1 M4} ? {b1 info precedence} "::M1 ::M4 ::M2 ::B ::A ::nx::Object" ? {b1 info object mixin classes} "::M1 ::M4" - B mixin {M3 M1 M1 M4} + B mixin set {M3 M1 M1 M4} ? {B info heritage} "::M3 ::M1 ::M4 ::M2 ::A ::nx::Object" ? {b1 info precedence} "::M1 ::M4 ::M3 ::M2 ::B ::A ::nx::Object" } @@ -1023,12 +1023,12 @@ ? {c1 info precedence} "::C ::nx::Object" # ::A is an implied class - c1 object mixin B + c1 object mixin set B ? {c1 info precedence} "::B ::A ::C ::nx::Object" ? {c1 info object mixin classes -heritage} "::B ::A" # ::A is as well implied by ::PCM - C mixin PCM + C mixin set PCM ? {C info heritage} "::PCM ::A ::nx::Object" ? {C info mixin classes} "::PCM" ? {C info mixin classes -order} "" ;# ???? why no warning @@ -1057,7 +1057,7 @@ ? {C info heritage} "::B ::A ::nx::Object" ? {c1 info precedence} "::C ::B ::A ::nx::Object" - B mixin PCMB + B mixin set PCMB # heritage includes implied classes ? {C info heritage} "::PCMB ::PCMA ::B ::A ::nx::Object" @@ -1082,7 +1082,7 @@ # since C is a specialization of B, it inherits the classes from B ? {C info mixin classes -heritage} "::PCMB ::PCMA ::A" - PCMB mixin TPCMB + PCMB mixin set TPCMB # heritage includes implied classes ? {C info heritage} "::TPCMB ::TPCMA ::PCMB ::PCMA ::B ::A ::nx::Object" @@ -1105,7 +1105,7 @@ # since C is a specialization of B, it inherits the classes from B ? {C info mixin classes -heritage} "::TPCMB ::TPCMA ::PCMB ::PCMA ::A" - C mixin PCMC + C mixin set PCMC # heritage includes implied classes ? {C info heritage} "::PCMC ::TPCMB ::TPCMA ::PCMB ::PCMA ::B ::A ::nx::Object" @@ -1213,7 +1213,7 @@ ? {D info methods -closure *2} "d2 c2" ? {D info methods -closure -source application} "c1 d1 d2 c2" - D mixin M + D mixin set M # # Check as well methods inherited from per-class mixins