Index: library/nx/nx.tcl =================================================================== diff -u -rd62bca12731d1c7a1a5cf63f950275852c5b05a2 -r6ec717176dee759bf70840eabb6b5728229ed8f9 --- library/nx/nx.tcl (.../nx.tcl) (revision d62bca12731d1c7a1a5cf63f950275852c5b05a2) +++ library/nx/nx.tcl (.../nx.tcl) (revision 6ec717176dee759bf70840eabb6b5728229ed8f9) @@ -36,8 +36,8 @@ # # get frequenly used primitiva from the next scripting framework # - namespace export next current self configure finalize interp is my relation - namespace import ::nsf::next ::nsf::current ::nsf::self ::nsf::my ::nsf::dispatch + namespace export next current self configure finalize interp is relation + namespace import ::nsf::next ::nsf::current ::nsf::self ::nsf::dispatch # # provide the standard command set for ::nx::Object @@ -250,7 +250,7 @@ if {![info exists ::nsf::methodDefiningMethod([lindex $args 0])]} { error "'[lindex $args 0]' is not a method defining method" } - set r [::nsf::my -system {*}$args] + set r [: -system {*}$args] if {$r ne ""} {::nsf::method::property [self] $r call-protected false} return $r } @@ -260,7 +260,7 @@ if {![info exists ::nsf::methodDefiningMethod([lindex $args 0])]} { error "'[lindex $args 0]' is not a method defining method" } - set r [::nsf::my -system {*}$args] + set r [: -system {*}$args] if {$r ne ""} {::nsf::method::property [self] $r call-protected true} return $r } @@ -270,7 +270,7 @@ if {![info exists ::nsf::methodDefiningMethod([lindex $args 0])]} { error "'[lindex $args 0]' is not a method defining method" } - set r [::nsf::my -system {*}$args] + set r [: -system {*}$args] if {$r ne ""} {::nsf::method::property [self] $r call-private true} return $r @@ -513,7 +513,7 @@ # Object public method "delete property" {name} { # call explicitly the per-object variant of "info::slotobjects" - set slot [::nsf::my ::nsf::methods::object::info::slotobjects $name] + set slot [: ::nsf::methods::object::info::slotobjects $name] if {$slot eq ""} {error "[self]: cannot delete object specific property '$name'"} $slot destroy nsf::var::unset -nocomplain [self] $name @@ -527,7 +527,7 @@ error "[self]: object does not have an instance variable '$name'" } # call explicitly the per-object variant of "info::slotobejcts" - set slot [::nsf::my ::nsf::methods::object::info::slotobjects $name] + set slot [: ::nsf::methods::object::info::slotobjects $name] if {$slot ne ""} { # it is not a slot-less variable @@ -573,7 +573,7 @@ set cmd [list ::nsf::methods::object::info::lookupslots -type $type] if {[info exists source]} {lappend cmd -source $source} if {[info exists pattern]} {lappend cmd $pattern} - return [::nsf::my {*}$cmd] + return [: {*}$cmd] } :alias "info children" ::nsf::methods::object::info::children :alias "info class" ::nsf::methods::object::info::class @@ -590,20 +590,20 @@ :alias "info precedence" ::nsf::methods::object::info::precedence :method "info slot definition" {{-type ::nx::Slot} -closure:switch -source:optional pattern:optional} { set result {} - foreach slot [::nsf::my ::nsf::methods::object::info::slotobjects {*}[current args]] { + foreach slot [: ::nsf::methods::object::info::slotobjects {*}[current args]] { lappend result [$slot getPropertyDefinition] } return $result } :method "info slot names" {{-type ::nx::Slot} -closure:switch -source:optional pattern:optional} { set result {} - foreach slot [::nsf::my ::nsf::methods::object::info::slotobjects {*}[current args]] { + foreach slot [: ::nsf::methods::object::info::slotobjects {*}[current args]] { lappend result [$slot name] } return $result } :method "info slot objects" {{-type ::nx::Slot} pattern:optional} { - return [::nsf::my ::nsf::methods::object::info::slotobjects {*}[current args]] + return [: ::nsf::methods::object::info::slotobjects {*}[current args]] } # "info properties" is a short form of "info slot definition" :alias "info properties" ::nx::Object::slot::__info::slot::definition @@ -654,42 +654,42 @@ :alias "info mixinof" ::nsf::methods::class::info::mixinof :method "info parameter definition" {name:optional} { if {[info exists name]} { - return [::nsf::my ::nsf::methods::class::info::objectparameter parameter $name] + return [: ::nsf::methods::class::info::objectparameter parameter $name] } return [:objectparameter] } :method "info parameter list" {name:optional} { set cmd [list ::nsf::methods::class::info::objectparameter list] if {[info exists name]} {lappend cmd $name} - return [::nsf::my {*}$cmd] + return [: {*}$cmd] } :method "info parameter names" {name:optional} { set cmd [list ::nsf::methods::class::info::objectparameter name] if {[info exists name]} {lappend cmd $name} - return [::nsf::my {*}$cmd] + return [: {*}$cmd] } :method "info parameter syntax" {name:optional} { set cmd [list ::nsf::methods::class::info::objectparameter parametersyntax] if {[info exists name]} {lappend cmd $name} - return [::nsf::my {*}$cmd] + return [: {*}$cmd] } :method "info slot objects" {{-type ::nx::Slot} -closure:switch -source:optional pattern:optional} { set cmd [list ::nsf::methods::class::info::slotobjects -type $type] if {[info exists source]} {lappend cmd -source $source} if {$closure} {lappend cmd -closure} if {[info exists pattern]} {lappend cmd $pattern} - return [::nsf::my {*}$cmd] + return [: {*}$cmd] } :method "info slot definition" {{-type ::nx::Slot} -closure:switch -source:optional pattern:optional} { set result {} - foreach slot [::nsf::my ::nsf::methods::class::info::slotobjects {*}[current args]] { + foreach slot [: ::nsf::methods::class::info::slotobjects {*}[current args]] { lappend result [$slot getPropertyDefinition] } return $result } :method "info slot names" {{-type ::nx::Slot} -closure:switch -source:optional pattern:optional} { set result {} - foreach slot [::nsf::my ::nsf::methods::class::info::slotobjects {*}[current args]] { + foreach slot [: ::nsf::methods::class::info::slotobjects {*}[current args]] { lappend result [$slot name] } return $result Index: tests/methods.test =================================================================== diff -u -r3b654bd0096ee0be729cbdefa63c0d981a708828 -r6ec717176dee759bf70840eabb6b5728229ed8f9 --- tests/methods.test (.../methods.test) (revision 3b654bd0096ee0be729cbdefa63c0d981a708828) +++ tests/methods.test (.../methods.test) (revision 6ec717176dee759bf70840eabb6b5728229ed8f9) @@ -696,10 +696,10 @@ :public method bar03 {} {[:]} :public method bar04 {} {:foo} :public method bar05 {} {: foo} - :public method bar06 {} {my foo} + #:public method bar06 {} {my foo} :public method bar07 {} {[self] foo} :public method bar08 {} {: -system info methods foo} - :public method bar09 {} {my -system info methods foo} + #:public method bar09 {} {my -system info methods foo} } ? {o foo} ::o @@ -709,8 +709,8 @@ ? {o bar03} ::o {[:]} ? {o bar04} ::o ":foo" ? {o bar05} ::o ": foo" - ? {o bar06} ::o "my foo" + #? {o bar06} ::o "my foo" ? {o bar07} ::o "self foo" ? {o bar08} foo ": -system info" - ? {o bar09} foo "my -system info" + #? {o bar09} foo "my -system info" } \ No newline at end of file Index: tests/object-system.test =================================================================== diff -u -r24724ebae83af4e0104b349a2fb582bfc71a7475 -r6ec717176dee759bf70840eabb6b5728229ed8f9 --- tests/object-system.test (.../object-system.test) (revision 24724ebae83af4e0104b349a2fb582bfc71a7475) +++ tests/object-system.test (.../object-system.test) (revision 6ec717176dee759bf70840eabb6b5728229ed8f9) @@ -160,7 +160,7 @@ o public method foo {} {return foo} o public method bar1 {} {return bar1-[:foo]} o public method bar2 {} {return bar2-[: foo]} -o public method bar3 {} {return bar3-[my foo]} +#o public method bar3 {} {return bar3-[my foo]} o public method bar4 {} {return bar4-[[self] foo]} o public method bar5 {} {return [self]::bar5} o public method bar6 {} {return [:]::bar6} @@ -170,7 +170,7 @@ ? {o foo} foo "simple method dispatch" ? {o bar1} bar1-foo "colon-methodname dispatch" ? {o bar2} bar2-foo "colon cmd dispatch" -? {o bar3} bar3-foo "my dispatch" +#? {o bar3} bar3-foo "my dispatch" ? {o bar4} bar4-foo "self dispatch" ? {o bar5} ::o::bar5 "self cmd" ? {o bar6} ::o::bar6 "colon cmd"