Index: library/serialize/serializer.tcl =================================================================== diff -u -N -rdd169437c7a701da0063a40978614e6148d71221 -r3cbf24ff95e38976cdc905ec0e8014d9d754ad6f --- library/serialize/serializer.tcl (.../serializer.tcl) (revision dd169437c7a701da0063a40978614e6148d71221) +++ library/serialize/serializer.tcl (.../serializer.tcl) (revision 3cbf24ff95e38976cdc905ec0e8014d9d754ad6f) @@ -511,8 +511,8 @@ set cmd "" foreach o [list ${:rootClass} ${:rootMetaClass}] { append cmd \ - [:frameWorkCmd ::nsf::relation $o object-mixin] \ - [:frameWorkCmd ::nsf::relation $o class-mixin] \ + [:frameWorkCmd ::nsf::relation::get $o object-mixin] \ + [:frameWorkCmd ::nsf::relation::get $o class-mixin] \ [:frameWorkCmd ::nsf::method::assertion $o object-invar] \ [:frameWorkCmd ::nsf::method::assertion $o class-invar] } @@ -717,7 +717,7 @@ if {![:Object-needsNothing $x $s]} {return 0} set scs [$x info superclass] if {[$s needsOneOf $scs]} {return 0} - if {[$s needsOneOf [::nsf::relation $x class-mixin]]} {return 0} + if {[$s needsOneOf [::nsf::relation::get $x class-mixin]]} {return 0} foreach sc $scs {if {[$s needsOneOf [$sc ::nsf::methods::class::info::slotobjects]]} {return 0}} if {[$s needsOneOf [:alias-dependency $x class]]} {return 0} return 1 @@ -829,14 +829,14 @@ } append cmd \ - [:frameWorkCmd ::nsf::relation $o object-mixin] \ + [:frameWorkCmd ::nsf::relation::get $o object-mixin] \ [:frameWorkCmd ::nsf::method::assertion $o object-invar] \ [:frameWorkCmd ::nsf::object::property $o keepcallerself -unless 0] \ [:frameWorkCmd ::nsf::object::property $o perobjectdispatch -unless 0] eval $traces - $s addPostCmd [:frameWorkCmd ::nsf::relation $o object-filter] + $s addPostCmd [:frameWorkCmd ::nsf::relation::get $o object-filter] return $cmd } @@ -852,11 +852,11 @@ append cmd [:method-serialize $o $i ""] "\n" } append cmd \ - [:frameWorkCmd ::nsf::relation $o superclass -unless ${:rootClass}] \ - [:frameWorkCmd ::nsf::relation $o class-mixin] \ + [:frameWorkCmd ::nsf::relation::get $o superclass -unless ${:rootClass}] \ + [:frameWorkCmd ::nsf::relation::get $o class-mixin] \ [:frameWorkCmd ::nsf::method::assertion $o class-invar] - $s addPostCmd [:frameWorkCmd ::nsf::relation $o class-filter] + $s addPostCmd [:frameWorkCmd ::nsf::relation::get $o class-filter] return $cmd\n } @@ -964,10 +964,10 @@ append cmd [list ${:targetName} parametercmd $i] "\n" } append cmd \ - [:frameWorkCmd ::nsf::relation $o object-mixin] \ + [:frameWorkCmd ::nsf::relation::get $o object-mixin] \ [:frameWorkCmd ::nsf::method::assertion $o object-invar] - $s addPostCmd [:frameWorkCmd ::nsf::relation $o object-filter] + $s addPostCmd [:frameWorkCmd ::nsf::relation::get $o object-filter] eval $traces return $cmd @@ -994,11 +994,11 @@ append cmd [list ::nsf::method::alias ${:targetName} {*}[lrange $nxDef 3 end]]\n } append cmd \ - [:frameWorkCmd ::nsf::relation $o superclass -unless ${:rootClass}] \ - [:frameWorkCmd ::nsf::relation $o class-mixin] \ + [:frameWorkCmd ::nsf::relation::get $o superclass -unless ${:rootClass}] \ + [:frameWorkCmd ::nsf::relation::get $o class-mixin] \ [:frameWorkCmd ::nsf::method::assertion $o class-invar] - $s addPostCmd [:frameWorkCmd ::nsf::relation $o class-filter] + $s addPostCmd [:frameWorkCmd ::nsf::relation::get $o class-filter] return $cmd }