Index: openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl,v diff -u -N -r1.71 -r1.72 --- openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl 28 May 2013 12:56:28 -0000 1.71 +++ openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl 12 Aug 2013 20:01:05 -0000 1.72 @@ -397,10 +397,10 @@ } else { # register only once - if {[lsearch $registered ::xo::freeconn] == -1} { + if {"::xo::freeconn" ni $registered} { ns_ictl trace freeconn ::xo::freeconn } - if {[lsearch [ns_ictl gettraces delete] ::xo::at_delete] == -1} { + if {"::xo::at_delete" ni [ns_ictl gettraces delete]} { ns_ictl ondelete ::xo::at_delete } Index: openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl 25 Jun 2012 14:46:52 -0000 1.5 +++ openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl 12 Aug 2013 20:01:06 -0000 1.6 @@ -157,7 +157,7 @@ set doc_elements(private_p) $private set doc_elements(deprecated_p) $deprecated set doc_elements(warn_p) $deprecated - set doc_elements(varargs_p) [expr {[lsearch args [my info ${inst}args $proc_name]]>-1}] + set doc_elements(varargs_p) [expr {"args" in [my info ${inst}args $proc_name]}] set doc_elements(flags) [list] set doc_elements(switches) [list] foreach f [my info ${inst}nonposargs $proc_name] { Index: openacs-4/packages/xotcl-core/tcl/10-recreation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/10-recreation-procs.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/xotcl-core/tcl/10-recreation-procs.tcl 4 Mar 2010 10:36:13 -0000 1.8 +++ openacs-4/packages/xotcl-core/tcl/10-recreation-procs.tcl 12 Aug 2013 20:01:06 -0000 1.9 @@ -68,12 +68,12 @@ foreach var [$obj info vars] {$obj unset $var} # set defaults and run configure $obj set_instance_vars_defaults - eval $obj configure $args + $obj configure {*}$args #my log "### instproc recreate $obj + configure $args ..." } if {[my exists instreinit]} { #my log "### instreinit for $obj <$args>" - eval $obj init + $obj init #my log "### instproc recreate $obj + init ..." } } -proc recreate {obj args} { @@ -86,10 +86,10 @@ foreach var [$obj info vars] {$obj unset $var} # set defaults and run configure $obj set_instance_vars_defaults - eval $obj configure $args + $obj configure {*}$args } if {[my exists reinit]} { - eval $obj init + $obj init } } @@ -150,9 +150,9 @@ # we use uplevel to handle -volatile correctly set pos [my uplevel $obj configure $args] - if {[lsearch -exact $args -init] == -1} { + if {"-init" ni $args} { incr pos -1 - eval $obj init [lrange $args 0 $pos] + $obj init {*}[lrange $args 0 $pos] } } 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.20 -r1.21 --- openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl 14 Jan 2011 10:28:10 -0000 1.20 +++ openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl 12 Aug 2013 20:01:06 -0000 1.21 @@ -80,7 +80,7 @@ OrderedComposite instproc contains cmds { my requireNamespace ;# legacy for older xotcl versions set m [Object info instmixin] - if {[lsearch $m [self class]::ChildManager] == -1} { + if {"[self class]::ChildManager" ni $m} { set insert 1 Object instmixin add [self class]::ChildManager } else { Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v diff -u -N -r1.53 -r1.54 --- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl 6 Nov 2012 15:47:28 -0000 1.53 +++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl 12 Aug 2013 20:01:06 -0000 1.54 @@ -377,7 +377,7 @@ $M contains $cmd set slots [list] foreach c [$M children] { - eval lappend slots [$c get-slots] + lappend slots {*}[$c get-slots] } my proc add $slots { set __self [::xo::Table::Line new] 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.11 -r1.12 --- openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl 13 Apr 2013 08:28:19 -0000 1.11 +++ openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl 12 Aug 2013 20:01:06 -0000 1.12 @@ -287,6 +287,6 @@ Class create ::xotcl::THREAD::Client -parameter {server {serverobj [self]}} ::xotcl::THREAD::Client instproc do args { - eval [my server] do [my serverobj] $args + [my server] do [my serverobj] {*}$args } 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.62 -r1.63 --- openacs-4/packages/xotcl-core/tcl/context-procs.tcl 12 Nov 2012 14:37:26 -0000 1.62 +++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl 12 Aug 2013 20:01:06 -0000 1.63 @@ -106,7 +106,7 @@ } #my log "--cc calling parser eval [self] __parse $parse_args" - eval [self] __parse $parse_args + [self] __parse {*}$parse_args #my msg "--cc qp [array get queryparm] // $actual_query" }