Index: generic/predefined.h =================================================================== diff -u -rbedcf64642123d38ace4f5117e2b4b99fe9a0e06 -r5556c6d63ea6f4d90705386490253530f0272b57 --- generic/predefined.h (.../predefined.h) (revision bedcf64642123d38ace4f5117e2b4b99fe9a0e06) +++ generic/predefined.h (.../predefined.h) (revision 5556c6d63ea6f4d90705386490253530f0272b57) @@ -75,27 +75,29 @@ "::xotcl::MetaSlot create ::xotcl::Slot\n" "::xotcl::MetaSlot invalidateobjectparameter\n" "::xotcl::Object instproc objectparameter {} {\n" -"set arg_list [list]\n" +"set parameterdefinitions [list]\n" "set slots [::xotcl::objectInfo slotobjects [self]]\n" "foreach slot $slots {\n" -"set arg \"-[namespace tail $slot]\"\n" +"set parameterdefinition \"-[namespace tail $slot]\"\n" "set opts [list]\n" "if {[$slot exists required] && [$slot required]} {\n" "lappend opts required}\n" "if {[$slot exists type]} {\n" "lappend opts [$slot type]}\n" "if {[$slot exists default]} {\n" -"set default [$slot set default]\n" -"if {[string match {*\\[*\\]*} $default] || [string first $default {$}] > -1} {\n" -"lappend opts substdefault}} elseif [info exists default] {\n" -"unset default}\n" +"set arg [$slot set default]\n" +"if {[string match {*\\[*\\]*} $arg] || [string first $arg {$}] > -1} {\n" +"lappend opts substdefault}} elseif {[$slot exists initcmd]} {\n" +"set arg [$slot set initcmd]\n" +"lappend opts initcmd}\n" "if {[llength $opts] > 0} {\n" -"set arg \"$arg:[join $opts ,]\"}\n" -"if {[info exists default]} {\n" -"lappend arg $default}\n" -"lappend arg_list $arg}\n" -"lappend arg_list args\n" -"return $arg_list}\n" +"append parameterdefinition :[join $opts ,]}\n" +"if {[info exists arg]} {\n" +"lappend parameterdefinition $arg\n" +"unset arg}\n" +"lappend parameterdefinitions $parameterdefinition}\n" +"lappend parameterdefinitions args\n" +"return $parameterdefinitions}\n" "proc createBootstrapAttributeSlots {class definitions} {\n" "if {![::xotcl::is ${class}::slot object]} {\n" "::xotcl::Object create ${class}::slot}\n"