Index: doc/index.html =================================================================== diff -u -rb3b84471d612c5883ec44ee884b6e03fd6574a32 -r2c0baf4a8ccba0820da0b4f318be18d2051e00ae --- doc/index.html (.../index.html) (revision b3b84471d612c5883ec44ee884b6e03fd6574a32) +++ doc/index.html (.../index.html) (revision 2c0baf4a8ccba0820da0b4f318be18d2051e00ae) @@ -23,7 +23,7 @@

Index: doc/migration1-2.html =================================================================== diff -u -rfe19549734064c3a57866e7e47743ec787f647e5 -r2c0baf4a8ccba0820da0b4f318be18d2051e00ae --- doc/migration1-2.html (.../migration1-2.html) (revision fe19549734064c3a57866e7e47743ec787f647e5) +++ doc/migration1-2.html (.../migration1-2.html) (revision 2c0baf4a8ccba0820da0b4f318be18d2051e00ae) @@ -149,7 +149,7 @@ }

Object create o
o eval {set :x 1}
- #    ::xotcl::setinstvar o x 1
+ #    ::xotcl::setvar o x 1
o method foo args {...}
 @@ -688,5 +688,5 @@
- Last modified: Fri Jan 15 13:42:35 CET 2010 + Last modified: Tue Feb 23 13:41:35 CET 2010 Index: generic/gentclAPI.decls =================================================================== diff -u -rbc1c78f197db742441e0ab0633bd1e2b2920d10f -r2c0baf4a8ccba0820da0b4f318be18d2051e00ae --- generic/gentclAPI.decls (.../gentclAPI.decls) (revision bc1c78f197db742441e0ab0633bd1e2b2920d10f) +++ generic/gentclAPI.decls (.../gentclAPI.decls) (revision 2c0baf4a8ccba0820da0b4f318be18d2051e00ae) @@ -51,7 +51,7 @@ xotclCmd colon XOTclColonCmd { {-argName "args" -type allargs} } -xotclCmd exists XOTclExistsCmd { +xotclCmd existsvar XOTclExistsVarCmd { {-argName "object" -required 1 -type object} {-argName "var" -required 1} } @@ -137,7 +137,7 @@ xotclCmd self XOTclGetSelfObjCmd { {-argName "selfoption" -required 0 -type "proc|class|activelevel|args|activemixin|calledproc|calledmethod|calledclass|callingproc|callingclass|callinglevel|callingobject|filterreg|isnextcall|next"} } -xotclCmd setinstvar XOTclSetInstvarCmd { +xotclCmd setvar XOTclSetVarCmd { {-argName "object" -required 1 -type object} {-argName "variable" -required 1 -type tclobj} {-argName "value" -required 0 -type tclobj} Index: generic/predefined.h =================================================================== diff -u -r7f114dad2b4deb00431c895e511118c3c675cb07 -r2c0baf4a8ccba0820da0b4f318be18d2051e00ae --- generic/predefined.h (.../predefined.h) (revision 7f114dad2b4deb00431c895e511118c3c675cb07) +++ generic/predefined.h (.../predefined.h) (revision 2c0baf4a8ccba0820da0b4f318be18d2051e00ae) @@ -181,7 +181,7 @@ "set slotObj [::xotcl::ObjectParameterSlot slotName $att $class]\n" "::xotcl::ObjectParameterSlot create $slotObj\n" "if {[info exists default]} {\n" -"::xotcl::setinstvar $slotObj default $default\n" +"::xotcl::setvar $slotObj default $default\n" "unset default}\n" "::xotcl::setter $class $att}\n" "foreach att $definitions {\n" @@ -192,7 +192,7 @@ "if {[string match {*\\[*\\]*} $default]} {\n" "set value [::xotcl::dispatch $i -objscope ::eval subst $default]} else {\n" "set value $default}\n" -"::xotcl::setinstvar $i $att $value}}\n" +"::xotcl::setvar $i $att $value}}\n" "unset default}}\n" "$class __invalidateobjectparameter}\n" "createBootstrapAttributeSlots ::xotcl::Slot {\n" @@ -208,18 +208,18 @@ "{defaultmethods {get assign}}\n" "{manager \"[::xotcl::self]\"}\n" "{per-object false}}\n" -"::xotcl::alias ::xotcl::ObjectParameterSlot get ::xotcl::setinstvar\n" -"::xotcl::alias ::xotcl::ObjectParameterSlot assign ::xotcl::setinstvar\n" +"::xotcl::alias ::xotcl::ObjectParameterSlot get ::xotcl::setvar\n" +"::xotcl::alias ::xotcl::ObjectParameterSlot assign ::xotcl::setvar\n" "::xotcl::ObjectParameterSlot public method add {obj prop value {pos 0}} {\n" "if {![set :multivalued]} {\n" "error \"Property $prop of [set :domain]->$obj ist not multivalued\"}\n" "if {[$obj exists $prop]} {\n" -"::xotcl::setinstvar $obj $prop [linsert [::xotcl::setinstvar $obj $prop] $pos $value]} else {\n" -"::xotcl::setinstvar $obj $prop [list $value]}}\n" +"::xotcl::setvar $obj $prop [linsert [::xotcl::setvar $obj $prop] $pos $value]} else {\n" +"::xotcl::setvar $obj $prop [list $value]}}\n" "::xotcl::ObjectParameterSlot public method delete {-nocomplain:switch obj prop value} {\n" -"set old [::xotcl::setinstvar $obj $prop]\n" +"set old [::xotcl::setvar $obj $prop]\n" "set p [lsearch -glob $old $value]\n" -"if {$p>-1} {::xotcl::setinstvar $obj $prop [lreplace $old $p $p]} else {\n" +"if {$p>-1} {::xotcl::setvar $obj $prop [lreplace $old $p $p]} else {\n" "error \"$value is not a $prop of $obj (valid are: $old)\"}}\n" "::xotcl::ObjectParameterSlot method unknown {method args} {\n" "set methods [list]\n" @@ -241,7 +241,7 @@ "if {[::xotcl::objectproperty ${:domain} class]} {\n" "${:domain} __invalidateobjectparameter}\n" "if {${:per-object} && [info exists :default] } {\n" -"::xotcl::setinstvar ${:domain} ${:name} ${:default}}\n" +"::xotcl::setvar ${:domain} ${:name} ${:default}}\n" "set cl [expr {${:per-object} ? \"Object\" : \"Class\"}]\n" "::xotcl::forward ${:domain} ${:name} \\\n" "${:manager} \\\n" @@ -372,9 +372,9 @@ "arg}\n" "::xotcl::Attribute method __default_from_cmd {obj cmd var sub op} {\n" "$obj trace remove variable $var $op [list [::xotcl::self] [::xotcl::self proc] $obj $cmd]\n" -"::xotcl::setinstvar $obj $var [$obj eval $cmd]}\n" +"::xotcl::setvar $obj $var [$obj eval $cmd]}\n" "::xotcl::Attribute method __value_from_cmd {obj cmd var sub op} {\n" -"::xotcl::setinstvar $obj $var [$obj eval $cmd]}\n" +"::xotcl::setvar $obj $var [$obj eval $cmd]}\n" "::xotcl::Attribute method __value_changed_cmd {obj cmd var sub op} {\n" "eval $cmd}\n" "::xotcl::Attribute protected method init {} {\n" @@ -388,9 +388,9 @@ "array set \"\" [:toParameterSyntax ${:name}]\n" "if {$(mparam) ne \"\"} {\n" "if {[info exists :multivalued] && ${:multivalued}} {\n" -":method assign [list obj var value:$(mparam),multivalued,slot=[self]] {::xotcl::setinstvar $obj $var $value}\n" +":method assign [list obj var value:$(mparam),multivalued,slot=[self]] {::xotcl::setvar $obj $var $value}\n" ":method add [list obj prop value:$(mparam),slot=[self] {pos 0}] {next}} else {\n" -":method assign [list obj var value:$(mparam),slot=[self]] {::xotcl::setinstvar $obj $var $value}}}\n" +":method assign [list obj var value:$(mparam),slot=[self]] {::xotcl::setvar $obj $var $value}}}\n" "if {[:exists valuechangedcmd]} {\n" "append __initcmd \":trace add variable [list ${:name}] write \\\n" "\\[list [::xotcl::self] __value_changed_cmd \\[::xotcl::self\\] [list [set :valuechangedcmd]]\\]\"}\n" @@ -415,9 +415,9 @@ "if {[info exists :incremental] && ${:incremental}} return\n" "if {[set :defaultmethods] ne {get assign}} return\n" "set assignInfo [:info callable -which assign]\n" -"if {$assignInfo ne \"::xotcl::ObjectParameterSlot alias assign ::xotcl::setinstvar\" &&\n" -"[lindex $assignInfo {end 0}] ne \"::xotcl::setinstvar\" } return\n" -"if {[:info callable -which get] ne \"::xotcl::ObjectParameterSlot alias get ::xotcl::setinstvar\"} return\n" +"if {$assignInfo ne \"::xotcl::ObjectParameterSlot alias assign ::xotcl::setvar\" &&\n" +"[lindex $assignInfo {end 0}] ne \"::xotcl::setvar\" } return\n" +"if {[:info callable -which get] ne \"::xotcl::ObjectParameterSlot alias get ::xotcl::setvar\"} return\n" "array set \"\" [:toParameterSyntax ${:name}]\n" "if {$(mparam) ne \"\"} {\n" "set setterParam [lindex $(oparam) 0]} else {\n" @@ -431,7 +431,7 @@ "::xotcl2::Class public method parameter arglist {\n" "foreach arg $arglist {\n" "::xotcl::Attribute createFromParameterSyntax [self] {*}$arg}\n" -"::xotcl::setinstvar [::xotcl::self]::slot __parameter $arglist}\n" +"::xotcl::setvar [::xotcl::self]::slot __parameter $arglist}\n" "proc createBootstrapAttributeSlots {} {}\n" "::xotcl::Slot method type=hasmixin {name value arg} {\n" "if {![::xotcl::objectproperty $value hasmixin $arg]} {\n" Index: generic/predefined.xotcl =================================================================== diff -u -r7f114dad2b4deb00431c895e511118c3c675cb07 -r2c0baf4a8ccba0820da0b4f318be18d2051e00ae --- generic/predefined.xotcl (.../predefined.xotcl) (revision 7f114dad2b4deb00431c895e511118c3c675cb07) +++ generic/predefined.xotcl (.../predefined.xotcl) (revision 2c0baf4a8ccba0820da0b4f318be18d2051e00ae) @@ -365,7 +365,7 @@ set slotObj [::xotcl::ObjectParameterSlot slotName $att $class] ::xotcl::ObjectParameterSlot create $slotObj if {[info exists default]} { - ::xotcl::setinstvar $slotObj default $default + ::xotcl::setvar $slotObj default $default unset default } ::xotcl::setter $class $att @@ -387,7 +387,7 @@ } else { set value $default } - ::xotcl::setinstvar $i $att $value + ::xotcl::setvar $i $att $value } } unset default @@ -423,23 +423,23 @@ # valuecmd # valuechangedcmd - ::xotcl::alias ::xotcl::ObjectParameterSlot get ::xotcl::setinstvar - ::xotcl::alias ::xotcl::ObjectParameterSlot assign ::xotcl::setinstvar + ::xotcl::alias ::xotcl::ObjectParameterSlot get ::xotcl::setvar + ::xotcl::alias ::xotcl::ObjectParameterSlot assign ::xotcl::setvar ::xotcl::ObjectParameterSlot public method add {obj prop value {pos 0}} { if {![set :multivalued]} { error "Property $prop of [set :domain]->$obj ist not multivalued" } if {[$obj exists $prop]} { - ::xotcl::setinstvar $obj $prop [linsert [::xotcl::setinstvar $obj $prop] $pos $value] + ::xotcl::setvar $obj $prop [linsert [::xotcl::setvar $obj $prop] $pos $value] } else { - ::xotcl::setinstvar $obj $prop [list $value] + ::xotcl::setvar $obj $prop [list $value] } } ::xotcl::ObjectParameterSlot public method delete {-nocomplain:switch obj prop value} { - set old [::xotcl::setinstvar $obj $prop] + set old [::xotcl::setvar $obj $prop] set p [lsearch -glob $old $value] - if {$p>-1} {::xotcl::setinstvar $obj $prop [lreplace $old $p $p]} else { + if {$p>-1} {::xotcl::setvar $obj $prop [lreplace $old $p $p]} else { error "$value is not a $prop of $obj (valid are: $old)" } } @@ -473,7 +473,7 @@ ${:domain} __invalidateobjectparameter } if {${:per-object} && [info exists :default] } { - ::xotcl::setinstvar ${:domain} ${:name} ${:default} + ::xotcl::setvar ${:domain} ${:name} ${:default} } set cl [expr {${:per-object} ? "Object" : "Class"}] #puts stderr "Slot [self] init, forwarder on ${:domain}" @@ -706,15 +706,15 @@ ::xotcl::Attribute method __default_from_cmd {obj cmd var sub op} { #puts "GETVAR [::xotcl::self proc] obj=$obj cmd=$cmd, var=$var, op=$op" $obj trace remove variable $var $op [list [::xotcl::self] [::xotcl::self proc] $obj $cmd] - ::xotcl::setinstvar $obj $var [$obj eval $cmd] + ::xotcl::setvar $obj $var [$obj eval $cmd] } ::xotcl::Attribute method __value_from_cmd {obj cmd var sub op} { #puts "GETVAR [::xotcl::self proc] obj=$obj cmd=$cmd, var=$var, op=$op" - ::xotcl::setinstvar $obj $var [$obj eval $cmd] + ::xotcl::setvar $obj $var [$obj eval $cmd] } ::xotcl::Attribute method __value_changed_cmd {obj cmd var sub op} { # puts stderr "**************************" - # puts "valuechanged obj=$obj cmd=$cmd, var=$var, op=$op, ...\n$obj exists $var -> [::xotcl::setinstvar $obj $var]" + # puts "valuechanged obj=$obj cmd=$cmd, var=$var, op=$op, ...\n$obj exists $var -> [::xotcl::setvar $obj $var]" eval $cmd } ::xotcl::Attribute protected method init {} { @@ -735,12 +735,12 @@ if {$(mparam) ne ""} { if {[info exists :multivalued] && ${:multivalued}} { #puts stderr "adding assign [list obj var value:$(mparam),multivalued] // for [self] with $(mparam)" - :method assign [list obj var value:$(mparam),multivalued,slot=[self]] {::xotcl::setinstvar $obj $var $value} + :method assign [list obj var value:$(mparam),multivalued,slot=[self]] {::xotcl::setvar $obj $var $value} #puts stderr "adding add method for [self] with value:$(mparam)" :method add [list obj prop value:$(mparam),slot=[self] {pos 0}] {next} } else { #puts stderr "adding assign [list obj var value:$(mparam)] // for [self] with $(mparam)" - :method assign [list obj var value:$(mparam),slot=[self]] {::xotcl::setinstvar $obj $var $value} + :method assign [list obj var value:$(mparam),slot=[self]] {::xotcl::setvar $obj $var $value} #::xotcl::setter ${:domain} ${:name}:$(mparam),slot=[self] #puts stderr "::xotcl::setter ${:domain} ${:name}:$(mparam),slot=[self]" } @@ -781,9 +781,9 @@ if {[set :defaultmethods] ne {get assign}} return set assignInfo [:info callable -which assign] #puts stderr assign=$assignInfo//[lindex $assignInfo {end 0}] - if {$assignInfo ne "::xotcl::ObjectParameterSlot alias assign ::xotcl::setinstvar" && - [lindex $assignInfo {end 0}] ne "::xotcl::setinstvar" } return - if {[:info callable -which get] ne "::xotcl::ObjectParameterSlot alias get ::xotcl::setinstvar"} return + if {$assignInfo ne "::xotcl::ObjectParameterSlot alias assign ::xotcl::setvar" && + [lindex $assignInfo {end 0}] ne "::xotcl::setvar" } return + if {[:info callable -which get] ne "::xotcl::ObjectParameterSlot alias get ::xotcl::setvar"} return array set "" [:toParameterSyntax ${:name}] if {$(mparam) ne ""} { @@ -818,7 +818,7 @@ ::xotcl::Attribute createFromParameterSyntax [self] {*}$arg } # todo needed? - ::xotcl::setinstvar [::xotcl::self]::slot __parameter $arglist + ::xotcl::setvar [::xotcl::self]::slot __parameter $arglist } ################################################################## @@ -1126,3 +1126,5 @@ } unset bootstrap } + + Index: generic/tclAPI.h =================================================================== diff -u -rbc1c78f197db742441e0ab0633bd1e2b2920d10f -r2c0baf4a8ccba0820da0b4f318be18d2051e00ae --- generic/tclAPI.h (.../tclAPI.h) (revision bc1c78f197db742441e0ab0633bd1e2b2920d10f) +++ generic/tclAPI.h (.../tclAPI.h) (revision 2c0baf4a8ccba0820da0b4f318be18d2051e00ae) @@ -195,7 +195,7 @@ static int XOTclCreateObjectSystemCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclDeprecatedCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclDispatchCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); -static int XOTclExistsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); +static int XOTclExistsVarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclFinalizeObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclForwardCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclGetSelfObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); @@ -211,7 +211,7 @@ static int XOTclParametercheckCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclQualifyObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclRelationCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); -static int XOTclSetInstvarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); +static int XOTclSetVarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclSetterCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclCAllocMethod(Tcl_Interp *interp, XOTclClass *cl, Tcl_Obj *name); @@ -275,7 +275,7 @@ static int XOTclCreateObjectSystemCmd(Tcl_Interp *interp, Tcl_Obj *rootClass, Tcl_Obj *rootMetaClass); static int XOTclDeprecatedCmd(Tcl_Interp *interp, char *what, char *oldCmd, char *newCmd); static int XOTclDispatchCmd(Tcl_Interp *interp, XOTclObject *object, int withObjscope, Tcl_Obj *command, int nobjc, Tcl_Obj *CONST nobjv[]); -static int XOTclExistsCmd(Tcl_Interp *interp, XOTclObject *object, char *var); +static int XOTclExistsVarCmd(Tcl_Interp *interp, XOTclObject *object, char *var); static int XOTclFinalizeObjCmd(Tcl_Interp *interp); static int XOTclForwardCmd(Tcl_Interp *interp, XOTclObject *object, int withPer_object, Tcl_Obj *method, Tcl_Obj *withDefault, int withEarlybinding, Tcl_Obj *withMethodprefix, int withObjscope, Tcl_Obj *withOnerror, int withVerbose, Tcl_Obj *target, int nobjc, Tcl_Obj *CONST nobjv[]); static int XOTclGetSelfObjCmd(Tcl_Interp *interp, int selfoption); @@ -291,7 +291,7 @@ static int XOTclParametercheckCmd(Tcl_Interp *interp, int withNocomplain, Tcl_Obj *param, Tcl_Obj *value); static int XOTclQualifyObjCmd(Tcl_Interp *interp, Tcl_Obj *name); static int XOTclRelationCmd(Tcl_Interp *interp, XOTclObject *object, int relationtype, Tcl_Obj *value); -static int XOTclSetInstvarCmd(Tcl_Interp *interp, XOTclObject *object, Tcl_Obj *variable, Tcl_Obj *value); +static int XOTclSetVarCmd(Tcl_Interp *interp, XOTclObject *object, Tcl_Obj *variable, Tcl_Obj *value); static int XOTclSetterCmd(Tcl_Interp *interp, XOTclObject *object, int withPer_object, Tcl_Obj *parameter); enum { @@ -356,7 +356,7 @@ XOTclCreateObjectSystemCmdIdx, XOTclDeprecatedCmdIdx, XOTclDispatchCmdIdx, - XOTclExistsCmdIdx, + XOTclExistsVarCmdIdx, XOTclFinalizeObjCmdIdx, XOTclForwardCmdIdx, XOTclGetSelfObjCmdIdx, @@ -372,7 +372,7 @@ XOTclParametercheckCmdIdx, XOTclQualifyObjCmdIdx, XOTclRelationCmdIdx, - XOTclSetInstvarCmdIdx, + XOTclSetVarCmdIdx, XOTclSetterCmdIdx } XOTclMethods; @@ -1582,20 +1582,20 @@ } static int -XOTclExistsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +XOTclExistsVarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { parseContext pc; if (ArgumentParse(interp, objc, objv, NULL, objv[0], - method_definitions[XOTclExistsCmdIdx].paramDefs, - method_definitions[XOTclExistsCmdIdx].nrParameters, + method_definitions[XOTclExistsVarCmdIdx].paramDefs, + method_definitions[XOTclExistsVarCmdIdx].nrParameters, &pc) != TCL_OK) { return TCL_ERROR; } else { XOTclObject *object = (XOTclObject *)pc.clientData[0]; char *var = (char *)pc.clientData[1]; parseContextRelease(&pc); - return XOTclExistsCmd(interp, object, var); + return XOTclExistsVarCmd(interp, object, var); } } @@ -1905,12 +1905,12 @@ } static int -XOTclSetInstvarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +XOTclSetVarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { parseContext pc; if (ArgumentParse(interp, objc, objv, NULL, objv[0], - method_definitions[XOTclSetInstvarCmdIdx].paramDefs, - method_definitions[XOTclSetInstvarCmdIdx].nrParameters, + method_definitions[XOTclSetVarCmdIdx].paramDefs, + method_definitions[XOTclSetVarCmdIdx].nrParameters, &pc) != TCL_OK) { return TCL_ERROR; } else { @@ -1919,7 +1919,7 @@ Tcl_Obj *value = (Tcl_Obj *)pc.clientData[2]; parseContextRelease(&pc); - return XOTclSetInstvarCmd(interp, object, variable, value); + return XOTclSetVarCmd(interp, object, variable, value); } } @@ -2206,7 +2206,7 @@ {"command", 1, 0, convertToTclobj}, {"args", 0, 0, convertToNothing}} }, -{"::xotcl::exists", XOTclExistsCmdStub, 2, { +{"::xotcl::existsvar", XOTclExistsVarCmdStub, 2, { {"object", 1, 0, convertToObject}, {"var", 1, 0, convertToString}} }, @@ -2293,7 +2293,7 @@ {"relationtype", 1, 0, convertToRelationtype}, {"value", 0, 0, convertToTclobj}} }, -{"::xotcl::setinstvar", XOTclSetInstvarCmdStub, 3, { +{"::xotcl::setvar", XOTclSetVarCmdStub, 3, { {"object", 1, 0, convertToObject}, {"variable", 1, 0, convertToTclobj}, {"value", 0, 0, convertToTclobj}} Index: generic/xotcl.c =================================================================== diff -u -re476fd3814e139958bab9cacbd8e2f8def632d00 -r2c0baf4a8ccba0820da0b4f318be18d2051e00ae --- generic/xotcl.c (.../xotcl.c) (revision e476fd3814e139958bab9cacbd8e2f8def632d00) +++ generic/xotcl.c (.../xotcl.c) (revision 2c0baf4a8ccba0820da0b4f318be18d2051e00ae) @@ -11153,12 +11153,12 @@ } /* -xotclCmd exists XOTclExistsCmd { +xotclCmd existsvar XOTclExistsVarCmd { {-argName "object" -required 1 -type object} {-argName "var" -required 1} } */ -static int XOTclExistsCmd(Tcl_Interp *interp, XOTclObject *object, char *var) { +static int XOTclExistsVarCmd(Tcl_Interp *interp, XOTclObject *object, char *var) { Tcl_SetIntObj(Tcl_GetObjResult(interp), varExists(interp, object, var, NULL, 1, 1)); return TCL_OK; } @@ -12319,13 +12319,13 @@ } /* -xotclCmd setinstvar XOTclSetInstvarCmd { +xotclCmd setvar XOTclSetVarCmd { {-argName "object" -required 1 -type object} {-argName "variable" -required 1 -type tclobj} {-argName "value" -required 0 -type tclobj} } */ -static int XOTclSetInstvarCmd(Tcl_Interp *interp, XOTclObject *object, Tcl_Obj *variable, Tcl_Obj *value) { +static int XOTclSetVarCmd(Tcl_Interp *interp, XOTclObject *object, Tcl_Obj *variable, Tcl_Obj *value) { return setInstVar(interp, object, variable, value); } Index: library/comm/Httpd.xotcl =================================================================== diff -u -rdf9b12b3347ec6d0aaab6a080619734cd4c45f34 -r2c0baf4a8ccba0820da0b4f318be18d2051e00ae --- library/comm/Httpd.xotcl (.../Httpd.xotcl) (revision df9b12b3347ec6d0aaab6a080619734cd4c45f34) +++ library/comm/Httpd.xotcl (.../Httpd.xotcl) (revision 2c0baf4a8ccba0820da0b4f318be18d2051e00ae) @@ -23,7 +23,7 @@ {port 80} ipaddr {root ./} - {logdir $::xotcl::logdir} + {logdir [set ::xotcl::logdir]} {httpdWrk Httpd::Wrk} {redirects [list]} {workerTimeout 10000} Index: library/serialize/Serializer.xotcl =================================================================== diff -u -r9a128ffc80f0c429d885af38e92c50b253cdb9e8 -r2c0baf4a8ccba0820da0b4f318be18d2051e00ae --- library/serialize/Serializer.xotcl (.../Serializer.xotcl) (revision 9a128ffc80f0c429d885af38e92c50b253cdb9e8) +++ library/serialize/Serializer.xotcl (.../Serializer.xotcl) (revision 2c0baf4a8ccba0820da0b4f318be18d2051e00ae) @@ -514,7 +514,7 @@ if {[$o eval [list ::array exists :$v]]} { lappend setcmd [list array set :$v [$o eval [list array get :$v]]] } else { - lappend setcmd [list set :$v [::xotcl::setinstvar $o $v]] + lappend setcmd [list set :$v [::xotcl::setvar $o $v]] } } } Index: tests/aliastest.xotcl =================================================================== diff -u -rb3b84471d612c5883ec44ee884b6e03fd6574a32 -r2c0baf4a8ccba0820da0b4f318be18d2051e00ae --- tests/aliastest.xotcl (.../aliastest.xotcl) (revision b3b84471d612c5883ec44ee884b6e03fd6574a32) +++ tests/aliastest.xotcl (.../aliastest.xotcl) (revision 2c0baf4a8ccba0820da0b4f318be18d2051e00ae) @@ -6,7 +6,7 @@ # The system methods of Object are either alias or forwarders ? {lsort [::xotcl::ObjectParameterSlot info methods -methodtype alias]} {assign get} - ? {::xotcl::ObjectParameterSlot info method definition get} "::xotcl::ObjectParameterSlot alias get ::xotcl::setinstvar" + ? {::xotcl::ObjectParameterSlot info method definition get} "::xotcl::ObjectParameterSlot alias get ::xotcl::setvar" # define an alias and retrieve its definition set cmd "::xotcl2::Object alias -objscope set ::set" Index: tests/slottest.xotcl =================================================================== diff -u -r62913a6c49e78801642a5d974c30ec1100831c2f -r2c0baf4a8ccba0820da0b4f318be18d2051e00ae --- tests/slottest.xotcl (.../slottest.xotcl) (revision 62913a6c49e78801642a5d974c30ec1100831c2f) +++ tests/slottest.xotcl (.../slottest.xotcl) (revision 2c0baf4a8ccba0820da0b4f318be18d2051e00ae) @@ -191,15 +191,15 @@ o1 set z 100 #o1 forward z o1 [list %argclindex [list set set]] %proc #o1 proc get name {my set $name} -o1 forward get -earlybinding ::xotcl::setinstvar %self %1 +o1 forward get -earlybinding ::xotcl::setvar %self %1 ? {o1 get z 101} 101 ? {o1 get z} "101" ? {o1 get z} 101 "get value via new parametercmd get" ? {o1 get z 124} 124 "set value via new parametercmd get" -o1 forward zz -earlybinding ::xotcl::setinstvar %self %proc +o1 forward zz -earlybinding ::xotcl::setvar %self %proc ? {o1 zz 123} 123 ? {o1 zz} 123 @@ -319,7 +319,7 @@ ? {a0 procsearch f3} "::a0 proc f3" ? {a0 procsearch f4} "::a0 forward f4" ? {a0 procsearch set} "::xotcl::Object instcmd set" -? {A slot foo info callable -which assign} "::xotcl::ObjectParameterSlot alias assign ::xotcl::setinstvar" +? {A slot foo info callable -which assign} "::xotcl::ObjectParameterSlot alias assign ::xotcl::setvar" # redefine setter for foo of class A A slot foo method assign {domain var val} { @@ -536,7 +536,7 @@ ? {o1 myf 100} 200 o1 set x 42 -o1 forward x -earlybinding ::xotcl::setinstvar %self %proc +o1 forward x -earlybinding ::xotcl::setvar %self %proc ? [list o1 x] 42 ? [list o1 x 41] 41 ? {o1 x} "get parametercmd via forward (earlybinding)" @@ -575,7 +575,7 @@ P create p2 -age 345 -s 567 ? {p2 age} "parametercmd read" -? {::xotcl::setinstvar p2 age} "via setinstvar" +? {::xotcl::setvar p2 age} "via setinstvar" ? {p2 s} "parameter read with setter"