Index: generic/predefined.h =================================================================== diff -u -r2ce14fba0764a9fcbbe7cc2f582472526a58ddf0 -r16696cd93d38760506be3dfc95fb2bb7ae972d2f --- generic/predefined.h (.../predefined.h) (revision 2ce14fba0764a9fcbbe7cc2f582472526a58ddf0) +++ generic/predefined.h (.../predefined.h) (revision 16696cd93d38760506be3dfc95fb2bb7ae972d2f) @@ -1,9 +1,6 @@ static char cmd[] = "# $Id: predefined.xotcl,v 1.12 2006/10/04 20:40:23 neumann Exp $\n" "namespace eval ::xotcl {\n" -"proc ::xotcl::setrelation args {\n" -"puts stderr \"::xotcl::setrelation is deprecated, use '::xotcl::relation $args' instead\"\n" -"uplevel ::xotcl::relation $args}\n" "namespace eval ::oo {}\n" "::xotcl::createobjectsystem ::oo::object ::oo::class\n" "if {[info command ::oo::object] ne \"\"} {\n" @@ -61,6 +58,8 @@ "return \"valid options are: [join [lsort $methods] {, }]\"}\n" "::xotcl::classInfo proc unknown {method args} {\n" "error \"unknown info option \\\"$method\\\"; [my info info]\"}\n" +"# info instargs\n" +"# istype??\n" "proc ::xotcl::info_args {inst o method} {\n" "set result [list]\n" "foreach \\\n" @@ -147,7 +146,9 @@ "if {[llength $att]>1} {foreach {att default} $att break}\n" "if {[info exists default]} {\n" "foreach i [$class info instances] {\n" -"if {![$i exists $att]} {::xotcl::setinstvar $i $att $default}}\n" +"if {![$i exists $att]} {\n" +"if {[string match {*[*]*} $default]} {set default [$i eval subst $default]}\n" +"::xotcl::setinstvar $i $att $default}}\n" "unset default}}\n" "$class invalidateobjectparameter}\n" "createBootstrapAttributeSlots ::xotcl::Class {\n" @@ -183,6 +184,11 @@ "if {[string match __* $m]} continue\n" "lappend methods $m}\n" "error \"Method '$method' unknown for slot [::xotcl::self]; valid are: {[lsort $methods]]}\"}\n" +"::xotcl::Slot instproc destroy {} {\n" +"::xotcl::instvar domain\n" +"if {$domain ne \"\"} {\n" +"$domain invalidateobjectparameter}\n" +"next}\n" "::xotcl::Slot instproc init {} {\n" "::xotcl::instvar name domain manager per-object\n" "set forwarder [expr {${per-object} ? \"forward\" : \"instforward\"}]\n"