Index: openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl,v diff -u -N -r1.27.2.2 -r1.27.2.3 --- openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl 8 May 2019 14:22:02 -0000 1.27.2.2 +++ openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl 8 May 2019 14:30:45 -0000 1.27.2.3 @@ -130,7 +130,7 @@ # implementation of the method contains, that does NOT use try. # OrderedComposite instproc contains cmds { - my requireNamespace ;# legacy for older xotcl versions + :requireNamespace ;# legacy for older xotcl versions set m [Object info instmixin] if {"[self class]::ChildManager" ni $m} { set insert 1 @@ -170,7 +170,7 @@ set parent [lindex [[self class] set composite] end] $parent lappend __children [self] set :__parent $parent - #my __after_insert + #:__after_insert #:log "-- adding __parent $parent to [self]" return $r } Index: openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl,v diff -u -N -r1.68.2.4 -r1.68.2.5 --- openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl 8 May 2019 14:23:40 -0000 1.68.2.4 +++ openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl 8 May 2019 14:30:45 -0000 1.68.2.5 @@ -95,7 +95,7 @@ set value [set $k] ns_log notice "resubmit: canceling currently running request $context // closing $value" lassign $value fd0 channel0 client_data0 filename0 - my end-delivery -client_data $client_data0 $filename0 $fd0 $channel0 -1 + :end-delivery -client_data $client_data0 $filename0 $fd0 $channel0 -1 } set $k [list $fd $channel $client_data $filename] @@ -134,13 +134,13 @@ if {[ns_time seconds $t] > 2000} { if {[regexp {^([^,]+),([^,]+),(.+)$} $index _ channel fd filename]} { ns_log notice "bgdelivery, fileSpooler cleanup after [ns_time seconds $t] seconds, $key" - my end-delivery $filename $fd $channel -1 + :end-delivery $filename $fd $channel -1 } } } } fileSpooler proc tick {} { - if {[catch {my cleanup} errorMsg]} {ns_log error "Error during filespooler cleanup: $errorMsg"} + if {[catch {:cleanup} errorMsg]} {ns_log error "Error during filespooler cleanup: $errorMsg"} set :to [after ${:tick_interval} [list [self] tick]] } fileSpooler tick @@ -188,7 +188,7 @@ flush $channel } errorMsg]} { ns_log notice "h264: error writing headers in h264 channel for $filename $query: $errorMsg" - my end-delivery -client_data $client_data $filename $handle $channel 0 + :end-delivery -client_data $client_data $filename $handle $channel 0 } # setup async delivery fconfigure $channel -translation binary -blocking false @@ -199,7 +199,7 @@ set bytesVar ::bytes($channel,$handle,$filename) #ns_log notice "h264 WRITE BLOCK $channel $handle" if {[eof $channel] || [h264eof $handle]} { - my end-delivery -client_data $client_data $filename $handle $channel [set $bytesVar] + :end-delivery -client_data $client_data $filename $handle $channel [set $bytesVar] } else { set block [h264read $handle] # one should not use "bytelength" on binary data: https://wiki.tcl-lang.org/8455 @@ -208,7 +208,7 @@ h264Spooler incr byteCount $len if {[catch {puts -nonewline $channel $block} errorMsg]} { ns_log notice "h264: error on writing to channel $channel: $errorMsg" - my end-delivery -client_data $client_data $filename $handle $channel [set $bytesVar] + :end-delivery -client_data $client_data $filename $handle $channel [set $bytesVar] } } } @@ -428,13 +428,13 @@ ::HttpSpooler instproc release {} { # release indicates the when running becomes 0, the spooler is finished set :release 1 - if {${:running} == 0} {my all_done} + if {${:running} == 0} {:all_done} } ::HttpSpooler instproc done {reason request} { incr :running -1 :log "--running ${:running}" $request destroy - if {${:running} == 0 && ${:release}} {my all_done} + if {${:running} == 0 && ${:release}} {:all_done} } ::HttpSpooler instproc deliver {data request {encoding binary}} { :log "-- spooling ${:spooling}" @@ -750,7 +750,7 @@ bgdelivery proc -deprecated subscribe {key {initmsg ""} {mode default} } { set ch [ns_conn channel] thread::transfer [:get_tid] $ch - #my do ::Subscriber sweep $key + #:do ::Subscriber sweep $key :do ::Subscriber new -channel $ch -key $key -user_id [ad_conn user_id] -mode $mode } Index: openacs-4/packages/xotcl-core/tcl/context-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/context-procs.tcl,v diff -u -N -r1.75.2.1 -r1.75.2.2 --- openacs-4/packages/xotcl-core/tcl/context-procs.tcl 8 May 2019 14:23:40 -0000 1.75.2.1 +++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl 8 May 2019 14:30:45 -0000 1.75.2.2 @@ -528,7 +528,7 @@ ConnectionContext instproc set_parameter {name value} { set key [list get_parameter $name] - if {[:cache_exists $key]} {my cache_unset $key} + if {[:cache_exists $key]} {:cache_unset $key} set :perconnectionparam($name) $value } ConnectionContext instproc get_parameter {name {default ""}} { Index: openacs-4/packages/xotcl-core/tcl/cr-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/cr-procs.tcl,v diff -u -N -r1.76.2.14 -r1.76.2.15 --- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl 8 May 2019 14:23:40 -0000 1.76.2.14 +++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl 8 May 2019 14:30:45 -0000 1.76.2.15 @@ -1745,7 +1745,7 @@ CrCache::Item instproc set_non_persistent_vars {vars} { lassign $vars arrays scalars - foreach {var value} $arrays {my array set $var $value} + foreach {var value} $arrays {:array set $var $value} :mset $scalars } CrCache::Item instproc flush_from_cache_and_refresh {} { Index: openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl,v diff -u -N -r1.40.2.1 -r1.40.2.2 --- openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl 8 May 2019 14:23:40 -0000 1.40.2.1 +++ openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl 8 May 2019 14:30:45 -0000 1.40.2.2 @@ -299,7 +299,7 @@ if {[info exists :url]} { :parse_url } else { - if {![info exists port]} {my set_default_port $protocol} + if {![info exists port]} {:set_default_port $protocol} if {![info exists host]} { error "either host or url must be specified" } @@ -315,7 +315,7 @@ # :mixin add ::xo::Tls } - if {[catch {my open_connection} err]} { + if {[catch {:open_connection} err]} { :cancel "error during open connection via $protocol to $host $port: $err" } } @@ -331,7 +331,7 @@ #set tag [string trim $tag] puts $S "$tag: $value" } - my $method + :$method } err]} { :cancel "error send $host [:port]: $err" return @@ -392,16 +392,16 @@ :debug "--premature eof" return -2 } - if {$n == -1} {my debug "--input pending, no full line"; return -1} + if {$n == -1} {:debug "--input pending, no full line"; return -1} return $n } HttpCore instproc reply_first_line {} { :instvar S status_code fconfigure $S -translation crlf set n [:getLine response] switch -exact -- $n { - -2 {my cancel premature-eof; return} - -1 {my finish; return} + -2 {:cancel premature-eof; return} + -1 {:finish; return} } if {[regexp {^HTTP/([0-9.]+) +([0-9]+) *} $response _ \ responseHttpVersion status_code]} { @@ -417,11 +417,11 @@ while {1} { set n [:getLine response] switch -exact -- $n { - -2 {my cancel premature-eof; return} + -2 {:cancel premature-eof; return} -1 {continue} 0 {break} default { - #my debug "--header $response" + #:debug "--header $response" if {[regexp -nocase {^content-length:(.+)$} $response _ length]} { set :content_length [string trim $length] } elseif {[regexp -nocase {^content-type:(.+)$} $response _ type]} { @@ -647,7 +647,7 @@ set block [read $S] :notify reply_data $block append :data $block - #my debug "reveived [string length $block] bytes" + #:debug "reveived [string length $block] bytes" } } Index: openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl,v diff -u -N -r1.20.2.2 -r1.20.2.3 --- openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl 8 May 2019 14:22:02 -0000 1.20.2.2 +++ openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl 8 May 2019 14:31:17 -0000 1.20.2.3 @@ -197,7 +197,7 @@ # lazy creation of a new slave thread ad_mutex_eval ${:mutex} { - #my check_blueprint + #:check_blueprint #:log "after lock" if {![nsv_exists [self class] [self]]} { if {[:lightweight]} {