diff options
| author | kjnash <k.j.nash@usa.net> | 2020-07-16 11:02:38 (GMT) |
|---|---|---|
| committer | kjnash <k.j.nash@usa.net> | 2020-07-16 11:02:38 (GMT) |
| commit | a757f1e30d79e5794e5b6a1a7d9826dc4ba52970 (patch) | |
| tree | 35dd169d506299c66fdd645e2a2d7aed58f2833f /library | |
| parent | e152f1757cded2998c7928799246c3ce9ed401a0 (diff) | |
| parent | dc175e403d5ce3e7986a9760b8850a93af6875e1 (diff) | |
| download | tcl-a757f1e30d79e5794e5b6a1a7d9826dc4ba52970.zip tcl-a757f1e30d79e5794e5b6a1a7d9826dc4ba52970.tar.gz tcl-a757f1e30d79e5794e5b6a1a7d9826dc4ba52970.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'library')
| -rw-r--r-- | library/auto.tcl | 18 | ||||
| -rw-r--r-- | library/tclIndex | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/library/auto.tcl b/library/auto.tcl index 7ef5681..2deae05 100644 --- a/library/auto.tcl +++ b/library/auto.tcl @@ -427,10 +427,10 @@ proc auto_mkindex_parser::mkindex {file} { # auto_mkindex_parser::hook command # -# Registers a Tcl command to evaluate when initializing the slave interpreter -# used by the mkindex parser. The command is evaluated in the master +# Registers a Tcl command to evaluate when initializing the child interpreter +# used by the mkindex parser. The command is evaluated in the parent # interpreter, and can use the variable auto_mkindex_parser::parser to get to -# the slave +# the child proc auto_mkindex_parser::hook {cmd} { variable initCommands @@ -438,16 +438,16 @@ proc auto_mkindex_parser::hook {cmd} { lappend initCommands $cmd } -# auto_mkindex_parser::slavehook command +# auto_mkindex_parser::childhook command # -# Registers a Tcl command to evaluate when initializing the slave interpreter -# used by the mkindex parser. The command is evaluated in the slave +# Registers a Tcl command to evaluate when initializing the child interpreter +# used by the mkindex parser. The command is evaluated in the child # interpreter. -proc auto_mkindex_parser::slavehook {cmd} { +proc auto_mkindex_parser::childhook {cmd} { variable initCommands - # The $parser variable is defined to be the name of the slave interpreter + # The $parser variable is defined to be the name of the child interpreter # when this command is used later. lappend initCommands "\$parser eval [list $cmd]" @@ -601,7 +601,7 @@ auto_mkindex_parser::command proc {name args} { # Conditionally add support for Tcl byte code files. There are some tricky # details here. First, we need to get the tbcload library initialized in the -# current interpreter. We cannot load tbcload into the slave until we have +# current interpreter. We cannot load tbcload into the child until we have # done so because it needs access to the tcl_patchLevel variable. Second, # because the package index file may defer loading the library until we invoke # a command, we need to explicitly invoke auto_load to force it to be loaded. diff --git a/library/tclIndex b/library/tclIndex index 87a2814..5f7fbfb 100644 --- a/library/tclIndex +++ b/library/tclIndex @@ -15,7 +15,7 @@ set auto_index(::auto_mkindex_parser::init) [list ::tcl::Pkg::source [file join set auto_index(::auto_mkindex_parser::cleanup) [list ::tcl::Pkg::source [file join $dir auto.tcl]] set auto_index(::auto_mkindex_parser::mkindex) [list ::tcl::Pkg::source [file join $dir auto.tcl]] set auto_index(::auto_mkindex_parser::hook) [list ::tcl::Pkg::source [file join $dir auto.tcl]] -set auto_index(::auto_mkindex_parser::slavehook) [list ::tcl::Pkg::source [file join $dir auto.tcl]] +set auto_index(::auto_mkindex_parser::childhook) [list ::tcl::Pkg::source [file join $dir auto.tcl]] set auto_index(::auto_mkindex_parser::command) [list ::tcl::Pkg::source [file join $dir auto.tcl]] set auto_index(::auto_mkindex_parser::commandInit) [list ::tcl::Pkg::source [file join $dir auto.tcl]] set auto_index(::auto_mkindex_parser::fullname) [list ::tcl::Pkg::source [file join $dir auto.tcl]] |