2102614 Add ensemble indexing support to [auto_mkindex]. Thanks Brian Griffin.

3 files changed, 45 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 26a51d5..69eb251 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-21  Don Porter  <dgp@users.sourceforge.net>
+
+	* library/auto.tcl: [Bug 2102614] Add ensemble indexing support
+	* tests/autoMkindex.test: to [auto_mkindex].  Thanks Brian Griffin.
+
 2013-03-19  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclFCmd.c: [Bug 3597000] Consistent [file copy] result.
diff --git a/library/auto.tcl b/library/auto.tcl
index e86257e..0848bb1 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -605,6 +605,15 @@ auto_mkindex_parser::command namespace {op args} {
             }
             catch {$parser eval "_%@namespace import $args"}
         }
+	ensemble {
+	    variable parser
+	    variable contextStack
+	    if {[lindex $args 0] eq "create"} {
+		set name ::[join [lreverse $contextStack] ::]
+		# create artifical proc to force an entry in the tclIndex
+		$parser eval [list ::proc $name {} {}]
+	    }
+	}
     }
 }
 
diff --git a/tests/autoMkindex.test b/tests/autoMkindex.test
index 8f29131..a7f72dc 100644
--- a/tests/autoMkindex.test
+++ b/tests/autoMkindex.test
@@ -236,6 +236,37 @@ test autoMkindex-3.3 {auto_mkindex_parser::command} -setup {
     # Reset initCommands to avoid trashing other tests
     AutoMkindexTestReset
 } -result "{::buried::mycmd4 $element} {::buried::mycmd5 $element} {mycmd6 $element}"
+makeFile {
+
+namespace eval wok {
+    namespace ensemble create -subcommands {commands vars}
+
+    proc commands {{pattern *}} {
+	puts [join [lsort -dictionary [info commands $pattern]] \n]
+    }
+
+    proc vars {{pattern *}} {
+	puts [join [lsort -dictionary [info vars $pattern]] \n]
+    }
+
+}
+
+} ensemblecommands.tcl
+
+test autoMkindex-3.3 {ensemble commands in tclIndex} {
+    file delete tclIndex
+    auto_mkindex . ensemblecommands.tcl
+    set f [open tclIndex r]
+    set dat [list]
+    foreach r [split [string trim [read $f]] "\n"] {
+	if {[string match {set auto_index*} $r]} {
+	    lappend dat $r
+	}
+    }
+    set result [lsort $dat]
+    close $f
+    set result
+} {{set auto_index(::wok::commands) [list source [file join $dir ensemblecommands.tcl]]} {set auto_index(::wok::vars) [list source [file join $dir ensemblecommands.tcl]]} {set auto_index(wok) [list source [file join $dir ensemblecommands.tcl]]}}
 
 test autoMkindex-4.1 {platform independent source commands} -setup {
     file delete tclIndex