Correct some faulty assumptions in the zlib transformation input driver.

BRANCHED - some other EOF matters need checking before this is trunk ready.

README

@@ -1,5 +1,5 @@
 README:  Tcl
-    This is the Tcl 8.6.2 source distribution.
+    This is the Tcl 8.6.1 source distribution.
 	http://sourceforge.net/projects/tcl/files/Tcl/
     You can get any source release of Tcl from the URL above.
 

changes

@@ -8274,7 +8274,7 @@ Dropped support for OS X versions less than 10.4 (Tiger) (fellows)
 2013-08-01 (bug fix)[1905562] RE recursion limit increased to support
 reported usage of large expressions (porter)
 
-2013-08-02 (bug fix)[9d6162] superclass slot empty crash (vdgoot,fellows)
+2013-08-02 (bug fix)[9d6162] superclass slot empty crash (vdgoot,fellows)2013-08-02 (bug fix)[9d6162] superclass slot empty crash (vdgoot,fellows)
 
 2013-08-03 (enhancement)[3611643] [auto_mkindex] support TclOO (fellows)
 
@@ -8303,154 +8303,4 @@ reported usage of large expressions (porter)
 
 Many optmizations, improvements, and tightened stack management in bytecode.
 
---- Released 8.6.1, September 20, 2013 --- http://core.tcl.tk/tcl/ for details 
-
-2013-09-27 (enhancement) improved ::env synchronization (fellows)
-
-2013-10-20 (bug fix)[2835313] segfault from 
-[apply {{} {while 1 {a {*}[return -level 0 -code continue]}}}] (fellows)
-
-2013-10-22 (bug fix)[3556215] [scan %E%G%X] support (fellows)
-
-2013-10-25 (bug fix)[3eb2ec1] upper case scheme names in url. (nijtmans)
-=> http 2.8.8
-
-2013-10-29 (bug fix)[414d103] HP-UX: restore [exec] in threaded Tcl (nijtmans)
-
-2013-11-04 (bug fix) C++ friendly stubs struct declarations (nijtmans)
-
-2013-11-05 (bug fix)[426679e] OpenBSD man page rendering (nijtmans)
-
-2013-11-12 (bug fix)[5425f2c] [fconfigure -error] breaks [socket -async]
-
-2013-11-20 (bug fix) Improved environment variable management (nijtmans)
-=> tcltest 2.3.7
-
-2013-11-21 (platforms) Support for Windows 8.1 (nijtmans)
-
-2013-12-06 (RFE) improved [foreach] bytecode (fellows)
-
-2013-12-10 (RFE) improved [lmap] bytecode (sofer)
-
-2013-12-11 (RFE) improved [catch] bytecode (sofer)
-
-2013-12-18 (bug fix)[0b874c3] SEGV [coroutine X coroutine Y info frame] (porter)
-
-2013-12-20 (RFE) reduced numeric conversion in bytecode (sofer)
-
-2014-01-07 (RFE) compilers for  [concat], [linsert], [namespace origin],
-[next], [string replace], [string tolower], [string totitle], [string toupper],
-[string trim], [string trimleft], [string trimright] (fellows)
-
-2014-01-22 (RFE) compilers for [nextto], [yieldto] (fellows)
-
-2014-02-02 (RFE) compiler for [string is] (fellows)
-
-2014-02-06 (bug fix)[a4494e2] panic in test namespace-13.2 (porter)
-
-2014-03-20 (bug fix)[2f7cbd0] FreeBSD 10.0 build failure (nijtmans)
-
-2014-03-26 (RFE)[b42b208] Cygwin: [file attr -readonly -archive -hidden -system]
-(nijtmans)
-
-2014-03-27 (bug fix) segfault iocmd-23.11 (porter)
-
-2014-04-02 (bug fix)[581937a] Win: readable event on async connect failure
-
-2014-04-04 (bug fix)[581937a,97069ea] async socket connect fail (oehlmann)
-
-2014-04-10 (bug fix)[792641f] Win: no \ in normalized path (nijtmans)
-
-2014-04-11 (bug fix)[3118489] protect NUL in filenames (nijtmans)
-
-2014-04-15 (bug fix)[88aef05] segfault iocmd-21.20 (porter)
-
-2014-04-16 (update) Win: use Winsock 2.2 (nijtmans)
-
-2014-04-16 (bug fix)[d19a30d] segfault clock-67.[23] (sebres)
-
-2014-04-21 (bug fix) segfault iocmd-21.2[12] (porter)
-
-2014-04-22 (bug fix) segfault iogt-2.4 (porter)
-
-2014-04-23 (bug fix)[3493120] memleak in thread exit
-
-2014-05-08 refactoring of core I/O functions (porter)
-
-2014-05-09 (bug fix)[3389978] Win: extended paths support (nijtmans)
-
-2014-05-09 (bug fix) segfault iocmd-32.1 (porter)
-
-2014-05-11 (bug fix)[6d2f249] nested ensemble compile failure (fellows)
-
-2014-05-17 (RFE)[47d6625] wideint support in [lsearch -integer] [lsort -integer] (nijtmans)
-	*** POTENTIAL INCOMPATIBILITY ***
-
-2014-05-20 (bug fix) Stop eof and blocked state leaking thru stacks (porter)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2014-05-20 (bug fix)[13d3af3] Win: socket -async tried only first IP address
-
-2014-05-28 (platforms) work around systems that fail when a shared library
-is deleted after it is [load]ed (kupries)
-
-2014-05-31 (bug fix) chan events on pipes must be on proper ends (porter)
-
-2014-06-04 (bug fix) socket-2.12 (porter)
-
-2014-06-05 (bug fix) io-12.6 (kupries,porter)
-
-2014-06-15 (RFE)[1b0266d] [dict replace|remove] return canonical dict (fellows)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2014-06-16 (bug fix) socket-2.13 workaround broken select() (porter)
-
-2014-06-20 (bug fix)[b47b176] iortrans.tf-11.0 (porter)
-
-2014-06-22 (RFE)[2f9df4c] -cleanup scripts before -out compare (nijtmans)
-
-2014-07-04 (update) Update Unicode data to 7.0 (nijtmans)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2014-07-08 (bug) [chan push] converts blocked writes to error (aspect,porter)
-
-2014-07-10 (bug fix)[7368d2] memleak Tcl_SetVar2(..,TCL_APPEND_VALUE) (porter)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2014-07-11 (bug) leaks in SetFsPathFromAny, [info frame] (porter)
-
-2014-07-15 (bug) compress dict leak in zlib xform channel close (porter)
-
-2014-07-17 (bug fix)[9969cf8] leak trace data in coroutine deletion (porter)
-
-2014-07-18 (RFE)[b43f2b4] fix [lappend] multi performance collapse (fellows)
-
-2014-07-19 (bug fix)[75b8433] memleak managing oo instance lists (porter)
-
-2014-07-21 (bug fix)[e6477e1] memleak in AtForkChild() (porter)
-
-2014-07-22 (bug fix)[12b0997] memleak in iocmd.tf-32.0 (porter)
-
-2014-07-28 (RFE) Optimized binary [chan copy] by moving buffers (porter)
-
-2014-07-30 (enhancement) use refcounts, not Tcl_Preserve to manage lifetime
-of Tcl_Channel  (porter)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2014-07-31 (bug fix)[a84a720] double free in oo chain deletion (porter)
-
-2014-08-01 (bug fix)[e75faba] SEGV [apply {{} {namespace upvar a b [x]}}] (porter)
-
-2014-08-01 (update) "macosx*-i386-x86_64" "macosx-universal" no longer compatible (kupries)
-=> platform 1.0.13
-
-2014-08-12 tzdata updated to Olson's tzdata2014f (kenny)
-
-2014-08-17 (bug fix)[7d52e11] [info class subclasses oo::object] should
-include ::oo::class (fellows)
-
-2014-08-25 (TIP 429) New command [string cat] (leitgeb,ferrieux)
-
---- Released 8.6.2, August 27, 2014 --- http://core.tcl.tk/tcl/ for details 
-
-2014-08-29 (TIP TBD) Added a C Implementation of ZipVFS to provide Tcl/Wishkit building capbilities in the core (hypnotoad)
+--- Released 8.6.1, Septemer 20, 2013 --- http://core.tcl.tk/tcl/ for details 

doc/StringObj.3

@@ -293,7 +293,6 @@ of \fBTcl_Format\fR with functionality equivalent to:
 Tcl_Obj *newPtr = \fBTcl_Format\fR(interp, format, objc, objv);
 if (newPtr == NULL) return TCL_ERROR;
 \fBTcl_AppendObjToObj\fR(objPtr, newPtr);
-\fBTcl_DecrRefCount\fR(newPtr);
 return TCL_OK;
 .CE
 .PP
@@ -338,9 +337,7 @@ Compile-time protection may be provided by some compilers.
 of \fBTcl_ObjPrintf\fR with functionality equivalent to
 .PP
 .CS
-Tcl_Obj *newPtr = \fBTcl_ObjPrintf\fR(format, ...);
-\fBTcl_AppendObjToObj\fR(objPtr, newPtr);
-\fBTcl_DecrRefCount\fR(newPtr);
+\fBTcl_AppendObjToObj\fR(objPtr, \fBTcl_ObjPrintf\fR(format, ...));
 .CE
 .PP
 but with greater convenience and efficiency when the appending

doc/clock.n

@@ -637,9 +637,8 @@ On output, produces a locale-dependent time of day representation on a
 12-hour clock. On input, accepts whatever \fB%r\fR produces.
 .TP
 \fB%R\fR
-On output, the time in 24-hour notation (%H:%M). For a version
-including the seconds, see \fB%T\fR below. On input, accepts whatever
-\fB%R\fR produces.
+On output, produces a locale-dependent time of day representation on a
+24-hour clock. On input, accepts whatever \fB%R\fR produces.
 .TP
 \fB%s\fR
 On output, simply formats the \fItimeVal\fR argument as a decimal

doc/dict.n

@@ -25,12 +25,11 @@ below for a description), depending on \fIoption\fR.  The legal
 This appends the given string (or strings) to the value that the given
 key maps to in the dictionary value contained in the given variable,
 writing the resulting dictionary value back to that variable.
-Non-existent keys are treated as if they map to an empty string. The
-updated dictionary value is returned.
+Non-existent keys are treated as if they map to an empty string.
 .TP
 \fBdict create \fR?\fIkey value ...\fR?
 .
-Return a new dictionary that contains each of the key/value mappings
+Create a new dictionary that contains each of the key/value mappings
 listed as arguments (keys and values alternating, with each key being
 followed by its associated value.)
 .TP
@@ -54,10 +53,10 @@ The key rule only matches those key/value pairs whose keys match any
 of the given patterns (in the style of \fBstring match\fR.)
 .VE 8.6
 .TP
-\fBdict filter \fIdictionaryValue \fBscript {\fIkeyVariable valueVariable\fB} \fIscript\fR
+\fBdict filter \fIdictionaryValue \fBscript {\fIkeyVar valueVar\fB} \fIscript\fR
 .
 The script rule tests for matching by assigning the key to the
-\fIkeyVariable\fR and the value to the \fIvalueVariable\fR, and then evaluating
+\fIkeyVar\fR and the value to the \fIvalueVar\fR, and then evaluating
 the given script which should return a boolean value (with the
 key/value pair only being included in the result of the \fBdict
 filter\fR when a true value is returned.)  Note that the first
@@ -75,7 +74,7 @@ of the given patterns (in the style of \fBstring match\fR.)
 .VE 8.6
 .RE
 .TP
-\fBdict for {\fIkeyVariable valueVariable\fB} \fIdictionaryValue body\fR
+\fBdict for {\fIkeyVar valueVar\fB} \fIdictionaryValue body\fR
 .
 This command takes three arguments, the first a two-element list of
 variable names (for the key and value respectively of each mapping in
@@ -122,8 +121,7 @@ not specified) to the value that the given key maps to in the
 dictionary value contained in the given variable, writing the
 resulting dictionary value back to that variable. Non-existent keys
 are treated as if they map to 0. It is an error to increment a value
-for an existing key if that value is not an integer. The updated
-dictionary value is returned.
+for an existing key if that value is not an integer.
 .TP
 \fBdict info \fIdictionaryValue\fR
 .
@@ -147,10 +145,9 @@ to in the dictionary value contained in the given variable, writing
 the resulting dictionary value back to that variable. Non-existent
 keys are treated as if they map to an empty list, and it is legal for
 there to be no items to append to the list. It is an error for the
-value that the key maps to to not be representable as a list. The
-updated dictionary value is returned.
+value that the key maps to to not be representable as a list.
 .TP
-\fBdict map \fR{\fIkeyVariable valueVariable\fR} \fIdictionaryValue body\fR
+\fBdict map \fR{\fIkeyVar valueVar\fR} \fIdictionaryValue body\fR
 .
 This command applies a transformation to each element of a dictionary,
 returning a new dictionary. It takes three arguments: the first is a
@@ -160,7 +157,7 @@ and the third a script to be evaluated for each mapping with the key and value
 variables set appropriately (in the manner of \fBlmap\fR). In an iteration
 where the evaluated script completes normally (\fBTCL_OK\fR, as opposed to an
 \fBerror\fR, etc.) the result of the script is put into an accumulator
-dictionary using the key that is the current contents of the \fIkeyVariable\fR
+dictionary using the key that is the current contents of the \fIkeyVar\fR
 variable at that point. The result of the \fBdict map\fR command is the
 accumulator dictionary after all keys have been iterated over.
 .RS
@@ -205,7 +202,7 @@ This operation takes the name of a variable containing a dictionary
 value and places an updated dictionary value in that variable
 containing a mapping from the given key to the given value. When
 multiple keys are present, this operation creates or updates a chain
-of nested dictionaries. The updated dictionary value is returned.
+of nested dictionaries.
 .TP
 \fBdict size \fIdictionaryValue\fR
 .
@@ -219,8 +216,7 @@ dictionary value in that variable that does not contain a mapping for
 the given key. Where multiple keys are present, this describes a path
 through nested dictionaries to the mapping to remove. At least one key
 must be specified, but the last key on the key-path need not exist.
-All other components on the path must exist. The updated dictionary
-value is returned.
+All other components on the path must exist.
 .TP
 \fBdict update \fIdictionaryVariable key varName \fR?\fIkey varName ...\fR? \fIbody\fR
 .

doc/fcopy.n

@@ -46,11 +46,8 @@ non-blocking mode; the \fBfcopy\fR command takes care of that automatically.
 However, it is necessary to enter the event loop by using
 the \fBvwait\fR command or by using Tk.
 .PP
-You are not allowed to do other input operations with \fIinchan\fR, or
-output operations with \fIoutchan\fR, during a background
-\fBfcopy\fR. The converse is entirely legitimate, as exhibited by the
-bidirectional fcopy example below.
-.PP
+You are not allowed to do other I/O operations with
+\fIinchan\fR or \fIoutchan\fR during a background \fBfcopy\fR.
 If either \fIinchan\fR or \fIoutchan\fR get closed
 while the copy is in progress, the current copy is stopped
 and the command callback is \fInot\fR made.
@@ -60,7 +57,7 @@ then all data already queued for \fIoutchan\fR is written out.
 Note that \fIinchan\fR can become readable during a background copy.
 You should turn off any \fBfileevent\fR handlers during a background
 copy so those handlers do not interfere with the copy.
-Any wrong-sided I/O attempted (by a \fBfileevent\fR handler or otherwise) will get a
+Any I/O attempted by a \fBfileevent\fR handler will get a
 .QW "channel busy"
 error.
 .PP
@@ -152,24 +149,6 @@ set total 0
         -command [list CopyMore $in $out $chunk]
 vwait done
 .CE
-.PP
-The fourth example starts an asynchronous, bidirectional fcopy between
-two sockets. Those could also be pipes from two [open "|hal 9000" r+]
-(though their conversation would remain secret to the script, since
-all four fileevent slots are busy).
-.PP
-.CS
-set flows 2
-proc Done {dir args} {
-     global flows done
-     puts "$dir is over."
-     incr flows -1
-     if {$flows<=0} {set done 1}
-}
-\fBfcopy\fR $sok1 $sok2 -command [list Done UP]
-\fBfcopy\fR $sok2 $sok1 -command [list Done DOWN]
-vwait done
-.CE
 .SH "SEE ALSO"
 eof(n), fblocked(n), fconfigure(n), file(n)
 .SH KEYWORDS

doc/http.n

@@ -210,8 +210,7 @@ proc httpHandlerCallback {socket token} {
 .TP
 \fB\-headers\fR \fIkeyvaluelist\fR
 .
-This option is used to add headers not already specified
-by \fB::http::config\fR to the HTTP request.  The
+This option is used to add extra headers to the HTTP request.  The
 \fIkeyvaluelist\fR argument must be a list with an even number of
 elements that alternate between keys and values.  The keys become
 header field names.  Newlines are stripped from the values so the

doc/string.n

@@ -19,21 +19,6 @@ string \- Manipulate strings
 Performs one of several string operations, depending on \fIoption\fR.
 The legal \fIoption\fRs (which may be abbreviated) are:
 .TP
-\fBstring cat\fR ?\fIstring1\fR? ?\fIstring2...\fR?
-.VS 8.6.2
-Concatenate the given \fIstring\fRs just like placing them directly
-next to each other and return the resulting compound string.  If no
-\fIstring\fRs are present, the result is an empty string.
-.RS
-.PP
-This primitive is occasionally handier than juxtaposition of strings
-when mixed quoting is wanted, or when the aim is to return the result
-of a concatenation without resorting to \fBreturn\fR \fB\-level 0\fR,
-and is more efficient than building a list of arguments and using
-\fBjoin\fR with an empty join string.
-.RE
-.VE
-.TP
 \fBstring compare\fR ?\fB\-nocase\fR? ?\fB\-length\fI length\fR? \fIstring1 string2\fR
 .
 Perform a character-by-character comparison of strings \fIstring1\fR
@@ -146,9 +131,8 @@ Any Unicode printing character, including space.
 .IP \fBpunct\fR 12
 Any Unicode punctuation character.
 .IP \fBspace\fR 12
-Any Unicode whitespace character, mongolian vowel separator
-(U+180e), zero width space (U+200b), word joiner (U+2060) or
-zero width no-break space (U+feff) (=BOM).
+Any Unicode whitespace character, zero width space (U+200b),
+word joiner (U+2060) and zero width no-break space (U+feff) (=BOM).
 .IP \fBtrue\fR 12
 Any of the forms allowed to \fBTcl_GetBoolean\fR where the value is
 true.

doc/tclsh.1

@@ -143,15 +143,6 @@ incomplete commands.
 .SH "STANDARD CHANNELS"
 .PP
 See \fBTcl_StandardChannels\fR for more explanations.
-.SH ZIPVFS
-.PP
-When a zipfile is concatenated to the end of a \fBtclsh\fR, on
-startup the contents of the zip archive will be mounted as the
-virtual file system /zvfs. If a top level directory tcl8.6 is
-present in the zip archive, it will become the directory loaded
-as env(TCL_LIBRARY). If a file named \fBmain.tcl\fR is present
-in the top level directory of the zip archive, it will be sourced
-instead of the shell's normal command line handing.
 .SH "SEE ALSO"
 auto_path(n), encoding(n), env(n), fconfigure(n)
 .SH KEYWORDS

doc/tclvars.n

@@ -347,8 +347,8 @@ was compiled with threads enabled.
 .
 This identifies the
 current user based on the login information available on the platform.
-This value comes from the getuid() and getpwuid() system calls on Unix,
-and the value from the GetUserName() system call on Windows.
+This comes from the USER or LOGNAME environment variable on Unix,
+and the value from GetUserName on Windows.
 .TP
 \fBwordSize\fR
 .

doc/zvfs.n

@@ -1,114 +0,0 @@
-'\"
-'\" Copyright (c) 2014 Sean Woods
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-.TH zvfs n 0.1 Zvfs "Zvfs Commands"
-.so man.macros
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-zvfs \- Mount and work with ZIP files within Tcl
-.SH SYNOPSIS
-.nf
-\fBpackage require zvfs \fR?\fB0.1\fR?
-.sp
-\fB::zvfs::add\fR ?\fB\-fconfigure \fIoptpairs...\fR? \fIarchive file1\fR ?\fIfile2 ...\fR?
-\fB::zvfs::append\fR \fIarchive\fR ?\fIsource destination\fR? ?\fIsource destination...\fR?
-\fB::zvfs::dump\fR \fIzipfile\fR
-\fB::zvfs::exists\fR \fIfilename\fR
-\fB::zvfs::info\fR \fIfile\fR
-\fB::zvfs::list\fR ?\fB\-glob\fR|\fB\-regexp\fR? ?\fIpattern\fR?
-\fB::zvfs::mount ?\fIarchive\fR? ?\fImountpoint\fR?
-\fB::zvfs::start\fR \fIzipfile\fR
-\fB::zvfs::unmount \fIarchive\fR
-.fi
-.BE
-.SH DESCRIPTION
-.PP
-The \fBzvfs\fR package provides tcl with the ability to manipulate
-the contents of a zip file archive as a virtual file system.
-.TP
-\fB::zvfs::mount ?\fIarchive\fR? ?\fImountpoint\fR?
-.
-The \fB::zvfs::mount\fR procedure mounts a zipfile as a VFS.
-After this command
-executes, files contained in the ZIP archive, \fIarchive\fR, will appear to Tcl to be
-regular files at the mount point.
-.RS
-.PP
-With no \fImountpoint\fR, returns the mount point for \fIarchive\fR. With no \fIarchive\fR,
-return all archive/mount pairs. If \fImountpoint\fR is specified as an empty
-string, mount on file path.
-.RE
-.TP
-\fB::zvfs::unmount \fIarchive\fR
-.
-Unmounts a previously mounted zip, \fIarchive\fR.
-.TP
-\fB::zvfs::append\fR \fIarchive\fR ?\fIsource destination\fR? ?\fIsource destination...\fR?
-.
-This command reads \fIsource\fR files and appends them (using the name
-\fIdestination\fR) to the zip archive named \fIarchive\fR. A new zip archive is created
-if it does not already exist. If \fIarchive\fR refers to a file which exists but
-is not a zip archive, then this command turns \fIarchive\fR into a zip archive by
-appending the necessary records and the table of contents. Treat all files
-as binary.
-.RS
-.PP
-Note: No duplicate checking is done, so multiple occurances of the same file is
-allowed.
-.RE
-.TP
-\fB::zvfs::add\fR ?\fB\-fconfigure \fIoptpairs...\fR? \fIarchive file1\fR ?\fIfile2 ...\fR?
-.
-This command is similar to \fBzvfs::append\fR in that it adds files to the zip archive
-named \fIarchive\fR, however file names are relative the current directory.  In
-addition, \fBfconfigure\fR is used to apply option pairs to set upon opening of
-each file.  Otherwise, default translation is allowed for those file
-extensions listed in the \fB::zvfs::auto_ext\fR variable.  Binary translation will be
-used for unknown extensions.
-.RS
-.PP
-NOTE: Use 
-.QW "\fB\-fconfigure {}\fR"
-to use auto translation for all.
-.RE
-.TP
-\fB::zvfs::exists\fR \fIfilename\fR
-.
-Return TRUE if the given filename exists in the mounted ZVFS and FALSE if it does
-not.
-.TP
-\fB::zvfs::info\fR \fIfile\fR
-.
-Return information about the given file in the mounted ZVFS.  The information
-consists of (1) the name of the ZIP archive that contains the file, (2) the
-size of the file after decompressions, (3) the compressed size of the file,
-and (4) the offset of the compressed data in the archive.
-.RS
-.PP
-Note: querying the mount point gives the start of zip data offset in (4),
-which can be used to truncate the zip info off an executable.
-.RE
-.TP
-\fB::zvfs::list\fR ?\fB\-glob\fR|\fB\-regexp\fR? ?\fIpattern\fR?
-.
-Return a list of all files in the mounted ZVFS.  The order of the names in the list
-is arbitrary.
-.TP
-\fB::zvfs::dump\fR \fIzipfile\fR
-.
-Describe the contents of a zip.
-.TP
-\fB::zvfs::start\fR \fIzipfile\fR
-.
-This command strips returns the offset of zip data.
-.SH "SEE ALSO"
-tclsh(1), file(n), zlib(n)
-.SH "KEYWORDS"
-compress, filesystem, zip
-'\" Local Variables:
-'\" mode: nroff
-'\" End:

generic/regc_locale.c

@@ -137,107 +137,97 @@ static const crange alphaRangeTable[] = {
     {0x41, 0x5a}, {0x61, 0x7a}, {0xc0, 0xd6}, {0xd8, 0xf6},
     {0xf8, 0x2c1}, {0x2c6, 0x2d1}, {0x2e0, 0x2e4}, {0x370, 0x374},
     {0x37a, 0x37d}, {0x388, 0x38a}, {0x38e, 0x3a1}, {0x3a3, 0x3f5},
-    {0x3f7, 0x481}, {0x48a, 0x52f}, {0x531, 0x556}, {0x561, 0x587},
+    {0x3f7, 0x481}, {0x48a, 0x527}, {0x531, 0x556}, {0x561, 0x587},
     {0x5d0, 0x5ea}, {0x5f0, 0x5f2}, {0x620, 0x64a}, {0x671, 0x6d3},
     {0x6fa, 0x6fc}, {0x712, 0x72f}, {0x74d, 0x7a5}, {0x7ca, 0x7ea},
-    {0x800, 0x815}, {0x840, 0x858}, {0x8a0, 0x8b2}, {0x904, 0x939},
-    {0x958, 0x961}, {0x971, 0x980}, {0x985, 0x98c}, {0x993, 0x9a8},
-    {0x9aa, 0x9b0}, {0x9b6, 0x9b9}, {0x9df, 0x9e1}, {0xa05, 0xa0a},
-    {0xa13, 0xa28}, {0xa2a, 0xa30}, {0xa59, 0xa5c}, {0xa72, 0xa74},
-    {0xa85, 0xa8d}, {0xa8f, 0xa91}, {0xa93, 0xaa8}, {0xaaa, 0xab0},
-    {0xab5, 0xab9}, {0xb05, 0xb0c}, {0xb13, 0xb28}, {0xb2a, 0xb30},
-    {0xb35, 0xb39}, {0xb5f, 0xb61}, {0xb85, 0xb8a}, {0xb8e, 0xb90},
-    {0xb92, 0xb95}, {0xba8, 0xbaa}, {0xbae, 0xbb9}, {0xc05, 0xc0c},
-    {0xc0e, 0xc10}, {0xc12, 0xc28}, {0xc2a, 0xc39}, {0xc85, 0xc8c},
-    {0xc8e, 0xc90}, {0xc92, 0xca8}, {0xcaa, 0xcb3}, {0xcb5, 0xcb9},
-    {0xd05, 0xd0c}, {0xd0e, 0xd10}, {0xd12, 0xd3a}, {0xd7a, 0xd7f},
-    {0xd85, 0xd96}, {0xd9a, 0xdb1}, {0xdb3, 0xdbb}, {0xdc0, 0xdc6},
-    {0xe01, 0xe30}, {0xe40, 0xe46}, {0xe94, 0xe97}, {0xe99, 0xe9f},
-    {0xea1, 0xea3}, {0xead, 0xeb0}, {0xec0, 0xec4}, {0xedc, 0xedf},
-    {0xf40, 0xf47}, {0xf49, 0xf6c}, {0xf88, 0xf8c}, {0x1000, 0x102a},
-    {0x1050, 0x1055}, {0x105a, 0x105d}, {0x106e, 0x1070}, {0x1075, 0x1081},
-    {0x10a0, 0x10c5}, {0x10d0, 0x10fa}, {0x10fc, 0x1248}, {0x124a, 0x124d},
-    {0x1250, 0x1256}, {0x125a, 0x125d}, {0x1260, 0x1288}, {0x128a, 0x128d},
-    {0x1290, 0x12b0}, {0x12b2, 0x12b5}, {0x12b8, 0x12be}, {0x12c2, 0x12c5},
-    {0x12c8, 0x12d6}, {0x12d8, 0x1310}, {0x1312, 0x1315}, {0x1318, 0x135a},
-    {0x1380, 0x138f}, {0x13a0, 0x13f4}, {0x1401, 0x166c}, {0x166f, 0x167f},
-    {0x1681, 0x169a}, {0x16a0, 0x16ea}, {0x16f1, 0x16f8}, {0x1700, 0x170c},
-    {0x170e, 0x1711}, {0x1720, 0x1731}, {0x1740, 0x1751}, {0x1760, 0x176c},
-    {0x176e, 0x1770}, {0x1780, 0x17b3}, {0x1820, 0x1877}, {0x1880, 0x18a8},
-    {0x18b0, 0x18f5}, {0x1900, 0x191e}, {0x1950, 0x196d}, {0x1970, 0x1974},
-    {0x1980, 0x19ab}, {0x19c1, 0x19c7}, {0x1a00, 0x1a16}, {0x1a20, 0x1a54},
-    {0x1b05, 0x1b33}, {0x1b45, 0x1b4b}, {0x1b83, 0x1ba0}, {0x1bba, 0x1be5},
-    {0x1c00, 0x1c23}, {0x1c4d, 0x1c4f}, {0x1c5a, 0x1c7d}, {0x1ce9, 0x1cec},
-    {0x1cee, 0x1cf1}, {0x1d00, 0x1dbf}, {0x1e00, 0x1f15}, {0x1f18, 0x1f1d},
-    {0x1f20, 0x1f45}, {0x1f48, 0x1f4d}, {0x1f50, 0x1f57}, {0x1f5f, 0x1f7d},
-    {0x1f80, 0x1fb4}, {0x1fb6, 0x1fbc}, {0x1fc2, 0x1fc4}, {0x1fc6, 0x1fcc},
-    {0x1fd0, 0x1fd3}, {0x1fd6, 0x1fdb}, {0x1fe0, 0x1fec}, {0x1ff2, 0x1ff4},
-    {0x1ff6, 0x1ffc}, {0x2090, 0x209c}, {0x210a, 0x2113}, {0x2119, 0x211d},
-    {0x212a, 0x212d}, {0x212f, 0x2139}, {0x213c, 0x213f}, {0x2145, 0x2149},
-    {0x2c00, 0x2c2e}, {0x2c30, 0x2c5e}, {0x2c60, 0x2ce4}, {0x2ceb, 0x2cee},
-    {0x2d00, 0x2d25}, {0x2d30, 0x2d67}, {0x2d80, 0x2d96}, {0x2da0, 0x2da6},
-    {0x2da8, 0x2dae}, {0x2db0, 0x2db6}, {0x2db8, 0x2dbe}, {0x2dc0, 0x2dc6},
-    {0x2dc8, 0x2dce}, {0x2dd0, 0x2dd6}, {0x2dd8, 0x2dde}, {0x3031, 0x3035},
-    {0x3041, 0x3096}, {0x309d, 0x309f}, {0x30a1, 0x30fa}, {0x30fc, 0x30ff},
-    {0x3105, 0x312d}, {0x3131, 0x318e}, {0x31a0, 0x31ba}, {0x31f0, 0x31ff},
-    {0x3400, 0x4db5}, {0x4e00, 0x9fcc}, {0xa000, 0xa48c}, {0xa4d0, 0xa4fd},
-    {0xa500, 0xa60c}, {0xa610, 0xa61f}, {0xa640, 0xa66e}, {0xa67f, 0xa69d},
-    {0xa6a0, 0xa6e5}, {0xa717, 0xa71f}, {0xa722, 0xa788}, {0xa78b, 0xa78e},
-    {0xa790, 0xa7ad}, {0xa7f7, 0xa801}, {0xa803, 0xa805}, {0xa807, 0xa80a},
-    {0xa80c, 0xa822}, {0xa840, 0xa873}, {0xa882, 0xa8b3}, {0xa8f2, 0xa8f7},
-    {0xa90a, 0xa925}, {0xa930, 0xa946}, {0xa960, 0xa97c}, {0xa984, 0xa9b2},
-    {0xa9e0, 0xa9e4}, {0xa9e6, 0xa9ef}, {0xa9fa, 0xa9fe}, {0xaa00, 0xaa28},
-    {0xaa40, 0xaa42}, {0xaa44, 0xaa4b}, {0xaa60, 0xaa76}, {0xaa7e, 0xaaaf},
-    {0xaab9, 0xaabd}, {0xaadb, 0xaadd}, {0xaae0, 0xaaea}, {0xaaf2, 0xaaf4},
-    {0xab01, 0xab06}, {0xab09, 0xab0e}, {0xab11, 0xab16}, {0xab20, 0xab26},
-    {0xab28, 0xab2e}, {0xab30, 0xab5a}, {0xab5c, 0xab5f}, {0xabc0, 0xabe2},
-    {0xac00, 0xd7a3}, {0xd7b0, 0xd7c6}, {0xd7cb, 0xd7fb}, {0xf900, 0xfa6d},
-    {0xfa70, 0xfad9}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17}, {0xfb1f, 0xfb28},
-    {0xfb2a, 0xfb36}, {0xfb38, 0xfb3c}, {0xfb46, 0xfbb1}, {0xfbd3, 0xfd3d},
-    {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7}, {0xfdf0, 0xfdfb}, {0xfe70, 0xfe74},
-    {0xfe76, 0xfefc}, {0xff21, 0xff3a}, {0xff41, 0xff5a}, {0xff66, 0xffbe},
-    {0xffc2, 0xffc7}, {0xffca, 0xffcf}, {0xffd2, 0xffd7}, {0xffda, 0xffdc}
+    {0x800, 0x815}, {0x840, 0x858}, {0x8a2, 0x8ac}, {0x904, 0x939},
+    {0x958, 0x961}, {0x971, 0x977}, {0x979, 0x97f}, {0x985, 0x98c},
+    {0x993, 0x9a8}, {0x9aa, 0x9b0}, {0x9b6, 0x9b9}, {0x9df, 0x9e1},
+    {0xa05, 0xa0a}, {0xa13, 0xa28}, {0xa2a, 0xa30}, {0xa59, 0xa5c},
+    {0xa72, 0xa74}, {0xa85, 0xa8d}, {0xa8f, 0xa91}, {0xa93, 0xaa8},
+    {0xaaa, 0xab0}, {0xab5, 0xab9}, {0xb05, 0xb0c}, {0xb13, 0xb28},
+    {0xb2a, 0xb30}, {0xb35, 0xb39}, {0xb5f, 0xb61}, {0xb85, 0xb8a},
+    {0xb8e, 0xb90}, {0xb92, 0xb95}, {0xba8, 0xbaa}, {0xbae, 0xbb9},
+    {0xc05, 0xc0c}, {0xc0e, 0xc10}, {0xc12, 0xc28}, {0xc2a, 0xc33},
+    {0xc35, 0xc39}, {0xc85, 0xc8c}, {0xc8e, 0xc90}, {0xc92, 0xca8},
+    {0xcaa, 0xcb3}, {0xcb5, 0xcb9}, {0xd05, 0xd0c}, {0xd0e, 0xd10},
+    {0xd12, 0xd3a}, {0xd7a, 0xd7f}, {0xd85, 0xd96}, {0xd9a, 0xdb1},
+    {0xdb3, 0xdbb}, {0xdc0, 0xdc6}, {0xe01, 0xe30}, {0xe40, 0xe46},
+    {0xe94, 0xe97}, {0xe99, 0xe9f}, {0xea1, 0xea3}, {0xead, 0xeb0},
+    {0xec0, 0xec4}, {0xedc, 0xedf}, {0xf40, 0xf47}, {0xf49, 0xf6c},
+    {0xf88, 0xf8c}, {0x1000, 0x102a}, {0x1050, 0x1055}, {0x105a, 0x105d},
+    {0x106e, 0x1070}, {0x1075, 0x1081}, {0x10a0, 0x10c5}, {0x10d0, 0x10fa},
+    {0x10fc, 0x1248}, {0x124a, 0x124d}, {0x1250, 0x1256}, {0x125a, 0x125d},
+    {0x1260, 0x1288}, {0x128a, 0x128d}, {0x1290, 0x12b0}, {0x12b2, 0x12b5},
+    {0x12b8, 0x12be}, {0x12c2, 0x12c5}, {0x12c8, 0x12d6}, {0x12d8, 0x1310},
+    {0x1312, 0x1315}, {0x1318, 0x135a}, {0x1380, 0x138f}, {0x13a0, 0x13f4},
+    {0x1401, 0x166c}, {0x166f, 0x167f}, {0x1681, 0x169a}, {0x16a0, 0x16ea},
+    {0x1700, 0x170c}, {0x170e, 0x1711}, {0x1720, 0x1731}, {0x1740, 0x1751},
+    {0x1760, 0x176c}, {0x176e, 0x1770}, {0x1780, 0x17b3}, {0x1820, 0x1877},
+    {0x1880, 0x18a8}, {0x18b0, 0x18f5}, {0x1900, 0x191c}, {0x1950, 0x196d},
+    {0x1970, 0x1974}, {0x1980, 0x19ab}, {0x19c1, 0x19c7}, {0x1a00, 0x1a16},
+    {0x1a20, 0x1a54}, {0x1b05, 0x1b33}, {0x1b45, 0x1b4b}, {0x1b83, 0x1ba0},
+    {0x1bba, 0x1be5}, {0x1c00, 0x1c23}, {0x1c4d, 0x1c4f}, {0x1c5a, 0x1c7d},
+    {0x1ce9, 0x1cec}, {0x1cee, 0x1cf1}, {0x1d00, 0x1dbf}, {0x1e00, 0x1f15},
+    {0x1f18, 0x1f1d}, {0x1f20, 0x1f45}, {0x1f48, 0x1f4d}, {0x1f50, 0x1f57},
+    {0x1f5f, 0x1f7d}, {0x1f80, 0x1fb4}, {0x1fb6, 0x1fbc}, {0x1fc2, 0x1fc4},
+    {0x1fc6, 0x1fcc}, {0x1fd0, 0x1fd3}, {0x1fd6, 0x1fdb}, {0x1fe0, 0x1fec},
+    {0x1ff2, 0x1ff4}, {0x1ff6, 0x1ffc}, {0x2090, 0x209c}, {0x210a, 0x2113},
+    {0x2119, 0x211d}, {0x212a, 0x212d}, {0x212f, 0x2139}, {0x213c, 0x213f},
+    {0x2145, 0x2149}, {0x2c00, 0x2c2e}, {0x2c30, 0x2c5e}, {0x2c60, 0x2ce4},
+    {0x2ceb, 0x2cee}, {0x2d00, 0x2d25}, {0x2d30, 0x2d67}, {0x2d80, 0x2d96},
+    {0x2da0, 0x2da6}, {0x2da8, 0x2dae}, {0x2db0, 0x2db6}, {0x2db8, 0x2dbe},
+    {0x2dc0, 0x2dc6}, {0x2dc8, 0x2dce}, {0x2dd0, 0x2dd6}, {0x2dd8, 0x2dde},
+    {0x3031, 0x3035}, {0x3041, 0x3096}, {0x309d, 0x309f}, {0x30a1, 0x30fa},
+    {0x30fc, 0x30ff}, {0x3105, 0x312d}, {0x3131, 0x318e}, {0x31a0, 0x31ba},
+    {0x31f0, 0x31ff}, {0x3400, 0x4db5}, {0x4e00, 0x9fcc}, {0xa000, 0xa48c},
+    {0xa4d0, 0xa4fd}, {0xa500, 0xa60c}, {0xa610, 0xa61f}, {0xa640, 0xa66e},
+    {0xa67f, 0xa697}, {0xa6a0, 0xa6e5}, {0xa717, 0xa71f}, {0xa722, 0xa788},
+    {0xa78b, 0xa78e}, {0xa790, 0xa793}, {0xa7a0, 0xa7aa}, {0xa7f8, 0xa801},
+    {0xa803, 0xa805}, {0xa807, 0xa80a}, {0xa80c, 0xa822}, {0xa840, 0xa873},
+    {0xa882, 0xa8b3}, {0xa8f2, 0xa8f7}, {0xa90a, 0xa925}, {0xa930, 0xa946},
+    {0xa960, 0xa97c}, {0xa984, 0xa9b2}, {0xaa00, 0xaa28}, {0xaa40, 0xaa42},
+    {0xaa44, 0xaa4b}, {0xaa60, 0xaa76}, {0xaa80, 0xaaaf}, {0xaab9, 0xaabd},
+    {0xaadb, 0xaadd}, {0xaae0, 0xaaea}, {0xaaf2, 0xaaf4}, {0xab01, 0xab06},
+    {0xab09, 0xab0e}, {0xab11, 0xab16}, {0xab20, 0xab26}, {0xab28, 0xab2e},
+    {0xabc0, 0xabe2}, {0xac00, 0xd7a3}, {0xd7b0, 0xd7c6}, {0xd7cb, 0xd7fb},
+    {0xf900, 0xfa6d}, {0xfa70, 0xfad9}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17},
+    {0xfb1f, 0xfb28}, {0xfb2a, 0xfb36}, {0xfb38, 0xfb3c}, {0xfb46, 0xfbb1},
+    {0xfbd3, 0xfd3d}, {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7}, {0xfdf0, 0xfdfb},
+    {0xfe70, 0xfe74}, {0xfe76, 0xfefc}, {0xff21, 0xff3a}, {0xff41, 0xff5a},
+    {0xff66, 0xffbe}, {0xffc2, 0xffc7}, {0xffca, 0xffcf}, {0xffd2, 0xffd7},
+    {0xffda, 0xffdc}
 #if TCL_UTF_MAX > 4
     ,{0x10000, 0x1000b}, {0x1000d, 0x10026}, {0x10028, 0x1003a}, {0x1003f, 0x1004d},
     {0x10050, 0x1005d}, {0x10080, 0x100fa}, {0x10280, 0x1029c}, {0x102a0, 0x102d0},
-    {0x10300, 0x1031f}, {0x10330, 0x10340}, {0x10342, 0x10349}, {0x10350, 0x10375},
-    {0x10380, 0x1039d}, {0x103a0, 0x103c3}, {0x103c8, 0x103cf}, {0x10400, 0x1049d},
-    {0x10500, 0x10527}, {0x10530, 0x10563}, {0x10600, 0x10736}, {0x10740, 0x10755},
-    {0x10760, 0x10767}, {0x10800, 0x10805}, {0x1080a, 0x10835}, {0x1083f, 0x10855},
-    {0x10860, 0x10876}, {0x10880, 0x1089e}, {0x10900, 0x10915}, {0x10920, 0x10939},
+    {0x10300, 0x1031e}, {0x10330, 0x10340}, {0x10342, 0x10349}, {0x10380, 0x1039d},
+    {0x103a0, 0x103c3}, {0x103c8, 0x103cf}, {0x10400, 0x1049d}, {0x10800, 0x10805},
+    {0x1080a, 0x10835}, {0x1083f, 0x10855}, {0x10900, 0x10915}, {0x10920, 0x10939},
     {0x10980, 0x109b7}, {0x10a10, 0x10a13}, {0x10a15, 0x10a17}, {0x10a19, 0x10a33},
-    {0x10a60, 0x10a7c}, {0x10a80, 0x10a9c}, {0x10ac0, 0x10ac7}, {0x10ac9, 0x10ae4},
-    {0x10b00, 0x10b35}, {0x10b40, 0x10b55}, {0x10b60, 0x10b72}, {0x10b80, 0x10b91},
+    {0x10a60, 0x10a7c}, {0x10b00, 0x10b35}, {0x10b40, 0x10b55}, {0x10b60, 0x10b72},
     {0x10c00, 0x10c48}, {0x11003, 0x11037}, {0x11083, 0x110af}, {0x110d0, 0x110e8},
-    {0x11103, 0x11126}, {0x11150, 0x11172}, {0x11183, 0x111b2}, {0x111c1, 0x111c4},
-    {0x11200, 0x11211}, {0x11213, 0x1122b}, {0x112b0, 0x112de}, {0x11305, 0x1130c},
-    {0x11313, 0x11328}, {0x1132a, 0x11330}, {0x11335, 0x11339}, {0x1135d, 0x11361},
-    {0x11480, 0x114af}, {0x11580, 0x115ae}, {0x11600, 0x1162f}, {0x11680, 0x116aa},
-    {0x118a0, 0x118df}, {0x11ac0, 0x11af8}, {0x12000, 0x12398}, {0x13000, 0x1342e},
-    {0x16800, 0x16a38}, {0x16a40, 0x16a5e}, {0x16ad0, 0x16aed}, {0x16b00, 0x16b2f},
-    {0x16b40, 0x16b43}, {0x16b63, 0x16b77}, {0x16b7d, 0x16b8f}, {0x16f00, 0x16f44},
-    {0x16f93, 0x16f9f}, {0x1bc00, 0x1bc6a}, {0x1bc70, 0x1bc7c}, {0x1bc80, 0x1bc88},
-    {0x1bc90, 0x1bc99}, {0x1d400, 0x1d454}, {0x1d456, 0x1d49c}, {0x1d4a9, 0x1d4ac},
+    {0x11103, 0x11126}, {0x11183, 0x111b2}, {0x111c1, 0x111c4}, {0x11680, 0x116aa},
+    {0x12000, 0x1236e}, {0x13000, 0x1342e}, {0x16800, 0x16a38}, {0x16f00, 0x16f44},
+    {0x16f93, 0x16f9f}, {0x1d400, 0x1d454}, {0x1d456, 0x1d49c}, {0x1d4a9, 0x1d4ac},
     {0x1d4ae, 0x1d4b9}, {0x1d4bd, 0x1d4c3}, {0x1d4c5, 0x1d505}, {0x1d507, 0x1d50a},
     {0x1d50d, 0x1d514}, {0x1d516, 0x1d51c}, {0x1d51e, 0x1d539}, {0x1d53b, 0x1d53e},
     {0x1d540, 0x1d544}, {0x1d54a, 0x1d550}, {0x1d552, 0x1d6a5}, {0x1d6a8, 0x1d6c0},
     {0x1d6c2, 0x1d6da}, {0x1d6dc, 0x1d6fa}, {0x1d6fc, 0x1d714}, {0x1d716, 0x1d734},
     {0x1d736, 0x1d74e}, {0x1d750, 0x1d76e}, {0x1d770, 0x1d788}, {0x1d78a, 0x1d7a8},
-    {0x1d7aa, 0x1d7c2}, {0x1d7c4, 0x1d7cb}, {0x1e800, 0x1e8c4}, {0x1ee00, 0x1ee03},
-    {0x1ee05, 0x1ee1f}, {0x1ee29, 0x1ee32}, {0x1ee34, 0x1ee37}, {0x1ee4d, 0x1ee4f},
-    {0x1ee67, 0x1ee6a}, {0x1ee6c, 0x1ee72}, {0x1ee74, 0x1ee77}, {0x1ee79, 0x1ee7c},
-    {0x1ee80, 0x1ee89}, {0x1ee8b, 0x1ee9b}, {0x1eea1, 0x1eea3}, {0x1eea5, 0x1eea9},
-    {0x1eeab, 0x1eebb}, {0x20000, 0x2a6d6}, {0x2a700, 0x2b734}, {0x2b740, 0x2b81d},
-    {0x2f800, 0x2fa1d}
+    {0x1d7aa, 0x1d7c2}, {0x1d7c4, 0x1d7cb}, {0x1ee00, 0x1ee03}, {0x1ee05, 0x1ee1f},
+    {0x1ee29, 0x1ee32}, {0x1ee34, 0x1ee37}, {0x1ee4d, 0x1ee4f}, {0x1ee67, 0x1ee6a},
+    {0x1ee6c, 0x1ee72}, {0x1ee74, 0x1ee77}, {0x1ee79, 0x1ee7c}, {0x1ee80, 0x1ee89},
+    {0x1ee8b, 0x1ee9b}, {0x1eea1, 0x1eea3}, {0x1eea5, 0x1eea9}, {0x1eeab, 0x1eebb},
+    {0x20000, 0x2a6d6}, {0x2a700, 0x2b734}, {0x2b740, 0x2b81d}, {0x2f800, 0x2fa1d}
 #endif
 };
 
 #define NUM_ALPHA_RANGE (sizeof(alphaRangeTable)/sizeof(crange))
 
 static const chr alphaCharTable[] = {
-    0xaa, 0xb5, 0xba, 0x2ec, 0x2ee, 0x376, 0x377, 0x37f, 0x386,
-    0x38c, 0x559, 0x66e, 0x66f, 0x6d5, 0x6e5, 0x6e6, 0x6ee, 0x6ef,
-    0x6ff, 0x710, 0x7b1, 0x7f4, 0x7f5, 0x7fa, 0x81a, 0x824, 0x828,
+    0xaa, 0xb5, 0xba, 0x2ec, 0x2ee, 0x376, 0x377, 0x386, 0x38c,
+    0x559, 0x66e, 0x66f, 0x6d5, 0x6e5, 0x6e6, 0x6ee, 0x6ef, 0x6ff,
+    0x710, 0x7b1, 0x7f4, 0x7f5, 0x7fa, 0x81a, 0x824, 0x828, 0x8a0,
     0x93d, 0x950, 0x98f, 0x990, 0x9b2, 0x9bd, 0x9ce, 0x9dc, 0x9dd,
     0x9f0, 0x9f1, 0xa0f, 0xa10, 0xa32, 0xa33, 0xa35, 0xa36, 0xa38,
     0xa39, 0xa5e, 0xab2, 0xab3, 0xabd, 0xad0, 0xae0, 0xae1, 0xb0f,
@@ -251,16 +241,14 @@ static const chr alphaCharTable[] = {
     0x1bae, 0x1baf, 0x1cf5, 0x1cf6, 0x1f59, 0x1f5b, 0x1f5d, 0x1fbe, 0x2071,
     0x207f, 0x2102, 0x2107, 0x2115, 0x2124, 0x2126, 0x2128, 0x214e, 0x2183,
     0x2184, 0x2cf2, 0x2cf3, 0x2d27, 0x2d2d, 0x2d6f, 0x2e2f, 0x3005, 0x3006,
-    0x303b, 0x303c, 0xa62a, 0xa62b, 0xa7b0, 0xa7b1, 0xa8fb, 0xa9cf, 0xaa7a,
-    0xaab1, 0xaab5, 0xaab6, 0xaac0, 0xaac2, 0xab64, 0xab65, 0xfb1d, 0xfb3e,
-    0xfb40, 0xfb41, 0xfb43, 0xfb44
+    0x303b, 0x303c, 0xa62a, 0xa62b, 0xa8fb, 0xa9cf, 0xaa7a, 0xaab1, 0xaab5,
+    0xaab6, 0xaac0, 0xaac2, 0xfb1d, 0xfb3e, 0xfb40, 0xfb41, 0xfb43, 0xfb44
 #if TCL_UTF_MAX > 4
     ,0x1003c, 0x1003d, 0x10808, 0x10837, 0x10838, 0x1083c, 0x109be, 0x109bf, 0x10a00,
-    0x11176, 0x111da, 0x1130f, 0x11310, 0x11332, 0x11333, 0x1133d, 0x114c4, 0x114c5,
-    0x114c7, 0x11644, 0x118ff, 0x16f50, 0x1b000, 0x1b001, 0x1d49e, 0x1d49f, 0x1d4a2,
-    0x1d4a5, 0x1d4a6, 0x1d4bb, 0x1d546, 0x1ee21, 0x1ee22, 0x1ee24, 0x1ee27, 0x1ee39,
-    0x1ee3b, 0x1ee42, 0x1ee47, 0x1ee49, 0x1ee4b, 0x1ee51, 0x1ee52, 0x1ee54, 0x1ee57,
-    0x1ee59, 0x1ee5b, 0x1ee5d, 0x1ee5f, 0x1ee61, 0x1ee62, 0x1ee64, 0x1ee7e
+    0x16f50, 0x1b000, 0x1b001, 0x1d49e, 0x1d49f, 0x1d4a2, 0x1d4a5, 0x1d4a6, 0x1d4bb,
+    0x1d546, 0x1ee21, 0x1ee22, 0x1ee24, 0x1ee27, 0x1ee39, 0x1ee3b, 0x1ee42, 0x1ee47,
+    0x1ee49, 0x1ee4b, 0x1ee51, 0x1ee52, 0x1ee54, 0x1ee57, 0x1ee59, 0x1ee5b, 0x1ee5d,
+    0x1ee5f, 0x1ee61, 0x1ee62, 0x1ee64, 0x1ee7e
 #endif
 };
 
@@ -271,12 +259,11 @@ static const chr alphaCharTable[] = {
  */
 
 static const crange controlRangeTable[] = {
-    {0x0, 0x1f}, {0x7f, 0x9f}, {0x600, 0x605}, {0x200b, 0x200f},
+    {0x0, 0x1f}, {0x7f, 0x9f}, {0x600, 0x604}, {0x200b, 0x200f},
     {0x202a, 0x202e}, {0x2060, 0x2064}, {0x2066, 0x206f}, {0xe000, 0xf8ff},
     {0xfff9, 0xfffb}
 #if TCL_UTF_MAX > 4
-    ,{0x1bca0, 0x1bca3}, {0x1d173, 0x1d17a}, {0xe0020, 0xe007f}, {0xf0000, 0xffffd},
-    {0x100000, 0x10fffd}
+    ,{0x1d173, 0x1d17a}, {0xe0020, 0xe007f}, {0xf0000, 0xffffd}, {0x100000, 0x10fffd}
 #endif
 };
 
@@ -299,18 +286,15 @@ static const crange digitRangeTable[] = {
     {0x30, 0x39}, {0x660, 0x669}, {0x6f0, 0x6f9}, {0x7c0, 0x7c9},
     {0x966, 0x96f}, {0x9e6, 0x9ef}, {0xa66, 0xa6f}, {0xae6, 0xaef},
     {0xb66, 0xb6f}, {0xbe6, 0xbef}, {0xc66, 0xc6f}, {0xce6, 0xcef},
-    {0xd66, 0xd6f}, {0xde6, 0xdef}, {0xe50, 0xe59}, {0xed0, 0xed9},
-    {0xf20, 0xf29}, {0x1040, 0x1049}, {0x1090, 0x1099}, {0x17e0, 0x17e9},
-    {0x1810, 0x1819}, {0x1946, 0x194f}, {0x19d0, 0x19d9}, {0x1a80, 0x1a89},
-    {0x1a90, 0x1a99}, {0x1b50, 0x1b59}, {0x1bb0, 0x1bb9}, {0x1c40, 0x1c49},
-    {0x1c50, 0x1c59}, {0xa620, 0xa629}, {0xa8d0, 0xa8d9}, {0xa900, 0xa909},
-    {0xa9d0, 0xa9d9}, {0xa9f0, 0xa9f9}, {0xaa50, 0xaa59}, {0xabf0, 0xabf9},
-    {0xff10, 0xff19}
+    {0xd66, 0xd6f}, {0xe50, 0xe59}, {0xed0, 0xed9}, {0xf20, 0xf29},
+    {0x1040, 0x1049}, {0x1090, 0x1099}, {0x17e0, 0x17e9}, {0x1810, 0x1819},
+    {0x1946, 0x194f}, {0x19d0, 0x19d9}, {0x1a80, 0x1a89}, {0x1a90, 0x1a99},
+    {0x1b50, 0x1b59}, {0x1bb0, 0x1bb9}, {0x1c40, 0x1c49}, {0x1c50, 0x1c59},
+    {0xa620, 0xa629}, {0xa8d0, 0xa8d9}, {0xa900, 0xa909}, {0xa9d0, 0xa9d9},
+    {0xaa50, 0xaa59}, {0xabf0, 0xabf9}, {0xff10, 0xff19}
 #if TCL_UTF_MAX > 4
     ,{0x104a0, 0x104a9}, {0x11066, 0x1106f}, {0x110f0, 0x110f9}, {0x11136, 0x1113f},
-    {0x111d0, 0x111d9}, {0x112f0, 0x112f9}, {0x114d0, 0x114d9}, {0x11650, 0x11659},
-    {0x116c0, 0x116c9}, {0x118e0, 0x118e9}, {0x16a60, 0x16a69}, {0x16b50, 0x16b59},
-    {0x1d7ce, 0x1d7ff}
+    {0x111d0, 0x111d9}, {0x116c0, 0x116c9}, {0x1d7ce, 0x1d7ff}
 #endif
 };
 
@@ -333,17 +317,15 @@ static const crange punctRangeTable[] = {
     {0x1b5a, 0x1b60}, {0x1bfc, 0x1bff}, {0x1c3b, 0x1c3f}, {0x1cc0, 0x1cc7},
     {0x2010, 0x2027}, {0x2030, 0x2043}, {0x2045, 0x2051}, {0x2053, 0x205e},
     {0x2308, 0x230b}, {0x2768, 0x2775}, {0x27e6, 0x27ef}, {0x2983, 0x2998},
-    {0x29d8, 0x29db}, {0x2cf9, 0x2cfc}, {0x2e00, 0x2e2e}, {0x2e30, 0x2e42},
+    {0x29d8, 0x29db}, {0x2cf9, 0x2cfc}, {0x2e00, 0x2e2e}, {0x2e30, 0x2e3b},
     {0x3001, 0x3003}, {0x3008, 0x3011}, {0x3014, 0x301f}, {0xa60d, 0xa60f},
     {0xa6f2, 0xa6f7}, {0xa874, 0xa877}, {0xa8f8, 0xa8fa}, {0xa9c1, 0xa9cd},
     {0xaa5c, 0xaa5f}, {0xfe10, 0xfe19}, {0xfe30, 0xfe52}, {0xfe54, 0xfe61},
     {0xff01, 0xff03}, {0xff05, 0xff0a}, {0xff0c, 0xff0f}, {0xff3b, 0xff3d},
     {0xff5f, 0xff65}
 #if TCL_UTF_MAX > 4
-    ,{0x10100, 0x10102}, {0x10a50, 0x10a58}, {0x10af0, 0x10af6}, {0x10b39, 0x10b3f},
-    {0x10b99, 0x10b9c}, {0x11047, 0x1104d}, {0x110be, 0x110c1}, {0x11140, 0x11143},
-    {0x111c5, 0x111c8}, {0x11238, 0x1123d}, {0x115c1, 0x115c9}, {0x11641, 0x11643},
-    {0x12470, 0x12474}, {0x16b37, 0x16b3b}
+    ,{0x10100, 0x10102}, {0x10a50, 0x10a58}, {0x10b39, 0x10b3f}, {0x11047, 0x1104d},
+    {0x110be, 0x110c1}, {0x11140, 0x11143}, {0x111c5, 0x111c8}, {0x12470, 0x12473}
 #endif
 };
 
@@ -363,8 +345,7 @@ static const chr punctCharTable[] = {
     0xaaf0, 0xaaf1, 0xabeb, 0xfd3e, 0xfd3f, 0xfe63, 0xfe68, 0xfe6a, 0xfe6b,
     0xff1a, 0xff1b, 0xff1f, 0xff20, 0xff3f, 0xff5b, 0xff5d
 #if TCL_UTF_MAX > 4
-    ,0x1039f, 0x103d0, 0x1056f, 0x10857, 0x1091f, 0x1093f, 0x10a7f, 0x110bb, 0x110bc,
-    0x11174, 0x11175, 0x111cd, 0x114c6, 0x16a6e, 0x16a6f, 0x16af5, 0x16b44, 0x1bc9f
+    ,0x1039f, 0x103d0, 0x10857, 0x1091f, 0x1093f, 0x10a7f, 0x110bb, 0x110bc
 #endif
 };
 
@@ -402,16 +383,15 @@ static const crange lowerRangeTable[] = {
     {0x1f90, 0x1f97}, {0x1fa0, 0x1fa7}, {0x1fb0, 0x1fb4}, {0x1fc2, 0x1fc4},
     {0x1fd0, 0x1fd3}, {0x1fe0, 0x1fe7}, {0x1ff2, 0x1ff4}, {0x2146, 0x2149},
     {0x2c30, 0x2c5e}, {0x2c76, 0x2c7b}, {0x2d00, 0x2d25}, {0xa72f, 0xa731},
-    {0xa771, 0xa778}, {0xa793, 0xa795}, {0xab30, 0xab5a}, {0xfb00, 0xfb06},
-    {0xfb13, 0xfb17}, {0xff41, 0xff5a}
+    {0xa771, 0xa778}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17}, {0xff41, 0xff5a}
 #if TCL_UTF_MAX > 4
-    ,{0x10428, 0x1044f}, {0x118c0, 0x118df}, {0x1d41a, 0x1d433}, {0x1d44e, 0x1d454},
-    {0x1d456, 0x1d467}, {0x1d482, 0x1d49b}, {0x1d4b6, 0x1d4b9}, {0x1d4bd, 0x1d4c3},
-    {0x1d4c5, 0x1d4cf}, {0x1d4ea, 0x1d503}, {0x1d51e, 0x1d537}, {0x1d552, 0x1d56b},
-    {0x1d586, 0x1d59f}, {0x1d5ba, 0x1d5d3}, {0x1d5ee, 0x1d607}, {0x1d622, 0x1d63b},
-    {0x1d656, 0x1d66f}, {0x1d68a, 0x1d6a5}, {0x1d6c2, 0x1d6da}, {0x1d6dc, 0x1d6e1},
-    {0x1d6fc, 0x1d714}, {0x1d716, 0x1d71b}, {0x1d736, 0x1d74e}, {0x1d750, 0x1d755},
-    {0x1d770, 0x1d788}, {0x1d78a, 0x1d78f}, {0x1d7aa, 0x1d7c2}, {0x1d7c4, 0x1d7c9}
+    ,{0x10428, 0x1044f}, {0x1d41a, 0x1d433}, {0x1d44e, 0x1d454}, {0x1d456, 0x1d467},
+    {0x1d482, 0x1d49b}, {0x1d4b6, 0x1d4b9}, {0x1d4bd, 0x1d4c3}, {0x1d4c5, 0x1d4cf},
+    {0x1d4ea, 0x1d503}, {0x1d51e, 0x1d537}, {0x1d552, 0x1d56b}, {0x1d586, 0x1d59f},
+    {0x1d5ba, 0x1d5d3}, {0x1d5ee, 0x1d607}, {0x1d622, 0x1d63b}, {0x1d656, 0x1d66f},
+    {0x1d68a, 0x1d6a5}, {0x1d6c2, 0x1d6da}, {0x1d6dc, 0x1d6e1}, {0x1d6fc, 0x1d714},
+    {0x1d716, 0x1d71b}, {0x1d736, 0x1d74e}, {0x1d750, 0x1d755}, {0x1d770, 0x1d788},
+    {0x1d78a, 0x1d78f}, {0x1d7aa, 0x1d7c2}, {0x1d7c4, 0x1d7c9}
 #endif
 };
 
@@ -447,41 +427,39 @@ static const chr lowerCharTable[] = {
     0x4f1, 0x4f3, 0x4f5, 0x4f7, 0x4f9, 0x4fb, 0x4fd, 0x4ff, 0x501,
     0x503, 0x505, 0x507, 0x509, 0x50b, 0x50d, 0x50f, 0x511, 0x513,
     0x515, 0x517, 0x519, 0x51b, 0x51d, 0x51f, 0x521, 0x523, 0x525,
-    0x527, 0x529, 0x52b, 0x52d, 0x52f, 0x1e01, 0x1e03, 0x1e05, 0x1e07,
-    0x1e09, 0x1e0b, 0x1e0d, 0x1e0f, 0x1e11, 0x1e13, 0x1e15, 0x1e17, 0x1e19,
-    0x1e1b, 0x1e1d, 0x1e1f, 0x1e21, 0x1e23, 0x1e25, 0x1e27, 0x1e29, 0x1e2b,
-    0x1e2d, 0x1e2f, 0x1e31, 0x1e33, 0x1e35, 0x1e37, 0x1e39, 0x1e3b, 0x1e3d,
-    0x1e3f, 0x1e41, 0x1e43, 0x1e45, 0x1e47, 0x1e49, 0x1e4b, 0x1e4d, 0x1e4f,
-    0x1e51, 0x1e53, 0x1e55, 0x1e57, 0x1e59, 0x1e5b, 0x1e5d, 0x1e5f, 0x1e61,
-    0x1e63, 0x1e65, 0x1e67, 0x1e69, 0x1e6b, 0x1e6d, 0x1e6f, 0x1e71, 0x1e73,
-    0x1e75, 0x1e77, 0x1e79, 0x1e7b, 0x1e7d, 0x1e7f, 0x1e81, 0x1e83, 0x1e85,
-    0x1e87, 0x1e89, 0x1e8b, 0x1e8d, 0x1e8f, 0x1e91, 0x1e93, 0x1e9f, 0x1ea1,
-    0x1ea3, 0x1ea5, 0x1ea7, 0x1ea9, 0x1eab, 0x1ead, 0x1eaf, 0x1eb1, 0x1eb3,
-    0x1eb5, 0x1eb7, 0x1eb9, 0x1ebb, 0x1ebd, 0x1ebf, 0x1ec1, 0x1ec3, 0x1ec5,
-    0x1ec7, 0x1ec9, 0x1ecb, 0x1ecd, 0x1ecf, 0x1ed1, 0x1ed3, 0x1ed5, 0x1ed7,
-    0x1ed9, 0x1edb, 0x1edd, 0x1edf, 0x1ee1, 0x1ee3, 0x1ee5, 0x1ee7, 0x1ee9,
-    0x1eeb, 0x1eed, 0x1eef, 0x1ef1, 0x1ef3, 0x1ef5, 0x1ef7, 0x1ef9, 0x1efb,
-    0x1efd, 0x1fb6, 0x1fb7, 0x1fbe, 0x1fc6, 0x1fc7, 0x1fd6, 0x1fd7, 0x1ff6,
-    0x1ff7, 0x210a, 0x210e, 0x210f, 0x2113, 0x212f, 0x2134, 0x2139, 0x213c,
-    0x213d, 0x214e, 0x2184, 0x2c61, 0x2c65, 0x2c66, 0x2c68, 0x2c6a, 0x2c6c,
-    0x2c71, 0x2c73, 0x2c74, 0x2c81, 0x2c83, 0x2c85, 0x2c87, 0x2c89, 0x2c8b,
-    0x2c8d, 0x2c8f, 0x2c91, 0x2c93, 0x2c95, 0x2c97, 0x2c99, 0x2c9b, 0x2c9d,
-    0x2c9f, 0x2ca1, 0x2ca3, 0x2ca5, 0x2ca7, 0x2ca9, 0x2cab, 0x2cad, 0x2caf,
-    0x2cb1, 0x2cb3, 0x2cb5, 0x2cb7, 0x2cb9, 0x2cbb, 0x2cbd, 0x2cbf, 0x2cc1,
-    0x2cc3, 0x2cc5, 0x2cc7, 0x2cc9, 0x2ccb, 0x2ccd, 0x2ccf, 0x2cd1, 0x2cd3,
-    0x2cd5, 0x2cd7, 0x2cd9, 0x2cdb, 0x2cdd, 0x2cdf, 0x2ce1, 0x2ce3, 0x2ce4,
-    0x2cec, 0x2cee, 0x2cf3, 0x2d27, 0x2d2d, 0xa641, 0xa643, 0xa645, 0xa647,
-    0xa649, 0xa64b, 0xa64d, 0xa64f, 0xa651, 0xa653, 0xa655, 0xa657, 0xa659,
-    0xa65b, 0xa65d, 0xa65f, 0xa661, 0xa663, 0xa665, 0xa667, 0xa669, 0xa66b,
-    0xa66d, 0xa681, 0xa683, 0xa685, 0xa687, 0xa689, 0xa68b, 0xa68d, 0xa68f,
-    0xa691, 0xa693, 0xa695, 0xa697, 0xa699, 0xa69b, 0xa723, 0xa725, 0xa727,
-    0xa729, 0xa72b, 0xa72d, 0xa733, 0xa735, 0xa737, 0xa739, 0xa73b, 0xa73d,
-    0xa73f, 0xa741, 0xa743, 0xa745, 0xa747, 0xa749, 0xa74b, 0xa74d, 0xa74f,
-    0xa751, 0xa753, 0xa755, 0xa757, 0xa759, 0xa75b, 0xa75d, 0xa75f, 0xa761,
-    0xa763, 0xa765, 0xa767, 0xa769, 0xa76b, 0xa76d, 0xa76f, 0xa77a, 0xa77c,
-    0xa77f, 0xa781, 0xa783, 0xa785, 0xa787, 0xa78c, 0xa78e, 0xa791, 0xa797,
-    0xa799, 0xa79b, 0xa79d, 0xa79f, 0xa7a1, 0xa7a3, 0xa7a5, 0xa7a7, 0xa7a9,
-    0xa7fa, 0xab64, 0xab65
+    0x527, 0x1e01, 0x1e03, 0x1e05, 0x1e07, 0x1e09, 0x1e0b, 0x1e0d, 0x1e0f,
+    0x1e11, 0x1e13, 0x1e15, 0x1e17, 0x1e19, 0x1e1b, 0x1e1d, 0x1e1f, 0x1e21,
+    0x1e23, 0x1e25, 0x1e27, 0x1e29, 0x1e2b, 0x1e2d, 0x1e2f, 0x1e31, 0x1e33,
+    0x1e35, 0x1e37, 0x1e39, 0x1e3b, 0x1e3d, 0x1e3f, 0x1e41, 0x1e43, 0x1e45,
+    0x1e47, 0x1e49, 0x1e4b, 0x1e4d, 0x1e4f, 0x1e51, 0x1e53, 0x1e55, 0x1e57,
+    0x1e59, 0x1e5b, 0x1e5d, 0x1e5f, 0x1e61, 0x1e63, 0x1e65, 0x1e67, 0x1e69,
+    0x1e6b, 0x1e6d, 0x1e6f, 0x1e71, 0x1e73, 0x1e75, 0x1e77, 0x1e79, 0x1e7b,
+    0x1e7d, 0x1e7f, 0x1e81, 0x1e83, 0x1e85, 0x1e87, 0x1e89, 0x1e8b, 0x1e8d,
+    0x1e8f, 0x1e91, 0x1e93, 0x1e9f, 0x1ea1, 0x1ea3, 0x1ea5, 0x1ea7, 0x1ea9,
+    0x1eab, 0x1ead, 0x1eaf, 0x1eb1, 0x1eb3, 0x1eb5, 0x1eb7, 0x1eb9, 0x1ebb,
+    0x1ebd, 0x1ebf, 0x1ec1, 0x1ec3, 0x1ec5, 0x1ec7, 0x1ec9, 0x1ecb, 0x1ecd,
+    0x1ecf, 0x1ed1, 0x1ed3, 0x1ed5, 0x1ed7, 0x1ed9, 0x1edb, 0x1edd, 0x1edf,
+    0x1ee1, 0x1ee3, 0x1ee5, 0x1ee7, 0x1ee9, 0x1eeb, 0x1eed, 0x1eef, 0x1ef1,
+    0x1ef3, 0x1ef5, 0x1ef7, 0x1ef9, 0x1efb, 0x1efd, 0x1fb6, 0x1fb7, 0x1fbe,
+    0x1fc6, 0x1fc7, 0x1fd6, 0x1fd7, 0x1ff6, 0x1ff7, 0x210a, 0x210e, 0x210f,
+    0x2113, 0x212f, 0x2134, 0x2139, 0x213c, 0x213d, 0x214e, 0x2184, 0x2c61,
+    0x2c65, 0x2c66, 0x2c68, 0x2c6a, 0x2c6c, 0x2c71, 0x2c73, 0x2c74, 0x2c81,
+    0x2c83, 0x2c85, 0x2c87, 0x2c89, 0x2c8b, 0x2c8d, 0x2c8f, 0x2c91, 0x2c93,
+    0x2c95, 0x2c97, 0x2c99, 0x2c9b, 0x2c9d, 0x2c9f, 0x2ca1, 0x2ca3, 0x2ca5,
+    0x2ca7, 0x2ca9, 0x2cab, 0x2cad, 0x2caf, 0x2cb1, 0x2cb3, 0x2cb5, 0x2cb7,
+    0x2cb9, 0x2cbb, 0x2cbd, 0x2cbf, 0x2cc1, 0x2cc3, 0x2cc5, 0x2cc7, 0x2cc9,
+    0x2ccb, 0x2ccd, 0x2ccf, 0x2cd1, 0x2cd3, 0x2cd5, 0x2cd7, 0x2cd9, 0x2cdb,
+    0x2cdd, 0x2cdf, 0x2ce1, 0x2ce3, 0x2ce4, 0x2cec, 0x2cee, 0x2cf3, 0x2d27,
+    0x2d2d, 0xa641, 0xa643, 0xa645, 0xa647, 0xa649, 0xa64b, 0xa64d, 0xa64f,
+    0xa651, 0xa653, 0xa655, 0xa657, 0xa659, 0xa65b, 0xa65d, 0xa65f, 0xa661,
+    0xa663, 0xa665, 0xa667, 0xa669, 0xa66b, 0xa66d, 0xa681, 0xa683, 0xa685,
+    0xa687, 0xa689, 0xa68b, 0xa68d, 0xa68f, 0xa691, 0xa693, 0xa695, 0xa697,
+    0xa723, 0xa725, 0xa727, 0xa729, 0xa72b, 0xa72d, 0xa733, 0xa735, 0xa737,
+    0xa739, 0xa73b, 0xa73d, 0xa73f, 0xa741, 0xa743, 0xa745, 0xa747, 0xa749,
+    0xa74b, 0xa74d, 0xa74f, 0xa751, 0xa753, 0xa755, 0xa757, 0xa759, 0xa75b,
+    0xa75d, 0xa75f, 0xa761, 0xa763, 0xa765, 0xa767, 0xa769, 0xa76b, 0xa76d,
+    0xa76f, 0xa77a, 0xa77c, 0xa77f, 0xa781, 0xa783, 0xa785, 0xa787, 0xa78c,
+    0xa78e, 0xa791, 0xa793, 0xa7a1, 0xa7a3, 0xa7a5, 0xa7a7, 0xa7a9, 0xa7fa
 #if TCL_UTF_MAX > 4
     ,0x1d4bb, 0x1d7cb
 #endif
@@ -503,15 +481,14 @@ static const crange upperRangeTable[] = {
     {0x1fd8, 0x1fdb}, {0x1fe8, 0x1fec}, {0x1ff8, 0x1ffb}, {0x210b, 0x210d},
     {0x2110, 0x2112}, {0x2119, 0x211d}, {0x212a, 0x212d}, {0x2130, 0x2133},
     {0x2c00, 0x2c2e}, {0x2c62, 0x2c64}, {0x2c6d, 0x2c70}, {0x2c7e, 0x2c80},
-    {0xa7aa, 0xa7ad}, {0xff21, 0xff3a}
+    {0xff21, 0xff3a}
 #if TCL_UTF_MAX > 4
-    ,{0x10400, 0x10427}, {0x118a0, 0x118bf}, {0x1d400, 0x1d419}, {0x1d434, 0x1d44d},
-    {0x1d468, 0x1d481}, {0x1d4a9, 0x1d4ac}, {0x1d4ae, 0x1d4b5}, {0x1d4d0, 0x1d4e9},
-    {0x1d507, 0x1d50a}, {0x1d50d, 0x1d514}, {0x1d516, 0x1d51c}, {0x1d53b, 0x1d53e},
-    {0x1d540, 0x1d544}, {0x1d54a, 0x1d550}, {0x1d56c, 0x1d585}, {0x1d5a0, 0x1d5b9},
-    {0x1d5d4, 0x1d5ed}, {0x1d608, 0x1d621}, {0x1d63c, 0x1d655}, {0x1d670, 0x1d689},
-    {0x1d6a8, 0x1d6c0}, {0x1d6e2, 0x1d6fa}, {0x1d71c, 0x1d734}, {0x1d756, 0x1d76e},
-    {0x1d790, 0x1d7a8}
+    ,{0x10400, 0x10427}, {0x1d400, 0x1d419}, {0x1d434, 0x1d44d}, {0x1d468, 0x1d481},
+    {0x1d4a9, 0x1d4ac}, {0x1d4ae, 0x1d4b5}, {0x1d4d0, 0x1d4e9}, {0x1d507, 0x1d50a},
+    {0x1d50d, 0x1d514}, {0x1d516, 0x1d51c}, {0x1d53b, 0x1d53e}, {0x1d540, 0x1d544},
+    {0x1d54a, 0x1d550}, {0x1d56c, 0x1d585}, {0x1d5a0, 0x1d5b9}, {0x1d5d4, 0x1d5ed},
+    {0x1d608, 0x1d621}, {0x1d63c, 0x1d655}, {0x1d670, 0x1d689}, {0x1d6a8, 0x1d6c0},
+    {0x1d6e2, 0x1d6fa}, {0x1d71c, 0x1d734}, {0x1d756, 0x1d76e}, {0x1d790, 0x1d7a8}
 #endif
 };
 
@@ -534,54 +511,52 @@ static const chr upperCharTable[] = {
     0x20c, 0x20e, 0x210, 0x212, 0x214, 0x216, 0x218, 0x21a, 0x21c,
     0x21e, 0x220, 0x222, 0x224, 0x226, 0x228, 0x22a, 0x22c, 0x22e,
     0x230, 0x232, 0x23a, 0x23b, 0x23d, 0x23e, 0x241, 0x248, 0x24a,
-    0x24c, 0x24e, 0x370, 0x372, 0x376, 0x37f, 0x386, 0x38c, 0x38e,
-    0x38f, 0x3cf, 0x3d8, 0x3da, 0x3dc, 0x3de, 0x3e0, 0x3e2, 0x3e4,
-    0x3e6, 0x3e8, 0x3ea, 0x3ec, 0x3ee, 0x3f4, 0x3f7, 0x3f9, 0x3fa,
-    0x460, 0x462, 0x464, 0x466, 0x468, 0x46a, 0x46c, 0x46e, 0x470,
-    0x472, 0x474, 0x476, 0x478, 0x47a, 0x47c, 0x47e, 0x480, 0x48a,
-    0x48c, 0x48e, 0x490, 0x492, 0x494, 0x496, 0x498, 0x49a, 0x49c,
-    0x49e, 0x4a0, 0x4a2, 0x4a4, 0x4a6, 0x4a8, 0x4aa, 0x4ac, 0x4ae,
-    0x4b0, 0x4b2, 0x4b4, 0x4b6, 0x4b8, 0x4ba, 0x4bc, 0x4be, 0x4c0,
-    0x4c1, 0x4c3, 0x4c5, 0x4c7, 0x4c9, 0x4cb, 0x4cd, 0x4d0, 0x4d2,
-    0x4d4, 0x4d6, 0x4d8, 0x4da, 0x4dc, 0x4de, 0x4e0, 0x4e2, 0x4e4,
-    0x4e6, 0x4e8, 0x4ea, 0x4ec, 0x4ee, 0x4f0, 0x4f2, 0x4f4, 0x4f6,
-    0x4f8, 0x4fa, 0x4fc, 0x4fe, 0x500, 0x502, 0x504, 0x506, 0x508,
-    0x50a, 0x50c, 0x50e, 0x510, 0x512, 0x514, 0x516, 0x518, 0x51a,
-    0x51c, 0x51e, 0x520, 0x522, 0x524, 0x526, 0x528, 0x52a, 0x52c,
-    0x52e, 0x10c7, 0x10cd, 0x1e00, 0x1e02, 0x1e04, 0x1e06, 0x1e08, 0x1e0a,
-    0x1e0c, 0x1e0e, 0x1e10, 0x1e12, 0x1e14, 0x1e16, 0x1e18, 0x1e1a, 0x1e1c,
-    0x1e1e, 0x1e20, 0x1e22, 0x1e24, 0x1e26, 0x1e28, 0x1e2a, 0x1e2c, 0x1e2e,
-    0x1e30, 0x1e32, 0x1e34, 0x1e36, 0x1e38, 0x1e3a, 0x1e3c, 0x1e3e, 0x1e40,
-    0x1e42, 0x1e44, 0x1e46, 0x1e48, 0x1e4a, 0x1e4c, 0x1e4e, 0x1e50, 0x1e52,
-    0x1e54, 0x1e56, 0x1e58, 0x1e5a, 0x1e5c, 0x1e5e, 0x1e60, 0x1e62, 0x1e64,
-    0x1e66, 0x1e68, 0x1e6a, 0x1e6c, 0x1e6e, 0x1e70, 0x1e72, 0x1e74, 0x1e76,
-    0x1e78, 0x1e7a, 0x1e7c, 0x1e7e, 0x1e80, 0x1e82, 0x1e84, 0x1e86, 0x1e88,
-    0x1e8a, 0x1e8c, 0x1e8e, 0x1e90, 0x1e92, 0x1e94, 0x1e9e, 0x1ea0, 0x1ea2,
-    0x1ea4, 0x1ea6, 0x1ea8, 0x1eaa, 0x1eac, 0x1eae, 0x1eb0, 0x1eb2, 0x1eb4,
-    0x1eb6, 0x1eb8, 0x1eba, 0x1ebc, 0x1ebe, 0x1ec0, 0x1ec2, 0x1ec4, 0x1ec6,
-    0x1ec8, 0x1eca, 0x1ecc, 0x1ece, 0x1ed0, 0x1ed2, 0x1ed4, 0x1ed6, 0x1ed8,
-    0x1eda, 0x1edc, 0x1ede, 0x1ee0, 0x1ee2, 0x1ee4, 0x1ee6, 0x1ee8, 0x1eea,
-    0x1eec, 0x1eee, 0x1ef0, 0x1ef2, 0x1ef4, 0x1ef6, 0x1ef8, 0x1efa, 0x1efc,
-    0x1efe, 0x1f59, 0x1f5b, 0x1f5d, 0x1f5f, 0x2102, 0x2107, 0x2115, 0x2124,
-    0x2126, 0x2128, 0x213e, 0x213f, 0x2145, 0x2183, 0x2c60, 0x2c67, 0x2c69,
-    0x2c6b, 0x2c72, 0x2c75, 0x2c82, 0x2c84, 0x2c86, 0x2c88, 0x2c8a, 0x2c8c,
-    0x2c8e, 0x2c90, 0x2c92, 0x2c94, 0x2c96, 0x2c98, 0x2c9a, 0x2c9c, 0x2c9e,
-    0x2ca0, 0x2ca2, 0x2ca4, 0x2ca6, 0x2ca8, 0x2caa, 0x2cac, 0x2cae, 0x2cb0,
-    0x2cb2, 0x2cb4, 0x2cb6, 0x2cb8, 0x2cba, 0x2cbc, 0x2cbe, 0x2cc0, 0x2cc2,
-    0x2cc4, 0x2cc6, 0x2cc8, 0x2cca, 0x2ccc, 0x2cce, 0x2cd0, 0x2cd2, 0x2cd4,
-    0x2cd6, 0x2cd8, 0x2cda, 0x2cdc, 0x2cde, 0x2ce0, 0x2ce2, 0x2ceb, 0x2ced,
-    0x2cf2, 0xa640, 0xa642, 0xa644, 0xa646, 0xa648, 0xa64a, 0xa64c, 0xa64e,
-    0xa650, 0xa652, 0xa654, 0xa656, 0xa658, 0xa65a, 0xa65c, 0xa65e, 0xa660,
-    0xa662, 0xa664, 0xa666, 0xa668, 0xa66a, 0xa66c, 0xa680, 0xa682, 0xa684,
-    0xa686, 0xa688, 0xa68a, 0xa68c, 0xa68e, 0xa690, 0xa692, 0xa694, 0xa696,
-    0xa698, 0xa69a, 0xa722, 0xa724, 0xa726, 0xa728, 0xa72a, 0xa72c, 0xa72e,
-    0xa732, 0xa734, 0xa736, 0xa738, 0xa73a, 0xa73c, 0xa73e, 0xa740, 0xa742,
-    0xa744, 0xa746, 0xa748, 0xa74a, 0xa74c, 0xa74e, 0xa750, 0xa752, 0xa754,
-    0xa756, 0xa758, 0xa75a, 0xa75c, 0xa75e, 0xa760, 0xa762, 0xa764, 0xa766,
-    0xa768, 0xa76a, 0xa76c, 0xa76e, 0xa779, 0xa77b, 0xa77d, 0xa77e, 0xa780,
-    0xa782, 0xa784, 0xa786, 0xa78b, 0xa78d, 0xa790, 0xa792, 0xa796, 0xa798,
-    0xa79a, 0xa79c, 0xa79e, 0xa7a0, 0xa7a2, 0xa7a4, 0xa7a6, 0xa7a8, 0xa7b0,
-    0xa7b1
+    0x24c, 0x24e, 0x370, 0x372, 0x376, 0x386, 0x38c, 0x38e, 0x38f,
+    0x3cf, 0x3d8, 0x3da, 0x3dc, 0x3de, 0x3e0, 0x3e2, 0x3e4, 0x3e6,
+    0x3e8, 0x3ea, 0x3ec, 0x3ee, 0x3f4, 0x3f7, 0x3f9, 0x3fa, 0x460,
+    0x462, 0x464, 0x466, 0x468, 0x46a, 0x46c, 0x46e, 0x470, 0x472,
+    0x474, 0x476, 0x478, 0x47a, 0x47c, 0x47e, 0x480, 0x48a, 0x48c,
+    0x48e, 0x490, 0x492, 0x494, 0x496, 0x498, 0x49a, 0x49c, 0x49e,
+    0x4a0, 0x4a2, 0x4a4, 0x4a6, 0x4a8, 0x4aa, 0x4ac, 0x4ae, 0x4b0,
+    0x4b2, 0x4b4, 0x4b6, 0x4b8, 0x4ba, 0x4bc, 0x4be, 0x4c0, 0x4c1,
+    0x4c3, 0x4c5, 0x4c7, 0x4c9, 0x4cb, 0x4cd, 0x4d0, 0x4d2, 0x4d4,
+    0x4d6, 0x4d8, 0x4da, 0x4dc, 0x4de, 0x4e0, 0x4e2, 0x4e4, 0x4e6,
+    0x4e8, 0x4ea, 0x4ec, 0x4ee, 0x4f0, 0x4f2, 0x4f4, 0x4f6, 0x4f8,
+    0x4fa, 0x4fc, 0x4fe, 0x500, 0x502, 0x504, 0x506, 0x508, 0x50a,
+    0x50c, 0x50e, 0x510, 0x512, 0x514, 0x516, 0x518, 0x51a, 0x51c,
+    0x51e, 0x520, 0x522, 0x524, 0x526, 0x10c7, 0x10cd, 0x1e00, 0x1e02,
+    0x1e04, 0x1e06, 0x1e08, 0x1e0a, 0x1e0c, 0x1e0e, 0x1e10, 0x1e12, 0x1e14,
+    0x1e16, 0x1e18, 0x1e1a, 0x1e1c, 0x1e1e, 0x1e20, 0x1e22, 0x1e24, 0x1e26,
+    0x1e28, 0x1e2a, 0x1e2c, 0x1e2e, 0x1e30, 0x1e32, 0x1e34, 0x1e36, 0x1e38,
+    0x1e3a, 0x1e3c, 0x1e3e, 0x1e40, 0x1e42, 0x1e44, 0x1e46, 0x1e48, 0x1e4a,
+    0x1e4c, 0x1e4e, 0x1e50, 0x1e52, 0x1e54, 0x1e56, 0x1e58, 0x1e5a, 0x1e5c,
+    0x1e5e, 0x1e60, 0x1e62, 0x1e64, 0x1e66, 0x1e68, 0x1e6a, 0x1e6c, 0x1e6e,
+    0x1e70, 0x1e72, 0x1e74, 0x1e76, 0x1e78, 0x1e7a, 0x1e7c, 0x1e7e, 0x1e80,
+    0x1e82, 0x1e84, 0x1e86, 0x1e88, 0x1e8a, 0x1e8c, 0x1e8e, 0x1e90, 0x1e92,
+    0x1e94, 0x1e9e, 0x1ea0, 0x1ea2, 0x1ea4, 0x1ea6, 0x1ea8, 0x1eaa, 0x1eac,
+    0x1eae, 0x1eb0, 0x1eb2, 0x1eb4, 0x1eb6, 0x1eb8, 0x1eba, 0x1ebc, 0x1ebe,
+    0x1ec0, 0x1ec2, 0x1ec4, 0x1ec6, 0x1ec8, 0x1eca, 0x1ecc, 0x1ece, 0x1ed0,
+    0x1ed2, 0x1ed4, 0x1ed6, 0x1ed8, 0x1eda, 0x1edc, 0x1ede, 0x1ee0, 0x1ee2,
+    0x1ee4, 0x1ee6, 0x1ee8, 0x1eea, 0x1eec, 0x1eee, 0x1ef0, 0x1ef2, 0x1ef4,
+    0x1ef6, 0x1ef8, 0x1efa, 0x1efc, 0x1efe, 0x1f59, 0x1f5b, 0x1f5d, 0x1f5f,
+    0x2102, 0x2107, 0x2115, 0x2124, 0x2126, 0x2128, 0x213e, 0x213f, 0x2145,
+    0x2183, 0x2c60, 0x2c67, 0x2c69, 0x2c6b, 0x2c72, 0x2c75, 0x2c82, 0x2c84,
+    0x2c86, 0x2c88, 0x2c8a, 0x2c8c, 0x2c8e, 0x2c90, 0x2c92, 0x2c94, 0x2c96,
+    0x2c98, 0x2c9a, 0x2c9c, 0x2c9e, 0x2ca0, 0x2ca2, 0x2ca4, 0x2ca6, 0x2ca8,
+    0x2caa, 0x2cac, 0x2cae, 0x2cb0, 0x2cb2, 0x2cb4, 0x2cb6, 0x2cb8, 0x2cba,
+    0x2cbc, 0x2cbe, 0x2cc0, 0x2cc2, 0x2cc4, 0x2cc6, 0x2cc8, 0x2cca, 0x2ccc,
+    0x2cce, 0x2cd0, 0x2cd2, 0x2cd4, 0x2cd6, 0x2cd8, 0x2cda, 0x2cdc, 0x2cde,
+    0x2ce0, 0x2ce2, 0x2ceb, 0x2ced, 0x2cf2, 0xa640, 0xa642, 0xa644, 0xa646,
+    0xa648, 0xa64a, 0xa64c, 0xa64e, 0xa650, 0xa652, 0xa654, 0xa656, 0xa658,
+    0xa65a, 0xa65c, 0xa65e, 0xa660, 0xa662, 0xa664, 0xa666, 0xa668, 0xa66a,
+    0xa66c, 0xa680, 0xa682, 0xa684, 0xa686, 0xa688, 0xa68a, 0xa68c, 0xa68e,
+    0xa690, 0xa692, 0xa694, 0xa696, 0xa722, 0xa724, 0xa726, 0xa728, 0xa72a,
+    0xa72c, 0xa72e, 0xa732, 0xa734, 0xa736, 0xa738, 0xa73a, 0xa73c, 0xa73e,
+    0xa740, 0xa742, 0xa744, 0xa746, 0xa748, 0xa74a, 0xa74c, 0xa74e, 0xa750,
+    0xa752, 0xa754, 0xa756, 0xa758, 0xa75a, 0xa75c, 0xa75e, 0xa760, 0xa762,
+    0xa764, 0xa766, 0xa768, 0xa76a, 0xa76c, 0xa76e, 0xa779, 0xa77b, 0xa77d,
+    0xa77e, 0xa780, 0xa782, 0xa784, 0xa786, 0xa78b, 0xa78d, 0xa790, 0xa792,
+    0xa7a0, 0xa7a2, 0xa7a4, 0xa7a6, 0xa7a8, 0xa7aa
 #if TCL_UTF_MAX > 4
     ,0x1d49c, 0x1d49e, 0x1d49f, 0x1d4a2, 0x1d4a5, 0x1d4a6, 0x1d504, 0x1d505, 0x1d538,
     0x1d539, 0x1d546, 0x1d7ca
@@ -595,34 +570,34 @@ static const chr upperCharTable[] = {
  */
 
 static const crange graphRangeTable[] = {
-    {0x21, 0x7e}, {0xa1, 0xac}, {0xae, 0x377}, {0x37a, 0x37f},
-    {0x384, 0x38a}, {0x38e, 0x3a1}, {0x3a3, 0x52f}, {0x531, 0x556},
-    {0x559, 0x55f}, {0x561, 0x587}, {0x58d, 0x58f}, {0x591, 0x5c7},
-    {0x5d0, 0x5ea}, {0x5f0, 0x5f4}, {0x606, 0x61b}, {0x61e, 0x6dc},
-    {0x6de, 0x70d}, {0x710, 0x74a}, {0x74d, 0x7b1}, {0x7c0, 0x7fa},
-    {0x800, 0x82d}, {0x830, 0x83e}, {0x840, 0x85b}, {0x8a0, 0x8b2},
-    {0x8e4, 0x983}, {0x985, 0x98c}, {0x993, 0x9a8}, {0x9aa, 0x9b0},
-    {0x9b6, 0x9b9}, {0x9bc, 0x9c4}, {0x9cb, 0x9ce}, {0x9df, 0x9e3},
-    {0x9e6, 0x9fb}, {0xa01, 0xa03}, {0xa05, 0xa0a}, {0xa13, 0xa28},
-    {0xa2a, 0xa30}, {0xa3e, 0xa42}, {0xa4b, 0xa4d}, {0xa59, 0xa5c},
-    {0xa66, 0xa75}, {0xa81, 0xa83}, {0xa85, 0xa8d}, {0xa8f, 0xa91},
-    {0xa93, 0xaa8}, {0xaaa, 0xab0}, {0xab5, 0xab9}, {0xabc, 0xac5},
-    {0xac7, 0xac9}, {0xacb, 0xacd}, {0xae0, 0xae3}, {0xae6, 0xaf1},
-    {0xb01, 0xb03}, {0xb05, 0xb0c}, {0xb13, 0xb28}, {0xb2a, 0xb30},
-    {0xb35, 0xb39}, {0xb3c, 0xb44}, {0xb4b, 0xb4d}, {0xb5f, 0xb63},
-    {0xb66, 0xb77}, {0xb85, 0xb8a}, {0xb8e, 0xb90}, {0xb92, 0xb95},
-    {0xba8, 0xbaa}, {0xbae, 0xbb9}, {0xbbe, 0xbc2}, {0xbc6, 0xbc8},
-    {0xbca, 0xbcd}, {0xbe6, 0xbfa}, {0xc00, 0xc03}, {0xc05, 0xc0c},
-    {0xc0e, 0xc10}, {0xc12, 0xc28}, {0xc2a, 0xc39}, {0xc3d, 0xc44},
-    {0xc46, 0xc48}, {0xc4a, 0xc4d}, {0xc60, 0xc63}, {0xc66, 0xc6f},
-    {0xc78, 0xc7f}, {0xc81, 0xc83}, {0xc85, 0xc8c}, {0xc8e, 0xc90},
-    {0xc92, 0xca8}, {0xcaa, 0xcb3}, {0xcb5, 0xcb9}, {0xcbc, 0xcc4},
-    {0xcc6, 0xcc8}, {0xcca, 0xccd}, {0xce0, 0xce3}, {0xce6, 0xcef},
-    {0xd01, 0xd03}, {0xd05, 0xd0c}, {0xd0e, 0xd10}, {0xd12, 0xd3a},
-    {0xd3d, 0xd44}, {0xd46, 0xd48}, {0xd4a, 0xd4e}, {0xd60, 0xd63},
-    {0xd66, 0xd75}, {0xd79, 0xd7f}, {0xd85, 0xd96}, {0xd9a, 0xdb1},
-    {0xdb3, 0xdbb}, {0xdc0, 0xdc6}, {0xdcf, 0xdd4}, {0xdd8, 0xddf},
-    {0xde6, 0xdef}, {0xdf2, 0xdf4}, {0xe01, 0xe3a}, {0xe3f, 0xe5b},
+    {0x21, 0x7e}, {0xa1, 0xac}, {0xae, 0x377}, {0x37a, 0x37e},
+    {0x384, 0x38a}, {0x38e, 0x3a1}, {0x3a3, 0x527}, {0x531, 0x556},
+    {0x559, 0x55f}, {0x561, 0x587}, {0x591, 0x5c7}, {0x5d0, 0x5ea},
+    {0x5f0, 0x5f4}, {0x606, 0x61b}, {0x61e, 0x6dc}, {0x6de, 0x70d},
+    {0x710, 0x74a}, {0x74d, 0x7b1}, {0x7c0, 0x7fa}, {0x800, 0x82d},
+    {0x830, 0x83e}, {0x840, 0x85b}, {0x8a2, 0x8ac}, {0x8e4, 0x8fe},
+    {0x900, 0x977}, {0x979, 0x97f}, {0x981, 0x983}, {0x985, 0x98c},
+    {0x993, 0x9a8}, {0x9aa, 0x9b0}, {0x9b6, 0x9b9}, {0x9bc, 0x9c4},
+    {0x9cb, 0x9ce}, {0x9df, 0x9e3}, {0x9e6, 0x9fb}, {0xa01, 0xa03},
+    {0xa05, 0xa0a}, {0xa13, 0xa28}, {0xa2a, 0xa30}, {0xa3e, 0xa42},
+    {0xa4b, 0xa4d}, {0xa59, 0xa5c}, {0xa66, 0xa75}, {0xa81, 0xa83},
+    {0xa85, 0xa8d}, {0xa8f, 0xa91}, {0xa93, 0xaa8}, {0xaaa, 0xab0},
+    {0xab5, 0xab9}, {0xabc, 0xac5}, {0xac7, 0xac9}, {0xacb, 0xacd},
+    {0xae0, 0xae3}, {0xae6, 0xaf1}, {0xb01, 0xb03}, {0xb05, 0xb0c},
+    {0xb13, 0xb28}, {0xb2a, 0xb30}, {0xb35, 0xb39}, {0xb3c, 0xb44},
+    {0xb4b, 0xb4d}, {0xb5f, 0xb63}, {0xb66, 0xb77}, {0xb85, 0xb8a},
+    {0xb8e, 0xb90}, {0xb92, 0xb95}, {0xba8, 0xbaa}, {0xbae, 0xbb9},
+    {0xbbe, 0xbc2}, {0xbc6, 0xbc8}, {0xbca, 0xbcd}, {0xbe6, 0xbfa},
+    {0xc01, 0xc03}, {0xc05, 0xc0c}, {0xc0e, 0xc10}, {0xc12, 0xc28},
+    {0xc2a, 0xc33}, {0xc35, 0xc39}, {0xc3d, 0xc44}, {0xc46, 0xc48},
+    {0xc4a, 0xc4d}, {0xc60, 0xc63}, {0xc66, 0xc6f}, {0xc78, 0xc7f},
+    {0xc85, 0xc8c}, {0xc8e, 0xc90}, {0xc92, 0xca8}, {0xcaa, 0xcb3},
+    {0xcb5, 0xcb9}, {0xcbc, 0xcc4}, {0xcc6, 0xcc8}, {0xcca, 0xccd},
+    {0xce0, 0xce3}, {0xce6, 0xcef}, {0xd05, 0xd0c}, {0xd0e, 0xd10},
+    {0xd12, 0xd3a}, {0xd3d, 0xd44}, {0xd46, 0xd48}, {0xd4a, 0xd4e},
+    {0xd60, 0xd63}, {0xd66, 0xd75}, {0xd79, 0xd7f}, {0xd85, 0xd96},
+    {0xd9a, 0xdb1}, {0xdb3, 0xdbb}, {0xdc0, 0xdc6}, {0xdcf, 0xdd4},
+    {0xdd8, 0xddf}, {0xdf2, 0xdf4}, {0xe01, 0xe3a}, {0xe3f, 0xe5b},
     {0xe94, 0xe97}, {0xe99, 0xe9f}, {0xea1, 0xea3}, {0xead, 0xeb9},
     {0xebb, 0xebd}, {0xec0, 0xec4}, {0xec8, 0xecd}, {0xed0, 0xed9},
     {0xedc, 0xedf}, {0xf00, 0xf47}, {0xf49, 0xf6c}, {0xf71, 0xf97},
@@ -631,123 +606,105 @@ static const crange graphRangeTable[] = {
     {0x1260, 0x1288}, {0x128a, 0x128d}, {0x1290, 0x12b0}, {0x12b2, 0x12b5},
     {0x12b8, 0x12be}, {0x12c2, 0x12c5}, {0x12c8, 0x12d6}, {0x12d8, 0x1310},
     {0x1312, 0x1315}, {0x1318, 0x135a}, {0x135d, 0x137c}, {0x1380, 0x1399},
-    {0x13a0, 0x13f4}, {0x1400, 0x167f}, {0x1681, 0x169c}, {0x16a0, 0x16f8},
+    {0x13a0, 0x13f4}, {0x1400, 0x167f}, {0x1681, 0x169c}, {0x16a0, 0x16f0},
     {0x1700, 0x170c}, {0x170e, 0x1714}, {0x1720, 0x1736}, {0x1740, 0x1753},
     {0x1760, 0x176c}, {0x176e, 0x1770}, {0x1780, 0x17dd}, {0x17e0, 0x17e9},
     {0x17f0, 0x17f9}, {0x1800, 0x180d}, {0x1810, 0x1819}, {0x1820, 0x1877},
-    {0x1880, 0x18aa}, {0x18b0, 0x18f5}, {0x1900, 0x191e}, {0x1920, 0x192b},
+    {0x1880, 0x18aa}, {0x18b0, 0x18f5}, {0x1900, 0x191c}, {0x1920, 0x192b},
     {0x1930, 0x193b}, {0x1944, 0x196d}, {0x1970, 0x1974}, {0x1980, 0x19ab},
     {0x19b0, 0x19c9}, {0x19d0, 0x19da}, {0x19de, 0x1a1b}, {0x1a1e, 0x1a5e},
     {0x1a60, 0x1a7c}, {0x1a7f, 0x1a89}, {0x1a90, 0x1a99}, {0x1aa0, 0x1aad},
-    {0x1ab0, 0x1abe}, {0x1b00, 0x1b4b}, {0x1b50, 0x1b7c}, {0x1b80, 0x1bf3},
-    {0x1bfc, 0x1c37}, {0x1c3b, 0x1c49}, {0x1c4d, 0x1c7f}, {0x1cc0, 0x1cc7},
-    {0x1cd0, 0x1cf6}, {0x1d00, 0x1df5}, {0x1dfc, 0x1f15}, {0x1f18, 0x1f1d},
-    {0x1f20, 0x1f45}, {0x1f48, 0x1f4d}, {0x1f50, 0x1f57}, {0x1f5f, 0x1f7d},
-    {0x1f80, 0x1fb4}, {0x1fb6, 0x1fc4}, {0x1fc6, 0x1fd3}, {0x1fd6, 0x1fdb},
-    {0x1fdd, 0x1fef}, {0x1ff2, 0x1ff4}, {0x1ff6, 0x1ffe}, {0x2010, 0x2027},
-    {0x2030, 0x205e}, {0x2074, 0x208e}, {0x2090, 0x209c}, {0x20a0, 0x20bd},
-    {0x20d0, 0x20f0}, {0x2100, 0x2189}, {0x2190, 0x23fa}, {0x2400, 0x2426},
-    {0x2440, 0x244a}, {0x2460, 0x2b73}, {0x2b76, 0x2b95}, {0x2b98, 0x2bb9},
-    {0x2bbd, 0x2bc8}, {0x2bca, 0x2bd1}, {0x2c00, 0x2c2e}, {0x2c30, 0x2c5e},
-    {0x2c60, 0x2cf3}, {0x2cf9, 0x2d25}, {0x2d30, 0x2d67}, {0x2d7f, 0x2d96},
-    {0x2da0, 0x2da6}, {0x2da8, 0x2dae}, {0x2db0, 0x2db6}, {0x2db8, 0x2dbe},
-    {0x2dc0, 0x2dc6}, {0x2dc8, 0x2dce}, {0x2dd0, 0x2dd6}, {0x2dd8, 0x2dde},
-    {0x2de0, 0x2e42}, {0x2e80, 0x2e99}, {0x2e9b, 0x2ef3}, {0x2f00, 0x2fd5},
-    {0x2ff0, 0x2ffb}, {0x3001, 0x303f}, {0x3041, 0x3096}, {0x3099, 0x30ff},
-    {0x3105, 0x312d}, {0x3131, 0x318e}, {0x3190, 0x31ba}, {0x31c0, 0x31e3},
-    {0x31f0, 0x321e}, {0x3220, 0x32fe}, {0x3300, 0x4db5}, {0x4dc0, 0x9fcc},
-    {0xa000, 0xa48c}, {0xa490, 0xa4c6}, {0xa4d0, 0xa62b}, {0xa640, 0xa69d},
-    {0xa69f, 0xa6f7}, {0xa700, 0xa78e}, {0xa790, 0xa7ad}, {0xa7f7, 0xa82b},
-    {0xa830, 0xa839}, {0xa840, 0xa877}, {0xa880, 0xa8c4}, {0xa8ce, 0xa8d9},
-    {0xa8e0, 0xa8fb}, {0xa900, 0xa953}, {0xa95f, 0xa97c}, {0xa980, 0xa9cd},
-    {0xa9cf, 0xa9d9}, {0xa9de, 0xa9fe}, {0xaa00, 0xaa36}, {0xaa40, 0xaa4d},
-    {0xaa50, 0xaa59}, {0xaa5c, 0xaac2}, {0xaadb, 0xaaf6}, {0xab01, 0xab06},
-    {0xab09, 0xab0e}, {0xab11, 0xab16}, {0xab20, 0xab26}, {0xab28, 0xab2e},
-    {0xab30, 0xab5f}, {0xabc0, 0xabed}, {0xabf0, 0xabf9}, {0xac00, 0xd7a3},
-    {0xd7b0, 0xd7c6}, {0xd7cb, 0xd7fb}, {0xdc00, 0xdc3e}, {0xdc40, 0xdc7e},
-    {0xdc80, 0xdcbe}, {0xdcc0, 0xdcfe}, {0xdd80, 0xddbe}, {0xddc0, 0xddfe},
-    {0xde80, 0xdebe}, {0xdec0, 0xdefe}, {0xdf00, 0xdf3e}, {0xdf40, 0xdf7e},
-    {0xf900, 0xfa6d}, {0xfa70, 0xfad9}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17},
-    {0xfb1d, 0xfb36}, {0xfb38, 0xfb3c}, {0xfb46, 0xfbc1}, {0xfbd3, 0xfd3f},
-    {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7}, {0xfdf0, 0xfdfd}, {0xfe00, 0xfe19},
-    {0xfe20, 0xfe2d}, {0xfe30, 0xfe52}, {0xfe54, 0xfe66}, {0xfe68, 0xfe6b},
-    {0xfe70, 0xfe74}, {0xfe76, 0xfefc}, {0xff01, 0xffbe}, {0xffc2, 0xffc7},
-    {0xffca, 0xffcf}, {0xffd2, 0xffd7}, {0xffda, 0xffdc}, {0xffe0, 0xffe6},
-    {0xffe8, 0xffee}
+    {0x1b00, 0x1b4b}, {0x1b50, 0x1b7c}, {0x1b80, 0x1bf3}, {0x1bfc, 0x1c37},
+    {0x1c3b, 0x1c49}, {0x1c4d, 0x1c7f}, {0x1cc0, 0x1cc7}, {0x1cd0, 0x1cf6},
+    {0x1d00, 0x1de6}, {0x1dfc, 0x1f15}, {0x1f18, 0x1f1d}, {0x1f20, 0x1f45},
+    {0x1f48, 0x1f4d}, {0x1f50, 0x1f57}, {0x1f5f, 0x1f7d}, {0x1f80, 0x1fb4},
+    {0x1fb6, 0x1fc4}, {0x1fc6, 0x1fd3}, {0x1fd6, 0x1fdb}, {0x1fdd, 0x1fef},
+    {0x1ff2, 0x1ff4}, {0x1ff6, 0x1ffe}, {0x2010, 0x2027}, {0x2030, 0x205e},
+    {0x2074, 0x208e}, {0x2090, 0x209c}, {0x20a0, 0x20ba}, {0x20d0, 0x20f0},
+    {0x2100, 0x2189}, {0x2190, 0x23f3}, {0x2400, 0x2426}, {0x2440, 0x244a},
+    {0x2460, 0x26ff}, {0x2701, 0x2b4c}, {0x2b50, 0x2b59}, {0x2c00, 0x2c2e},
+    {0x2c30, 0x2c5e}, {0x2c60, 0x2cf3}, {0x2cf9, 0x2d25}, {0x2d30, 0x2d67},
+    {0x2d7f, 0x2d96}, {0x2da0, 0x2da6}, {0x2da8, 0x2dae}, {0x2db0, 0x2db6},
+    {0x2db8, 0x2dbe}, {0x2dc0, 0x2dc6}, {0x2dc8, 0x2dce}, {0x2dd0, 0x2dd6},
+    {0x2dd8, 0x2dde}, {0x2de0, 0x2e3b}, {0x2e80, 0x2e99}, {0x2e9b, 0x2ef3},
+    {0x2f00, 0x2fd5}, {0x2ff0, 0x2ffb}, {0x3001, 0x303f}, {0x3041, 0x3096},
+    {0x3099, 0x30ff}, {0x3105, 0x312d}, {0x3131, 0x318e}, {0x3190, 0x31ba},
+    {0x31c0, 0x31e3}, {0x31f0, 0x321e}, {0x3220, 0x32fe}, {0x3300, 0x4db5},
+    {0x4dc0, 0x9fcc}, {0xa000, 0xa48c}, {0xa490, 0xa4c6}, {0xa4d0, 0xa62b},
+    {0xa640, 0xa697}, {0xa69f, 0xa6f7}, {0xa700, 0xa78e}, {0xa790, 0xa793},
+    {0xa7a0, 0xa7aa}, {0xa7f8, 0xa82b}, {0xa830, 0xa839}, {0xa840, 0xa877},
+    {0xa880, 0xa8c4}, {0xa8ce, 0xa8d9}, {0xa8e0, 0xa8fb}, {0xa900, 0xa953},
+    {0xa95f, 0xa97c}, {0xa980, 0xa9cd}, {0xa9cf, 0xa9d9}, {0xaa00, 0xaa36},
+    {0xaa40, 0xaa4d}, {0xaa50, 0xaa59}, {0xaa5c, 0xaa7b}, {0xaa80, 0xaac2},
+    {0xaadb, 0xaaf6}, {0xab01, 0xab06}, {0xab09, 0xab0e}, {0xab11, 0xab16},
+    {0xab20, 0xab26}, {0xab28, 0xab2e}, {0xabc0, 0xabed}, {0xabf0, 0xabf9},
+    {0xac00, 0xd7a3}, {0xd7b0, 0xd7c6}, {0xd7cb, 0xd7fb}, {0xf900, 0xfa6d},
+    {0xfa70, 0xfad9}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17}, {0xfb1d, 0xfb36},
+    {0xfb38, 0xfb3c}, {0xfb46, 0xfbc1}, {0xfbd3, 0xfd3f}, {0xfd50, 0xfd8f},
+    {0xfd92, 0xfdc7}, {0xfdf0, 0xfdfd}, {0xfe00, 0xfe19}, {0xfe20, 0xfe26},
+    {0xfe30, 0xfe52}, {0xfe54, 0xfe66}, {0xfe68, 0xfe6b}, {0xfe70, 0xfe74},
+    {0xfe76, 0xfefc}, {0xff01, 0xffbe}, {0xffc2, 0xffc7}, {0xffca, 0xffcf},
+    {0xffd2, 0xffd7}, {0xffda, 0xffdc}, {0xffe0, 0xffe6}, {0xffe8, 0xffee}
 #if TCL_UTF_MAX > 4
     ,{0x10000, 0x1000b}, {0x1000d, 0x10026}, {0x10028, 0x1003a}, {0x1003f, 0x1004d},
     {0x10050, 0x1005d}, {0x10080, 0x100fa}, {0x10100, 0x10102}, {0x10107, 0x10133},
-    {0x10137, 0x1018c}, {0x10190, 0x1019b}, {0x101d0, 0x101fd}, {0x10280, 0x1029c},
-    {0x102a0, 0x102d0}, {0x102e0, 0x102fb}, {0x10300, 0x10323}, {0x10330, 0x1034a},
-    {0x10350, 0x1037a}, {0x10380, 0x1039d}, {0x1039f, 0x103c3}, {0x103c8, 0x103d5},
-    {0x10400, 0x1049d}, {0x104a0, 0x104a9}, {0x10500, 0x10527}, {0x10530, 0x10563},
-    {0x10600, 0x10736}, {0x10740, 0x10755}, {0x10760, 0x10767}, {0x10800, 0x10805},
-    {0x1080a, 0x10835}, {0x1083f, 0x10855}, {0x10857, 0x1089e}, {0x108a7, 0x108af},
-    {0x10900, 0x1091b}, {0x1091f, 0x10939}, {0x10980, 0x109b7}, {0x10a00, 0x10a03},
-    {0x10a0c, 0x10a13}, {0x10a15, 0x10a17}, {0x10a19, 0x10a33}, {0x10a38, 0x10a3a},
-    {0x10a3f, 0x10a47}, {0x10a50, 0x10a58}, {0x10a60, 0x10a9f}, {0x10ac0, 0x10ae6},
-    {0x10aeb, 0x10af6}, {0x10b00, 0x10b35}, {0x10b39, 0x10b55}, {0x10b58, 0x10b72},
-    {0x10b78, 0x10b91}, {0x10b99, 0x10b9c}, {0x10ba9, 0x10baf}, {0x10c00, 0x10c48},
-    {0x10e60, 0x10e7e}, {0x11000, 0x1104d}, {0x11052, 0x1106f}, {0x1107f, 0x110bc},
-    {0x110be, 0x110c1}, {0x110d0, 0x110e8}, {0x110f0, 0x110f9}, {0x11100, 0x11134},
-    {0x11136, 0x11143}, {0x11150, 0x11176}, {0x11180, 0x111c8}, {0x111d0, 0x111da},
-    {0x111e1, 0x111f4}, {0x11200, 0x11211}, {0x11213, 0x1123d}, {0x112b0, 0x112ea},
-    {0x112f0, 0x112f9}, {0x11301, 0x11303}, {0x11305, 0x1130c}, {0x11313, 0x11328},
-    {0x1132a, 0x11330}, {0x11335, 0x11339}, {0x1133c, 0x11344}, {0x1134b, 0x1134d},
-    {0x1135d, 0x11363}, {0x11366, 0x1136c}, {0x11370, 0x11374}, {0x11480, 0x114c7},
-    {0x114d0, 0x114d9}, {0x11580, 0x115b5}, {0x115b8, 0x115c9}, {0x11600, 0x11644},
-    {0x11650, 0x11659}, {0x11680, 0x116b7}, {0x116c0, 0x116c9}, {0x118a0, 0x118f2},
-    {0x11ac0, 0x11af8}, {0x12000, 0x12398}, {0x12400, 0x1246e}, {0x12470, 0x12474},
-    {0x13000, 0x1342e}, {0x16800, 0x16a38}, {0x16a40, 0x16a5e}, {0x16a60, 0x16a69},
-    {0x16ad0, 0x16aed}, {0x16af0, 0x16af5}, {0x16b00, 0x16b45}, {0x16b50, 0x16b59},
-    {0x16b5b, 0x16b61}, {0x16b63, 0x16b77}, {0x16b7d, 0x16b8f}, {0x16f00, 0x16f44},
-    {0x16f50, 0x16f7e}, {0x16f8f, 0x16f9f}, {0x1bc00, 0x1bc6a}, {0x1bc70, 0x1bc7c},
-    {0x1bc80, 0x1bc88}, {0x1bc90, 0x1bc99}, {0x1bc9c, 0x1bc9f}, {0x1d000, 0x1d0f5},
-    {0x1d100, 0x1d126}, {0x1d129, 0x1d172}, {0x1d17b, 0x1d1dd}, {0x1d200, 0x1d245},
-    {0x1d300, 0x1d356}, {0x1d360, 0x1d371}, {0x1d400, 0x1d454}, {0x1d456, 0x1d49c},
-    {0x1d4a9, 0x1d4ac}, {0x1d4ae, 0x1d4b9}, {0x1d4bd, 0x1d4c3}, {0x1d4c5, 0x1d505},
-    {0x1d507, 0x1d50a}, {0x1d50d, 0x1d514}, {0x1d516, 0x1d51c}, {0x1d51e, 0x1d539},
-    {0x1d53b, 0x1d53e}, {0x1d540, 0x1d544}, {0x1d54a, 0x1d550}, {0x1d552, 0x1d6a5},
-    {0x1d6a8, 0x1d7cb}, {0x1d7ce, 0x1d7ff}, {0x1e800, 0x1e8c4}, {0x1e8c7, 0x1e8d6},
-    {0x1ee00, 0x1ee03}, {0x1ee05, 0x1ee1f}, {0x1ee29, 0x1ee32}, {0x1ee34, 0x1ee37},
-    {0x1ee4d, 0x1ee4f}, {0x1ee67, 0x1ee6a}, {0x1ee6c, 0x1ee72}, {0x1ee74, 0x1ee77},
-    {0x1ee79, 0x1ee7c}, {0x1ee80, 0x1ee89}, {0x1ee8b, 0x1ee9b}, {0x1eea1, 0x1eea3},
-    {0x1eea5, 0x1eea9}, {0x1eeab, 0x1eebb}, {0x1f000, 0x1f02b}, {0x1f030, 0x1f093},
-    {0x1f0a0, 0x1f0ae}, {0x1f0b1, 0x1f0bf}, {0x1f0c1, 0x1f0cf}, {0x1f0d1, 0x1f0f5},
-    {0x1f100, 0x1f10c}, {0x1f110, 0x1f12e}, {0x1f130, 0x1f16b}, {0x1f170, 0x1f19a},
-    {0x1f1e6, 0x1f202}, {0x1f210, 0x1f23a}, {0x1f240, 0x1f248}, {0x1f300, 0x1f32c},
-    {0x1f330, 0x1f37d}, {0x1f380, 0x1f3ce}, {0x1f3d4, 0x1f3f7}, {0x1f400, 0x1f4fe},
-    {0x1f500, 0x1f54a}, {0x1f550, 0x1f579}, {0x1f57b, 0x1f5a3}, {0x1f5a5, 0x1f642},
-    {0x1f645, 0x1f6cf}, {0x1f6e0, 0x1f6ec}, {0x1f6f0, 0x1f6f3}, {0x1f700, 0x1f773},
-    {0x1f780, 0x1f7d4}, {0x1f800, 0x1f80b}, {0x1f810, 0x1f847}, {0x1f850, 0x1f859},
-    {0x1f860, 0x1f887}, {0x1f890, 0x1f8ad}, {0x20000, 0x2a6d6}, {0x2a700, 0x2b734},
-    {0x2b740, 0x2b81d}, {0x2f800, 0x2fa1d}, {0xe0100, 0xe01ef}
+    {0x10137, 0x1018a}, {0x10190, 0x1019b}, {0x101d0, 0x101fd}, {0x10280, 0x1029c},
+    {0x102a0, 0x102d0}, {0x10300, 0x1031e}, {0x10320, 0x10323}, {0x10330, 0x1034a},
+    {0x10380, 0x1039d}, {0x1039f, 0x103c3}, {0x103c8, 0x103d5}, {0x10400, 0x1049d},
+    {0x104a0, 0x104a9}, {0x10800, 0x10805}, {0x1080a, 0x10835}, {0x1083f, 0x10855},
+    {0x10857, 0x1085f}, {0x10900, 0x1091b}, {0x1091f, 0x10939}, {0x10980, 0x109b7},
+    {0x10a00, 0x10a03}, {0x10a0c, 0x10a13}, {0x10a15, 0x10a17}, {0x10a19, 0x10a33},
+    {0x10a38, 0x10a3a}, {0x10a3f, 0x10a47}, {0x10a50, 0x10a58}, {0x10a60, 0x10a7f},
+    {0x10b00, 0x10b35}, {0x10b39, 0x10b55}, {0x10b58, 0x10b72}, {0x10b78, 0x10b7f},
+    {0x10c00, 0x10c48}, {0x10e60, 0x10e7e}, {0x11000, 0x1104d}, {0x11052, 0x1106f},
+    {0x11080, 0x110bc}, {0x110be, 0x110c1}, {0x110d0, 0x110e8}, {0x110f0, 0x110f9},
+    {0x11100, 0x11134}, {0x11136, 0x11143}, {0x11180, 0x111c8}, {0x111d0, 0x111d9},
+    {0x11680, 0x116b7}, {0x116c0, 0x116c9}, {0x12000, 0x1236e}, {0x12400, 0x12462},
+    {0x12470, 0x12473}, {0x13000, 0x1342e}, {0x16800, 0x16a38}, {0x16f00, 0x16f44},
+    {0x16f50, 0x16f7e}, {0x16f8f, 0x16f9f}, {0x1d000, 0x1d0f5}, {0x1d100, 0x1d126},
+    {0x1d129, 0x1d172}, {0x1d17b, 0x1d1dd}, {0x1d200, 0x1d245}, {0x1d300, 0x1d356},
+    {0x1d360, 0x1d371}, {0x1d400, 0x1d454}, {0x1d456, 0x1d49c}, {0x1d4a9, 0x1d4ac},
+    {0x1d4ae, 0x1d4b9}, {0x1d4bd, 0x1d4c3}, {0x1d4c5, 0x1d505}, {0x1d507, 0x1d50a},
+    {0x1d50d, 0x1d514}, {0x1d516, 0x1d51c}, {0x1d51e, 0x1d539}, {0x1d53b, 0x1d53e},
+    {0x1d540, 0x1d544}, {0x1d54a, 0x1d550}, {0x1d552, 0x1d6a5}, {0x1d6a8, 0x1d7cb},
+    {0x1d7ce, 0x1d7ff}, {0x1ee00, 0x1ee03}, {0x1ee05, 0x1ee1f}, {0x1ee29, 0x1ee32},
+    {0x1ee34, 0x1ee37}, {0x1ee4d, 0x1ee4f}, {0x1ee67, 0x1ee6a}, {0x1ee6c, 0x1ee72},
+    {0x1ee74, 0x1ee77}, {0x1ee79, 0x1ee7c}, {0x1ee80, 0x1ee89}, {0x1ee8b, 0x1ee9b},
+    {0x1eea1, 0x1eea3}, {0x1eea5, 0x1eea9}, {0x1eeab, 0x1eebb}, {0x1f000, 0x1f02b},
+    {0x1f030, 0x1f093}, {0x1f0a0, 0x1f0ae}, {0x1f0b1, 0x1f0be}, {0x1f0c1, 0x1f0cf},
+    {0x1f0d1, 0x1f0df}, {0x1f100, 0x1f10a}, {0x1f110, 0x1f12e}, {0x1f130, 0x1f16b},
+    {0x1f170, 0x1f19a}, {0x1f1e6, 0x1f202}, {0x1f210, 0x1f23a}, {0x1f240, 0x1f248},
+    {0x1f300, 0x1f320}, {0x1f330, 0x1f335}, {0x1f337, 0x1f37c}, {0x1f380, 0x1f393},
+    {0x1f3a0, 0x1f3c4}, {0x1f3c6, 0x1f3ca}, {0x1f3e0, 0x1f3f0}, {0x1f400, 0x1f43e},
+    {0x1f442, 0x1f4f7}, {0x1f4f9, 0x1f4fc}, {0x1f500, 0x1f53d}, {0x1f540, 0x1f543},
+    {0x1f550, 0x1f567}, {0x1f5fb, 0x1f640}, {0x1f645, 0x1f64f}, {0x1f680, 0x1f6c5},
+    {0x1f700, 0x1f773}, {0x20000, 0x2a6d6}, {0x2a700, 0x2b734}, {0x2b740, 0x2b81d},
+    {0x2f800, 0x2fa1d}, {0xe0100, 0xe01ef}
 #endif
 };
 
 #define NUM_GRAPH_RANGE (sizeof(graphRangeTable)/sizeof(crange))
 
 static const chr graphCharTable[] = {
-    0x38c, 0x589, 0x58a, 0x85e, 0x98f, 0x990, 0x9b2, 0x9c7, 0x9c8,
-    0x9d7, 0x9dc, 0x9dd, 0xa0f, 0xa10, 0xa32, 0xa33, 0xa35, 0xa36,
-    0xa38, 0xa39, 0xa3c, 0xa47, 0xa48, 0xa51, 0xa5e, 0xab2, 0xab3,
-    0xad0, 0xb0f, 0xb10, 0xb32, 0xb33, 0xb47, 0xb48, 0xb56, 0xb57,
-    0xb5c, 0xb5d, 0xb82, 0xb83, 0xb99, 0xb9a, 0xb9c, 0xb9e, 0xb9f,
-    0xba3, 0xba4, 0xbd0, 0xbd7, 0xc55, 0xc56, 0xc58, 0xc59, 0xcd5,
-    0xcd6, 0xcde, 0xcf1, 0xcf2, 0xd57, 0xd82, 0xd83, 0xdbd, 0xdca,
-    0xdd6, 0xe81, 0xe82, 0xe84, 0xe87, 0xe88, 0xe8a, 0xe8d, 0xea5,
-    0xea7, 0xeaa, 0xeab, 0xec6, 0x10c7, 0x10cd, 0x1258, 0x12c0, 0x1772,
-    0x1773, 0x1940, 0x1cf8, 0x1cf9, 0x1f59, 0x1f5b, 0x1f5d, 0x2070, 0x2071,
-    0x2d27, 0x2d2d, 0x2d6f, 0x2d70, 0xa7b0, 0xa7b1, 0xab64, 0xab65, 0xfb3e,
-    0xfb40, 0xfb41, 0xfb43, 0xfb44, 0xfffc, 0xfffd
+    0x38c, 0x589, 0x58a, 0x58f, 0x85e, 0x8a0, 0x98f, 0x990, 0x9b2,
+    0x9c7, 0x9c8, 0x9d7, 0x9dc, 0x9dd, 0xa0f, 0xa10, 0xa32, 0xa33,
+    0xa35, 0xa36, 0xa38, 0xa39, 0xa3c, 0xa47, 0xa48, 0xa51, 0xa5e,
+    0xab2, 0xab3, 0xad0, 0xb0f, 0xb10, 0xb32, 0xb33, 0xb47, 0xb48,
+    0xb56, 0xb57, 0xb5c, 0xb5d, 0xb82, 0xb83, 0xb99, 0xb9a, 0xb9c,
+    0xb9e, 0xb9f, 0xba3, 0xba4, 0xbd0, 0xbd7, 0xc55, 0xc56, 0xc58,
+    0xc59, 0xc82, 0xc83, 0xcd5, 0xcd6, 0xcde, 0xcf1, 0xcf2, 0xd02,
+    0xd03, 0xd57, 0xd82, 0xd83, 0xdbd, 0xdca, 0xdd6, 0xe81, 0xe82,
+    0xe84, 0xe87, 0xe88, 0xe8a, 0xe8d, 0xea5, 0xea7, 0xeaa, 0xeab,
+    0xec6, 0x10c7, 0x10cd, 0x1258, 0x12c0, 0x1772, 0x1773, 0x1940, 0x1f59,
+    0x1f5b, 0x1f5d, 0x2070, 0x2071, 0x2d27, 0x2d2d, 0x2d6f, 0x2d70, 0xa9de,
+    0xa9df, 0xfb3e, 0xfb40, 0xfb41, 0xfb43, 0xfb44, 0xfffc, 0xfffd
 #if TCL_UTF_MAX > 4
-    ,0x1003c, 0x1003d, 0x101a0, 0x1056f, 0x10808, 0x10837, 0x10838, 0x1083c, 0x1093f,
-    0x109be, 0x109bf, 0x10a05, 0x10a06, 0x111cd, 0x1130f, 0x11310, 0x11332, 0x11333,
-    0x11347, 0x11348, 0x11357, 0x118ff, 0x16a6e, 0x16a6f, 0x1b000, 0x1b001, 0x1d49e,
-    0x1d49f, 0x1d4a2, 0x1d4a5, 0x1d4a6, 0x1d4bb, 0x1d546, 0x1ee21, 0x1ee22, 0x1ee24,
-    0x1ee27, 0x1ee39, 0x1ee3b, 0x1ee42, 0x1ee47, 0x1ee49, 0x1ee4b, 0x1ee51, 0x1ee52,
-    0x1ee54, 0x1ee57, 0x1ee59, 0x1ee5b, 0x1ee5d, 0x1ee5f, 0x1ee61, 0x1ee62, 0x1ee64,
-    0x1ee7e, 0x1eef0, 0x1eef1, 0x1f250, 0x1f251
+    ,0x1003c, 0x1003d, 0x10808, 0x10837, 0x10838, 0x1083c, 0x1093f, 0x109be, 0x109bf,
+    0x10a05, 0x10a06, 0x1b000, 0x1b001, 0x1d49e, 0x1d49f, 0x1d4a2, 0x1d4a5, 0x1d4a6,
+    0x1d4bb, 0x1d546, 0x1ee21, 0x1ee22, 0x1ee24, 0x1ee27, 0x1ee39, 0x1ee3b, 0x1ee42,
+    0x1ee47, 0x1ee49, 0x1ee4b, 0x1ee51, 0x1ee52, 0x1ee54, 0x1ee57, 0x1ee59, 0x1ee5b,
+    0x1ee5d, 0x1ee5f, 0x1ee61, 0x1ee62, 0x1ee64, 0x1ee7e, 0x1eef0, 0x1eef1, 0x1f250,
+    0x1f251, 0x1f440
 #endif
 };
 

generic/regc_nfa.c

@@ -1345,7 +1345,7 @@ fixempties(
     for (s = nfa->states; s != NULL && !NISERR(); s = nexts) {
 	nexts = s->next;
 	/* Ensure tmp fields are clear for next step */
-	assert(s->tmp == NULL);
+	assert(s->tmp = NULL);
 	if (s->flag || s->nins != 1) {
 	    continue;
 	}

generic/tcl.decls

@@ -2326,11 +2326,6 @@ declare 630 {
 
 # ----- BASELINE -- FOR -- 8.6.0 ----- #
 
-# ZipVfs
-declare 631 {
-  int Tcl_Zvfs_Boot(Tcl_Interp *interp)
-}
-
 ##############################################################################
 
 # Define the platform specific public Tcl interface. These functions are only

generic/tcl.h

@@ -56,10 +56,10 @@ extern "C" {
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   6
 #define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
-#define TCL_RELEASE_SERIAL  2
+#define TCL_RELEASE_SERIAL  1
 
 #define TCL_VERSION	    "8.6"
-#define TCL_PATCH_LEVEL	    "8.6.2"
+#define TCL_PATCH_LEVEL	    "8.6.1"
 
 /*
  *----------------------------------------------------------------------------
@@ -2433,15 +2433,9 @@ EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
 
 /*
  * Include platform specific public function declarations that are accessible
- * via the stubs table. Make all TclOO symbols MODULE_SCOPE (which only
- * has effect on building it as a shared library). See ticket [3010352].
+ * via the stubs table.
  */
 
-#if defined(BUILD_tcl)
-#   undef TCLAPI
-#   define TCLAPI MODULE_SCOPE
-#endif
-
 #include "tclPlatDecls.h"
 
 /*

generic/tclAssembly.c

@@ -410,10 +410,6 @@ static const TalInstDesc TalInstructionTable[] = {
     {"lappendArray",	ASSEM_LVT,	(INST_LAPPEND_ARRAY1<<8
 					 | INST_LAPPEND_ARRAY4),2,	1},
     {"lappendArrayStk", ASSEM_1BYTE,	INST_LAPPEND_ARRAY_STK,	3,	1},
-    {"lappendList",	ASSEM_LVT4,	INST_LAPPEND_LIST,	1,	1},
-    {"lappendListArray",ASSEM_LVT4,	INST_LAPPEND_LIST_ARRAY,2,	1},
-    {"lappendListArrayStk", ASSEM_1BYTE,INST_LAPPEND_LIST_ARRAY_STK, 3,	1},
-    {"lappendListStk",	ASSEM_1BYTE,	INST_LAPPEND_LIST_STK,	2,	1},
     {"lappendStk",	ASSEM_1BYTE,	INST_LAPPEND_STK,	2,	1},
     {"le",		ASSEM_1BYTE,	INST_LE,		2,	1},
     {"lindexMulti",	ASSEM_LINDEX_MULTI,

generic/tclClock.c

@@ -521,46 +521,6 @@ ClockGetdatefieldsObjCmd(
  *----------------------------------------------------------------------
  */
 
-static int
-FetchEraField(
-    Tcl_Interp *interp,
-    Tcl_Obj *dict,
-    Tcl_Obj *key,
-    int *storePtr)
-{
-    Tcl_Obj *value = NULL;
-
-    if (Tcl_DictObjGet(interp, dict, key, &value) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    if (value == NULL) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"expected key(s) not found in dictionary", -1));
-	return TCL_ERROR;
-    }
-    return Tcl_GetIndexFromObj(interp, value, eras, "era", TCL_EXACT, storePtr);
-}
-
-static int
-FetchIntField(
-    Tcl_Interp *interp,
-    Tcl_Obj *dict,
-    Tcl_Obj *key,
-    int *storePtr)
-{
-    Tcl_Obj *value = NULL;
-
-    if (Tcl_DictObjGet(interp, dict, key, &value) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    if (value == NULL) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"expected key(s) not found in dictionary", -1));
-	return TCL_ERROR;
-    }
-    return TclGetIntFromObj(interp, value, storePtr);
-}
-
 static int
 ClockGetjuliandayfromerayearmonthdayObjCmd(
     ClientData clientData,	/* Opaque pointer to literal pool, etc. */
@@ -572,6 +532,7 @@ ClockGetjuliandayfromerayearmonthdayObjCmd(
     Tcl_Obj *dict;
     ClockClientData *data = clientData;
     Tcl_Obj *const *literals = data->literals;
+    Tcl_Obj *fieldPtr;
     int changeover;
     int copied = 0;
     int status;
@@ -586,13 +547,18 @@ ClockGetjuliandayfromerayearmonthdayObjCmd(
 	return TCL_ERROR;
     }
     dict = objv[1];
-    if (FetchEraField(interp, dict, literals[LIT_ERA], &era) != TCL_OK
-	    || FetchIntField(interp, dict, literals[LIT_YEAR], &fields.year)
-		!= TCL_OK
-	    || FetchIntField(interp, dict, literals[LIT_MONTH], &fields.month)
-		!= TCL_OK
-	    || FetchIntField(interp, dict, literals[LIT_DAYOFMONTH],
-		&fields.dayOfMonth) != TCL_OK
+    if (Tcl_DictObjGet(interp, dict, literals[LIT_ERA], &fieldPtr) != TCL_OK
+	    || Tcl_GetIndexFromObj(interp, fieldPtr, eras, "era", TCL_EXACT,
+		&era) != TCL_OK
+	    || Tcl_DictObjGet(interp, dict, literals[LIT_YEAR],
+		&fieldPtr) != TCL_OK
+	    || TclGetIntFromObj(interp, fieldPtr, &fields.year) != TCL_OK
+	    || Tcl_DictObjGet(interp, dict, literals[LIT_MONTH],
+		&fieldPtr) != TCL_OK
+	    || TclGetIntFromObj(interp, fieldPtr, &fields.month) != TCL_OK
+	    || Tcl_DictObjGet(interp, dict, literals[LIT_DAYOFMONTH],
+		&fieldPtr) != TCL_OK
+	    || TclGetIntFromObj(interp, fieldPtr, &fields.dayOfMonth)!=TCL_OK
 	    || TclGetIntFromObj(interp, objv[2], &changeover) != TCL_OK) {
 	return TCL_ERROR;
     }
@@ -656,6 +622,7 @@ ClockGetjuliandayfromerayearweekdayObjCmd(
     Tcl_Obj *dict;
     ClockClientData *data = clientData;
     Tcl_Obj *const *literals = data->literals;
+    Tcl_Obj *fieldPtr;
     int changeover;
     int copied = 0;
     int status;
@@ -670,13 +637,18 @@ ClockGetjuliandayfromerayearweekdayObjCmd(
 	return TCL_ERROR;
     }
     dict = objv[1];
-    if (FetchEraField(interp, dict, literals[LIT_ERA], &era) != TCL_OK
-	    || FetchIntField(interp, dict, literals[LIT_ISO8601YEAR],
-		&fields.iso8601Year) != TCL_OK
-	    || FetchIntField(interp, dict, literals[LIT_ISO8601WEEK],
-		&fields.iso8601Week) != TCL_OK
-	    || FetchIntField(interp, dict, literals[LIT_DAYOFWEEK],
-		&fields.dayOfWeek) != TCL_OK
+    if (Tcl_DictObjGet(interp, dict, literals[LIT_ERA], &fieldPtr) != TCL_OK
+	    || Tcl_GetIndexFromObj(interp, fieldPtr, eras, "era", TCL_EXACT,
+		&era) != TCL_OK
+	    || Tcl_DictObjGet(interp, dict, literals[LIT_ISO8601YEAR],
+		&fieldPtr) != TCL_OK
+	    || TclGetIntFromObj(interp, fieldPtr, &fields.iso8601Year)!=TCL_OK
+	    || Tcl_DictObjGet(interp, dict, literals[LIT_ISO8601WEEK],
+		&fieldPtr) != TCL_OK
+	    || TclGetIntFromObj(interp, fieldPtr, &fields.iso8601Week)!=TCL_OK
+	    || Tcl_DictObjGet(interp, dict, literals[LIT_DAYOFWEEK],
+		&fieldPtr) != TCL_OK
+	    || TclGetIntFromObj(interp, fieldPtr, &fields.dayOfWeek) != TCL_OK
 	    || TclGetIntFromObj(interp, objv[2], &changeover) != TCL_OK) {
 	return TCL_ERROR;
     }
@@ -1725,7 +1697,7 @@ ClockClicksObjCmd(
     case 1:
 	break;
     case 2:
-	if (Tcl_GetIndexFromObj(interp, objv[1], clicksSwitches, "option", 0,
+	if (Tcl_GetIndexFromObj(interp, objv[1], clicksSwitches, "switch", 0,
 		&index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
@@ -1895,9 +1867,9 @@ ClockParseformatargsObjCmd(
     localeObj = litPtr[LIT_C];
     timezoneObj = litPtr[LIT__NIL];
     for (i = 2; i < objc; i+=2) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0,
+	if (Tcl_GetIndexFromObj(interp, objv[i], options, "switch", 0,
 		&optionIndex) != TCL_OK) {
-	    Tcl_SetErrorCode(interp, "CLOCK", "badOption",
+	    Tcl_SetErrorCode(interp, "CLOCK", "badSwitch",
 		    Tcl_GetString(objv[i]), NULL);
 	    return TCL_ERROR;
 	}

generic/tclCmdIL.c

@@ -29,7 +29,7 @@
 typedef struct SortElement {
     union {			/* The value that we sorting by. */
 	const char *strValuePtr;
-	Tcl_WideInt wideValue;
+	long intValue;
 	double doubleValue;
 	Tcl_Obj *objValuePtr;
     } collationKey;
@@ -1287,7 +1287,6 @@ TclInfoFrame(
 	"eval", "eval", "eval", "precompiled", "source", "proc"
     };
     Proc *procPtr = framePtr->framePtr ? framePtr->framePtr->procPtr : NULL;
-    int needsFree = -1;
 
     /*
      * Pull the information and construct the dictionary to return, as list.
@@ -1361,9 +1360,6 @@ TclInfoFrame(
 	}
 
 	ADD_PAIR("cmd", TclGetSourceFromFrame(fPtr, 0, NULL));
-	if (fPtr->cmdObj && framePtr->cmdObj == NULL) {
-	    needsFree = lc - 1;
-	}
 	TclStackFree(interp, fPtr);
 	break;
     }
@@ -1451,11 +1447,7 @@ TclInfoFrame(
 	}
     }
 
-    tmpObj = Tcl_NewListObj(lc, lv);
-    if (needsFree >= 0) {
-	Tcl_DecrRefCount(lv[needsFree]);
-    }
-    return tmpObj;
+    return Tcl_NewListObj(lc, lv);
 }
 
 /*
@@ -2663,7 +2655,7 @@ Tcl_LrepeatObjCmd(
      * number of times.
      */
 
-    CLANG_ASSERT(dataArray || totalElems == 0 );
+    CLANG_ASSERT(dataArray);
     if (objc == 1) {
 	register Tcl_Obj *tmpPtr = objv[0];
 
@@ -2901,8 +2893,7 @@ Tcl_LsearchObjCmd(
 {
     const char *bytes, *patternBytes;
     int i, match, index, result, listc, length, elemLen, bisect;
-    int dataType, isIncreasing, lower, upper, offset;
-    Tcl_WideInt patWide, objWide;
+    int dataType, isIncreasing, lower, upper, patInt, objInt, offset;
     int allMatches, inlineReturn, negatedMatch, returnSubindices, noCase;
     double patDouble, objDouble;
     SortInfo sortInfo;
@@ -3221,7 +3212,7 @@ Tcl_LsearchObjCmd(
 	    patternBytes = TclGetStringFromObj(patObj, &length);
 	    break;
 	case INTEGER:
-	    result = TclGetWideIntFromObj(interp, patObj, &patWide);
+	    result = TclGetIntFromObj(interp, patObj, &patInt);
 	    if (result != TCL_OK) {
 		goto done;
 	    }
@@ -3290,13 +3281,13 @@ Tcl_LsearchObjCmd(
 		match = DictionaryCompare(patternBytes, bytes);
 		break;
 	    case INTEGER:
-		result = TclGetWideIntFromObj(interp, itemPtr, &objWide);
+		result = TclGetIntFromObj(interp, itemPtr, &objInt);
 		if (result != TCL_OK) {
 		    goto done;
 		}
-		if (patWide == objWide) {
+		if (patInt == objInt) {
 		    match = 0;
-		} else if (patWide < objWide) {
+		} else if (patInt < objInt) {
 		    match = -1;
 		} else {
 		    match = 1;
@@ -3409,14 +3400,14 @@ Tcl_LsearchObjCmd(
 		    break;
 
 		case INTEGER:
-		    result = TclGetWideIntFromObj(interp, itemPtr, &objWide);
+		    result = TclGetIntFromObj(interp, itemPtr, &objInt);
 		    if (result != TCL_OK) {
 			if (listPtr != NULL) {
 			    Tcl_DecrRefCount(listPtr);
 			}
 			goto done;
 		    }
-		    match = (objWide == patWide);
+		    match = (objInt == patInt);
 		    break;
 
 		case REAL:
@@ -3980,13 +3971,13 @@ Tcl_LsortObjCmd(
 	if (sortMode == SORTMODE_ASCII) {
 	    elementArray[i].collationKey.strValuePtr = TclGetString(indexPtr);
 	} else if (sortMode == SORTMODE_INTEGER) {
-	    Tcl_WideInt a;
+	    long a;
 
-	    if (TclGetWideIntFromObj(sortInfo.interp, indexPtr, &a) != TCL_OK) {
+	    if (TclGetLongFromObj(sortInfo.interp, indexPtr, &a) != TCL_OK) {
 		sortInfo.resultCode = TCL_ERROR;
 		goto done1;
 	    }
-	    elementArray[i].collationKey.wideValue = a;
+	    elementArray[i].collationKey.intValue = a;
 	} else if (sortMode == SORTMODE_REAL) {
 	    double a;
 
@@ -4235,10 +4226,10 @@ SortCompare(
 	order = DictionaryCompare(elemPtr1->collationKey.strValuePtr,
 		elemPtr2->collationKey.strValuePtr);
     } else if (infoPtr->sortMode == SORTMODE_INTEGER) {
-	Tcl_WideInt a, b;
+	long a, b;
 
-	a = elemPtr1->collationKey.wideValue;
-	b = elemPtr2->collationKey.wideValue;
+	a = elemPtr1->collationKey.intValue;
+	b = elemPtr2->collationKey.intValue;
 	order = ((a >= b) - (a <= b));
     } else if (infoPtr->sortMode == SORTMODE_REAL) {
 	double a, b;

generic/tclCmdMZ.c

@@ -161,7 +161,7 @@ Tcl_RegexpObjCmd(
 	if (name[0] != '-') {
 	    break;
 	}
-	if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", TCL_EXACT,
+	if (Tcl_GetIndexFromObj(interp, objv[i], options, "switch", TCL_EXACT,
 		&index) != TCL_OK) {
 	    goto optionError;
 	}
@@ -217,7 +217,7 @@ Tcl_RegexpObjCmd(
   endOfForLoop:
     if ((objc - i) < (2 - about)) {
 	Tcl_WrongNumArgs(interp, 1, objv,
-		"?-option ...? exp string ?matchVar? ?subMatchVar ...?");
+	    "?-switch ...? exp string ?matchVar? ?subMatchVar ...?");
 	goto optionError;
     }
     objc -= i;
@@ -231,8 +231,6 @@ Tcl_RegexpObjCmd(
     if (doinline && ((objc - 2) != 0)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"regexp match variables not allowed when using -inline", -1));
-	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "REGEXP",
-		"MIX_VAR_INLINE", NULL);
 	goto optionError;
     }
 
@@ -521,7 +519,7 @@ Tcl_RegsubObjCmd(
 	if (name[0] != '-') {
 	    break;
 	}
-	if (Tcl_GetIndexFromObj(interp, objv[idx], options, "option",
+	if (Tcl_GetIndexFromObj(interp, objv[idx], options, "switch",
 		TCL_EXACT, &index) != TCL_OK) {
 	    goto optionError;
 	}
@@ -568,7 +566,7 @@ Tcl_RegsubObjCmd(
   endOfForLoop:
     if (objc-idx < 3 || objc-idx > 4) {
 	Tcl_WrongNumArgs(interp, 1, objv,
-		"?-option ...? exp string subSpec ?varName?");
+		"?-switch ...? exp string subSpec ?varName?");
     optionError:
 	if (startIndex) {
 	    Tcl_DecrRefCount(startIndex);
@@ -2835,59 +2833,6 @@ StringCmpCmd(
     return TCL_OK;
 }
 
-/*
- *----------------------------------------------------------------------
- *
- * StringCatCmd --
- *
- *	This procedure is invoked to process the "string cat" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-StringCatCmd(
-    ClientData dummy,		/* Not used. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
-{
-    int i;
-    Tcl_Obj *objResultPtr;
-
-    if (objc < 2) {
-	/*
-	 * If there are no args, the result is an empty object.
-	 * Just leave the preset empty interp result.
-	 */
-	return TCL_OK;
-    }
-    if (objc == 2) {
-	/*
-	 * Other trivial case, single arg, just return it.
-	 */
-	Tcl_SetObjResult(interp, objv[1]);
-	return TCL_OK;
-    }
-    objResultPtr = objv[1];
-    if (Tcl_IsShared(objResultPtr)) {
-	objResultPtr = Tcl_DuplicateObj(objResultPtr);
-    }
-    for(i = 2;i < objc;i++) {
-	Tcl_AppendObjToObj(objResultPtr, objv[i]);
-    }
-    Tcl_SetObjResult(interp, objResultPtr);
-    
-    return TCL_OK;
-}
-
 /*
  *----------------------------------------------------------------------
  *
@@ -3383,7 +3328,6 @@ TclInitStringCmd(
 {
     static const EnsembleImplMap stringImplMap[] = {
 	{"bytelength",	StringBytesCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 0},
-	{"cat",		StringCatCmd,	TclCompileStringCatCmd, NULL, NULL, 0},
 	{"compare",	StringCmpCmd,	TclCompileStringCmpCmd, NULL, NULL, 0},
 	{"equal",	StringEqualCmd,	TclCompileStringEqualCmd, NULL, NULL, 0},
 	{"first",	StringFirstCmd,	TclCompileStringFirstCmd, NULL, NULL, 0},
@@ -3447,7 +3391,7 @@ TclSubstOptions(
     for (i = 0; i < numOpts; i++) {
 	int optionIndex;
 
-	if (Tcl_GetIndexFromObj(interp, opts[i], substOptions, "option", 0,
+	if (Tcl_GetIndexFromObj(interp, opts[i], substOptions, "switch", 0,
 		&optionIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
@@ -3647,7 +3591,7 @@ TclNRSwitchObjCmd(
   finishedOptions:
     if (objc - i < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv,
-		"?-option ...? string ?pattern body ...? ?default body?");
+		"?-switch ...? string ?pattern body ...? ?default body?");
 	return TCL_ERROR;
     }
     if (indexVarObj != NULL && mode != OPT_REGEXP) {
@@ -3694,7 +3638,7 @@ TclNRSwitchObjCmd(
 
 	if (objc < 1) {
 	    Tcl_WrongNumArgs(interp, 1, savedObjv,
-		    "?-option ...? string {?pattern body ...? ?default body?}");
+		    "?-switch ...? string {?pattern body ...? ?default body?}");
 	    return TCL_ERROR;
 	}
 	objv = listv;

generic/tclCompCmdsGR.c

@@ -868,16 +868,28 @@ TclCompileLappendCmd(
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
     Tcl_Token *varTokenPtr, *valueTokenPtr;
-    int isScalar, localIndex, numWords, i;
+    int isScalar, localIndex, numWords, i, fwd, offsetFwd;
     DefineLineInformation;	/* TIP #280 */
 
+    /*
+     * If we're not in a procedure, don't compile.
+     */
+
+    if (envPtr->procPtr == NULL) {
+	return TCL_ERROR;
+    }
+
     /* TODO: Consider support for compiling expanded args. */
     numWords = parsePtr->numWords;
     if (numWords == 1) {
 	return TCL_ERROR;
     }
+    if (numWords != 3) {
+	/*
+	 * LAPPEND instructions currently only handle one value, but we can
+	 * handle some multi-value cases by stringing them together.
+	 */
 
-    if (numWords != 3 || envPtr->procPtr == NULL) {
 	goto lappendMultiple;
     }
 
@@ -931,28 +943,42 @@ TclCompileLappendCmd(
     return TCL_OK;
 
   lappendMultiple:
+    /*
+     * Can only handle the case where we are appending to a local scalar when
+     * there are multiple values to append.  Fortunately, this is common.
+     */
+
+    if (envPtr->procPtr == NULL) {
+	return TCL_ERROR;
+    }
     varTokenPtr = TokenAfter(parsePtr->tokenPtr);
-    PushVarNameWord(interp, varTokenPtr, envPtr, 0,
+    PushVarNameWord(interp, varTokenPtr, envPtr, TCL_NO_ELEMENT,
 	    &localIndex, &isScalar, 1);
+    if (!isScalar || localIndex < 0) {
+	return TCL_ERROR;
+    }
+
+    /*
+     * Definitely appending to a local scalar; generate the words and append
+     * them.
+     */
+
     valueTokenPtr = TokenAfter(varTokenPtr);
     for (i = 2 ; i < numWords ; i++) {
 	CompileWord(envPtr, valueTokenPtr, interp, i);
 	valueTokenPtr = TokenAfter(valueTokenPtr);
     }
-    TclEmitInstInt4(	    INST_LIST, numWords-2,		envPtr);
-    if (isScalar) {
-	if (localIndex < 0) {
-	    TclEmitOpcode(  INST_LAPPEND_LIST_STK,		envPtr);
-	} else {
-	    TclEmitInstInt4(INST_LAPPEND_LIST, localIndex,	envPtr);
-	}
-    } else {
-	if (localIndex < 0) {
-	    TclEmitOpcode(  INST_LAPPEND_LIST_ARRAY_STK,	envPtr);
-	} else {
-	    TclEmitInstInt4(INST_LAPPEND_LIST_ARRAY, localIndex,envPtr);
-	}
-    }
+    TclEmitInstInt4(	  INST_LIST, numWords-2,		envPtr);
+    TclEmitInstInt4(	  INST_EXIST_SCALAR, localIndex,	envPtr);
+    offsetFwd = CurrentOffset(envPtr);
+    TclEmitInstInt1(	  INST_JUMP_FALSE1, 0,			envPtr);
+    Emit14Inst(		  INST_LOAD_SCALAR, localIndex,		envPtr);
+    TclEmitInstInt4(	  INST_REVERSE, 2,			envPtr);
+    TclEmitOpcode(	  INST_LIST_CONCAT,			envPtr);
+    fwd = CurrentOffset(envPtr) - offsetFwd;
+    TclStoreInt1AtPtr(fwd, envPtr->codeStart+offsetFwd+1);
+    Emit14Inst(		  INST_STORE_SCALAR, localIndex,	envPtr);
+
     return TCL_OK;
 }
 

generic/tclCompCmdsSZ.c

@@ -268,78 +268,6 @@ TclCompileSetCmd(
  *----------------------------------------------------------------------
  */
 
-int
-TclCompileStringCatCmd(
-    Tcl_Interp *interp,		/* Used for error reporting. */
-    Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
-				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
-				 * compiled. */
-    CompileEnv *envPtr)		/* Holds resulting instructions. */
-{
-    int i, numWords = parsePtr->numWords, numArgs;
-    Tcl_Token *wordTokenPtr;
-    Tcl_Obj *obj, *folded;
-    DefineLineInformation;	/* TIP #280 */
-
-    /* Trivial case, no arg */
-
-    if (numWords<2) {
-	PushStringLiteral(envPtr, "");
-	return TCL_OK;
-    }
-	
-    /* General case: issue CONCAT1's (by chunks of 254 if needed), folding
-       contiguous constants along the way */
-
-    numArgs = 0;
-    folded = NULL;
-    wordTokenPtr = TokenAfter(parsePtr->tokenPtr);
-    for (i = 1; i < numWords; i++) {
-	obj = Tcl_NewObj();
-	if (TclWordKnownAtCompileTime(wordTokenPtr, obj)) {
-	    if (folded) {
-		Tcl_AppendObjToObj(folded, obj);
-		Tcl_DecrRefCount(obj);
-	    } else {
-		folded = obj;
-	    }
-	} else {
-	    Tcl_DecrRefCount(obj);
-	    if (folded) {
-		int len;
-		const char *bytes = Tcl_GetStringFromObj(folded, &len);
-		
-		PushLiteral(envPtr, bytes, len);
-		Tcl_DecrRefCount(folded);
-		folded = NULL;
-		numArgs ++;
-	    }
-	    CompileWord(envPtr, wordTokenPtr, interp, i);
-	    numArgs ++;
-	    if (numArgs >= 254) { /* 254 to take care of the possible +1 of "folded" above */
-		TclEmitInstInt1(INST_STR_CONCAT1, 254, envPtr);
-		numArgs -= 253;	/* concat pushes 1 obj, the result */
-	    }
-	}
-	wordTokenPtr = TokenAfter(wordTokenPtr);
-    }
-    if (folded) {
-	int len;
-	const char *bytes = Tcl_GetStringFromObj(folded, &len);
-	
-	PushLiteral(envPtr, bytes, len);
-	Tcl_DecrRefCount(folded);
-	folded = NULL;
-	numArgs ++;
-    }
-    if (numArgs > 1) {
-	TclEmitInstInt1(INST_STR_CONCAT1, numArgs, envPtr);
-    }
-
-    return TCL_OK;
-}
-
 int
 TclCompileStringCmpCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */

generic/tclCompile.c

@@ -650,19 +650,6 @@ InstructionDesc const tclInstructionTable[] = {
 	 * satisfy the class check (standard definition of "all").
 	 * Stack:  ... stringValue => ... boolean */
 
-    {"lappendList",	 5,	0,	1,	{OPERAND_LVT4}},
-	/* Lappend list to scalar variable at op4 in frame.
-	 * Stack:  ... list => ... listVarContents */
-    {"lappendListArray", 5,	-1,	1,	{OPERAND_LVT4}},
-	/* Lappend list to array element; array at op4.
-	 * Stack:  ... elem list => ... listVarContents */
-    {"lappendListArrayStk", 1,	-2,	0,	{OPERAND_NONE}},
-	/* Lappend list to array element.
-	 * Stack:  ... arrayName elem list => ... listVarContents */
-    {"lappendListStk",	 1,	-1,	0,	{OPERAND_NONE}},
-	/* Lappend list to general variable.
-	 * Stack:  ... varName list => ... listVarContents */
-
     {NULL, 0, 0, 0, {OPERAND_NONE}}
 };
 

generic/tclCompile.h

@@ -799,13 +799,8 @@ typedef struct ByteCode {
 #define INST_TRY_CVT_TO_BOOLEAN		183
 #define INST_STR_CLASS			184
 
-#define INST_LAPPEND_LIST		185
-#define INST_LAPPEND_LIST_ARRAY		186
-#define INST_LAPPEND_LIST_ARRAY_STK	187
-#define INST_LAPPEND_LIST_STK		188
-
 /* The last opcode */
-#define LAST_INST_OPCODE		188
+#define LAST_INST_OPCODE		184
 
 /*
  * Table describing the Tcl bytecode instructions: their name (for displaying

generic/tclDecls.h

@@ -1815,8 +1815,6 @@ EXTERN int		Tcl_FSUnloadFile(Tcl_Interp *interp,
 EXTERN void		Tcl_ZlibStreamSetCompressionDictionary(
 				Tcl_ZlibStream zhandle,
 				Tcl_Obj *compressionDictionaryObj);
-/* 631 */
-EXTERN int		Tcl_Zvfs_Boot(Tcl_Interp *interp);
 
 typedef struct {
     const struct TclPlatStubs *tclPlatStubs;
@@ -2483,7 +2481,6 @@ typedef struct TclStubs {
     void * (*tcl_FindSymbol) (Tcl_Interp *interp, Tcl_LoadHandle handle, const char *symbol); /* 628 */
     int (*tcl_FSUnloadFile) (Tcl_Interp *interp, Tcl_LoadHandle handlePtr); /* 629 */
     void (*tcl_ZlibStreamSetCompressionDictionary) (Tcl_ZlibStream zhandle, Tcl_Obj *compressionDictionaryObj); /* 630 */
-    int (*tcl_Zvfs_Boot) (Tcl_Interp *interp); /* 631 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -3776,8 +3773,6 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_FSUnloadFile) /* 629 */
 #define Tcl_ZlibStreamSetCompressionDictionary \
 	(tclStubsPtr->tcl_ZlibStreamSetCompressionDictionary) /* 630 */
-#define Tcl_Zvfs_Boot \
-	(tclStubsPtr->tcl_Zvfs_Boot) /* 631 */
 
 #endif /* defined(USE_TCL_STUBS) */
 

generic/tclDictObj.c

@@ -154,13 +154,6 @@ typedef struct Dict {
 				 * dictionaries. */
 } Dict;
 
-/*
- * Accessor macro for converting between a Tcl_Obj* and a Dict. Note that this
- * must be assignable as well as readable.
- */
-
-#define DICT(dictObj)   (*((Dict **)&(dictObj)->internalRep.twoPtrValue.ptr1))
-
 /*
  * The structure below defines the dictionary object type by means of
  * functions that can be invoked by generic object code.
@@ -319,7 +312,6 @@ DeleteChainEntry(
 	return 0;
     } else {
 	Tcl_Obj *valuePtr = Tcl_GetHashValue(&cPtr->entry);
-
 	TclDecrRefCount(valuePtr);
     }
 
@@ -369,7 +361,7 @@ DupDictInternalRep(
     Tcl_Obj *srcPtr,
     Tcl_Obj *copyPtr)
 {
-    Dict *oldDict = DICT(srcPtr);
+    Dict *oldDict = srcPtr->internalRep.twoPtrValue.ptr1;
     Dict *newDict = ckalloc(sizeof(Dict));
     ChainEntry *cPtr;
 
@@ -404,8 +396,7 @@ DupDictInternalRep(
      * Store in the object.
      */
 
-    DICT(copyPtr) = newDict;
-    copyPtr->internalRep.twoPtrValue.ptr2 = NULL;
+    copyPtr->internalRep.twoPtrValue.ptr1 = newDict;
     copyPtr->typePtr = &tclDictType;
 }
 
@@ -431,7 +422,7 @@ static void
 FreeDictInternalRep(
     Tcl_Obj *dictPtr)
 {
-    Dict *dict = DICT(dictPtr);
+    Dict *dict = dictPtr->internalRep.twoPtrValue.ptr1;
 
     dict->refcount--;
     if (dict->refcount <= 0) {
@@ -496,7 +487,7 @@ UpdateStringOfDict(
 {
 #define LOCAL_SIZE 20
     int localFlags[LOCAL_SIZE], *flagPtr = NULL;
-    Dict *dict = DICT(dictPtr);
+    Dict *dict = dictPtr->internalRep.twoPtrValue.ptr1;
     ChainEntry *cPtr;
     Tcl_Obj *keyPtr, *valuePtr;
     int i, length, bytesNeeded = 0;
@@ -609,7 +600,7 @@ SetDictFromAny(
     Tcl_Obj *objPtr)
 {
     Tcl_HashEntry *hPtr;
-    int isNew;
+    int isNew, result;
     Dict *dict = ckalloc(sizeof(Dict));
 
     InitChainTable(dict);
@@ -660,9 +651,10 @@ SetDictFromAny(
 	    const char *elemStart;
 	    int elemSize, literal;
 
-	    if (TclFindDictElement(interp, nextElem, (limit - nextElem),
-		    &elemStart, &nextElem, &elemSize, &literal) != TCL_OK) {
-		goto errorInFindDictElement;
+	    result = TclFindElement(interp, nextElem, (limit - nextElem),
+		    &elemStart, &nextElem, &elemSize, &literal);
+	    if (result != TCL_OK) {
+		goto errorExit;
 	    }
 	    if (elemStart == limit) {
 		break;
@@ -681,10 +673,11 @@ SetDictFromAny(
 			keyPtr->bytes);
 	    }
 
-	    if (TclFindDictElement(interp, nextElem, (limit - nextElem),
-		    &elemStart, &nextElem, &elemSize, &literal) != TCL_OK) {
+	    result = TclFindElement(interp, nextElem, (limit - nextElem),
+		    &elemStart, &nextElem, &elemSize, &literal);
+	    if (result != TCL_OK) {
 		TclDecrRefCount(keyPtr);
-		goto errorInFindDictElement;
+		goto errorExit;
 	    }
 
 	    if (literal) {
@@ -720,8 +713,7 @@ SetDictFromAny(
     dict->epoch = 0;
     dict->chain = NULL;
     dict->refcount = 1;
-    DICT(objPtr) = dict;
-    objPtr->internalRep.twoPtrValue.ptr2 = NULL;
+    objPtr->internalRep.twoPtrValue.ptr1 = dict;
     objPtr->typePtr = &tclDictType;
     return TCL_OK;
 
@@ -731,10 +723,15 @@ SetDictFromAny(
 		"missing value to go with key", -1));
 	Tcl_SetErrorCode(interp, "TCL", "VALUE", "DICTIONARY", NULL);
     }
-  errorInFindDictElement:
+    result = TCL_ERROR;
+
+  errorExit:
+    if (interp != NULL) {
+	Tcl_SetErrorCode(interp, "TCL", "VALUE", "DICTIONARY", NULL);
+    }
     DeleteChainTable(dict);
     ckfree(dict);
-    return TCL_ERROR;
+    return result;
 }
 
 /*
@@ -780,11 +777,12 @@ TclTraceDictPath(
     Dict *dict, *newDict;
     int i;
 
-    if (dictPtr->typePtr != &tclDictType
-	    && SetDictFromAny(interp, dictPtr) != TCL_OK) {
-	return NULL;
+    if (dictPtr->typePtr != &tclDictType) {
+	if (SetDictFromAny(interp, dictPtr) != TCL_OK) {
+	    return NULL;
+	}
     }
-    dict = DICT(dictPtr);
+    dict = dictPtr->internalRep.twoPtrValue.ptr1;
     if (flags & DICT_PATH_UPDATE) {
 	dict->chain = NULL;
     }
@@ -820,13 +818,14 @@ TclTraceDictPath(
 	    Tcl_SetHashValue(hPtr, tmpObj);
 	} else {
 	    tmpObj = Tcl_GetHashValue(hPtr);
-	    if (tmpObj->typePtr != &tclDictType
-		    && SetDictFromAny(interp, tmpObj) != TCL_OK) {
-		return NULL;
+	    if (tmpObj->typePtr != &tclDictType) {
+		if (SetDictFromAny(interp, tmpObj) != TCL_OK) {
+		    return NULL;
+		}
 	    }
 	}
 
-	newDict = DICT(tmpObj);
+	newDict = tmpObj->internalRep.twoPtrValue.ptr1;
 	if (flags & DICT_PATH_UPDATE) {
 	    if (Tcl_IsShared(tmpObj)) {
 		TclDecrRefCount(tmpObj);
@@ -834,7 +833,7 @@ TclTraceDictPath(
 		Tcl_IncrRefCount(tmpObj);
 		Tcl_SetHashValue(hPtr, tmpObj);
 		dict->epoch++;
-		newDict = DICT(tmpObj);
+		newDict = tmpObj->internalRep.twoPtrValue.ptr1;
 	    }
 
 	    newDict->chain = dictPtr;
@@ -869,7 +868,7 @@ static void
 InvalidateDictChain(
     Tcl_Obj *dictObj)
 {
-    Dict *dict = DICT(dictObj);
+    Dict *dict = dictObj->internalRep.twoPtrValue.ptr1;
 
     do {
 	TclInvalidateStringRep(dictObj);
@@ -879,7 +878,7 @@ InvalidateDictChain(
 	    break;
 	}
 	dict->chain = NULL;
-	dict = DICT(dictObj);
+	dict = dictObj->internalRep.twoPtrValue.ptr1;
     } while (dict != NULL);
 }
 
@@ -917,15 +916,18 @@ Tcl_DictObjPut(
 	Tcl_Panic("%s called with shared object", "Tcl_DictObjPut");
     }
 
-    if (dictPtr->typePtr != &tclDictType
-	    && SetDictFromAny(interp, dictPtr) != TCL_OK) {
-	return TCL_ERROR;
+    if (dictPtr->typePtr != &tclDictType) {
+	int result = SetDictFromAny(interp, dictPtr);
+
+	if (result != TCL_OK) {
+	    return result;
+	}
     }
 
     if (dictPtr->bytes != NULL) {
 	TclInvalidateStringRep(dictPtr);
     }
-    dict = DICT(dictPtr);
+    dict = dictPtr->internalRep.twoPtrValue.ptr1;
     hPtr = CreateChainEntry(dict, keyPtr, &isNew);
     Tcl_IncrRefCount(valuePtr);
     if (!isNew) {
@@ -968,13 +970,15 @@ Tcl_DictObjGet(
     Dict *dict;
     Tcl_HashEntry *hPtr;
 
-    if (dictPtr->typePtr != &tclDictType
-	    && SetDictFromAny(interp, dictPtr) != TCL_OK) {
-	*valuePtrPtr = NULL;
-	return TCL_ERROR;
+    if (dictPtr->typePtr != &tclDictType) {
+	int result = SetDictFromAny(interp, dictPtr);
+	if (result != TCL_OK) {
+	    *valuePtrPtr = NULL;
+	    return result;
+	}
     }
 
-    dict = DICT(dictPtr);
+    dict = dictPtr->internalRep.twoPtrValue.ptr1;
     hPtr = Tcl_FindHashEntry(&dict->table, keyPtr);
     if (hPtr == NULL) {
 	*valuePtrPtr = NULL;
@@ -1015,16 +1019,18 @@ Tcl_DictObjRemove(
 	Tcl_Panic("%s called with shared object", "Tcl_DictObjRemove");
     }
 
-    if (dictPtr->typePtr != &tclDictType
-	    && SetDictFromAny(interp, dictPtr) != TCL_OK) {
-	return TCL_ERROR;
+    if (dictPtr->typePtr != &tclDictType) {
+	int result = SetDictFromAny(interp, dictPtr);
+	if (result != TCL_OK) {
+	    return result;
+	}
     }
 
-    dict = DICT(dictPtr);
+    if (dictPtr->bytes != NULL) {
+	TclInvalidateStringRep(dictPtr);
+    }
+    dict = dictPtr->internalRep.twoPtrValue.ptr1;
     if (DeleteChainEntry(dict, keyPtr)) {
-	if (dictPtr->bytes != NULL) {
-	    TclInvalidateStringRep(dictPtr);
-	}
 	dict->epoch++;
     }
     return TCL_OK;
@@ -1056,12 +1062,14 @@ Tcl_DictObjSize(
 {
     Dict *dict;
 
-    if (dictPtr->typePtr != &tclDictType
-	    && SetDictFromAny(interp, dictPtr) != TCL_OK) {
-	return TCL_ERROR;
+    if (dictPtr->typePtr != &tclDictType) {
+	int result = SetDictFromAny(interp, dictPtr);
+	if (result != TCL_OK) {
+	    return result;
+	}
     }
 
-    dict = DICT(dictPtr);
+    dict = dictPtr->internalRep.twoPtrValue.ptr1;
     *sizePtr = dict->table.numEntries;
     return TCL_OK;
 }
@@ -1108,12 +1116,15 @@ Tcl_DictObjFirst(
     Dict *dict;
     ChainEntry *cPtr;
 
-    if (dictPtr->typePtr != &tclDictType
-	    && SetDictFromAny(interp, dictPtr) != TCL_OK) {
-	return TCL_ERROR;
+    if (dictPtr->typePtr != &tclDictType) {
+	int result = SetDictFromAny(interp, dictPtr);
+
+	if (result != TCL_OK) {
+	    return result;
+	}
     }
 
-    dict = DICT(dictPtr);
+    dict = dictPtr->internalRep.twoPtrValue.ptr1;
     cPtr = dict->entryChainHead;
     if (cPtr == NULL) {
 	searchPtr->epoch = -1;
@@ -1288,12 +1299,11 @@ Tcl_DictObjPutKeyList(
 	return TCL_ERROR;
     }
 
-    dict = DICT(dictPtr);
+    dict = dictPtr->internalRep.twoPtrValue.ptr1;
     hPtr = CreateChainEntry(dict, keyv[keyc-1], &isNew);
     Tcl_IncrRefCount(valuePtr);
     if (!isNew) {
 	Tcl_Obj *oldValuePtr = Tcl_GetHashValue(hPtr);
-
 	TclDecrRefCount(oldValuePtr);
     }
     Tcl_SetHashValue(hPtr, valuePtr);
@@ -1345,7 +1355,7 @@ Tcl_DictObjRemoveKeyList(
 	return TCL_ERROR;
     }
 
-    dict = DICT(dictPtr);
+    dict = dictPtr->internalRep.twoPtrValue.ptr1;
     DeleteChainEntry(dict, keyv[keyc-1]);
     InvalidateDictChain(dictPtr);
     return TCL_OK;
@@ -1391,8 +1401,7 @@ Tcl_NewDictObj(void)
     dict->epoch = 0;
     dict->chain = NULL;
     dict->refcount = 1;
-    DICT(dictPtr) = dict;
-    dictPtr->internalRep.twoPtrValue.ptr2 = NULL;
+    dictPtr->internalRep.twoPtrValue.ptr1 = dict;
     dictPtr->typePtr = &tclDictType;
     return dictPtr;
 #endif
@@ -1441,8 +1450,7 @@ Tcl_DbNewDictObj(
     dict->epoch = 0;
     dict->chain = NULL;
     dict->refcount = 1;
-    DICT(dictPtr) = dict;
-    dictPtr->internalRep.twoPtrValue.ptr2 = NULL;
+    dictPtr->internalRep.twoPtrValue.ptr1 = dict;
     dictPtr->typePtr = &tclDictType;
     return dictPtr;
 #else /* !TCL_MEM_DEBUG */
@@ -1496,7 +1504,7 @@ DictCreateCmd(
 	/*
 	 * The next command is assumed to never fail...
 	 */
-	Tcl_DictObjPut(NULL, dictObj, objv[i], objv[i+1]);
+	Tcl_DictObjPut(interp, dictObj, objv[i], objv[i+1]);
     }
     Tcl_SetObjResult(interp, dictObj);
     return TCL_OK;
@@ -1621,7 +1629,8 @@ DictReplaceCmd(
     Tcl_Obj *const *objv)
 {
     Tcl_Obj *dictPtr;
-    int i;
+    int i, result;
+    int allocatedDict = 0;
 
     if ((objc < 2) || (objc & 1)) {
 	Tcl_WrongNumArgs(interp, 1, objv, "dictionary ?key value ...?");
@@ -1629,18 +1638,18 @@ DictReplaceCmd(
     }
 
     dictPtr = objv[1];
-    if (dictPtr->typePtr != &tclDictType
-	    && SetDictFromAny(interp, dictPtr) != TCL_OK) {
-	return TCL_ERROR;
-    }
     if (Tcl_IsShared(dictPtr)) {
 	dictPtr = Tcl_DuplicateObj(dictPtr);
-    }
-    if (dictPtr->bytes != NULL) {
-	TclInvalidateStringRep(dictPtr);
+	allocatedDict = 1;
     }
     for (i=2 ; i<objc ; i+=2) {
-	Tcl_DictObjPut(NULL, dictPtr, objv[i], objv[i+1]);
+	result = Tcl_DictObjPut(interp, dictPtr, objv[i], objv[i+1]);
+	if (result != TCL_OK) {
+	    if (allocatedDict) {
+		TclDecrRefCount(dictPtr);
+	    }
+	    return TCL_ERROR;
+	}
     }
     Tcl_SetObjResult(interp, dictPtr);
     return TCL_OK;
@@ -1672,7 +1681,8 @@ DictRemoveCmd(
     Tcl_Obj *const *objv)
 {
     Tcl_Obj *dictPtr;
-    int i;
+    int i, result;
+    int allocatedDict = 0;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "dictionary ?key ...?");
@@ -1680,18 +1690,18 @@ DictRemoveCmd(
     }
 
     dictPtr = objv[1];
-    if (dictPtr->typePtr != &tclDictType
-	    && SetDictFromAny(interp, dictPtr) != TCL_OK) {
-	return TCL_ERROR;
-    }
     if (Tcl_IsShared(dictPtr)) {
 	dictPtr = Tcl_DuplicateObj(dictPtr);
-    }
-    if (dictPtr->bytes != NULL) {
-	TclInvalidateStringRep(dictPtr);
+	allocatedDict = 1;
     }
     for (i=2 ; i<objc ; i++) {
-	Tcl_DictObjRemove(NULL, dictPtr, objv[i]);
+	result = Tcl_DictObjRemove(interp, dictPtr, objv[i]);
+	if (result != TCL_OK) {
+	    if (allocatedDict) {
+		TclDecrRefCount(dictPtr);
+	    }
+	    return TCL_ERROR;
+	}
     }
     Tcl_SetObjResult(interp, dictPtr);
     return TCL_OK;
@@ -1740,9 +1750,10 @@ DictMergeCmd(
      */
 
     targetObj = objv[1];
-    if (targetObj->typePtr != &tclDictType
-	    && SetDictFromAny(interp, targetObj) != TCL_OK) {
-	return TCL_ERROR;
+    if (targetObj->typePtr != &tclDictType) {
+	if (SetDictFromAny(interp, targetObj) != TCL_OK) {
+	    return TCL_ERROR;
+	}
     }
 
     if (objc == 2) {
@@ -1824,9 +1835,12 @@ DictKeysCmd(
      * need. [Bug 1705778, leak K04]
      */
 
-    if (objv[1]->typePtr != &tclDictType
-	    && SetDictFromAny(interp, objv[1]) != TCL_OK) {
-	return TCL_ERROR;
+    if (objv[1]->typePtr != &tclDictType) {
+	int result = SetDictFromAny(interp, objv[1]);
+
+	if (result != TCL_OK) {
+	    return result;
+	}
     }
 
     if (objc == 3) {
@@ -2042,11 +2056,13 @@ DictInfoCmd(
     }
 
     dictPtr = objv[1];
-    if (dictPtr->typePtr != &tclDictType
-	    && SetDictFromAny(interp, dictPtr) != TCL_OK) {
-	return TCL_ERROR;
+    if (dictPtr->typePtr != &tclDictType) {
+	int result = SetDictFromAny(interp, dictPtr);
+	if (result != TCL_OK) {
+	    return result;
+	}
     }
-    dict = DICT(dictPtr);
+    dict = dictPtr->internalRep.twoPtrValue.ptr1;
 
     statsStr = Tcl_HashStats(&dict->table);
     Tcl_SetObjResult(interp, Tcl_NewStringObj(statsStr, -1));
@@ -2083,7 +2099,7 @@ DictIncrCmd(
     Tcl_Obj *dictPtr, *valuePtr = NULL;
 
     if (objc < 3 || objc > 4) {
-	Tcl_WrongNumArgs(interp, 1, objv, "dictVarName key ?increment?");
+	Tcl_WrongNumArgs(interp, 1, objv, "varName key ?increment?");
 	return TCL_ERROR;
     }
 
@@ -2136,10 +2152,10 @@ DictIncrCmd(
 		 */
 
 		mp_clear(&increment);
-		Tcl_DictObjPut(NULL, dictPtr, objv[2], objv[3]);
+		Tcl_DictObjPut(interp, dictPtr, objv[2], objv[3]);
 	    }
 	} else {
-	    Tcl_DictObjPut(NULL, dictPtr, objv[2], Tcl_NewIntObj(1));
+	    Tcl_DictObjPut(interp, dictPtr, objv[2], Tcl_NewIntObj(1));
 	}
     } else {
 	/*
@@ -2148,7 +2164,7 @@ DictIncrCmd(
 
 	if (Tcl_IsShared(valuePtr)) {
 	    valuePtr = Tcl_DuplicateObj(valuePtr);
-	    Tcl_DictObjPut(NULL, dictPtr, objv[2], valuePtr);
+	    Tcl_DictObjPut(interp, dictPtr, objv[2], valuePtr);
 	}
 	if (objc == 4) {
 	    code = TclIncrObj(interp, valuePtr, objv[3]);
@@ -2157,7 +2173,7 @@ DictIncrCmd(
 
 	    Tcl_IncrRefCount(incrPtr);
 	    code = TclIncrObj(interp, valuePtr, incrPtr);
-	    TclDecrRefCount(incrPtr);
+	    Tcl_DecrRefCount(incrPtr);
 	}
     }
     if (code == TCL_OK) {
@@ -2170,7 +2186,7 @@ DictIncrCmd(
 	    Tcl_SetObjResult(interp, valuePtr);
 	}
     } else if (dictPtr->refCount == 0) {
-	TclDecrRefCount(dictPtr);
+	Tcl_DecrRefCount(dictPtr);
     }
     return code;
 }
@@ -2204,7 +2220,7 @@ DictLappendCmd(
     int i, allocatedDict = 0, allocatedValue = 0;
 
     if (objc < 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "dictVarName key ?value ...?");
+	Tcl_WrongNumArgs(interp, 1, objv, "varName key ?value ...?");
 	return TCL_ERROR;
     }
 
@@ -2248,7 +2264,7 @@ DictLappendCmd(
     }
 
     if (allocatedValue) {
-	Tcl_DictObjPut(NULL, dictPtr, objv[2], valuePtr);
+	Tcl_DictObjPut(interp, dictPtr, objv[2], valuePtr);
     } else if (dictPtr->bytes != NULL) {
 	TclInvalidateStringRep(dictPtr);
     }
@@ -2291,7 +2307,7 @@ DictAppendCmd(
     int i, allocatedDict = 0;
 
     if (objc < 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "dictVarName key ?value ...?");
+	Tcl_WrongNumArgs(interp, 1, objv, "varName key ?value ...?");
 	return TCL_ERROR;
     }
 
@@ -2313,15 +2329,17 @@ DictAppendCmd(
 
     if (valuePtr == NULL) {
 	TclNewObj(valuePtr);
-    } else if (Tcl_IsShared(valuePtr)) {
-	valuePtr = Tcl_DuplicateObj(valuePtr);
+    } else {
+	if (Tcl_IsShared(valuePtr)) {
+	    valuePtr = Tcl_DuplicateObj(valuePtr);
+	}
     }
 
     for (i=3 ; i<objc ; i++) {
 	Tcl_AppendObjToObj(valuePtr, objv[i]);
     }
 
-    Tcl_DictObjPut(NULL, dictPtr, objv[2], valuePtr);
+    Tcl_DictObjPut(interp, dictPtr, objv[2], valuePtr);
 
     resultPtr = Tcl_ObjSetVar2(interp, objv[1], NULL, dictPtr,
 	    TCL_LEAVE_ERR_MSG);
@@ -2365,7 +2383,7 @@ DictForNRCmd(
 
     if (objc != 4) {
 	Tcl_WrongNumArgs(interp, 1, objv,
-		"{keyVarName valueVarName} dictionary script");
+		"{keyVar valueVar} dictionary script");
 	return TCL_ERROR;
     }
 
@@ -2379,7 +2397,6 @@ DictForNRCmd(
     if (varc != 2) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"must have exactly two variable names", -1));
-	Tcl_SetErrorCode(interp, "TCL", "SYNTAX", "dict", "for", NULL);
 	return TCL_ERROR;
     }
     searchPtr = TclStackAlloc(interp, sizeof(Tcl_DictSearch));
@@ -2413,14 +2430,12 @@ DictForNRCmd(
      */
 
     Tcl_IncrRefCount(valueObj);
-    if (Tcl_ObjSetVar2(interp, keyVarObj, NULL, keyObj,
-	    TCL_LEAVE_ERR_MSG) == NULL) {
+    if (Tcl_ObjSetVar2(interp, keyVarObj, NULL, keyObj, TCL_LEAVE_ERR_MSG) == NULL) {
 	TclDecrRefCount(valueObj);
 	goto error;
     }
     TclDecrRefCount(valueObj);
-    if (Tcl_ObjSetVar2(interp, valueVarObj, NULL, valueObj,
-	    TCL_LEAVE_ERR_MSG) == NULL) {
+    if (Tcl_ObjSetVar2(interp, valueVarObj, NULL, valueObj, TCL_LEAVE_ERR_MSG) == NULL) {
 	goto error;
     }
 
@@ -2559,7 +2574,7 @@ DictMapNRCmd(
 
     if (objc != 4) {
 	Tcl_WrongNumArgs(interp, 1, objv,
-		"{keyVarName valueVarName} dictionary script");
+		"{keyVar valueVar} dictionary script");
 	return TCL_ERROR;
     }
 
@@ -2573,7 +2588,6 @@ DictMapNRCmd(
     if (varc != 2) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"must have exactly two variable names", -1));
-	Tcl_SetErrorCode(interp, "TCL", "SYNTAX", "dict", "map", NULL);
 	return TCL_ERROR;
     }
     storagePtr = TclStackAlloc(interp, sizeof(DictMapStorage));
@@ -2768,7 +2782,7 @@ DictSetCmd(
     int result, allocatedDict = 0;
 
     if (objc < 4) {
-	Tcl_WrongNumArgs(interp, 1, objv, "dictVarName key ?key ...? value");
+	Tcl_WrongNumArgs(interp, 1, objv, "varName key ?key ...? value");
 	return TCL_ERROR;
     }
 
@@ -2828,7 +2842,7 @@ DictUnsetCmd(
     int result, allocatedDict = 0;
 
     if (objc < 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "dictVarName key ?key ...?");
+	Tcl_WrongNumArgs(interp, 1, objv, "varName key ?key ...?");
 	return TCL_ERROR;
     }
 
@@ -2935,12 +2949,12 @@ DictFilterCmd(
 		Tcl_DictObjDone(&search);
 		Tcl_DictObjGet(interp, objv[1], objv[3], &valueObj);
 		if (valueObj != NULL) {
-		    Tcl_DictObjPut(NULL, resultObj, objv[3], valueObj);
+		    Tcl_DictObjPut(interp, resultObj, objv[3], valueObj);
 		}
 	    } else {
 		while (!done) {
 		    if (Tcl_StringMatch(TclGetString(keyObj), pattern)) {
-			Tcl_DictObjPut(NULL, resultObj, keyObj, valueObj);
+			Tcl_DictObjPut(interp, resultObj, keyObj, valueObj);
 		    }
 		    Tcl_DictObjNext(&search, &keyObj, &valueObj, &done);
 		}
@@ -2958,7 +2972,7 @@ DictFilterCmd(
 		for (i=3 ; i<objc ; i++) {
 		    pattern = TclGetString(objv[i]);
 		    if (Tcl_StringMatch(TclGetString(keyObj), pattern)) {
-			Tcl_DictObjPut(NULL, resultObj, keyObj, valueObj);
+			Tcl_DictObjPut(interp, resultObj, keyObj, valueObj);
 			break;		/* stop inner loop */
 		    }
 		}
@@ -2984,7 +2998,7 @@ DictFilterCmd(
 	    for (i=3 ; i<objc ; i++) {
 		pattern = TclGetString(objv[i]);
 		if (Tcl_StringMatch(TclGetString(valueObj), pattern)) {
-		    Tcl_DictObjPut(NULL, resultObj, keyObj, valueObj);
+		    Tcl_DictObjPut(interp, resultObj, keyObj, valueObj);
 		    break;		/* stop inner loop */
 		}
 	    }
@@ -2996,7 +3010,7 @@ DictFilterCmd(
     case FILTER_SCRIPT:
 	if (objc != 5) {
 	    Tcl_WrongNumArgs(interp, 1, objv,
-		    "dictionary script {keyVarName valueVarName} filterScript");
+		    "dictionary script {keyVar valueVar} filterScript");
 	    return TCL_ERROR;
 	}
 
@@ -3012,7 +3026,6 @@ DictFilterCmd(
 	if (varc != 2) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "must have exactly two variable names", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "SYNTAX", "dict", "filter", NULL);
 	    return TCL_ERROR;
 	}
 	keyVarObj = varv[0];
@@ -3051,15 +3064,19 @@ DictFilterCmd(
 	    Tcl_IncrRefCount(valueObj);
 	    if (Tcl_ObjSetVar2(interp, keyVarObj, NULL, keyObj,
 		    TCL_LEAVE_ERR_MSG) == NULL) {
-		Tcl_AddErrorInfo(interp, 
-			"\n    (\"dict filter\" filter script key variable)");
+		Tcl_ResetResult(interp);
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"couldn't set key variable: \"%s\"",
+			TclGetString(keyVarObj)));
 		result = TCL_ERROR;
 		goto abnormalResult;
 	    }
 	    if (Tcl_ObjSetVar2(interp, valueVarObj, NULL, valueObj,
 		    TCL_LEAVE_ERR_MSG) == NULL) {
-		Tcl_AddErrorInfo(interp, 
-			"\n    (\"dict filter\" filter script value variable)");
+		Tcl_ResetResult(interp);
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"couldn't set value variable: \"%s\"",
+			TclGetString(valueVarObj)));
 		result = TCL_ERROR;
 		goto abnormalResult;
 	    }
@@ -3082,7 +3099,7 @@ DictFilterCmd(
 		}
 		TclDecrRefCount(boolObj);
 		if (satisfied) {
-		    Tcl_DictObjPut(NULL, resultObj, keyObj, valueObj);
+		    Tcl_DictObjPut(interp, resultObj, keyObj, valueObj);
 		}
 		break;
 	    case TCL_BREAK:
@@ -3173,7 +3190,7 @@ DictUpdateCmd(
 
     if (objc < 5 || !(objc & 1)) {
 	Tcl_WrongNumArgs(interp, 1, objv,
-		"dictVarName key varName ?key varName ...? script");
+		"varName key varName ?key varName ...? script");
 	return TCL_ERROR;
     }
 
@@ -3270,17 +3287,18 @@ FinalizeDictUpdate(
     for (i=0 ; i<objc ; i+=2) {
 	objPtr = Tcl_ObjGetVar2(interp, objv[i+1], NULL, 0);
 	if (objPtr == NULL) {
-	    Tcl_DictObjRemove(NULL, dictPtr, objv[i]);
+	    Tcl_DictObjRemove(interp, dictPtr, objv[i]);
 	} else if (objPtr == dictPtr) {
 	    /*
 	     * Someone is messing us around, trying to build a recursive
 	     * structure. [Bug 1786481]
 	     */
 
-	    Tcl_DictObjPut(NULL, dictPtr, objv[i], Tcl_DuplicateObj(objPtr));
+	    Tcl_DictObjPut(interp, dictPtr, objv[i],
+		    Tcl_DuplicateObj(objPtr));
 	} else {
 	    /* Shouldn't fail */
-	    Tcl_DictObjPut(NULL, dictPtr, objv[i], objPtr);
+	    Tcl_DictObjPut(interp, dictPtr, objv[i], objPtr);
 	}
     }
     TclDecrRefCount(argsObj);
@@ -3329,7 +3347,7 @@ DictWithCmd(
     Tcl_Obj *dictPtr, *keysPtr, *pathPtr;
 
     if (objc < 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "dictVarName ?key ...? script");
+	Tcl_WrongNumArgs(interp, 1, objv, "dictVar ?key ...? script");
 	return TCL_ERROR;
     }
 

generic/tclEnsemble.c

@@ -2749,9 +2749,15 @@ TclCompileEnsemble(
     int ourResult = TCL_ERROR;
     unsigned numBytes;
     const char *word;
-    DefineLineInformation;
 
     Tcl_IncrRefCount(replaced);
+
+    /*
+     * This is where we return to if we are parsing multiple nested compiled
+     * ensembles. [info object] is such a beast.
+     */
+
+  checkNextWord:
     if (parsePtr->numWords < depth + 1) {
 	goto failed;
     }
@@ -2763,12 +2769,6 @@ TclCompileEnsemble(
 	goto failed;
     }
 
-    /*
-     * This is where we return to if we are parsing multiple nested compiled
-     * ensembles. [info object] is such a beast.
-     */
-
-  checkNextWord:
     word = tokenPtr[1].start;
     numBytes = tokenPtr[1].size;
 
@@ -2979,17 +2979,6 @@ TclCompileEnsemble(
 
     if (cmdPtr->compileProc == TclCompileEnsemble) {
 	tokenPtr = TokenAfter(tokenPtr);
-	if (parsePtr->numWords < depth + 1
-		|| tokenPtr->type != TCL_TOKEN_SIMPLE_WORD) {
-	    /*
-	     * Too hard because the user has done something unpleasant like
-	     * omitting the sub-ensemble's command name or used a non-constant
-	     * name for a sub-ensemble's command name; we respond by bailing
-	     * out completely (this is a rare case). [Bug 6d2f249a01]
-	     */
-
-	    goto cleanup;
-	}
 	ensemble = (Tcl_Command) cmdPtr;
 	goto checkNextWord;
     }
@@ -3008,23 +2997,6 @@ TclCompileEnsemble(
 	goto cleanup;
     }
 
-    /*
-     * Throw out any line information generated by the failed compile attempt.
-     */
-
-    while (mapPtr->nuloc - 1 > eclIndex) {
-        mapPtr->nuloc--;
-        ckfree(mapPtr->loc[mapPtr->nuloc].line);
-        mapPtr->loc[mapPtr->nuloc].line = NULL;
-    }
-
-    /*
-     * Reset the index of next command.  Toss out any from failed nested
-     * partial compiles.
-     */
-
-    envPtr->numCommands = mapPtr->nuloc;
-
     /*
      * Failed to do a full compile for some reason. Try to do a direct invoke
      * instead of going through the ensemble lookup process again.
@@ -3037,24 +3009,8 @@ TclCompileEnsemble(
 		cmdPtr = oldCmdPtr;
 		depth--;
 	    }
+	    (void) Tcl_ListObjReplace(NULL, replaced, depth, 2, 0, NULL);
 	}
-	/*
-	 * The length of the "replaced" list must be depth-1.  Trim back
-	 * any extra elements that might have been appended by failing
-	 * pathways above.
-	 */
-	(void) Tcl_ListObjReplace(NULL, replaced, depth-1, INT_MAX, 0, NULL);
-
-	/*
-	 * TODO: Reconsider whether we ought to call CompileToInvokedCommand()
-	 * when depth==1.  In that case we are choosing to emit the
-	 * INST_INVOKE_REPLACE bytecode when there is in fact no replacing
-	 * to be done.  It would be equally functional and presumably more
-	 * performant to fall through to cleanup below, return TCL_ERROR,
-	 * and let the compiler harness emit the INST_INVOKE_STK
-	 * implementation for us.
-	 */
-
 	CompileToInvokedCommand(interp, parsePtr, replaced, cmdPtr, envPtr);
 	ourResult = TCL_OK;
     }

generic/tclEvent.c

@@ -1299,20 +1299,18 @@ Tcl_FinalizeThread(void)
 	TclFinalizeAsync();
 	TclFinalizeThreadObjects();
     }
-    if (TclFullFinalizationRequested()) { /* useless if we are facing a quick-exit */
 
-	/*
-	 * Blow away all thread local storage blocks.
-	 *
-	 * Note that Tcl API allows creation of threads which do not use any Tcl
-	 * interp or other Tcl subsytems. Those threads might, however, use thread
-	 * local storage, so we must unconditionally finalize it.
-	 *
-	 * Fix [Bug #571002]
-	 */
-	
-	TclFinalizeThreadData();
-    }
+    /*
+     * Blow away all thread local storage blocks.
+     *
+     * Note that Tcl API allows creation of threads which do not use any Tcl
+     * interp or other Tcl subsytems. Those threads might, however, use thread
+     * local storage, so we must unconditionally finalize it.
+     *
+     * Fix [Bug #571002]
+     */
+
+    TclFinalizeThreadData();
 }
 
 /*

generic/tclExecute.c

@@ -555,6 +555,30 @@ VarHashCreateVar(
 	? (*(boolPtr) = ((objPtr)->internalRep.longValue!=0), TCL_OK)	\
 	: Tcl_GetBooleanFromObj((interp), (objPtr), (boolPtr)))
 
+/*
+ * Macro used in this file to save a function call for common uses of
+ * Tcl_GetWideIntFromObj(). The ANSI C "prototype" is:
+ *
+ * MODULE_SCOPE int TclGetWideIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+ *			Tcl_WideInt *wideIntPtr);
+ */
+
+#ifdef TCL_WIDE_INT_IS_LONG
+#define TclGetWideIntFromObj(interp, objPtr, wideIntPtr) \
+    (((objPtr)->typePtr == &tclIntType)					\
+	? (*(wideIntPtr) = (Tcl_WideInt)				\
+		((objPtr)->internalRep.longValue), TCL_OK) :		\
+	Tcl_GetWideIntFromObj((interp), (objPtr), (wideIntPtr)))
+#else /* !TCL_WIDE_INT_IS_LONG */
+#define TclGetWideIntFromObj(interp, objPtr, wideIntPtr)		\
+    (((objPtr)->typePtr == &tclWideIntType)				\
+	? (*(wideIntPtr) = (objPtr)->internalRep.wideValue, TCL_OK) :	\
+    ((objPtr)->typePtr == &tclIntType)					\
+	? (*(wideIntPtr) = (Tcl_WideInt)				\
+		((objPtr)->internalRep.longValue), TCL_OK) :		\
+	Tcl_GetWideIntFromObj((interp), (objPtr), (wideIntPtr)))
+#endif /* TCL_WIDE_INT_IS_LONG */
+
 /*
  * Macro used to make the check for type overflow more mnemonic. This works by
  * comparing sign bits; the rest of the word is irrelevant. The ANSI C
@@ -2204,6 +2228,10 @@ TEBCresume(
     } else {
         /* resume from invocation */
 	CACHE_STACK_INFO();
+	if (iPtr->execEnvPtr->rewind) {
+	    result = TCL_ERROR;
+	    goto abnormalReturn;
+	}
 
 	NRE_ASSERT(iPtr->cmdFramePtr == bcFramePtr);
 	if (bcFramePtr->cmdObj) {
@@ -2215,10 +2243,6 @@ TEBCresume(
 	if (iPtr->flags & INTERP_DEBUG_FRAME) {
 	    TclArgumentBCRelease(interp, bcFramePtr);
 	}
-	if (iPtr->execEnvPtr->rewind) {
-	    result = TCL_ERROR;
-	    goto abnormalReturn;
-	}
 	if (codePtr->flags & TCL_BYTECODE_RECOMPILE) {
 	    iPtr->flags |= ERR_ALREADY_LOGGED;
 	    codePtr->flags &= ~TCL_BYTECODE_RECOMPILE;
@@ -3347,7 +3371,7 @@ TEBCresume(
      */
 
     {
-	int storeFlags, len;
+	int storeFlags;
 
     case INST_STORE_ARRAY4:
 	opnd = TclGetUInt4AtPtr(pc+1);
@@ -3587,171 +3611,6 @@ TEBCresume(
 #endif
 	TRACE_APPEND(("%.30s\n", O2S(objResultPtr)));
 	NEXT_INST_V(pcAdjustment, cleanup, 1);
-
-    case INST_LAPPEND_LIST:
-	opnd = TclGetUInt4AtPtr(pc+1);
-	valuePtr = OBJ_AT_TOS;
-	varPtr = LOCAL(opnd);
-	cleanup = 1;
-	pcAdjustment = 5;
-	while (TclIsVarLink(varPtr)) {
-	    varPtr = varPtr->value.linkPtr;
-	}
-	TRACE(("%u <- \"%.30s\" => ", opnd, O2S(valuePtr)));
-	if (TclListObjGetElements(interp, valuePtr, &objc, &objv)
-		!= TCL_OK) {
-	    TRACE_ERROR(interp);
-	    goto gotError;
-	}
-	if (TclIsVarDirectReadable(varPtr)
-		&& TclIsVarDirectWritable(varPtr)) {
-	    goto lappendListDirect;
-	}
-	arrayPtr = NULL;
-	part1Ptr = part2Ptr = NULL;
-	goto lappendListPtr;
-
-    case INST_LAPPEND_LIST_ARRAY:
-	opnd = TclGetUInt4AtPtr(pc+1);
-	valuePtr = OBJ_AT_TOS;
-	part1Ptr = NULL;
-	part2Ptr = OBJ_UNDER_TOS;
-	arrayPtr = LOCAL(opnd);
-	cleanup = 2;
-	pcAdjustment = 5;
-	while (TclIsVarLink(arrayPtr)) {
-	    arrayPtr = arrayPtr->value.linkPtr;
-	}
-	TRACE(("%u \"%.30s\" \"%.30s\" => ",
-		opnd, O2S(part2Ptr), O2S(valuePtr)));
-	if (TclListObjGetElements(interp, valuePtr, &objc, &objv)
-		!= TCL_OK) {
-	    TRACE_ERROR(interp);
-	    goto gotError;
-	}
-	if (TclIsVarArray(arrayPtr) && !ReadTraced(arrayPtr)
-		&& !WriteTraced(arrayPtr)) {
-	    varPtr = VarHashFindVar(arrayPtr->value.tablePtr, part2Ptr);
-	    if (varPtr && TclIsVarDirectReadable(varPtr)
-		    && TclIsVarDirectWritable(varPtr)) {
-		goto lappendListDirect;
-	    }
-	}
-	varPtr = TclLookupArrayElement(interp, part1Ptr, part2Ptr,
-		TCL_LEAVE_ERR_MSG, "set", 1, 1, arrayPtr, opnd);
-	if (varPtr == NULL) {
-	    TRACE_ERROR(interp);
-	    goto gotError;
-	}
-	goto lappendListPtr;
-
-    case INST_LAPPEND_LIST_ARRAY_STK:
-	pcAdjustment = 1;
-	cleanup = 3;
-	valuePtr = OBJ_AT_TOS;
-	part2Ptr = OBJ_UNDER_TOS;	/* element name */
-	part1Ptr = OBJ_AT_DEPTH(2);	/* array name */
-	TRACE(("\"%.30s(%.30s)\" \"%.30s\" => ",
-		O2S(part1Ptr), O2S(part2Ptr), O2S(valuePtr)));
-	goto lappendList;
-
-    case INST_LAPPEND_LIST_STK:
-	pcAdjustment = 1;
-	cleanup = 2;
-	valuePtr = OBJ_AT_TOS;
-	part2Ptr = NULL;
-	part1Ptr = OBJ_UNDER_TOS;	/* variable name */
-	TRACE(("\"%.30s\" \"%.30s\" => ", O2S(part1Ptr), O2S(valuePtr)));
-	goto lappendList;
-
-    lappendListDirect:
-	objResultPtr = varPtr->value.objPtr;
-	if (TclListObjLength(interp, objResultPtr, &len) != TCL_OK) {
-	    TRACE_ERROR(interp);
-	    goto gotError;
-	}
-	if (Tcl_IsShared(objResultPtr)) {
-	    Tcl_Obj *newValue = Tcl_DuplicateObj(objResultPtr);
-
-	    TclDecrRefCount(objResultPtr);
-	    varPtr->value.objPtr = objResultPtr = newValue;
-	    Tcl_IncrRefCount(newValue);
-	}
-	if (Tcl_ListObjReplace(interp, objResultPtr, len, 0, objc, objv)
-		!= TCL_OK) {
-	    TRACE_ERROR(interp);
-	    goto gotError;
-	}
-	TRACE_APPEND(("%.30s\n", O2S(objResultPtr)));
-	NEXT_INST_V(pcAdjustment, cleanup, 1);
-
-    lappendList:
-	opnd = -1;
-	if (TclListObjGetElements(interp, valuePtr, &objc, &objv)
-		!= TCL_OK) {
-	    TRACE_ERROR(interp);
-	    goto gotError;
-	}
-	DECACHE_STACK_INFO();
-	varPtr = TclObjLookupVarEx(interp, part1Ptr, part2Ptr,
-		TCL_LEAVE_ERR_MSG, "set", 1, 1, &arrayPtr);
-	CACHE_STACK_INFO();
-	if (!varPtr) {
-	    TRACE_ERROR(interp);
-	    goto gotError;
-	}
-
-    lappendListPtr:
-	if (TclIsVarInHash(varPtr)) {
-	    VarHashRefCount(varPtr)++;
-	}
-	if (arrayPtr && TclIsVarInHash(arrayPtr)) {
-	    VarHashRefCount(arrayPtr)++;
-	}
-	DECACHE_STACK_INFO();
-	objResultPtr = TclPtrGetVar(interp, varPtr, arrayPtr,
-		part1Ptr, part2Ptr, TCL_LEAVE_ERR_MSG, opnd);
-	CACHE_STACK_INFO();
-	if (TclIsVarInHash(varPtr)) {
-	    VarHashRefCount(varPtr)--;
-	}
-	if (arrayPtr && TclIsVarInHash(arrayPtr)) {
-	    VarHashRefCount(arrayPtr)--;
-	}
-
-	{
-	    int createdNewObj = 0;
-
-	    if (!objResultPtr) {
-		objResultPtr = valuePtr;
-	    } else if (TclListObjLength(interp, objResultPtr, &len)!=TCL_OK) {
-		TRACE_ERROR(interp);
-		goto gotError;
-	    } else {
-		if (Tcl_IsShared(objResultPtr)) {
-		    objResultPtr = Tcl_DuplicateObj(objResultPtr);
-		    createdNewObj = 1;
-		}
-		if (Tcl_ListObjReplace(interp, objResultPtr, len,0, objc,objv)
-			!= TCL_OK) {
-		    goto errorInLappendListPtr;
-		}
-	    }
-	    DECACHE_STACK_INFO();
-	    objResultPtr = TclPtrSetVar(interp, varPtr, arrayPtr, part1Ptr,
-		    part2Ptr, objResultPtr, TCL_LEAVE_ERR_MSG, opnd);
-	    CACHE_STACK_INFO();
-	    if (!objResultPtr) {
-	    errorInLappendListPtr:
-		if (createdNewObj) {
-		    TclDecrRefCount(objResultPtr);
-		}
-		TRACE_ERROR(interp);
-		goto gotError;
-	    }
-	}
-	TRACE_APPEND(("%.30s\n", O2S(objResultPtr)));
-	NEXT_INST_V(pcAdjustment, cleanup, 1);
     }
 
     /*
@@ -5079,7 +4938,7 @@ TEBCresume(
 
 	valuePtr = OBJ_AT_TOS;
 	opnd = TclGetInt4AtPtr(pc+1);
-	TRACE(("\"%.30s\" %d => ", O2S(valuePtr), opnd));
+	TRACE(("\%.30s\" %d => ", O2S(valuePtr), opnd));
 
 	/*
 	 * Get the contents of the list, making sure that it really is a list
@@ -5766,7 +5625,6 @@ TEBCresume(
 		    ((int *) objResultPtr->internalRep.otherValuePtr)[1] = 0;
 		}
 		Tcl_InvalidateStringRep(objResultPtr);
-		TclDecrRefCount(value3Ptr);
 		TRACE_APPEND(("\"%.30s\"\n", O2S(objResultPtr)));
 		NEXT_INST_F(1, 1, 1);
 	    } else {
@@ -5793,7 +5651,6 @@ TEBCresume(
 		    ((int *) objResultPtr->internalRep.otherValuePtr)[1] = 0;
 		}
 		Tcl_InvalidateStringRep(valuePtr);
-		TclDecrRefCount(value3Ptr);
 		TRACE_APPEND(("\"%.30s\"\n", O2S(valuePtr)));
 		NEXT_INST_F(1, 0, 0);
 	    }
@@ -5845,21 +5702,11 @@ TEBCresume(
 			length - toIdx);
 	    }
 	} else {
-	    /*
-	     * Be careful with splicing the stack in this case; we have a
-	     * refCount:1 object in value3Ptr and we want to append to it and
-	     * make it be the refCount:1 object at the top of the stack
-	     * afterwards. [Bug 82e7f67325]
-	     */
-
+	    objResultPtr = value3Ptr;
 	    if (toIdx < length) {
-		Tcl_AppendUnicodeToObj(value3Ptr, ustring1 + toIdx + 1,
+		Tcl_AppendUnicodeToObj(objResultPtr, ustring1 + toIdx + 1,
 			length - toIdx);
 	    }
-	    TRACE_APPEND(("\"%.30s\"\n", O2S(value3Ptr)));
-	    TclDecrRefCount(valuePtr);
-	    OBJ_AT_TOS = value3Ptr;	/* Tricky! */
-	    NEXT_INST_F(1, 0, 0);
 	}
 	TclDecrRefCount(value3Ptr);
 	TRACE_APPEND(("\"%.30s\"\n", O2S(objResultPtr)));
@@ -6142,31 +5989,6 @@ TEBCresume(
     case INST_NUM_TYPE:
 	if (GetNumberFromObj(NULL, OBJ_AT_TOS, &ptr1, &type1) != TCL_OK) {
 	    type1 = 0;
-	} else if (type1 == TCL_NUMBER_LONG) {
-	    /* value is between LONG_MIN and LONG_MAX */
-	    /* [string is integer] is -UINT_MAX to UINT_MAX range */
-	    int i;
-
-	    if (Tcl_GetIntFromObj(NULL, OBJ_AT_TOS, &i) != TCL_OK) {
-		type1 = TCL_NUMBER_WIDE;
-	    }
-#ifndef TCL_WIDE_INT_IS_LONG
-	} else if (type1 == TCL_NUMBER_WIDE) {
-	    /* value is between WIDE_MIN and WIDE_MAX */
-	    /* [string is wideinteger] is -UWIDE_MAX to UWIDE_MAX range */
-	    int i;
-	    if (Tcl_GetIntFromObj(NULL, OBJ_AT_TOS, &i) == TCL_OK) {
-		type1 = TCL_NUMBER_LONG;
-	    }
-#endif
-	} else if (type1 == TCL_NUMBER_BIG) {
-	    /* value is an integer outside the WIDE_MIN to WIDE_MAX range */
-	    /* [string is wideinteger] is -UWIDE_MAX to UWIDE_MAX range */
-	    Tcl_WideInt w;
-
-	    if (Tcl_GetWideIntFromObj(NULL, OBJ_AT_TOS, &w) == TCL_OK) {
-		type1 = TCL_NUMBER_WIDE;
-	    }
 	}
 	TclNewIntObj(objResultPtr, type1);
 	TRACE(("\"%.20s\" => %d\n", O2S(OBJ_AT_TOS), type1));
@@ -7641,14 +7463,6 @@ TEBCresume(
 	searchPtr = ckalloc(sizeof(Tcl_DictSearch));
 	if (Tcl_DictObjFirst(interp, dictPtr, searchPtr, &keyPtr,
 		&valuePtr, &done) != TCL_OK) {
-
-	    /*
-	     * dictPtr is no longer on the stack, and we're not
-	     * moving it into the intrep of an iterator.  We need
-	     * to drop the refcount [Tcl Bug 9b352768e6].
-	     */
-
-	    Tcl_DecrRefCount(dictPtr);
 	    ckfree(searchPtr);
 	    TRACE_ERROR(interp);
 	    goto gotError;

generic/tclFCmd.c

@@ -1196,7 +1196,7 @@ TclFileLinkCmd(
 	    static const char *const linkTypes[] = {
 		"-symbolic", "-hard", NULL
 	    };
-	    if (Tcl_GetIndexFromObj(interp, objv[1], linkTypes, "option", 0,
+	    if (Tcl_GetIndexFromObj(interp, objv[1], linkTypes, "switch", 0,
 		    &linkAction) != TCL_OK) {
 		return TCL_ERROR;
 	    }

generic/tclIO.h

@@ -36,7 +36,6 @@
  */
 
 typedef struct ChannelBuffer {
-    int refCount;		/* Current uses count */
     int nextAdded;		/* The next position into which a character
 				 * will be put in the buffer. */
     int nextRemoved;		/* Position of next byte to be removed from
@@ -112,8 +111,6 @@ typedef struct Channel {
 
     ChannelBuffer *inQueueHead;	/* Points at first buffer in input queue. */
     ChannelBuffer *inQueueTail;	/* Points at last buffer in input queue. */
-
-    int refCount;
 } Channel;
 
 /*
@@ -229,6 +226,11 @@ typedef struct ChannelState {
 					 * flushed after every newline. */
 #define CHANNEL_UNBUFFERED	(1<<5)	/* Output to the channel must always
 					 * be flushed immediately. */
+#define BUFFER_READY		(1<<6)	/* Current output buffer (the
+					 * curOutPtr field in the channel
+					 * structure) should be output as soon
+					 * as possible even though it may not
+					 * be full. */
 #define BG_FLUSH_SCHEDULED	(1<<7)	/* A background flush of the queued
 					 * output buffers has been
 					 * scheduled. */
@@ -250,6 +252,9 @@ typedef struct ChannelState {
 #define INPUT_SAW_CR		(1<<12)	/* Channel is in CRLF eol input
 					 * translation mode and the last byte
 					 * seen was a "\r". */
+#define INPUT_NEED_NL		(1<<15)	/* Saw a '\r' at end of last buffer,
+					 * and there should be a '\n' at
+					 * beginning of next buffer. */
 #define CHANNEL_DEAD		(1<<13)	/* The channel has been closed by the
 					 * exit handler (on exit) but not
 					 * deallocated. When any IO operation
@@ -269,6 +274,29 @@ typedef struct ChannelState {
 					 * changes. */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
+#ifdef TCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING
+#define CHANNEL_TIMER_FEV	(1<<17)	/* When set the event we are notified
+					 * by is a fileevent generated by a
+					 * timer. We don't know if the driver
+					 * has more data and should not try to
+					 * read from it. If the system needs
+					 * more than is in the buffers out
+					 * read routines will simulate a short
+					 * read (0 characters read) */
+#define CHANNEL_HAS_MORE_DATA   (1<<18) /* Set by NotifyChannel for a channel
+					 * if and only if the channel is
+					 * configured non-blocking, the driver
+					 * for said channel has no
+					 * blockmodeproc, and data has arrived
+					 * for reading at the OS level). A
+					 * GetInput will pass reading from the
+					 * driver if the channel is
+					 * non-blocking, without blockmode
+					 * proc and the flag has not been set.
+					 * A read will be performed if the
+					 * flag is set. This will reset the
+					 * flag as well. */
+#endif /* TCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING */
 
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
 					 * Its structures are still live and

generic/tclIOCmd.c

@@ -181,7 +181,6 @@ Tcl_PutsObjCmd(
 	return TCL_ERROR;
     }
 
-    TclChannelPreserve(chan);
     result = Tcl_WriteObj(chan, string);
     if (result < 0) {
 	goto error;
@@ -192,7 +191,6 @@ Tcl_PutsObjCmd(
 	    goto error;
 	}
     }
-    TclChannelRelease(chan);
     return TCL_OK;
 
     /*
@@ -207,7 +205,6 @@ Tcl_PutsObjCmd(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf("error writing \"%s\": %s",
 		TclGetString(chanObjPtr), Tcl_PosixError(interp)));
     }
-    TclChannelRelease(chan);
     return TCL_ERROR;
 }
 
@@ -255,7 +252,6 @@ Tcl_FlushObjCmd(
 	return TCL_ERROR;
     }
 
-    TclChannelPreserve(chan);
     if (Tcl_Flush(chan) != TCL_OK) {
 	/*
 	 * TIP #219.
@@ -269,10 +265,8 @@ Tcl_FlushObjCmd(
 		    "error flushing \"%s\": %s",
 		    TclGetString(chanObjPtr), Tcl_PosixError(interp)));
 	}
-	TclChannelRelease(chan);
 	return TCL_ERROR;
     }
-    TclChannelRelease(chan);
     return TCL_OK;
 }
 
@@ -305,7 +299,6 @@ Tcl_GetsObjCmd(
     int lineLen;		/* Length of line just read. */
     int mode;			/* Mode in which channel is opened. */
     Tcl_Obj *linePtr, *chanObjPtr;
-    int code = TCL_OK;
 
     if ((objc != 2) && (objc != 3)) {
 	Tcl_WrongNumArgs(interp, 1, objv, "channelId ?varName?");
@@ -322,7 +315,6 @@ Tcl_GetsObjCmd(
 	return TCL_ERROR;
     }
 
-    TclChannelPreserve(chan);
     linePtr = Tcl_NewObj();
     lineLen = Tcl_GetsObj(chan, linePtr);
     if (lineLen < 0) {
@@ -341,24 +333,20 @@ Tcl_GetsObjCmd(
 			"error reading \"%s\": %s",
 			TclGetString(chanObjPtr), Tcl_PosixError(interp)));
 	    }
-	    code = TCL_ERROR;
-	    goto done;
+	    return TCL_ERROR;
 	}
 	lineLen = -1;
     }
     if (objc == 3) {
 	if (Tcl_ObjSetVar2(interp, objv[2], NULL, linePtr,
 		TCL_LEAVE_ERR_MSG) == NULL) {
-	    code = TCL_ERROR;
-	    goto done;
+	    return TCL_ERROR;
 	}
 	Tcl_SetObjResult(interp, Tcl_NewIntObj(lineLen));
     } else {
 	Tcl_SetObjResult(interp, linePtr);
     }
-  done:
-    TclChannelRelease(chan);
-    return code;
+    return TCL_OK;
 }
 
 /*
@@ -465,7 +453,6 @@ Tcl_ReadObjCmd(
 
     resultPtr = Tcl_NewObj();
     Tcl_IncrRefCount(resultPtr);
-    TclChannelPreserve(chan);
     charactersRead = Tcl_ReadChars(chan, resultPtr, toRead, 0);
     if (charactersRead < 0) {
 	/*
@@ -480,7 +467,6 @@ Tcl_ReadObjCmd(
 		    "error reading \"%s\": %s",
 		    TclGetString(chanObjPtr), Tcl_PosixError(interp)));
 	}
-	TclChannelRelease(chan);
 	Tcl_DecrRefCount(resultPtr);
 	return TCL_ERROR;
     }
@@ -499,7 +485,6 @@ Tcl_ReadObjCmd(
 	}
     }
     Tcl_SetObjResult(interp, resultPtr);
-    TclChannelRelease(chan);
     Tcl_DecrRefCount(resultPtr);
     return TCL_OK;
 }
@@ -559,7 +544,6 @@ Tcl_SeekObjCmd(
 	mode = modeArray[optionIndex];
     }
 
-    TclChannelPreserve(chan);
     result = Tcl_Seek(chan, offset, mode);
     if (result == Tcl_LongAsWide(-1)) {
 	/*
@@ -574,10 +558,8 @@ Tcl_SeekObjCmd(
 		    "error during seek on \"%s\": %s",
 		    TclGetString(objv[1]), Tcl_PosixError(interp)));
 	}
-	TclChannelRelease(chan);
 	return TCL_ERROR;
     }
-    TclChannelRelease(chan);
     return TCL_OK;
 }
 
@@ -608,7 +590,6 @@ Tcl_TellObjCmd(
 {
     Tcl_Channel chan;		/* The channel to tell on. */
     Tcl_WideInt newLoc;
-    int code;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
@@ -624,7 +605,6 @@ Tcl_TellObjCmd(
 	return TCL_ERROR;
     }
 
-    TclChannelPreserve(chan);
     newLoc = Tcl_Tell(chan);
 
     /*
@@ -633,10 +613,7 @@ Tcl_TellObjCmd(
      * them into the regular interpreter result.
      */
 
-
-    code  = TclChanCaughtErrorBypass(interp, chan);
-    TclChannelRelease(chan);
-    if (code) {
+    if (TclChanCaughtErrorBypass(interp, chan)) {
 	return TCL_ERROR;
     }
 
@@ -919,7 +896,7 @@ Tcl_ExecObjCmd(
 	if (string[0] != '-') {
 	    break;
 	}
-	if (Tcl_GetIndexFromObj(interp, objv[skip], options, "option",
+	if (Tcl_GetIndexFromObj(interp, objv[skip], options, "switch",
 		TCL_EXACT, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
@@ -933,7 +910,7 @@ Tcl_ExecObjCmd(
 	}
     }
     if (objc <= skip) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?-option ...? arg ?arg ...?");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-switch ...? arg ?arg ...?");
 	return TCL_ERROR;
     }
 
@@ -1696,7 +1673,7 @@ Tcl_FcopyObjCmd(
     toRead = -1;
     cmdPtr = NULL;
     for (i = 3; i < objc; i += 2) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], switches, "option", 0,
+	if (Tcl_GetIndexFromObj(interp, objv[i], switches, "switch", 0,
 		&index) != TCL_OK) {
 	    return TCL_ERROR;
 	}

generic/tclIOGT.c

@@ -210,27 +210,7 @@ struct TransformChannelData {
 				 * a transformation of incoming data. Also
 				 * serves as buffer of all data not yet
 				 * consumed by the reader. */
-    int refCount;
 };
-
-static void
-PreserveData(
-    TransformChannelData *dataPtr)
-{
-    dataPtr->refCount++;
-}
-
-static void
-ReleaseData(
-    TransformChannelData *dataPtr)
-{
-    if (--dataPtr->refCount) {
-	return;
-    }
-    ResultClear(&dataPtr->result);
-    Tcl_DecrRefCount(dataPtr->command);
-    ckfree(dataPtr);
-}
 
 /*
  *----------------------------------------------------------------------
@@ -260,7 +240,6 @@ TclChannelTransform(
     Channel *chanPtr;		/* The actual channel. */
     ChannelState *statePtr;	/* State info for channel. */
     int mode;			/* Read/write mode of the channel. */
-    int objc;
     TransformChannelData *dataPtr;
     Tcl_DString ds;
 
@@ -268,12 +247,6 @@ TclChannelTransform(
 	return TCL_ERROR;
     }
 
-    if (TCL_OK != Tcl_ListObjLength(interp, cmdObjPtr, &objc)) {
-	Tcl_SetObjResult(interp,
-		Tcl_NewStringObj("-command value is not a list", -1));
-	return TCL_ERROR;
-    }
-
     chanPtr = (Channel *) chan;
     statePtr = chanPtr->state;
     chanPtr = statePtr->topChanPtr;
@@ -288,7 +261,6 @@ TclChannelTransform(
 
     dataPtr = ckalloc(sizeof(TransformChannelData));
 
-    dataPtr->refCount = 1;
     Tcl_DStringInit(&ds);
     Tcl_GetChannelOption(interp, chan, "-blocking", &ds);
     dataPtr->readIsFlushed = 0;
@@ -298,6 +270,7 @@ TclChannelTransform(
     }
     Tcl_DStringFree(&ds);
 
+    dataPtr->self = chan;
     dataPtr->watchMask = 0;
     dataPtr->mode = mode;
     dataPtr->timer = NULL;
@@ -313,20 +286,19 @@ TclChannelTransform(
     if (dataPtr->self == NULL) {
 	Tcl_AppendPrintfToObj(Tcl_GetObjResult(interp),
 		"\nfailed to stack channel \"%s\"", Tcl_GetChannelName(chan));
-	ReleaseData(dataPtr);
+	Tcl_DecrRefCount(dataPtr->command);
+	ResultClear(&dataPtr->result);
+	ckfree(dataPtr);
 	return TCL_ERROR;
     }
-    Tcl_Preserve(dataPtr->self);
 
     /*
      * At last initialize the transformation at the script level.
      */
 
-    PreserveData(dataPtr);
     if ((dataPtr->mode & TCL_WRITABLE) && ExecuteCallback(dataPtr, NULL,
 	    A_CREATE_WRITE, NULL, 0, TRANSMIT_DONT, P_NO_PRESERVE) != TCL_OK){
 	Tcl_UnstackChannel(interp, chan);
-	ReleaseData(dataPtr);
 	return TCL_ERROR;
     }
 
@@ -335,11 +307,9 @@ TclChannelTransform(
 	ExecuteCallback(dataPtr, NULL, A_DELETE_WRITE, NULL, 0, TRANSMIT_DONT,
 		P_NO_PRESERVE);
 	Tcl_UnstackChannel(interp, chan);
-	ReleaseData(dataPtr);
 	return TCL_ERROR;
     }
 
-    ReleaseData(dataPtr);
     return TCL_OK;
 }
 
@@ -380,10 +350,7 @@ ExecuteCallback(
     unsigned char *resBuf;
     Tcl_InterpState state = NULL;
     int res = TCL_OK;
-    Tcl_Obj *command = TclListObjCopy(NULL, dataPtr->command);
-    Tcl_Interp *eval = dataPtr->interp;
-
-    Tcl_Preserve(eval);
+    Tcl_Obj *command = Tcl_DuplicateObj(dataPtr->command);
 
     /*
      * Step 1, create the complete command to execute. Do this by appending
@@ -394,18 +361,26 @@ ExecuteCallback(
      */
 
     if (preserve == P_PRESERVE) {
-	state = Tcl_SaveInterpState(eval, res);
+	state = Tcl_SaveInterpState(dataPtr->interp, res);
     }
 
     Tcl_IncrRefCount(command);
-    Tcl_ListObjAppendElement(NULL, command, Tcl_NewStringObj((char *) op, -1));
+    res = Tcl_ListObjAppendElement(dataPtr->interp, command,
+	    Tcl_NewStringObj((char *) op, -1));
+    if (res != TCL_OK) {
+	goto cleanup;
+    }
 
     /*
      * Use a byte-array to prevent the misinterpretation of binary data coming
      * through as UTF while at the tcl level.
      */
 
-    Tcl_ListObjAppendElement(NULL, command, Tcl_NewByteArrayObj(buf, bufLen));
+    res = Tcl_ListObjAppendElement(dataPtr->interp, command,
+	    Tcl_NewByteArrayObj(buf, bufLen));
+    if (res != TCL_OK) {
+	goto cleanup;
+    }
 
     /*
      * Step 2, execute the command at the global level of the interpreter used
@@ -415,14 +390,13 @@ ExecuteCallback(
      * current interpreter. Don't copy if in preservation mode.
      */
 
-    res = Tcl_EvalObjEx(eval, command, TCL_EVAL_GLOBAL);
+    res = Tcl_EvalObjEx(dataPtr->interp, command, TCL_EVAL_GLOBAL);
     Tcl_DecrRefCount(command);
     command = NULL;
 
-    if ((res != TCL_OK) && (interp != NULL) && (eval != interp)
+    if ((res != TCL_OK) && (interp != NULL) && (dataPtr->interp != interp)
 	    && (preserve == P_NO_PRESERVE)) {
-	Tcl_SetObjResult(interp, Tcl_GetObjResult(eval));
-	Tcl_Release(eval);
+	Tcl_SetObjResult(interp, Tcl_GetObjResult(dataPtr->interp));
 	return res;
     }
 
@@ -437,26 +411,20 @@ ExecuteCallback(
 	break;
 
     case TRANSMIT_DOWN:
-	if (dataPtr->self == NULL) {
-	    break;
-	}
-	resObj = Tcl_GetObjResult(eval);
+	resObj = Tcl_GetObjResult(dataPtr->interp);
 	resBuf = Tcl_GetByteArrayFromObj(resObj, &resLen);
 	Tcl_WriteRaw(Tcl_GetStackedChannel(dataPtr->self), (char *) resBuf,
 		resLen);
 	break;
 
     case TRANSMIT_SELF:
-	if (dataPtr->self == NULL) {
-	    break;
-	}
-	resObj = Tcl_GetObjResult(eval);
+	resObj = Tcl_GetObjResult(dataPtr->interp);
 	resBuf = Tcl_GetByteArrayFromObj(resObj, &resLen);
 	Tcl_WriteRaw(dataPtr->self, (char *) resBuf, resLen);
 	break;
 
     case TRANSMIT_IBUF:
-	resObj = Tcl_GetObjResult(eval);
+	resObj = Tcl_GetObjResult(dataPtr->interp);
 	resBuf = Tcl_GetByteArrayFromObj(resObj, &resLen);
 	ResultAdd(&dataPtr->result, resBuf, resLen);
 	break;
@@ -466,16 +434,24 @@ ExecuteCallback(
 	 * Interpret result as integer number.
 	 */
 
-	resObj = Tcl_GetObjResult(eval);
-	TclGetIntFromObj(eval, resObj, &dataPtr->maxRead);
+	resObj = Tcl_GetObjResult(dataPtr->interp);
+	TclGetIntFromObj(dataPtr->interp, resObj, &dataPtr->maxRead);
 	break;
     }
 
-    Tcl_ResetResult(eval);
+    Tcl_ResetResult(dataPtr->interp);
     if (preserve == P_PRESERVE) {
-	(void) Tcl_RestoreInterpState(eval, state);
+	(void) Tcl_RestoreInterpState(dataPtr->interp, state);
+    }
+    return res;
+
+  cleanup:
+    if (preserve == P_PRESERVE) {
+	(void) Tcl_RestoreInterpState(dataPtr->interp, state);
+    }
+    if (command != NULL) {
+	Tcl_DecrRefCount(command);
     }
-    Tcl_Release(eval);
     return res;
 }
 
@@ -559,7 +535,6 @@ TransformCloseProc(
      * system rely on (f.e. signaling the close to interested parties).
      */
 
-    PreserveData(dataPtr);
     if (dataPtr->mode & TCL_WRITABLE) {
 	ExecuteCallback(dataPtr, interp, A_FLUSH_WRITE, NULL, 0,
 		TRANSMIT_DOWN, P_PRESERVE);
@@ -579,15 +554,14 @@ TransformCloseProc(
 	ExecuteCallback(dataPtr, interp, A_DELETE_READ, NULL, 0,
 		TRANSMIT_DONT, P_PRESERVE);
     }
-    ReleaseData(dataPtr);
 
     /*
      * General cleanup.
      */
 
-    Tcl_Release(dataPtr->self);
-    dataPtr->self = NULL;
-    ReleaseData(dataPtr);
+    ResultClear(&dataPtr->result);
+    Tcl_DecrRefCount(dataPtr->command);
+    ckfree(dataPtr);
     return TCL_OK;
 }
 
@@ -622,7 +596,7 @@ TransformInputProc(
      * Should assert(dataPtr->mode & TCL_READABLE);
      */
 
-    if (toRead == 0 || dataPtr->self == NULL) {
+    if (toRead == 0) {
 	/*
 	 * Catch a no-op.
 	 */
@@ -632,7 +606,6 @@ TransformInputProc(
     gotBytes = 0;
     downChan = Tcl_GetStackedChannel(dataPtr->self);
 
-    PreserveData(dataPtr);
     while (toRead > 0) {
 	/*
 	 * Loop until the request is satisfied (or no data is available from
@@ -650,7 +623,7 @@ TransformInputProc(
 	     * break out of the loop and return to the caller.
 	     */
 
-	    break;
+	    return gotBytes;
 	}
 
 	/*
@@ -674,7 +647,7 @@ TransformInputProc(
 	    }
 	} /* else: 'maxRead < 0' == Accept the current value of toRead. */
 	if (toRead <= 0) {
-	    break;
+	    return gotBytes;
 	}
 
 	/*
@@ -683,40 +656,44 @@ TransformInputProc(
 
 	read = Tcl_ReadRaw(downChan, buf, toRead);
 	if (read < 0) {
-	    if (Tcl_InputBlocked(downChan) && (gotBytes > 0)) {
-		/*
-		 * Zero bytes available from downChan because blocked.
-		 * But nonzero bytes already copied, so total is a
-		 * valid blocked short read. Return to caller.
-		 */
+	    /*
+	     * Report errors to caller. EAGAIN is a special situation. If we
+	     * had some data before we report that instead of the request to
+	     * re-try.
+	     */
+		int error = Tcl_GetErrno();
 
-		break;
+	    if ((error == EAGAIN) && (gotBytes > 0)) {
+		return gotBytes;
 	    }
 
-	    /*
-	     * Either downChan is not blocked (there's a real error).
-	     * or it is and there are no bytes copied yet.  In either
-	     * case we want to pass the "error" along to the caller,
-	     * either to report an error, or to signal to the caller
-	     * that zero bytes are available because blocked.
-	     */
-
-	    *errorCodePtr = Tcl_GetErrno();
-	    gotBytes = -1;
-	    break;
+	    *errorCodePtr = error;
+	    return -1;
 	} else if (read == 0) {
-
 	    /*
-	     * Zero returned from Tcl_ReadRaw() always indicates EOF
-	     * on the down channel.
+	     * Check wether we hit on EOF in the underlying channel or not. If
+	     * not differentiate between blocking and non-blocking modes. In
+	     * non-blocking mode we ran temporarily out of data. Signal this
+	     * to the caller via EWOULDBLOCK and error return (-1). In the
+	     * other cases we simply return what we got and let the caller
+	     * wait for more. On the other hand, if we got an EOF we have to
+	     * convert and flush all waiting partial data.
 	     */
 
+	    if (!Tcl_Eof(downChan)) {
+		if ((gotBytes == 0) && (dataPtr->flags & CHANNEL_ASYNC)) {
+		    *errorCodePtr = EWOULDBLOCK;
+		    return -1;
+		}
+		return gotBytes;
+	    }
+
 	    if (dataPtr->readIsFlushed) {
 		/*
 		 * Already flushed, nothing to do anymore.
 		 */
 
-		break;
+		return gotBytes;
 	    }
 
 	    dataPtr->readIsFlushed = 1;
@@ -728,7 +705,7 @@ TransformInputProc(
 		 * We had nothing to flush.
 		 */
 
-		break;
+		return gotBytes;
 	    }
 
 	    continue;		/* at: while (toRead > 0) */
@@ -742,11 +719,9 @@ TransformInputProc(
 	if (ExecuteCallback(dataPtr, NULL, A_READ, UCHARP(buf), read,
 		TRANSMIT_IBUF, P_PRESERVE) != TCL_OK) {
 	    *errorCodePtr = EINVAL;
-	    gotBytes = -1;
-	    break;
+	    return -1;
 	}
     } /* while toRead > 0 */
-    ReleaseData(dataPtr);
 
     return gotBytes;
 }
@@ -788,13 +763,11 @@ TransformOutputProc(
 	return 0;
     }
 
-    PreserveData(dataPtr);
     if (ExecuteCallback(dataPtr, NULL, A_WRITE, UCHARP(buf), toWrite,
 	    TRANSMIT_DOWN, P_NO_PRESERVE) != TCL_OK) {
 	*errorCodePtr = EINVAL;
-	toWrite = -1;
+	return -1;
     }
-    ReleaseData(dataPtr);
 
     return toWrite;
 }
@@ -847,7 +820,6 @@ TransformSeekProc(
      * request down, unchanged.
      */
 
-    PreserveData(dataPtr);
     if (dataPtr->mode & TCL_WRITABLE) {
 	ExecuteCallback(dataPtr, NULL, A_FLUSH_WRITE, NULL, 0, TRANSMIT_DOWN,
 		P_NO_PRESERVE);
@@ -859,7 +831,6 @@ TransformSeekProc(
 	ResultClear(&dataPtr->result);
 	dataPtr->readIsFlushed = 0;
     }
-    ReleaseData(dataPtr);
 
     return parentSeekProc(Tcl_GetChannelInstanceData(parent), offset, mode,
 	    errorCodePtr);
@@ -920,7 +891,6 @@ TransformWideSeekProc(
      * request down, unchanged.
      */
 
-    PreserveData(dataPtr);
     if (dataPtr->mode & TCL_WRITABLE) {
 	ExecuteCallback(dataPtr, NULL, A_FLUSH_WRITE, NULL, 0, TRANSMIT_DOWN,
 		P_NO_PRESERVE);
@@ -932,7 +902,6 @@ TransformWideSeekProc(
 	ResultClear(&dataPtr->result);
 	dataPtr->readIsFlushed = 0;
     }
-    ReleaseData(dataPtr);
 
     /*
      * If we have a wide seek capability, we should stick with that.
@@ -1087,9 +1056,6 @@ TransformWatchProc(
      * unchanged.
      */
 
-    if (dataPtr->self == NULL) {
-	return;
-    }
     downChan = Tcl_GetStackedChannel(dataPtr->self);
 
     Tcl_GetChannelType(downChan)->watchProc(

generic/tclIORChan.c

@@ -99,9 +99,31 @@ typedef struct {
     Tcl_ThreadId thread;	/* Thread the 'interp' belongs to. == Handler thread */
     Tcl_ThreadId owner;         /* Thread owning the structure.    == Channel thread */
 #endif
-    Tcl_Obj *cmd;		/* Callback command prefix */
-    Tcl_Obj *methods;		/* Methods to append to command prefix */
-    Tcl_Obj *name;		/* Name of the channel as created */
+
+    /* See [==] as well.
+     * Storage for the command prefix and the additional words required for
+     * the invocation of methods in the command handler.
+     *
+     * argv [0] ... [.] | [argc-2] [argc-1] | [argc]  [argc+2]
+     *      cmd ... pfx | method   chan     | detail1 detail2
+     *      ~~~~ CT ~~~            ~~ CT ~~
+     *
+     * CT = Belongs to the 'Command handler Thread'.
+     */
+
+    int argc;			/* Number of preallocated words - 2 */
+    Tcl_Obj **argv;		/* Preallocated array for calling the handler.
+				 * args[0] is placeholder for cmd word.
+				 * Followed by the arguments in the prefix,
+				 * plus 4 placeholders for method, channel,
+				 * and at most two varying (method specific)
+				 * words. */
+    int methods;		/* Bitmask of supported methods */
+
+    /*
+     * NOTE (9): Should we have predefined shared literals for the method
+     * names?
+     */
 
     int mode;			/* Mask of R/W mode */
     int interest;		/* Mask of events the channel is interested
@@ -428,15 +450,15 @@ static ReflectedChannel * NewReflectedChannel(Tcl_Interp *interp,
 			    Tcl_Obj *cmdpfxObj, int mode, Tcl_Obj *handleObj);
 static Tcl_Obj *	NextHandle(void);
 static void		FreeReflectedChannel(ReflectedChannel *rcPtr);
+static void		FreeReflectedChannelArgs(ReflectedChannel *rcPtr);
 static int		InvokeTclMethod(ReflectedChannel *rcPtr,
-			    MethodName method, Tcl_Obj *argOneObj,
+			    const char *method, Tcl_Obj *argOneObj,
 			    Tcl_Obj *argTwoObj, Tcl_Obj **resultObjPtr);
 
 static ReflectedChannelMap *	GetReflectedChannelMap(Tcl_Interp *interp);
 static void		DeleteReflectedChannelMap(ClientData clientData,
 			    Tcl_Interp *interp);
 static int		ErrnoReturn(ReflectedChannel *rcPtr, Tcl_Obj *resObj);
-static void		MarkDead(ReflectedChannel *rcPtr);
 
 /*
  * Global constant strings (messages). ==================
@@ -445,14 +467,16 @@ static void		MarkDead(ReflectedChannel *rcPtr);
  * list-quoting to keep the words of the message together. See also [x].
  */
 
+static const char *msg_read_unsup = "{read not supported by Tcl driver}";
 static const char *msg_read_toomuch = "{read delivered more than requested}";
+static const char *msg_write_unsup = "{write not supported by Tcl driver}";
 static const char *msg_write_toomuch = "{write wrote more than requested}";
 static const char *msg_write_nothing = "{write wrote nothing}";
 static const char *msg_seek_beforestart = "{Tried to seek before origin}";
 #ifdef TCL_THREADS
 static const char *msg_send_originlost = "{Channel thread lost}";
-#endif /* TCL_THREADS */
 static const char *msg_send_dstlost    = "{Owner lost}";
+#endif /* TCL_THREADS */
 static const char *msg_dstlost    = "-code 1 -level 0 -errorcode NONE -errorinfo {} -errorline 1 {Owner lost}";
 
 /*
@@ -559,6 +583,10 @@ TclChanCreateObjCmd(
 
     rcId = NextHandle();
     rcPtr = NewReflectedChannel(interp, cmdObj, mode, rcId);
+    chan = Tcl_CreateChannel(&tclRChannelType, TclGetString(rcId), rcPtr,
+	    mode);
+    rcPtr->chan = chan;
+    chanPtr = (Channel *) chan;
 
     /*
      * Invoke 'initialize' and validate that the handler is present and ok.
@@ -572,7 +600,7 @@ TclChanCreateObjCmd(
 
     modeObj = DecodeEventMask(mode);
     /* assert modeObj.refCount == 1 */
-    result = InvokeTclMethod(rcPtr, METH_INIT, modeObj, NULL, &resObj);
+    result = InvokeTclMethod(rcPtr, "initialize", modeObj, NULL, &resObj);
     Tcl_DecrRefCount(modeObj);
 
     if (result != TCL_OK) {
@@ -655,11 +683,7 @@ TclChanCreateObjCmd(
      * Everything is fine now.
      */
 
-    chan = Tcl_CreateChannel(&tclRChannelType, TclGetString(rcId), rcPtr,
-	    mode);
-    rcPtr->chan = chan;
-    TclChannelPreserve(chan);
-    chanPtr = (Channel *) chan;
+    rcPtr->methods = methods;
 
     if ((methods & NULLABLE_METHODS) != NULLABLE_METHODS) {
 	/*
@@ -720,10 +744,12 @@ TclChanCreateObjCmd(
     return TCL_OK;
 
   error:
-    Tcl_DecrRefCount(rcPtr->name);
-    Tcl_DecrRefCount(rcPtr->methods);
-    Tcl_DecrRefCount(rcPtr->cmd);
-    ckfree((char*) rcPtr);
+    /*
+     * Signal to ReflectClose to not call 'finalize'.
+     */
+
+    rcPtr->methods = 0;
+    Tcl_Close(interp, chan);
     return TCL_ERROR;
 
 #undef MODE
@@ -1112,7 +1138,6 @@ ReflectClose(
     ReflectedChannelMap *rcmPtr;/* Map of reflected channels with handlers in
 				 * this interp */
     Tcl_HashEntry *hPtr;	/* Entry in the above map */
-    const Tcl_ChannelType *tctPtr;
 
     if (TclInThreadExit()) {
 	/*
@@ -1150,11 +1175,18 @@ ReflectClose(
 	}
 #endif
 
-	tctPtr = ((Channel *)rcPtr->chan)->typePtr;
-	if (tctPtr && tctPtr != &tclRChannelType) {
-	    ckfree((char *)tctPtr);
-	    ((Channel *)rcPtr->chan)->typePtr = NULL;
-	}
+        Tcl_EventuallyFree(rcPtr, (Tcl_FreeProc *) FreeReflectedChannel);
+	return EOK;
+    }
+
+    /*
+     * -- No -- ASSERT rcPtr->methods & FLAG(METH_FINAL)
+     *
+     * A cleaned method mask here implies that the channel creation was
+     * aborted, and "finalize" must not be called.
+     */
+
+    if (rcPtr->methods == 0) {
         Tcl_EventuallyFree(rcPtr, (Tcl_FreeProc *) FreeReflectedChannel);
 	return EOK;
     }
@@ -1176,12 +1208,14 @@ ReflectClose(
 
         Tcl_DeleteEvents(ReflectEventDelete, rcPtr);
 
+        Tcl_EventuallyFree(rcPtr, (Tcl_FreeProc *) FreeReflectedChannel);
+
 	if (result != TCL_OK) {
 	    PassReceivedErrorInterp(interp, &p);
 	}
     } else {
 #endif
-	result = InvokeTclMethod(rcPtr, METH_FINAL, NULL, NULL, &resObj);
+	result = InvokeTclMethod(rcPtr, "finalize", NULL, NULL, &resObj);
 	if ((result != TCL_OK) && (interp != NULL)) {
 	    Tcl_SetChannelErrorInterp(interp, resObj);
 	}
@@ -1217,14 +1251,12 @@ ReflectClose(
 	if (hPtr) {
 	    Tcl_DeleteHashEntry(hPtr);
 	}
+#endif
+
+        Tcl_EventuallyFree(rcPtr, (Tcl_FreeProc *) FreeReflectedChannel);
+#ifdef TCL_THREADS
     }
 #endif
-    tctPtr = ((Channel *)rcPtr->chan)->typePtr;
-    if (tctPtr && tctPtr != &tclRChannelType) {
-	    ckfree((char *)tctPtr);
-	    ((Channel *)rcPtr->chan)->typePtr = NULL;
-    }
-    Tcl_EventuallyFree(rcPtr, (Tcl_FreeProc *) FreeReflectedChannel);
     return (result == TCL_OK) ? EOK : EINVAL;
 }
 
@@ -1257,6 +1289,18 @@ ReflectInput(
     unsigned char *bytev;	/* Array of returned bytes */
     Tcl_Obj *resObj;		/* Result data for 'read' */
 
+    /*
+     * The following check can be done before thread redirection, because we
+     * are reading from an item which is readonly, i.e. will never change
+     * during the lifetime of the channel.
+     */
+
+    if (!(rcPtr->methods & FLAG(METH_READ))) {
+	SetChannelErrorStr(rcPtr->chan, msg_read_unsup);
+	*errorCodePtr = EINVAL;
+	return -1;
+    }
+
     /*
      * Are we in the correct thread?
      */
@@ -1295,7 +1339,7 @@ ReflectInput(
     toReadObj = Tcl_NewIntObj(toRead);
     Tcl_IncrRefCount(toReadObj);
 
-    if (InvokeTclMethod(rcPtr, METH_READ, toReadObj, NULL, &resObj)!=TCL_OK) {
+    if (InvokeTclMethod(rcPtr, "read", toReadObj, NULL, &resObj)!=TCL_OK) {
 	int code = ErrnoReturn(rcPtr, resObj);
 
 	if (code < 0) {
@@ -1360,6 +1404,18 @@ ReflectOutput(
     Tcl_Obj *resObj;		/* Result data for 'write' */
     int written;
 
+    /*
+     * The following check can be done before thread redirection, because we
+     * are reading from an item which is readonly, i.e. will never change
+     * during the lifetime of the channel.
+     */
+
+    if (!(rcPtr->methods & FLAG(METH_WRITE))) {
+	SetChannelErrorStr(rcPtr->chan, msg_write_unsup);
+	*errorCodePtr = EINVAL;
+	return -1;
+    }
+
     /*
      * Are we in the correct thread?
      */
@@ -1394,12 +1450,11 @@ ReflectOutput(
     /* ASSERT: rcPtr->mode & TCL_WRITABLE */
 
     Tcl_Preserve(rcPtr);
-    Tcl_Preserve(rcPtr->interp);
 
     bufObj = Tcl_NewByteArrayObj((unsigned char *) buf, toWrite);
     Tcl_IncrRefCount(bufObj);
 
-    if (InvokeTclMethod(rcPtr, METH_WRITE, bufObj, NULL, &resObj) != TCL_OK) {
+    if (InvokeTclMethod(rcPtr, "write", bufObj, NULL, &resObj) != TCL_OK) {
 	int code = ErrnoReturn(rcPtr, resObj);
 
 	if (code < 0) {
@@ -1411,14 +1466,6 @@ ReflectOutput(
         goto invalid;
     }
 
-    if (Tcl_InterpDeleted(rcPtr->interp)) {
-	/*
-	 * The interp was destroyed during InvokeTclMethod().
-	 */
-
-	SetChannelErrorStr(rcPtr->chan, msg_send_dstlost);
-        goto invalid;
-    }
     if (Tcl_GetIntFromObj(rcPtr->interp, resObj, &written) != TCL_OK) {
 	Tcl_SetChannelError(rcPtr->chan, MarshallError(rcPtr->interp));
         goto invalid;
@@ -1448,7 +1495,6 @@ ReflectOutput(
  stop:
     Tcl_DecrRefCount(bufObj);
     Tcl_DecrRefCount(resObj);		/* Remove reference held from invoke */
-    Tcl_Release(rcPtr->interp);
     Tcl_Release(rcPtr);
     return written;
  invalid:
@@ -1522,7 +1568,7 @@ ReflectSeekWide(
     Tcl_IncrRefCount(offObj);
     Tcl_IncrRefCount(baseObj);
 
-    if (InvokeTclMethod(rcPtr, METH_SEEK, offObj, baseObj, &resObj)!=TCL_OK) {
+    if (InvokeTclMethod(rcPtr, "seek", offObj, baseObj, &resObj) != TCL_OK) {
 	Tcl_SetChannelError(rcPtr->chan, resObj);
         goto invalid;
     }
@@ -1593,6 +1639,8 @@ ReflectWatch(
     ReflectedChannel *rcPtr = clientData;
     Tcl_Obj *maskObj;
 
+    /* ASSERT rcPtr->methods & FLAG(METH_WATCH) */
+
     /*
      * We restrict the interest to what the channel can support. IOW there
      * will never be write events for a channel which is not writable.
@@ -1635,7 +1683,7 @@ ReflectWatch(
 
     maskObj = DecodeEventMask(mask);
     /* assert maskObj.refCount == 1 */
-    (void) InvokeTclMethod(rcPtr, METH_WATCH, maskObj, NULL, NULL);
+    (void) InvokeTclMethod(rcPtr, "watch", maskObj, NULL, NULL);
     Tcl_DecrRefCount(maskObj);
 
     Tcl_Release(rcPtr);
@@ -1694,7 +1742,7 @@ ReflectBlock(
 
     Tcl_Preserve(rcPtr);
 
-    if (InvokeTclMethod(rcPtr,METH_BLOCKING,blockObj,NULL,&resObj)!=TCL_OK) {
+    if (InvokeTclMethod(rcPtr, "blocking", blockObj, NULL, &resObj)!=TCL_OK) {
 	Tcl_SetChannelError(rcPtr->chan, resObj);
 	errorNum = EINVAL;
     } else {
@@ -1806,7 +1854,7 @@ ReflectSetOption(
     Tcl_IncrRefCount(optionObj);
     Tcl_IncrRefCount(valueObj);
 
-    result = InvokeTclMethod(rcPtr, METH_CONFIGURE,optionObj,valueObj, &resObj);
+    result = InvokeTclMethod(rcPtr, "configure",optionObj,valueObj, &resObj);
     if (result != TCL_OK) {
 	UnmarshallErrorResult(interp, resObj);
     }
@@ -1851,7 +1899,7 @@ ReflectGetOption(
     Tcl_Obj *resObj;		/* Result data for 'configure' */
     int listc, result = TCL_OK;
     Tcl_Obj **listv;
-    MethodName method;
+    const char *method;
 
     /*
      * Are we in the correct thread?
@@ -1890,14 +1938,14 @@ ReflectGetOption(
 	 * Retrieve all options.
 	 */
 
-	method = METH_CGETALL;
+	method = "cgetall";
 	optionObj = NULL;
     } else {
 	/*
 	 * Retrieve the value of one option.
 	 */
 
-	method = METH_CGET;
+	method = "cget";
 	optionObj = Tcl_NewStringObj(optionName, -1);
         Tcl_IncrRefCount(optionObj);
     }
@@ -2111,13 +2159,16 @@ NewReflectedChannel(
     Tcl_Obj *handleObj)
 {
     ReflectedChannel *rcPtr;
-    MethodName mn = METH_BLOCKING;
+    int i, listc;
+    Tcl_Obj **listv;
 
     rcPtr = ckalloc(sizeof(ReflectedChannel));
 
     /* rcPtr->chan: Assigned by caller. Dummy data here. */
+    /* rcPtr->methods: Assigned by caller. Dummy data here. */
 
     rcPtr->chan = NULL;
+    rcPtr->methods = 0;
     rcPtr->interp = interp;
     rcPtr->dead = 0;
 #ifdef TCL_THREADS
@@ -2126,17 +2177,54 @@ NewReflectedChannel(
     rcPtr->mode = mode;
     rcPtr->interest = 0;		/* Initially no interest registered */
 
+    /*
+     * Method placeholder.
+     */
+
     /* ASSERT: cmdpfxObj is a Tcl List */
-    rcPtr->cmd = TclListObjCopy(NULL, cmdpfxObj);
-    Tcl_IncrRefCount(rcPtr->cmd);
-    rcPtr->methods = Tcl_NewListObj(METH_WRITE + 1, NULL);
-    while (mn <= METH_WRITE) {
-	Tcl_ListObjAppendElement(NULL, rcPtr->methods,
-		Tcl_NewStringObj(methodNames[mn++], -1));
+
+    Tcl_ListObjGetElements(interp, cmdpfxObj, &listc, &listv);
+
+    /*
+     * See [==] as well.
+     * Storage for the command prefix and the additional words required for
+     * the invocation of methods in the command handler.
+     *
+     * listv [0] [listc-1] | [listc]  [listc+1] |
+     * argv  [0]   ... [.] | [argc-2] [argc-1]  | [argc]  [argc+2]
+     *       cmd   ... pfx | method   chan      | detail1 detail2
+     */
+
+    rcPtr->argc = listc + 2;
+    rcPtr->argv = ckalloc(sizeof(Tcl_Obj *) * (listc+4));
+
+    /*
+     * Duplicate object references.
+     */
+
+    for (i=0; i<listc ; i++) {
+	Tcl_Obj *word = rcPtr->argv[i] = listv[i];
+
+	Tcl_IncrRefCount(word);
     }
-    Tcl_IncrRefCount(rcPtr->methods);
-    rcPtr->name = handleObj;
-    Tcl_IncrRefCount(rcPtr->name);
+
+    i++;				/* Skip placeholder for method */
+
+    /*
+     * [Bug 1667990]: See [x] in FreeReflectedChannel for release
+     */
+
+    rcPtr->argv[i] = handleObj;
+    Tcl_IncrRefCount(handleObj);
+
+    /*
+     * The next two objects are kept empty, varying arguments.
+     */
+
+    /*
+     * Initialization complete.
+     */
+
     return rcPtr;
 }
 
@@ -2183,21 +2271,45 @@ NextHandle(void)
 }
 
 static void
+FreeReflectedChannelArgs(
+    ReflectedChannel *rcPtr)
+{
+    int i, n = rcPtr->argc - 2;
+
+    if (n < 0) {
+	return;
+    }
+    for (i=0; i<n; i++) {
+	Tcl_DecrRefCount(rcPtr->argv[i]);
+    }
+
+    /*
+     * [Bug 1667990]: See [x] in NewReflectedChannel for lock. n+1 = argc-1.
+     */
+
+    Tcl_DecrRefCount(rcPtr->argv[n+1]);
+
+    rcPtr->argc = 1;
+}
+
+static void
 FreeReflectedChannel(
     ReflectedChannel *rcPtr)
 {
     Channel *chanPtr = (Channel *) rcPtr->chan;
 
-    TclChannelRelease((Tcl_Channel)chanPtr);
-    if (rcPtr->name) {
-	Tcl_DecrRefCount(rcPtr->name);
-    }
-    if (rcPtr->methods) {
-	Tcl_DecrRefCount(rcPtr->methods);
-    }
-    if (rcPtr->cmd) {
-	Tcl_DecrRefCount(rcPtr->cmd);
+    if (chanPtr->typePtr != &tclRChannelType) {
+	/*
+	 * Delete a cloned ChannelType structure.
+	 */
+
+	ckfree(chanPtr->typePtr);
+	chanPtr->typePtr = NULL;
     }
+
+    FreeReflectedChannelArgs(rcPtr);
+
+    ckfree(rcPtr->argv);
     ckfree(rcPtr);
 }
 
@@ -2228,16 +2340,16 @@ FreeReflectedChannel(
 static int
 InvokeTclMethod(
     ReflectedChannel *rcPtr,
-    MethodName method,
+    const char *method,
     Tcl_Obj *argOneObj,		/* NULL'able */
     Tcl_Obj *argTwoObj,		/* NULL'able */
     Tcl_Obj **resultObjPtr)	/* NULL'able */
 {
+    int cmdc;			/* #words in constructed command */
     Tcl_Obj *methObj = NULL;	/* Method name in object form */
     Tcl_InterpState sr;		/* State of handler interp */
     int result;			/* Result code of method invokation */
     Tcl_Obj *resObj = NULL;	/* Result of method invokation. */
-    Tcl_Obj *cmd;
 
     if (rcPtr->dead) {
 	/*
@@ -2260,15 +2372,19 @@ InvokeTclMethod(
     }
 
     /*
-     * Insert method into the callback command, after the command prefix,
+     * NOTE (5): Decide impl. issue: Cache objects with method names? Needs
+     * TSD data as reflections can be created in many different threads.
+     * NO: Caching of command resolutions means storage per channel.
+     */
+
+    /*
+     * Insert method into the pre-allocated area, after the command prefix,
      * before the channel id.
      */
 
-    cmd = TclListObjCopy(NULL, rcPtr->cmd);
-
-    Tcl_ListObjIndex(NULL, rcPtr->methods, method, &methObj);
-    Tcl_ListObjAppendElement(NULL, cmd, methObj);
-    Tcl_ListObjAppendElement(NULL, cmd, rcPtr->name);
+    methObj = Tcl_NewStringObj(method, -1);
+    Tcl_IncrRefCount(methObj);
+    rcPtr->argv[rcPtr->argc - 2] = methObj;
 
     /*
      * Append the additional argument containing method specific details
@@ -2278,10 +2394,13 @@ InvokeTclMethod(
      * The objects will survive the Tcl_EvalObjv without change.
      */
 
+    cmdc = rcPtr->argc;
     if (argOneObj) {
-	Tcl_ListObjAppendElement(NULL, cmd, argOneObj);
+	rcPtr->argv[cmdc] = argOneObj;
+	cmdc++;
 	if (argTwoObj) {
-	    Tcl_ListObjAppendElement(NULL, cmd, argTwoObj);
+	    rcPtr->argv[cmdc] = argTwoObj;
+	    cmdc++;
 	}
     }
 
@@ -2290,10 +2409,9 @@ InvokeTclMethod(
      * existing state intact.
      */
 
-    Tcl_IncrRefCount(cmd);
     sr = Tcl_SaveInterpState(rcPtr->interp, 0 /* Dummy */);
     Tcl_Preserve(rcPtr->interp);
-    result = Tcl_EvalObjEx(rcPtr->interp, cmd, TCL_EVAL_GLOBAL);
+    result = Tcl_EvalObjv(rcPtr->interp, cmdc, rcPtr->argv, TCL_EVAL_GLOBAL);
 
     /*
      * We do not try to extract the result information if the caller has no
@@ -2319,6 +2437,7 @@ InvokeTclMethod(
 	     */
 
 	    if (result != TCL_ERROR) {
+		Tcl_Obj *cmd = Tcl_NewListObj(cmdc, rcPtr->argv);
 		int cmdLen;
 		const char *cmdString = Tcl_GetStringFromObj(cmd, &cmdLen);
 
@@ -2332,16 +2451,24 @@ InvokeTclMethod(
 		result = TCL_ERROR;
 	    }
 	    Tcl_AppendObjToErrorInfo(rcPtr->interp, Tcl_ObjPrintf(
-		    "\n    (chan handler subcommand \"%s\")",
-		    methodNames[method]));
+		    "\n    (chan handler subcommand \"%s\")", method));
 	    resObj = MarshallError(rcPtr->interp);
 	}
 	Tcl_IncrRefCount(resObj);
     }
-    Tcl_DecrRefCount(cmd);
     Tcl_RestoreInterpState(rcPtr->interp, sr);
     Tcl_Release(rcPtr->interp);
 
+    /*
+     * Cleanup of the dynamic parts of the command.
+     *
+     * The detail objects survived the Tcl_EvalObjv without change because of
+     * the contract. Therefore there is no need to decrement the refcounts. Only
+     * the internal method object has to be disposed of.
+     */
+
+    Tcl_DecrRefCount(methObj);
+
     /*
      * The resObj has a ref count of 1 at this location. This means that the
      * caller of InvokeTclMethod has to dispose of it (but only if it was
@@ -2462,28 +2589,6 @@ GetReflectedChannelMap(
  *----------------------------------------------------------------------
  */
 
-static void
-MarkDead(
-    ReflectedChannel *rcPtr)
-{
-    if (rcPtr->dead) {
-	return;
-    }
-    if (rcPtr->name) {
-	Tcl_DecrRefCount(rcPtr->name);
-	rcPtr->name = NULL;
-    }
-    if (rcPtr->methods) {
-	Tcl_DecrRefCount(rcPtr->methods);
-	rcPtr->methods = NULL;
-    }
-    if (rcPtr->cmd) {
-	Tcl_DecrRefCount(rcPtr->cmd);
-	rcPtr->cmd = NULL;
-    }
-    rcPtr->dead = 1;
-}
-
 static void
 DeleteReflectedChannelMap(
     ClientData clientData,	/* The per-interpreter data structure. */
@@ -2519,7 +2624,7 @@ DeleteReflectedChannelMap(
 	chan = Tcl_GetHashValue(hPtr);
 	rcPtr = Tcl_GetChannelInstanceData(chan);
 
-	MarkDead(rcPtr);
+	rcPtr->dead = 1;
 	Tcl_DeleteHashEntry(hPtr);
     }
     Tcl_DeleteHashTable(&rcmPtr->map);
@@ -2552,11 +2657,6 @@ DeleteReflectedChannelMap(
 	/*
 	 * The receiver for the event exited, before processing the event. We
 	 * detach the result now, wake the originator up and signal failure.
-         *
-         * Attention: Results may have been detached already, by either the
-         * receiver, or this thread, as part of other parts in the thread
-         * teardown. Such results are ignored. See ticket [b47b176adf] for the
-         * identical race condition in Tcl 8.6 IORTrans.
 	 */
 
 	evPtr = resultPtr->evPtr;
@@ -2566,9 +2666,6 @@ DeleteReflectedChannelMap(
 	    continue;
 	}
 	paramPtr = evPtr->param;
-	if (!evPtr) {
-	    continue;
-	}
 
 	evPtr->resultPtr = NULL;
 	resultPtr->evPtr = NULL;
@@ -2602,7 +2699,8 @@ DeleteReflectedChannelMap(
 	    continue;
 	}
 
-	MarkDead(rcPtr);
+	rcPtr->dead = 1;
+	FreeReflectedChannelArgs(rcPtr);
 	Tcl_DeleteHashEntry(hPtr);
     }
 #endif
@@ -2699,11 +2797,6 @@ DeleteThreadReflectedChannelMap(
 	/*
 	 * The receiver for the event exited, before processing the event. We
 	 * detach the result now, wake the originator up and signal failure.
-         *
-         * Attention: Results may have been detached already, by either the
-         * receiver, or this thread, as part of other parts in the thread
-         * teardown. Such results are ignored. See ticket [b47b176adf] for the
-         * identical race condition in Tcl 8.6 IORTrans.
 	 */
 
 	evPtr = resultPtr->evPtr;
@@ -2713,9 +2806,6 @@ DeleteThreadReflectedChannelMap(
 	    continue;
 	}
 	paramPtr = evPtr->param;
-	if (!evPtr) {
-	    continue;
-	}
 
 	evPtr->resultPtr = NULL;
 	resultPtr->evPtr = NULL;
@@ -2749,7 +2839,8 @@ DeleteThreadReflectedChannelMap(
 	Tcl_Channel chan = Tcl_GetHashValue(hPtr);
 	ReflectedChannel *rcPtr = Tcl_GetChannelInstanceData(chan);
 
-	MarkDead(rcPtr);
+	rcPtr->dead = 1;
+	FreeReflectedChannelArgs(rcPtr);
 	Tcl_DeleteHashEntry(hPtr);
     }
     ckfree(rcmPtr);
@@ -2927,17 +3018,17 @@ ForwardProc(
 	 * call upon for the driver.
 	 */
 
-    case ForwardedClose: {
+    case ForwardedClose:
 	/*
 	 * No parameters/results.
 	 */
 
-	if (InvokeTclMethod(rcPtr, METH_FINAL, NULL, NULL, &resObj)!=TCL_OK) {
+	if (InvokeTclMethod(rcPtr, "finalize", NULL, NULL, &resObj)!=TCL_OK) {
 	    ForwardSetObjError(paramPtr, resObj);
 	}
 
 	/*
-	 * Freeing is done here, in the origin thread, callback command
+	 * Freeing is done here, in the origin thread, because the argv[]
 	 * objects belong to this thread. Deallocating them in a different
 	 * thread is not allowed
 	 *
@@ -2955,16 +3046,16 @@ ForwardProc(
 	hPtr = Tcl_FindHashEntry(&rcmPtr->map,
                 Tcl_GetChannelName(rcPtr->chan));
 	Tcl_DeleteHashEntry(hPtr);
-	MarkDead(rcPtr);
+
+	FreeReflectedChannelArgs(rcPtr);
 	break;
-    }
 
     case ForwardedInput: {
 	Tcl_Obj *toReadObj = Tcl_NewIntObj(paramPtr->input.toRead);
         Tcl_IncrRefCount(toReadObj);
 
         Tcl_Preserve(rcPtr);
-	if (InvokeTclMethod(rcPtr, METH_READ, toReadObj, NULL, &resObj)!=TCL_OK){
+	if (InvokeTclMethod(rcPtr, "read", toReadObj, NULL, &resObj)!=TCL_OK){
 	    int code = ErrnoReturn(rcPtr, resObj);
 
 	    if (code < 0) {
@@ -3004,7 +3095,7 @@ ForwardProc(
         Tcl_IncrRefCount(bufObj);
 
         Tcl_Preserve(rcPtr);
-	if (InvokeTclMethod(rcPtr, METH_WRITE, bufObj, NULL, &resObj) != TCL_OK) {
+	if (InvokeTclMethod(rcPtr, "write", bufObj, NULL, &resObj) != TCL_OK) {
 	    int code = ErrnoReturn(rcPtr, resObj);
 
 	    if (code < 0) {
@@ -3047,7 +3138,7 @@ ForwardProc(
         Tcl_IncrRefCount(baseObj);
 
         Tcl_Preserve(rcPtr);
-	if (InvokeTclMethod(rcPtr, METH_SEEK, offObj, baseObj, &resObj)!=TCL_OK){
+	if (InvokeTclMethod(rcPtr, "seek", offObj, baseObj, &resObj)!=TCL_OK){
 	    ForwardSetObjError(paramPtr, resObj);
 	    paramPtr->seek.offset = -1;
 	} else {
@@ -3083,7 +3174,7 @@ ForwardProc(
         /* assert maskObj.refCount == 1 */
 
         Tcl_Preserve(rcPtr);
-	(void) InvokeTclMethod(rcPtr, METH_WATCH, maskObj, NULL, NULL);
+	(void) InvokeTclMethod(rcPtr, "watch", maskObj, NULL, NULL);
 	Tcl_DecrRefCount(maskObj);
         Tcl_Release(rcPtr);
 	break;
@@ -3094,7 +3185,7 @@ ForwardProc(
 
         Tcl_IncrRefCount(blockObj);
         Tcl_Preserve(rcPtr);
-	if (InvokeTclMethod(rcPtr, METH_BLOCKING, blockObj, NULL,
+	if (InvokeTclMethod(rcPtr, "blocking", blockObj, NULL,
                 &resObj) != TCL_OK) {
 	    ForwardSetObjError(paramPtr, resObj);
 	}
@@ -3110,7 +3201,7 @@ ForwardProc(
         Tcl_IncrRefCount(optionObj);
         Tcl_IncrRefCount(valueObj);
         Tcl_Preserve(rcPtr);
-	if (InvokeTclMethod(rcPtr, METH_CONFIGURE, optionObj, valueObj,
+	if (InvokeTclMethod(rcPtr, "configure", optionObj, valueObj,
                 &resObj) != TCL_OK) {
 	    ForwardSetObjError(paramPtr, resObj);
 	}
@@ -3129,7 +3220,7 @@ ForwardProc(
 
         Tcl_IncrRefCount(optionObj);
         Tcl_Preserve(rcPtr);
-	if (InvokeTclMethod(rcPtr, METH_CGET, optionObj, NULL, &resObj)!=TCL_OK){
+	if (InvokeTclMethod(rcPtr, "cget", optionObj, NULL, &resObj)!=TCL_OK){
 	    ForwardSetObjError(paramPtr, resObj);
 	} else {
 	    TclDStringAppendObj(paramPtr->getOpt.value, resObj);
@@ -3145,7 +3236,7 @@ ForwardProc(
 	 */
 
         Tcl_Preserve(rcPtr);
-	if (InvokeTclMethod(rcPtr, METH_CGETALL, NULL, NULL, &resObj) != TCL_OK){
+	if (InvokeTclMethod(rcPtr, "cgetall", NULL, NULL, &resObj) != TCL_OK){
 	    ForwardSetObjError(paramPtr, resObj);
 	} else {
 	    /*

generic/tclIORTrans.c

@@ -457,7 +457,8 @@ static void		TimerKill(ReflectedTransform *rtPtr);
 static void		TimerSetup(ReflectedTransform *rtPtr);
 static void		TimerRun(ClientData clientData);
 static int		TransformRead(ReflectedTransform *rtPtr,
-			    int *errorCodePtr, Tcl_Obj *bufObj);
+			    int *errorCodePtr, unsigned char *buf,
+			    int toRead);
 static int		TransformWrite(ReflectedTransform *rtPtr,
 			    int *errorCodePtr, unsigned char *buf,
 			    int toWrite);
@@ -1062,7 +1063,6 @@ ReflectInput(
 {
     ReflectedTransform *rtPtr = clientData;
     int gotBytes, copied, readBytes;
-    Tcl_Obj *bufObj;
 
     /*
      * The following check can be done before thread redirection, because we
@@ -1078,9 +1078,6 @@ ReflectInput(
 
     Tcl_Preserve(rtPtr);
 
-    /* TODO: Consider a more appropriate buffer size. */
-    bufObj = Tcl_NewByteArrayObj(NULL, toRead);
-    Tcl_IncrRefCount(bufObj);
     gotBytes = 0;
     while (toRead > 0) {
 	/*
@@ -1132,40 +1129,52 @@ ReflectInput(
 	    goto stop;
 	}
 
-
-	readBytes = Tcl_ReadRaw(rtPtr->parent,
-		(char *) Tcl_SetByteArrayLength(bufObj, toRead), toRead);
+	readBytes = Tcl_ReadRaw(rtPtr->parent, buf, toRead);
 	if (readBytes < 0) {
-	    if (Tcl_InputBlocked(rtPtr->parent) && (gotBytes > 0)) {
+	    /*
+	     * Report errors to caller. The state of the seek system is
+	     * unchanged!
+	     */
 
+	    if ((Tcl_GetErrno() == EAGAIN) && (gotBytes > 0)) {
 		/*
-		 * Down channel is blocked and offers zero additional bytes.
-		 * The nonzero gotBytes already returned makes the total
-		 * operation a valid short read.  Return to caller.
+		 * EAGAIN is a special situation. If we had some data before
+		 * we report that instead of the request to re-try.
 		 */
 
 		goto stop;
 	    }
 
-	    /*
-	     * Either the down channel is not blocked (a real error)
-	     * or it is and there are gotBytes==0 byte copied so far.
-	     * In either case, pass up the error, so we either report
-	     * any real error, or do not mistakenly signal EOF by
-	     * returning 0 to the caller.
-	     */
-
 	    *errorCodePtr = Tcl_GetErrno();
 	    goto error;
 	}
 
 	if (readBytes == 0) {
-
 	    /*
-	     * Zero returned from Tcl_ReadRaw() always indicates EOF
-	     * on the down channel.
+	     * Check wether we hit on EOF in 'parent' or not. If not
+	     * differentiate between blocking and non-blocking modes. In
+	     * non-blocking mode we ran temporarily out of data. Signal this
+	     * to the caller via EWOULDBLOCK and error return (-1). In the
+	     * other cases we simply return what we got and let the caller
+	     * wait for more. On the other hand, if we got an EOF we have to
+	     * convert and flush all waiting partial data.
 	     */
-	
+
+	    if (!Tcl_Eof(rtPtr->parent)) {
+		/*
+		 * The state of the seek system is unchanged!
+		 */
+
+		if ((gotBytes == 0) && rtPtr->nonblocking) {
+		    *errorCodePtr = EWOULDBLOCK;
+		    goto error;
+		}
+		goto stop;
+	    } else {
+		/*
+		 * Eof in parent.
+		 */
+
 		if (rtPtr->readIsDrained) {
 		    goto stop;
 		}
@@ -1189,7 +1198,13 @@ ReflectInput(
 		    goto stop;
 		}
 
+		/*
+		 * Reset eof, force caller to drain result buffer.
+		 */
+
+		((Channel *) rtPtr->parent)->state->flags &= ~CHANNEL_EOF;
 		continue; /* at: while (toRead > 0) */
+	    }
 	} /* readBytes == 0 */
 
 	/*
@@ -1198,20 +1213,12 @@ ReflectInput(
 	 * iteration will put it into the result.
 	 */
 
-	Tcl_SetByteArrayLength(bufObj, readBytes);
-	if (!TransformRead(rtPtr, errorCodePtr, bufObj)) {
+	if (!TransformRead(rtPtr, errorCodePtr, UCHARP(buf), readBytes)) {
 	    goto error;
 	}
-	if (Tcl_IsShared(bufObj)) {
-	    Tcl_DecrRefCount(bufObj);
-	    bufObj = Tcl_NewObj();
-	    Tcl_IncrRefCount(bufObj);
-	}
-	Tcl_SetByteArrayLength(bufObj, 0);
     } /* while toRead > 0 */
 
  stop:
-    Tcl_DecrRefCount(bufObj);
     Tcl_Release(rtPtr);
     return gotBytes;
 
@@ -2003,7 +2010,6 @@ InvokeTclMethod(
 
     sr = Tcl_SaveInterpState(rtPtr->interp, 0 /* Dummy */);
     Tcl_Preserve(rtPtr);
-    Tcl_Preserve(rtPtr->interp);
     result = Tcl_EvalObjv(rtPtr->interp, cmdc, rtPtr->argv, TCL_EVAL_GLOBAL);
 
     /*
@@ -2048,7 +2054,6 @@ InvokeTclMethod(
 	Tcl_IncrRefCount(resObj);
     }
     Tcl_RestoreInterpState(rtPtr->interp, sr);
-    Tcl_Release(rtPtr->interp);
     Tcl_Release(rtPtr);
 
     /*
@@ -2225,9 +2230,6 @@ DeleteReflectedTransformMap(
 	 */
 
 	evPtr = resultPtr->evPtr;
-	if (evPtr == NULL) {
-	    continue;
-	}
 	paramPtr = evPtr->param;
 
 	evPtr->resultPtr = NULL;
@@ -2353,9 +2355,6 @@ DeleteThreadReflectedTransformMap(
 	 */
 
 	evPtr = resultPtr->evPtr;
-	if (evPtr == NULL) {
-	    continue;
-	}
 	paramPtr = evPtr->param;
 
 	evPtr->resultPtr = NULL;
@@ -3066,8 +3065,10 @@ static int
 TransformRead(
     ReflectedTransform *rtPtr,
     int *errorCodePtr,
-    Tcl_Obj *bufObj)
+    unsigned char *buf,
+    int toRead)
 {
+    Tcl_Obj *bufObj;
     Tcl_Obj *resObj;
     int bytec;			/* Number of returned bytes */
     unsigned char *bytev;	/* Array of returned bytes */
@@ -3080,8 +3081,8 @@ TransformRead(
     if (rtPtr->thread != Tcl_GetCurrentThread()) {
 	ForwardParam p;
 
-	p.transform.buf = (char *) Tcl_GetByteArrayFromObj(bufObj,
-		&(p.transform.size));
+	p.transform.buf = (char *) buf;
+	p.transform.size = toRead;
 
 	ForwardOpToOwnerThread(rtPtr, ForwardedInput, &p);
 
@@ -3101,8 +3102,12 @@ TransformRead(
     /* ASSERT: rtPtr->method & FLAG(METH_READ) */
     /* ASSERT: rtPtr->mode & TCL_READABLE */
 
+    bufObj = Tcl_NewByteArrayObj((unsigned char *) buf, toRead);
+    Tcl_IncrRefCount(bufObj);
+
     if (InvokeTclMethod(rtPtr, "read", bufObj, NULL, &resObj) != TCL_OK) {
 	Tcl_SetChannelError(rtPtr->chan, resObj);
+	Tcl_DecrRefCount(bufObj);
 	Tcl_DecrRefCount(resObj);	/* Remove reference held from invoke */
 	*errorCodePtr = EINVAL;
 	return 0;
@@ -3111,6 +3116,7 @@ TransformRead(
     bytev = Tcl_GetByteArrayFromObj(resObj, &bytec);
     ResultAdd(&rtPtr->result, bytev, bytec);
 
+    Tcl_DecrRefCount(bufObj);
     Tcl_DecrRefCount(resObj);		/* Remove reference held from invoke */
     return 1;
 }
@@ -3178,7 +3184,7 @@ TransformWrite(
     }
 
     if (res < 0) {
-	*errorCodePtr = Tcl_GetErrno();
+	*errorCodePtr = EINVAL;
 	return 0;
     }
 
@@ -3288,7 +3294,7 @@ TransformFlush(
     }
 
     if (res < 0) {
-	*errorCodePtr = Tcl_GetErrno();
+	*errorCodePtr = EINVAL;
 	return 0;
     }
 

generic/tclIOUtil.c

@@ -24,12 +24,6 @@
 #endif
 #include "tclFileSystem.h"
 
-#ifdef TCL_TEMPLOAD_NO_UNLINK
-#ifndef NO_FSTATFS
-#include <sys/statfs.h>
-#endif
-#endif
-
 /*
  * struct FilesystemRecord --
  *
@@ -3116,82 +3110,6 @@ Tcl_FSLoadFile(
  *----------------------------------------------------------------------
  */
 
-/*
- * Workaround for issue with modern HPUX which do allow the unlink (no ETXTBSY
- * error) yet somehow trash some internal data structures which prevents the
- * second and further shared libraries from getting properly loaded. Only the
- * first is ok. We try to get around the issue by not unlinking,
- * i.e. emulating the behaviour of the older HPUX which denied removal.
- *
- * Doing the unlink is also an issue within docker containers, whose AUFS
- * bungles this as well, see
- *     https://github.com/dotcloud/docker/issues/1911
- *
- * For these situations the change below makes the execution of the unlink
- * semi-controllable at runtime.
- *
- *     An AUFS filesystem (if it can be detected) will force avoidance of
- *     unlink. The env variable TCL_TEMPLOAD_NO_UNLINK allows detection of a
- *     users general request (unlink and not.
- *
- * By default the unlink is done (if not in AUFS). However if the variable is
- * present and set to true (any integer > 0) then the unlink is skipped.
- */
-
-int
-TclSkipUnlink (Tcl_Obj* shlibFile)
-{
-    /* Order of testing:
-     * 1. On hpux we generally want to skip unlink in general
-     *
-     * Outside of hpux then:
-     * 2. For a general user request   (TCL_TEMPLOAD_NO_UNLINK present, non-empty, => int)
-     * 3. For general AUFS environment (statfs, if available).
-     *
-     * Ad 2: This variable can disable/override the AUFS detection, i.e. for
-     * testing if a newer AUFS does not have the bug any more.
-     * 
-     * Ad 3: This is conditionally compiled in. Condition currently must be set manually.
-     *       This part needs proper tests in the configure(.in).
-     */
-
-#ifdef hpux
-    return 1;
-#else
-    char* skipstr;
-
-    skipstr = getenv ("TCL_TEMPLOAD_NO_UNLINK");
-    if (skipstr && (skipstr[0] != '\0')) {
-	return atoi(skipstr);
-    }
-
-#ifdef TCL_TEMPLOAD_NO_UNLINK
-#ifndef NO_FSTATFS
-    {
-	struct statfs fs;
-	/* Have fstatfs. May not have the AUFS super magic ... Indeed our build
-	 * box is too old to have it directly in the headers. Define taken from
-	 *     http://mooon.googlecode.com/svn/trunk/linux_include/linux/aufs_type.h
-	 *     http://aufs.sourceforge.net/
-	 * Better reference will be gladly taken.
-	 */
-#ifndef AUFS_SUPER_MAGIC
-#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
-#endif /* AUFS_SUPER_MAGIC */
-	if ((statfs(Tcl_GetString (shlibFile), &fs) == 0) &&
-	    (fs.f_type == AUFS_SUPER_MAGIC)) {
-	    return 1;
-	}
-    }
-#endif /* ... NO_FSTATFS */
-#endif /* ... TCL_TEMPLOAD_NO_UNLINK */
-
-    /* Fallback: !hpux, no EV override, no AUFS (detection, nor detected):
-     * Don't skip */
-    return 0;
-#endif /* hpux */
-}
-
 int
 Tcl_LoadFile(
     Tcl_Interp *interp,		/* Used for error reporting. */
@@ -3382,9 +3300,7 @@ Tcl_LoadFile(
      * avoids any worries about leaving the copy laying around on exit.
      */
 
-    if (
-	!TclSkipUnlink (copyToPtr) &&
-	(Tcl_FSDeleteFile(copyToPtr) == TCL_OK)) {
+    if (Tcl_FSDeleteFile(copyToPtr) == TCL_OK) {
 	Tcl_DecrRefCount(copyToPtr);
 
 	/*

generic/tclInt.h

@@ -2452,30 +2452,6 @@ typedef struct List {
     TclGetIntForIndex(interp, objPtr, ignore, idxPtr)
 #endif
 
-/*
- * Macro used to save a function call for common uses of
- * Tcl_GetWideIntFromObj(). The ANSI C "prototype" is:
- *
- * MODULE_SCOPE int TclGetWideIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
- *			Tcl_WideInt *wideIntPtr);
- */
-
-#ifdef TCL_WIDE_INT_IS_LONG
-#define TclGetWideIntFromObj(interp, objPtr, wideIntPtr) \
-    (((objPtr)->typePtr == &tclIntType)					\
-	? (*(wideIntPtr) = (Tcl_WideInt)				\
-		((objPtr)->internalRep.longValue), TCL_OK) :		\
-	Tcl_GetWideIntFromObj((interp), (objPtr), (wideIntPtr)))
-#else /* !TCL_WIDE_INT_IS_LONG */
-#define TclGetWideIntFromObj(interp, objPtr, wideIntPtr)		\
-    (((objPtr)->typePtr == &tclWideIntType)				\
-	? (*(wideIntPtr) = (objPtr)->internalRep.wideValue, TCL_OK) :	\
-    ((objPtr)->typePtr == &tclIntType)					\
-	? (*(wideIntPtr) = (Tcl_WideInt)				\
-		((objPtr)->internalRep.longValue), TCL_OK) :		\
-	Tcl_GetWideIntFromObj((interp), (objPtr), (wideIntPtr)))
-#endif /* TCL_WIDE_INT_IS_LONG */
-
 /*
  * Flag values for TclTraceDictPath().
  *
@@ -2864,8 +2840,6 @@ MODULE_SCOPE int	TclByteArrayMatch(const unsigned char *string,
 			    int strLen, const unsigned char *pattern,
 			    int ptnLen, int flags);
 MODULE_SCOPE double	TclCeil(const mp_int *a);
-MODULE_SCOPE void	TclChannelPreserve(Tcl_Channel chan);
-MODULE_SCOPE void	TclChannelRelease(Tcl_Channel chan);
 MODULE_SCOPE int	TclCheckBadOctal(Tcl_Interp *interp,
 			    const char *value);
 MODULE_SCOPE int	TclChanCaughtErrorBypass(Tcl_Interp *interp,
@@ -2883,10 +2857,6 @@ MODULE_SCOPE void	TclContinuationsCopy(Tcl_Obj *objPtr,
 MODULE_SCOPE int	TclConvertElement(const char *src, int length,
 			    char *dst, int flags);
 MODULE_SCOPE void	TclDeleteNamespaceVars(Namespace *nsPtr);
-MODULE_SCOPE int	TclFindDictElement(Tcl_Interp *interp,
-			    const char *dict, int dictLength,
-			    const char **elementPtr, const char **nextPtr,
-			    int *sizePtr, int *literalPtr);
 /* TIP #280 - Modified token based evulation, with line information. */
 MODULE_SCOPE int	TclEvalEx(Tcl_Interp *interp, const char *script,
 			    int numBytes, int flags, int line,
@@ -2926,7 +2896,6 @@ MODULE_SCOPE void	TclFinalizeObjects(void);
 MODULE_SCOPE void	TclFinalizePreserve(void);
 MODULE_SCOPE void	TclFinalizeSynchronization(void);
 MODULE_SCOPE void	TclFinalizeThreadAlloc(void);
-MODULE_SCOPE void	TclFinalizeThreadAllocThread(void);
 MODULE_SCOPE void	TclFinalizeThreadData(void);
 MODULE_SCOPE void	TclFinalizeThreadObjects(void);
 MODULE_SCOPE double	TclFloor(const mp_int *a);
@@ -2952,8 +2921,6 @@ MODULE_SCOPE int	TclGetOpenModeEx(Tcl_Interp *interp,
 MODULE_SCOPE Tcl_Obj *	TclGetProcessGlobalValue(ProcessGlobalValue *pgvPtr);
 MODULE_SCOPE Tcl_Obj *	TclGetSourceFromFrame(CmdFrame *cfPtr, int objc,
 			    Tcl_Obj *const objv[]);
-MODULE_SCOPE char *	TclGetStringStorage(Tcl_Obj *objPtr,
-			    unsigned int *sizePtr);
 MODULE_SCOPE int	TclGlob(Tcl_Interp *interp, char *pattern,
 			    Tcl_Obj *unquotedPrefix, int globFlags,
 			    Tcl_GlobTypeData *types);
@@ -3646,9 +3613,6 @@ MODULE_SCOPE int	TclCompileReturnCmd(Tcl_Interp *interp,
 MODULE_SCOPE int	TclCompileSetCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclCompileStringCatCmd(Tcl_Interp *interp,
-			    Tcl_Parse *parsePtr, Command *cmdPtr,
-			    struct CompileEnv *envPtr);
 MODULE_SCOPE int	TclCompileStringCmpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);

generic/tclIntPlatDecls.h

@@ -550,15 +550,9 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 #undef TclpInetNtoa
 #define TclpInetNtoa inet_ntoa
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(__CYGWIN__)
 #   undef TclWinNToHS
-#   undef TclWinGetServByName
-#   undef TclWinGetSockOpt
-#   undef TclWinSetSockOpt
 #   define TclWinNToHS ntohs
-#   define TclWinGetServByName getservbyname
-#   define TclWinGetSockOpt getsockopt
-#   define TclWinSetSockOpt setsockopt
 #else
 #   undef TclpGetPid
 #   define TclpGetPid(pid) ((unsigned long) (pid))

generic/tclLoadNone.c

@@ -104,9 +104,7 @@ TclpLoadMemory(
     int size,			/* Dummy: unused by this implementation */
     int codeSize,		/* Dummy: unused by this implementation */
     Tcl_LoadHandle *loadHandle,	/* Dummy: unused by this implementation */
-    Tcl_FSUnloadFileProc **unloadProcPtr,
-				/* Dummy: unused by this implementation */
-    int flags)
+    Tcl_FSUnloadFileProc **unloadProcPtr)
 				/* Dummy: unused by this implementation */
 {
     Tcl_SetObjResult(interp, Tcl_NewStringObj("dynamic loading from memory "

generic/tclOO.c

@@ -394,7 +394,6 @@ InitFoundation(
     fPtr->classCls->flags |= ROOT_CLASS;
     TclOOAddToInstances(fPtr->objectCls->thisPtr, fPtr->classCls);
     TclOOAddToInstances(fPtr->classCls->thisPtr, fPtr->classCls);
-    TclOOAddToSubclasses(fPtr->classCls, fPtr->objectCls);
     AddRef(fPtr->objectCls->thisPtr);
     AddRef(fPtr->objectCls);
 
@@ -1009,12 +1008,6 @@ ReleaseClassContents(
 	    }
 	    if (!Deleted(instancePtr)) {
 		Tcl_DeleteCommandFromToken(interp, instancePtr->command);
-		/*
-		 * Tcl_DeleteCommandFromToken() may have done to whole
-		 * job for us.  Roll back and check again.
-		 */
-		i--;
-		continue;
 	    }
 	    DelRef(instancePtr);
 	}
@@ -1287,7 +1280,6 @@ TclOORemoveFromInstances(
 
   removeInstance:
     if (Deleted(clsPtr->thisPtr)) {
-	DelRef(clsPtr->instances.list[i]);
 	clsPtr->instances.list[i] = NULL;
     } else {
 	clsPtr->instances.num--;

generic/tclOO.h

@@ -24,7 +24,7 @@
  * win/tclooConfig.sh
  */
 
-#define TCLOO_VERSION "1.0.2"
+#define TCLOO_VERSION "1.0.1"
 #define TCLOO_PATCHLEVEL TCLOO_VERSION
 
 #include "tcl.h"

generic/tclOOCall.c

@@ -38,12 +38,6 @@ struct ChainBuilder {
 #define DEFINITE_PUBLIC    0x200000
 #define KNOWN_STATE	   (DEFINITE_PROTECTED | DEFINITE_PUBLIC)
 #define SPECIAL		   (CONSTRUCTOR | DESTRUCTOR | FORCE_UNKNOWN)
-#define BUILDING_MIXINS	   0x400000
-#define TRAVERSED_MIXIN	   0x800000
-#define OBJECT_MIXIN	   0x1000000
-#define MIXIN_CONSISTENT(flags) \
-    (((flags) & OBJECT_MIXIN) ||					\
-	!((flags) & BUILDING_MIXINS) == !((flags) & TRAVERSED_MIXIN))
 
 /*
  * Function declarations for things defined in this file.
@@ -51,13 +45,13 @@ struct ChainBuilder {
 
 static void		AddClassFiltersToCallContext(Object *const oPtr,
 			    Class *clsPtr, struct ChainBuilder *const cbPtr,
-			    Tcl_HashTable *const doneFilters, int flags);
+			    Tcl_HashTable *const doneFilters);
 static void		AddClassMethodNames(Class *clsPtr, const int flags,
 			    Tcl_HashTable *const namesPtr);
 static inline void	AddMethodToCallChain(Method *const mPtr,
 			    struct ChainBuilder *const cbPtr,
 			    Tcl_HashTable *const doneFilters,
-			    Class *const filterDecl, int flags);
+			    Class *const filterDecl);
 static inline void	AddSimpleChainToCallContext(Object *const oPtr,
 			    Tcl_Obj *const methodNameObj,
 			    struct ChainBuilder *const cbPtr,
@@ -156,7 +150,7 @@ void
 TclOODeleteChain(
     CallChain *callPtr)
 {
-    if (callPtr == NULL || --callPtr->refCount >= 1) {
+    if (--callPtr->refCount >= 1) {
 	return;
     }
     if (callPtr->chain != callPtr->staticChain) {
@@ -440,7 +434,7 @@ TclOOGetSortedMethodList(
 
     AddClassMethodNames(oPtr->selfCls, flags, &names);
     FOREACH(mixinPtr, oPtr->mixins) {
-	AddClassMethodNames(mixinPtr, flags|TRAVERSED_MIXIN, &names);
+	AddClassMethodNames(mixinPtr, flags, &names);
     }
 
     /*
@@ -604,7 +598,7 @@ AddClassMethodNames(
 
 	/* TODO: Beware of infinite loops! */
 	FOREACH(mixinPtr, clsPtr->mixins) {
-	    AddClassMethodNames(mixinPtr, flags|TRAVERSED_MIXIN, namesPtr);
+	    AddClassMethodNames(mixinPtr, flags, namesPtr);
 	}
     }
 
@@ -701,13 +695,13 @@ AddSimpleChainToCallContext(
 
 	FOREACH(mixinPtr, oPtr->mixins) {
 	    AddSimpleClassChainToCallContext(mixinPtr, methodNameObj, cbPtr,
-		    doneFilters, flags|TRAVERSED_MIXIN, filterDecl);
+		    doneFilters, flags, filterDecl);
 	}
 	if (oPtr->methodsPtr) {
 	    hPtr = Tcl_FindHashEntry(oPtr->methodsPtr, (char*) methodNameObj);
 	    if (hPtr != NULL) {
 		AddMethodToCallChain(Tcl_GetHashValue(hPtr), cbPtr,
-			doneFilters, filterDecl, flags);
+			doneFilters, filterDecl);
 	    }
 	}
     }
@@ -738,15 +732,9 @@ AddMethodToCallChain(
 				 * processed. If NULL, not processing filters.
 				 * Note that this function does not update
 				 * this hashtable. */
-    Class *const filterDecl,	/* The class that declared the filter. If
+    Class *const filterDecl)	/* The class that declared the filter. If
 				 * NULL, either the filter was declared by the
 				 * object or this isn't a filter. */
-    int flags)			/* Used to check if we're mixin-consistent
-				 * only. Mixin-consistent means that either
-				 * we're looking to add things from a mixin
-				 * and we have passed a mixin, or we're not
-				 * looking to add things from a mixin and have
-				 * not passed a mixin. */
 {
     register CallChain *callPtr = cbPtr->callChainPtr;
     int i;
@@ -755,11 +743,9 @@ AddMethodToCallChain(
      * Return if this is just an entry used to record whether this is a public
      * method. If so, there's nothing real to call and so nothing to add to
      * the call chain.
-     *
-     * This is also where we enforce mixin-consistency.
      */
 
-    if (mPtr == NULL || mPtr->typePtr == NULL || !MIXIN_CONSISTENT(flags)) {
+    if (mPtr == NULL || mPtr->typePtr == NULL) {
 	return;
     }
 
@@ -1014,8 +1000,6 @@ TclOOGetCallContext(
      */
 
     if (flags & FORCE_UNKNOWN) {
-	AddSimpleChainToCallContext(oPtr, oPtr->fPtr->unknownMethodNameObj,
-		&cb, NULL, BUILDING_MIXINS, NULL);
 	AddSimpleChainToCallContext(oPtr, oPtr->fPtr->unknownMethodNameObj,
 		&cb, NULL, 0, NULL);
 	callPtr->flags |= OO_UNKNOWN_METHOD;
@@ -1040,32 +1024,21 @@ TclOOGetCallContext(
 	doFilters = 1;
 	Tcl_InitObjHashTable(&doneFilters);
 	FOREACH(mixinPtr, oPtr->mixins) {
-	    AddClassFiltersToCallContext(oPtr, mixinPtr, &cb, &doneFilters,
-		    TRAVERSED_MIXIN|BUILDING_MIXINS|OBJECT_MIXIN);
-	    AddClassFiltersToCallContext(oPtr, mixinPtr, &cb, &doneFilters,
-		    OBJECT_MIXIN);
+	    AddClassFiltersToCallContext(oPtr, mixinPtr, &cb, &doneFilters);
 	}
 	FOREACH(filterObj, oPtr->filters) {
-	    AddSimpleChainToCallContext(oPtr, filterObj, &cb, &doneFilters,
-		    BUILDING_MIXINS, NULL);
 	    AddSimpleChainToCallContext(oPtr, filterObj, &cb, &doneFilters, 0,
 		    NULL);
 	}
-	AddClassFiltersToCallContext(oPtr, oPtr->selfCls, &cb, &doneFilters,
-		BUILDING_MIXINS);
-	AddClassFiltersToCallContext(oPtr, oPtr->selfCls, &cb, &doneFilters,
-		0);
+	AddClassFiltersToCallContext(oPtr, oPtr->selfCls, &cb, &doneFilters);
 	Tcl_DeleteHashTable(&doneFilters);
     }
     count = cb.filterLength = callPtr->numChain;
 
     /*
-     * Add the actual method implementations. We have to do this twice to
-     * handle class mixins right.
+     * Add the actual method implementations.
      */
 
-    AddSimpleChainToCallContext(oPtr, methodNameObj, &cb, NULL,
-	    flags|BUILDING_MIXINS, NULL);
     AddSimpleChainToCallContext(oPtr, methodNameObj, &cb, NULL, flags, NULL);
 
     /*
@@ -1084,8 +1057,6 @@ TclOOGetCallContext(
 	    TclOODeleteChain(callPtr);
 	    return NULL;
 	}
-	AddSimpleChainToCallContext(oPtr, oPtr->fPtr->unknownMethodNameObj,
-		&cb, NULL, BUILDING_MIXINS, NULL);
 	AddSimpleChainToCallContext(oPtr, oPtr->fPtr->unknownMethodNameObj,
 		&cb, NULL, 0, NULL);
 	callPtr->flags |= OO_UNKNOWN_METHOD;
@@ -1230,9 +1201,7 @@ TclOOGetStereotypeCallChain(
      */
 
     Tcl_InitObjHashTable(&doneFilters);
-    AddClassFiltersToCallContext(&obj, clsPtr, &cb, &doneFilters,
-	    BUILDING_MIXINS);
-    AddClassFiltersToCallContext(&obj, clsPtr, &cb, &doneFilters, 0);
+    AddClassFiltersToCallContext(&obj, clsPtr, &cb, &doneFilters);
     Tcl_DeleteHashTable(&doneFilters);
     count = cb.filterLength = callPtr->numChain;
 
@@ -1240,8 +1209,6 @@ TclOOGetStereotypeCallChain(
      * Add the actual method implementations.
      */
 
-    AddSimpleChainToCallContext(&obj, methodNameObj, &cb, NULL,
-	    flags|BUILDING_MIXINS, NULL);
     AddSimpleChainToCallContext(&obj, methodNameObj, &cb, NULL, flags, NULL);
 
     /*
@@ -1251,8 +1218,6 @@ TclOOGetStereotypeCallChain(
      */
 
     if (count == callPtr->numChain) {
-	AddSimpleChainToCallContext(&obj, fPtr->unknownMethodNameObj, &cb,
-		NULL, BUILDING_MIXINS, NULL);
 	AddSimpleChainToCallContext(&obj, fPtr->unknownMethodNameObj, &cb,
 		NULL, 0, NULL);
 	callPtr->flags |= OO_UNKNOWN_METHOD;
@@ -1294,15 +1259,12 @@ AddClassFiltersToCallContext(
     Class *clsPtr,		/* Class to get the filters from. */
     struct ChainBuilder *const cbPtr,
 				/* Context to fill with call chain entries. */
-    Tcl_HashTable *const doneFilters,
+    Tcl_HashTable *const doneFilters)
 				/* Where to record what filters have been
 				 * processed. Keys are objects, values are
 				 * ignored. */
-    int flags)			/* Whether we've gone along a mixin link
-				 * yet. */
 {
-    int i, clearedFlags =
-	    flags & ~(TRAVERSED_MIXIN|OBJECT_MIXIN|BUILDING_MIXINS);
+    int i;
     Class *superPtr, *mixinPtr;
     Tcl_Obj *filterObj;
 
@@ -1317,8 +1279,7 @@ AddClassFiltersToCallContext(
      */
 
     FOREACH(mixinPtr, clsPtr->mixins) {
-	AddClassFiltersToCallContext(oPtr, mixinPtr, cbPtr, doneFilters,
-		flags|TRAVERSED_MIXIN);
+	AddClassFiltersToCallContext(oPtr, mixinPtr, cbPtr, doneFilters);
     }
 
     /*
@@ -1327,18 +1288,13 @@ AddClassFiltersToCallContext(
      * override how filters work to extend their behaviour.
      */
 
-    if (MIXIN_CONSISTENT(flags)) {
-	FOREACH(filterObj, clsPtr->filters) {
-	    int isNew;
+    FOREACH(filterObj, clsPtr->filters) {
+	int isNew;
 
-	    (void) Tcl_CreateHashEntry(doneFilters, (char *) filterObj,
-		    &isNew);
-	    if (isNew) {
-		AddSimpleChainToCallContext(oPtr, filterObj, cbPtr,
-			doneFilters, clearedFlags|BUILDING_MIXINS, clsPtr);
-		AddSimpleChainToCallContext(oPtr, filterObj, cbPtr,
-			doneFilters, clearedFlags, clsPtr);
-	    }
+	(void) Tcl_CreateHashEntry(doneFilters, (char *) filterObj, &isNew);
+	if (isNew) {
+	    AddSimpleChainToCallContext(oPtr, filterObj, cbPtr, doneFilters,
+		    0, clsPtr);
 	}
     }
 
@@ -1352,8 +1308,7 @@ AddClassFiltersToCallContext(
 	goto tailRecurse;
     default:
 	FOREACH(superPtr, clsPtr->superclasses) {
-	    AddClassFiltersToCallContext(oPtr, superPtr, cbPtr, doneFilters,
-		    flags);
+	    AddClassFiltersToCallContext(oPtr, superPtr, cbPtr, doneFilters);
 	}
     case 0:
 	return;
@@ -1400,16 +1355,16 @@ AddSimpleClassChainToCallContext(
   tailRecurse:
     FOREACH(superPtr, classPtr->mixins) {
 	AddSimpleClassChainToCallContext(superPtr, methodNameObj, cbPtr,
-		doneFilters, flags|TRAVERSED_MIXIN, filterDecl);
+		doneFilters, flags, filterDecl);
     }
 
     if (flags & CONSTRUCTOR) {
 	AddMethodToCallChain(classPtr->constructorPtr, cbPtr, doneFilters,
-		filterDecl, flags);
+		filterDecl);
 
     } else if (flags & DESTRUCTOR) {
 	AddMethodToCallChain(classPtr->destructorPtr, cbPtr, doneFilters,
-		filterDecl, flags);
+		filterDecl);
     } else {
 	Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&classPtr->classMethods,
 		(char *) methodNameObj);
@@ -1428,7 +1383,7 @@ AddSimpleClassChainToCallContext(
 		    flags |= DEFINITE_PROTECTED;
 		}
 	    }
-	    AddMethodToCallChain(mPtr, cbPtr, doneFilters, filterDecl, flags);
+	    AddMethodToCallChain(mPtr, cbPtr, doneFilters, filterDecl);
 	}
     }
 

generic/tclPathObj.c

@@ -2437,13 +2437,19 @@ SetFsPathFromAny(
 		}
 		TclDecrRefCount(parts);
 	    } else {
-		Tcl_Obj *pair[2];
+		/*
+		 * Simple case. "rest" is relative path. Just join it. The
+		 * "rest" object will be freed when Tcl_FSJoinToPath returns
+		 * (unless something else claims a refCount on it).
+		 */
 
-		pair[0] = transPtr;
-		pair[1] = Tcl_NewStringObj(name+split+1, -1);
-		transPtr = TclJoinPath(2, pair);
-		Tcl_DecrRefCount(pair[0]);
-		Tcl_DecrRefCount(pair[1]);
+		Tcl_Obj *joined;
+		Tcl_Obj *rest = Tcl_NewStringObj(name+split+1, -1);
+
+		Tcl_IncrRefCount(transPtr);
+		joined = Tcl_FSJoinToPath(transPtr, 1, &rest);
+		TclDecrRefCount(transPtr);
+		transPtr = joined;
 	    }
 	}
     } else {

generic/tclStringObj.c

@@ -1123,8 +1123,7 @@ Tcl_AppendLimitedToObj(
 	if (ellipsis == NULL) {
 	    ellipsis = "...";
 	}
-	toCopy = (bytes == NULL) ? limit
-		: Tcl_UtfPrev(bytes+limit+1-strlen(ellipsis), bytes) - bytes;
+	toCopy = Tcl_UtfPrev(bytes+limit+1-strlen(ellipsis), bytes) - bytes;
     }
 
     /*
@@ -1436,7 +1435,7 @@ AppendUnicodeToUnicodeRep(
 	 * the reallocs below.
 	 */
 
-	if (unicode && unicode >= stringPtr->unicode
+	if (unicode >= stringPtr->unicode
 		&& unicode <= stringPtr->unicode + stringPtr->maxChars) {
 	    offset = unicode - stringPtr->unicode;
 	}
@@ -1458,10 +1457,8 @@ AppendUnicodeToUnicodeRep(
      * trailing null.
      */
 
-    if (unicode) {
-	memmove(stringPtr->unicode + stringPtr->numChars, unicode,
-		appendNumChars * sizeof(Tcl_UniChar));
-    }
+    memmove(stringPtr->unicode + stringPtr->numChars, unicode,
+	    appendNumChars * sizeof(Tcl_UniChar));
     stringPtr->unicode[numChars] = 0;
     stringPtr->numChars = numChars;
     stringPtr->allocated = 0;
@@ -1600,7 +1597,7 @@ AppendUtfToUtfRep(
 	 * the reallocs below.
 	 */
 
-	if (bytes && bytes >= objPtr->bytes
+	if (bytes >= objPtr->bytes
 		&& bytes <= objPtr->bytes + objPtr->length) {
 	    offset = bytes - objPtr->bytes;
 	}
@@ -1628,9 +1625,7 @@ AppendUtfToUtfRep(
     stringPtr->numChars = -1;
     stringPtr->hasUnicode = 0;
 
-    if (bytes) {
-	memmove(objPtr->bytes + oldLength, bytes, numBytes);
-    }
+    memmove(objPtr->bytes + oldLength, bytes, numBytes);
     objPtr->bytes[newLength] = 0;
     objPtr->length = newLength;
 }
@@ -2660,38 +2655,6 @@ Tcl_ObjPrintf(
     return objPtr;
 }
 
-/*
- *---------------------------------------------------------------------------
- *
- * TclGetStringStorage --
- *
- *	Returns the string storage space of a Tcl_Obj.
- *
- * Results:
- *	The pointer value objPtr->bytes is returned and the number of bytes
- *	allocated there is written to *sizePtr (if known).
- *
- * Side effects:
- *	May set objPtr->bytes.
- *
- *---------------------------------------------------------------------------
- */
-
-char *
-TclGetStringStorage(
-    Tcl_Obj *objPtr,
-    unsigned int *sizePtr)
-{
-    String *stringPtr;
-
-    if (objPtr->typePtr != &tclStringType || objPtr->bytes == NULL) {
-	return TclGetStringFromObj(objPtr, (int *)sizePtr);
-    }
-
-    stringPtr = GET_STRING(objPtr);
-    *sizePtr = stringPtr->allocated;
-    return objPtr->bytes;
-}
 /*
  *---------------------------------------------------------------------------
  *
@@ -2885,11 +2848,7 @@ ExtendUnicodeRepWithString(
     }
 
     stringPtr->hasUnicode = 1;
-    if (bytes) {
-	stringPtr->numChars = needed;
-    } else {
-	numAppendChars = 0;
-    }
+    stringPtr->numChars = needed;
     for (dst=stringPtr->unicode + numOrigChars; numAppendChars-- > 0; dst++) {
 	bytes += TclUtfToUniChar(bytes, dst);
     }

generic/tclStubInit.c

@@ -44,9 +44,6 @@
 #define TclBackgroundException Tcl_BackgroundException
 #undef Tcl_SetIntObj
 #undef TclpInetNtoa
-#undef TclWinGetServByName
-#undef TclWinGetSockOpt
-#undef TclWinSetSockOpt
 
 /* See bug 510001: TclSockMinimumBuffers needs plat imp */
 #ifdef _WIN64
@@ -114,8 +111,7 @@ TclpIsAtty(int fd)
     return isatty(fd);
 }
 
-#define TclWinGetPlatformId winGetPlatformId
-static int
+int
 TclWinGetPlatformId()
 {
     /* Don't bother to determine the real platform on cygwin,
@@ -131,31 +127,27 @@ void *TclWinGetTclInstance()
     return hInstance;
 }
 
-#define TclWinSetSockOpt winSetSockOpt
-static int
+int
 TclWinSetSockOpt(SOCKET s, int level, int optname,
 	    const char *optval, int optlen)
 {
     return setsockopt((int) s, level, optname, optval, optlen);
 }
 
-#define TclWinGetSockOpt winGetSockOpt
-static int
+int
 TclWinGetSockOpt(SOCKET s, int level, int optname,
 	    char *optval, int *optlen)
 {
     return getsockopt((int) s, level, optname, optval, optlen);
 }
 
-#define TclWinGetServByName winGetServByName
-static struct servent *
+struct servent *
 TclWinGetServByName(const char *name, const char *proto)
 {
     return getservbyname(name, proto);
 }
 
-#define TclWinNoBackslash winNoBackslash
-static char *
+char *
 TclWinNoBackslash(char *path)
 {
     char *p;
@@ -1412,7 +1404,6 @@ const TclStubs tclStubs = {
     Tcl_FindSymbol, /* 628 */
     Tcl_FSUnloadFile, /* 629 */
     Tcl_ZlibStreamSetCompressionDictionary, /* 630 */
-    Tcl_Zvfs_Boot, /* 631 */
 };
 
 /* !END!: Do not edit above this line. */

generic/tclTest.c

@@ -201,9 +201,8 @@ static int		EncodingFromUtfProc(ClientData clientData,
 			    int *dstCharsPtr);
 static void		ExitProcEven(ClientData clientData);
 static void		ExitProcOdd(ClientData clientData);
-static int		GetTimesObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+static int		GetTimesCmd(ClientData clientData,
+			    Tcl_Interp *interp, int argc, const char **argv);
 static void		MainLoop(void);
 static int		NoopCmd(ClientData clientData,
 			    Tcl_Interp *interp, int argc, const char **argv);
@@ -220,9 +219,6 @@ static void		SpecialFree(char *blockPtr);
 static int		StaticInitProc(Tcl_Interp *interp);
 static int		TestasyncCmd(ClientData dummy,
 			    Tcl_Interp *interp, int argc, const char **argv);
-static int		TestbytestringObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
 static int		TestcmdinfoCmd(ClientData dummy,
 			    Tcl_Interp *interp, int argc, const char **argv);
 static int		TestcmdtokenCmd(ClientData dummy,
@@ -560,10 +556,9 @@ Tcltest_Init(
      * Create additional commands and math functions for testing Tcl.
      */
 
-    Tcl_CreateObjCommand(interp, "gettimes", GetTimesObjCmd, NULL, NULL);
+    Tcl_CreateCommand(interp, "gettimes", GetTimesCmd, NULL, NULL);
     Tcl_CreateCommand(interp, "noop", NoopCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "noop", NoopObjCmd, NULL, NULL);
-    Tcl_CreateObjCommand(interp, "testbytestring", TestbytestringObjCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "testwrongnumargs", TestWrongNumArgsObjCmd,
 	    NULL, NULL);
     Tcl_CreateObjCommand(interp, "testfilesystem", TestFilesystemObjCmd,
@@ -4722,7 +4717,7 @@ TestgetvarfullnameCmd(
 /*
  *----------------------------------------------------------------------
  *
- * GetTimesObjCmd --
+ * GetTimesCmd --
  *
  *	This procedure implements the "gettimes" command.  It is used for
  *	computing the time needed for various basic operations such as reading
@@ -4738,11 +4733,11 @@ TestgetvarfullnameCmd(
  */
 
 static int
-GetTimesObjCmd(
+GetTimesCmd(
     ClientData unused,		/* Unused. */
     Tcl_Interp *interp,		/* The current interpreter. */
-    int notused1,			/* Number of arguments. */
-    Tcl_Obj *const notused2[])	/* The argument objects. */
+    int argc,			/* The number of arguments. */
+    const char **argv)		/* The argument strings. */
 {
     Interp *iPtr = (Interp *) interp;
     int i, n;
@@ -4953,42 +4948,6 @@ NoopObjCmd(
     return TCL_OK;
 }
 
-/*
- *----------------------------------------------------------------------
- *
- * TestbytestringObjCmd --
- *
- *	This object-based procedure constructs a string which can
- *	possibly contain invalid UTF-8 bytes.
- *
- * Results:
- *	Returns the TCL_OK result code.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestbytestringObjCmd(
-    ClientData unused,		/* Not used. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* The argument objects. */
-{
-    int n;
-    const char *p;
-
-    if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "bytearray");
-	return TCL_ERROR;
-    }
-    p = (const char *)Tcl_GetByteArrayFromObj(objv[1], &n);
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(p, n));
-    return TCL_OK;
-}
-
 /*
  *----------------------------------------------------------------------
  *

generic/tclThread.c

@@ -339,9 +339,8 @@ Tcl_ConditionFinalize(
  *
  * TclFinalizeThreadData --
  *
- *	This function cleans up the thread-local storage. Secondary, it cleans
- *	thread alloc cache.
- *	This is called once for each thread before thread exits.
+ *	This function cleans up the thread-local storage. This is called once
+ *	for each thread.
  *
  * Results:
  *	None.
@@ -356,9 +355,6 @@ void
 TclFinalizeThreadData(void)
 {
     TclFinalizeThreadDataThread();
-#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
-    TclFinalizeThreadAllocThread();
-#endif
 }
 
 /*

generic/tclThreadAlloc.c

@@ -287,7 +287,7 @@ TclFreeAllocCache(
     *nextPtrPtr = cachePtr->nextPtr;
     cachePtr->nextPtr = NULL;
     Tcl_MutexUnlock(listLockPtr);
-    TclpSysFree(cachePtr);
+    free(cachePtr);
 }
 
 /*
@@ -332,7 +332,7 @@ TclpAlloc(
 
     /*
      * Increment the requested size to include room for the Block structure.
-     * Call TclpSysAlloc() directly if the required amount is greater than the
+     * Call malloc() directly if the required amount is greater than the
      * largest block, otherwise pop the smallest block large enough,
      * allocating more blocks if necessary.
      */
@@ -344,7 +344,7 @@ TclpAlloc(
 #endif
     if (size > MAXALLOC) {
 	bucket = NBUCKETS;
-	blockPtr = TclpSysAlloc(size, 0);
+	blockPtr = malloc(size);
 	if (blockPtr != NULL) {
 	    cachePtr->totalAssigned += reqSize;
 	}
@@ -407,7 +407,7 @@ TclpFree(
     bucket = blockPtr->sourceBucket;
     if (bucket == NBUCKETS) {
 	cachePtr->totalAssigned -= blockPtr->blockReqSize;
-	TclpSysFree(blockPtr);
+	free(blockPtr);
 	return;
     }
 
@@ -472,7 +472,7 @@ TclpRealloc(
     /*
      * If the block is not a system block and fits in place, simply return the
      * existing pointer. Otherwise, if the block is a system block and the new
-     * size would also require a system block, call TclpSysRealloc() directly.
+     * size would also require a system block, call realloc() directly.
      */
 
     blockPtr = Ptr2Block(ptr);
@@ -495,7 +495,7 @@ TclpRealloc(
     } else if (size > MAXALLOC) {
 	cachePtr->totalAssigned -= blockPtr->blockReqSize;
 	cachePtr->totalAssigned += reqSize;
-	blockPtr = TclpSysRealloc(blockPtr, size);
+	blockPtr = realloc(blockPtr, size);
 	if (blockPtr == NULL) {
 	    return NULL;
 	}
@@ -567,7 +567,7 @@ TclThreadAllocObj(void)
 	    Tcl_Obj *newObjsPtr;
 
 	    cachePtr->numObjects = numMove = NOBJALLOC;
-	    newObjsPtr = TclpSysAlloc(sizeof(Tcl_Obj) * numMove, 0);
+	    newObjsPtr = malloc(sizeof(Tcl_Obj) * numMove);
 	    if (newObjsPtr == NULL) {
 		Tcl_Panic("alloc: could not allocate %d new objects", numMove);
 	    }
@@ -964,7 +964,7 @@ GetBlocks(
 
 	if (blockPtr == NULL) {
 	    size = MAXALLOC;
-	    blockPtr = TclpSysAlloc(size, 0);
+	    blockPtr = malloc(size);
 	    if (blockPtr == NULL) {
 		return 0;
 	    }
@@ -1023,33 +1023,6 @@ TclFinalizeThreadAlloc(void)
     TclpFreeAllocCache(NULL);
 }
 
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeThreadAllocThread --
- *
- *	This procedure is used to destroy single thread private resources used
- *	in this file. 
- * Called in TclpFinalizeThreadData when a thread exits (Tcl_FinalizeThread).
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeThreadAllocThread(void)
-{
-    Cache *cachePtr = TclpGetAllocCache();
-    if (cachePtr != NULL) {
-	TclpFreeAllocCache(cachePtr);
-    }
-}
-
 #else /* !(TCL_THREADS && USE_THREAD_ALLOC) */
 /*
  *----------------------------------------------------------------------

generic/tclUtil.c

@@ -111,11 +111,7 @@ static Tcl_HashTable *	GetThreadHash(Tcl_ThreadDataKey *keyPtr);
 static int		SetEndOffsetFromAny(Tcl_Interp *interp,
 			    Tcl_Obj *objPtr);
 static void		UpdateStringOfEndOffset(Tcl_Obj *objPtr);
-static int		FindElement(Tcl_Interp *interp, const char *string,
-			    int stringLength, const char *typeStr,
-			    const char *typeCode, const char **elementPtr,
-			    const char **nextPtr, int *sizePtr,
-			    int *literalPtr);
+
 /*
  * The following is the Tcl object type definition for an object that
  * represents a list index in the form, "end-offset". It is used as a
@@ -241,7 +237,7 @@ const Tcl_ObjType tclEndOffsetType = {
  *   of either braces or quotes to delimit it.
  *
  * This collection of parsing rules is implemented in the routine
- * FindElement().
+ * TclFindElement().
  *
  * In order to produce lists that can be parsed by these rules, we need the
  * ability to distinguish between characters that are part of a list element
@@ -509,70 +505,9 @@ TclFindElement(
 				 * does not/does require a call to 
 				 * TclCopyAndCollapse() by the caller. */
 {
-    return FindElement(interp, list, listLength, "list", "LIST", elementPtr,
-	    nextPtr, sizePtr, literalPtr);
-}
-
-int
-TclFindDictElement(
-    Tcl_Interp *interp,		/* Interpreter to use for error reporting. If
-				 * NULL, then no error message is left after
-				 * errors. */
-    const char *dict,		/* Points to the first byte of a string
-				 * containing a Tcl dictionary with zero or
-				 * more keys and values (possibly in
-				 * braces). */
-    int dictLength,		/* Number of bytes in the dict's string. */
-    const char **elementPtr,	/* Where to put address of first significant
-				 * character in the first element (i.e., key
-				 * or value) of dict. */
-    const char **nextPtr,	/* Fill in with location of character just
-				 * after all white space following end of
-				 * element (next arg or end of list). */
-    int *sizePtr,		/* If non-zero, fill in with size of
-				 * element. */
-    int *literalPtr)		/* If non-zero, fill in with non-zero/zero to
-				 * indicate that the substring of *sizePtr
-				 * bytes starting at **elementPtr is/is not
-				 * the literal key or value and therefore
-				 * does not/does require a call to 
-				 * TclCopyAndCollapse() by the caller. */
-{
-    return FindElement(interp, dict, dictLength, "dict", "DICTIONARY",
-	    elementPtr, nextPtr, sizePtr, literalPtr);
-}
-
-static int
-FindElement(
-    Tcl_Interp *interp,		/* Interpreter to use for error reporting. If
-				 * NULL, then no error message is left after
-				 * errors. */
-    const char *string,		/* Points to the first byte of a string
-				 * containing a Tcl list or dictionary with
-				 * zero or more elements (possibly in
-				 * braces). */
-    int stringLength,		/* Number of bytes in the string. */
-    const char *typeStr,	/* The name of the type of thing we are
-				 * parsing, for error messages. */
-    const char *typeCode,	/* The type code for thing we are parsing, for
-				 * error messages. */
-    const char **elementPtr,	/* Where to put address of first significant
-				 * character in first element. */
-    const char **nextPtr,	/* Fill in with location of character just
-				 * after all white space following end of
-				 * argument (next arg or end of list/dict). */
-    int *sizePtr,		/* If non-zero, fill in with size of
-				 * element. */
-    int *literalPtr)		/* If non-zero, fill in with non-zero/zero to
-				 * indicate that the substring of *sizePtr
-				 * bytes starting at **elementPtr is/is not
-				 * the literal list/dict element and therefore
-				 * does not/does require a call to 
-				 * TclCopyAndCollapse() by the caller. */
-{
-    const char *p = string;
+    const char *p = list;
     const char *elemStart;	/* Points to first byte of first element. */
-    const char *limit;		/* Points just after list/dict's last byte. */
+    const char *limit;		/* Points just after list's last byte. */
     int openBraces = 0;		/* Brace nesting level during parse. */
     int inQuotes = 0;
     int size = 0;		/* lint. */
@@ -582,11 +517,11 @@ FindElement(
 
     /*
      * Skim off leading white space and check for an opening brace or quote.
-     * We treat embedded NULLs in the list/dict as bytes belonging to a list 
-     * element (or dictionary key or value).
+     * We treat embedded NULLs in the list as bytes belonging to a list
+     * element.
      */
 
-    limit = (string + stringLength);
+    limit = (list + listLength);
     while ((p < limit) && (TclIsSpaceProc(*p))) {
 	p++;
     }
@@ -647,9 +582,9 @@ FindElement(
 			p2++;
 		    }
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "%s element in braces followed by \"%.*s\" "
-			    "instead of space", typeStr, (int) (p2-p), p));
-		    Tcl_SetErrorCode(interp, "TCL", "VALUE", typeCode, "JUNK",
+			    "list element in braces followed by \"%.*s\" "
+			    "instead of space", (int) (p2-p), p));
+		    Tcl_SetErrorCode(interp, "TCL", "VALUE", "LIST", "JUNK",
 			    NULL);
 		}
 		return TCL_ERROR;
@@ -716,9 +651,9 @@ FindElement(
 			p2++;
 		    }
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "%s element in quotes followed by \"%.*s\" "
-			    "instead of space", typeStr, (int) (p2-p), p));
-		    Tcl_SetErrorCode(interp, "TCL", "VALUE", typeCode, "JUNK",
+			    "list element in quotes followed by \"%.*s\" "
+			    "instead of space", (int) (p2-p), p));
+		    Tcl_SetErrorCode(interp, "TCL", "VALUE", "LIST", "JUNK",
 			    NULL);
 		}
 		return TCL_ERROR;
@@ -729,23 +664,23 @@ FindElement(
     }
 
     /*
-     * End of list/dict: terminate element.
+     * End of list: terminate element.
      */
 
     if (p == limit) {
 	if (openBraces != 0) {
 	    if (interp != NULL) {
-		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			"unmatched open brace in %s", typeStr));
-		Tcl_SetErrorCode(interp, "TCL", "VALUE", typeCode, "BRACE",
+		Tcl_SetObjResult(interp, Tcl_NewStringObj(
+			"unmatched open brace in list", -1));
+		Tcl_SetErrorCode(interp, "TCL", "VALUE", "LIST", "BRACE",
 			NULL);
 	    }
 	    return TCL_ERROR;
 	} else if (inQuotes) {
 	    if (interp != NULL) {
-		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			"unmatched open quote in %s", typeStr));
-		Tcl_SetErrorCode(interp, "TCL", "VALUE", typeCode, "QUOTE",
+		Tcl_SetObjResult(interp, Tcl_NewStringObj(
+			"unmatched open quote in list", -1));
+		Tcl_SetErrorCode(interp, "TCL", "VALUE", "LIST", "QUOTE",
 			NULL);
 	    }
 	    return TCL_ERROR;

generic/tclVar.c

@@ -1958,9 +1958,6 @@ TclPtrSetVar(
 		    Tcl_IncrRefCount(oldValuePtr);	/* Since var is ref */
 		}
 		Tcl_AppendObjToObj(oldValuePtr, newValuePtr);
-		if (newValuePtr->refCount == 0) {
-		    Tcl_DecrRefCount(newValuePtr);
-		}
 	    }
 	}
     } else if (newValuePtr != oldValuePtr) {

generic/tclZlib.c

@@ -26,7 +26,7 @@
  * interface, even if that is mostly true).
  */
 
-#define TCL_ZLIB_VERSION	"2.0.1"
+#define TCL_ZLIB_VERSION	"2.0"
 
 /*
  * Magic flags used with wbits fields to indicate that we're handling the gzip
@@ -643,6 +643,7 @@ Tcl_ZlibStreamInit(
     int e;
     ZlibStreamHandle *zshPtr = NULL;
     Tcl_DString cmdname;
+    Tcl_CmdInfo cmdinfo;
     GzipHeader *gzHeaderPtr = NULL;
 
     switch (mode) {
@@ -768,8 +769,8 @@ Tcl_ZlibStreamInit(
 	Tcl_DStringInit(&cmdname);
 	TclDStringAppendLiteral(&cmdname, "::tcl::zlib::streamcmd_");
 	TclDStringAppendObj(&cmdname, Tcl_GetObjResult(interp));
-	if (Tcl_FindCommand(interp, Tcl_DStringValue(&cmdname),
-		NULL, 0) != NULL) {
+	if (Tcl_GetCommandInfo(interp, Tcl_DStringValue(&cmdname),
+		&cmdinfo) == 1) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "BUG: Stream command name already exists", -1));
 	    Tcl_SetErrorCode(interp, "TCL", "BUG", "EXISTING_CMD", NULL);
@@ -2910,10 +2911,6 @@ ZlibTransformClose(
      * Release all memory.
      */
 
-    if (cd->compDictObj) {
-	Tcl_DecrRefCount(cd->compDictObj);
-	cd->compDictObj = NULL;
-    }
     Tcl_DStringFree(&cd->decompressed);
 
     if (cd->inBuffer) {
@@ -2997,35 +2994,40 @@ ZlibTransformInput(
 	 */
 
 	if (readBytes < 0) {
+	    /*
+	     * Report errors to caller. The state of the seek system is
+	     * unchanged!
+	     */
+
+	    if ((Tcl_GetErrno() == EAGAIN) && (gotBytes > 0)) {
+		/*
+		 * EAGAIN is a special situation. If we had some data before
+		 * we report that instead of the request to re-try.
+		 */
 
-	    /* See ReflectInput() in tclIORTrans.c */
-	    if (Tcl_InputBlocked(cd->parent) && (gotBytes > 0)) {
 		return gotBytes;
 	    }
 
 	    *errorCodePtr = Tcl_GetErrno();
 	    return -1;
-	}
-	if (readBytes == 0) {
+	} else if (readBytes == 0) {
 	    /*
-	     * Eof in parent.
-	     *
-	     * Now this is a bit different. The partial data waiting is
-	     * converted and returned.
+	     * The 'parent' is at EOF.   It will not deliver us any more
+	     * bytes.  Make one last decompression attempt where we flush
+	     * the streams.
 	     */
 
 	    if (ResultGenerate(cd, 0, Z_SYNC_FLUSH, errorCodePtr) != TCL_OK) {
 		return -1;
 	    }
 
-	    if (Tcl_DStringLength(&cd->decompressed) == 0) {
-		/*
-		 * The drain delivered nothing. Time to deliver what we've
-		 * got.
-		 */
-
-		return gotBytes;
-	    }
+	    /*
+	     * Note that in the case where gotBytes == 0 (nothing in
+	     * the decompressed buffer to begin with) and the flush
+	     * also produce no new output, we are returning 0, which
+	     * signals the EOF to our caller.
+	     */
+	    return gotBytes + ResultCopy(cd, buf, toRead);
 	} else /* readBytes > 0 */ {
 	    /*
 	     * Transform the read chunk, which was not empty. Anything we get

library/clock.tcl

@@ -1227,8 +1227,8 @@ proc ::tcl::clock::scan { args } {
 	    }
 	    default {
 		return -code error \
-		    -errorcode [list CLOCK badOption $flag] \
-		    "bad option \"$flag\",\
+		    -errorcode [list CLOCK badSwitch $flag] \
+		    "bad switch \"$flag\",\
                      must be -base, -format, -gmt, -locale or -timezone"
 	    }
 	}
@@ -4295,8 +4295,8 @@ proc ::tcl::clock::add { clockval args } {
 		    set timezone $b
 		}
 		default {
-		    throw [list CLOCK badOption $a] \
-			"bad option \"$a\",\
+		    throw [list CLOCK badSwitch $a] \
+			"bad switch \"$a\",\
                          must be -gmt, -locale or -timezone"
 		}
 	    }

library/init.tcl

@@ -16,7 +16,7 @@
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.6.2
+package require -exact Tcl 8.6.1
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
@@ -398,8 +398,7 @@ proc unknown args {
 	    return -code error "ambiguous command name \"$name\": [lsort $cmds]"
 	}
     }
-    return -code error -errorcode [list TCL LOOKUP COMMAND $name] \
-	"invalid command name \"$name\""
+    return -code error "invalid command name \"$name\""
 }
 
 # auto_load --

library/platform/pkgIndex.tcl

@@ -1,3 +1,3 @@
-package ifneeded platform        1.0.13 [list source [file join $dir platform.tcl]]
+package ifneeded platform        1.0.12 [list source [file join $dir platform.tcl]]
 package ifneeded platform::shell 1.1.4 [list source [file join $dir shell.tcl]]
 

library/platform/platform.tcl

@@ -313,25 +313,13 @@ proc ::platform::patterns {id} {
 		}
 	    }
 	}
-	macosx-powerpc {
-	    lappend res macosx-universal
-	}
-	macosx-x86_64 {
-	    lappend res macosx-i386-x86_64
-	}
-	macosx-ix86 {
-	    lappend res macosx-universal macosx-i386-x86_64
-	}
 	macosx*-*    {
 	    # 10.5+ 
 	    if {[regexp {macosx([^-]*)-(.*)} $id -> v cpu]} {
 
 		switch -exact -- $cpu {
-		    ix86    {
-			lappend alt i386-x86_64
-			lappend alt universal
-		    }
-		    x86_64  { lappend alt i386-x86_64 }
+		    ix86    -
+		    x86_64  { set alt i386-x86_64 }
 		    default { set alt {} }
 		}
 
@@ -342,26 +330,35 @@ proc ::platform::patterns {id} {
 		    set res {}
 		    for {set j $minor} {$j >= 5} {incr j -1} {
 			lappend res macosx${major}.${j}-${cpu}
-			foreach a $alt {
-			    lappend res macosx${major}.${j}-$a
+			lappend res macosx${major}.${j}-universal
+			if {$alt ne {}} {
+			    lappend res macosx${major}.${j}-$alt
 			}
 		    }
 
 		    # Add unversioned patterns for 10.3/10.4 builds.
 		    lappend res macosx-${cpu}
-		    foreach a $alt {
-			lappend res macosx-$a
+		    lappend res macosx-universal
+		    if {$alt ne {}} {
+			lappend res macosx-$alt
 		    }
 		} else {
-		    # No version, just do unversioned patterns.
-		    foreach a $alt {
-			lappend res macosx-$a
+		    lappend res macosx-universal
+		    if {$alt ne {}} {
+			lappend res macosx-$alt
 		    }
 		}
 	    } else {
-		# no v, no cpu ... nothing
+		lappend res macosx-universal
 	    }
 	}
+	macosx-powerpc {
+	    lappend res macosx-universal
+	}
+	macosx-x86_64 -
+	macosx-ix86 {
+	    lappend res macosx-universal macosx-i386-x86_64
+	}
     }
     lappend res tcl ; # Pure tcl packages are always compatible.
     return $res
@@ -371,7 +368,7 @@ proc ::platform::patterns {id} {
 # ### ### ### ######### ######### #########
 ## Ready
 
-package provide platform 1.0.13
+package provide platform 1.0.12
 
 # ### ### ### ######### ######### #########
 ## Demo application

library/platform/shell.tcl

@@ -187,7 +187,7 @@ proc ::platform::shell::TEMP {} {
  	    }
  	}
     }
-    if {$channel ne ""} {
+    if {$channel != ""} {
  	return -code error "Failed to open a temporary file: $channel"
     } else {
  	return -code error "Failed to find an unused temporary file name"

library/tcltest/pkgIndex.tcl

@@ -9,4 +9,4 @@
 # full path name of this file's directory.
 
 if {![package vsatisfies [package provide Tcl] 8.5]} {return}
-package ifneeded tcltest 2.3.8 [list source [file join $dir tcltest.tcl]]
+package ifneeded tcltest 2.3.7 [list source [file join $dir tcltest.tcl]]

library/tcltest/tcltest.tcl

@@ -22,7 +22,7 @@ namespace eval tcltest {
     # When the version number changes, be sure to update the pkgIndex.tcl file,
     # and the install directory in the Makefiles.  When the minor version
     # changes (new feature) be sure to update the man page as well.
-    variable Version 2.3.8
+    variable Version 2.3.7
 
     # Compatibility support for dumb variables defined in tcltest 1
     # Do not use these.  Call [package provide Tcl] and [info patchlevel]
@@ -1991,6 +1991,47 @@ proc tcltest::test {name description args} {
 	}
     }
 
+    # Always run the cleanup script
+    set code [catch {uplevel 1 $cleanup} cleanupMsg]
+    if {$code == 1} {
+	set errorInfo(cleanup) $::errorInfo
+	set errorCode(cleanup) $::errorCode
+    }
+    set cleanupFailure [expr {$code != 0}]
+
+    set coreFailure 0
+    set coreMsg ""
+    # check for a core file first - if one was created by the test,
+    # then the test failed
+    if {[preserveCore]} {
+	if {[file exists [file join [workingDirectory] core]]} {
+	    # There's only a test failure if there is a core file
+	    # and (1) there previously wasn't one or (2) the new
+	    # one is different from the old one.
+	    if {[info exists coreModTime]} {
+		if {$coreModTime != [file mtime \
+			[file join [workingDirectory] core]]} {
+		    set coreFailure 1
+		}
+	    } else {
+		set coreFailure 1
+	    }
+	
+	    if {([preserveCore] > 1) && ($coreFailure)} {
+		append coreMsg "\nMoving file to:\
+		    [file join [temporaryDirectory] core-$name]"
+		catch {file rename -force -- \
+		    [file join [workingDirectory] core] \
+		    [file join [temporaryDirectory] core-$name]
+		} msg
+		if {$msg ne {}} {
+		    append coreMsg "\nError:\
+			Problem renaming core file: $msg"
+		}
+	    }
+	}
+    }
+
     # check if the return code matched the expected return code
     set codeFailure 0
     if {!$setupFailure && ($returnCode ni $returnCodes)} {
@@ -2035,47 +2076,6 @@ proc tcltest::test {name description args} {
 	set scriptFailure 1
     }
 
-    # Always run the cleanup script
-    set code [catch {uplevel 1 $cleanup} cleanupMsg]
-    if {$code == 1} {
-	set errorInfo(cleanup) $::errorInfo
-	set errorCode(cleanup) $::errorCode
-    }
-    set cleanupFailure [expr {$code != 0}]
-
-    set coreFailure 0
-    set coreMsg ""
-    # check for a core file first - if one was created by the test,
-    # then the test failed
-    if {[preserveCore]} {
-	if {[file exists [file join [workingDirectory] core]]} {
-	    # There's only a test failure if there is a core file
-	    # and (1) there previously wasn't one or (2) the new
-	    # one is different from the old one.
-	    if {[info exists coreModTime]} {
-		if {$coreModTime != [file mtime \
-			[file join [workingDirectory] core]]} {
-		    set coreFailure 1
-		}
-	    } else {
-		set coreFailure 1
-	    }
-	
-	    if {([preserveCore] > 1) && ($coreFailure)} {
-		append coreMsg "\nMoving file to:\
-		    [file join [temporaryDirectory] core-$name]"
-		catch {file rename -force -- \
-		    [file join [workingDirectory] core] \
-		    [file join [temporaryDirectory] core-$name]
-		} msg
-		if {$msg ne {}} {
-		    append coreMsg "\nError:\
-			Problem renaming core file: $msg"
-		}
-	    }
-	}
-    }
-
     # if we didn't experience any failures, then we passed
     variable numTests
     if {!($setupFailure || $cleanupFailure || $coreFailure

library/tzdata/Africa/Accra

@@ -3,38 +3,6 @@
 set TZData(:Africa/Accra) {
     {-9223372036854775808 -52 0 LMT}
     {-1640995148 0 0 GMT}
-    {-1556841600 1200 1 GHST}
-    {-1546388400 0 0 GMT}
-    {-1525305600 1200 1 GHST}
-    {-1514852400 0 0 GMT}
-    {-1493769600 1200 1 GHST}
-    {-1483316400 0 0 GMT}
-    {-1462233600 1200 1 GHST}
-    {-1451780400 0 0 GMT}
-    {-1430611200 1200 1 GHST}
-    {-1420158000 0 0 GMT}
-    {-1399075200 1200 1 GHST}
-    {-1388622000 0 0 GMT}
-    {-1367539200 1200 1 GHST}
-    {-1357086000 0 0 GMT}
-    {-1336003200 1200 1 GHST}
-    {-1325550000 0 0 GMT}
-    {-1304380800 1200 1 GHST}
-    {-1293927600 0 0 GMT}
-    {-1272844800 1200 1 GHST}
-    {-1262391600 0 0 GMT}
-    {-1241308800 1200 1 GHST}
-    {-1230855600 0 0 GMT}
-    {-1209772800 1200 1 GHST}
-    {-1199319600 0 0 GMT}
-    {-1178150400 1200 1 GHST}
-    {-1167697200 0 0 GMT}
-    {-1146614400 1200 1 GHST}
-    {-1136161200 0 0 GMT}
-    {-1115078400 1200 1 GHST}
-    {-1104625200 0 0 GMT}
-    {-1083542400 1200 1 GHST}
-    {-1073089200 0 0 GMT}
     {-1051920000 1200 1 GHST}
     {-1041466800 0 0 GMT}
     {-1020384000 1200 1 GHST}

library/tzdata/Africa/Bamako

@@ -1,5 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Africa/Abidjan)]} {
-    LoadTimeZoneFile Africa/Abidjan
+
+set TZData(:Africa/Bamako) {
+    {-9223372036854775808 -1920 0 LMT}
+    {-1830382080 0 0 GMT}
+    {-1131235200 -3600 0 WAT}
+    {-300841200 0 0 GMT}
 }
-set TZData(:Africa/Bamako) $TZData(:Africa/Abidjan)

library/tzdata/Africa/Banjul

@@ -1,5 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Africa/Abidjan)]} {
-    LoadTimeZoneFile Africa/Abidjan
+
+set TZData(:Africa/Banjul) {
+    {-9223372036854775808 -3996 0 LMT}
+    {-1830380004 -3996 0 BMT}
+    {-1104533604 -3600 0 WAT}
+    {-189385200 0 0 GMT}
 }
-set TZData(:Africa/Banjul) $TZData(:Africa/Abidjan)

library/tzdata/Africa/Cairo

@@ -125,188 +125,4 @@ set TZData(:Africa/Cairo) {
     {1281474000 7200 0 EET}
     {1284069600 10800 1 EEST}
     {1285880400 7200 0 EET}
-    {1400191200 10800 1 EEST}
-    {1403816400 7200 0 EET}
-    {1406844000 10800 1 EEST}
-    {1411678800 7200 0 EET}
-    {1429826400 10800 1 EEST}
-    {1434056400 7200 0 EET}
-    {1437688800 10800 1 EEST}
-    {1443128400 7200 0 EET}
-    {1461880800 10800 1 EEST}
-    {1464901200 7200 0 EET}
-    {1467928800 10800 1 EEST}
-    {1475182800 7200 0 EET}
-    {1493330400 10800 1 EEST}
-    {1495746000 7200 0 EET}
-    {1498773600 10800 1 EEST}
-    {1506632400 7200 0 EET}
-    {1524780000 10800 1 EEST}
-    {1525986000 7200 0 EET}
-    {1529013600 10800 1 EEST}
-    {1538082000 7200 0 EET}
-    {1556229600 10800 1 EEST}
-    {1556830800 7200 0 EET}
-    {1559858400 10800 1 EEST}
-    {1569531600 7200 0 EET}
-    {1590703200 10800 1 EEST}
-    {1600981200 7200 0 EET}
-    {1620943200 10800 1 EEST}
-    {1633035600 7200 0 EET}
-    {1651788000 10800 1 EEST}
-    {1664485200 7200 0 EET}
-    {1682632800 10800 1 EEST}
-    {1695934800 7200 0 EET}
-    {1714082400 10800 1 EEST}
-    {1727384400 7200 0 EET}
-    {1745532000 10800 1 EEST}
-    {1758834000 7200 0 EET}
-    {1776981600 10800 1 EEST}
-    {1790283600 7200 0 EET}
-    {1809036000 10800 1 EEST}
-    {1822338000 7200 0 EET}
-    {1840485600 10800 1 EEST}
-    {1853787600 7200 0 EET}
-    {1871935200 10800 1 EEST}
-    {1885237200 7200 0 EET}
-    {1903384800 10800 1 EEST}
-    {1916686800 7200 0 EET}
-    {1934834400 10800 1 EEST}
-    {1948136400 7200 0 EET}
-    {1966888800 10800 1 EEST}
-    {1980190800 7200 0 EET}
-    {1998338400 10800 1 EEST}
-    {2011640400 7200 0 EET}
-    {2029788000 10800 1 EEST}
-    {2043090000 7200 0 EET}
-    {2061237600 10800 1 EEST}
-    {2074539600 7200 0 EET}
-    {2092687200 10800 1 EEST}
-    {2105989200 7200 0 EET}
-    {2124136800 10800 1 EEST}
-    {2137438800 7200 0 EET}
-    {2156191200 10800 1 EEST}
-    {2169493200 7200 0 EET}
-    {2187640800 10800 1 EEST}
-    {2200942800 7200 0 EET}
-    {2219090400 10800 1 EEST}
-    {2232392400 7200 0 EET}
-    {2250540000 10800 1 EEST}
-    {2263842000 7200 0 EET}
-    {2281989600 10800 1 EEST}
-    {2295291600 7200 0 EET}
-    {2313439200 10800 1 EEST}
-    {2326741200 7200 0 EET}
-    {2345493600 10800 1 EEST}
-    {2358795600 7200 0 EET}
-    {2376943200 10800 1 EEST}
-    {2390245200 7200 0 EET}
-    {2408392800 10800 1 EEST}
-    {2421694800 7200 0 EET}
-    {2439842400 10800 1 EEST}
-    {2453144400 7200 0 EET}
-    {2471292000 10800 1 EEST}
-    {2484594000 7200 0 EET}
-    {2503346400 10800 1 EEST}
-    {2516648400 7200 0 EET}
-    {2534796000 10800 1 EEST}
-    {2548098000 7200 0 EET}
-    {2566245600 10800 1 EEST}
-    {2579547600 7200 0 EET}
-    {2597695200 10800 1 EEST}
-    {2610997200 7200 0 EET}
-    {2629144800 10800 1 EEST}
-    {2642446800 7200 0 EET}
-    {2660594400 10800 1 EEST}
-    {2673896400 7200 0 EET}
-    {2692648800 10800 1 EEST}
-    {2705950800 7200 0 EET}
-    {2724098400 10800 1 EEST}
-    {2737400400 7200 0 EET}
-    {2755548000 10800 1 EEST}
-    {2768850000 7200 0 EET}
-    {2786997600 10800 1 EEST}
-    {2800299600 7200 0 EET}
-    {2818447200 10800 1 EEST}
-    {2831749200 7200 0 EET}
-    {2850501600 10800 1 EEST}
-    {2863803600 7200 0 EET}
-    {2881951200 10800 1 EEST}
-    {2895253200 7200 0 EET}
-    {2913400800 10800 1 EEST}
-    {2926702800 7200 0 EET}
-    {2944850400 10800 1 EEST}
-    {2958152400 7200 0 EET}
-    {2976300000 10800 1 EEST}
-    {2989602000 7200 0 EET}
-    {3007749600 10800 1 EEST}
-    {3021051600 7200 0 EET}
-    {3039804000 10800 1 EEST}
-    {3053106000 7200 0 EET}
-    {3071253600 10800 1 EEST}
-    {3084555600 7200 0 EET}
-    {3102703200 10800 1 EEST}
-    {3116005200 7200 0 EET}
-    {3134152800 10800 1 EEST}
-    {3147454800 7200 0 EET}
-    {3165602400 10800 1 EEST}
-    {3178904400 7200 0 EET}
-    {3197052000 10800 1 EEST}
-    {3210354000 7200 0 EET}
-    {3229106400 10800 1 EEST}
-    {3242408400 7200 0 EET}
-    {3260556000 10800 1 EEST}
-    {3273858000 7200 0 EET}
-    {3292005600 10800 1 EEST}
-    {3305307600 7200 0 EET}
-    {3323455200 10800 1 EEST}
-    {3336757200 7200 0 EET}
-    {3354904800 10800 1 EEST}
-    {3368206800 7200 0 EET}
-    {3386959200 10800 1 EEST}
-    {3400261200 7200 0 EET}
-    {3418408800 10800 1 EEST}
-    {3431710800 7200 0 EET}
-    {3449858400 10800 1 EEST}
-    {3463160400 7200 0 EET}
-    {3481308000 10800 1 EEST}
-    {3494610000 7200 0 EET}
-    {3512757600 10800 1 EEST}
-    {3526059600 7200 0 EET}
-    {3544207200 10800 1 EEST}
-    {3557509200 7200 0 EET}
-    {3576261600 10800 1 EEST}
-    {3589563600 7200 0 EET}
-    {3607711200 10800 1 EEST}
-    {3621013200 7200 0 EET}
-    {3639160800 10800 1 EEST}
-    {3652462800 7200 0 EET}
-    {3670610400 10800 1 EEST}
-    {3683912400 7200 0 EET}
-    {3702060000 10800 1 EEST}
-    {3715362000 7200 0 EET}
-    {3734114400 10800 1 EEST}
-    {3747416400 7200 0 EET}
-    {3765564000 10800 1 EEST}
-    {3778866000 7200 0 EET}
-    {3797013600 10800 1 EEST}
-    {3810315600 7200 0 EET}
-    {3828463200 10800 1 EEST}
-    {3841765200 7200 0 EET}
-    {3859912800 10800 1 EEST}
-    {3873214800 7200 0 EET}
-    {3891362400 10800 1 EEST}
-    {3904664400 7200 0 EET}
-    {3923416800 10800 1 EEST}
-    {3936718800 7200 0 EET}
-    {3954866400 10800 1 EEST}
-    {3968168400 7200 0 EET}
-    {3986316000 10800 1 EEST}
-    {3999618000 7200 0 EET}
-    {4017765600 10800 1 EEST}
-    {4031067600 7200 0 EET}
-    {4049215200 10800 1 EEST}
-    {4062517200 7200 0 EET}
-    {4080664800 10800 1 EEST}
-    {4093966800 7200 0 EET}
 }

library/tzdata/Africa/Casablanca

@@ -38,46 +38,46 @@ set TZData(:Africa/Casablanca) {
     {1376100000 3600 1 WEST}
     {1382839200 0 0 WET}
     {1396144800 3600 1 WEST}
-    {1403920800 0 0 WET}
-    {1406944800 3600 1 WEST}
+    {1404007200 0 0 WET}
+    {1406599200 3600 1 WEST}
     {1414288800 0 0 WET}
     {1427594400 3600 1 WEST}
-    {1434160800 0 0 WET}
+    {1434592800 0 0 WET}
     {1437184800 3600 1 WEST}
     {1445738400 0 0 WET}
     {1459044000 3600 1 WEST}
-    {1465005600 0 0 WET}
-    {1468029600 3600 1 WEST}
+    {1465264800 0 0 WET}
+    {1467856800 3600 1 WEST}
     {1477792800 0 0 WET}
     {1490493600 3600 1 WEST}
-    {1495245600 0 0 WET}
-    {1498874400 3600 1 WEST}
+    {1495850400 0 0 WET}
+    {1498442400 3600 1 WEST}
     {1509242400 0 0 WET}
     {1521943200 3600 1 WEST}
-    {1526090400 0 0 WET}
-    {1529114400 3600 1 WEST}
+    {1526436000 0 0 WET}
+    {1529028000 3600 1 WEST}
     {1540692000 0 0 WET}
     {1553997600 3600 1 WEST}
-    {1556935200 0 0 WET}
-    {1559959200 3600 1 WEST}
+    {1557108000 0 0 WET}
+    {1559700000 3600 1 WEST}
     {1572141600 0 0 WET}
     {1585447200 3600 1 WEST}
-    {1587175200 0 0 WET}
-    {1590804000 3600 1 WEST}
+    {1587693600 0 0 WET}
+    {1590285600 3600 1 WEST}
     {1603591200 0 0 WET}
     {1616896800 3600 1 WEST}
-    {1618020000 0 0 WET}
-    {1621044000 3600 1 WEST}
+    {1618279200 0 0 WET}
+    {1620871200 3600 1 WEST}
     {1635645600 0 0 WET}
     {1648346400 3600 1 WEST}
-    {1648864800 0 0 WET}
-    {1651888800 3600 1 WEST}
+    {1648951200 0 0 WET}
+    {1651543200 3600 1 WEST}
     {1667095200 0 0 WET}
     {1682128800 3600 1 WEST}
     {1698544800 0 0 WET}
-    {1712973600 3600 1 WEST}
+    {1712714400 3600 1 WEST}
     {1729994400 0 0 WET}
-    {1743818400 3600 1 WEST}
+    {1743386400 3600 1 WEST}
     {1761444000 0 0 WET}
     {1774749600 3600 1 WEST}
     {1792893600 0 0 WET}
@@ -98,136 +98,71 @@ set TZData(:Africa/Casablanca) {
     {2026951200 3600 1 WEST}
     {2045700000 0 0 WET}
     {2058400800 3600 1 WEST}
-    {2077063200 0 0 WET}
-    {2077153200 0 0 WET}
+    {2077149600 0 0 WET}
     {2090455200 3600 1 WEST}
-    {2107908000 0 0 WET}
-    {2108602800 0 0 WET}
+    {2108167200 0 0 WET}
     {2121904800 3600 1 WEST}
-    {2138752800 0 0 WET}
-    {2140052400 0 0 WET}
+    {2138839200 0 0 WET}
     {2153354400 3600 1 WEST}
-    {2172103200 0 0 WET}
-    {2184804000 3600 1 WEST}
-    {2203552800 0 0 WET}
-    {2216253600 3600 1 WEST}
-    {2235002400 0 0 WET}
-    {2248308000 3600 1 WEST}
-    {2266452000 0 0 WET}
-    {2279757600 3600 1 WEST}
-    {2297901600 0 0 WET}
-    {2311207200 3600 1 WEST}
-    {2329351200 0 0 WET}
-    {2342656800 3600 1 WEST}
-    {2361405600 0 0 WET}
-    {2374106400 3600 1 WEST}
-    {2392855200 0 0 WET}
-    {2405556000 3600 1 WEST}
-    {2424304800 0 0 WET}
-    {2437610400 3600 1 WEST}
-    {2455754400 0 0 WET}
-    {2469060000 3600 1 WEST}
-    {2487204000 0 0 WET}
-    {2500509600 3600 1 WEST}
-    {2519258400 0 0 WET}
-    {2531959200 3600 1 WEST}
-    {2550708000 0 0 WET}
-    {2563408800 3600 1 WEST}
-    {2582157600 0 0 WET}
-    {2595463200 3600 1 WEST}
-    {2613607200 0 0 WET}
-    {2626912800 3600 1 WEST}
-    {2645056800 0 0 WET}
-    {2658362400 3600 1 WEST}
-    {2676506400 0 0 WET}
-    {2689812000 3600 1 WEST}
-    {2708560800 0 0 WET}
-    {2721261600 3600 1 WEST}
-    {2740010400 0 0 WET}
-    {2752711200 3600 1 WEST}
-    {2771460000 0 0 WET}
-    {2784765600 3600 1 WEST}
-    {2802909600 0 0 WET}
-    {2816215200 3600 1 WEST}
-    {2834359200 0 0 WET}
-    {2847664800 3600 1 WEST}
-    {2866413600 0 0 WET}
-    {2879114400 3600 1 WEST}
-    {2897863200 0 0 WET}
-    {2910564000 3600 1 WEST}
-    {2929312800 0 0 WET}
-    {2942013600 3600 1 WEST}
-    {2960762400 0 0 WET}
-    {2974068000 3600 1 WEST}
-    {2992212000 0 0 WET}
-    {3005517600 3600 1 WEST}
-    {3023661600 0 0 WET}
-    {3036967200 3600 1 WEST}
-    {3055716000 0 0 WET}
-    {3068416800 3600 1 WEST}
-    {3087165600 0 0 WET}
-    {3099866400 3600 1 WEST}
-    {3118615200 0 0 WET}
-    {3131920800 3600 1 WEST}
-    {3150064800 0 0 WET}
-    {3163370400 3600 1 WEST}
-    {3181514400 0 0 WET}
-    {3194820000 3600 1 WEST}
-    {3212964000 0 0 WET}
-    {3226269600 3600 1 WEST}
-    {3245018400 0 0 WET}
-    {3257719200 3600 1 WEST}
-    {3276468000 0 0 WET}
-    {3289168800 3600 1 WEST}
-    {3307917600 0 0 WET}
-    {3321223200 3600 1 WEST}
-    {3339367200 0 0 WET}
-    {3352672800 3600 1 WEST}
-    {3370816800 0 0 WET}
-    {3384122400 3600 1 WEST}
-    {3402871200 0 0 WET}
-    {3415572000 3600 1 WEST}
-    {3434320800 0 0 WET}
-    {3447021600 3600 1 WEST}
-    {3465770400 0 0 WET}
-    {3479076000 3600 1 WEST}
-    {3497220000 0 0 WET}
-    {3510525600 3600 1 WEST}
-    {3528669600 0 0 WET}
-    {3541975200 3600 1 WEST}
-    {3560119200 0 0 WET}
-    {3573424800 3600 1 WEST}
-    {3592173600 0 0 WET}
-    {3604874400 3600 1 WEST}
-    {3623623200 0 0 WET}
-    {3636324000 3600 1 WEST}
-    {3655072800 0 0 WET}
-    {3668378400 3600 1 WEST}
-    {3686522400 0 0 WET}
-    {3699828000 3600 1 WEST}
-    {3717972000 0 0 WET}
-    {3731277600 3600 1 WEST}
-    {3750026400 0 0 WET}
-    {3762727200 3600 1 WEST}
-    {3781476000 0 0 WET}
-    {3794176800 3600 1 WEST}
-    {3812925600 0 0 WET}
-    {3825626400 3600 1 WEST}
-    {3844375200 0 0 WET}
-    {3857680800 3600 1 WEST}
-    {3875824800 0 0 WET}
-    {3889130400 3600 1 WEST}
-    {3907274400 0 0 WET}
-    {3920580000 3600 1 WEST}
-    {3939328800 0 0 WET}
-    {3952029600 3600 1 WEST}
-    {3970778400 0 0 WET}
-    {3983479200 3600 1 WEST}
-    {4002228000 0 0 WET}
-    {4015533600 3600 1 WEST}
-    {4033677600 0 0 WET}
-    {4046983200 3600 1 WEST}
-    {4065127200 0 0 WET}
-    {4078432800 3600 1 WEST}
-    {4096576800 0 0 WET}
+    {2184800400 3600 1 WEST}
+    {2216250000 3600 1 WEST}
+    {2248304400 3600 1 WEST}
+    {2279754000 3600 1 WEST}
+    {2311203600 3600 1 WEST}
+    {2342653200 3600 1 WEST}
+    {2374102800 3600 1 WEST}
+    {2405552400 3600 1 WEST}
+    {2437606800 3600 1 WEST}
+    {2469056400 3600 1 WEST}
+    {2500506000 3600 1 WEST}
+    {2531955600 3600 1 WEST}
+    {2563405200 3600 1 WEST}
+    {2595459600 3600 1 WEST}
+    {2626909200 3600 1 WEST}
+    {2658358800 3600 1 WEST}
+    {2689808400 3600 1 WEST}
+    {2721258000 3600 1 WEST}
+    {2752707600 3600 1 WEST}
+    {2784762000 3600 1 WEST}
+    {2816211600 3600 1 WEST}
+    {2847661200 3600 1 WEST}
+    {2879110800 3600 1 WEST}
+    {2910560400 3600 1 WEST}
+    {2942010000 3600 1 WEST}
+    {2974064400 3600 1 WEST}
+    {3005514000 3600 1 WEST}
+    {3036963600 3600 1 WEST}
+    {3068413200 3600 1 WEST}
+    {3099862800 3600 1 WEST}
+    {3131917200 3600 1 WEST}
+    {3163366800 3600 1 WEST}
+    {3194816400 3600 1 WEST}
+    {3226266000 3600 1 WEST}
+    {3257715600 3600 1 WEST}
+    {3289165200 3600 1 WEST}
+    {3321219600 3600 1 WEST}
+    {3352669200 3600 1 WEST}
+    {3384118800 3600 1 WEST}
+    {3415568400 3600 1 WEST}
+    {3447018000 3600 1 WEST}
+    {3479072400 3600 1 WEST}
+    {3510522000 3600 1 WEST}
+    {3541971600 3600 1 WEST}
+    {3573421200 3600 1 WEST}
+    {3604870800 3600 1 WEST}
+    {3636320400 3600 1 WEST}
+    {3668374800 3600 1 WEST}
+    {3699824400 3600 1 WEST}
+    {3731274000 3600 1 WEST}
+    {3762723600 3600 1 WEST}
+    {3794173200 3600 1 WEST}
+    {3825622800 3600 1 WEST}
+    {3857677200 3600 1 WEST}
+    {3889126800 3600 1 WEST}
+    {3920576400 3600 1 WEST}
+    {3952026000 3600 1 WEST}
+    {3983475600 3600 1 WEST}
+    {4015530000 3600 1 WEST}
+    {4046979600 3600 1 WEST}
+    {4078429200 3600 1 WEST}
 }

library/tzdata/Africa/Conakry

@@ -1,5 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Africa/Abidjan)]} {
-    LoadTimeZoneFile Africa/Abidjan
+
+set TZData(:Africa/Conakry) {
+    {-9223372036854775808 -3292 0 LMT}
+    {-1830380708 0 0 GMT}
+    {-1131235200 -3600 0 WAT}
+    {-315615600 0 0 GMT}
 }
-set TZData(:Africa/Conakry) $TZData(:Africa/Abidjan)

library/tzdata/Africa/Dakar

@@ -1,5 +1,7 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Africa/Abidjan)]} {
-    LoadTimeZoneFile Africa/Abidjan
+
+set TZData(:Africa/Dakar) {
+    {-9223372036854775808 -4184 0 LMT}
+    {-1830379816 -3600 0 WAT}
+    {-902098800 0 0 GMT}
 }
-set TZData(:Africa/Dakar) $TZData(:Africa/Abidjan)

library/tzdata/Africa/El_Aaiun

@@ -4,219 +4,4 @@ set TZData(:Africa/El_Aaiun) {
     {-9223372036854775808 -3168 0 LMT}
     {-1136070432 -3600 0 WAT}
     {198291600 0 0 WET}
-    {199756800 3600 1 WEST}
-    {207702000 0 0 WET}
-    {231292800 3600 1 WEST}
-    {244249200 0 0 WET}
-    {265507200 3600 1 WEST}
-    {271033200 0 0 WET}
-    {1212278400 3600 1 WEST}
-    {1220223600 0 0 WET}
-    {1243814400 3600 1 WEST}
-    {1250809200 0 0 WET}
-    {1272758400 3600 1 WEST}
-    {1281222000 0 0 WET}
-    {1301788800 3600 1 WEST}
-    {1312066800 0 0 WET}
-    {1335664800 3600 1 WEST}
-    {1342749600 0 0 WET}
-    {1345428000 3600 1 WEST}
-    {1348970400 0 0 WET}
-    {1367114400 3600 1 WEST}
-    {1373162400 0 0 WET}
-    {1376100000 3600 1 WEST}
-    {1382839200 0 0 WET}
-    {1396144800 3600 1 WEST}
-    {1403920800 0 0 WET}
-    {1406944800 3600 1 WEST}
-    {1414288800 0 0 WET}
-    {1427594400 3600 1 WEST}
-    {1434160800 0 0 WET}
-    {1437184800 3600 1 WEST}
-    {1445738400 0 0 WET}
-    {1459044000 3600 1 WEST}
-    {1465005600 0 0 WET}
-    {1468029600 3600 1 WEST}
-    {1477792800 0 0 WET}
-    {1490493600 3600 1 WEST}
-    {1495245600 0 0 WET}
-    {1498874400 3600 1 WEST}
-    {1509242400 0 0 WET}
-    {1521943200 3600 1 WEST}
-    {1526090400 0 0 WET}
-    {1529114400 3600 1 WEST}
-    {1540692000 0 0 WET}
-    {1553997600 3600 1 WEST}
-    {1556935200 0 0 WET}
-    {1559959200 3600 1 WEST}
-    {1572141600 0 0 WET}
-    {1585447200 3600 1 WEST}
-    {1587175200 0 0 WET}
-    {1590804000 3600 1 WEST}
-    {1603591200 0 0 WET}
-    {1616896800 3600 1 WEST}
-    {1618020000 0 0 WET}
-    {1621044000 3600 1 WEST}
-    {1635645600 0 0 WET}
-    {1648346400 3600 1 WEST}
-    {1648864800 0 0 WET}
-    {1651888800 3600 1 WEST}
-    {1667095200 0 0 WET}
-    {1682128800 3600 1 WEST}
-    {1698544800 0 0 WET}
-    {1712973600 3600 1 WEST}
-    {1729994400 0 0 WET}
-    {1743818400 3600 1 WEST}
-    {1761444000 0 0 WET}
-    {1774749600 3600 1 WEST}
-    {1792893600 0 0 WET}
-    {1806199200 3600 1 WEST}
-    {1824948000 0 0 WET}
-    {1837648800 3600 1 WEST}
-    {1856397600 0 0 WET}
-    {1869098400 3600 1 WEST}
-    {1887847200 0 0 WET}
-    {1901152800 3600 1 WEST}
-    {1919296800 0 0 WET}
-    {1932602400 3600 1 WEST}
-    {1950746400 0 0 WET}
-    {1964052000 3600 1 WEST}
-    {1982800800 0 0 WET}
-    {1995501600 3600 1 WEST}
-    {2014250400 0 0 WET}
-    {2026951200 3600 1 WEST}
-    {2045700000 0 0 WET}
-    {2058400800 3600 1 WEST}
-    {2077063200 0 0 WET}
-    {2077153200 0 0 WET}
-    {2090455200 3600 1 WEST}
-    {2107908000 0 0 WET}
-    {2108602800 0 0 WET}
-    {2121904800 3600 1 WEST}
-    {2138752800 0 0 WET}
-    {2140052400 0 0 WET}
-    {2153354400 3600 1 WEST}
-    {2172103200 0 0 WET}
-    {2184804000 3600 1 WEST}
-    {2203552800 0 0 WET}
-    {2216253600 3600 1 WEST}
-    {2235002400 0 0 WET}
-    {2248308000 3600 1 WEST}
-    {2266452000 0 0 WET}
-    {2279757600 3600 1 WEST}
-    {2297901600 0 0 WET}
-    {2311207200 3600 1 WEST}
-    {2329351200 0 0 WET}
-    {2342656800 3600 1 WEST}
-    {2361405600 0 0 WET}
-    {2374106400 3600 1 WEST}
-    {2392855200 0 0 WET}
-    {2405556000 3600 1 WEST}
-    {2424304800 0 0 WET}
-    {2437610400 3600 1 WEST}
-    {2455754400 0 0 WET}
-    {2469060000 3600 1 WEST}
-    {2487204000 0 0 WET}
-    {2500509600 3600 1 WEST}
-    {2519258400 0 0 WET}
-    {2531959200 3600 1 WEST}
-    {2550708000 0 0 WET}
-    {2563408800 3600 1 WEST}
-    {2582157600 0 0 WET}
-    {2595463200 3600 1 WEST}
-    {2613607200 0 0 WET}
-    {2626912800 3600 1 WEST}
-    {2645056800 0 0 WET}
-    {2658362400 3600 1 WEST}
-    {2676506400 0 0 WET}
-    {2689812000 3600 1 WEST}
-    {2708560800 0 0 WET}
-    {2721261600 3600 1 WEST}
-    {2740010400 0 0 WET}
-    {2752711200 3600 1 WEST}
-    {2771460000 0 0 WET}
-    {2784765600 3600 1 WEST}
-    {2802909600 0 0 WET}
-    {2816215200 3600 1 WEST}
-    {2834359200 0 0 WET}
-    {2847664800 3600 1 WEST}
-    {2866413600 0 0 WET}
-    {2879114400 3600 1 WEST}
-    {2897863200 0 0 WET}
-    {2910564000 3600 1 WEST}
-    {2929312800 0 0 WET}
-    {2942013600 3600 1 WEST}
-    {2960762400 0 0 WET}
-    {2974068000 3600 1 WEST}
-    {2992212000 0 0 WET}
-    {3005517600 3600 1 WEST}
-    {3023661600 0 0 WET}
-    {3036967200 3600 1 WEST}
-    {3055716000 0 0 WET}
-    {3068416800 3600 1 WEST}
-    {3087165600 0 0 WET}
-    {3099866400 3600 1 WEST}
-    {3118615200 0 0 WET}
-    {3131920800 3600 1 WEST}
-    {3150064800 0 0 WET}
-    {3163370400 3600 1 WEST}
-    {3181514400 0 0 WET}
-    {3194820000 3600 1 WEST}
-    {3212964000 0 0 WET}
-    {3226269600 3600 1 WEST}
-    {3245018400 0 0 WET}
-    {3257719200 3600 1 WEST}
-    {3276468000 0 0 WET}
-    {3289168800 3600 1 WEST}
-    {3307917600 0 0 WET}
-    {3321223200 3600 1 WEST}
-    {3339367200 0 0 WET}
-    {3352672800 3600 1 WEST}
-    {3370816800 0 0 WET}
-    {3384122400 3600 1 WEST}
-    {3402871200 0 0 WET}
-    {3415572000 3600 1 WEST}
-    {3434320800 0 0 WET}
-    {3447021600 3600 1 WEST}
-    {3465770400 0 0 WET}
-    {3479076000 3600 1 WEST}
-    {3497220000 0 0 WET}
-    {3510525600 3600 1 WEST}
-    {3528669600 0 0 WET}
-    {3541975200 3600 1 WEST}
-    {3560119200 0 0 WET}
-    {3573424800 3600 1 WEST}
-    {3592173600 0 0 WET}
-    {3604874400 3600 1 WEST}
-    {3623623200 0 0 WET}
-    {3636324000 3600 1 WEST}
-    {3655072800 0 0 WET}
-    {3668378400 3600 1 WEST}
-    {3686522400 0 0 WET}
-    {3699828000 3600 1 WEST}
-    {3717972000 0 0 WET}
-    {3731277600 3600 1 WEST}
-    {3750026400 0 0 WET}
-    {3762727200 3600 1 WEST}
-    {3781476000 0 0 WET}
-    {3794176800 3600 1 WEST}
-    {3812925600 0 0 WET}
-    {3825626400 3600 1 WEST}
-    {3844375200 0 0 WET}
-    {3857680800 3600 1 WEST}
-    {3875824800 0 0 WET}
-    {3889130400 3600 1 WEST}
-    {3907274400 0 0 WET}
-    {3920580000 3600 1 WEST}
-    {3939328800 0 0 WET}
-    {3952029600 3600 1 WEST}
-    {3970778400 0 0 WET}
-    {3983479200 3600 1 WEST}
-    {4002228000 0 0 WET}
-    {4015533600 3600 1 WEST}
-    {4033677600 0 0 WET}
-    {4046983200 3600 1 WEST}
-    {4065127200 0 0 WET}
-    {4078432800 3600 1 WEST}
-    {4096576800 0 0 WET}
 }

library/tzdata/Africa/Freetown

@@ -1,5 +1,36 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Africa/Abidjan)]} {
-    LoadTimeZoneFile Africa/Abidjan
+
+set TZData(:Africa/Freetown) {
+    {-9223372036854775808 -3180 0 LMT}
+    {-2776979220 -3180 0 FMT}
+    {-1785712020 -3600 0 WAT}
+    {-1091487600 -1200 1 SLST}
+    {-1080949200 -3600 0 WAT}
+    {-1059865200 -1200 1 SLST}
+    {-1049326800 -3600 0 WAT}
+    {-1028329200 -1200 1 SLST}
+    {-1017790800 -3600 0 WAT}
+    {-996793200 -1200 1 SLST}
+    {-986254800 -3600 0 WAT}
+    {-965257200 -1200 1 SLST}
+    {-954718800 -3600 0 WAT}
+    {-933634800 -1200 1 SLST}
+    {-923096400 -3600 0 WAT}
+    {-902098800 -1200 1 SLST}
+    {-891560400 -3600 0 WAT}
+    {-870562800 -1200 1 SLST}
+    {-860024400 -3600 0 WAT}
+    {-410223600 0 0 WAT}
+    {-397180800 3600 1 SLST}
+    {-389235600 0 0 GMT}
+    {-365644800 3600 1 SLST}
+    {-357699600 0 0 GMT}
+    {-334108800 3600 1 SLST}
+    {-326163600 0 0 GMT}
+    {-302486400 3600 1 SLST}
+    {-294541200 0 0 GMT}
+    {-270950400 3600 1 SLST}
+    {-263005200 0 0 GMT}
+    {-239414400 3600 1 SLST}
+    {-231469200 0 0 GMT}
 }
-set TZData(:Africa/Freetown) $TZData(:Africa/Abidjan)

library/tzdata/Africa/Lome

@@ -1,5 +1,6 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Africa/Abidjan)]} {
-    LoadTimeZoneFile Africa/Abidjan
+
+set TZData(:Africa/Lome) {
+    {-9223372036854775808 292 0 LMT}
+    {-2429827492 0 0 GMT}
 }
-set TZData(:Africa/Lome) $TZData(:Africa/Abidjan)

library/tzdata/Africa/Nouakchott

@@ -1,5 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Africa/Abidjan)]} {
-    LoadTimeZoneFile Africa/Abidjan
+
+set TZData(:Africa/Nouakchott) {
+    {-9223372036854775808 -3828 0 LMT}
+    {-1830380172 0 0 GMT}
+    {-1131235200 -3600 0 WAT}
+    {-286930800 0 0 GMT}
 }
-set TZData(:Africa/Nouakchott) $TZData(:Africa/Abidjan)

library/tzdata/Africa/Ouagadougou

@@ -1,5 +1,6 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Africa/Abidjan)]} {
-    LoadTimeZoneFile Africa/Abidjan
+
+set TZData(:Africa/Ouagadougou) {
+    {-9223372036854775808 -364 0 LMT}
+    {-1830383636 0 0 GMT}
 }
-set TZData(:Africa/Ouagadougou) $TZData(:Africa/Abidjan)

library/tzdata/Africa/Sao_Tome

@@ -1,5 +1,7 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Africa/Abidjan)]} {
-    LoadTimeZoneFile Africa/Abidjan
+
+set TZData(:Africa/Sao_Tome) {
+    {-9223372036854775808 1616 0 LMT}
+    {-2713912016 -2192 0 LMT}
+    {-1830381808 0 0 GMT}
 }
-set TZData(:Africa/Sao_Tome) $TZData(:Africa/Abidjan)

library/tzdata/Africa/Timbuktu

@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Africa/Abidjan)]} {
-    LoadTimeZoneFile Africa/Abidjan
+if {![info exists TZData(Africa/Bamako)]} {
+    LoadTimeZoneFile Africa/Bamako
 }
-set TZData(:Africa/Timbuktu) $TZData(:Africa/Abidjan)
+set TZData(:Africa/Timbuktu) $TZData(:Africa/Bamako)

library/tzdata/Africa/Tripoli

@@ -30,5 +30,177 @@ set TZData(:Africa/Tripoli) {
     {875919600 7200 0 EET}
     {1352505600 3600 0 CET}
     {1364515200 7200 1 CEST}
-    {1382662800 7200 0 EET}
+    {1382659200 3600 0 CET}
+    {1395964800 7200 1 CEST}
+    {1414713600 3600 0 CET}
+    {1427414400 7200 1 CEST}
+    {1446163200 3600 0 CET}
+    {1458864000 7200 1 CEST}
+    {1477612800 3600 0 CET}
+    {1490918400 7200 1 CEST}
+    {1509062400 3600 0 CET}
+    {1522368000 7200 1 CEST}
+    {1540512000 3600 0 CET}
+    {1553817600 7200 1 CEST}
+    {1571961600 3600 0 CET}
+    {1585267200 7200 1 CEST}
+    {1604016000 3600 0 CET}
+    {1616716800 7200 1 CEST}
+    {1635465600 3600 0 CET}
+    {1648166400 7200 1 CEST}
+    {1666915200 3600 0 CET}
+    {1680220800 7200 1 CEST}
+    {1698364800 3600 0 CET}
+    {1711670400 7200 1 CEST}
+    {1729814400 3600 0 CET}
+    {1743120000 7200 1 CEST}
+    {1761868800 3600 0 CET}
+    {1774569600 7200 1 CEST}
+    {1793318400 3600 0 CET}
+    {1806019200 7200 1 CEST}
+    {1824768000 3600 0 CET}
+    {1838073600 7200 1 CEST}
+    {1856217600 3600 0 CET}
+    {1869523200 7200 1 CEST}
+    {1887667200 3600 0 CET}
+    {1900972800 7200 1 CEST}
+    {1919116800 3600 0 CET}
+    {1932422400 7200 1 CEST}
+    {1951171200 3600 0 CET}
+    {1963872000 7200 1 CEST}
+    {1982620800 3600 0 CET}
+    {1995321600 7200 1 CEST}
+    {2014070400 3600 0 CET}
+    {2027376000 7200 1 CEST}
+    {2045520000 3600 0 CET}
+    {2058825600 7200 1 CEST}
+    {2076969600 3600 0 CET}
+    {2090275200 7200 1 CEST}
+    {2109024000 3600 0 CET}
+    {2121724800 7200 1 CEST}
+    {2140473600 3600 0 CET}
+    {2153174400 7200 1 CEST}
+    {2171923200 3600 0 CET}
+    {2184624000 7200 1 CEST}
+    {2203372800 3600 0 CET}
+    {2216678400 7200 1 CEST}
+    {2234822400 3600 0 CET}
+    {2248128000 7200 1 CEST}
+    {2266272000 3600 0 CET}
+    {2279577600 7200 1 CEST}
+    {2298326400 3600 0 CET}
+    {2311027200 7200 1 CEST}
+    {2329776000 3600 0 CET}
+    {2342476800 7200 1 CEST}
+    {2361225600 3600 0 CET}
+    {2374531200 7200 1 CEST}
+    {2392675200 3600 0 CET}
+    {2405980800 7200 1 CEST}
+    {2424124800 3600 0 CET}
+    {2437430400 7200 1 CEST}
+    {2455574400 3600 0 CET}
+    {2468880000 7200 1 CEST}
+    {2487628800 3600 0 CET}
+    {2500329600 7200 1 CEST}
+    {2519078400 3600 0 CET}
+    {2531779200 7200 1 CEST}
+    {2550528000 3600 0 CET}
+    {2563833600 7200 1 CEST}
+    {2581977600 3600 0 CET}
+    {2595283200 7200 1 CEST}
+    {2613427200 3600 0 CET}
+    {2626732800 7200 1 CEST}
+    {2645481600 3600 0 CET}
+    {2658182400 7200 1 CEST}
+    {2676931200 3600 0 CET}
+    {2689632000 7200 1 CEST}
+    {2708380800 3600 0 CET}
+    {2721686400 7200 1 CEST}
+    {2739830400 3600 0 CET}
+    {2753136000 7200 1 CEST}
+    {2771280000 3600 0 CET}
+    {2784585600 7200 1 CEST}
+    {2802729600 3600 0 CET}
+    {2816035200 7200 1 CEST}
+    {2834784000 3600 0 CET}
+    {2847484800 7200 1 CEST}
+    {2866233600 3600 0 CET}
+    {2878934400 7200 1 CEST}
+    {2897683200 3600 0 CET}
+    {2910988800 7200 1 CEST}
+    {2929132800 3600 0 CET}
+    {2942438400 7200 1 CEST}
+    {2960582400 3600 0 CET}
+    {2973888000 7200 1 CEST}
+    {2992636800 3600 0 CET}
+    {3005337600 7200 1 CEST}
+    {3024086400 3600 0 CET}
+    {3036787200 7200 1 CEST}
+    {3055536000 3600 0 CET}
+    {3068236800 7200 1 CEST}
+    {3086985600 3600 0 CET}
+    {3100291200 7200 1 CEST}
+    {3118435200 3600 0 CET}
+    {3131740800 7200 1 CEST}
+    {3149884800 3600 0 CET}
+    {3163190400 7200 1 CEST}
+    {3181939200 3600 0 CET}
+    {3194640000 7200 1 CEST}
+    {3213388800 3600 0 CET}
+    {3226089600 7200 1 CEST}
+    {3244838400 3600 0 CET}
+    {3258144000 7200 1 CEST}
+    {3276288000 3600 0 CET}
+    {3289593600 7200 1 CEST}
+    {3307737600 3600 0 CET}
+    {3321043200 7200 1 CEST}
+    {3339187200 3600 0 CET}
+    {3352492800 7200 1 CEST}
+    {3371241600 3600 0 CET}
+    {3383942400 7200 1 CEST}
+    {3402691200 3600 0 CET}
+    {3415392000 7200 1 CEST}
+    {3434140800 3600 0 CET}
+    {3447446400 7200 1 CEST}
+    {3465590400 3600 0 CET}
+    {3478896000 7200 1 CEST}
+    {3497040000 3600 0 CET}
+    {3510345600 7200 1 CEST}
+    {3529094400 3600 0 CET}
+    {3541795200 7200 1 CEST}
+    {3560544000 3600 0 CET}
+    {3573244800 7200 1 CEST}
+    {3591993600 3600 0 CET}
+    {3605299200 7200 1 CEST}
+    {3623443200 3600 0 CET}
+    {3636748800 7200 1 CEST}
+    {3654892800 3600 0 CET}
+    {3668198400 7200 1 CEST}
+    {3686342400 3600 0 CET}
+    {3699648000 7200 1 CEST}
+    {3718396800 3600 0 CET}
+    {3731097600 7200 1 CEST}
+    {3749846400 3600 0 CET}
+    {3762547200 7200 1 CEST}
+    {3781296000 3600 0 CET}
+    {3794601600 7200 1 CEST}
+    {3812745600 3600 0 CET}
+    {3826051200 7200 1 CEST}
+    {3844195200 3600 0 CET}
+    {3857500800 7200 1 CEST}
+    {3876249600 3600 0 CET}
+    {3888950400 7200 1 CEST}
+    {3907699200 3600 0 CET}
+    {3920400000 7200 1 CEST}
+    {3939148800 3600 0 CET}
+    {3951849600 7200 1 CEST}
+    {3970598400 3600 0 CET}
+    {3983904000 7200 1 CEST}
+    {4002048000 3600 0 CET}
+    {4015353600 7200 1 CEST}
+    {4033497600 3600 0 CET}
+    {4046803200 7200 1 CEST}
+    {4065552000 3600 0 CET}
+    {4078252800 7200 1 CEST}
+    {4097001600 3600 0 CET}
 }

library/tzdata/America/Eirunepe

@@ -37,5 +37,4 @@ set TZData(:America/Eirunepe) {
     {761716800 -18000 0 ACT}
     {780206400 -18000 0 ACT}
     {1214283600 -14400 0 AMT}
-    {1384056000 -18000 0 ACT}
 }

library/tzdata/America/Havana

@@ -94,7 +94,7 @@ set TZData(:America/Havana) {
     {1035694800 -18000 0 CST}
     {1049605200 -14400 1 CDT}
     {1067144400 -18000 0 CST}
-    {1080450000 -14400 1 CDT}
+    {1081054800 -14400 1 CDT}
     {1162098000 -18000 0 CST}
     {1173589200 -14400 1 CDT}
     {1193547600 -18000 0 CST}

library/tzdata/America/Metlakatla

@@ -39,5 +39,5 @@ set TZData(:America/Metlakatla) {
     {388576800 -25200 1 PDT}
     {404902800 -28800 0 PST}
     {420026400 -25200 1 PDT}
-    {436356000 -28800 0 PST}
+    {436356000 -28800 0 MeST}
 }

library/tzdata/America/Rio_Branco

@@ -33,5 +33,4 @@ set TZData(:America/Rio_Branco) {
     {571204800 -18000 0 ACT}
     {590040000 -18000 0 ACT}
     {1214283600 -14400 0 AMT}
-    {1384056000 -18000 0 ACT}
 }

library/tzdata/Antarctica/Casey

@@ -2,9 +2,9 @@
 
 set TZData(:Antarctica/Casey) {
     {-9223372036854775808 0 0 zzz}
-    {-31536000 28800 0 AWST}
+    {-31536000 28800 0 WST}
     {1255802400 39600 0 CAST}
-    {1267714800 28800 0 AWST}
+    {1267714800 28800 0 WST}
     {1319738400 39600 0 CAST}
-    {1329843600 28800 0 AWST}
+    {1329843600 28800 0 WST}
 }

library/tzdata/Antarctica/Macquarie

@@ -2,96 +2,96 @@
 
 set TZData(:Antarctica/Macquarie) {
     {-9223372036854775808 0 0 zzz}
-    {-2214259200 36000 0 AEST}
-    {-1680508800 39600 1 AEDT}
-    {-1669892400 39600 0 AEDT}
-    {-1665392400 36000 0 AEST}
+    {-2214259200 36000 0 EST}
+    {-1680508800 39600 1 EST}
+    {-1669892400 39600 0 EST}
+    {-1665392400 36000 0 EST}
     {-1601719200 0 0 zzz}
-    {-94730400 36000 0 AEST}
-    {-71136000 39600 1 AEDT}
-    {-55411200 36000 0 AEST}
-    {-37267200 39600 1 AEDT}
-    {-25776000 36000 0 AEST}
-    {-5817600 39600 1 AEDT}
-    {5673600 36000 0 AEST}
-    {25632000 39600 1 AEDT}
-    {37728000 36000 0 AEST}
-    {57686400 39600 1 AEDT}
-    {67968000 36000 0 AEST}
-    {89136000 39600 1 AEDT}
-    {100022400 36000 0 AEST}
-    {120585600 39600 1 AEDT}
-    {131472000 36000 0 AEST}
-    {152035200 39600 1 AEDT}
-    {162921600 36000 0 AEST}
-    {183484800 39600 1 AEDT}
-    {194976000 36000 0 AEST}
-    {215539200 39600 1 AEDT}
-    {226425600 36000 0 AEST}
-    {246988800 39600 1 AEDT}
-    {257875200 36000 0 AEST}
-    {278438400 39600 1 AEDT}
-    {289324800 36000 0 AEST}
-    {309888000 39600 1 AEDT}
-    {320774400 36000 0 AEST}
-    {341337600 39600 1 AEDT}
-    {352224000 36000 0 AEST}
-    {372787200 39600 1 AEDT}
-    {386092800 36000 0 AEST}
-    {404841600 39600 1 AEDT}
-    {417542400 36000 0 AEST}
-    {436291200 39600 1 AEDT}
-    {447177600 36000 0 AEST}
-    {467740800 39600 1 AEDT}
-    {478627200 36000 0 AEST}
-    {499190400 39600 1 AEDT}
-    {510076800 36000 0 AEST}
-    {530035200 39600 1 AEDT}
-    {542736000 36000 0 AEST}
-    {562089600 39600 1 AEDT}
-    {574790400 36000 0 AEST}
-    {594144000 39600 1 AEDT}
-    {606240000 36000 0 AEST}
-    {625593600 39600 1 AEDT}
-    {637689600 36000 0 AEST}
-    {657043200 39600 1 AEDT}
-    {670348800 36000 0 AEST}
-    {686678400 39600 1 AEDT}
-    {701798400 36000 0 AEST}
-    {718128000 39600 1 AEDT}
-    {733248000 36000 0 AEST}
-    {749577600 39600 1 AEDT}
-    {764697600 36000 0 AEST}
-    {781027200 39600 1 AEDT}
-    {796147200 36000 0 AEST}
-    {812476800 39600 1 AEDT}
-    {828201600 36000 0 AEST}
-    {844531200 39600 1 AEDT}
-    {859651200 36000 0 AEST}
-    {875980800 39600 1 AEDT}
-    {891100800 36000 0 AEST}
-    {907430400 39600 1 AEDT}
-    {922550400 36000 0 AEST}
-    {938880000 39600 1 AEDT}
-    {954000000 36000 0 AEST}
-    {967305600 39600 1 AEDT}
-    {985449600 36000 0 AEST}
-    {1002384000 39600 1 AEDT}
-    {1017504000 36000 0 AEST}
-    {1033833600 39600 1 AEDT}
-    {1048953600 36000 0 AEST}
-    {1065283200 39600 1 AEDT}
-    {1080403200 36000 0 AEST}
-    {1096732800 39600 1 AEDT}
-    {1111852800 36000 0 AEST}
-    {1128182400 39600 1 AEDT}
-    {1143907200 36000 0 AEST}
-    {1159632000 39600 1 AEDT}
-    {1174752000 36000 0 AEST}
-    {1191686400 39600 1 AEDT}
-    {1207411200 36000 0 AEST}
-    {1223136000 39600 1 AEDT}
-    {1238860800 36000 0 AEST}
-    {1254585600 39600 1 AEDT}
+    {-94730400 36000 0 EST}
+    {-71136000 39600 1 EST}
+    {-55411200 36000 0 EST}
+    {-37267200 39600 1 EST}
+    {-25776000 36000 0 EST}
+    {-5817600 39600 1 EST}
+    {5673600 36000 0 EST}
+    {25632000 39600 1 EST}
+    {37728000 36000 0 EST}
+    {57686400 39600 1 EST}
+    {67968000 36000 0 EST}
+    {89136000 39600 1 EST}
+    {100022400 36000 0 EST}
+    {120585600 39600 1 EST}
+    {131472000 36000 0 EST}
+    {152035200 39600 1 EST}
+    {162921600 36000 0 EST}
+    {183484800 39600 1 EST}
+    {194976000 36000 0 EST}
+    {215539200 39600 1 EST}
+    {226425600 36000 0 EST}
+    {246988800 39600 1 EST}
+    {257875200 36000 0 EST}
+    {278438400 39600 1 EST}
+    {289324800 36000 0 EST}
+    {309888000 39600 1 EST}
+    {320774400 36000 0 EST}
+    {341337600 39600 1 EST}
+    {352224000 36000 0 EST}
+    {372787200 39600 1 EST}
+    {386092800 36000 0 EST}
+    {404841600 39600 1 EST}
+    {417542400 36000 0 EST}
+    {436291200 39600 1 EST}
+    {447177600 36000 0 EST}
+    {467740800 39600 1 EST}
+    {478627200 36000 0 EST}
+    {499190400 39600 1 EST}
+    {510076800 36000 0 EST}
+    {530035200 39600 1 EST}
+    {542736000 36000 0 EST}
+    {562089600 39600 1 EST}
+    {574790400 36000 0 EST}
+    {594144000 39600 1 EST}
+    {606240000 36000 0 EST}
+    {625593600 39600 1 EST}
+    {637689600 36000 0 EST}
+    {657043200 39600 1 EST}
+    {670348800 36000 0 EST}
+    {686678400 39600 1 EST}
+    {701798400 36000 0 EST}
+    {718128000 39600 1 EST}
+    {733248000 36000 0 EST}
+    {749577600 39600 1 EST}
+    {764697600 36000 0 EST}
+    {781027200 39600 1 EST}
+    {796147200 36000 0 EST}
+    {812476800 39600 1 EST}
+    {828201600 36000 0 EST}
+    {844531200 39600 1 EST}
+    {859651200 36000 0 EST}
+    {875980800 39600 1 EST}
+    {891100800 36000 0 EST}
+    {907430400 39600 1 EST}
+    {922550400 36000 0 EST}
+    {938880000 39600 1 EST}
+    {954000000 36000 0 EST}
+    {967305600 39600 1 EST}
+    {985449600 36000 0 EST}
+    {1002384000 39600 1 EST}
+    {1017504000 36000 0 EST}
+    {1033833600 39600 1 EST}
+    {1048953600 36000 0 EST}
+    {1065283200 39600 1 EST}
+    {1080403200 36000 0 EST}
+    {1096732800 39600 1 EST}
+    {1111852800 36000 0 EST}
+    {1128182400 39600 1 EST}
+    {1143907200 36000 0 EST}
+    {1159632000 39600 1 EST}
+    {1174752000 36000 0 EST}
+    {1191686400 39600 1 EST}
+    {1207411200 36000 0 EST}
+    {1223136000 39600 1 EST}
+    {1238860800 36000 0 EST}
+    {1254585600 39600 1 EST}
     {1270310400 39600 0 MIST}
 }

library/tzdata/Asia/Amman

@@ -70,177 +70,5 @@ set TZData(:Asia/Amman) {
     {1301608800 10800 1 EEST}
     {1319752800 7200 0 EET}
     {1333058400 10800 1 EEST}
-    {1387486800 7200 0 EET}
-    {1395957600 10800 1 EEST}
-    {1414706400 7200 0 EET}
-    {1427407200 10800 1 EEST}
-    {1446156000 7200 0 EET}
-    {1459461600 10800 1 EEST}
-    {1477605600 7200 0 EET}
-    {1490911200 10800 1 EEST}
-    {1509055200 7200 0 EET}
-    {1522360800 10800 1 EEST}
-    {1540504800 7200 0 EET}
-    {1553810400 10800 1 EEST}
-    {1571954400 7200 0 EET}
-    {1585260000 10800 1 EEST}
-    {1604008800 7200 0 EET}
-    {1616709600 10800 1 EEST}
-    {1635458400 7200 0 EET}
-    {1648764000 10800 1 EEST}
-    {1666908000 7200 0 EET}
-    {1680213600 10800 1 EEST}
-    {1698357600 7200 0 EET}
-    {1711663200 10800 1 EEST}
-    {1729807200 7200 0 EET}
-    {1743112800 10800 1 EEST}
-    {1761861600 7200 0 EET}
-    {1774562400 10800 1 EEST}
-    {1793311200 7200 0 EET}
-    {1806012000 10800 1 EEST}
-    {1824760800 7200 0 EET}
-    {1838066400 10800 1 EEST}
-    {1856210400 7200 0 EET}
-    {1869516000 10800 1 EEST}
-    {1887660000 7200 0 EET}
-    {1900965600 10800 1 EEST}
-    {1919109600 7200 0 EET}
-    {1932415200 10800 1 EEST}
-    {1951164000 7200 0 EET}
-    {1963864800 10800 1 EEST}
-    {1982613600 7200 0 EET}
-    {1995919200 10800 1 EEST}
-    {2014063200 7200 0 EET}
-    {2027368800 10800 1 EEST}
-    {2045512800 7200 0 EET}
-    {2058818400 10800 1 EEST}
-    {2076962400 7200 0 EET}
-    {2090268000 10800 1 EEST}
-    {2109016800 7200 0 EET}
-    {2121717600 10800 1 EEST}
-    {2140466400 7200 0 EET}
-    {2153167200 10800 1 EEST}
-    {2171916000 7200 0 EET}
-    {2185221600 10800 1 EEST}
-    {2203365600 7200 0 EET}
-    {2216671200 10800 1 EEST}
-    {2234815200 7200 0 EET}
-    {2248120800 10800 1 EEST}
-    {2266264800 7200 0 EET}
-    {2279570400 10800 1 EEST}
-    {2298319200 7200 0 EET}
-    {2311020000 10800 1 EEST}
-    {2329768800 7200 0 EET}
-    {2343074400 10800 1 EEST}
-    {2361218400 7200 0 EET}
-    {2374524000 10800 1 EEST}
-    {2392668000 7200 0 EET}
-    {2405973600 10800 1 EEST}
-    {2424117600 7200 0 EET}
-    {2437423200 10800 1 EEST}
-    {2455567200 7200 0 EET}
-    {2468872800 10800 1 EEST}
-    {2487621600 7200 0 EET}
-    {2500322400 10800 1 EEST}
-    {2519071200 7200 0 EET}
-    {2532376800 10800 1 EEST}
-    {2550520800 7200 0 EET}
-    {2563826400 10800 1 EEST}
-    {2581970400 7200 0 EET}
-    {2595276000 10800 1 EEST}
-    {2613420000 7200 0 EET}
-    {2626725600 10800 1 EEST}
-    {2645474400 7200 0 EET}
-    {2658175200 10800 1 EEST}
-    {2676924000 7200 0 EET}
-    {2689624800 10800 1 EEST}
-    {2708373600 7200 0 EET}
-    {2721679200 10800 1 EEST}
-    {2739823200 7200 0 EET}
-    {2753128800 10800 1 EEST}
-    {2771272800 7200 0 EET}
-    {2784578400 10800 1 EEST}
-    {2802722400 7200 0 EET}
-    {2816028000 10800 1 EEST}
-    {2834776800 7200 0 EET}
-    {2847477600 10800 1 EEST}
-    {2866226400 7200 0 EET}
-    {2879532000 10800 1 EEST}
-    {2897676000 7200 0 EET}
-    {2910981600 10800 1 EEST}
-    {2929125600 7200 0 EET}
-    {2942431200 10800 1 EEST}
-    {2960575200 7200 0 EET}
-    {2973880800 10800 1 EEST}
-    {2992629600 7200 0 EET}
-    {3005330400 10800 1 EEST}
-    {3024079200 7200 0 EET}
-    {3036780000 10800 1 EEST}
-    {3055528800 7200 0 EET}
-    {3068834400 10800 1 EEST}
-    {3086978400 7200 0 EET}
-    {3100284000 10800 1 EEST}
-    {3118428000 7200 0 EET}
-    {3131733600 10800 1 EEST}
-    {3149877600 7200 0 EET}
-    {3163183200 10800 1 EEST}
-    {3181932000 7200 0 EET}
-    {3194632800 10800 1 EEST}
-    {3213381600 7200 0 EET}
-    {3226687200 10800 1 EEST}
-    {3244831200 7200 0 EET}
-    {3258136800 10800 1 EEST}
-    {3276280800 7200 0 EET}
-    {3289586400 10800 1 EEST}
-    {3307730400 7200 0 EET}
-    {3321036000 10800 1 EEST}
-    {3339180000 7200 0 EET}
-    {3352485600 10800 1 EEST}
-    {3371234400 7200 0 EET}
-    {3383935200 10800 1 EEST}
-    {3402684000 7200 0 EET}
-    {3415989600 10800 1 EEST}
-    {3434133600 7200 0 EET}
-    {3447439200 10800 1 EEST}
-    {3465583200 7200 0 EET}
-    {3478888800 10800 1 EEST}
-    {3497032800 7200 0 EET}
-    {3510338400 10800 1 EEST}
-    {3529087200 7200 0 EET}
-    {3541788000 10800 1 EEST}
-    {3560536800 7200 0 EET}
-    {3573237600 10800 1 EEST}
-    {3591986400 7200 0 EET}
-    {3605292000 10800 1 EEST}
-    {3623436000 7200 0 EET}
-    {3636741600 10800 1 EEST}
-    {3654885600 7200 0 EET}
-    {3668191200 10800 1 EEST}
-    {3686335200 7200 0 EET}
-    {3699640800 10800 1 EEST}
-    {3718389600 7200 0 EET}
-    {3731090400 10800 1 EEST}
-    {3749839200 7200 0 EET}
-    {3763144800 10800 1 EEST}
-    {3781288800 7200 0 EET}
-    {3794594400 10800 1 EEST}
-    {3812738400 7200 0 EET}
-    {3826044000 10800 1 EEST}
-    {3844188000 7200 0 EET}
-    {3857493600 10800 1 EEST}
-    {3876242400 7200 0 EET}
-    {3888943200 10800 1 EEST}
-    {3907692000 7200 0 EET}
-    {3920392800 10800 1 EEST}
-    {3939141600 7200 0 EET}
-    {3952447200 10800 1 EEST}
-    {3970591200 7200 0 EET}
-    {3983896800 10800 1 EEST}
-    {4002040800 7200 0 EET}
-    {4015346400 10800 1 EEST}
-    {4033490400 7200 0 EET}
-    {4046796000 10800 1 EEST}
-    {4065544800 7200 0 EET}
-    {4078245600 10800 1 EEST}
-    {4096994400 7200 0 EET}
+    {1351202400 10800 0 AST}
 }

library/tzdata/Asia/Chongqing

@@ -1,5 +1,19 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Asia/Shanghai)]} {
-    LoadTimeZoneFile Asia/Shanghai
+
+set TZData(:Asia/Chongqing) {
+    {-9223372036854775808 25580 0 LMT}
+    {-1325487980 25200 0 LONT}
+    {325962000 28800 0 CST}
+    {515520000 32400 1 CDT}
+    {527007600 28800 0 CST}
+    {545155200 32400 1 CDT}
+    {558457200 28800 0 CST}
+    {576604800 32400 1 CDT}
+    {589906800 28800 0 CST}
+    {608659200 32400 1 CDT}
+    {621961200 28800 0 CST}
+    {640108800 32400 1 CDT}
+    {653410800 28800 0 CST}
+    {671558400 32400 1 CDT}
+    {684860400 28800 0 CST}
 }
-set TZData(:Asia/Chongqing) $TZData(:Asia/Shanghai)

library/tzdata/Asia/Chungking

@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Asia/Shanghai)]} {
-    LoadTimeZoneFile Asia/Shanghai
+if {![info exists TZData(Asia/Chongqing)]} {
+    LoadTimeZoneFile Asia/Chongqing
 }
-set TZData(:Asia/Chungking) $TZData(:Asia/Shanghai)
+set TZData(:Asia/Chungking) $TZData(:Asia/Chongqing)

library/tzdata/Asia/Gaza

@@ -46,8 +46,8 @@ set TZData(:Asia/Gaza) {
     {526424400 7200 0 IST}
     {545436000 10800 1 IDT}
     {558478800 7200 0 IST}
-    {576626400 10800 1 IDT}
-    {589323600 7200 0 IST}
+    {576540000 10800 1 IDT}
+    {589237200 7200 0 IST}
     {609890400 10800 1 IDT}
     {620773200 7200 0 IST}
     {638316000 10800 1 IDT}

library/tzdata/Asia/Harbin

@@ -1,5 +1,22 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Asia/Shanghai)]} {
-    LoadTimeZoneFile Asia/Shanghai
+
+set TZData(:Asia/Harbin) {
+    {-9223372036854775808 30404 0 LMT}
+    {-1325492804 30600 0 CHAT}
+    {-1194078600 28800 0 CST}
+    {-946800000 32400 0 CHAT}
+    {-115894800 30600 0 CHAT}
+    {325956600 28800 0 CST}
+    {515520000 32400 1 CDT}
+    {527007600 28800 0 CST}
+    {545155200 32400 1 CDT}
+    {558457200 28800 0 CST}
+    {576604800 32400 1 CDT}
+    {589906800 28800 0 CST}
+    {608659200 32400 1 CDT}
+    {621961200 28800 0 CST}
+    {640108800 32400 1 CDT}
+    {653410800 28800 0 CST}
+    {671558400 32400 1 CDT}
+    {684860400 28800 0 CST}
 }
-set TZData(:Asia/Harbin) $TZData(:Asia/Shanghai)

library/tzdata/Asia/Hebron

@@ -46,8 +46,8 @@ set TZData(:Asia/Hebron) {
     {526424400 7200 0 IST}
     {545436000 10800 1 IDT}
     {558478800 7200 0 IST}
-    {576626400 10800 1 IDT}
-    {589323600 7200 0 IST}
+    {576540000 10800 1 IDT}
+    {589237200 7200 0 IST}
     {609890400 10800 1 IDT}
     {620773200 7200 0 IST}
     {638316000 10800 1 IDT}

library/tzdata/Asia/Irkutsk

@@ -1,9 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Irkutsk) {
-    {-9223372036854775808 25035 0 LMT}
-    {-2840165835 25035 0 IMT}
-    {-1575874635 25200 0 IRKT}
+    {-9223372036854775808 25040 0 LMT}
+    {-2840165840 25040 0 IMT}
+    {-1575874640 25200 0 IRKT}
     {-1247554800 28800 0 IRKMMTT}
     {354902400 32400 1 IRKST}
     {370710000 28800 0 IRKT}
@@ -68,5 +68,4 @@ set TZData(:Asia/Irkutsk) {
     {1269712800 32400 1 IRKST}
     {1288461600 28800 0 IRKT}
     {1301162400 32400 0 IRKT}
-    {1414256400 28800 0 IRKT}
 }

library/tzdata/Asia/Jayapura

@@ -3,6 +3,6 @@
 set TZData(:Asia/Jayapura) {
     {-9223372036854775808 33768 0 LMT}
     {-1172913768 32400 0 WIT}
-    {-799491600 34200 0 ACST}
+    {-799491600 34200 0 CST}
     {-189423000 32400 0 WIT}
 }

library/tzdata/Asia/Jerusalem

@@ -45,8 +45,8 @@ set TZData(:Asia/Jerusalem) {
     {526424400 7200 0 IST}
     {545436000 10800 1 IDT}
     {558478800 7200 0 IST}
-    {576626400 10800 1 IDT}
-    {589323600 7200 0 IST}
+    {576540000 10800 1 IDT}
+    {589237200 7200 0 IST}
     {609890400 10800 1 IDT}
     {620773200 7200 0 IST}
     {638316000 10800 1 IDT}

library/tzdata/Asia/Kashgar

@@ -1,5 +1,20 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Asia/Urumqi)]} {
-    LoadTimeZoneFile Asia/Urumqi
+
+set TZData(:Asia/Kashgar) {
+    {-9223372036854775808 18236 0 LMT}
+    {-1325480636 19800 0 KAST}
+    {-946791000 18000 0 KAST}
+    {325969200 28800 0 CST}
+    {515520000 32400 1 CDT}
+    {527007600 28800 0 CST}
+    {545155200 32400 1 CDT}
+    {558457200 28800 0 CST}
+    {576604800 32400 1 CDT}
+    {589906800 28800 0 CST}
+    {608659200 32400 1 CDT}
+    {621961200 28800 0 CST}
+    {640108800 32400 1 CDT}
+    {653410800 28800 0 CST}
+    {671558400 32400 1 CDT}
+    {684860400 28800 0 CST}
 }
-set TZData(:Asia/Kashgar) $TZData(:Asia/Urumqi)

library/tzdata/Asia/Khandyga

@@ -69,5 +69,4 @@ set TZData(:Asia/Khandyga) {
     {1288454400 36000 0 VLAT}
     {1301155200 39600 0 VLAT}
     {1315832400 36000 0 YAKT}
-    {1414252800 32400 0 YAKT}
 }

library/tzdata/Asia/Krasnoyarsk

@@ -67,5 +67,4 @@ set TZData(:Asia/Krasnoyarsk) {
     {1269716400 28800 1 KRAST}
     {1288465200 25200 0 KRAT}
     {1301166000 28800 0 KRAT}
-    {1414260000 25200 0 KRAT}
 }

library/tzdata/Asia/Magadan

@@ -67,5 +67,4 @@ set TZData(:Asia/Magadan) {
     {1269702000 43200 1 MAGST}
     {1288450800 39600 0 MAGT}
     {1301151600 43200 0 MAGT}
-    {1414245600 36000 0 MAGT}
 }

library/tzdata/Asia/Novokuznetsk

@@ -68,5 +68,4 @@ set TZData(:Asia/Novokuznetsk) {
     {1269720000 25200 1 NOVST}
     {1288468800 21600 0 NOVT}
     {1301169600 25200 0 NOVT}
-    {1414263600 25200 0 KRAT}
 }

library/tzdata/Asia/Novosibirsk

@@ -68,5 +68,4 @@ set TZData(:Asia/Novosibirsk) {
     {1269720000 25200 1 NOVST}
     {1288468800 21600 0 NOVT}
     {1301169600 25200 0 NOVT}
-    {1414263600 21600 0 NOVT}
 }

library/tzdata/Asia/Omsk

@@ -67,5 +67,4 @@ set TZData(:Asia/Omsk) {
     {1269720000 25200 1 OMSST}
     {1288468800 21600 0 OMST}
     {1301169600 25200 0 OMST}
-    {1414263600 21600 0 OMST}
 }

library/tzdata/Asia/Pyongyang

@@ -3,11 +3,9 @@
 set TZData(:Asia/Pyongyang) {
     {-9223372036854775808 30180 0 LMT}
     {-2524551780 30600 0 KST}
-    {-2053931400 32400 0 JCST}
+    {-2053931400 32400 0 KST}
     {-1325494800 30600 0 KST}
-    {-1199262600 32400 0 JCST}
-    {-1017824400 32400 0 JST}
-    {-768646800 32400 0 KST}
+    {-1199262600 32400 0 KST}
     {-498128400 28800 0 KST}
     {-264931200 32400 0 KST}
 }

library/tzdata/Asia/Riyadh

@@ -2,5 +2,5 @@
 
 set TZData(:Asia/Riyadh) {
     {-9223372036854775808 11212 0 LMT}
-    {-719636812 10800 0 AST}
+    {-631163212 10800 0 AST}
 }

library/tzdata/Asia/Sakhalin

@@ -2,8 +2,8 @@
 
 set TZData(:Asia/Sakhalin) {
     {-9223372036854775808 34248 0 LMT}
-    {-2031039048 32400 0 JCST}
-    {-1017824400 32400 0 JST}
+    {-2031039048 32400 0 CJT}
+    {-1009875600 32400 0 JST}
     {-768560400 39600 0 SAKMMTT}
     {354891600 43200 1 SAKST}
     {370699200 39600 0 SAKT}
@@ -69,5 +69,4 @@ set TZData(:Asia/Sakhalin) {
     {1269705600 39600 1 SAKST}
     {1288454400 36000 0 SAKT}
     {1301155200 39600 0 SAKT}
-    {1414249200 36000 0 SAKT}
 }