Index: generic/predefined.h =================================================================== diff -u -re591522c92d208c4942888e632546262fd7641ad -r806b88973de6c75ab4cb2d796d0ddf382ed1ede7 --- generic/predefined.h (.../predefined.h) (revision e591522c92d208c4942888e632546262fd7641ad) +++ generic/predefined.h (.../predefined.h) (revision 806b88973de6c75ab4cb2d796d0ddf382ed1ede7) @@ -252,7 +252,7 @@ "::xotcl::InterceptorSlot create ${os}::Object::slot::mixin \\\n" "-type relation\n" "::xotcl::dispatch ::xotcl2::Class ::xotcl::cmd::Class::forward -- \\\n" -"\"-per-object\" -verbose -default [list get assign] ::xotcl2::Object::slot::mixin add %self %proc\n" +"\"-per-object\" -verbose ::xotcl2::Object::slot::mixin add %self %proc\n" "::xotcl::InterceptorSlot create ${os}::Object::slot::filter \\\n" "-elementtype \"\" -type relation}\n" "::xotcl::register_system_slots ::xotcl2\n" Index: generic/predefined.xotcl =================================================================== diff -u -re591522c92d208c4942888e632546262fd7641ad -r806b88973de6c75ab4cb2d796d0ddf382ed1ede7 --- generic/predefined.xotcl (.../predefined.xotcl) (revision e591522c92d208c4942888e632546262fd7641ad) +++ generic/predefined.xotcl (.../predefined.xotcl) (revision 806b88973de6c75ab4cb2d796d0ddf382ed1ede7) @@ -493,7 +493,7 @@ # ::xotcl::dispatch ::xotcl2::Class ::xotcl::cmd::Class::forward mixin -verbose -default [list get assign] ::xotcl2::Class::slot::mixin %1 %self %proc ::xotcl::dispatch ::xotcl2::Class ::xotcl::cmd::Class::forward -- \ - "-per-object" -verbose -default [list get assign] ::xotcl2::Object::slot::mixin add %self %proc + "-per-object" -verbose ::xotcl2::Object::slot::mixin add %self %proc # ::xotcl::dispatch ::xotcl2::classInfo ::xotcl::cmd::Object::forward \ # "-per-object" -verbose ::xotcl2::objectInfo {%@2 %1} Index: tests/forwardtest.xotcl =================================================================== diff -u -r666f7ad2cb2562f3d62fc9aea54efb9b0826f6b0 -r806b88973de6c75ab4cb2d796d0ddf382ed1ede7 --- tests/forwardtest.xotcl (.../forwardtest.xotcl) (revision 666f7ad2cb2562f3d62fc9aea54efb9b0826f6b0) +++ tests/forwardtest.xotcl (.../forwardtest.xotcl) (revision 806b88973de6c75ab4cb2d796d0ddf382ed1ede7) @@ -67,7 +67,7 @@ ? {catch {obj Mixin}} 1 -obj forward Mixin -default {Getter Setter} mixin %1 %self +obj forward Mixin mixin "%1 {Getter Setter}" %self ? {obj Mixin add M1} [list ::mixin add ::obj M1] ? {obj Mixin M1} [list ::mixin Setter ::obj M1] ? {obj Mixin} [list ::mixin Getter ::obj] @@ -123,7 +123,7 @@ # check introspection for objects ? {lsort [obj info forward]} "Mixin addOne foo i1" -? {obj info forward -definition Mixin} "-default {Getter Setter} mixin %1 %self" +? {obj info forward -definition Mixin} "mixin {%1 {Getter Setter}} %self" ? {obj info forward -definition addOne} "expr 1 +" ? {obj info forward -definition foo} "target %proc %self %%self %%p" ? {obj info forward -definition i1} "-objscope ::incr x"