Index: xotcl/library/serialize/Serializer.xotcl =================================================================== diff -u -r4623855af8a4829fefe2f40299f2e24e4387a821 -rf909cd44b7d6b7fe9a120885b206d34100c46c0d --- xotcl/library/serialize/Serializer.xotcl (.../Serializer.xotcl) (revision 4623855af8a4829fefe2f40299f2e24e4387a821) +++ xotcl/library/serialize/Serializer.xotcl (.../Serializer.xotcl) (revision f909cd44b7d6b7fe9a120885b206d34100c46c0d) @@ -1,4 +1,4 @@ -# $Id: Serializer.xotcl,v 1.7 2005/01/07 03:33:41 neumann Exp $ +# $Id: Serializer.xotcl,v 1.8 2005/01/07 12:41:26 neumann Exp $ package require XOTcl 1.3 package provide xotcl::serializer 0.7 namespace eval ::xotcl {} @@ -16,7 +16,7 @@ authors { Gustaf Neumann, Gustaf.Neumann@wu-wien.ac.at } - date { $Date: 2005/01/07 03:33:41 $ } + date { $Date: 2005/01/07 12:41:26 $ } } @ Serializer proc all { @@ -173,7 +173,7 @@ } } Serializer instproc Object-serialize o { - append cmd [list [$o info class] create $o -noinit] " \\\n" + append cmd [list [$o info class] create [$o self] -noinit] " \\\n" foreach i [$o info procs] { append cmd " " [my method-serialize $o $i ""] " \\\n" } @@ -237,7 +237,7 @@ return $arglist } Serializer instproc category c { - if {[$c istype ::Class]} {return Class} {return Object} + if {[$c istype ::xotcl::Class]} {return Class} {return Object} } Serializer instproc allChildren o { set set $o @@ -308,15 +308,15 @@ return 0 } Serializer instproc serialize {objectOrClass} { - my [my category $objectOrClass]-serialize $objectOrClass + string trimright [my [my category $objectOrClass]-serialize $objectOrClass] "\\\n" } Serializer instproc serializeList {list} { my topoSort $list #foreach i [lsort [my array names level]] {puts "$i: [my set level($i)]"} set result "" foreach l [lsort [my array names level]] { foreach i [my set level($l)] { - append result [string trimright [my serialize $i] "\\\n"] \n + append result [my serialize $i] \n } } foreach e $list {