Index: generic/predefined.h =================================================================== diff -u -r6a93cc19b601c6972981b1844c198371deccce28 -r9be992c0b15d88b32a95113f01d4fa92eb9342f5 --- generic/predefined.h (.../predefined.h) (revision 6a93cc19b601c6972981b1844c198371deccce28) +++ generic/predefined.h (.../predefined.h) (revision 9be992c0b15d88b32a95113f01d4fa92eb9342f5) @@ -201,12 +201,9 @@ "{multivalued true}\n" "{elementtype ::xotcl2::Class}}\n" "::xotcl::relation ::xotcl::InfoSlot superclass ::xotcl::Slot\n" -"::xotcl::InfoSlot method get {obj -per-object:switch prop} {\n" -"if {[::xotcl::is $obj type ::xotcl2::Object]} {\n" -"$obj info {*}[expr {${per-object} ? \"-per-object\" : \"\"}] $prop} else {\n" -"$obj info $prop}}\n" -"::xotcl::InfoSlot method add {obj -per-object:switch prop value {pos 0}} {\n" -"puts stderr infoslot-add-[self args]\n" +"::xotcl::InfoSlot method get {obj prop} {\n" +"$obj info $prop}\n" +"::xotcl::InfoSlot method add {obj prop value {pos 0}} {\n" "if {![set .multivalued]} {\n" "error \"Property $prop of ${.domain}->$obj ist not multivalued\"}\n" "puts stderr \"adding infoslot: $obj $prop [linsert [$obj info $prop] $pos $value]\"\n" Index: generic/predefined.xotcl =================================================================== diff -u -r6a93cc19b601c6972981b1844c198371deccce28 -r9be992c0b15d88b32a95113f01d4fa92eb9342f5 --- generic/predefined.xotcl (.../predefined.xotcl) (revision 6a93cc19b601c6972981b1844c198371deccce28) +++ generic/predefined.xotcl (.../predefined.xotcl) (revision 9be992c0b15d88b32a95113f01d4fa92eb9342f5) @@ -403,17 +403,10 @@ {elementtype ::xotcl2::Class} } ::xotcl::relation ::xotcl::InfoSlot superclass ::xotcl::Slot -::xotcl::InfoSlot method get {obj -per-object:switch prop} { - # this check is not nice, but one has to care about cases - # where get is used an xotcl1 objects - if {[::xotcl::is $obj type ::xotcl2::Object]} { - $obj info {*}[expr {${per-object} ? "-per-object" : ""}] $prop - } else { +::xotcl::InfoSlot method get {obj prop} { $obj info $prop - } } -::xotcl::InfoSlot method add {obj -per-object:switch prop value {pos 0}} { - puts stderr infoslot-add-[self args] +::xotcl::InfoSlot method add {obj prop value {pos 0}} { if {![set .multivalued]} { error "Property $prop of ${.domain}->$obj ist not multivalued" }