Index: generic/predefined.h =================================================================== diff -u -r9be992c0b15d88b32a95113f01d4fa92eb9342f5 -r1f0231a5c7cbb8dfef4eaf78335c9ad571863660 --- generic/predefined.h (.../predefined.h) (revision 9be992c0b15d88b32a95113f01d4fa92eb9342f5) +++ generic/predefined.h (.../predefined.h) (revision 1f0231a5c7cbb8dfef4eaf78335c9ad571863660) @@ -40,7 +40,7 @@ ".alias is ::xotcl::is\n" ".method info {obj} {\n" "set methods [list]\n" -"foreach name [::xotcl::cmd::ObjectInfo::methods [self] -defined] {\n" +"foreach name [::xotcl::cmd::ObjectInfo::methods [self]] {\n" "if {$name eq \"unknown\"} continue\n" "lappend methods $name}\n" "return \"valid options are: [join [lsort $methods] {, }]\"}\n" @@ -177,8 +177,8 @@ "error \"$value is not a $prop of $obj (valid are: $old)\"}}\n" "::xotcl::Slot method unknown {method args} {\n" "set methods [list]\n" -"foreach m [.info methods] {\n" -"if {[::xotcl2::Object info methods $m] ne \"\"} continue\n" +"foreach m [.info callable] {\n" +"if {[::xotcl2::Object info callable $m] ne \"\"} continue\n" "if {[string match __* $m]} continue\n" "lappend methods $m}\n" "error \"Method '$method' unknown for slot [::xotcl::self]; valid are: {[lsort $methods]]}\"}\n" @@ -312,8 +312,8 @@ ".method optimize {} {\n" "if {[set .multivalued]} return\n" "if {[set .defaultmethods] ne {get assign}} return\n" -"if {[.procsearch assign] ne \"::xotcl::Slot instcmd assign\"} return\n" -"if {[.procsearch get] ne \"::xotcl::Slot instcmd get\"} return\n" +"if {[.info callable -which assign] ne \"::xotcl::Slot alias assign ::xotcl::setinstvar\"} return\n" +"if {[.info callable -which get] ne \"::xotcl::Slot alias get ::xotcl::setinstvar\"} return\n" "${.domain} setter {*}[expr {${.per-object} ? \"-per-object\" : \"\"}] ${.name}}}\n" "::xotcl::Attribute mixin add ::xotcl::Slot::Optimizer\n" "::xotcl2::Class create ::xotcl::ScopedNew -superclass ::xotcl2::Class\n"