Index: openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl,v diff -u -N -r1.72.2.31 -r1.72.2.32 --- openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl 2 Sep 2021 16:40:48 -0000 1.72.2.31 +++ openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl 27 Oct 2021 19:34:25 -0000 1.72.2.32 @@ -425,7 +425,7 @@ flags "" default_values "" switches0 "" - switches1 "" + switches1 "" positionals "" varargs_p 0 script "" @@ -1161,13 +1161,14 @@ if {[namespace which ::xo::api] ne "" && [regexp {^(.*) (inst)?proc (.*)$} $proc_name match obj prefix method]} { + set method [lindex $proc_name end] if {[regexp {^(.*) (.*)$} $obj match scope obj]} { if {[::xo::api scope_eval $scope ::nsf::is object $obj]} { - return [::xo::api get_method_source $scope $obj $prefix $method] + return [::xo::api get_method_source $scope ::$obj $prefix $method] } } else { if {[::nsf::is object $obj]} { - return [::xo::api get_method_source "" $obj $prefix $method] + return [::xo::api get_method_source "" ::$obj $prefix $method] } } return "" 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.93.2.43 -r1.93.2.44 --- openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl 27 Oct 2021 11:59:10 -0000 1.93.2.43 +++ openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl 27 Oct 2021 19:34:25 -0000 1.93.2.44 @@ -945,11 +945,11 @@ "instproc" { if {"::xotcl::Object" in [$o info precedence]} {return [$o info instprocs {*}$args]} - return [$o info methods -type scripted -callprotection all {*}$args] + return [$o info methods -path -type scripted -callprotection all {*}$args] } "instcommand" { if {"::xotcl::Object" in [$o info precedence]} {return [$o info instcommands {*}$args]} - return [$o info methods {*}$args] + return [$o info methods -path {*}$args] } "instforward" { if {"::xotcl::Object" in [$o info precedence]} {return [$o info instforward {*}$args]} @@ -963,7 +963,7 @@ } "proc" { if {"::xotcl::Object" in [$o info precedence]} {return [$o info procs {*}$args]} - return [$o info object methods -type scripted {*}$args] + return [$o info object methods -path -type scripted {*}$args] } "command" { return [$o ::nsf::methods::object::info::methods {*}$args] 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.22.2.8 -r1.22.2.9 --- openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl 27 Feb 2021 22:29:09 -0000 1.22.2.8 +++ openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl 27 Oct 2021 19:34:25 -0000 1.22.2.9 @@ -263,9 +263,9 @@ :public object method proc_index {scope obj instproc proc_name} { if {$scope eq ""} { - return "$obj $instproc $proc_name" + return [list [string trimleft $obj :] $instproc $proc_name] } else { - return "$scope $obj $instproc $proc_name" + return [list $scope $obj $instproc $proc_name] } } @@ -336,8 +336,6 @@ # definition. # - #ns_log notice "update_object_doc $scope $obj ..." - if {$doc_string eq ""} { set doc_string [:get_doc_block [:get_init_block $scope $obj]] } @@ -405,7 +403,7 @@ # foreach protection {public protected private} { foreach m [::nsf::dispatch $obj ::nsf::methods::class::info::methods \ - -callprotection $protection -type scripted] { + -path -callprotection $protection -type scripted] { set docBlock [:get_doc_block \ [::nsf::dispatch $obj ::nsf::methods::class::info::method body $m]] ::xo::api update_method_doc \ @@ -508,7 +506,7 @@ } # argument documentation finished - set proc_index [string trimleft [::xo::api proc_index $scope $obj ${inst}proc $proc_name] :] + set proc_index [::xo::api proc_index $scope $obj ${inst}proc $proc_name] if {![nsv_exists api_proc_doc $proc_index]} { nsv_lappend api_proc_doc_scripts [dict get $doc script] $proc_index }