Checkpoint of work in progress.

Add in the URL parsing as a general service.
Rethinking how to hold the bits of configuration.
2017-09-21 22:00:43 +00:00 · 2017-07-04 14:31:08 +00:00 · 2017-06-27 18:21:57 +00:00 · 2017-06-25 22:16:08 +00:00
462 changed files with 31247 additions and 39076 deletions
@@ -3,17 +3,12 @@ compat/zlib/contrib/vstudio/readme.txt
 compat/zlib/contrib/vstudio/*/zlib.rc
 compat/zlib/win32/*.txt
 compat/zlib/win64/*.txt
-libtommath/*.dsp
-libtommath/*.sln
-libtommath/*.vcproj
 tools/tcl.hpj.in
 tools/tcl.wse.in
 win/buildall.vc.bat
 win/coffbase.txt
 win/makefile.vc
 win/rules.vc
-win/rules-ext.vc
-win/targets.vc
 win/tcl.dsp
 win/tcl.dsw
 win/tcl.hpj.in
@@ -3,17 +3,12 @@ compat/zlib/contrib/vstudio/readme.txt
 compat/zlib/contrib/vstudio/*/zlib.rc
 compat/zlib/win32/*.txt
 compat/zlib/win64/*.txt
-libtommath/*.dsp
-libtommath/*.sln
-libtommath/*.vcproj
 tools/tcl.hpj.in
 tools/tcl.wse.in
 win/buildall.vc.bat
 win/coffbase.txt
 win/makefile.vc
 win/rules.vc
-win/rules-ext.vc
-win/targets.vc
 win/tcl.dsp
 win/tcl.dsw
 win/tcl.hpj.in
@@ -18,7 +18,6 @@
 */tclsh*
 */tcltest*
 */versions.vc
-*/version.vc
 html
 libtommath/bn.ilg
 libtommath/bn.ind
@@ -41,9 +40,7 @@ unix/dltest.marker
 unix/tcl.pc
 unix/tclIndex
 unix/pkgs/*
-win/Debug*
-win/Release*
+win/Debug_VC*
+win/Release_VC*
 win/pkgs/*
-win/coffbase.txt
-win/tcl.hpj
-win/nmhlp-out.txt
+win/tcl.hpj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>tcl8</name>
+	<name>tcl8.7</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -1,5 +1,5 @@
 README:  Tcl
-    This is the Tcl 8.7a2 source distribution.
+    This is the Tcl 8.7a0 source distribution.
 	http://sourceforge.net/projects/tcl/files/Tcl/
    You can get any source release of Tcl from the URL above.

@@ -8624,263 +8624,3 @@ improvements to regexp engine from Postgres (lane,porter,fellows,seltenreich)
 2016-02-22 (bug)[9b4702] [info exists env(missing)] kills trace (nijtmans)

 --- Released 8.6.5, February 29, 2016 --- http://core.tcl.tk/tcl/ for details
-
-2016-03-01 (bug)[803042] mem leak due to reference cycle (porter)
-
-2016-03-08 (bug)[bbc304] reflected watch race condition (porter)
-
-2016-03-17 (bug)[fadc99] compile-5.3 (rodriguez,porter)
-
-2016-03-17 (enhancement)[1a25fd] compile [variable ${ns}::v] (porter)
-
-2016-03-20 (bug)[1af8de] crash in compiled [string replace] (harder,fellows)
-
-2016-03-21 (bug)[d30718] segv in notifier finalize (hirofumi,nijtmans)
-
-2016-03-23 (enhancement)[7d0db7] parallel make (yarda,nijtmans)
-
-2016-03-23 [f12535] enable test bindings customization (vogel,nijtmans)
-
-2016-04-04 (bug)[47ac84] compiled [lreplace] fixes (aspect,ferrieux,fellows)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2016-04-08 (bug)[866368] RE \w includes 'Punctuation Connector' (nijtmans)
-
-2016-04-08 (bug)[2538f3] Win crash Tcl_OpenTcpServer() (griffin)
-
-2016-04-10 [07d13d] Restore TclBlend support lost in 8.6.1 (buratti)
-
-2016-05-13 (bug)[3154ea] Mem corruption in assembler exceptions (tkob,kenny)
-
-2016-05-13 (bug) registry package support any Unicode env (nijtmans)
-=> registry 1.3.2
-
-2016-05-21 (bug)[f7d4e] [namespace delete] performance (fellows)
-
-2016-06-02 (TIP 447) execution time verbosity option (cerutti)
-=> tcltest 2.4.0
-
-2016-06-16 (bug)[16828b] crash due to [vwait] trace undo fail (dah,porter)
-
-2016-06-16 (enhancement)[4b61af] good [info frame] from more cases (beric)
-
-2016-06-21 (bug)[c383eb] crash in [glob -path a] (oehlmann,porter)
-
-2016-06-21 (update) Update Unicode data to 9.0 (nijtmans)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2016-06-22 (bug)[16896d] Tcl_DString tolerate append to self. (dah,porter)
-
-2016-06-23 (bug)[d55322] crash in [dict update] (yorick,fellows)
-
-2016-06-27 (bug)[dd260a] crash in [chan configure -dictionary] (madden,aspect)
-
-2016-07-02 (bug)[f961d7] usage message with parameters with spaces (porter)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2016-07-02 (enhancement)[09fabc] Sort order of -relateddir (lanam)
-
-2016-07-07 (bug)[5d7ca0] Win: [file executable] for .cmd and .ps1 (nadkarni)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2016-07-08 (bug)[a47641] [file normalize] & Windows junctions (nadkarni)
-
-2016-07-09 [ae61a6] [file] handling of Win hardcoded names (CON) (nadkarni)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2016-07-09 [3613671] [file owned] (more) useful on Win (nadkarni)
-
-2016-07-09 (bug)[1493a4] [namespace upvar] use of resolvers (beric,fellows)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2016-07-10 (bug)[da340d] integer division in clock math (nadkarni)
-
-2016-07-20 tzdata updated to Olson's tzdata2016f (venkat)
-
--- Released 8.6.6, July 27, 2016 --- http://core.tcl.tk/tcl/ for details
-
-2016-09-07 (bug)[c09edf] Bad caching with  custom resolver (neumann,nijtmans)
-
-2016-09-07 (bug)[4dbdd9] Memleak in test var-8.3 (mr_calvin,porter)
-
-2016-10-03 (bug)[2bf561] Allow empty command as alias target (yorick,nijtmans)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2016-10-04 (bug)[4d5ae7] Crash in async connects host no address (gahr,fellows)
-
-2016-10-08 (bug)[838e99] treat application/xml as text (gahr,fellows)
-=> http 2.8.10
-
-2016-10-11 (bug)[3cc1d9] Thread finalization crash in zippy (neumann)
-
-2016-10-12 (bug)[be003d] Fix [scan 0x1 %b], [scan 0x1 %o] (porter)
-
-2016-10-14 (bug)[eb6b68] Fix stringComp-14.5 (porter)
-
-2016-10-30 (bug)[b26e38] Fix zlib-7.8 (fellows)
-
-2016-10-30 (bug)[1ae129] Fix memleak in [history] destruction (fellows)
-
-2016-11-04 (feature) Provisional Tcl 9 support in msgcat and tcltest (nijtmans)
-=> msgcat 1.6.1
-=> tcltest 2.4.1
-
-2016-11-04 (bug)[824752] Crash in Tcl_ListObjReplace() (gahr,porter)
-
-2016-11-11 (bug)[79614f] invalidate VFS mounts on sytem encoding change (yorick)
-
-2016-11-14 OSX: End panic() as legacy support macro; system conflicts (nijtmans)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2016-11-15 (bug) TclOO fix stops crash mixing Itcl and snit (fellows)
-
-2016-11-17 (update) Reconcile libtommath updates; purge unused files (nijtmans)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2017-01-09 (bug)[b87ad7] Repair drifts in timer clock (sebres)
-
-2017-01-17 (update) => zlib 1.2.11 (nijtmans)
-
-2017-01-31 (bug)[39f630] Revise Tcl_LinkVar to tolerate some prefixes (nijtmans)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2017-02-01 (bug)[d0f7ba] Improper NAN optimization. expr-22.1[01] (aspect)
-
-2017-02-26 (bug)[25842c] zlib stream finalization (aspect)
-
-2017-03-07 (deprecate) Remove unmaintained makefile.bc file (nijtmans)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2017-03-14 (enhancement) [clock] and [encoding] are now ensembles (kenny)
-
-2017-03-15 (enhancement) several [clock] subcommands bytecoded (kenny)
-
-2017-03-23 tzdata updated to Olson's tzdata2017b (jima)
-
-2017-03-29 (bug)[900cb0] Fix OO unexport introspection (napier)
-
-2017-04-12 (bug)[42202b] Nesting imbalance in coro injection (nadkarni,sebres)
-
-2017-04-18 (bug)[bc4322] http package support for safe interps (nash,nijtmans)
-
-2017-04-28 (bug)[f34cf8] [file join a //b] => /b (neumann,porter)
-
-2017-05-01 (bug)[8bd13f] Windows threads and pipes (sebres,nijtmans)
-
-2017-05-01 (bug)[f9fe90] [file join //a b] EIAS violation (aspect,porter)
-
-2017-05-04 (bug) Make test filesystem-1.52 pass on Windows (nijtmans)
-
-2017-05-05 (bug)[601522] [binary] field spec overflow -> segfault (porter)
-
-2017-05-08 (bug)[6ca52a] http memleak handling keep-alive (aspect,nijtmans)
-=> http 2.8.11
-
-2017-05-29 (bug)[a3fb33] crash in [lsort] on long lists (sebres)
-
-2017-06-05 (bug)[67aa9a] Tcl_UtfToUniChar() revised handling invalid UTF-8 (nijtmans)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2017-06-08 (bug)[2738427] Tcl_NumUtfChars() corner case utf-4.9 (nijtmans)
-
-2017-06-22 (update) Update Unicode data to 10.0 (nijtmans)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2017-06-22 (TIP 473) Let [oo::copy] specify target namespace (fellows)
-
-2017-06-26 (bug)[46f801] Repair autoloader fragility (porter)
-
-2017-07-06 (bug)[adb198] Plug memleak in TclJoinPath (sebres,porter)
-
-2017-07-17 (bug)[fb2208] Repeatable tclIndex generation (wiedemann,nijtmans)
-
--- Released 8.6.7, August 9, 2017 --- http://core.tcl.tk/tcl/ for details
-
-2017-08-10 [array names -regexp] supports backrefs (goth)
-
-2017-08-10 Fix gcc build failures due to #pragma placement (cassoff,fellows)
-
-2017-08-29 (bug)[b50fb2] exec redir append stdout and stderr to file (coulter)
-
-2017-08-31 (bug)[2a9465] http state 100 continue handling broken (oehlmann)
-=> http 2.8.12
-
-2017-09-02 (bug)[0e4d88] replace command, delete trace kills namespace (porter)
-
-2017-10-19 (bug)[1a5655] [info * methods] includes mixins (fellows)
-
-2017-10-23 tzdata updated to Olson's tzdata2017c (jima)
-
-2017-10-24 (bug)[fc1409] segfault in method cloning, oo-15.15 (coulter,fellows)
-
-2017-11-03 (bug)[6f2f83] More robust [load] for ReactOS (werner)
-
-2017-11-08 (bug)[3298012] Stop crash when hash tables overflow 32 bits (porter)
-
-2017-11-14 (bug)[5d6de6] Close failing case of [package prefer stable] (kupries)
-
-2017-11-17 (bug)[fab924] Fix misleading [load] message on Windows (oehlmann)
-
-2017-12-05 (bug)[4f6a1e] Crash when ensemble map and list are same (sebres)
-
-2017-12-06 (bug)[ce3a21] file normalize failure when tail is empty (porter)
-
-2017-12-08 (new)[TIP 477] nmake build system reform (nadkarni)
-
-2017-12-19 (bug)[586e71] EvalObjv exception handling at level #0 (sebres,porter)
-
--- Released 8.6.8, December 22, 2017 --- http://core.tcl.tk/tcl/ for details
-
-Changes to 8.7a1 include all changes to the 8.6 line through 8.6.7,
-plus the following, which focuses on the high-level feature changes
-in this changeset (new minor version) rather than bug fixes:
-
-2016-03-17 (bug)[0b8c38] socket accept callbacks always in global ns (porter)
-        *** POTENTIAL INCOMPATIBILITY ***
-
-2016-07-01 Hack accommodations for legacy Itcl 3 disabled (porter)
-
-2016-07-12 Make TCL_HASH_TYPE build-time configurable (nijtmans)
-
-2016-07-19 (bug)[0363f0] Partial array search ID reform (porter)
-
-2016-07-19 (feature removed) Tcl_ObjType "array search" unregistered (porter)
-	*** POTENTIAL INCOMPATIBILITY for Tcl_GetObjType("array search") ***
-
-2016-10-04 Server socket on port 0 chooses port supporting IPv4 * IPv6 (max)
-
-2016-11-25 [array named -regexp] supports backrefs (goth)
-
-2017-01-04 (TIP 456) New routine Tcl_OpenTcpServerEx() (limeboy)
-
-2017-01-04 (TIP 459) New subcommand [package files] (nijtmans)
-
-2017-01-16 threaded allocator initialization repair (vasiljevic,nijtmans)
-
-2017-01-30 Add to Win shell builtins: assoc ftype move (ashok)
-
-2017-03-31 TCL_MEM_DEBUG facilities better support 64-bit memory (nijtmans)
-
-2017-04-13 \u escaped content in msg files converted to true utf-8 (nijtmans)
-
-2017-05-18 (TIP 458) New epoll or kqueue notifiers are default (alborboz)
-
-2017-05-31 Purge build support for SunOS-4.* (stu)
-
-2017-06-22 (TIP 463) New option [regsub ... -command ...] (fellows)
-
-2017-06-22 (TIP 470) Tcl_GetDefineContextObject();[oo::define [self]] (fellows)
-=> TclOO 1.2.0
-
-2017-06-23 (TIP 472) Support 0d as prefix of decimal numbers (iyer,griffin)
-
-2017-08-31 (bug)[2a9465] http state 100 continue handling broken (oehlmann)
-
-2017-09-02 (bug)[0e4d88] replace command, delete trace kills namespace (porter)
-
--- Released 8.7a1, September 8, 2017 --- http://core.tcl.tk/tcl/ for details
-
-2018-03-12 (TIP 490) add oo support for msgcat => msgcat 1.7.0 (oehlmann)
-
-2018-03-12 (TIP 499) custom locale preference list (oehlmann)
-=> msgcat 1.7.0
@@ -0,0 +1,14 @@
+/*
+ * float.h --
+ *
+ *	This is a dummy header file to #include in Tcl when there
+ *	is no float.h in /usr/include.  Right now this file is empty:
+ *	Tcl contains #ifdefs to deal with the lack of definitions;
+ *	all it needs is for the #include statement to work.
+ *
+ * Copyright (c) 1993 The Regents of the University of California.
+ * Copyright (c) 1994 Sun Microsystems, Inc.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
@@ -260,6 +260,10 @@ Windows-only convenience
 functions for converting between UTF-8 and Windows strings
 based on the TCHAR type which is by convention
 a Unicode character on Windows NT.
+These functions are essentially wrappers around
+\fBTcl_UtfToExternalDString\fR and
+\fBTcl_ExternalToUtfDString\fR that convert to and from the
+Unicode encoding.
 .PP
 \fBTcl_GetEncodingName\fR is roughly the inverse of \fBTcl_GetEncoding\fR.
 Given an \fIencoding\fR, the return value is the \fIname\fR argument that
@@ -176,10 +176,10 @@ it is faster to execute the script directly.
 .TP 23
 \fBTCL_EVAL_GLOBAL\fR
 .
-If this flag is set, the script is evaluated in the global namespace instead of
-the current namespace and its variable context consists of global variables
-only (it ignores any Tcl procedures that are active).
-.\" TODO: document TCL_EVAL_INVOKE and TCL_EVAL_NOERR.
+If this flag is set, the script is processed at global level.  This
+means that it is evaluated in the global namespace and its variable
+context consists of global variables only (it ignores any Tcl
+procedures that are active).

 .SH "MISCELLANEOUS DETAILS"
 .PP
@@ -57,9 +57,6 @@ after the optional white space and sign are
 .QW \fB0x\fR
 then \fIsrc\fR is expected to be in hexadecimal form;  otherwise,
 if the first such characters are
-.QW \fB0d\fR
-then \fIsrc\fR is expected to be in decimal form; otherwise,
-if the first such characters are
 .QW \fB0o\fR
 then \fIsrc\fR is expected to be in octal form;  otherwise,
 if the first such characters are
@@ -68,8 +65,8 @@ then \fIsrc\fR is expected to be in binary form;  otherwise,
 if the first such character is
 .QW \fB0\fR
 then \fIsrc\fR
-is expected to be in octal form;  otherwise, \fIsrc\fR
-is expected to be in decimal form.
+is expected to be in octal form;  otherwise, \fIsrc\fR is
+expected to be in decimal form.
 .PP
 \fBTcl_GetDouble\fR expects \fIsrc\fR to consist of a floating-point
 number, which is:  white space;  a sign; a sequence of digits;  a
@@ -97,7 +97,7 @@ are provided by the C language standard.  The \fBTcl_WideInt\fR type is a
 typedef defined to be whatever signed integral type covers at least the
 64-bit integer range (-9223372036854775808 to 9223372036854775807).  Depending
 on the platform and the C compiler, the actual type might be
-\fBlong long int\fR, \fB__int64\fR, or something else.
+\fBlong int\fR, \fBlong long int\fR, \fB__int64\fR, or something else.
 The \fBmp_int\fR type is a multiple-precision integer type defined
 by the LibTomMath multiple-precision integer library.
 .PP
@@ -101,7 +101,7 @@ the command.  The \fIfreeProc\fR field will be initialized to zero,
 and \fIinterp->result\fR will point to an empty string.  Commands that
 do not return any value can simply leave the fields alone.
 Furthermore, the empty string pointed to by \fIresult\fR is actually
-part of an array of approximately 200 characters.
+part of an array of \fBTCL_RESULT_SIZE\fR characters (approximately 200).
 If a command wishes to return a short string, it can simply copy
 it to the area pointed to by \fIinterp->result\fR.  Or, it can use
 the sprintf procedure to generate a short result string at the location
@@ -1,6 +1,5 @@
 .\"
 .\" Copyright (c) 2008 by Kevin B. Kenny.
-.\" Copyright (c) 2018 by Nathan Coulter. 
 .\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -39,39 +38,43 @@ void
 .SH ARGUMENTS
 .AS Tcl_CmdDeleteProc *interp in
 .AP Tcl_Interp *interp in
-The relevant Interpreter.
+Interpreter in which to create or evaluate a command.
 .AP char *cmdName in
-Name of the command to create.
+Name of a new command to create.
 .AP Tcl_ObjCmdProc *proc in
-Called in order to evaluate a command.  Is often just a small wrapper that uses
-\fBTcl_NRCallObjProc\fR to call \fInreProc\fR using a new trampoline.  Behaves
-in the same way as the \fIproc\fR argument to \fBTcl_CreateObjCommand\fR(3)
-(\fIq.v.\fR).
+Implementation of a command that will be called whenever \fIcmdName\fR
+is invoked as a command in the unoptimized way.
 .AP Tcl_ObjCmdProc *nreProc in
-Called instead of \fIproc\fR when a trampoline is already in use.
+Implementation of a command that will be called whenever \fIcmdName\fR
+is invoked and requested to conserve the C stack.
 .AP ClientData clientData in
-Arbitrary one-word value passed to \fIproc\fR, \fInreProc\fR, \fIdeleteProc\fR
-and \fIobjProc\fR.
+Arbitrary one-word value that will be passed to \fIproc\fR, \fInreProc\fR,
+\fIdeleteProc\fR and \fIobjProc\fR.
 .AP Tcl_CmdDeleteProc *deleteProc in/out
-Called before \fIcmdName\fR is deleted from the interpreter, allowing for
-command-specific cleanup. May be NULL.
+Procedure to call before \fIcmdName\fR is deleted from the interpreter.
+This procedure allows for command-specific cleanup. If \fIdeleteProc\fR
+is \fBNULL\fR, then no procedure is called before the command is deleted.
 .AP int objc in
-Number of items in \fIobjv\fR.
+Count of parameters provided to the implementation of a command.
 .AP Tcl_Obj **objv in
-Words in the command.
+Pointer to an array of Tcl values. Each value holds the value of a
+single word in the command to execute.
 .AP Tcl_Obj *objPtr in
-A script or expression to evaluate.
+Pointer to a Tcl_Obj whose value is a script or expression to execute.
 .AP int flags in
-As described for \fITcl_EvalObjv\fR.
-.PP
+ORed combination of flag bits that specify additional options.
+\fBTCL_EVAL_GLOBAL\fR is the only flag that is currently supported.
+.\" TODO: This is a lie. But kbk didn't grasp TCL_EVAL_INVOKE and
+.\"       TCL_EVAL_NOERR well enough to document them.
 .AP Tcl_Command cmd in
-Token to use instead of one derived from the first word of \fIobjv\fR in order
-to evaluate a command.
+Token for a command that is to be used instead of the currently
+executing command.
 .AP Tcl_Obj *resultPtr out
-Pointer to an unshared Tcl_Obj where the result of the evaluation is stored if
-the return code is TCL_OK.
+Pointer to an unshared Tcl_Obj where the result of expression
+evaluation is written.
 .AP Tcl_NRPostProc *postProcPtr in
-A function to push.
+Pointer to a function that will be invoked when the command currently
+executing in the interpreter designated by \fIinterp\fR completes.
 .AP ClientData data0 in
 .AP ClientData data1 in
 .AP ClientData data2 in
@@ -81,51 +84,98 @@ to the function designated by \fIpostProcPtr\fR when it is invoked.
 .BE
 .SH DESCRIPTION
 .PP
-These functions provide an interface to the function stack that an interpreter
-iterates through to evaluate commands.  The routine behind a command is
-implemented by an initial function and any additional functions that the
-routine pushes onto the stack as it progresses.  The interpreter itself pushes
-functions onto the stack to react to the end of a routine and to exercise other
-forms of control such as switching between in-progress stacks and the
-evaluation of other scripts at additional levels without adding frames to the C
-stack.  To execute a routine, the initial function for the routine is called
-and then a small bit of code called a \fItrampoline\fR iteratively takes
-functions off the stack and calls them, using the value of the last call as the
-value of the routine.
+This series of C functions provides an interface whereby commands that
+are implemented in C can be evaluated, and invoke Tcl commands scripts
+and scripts, without consuming space on the C stack. The non-recursive
+evaluation is done by installing a \fItrampoline\fR, a small piece of
+code that invokes a command or script, and then executes a series of
+callbacks when the command or script returns.
 .PP
-\fBTcl_NRCallObjProc\fR calls \fInreProc\fR using a new trampoline.
+The \fBTcl_NRCreateCommand\fR function creates a Tcl command in the
+interpreter designated by \fIinterp\fR that is prepared to handle
+nonrecursive evaluation with a trampoline. The \fIcmdName\fR argument
+gives the name of the new command. If \fIcmdName\fR contains any
+namespace qualifiers, then the new command is added to the specified
+namespace; otherwise, it is added to the global namespace. \fIproc\fR
+gives the procedure that will be called when the interpreter wishes to
+evaluate the command in an unoptimized manner, and \fInreProc\fR is
+the procedure that will be called when the interpreter wishes to
+evaluate the command using a trampoline. \fIdeleteProc\fR is a
+function that will be called before the command is deleted from the
+interpreter. When any of the three functions is invoked, it is passed
+the \fIclientData\fR parameter.
 .PP
-\fBTcl_NRCreateCommand\fR, an alternative to \fBTcl_CreateObjCommand\fR,
-resolves \fIcmdName\fR, which may contain namespace qualifiers, relative to the
-current namespace, creates a command by that name, and returns a token for the
-command which may be used in subsequent calls to \fBTcl_GetCommandName\fR.
-Except for a few cases noted below any existing command by the same name is
-first deleted.  If \fIinterp\fR is in the process of being deleted
-\fBTcl_NRCreateCommand\fR does not create any command, does not delete any
-command, and returns NULL.
+\fBTcl_NRCreateCommand\fR deletes any existing command
+\fIname\fR already associated with the interpreter
+(however see below for an exception where the existing command
+is not deleted).
+It returns a token that may be used to refer
+to the command in subsequent calls to \fBTcl_GetCommandName\fR.
+If \fBTcl_NRCreateCommand\fR is called for an interpreter that is in
+the process of being deleted, then it does not create a new command,
+does not delete any existing command of the same name, and returns NULL.
 .PP
-\fBTcl_NREvalObj\fR pushes a function that is like \fBTcl_EvalObjEx\fR but
-consumes no space on the C stack.
+The \fIproc\fR and \fInreProc\fR function are expected to conform to
+all the rules set forth for the \fIproc\fR argument to
+\fBTcl_CreateObjCommand\fR(3) (\fIq.v.\fR).
 .PP
-\fBTcl_NREvalObjv\fR pushes a function that is like \fBTcl_EvalObjv\fR but
-consumes no space on the C stack.
+When a command that is written to cope with evaluation via trampoline
+is invoked without a trampoline on the stack, it will usually respond
+to the invocation by creating a trampoline and calling the
+trampoline-enabled implementation of the same command. This call is done by
+means of \fBTcl_NRCallObjProc\fR. In the call to
+\fBTcl_NRCallObjProc\fR, the \fIinterp\fR, \fIclientData\fR,
+\fIobjc\fR and \fIobjv\fR parameters should be the same ones that were
+passed to \fIproc\fR. The \fInreProc\fR parameter should designate the
+trampoline-enabled implementation of the command.
 .PP
-\fBTcl_NRCmdSwap\fR is like \fBTcl_NREvalObjv\fR, but uses \fIcmd\fR, a token
-previously returned by \fBTcl_CreateObjCommand\fR or
-\fBTcl_GetCommandFromObj\fR, instead of resolving the first word of \fIobjv\fR.
-.  The name of this command must be the same as \fIobjv[0]\fR.
+\fBTcl_NREvalObj\fR arranges for the script contained in \fIobjPtr\fR
+to be evaluated in the interpreter designated by \fIinterp\fR after
+the current command (which must be trampoline-enabled) returns. It is
+the method by which a command may invoke a script without consuming
+space on the C stack. Similarly, \fBTcl_NREvalObjv\fR arranges to
+invoke a single Tcl command whose words have already been separated
+and substituted. The \fIobjc\fR and \fIobjv\fR parameters give the
+words of the command to be evaluated when execution reaches the
+trampoline.
 .PP
-\fBTcl_NRExprObj\fR pushes a function that evaluates \fIobjPtr\fR as an
-expression in the same manner as \fBTcl_ExprObj\fR but without consuming space
-on the C stack.
+\fBTcl_NRCmdSwap\fR allows for trampoline evaluation of a command whose
+resolution is already known.  The \fIcmd\fR parameter gives a
+\fBTcl_Command\fR token (returned from \fBTcl_CreateObjCommand\fR or
+\fBTcl_GetCommandFromObj\fR) identifying the command to be invoked in
+the trampoline; this command must match the word in \fIobjv[0]\fR.
+The remaining arguments are as for \fBTcl_NREvalObjv\fR.
 .PP
-All of the functions return \fBTCL_OK\fR if the evaluation of the script,
-command, or expression has been scheduled successfully.  Otherwise (for example
-if the command name cannot be resolved), they return \fBTCL_ERROR\fR and store
-a message as the interpreter's result.
+\fBTcl_NREvalObj\fR, \fBTcl_NREvalObjv\fR and \fBTcl_NRCmdSwap\fR
+all accept a \fIflags\fR parameter, which is an OR-ed-together set of
+bits to control evaluation. At the present time, the only supported flag
+available to callers is \fBTCL_EVAL_GLOBAL\fR.
+.\" TODO: Again, this is a lie. Do we want to explain TCL_EVAL_INVOKE
+.\"       and TCL_EVAL_NOERR?
+If the \fBTCL_EVAL_GLOBAL\fR flag is set, the script or command is
+evaluated in the global namespace. If it is not set, it is evaluated
+in the current namespace.
 .PP
-\fBTcl_NRAddCallback\fR pushes \fIpostProcPtr\fR.  The signature for
-\fBTcl_NRPostProc\fR is:
+\fBTcl_NRExprObj\fR arranges for the expression contained in \fIobjPtr\fR
+to be evaluated in the interpreter designated by \fIinterp\fR after
+the current command (which must be trampoline-enabled) returns. It is
+the method by which a command may evaluate a Tcl expression without consuming
+space on the C stack.  The argument \fIresultPtr\fR is a pointer to an
+unshared Tcl_Obj where the result of expression evaluation is to be written.
+If expression evaluation returns any code other than TCL_OK, the
+\fIresultPtr\fR value is left untouched.
+.PP
+All of the routines return \fBTCL_OK\fR if command or expression invocation
+has been scheduled successfully. If for any reason the scheduling cannot
+be completed (for example, if the interpreter is unable to find
+the requested command), they return \fBTCL_ERROR\fR with an
+appropriate message left in the interpreter's result.
+.PP
+\fBTcl_NRAddCallback\fR arranges to have a C function called when the
+current trampoline-enabled command in the Tcl interpreter designated
+by \fIinterp\fR returns.  The \fIpostProcPtr\fR argument is a pointer
+to the callback function, which must have arguments and return value
+consistent with the \fBTcl_NRPostProc\fR data type:
 .PP
 .CS
 typedef int
@@ -135,13 +185,25 @@ typedef int
        int \fIresult\fR);
 .CE
 .PP
-\fIdata\fR is a pointer to an array containing \fIdata0\fR through \fIdata3\fR.
-\fIresult\fR is the value returned by the previous function implementing part
-the routine.
+When the trampoline invokes the callback function, the \fIdata\fR
+parameter will point to an array containing the four one-word
+quantities that were passed to \fBTcl_NRAddCallback\fR in the
+\fIdata0\fR through \fIdata3\fR parameters. The Tcl interpreter will
+be designated by the \fIinterp\fR parameter, and the \fIresult\fR
+parameter will contain the result (\fBTCL_OK\fR, \fBTCL_ERROR\fR,
+\fBTCL_RETURN\fR, \fBTCL_BREAK\fR or \fBTCL_CONTINUE\fR) that was
+returned by the command evaluation. The callback function is expected,
+in turn, either to return a \fIresult\fR to control further evaluation.
+.PP
+Multiple \fBTcl_NRAddCallback\fR invocations may request multiple
+callbacks, which may be to the same or different callback
+functions. If multiple callbacks are requested, they are executed in
+last-in, first-out order, that is, the most recently requested
+callback is executed first.
 .SH EXAMPLE
 .PP
-The following command uses \fBTcl_EvalObjEx\fR, which consumes space on the C
-stack, to evalute a script:
+The usual pattern for Tcl commands that invoke other Tcl commands
+is something like:
 .PP
 .CS
 int
@@ -166,17 +228,28 @@ int
        \fITheCmdOldObjProc\fR, clientData, TheCmdDeleteProc);
 .CE
 .PP
-To avoid consuming space on the C stack, \fITheCmdOldObjProc\fR is renamed to
-\fITheCmdNRObjProc\fR and the postprocessing step is split into a separate
-function, \fITheCmdPostProc\fR, which is pushed onto the function stack.
-\fITcl_EvalObjEx\fR is replaced with \fITcl_NREvalObj\fR, which uses a
-trampoline instead of consuming space on the C stack.  A new version of
-\fITheCmdOldObjProc\fR is just a a wrapper that uses \fBTcl_NRCallObjProc\fR to
-call \fITheCmdNRObjProc\fR:
+To enable a command like this one for trampoline-based evaluation,
+it must be split into three pieces:
+.IP \(bu
+A non-trampoline implementation, \fITheCmdNewObjProc\fR,
+which will simply create a trampoline
+and invoke the trampoline-based implementation.
+.IP \(bu
+A trampoline-enabled implementation, \fITheCmdNRObjProc\fR.  This
+function will perform the initialization, request that the trampoline
+call the postprocessing routine after command evaluation, and finally,
+request that the trampoline call the inner command.
+.IP \(bu
+A postprocessing routine, \fITheCmdPostProc\fR. This function will
+perform the postprocessing formerly done after the return from the
+inner command in \fITheCmdObjProc\fR.
+.PP
+The non-trampoline implementation is simple and stylized, containing
+a single statement:
 .PP
 .CS
 int
-\fITheCmdOldObjProc\fR(
+\fITheCmdNewObjProc\fR(
    ClientData clientData,
    Tcl_Interp *interp,
    int objc,
@@ -187,6 +260,9 @@ int
 }
 .CE
 .PP
+The trampoline-enabled implementation requests postprocessing,
+and returns to the trampoline requesting command evaluation.
+.PP
 .CS
 int
 \fITheCmdNRObjProc\fR
@@ -208,6 +284,9 @@ int
 }
 .CE
 .PP
+The postprocessing procedure does whatever the original command did
+upon return from the inner evaluation.
+.PP
 .CS
 int
 \fITheCmdNRPostProc\fR(
@@ -224,13 +303,26 @@ int
 }
 .CE
 .PP
-Any function comprising a routine can push other functions, making it possible
-implement looping and sequencing constructs using the function stack.
+If \fItheCommand\fR is a command that results in multiple commands or
+scripts being evaluated, its postprocessing routine may schedule
+additional postprocessing and then request another command evaluation
+by means of \fBTcl_NREvalObj\fR or one of the other evaluation
+routines. Looping and sequencing constructs may be implemented in this way.
 .PP
+Finally, to install a trampoline-enabled command in the interpreter,
+\fBTcl_NRCreateCommand\fR is used in place of
+\fBTcl_CreateObjCommand\fR.  It accepts two command procedures instead
+of one. The first is for use when no trampoline is yet on the stack,
+and the second is for use when there is already a trampoline in place.
+.PP
+.CS
+\fBTcl_NRCreateCommand\fR(interp, "theCommand",
+        \fITheCmdNewObjProc\fR, \fITheCmdNRObjProc\fR, clientData,
+        TheCmdDeleteProc);
+.CE
 .SH "SEE ALSO"
 Tcl_CreateCommand(3), Tcl_CreateObjCommand(3), Tcl_EvalObjEx(3), Tcl_GetCommandFromObj(3), Tcl_ExprObj(3)
 .SH KEYWORDS
 stackless, nonrecursive, execute, command, global, value, result, script
 .SH COPYRIGHT
-Copyright (c) 2008 by Kevin B. Kenny.
-Copyright (c) 2018 by Nathan Coulter.
+Copyright (c) 2008 by Kevin B. Kenny
@@ -257,7 +257,7 @@ The \fBincr\fR command first gets an integer from \fIx\fR's value
 by calling \fBTcl_GetIntFromObj\fR.
 This procedure checks whether the value is already an integer value.
 Since it is not, it converts the value
-by setting the value's internal representation
+by setting the value's \fIinternalRep.longValue\fR member
 to the integer \fB123\fR
 and setting the value's \fItypePtr\fR
 to point to the integer Tcl_ObjType structure.
@@ -54,9 +54,9 @@ is called, Tcl will take care of memory management.
 .PP
 The second triplet stores the snapshot of only the interpreter
 result (not its complete state) in memory allocated by the caller.
-These routines are passed a pointer to \fBTcl_SavedResult\fR
+These routines are passed a pointer to a \fBTcl_SavedResult\fR structure
 that is used to store enough information to restore the interpreter result.
-\fBTcl_SavedResult\fR can be allocated on the stack of the calling
+This structure can be allocated on the stack of the calling
 procedure.  These routines do not save the state of any error
 information in the interpreter (e.g. the \fB\-errorcode\fR or
 \fB\-errorinfo\fR return options, when an error is in progress).
@@ -33,7 +33,7 @@ int
 .SH ARGUMENTS
 .AS char *str in/out
 .AP int ch in
-The Unicode character to be converted.
+The Tcl_UniChar to be converted.
 .AP char *str in/out
 Pointer to UTF-8 string to be converted in place.
 .BE
@@ -48,16 +48,19 @@ int
 .SH ARGUMENTS
 .AS int ch
 .AP int ch in
-The Unicode character to be examined.
+The Tcl_UniChar to be examined.
 .BE

 .SH DESCRIPTION
 .PP
-All of the routines described examine Unicode characters and return a
+All of the routines described examine Tcl_UniChars and return a
 boolean value. A non-zero return value means that the character does
 belong to the character class associated with the called routine. The
 rest of this document just describes the character classes associated
 with the various routines.
+.PP
+Note: A Tcl_UniChar is a Unicode character represented as an unsigned,
+fixed-size quantity.

 .SH "CHARACTER CLASSES"
 .PP
@@ -77,7 +77,7 @@ int
 Buffer in which the UTF-8 representation of the Tcl_UniChar is stored.  At most
 \fBTCL_UTF_MAX\fR bytes are stored in the buffer.
 .AP int ch in
-The Unicode character to be converted or examined.
+The Tcl_UniChar to be converted or examined.
 .AP Tcl_UniChar *chPtr out
 Filled with the Tcl_UniChar represented by the head of the UTF-8 string.
 .AP "const char" *src in
@@ -23,7 +23,7 @@ exception to occur.
 The exception causes the current script to be aborted
 out to the innermost containing loop command, which then
 continues with the next iteration of the loop.
-Continue exceptions are also handled in a few other situations, such
+Catch exceptions are also handled in a few other situations, such
 as the \fBcatch\fR command and the outermost scripts of procedure
 bodies.
 .SH EXAMPLE
@@ -33,9 +33,9 @@ as the empty string, a new name is chosen. Names, unless specified, are
 chosen with the same algorithm used by the \fBnew\fR method of
 \fBoo::class\fR.
 .VE TIP473
-The copied object will be of the same class as the source object, and will have
-all its per-object methods copied. If it is a class, it will also have all the
-class methods in the class copied, but it will not have any of its instances
+The copied object will be of the same class as the source object, and will have 
+all its per-object methods copied. If it is a class, it will also have all the 
+class methods in the class copied, but it will not have any of its instances 
 copied.
 .PP
 .VS
@@ -38,8 +38,8 @@ Performs one of several encoding related operations, depending on
 .
 Convert \fIdata\fR to Unicode from the specified \fIencoding\fR.  The
 characters in \fIdata\fR are treated as binary data where the lower
-8-bits of each character is taken as a single byte.  This binary data
-is decoded as a string in the specified
+8-bits of each character is taken as a single byte.  The resulting
+sequence of bytes is treated as a string in the specified
 \fIencoding\fR.  If \fIencoding\fR is not specified, the current
 system encoding is used.
 .TP
@@ -46,8 +46,7 @@ value is the form produced by the \fB%g\fR format specifier of Tcl's
 An expression consists of a combination of operands, operators, parentheses and
 commas, possibly with whitespace between any of these elements, which is
 ignored.
-An integer operand may be specified in decimal (the normal case, the optional
-first two characters are \fB0d\fR), binary
+An integer operand may be specified in decimal, binary
 (the first two characters are \fB0b\fR), octal
 (the first two characters are \fB0o\fR), or hexadecimal
 (the first two characters are \fB0x\fR) form.  For
@@ -83,15 +83,12 @@ Specifies that the number should be padded on the left with
 zeroes instead of spaces.
 .TP 10
 \fB#\fR
-Requests an alternate output form. For \fBo\fR conversions,
-\fB0o\fR will be added to the beginning of the result unless
-it is zero. For \fBx\fR or \fBX\fR conversions, \fB0x\fR
+Requests an alternate output form. For \fBo\fR and \fBO\fR
+conversions it guarantees that the first digit is always \fB0\fR.
+For \fBx\fR or \fBX\fR conversions, \fB0x\fR or \fB0X\fR (respectively)
 will be added to the beginning of the result unless it is zero.
 For \fBb\fR conversions, \fB0b\fR
 will be added to the beginning of the result unless it is zero.
-For \fBd\fR conversions, \fB0d\fR there is no effect unless
-the \fB0\fR specifier is used as well: In that case, \fB0d\fR
-will be added to the beginning.
 For all floating-point conversions (\fBe\fR, \fBE\fR, \fBf\fR,
 \fBg\fR, and \fBG\fR) it guarantees that the result always
 has a decimal point.
@@ -133,7 +130,7 @@ it must be a numeric string.
 .SS "OPTIONAL SIZE MODIFIER"
 .PP
 The fifth part of a conversion specifier is a size modifier,
-which must be \fBll\fR, \fBh\fR, \fBl\fR, or \fBL\fR.
+which must be \fBll\fR, \fBh\fR, or \fBl\fR.
 If it is \fBll\fR it specifies that an integer value is taken
 without truncation for conversion to a formatted substring.
 If it is \fBh\fR it specifies that an integer value is
@@ -141,9 +138,7 @@ truncated to a 16-bit range before converting.  This option is rarely useful.
 If it is \fBl\fR it specifies that the integer value is
 truncated to the same range as that produced by the \fBwide()\fR
 function of the \fBexpr\fR command (at least a 64-bit range).
-If it is \fBL\fR it specifies that an integer or double value is taken
-without truncation for conversion to a formatted substring.
-If neither \fBh\fR nor \fBl\fR nor \fBL\fR are present, the integer value is
+If neither \fBh\fR nor \fBl\fR are present, the integer value is
 truncated to the same range as that produced by the \fBint()\fR
 function of the \fBexpr\fR command (at least a 32-bit range, but
 determined by the value of the \fBwordSize\fR element of the
@@ -174,7 +169,7 @@ for \fBx\fR and
 for \fBX\fR).
 .TP 10
 \fBb\fR
-Convert integer to unsigned binary string, using digits 0 and 1.
+Convert integer to binary string, using digits 0 and 1.
 .TP 10
 \fBc\fR
 Convert integer to the Unicode character it represents.
@@ -203,19 +198,8 @@ precision, then convert number as for \fB%e\fR or
 Otherwise convert as for \fB%f\fR.
 Trailing zeroes and a trailing decimal point are omitted.
 .TP 10
-\fBa\fR or \fBA\fR
-Convert double to hexadecimal notation in the form
-\fI0x1.yyy\fBp\(+-\fIzz\fR, where the number of \fIy\fR's is
-determined by the precision (default: 13).
-If the \fBA\fR form is used then the hex characters
-are printed in uppercase.
-.TP 10
 \fB%\fR
 No conversion: just insert \fB%\fR.
-.TP 10
-\fBp\fR
-Shorthand form for \fB0x%zx\fR, so it outputs the integer in
-hexadecimal form with \fB0x\fR prefix.
 .SH "DIFFERENCES FROM ANSI SPRINTF"
 .PP
 The behavior of the format command is the same as the
@@ -224,12 +208,13 @@ differences:
 .IP [1]
 Tcl guarantees that it will be working with UNICODE characters.
 .IP [2]
-\fB%n\fR specifier is not supported.
+\fB%p\fR and \fB%n\fR specifiers are not supported.
 .IP [3]
 For \fB%c\fR conversions the argument must be an integer value,
 which will then be converted to the corresponding character value.
 .IP [4]
 The size modifiers are ignored when formatting floating-point values.
+The \fBll\fR modifier has no \fBsprintf\fR counterpart.
 The \fBb\fR specifier has no \fBsprintf\fR counterpart.
 .SH EXAMPLES
 .PP
@@ -148,19 +148,6 @@ or \fB\-not\fR.
 These options are used to search lists of lists.  They may be used
 with any other options.
 .TP
-\fB\-stride\0\fIstrideLength\fR
-.
-If this option is specified, the list is treated as consisting of
-groups of \fIstrideLength\fR elements and the groups are searched by
-either their first element or, if the \fB\-index\fR option is used,
-by the element within each group given by the first index passed to
-\fB\-index\fR (which is then ignored by \fB\-index\fR). The resulting
-index always points to the first element in a group.
-.PP
-The list length must be an integer multiple of \fIstrideLength\fR, which
-in turn must be at least 1. A \fIstrideLength\fR of 1 is the default and
-indicates no grouping.
-.TP
 \fB\-index\fR\0\fIindexList\fR
 .
 This option is designed for use when searching within nested lists.
@@ -221,13 +208,6 @@ It is also possible to search inside elements:
 \fBlsearch\fR -index 1 -all -inline {{a abc} {b bcd} {c cde}} *bc*
      \fI\(-> {a abc} {b bcd}\fR
 .CE
-.PP
-The same thing for a flattened list:
-.PP
-.CS
-\fBlsearch\fR -stride 2 -index 1 -all -inline {a abc b bcd c cde} *bc*
-      \fI\(-> {a abc b bcd}\fR
-.CE
 .SH "SEE ALSO"
 foreach(n), list(n), lappend(n), lindex(n), linsert(n), llength(n),
 lset(n), lsort(n), lrange(n), lreplace(n),
@@ -11,9 +11,9 @@
 .SH NAME
 msgcat \- Tcl message catalog
 .SH SYNOPSIS
-\fBpackage require Tcl 8.7\fR
+\fBpackage require Tcl 8.5\fR
 .sp
-\fBpackage require msgcat 1.7\fR
+\fBpackage require msgcat 1.6\fR
 .sp
 \fB::msgcat::mc \fIsrc-string\fR ?\fIarg arg ...\fR?
 .sp
@@ -23,15 +23,9 @@ msgcat \- Tcl message catalog
 \fB::msgcat::mcexists\fR ?\fB-exactnamespace\fR? ?\fB-exactlocale\fR? \fIsrc-string\fR
 .VE "TIP 412"
 .sp
-.VS "TIP 490"
-\fB::msgcat::mcpackagenamespaceget\fR
-.VE "TIP 490"
-.sp
 \fB::msgcat::mclocale \fR?\fInewLocale\fR?
 .sp
-.VS "TIP 499"
-\fB::msgcat::mcpreferences\fR ?\fIlocale preference\fR? ...
-.VE "TIP 499"
+\fB::msgcat::mcpreferences\fR
 .sp
 .VS "TIP 412"
 \fB::msgcat::mcloadedlocales subcommand\fR ?\fIlocale\fR?
@@ -56,10 +50,6 @@ msgcat \- Tcl message catalog
 .sp
 \fB::msgcat::mcforgetpackage\fR
 .VE "TIP 412"
-.sp
-.VS "TIP 499"
-\fB::msgcat::mcutil subcommand\fR ?\fIlocale\fR?
-.VS "TIP 499"
 .BE
 .SH DESCRIPTION
 .PP
@@ -81,11 +71,6 @@ In \fBmsgcat\fR, there is a global locale initialized by the system locale of th
 Each package may decide to use the global locale or to use a package specific locale.
 .PP
 The global locale may be changed on demand, for example by a user initiated language change or within a multi user application like a web server.
-.PP
-.VS tip490
-Object oriented programming is supported by the use of a package namespace.
-.VE tip490
-.PP
 .SH COMMANDS
 .TP
 \fB::msgcat::mc \fIsrc-string\fR ?\fIarg arg ...\fR?
@@ -110,17 +95,6 @@ use the result.  If an application is written for a single language in
 this fashion, then it is easy to add support for additional languages
 later simply by defining new message catalog entries.
 .RE
-.VS "TIP 490"
-.TP
-\fB::msgcat::mcn \fInamespace\fR \fIsrc-string\fR ?\fIarg arg ...\fR?
-.
-Like \fB::msgcat::mc\fR, but with the message namespace specified as first argument.
-.PP
-.RS
-\fBmcn\fR may be used for cases where the package namespace is not the namespace of the caller.
-An example is shown within the description of the command \fB::msgcat::mcpackagenamespaceget\fR below.
-.RE
-.PP
 .TP
 \fB::msgcat::mcmax ?\fIsrc-string src-string ...\fR?
 .
@@ -129,68 +103,28 @@ of the longest translated string.  This is useful when designing
 localized GUIs, which may require that all buttons, for example, be a
 fixed width (which will be the width of the widest button).
 .TP
-.VS "TIP 412"
-\fB::msgcat::mcexists\fR ?\fB-exactnamespace\fR? ?\fB-exactlocale\fR? ?\fB-namespace\fR \fInamespace\fR? \fIsrc-string\fR
+\fB::msgcat::mcexists\fR ?\fB-exactnamespace\fR? ?\fB-exactlocale\fR? \fIsrc-string\fR
 .
+.VS "TIP 412"
 Return true, if there is a translation for the given \fIsrc-string\fR.
 .PP
 .RS
 The search may be limited by the option \fB\-exactnamespace\fR to only check the current namespace and not any parent namespaces.
 .PP
 It may also be limited by the option \fB\-exactlocale\fR to only check the first prefered locale (e.g. first element returned by \fB::msgcat::mcpreferences\fR if global locale is used).
-.PP
+.RE
 .VE "TIP 412"
-.VS "TIP 490"
-An explicit package namespace may be specified by the option \fB-namespace\fR.
-The namespace of the caller is used if not explicitly specified.
-.RE
-.PP
-.VE "TIP 490"
-.VS "TIP 490"
-.TP
-\fB::msgcat::mcpackagenamespaceget\fR
-.
-Return the package namespace of the caller.
-This command handles all cases described in section \fBOBJECT ORIENTED PROGRAMMING\fR.
-.PP
-.RS
-Example usage is a tooltip package, which saves the caller package namespace to update the translation each time the tooltip is shown:
-.CS
-proc ::tooltip::tooltip {widget message} {
-    ...
-    set messagenamespace [uplevel 1 {::msgcat::mcpackagenamespaceget}]
-    ...
-    bind $widget  [list ::tooltip::show $widget $messagenamespace $message]
-}
-
-proc ::tooltip::show {widget messagenamespace message} {
-    ...
-    set message [::msgcat::mcn $messagenamespace $message]
-    ...
-}
-.CE
-.RE
-.PP
-.VE "TIP 490"
 .TP
 \fB::msgcat::mclocale \fR?\fInewLocale\fR?
 .
-If \fInewLocale\fR is omitted, the current locale is returned, otherwise the current locale
-is set to \fInewLocale\fR.
-.PP
-.RS
-If the new locale is set to \fInewLocale\fR, the corresponding preferences are calculated and set.
-For example, if the current locale is en_US_funky, then \fB::msgcat::mcpreferences\fR returns \fB{en_us_funky en_us en {}}\fR.
-.PP
-The same result may be acheved by \fB::msgcat::mcpreferences\fR {*}[\fB::msgcat::mcutil getpreferences\fR \fInewLocale\fR].
-.PP
-The current locale is always the first element of the list returned by \fBmcpreferences\fR.
-.PP
-msgcat stores and compares the locale in a
+This function sets the locale to \fInewLocale\fR.  If \fInewLocale\fR
+is omitted, the current locale is returned, otherwise the current locale
+is set to \fInewLocale\fR.  msgcat stores and compares the locale in a
 case-insensitive manner, and returns locales in lowercase.
 The initial locale is determined by the locale specified in
 the user's environment.  See \fBLOCALE SPECIFICATION\fR
 below for a description of the locale string format.
+.RS
 .PP
 .VS "TIP 412"
 If the locale is set, the preference list of locales is evaluated.
@@ -198,26 +132,16 @@ Locales in this list are loaded now, if not jet loaded.
 .VE "TIP 412"
 .RE
 .TP
-\fB::msgcat::mcpreferences\fR ?\fIlocale preference\fR? ...
+\fB::msgcat::mcpreferences\fR
 .
-Without arguments, returns an ordered list of the locales preferred by
-the user.
-The list is ordered from most specific to least preference.
-.PP
-.VS "TIP 499"
-.RS
-A set of locale preferences may be given to set the list of locale preferences.
-The current locale is also set, which is the first element of the locale preferences list.
-.PP
-Locale preferences are loaded now, if not jet loaded.
-.PP
-As an example, the user may prefer French or English text. This may be configured by:
-.CS
-::msgcat::mcpreferences fr en {}
-.CE
-.RE
-.PP
-.VS "TIP 499"
+Returns an ordered list of the locales preferred by
+the user, based on the user's language specification.
+The list is ordered from most specific to least
+preference.  The list is derived from the current
+locale set in msgcat by \fB::msgcat::mclocale\fR, and
+cannot be set independently.  For example, if the
+current locale is en_US_funky, then \fB::msgcat::mcpreferences\fR
+returns \fB{en_us_funky en_us en {}}\fR.
 .TP
 \fB::msgcat:mcloadedlocales subcommand\fR ?\fIlocale\fR?
 .
@@ -308,22 +232,6 @@ Note that this routine is only called if the concerned package did not set a pac
 The calling package clears all its state within the \fBmsgcat\fR package including all settings and translations.
 .VE "TIP 412"
 .PP
-.VS "TIP 499"
-.TP
-\fB::msgcat::mcutil getpreferences\fR \fIlocale\fR
-.
-Return the preferences list of the given locale as described in section \fBLOCALE SPECIFICATION\fR.
-An example is the composition of a preference list for the bilingual region "Biel/Bienne" as a concatenation of swiss german and swiss french:
-.CS
-% concat [lrange [msgcat::mcutil getpreferences fr_CH] 0 end-1] [msgcat::mcutil getpreferences de_CH]
-fr_ch fr de_ch de {}
-.CE
-.TP
-\fB::msgcat::mcutil getsystemlocale\fR
-.
-The system locale is returned as described by the section \fBLOCALE SPECIFICATION\fR.
-.VE "TIP 499"
-.PP
 .SH "LOCALE SPECIFICATION"
 .PP
 The locale is specified to \fBmsgcat\fR by a locale string
@@ -529,7 +437,7 @@ formatting substitution is done directly.
 # human-oriented versions by \fBmsgcat::mcset\fR
 .CE
 .VS "TIP 412"
-.SH "PACKAGE PRIVATE LOCALE"
+.SH Package private locale
 .PP
 A package using \fBmsgcat\fR may choose to use its own package private
 locale and its own set of loaded locales, independent to the global
@@ -553,22 +461,10 @@ This command may cause the load of locales.
 .
 Return the package private locale or the global locale, if no package private locale is set.
 .TP
-\fB::msgcat::mcpackagelocale preferences\fR ?\fIlocale preference\fR? ...
+\fB::msgcat::mcpackagelocale preferences\fR
 .
-With no parameters, return the package private preferences or the global preferences,
+Return the package private preferences or the global preferences,
 if no package private locale is set.
-The package locale state (set or not) is not changed (in contrast to the command \fB::msgcat::mcpackagelocale set\fR).
-.PP
-.RS
-.VS "TIP 499"
-If a set of locale preferences is given, it is set as package locale preference list.
-The package locale is set to the first element of the preference list.
-A package locale is activated, if it was not set so far.
-.PP
-Locale preferences are loaded now for the package, if not jet loaded.
-.VE "TIP 499"
-.RE
-.PP
 .TP
 \fB::msgcat::mcpackagelocale loaded\fR
 .
@@ -592,7 +488,7 @@ Returns true, if the given locale is loaded for the package.
 .
 Clear any loaded locales of the package not present in the package preferences.
 .PP
-.SH "CHANGING PACKAGE OPTIONS"
+.SH Changing package options
 .PP
 Each package using msgcat has a set of options within \fBmsgcat\fR.
 The package options are described in the next sectionPackage options.
@@ -667,7 +563,7 @@ A generic unknown handler is used if set to the empty string. This consists in r
 See section \fBcallback invocation\fR below.
 The appended arguments are identical to \fB::msgcat::mcunknown\fR.
 .RE
-.SH "Callback invocation"
+.SS Callback invocation
 A package may decide to register one or multiple callbacks, as described above.
 .PP
 Callbacks are invoked, if:
@@ -681,54 +577,7 @@ Callbacks are invoked, if:
 If a called routine fails with an error, the \fBbgerror\fR routine for the interpreter is invoked after command completion.
 Only exception is the callback \fBunknowncmd\fR, where an error causes the invoking \fBmc\fR-command to fail with that error.
 .PP
-.VS tip490
-.SH "OBJECT ORIENTED PROGRAMMING"
-\fBmsgcat\fR supports packages implemented by object oriented programming.
-Objects and classes should be defined within a package namespace.
-.PP
-There are 3 supported cases where package namespace sensitive commands of msgcat (\fBmc\fR, \fBmcexists\fR, \fBmcpackagelocale\fR, \fBmcforgetpackage\fR, \fBmcpackagenamespaceget\fR, \fBmcpackageconfig\fR, \fBmcset\fR and \fBmcmset\fR) may be called:
-.PP
-.TP
-\fB1) In class definition script\fR
-.
-\fBmsgcat\fR command is called within a class definition script.
-.CS
-namespace eval ::N2 {
-    mcload $dir/msgs
-    oo::class create C1 {puts [mc Hi!]}
-}
-.CE
-.PP
-.TP
-\fB2) method defined in a class\fR
-.
-\fBmsgcat\fR command is called from a method in an object and the method is defined in a class.
-.CS
-namespace eval ::N3Class {
-    mcload $dir/msgs
-    oo::class create C1
-    oo::define C1 method m1 {
-        puts [mc Hi!]
-    }
-}
-.CE
-.PP
-.TP
-\fB3) method defined in a classless object\fR
-.
-\fBmsgcat\fR command is called from a method of a classless object.
-.CS
-namespace eval ::N4 {
-    mcload $dir/msgs
-    oo::object create O1
-    oo::objdefine O1 method m1 {} {
-        puts [mc Hi!]
-    }
-}
-.CE
-.PP
-.VE tip490
-.SH EXAMPLES
+.SS Examples
 Packages which display a GUI may update their widgets when the global locale changes.
 To register to a callback, use:
 .CS
@@ -794,9 +643,9 @@ proc ::tcl::clock::LocalizeFormat { locale format } {
 .PP
 The message catalog code was developed by Mark Harrison.
 .SH "SEE ALSO"
-format(n), scan(n), namespace(n), package(n), oo::class(n), oo::object
+format(n), scan(n), namespace(n), package(n)
 .SH KEYWORDS
-internationalization, i18n, localization, l10n, message, text, translation, class, object
+internationalization, i18n, localization, l10n, message, text, translation
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
@@ -70,20 +70,18 @@ from the corresponding match.
 .TP
 \fB\-command\fR
 .VS 8.7
-Changes the handling of \fIsubSpec\fR so that it is not treated
-as a template for a substitution string and the substrings
+Changes the handling of the substitution string so that it no longer treats
 .QW &
 and
-.QW \e\fIn\fR
-no longer have special meaning. Instead \fIsubSpec\fR must be a
-command prefix, that is, a non-empty list.  The substring of \fIstring\fR
-that matches \fIexp\fR, and then each substring that matches each
-capturing sub-RE within \fIexp\fR are appended as additional elements
-to that list. (The items appended to the list are much like what
-\fBregexp\fR \fB-inline\fR would return).  The completed list is then
-evaluated as a Tcl command, and the result of that command is the
-substitution string.  Any error or exception from command evaluation
-becomes an error or exception from the \fBregsub\fR command.
+.QW \e
+as special characters, but instead uses them as a non-empty list of words.
+Each time a substitution is processed, another complete Tcl word is appended
+to that list for each substitution value (the first such argument represents
+the overall matched substring, the subsequent arguments will be one per
+capturing sub-RE, much as are returned from \fBregexp\fR \fB\-inline\fR) and
+the overall list is then evaluated as a Tcl command call. If the command
+finishes successfully, the result of command call is substituted into the
+resulting string.
 .RS
 .PP
 If \fB\-all\fR is not also given, the command callback will be invoked at most
@@ -115,7 +115,9 @@ Any Unicode control character.
 Any Unicode digit character.  Note that this includes characters
 outside of the [0\-9] range.
 .IP \fBdouble\fR 12
-Any of the forms allowed to \fBTcl_GetDoubleFromObj\fR.
+Any of the valid forms for a double in Tcl, with optional surrounding
+whitespace.  In case of under/overflow in the value, 0 is returned and
+the \fIvarname\fR will contain \-1.
 .IP \fBentier\fR 12
 .VS 8.6
 Any of the valid string formats for an integer value of arbitrary size
@@ -129,7 +131,7 @@ false.
 Any Unicode printing character, except space.
 .IP \fBinteger\fR 12
 Any of the valid string formats for a 32-bit integer value in Tcl,
-with optional surrounding whitespace.  In case of overflow in
+with optional surrounding whitespace.  In case of under/overflow in
 the value, 0 is returned and the \fIvarname\fR will contain \-1.
 .IP \fBlist\fR 12
 Any proper list structure, with optional surrounding whitespace. In
@@ -154,7 +156,7 @@ true.
 Any upper case alphabet character in the Unicode character set.
 .IP \fBwideinteger\fR 12
 Any of the valid forms for a wide integer in Tcl, with optional
-surrounding whitespace.  In case of overflow in the value, 0 is
+surrounding whitespace.  In case of under/overflow in the value, 0 is
 returned and the \fIvarname\fR will contain \-1.
 .IP \fBwordchar\fR 12
 Any Unicode word character.  That is any alphanumeric character, and
@@ -70,6 +70,7 @@
 */

 #define	NOTREACHED	0
+#define	xxx		1

 #define	DUPMAX	_POSIX2_RE_DUP_MAX
 #define	DUPINF	(DUPMAX+1)
@@ -32,7 +32,7 @@ declare 0 {
 	    const char *version, const void *clientData)
 }
 declare 1 {
-    const char *Tcl_PkgRequireEx(Tcl_Interp *interp,
+    CONST84_RETURN char *Tcl_PkgRequireEx(Tcl_Interp *interp,
 	    const char *name, const char *version, int exact,
 	    void *clientDataPtr)
 }
@@ -154,7 +154,7 @@ declare 35 {
 }
 declare 36 {
    int Tcl_GetIndexFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    const char *const *tablePtr, const char *msg, int flags, int *indexPtr)
+	    CONST84 char *const *tablePtr, const char *msg, int flags, int *indexPtr)
 }
 declare 37 {
    int Tcl_GetInt(Tcl_Interp *interp, const char *src, int *intPtr)
@@ -285,7 +285,7 @@ declare 75 {
 declare 76 {
    void Tcl_BackgroundError(Tcl_Interp *interp)
 }
-declare 77 {deprecated {Use Tcl_UtfBackslash}} {
+declare 77 {
    char Tcl_Backslash(const char *src, int *readPtr)
 }
 declare 78 {
@@ -306,7 +306,7 @@ declare 82 {
    int Tcl_CommandComplete(const char *cmd)
 }
 declare 83 {
-    char *Tcl_Concat(int argc, const char *const *argv)
+    char *Tcl_Concat(int argc, CONST84 char *const *argv)
 }
 declare 84 {
    int Tcl_ConvertElement(const char *src, char *dst, int flags)
@@ -318,7 +318,7 @@ declare 85 {
 declare 86 {
    int Tcl_CreateAlias(Tcl_Interp *slave, const char *slaveCmd,
 	    Tcl_Interp *target, const char *targetCmd, int argc,
-	    const char *const *argv)
+	    CONST84 char *const *argv)
 }
 declare 87 {
    int Tcl_CreateAliasObj(Tcl_Interp *slave, const char *slaveCmd,
@@ -352,7 +352,7 @@ declare 93 {
 declare 94 {
    Tcl_Interp *Tcl_CreateInterp(void)
 }
-declare 95 {deprecated {}} {
+declare 95 {
    void Tcl_CreateMathFunc(Tcl_Interp *interp, const char *name,
 	    int numArgs, Tcl_ValueType *argTypes,
 	    Tcl_MathProc *proc, ClientData clientData)
@@ -461,14 +461,15 @@ declare 126 {
    int Tcl_Eof(Tcl_Channel chan)
 }
 declare 127 {
-    const char *Tcl_ErrnoId(void)
+    CONST84_RETURN char *Tcl_ErrnoId(void)
 }
 declare 128 {
-    const char *Tcl_ErrnoMsg(int err)
+    CONST84_RETURN char *Tcl_ErrnoMsg(int err)
 }
 declare 129 {
    int Tcl_Eval(Tcl_Interp *interp, const char *script)
 }
+# This is obsolete, use Tcl_FSEvalFile
 declare 130 {
    int Tcl_EvalFile(Tcl_Interp *interp, const char *fileName)
 }
@@ -528,12 +529,12 @@ declare 147 {
 }
 declare 148 {
    int Tcl_GetAlias(Tcl_Interp *interp, const char *slaveCmd,
-	    Tcl_Interp **targetInterpPtr, const char **targetCmdPtr,
-	    int *argcPtr, const char ***argvPtr)
+	    Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr,
+	    int *argcPtr, CONST84 char ***argvPtr)
 }
 declare 149 {
    int Tcl_GetAliasObj(Tcl_Interp *interp, const char *slaveCmd,
-	    Tcl_Interp **targetInterpPtr, const char **targetCmdPtr,
+	    Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr,
 	    int *objcPtr, Tcl_Obj ***objv)
 }
 declare 150 {
@@ -558,7 +559,7 @@ declare 155 {
    int Tcl_GetChannelMode(Tcl_Channel chan)
 }
 declare 156 {
-    const char *Tcl_GetChannelName(Tcl_Channel chan)
+    CONST84_RETURN char *Tcl_GetChannelName(Tcl_Channel chan)
 }
 declare 157 {
    int Tcl_GetChannelOption(Tcl_Interp *interp, Tcl_Channel chan,
@@ -572,14 +573,14 @@ declare 159 {
 	    Tcl_CmdInfo *infoPtr)
 }
 declare 160 {
-    const char *Tcl_GetCommandName(Tcl_Interp *interp,
+    CONST84_RETURN char *Tcl_GetCommandName(Tcl_Interp *interp,
 	    Tcl_Command command)
 }
 declare 161 {
    int Tcl_GetErrno(void)
 }
 declare 162 {
-    const char *Tcl_GetHostName(void)
+    CONST84_RETURN char *Tcl_GetHostName(void)
 }
 declare 163 {
    int Tcl_GetInterpPath(Tcl_Interp *askInterp, Tcl_Interp *slaveInterp)
@@ -622,14 +623,14 @@ declare 173 {
    Tcl_Channel Tcl_GetStdChannel(int type)
 }
 declare 174 {
-    const char *Tcl_GetStringResult(Tcl_Interp *interp)
+    CONST84_RETURN char *Tcl_GetStringResult(Tcl_Interp *interp)
 }
 declare 175 {
-    const char *Tcl_GetVar(Tcl_Interp *interp, const char *varName,
+    CONST84_RETURN char *Tcl_GetVar(Tcl_Interp *interp, const char *varName,
 	    int flags)
 }
 declare 176 {
-    const char *Tcl_GetVar2(Tcl_Interp *interp, const char *part1,
+    CONST84_RETURN char *Tcl_GetVar2(Tcl_Interp *interp, const char *part1,
 	    const char *part2, int flags)
 }
 declare 177 {
@@ -662,7 +663,7 @@ declare 185 {
 }
 # Obsolete, use Tcl_FSJoinPath
 declare 186 {
-    char *Tcl_JoinPath(int argc, const char *const *argv,
+    char *Tcl_JoinPath(int argc, CONST84 char *const *argv,
 	    Tcl_DString *resultPtr)
 }
 declare 187 {
@@ -685,7 +686,7 @@ declare 191 {
    Tcl_Channel Tcl_MakeTcpClientChannel(ClientData tcpSocket)
 }
 declare 192 {
-    char *Tcl_Merge(int argc, const char *const *argv)
+    char *Tcl_Merge(int argc, CONST84 char *const *argv)
 }
 declare 193 {
    Tcl_HashEntry *Tcl_NextHashEntry(Tcl_HashSearch *searchPtr)
@@ -703,7 +704,7 @@ declare 196 {
 }
 declare 197 {
    Tcl_Channel Tcl_OpenCommandChannel(Tcl_Interp *interp, int argc,
-	    const char **argv, int flags)
+	    CONST84 char **argv, int flags)
 }
 # This is obsolete, use Tcl_FSOpenFileChannel
 declare 198 {
@@ -729,7 +730,7 @@ declare 203 {
    int Tcl_PutEnv(const char *assignment)
 }
 declare 204 {
-    const char *Tcl_PosixError(Tcl_Interp *interp)
+    CONST84_RETURN char *Tcl_PosixError(Tcl_Interp *interp)
 }
 declare 205 {
    void Tcl_QueueEvent(Tcl_Event *evPtr, Tcl_QueuePosition position)
@@ -765,7 +766,7 @@ declare 214 {
 }
 declare 215 {
    void Tcl_RegExpRange(Tcl_RegExp regexp, int index,
-	    const char **startPtr, const char **endPtr)
+	    CONST84 char **startPtr, CONST84 char **endPtr)
 }
 declare 216 {
    void Tcl_Release(ClientData clientData)
@@ -779,7 +780,8 @@ declare 218 {
 declare 219 {
    int Tcl_ScanCountedElement(const char *src, int length, int *flagPtr)
 }
-declare 220 {deprecated {}} {
+# Obsolete
+declare 220 {
    int Tcl_SeekOld(Tcl_Channel chan, int offset, int mode)
 }
 declare 221 {
@@ -835,29 +837,29 @@ declare 236 {
    void Tcl_SetStdChannel(Tcl_Channel channel, int type)
 }
 declare 237 {
-    const char *Tcl_SetVar(Tcl_Interp *interp, const char *varName,
+    CONST84_RETURN char *Tcl_SetVar(Tcl_Interp *interp, const char *varName,
 	    const char *newValue, int flags)
 }
 declare 238 {
-    const char *Tcl_SetVar2(Tcl_Interp *interp, const char *part1,
+    CONST84_RETURN char *Tcl_SetVar2(Tcl_Interp *interp, const char *part1,
 	    const char *part2, const char *newValue, int flags)
 }
 declare 239 {
-    const char *Tcl_SignalId(int sig)
+    CONST84_RETURN char *Tcl_SignalId(int sig)
 }
 declare 240 {
-    const char *Tcl_SignalMsg(int sig)
+    CONST84_RETURN char *Tcl_SignalMsg(int sig)
 }
 declare 241 {
    void Tcl_SourceRCFile(Tcl_Interp *interp)
 }
 declare 242 {
    int Tcl_SplitList(Tcl_Interp *interp, const char *listStr, int *argcPtr,
-	    const char ***argvPtr)
+	    CONST84 char ***argvPtr)
 }
 # Obsolete, use Tcl_FSSplitPath
 declare 243 {
-    void Tcl_SplitPath(const char *path, int *argcPtr, const char ***argvPtr)
+    void Tcl_SplitPath(const char *path, int *argcPtr, CONST84 char ***argvPtr)
 }
 declare 244 {
    void Tcl_StaticPackage(Tcl_Interp *interp, const char *pkgName,
@@ -866,7 +868,8 @@ declare 244 {
 declare 245 {
    int Tcl_StringMatch(const char *str, const char *pattern)
 }
-declare 246 {deprecated {}} {
+# Obsolete
+declare 246 {
    int Tcl_TellOld(Tcl_Channel chan)
 }
 declare 247 {
@@ -942,25 +945,25 @@ declare 265 {
 declare 266 {
    void Tcl_ValidateAllMemory(const char *file, int line)
 }
-declare 267 {deprecated {see TIP #422}} {
+declare 267 {
    void Tcl_AppendResultVA(Tcl_Interp *interp, va_list argList)
 }
-declare 268 {deprecated {see TIP #422}} {
+declare 268 {
    void Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr, va_list argList)
 }
 declare 269 {
    char *Tcl_HashStats(Tcl_HashTable *tablePtr)
 }
 declare 270 {
-    const char *Tcl_ParseVar(Tcl_Interp *interp, const char *start,
-	    const char **termPtr)
+    CONST84_RETURN char *Tcl_ParseVar(Tcl_Interp *interp, const char *start,
+	    CONST84 char **termPtr)
 }
 declare 271 {
-    const char *Tcl_PkgPresent(Tcl_Interp *interp, const char *name,
+    CONST84_RETURN char *Tcl_PkgPresent(Tcl_Interp *interp, const char *name,
 	    const char *version, int exact)
 }
 declare 272 {
-    const char *Tcl_PkgPresentEx(Tcl_Interp *interp,
+    CONST84_RETURN char *Tcl_PkgPresentEx(Tcl_Interp *interp,
 	    const char *name, const char *version, int exact,
 	    void *clientDataPtr)
 }
@@ -970,19 +973,19 @@ declare 273 {
 }
 # TIP #268: The internally used new Require function is in slot 573.
 declare 274 {
-    const char *Tcl_PkgRequire(Tcl_Interp *interp, const char *name,
+    CONST84_RETURN char *Tcl_PkgRequire(Tcl_Interp *interp, const char *name,
 	    const char *version, int exact)
 }
-declare 275 {deprecated {see TIP #422}} {
+declare 275 {
    void Tcl_SetErrorCodeVA(Tcl_Interp *interp, va_list argList)
 }
-declare 276 {deprecated {see TIP #422}} {
+declare 276 {
    int  Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList)
 }
 declare 277 {
    Tcl_Pid Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options)
 }
-declare 278 {deprecated {see TIP #422}} {
+declare 278 {
    TCL_NORETURN void Tcl_PanicVA(const char *format, va_list argList)
 }
 declare 279 {
@@ -1084,7 +1087,7 @@ declare 301 {
    Tcl_Encoding Tcl_GetEncoding(Tcl_Interp *interp, const char *name)
 }
 declare 302 {
-    const char *Tcl_GetEncodingName(Tcl_Encoding encoding)
+    CONST84_RETURN char *Tcl_GetEncodingName(Tcl_Encoding encoding)
 }
 declare 303 {
    void Tcl_GetEncodingNames(Tcl_Interp *interp)
@@ -1160,7 +1163,7 @@ declare 324 {
    int Tcl_UniCharToUtf(int ch, char *buf)
 }
 declare 325 {
-    const char *Tcl_UtfAtIndex(const char *src, int index)
+    CONST84_RETURN char *Tcl_UtfAtIndex(const char *src, int index)
 }
 declare 326 {
    int Tcl_UtfCharComplete(const char *src, int length)
@@ -1169,16 +1172,16 @@ declare 327 {
    int Tcl_UtfBackslash(const char *src, int *readPtr, char *dst)
 }
 declare 328 {
-    const char *Tcl_UtfFindFirst(const char *src, int ch)
+    CONST84_RETURN char *Tcl_UtfFindFirst(const char *src, int ch)
 }
 declare 329 {
-    const char *Tcl_UtfFindLast(const char *src, int ch)
+    CONST84_RETURN char *Tcl_UtfFindLast(const char *src, int ch)
 }
 declare 330 {
-    const char *Tcl_UtfNext(const char *src)
+    CONST84_RETURN char *Tcl_UtfNext(const char *src)
 }
 declare 331 {
-    const char *Tcl_UtfPrev(const char *src, const char *start)
+    CONST84_RETURN char *Tcl_UtfPrev(const char *src, const char *start)
 }
 declare 332 {
    int Tcl_UtfToExternal(Tcl_Interp *interp, Tcl_Encoding encoding,
@@ -1211,10 +1214,10 @@ declare 339 {
 declare 340 {
    char *Tcl_GetString(Tcl_Obj *objPtr)
 }
-declare 341 {deprecated {Use Tcl_GetEncodingSearchPath}} {
-    const char *Tcl_GetDefaultEncodingDir(void)
+declare 341 {
+    CONST84_RETURN char *Tcl_GetDefaultEncodingDir(void)
 }
-declare 342 {deprecated {Use Tcl_SetEncodingSearchPath}} {
+declare 342 {
    void Tcl_SetDefaultEncodingDir(const char *path)
 }
 declare 343 {
@@ -1263,7 +1266,7 @@ declare 356 {
    Tcl_RegExp Tcl_GetRegExpFromObj(Tcl_Interp *interp, Tcl_Obj *patObj,
 	    int flags)
 }
-declare 357 {deprecated {Use Tcl_EvalTokensStandard}} {
+declare 357 {
    Tcl_Obj *Tcl_EvalTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr,
 	    int count)
 }
@@ -1276,7 +1279,7 @@ declare 359 {
 }
 declare 360 {
    int Tcl_ParseBraces(Tcl_Interp *interp, const char *start, int numBytes,
-	    Tcl_Parse *parsePtr, int append, const char **termPtr)
+	    Tcl_Parse *parsePtr, int append, CONST84 char **termPtr)
 }
 declare 361 {
    int Tcl_ParseCommand(Tcl_Interp *interp, const char *start, int numBytes,
@@ -1289,7 +1292,7 @@ declare 362 {
 declare 363 {
    int Tcl_ParseQuotedString(Tcl_Interp *interp, const char *start,
 	    int numBytes, Tcl_Parse *parsePtr, int append,
-	    const char **termPtr)
+	    CONST84 char **termPtr)
 }
 declare 364 {
    int Tcl_ParseVarName(Tcl_Interp *interp, const char *start, int numBytes,
@@ -1405,7 +1408,7 @@ declare 397 {
    int Tcl_ChannelBuffered(Tcl_Channel chan)
 }
 declare 398 {
-    const char *Tcl_ChannelName(const Tcl_ChannelType *chanTypePtr)
+    CONST84_RETURN char *Tcl_ChannelName(const Tcl_ChannelType *chanTypePtr)
 }
 declare 399 {
    Tcl_ChannelTypeVersion Tcl_ChannelVersion(
@@ -1545,12 +1548,12 @@ declare 434 {
 }

 # TIP#15 (math function introspection) dkf
-declare 435 {deprecated {}} {
+declare 435 {
    int Tcl_GetMathFuncInfo(Tcl_Interp *interp, const char *name,
 	    int *numArgsPtr, Tcl_ValueType **argTypesPtr,
 	    Tcl_MathProc **procPtr, ClientData *clientDataPtr)
 }
-declare 436 {deprecated {}} {
+declare 436 {
    Tcl_Obj *Tcl_ListMathFuncs(Tcl_Interp *interp, const char *pattern)
 }

@@ -55,10 +55,10 @@ extern "C" {
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   7
 #define TCL_RELEASE_LEVEL   TCL_ALPHA_RELEASE
-#define TCL_RELEASE_SERIAL  2
+#define TCL_RELEASE_SERIAL  0

 #define TCL_VERSION	    "8.7"
-#define TCL_PATCH_LEVEL	    "8.7a2"
+#define TCL_PATCH_LEVEL	    "8.7a0"

 #if !defined(TCL_NO_DEPRECATED) || defined(RC_INVOKED)
 /*
@@ -137,7 +137,7 @@ extern "C" {
 */

 #include <stdarg.h>
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 #    define TCL_VARARGS(type, name) (type name, ...)
 #    define TCL_VARARGS_DEF(type, name) (type name, ...)
 #    define TCL_VARARGS_START(type, name, list) (va_start(list, name), name)
@@ -254,9 +254,10 @@ extern "C" {
 * New code should use prototypes.
 */

-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 #   undef _ANSI_ARGS_
 #   define _ANSI_ARGS_(x)	x
+#endif /* !TCL_NO_DEPRECATED */

 /*
 * Definitions that allow this header file to be used either with or without
@@ -266,14 +267,34 @@ extern "C" {
 #ifndef INLINE
 #   define INLINE
 #endif
+
+#ifdef NO_CONST
+#   ifndef const
+#      define const
+#   endif
+#endif
 #ifndef CONST
 #   define CONST const
 #endif

-#endif /* !TCL_NO_DEPRECATED */
+#ifdef USE_NON_CONST
+#   ifdef USE_COMPAT_CONST
+#      error define at most one of USE_NON_CONST and USE_COMPAT_CONST
+#   endif
+#   define CONST84
+#   define CONST84_RETURN
+#else
+#   ifdef USE_COMPAT_CONST
+#      define CONST84
+#      define CONST84_RETURN const
+#   else
+#      define CONST84 const
+#      define CONST84_RETURN const
+#   endif
+#endif

 #ifndef CONST86
-#      define CONST86 const
+#      define CONST86 CONST84
 #endif

 /*
@@ -297,7 +318,6 @@ extern "C" {
 * VOID. This block is skipped under Cygwin and Mingw.
 */

-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 #if defined(_WIN32) && !defined(HAVE_WINNT_IGNORE_VOID)
 #ifndef VOID
 #define VOID void
@@ -313,16 +333,23 @@ typedef long LONG;
 */

 #ifndef __VXWORKS__
-#   define VOID void
+#   ifndef NO_VOID
+#	define VOID void
+#   else
+#	define VOID char
+#   endif
 #endif
-#endif /* !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 */

 /*
 * Miscellaneous declarations.
 */

 #ifndef _CLIENTDATA
-    typedef void *ClientData;
+#   ifndef NO_VOID
+	typedef void *ClientData;
+#   else
+	typedef int *ClientData;
+#   endif
 #   define _CLIENTDATA
 #endif

@@ -369,40 +396,44 @@ typedef long LONG;
 #   if defined(_WIN32)
 #      define TCL_WIDE_INT_TYPE __int64
 #      define TCL_LL_MODIFIER	"I64"
-#      if defined(_WIN64)
-#         define TCL_Z_MODIFIER	"I"
-#      endif
 #   elif defined(__GNUC__)
-#      define TCL_Z_MODIFIER	"z"
+#      define TCL_WIDE_INT_TYPE long long
+#      define TCL_LL_MODIFIER	"ll"
 #   else /* ! _WIN32 && ! __GNUC__ */
 /*
 * Don't know what platform it is and configure hasn't discovered what is
 * going on for us. Try to guess...
 */
 #      include <limits.h>
-#      if defined(LLONG_MAX) && (LLONG_MAX == LONG_MAX)
+#      if (INT_MAX < LONG_MAX)
 #         define TCL_WIDE_INT_IS_LONG	1
+#      else
+#         define TCL_WIDE_INT_TYPE long long
 #      endif
 #   endif /* _WIN32 */
 #endif /* !TCL_WIDE_INT_TYPE & !TCL_WIDE_INT_IS_LONG */
-
-#ifndef TCL_WIDE_INT_TYPE
-#   define TCL_WIDE_INT_TYPE		long long
-#endif /* !TCL_WIDE_INT_TYPE */
+#ifdef TCL_WIDE_INT_IS_LONG
+#   undef TCL_WIDE_INT_TYPE
+#   define TCL_WIDE_INT_TYPE	long
+#endif /* TCL_WIDE_INT_IS_LONG */

 typedef TCL_WIDE_INT_TYPE		Tcl_WideInt;
 typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;

-#ifndef TCL_LL_MODIFIER
-#   define TCL_LL_MODIFIER	"ll"
-#endif /* !TCL_LL_MODIFIER */
-#ifndef TCL_Z_MODIFIER
-#   if defined(__GNUC__) && !defined(_WIN32)
-#	define TCL_Z_MODIFIER	"z"
-#   else
-#	define TCL_Z_MODIFIER	""
-#   endif
-#endif /* !TCL_Z_MODIFIER */
+#ifdef TCL_WIDE_INT_IS_LONG
+#   ifndef TCL_LL_MODIFIER
+#      define TCL_LL_MODIFIER		"l"
+#   endif /* !TCL_LL_MODIFIER */
+#else /* TCL_WIDE_INT_IS_LONG */
+/*
+ * The next short section of defines are only done when not running on Windows
+ * or some other strange platform.
+ */
+#   ifndef TCL_LL_MODIFIER
+#      define TCL_LL_MODIFIER		"ll"
+#   endif /* !TCL_LL_MODIFIER */
+#endif /* TCL_WIDE_INT_IS_LONG */
+
 #define Tcl_WideAsLong(val)	((long)((Tcl_WideInt)(val)))
 #define Tcl_LongAsWide(val)	((Tcl_WideInt)((long)(val)))
 #define Tcl_WideAsDouble(val)	((double)((Tcl_WideInt)(val)))
@@ -462,13 +493,35 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 */

 typedef struct Tcl_Interp
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 {
    /* TIP #330: Strongly discourage extensions from using the string
     * result. */
+#ifdef USE_INTERP_RESULT
+    char *result TCL_DEPRECATED_API("use Tcl_GetStringResult/Tcl_SetResult");
+				/* If the last command returned a string
+				 * result, this points to it. */
+    void (*freeProc) (char *blockPtr)
+	    TCL_DEPRECATED_API("use Tcl_GetStringResult/Tcl_SetResult");
+				/* Zero means the string result is statically
+				 * allocated. TCL_DYNAMIC means it was
+				 * allocated with ckalloc and should be freed
+				 * with ckfree. Other values give the address
+				 * of function to invoke to free the result.
+				 * Tcl_Eval must free it before executing next
+				 * command. */
+#else
    char *resultDontUse; /* Don't use in extensions! */
    void (*freeProcDontUse) (char *); /* Don't use in extensions! */
+#endif
+#ifdef USE_INTERP_ERRORLINE
+    int errorLine TCL_DEPRECATED_API("use Tcl_GetErrorLine/Tcl_SetErrorLine");
+				/* When TCL_ERROR is returned, this gives the
+				 * line number within the command where the
+				 * error occurred (1 if first line). */
+#else
    int errorLineDontUse; /* Don't use in extensions! */
+#endif
 }
 #endif /* !TCL_NO_DEPRECATED */
 Tcl_Interp;
@@ -620,9 +673,7 @@ typedef struct stat *Tcl_OldStat_;
 #define TCL_BREAK		3
 #define TCL_CONTINUE		4

-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 #define TCL_RESULT_SIZE		200
-#endif

 /*
 *----------------------------------------------------------------------------
@@ -638,7 +689,6 @@ typedef struct stat *Tcl_OldStat_;
 * Argument descriptors for math function callbacks in expressions:
 */

-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 typedef enum {
    TCL_INT, TCL_DOUBLE, TCL_EITHER, TCL_WIDE_INT
 } Tcl_ValueType;
@@ -650,10 +700,6 @@ typedef struct Tcl_Value {
    double doubleValue;		/* Double-precision floating value. */
    Tcl_WideInt wideValue;	/* Wide (min. 64-bit) integer value. */
 } Tcl_Value;
-#else
-#define Tcl_ValueType void /* Just enough to prevent compilation error in Tcl */
-#define Tcl_Value void /* Just enough to prevent compilation error in Tcl */
-#endif

 /*
 * Forward declaration of Tcl_Obj to prevent an error when the forward
@@ -674,10 +720,10 @@ typedef void (Tcl_ChannelProc) (ClientData clientData, int mask);
 typedef void (Tcl_CloseProc) (ClientData data);
 typedef void (Tcl_CmdDeleteProc) (ClientData clientData);
 typedef int (Tcl_CmdProc) (ClientData clientData, Tcl_Interp *interp,
-	int argc, const char *argv[]);
+	int argc, CONST84 char *argv[]);
 typedef void (Tcl_CmdTraceProc) (ClientData clientData, Tcl_Interp *interp,
 	int level, char *command, Tcl_CmdProc *proc,
-	ClientData cmdClientData, int argc, const char *argv[]);
+	ClientData cmdClientData, int argc, CONST84 char *argv[]);
 typedef int (Tcl_CmdObjTraceProc) (ClientData clientData, Tcl_Interp *interp,
 	int level, const char *command, Tcl_Command commandInfo, int objc,
 	struct Tcl_Obj *const *objv);
@@ -714,7 +760,7 @@ typedef void (Tcl_TimerProc) (ClientData clientData);
 typedef int (Tcl_SetFromAnyProc) (Tcl_Interp *interp, struct Tcl_Obj *objPtr);
 typedef void (Tcl_UpdateStringProc) (struct Tcl_Obj *objPtr);
 typedef char * (Tcl_VarTraceProc) (ClientData clientData, Tcl_Interp *interp,
-	const char *part1, const char *part2, int flags);
+	CONST84 char *part1, CONST84 char *part2, int flags);
 typedef void (Tcl_CommandTraceProc) (ClientData clientData, Tcl_Interp *interp,
 	const char *oldName, const char *newName, int flags);
 typedef void (Tcl_CreateFileHandlerProc) (int fd, int mask, Tcl_FileProc *proc,
@@ -825,7 +871,7 @@ typedef struct Tcl_SavedResult {
    char *appendResult;
    int appendAvl;
    int appendUsed;
-    char resultSpace[200+1];
+    char resultSpace[TCL_RESULT_SIZE+1];
 } Tcl_SavedResult;

 /*
@@ -951,7 +997,7 @@ typedef struct Tcl_DString {

 #define Tcl_DStringLength(dsPtr) ((dsPtr)->length)
 #define Tcl_DStringValue(dsPtr) ((dsPtr)->string)
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 #   define Tcl_DStringTrunc Tcl_DStringSetLength
 #endif /* !TCL_NO_DEPRECATED */

@@ -1079,7 +1125,7 @@ typedef struct Tcl_DString {
 * give the flag)
 */

-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 #   define TCL_PARSE_PART1	0x400
 #endif /* !TCL_NO_DEPRECATED */

@@ -1298,8 +1344,8 @@ typedef struct Tcl_HashSearch {
 typedef struct {
    void *next;			/* Search position for underlying hash
 				 * table. */
-    unsigned int epoch; 	/* Epoch marker for dictionary being searched,
-				 * or 0 if search has terminated. */
+    int epoch;			/* Epoch marker for dictionary being searched,
+				 * or -1 if search has terminated. */
    Tcl_Dict dictionaryPtr;	/* Reference to dictionary being searched. */
 } Tcl_DictSearch;

@@ -1432,14 +1478,14 @@ typedef int	(Tcl_DriverClose2Proc) (ClientData instanceData,
 typedef int	(Tcl_DriverInputProc) (ClientData instanceData, char *buf,
 			int toRead, int *errorCodePtr);
 typedef int	(Tcl_DriverOutputProc) (ClientData instanceData,
-			const char *buf, int toWrite, int *errorCodePtr);
+			CONST84 char *buf, int toWrite, int *errorCodePtr);
 typedef int	(Tcl_DriverSeekProc) (ClientData instanceData, long offset,
 			int mode, int *errorCodePtr);
 typedef int	(Tcl_DriverSetOptionProc) (ClientData instanceData,
 			Tcl_Interp *interp, const char *optionName,
 			const char *value);
 typedef int	(Tcl_DriverGetOptionProc) (ClientData instanceData,
-			Tcl_Interp *interp, const char *optionName,
+			Tcl_Interp *interp, CONST84 char *optionName,
 			Tcl_DString *dsPtr);
 typedef void	(Tcl_DriverWatchProc) (ClientData instanceData, int mask);
 typedef int	(Tcl_DriverGetHandleProc) (ClientData instanceData,
@@ -1932,7 +1978,7 @@ typedef struct Tcl_Token {
 * TCL_TOKEN_OPERATOR -		The token describes one expression operator.
 *				An operator might be the name of a math
 *				function such as "abs". A TCL_TOKEN_OPERATOR
- *				token is always preceded by one
+ *				token is always preceeded by one
 *				TCL_TOKEN_SUB_EXPR token for the operator's
 *				subexpression, and is followed by zero or more
 *				TCL_TOKEN_SUB_EXPR tokens for the operator's
@@ -2217,8 +2263,6 @@ typedef struct mp_int mp_int;
 #define MP_INT_DECLARED
 typedef unsigned int mp_digit;
 #define MP_DIGIT_DECLARED
-typedef unsigned TCL_WIDE_INT_TYPE mp_word;
-#define MP_WORD_DECLARED

 /*
 *----------------------------------------------------------------------------
@@ -2363,27 +2407,14 @@ const char *		TclTomMathInitializeStubs(Tcl_Interp *interp,
 			    const char *version, int epoch, int revision);

 #ifdef USE_TCL_STUBS
-#if TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE
-#   define Tcl_InitStubs(interp, version, exact) \
-	(Tcl_InitStubs)(interp, version, \
+#define Tcl_InitStubs(interp, version, exact) \
+    (Tcl_InitStubs)(interp, version, \
 	    (exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \
 	    TCL_STUB_MAGIC)
 #else
-#   define Tcl_InitStubs(interp, version, exact) \
-	(Tcl_InitStubs)(interp, TCL_PATCH_LEVEL, \
-	    1|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \
-	    TCL_STUB_MAGIC)
-#endif
-#else
-#if TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE
-#   define Tcl_InitStubs(interp, version, exact) \
-	Tcl_PkgInitStubsCheck(interp, version, \
-		(exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16))
-#else
-#   define Tcl_InitStubs(interp, version, exact) \
-	Tcl_PkgInitStubsCheck(interp, TCL_PATCH_LEVEL, \
-		1|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16))
-#endif
+#define Tcl_InitStubs(interp, version, exact) \
+    Tcl_PkgInitStubsCheck(interp, version, \
+	    (exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16))
 #endif

 /*
@@ -2511,9 +2542,15 @@ EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
 #  undef  Tcl_NewDoubleObj
 #  define Tcl_NewDoubleObj(val) \
     Tcl_DbNewDoubleObj(val, __FILE__, __LINE__)
+#  undef  Tcl_NewIntObj
+#  define Tcl_NewIntObj(val) \
+     Tcl_DbNewLongObj(val, __FILE__, __LINE__)
 #  undef  Tcl_NewListObj
 #  define Tcl_NewListObj(objc, objv) \
     Tcl_DbNewListObj(objc, objv, __FILE__, __LINE__)
+#  undef  Tcl_NewLongObj
+#  define Tcl_NewLongObj(val) \
+     Tcl_DbNewLongObj(val, __FILE__, __LINE__)
 #  undef  Tcl_NewObj
 #  define Tcl_NewObj() \
     Tcl_DbNewObj(__FILE__, __LINE__)
@@ -2576,10 +2613,10 @@ EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
 * Deprecated Tcl functions:
 */

-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 /*
 * These function have been renamed. The old names are deprecated, but we
- * define these macros for backwards compatibility.
+ * define these macros for backwards compatibilty.
 */

 #   define Tcl_Ckalloc		Tcl_Alloc
@@ -661,14 +661,14 @@ mstats(

    fprintf(stderr, "\nused:\t");
    for (i = 0; i < NBUCKETS; i++) {
-	fprintf(stderr, " %" TCL_Z_MODIFIER "u", numMallocs[i]);
+	fprintf(stderr, " %" TCL_LL_MODIFIER "d", (Tcl_WideInt)numMallocs[i]);
 	totalUsed += numMallocs[i] * (1 << (i + 3));
    }

-    fprintf(stderr, "\n\tTotal small in use: %" TCL_Z_MODIFIER "u, total free: %" TCL_Z_MODIFIER "u\n",
-	totalUsed, totalFree);
-    fprintf(stderr, "\n\tNumber of big (>%d) blocks in use: %" TCL_Z_MODIFIER "u\n",
-	    MAXMALLOC, numMallocs[NBUCKETS]);
+    fprintf(stderr, "\n\tTotal small in use: %" TCL_LL_MODIFIER "d, total free: %" TCL_LL_MODIFIER "d\n",
+	(Tcl_WideInt)totalUsed, (Tcl_WideInt)totalFree);
+    fprintf(stderr, "\n\tNumber of big (>%d) blocks in use: %" TCL_LL_MODIFIER "d\n",
+	    MAXMALLOC, (Tcl_WideInt)numMallocs[NBUCKETS]);

    Tcl_MutexUnlock(allocMutexPtr);
 }
@@ -2246,24 +2246,23 @@ GetListIndexOperand(
    Tcl_Token* tokenPtr = *tokenPtrPtr;
 				/* INOUT: Pointer to the next token in the
 				 * source code */
-    Tcl_Obj *value;
-    int status;
+    Tcl_Obj* intObj;		/* Integer from the source code */
+    int status;			/* Tcl status return */

-    /* General operand validity check */
-    if (GetNextOperand(assemEnvPtr, tokenPtrPtr, &value) != TCL_OK) {
+    /*
+     * Extract the next token as a string.
+     */
+
+    if (GetNextOperand(assemEnvPtr, tokenPtrPtr, &intObj) != TCL_OK) {
 	return TCL_ERROR;
    }
-     
-    /* Convert to an integer, advance to the next token and return. */
-    /*
-     * NOTE: Indexing a list with an index before it yields the
-     * same result as indexing after it, and might be more easily portable
-     * when list size limits grow.
-     */
-    status = TclIndexEncode(interp, value,
-	    TCL_INDEX_BEFORE,TCL_INDEX_BEFORE, result);

-    Tcl_DecrRefCount(value);
+    /*
+     * Convert to an integer, advance to the next token and return.
+     */
+
+    status = TclGetIntForIndex(interp, intObj, -2, result);
+    Tcl_DecrRefCount(intObj);
    *tokenPtrPtr = TokenAfter(tokenPtr);
    return status;
 }
@@ -4267,7 +4266,7 @@ AddBasicBlockRangeToErrorInfo(
    Tcl_AppendObjToErrorInfo(interp, lineNo);
    Tcl_AddErrorInfo(interp, " and ");
    if (bbPtr->successor1 != NULL) {
-	TclSetIntObj(lineNo, bbPtr->successor1->startLine);
+	TclSetLongObj(lineNo, bbPtr->successor1->startLine);
 	Tcl_AppendObjToErrorInfo(interp, lineNo);
    } else {
 	Tcl_AddErrorInfo(interp, "end of assembly code");
@@ -118,8 +118,6 @@ static Tcl_ObjCmdProc	ExprEntierFunc;
 static Tcl_ObjCmdProc	ExprFloorFunc;
 static Tcl_ObjCmdProc	ExprIntFunc;
 static Tcl_ObjCmdProc	ExprIsqrtFunc;
-static Tcl_ObjCmdProc	ExprMaxFunc;
-static Tcl_ObjCmdProc	ExprMinFunc;
 static Tcl_ObjCmdProc	ExprRandFunc;
 static Tcl_ObjCmdProc	ExprRoundFunc;
 static Tcl_ObjCmdProc	ExprSqrtFunc;
@@ -132,10 +130,8 @@ static Tcl_NRPostProc	NRCoroutineCallerCallback;
 static Tcl_NRPostProc	NRCoroutineExitCallback;
 static Tcl_NRPostProc	NRCommand;

-#if !defined(TCL_NO_DEPRECATED)
 static Tcl_ObjCmdProc	OldMathFuncProc;
 static void		OldMathFuncDeleteProc(ClientData clientData);
-#endif /* !defined(TCL_NO_DEPRECATED) */
 static void		ProcessUnexpectedResult(Tcl_Interp *interp,
 			    int returnCode);
 static int		RewindCoroutine(CoroutineData *corPtr, int result);
@@ -207,7 +203,7 @@ static const CmdInfo builtInCmds[] = {
    {"append",		Tcl_AppendObjCmd,	TclCompileAppendCmd,	NULL,	CMD_IS_SAFE},
    {"apply",		Tcl_ApplyObjCmd,	NULL,			TclNRApplyObjCmd,	CMD_IS_SAFE},
    {"break",		Tcl_BreakObjCmd,	TclCompileBreakCmd,	NULL,	CMD_IS_SAFE},
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
    {"case",		Tcl_CaseObjCmd,		NULL,			NULL,	CMD_IS_SAFE},
 #endif
    {"catch",		Tcl_CatchObjCmd,	TclCompileCatchCmd,	TclNRCatchObjCmd,	CMD_IS_SAFE},
@@ -238,7 +234,7 @@ static const CmdInfo builtInCmds[] = {
    {"lsearch",		Tcl_LsearchObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
    {"lset",		Tcl_LsetObjCmd,		TclCompileLsetCmd,	NULL,	CMD_IS_SAFE},
    {"lsort",		Tcl_LsortObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
-    {"package",		Tcl_PackageObjCmd,	NULL,			TclNRPackageObjCmd,	CMD_IS_SAFE},
+    {"package",		Tcl_PackageObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
    {"proc",		Tcl_ProcObjCmd,		NULL,			NULL,	CMD_IS_SAFE},
    {"regexp",		Tcl_RegexpObjCmd,	TclCompileRegexpCmd,	NULL,	CMD_IS_SAFE},
    {"regsub",		Tcl_RegsubObjCmd,	TclCompileRegsubCmd,	NULL,	CMD_IS_SAFE},
@@ -325,8 +321,6 @@ static const BuiltinFuncDef BuiltinFuncTable[] = {
    { "isqrt",	ExprIsqrtFunc,	NULL			},
    { "log",	ExprUnaryFunc,	(ClientData) log	},
    { "log10",	ExprUnaryFunc,	(ClientData) log10	},
-    { "max",	ExprMaxFunc,	NULL			},
-    { "min",	ExprMinFunc,	NULL			},
    { "pow",	ExprBinaryFunc,	(ClientData) pow	},
    { "rand",	ExprRandFunc,	NULL			},
    { "round",	ExprRoundFunc,	NULL			},
@@ -819,7 +813,6 @@ Tcl_CreateInterp(void)
    TclInitNamespaceCmd(interp);
    TclInitStringCmd(interp);
    TclInitPrefixCmd(interp);
-    TclInitProcessCmd(interp);

    /*
     * Register "clock" subcommands. These *do* go through
@@ -957,11 +950,9 @@ Tcl_CreateInterp(void)

    Tcl_SetVar2(interp, "tcl_patchLevel", NULL, TCL_PATCH_LEVEL, TCL_GLOBAL_ONLY);
    Tcl_SetVar2(interp, "tcl_version", NULL, TCL_VERSION, TCL_GLOBAL_ONLY);
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
    Tcl_TraceVar2(interp, "tcl_precision", NULL,
 	    TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
 	    TclPrecTraceProc, NULL);
-#endif /* !TCL_NO_DEPRECATED */
    TclpSetVariables(interp);

 #ifdef TCL_THREADS
@@ -2062,11 +2053,11 @@ Tcl_CreateCommand(
 {
    Interp *iPtr = (Interp *) interp;
    ImportRef *oldRefPtr = NULL;
-    Namespace *nsPtr;
-    Command *cmdPtr;
+    Namespace *nsPtr, *dummy1, *dummy2;
+    Command *cmdPtr, *refCmdPtr;
    Tcl_HashEntry *hPtr;
    const char *tail;
-    int isNew = 0, deleted = 0;
+    int isNew;
    ImportedCmdData *dataPtr;

    if (iPtr->flags & DELETED) {
@@ -2079,52 +2070,32 @@ Tcl_CreateCommand(
    }

    /*
-     * If the command name we seek to create already exists, we need to
-     * delete that first.  That can be tricky in the presence of traces.
-     * Loop until we no longer find an existing command in the way, or
-     * until we've deleted one command and that didn't finish the job.
+     * Determine where the command should reside. If its name contains
+     * namespace qualifiers, we put it in the specified namespace; otherwise,
+     * we always put it in the global namespace.
     */

-    while (1) {
-        /*
-         * Determine where the command should reside. If its name contains
-         * namespace qualifiers, we put it in the specified namespace;
-	 * otherwise, we always put it in the global namespace.
-         */
-
-        if (strstr(cmdName, "::") != NULL) {
-	    Namespace *dummy1, *dummy2;
-
-	    TclGetNamespaceForQualName(interp, cmdName, NULL,
-		    TCL_CREATE_NS_IF_UNKNOWN, &nsPtr, &dummy1, &dummy2, &tail);
-	    if ((nsPtr == NULL) || (tail == NULL)) {
-	        return (Tcl_Command) NULL;
-	    }
-        } else {
-	    nsPtr = iPtr->globalNsPtr;
-	    tail = cmdName;
-        }
-
-        hPtr = Tcl_CreateHashEntry(&nsPtr->cmdTable, tail, &isNew);
-
-	if (isNew || deleted) {
-	    /*
-	     * isNew - No conflict with existing command.
-	     * deleted - We've already deleted a conflicting command
-	     */
-	    break;
+    if (strstr(cmdName, "::") != NULL) {
+	TclGetNamespaceForQualName(interp, cmdName, NULL,
+		TCL_CREATE_NS_IF_UNKNOWN, &nsPtr, &dummy1, &dummy2, &tail);
+	if ((nsPtr == NULL) || (tail == NULL)) {
+	    return (Tcl_Command) NULL;
 	}
+    } else {
+	nsPtr = iPtr->globalNsPtr;
+	tail = cmdName;
+    }

-	/* An existing command conflicts. Try to delete it.. */
-	cmdPtr = Tcl_GetHashValue(hPtr);
-
+    hPtr = Tcl_CreateHashEntry(&nsPtr->cmdTable, tail, &isNew);
+    if (!isNew) {
 	/*
-	 * Be careful to preserve
+	 * Command already exists. Delete the old one. Be careful to preserve
 	 * any existing import links so we can restore them down below. That
 	 * way, you can redefine a command and its import status will remain
 	 * intact.
 	 */

+	cmdPtr = Tcl_GetHashValue(hPtr);
 	cmdPtr->refCount++;
 	if (cmdPtr->importRefPtr) {
 	    cmdPtr->flags |= CMD_REDEF_IN_PROGRESS;
@@ -2137,21 +2108,18 @@ Tcl_CreateCommand(
 	    cmdPtr->importRefPtr = NULL;
 	}
 	TclCleanupCommandMacro(cmdPtr);
-	deleted = 1;
-    }

-    if (!isNew) {
-	/*
-	 * If the deletion callback recreated the command, just throw away
-	 * the new command (if we try to delete it again, we could get
-	 * stuck in an infinite loop).
-	 */
-
-	ckfree(Tcl_GetHashValue(hPtr));
-    }
-
-    if (!deleted) {
+	hPtr = Tcl_CreateHashEntry(&nsPtr->cmdTable, tail, &isNew);
+	if (!isNew) {
+	    /*
+	     * If the deletion callback recreated the command, just throw away
+	     * the new command (if we try to delete it again, we could get
+	     * stuck in an infinite loop).
+	     */

+	    ckfree(Tcl_GetHashValue(hPtr));
+	}
+    } else {
 	/*
 	 * Command resolvers (per-interp, per-namespace) might have resolved
 	 * to a command for the given namespace scope with this command not
@@ -2199,7 +2167,7 @@ Tcl_CreateCommand(
    if (oldRefPtr != NULL) {
 	cmdPtr->importRefPtr = oldRefPtr;
 	while (oldRefPtr != NULL) {
-	    Command *refCmdPtr = oldRefPtr->importedCmdPtr;
+	    refCmdPtr = oldRefPtr->importedCmdPtr;
 	    dataPtr = refCmdPtr->objClientData;
 	    dataPtr->realCmdPtr = cmdPtr;
 	    oldRefPtr = oldRefPtr->nextPtr;
@@ -2254,34 +2222,37 @@ Tcl_CreateObjCommand(
 				 * name. */
    ClientData clientData,	/* Arbitrary value to pass to object
 				 * function. */
-    Tcl_CmdDeleteProc *deleteProc
+    Tcl_CmdDeleteProc *deleteProc)
 				/* If not NULL, gives a function to call when
 				 * this command is deleted. */
-)
 {
    Interp *iPtr = (Interp *) interp;
-    Namespace *nsPtr;
+    ImportRef *oldRefPtr = NULL;
+    Namespace *nsPtr, *dummy1, *dummy2;
+    Command *cmdPtr, *refCmdPtr;
+    Tcl_HashEntry *hPtr;
    const char *tail;
+    int isNew;
+    ImportedCmdData *dataPtr;

    if (iPtr->flags & DELETED) {
 	/*
 	 * The interpreter is being deleted. Don't create any new commands;
 	 * it's not safe to muck with the interpreter anymore.
 	 */
+
 	return (Tcl_Command) NULL;
    }

    /*
     * Determine where the command should reside. If its name contains
-     * namespace qualifiers, we put it in the specified namespace;
-     * otherwise, we always put it in the global namespace.
+     * namespace qualifiers, we put it in the specified namespace; otherwise,
+     * we always put it in the global namespace.
     */

    if (strstr(cmdName, "::") != NULL) {
-	Namespace *dummy1, *dummy2;
-
 	TclGetNamespaceForQualName(interp, cmdName, NULL,
-	    TCL_CREATE_NS_IF_UNKNOWN, &nsPtr, &dummy1, &dummy2, &tail);
+		TCL_CREATE_NS_IF_UNKNOWN, &nsPtr, &dummy1, &dummy2, &tail);
 	if ((nsPtr == NULL) || (tail == NULL)) {
 	    return (Tcl_Command) NULL;
 	}
@@ -2290,50 +2261,13 @@ Tcl_CreateObjCommand(
 	tail = cmdName;
    }

-    return TclCreateObjCommandInNs(interp, tail, (Tcl_Namespace *) nsPtr,
-	proc, clientData, deleteProc);
-}
-
-Tcl_Command
-TclCreateObjCommandInNs (
-    Tcl_Interp *interp,
-    const char *cmdName,	/* Name of command, without any namespace components */
-    Tcl_Namespace *namespace,   /* The namespace to create the command in */
-    Tcl_ObjCmdProc *proc,	/* Object-based function to associate with
-				 * name. */
-    ClientData clientData,	/* Arbitrary value to pass to object
-				 * function. */
-    Tcl_CmdDeleteProc *deleteProc
-				/* If not NULL, gives a function to call when
-				 * this command is deleted. */
-) {
-    int deleted = 0, isNew = 0;
-    Command *cmdPtr;
-    ImportRef *oldRefPtr = NULL;
-    ImportedCmdData *dataPtr;
-    Tcl_HashEntry *hPtr;
-    Namespace *nsPtr = (Namespace *) namespace;
-    /*
-     * If the command name we seek to create already exists, we need to
-     * delete that first.  That can be tricky in the presence of traces.
-     * Loop until we no longer find an existing command in the way, or
-     * until we've deleted one command and that didn't finish the job.
-     */
-    while (1) {
-	hPtr = Tcl_CreateHashEntry(&nsPtr->cmdTable, cmdName, &isNew);
-
-	if (isNew || deleted) {
-	    /*
-	     * isNew - No conflict with existing command.
-	     * deleted - We've already deleted a conflicting command
-	     */
-	    break;
-	}
-
-
-	/* An existing command conflicts. Try to delete it.. */
+    hPtr = Tcl_CreateHashEntry(&nsPtr->cmdTable, tail, &isNew);
+    TclInvalidateNsPath(nsPtr);
+    if (!isNew) {
 	cmdPtr = Tcl_GetHashValue(hPtr);

+	/* Command already exists. */
+
 	/*
 	 * [***] This is wrong.  See Tcl Bug a16752c252.
 	 * However, this buggy behavior is kept under particular
@@ -2363,32 +2297,25 @@ TclCreateObjCommandInNs (
 	    cmdPtr->flags |= CMD_REDEF_IN_PROGRESS;
 	}

-	/* Make sure namespace doesn't get deallocated. */
-	cmdPtr->nsPtr->refCount++;
-
 	Tcl_DeleteCommandFromToken(interp, (Tcl_Command) cmdPtr);
-	nsPtr = (Namespace *) TclEnsureNamespace(interp,
-	    (Tcl_Namespace *)cmdPtr->nsPtr);
-	TclNsDecrRefCount(cmdPtr->nsPtr);

 	if (cmdPtr->flags & CMD_REDEF_IN_PROGRESS) {
 	    oldRefPtr = cmdPtr->importRefPtr;
 	    cmdPtr->importRefPtr = NULL;
 	}
 	TclCleanupCommandMacro(cmdPtr);
-	deleted = 1;
-    }
-    if (!isNew) {
-	/*
-	 * If the deletion callback recreated the command, just throw away
-	 * the new command (if we try to delete it again, we could get
-	 * stuck in an infinite loop).
-	 */

-	ckfree(Tcl_GetHashValue(hPtr));
-    }
+	hPtr = Tcl_CreateHashEntry(&nsPtr->cmdTable, tail, &isNew);
+	if (!isNew) {
+	    /*
+	     * If the deletion callback recreated the command, just throw away
+	     * the new command (if we try to delete it again, we could get
+	     * stuck in an infinite loop).
+	     */

-    if (!deleted) {
+	    ckfree(Tcl_GetHashValue(hPtr));
+	}
+    } else {
 	/*
 	 * Command resolvers (per-interp, per-namespace) might have resolved
 	 * to a command for the given namespace scope with this command not
@@ -2399,7 +2326,7 @@ TclCreateObjCommandInNs (
 	 * commands.
 	 */

-	TclInvalidateCmdLiteral(interp, cmdName, nsPtr);
+	TclInvalidateCmdLiteral(interp, tail, nsPtr);

 	/*
 	 * The list of command exported from the namespace might have changed.
@@ -2408,7 +2335,6 @@ TclCreateObjCommandInNs (
 	 */

 	TclInvalidateNsCmdLookup(nsPtr);
-	TclInvalidateNsPath(nsPtr);
    }
    cmdPtr = ckalloc(sizeof(Command));
    Tcl_SetHashValue(hPtr, cmdPtr);
@@ -2436,7 +2362,7 @@ TclCreateObjCommandInNs (
    if (oldRefPtr != NULL) {
 	cmdPtr->importRefPtr = oldRefPtr;
 	while (oldRefPtr != NULL) {
-	    Command *refCmdPtr = oldRefPtr->importedCmdPtr;
+	    refCmdPtr = oldRefPtr->importedCmdPtr;
 	    dataPtr = refCmdPtr->objClientData;
 	    dataPtr->realCmdPtr = cmdPtr;
 	    oldRefPtr = oldRefPtr->nextPtr;
@@ -2629,6 +2555,10 @@ TclRenameCommand(
        Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "COMMAND", oldName, NULL);
 	return TCL_ERROR;
    }
+    cmdNsPtr = cmdPtr->nsPtr;
+    oldFullName = Tcl_NewObj();
+    Tcl_IncrRefCount(oldFullName);
+    Tcl_GetCommandFullName(interp, cmd, oldFullName);

    /*
     * If the new command name is NULL or empty, delete the command. Do this
@@ -2637,14 +2567,10 @@ TclRenameCommand(

    if ((newName == NULL) || (*newName == '\0')) {
 	Tcl_DeleteCommandFromToken(interp, cmd);
-	return TCL_OK;
+	result = TCL_OK;
+	goto done;
    }

-    cmdNsPtr = cmdPtr->nsPtr;
-    oldFullName = Tcl_NewObj();
-    Tcl_IncrRefCount(oldFullName);
-    Tcl_GetCommandFullName(interp, cmd, oldFullName);
-
    /*
     * Make sure that the destination command does not already exist. The
     * rename operation is like creating a command, so we should automatically
@@ -3144,7 +3070,7 @@ Tcl_DeleteCommandFromToken(
    /*
     * We must delete this command, even though both traces and delete procs
     * may try to avoid this (renaming the command etc). Also traces and
-     * delete procs may try to delete the command themselves. This flag
+     * delete procs may try to delete the command themsevles. This flag
     * declares that a delete is in progress and that recursive deletes should
     * be ignored.
     */
@@ -3156,8 +3082,6 @@ Tcl_DeleteCommandFromToken(
     * traces.
     */

-    cmdPtr->nsPtr->refCount++;
-
    if (cmdPtr->tracePtr != NULL) {
 	CommandTrace *tracePtr;
 	CallCommandTraces(iPtr,cmdPtr,NULL,NULL,TCL_TRACE_DELETE);
@@ -3185,7 +3109,6 @@ Tcl_DeleteCommandFromToken(
     */

    TclInvalidateNsCmdLookup(cmdPtr->nsPtr);
-    TclNsDecrRefCount(cmdPtr->nsPtr);

    /*
     * If the command being deleted has a compile function, increment the
@@ -3523,7 +3446,6 @@ TclCleanupCommand(
 *----------------------------------------------------------------------
 */

-#if !defined(TCL_NO_DEPRECATED)
 void
 Tcl_CreateMathFunc(
    Tcl_Interp *interp,		/* Interpreter in which function is to be
@@ -3574,7 +3496,7 @@ Tcl_CreateMathFunc(

 static int
 OldMathFuncProc(
-    ClientData clientData,	/* Pointer to OldMathFuncData describing the
+    ClientData clientData,	/* Ponter to OldMathFuncData describing the
 				 * function being called */
    Tcl_Interp *interp,		/* Tcl interpreter */
    int objc,			/* Actual parameter count */
@@ -3687,7 +3609,7 @@ OldMathFuncProc(
     */

    if (funcResult.type == TCL_INT) {
-	TclNewIntObj(valuePtr, funcResult.intValue);
+	TclNewLongObj(valuePtr, funcResult.intValue);
    } else if (funcResult.type == TCL_WIDE_INT) {
 	valuePtr = Tcl_NewWideIntObj(funcResult.wideValue);
    } else {
@@ -3855,7 +3777,6 @@ Tcl_ListMathFuncs(

    return result;
 }
-#endif /* !defined(TCL_NO_DEPRECATED) */

 /*
 *----------------------------------------------------------------------
@@ -4463,9 +4384,7 @@ TclNRRunCallbacks(
 				/* All callbacks down to rootPtr not inclusive
 				 * are to be run. */
 {
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
    Interp *iPtr = (Interp *) interp;
-#endif /* !defined(TCL_NO_DEPRECATED) */
    NRE_callback *callbackPtr;
    Tcl_NRPostProc *procPtr;

@@ -4479,13 +4398,9 @@ TclNRRunCallbacks(
     * are for NR function calls, and those are Tcl_Obj based.
     */

-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
    if (*(iPtr->result) != 0) {
 	(void) Tcl_GetObjResult(interp);
    }
-#endif /* !defined(TCL_NO_DEPRECATED) */
-
-    /* This is the trampoline. */

    while (TOP_CB(interp) != rootPtr) {
 	callbackPtr = TOP_CB(interp);
@@ -4620,7 +4535,7 @@ TEOV_Exception(
 	if (result == TCL_RETURN) {
 	    result = TclUpdateReturnInfo(iPtr);
 	}
-	if ((result != TCL_OK) && (result != TCL_ERROR) && !allowExceptions) {
+	if ((result != TCL_ERROR) && !allowExceptions) {
 	    ProcessUnexpectedResult(interp, result);
 	    result = TCL_ERROR;
 	}
@@ -4801,7 +4716,7 @@ TEOV_RunEnterTraces(
 {
    Interp *iPtr = (Interp *) interp;
    Command *cmdPtr = *cmdPtrPtr;
-    unsigned int newEpoch, cmdEpoch = cmdPtr->cmdEpoch;
+    size_t newEpoch, cmdEpoch = cmdPtr->cmdEpoch;
    int length, traceCode = TCL_OK;
    const char *command = TclGetStringFromObj(commandPtr, &length);

@@ -4944,7 +4859,6 @@ Tcl_EvalTokensStandard(
 	    NULL, NULL);
 }

-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 /*
 *----------------------------------------------------------------------
 *
@@ -4992,7 +4906,6 @@ Tcl_EvalTokens(
    Tcl_ResetResult(interp);
    return resPtr;
 }
-#endif /* !TCL_NO_DEPRECATED */

 /*
 *----------------------------------------------------------------------
@@ -6511,6 +6424,7 @@ Tcl_ExprLongObj(
 	resultPtr = Tcl_NewBignumObj(&big);
 	/* FALLTHROUGH */
    }
+    case TCL_NUMBER_LONG:
    case TCL_NUMBER_WIDE:
    case TCL_NUMBER_BIG:
 	result = TclGetLongFromObj(interp, resultPtr, ptr);
@@ -6878,8 +6792,7 @@ Tcl_AddObjErrorInfo(

    iPtr->flags |= ERR_LEGACY_COPY;
    if (iPtr->errorInfo == NULL) {
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-	if (*(iPtr->result) != 0) {
+	if (iPtr->result[0] != 0) {
 	    /*
 	     * The interp's string result is set, apparently by some extension
 	     * making a deprecated direct write to it. That extension may
@@ -6889,9 +6802,9 @@ Tcl_AddObjErrorInfo(
 	     */

 	    iPtr->errorInfo = Tcl_NewStringObj(iPtr->result, -1);
-	} else
-#endif /* !defined(TCL_NO_DEPRECATED) */
+	} else {
 	    iPtr->errorInfo = iPtr->objResultPtr;
+	}
 	Tcl_IncrRefCount(iPtr->errorInfo);
 	if (!iPtr->errorCode) {
 	    Tcl_SetErrorCode(interp, "NONE", NULL);
@@ -7487,12 +7400,12 @@ ExprAbsFunc(
 	return TCL_ERROR;
    }

-    if (type == TCL_NUMBER_WIDE) {
-	Tcl_WideInt l = *((const Tcl_WideInt *) ptr);
+    if (type == TCL_NUMBER_LONG) {
+	long l = *((const long *) ptr);

-	if (l > (Tcl_WideInt)0) {
+	if (l > (long)0) {
 	    goto unChanged;
-	} else if (l == (Tcl_WideInt)0) {
+	} else if (l == (long)0) {
 	    const char *string = objv[1]->bytes;
 	    if (string) {
 		while (*string != '0') {
@@ -7504,11 +7417,11 @@ ExprAbsFunc(
 		}
 	    }
 	    goto unChanged;
-	} else if (l == LLONG_MIN) {
-	    TclInitBignumFromWideInt(&big, l);
+	} else if (l == LONG_MIN) {
+	    TclBNInitBignumFromLong(&big, l);
 	    goto tooLarge;
 	}
-	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(-l));
+	Tcl_SetObjResult(interp, Tcl_NewLongObj(-l));
 	return TCL_OK;
    }

@@ -7532,8 +7445,24 @@ ExprAbsFunc(
 	return TCL_OK;
    }

+#ifndef TCL_WIDE_INT_IS_LONG
+    if (type == TCL_NUMBER_WIDE) {
+	Tcl_WideInt w = *((const Tcl_WideInt *) ptr);
+
+	if (w >= (Tcl_WideInt)0) {
+	    goto unChanged;
+	}
+	if (w == LLONG_MIN) {
+	    TclBNInitBignumFromWideInt(&big, w);
+	    goto tooLarge;
+	}
+	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(-w));
+	return TCL_OK;
+    }
+#endif
+
    if (type == TCL_NUMBER_BIG) {
-	if (mp_isneg((const mp_int *) ptr)) {
+	if (mp_cmp_d((const mp_int *) ptr, 0) == MP_LT) {
 	    Tcl_GetBignumFromObj(NULL, objv[1], &big);
 	tooLarge:
 	    mp_neg(&big, &big);
@@ -7728,71 +7657,6 @@ ExprWideFunc(
    return TCL_OK;
 }

-/*
- * Common implmentation of max() and min().
- */
-static int
-ExprMaxMinFunc(
-    ClientData clientData,	/* Ignored. */
-    Tcl_Interp *interp,		/* The interpreter in which to execute the
-				 * function. */
-    int objc,			/* Actual parameter count. */
-    Tcl_Obj *const *objv,	/* Actual parameter vector. */
-    int op)			/* Comparison direction */
-{
-    Tcl_Obj *res;
-    double d;
-    int type, i;
-    ClientData ptr;
-
-    if (objc < 2) {
-	MathFuncWrongNumArgs(interp, 2, objc, objv);
-	return TCL_ERROR;
-    }
-    res = objv[1];
-    for (i = 1; i < objc; i++) {
-        if (TclGetNumberFromObj(interp, objv[i], &ptr, &type) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        if (type == TCL_NUMBER_NAN) {
-            /*
-             * Get the error message for NaN.
-             */
-
-            Tcl_GetDoubleFromObj(interp, objv[i], &d);
-            return TCL_ERROR;
-        }
-        if (TclCompareTwoNumbers(objv[i], res) == op)  {
-            res = objv[i];
-        }
-    }
-
-    Tcl_SetObjResult(interp, res);
-    return TCL_OK;
-}
-
-static int
-ExprMaxFunc(
-    ClientData clientData,	/* Ignored. */
-    Tcl_Interp *interp,		/* The interpreter in which to execute the
-				 * function. */
-    int objc,			/* Actual parameter count. */
-    Tcl_Obj *const *objv)	/* Actual parameter vector. */
-{
-    return ExprMaxMinFunc(clientData, interp, objc, objv, MP_GT);
-}
-
-static int
-ExprMinFunc(
-    ClientData clientData,	/* Ignored. */
-    Tcl_Interp *interp,		/* The interpreter in which to execute the
-				 * function. */
-    int objc,			/* Actual parameter count. */
-    Tcl_Obj *const *objv)	/* Actual parameter vector. */
-{
-    return ExprMaxMinFunc(clientData, interp, objc, objv, MP_LT);
-}
-
 static int
 ExprRandFunc(
    ClientData clientData,	/* Ignored. */
@@ -7816,8 +7680,8 @@ ExprRandFunc(
 	iPtr->flags |= RAND_SEED_INITIALIZED;

 	/*
-	 * To ensure different seeds in different threads (bug #416643),
-	 * take into consideration the thread this interp is running in.
+	 * Take into consideration the thread this interp is running in order
+	 * to insure different seeds in different threads (bug #416643)
 	 */

 	iPtr->randSeed = TclpGetClicks() + (PTR2INT(Tcl_GetCurrentThread())<<12);
@@ -8281,22 +8145,6 @@ Tcl_NRCreateCommand(
    cmdPtr->nreProc = nreProc;
    return (Tcl_Command) cmdPtr;
 }
-
-Tcl_Command
-TclNRCreateCommandInNs (
-    Tcl_Interp *interp,
-    const char *cmdName,
-    Tcl_Namespace *nsPtr,
-    Tcl_ObjCmdProc *proc,
-    Tcl_ObjCmdProc *nreProc,
-    ClientData clientData,
-    Tcl_CmdDeleteProc *deleteProc) {
-    Command *cmdPtr = (Command *)
-	TclCreateObjCommandInNs(interp,cmdName,nsPtr,proc,clientData,deleteProc);
-
-    cmdPtr->nreProc = nreProc;
-    return (Tcl_Command) cmdPtr;
-}

 /****************************************************************************
 * Stuff for the public api
@@ -9082,9 +8930,9 @@ TclNRCoroutineObjCmd(
 {
    Command *cmdPtr;
    CoroutineData *corPtr;
-    const char *procName, *simpleName;
-    Namespace *nsPtr, *altNsPtr, *cxtNsPtr,
-	*inNsPtr = (Namespace *)TclGetCurrentNamespace(interp);
+    const char *fullName, *procName;
+    Namespace *nsPtr, *altNsPtr, *cxtNsPtr;
+    Tcl_DString ds;
    Namespace *lookupNsPtr = iPtr->varFramePtr->nsPtr;

    if (objc < 3) {
@@ -9092,21 +8940,34 @@ TclNRCoroutineObjCmd(
 	return TCL_ERROR;
    }

-    procName = TclGetString(objv[1]);
-    TclGetNamespaceForQualName(interp, procName, inNsPtr, 0,
-	    &nsPtr, &altNsPtr, &cxtNsPtr, &simpleName);
+    /*
+     * FIXME: this is copy/pasted from Tcl_ProcObjCommand. Should have
+     * something in tclUtil.c to find the FQ name.
+     */
+
+    fullName = TclGetString(objv[1]);
+    TclGetNamespaceForQualName(interp, fullName, NULL, 0,
+	    &nsPtr, &altNsPtr, &cxtNsPtr, &procName);

    if (nsPtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                "can't create procedure \"%s\": unknown namespace",
-                procName));
+                fullName));
        Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "NAMESPACE", NULL);
 	return TCL_ERROR;
    }
-    if (simpleName == NULL) {
+    if (procName == NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                "can't create procedure \"%s\": bad procedure name",
-                procName));
+                fullName));
+        Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", fullName, NULL);
+	return TCL_ERROR;
+    }
+    if ((nsPtr != iPtr->globalNsPtr)
+	    && (procName != NULL) && (procName[0] == ':')) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+                "can't create procedure \"%s\" in non-global namespace with"
+                " name starting with \":\"", procName));
        Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", procName, NULL);
 	return TCL_ERROR;
    }
@@ -9118,9 +8979,16 @@ TclNRCoroutineObjCmd(

    corPtr = ckalloc(sizeof(CoroutineData));

-    cmdPtr = (Command *) TclNRCreateCommandInNs(interp, simpleName,
-	    (Tcl_Namespace *)nsPtr, /*objProc*/ NULL, TclNRInterpCoroutine,
-	    corPtr, DeleteCoroutine);
+    Tcl_DStringInit(&ds);
+    if (nsPtr != iPtr->globalNsPtr) {
+	Tcl_DStringAppend(&ds, nsPtr->fullName, -1);
+	TclDStringAppendLiteral(&ds, "::");
+    }
+    Tcl_DStringAppend(&ds, procName, -1);
+
+    cmdPtr = (Command *) Tcl_NRCreateCommand(interp, Tcl_DStringValue(&ds),
+	    /*objProc*/ NULL, TclNRInterpCoroutine, corPtr, DeleteCoroutine);
+    Tcl_DStringFree(&ds);

    corPtr->cmdPtr = cmdPtr;
    cmdPtr->refCount++;
@@ -9181,7 +9049,7 @@ TclNRCoroutineObjCmd(
    TclNRAddCallback(interp, NRCoroutineExitCallback, corPtr,
 	    NULL, NULL, NULL);

-    /* ensure that the command is looked up in the correct namespace */
+    /* insure that the command is looked up in the correct namespace */
    iPtr->lookupNsPtr = lookupNsPtr;
    Tcl_NREvalObj(interp, Tcl_NewListObj(objc-2, objv+2), 0);
    iPtr->numLevels--;
@@ -536,7 +536,7 @@ SetByteArrayFromAny(
    const char *src, *srcEnd;
    unsigned char *dst;
    ByteArray *byteArrayPtr;
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar ch;

    if (objPtr->typePtr == &properByteArrayType) {
 	return TCL_OK;
@@ -1300,7 +1300,7 @@ BinaryFormatCmd(

 badField:
    {
-	Tcl_UniChar ch = 0;
+	Tcl_UniChar ch;
 	char buf[TCL_UTF_MAX + 1];

 	TclUtfToUniChar(errorString, &ch);
@@ -1670,7 +1670,7 @@ BinaryScanCmd(

 badField:
    {
-	Tcl_UniChar ch = 0;
+	Tcl_UniChar ch;
 	char buf[TCL_UTF_MAX + 1];

 	TclUtfToUniChar(errorString, &ch);
@@ -2284,7 +2284,7 @@ ScanNumber(
 	    Tcl_Obj *bigObj = NULL;
 	    mp_int big;

-	    TclInitBignumFromWideUInt(&big, uwvalue);
+	    TclBNInitBignumFromWideUInt(&big, uwvalue);
 	    bigObj = Tcl_NewBignumObj(&big);
 	    return bigObj;
 	}
@@ -187,15 +187,15 @@ TclDumpMemoryInfo(
 	    "total mallocs             %10u\n"
 	    "total frees               %10u\n"
 	    "current packets allocated %10u\n"
-	    "current bytes allocated   %10" TCL_Z_MODIFIER "u\n"
+	    "current bytes allocated   %10" TCL_LL_MODIFIER "u\n"
 	    "maximum packets allocated %10u\n"
-	    "maximum bytes allocated   %10" TCL_Z_MODIFIER "u\n",
+	    "maximum bytes allocated   %10" TCL_LL_MODIFIER "u\n",
 	    total_mallocs,
 	    total_frees,
 	    current_malloc_packets,
-	    current_bytes_malloced,
+	    (Tcl_WideInt)current_bytes_malloced,
 	    maximum_malloc_packets,
-	    maximum_bytes_malloced);
+	    (Tcl_WideInt)maximum_bytes_malloced);
    if (flags == 0) {
 	fprintf((FILE *)clientData, "%s", buf);
    } else {
@@ -254,7 +254,7 @@ ValidateMemory(
 	fprintf(stderr, "low guard failed at %p, %s %d\n",
 		memHeaderP->body, file, line);
 	fflush(stderr);			/* In case name pointer is bad. */
-	fprintf(stderr, "%" TCL_Z_MODIFIER "u bytes allocated at (%s %d)\n", memHeaderP->length,
+	fprintf(stderr, "%" TCL_LL_MODIFIER "d bytes allocated at (%s %d)\n", (Tcl_WideInt) memHeaderP->length,
 		memHeaderP->file, memHeaderP->line);
 	Tcl_Panic("Memory validation failure");
    }
@@ -276,8 +276,8 @@ ValidateMemory(
 	fprintf(stderr, "high guard failed at %p, %s %d\n",
 		memHeaderP->body, file, line);
 	fflush(stderr);			/* In case name pointer is bad. */
-	fprintf(stderr, "%" TCL_Z_MODIFIER "u bytes allocated at (%s %d)\n",
-		memHeaderP->length, memHeaderP->file,
+	fprintf(stderr, "%" TCL_LL_MODIFIER "d bytes allocated at (%s %d)\n",
+		(Tcl_WideInt)memHeaderP->length, memHeaderP->file,
 		memHeaderP->line);
 	Tcl_Panic("Memory validation failure");
    }
@@ -359,9 +359,9 @@ Tcl_DumpActiveMemory(
    Tcl_MutexLock(ckallocMutexPtr);
    for (memScanP = allocHead; memScanP != NULL; memScanP = memScanP->flink) {
 	address = &memScanP->body[0];
-	fprintf(fileP, "%p - %p  %" TCL_Z_MODIFIER "u @ %s %d %s",
+	fprintf(fileP, "%p - %p  %" TCL_LL_MODIFIER "d @ %s %d %s",
 		address, address + memScanP->length - 1,
-		memScanP->length, memScanP->file, memScanP->line,
+		(Tcl_WideInt)memScanP->length, memScanP->file, memScanP->line,
 		(memScanP->tagPtr == NULL) ? "" : memScanP->tagPtr->string);
 	(void) fputc('\n', fileP);
    }
@@ -611,8 +611,8 @@ Tcl_DbCkfree(
    memp = (struct mem_header *) (((size_t) ptr) - BODY_OFFSET);

    if (alloc_tracing) {
-	fprintf(stderr, "ckfree %p %" TCL_Z_MODIFIER "u %s %d\n",
-		memp->body, memp->length, file, line);
+	fprintf(stderr, "ckfree %p %" TCL_LL_MODIFIER "d %s %d\n",
+		memp->body, (Tcl_WideInt) memp->length, file, line);
    }

    if (validate_memory) {
@@ -859,12 +859,12 @@ MemoryCmd(
    }
    if (strcmp(argv[1],"info") == 0) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"%-25s %10u\n%-25s %10u\n%-25s %10u\n%-25s %10" TCL_Z_MODIFIER"u\n%-25s %10u\n%-25s %10" TCL_Z_MODIFIER "u\n",
+		"%-25s %10u\n%-25s %10u\n%-25s %10u\n%-25s %10" TCL_LL_MODIFIER"d\n%-25s %10u\n%-25s %10" TCL_LL_MODIFIER "d\n",
 		"total mallocs", total_mallocs, "total frees", total_frees,
 		"current packets allocated", current_malloc_packets,
-		"current bytes allocated", current_bytes_malloced,
+		"current bytes allocated", (Tcl_WideInt)current_bytes_malloced,
 		"maximum packets allocated", maximum_malloc_packets,
-		"maximum bytes allocated", maximum_bytes_malloced));
+		"maximum bytes allocated", (Tcl_WideInt)maximum_bytes_malloced));
 	return TCL_OK;
    }
    if (strcmp(argv[1], "init") == 0) {
@@ -164,7 +164,7 @@ Tcl_BreakObjCmd(
 *
 *----------------------------------------------------------------------
 */
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 	/* ARGSUSED */
 int
 Tcl_CaseObjCmd(
@@ -64,9 +64,8 @@ typedef struct SortInfo {
 				 * SORTMODE_COMMAND. Pre-initialized to hold
 				 * base of command. */
    int *indexv;		/* If the -index option was specified, this
-				 * holds an encoding of the indexes contained
-				 * in the list supplied as an argument to
-				 * that option.
+				 * holds the indexes contained in the list
+				 * supplied as an argument to that option.
 				 * NULL if no indexes supplied, and points to
 				 * singleIndex field when only one
 				 * supplied. */
@@ -93,6 +92,14 @@ typedef struct SortInfo {
 #define SORTMODE_DICTIONARY	4
 #define SORTMODE_ASCII_NC	8

+/*
+ * Magic values for the index field of the SortInfo structure. Note that the
+ * index "end-1" will be translated to SORTIDX_END-1, etc.
+ */
+
+#define SORTIDX_NONE	-1	/* Not indexed; use whole value. */
+#define SORTIDX_END	-2	/* Indexed from end. */
+
 /*
 * Forward declarations for procedures defined in this file:
 */
@@ -2153,7 +2160,7 @@ Tcl_JoinObjCmd(
    int objc,			/* Number of arguments. */
    Tcl_Obj *const objv[])	/* The argument objects. */
 {
-    int length, listLen;
+    int listLen;
    Tcl_Obj *resObjPtr = NULL, *joinObjPtr, **elemPtrs;

    if ((objc < 2) || (objc > 3)) {
@@ -2184,9 +2191,9 @@ Tcl_JoinObjCmd(
    joinObjPtr = (objc == 2) ? Tcl_NewStringObj(" ", 1) : objv[2];
    Tcl_IncrRefCount(joinObjPtr);

-    (void) Tcl_GetStringFromObj(joinObjPtr, &length);
-    if (length == 0) {
-	resObjPtr = TclStringCat(interp, listLen, elemPtrs, 0);
+    if (Tcl_GetCharLength(joinObjPtr) == 0) {
+	TclStringCatObjv(interp, /* inPlace */ 0, listLen, elemPtrs,
+		&resObjPtr);
    } else {
 	int i;

@@ -2536,6 +2543,7 @@ Tcl_LrangeObjCmd(
    register Tcl_Obj *const objv[])
 				/* Argument objects. */
 {
+    Tcl_Obj **elemPtrs;
    int listLen, first, last, result;

    if (objc != 4) {
@@ -2553,14 +2561,55 @@ Tcl_LrangeObjCmd(
    if (result != TCL_OK) {
 	return result;
    }
+    if (first < 0) {
+	first = 0;
+    }

    result = TclGetIntForIndexM(interp, objv[3], /*endValue*/ listLen - 1,
 	    &last);
    if (result != TCL_OK) {
 	return result;
    }
+    if (last >= listLen) {
+	last = listLen - 1;
+    }
+
+    if (first > last) {
+	/*
+	 * Returning an empty list is easy.
+	 */
+
+	return TCL_OK;
+    }
+
+    result = TclListObjGetElements(interp, objv[1], &listLen, &elemPtrs);
+    if (result != TCL_OK) {
+	return result;
+    }
+
+    if (Tcl_IsShared(objv[1]) ||
+	    ((ListRepPtr(objv[1])->refCount > 1))) {
+	Tcl_SetObjResult(interp, Tcl_NewListObj(last - first + 1,
+		&elemPtrs[first]));
+    } else {
+	/*
+	 * In-place is possible.
+	 */
+
+	if (last < (listLen - 1)) {
+	    Tcl_ListObjReplace(interp, objv[1], last + 1, listLen - 1 - last,
+		    0, NULL);
+	}
+
+	/*
+	 * This one is not conditioned on (first > 0) in order to preserve the
+	 * string-canonizing effect of [lrange 0 end].
+	 */
+
+	Tcl_ListObjReplace(interp, objv[1], 0, first, 0, NULL);
+	Tcl_SetObjResult(interp, objv[1]);
+    }

-    Tcl_SetObjResult(interp, TclListObjRange(objv[1], first, last));
    return TCL_OK;
 }

@@ -2738,7 +2787,7 @@ Tcl_LreplaceObjCmd(
     * (to allow for replacing the last elem).
     */

-    if ((first >= listLen) && (listLen > 0)) {
+    if ((first > listLen) && (listLen > 0)) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"list doesn't contain element %s", TclGetString(objv[2])));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LREPLACE", "BADIDX",
@@ -2889,21 +2938,20 @@ Tcl_LsearchObjCmd(
    Tcl_Obj *const objv[])	/* Argument values. */
 {
    const char *bytes, *patternBytes;
-    int i, match, index, result=TCL_OK, listc, length, elemLen, bisect;
-    int allocatedIndexVector = 0;
-    int dataType, isIncreasing, lower, upper, start, groupSize, groupOffset;
+    int i, match, index, result, listc, length, elemLen, bisect;
+    int dataType, isIncreasing, lower, upper, offset;
    Tcl_WideInt patWide, objWide;
    int allMatches, inlineReturn, negatedMatch, returnSubindices, noCase;
    double patDouble, objDouble;
    SortInfo sortInfo;
    Tcl_Obj *patObj, **listv, *listPtr, *startPtr, *itemPtr;
-    SortStrCmpFn_t strCmpFn = TclUtfCmp;
+    SortStrCmpFn_t strCmpFn = strcmp;
    Tcl_RegExp regexp = NULL;
    static const char *const options[] = {
 	"-all",	    "-ascii",   "-bisect", "-decreasing", "-dictionary",
 	"-exact",   "-glob",    "-increasing", "-index",
 	"-inline",  "-integer", "-nocase",     "-not",
-	"-real",    "-regexp",  "-sorted",     "-start", "-stride",
+	"-real",    "-regexp",  "-sorted",     "-start",
 	"-subindices", NULL
    };
    enum options {
@@ -2911,7 +2959,7 @@ Tcl_LsearchObjCmd(
 	LSEARCH_DICTIONARY, LSEARCH_EXACT, LSEARCH_GLOB, LSEARCH_INCREASING,
 	LSEARCH_INDEX, LSEARCH_INLINE, LSEARCH_INTEGER, LSEARCH_NOCASE,
 	LSEARCH_NOT, LSEARCH_REAL, LSEARCH_REGEXP, LSEARCH_SORTED,
-	LSEARCH_START, LSEARCH_STRIDE, LSEARCH_SUBINDICES
+	LSEARCH_START, LSEARCH_SUBINDICES
    };
    enum datatypes {
 	ASCII, DICTIONARY, INTEGER, REAL
@@ -2931,9 +2979,7 @@ Tcl_LsearchObjCmd(
    bisect = 0;
    listPtr = NULL;
    startPtr = NULL;
-    groupSize = 1;
-    groupOffset = 0;
-    start = 0;
+    offset = 0;
    noCase = 0;
    sortInfo.compareCmdPtr = NULL;
    sortInfo.isIncreasing = 1;
@@ -2951,6 +2997,9 @@ Tcl_LsearchObjCmd(
    for (i = 1; i < objc-2; i++) {
 	if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0, &index)
 		!= TCL_OK) {
+	    if (startPtr != NULL) {
+		Tcl_DecrRefCount(startPtr);
+	    }
 	    result = TCL_ERROR;
 	    goto done;
 	}
@@ -3015,7 +3064,6 @@ Tcl_LsearchObjCmd(

 	    if (startPtr != NULL) {
 		Tcl_DecrRefCount(startPtr);
-		startPtr = NULL;
 	    }
 	    if (i > objc-4) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -3036,47 +3084,25 @@ Tcl_LsearchObjCmd(
 		startPtr = Tcl_DuplicateObj(objv[i]);
 	    } else {
 		startPtr = objv[i];
+		Tcl_IncrRefCount(startPtr);
 	    }
-	    Tcl_IncrRefCount(startPtr);
-	    break;
-	case LSEARCH_STRIDE:		/* -stride */
-	    if (i > objc-4) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"\"-stride\" option must be "
-			"followed by stride length", -1));
-		Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
-		result = TCL_ERROR;
-		goto done;
-	    }
-	    if (Tcl_GetIntFromObj(interp, objv[i+1], &groupSize) != TCL_OK) {
-		result = TCL_ERROR;
-		goto done;
-	    }
-	    if (groupSize < 1) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"stride length must be at least 1", -1));
-		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSORT",
-			"BADSTRIDE", NULL);
-		result = TCL_ERROR;
-		goto done;
-	    }
-	    i++;
 	    break;
 	case LSEARCH_INDEX: {		/* -index */
 	    Tcl_Obj **indices;
 	    int j;

-	    if (allocatedIndexVector) {
+	    if (sortInfo.indexc > 1) {
 		TclStackFree(interp, sortInfo.indexv);
-		allocatedIndexVector = 0;
 	    }
 	    if (i > objc-4) {
+		if (startPtr != NULL) {
+		    Tcl_DecrRefCount(startPtr);
+		}
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"\"-index\" option must be followed by list index",
 			-1));
 		Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
-		result = TCL_ERROR;
-		goto done;
+		return TCL_ERROR;
 	    }

 	    /*
@@ -3088,8 +3114,10 @@ Tcl_LsearchObjCmd(
 	    i++;
 	    if (TclListObjGetElements(interp, objv[i],
 		    &sortInfo.indexc, &indices) != TCL_OK) {
-		result = TCL_ERROR;
-		goto done;
+		if (startPtr != NULL) {
+		    Tcl_DecrRefCount(startPtr);
+		}
+		return TCL_ERROR;
 	    }
 	    switch (sortInfo.indexc) {
 	    case 0:
@@ -3101,8 +3129,6 @@ Tcl_LsearchObjCmd(
 	    default:
 		sortInfo.indexv =
 			TclStackAlloc(interp, sizeof(int) * sortInfo.indexc);
-		allocatedIndexVector = 1; /* Cannot use indexc field, as it
-					   * might be decreased by 1 later. */
 	    }

 	    /*
@@ -3112,26 +3138,13 @@ Tcl_LsearchObjCmd(
 	     */

 	    for (j=0 ; j<sortInfo.indexc ; j++) {
-		int encoded = 0;
-		if (TclIndexEncode(interp, indices[j], TCL_INDEX_BEFORE,
-			TCL_INDEX_AFTER, &encoded) != TCL_OK) {
-		    result = TCL_ERROR;
-		}
-		if ((encoded == TCL_INDEX_BEFORE)
-			|| (encoded == TCL_INDEX_AFTER)) {
-		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "index \"%s\" cannot select an element "
-			    "from any list", Tcl_GetString(indices[j])));
-		    Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX"
-			    "OUTOFRANGE", NULL);
-		    result = TCL_ERROR;
-		}
-		if (result == TCL_ERROR) {
+		if (TclGetIntForIndexM(interp, indices[j], SORTIDX_END,
+			&sortInfo.indexv[j]) != TCL_OK) {
 		    Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 			    "\n    (-index option item number %d)", j));
+		    result = TCL_ERROR;
 		    goto done;
 		}
-		sortInfo.indexv[j] = encoded;
 	    }
 	    break;
 	}
@@ -3143,12 +3156,14 @@ Tcl_LsearchObjCmd(
     */

    if (returnSubindices && sortInfo.indexc==0) {
+	if (startPtr != NULL) {
+	    Tcl_DecrRefCount(startPtr);
+	}
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"-subindices cannot be used without -index option", -1));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSEARCH",
 		"BAD_OPTION_MIX", NULL);
-	result = TCL_ERROR;
-	goto done;
+	return TCL_ERROR;
    }

    if (bisect && (allMatches || negatedMatch)) {
@@ -3156,8 +3171,7 @@ Tcl_LsearchObjCmd(
 		"-bisect is not compatible with -all or -not", -1));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSEARCH",
 		"BAD_OPTION_MIX", NULL);
-	result = TCL_ERROR;
-	goto done;
+	return TCL_ERROR;
    }

    if (mode == REGEXP) {
@@ -3183,6 +3197,9 @@ Tcl_LsearchObjCmd(
 	}

 	if (regexp == NULL) {
+	    if (startPtr != NULL) {
+		Tcl_DecrRefCount(startPtr);
+	    }
 	    result = TCL_ERROR;
 	    goto done;
 	}
@@ -3195,64 +3212,24 @@ Tcl_LsearchObjCmd(

    result = TclListObjGetElements(interp, objv[objc - 2], &listc, &listv);
    if (result != TCL_OK) {
+	if (startPtr != NULL) {
+	    Tcl_DecrRefCount(startPtr);
+	}
 	goto done;
    }

-    /*
-     * Check for sanity when grouping elements of the overall list together
-     * because of the -stride option. [TIP #351]
-     */
-
-    if (groupSize > 1) {
-	if (listc % groupSize) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "list size must be a multiple of the stride length",
-		    -1));
-	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSEARCH", "BADSTRIDE",
-		    NULL);
-	    result = TCL_ERROR;
-	    goto done;
-	}
-	if (sortInfo.indexc > 0) {
-	    /*
-	     * Use the first value in the list supplied to -index as the
-	     * offset of the element within each group by which to sort.
-	     */
-
-	    groupOffset = TclIndexDecode(sortInfo.indexv[0], groupSize - 1);
-	    if (groupOffset < 0 || groupOffset >= groupSize) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"when used with \"-stride\", the leading \"-index\""
-			" value must be within the group", -1));
-		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSEARCH",
-			"BADINDEX", NULL);
-		result = TCL_ERROR;
-		goto done;
-	    }
-	    if (sortInfo.indexc == 1) {
-		sortInfo.indexc = 0;
-		sortInfo.indexv = NULL;
-	    } else {
-		sortInfo.indexc--;
-
-		for (i = 0; i < sortInfo.indexc; i++) {
-		    sortInfo.indexv[i] = sortInfo.indexv[i+1];
-		}
-	    }
-	}
-    }
-
    /*
     * Get the user-specified start offset.
     */

    if (startPtr) {
-	result = TclGetIntForIndexM(interp, startPtr, listc-1, &start);
+	result = TclGetIntForIndexM(interp, startPtr, listc-1, &offset);
+	Tcl_DecrRefCount(startPtr);
 	if (result != TCL_OK) {
 	    goto done;
 	}
-	if (start < 0) {
-	    start = 0;
+	if (offset < 0) {
+	    offset = 0;
 	}

 	/*
@@ -3260,21 +3237,16 @@ Tcl_LsearchObjCmd(
 	 * "did not match anything at all" result straight away. [Bug 1374778]
 	 */

-	if (start > listc-1) {
+	if (offset > listc-1) {
+	    if (sortInfo.indexc > 1) {
+		TclStackFree(interp, sortInfo.indexv);
+	    }
 	    if (allMatches || inlineReturn) {
 		Tcl_ResetResult(interp);
 	    } else {
 		Tcl_SetObjResult(interp, Tcl_NewIntObj(-1));
 	    }
-	    goto done;
-	}
-
-	/*
-	 * If start points within a group, it points to the start of the group.
-	 */
-
-	if (groupSize > 1) {
-	    start -= (start % groupSize);
+	    return TCL_OK;
 	}
    }

@@ -3333,23 +3305,18 @@ Tcl_LsearchObjCmd(
 	 * sense in doing this when the match sense is inverted.
 	 */

-	/* 
-	 * With -stride, lower, upper and i are kept as multiples of groupSize.
-	 */
-
-	lower = start - groupSize;
+	lower = offset - 1;
 	upper = listc;
-	while (lower + groupSize != upper && sortInfo.resultCode == TCL_OK) {
+	while (lower + 1 != upper && sortInfo.resultCode == TCL_OK) {
 	    i = (lower + upper)/2;
-	    i -= i % groupSize;
 	    if (sortInfo.indexc != 0) {
-		itemPtr = SelectObjFromSublist(listv[i+groupOffset], &sortInfo);
+		itemPtr = SelectObjFromSublist(listv[i], &sortInfo);
 		if (sortInfo.resultCode != TCL_OK) {
 		    result = sortInfo.resultCode;
 		    goto done;
 		}
 	    } else {
-		itemPtr = listv[i+groupOffset];
+		itemPtr = listv[i];
 	    }
 	    switch ((enum datatypes) dataType) {
 	    case ASCII:
@@ -3438,10 +3405,10 @@ Tcl_LsearchObjCmd(
 	if (allMatches) {
 	    listPtr = Tcl_NewListObj(0, NULL);
 	}
-	for (i = start; i < listc; i += groupSize) {
+	for (i = offset; i < listc; i++) {
 	    match = 0;
 	    if (sortInfo.indexc != 0) {
-		itemPtr = SelectObjFromSublist(listv[i+groupOffset], &sortInfo);
+		itemPtr = SelectObjFromSublist(listv[i], &sortInfo);
 		if (sortInfo.resultCode != TCL_OK) {
 		    if (listPtr != NULL) {
 			Tcl_DecrRefCount(listPtr);
@@ -3450,7 +3417,7 @@ Tcl_LsearchObjCmd(
 		    goto done;
 		}
 	    } else {
-		itemPtr = listv[i+groupOffset];
+		itemPtr = listv[i];
 	    }

 	    switch (mode) {
@@ -3540,23 +3507,18 @@ Tcl_LsearchObjCmd(
 		 */

 		if (returnSubindices && (sortInfo.indexc != 0)) {
-		    itemPtr = SelectObjFromSublist(listv[i+groupOffset],
-			    &sortInfo);
-		    Tcl_ListObjAppendElement(interp, listPtr, itemPtr);
-		} else if (groupSize > 1) {
-		    Tcl_ListObjReplace(interp, listPtr, LIST_MAX, 0,
-			    groupSize, &listv[i]);
+		    itemPtr = SelectObjFromSublist(listv[i], &sortInfo);
 		} else {
 		    itemPtr = listv[i];
-		    Tcl_ListObjAppendElement(interp, listPtr, itemPtr);
 		}
+		Tcl_ListObjAppendElement(interp, listPtr, itemPtr);
 	    } else if (returnSubindices) {
 		int j;

-		itemPtr = Tcl_NewIntObj(i+groupOffset);
+		itemPtr = Tcl_NewIntObj(i);
 		for (j=0 ; j<sortInfo.indexc ; j++) {
-		    Tcl_ListObjAppendElement(interp, itemPtr, Tcl_NewIntObj(
-			    TclIndexDecode(sortInfo.indexv[j], listc)));
+		    Tcl_ListObjAppendElement(interp, itemPtr,
+			    Tcl_NewIntObj(sortInfo.indexv[j]));
 		}
 		Tcl_ListObjAppendElement(interp, listPtr, itemPtr);
 	    } else {
@@ -3575,10 +3537,10 @@ Tcl_LsearchObjCmd(
 	if (returnSubindices) {
 	    int j;

-	    itemPtr = Tcl_NewIntObj(index+groupOffset);
+	    itemPtr = Tcl_NewIntObj(index);
 	    for (j=0 ; j<sortInfo.indexc ; j++) {
-		Tcl_ListObjAppendElement(interp, itemPtr, Tcl_NewIntObj(
-			TclIndexDecode(sortInfo.indexv[j], listc)));
+		Tcl_ListObjAppendElement(interp, itemPtr,
+			Tcl_NewIntObj(sortInfo.indexv[j]));
 	    }
 	    Tcl_SetObjResult(interp, itemPtr);
 	} else {
@@ -3592,14 +3554,7 @@ Tcl_LsearchObjCmd(

 	Tcl_SetObjResult(interp, Tcl_NewObj());
    } else {
-	if (returnSubindices) {
-	    Tcl_SetObjResult(interp, SelectObjFromSublist(listv[i+groupOffset],
-		    &sortInfo));
-	} else if (groupSize > 1) {
-	    Tcl_SetObjResult(interp, Tcl_NewListObj(groupSize, &listv[index]));
-	} else {
-	    Tcl_SetObjResult(interp, listv[index]);
-	}
+	Tcl_SetObjResult(interp, listv[index]);
    }
    result = TCL_OK;

@@ -3608,10 +3563,7 @@ Tcl_LsearchObjCmd(
     */

  done:
-    if (startPtr != NULL) {
-	Tcl_DecrRefCount(startPtr);
-    }
-    if (allocatedIndexVector) {
+    if (sortInfo.indexc > 1) {
 	TclStackFree(interp, sortInfo.indexv);
    }
    return result;
@@ -3805,7 +3757,7 @@ Tcl_LsortObjCmd(
 	    sortInfo.isIncreasing = 1;
 	    break;
 	case LSORT_INDEX: {
-	    int indexc;
+	    int indexc, dummy;
 	    Tcl_Obj **indexv;

 	    if (i == objc-2) {
@@ -3831,20 +3783,8 @@ Tcl_LsortObjCmd(
 	     */

 	    for (j=0 ; j<indexc ; j++) {
-		int encoded = 0;
-		int result = TclIndexEncode(interp, indexv[j],
-			TCL_INDEX_BEFORE, TCL_INDEX_AFTER, &encoded);
-
-		if ((result == TCL_OK) && ((encoded == TCL_INDEX_BEFORE)
-			|| (encoded == TCL_INDEX_AFTER))) {
-		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "index \"%s\" cannot select an element "
-			    "from any list", Tcl_GetString(indexv[j])));
-		    Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX"
-			    "OUTOFRANGE", NULL);
-		    result = TCL_ERROR;
-		}
-		if (result == TCL_ERROR) {
+		if (TclGetIntForIndexM(interp, indexv[j], SORTIDX_END,
+			&dummy) != TCL_OK) {
 		    Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 			    "\n    (-index option item number %d)", j));
 		    sortInfo.resultCode = TCL_ERROR;
@@ -3924,8 +3864,8 @@ Tcl_LsortObjCmd(
 					 * might be decreased by 1 later. */
 	}
 	for (j=0 ; j<sortInfo.indexc ; j++) {
-	    /* Prescreened values, no errors or out of range possible */
-	    TclIndexEncode(NULL, indexv[j], 0, 0, &sortInfo.indexv[j]);
+	    TclGetIntForIndexM(interp, indexv[j], SORTIDX_END,
+		    &sortInfo.indexv[j]);
 	}
    }

@@ -3996,7 +3936,10 @@ Tcl_LsortObjCmd(
 	     * offset of the element within each group by which to sort.
 	     */

-	    groupOffset = TclIndexDecode(sortInfo.indexv[0], groupSize - 1);
+	    groupOffset = sortInfo.indexv[0];
+	    if (groupOffset <= SORTIDX_END) {
+		groupOffset = (groupOffset - SORTIDX_END) + groupSize - 1;
+	    }
 	    if (groupOffset < 0 || groupOffset >= groupSize) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"when used with \"-stride\", the leading \"-index\""
@@ -4015,9 +3958,6 @@ Tcl_LsortObjCmd(
 		/*
 		 * Do not shrink the actual memory block used; that doesn't
 		 * work with TclStackAlloc-allocated memory. [Bug 2918962]
-		 * 
-		 * TODO: Consider a pointer increment to replace this
-		 * array shift.
 		 */

 		for (i = 0; i < sortInfo.indexc; i++) {
@@ -4323,7 +4263,7 @@ SortCompare(
    int order = 0;

    if (infoPtr->sortMode == SORTMODE_ASCII) {
-	order = TclUtfCmp(elemPtr1->collationKey.strValuePtr,
+	order = strcmp(elemPtr1->collationKey.strValuePtr,
 		elemPtr2->collationKey.strValuePtr);
    } else if (infoPtr->sortMode == SORTMODE_ASCII_NC) {
 	order = TclUtfCasecmp(elemPtr1->collationKey.strValuePtr,
@@ -4430,7 +4370,7 @@ static int
 DictionaryCompare(
    const char *left, const char *right)	/* The strings to compare. */
 {
-    Tcl_UniChar uniLeft = 0, uniRight = 0, uniLeftLower, uniRightLower;
+    Tcl_UniChar uniLeft, uniRight, uniLeftLower, uniRightLower;
    int diff, zeros;
    int secondaryDiff = 0;

@@ -4586,8 +4526,15 @@ SelectObjFromSublist(
 	    infoPtr->resultCode = TCL_ERROR;
 	    return NULL;
 	}
+	index = infoPtr->indexv[i];

-	index = TclIndexDecode(infoPtr->indexv[i], listLen - 1);
+	/*
+	 * Adjust for end-based indexing.
+	 */
+
+	if (index < SORTIDX_NONE) {
+	    index += listLen + 1;
+	}

 	if (Tcl_ListObjIndex(infoPtr->interp, objPtr, index,
 		&currentObj) != TCL_OK) {
@@ -309,7 +309,7 @@ Tcl_RegexpObjCmd(
 	    eflags = 0;
 	} else if (offset > stringLength) {
 	    eflags = TCL_REG_NOTBOL;
-	} else if (Tcl_GetUniChar(objPtr, offset-1) == '\n') {
+	} else if (Tcl_GetUniChar(objPtr, offset-1) == (Tcl_UniChar)'\n') {
 	    eflags = 0;
 	} else {
 	    eflags = TCL_REG_NOTBOL;
@@ -487,10 +487,11 @@ Tcl_RegsubObjCmd(
    Tcl_Obj *const objv[])	/* Argument objects. */
 {
    int idx, result, cflags, all, wlen, wsublen, numMatches, offset;
-    int start, end, subStart, subEnd, match, command, numParts;
+    int start, end, subStart, subEnd, match, command, numParts, numArgs;
    Tcl_RegExp regExpr;
    Tcl_RegExpInfo info;
    Tcl_Obj *resultPtr, *subPtr, *objPtr, *startIndex = NULL;
+    Tcl_Obj **args = NULL, **parts;
    Tcl_UniChar ch, *wsrc, *wfirstChar, *wstring, *wsubspec, *wend;

    static const char *const options[] = {
@@ -772,13 +773,12 @@ Tcl_RegsubObjCmd(
 	 */

 	if (command) {
-	    Tcl_Obj **args = NULL, **parts;
-	    int numArgs;
-
-	    Tcl_ListObjGetElements(interp, subPtr, &numParts, &parts);
-	    numArgs = numParts + info.nsubs + 1;
-	    args = ckalloc(sizeof(Tcl_Obj*) * numArgs);
-	    memcpy(args, parts, sizeof(Tcl_Obj*) * numParts);
+	    if (args == NULL) {
+		Tcl_ListObjGetElements(interp, subPtr, &numParts, &parts);
+		numArgs = numParts + info.nsubs + 1;
+		args = ckalloc(sizeof(Tcl_Obj*) * numArgs);
+		memcpy(args, parts, sizeof(Tcl_Obj*) * numParts);
+	    }

 	    for (idx = 0 ; idx <= info.nsubs ; idx++) {
 		subStart = info.matches[idx].start;
@@ -800,14 +800,13 @@ Tcl_RegsubObjCmd(
 	     * because Tcl_EvalObjv is "hairy monster" in terms of refcount
 	     * handling, being able to optionally add references to any of its
 	     * argument words. We'll drop the local refs immediately
-	     * afterwards; subPtr is handled in the main exit stanza.
+	     * afterwarsds; subPtr is handled in the main exit stanza.
 	     */

 	    result = Tcl_EvalObjv(interp, numArgs, args, 0);
 	    for (idx = 0 ; idx <= info.nsubs ; idx++) {
 		TclDecrRefCount(args[idx + numParts]);
 	    }
-	    ckfree(args);
 	    if (result != TCL_OK) {
 		if (result == TCL_ERROR) {
 		    Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
@@ -976,6 +975,9 @@ Tcl_RegsubObjCmd(
    if (subPtr && (objv[2] == objv[0])) {
 	Tcl_DecrRefCount(subPtr);
    }
+    if (args) {
+	ckfree(args);
+    }
    if (resultPtr) {
 	Tcl_DecrRefCount(resultPtr);
    }
@@ -1173,7 +1175,7 @@ Tcl_SplitObjCmd(
    int objc,			/* Number of arguments. */
    Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar ch;
    int len;
    const char *splitChars;
    const char *stringPtr;
@@ -1216,22 +1218,13 @@ Tcl_SplitObjCmd(
 	Tcl_InitHashTable(&charReuseTable, TCL_ONE_WORD_KEYS);

 	for ( ; stringPtr < end; stringPtr += len) {
-		int fullchar;
 	    len = TclUtfToUniChar(stringPtr, &ch);
-	    fullchar = ch;
-
-#if TCL_UTF_MAX == 4
-	    if (!len) {
-		len += TclUtfToUniChar(stringPtr, &ch);
-		fullchar = (((fullchar & 0x3ff) << 10) | (ch & 0x3ff)) + 0x10000;
-	    }
-#endif

 	    /*
 	     * Assume Tcl_UniChar is an integral type...
 	     */

-	    hPtr = Tcl_CreateHashEntry(&charReuseTable, INT2PTR(fullchar),
+	    hPtr = Tcl_CreateHashEntry(&charReuseTable, INT2PTR((int) ch),
 		    &isNew);
 	    if (isNew) {
 		TclNewStringObj(objPtr, stringPtr, len);
@@ -1267,7 +1260,7 @@ Tcl_SplitObjCmd(
    } else {
 	const char *element, *p, *splitEnd;
 	int splitLen;
-	Tcl_UniChar splitChar = 0;
+	Tcl_UniChar splitChar;

 	/*
 	 * Normal case: split on any of a given set of characters. Discard
@@ -1335,8 +1328,16 @@ StringFirstCmd(
 	if (TCL_OK != TclGetIntForIndexM(interp, objv[3], size - 1, &start)) {
 	    return TCL_ERROR;
 	}
+
+	if (start < 0) {
+	    start = 0;
+	}
+	if (start >= size) {
+	    Tcl_SetObjResult(interp, Tcl_NewIntObj(-1));
+	    return TCL_OK;
+	}
    }
-    Tcl_SetObjResult(interp, Tcl_NewIntObj(TclStringFirst(objv[1],
+    Tcl_SetObjResult(interp, Tcl_NewIntObj(TclStringFind(objv[1],
 	    objv[2], start)));
    return TCL_OK;
 }
@@ -1380,6 +1381,14 @@ StringLastCmd(
 	if (TCL_OK != TclGetIntForIndexM(interp, objv[3], size - 1, &last)) {
 	    return TCL_ERROR;
 	}
+
+	if (last < 0) {
+	    Tcl_SetObjResult(interp, Tcl_NewIntObj(-1));
+	    return TCL_OK;
+	}
+	if (last >= size) {
+	    last = size - 1;
+	}
    }
    Tcl_SetObjResult(interp, Tcl_NewIntObj(TclStringLast(objv[1],
 	    objv[2], last)));
@@ -1475,7 +1484,7 @@ StringIsCmd(
    Tcl_Obj *const objv[])	/* Argument objects. */
 {
    const char *string1, *end, *stop;
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar ch;
    int (*chcomp)(int) = NULL;	/* The UniChar comparison function. */
    int i, failat = 0, result = 1, strict = 0, index, length1, length2;
    Tcl_Obj *objPtr, *failVarObj = NULL;
@@ -1572,11 +1581,11 @@ StringIsCmd(
 		string1 = TclGetStringFromObj(objPtr, &length1);
 		result = length1 == 0;
 	    }
-	} else if (index != STR_IS_BOOL) {
-	    TclGetBooleanFromObj(NULL, objPtr, &i);
-	    if ((index == STR_IS_TRUE) ^ i) {
-		result = 0;
-	    }
+	} else if (((index == STR_IS_TRUE) &&
+		objPtr->internalRep.longValue == 0)
+	    || ((index == STR_IS_FALSE) &&
+		objPtr->internalRep.longValue != 0)) {
+	    result = 0;
 	}
 	break;
    case STR_IS_CONTROL:
@@ -1586,8 +1595,12 @@ StringIsCmd(
 	chcomp = Tcl_UniCharIsDigit;
 	break;
    case STR_IS_DOUBLE: {
+	/* TODO */
 	if ((objPtr->typePtr == &tclDoubleType) ||
 		(objPtr->typePtr == &tclIntType) ||
+#ifndef TCL_WIDE_INT_IS_LONG
+		(objPtr->typePtr == &tclWideIntType) ||
+#endif
 		(objPtr->typePtr == &tclBignumType)) {
 	    break;
 	}
@@ -1622,6 +1635,9 @@ StringIsCmd(
 	goto failedIntParse;
    case STR_IS_ENTIER:
 	if ((objPtr->typePtr == &tclIntType) ||
+#ifndef TCL_WIDE_INT_IS_LONG
+		(objPtr->typePtr == &tclWideIntType) ||
+#endif
 		(objPtr->typePtr == &tclBignumType)) {
 	    break;
 	}
@@ -1800,16 +1816,8 @@ StringIsCmd(
 	}
 	end = string1 + length1;
 	for (; string1 < end; string1 += length2, failat++) {
-	    int fullchar;
 	    length2 = TclUtfToUniChar(string1, &ch);
-	    fullchar = ch;
-#if TCL_UTF_MAX == 4
-	    if (!length2) {
-	    	length2 = TclUtfToUniChar(string1, &ch);
-	    	fullchar = (((fullchar & 0x3ff) << 10) | (ch & 0x3ff)) + 0x10000;
-	    }
-#endif
-	    if (!chcomp(fullchar)) {
+	    if (!chcomp(ch)) {
 		result = 0;
 		break;
 	    }
@@ -2271,12 +2279,11 @@ StringReptCmd(
 	return TCL_OK;
    }

-    resultPtr = TclStringRepeat(interp, objv[1], count, TCL_STRING_IN_PLACE);
-    if (resultPtr) {
-	Tcl_SetObjResult(interp, resultPtr);
-	return TCL_OK;
+    if (TCL_OK != TclStringRepeat(interp, objv[1], count, &resultPtr)) {
+	return TCL_ERROR;
    }
-    return TCL_ERROR;
+    Tcl_SetObjResult(interp, resultPtr);
+    return TCL_OK;
 }

 /*
@@ -2304,50 +2311,42 @@ StringRplcCmd(
    int objc,			/* Number of arguments. */
    Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int first, last, length, end;
+    Tcl_UniChar *ustring;
+    int first, last, length;

    if (objc < 4 || objc > 5) {
 	Tcl_WrongNumArgs(interp, 1, objv, "string first last ?string?");
 	return TCL_ERROR;
    }

-    length = Tcl_GetCharLength(objv[1]);
-    end = length - 1;
+    ustring = Tcl_GetUnicodeFromObj(objv[1], &length);
+    length--;

-    if (TclGetIntForIndexM(interp, objv[2], end, &first) != TCL_OK ||
-	    TclGetIntForIndexM(interp, objv[3], end, &last) != TCL_OK){
+    if (TclGetIntForIndexM(interp, objv[2], length, &first) != TCL_OK ||
+	    TclGetIntForIndexM(interp, objv[3], length, &last) != TCL_OK){
 	return TCL_ERROR;
    }

-    /*
-     * The following test screens out most empty substrings as
-     * candidates for replacement. When they are detected, no
-     * replacement is done, and the result is the original string,
-     */
-    if ((last < 0) ||		/* Range ends before start of string */
-	    (first > end) ||	/* Range begins after end of string */
-	    (last < first)) {	/* Range begins after it starts */
-
-	/*
-	 * BUT!!! when (end < 0) -- an empty original string -- we can
-	 * have (first <= end < 0 <= last) and an empty string is permitted
-	 * to be replaced.
-	 */
+    if ((last < first) || (last < 0) || (first > length)) {
 	Tcl_SetObjResult(interp, objv[1]);
    } else {
 	Tcl_Obj *resultPtr;

+	ustring = Tcl_GetUnicodeFromObj(objv[1], &length);
+	length--;
+
 	if (first < 0) {
 	    first = 0;
 	}
-	if (last > end) {
-	    last = end;
+
+	resultPtr = Tcl_NewUnicodeObj(ustring, first);
+	if (objc == 5) {
+	    Tcl_AppendObjToObj(resultPtr, objv[4]);
+	}
+	if (last < length) {
+	    Tcl_AppendUnicodeToObj(resultPtr, ustring + last + 1,
+		    length - last);
 	}
-
-	resultPtr = TclStringReplace(interp, objv[1], first,
-		last + 1 - first, (objc == 5) ? objv[4] : NULL,
-		TCL_STRING_IN_PLACE);
-
 	Tcl_SetObjResult(interp, resultPtr);
    }
    return TCL_OK;
@@ -2383,7 +2382,7 @@ StringRevCmd(
 	return TCL_ERROR;
    }

-    Tcl_SetObjResult(interp, TclStringReverse(objv[1], TCL_STRING_IN_PLACE));
+    Tcl_SetObjResult(interp, TclStringObjReverse(objv[1]));
    return TCL_OK;
 }

@@ -2413,7 +2412,7 @@ StringStartCmd(
    int objc,			/* Number of arguments. */
    Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar ch;
    const char *p, *string;
    int cur, index, length, numChars;

@@ -2474,7 +2473,7 @@ StringEndCmd(
    int objc,			/* Number of arguments. */
    Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar ch;
    const char *p, *end, *string;
    int cur, index, length, numChars;

@@ -2832,6 +2831,7 @@ StringCatCmd(
    int objc,			/* Number of arguments. */
    Tcl_Obj *const objv[])	/* Argument objects. */
 {
+    int code;
    Tcl_Obj *objResultPtr;

    if (objc < 2) {
@@ -2841,15 +2841,23 @@ StringCatCmd(
 	 */
 	return TCL_OK;
    }
+    if (objc == 2) {
+	/*
+	 * Other trivial case, single arg, just return it.
+	 */
+	Tcl_SetObjResult(interp, objv[1]);
+	return TCL_OK;
+    }

-    objResultPtr = TclStringCat(interp, objc-1, objv+1, TCL_STRING_IN_PLACE);
+    code = TclStringCatObjv(interp, /* inPlace */ 1, objc-1, objv+1,
+	    &objResultPtr);

-    if (objResultPtr) {
+    if (code == TCL_OK) {
 	Tcl_SetObjResult(interp, objResultPtr);
 	return TCL_OK;
    }

-    return TCL_ERROR;
+    return code;
 }

 /*
@@ -2870,6 +2878,7 @@ StringCatCmd(
 *
 *----------------------------------------------------------------------
 */
+
 static int
 StringBytesCmd(
    ClientData dummy,		/* Not used. */
@@ -3217,7 +3226,8 @@ StringTrimCmd(
    }
    string1 = TclGetStringFromObj(objv[1], &length1);

-    triml = TclTrim(string1, length1, string2, length2, &trimr);
+    triml = TclTrimLeft(string1, length1, string2, length2);
+    trimr = TclTrimRight(string1 + triml, length1 - triml, string2, length2);

    Tcl_SetObjResult(interp,
 	    Tcl_NewStringObj(string1 + triml, length1 - triml - trimr));
@@ -3522,7 +3532,7 @@ TclNRSwitchObjCmd(
 	OPT_LAST
    };
    typedef int (*strCmpFn_t)(const char *, const char *);
-    strCmpFn_t strCmpFn = TclUtfCmp;
+    strCmpFn_t strCmpFn = strcmp;

    mode = OPT_EXACT;
    foundmode = 0;
@@ -4285,7 +4295,7 @@ TclNRTryObjCmd(
 	    }

 	    info[0] = objv[i];			/* type */
-	    TclNewIntObj(info[1], code);	/* returnCode */
+	    TclNewLongObj(info[1], code);	/* returnCode */
 	    if (info[2] == NULL) {		/* errorCodePrefix */
 		TclNewObj(info[2]);
 	    }
@@ -28,39 +28,56 @@ static void		CompileReturnInternal(CompileEnv *envPtr,
 static int		IndexTailVarIfKnown(Tcl_Interp *interp,
 			    Tcl_Token *varTokenPtr, CompileEnv *envPtr);

+#define INDEX_END	(-2)

 /*
 *----------------------------------------------------------------------
 *
- * TclGetIndexFromToken --
+ * GetIndexFromToken --
 *
- *	Parse a token to determine if an index value is known at
- *	compile time. 
+ *	Parse a token and get the encoded version of the index (as understood
+ *	by TEBC), assuming it is at all knowable at compile time. Only handles
+ *	indices that are integers or 'end' or 'end-integer'.
 *
 * Returns:
 *	TCL_OK if parsing succeeded, and TCL_ERROR if it failed.
 *
 * Side effects:
- *	When TCL_OK is returned, the encoded index value is written
- *	to *index.
+ *	Sets *index to the index value if successful.
 *
 *----------------------------------------------------------------------
 */

-int
-TclGetIndexFromToken(
+static inline int
+GetIndexFromToken(
    Tcl_Token *tokenPtr,
-    int before,
-    int after,
-    int *indexPtr)
+    int *index)
 {
    Tcl_Obj *tmpObj = Tcl_NewObj();
-    int result = TCL_ERROR;
+    int result, idx;

-    if (TclWordKnownAtCompileTime(tokenPtr, tmpObj)) {
-	result = TclIndexEncode(NULL, tmpObj, before, after, indexPtr);
+    if (!TclWordKnownAtCompileTime(tokenPtr, tmpObj)) {
+	Tcl_DecrRefCount(tmpObj);
+	return TCL_ERROR;
+    }
+
+    result = TclGetIntFromObj(NULL, tmpObj, &idx);
+    if (result == TCL_OK) {
+	if (idx < 0) {
+	    result = TCL_ERROR;
+	}
+    } else {
+	result = TclGetIntForIndexM(NULL, tmpObj, INDEX_END, &idx);
+	if (result == TCL_OK && idx > INDEX_END) {
+	    result = TCL_ERROR;
+	}
    }
    Tcl_DecrRefCount(tmpObj);
+
+    if (result == TCL_OK) {
+	*index = idx;
+    }
+
    return result;
 }

@@ -127,7 +144,7 @@ TclCompileGlobalCmd(
 	    return TCL_ERROR;
 	}

-	/* TODO: Consider what value can pass through the
+	/* TODO: Consider what value can pass throug the
 	 * IndexTailVarIfKnown() screen.  Full CompileWord()
 	 * likely does not apply here.  Push known value instead. */
 	CompileWord(envPtr, varTokenPtr, interp, i);
@@ -1036,7 +1053,7 @@ TclCompileLassignCmd(
     */

    TclEmitInstInt4(		INST_LIST_RANGE_IMM, idx,	envPtr);
-    TclEmitInt4(			TCL_INDEX_END,		envPtr);
+    TclEmitInt4(			INDEX_END,		envPtr);

    return TCL_OK;
 }
@@ -1087,14 +1104,14 @@ TclCompileLindexCmd(
    }

    idxTokenPtr = TokenAfter(valTokenPtr);
-    if (TclGetIndexFromToken(idxTokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_BEFORE,
-	    &idx) == TCL_OK) {
+    if (GetIndexFromToken(idxTokenPtr, &idx) == TCL_OK) {
 	/*
-	 * The idxTokenPtr parsed as a valid index value and was
-	 * encoded as expected by INST_LIST_INDEX_IMM.
-	 *
-	 * NOTE: that we rely on indexing before a list producing the
-	 * same result as indexing after a list.
+	 * All checks have been completed, and we have exactly one of these
+	 * constructs:
+	 *	 lindex <arbitraryValue> <posInt>
+	 *	 lindex <arbitraryValue> end-<posInt>
+	 * This is best compiled as a push of the arbitrary value followed by
+	 * an "immediate lindex" which is the most efficient variety.
 	 */

 	CompileWord(envPtr, valTokenPtr, interp, 1);
@@ -1241,7 +1258,7 @@ TclCompileListCmd(

    if (concat && numWords == 2) {
 	TclEmitInstInt4(	INST_LIST_RANGE_IMM, 0,	envPtr);
-	TclEmitInt4(			TCL_INDEX_END,	envPtr);
+	TclEmitInt4(			INDEX_END,	envPtr);
    }
    return TCL_OK;
 }
@@ -1315,25 +1332,21 @@ TclCompileLrangeCmd(
    }
    listTokenPtr = TokenAfter(parsePtr->tokenPtr);

-    tokenPtr = TokenAfter(listTokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_AFTER,
-	    &idx1) != TCL_OK) {
-	return TCL_ERROR;
-    }
    /*
-     * Token was an index value, and we treat all "first" indices
-     * before the list same as the start of the list.
+     * Parse the indices. Will only compile if both are constants and not an
+     * _integer_ less than zero (since we reserve negative indices here for
+     * end-relative indexing) or an end-based index greater than 'end' itself.
     */

+    tokenPtr = TokenAfter(listTokenPtr);
+    if (GetIndexFromToken(tokenPtr, &idx1) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
    tokenPtr = TokenAfter(tokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_END,
-	    &idx2) != TCL_OK) {
+    if (GetIndexFromToken(tokenPtr, &idx2) != TCL_OK) {
 	return TCL_ERROR;
    }
-    /*
-     * Token was an index value, and we treat all "last" indices
-     * after the list same as the end of the list.
-     */

    /*
     * Issue instructions. It's not safe to skip doing the LIST_RANGE, as
@@ -1383,30 +1396,21 @@ TclCompileLinsertCmd(
     */

    tokenPtr = TokenAfter(listTokenPtr);
-
-    /*
-     * NOTE: This command treats all inserts at indices before the list
-     * the same as inserts at the start of the list, and all inserts
-     * after the list the same as inserts at the end of the list. We
-     * make that transformation here so we can use the optimized bytecode
-     * as much as possible.
-     */
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_END,
-	    &idx) != TCL_OK) {
+    if (GetIndexFromToken(tokenPtr, &idx) != TCL_OK) {
 	return TCL_ERROR;
    }

    /*
     * There are four main cases. If there are no values to insert, this is
     * just a confirm-listiness check. If the index is '0', this is a prepend.
-     * If the index is 'end' (== TCL_INDEX_END), this is an append. Otherwise,
+     * If the index is 'end' (== INDEX_END), this is an append. Otherwise,
     * this is a splice (== split, insert values as list, concat-3).
     */

    CompileWord(envPtr, listTokenPtr, interp, 1);
    if (parsePtr->numWords == 3) {
 	TclEmitInstInt4(	INST_LIST_RANGE_IMM, 0,		envPtr);
-	TclEmitInt4(			TCL_INDEX_END,		envPtr);
+	TclEmitInt4(			INDEX_END,		envPtr);
 	return TCL_OK;
    }

@@ -1416,25 +1420,13 @@ TclCompileLinsertCmd(
    }
    TclEmitInstInt4(		INST_LIST, i-3,			envPtr);

-    if (idx == TCL_INDEX_START) {
+    if (idx == 0 /*start*/) {
 	TclEmitInstInt4(	INST_REVERSE, 2,		envPtr);
 	TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
-    } else if (idx == TCL_INDEX_END) {
+    } else if (idx == INDEX_END /*end*/) {
 	TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
    } else {
-	/*
-	 * Here we handle two ranges for idx. First when idx > 0, we
-	 * want the first half of the split to end at index idx-1 and
-	 * the second half to start at index idx.
-	 * Second when idx < TCL_INDEX_END, indicating "end-N" indexing,
-	 * we want the first half of the split to end at index end-N and
-	 * the second half to start at index end-N+1. We accomplish this
-	 * with a pre-adjustment of the end-N value.
-	 * The root of this is that the commands [lrange] and [linsert]
-	 * differ in their interpretation of the "end" index.
-	 */
-
-	if (idx < TCL_INDEX_END) {
+	if (idx < 0) {
 	    idx++;
 	}
 	TclEmitInstInt4(	INST_OVER, 1,			envPtr);
@@ -1442,7 +1434,7 @@ TclCompileLinsertCmd(
 	TclEmitInt4(			idx-1,			envPtr);
 	TclEmitInstInt4(	INST_REVERSE, 3,		envPtr);
 	TclEmitInstInt4(	INST_LIST_RANGE_IMM, idx,	envPtr);
-	TclEmitInt4(			TCL_INDEX_END,		envPtr);
+	TclEmitInt4(			INDEX_END,		envPtr);
 	TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
 	TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
    }
@@ -1472,167 +1464,250 @@ TclCompileLreplaceCmd(
 {
    Tcl_Token *tokenPtr, *listTokenPtr;
    DefineLineInformation;	/* TIP #280 */
+    Tcl_Obj *tmpObj;
    int idx1, idx2, i, offset, offset2;
-    int emptyPrefix=1, suffixStart = 0;

    if (parsePtr->numWords < 4) {
 	return TCL_ERROR;
    }
    listTokenPtr = TokenAfter(parsePtr->tokenPtr);

+    /*
+     * Parse the indices. Will only compile if both are constants and not an
+     * _integer_ less than zero (since we reserve negative indices here for
+     * end-relative indexing) or an end-based index greater than 'end' itself.
+     */
+
    tokenPtr = TokenAfter(listTokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_AFTER,
-	    &idx1) != TCL_OK) {
+    if (GetIndexFromToken(tokenPtr, &idx1) != TCL_OK) {
 	return TCL_ERROR;
    }

    tokenPtr = TokenAfter(tokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_END,
-	    &idx2) != TCL_OK) {
+    if (GetIndexFromToken(tokenPtr, &idx2) != TCL_OK) {
 	return TCL_ERROR;
    }

    /*
-     * idx1, idx2 are the conventional encoded forms of the tokens parsed
-     * as all forms of index values.  Values of idx1 that come before the
-     * list are treated the same as if they were the start of the list.
-     * Values of idx2 that come after the list are treated the same as if
-     * they were the end of the list.
-     */
-
-    if (idx1 == TCL_INDEX_AFTER) {
-	/*
-	 * [lreplace] treats idx1 value end+1 differently from end+2, etc.
-	 * The operand encoding cannot distinguish them, so we must bail
-	 * out to direct evaluation.
-	 */
-	return TCL_ERROR;
-    }
-
-    /*
-     * General structure of the [lreplace] result is
-     *		prefix replacement suffix
-     * In a few cases we can predict various parts will be empty and
-     * take advantage.
+     * idx1, idx2 are now in canonical form:
     *
-     * The proper suffix begins with the greater of indices idx1 or
-     * idx2 + 1. If we cannot tell at compile time which is greater,
-     * we must defer to direct evaluation.
+     *  - integer:	[0,len+1]
+     *  - end index:    INDEX_END
+     *  - -ive offset:  INDEX_END-[len-1,0]
+     *  - +ive offset:  INDEX_END+1
     */

-    if (idx2 == TCL_INDEX_BEFORE) {
-	suffixStart = idx1;
-    } else if (idx2 == TCL_INDEX_END) {
-	suffixStart = TCL_INDEX_AFTER;
-    } else if (((idx2 < TCL_INDEX_END) && (idx1 <= TCL_INDEX_END))
-	    || ((idx2 >= TCL_INDEX_START) && (idx1 >= TCL_INDEX_START))) {
-	suffixStart = (idx1 > idx2 + 1) ? idx1 : idx2 + 1;
-    } else {
+    /*
+     * Compilation fails when one index is end-based but the other isn't.
+     * Fixing this will require more bytecodes, but this is a workaround for
+     * now. [Bug 47ac84309b]
+     */
+
+    if ((idx1 <= INDEX_END) != (idx2 <= INDEX_END)) {
 	return TCL_ERROR;
    }

-    /* All paths start with computing/pushing the original value. */
+    if (idx2 != INDEX_END && idx2 >= 0 && idx2 < idx1) {
+	idx2 = idx1 - 1;
+    }
+
+    /*
+     * Work out what this [lreplace] is actually doing.
+     */
+
+    tmpObj = NULL;
    CompileWord(envPtr, listTokenPtr, interp, 1);
-
-    /*
-     * Push all the replacement values next so any errors raised in
-     * creating them get raised first.
-     */
-    if (parsePtr->numWords > 4) {
-	/* Push the replacement arguments */
-	tokenPtr = TokenAfter(tokenPtr);
-	for (i=4 ; i<parsePtr->numWords ; i++) {
-	    CompileWord(envPtr, tokenPtr, interp, i);
-	    tokenPtr = TokenAfter(tokenPtr);
-	}
-
-	/* Make a list of them... */
-	TclEmitInstInt4(	INST_LIST, i - 4,		envPtr);
-
-	emptyPrefix = 0;
-    }
-     
-    /*
-     * [lreplace] raises an error when idx1 points after the list, but
-     * only when the list is not empty. This is maximum stupidity.
-     *
-     * TODO: TIP this nonsense away!
-     */
-    if (idx1 >= TCL_INDEX_START) {
-	if (emptyPrefix) {
-	    TclEmitOpcode(	INST_DUP,			envPtr);
+    if (parsePtr->numWords == 4) {
+	if (idx1 == 0) {
+	    if (idx2 == INDEX_END) {
+		goto dropAll;
+	    }
+	    idx1 = idx2 + 1;
+	    idx2 = INDEX_END;
+	    goto dropEnd;
+	} else if (idx2 == INDEX_END) {
+	    idx2 = idx1 - 1;
+	    idx1 = 0;
+	    goto dropEnd;
 	} else {
-	    TclEmitInstInt4(	INST_OVER, 1,			envPtr);
+	    if (idx2 < idx1) {
+		idx2 = idx1 - 1;
+	    }
+	    if (idx1 > 0) {
+		tmpObj = Tcl_NewIntObj(idx1);
+		Tcl_IncrRefCount(tmpObj);
+	    }
+	    goto dropRange;
 	}
-	TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);
-	TclEmitOpcode(		INST_DUP,			envPtr);
-	offset = CurrentOffset(envPtr);
-	TclEmitInstInt1(	INST_JUMP_FALSE1, 0,		envPtr);
+    }

-	/* List is not empty */
-	TclEmitPush(TclAddLiteralObj(envPtr, Tcl_NewIntObj(idx1),
-							NULL),	envPtr);
-	TclEmitOpcode(		INST_GT,			envPtr);
-	offset2 = CurrentOffset(envPtr);
+    tokenPtr = TokenAfter(tokenPtr);
+    for (i=4 ; i<parsePtr->numWords ; i++) {
+	CompileWord(envPtr, tokenPtr, interp, i);
+	tokenPtr = TokenAfter(tokenPtr);
+    }
+    TclEmitInstInt4(		INST_LIST, i - 4,		envPtr);
+    TclEmitInstInt4(		INST_REVERSE, 2,		envPtr);
+    if (idx1 == 0) {
+	if (idx2 == INDEX_END) {
+	    goto replaceAll;
+	}
+	idx1 = idx2 + 1;
+	idx2 = INDEX_END;
+	goto replaceHead;
+    } else if (idx2 == INDEX_END) {
+	idx2 = idx1 - 1;
+	idx1 = 0;
+	goto replaceTail;
+    } else {
+	if (idx2 < idx1) {
+	    idx2 = idx1 - 1;
+	}
+	if (idx1 > 0) {
+	    tmpObj = Tcl_NewIntObj(idx1);
+	    Tcl_IncrRefCount(tmpObj);
+	}
+	goto replaceRange;
+    }
+
+    /*
+     * Issue instructions to perform the operations relating to configurations
+     * that just drop. The only argument pushed on the stack is the list to
+     * operate on.
+     */
+
+  dropAll:			/* This just ensures the arg is a list. */
+    TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);
+    TclEmitOpcode(		INST_POP,			envPtr);
+    PushStringLiteral(envPtr,	"");
+    goto done;
+
+  dropEnd:
+    TclEmitInstInt4(		INST_LIST_RANGE_IMM, idx1,	envPtr);
+    TclEmitInt4(			idx2,			envPtr);
+    goto done;
+
+  dropRange:
+    if (tmpObj != NULL) {
+	/*
+	 * Emit bytecode to check the list length.
+	 */
+
+	TclEmitOpcode(		INST_DUP,			envPtr);
+	TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);
+	TclEmitPush(TclAddLiteralObj(envPtr, tmpObj, NULL),	envPtr);
+	TclEmitOpcode(		INST_GE,			envPtr);
+	offset = CurrentOffset(envPtr);
 	TclEmitInstInt1(	INST_JUMP_TRUE1, 0,		envPtr);

-	/* Idx1 >= list length ===> raise an error */
+	/*
+	 * Emit an error if we've been given an empty list.
+	 */
+
+	TclEmitOpcode(		INST_DUP,			envPtr);
+	TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);
+	offset2 = CurrentOffset(envPtr);
+	TclEmitInstInt1(	INST_JUMP_FALSE1, 0,		envPtr);
 	TclEmitPush(TclAddLiteralObj(envPtr, Tcl_ObjPrintf(
 		"list doesn't contain element %d", idx1), NULL), envPtr);
 	CompileReturnInternal(envPtr, INST_RETURN_IMM, TCL_ERROR, 0,
 		Tcl_ObjPrintf("-errorcode {TCL OPERATION LREPLACE BADIDX}"));
 	TclStoreInt1AtPtr(CurrentOffset(envPtr) - offset,
 		envPtr->codeStart + offset + 1);
-	TclEmitOpcode(		INST_POP,			envPtr);
 	TclStoreInt1AtPtr(CurrentOffset(envPtr) - offset2,
 		envPtr->codeStart + offset2 + 1);
+	TclAdjustStackDepth(-1, envPtr);
    }
+    TclEmitOpcode(		INST_DUP,			envPtr);
+    TclEmitInstInt4(		INST_LIST_RANGE_IMM, 0,		envPtr);
+    TclEmitInt4(			idx1 - 1,		envPtr);
+    TclEmitInstInt4(		INST_REVERSE, 2,		envPtr);
+    TclEmitInstInt4(		INST_LIST_RANGE_IMM, idx2 + 1,	envPtr);
+    TclEmitInt4(			INDEX_END,		envPtr);
+    TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
+    goto done;

-    if ((idx1 == suffixStart) && (parsePtr->numWords == 4)) {
+    /*
+     * Issue instructions to perform the operations relating to configurations
+     * that do real replacement. All arguments are pushed and assembled into a
+     * pair: the list of values to replace with, and the list to do the
+     * surgery on.
+     */
+
+  replaceAll:
+    TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);
+    TclEmitOpcode(		INST_POP,			envPtr);
+    goto done;
+
+  replaceHead:
+    TclEmitInstInt4(		INST_LIST_RANGE_IMM, idx1,	envPtr);
+    TclEmitInt4(			idx2,			envPtr);
+    TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
+    goto done;
+
+  replaceTail:
+    TclEmitInstInt4(		INST_LIST_RANGE_IMM, idx1,	envPtr);
+    TclEmitInt4(			idx2,			envPtr);
+    TclEmitInstInt4(		INST_REVERSE, 2,		envPtr);
+    TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
+    goto done;
+
+  replaceRange:
+    if (tmpObj != NULL) {
 	/*
-	 * This is a "no-op". Example: [lreplace {a b c} 2 0]
-	 * We still do a list operation to get list-verification
-	 * and canonicalization side effects.
+	 * Emit bytecode to check the list length.
 	 */
-	TclEmitInstInt4(	INST_LIST_RANGE_IMM, 0,		envPtr);
-	TclEmitInt4(			TCL_INDEX_END,		envPtr);
-	return TCL_OK;
-    }

-    if (idx1 != TCL_INDEX_START) {
-	/* Prefix may not be empty; generate bytecode to push it */
-	if (emptyPrefix) {
-	    TclEmitOpcode(	INST_DUP,			envPtr);
-	} else {
-	    TclEmitInstInt4(	INST_OVER, 1,			envPtr);
-	}
-	TclEmitInstInt4(	INST_LIST_RANGE_IMM, 0,		envPtr);
-	TclEmitInt4(			idx1 - 1,		envPtr);
-	if (!emptyPrefix) {
-	    TclEmitInstInt4(	INST_REVERSE, 2,		envPtr);
-	    TclEmitOpcode(	INST_LIST_CONCAT,		envPtr);
-	}
-	emptyPrefix = 0;
-    }
+	TclEmitOpcode(		INST_DUP,			envPtr);
+	TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);

-    if (!emptyPrefix) {
-	TclEmitInstInt4(	INST_REVERSE, 2,		envPtr);
-    }
+	/*
+	 * Check the list length vs idx1.
+	 */

-    if (suffixStart == TCL_INDEX_AFTER) {
-	TclEmitOpcode(		INST_POP,			envPtr);
-	if (emptyPrefix) {
-	    PushStringLiteral(envPtr, "");
-	}
-    } else {
-	/* Suffix may not be empty; generate bytecode to push it */
-	TclEmitInstInt4(	INST_LIST_RANGE_IMM, suffixStart, envPtr);
-	TclEmitInt4(			TCL_INDEX_END,		envPtr);
-	if (!emptyPrefix) {
-	    TclEmitOpcode(	INST_LIST_CONCAT,		envPtr);
-	}
-    }
+	TclEmitPush(TclAddLiteralObj(envPtr, tmpObj, NULL),	envPtr);
+	TclEmitOpcode(		INST_GE,			envPtr);
+	offset = CurrentOffset(envPtr);
+	TclEmitInstInt1(	INST_JUMP_TRUE1, 0,		envPtr);

+	/*
+	 * Emit an error if we've been given an empty list.
+	 */
+
+	TclEmitOpcode(		INST_DUP,			envPtr);
+	TclEmitOpcode(		INST_LIST_LENGTH,		envPtr);
+	offset2 = CurrentOffset(envPtr);
+	TclEmitInstInt1(	INST_JUMP_FALSE1, 0,		envPtr);
+	TclEmitPush(TclAddLiteralObj(envPtr, Tcl_ObjPrintf(
+		"list doesn't contain element %d", idx1), NULL), envPtr);
+	CompileReturnInternal(envPtr, INST_RETURN_IMM, TCL_ERROR, 0,
+		Tcl_ObjPrintf("-errorcode {TCL OPERATION LREPLACE BADIDX}"));
+	TclStoreInt1AtPtr(CurrentOffset(envPtr) - offset,
+		envPtr->codeStart + offset + 1);
+	TclStoreInt1AtPtr(CurrentOffset(envPtr) - offset2,
+		envPtr->codeStart + offset2 + 1);
+	TclAdjustStackDepth(-1, envPtr);
+    }
+    TclEmitOpcode(		INST_DUP,			envPtr);
+    TclEmitInstInt4(		INST_LIST_RANGE_IMM, 0,		envPtr);
+    TclEmitInt4(			idx1 - 1,		envPtr);
+    TclEmitInstInt4(		INST_REVERSE, 2,		envPtr);
+    TclEmitInstInt4(		INST_LIST_RANGE_IMM, idx2 + 1,	envPtr);
+    TclEmitInt4(			INDEX_END,		envPtr);
+    TclEmitInstInt4(		INST_REVERSE, 3,		envPtr);
+    TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
+    TclEmitInstInt4(		INST_REVERSE, 2,		envPtr);
+    TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
+    goto done;
+
+    /*
+     * Clean up the allocated memory.
+     */
+
+  done:
+    if (tmpObj != NULL) {
+	Tcl_DecrRefCount(tmpObj);
+    }
    return TCL_OK;
 }

@@ -2858,7 +2933,7 @@ TclCompileVariableCmd(
 	    return TCL_ERROR;
 	}

-	/* TODO: Consider what value can pass through the
+	/* TODO: Consider what value can pass throug the
 	 * IndexTailVarIfKnown() screen.  Full CompileWord()
 	 * likely does not apply here.  Push known value instead. */
 	CompileWord(envPtr, varTokenPtr, interp, i);
@@ -107,6 +107,58 @@ const AuxDataType tclJumptableInfoType = {
 #define INVOKE(name) \
    TclEmitInvoke(envPtr,INST_##name)

+#define INDEX_END	(-2)
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GetIndexFromToken --
+ *
+ *	Parse a token and get the encoded version of the index (as understood
+ *	by TEBC), assuming it is at all knowable at compile time. Only handles
+ *	indices that are integers or 'end' or 'end-integer'.
+ *
+ * Returns:
+ *	TCL_OK if parsing succeeded, and TCL_ERROR if it failed.
+ *
+ * Side effects:
+ *	Sets *index to the index value if successful.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static inline int
+GetIndexFromToken(
+    Tcl_Token *tokenPtr,
+    int *index)
+{
+    Tcl_Obj *tmpObj = Tcl_NewObj();
+    int result, idx;
+
+    if (!TclWordKnownAtCompileTime(tokenPtr, tmpObj)) {
+	Tcl_DecrRefCount(tmpObj);
+	return TCL_ERROR;
+    }
+
+    result = TclGetIntFromObj(NULL, tmpObj, &idx);
+    if (result == TCL_OK) {
+	if (idx < 0) {
+	    result = TCL_ERROR;
+	}
+    } else {
+	result = TclGetIntForIndexM(NULL, tmpObj, INDEX_END, &idx);
+	if (result == TCL_OK && idx > INDEX_END) {
+	    result = TCL_ERROR;
+	}
+    }
+    Tcl_DecrRefCount(tmpObj);
+
+    if (result == TCL_OK) {
+	*index = idx;
+    }
+
+    return result;
+}

 /*
 *----------------------------------------------------------------------
@@ -930,48 +982,22 @@ TclCompileStringRangeCmd(
    fromTokenPtr = TokenAfter(stringTokenPtr);
    toTokenPtr = TokenAfter(fromTokenPtr);

-    /* Every path must push the string argument */
-    CompileWord(envPtr, stringTokenPtr,			interp, 1);
-
    /*
     * Parse the two indices.
     */

-    if (TclGetIndexFromToken(fromTokenPtr, TCL_INDEX_START, TCL_INDEX_AFTER,
-	    &idx1) != TCL_OK) {
+    if (GetIndexFromToken(fromTokenPtr, &idx1) != TCL_OK) {
 	goto nonConstantIndices;
    }
-    /*
-     * Token parsed as an index expression. We treat all indices before
-     * the string the same as the start of the string.
-     */
-
-    if (idx1 == TCL_INDEX_AFTER) {
-	/* [string range $s end+1 $last] must be empty string */
-	OP(		POP);
-	PUSH(		"");
-	return TCL_OK;
-    }
-
-    if (TclGetIndexFromToken(toTokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_END,
-	    &idx2) != TCL_OK) {
+    if (GetIndexFromToken(toTokenPtr, &idx2) != TCL_OK) {
 	goto nonConstantIndices;
    }
-    /*
-     * Token parsed as an index expression. We treat all indices after
-     * the string the same as the end of the string.
-     */
-    if (idx2 == TCL_INDEX_BEFORE) {
-	/* [string range $s $first -1] must be empty string */
-	OP(		POP);
-	PUSH(		"");
-	return TCL_OK;
-    }

    /*
     * Push the operand onto the stack and then the substring operation.
     */

+    CompileWord(envPtr, stringTokenPtr,			interp, 1);
    OP44(		STR_RANGE_IMM, idx1, idx2);
    return TCL_OK;

@@ -980,6 +1006,7 @@ TclCompileStringRangeCmd(
     */

  nonConstantIndices:
+    CompileWord(envPtr, stringTokenPtr,			interp, 1);
    CompileWord(envPtr, fromTokenPtr,			interp, 2);
    CompileWord(envPtr, toTokenPtr,			interp, 3);
    OP(			STR_RANGE);
@@ -995,197 +1022,124 @@ TclCompileStringReplaceCmd(
 				 * compiled. */
    CompileEnv *envPtr)		/* Holds the resulting instructions. */
 {
-    Tcl_Token *tokenPtr, *valueTokenPtr;
+    Tcl_Token *tokenPtr, *valueTokenPtr, *replacementTokenPtr = NULL;
    DefineLineInformation;	/* TIP #280 */
-    int first, last;
+    int idx1, idx2;

    if (parsePtr->numWords < 4 || parsePtr->numWords > 5) {
 	return TCL_ERROR;
    }
- 
-    /* Bytecode to compute/push string argument being replaced */
    valueTokenPtr = TokenAfter(parsePtr->tokenPtr);
-    CompileWord(envPtr, valueTokenPtr, interp, 1);
-
-    /*
-     * Check for first index known and useful at compile time. 
-     */
-    tokenPtr = TokenAfter(valueTokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_AFTER,
-	    &first) != TCL_OK) {
-	goto genericReplace;
-    }
-
-    /*
-     * Check for last index known and useful at compile time. 
-     */
-    tokenPtr = TokenAfter(tokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_AFTER,
-	    &last) != TCL_OK) {
-	goto genericReplace;
-    }
-
-    /* 
-     * [string replace] is an odd bird.  For many arguments it is
-     * a conventional substring replacer.  However it also goes out
-     * of its way to become a no-op for many cases where it would be
-     * replacing an empty substring.  Precisely, it is a no-op when
-     *
-     *		(last < first)		OR
-     *		(last < 0)		OR
-     *		(end < first)
-     *
-     * For some compile-time values we can detect these cases, and
-     * compile direct to bytecode implementing the no-op.
-     */
-
-    if ((last == TCL_INDEX_BEFORE)		/* Know (last < 0) */
-	    || (first == TCL_INDEX_AFTER)	/* Know (first > end) */
-
-	/*
-	 * Tricky to determine when runtime (last < first) can be
-	 * certainly known based on the encoded values. Consider the
-	 * cases...
-	 *
-	 * (first <= TCL_INDEX_END) &&
-	 *	(last == TCL_INDEX_AFTER) => cannot tell REJECT
-	 *	(last <= TCL_INDEX END) && (last < first) => ACCEPT
-	 *	else => cannot tell REJECT
-	 */
-	    || ((first <= TCL_INDEX_END) && (last <= TCL_INDEX_END)
-		&& (last < first))		/* Know (last < first) */
-	/*
-	 * (first == TCL_INDEX_BEFORE) &&
-	 *	(last == TCL_INDEX_AFTER) => (first < last) REJECT
-	 *	(last <= TCL_INDEX_END) => cannot tell REJECT
-	 *	else		=> (first < last) REJECT
-	 *
-	 * else [[first >= TCL_INDEX_START]] &&
-	 *	(last == TCL_INDEX_AFTER) => cannot tell REJECT
-	 *	(last <= TCL_INDEX_END) => cannot tell REJECT
-	 *	else [[last >= TCL_INDEX START]] && (last < first) => ACCEPT
-	 */
-	    || ((first >= TCL_INDEX_START) && (last >= TCL_INDEX_START)
-		&& (last < first))) {		/* Know (last < first) */
-	if (parsePtr->numWords == 5) {
-	    tokenPtr = TokenAfter(tokenPtr);
-	    CompileWord(envPtr, tokenPtr, interp, 4);
-	    OP(		POP);		/* Pop newString */
-	}
-	/* Original string argument now on TOS as result */
-	return TCL_OK;
-    }
-
    if (parsePtr->numWords == 5) {
+	tokenPtr = TokenAfter(valueTokenPtr);
+	tokenPtr = TokenAfter(tokenPtr);
+	replacementTokenPtr = TokenAfter(tokenPtr);
+    }
+
    /*
-     * When we have a string replacement, we have to take care about
-     * not replacing empty substrings that [string replace] promises
-     * not to replace
-     *
-     * The remaining index values might be suitable for conventional
-     * string replacement, but only if they cannot possibly meet the
-     * conditions described above at runtime. If there's a chance they
-     * might, we would have to emit bytecode to check and at that point
-     * we're paying more in bytecode execution time than would make
-     * things worthwhile. Trouble is we are very limited in
-     * how much we can detect that at compile time. After decoding,
-     * we need, first:
-     *
-     *		(first <= end)
-     *
-     * The encoded indices (first <= TCL_INDEX END) and
-     * (first == TCL_INDEX_BEFORE) always meets this condition, but
-     * any other encoded first index has some list for which it fails.
-     *
-     * We also need, second:
-     *
-     *		(last >= 0)
-     *
-     * The encoded indices (last >= TCL_INDEX_START) and
-     * (last == TCL_INDEX_AFTER) always meet this condition but any
-     * other encoded last index has some list for which it fails.
-     *
-     * Finally we need, third:
-     *
-     *		(first <= last)
-     * 
-     * Considered in combination with the constraints we already have,
-     * we see that we can proceed when (first == TCL_INDEX_BEFORE)
-     * or (last == TCL_INDEX_AFTER). These also permit simplification
-     * of the prefix|replace|suffix construction. The other constraints,
-     * though, interfere with getting a guarantee that first <= last. 
+     * Parse the indices. Will only compile special cases if both are
+     * constants and not an _integer_ less than zero (since we reserve
+     * negative indices here for end-relative indexing) or an end-based index
+     * greater than 'end' itself.
     */

-    if ((first == TCL_INDEX_BEFORE) && (last >= TCL_INDEX_START)) {
-	/* empty prefix */
-	tokenPtr = TokenAfter(tokenPtr);
-	CompileWord(envPtr, tokenPtr, interp, 4);
-	OP4(		REVERSE, 2);
-	if (last == TCL_INDEX_AFTER) {
-	    OP(		POP);		/* Pop  original */
-	} else {
-	    OP44(	STR_RANGE_IMM, last + 1, TCL_INDEX_END);
-	    OP1(	STR_CONCAT1, 2);
+    tokenPtr = TokenAfter(valueTokenPtr);
+    if (GetIndexFromToken(tokenPtr, &idx1) != TCL_OK) {
+	goto genericReplace;
+    }
+
+    tokenPtr = TokenAfter(tokenPtr);
+    if (GetIndexFromToken(tokenPtr, &idx2) != TCL_OK) {
+	goto genericReplace;
+    }
+
+    /*
+     * We handle these replacements specially: first character (where
+     * idx1=idx2=0) and last character (where idx1=idx2=INDEX_END). Anything
+     * else and the semantics get rather screwy.
+     */
+
+    if (idx1 == 0 && idx2 == 0) {
+	int notEq, end;
+
+	/*
+	 * Just working with the first character.
+	 */
+
+	CompileWord(envPtr, valueTokenPtr, interp, 1);
+	if (replacementTokenPtr == NULL) {
+	    /* Drop first */
+	    OP44(	STR_RANGE_IMM, 1, INDEX_END);
+	    return TCL_OK;
 	}
-	return TCL_OK;
-    }
-
-    if ((last == TCL_INDEX_AFTER) && (first <= TCL_INDEX_END)) {
-	OP44(		STR_RANGE_IMM, 0, first-1);
-	tokenPtr = TokenAfter(tokenPtr);
-	CompileWord(envPtr, tokenPtr, interp, 4);
+	/* Replace first */
+	CompileWord(envPtr, replacementTokenPtr, interp, 4);
+	OP4(		OVER, 1);
+	PUSH(		"");
+	OP(		STR_EQ);
+	JUMP1(		JUMP_FALSE, notEq);
+	OP(		POP);
+	JUMP1(		JUMP, end);
+	FIXJUMP1(notEq);
+	TclAdjustStackDepth(1, envPtr);
+	OP4(		REVERSE, 2);
+	OP44(		STR_RANGE_IMM, 1, INDEX_END);
 	OP1(		STR_CONCAT1, 2);
+	FIXJUMP1(end);
 	return TCL_OK;
-    }

-	/* FLOW THROUGH TO genericReplace */
+    } else if (idx1 == INDEX_END && idx2 == INDEX_END) {
+	int notEq, end;
+
+	/*
+	 * Just working with the last character.
+	 */
+
+	CompileWord(envPtr, valueTokenPtr, interp, 1);
+	if (replacementTokenPtr == NULL) {
+	    /* Drop last */
+	    OP44(	STR_RANGE_IMM, 0, INDEX_END-1);
+	    return TCL_OK;
+	}
+	/* Replace last */
+	CompileWord(envPtr, replacementTokenPtr, interp, 4);
+	OP4(		OVER, 1);
+	PUSH(		"");
+	OP(		STR_EQ);
+	JUMP1(		JUMP_FALSE, notEq);
+	OP(		POP);
+	JUMP1(		JUMP, end);
+	FIXJUMP1(notEq);
+	TclAdjustStackDepth(1, envPtr);
+	OP4(		REVERSE, 2);
+	OP44(		STR_RANGE_IMM, 0, INDEX_END-1);
+	OP4(		REVERSE, 2);
+	OP1(		STR_CONCAT1, 2);
+	FIXJUMP1(end);
+	return TCL_OK;

    } else {
-	/* 
-	 * When we have no replacement string to worry about, we may
-	 * have more luck, because the forbidden empty string replacements
-	 * are harmless when they are replaced by another empty string.
+	/*
+	 * Need to process indices at runtime. This could be because the
+	 * indices are not constants, or because we need to resolve them to
+	 * absolute indices to work out if a replacement is going to happen.
+	 * In any case, to runtime it is.
 	 */

-	if ((first == TCL_INDEX_BEFORE) || (first == TCL_INDEX_START)) {
-	    /* empty prefix - build suffix only */
-
-	    if ((last == TCL_INDEX_END) || (last == TCL_INDEX_AFTER)) {
-		/* empty suffix too => empty result */
-		OP(	POP);		/* Pop  original */
-		PUSH	(	"");
-		return TCL_OK;
-	    }
-	    OP44(	STR_RANGE_IMM, last + 1, TCL_INDEX_END);
-	    return TCL_OK;
-	} else {
-	    if ((last == TCL_INDEX_END) || (last == TCL_INDEX_AFTER)) {
-		/* empty suffix - build prefix only */
-		OP44(	STR_RANGE_IMM, 0, first-1);
-		return TCL_OK;
-	    }
-	    OP(		DUP);
-	    OP44(	STR_RANGE_IMM, 0, first-1);
-	    OP4(	REVERSE, 2);
-	    OP44(	STR_RANGE_IMM, last + 1, TCL_INDEX_END);
-	    OP1(	STR_CONCAT1, 2);
-	    return TCL_OK;
-	}
-    }
-
    genericReplace:
+	CompileWord(envPtr, valueTokenPtr, interp, 1);
 	tokenPtr = TokenAfter(valueTokenPtr);
 	CompileWord(envPtr, tokenPtr, interp, 2);
 	tokenPtr = TokenAfter(tokenPtr);
 	CompileWord(envPtr, tokenPtr, interp, 3);
-	if (parsePtr->numWords == 5) {
-	    tokenPtr = TokenAfter(tokenPtr);
-	    CompileWord(envPtr, tokenPtr, interp, 4);
+	if (replacementTokenPtr != NULL) {
+	    CompileWord(envPtr, replacementTokenPtr, interp, 4);
 	} else {
 	    PUSH(	"");
 	}
 	OP(		STR_REPLACE);
 	return TCL_OK;
+    }
 }

 int
@@ -1885,7 +1885,7 @@ ParseLexeme(
 {
    const char *end;
    int scanned;
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar ch;
    Tcl_Obj *literal = NULL;
    unsigned char byte;

@@ -425,11 +425,11 @@ typedef struct ByteCode {
 				 * compiled. If the code is executed if a
 				 * different namespace, it must be
 				 * recompiled. */
-    unsigned int nsEpoch;	/* Value of nsPtr->resolverEpoch when this
+    size_t nsEpoch;		/* Value of nsPtr->resolverEpoch when this
 				 * ByteCode was compiled. Used to invalidate
 				 * code when new namespace resolution rules
 				 * are put into effect. */
-    unsigned int refCount;	/* Reference count: set 1 when created plus 1
+    int refCount;		/* Reference count: set 1 when created plus 1
 				 * for each execution of the code currently
 				 * active. This structure can be freed when
 				 * refCount becomes zero. */
@@ -1120,8 +1120,6 @@ MODULE_SCOPE int	TclFixupForwardJump(CompileEnv *envPtr,
 			    int distThreshold);
 MODULE_SCOPE void	TclFreeCompileEnv(CompileEnv *envPtr);
 MODULE_SCOPE void	TclFreeJumpFixupArray(JumpFixupArray *fixupArrayPtr);
-MODULE_SCOPE int	TclGetIndexFromToken(Tcl_Token *tokenPtr,
-			    int before, int after, int *indexPtr);
 MODULE_SCOPE ByteCode *	TclInitByteCode(CompileEnv *envPtr);
 MODULE_SCOPE ByteCode *	TclInitByteCodeObj(Tcl_Obj *objPtr,
 			    const Tcl_ObjType *typePtr, CompileEnv *envPtr);
@@ -23,15 +23,6 @@
 #   endif
 #endif

-#if !defined(BUILD_tcl)
-# define TCL_DEPRECATED(msg) EXTERN TCL_DEPRECATED_API(msg)
-#elif defined(TCL_NO_DEPRECATED)
-# define TCL_DEPRECATED(msg) MODULE_SCOPE
-#else
-# define TCL_DEPRECATED(msg) EXTERN
-#endif
-
-
 /*
 * WARNING: This file is automatically generated by the tools/genStubs.tcl
 * script.  Any modifications to the function declarations below should be made
@@ -53,7 +44,7 @@ EXTERN int		Tcl_PkgProvideEx(Tcl_Interp *interp,
 				const char *name, const char *version,
 				const void *clientData);
 /* 1 */
-EXTERN const char *	Tcl_PkgRequireEx(Tcl_Interp *interp,
+EXTERN CONST84_RETURN char * Tcl_PkgRequireEx(Tcl_Interp *interp,
 				const char *name, const char *version,
 				int exact, void *clientDataPtr);
 /* 2 */
@@ -159,7 +150,8 @@ EXTERN int		Tcl_GetDoubleFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, double *doublePtr);
 /* 36 */
 EXTERN int		Tcl_GetIndexFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, const char *const *tablePtr,
+				Tcl_Obj *objPtr,
+				CONST84 char *const *tablePtr,
 				const char *msg, int flags, int *indexPtr);
 /* 37 */
 EXTERN int		Tcl_GetInt(Tcl_Interp *interp, const char *src,
@@ -262,8 +254,7 @@ EXTERN int		Tcl_AsyncReady(void);
 /* 76 */
 EXTERN void		Tcl_BackgroundError(Tcl_Interp *interp);
 /* 77 */
-TCL_DEPRECATED("Use Tcl_UtfBackslash")
-char			Tcl_Backslash(const char *src, int *readPtr);
+EXTERN char		Tcl_Backslash(const char *src, int *readPtr);
 /* 78 */
 EXTERN int		Tcl_BadChannelOption(Tcl_Interp *interp,
 				const char *optionName,
@@ -280,7 +271,7 @@ EXTERN int		Tcl_Close(Tcl_Interp *interp, Tcl_Channel chan);
 /* 82 */
 EXTERN int		Tcl_CommandComplete(const char *cmd);
 /* 83 */
-EXTERN char *		Tcl_Concat(int argc, const char *const *argv);
+EXTERN char *		Tcl_Concat(int argc, CONST84 char *const *argv);
 /* 84 */
 EXTERN int		Tcl_ConvertElement(const char *src, char *dst,
 				int flags);
@@ -291,7 +282,7 @@ EXTERN int		Tcl_ConvertCountedElement(const char *src,
 EXTERN int		Tcl_CreateAlias(Tcl_Interp *slave,
 				const char *slaveCmd, Tcl_Interp *target,
 				const char *targetCmd, int argc,
-				const char *const *argv);
+				CONST84 char *const *argv);
 /* 87 */
 EXTERN int		Tcl_CreateAliasObj(Tcl_Interp *slave,
 				const char *slaveCmd, Tcl_Interp *target,
@@ -322,8 +313,7 @@ EXTERN void		Tcl_CreateExitHandler(Tcl_ExitProc *proc,
 /* 94 */
 EXTERN Tcl_Interp *	Tcl_CreateInterp(void);
 /* 95 */
-TCL_DEPRECATED("")
-void			Tcl_CreateMathFunc(Tcl_Interp *interp,
+EXTERN void		Tcl_CreateMathFunc(Tcl_Interp *interp,
 				const char *name, int numArgs,
 				Tcl_ValueType *argTypes, Tcl_MathProc *proc,
 				ClientData clientData);
@@ -413,9 +403,9 @@ EXTERN void		Tcl_DStringStartSublist(Tcl_DString *dsPtr);
 /* 126 */
 EXTERN int		Tcl_Eof(Tcl_Channel chan);
 /* 127 */
-EXTERN const char *	Tcl_ErrnoId(void);
+EXTERN CONST84_RETURN char * Tcl_ErrnoId(void);
 /* 128 */
-EXTERN const char *	Tcl_ErrnoMsg(int err);
+EXTERN CONST84_RETURN char * Tcl_ErrnoMsg(int err);
 /* 129 */
 EXTERN int		Tcl_Eval(Tcl_Interp *interp, const char *script);
 /* 130 */
@@ -470,13 +460,13 @@ EXTERN void		Tcl_FreeResult(Tcl_Interp *interp);
 EXTERN int		Tcl_GetAlias(Tcl_Interp *interp,
 				const char *slaveCmd,
 				Tcl_Interp **targetInterpPtr,
-				const char **targetCmdPtr, int *argcPtr,
-				const char ***argvPtr);
+				CONST84 char **targetCmdPtr, int *argcPtr,
+				CONST84 char ***argvPtr);
 /* 149 */
 EXTERN int		Tcl_GetAliasObj(Tcl_Interp *interp,
 				const char *slaveCmd,
 				Tcl_Interp **targetInterpPtr,
-				const char **targetCmdPtr, int *objcPtr,
+				CONST84 char **targetCmdPtr, int *objcPtr,
 				Tcl_Obj ***objv);
 /* 150 */
 EXTERN ClientData	Tcl_GetAssocData(Tcl_Interp *interp,
@@ -495,7 +485,7 @@ EXTERN ClientData	Tcl_GetChannelInstanceData(Tcl_Channel chan);
 /* 155 */
 EXTERN int		Tcl_GetChannelMode(Tcl_Channel chan);
 /* 156 */
-EXTERN const char *	Tcl_GetChannelName(Tcl_Channel chan);
+EXTERN CONST84_RETURN char * Tcl_GetChannelName(Tcl_Channel chan);
 /* 157 */
 EXTERN int		Tcl_GetChannelOption(Tcl_Interp *interp,
 				Tcl_Channel chan, const char *optionName,
@@ -506,12 +496,12 @@ EXTERN CONST86 Tcl_ChannelType * Tcl_GetChannelType(Tcl_Channel chan);
 EXTERN int		Tcl_GetCommandInfo(Tcl_Interp *interp,
 				const char *cmdName, Tcl_CmdInfo *infoPtr);
 /* 160 */
-EXTERN const char *	Tcl_GetCommandName(Tcl_Interp *interp,
+EXTERN CONST84_RETURN char * Tcl_GetCommandName(Tcl_Interp *interp,
 				Tcl_Command command);
 /* 161 */
 EXTERN int		Tcl_GetErrno(void);
 /* 162 */
-EXTERN const char *	Tcl_GetHostName(void);
+EXTERN CONST84_RETURN char * Tcl_GetHostName(void);
 /* 163 */
 EXTERN int		Tcl_GetInterpPath(Tcl_Interp *askInterp,
 				Tcl_Interp *slaveInterp);
@@ -547,13 +537,14 @@ EXTERN Tcl_Interp *	Tcl_GetSlave(Tcl_Interp *interp,
 /* 173 */
 EXTERN Tcl_Channel	Tcl_GetStdChannel(int type);
 /* 174 */
-EXTERN const char *	Tcl_GetStringResult(Tcl_Interp *interp);
+EXTERN CONST84_RETURN char * Tcl_GetStringResult(Tcl_Interp *interp);
 /* 175 */
-EXTERN const char *	Tcl_GetVar(Tcl_Interp *interp, const char *varName,
-				int flags);
+EXTERN CONST84_RETURN char * Tcl_GetVar(Tcl_Interp *interp,
+				const char *varName, int flags);
 /* 176 */
-EXTERN const char *	Tcl_GetVar2(Tcl_Interp *interp, const char *part1,
-				const char *part2, int flags);
+EXTERN CONST84_RETURN char * Tcl_GetVar2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				int flags);
 /* 177 */
 EXTERN int		Tcl_GlobalEval(Tcl_Interp *interp,
 				const char *command);
@@ -578,7 +569,7 @@ EXTERN int		Tcl_InterpDeleted(Tcl_Interp *interp);
 /* 185 */
 EXTERN int		Tcl_IsSafe(Tcl_Interp *interp);
 /* 186 */
-EXTERN char *		Tcl_JoinPath(int argc, const char *const *argv,
+EXTERN char *		Tcl_JoinPath(int argc, CONST84 char *const *argv,
 				Tcl_DString *resultPtr);
 /* 187 */
 EXTERN int		Tcl_LinkVar(Tcl_Interp *interp, const char *varName,
@@ -591,7 +582,7 @@ EXTERN int		Tcl_MakeSafe(Tcl_Interp *interp);
 /* 191 */
 EXTERN Tcl_Channel	Tcl_MakeTcpClientChannel(ClientData tcpSocket);
 /* 192 */
-EXTERN char *		Tcl_Merge(int argc, const char *const *argv);
+EXTERN char *		Tcl_Merge(int argc, CONST84 char *const *argv);
 /* 193 */
 EXTERN Tcl_HashEntry *	Tcl_NextHashEntry(Tcl_HashSearch *searchPtr);
 /* 194 */
@@ -605,7 +596,7 @@ EXTERN Tcl_Obj *	Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
 				int flags);
 /* 197 */
 EXTERN Tcl_Channel	Tcl_OpenCommandChannel(Tcl_Interp *interp, int argc,
-				const char **argv, int flags);
+				CONST84 char **argv, int flags);
 /* 198 */
 EXTERN Tcl_Channel	Tcl_OpenFileChannel(Tcl_Interp *interp,
 				const char *fileName, const char *modeString,
@@ -627,7 +618,7 @@ EXTERN void		Tcl_PrintDouble(Tcl_Interp *interp, double value,
 /* 203 */
 EXTERN int		Tcl_PutEnv(const char *assignment);
 /* 204 */
-EXTERN const char *	Tcl_PosixError(Tcl_Interp *interp);
+EXTERN CONST84_RETURN char * Tcl_PosixError(Tcl_Interp *interp);
 /* 205 */
 EXTERN void		Tcl_QueueEvent(Tcl_Event *evPtr,
 				Tcl_QueuePosition position);
@@ -657,7 +648,8 @@ EXTERN int		Tcl_RegExpMatch(Tcl_Interp *interp, const char *text,
 				const char *pattern);
 /* 215 */
 EXTERN void		Tcl_RegExpRange(Tcl_RegExp regexp, int index,
-				const char **startPtr, const char **endPtr);
+				CONST84 char **startPtr,
+				CONST84 char **endPtr);
 /* 216 */
 EXTERN void		Tcl_Release(ClientData clientData);
 /* 217 */
@@ -668,8 +660,7 @@ EXTERN int		Tcl_ScanElement(const char *src, int *flagPtr);
 EXTERN int		Tcl_ScanCountedElement(const char *src, int length,
 				int *flagPtr);
 /* 220 */
-TCL_DEPRECATED("")
-int			Tcl_SeekOld(Tcl_Channel chan, int offset, int mode);
+EXTERN int		Tcl_SeekOld(Tcl_Channel chan, int offset, int mode);
 /* 221 */
 EXTERN int		Tcl_ServiceAll(void);
 /* 222 */
@@ -713,25 +704,26 @@ EXTERN void		Tcl_SetObjResult(Tcl_Interp *interp,
 /* 236 */
 EXTERN void		Tcl_SetStdChannel(Tcl_Channel channel, int type);
 /* 237 */
-EXTERN const char *	Tcl_SetVar(Tcl_Interp *interp, const char *varName,
-				const char *newValue, int flags);
-/* 238 */
-EXTERN const char *	Tcl_SetVar2(Tcl_Interp *interp, const char *part1,
-				const char *part2, const char *newValue,
+EXTERN CONST84_RETURN char * Tcl_SetVar(Tcl_Interp *interp,
+				const char *varName, const char *newValue,
 				int flags);
+/* 238 */
+EXTERN CONST84_RETURN char * Tcl_SetVar2(Tcl_Interp *interp,
+				const char *part1, const char *part2,
+				const char *newValue, int flags);
 /* 239 */
-EXTERN const char *	Tcl_SignalId(int sig);
+EXTERN CONST84_RETURN char * Tcl_SignalId(int sig);
 /* 240 */
-EXTERN const char *	Tcl_SignalMsg(int sig);
+EXTERN CONST84_RETURN char * Tcl_SignalMsg(int sig);
 /* 241 */
 EXTERN void		Tcl_SourceRCFile(Tcl_Interp *interp);
 /* 242 */
 EXTERN int		Tcl_SplitList(Tcl_Interp *interp,
 				const char *listStr, int *argcPtr,
-				const char ***argvPtr);
+				CONST84 char ***argvPtr);
 /* 243 */
 EXTERN void		Tcl_SplitPath(const char *path, int *argcPtr,
-				const char ***argvPtr);
+				CONST84 char ***argvPtr);
 /* 244 */
 EXTERN void		Tcl_StaticPackage(Tcl_Interp *interp,
 				const char *pkgName,
@@ -740,8 +732,7 @@ EXTERN void		Tcl_StaticPackage(Tcl_Interp *interp,
 /* 245 */
 EXTERN int		Tcl_StringMatch(const char *str, const char *pattern);
 /* 246 */
-TCL_DEPRECATED("")
-int			Tcl_TellOld(Tcl_Channel chan);
+EXTERN int		Tcl_TellOld(Tcl_Channel chan);
 /* 247 */
 EXTERN int		Tcl_TraceVar(Tcl_Interp *interp, const char *varName,
 				int flags, Tcl_VarTraceProc *proc,
@@ -812,43 +803,40 @@ EXTERN int		Tcl_DumpActiveMemory(const char *fileName);
 /* 266 */
 EXTERN void		Tcl_ValidateAllMemory(const char *file, int line);
 /* 267 */
-TCL_DEPRECATED("see TIP #422")
-void			Tcl_AppendResultVA(Tcl_Interp *interp,
+EXTERN void		Tcl_AppendResultVA(Tcl_Interp *interp,
 				va_list argList);
 /* 268 */
-TCL_DEPRECATED("see TIP #422")
-void			Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr,
+EXTERN void		Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr,
 				va_list argList);
 /* 269 */
 EXTERN char *		Tcl_HashStats(Tcl_HashTable *tablePtr);
 /* 270 */
-EXTERN const char *	Tcl_ParseVar(Tcl_Interp *interp, const char *start,
-				const char **termPtr);
+EXTERN CONST84_RETURN char * Tcl_ParseVar(Tcl_Interp *interp,
+				const char *start, CONST84 char **termPtr);
 /* 271 */
-EXTERN const char *	Tcl_PkgPresent(Tcl_Interp *interp, const char *name,
-				const char *version, int exact);
+EXTERN CONST84_RETURN char * Tcl_PkgPresent(Tcl_Interp *interp,
+				const char *name, const char *version,
+				int exact);
 /* 272 */
-EXTERN const char *	Tcl_PkgPresentEx(Tcl_Interp *interp,
+EXTERN CONST84_RETURN char * Tcl_PkgPresentEx(Tcl_Interp *interp,
 				const char *name, const char *version,
 				int exact, void *clientDataPtr);
 /* 273 */
 EXTERN int		Tcl_PkgProvide(Tcl_Interp *interp, const char *name,
 				const char *version);
 /* 274 */
-EXTERN const char *	Tcl_PkgRequire(Tcl_Interp *interp, const char *name,
-				const char *version, int exact);
+EXTERN CONST84_RETURN char * Tcl_PkgRequire(Tcl_Interp *interp,
+				const char *name, const char *version,
+				int exact);
 /* 275 */
-TCL_DEPRECATED("see TIP #422")
-void			Tcl_SetErrorCodeVA(Tcl_Interp *interp,
+EXTERN void		Tcl_SetErrorCodeVA(Tcl_Interp *interp,
 				va_list argList);
 /* 276 */
-TCL_DEPRECATED("see TIP #422")
-int			Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList);
+EXTERN int		Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList);
 /* 277 */
 EXTERN Tcl_Pid		Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options);
 /* 278 */
-TCL_DEPRECATED("see TIP #422")
-TCL_NORETURN void	Tcl_PanicVA(const char *format, va_list argList);
+EXTERN TCL_NORETURN void Tcl_PanicVA(const char *format, va_list argList);
 /* 279 */
 EXTERN void		Tcl_GetVersion(int *major, int *minor,
 				int *patchLevel, int *type);
@@ -913,7 +901,7 @@ EXTERN Tcl_ThreadId	Tcl_GetCurrentThread(void);
 /* 301 */
 EXTERN Tcl_Encoding	Tcl_GetEncoding(Tcl_Interp *interp, const char *name);
 /* 302 */
-EXTERN const char *	Tcl_GetEncodingName(Tcl_Encoding encoding);
+EXTERN CONST84_RETURN char * Tcl_GetEncodingName(Tcl_Encoding encoding);
 /* 303 */
 EXTERN void		Tcl_GetEncodingNames(Tcl_Interp *interp);
 /* 304 */
@@ -972,20 +960,20 @@ EXTERN Tcl_UniChar	Tcl_UniCharToUpper(int ch);
 /* 324 */
 EXTERN int		Tcl_UniCharToUtf(int ch, char *buf);
 /* 325 */
-EXTERN const char *	Tcl_UtfAtIndex(const char *src, int index);
+EXTERN CONST84_RETURN char * Tcl_UtfAtIndex(const char *src, int index);
 /* 326 */
 EXTERN int		Tcl_UtfCharComplete(const char *src, int length);
 /* 327 */
 EXTERN int		Tcl_UtfBackslash(const char *src, int *readPtr,
 				char *dst);
 /* 328 */
-EXTERN const char *	Tcl_UtfFindFirst(const char *src, int ch);
+EXTERN CONST84_RETURN char * Tcl_UtfFindFirst(const char *src, int ch);
 /* 329 */
-EXTERN const char *	Tcl_UtfFindLast(const char *src, int ch);
+EXTERN CONST84_RETURN char * Tcl_UtfFindLast(const char *src, int ch);
 /* 330 */
-EXTERN const char *	Tcl_UtfNext(const char *src);
+EXTERN CONST84_RETURN char * Tcl_UtfNext(const char *src);
 /* 331 */
-EXTERN const char *	Tcl_UtfPrev(const char *src, const char *start);
+EXTERN CONST84_RETURN char * Tcl_UtfPrev(const char *src, const char *start);
 /* 332 */
 EXTERN int		Tcl_UtfToExternal(Tcl_Interp *interp,
 				Tcl_Encoding encoding, const char *src,
@@ -1013,11 +1001,9 @@ EXTERN int		Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr);
 /* 340 */
 EXTERN char *		Tcl_GetString(Tcl_Obj *objPtr);
 /* 341 */
-TCL_DEPRECATED("Use Tcl_GetEncodingSearchPath")
-const char *		Tcl_GetDefaultEncodingDir(void);
+EXTERN CONST84_RETURN char * Tcl_GetDefaultEncodingDir(void);
 /* 342 */
-TCL_DEPRECATED("Use Tcl_SetEncodingSearchPath")
-void			Tcl_SetDefaultEncodingDir(const char *path);
+EXTERN void		Tcl_SetDefaultEncodingDir(const char *path);
 /* 343 */
 EXTERN void		Tcl_AlertNotifier(ClientData clientData);
 /* 344 */
@@ -1052,8 +1038,7 @@ EXTERN Tcl_UniChar *	Tcl_UtfToUniCharDString(const char *src, int length,
 EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj(Tcl_Interp *interp,
 				Tcl_Obj *patObj, int flags);
 /* 357 */
-TCL_DEPRECATED("Use Tcl_EvalTokensStandard")
-Tcl_Obj *		Tcl_EvalTokens(Tcl_Interp *interp,
+EXTERN Tcl_Obj *	Tcl_EvalTokens(Tcl_Interp *interp,
 				Tcl_Token *tokenPtr, int count);
 /* 358 */
 EXTERN void		Tcl_FreeParse(Tcl_Parse *parsePtr);
@@ -1065,7 +1050,7 @@ EXTERN void		Tcl_LogCommandInfo(Tcl_Interp *interp,
 EXTERN int		Tcl_ParseBraces(Tcl_Interp *interp,
 				const char *start, int numBytes,
 				Tcl_Parse *parsePtr, int append,
-				const char **termPtr);
+				CONST84 char **termPtr);
 /* 361 */
 EXTERN int		Tcl_ParseCommand(Tcl_Interp *interp,
 				const char *start, int numBytes, int nested,
@@ -1077,7 +1062,7 @@ EXTERN int		Tcl_ParseExpr(Tcl_Interp *interp, const char *start,
 EXTERN int		Tcl_ParseQuotedString(Tcl_Interp *interp,
 				const char *start, int numBytes,
 				Tcl_Parse *parsePtr, int append,
-				const char **termPtr);
+				CONST84 char **termPtr);
 /* 364 */
 EXTERN int		Tcl_ParseVarName(Tcl_Interp *interp,
 				const char *start, int numBytes,
@@ -1167,7 +1152,8 @@ EXTERN Tcl_Channel	Tcl_GetTopChannel(Tcl_Channel chan);
 /* 397 */
 EXTERN int		Tcl_ChannelBuffered(Tcl_Channel chan);
 /* 398 */
-EXTERN const char *	Tcl_ChannelName(const Tcl_ChannelType *chanTypePtr);
+EXTERN CONST84_RETURN char * Tcl_ChannelName(
+				const Tcl_ChannelType *chanTypePtr);
 /* 399 */
 EXTERN Tcl_ChannelTypeVersion Tcl_ChannelVersion(
 				const Tcl_ChannelType *chanTypePtr);
@@ -1273,15 +1259,13 @@ EXTERN Tcl_ThreadId	Tcl_GetChannelThread(Tcl_Channel channel);
 EXTERN Tcl_UniChar *	Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr,
 				int *lengthPtr);
 /* 435 */
-TCL_DEPRECATED("")
-int			Tcl_GetMathFuncInfo(Tcl_Interp *interp,
+EXTERN int		Tcl_GetMathFuncInfo(Tcl_Interp *interp,
 				const char *name, int *numArgsPtr,
 				Tcl_ValueType **argTypesPtr,
 				Tcl_MathProc **procPtr,
 				ClientData *clientDataPtr);
 /* 436 */
-TCL_DEPRECATED("")
-Tcl_Obj *		Tcl_ListMathFuncs(Tcl_Interp *interp,
+EXTERN Tcl_Obj *	Tcl_ListMathFuncs(Tcl_Interp *interp,
 				const char *pattern);
 /* 437 */
 EXTERN Tcl_Obj *	Tcl_SubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
@@ -1850,7 +1834,7 @@ typedef struct TclStubs {
    const TclStubHooks *hooks;

    int (*tcl_PkgProvideEx) (Tcl_Interp *interp, const char *name, const char *version, const void *clientData); /* 0 */
-    const char * (*tcl_PkgRequireEx) (Tcl_Interp *interp, const char *name, const char *version, int exact, void *clientDataPtr); /* 1 */
+    CONST84_RETURN char * (*tcl_PkgRequireEx) (Tcl_Interp *interp, const char *name, const char *version, int exact, void *clientDataPtr); /* 1 */
    TCL_NORETURN1 void (*tcl_Panic) (const char *format, ...) TCL_FORMAT_PRINTF(1, 2); /* 2 */
    char * (*tcl_Alloc) (unsigned int size); /* 3 */
    void (*tcl_Free) (char *ptr); /* 4 */
@@ -1901,7 +1885,7 @@ typedef struct TclStubs {
    unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 33 */
    int (*tcl_GetDouble) (Tcl_Interp *interp, const char *src, double *doublePtr); /* 34 */
    int (*tcl_GetDoubleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *doublePtr); /* 35 */
-    int (*tcl_GetIndexFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, const char *const *tablePtr, const char *msg, int flags, int *indexPtr); /* 36 */
+    int (*tcl_GetIndexFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, CONST84 char *const *tablePtr, const char *msg, int flags, int *indexPtr); /* 36 */
    int (*tcl_GetInt) (Tcl_Interp *interp, const char *src, int *intPtr); /* 37 */
    int (*tcl_GetIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *intPtr); /* 38 */
    int (*tcl_GetLongFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, long *longPtr); /* 39 */
@@ -1942,16 +1926,16 @@ typedef struct TclStubs {
    void (*tcl_AsyncMark) (Tcl_AsyncHandler async); /* 74 */
    int (*tcl_AsyncReady) (void); /* 75 */
    void (*tcl_BackgroundError) (Tcl_Interp *interp); /* 76 */
-    TCL_DEPRECATED_API("Use Tcl_UtfBackslash") char (*tcl_Backslash) (const char *src, int *readPtr); /* 77 */
+    char (*tcl_Backslash) (const char *src, int *readPtr); /* 77 */
    int (*tcl_BadChannelOption) (Tcl_Interp *interp, const char *optionName, const char *optionList); /* 78 */
    void (*tcl_CallWhenDeleted) (Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, ClientData clientData); /* 79 */
    void (*tcl_CancelIdleCall) (Tcl_IdleProc *idleProc, ClientData clientData); /* 80 */
    int (*tcl_Close) (Tcl_Interp *interp, Tcl_Channel chan); /* 81 */
    int (*tcl_CommandComplete) (const char *cmd); /* 82 */
-    char * (*tcl_Concat) (int argc, const char *const *argv); /* 83 */
+    char * (*tcl_Concat) (int argc, CONST84 char *const *argv); /* 83 */
    int (*tcl_ConvertElement) (const char *src, char *dst, int flags); /* 84 */
    int (*tcl_ConvertCountedElement) (const char *src, int length, char *dst, int flags); /* 85 */
-    int (*tcl_CreateAlias) (Tcl_Interp *slave, const char *slaveCmd, Tcl_Interp *target, const char *targetCmd, int argc, const char *const *argv); /* 86 */
+    int (*tcl_CreateAlias) (Tcl_Interp *slave, const char *slaveCmd, Tcl_Interp *target, const char *targetCmd, int argc, CONST84 char *const *argv); /* 86 */
    int (*tcl_CreateAliasObj) (Tcl_Interp *slave, const char *slaveCmd, Tcl_Interp *target, const char *targetCmd, int objc, Tcl_Obj *const objv[]); /* 87 */
    Tcl_Channel (*tcl_CreateChannel) (const Tcl_ChannelType *typePtr, const char *chanName, ClientData instanceData, int mask); /* 88 */
    void (*tcl_CreateChannelHandler) (Tcl_Channel chan, int mask, Tcl_ChannelProc *proc, ClientData clientData); /* 89 */
@@ -1960,7 +1944,7 @@ typedef struct TclStubs {
    void (*tcl_CreateEventSource) (Tcl_EventSetupProc *setupProc, Tcl_EventCheckProc *checkProc, ClientData clientData); /* 92 */
    void (*tcl_CreateExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 93 */
    Tcl_Interp * (*tcl_CreateInterp) (void); /* 94 */
-    TCL_DEPRECATED_API("") void (*tcl_CreateMathFunc) (Tcl_Interp *interp, const char *name, int numArgs, Tcl_ValueType *argTypes, Tcl_MathProc *proc, ClientData clientData); /* 95 */
+    void (*tcl_CreateMathFunc) (Tcl_Interp *interp, const char *name, int numArgs, Tcl_ValueType *argTypes, Tcl_MathProc *proc, ClientData clientData); /* 95 */
    Tcl_Command (*tcl_CreateObjCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); /* 96 */
    Tcl_Interp * (*tcl_CreateSlave) (Tcl_Interp *interp, const char *slaveName, int isSafe); /* 97 */
    Tcl_TimerToken (*tcl_CreateTimerHandler) (int milliseconds, Tcl_TimerProc *proc, ClientData clientData); /* 98 */
@@ -1992,8 +1976,8 @@ typedef struct TclStubs {
    void (*tcl_DStringSetLength) (Tcl_DString *dsPtr, int length); /* 124 */
    void (*tcl_DStringStartSublist) (Tcl_DString *dsPtr); /* 125 */
    int (*tcl_Eof) (Tcl_Channel chan); /* 126 */
-    const char * (*tcl_ErrnoId) (void); /* 127 */
-    const char * (*tcl_ErrnoMsg) (int err); /* 128 */
+    CONST84_RETURN char * (*tcl_ErrnoId) (void); /* 127 */
+    CONST84_RETURN char * (*tcl_ErrnoMsg) (int err); /* 128 */
    int (*tcl_Eval) (Tcl_Interp *interp, const char *script); /* 129 */
    int (*tcl_EvalFile) (Tcl_Interp *interp, const char *fileName); /* 130 */
    int (*tcl_EvalObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 131 */
@@ -2013,21 +1997,21 @@ typedef struct TclStubs {
    Tcl_HashEntry * (*tcl_FirstHashEntry) (Tcl_HashTable *tablePtr, Tcl_HashSearch *searchPtr); /* 145 */
    int (*tcl_Flush) (Tcl_Channel chan); /* 146 */
    void (*tcl_FreeResult) (Tcl_Interp *interp); /* 147 */
-    int (*tcl_GetAlias) (Tcl_Interp *interp, const char *slaveCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *argcPtr, const char ***argvPtr); /* 148 */
-    int (*tcl_GetAliasObj) (Tcl_Interp *interp, const char *slaveCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *objcPtr, Tcl_Obj ***objv); /* 149 */
+    int (*tcl_GetAlias) (Tcl_Interp *interp, const char *slaveCmd, Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr, int *argcPtr, CONST84 char ***argvPtr); /* 148 */
+    int (*tcl_GetAliasObj) (Tcl_Interp *interp, const char *slaveCmd, Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr, int *objcPtr, Tcl_Obj ***objv); /* 149 */
    ClientData (*tcl_GetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc **procPtr); /* 150 */
    Tcl_Channel (*tcl_GetChannel) (Tcl_Interp *interp, const char *chanName, int *modePtr); /* 151 */
    int (*tcl_GetChannelBufferSize) (Tcl_Channel chan); /* 152 */
    int (*tcl_GetChannelHandle) (Tcl_Channel chan, int direction, ClientData *handlePtr); /* 153 */
    ClientData (*tcl_GetChannelInstanceData) (Tcl_Channel chan); /* 154 */
    int (*tcl_GetChannelMode) (Tcl_Channel chan); /* 155 */
-    const char * (*tcl_GetChannelName) (Tcl_Channel chan); /* 156 */
+    CONST84_RETURN char * (*tcl_GetChannelName) (Tcl_Channel chan); /* 156 */
    int (*tcl_GetChannelOption) (Tcl_Interp *interp, Tcl_Channel chan, const char *optionName, Tcl_DString *dsPtr); /* 157 */
    CONST86 Tcl_ChannelType * (*tcl_GetChannelType) (Tcl_Channel chan); /* 158 */
    int (*tcl_GetCommandInfo) (Tcl_Interp *interp, const char *cmdName, Tcl_CmdInfo *infoPtr); /* 159 */
-    const char * (*tcl_GetCommandName) (Tcl_Interp *interp, Tcl_Command command); /* 160 */
+    CONST84_RETURN char * (*tcl_GetCommandName) (Tcl_Interp *interp, Tcl_Command command); /* 160 */
    int (*tcl_GetErrno) (void); /* 161 */
-    const char * (*tcl_GetHostName) (void); /* 162 */
+    CONST84_RETURN char * (*tcl_GetHostName) (void); /* 162 */
    int (*tcl_GetInterpPath) (Tcl_Interp *askInterp, Tcl_Interp *slaveInterp); /* 163 */
    Tcl_Interp * (*tcl_GetMaster) (Tcl_Interp *interp); /* 164 */
    const char * (*tcl_GetNameOfExecutable) (void); /* 165 */
@@ -2047,9 +2031,9 @@ typedef struct TclStubs {
    int (*tcl_GetServiceMode) (void); /* 171 */
    Tcl_Interp * (*tcl_GetSlave) (Tcl_Interp *interp, const char *slaveName); /* 172 */
    Tcl_Channel (*tcl_GetStdChannel) (int type); /* 173 */
-    const char * (*tcl_GetStringResult) (Tcl_Interp *interp); /* 174 */
-    const char * (*tcl_GetVar) (Tcl_Interp *interp, const char *varName, int flags); /* 175 */
-    const char * (*tcl_GetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 176 */
+    CONST84_RETURN char * (*tcl_GetStringResult) (Tcl_Interp *interp); /* 174 */
+    CONST84_RETURN char * (*tcl_GetVar) (Tcl_Interp *interp, const char *varName, int flags); /* 175 */
+    CONST84_RETURN char * (*tcl_GetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 176 */
    int (*tcl_GlobalEval) (Tcl_Interp *interp, const char *command); /* 177 */
    int (*tcl_GlobalEvalObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 178 */
    int (*tcl_HideCommand) (Tcl_Interp *interp, const char *cmdName, const char *hiddenCmdToken); /* 179 */
@@ -2059,25 +2043,25 @@ typedef struct TclStubs {
    int (*tcl_InputBuffered) (Tcl_Channel chan); /* 183 */
    int (*tcl_InterpDeleted) (Tcl_Interp *interp); /* 184 */
    int (*tcl_IsSafe) (Tcl_Interp *interp); /* 185 */
-    char * (*tcl_JoinPath) (int argc, const char *const *argv, Tcl_DString *resultPtr); /* 186 */
+    char * (*tcl_JoinPath) (int argc, CONST84 char *const *argv, Tcl_DString *resultPtr); /* 186 */
    int (*tcl_LinkVar) (Tcl_Interp *interp, const char *varName, char *addr, int type); /* 187 */
    void (*reserved188)(void);
    Tcl_Channel (*tcl_MakeFileChannel) (ClientData handle, int mode); /* 189 */
    int (*tcl_MakeSafe) (Tcl_Interp *interp); /* 190 */
    Tcl_Channel (*tcl_MakeTcpClientChannel) (ClientData tcpSocket); /* 191 */
-    char * (*tcl_Merge) (int argc, const char *const *argv); /* 192 */
+    char * (*tcl_Merge) (int argc, CONST84 char *const *argv); /* 192 */
    Tcl_HashEntry * (*tcl_NextHashEntry) (Tcl_HashSearch *searchPtr); /* 193 */
    void (*tcl_NotifyChannel) (Tcl_Channel channel, int mask); /* 194 */
    Tcl_Obj * (*tcl_ObjGetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags); /* 195 */
    Tcl_Obj * (*tcl_ObjSetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags); /* 196 */
-    Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp *interp, int argc, const char **argv, int flags); /* 197 */
+    Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp *interp, int argc, CONST84 char **argv, int flags); /* 197 */
    Tcl_Channel (*tcl_OpenFileChannel) (Tcl_Interp *interp, const char *fileName, const char *modeString, int permissions); /* 198 */
    Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp *interp, int port, const char *address, const char *myaddr, int myport, int async); /* 199 */
    Tcl_Channel (*tcl_OpenTcpServer) (Tcl_Interp *interp, int port, const char *host, Tcl_TcpAcceptProc *acceptProc, ClientData callbackData); /* 200 */
    void (*tcl_Preserve) (ClientData data); /* 201 */
    void (*tcl_PrintDouble) (Tcl_Interp *interp, double value, char *dst); /* 202 */
    int (*tcl_PutEnv) (const char *assignment); /* 203 */
-    const char * (*tcl_PosixError) (Tcl_Interp *interp); /* 204 */
+    CONST84_RETURN char * (*tcl_PosixError) (Tcl_Interp *interp); /* 204 */
    void (*tcl_QueueEvent) (Tcl_Event *evPtr, Tcl_QueuePosition position); /* 205 */
    int (*tcl_Read) (Tcl_Channel chan, char *bufPtr, int toRead); /* 206 */
    void (*tcl_ReapDetachedProcs) (void); /* 207 */
@@ -2088,12 +2072,12 @@ typedef struct TclStubs {
    Tcl_RegExp (*tcl_RegExpCompile) (Tcl_Interp *interp, const char *pattern); /* 212 */
    int (*tcl_RegExpExec) (Tcl_Interp *interp, Tcl_RegExp regexp, const char *text, const char *start); /* 213 */
    int (*tcl_RegExpMatch) (Tcl_Interp *interp, const char *text, const char *pattern); /* 214 */
-    void (*tcl_RegExpRange) (Tcl_RegExp regexp, int index, const char **startPtr, const char **endPtr); /* 215 */
+    void (*tcl_RegExpRange) (Tcl_RegExp regexp, int index, CONST84 char **startPtr, CONST84 char **endPtr); /* 215 */
    void (*tcl_Release) (ClientData clientData); /* 216 */
    void (*tcl_ResetResult) (Tcl_Interp *interp); /* 217 */
    int (*tcl_ScanElement) (const char *src, int *flagPtr); /* 218 */
    int (*tcl_ScanCountedElement) (const char *src, int length, int *flagPtr); /* 219 */
-    TCL_DEPRECATED_API("") int (*tcl_SeekOld) (Tcl_Channel chan, int offset, int mode); /* 220 */
+    int (*tcl_SeekOld) (Tcl_Channel chan, int offset, int mode); /* 220 */
    int (*tcl_ServiceAll) (void); /* 221 */
    int (*tcl_ServiceEvent) (int flags); /* 222 */
    void (*tcl_SetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc *proc, ClientData clientData); /* 223 */
@@ -2110,16 +2094,16 @@ typedef struct TclStubs {
    void (*tcl_SetObjErrorCode) (Tcl_Interp *interp, Tcl_Obj *errorObjPtr); /* 234 */
    void (*tcl_SetObjResult) (Tcl_Interp *interp, Tcl_Obj *resultObjPtr); /* 235 */
    void (*tcl_SetStdChannel) (Tcl_Channel channel, int type); /* 236 */
-    const char * (*tcl_SetVar) (Tcl_Interp *interp, const char *varName, const char *newValue, int flags); /* 237 */
-    const char * (*tcl_SetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, const char *newValue, int flags); /* 238 */
-    const char * (*tcl_SignalId) (int sig); /* 239 */
-    const char * (*tcl_SignalMsg) (int sig); /* 240 */
+    CONST84_RETURN char * (*tcl_SetVar) (Tcl_Interp *interp, const char *varName, const char *newValue, int flags); /* 237 */
+    CONST84_RETURN char * (*tcl_SetVar2) (Tcl_Interp *interp, const char *part1, const char *part2, const char *newValue, int flags); /* 238 */
+    CONST84_RETURN char * (*tcl_SignalId) (int sig); /* 239 */
+    CONST84_RETURN char * (*tcl_SignalMsg) (int sig); /* 240 */
    void (*tcl_SourceRCFile) (Tcl_Interp *interp); /* 241 */
-    int (*tcl_SplitList) (Tcl_Interp *interp, const char *listStr, int *argcPtr, const char ***argvPtr); /* 242 */
-    void (*tcl_SplitPath) (const char *path, int *argcPtr, const char ***argvPtr); /* 243 */
+    int (*tcl_SplitList) (Tcl_Interp *interp, const char *listStr, int *argcPtr, CONST84 char ***argvPtr); /* 242 */
+    void (*tcl_SplitPath) (const char *path, int *argcPtr, CONST84 char ***argvPtr); /* 243 */
    void (*tcl_StaticPackage) (Tcl_Interp *interp, const char *pkgName, Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc); /* 244 */
    int (*tcl_StringMatch) (const char *str, const char *pattern); /* 245 */
-    TCL_DEPRECATED_API("") int (*tcl_TellOld) (Tcl_Channel chan); /* 246 */
+    int (*tcl_TellOld) (Tcl_Channel chan); /* 246 */
    int (*tcl_TraceVar) (Tcl_Interp *interp, const char *varName, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 247 */
    int (*tcl_TraceVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 248 */
    char * (*tcl_TranslateFileName) (Tcl_Interp *interp, const char *name, Tcl_DString *bufferPtr); /* 249 */
@@ -2140,18 +2124,18 @@ typedef struct TclStubs {
    void (*tcl_WrongNumArgs) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], const char *message); /* 264 */
    int (*tcl_DumpActiveMemory) (const char *fileName); /* 265 */
    void (*tcl_ValidateAllMemory) (const char *file, int line); /* 266 */
-    TCL_DEPRECATED_API("see TIP #422") void (*tcl_AppendResultVA) (Tcl_Interp *interp, va_list argList); /* 267 */
-    TCL_DEPRECATED_API("see TIP #422") void (*tcl_AppendStringsToObjVA) (Tcl_Obj *objPtr, va_list argList); /* 268 */
+    void (*tcl_AppendResultVA) (Tcl_Interp *interp, va_list argList); /* 267 */
+    void (*tcl_AppendStringsToObjVA) (Tcl_Obj *objPtr, va_list argList); /* 268 */
    char * (*tcl_HashStats) (Tcl_HashTable *tablePtr); /* 269 */
-    const char * (*tcl_ParseVar) (Tcl_Interp *interp, const char *start, const char **termPtr); /* 270 */
-    const char * (*tcl_PkgPresent) (Tcl_Interp *interp, const char *name, const char *version, int exact); /* 271 */
-    const char * (*tcl_PkgPresentEx) (Tcl_Interp *interp, const char *name, const char *version, int exact, void *clientDataPtr); /* 272 */
+    CONST84_RETURN char * (*tcl_ParseVar) (Tcl_Interp *interp, const char *start, CONST84 char **termPtr); /* 270 */
+    CONST84_RETURN char * (*tcl_PkgPresent) (Tcl_Interp *interp, const char *name, const char *version, int exact); /* 271 */
+    CONST84_RETURN char * (*tcl_PkgPresentEx) (Tcl_Interp *interp, const char *name, const char *version, int exact, void *clientDataPtr); /* 272 */
    int (*tcl_PkgProvide) (Tcl_Interp *interp, const char *name, const char *version); /* 273 */
-    const char * (*tcl_PkgRequire) (Tcl_Interp *interp, const char *name, const char *version, int exact); /* 274 */
-    TCL_DEPRECATED_API("see TIP #422") void (*tcl_SetErrorCodeVA) (Tcl_Interp *interp, va_list argList); /* 275 */
-    TCL_DEPRECATED_API("see TIP #422") int (*tcl_VarEvalVA) (Tcl_Interp *interp, va_list argList); /* 276 */
+    CONST84_RETURN char * (*tcl_PkgRequire) (Tcl_Interp *interp, const char *name, const char *version, int exact); /* 274 */
+    void (*tcl_SetErrorCodeVA) (Tcl_Interp *interp, va_list argList); /* 275 */
+    int (*tcl_VarEvalVA) (Tcl_Interp *interp, va_list argList); /* 276 */
    Tcl_Pid (*tcl_WaitPid) (Tcl_Pid pid, int *statPtr, int options); /* 277 */
-    TCL_DEPRECATED_API("see TIP #422") TCL_NORETURN1 void (*tcl_PanicVA) (const char *format, va_list argList); /* 278 */
+    TCL_NORETURN1 void (*tcl_PanicVA) (const char *format, va_list argList); /* 278 */
    void (*tcl_GetVersion) (int *major, int *minor, int *patchLevel, int *type); /* 279 */
    void (*tcl_InitMemory) (Tcl_Interp *interp); /* 280 */
    Tcl_Channel (*tcl_StackChannel) (Tcl_Interp *interp, const Tcl_ChannelType *typePtr, ClientData instanceData, int mask, Tcl_Channel prevChan); /* 281 */
@@ -2175,7 +2159,7 @@ typedef struct TclStubs {
    void (*tcl_FreeEncoding) (Tcl_Encoding encoding); /* 299 */
    Tcl_ThreadId (*tcl_GetCurrentThread) (void); /* 300 */
    Tcl_Encoding (*tcl_GetEncoding) (Tcl_Interp *interp, const char *name); /* 301 */
-    const char * (*tcl_GetEncodingName) (Tcl_Encoding encoding); /* 302 */
+    CONST84_RETURN char * (*tcl_GetEncodingName) (Tcl_Encoding encoding); /* 302 */
    void (*tcl_GetEncodingNames) (Tcl_Interp *interp); /* 303 */
    int (*tcl_GetIndexFromObjStruct) (Tcl_Interp *interp, Tcl_Obj *objPtr, const void *tablePtr, int offset, const char *msg, int flags, int *indexPtr); /* 304 */
    void * (*tcl_GetThreadData) (Tcl_ThreadDataKey *keyPtr, int size); /* 305 */
@@ -2198,13 +2182,13 @@ typedef struct TclStubs {
    Tcl_UniChar (*tcl_UniCharToTitle) (int ch); /* 322 */
    Tcl_UniChar (*tcl_UniCharToUpper) (int ch); /* 323 */
    int (*tcl_UniCharToUtf) (int ch, char *buf); /* 324 */
-    const char * (*tcl_UtfAtIndex) (const char *src, int index); /* 325 */
+    CONST84_RETURN char * (*tcl_UtfAtIndex) (const char *src, int index); /* 325 */
    int (*tcl_UtfCharComplete) (const char *src, int length); /* 326 */
    int (*tcl_UtfBackslash) (const char *src, int *readPtr, char *dst); /* 327 */
-    const char * (*tcl_UtfFindFirst) (const char *src, int ch); /* 328 */
-    const char * (*tcl_UtfFindLast) (const char *src, int ch); /* 329 */
-    const char * (*tcl_UtfNext) (const char *src); /* 330 */
-    const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 331 */
+    CONST84_RETURN char * (*tcl_UtfFindFirst) (const char *src, int ch); /* 328 */
+    CONST84_RETURN char * (*tcl_UtfFindLast) (const char *src, int ch); /* 329 */
+    CONST84_RETURN char * (*tcl_UtfNext) (const char *src); /* 330 */
+    CONST84_RETURN char * (*tcl_UtfPrev) (const char *src, const char *start); /* 331 */
    int (*tcl_UtfToExternal) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 332 */
    char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, const char *src, int srcLen, Tcl_DString *dsPtr); /* 333 */
    int (*tcl_UtfToLower) (char *src); /* 334 */
@@ -2214,8 +2198,8 @@ typedef struct TclStubs {
    int (*tcl_WriteChars) (Tcl_Channel chan, const char *src, int srcLen); /* 338 */
    int (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 339 */
    char * (*tcl_GetString) (Tcl_Obj *objPtr); /* 340 */
-    TCL_DEPRECATED_API("Use Tcl_GetEncodingSearchPath") const char * (*tcl_GetDefaultEncodingDir) (void); /* 341 */
-    TCL_DEPRECATED_API("Use Tcl_SetEncodingSearchPath") void (*tcl_SetDefaultEncodingDir) (const char *path); /* 342 */
+    CONST84_RETURN char * (*tcl_GetDefaultEncodingDir) (void); /* 341 */
+    void (*tcl_SetDefaultEncodingDir) (const char *path); /* 342 */
    void (*tcl_AlertNotifier) (ClientData clientData); /* 343 */
    void (*tcl_ServiceModeHook) (int mode); /* 344 */
    int (*tcl_UniCharIsAlnum) (int ch); /* 345 */
@@ -2230,13 +2214,13 @@ typedef struct TclStubs {
    char * (*tcl_UniCharToUtfDString) (const Tcl_UniChar *uniStr, int uniLength, Tcl_DString *dsPtr); /* 354 */
    Tcl_UniChar * (*tcl_UtfToUniCharDString) (const char *src, int length, Tcl_DString *dsPtr); /* 355 */
    Tcl_RegExp (*tcl_GetRegExpFromObj) (Tcl_Interp *interp, Tcl_Obj *patObj, int flags); /* 356 */
-    TCL_DEPRECATED_API("Use Tcl_EvalTokensStandard") Tcl_Obj * (*tcl_EvalTokens) (Tcl_Interp *interp, Tcl_Token *tokenPtr, int count); /* 357 */
+    Tcl_Obj * (*tcl_EvalTokens) (Tcl_Interp *interp, Tcl_Token *tokenPtr, int count); /* 357 */
    void (*tcl_FreeParse) (Tcl_Parse *parsePtr); /* 358 */
    void (*tcl_LogCommandInfo) (Tcl_Interp *interp, const char *script, const char *command, int length); /* 359 */
-    int (*tcl_ParseBraces) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 360 */
+    int (*tcl_ParseBraces) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int append, CONST84 char **termPtr); /* 360 */
    int (*tcl_ParseCommand) (Tcl_Interp *interp, const char *start, int numBytes, int nested, Tcl_Parse *parsePtr); /* 361 */
    int (*tcl_ParseExpr) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr); /* 362 */
-    int (*tcl_ParseQuotedString) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 363 */
+    int (*tcl_ParseQuotedString) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int append, CONST84 char **termPtr); /* 363 */
    int (*tcl_ParseVarName) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int append); /* 364 */
    char * (*tcl_GetCwd) (Tcl_Interp *interp, Tcl_DString *cwdPtr); /* 365 */
    int (*tcl_Chdir) (const char *dirName); /* 366 */
@@ -2271,7 +2255,7 @@ typedef struct TclStubs {
    int (*tcl_WriteRaw) (Tcl_Channel chan, const char *src, int srcLen); /* 395 */
    Tcl_Channel (*tcl_GetTopChannel) (Tcl_Channel chan); /* 396 */
    int (*tcl_ChannelBuffered) (Tcl_Channel chan); /* 397 */
-    const char * (*tcl_ChannelName) (const Tcl_ChannelType *chanTypePtr); /* 398 */
+    CONST84_RETURN char * (*tcl_ChannelName) (const Tcl_ChannelType *chanTypePtr); /* 398 */
    Tcl_ChannelTypeVersion (*tcl_ChannelVersion) (const Tcl_ChannelType *chanTypePtr); /* 399 */
    Tcl_DriverBlockModeProc * (*tcl_ChannelBlockModeProc) (const Tcl_ChannelType *chanTypePtr); /* 400 */
    Tcl_DriverCloseProc * (*tcl_ChannelCloseProc) (const Tcl_ChannelType *chanTypePtr); /* 401 */
@@ -2308,8 +2292,8 @@ typedef struct TclStubs {
    int (*tcl_AttemptSetObjLength) (Tcl_Obj *objPtr, int length); /* 432 */
    Tcl_ThreadId (*tcl_GetChannelThread) (Tcl_Channel channel); /* 433 */
    Tcl_UniChar * (*tcl_GetUnicodeFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 434 */
-    TCL_DEPRECATED_API("") int (*tcl_GetMathFuncInfo) (Tcl_Interp *interp, const char *name, int *numArgsPtr, Tcl_ValueType **argTypesPtr, Tcl_MathProc **procPtr, ClientData *clientDataPtr); /* 435 */
-    TCL_DEPRECATED_API("") Tcl_Obj * (*tcl_ListMathFuncs) (Tcl_Interp *interp, const char *pattern); /* 436 */
+    int (*tcl_GetMathFuncInfo) (Tcl_Interp *interp, const char *name, int *numArgsPtr, Tcl_ValueType **argTypesPtr, Tcl_MathProc **procPtr, ClientData *clientDataPtr); /* 435 */
+    Tcl_Obj * (*tcl_ListMathFuncs) (Tcl_Interp *interp, const char *pattern); /* 436 */
    Tcl_Obj * (*tcl_SubstObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 437 */
    int (*tcl_DetachChannel) (Tcl_Interp *interp, Tcl_Channel channel); /* 438 */
    int (*tcl_IsStandardChannel) (Tcl_Channel channel); /* 439 */
@@ -3934,14 +3918,20 @@ extern const TclStubs *tclStubsPtr;
 * possible. Tcl 9 must find a better solution, but that cannot be done
 * without introducing a binary incompatibility.
 */
+#	undef Tcl_DbNewLongObj
 #	undef Tcl_GetLongFromObj
+#	undef Tcl_NewLongObj
+#	undef Tcl_SetLongObj
 #	undef Tcl_ExprLong
 #	undef Tcl_ExprLongObj
 #	undef Tcl_UniCharNcmp
 #	undef Tcl_UtfNcmp
 #	undef Tcl_UtfNcasecmp
 #	undef Tcl_UniCharNcasecmp
+#	define Tcl_DbNewLongObj ((Tcl_Obj*(*)(long,const char*,int))Tcl_DbNewWideIntObj)
 #	define Tcl_GetLongFromObj ((int(*)(Tcl_Interp*,Tcl_Obj*,long*))Tcl_GetWideIntFromObj)
+#	define Tcl_NewLongObj ((Tcl_Obj*(*)(long))Tcl_NewWideIntObj)
+#	define Tcl_SetLongObj ((void(*)(Tcl_Obj*,long))Tcl_SetWideIntObj)
 #	define Tcl_ExprLong TclExprLong
 	static inline int TclExprLong(Tcl_Interp *interp, const char *string, long *ptr){
 	    int intValue;
@@ -3967,17 +3957,6 @@ extern const TclStubs *tclStubsPtr;
 #   endif
 #endif

-#undef Tcl_NewLongObj
-#define Tcl_NewLongObj(value) Tcl_NewWideIntObj((long)(value))
-#undef Tcl_NewIntObj
-#define Tcl_NewIntObj(value) Tcl_NewWideIntObj((int)(value))
-#undef Tcl_DbNewLongObj
-#define Tcl_DbNewLongObj(value, file, line) Tcl_DbNewWideIntObj((long)(value), file, line)
-#undef Tcl_SetIntObj
-#define Tcl_SetIntObj(objPtr, value)	Tcl_SetWideIntObj(objPtr, (int)(value))
-#undef Tcl_SetLongObj
-#define Tcl_SetLongObj(objPtr, value)	Tcl_SetWideIntObj(objPtr, (long)(value))
-
 /*
 * Deprecated Tcl procedures:
 */
@@ -141,7 +141,7 @@ typedef struct Dict {
 				 * the dictionary. Used for doing traversal of
 				 * the entries in the order that they are
 				 * created. */
-    unsigned int epoch; 	/* Epoch counter */
+    int epoch;			/* Epoch counter */
    size_t refCount;		/* Reference counter (see above) */
    Tcl_Obj *chain;		/* Linked list used for invalidating the
 				 * string representations of updated nested
@@ -390,7 +390,7 @@ DupDictInternalRep(
     * Initialise other fields.
     */

-    newDict->epoch = 1;
+    newDict->epoch = 0;
    newDict->chain = NULL;
    newDict->refCount = 1;

@@ -487,14 +487,15 @@ static void
 UpdateStringOfDict(
    Tcl_Obj *dictPtr)
 {
-#define LOCAL_SIZE 64
-    char localFlags[LOCAL_SIZE], *flagPtr = NULL;
+#define LOCAL_SIZE 20
+    int localFlags[LOCAL_SIZE], *flagPtr = NULL;
    Dict *dict = DICT(dictPtr);
    ChainEntry *cPtr;
    Tcl_Obj *keyPtr, *valuePtr;
    int i, length, bytesNeeded = 0;
    const char *elem;
    char *dst;
+    const int maxFlags = UINT_MAX / sizeof(int);

    /*
     * This field is the most useful one in the whole hash structure, and it
@@ -516,8 +517,10 @@ UpdateStringOfDict(

    if (numElems <= LOCAL_SIZE) {
 	flagPtr = localFlags;
+    } else if (numElems > maxFlags) {
+	Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
    } else {
-	flagPtr = ckalloc(numElems);
+	flagPtr = ckalloc(numElems * sizeof(int));
    }
    for (i=0,cPtr=dict->entryChainHead; i<numElems; i+=2,cPtr=cPtr->nextPtr) {
 	/*
@@ -707,7 +710,7 @@ SetDictFromAny(
     */

    TclFreeIntRep(objPtr);
-    dict->epoch = 1;
+    dict->epoch = 0;
    dict->chain = NULL;
    dict->refCount = 1;
    DICT(objPtr) = dict;
@@ -1106,7 +1109,7 @@ Tcl_DictObjFirst(
    dict = DICT(dictPtr);
    cPtr = dict->entryChainHead;
    if (cPtr == NULL) {
-	searchPtr->epoch = 0;
+	searchPtr->epoch = -1;
 	*donePtr = 1;
    } else {
 	*donePtr = 0;
@@ -1167,7 +1170,7 @@ Tcl_DictObjNext(
     * If the searh is done; we do no work.
     */

-    if (!searchPtr->epoch) {
+    if (searchPtr->epoch == -1) {
 	*donePtr = 1;
 	return;
    }
@@ -1224,8 +1227,8 @@ Tcl_DictObjDone(
 {
    Dict *dict;

-    if (searchPtr->epoch) {
-	searchPtr->epoch = 0;
+    if (searchPtr->epoch != -1) {
+	searchPtr->epoch = -1;
 	dict = (Dict *) searchPtr->dictionaryPtr;
 	if (dict->refCount-- <= 1) {
 	    DeleteDict(dict);
@@ -1377,7 +1380,7 @@ Tcl_NewDictObj(void)
    TclInvalidateStringRep(dictPtr);
    dict = ckalloc(sizeof(Dict));
    InitChainTable(dict);
-    dict->epoch = 1;
+    dict->epoch = 0;
    dict->chain = NULL;
    dict->refCount = 1;
    DICT(dictPtr) = dict;
@@ -1427,7 +1430,7 @@ Tcl_DbNewDictObj(
    TclInvalidateStringRep(dictPtr);
    dict = ckalloc(sizeof(Dict));
    InitChainTable(dict);
-    dict->epoch = 1;
+    dict->epoch = 0;
    dict->chain = NULL;
    dict->refCount = 1;
    DICT(dictPtr) = dict;
@@ -2309,12 +2312,9 @@ DictAppendCmd(

 	    if (objc == 4) {
 		appendObjPtr = objv[3];
-	    } else {
-		appendObjPtr = TclStringCat(interp, objc-3, objv+3,
-			TCL_STRING_IN_PLACE);
-		if (appendObjPtr == NULL) {
-		    return TCL_ERROR;
-		}
+	    } else if (TCL_OK != TclStringCatObjv(interp, /* inPlace */ 1,
+		    objc-3, objv+3, &appendObjPtr)) {
+		return TCL_ERROR;
 	    }
 	}

@@ -2331,9 +2331,7 @@ DictAppendCmd(
 		valuePtr = Tcl_DuplicateObj(valuePtr);
 	    }

-	    Tcl_IncrRefCount(appendObjPtr);
 	    Tcl_AppendObjToObj(valuePtr, appendObjPtr);
-	    Tcl_DecrRefCount(appendObjPtr);
 	}

 	Tcl_DictObjPut(NULL, dictPtr, objv[2], valuePtr);
@@ -254,7 +254,7 @@ DisassembleByteCodeObj(
    Tcl_Obj *bufferObj, *fileObj;

    TclNewObj(bufferObj);
-    if (!codePtr->refCount) {
+    if (codePtr->refCount <= 0) {
 	return bufferObj;	/* Already freed. */
    }

@@ -312,7 +312,7 @@ DisassembleByteCodeObj(
 	int numCompiledLocals = procPtr->numCompiledLocals;

 	Tcl_AppendPrintfToObj(bufferObj,
-		"  Proc %p, refCt %u, args %d, compiled locals %d\n",
+		"  Proc %p, refCt %d, args %d, compiled locals %d\n",
 		procPtr, procPtr->refCount, procPtr->numArgs,
 		numCompiledLocals);
 	if (numCompiledLocals > 0) {
@@ -797,7 +797,7 @@ TclNewInstNameObj(
    Tcl_Obj *objPtr = Tcl_NewObj();

    objPtr->typePtr = &tclInstNameType;
-    objPtr->internalRep.wideValue = (long) inst;
+    objPtr->internalRep.longValue = (long) inst;
    objPtr->bytes = NULL;

    return objPtr;
@@ -817,17 +817,17 @@ static void
 UpdateStringOfInstName(
    Tcl_Obj *objPtr)
 {
-    size_t len, inst = (size_t)objPtr->internalRep.wideValue;
-    char *s, buf[TCL_INTEGER_SPACE + 5];
+    int inst = objPtr->internalRep.longValue;
+    char *s, buf[20];
+    int len;

-    if (inst > LAST_INST_OPCODE) {
-        sprintf(buf, "inst_%" TCL_Z_MODIFIER "d", inst);
+    if ((inst < 0) || (inst > LAST_INST_OPCODE)) {
+        sprintf(buf, "inst_%d", inst);
        s = buf;
    } else {
-        s = (char *) tclInstructionTable[inst].name;
+        s = (char *) tclInstructionTable[objPtr->internalRep.longValue].name;
    }
    len = strlen(s);
-    /* assert (len < UINT_MAX) */
    objPtr->bytes = ckalloc(len + 1);
    memcpy(objPtr->bytes, s, len + 1);
    objPtr->length = len;
@@ -18,7 +18,7 @@ typedef size_t (LengthProc)(const char *src);
 * convert between various character sets and UTF-8.
 */

-typedef struct {
+typedef struct Encoding {
    char *name;			/* Name of encoding. Malloced because (1) hash
 				 * table entry that owns this encoding may be
 				 * freed prior to this encoding being freed,
@@ -57,7 +57,7 @@ typedef struct {
 * encoding.
 */

-typedef struct {
+typedef struct TableEncodingData {
    int fallback;		/* Character (in this encoding) to substitute
 				 * when this encoding cannot represent a UTF-8
 				 * character. */
@@ -91,7 +91,7 @@ typedef struct {
 * for switching character sets.
 */

-typedef struct {
+typedef struct EscapeSubTable {
    unsigned sequenceLen;	/* Length of following string. */
    char sequence[16];		/* Escape code that marks this encoding. */
    char name[32];		/* Name for encoding. */
@@ -100,7 +100,7 @@ typedef struct {
 				 * yet. */
 } EscapeSubTable;

-typedef struct {
+typedef struct EscapeEncodingData {
    int fallback;		/* Character (in this encoding) to substitute
 				 * when this encoding cannot represent a UTF-8
 				 * character. */
@@ -563,7 +563,7 @@ TclInitEncodingSubsystem(void)
     * formed UTF-8 into a properly formed stream.
     */

-    type.encodingName	= NULL;
+    type.encodingName	= "identity";
    type.toUtfProc	= BinaryProc;
    type.fromUtfProc	= BinaryProc;
    type.freeProc	= NULL;
@@ -693,7 +693,6 @@ TclFinalizeEncodingSubsystem(void)
 *-------------------------------------------------------------------------
 */

-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 const char *
 Tcl_GetDefaultEncodingDir(void)
 {
@@ -737,7 +736,6 @@ Tcl_SetDefaultEncodingDir(
    Tcl_ListObjReplace(NULL, searchPath, 0, 0, 1, &directory);
    Tcl_SetEncodingSearchPath(searchPath);
 }
-#endif

 /*
 *-------------------------------------------------------------------------
@@ -853,9 +851,7 @@ FreeEncoding(
 	if (encodingPtr->hPtr != NULL) {
 	    Tcl_DeleteHashEntry(encodingPtr->hPtr);
 	}
-	if (encodingPtr->name) {
-	    ckfree(encodingPtr->name);
-	}
+	ckfree(encodingPtr->name);
 	ckfree(encodingPtr);
    }
 }
@@ -1044,8 +1040,27 @@ Tcl_CreateEncoding(
    const Tcl_EncodingType *typePtr)
 				/* The encoding type. */
 {
-    Encoding *encodingPtr = ckalloc(sizeof(Encoding));
-    encodingPtr->name		= NULL;
+    Tcl_HashEntry *hPtr;
+    int isNew;
+    Encoding *encodingPtr;
+    char *name;
+
+    Tcl_MutexLock(&encodingMutex);
+    hPtr = Tcl_CreateHashEntry(&encodingTable, typePtr->encodingName, &isNew);
+    if (isNew == 0) {
+	/*
+	 * Remove old encoding from hash table, but don't delete it until last
+	 * reference goes away.
+	 */
+
+	encodingPtr = Tcl_GetHashValue(hPtr);
+	encodingPtr->hPtr = NULL;
+    }
+
+    name = ckalloc(strlen(typePtr->encodingName) + 1);
+
+    encodingPtr = ckalloc(sizeof(Encoding));
+    encodingPtr->name		= strcpy(name, typePtr->encodingName);
    encodingPtr->toUtfProc	= typePtr->toUtfProc;
    encodingPtr->fromUtfProc	= typePtr->fromUtfProc;
    encodingPtr->freeProc	= typePtr->freeProc;
@@ -1057,32 +1072,11 @@ Tcl_CreateEncoding(
 	encodingPtr->lengthProc = (LengthProc *) unilen;
    }
    encodingPtr->refCount	= 1;
-    encodingPtr->hPtr		= NULL;
-
-  if (typePtr->encodingName) {
-    Tcl_HashEntry *hPtr;
-    int isNew;
-    char *name;
-
-    Tcl_MutexLock(&encodingMutex);
-    hPtr = Tcl_CreateHashEntry(&encodingTable, typePtr->encodingName, &isNew);
-    if (isNew == 0) {
-	/*
-	 * Remove old encoding from hash table, but don't delete it until last
-	 * reference goes away.
-	 */
-
-	Encoding *replaceMe = Tcl_GetHashValue(hPtr);
-	replaceMe->hPtr = NULL;
-    }
-
-    name = ckalloc(strlen(typePtr->encodingName) + 1);
-    encodingPtr->name		= strcpy(name, typePtr->encodingName);
    encodingPtr->hPtr		= hPtr;
    Tcl_SetHashValue(hPtr, encodingPtr);

    Tcl_MutexUnlock(&encodingMutex);
-  }
+
    return (Tcl_Encoding) encodingPtr;
 }

@@ -2299,11 +2293,8 @@ UtfToUtfProc(
    const char *srcStart, *srcEnd, *srcClose;
    const char *dstStart, *dstEnd;
    int result, numChars, charLimit = INT_MAX;
-    Tcl_UniChar *chPtr = (Tcl_UniChar *) statePtr;
+    Tcl_UniChar ch;

-    if (flags & TCL_ENCODING_START) {
-    	*statePtr = 0;
-    }
    result = TCL_OK;

    srcStart = src;
@@ -2335,7 +2326,7 @@ UtfToUtfProc(
 	}
 	if (UCHAR(*src) < 0x80 && !(UCHAR(*src) == 0 && pureNullMode == 0)) {
 	    /*
-	     * Copy 7bit characters, but skip null-bytes when we are in input
+	     * Copy 7bit chatacters, but skip null-bytes when we are in input
 	     * mode, so that they get converted to 0xc080.
 	     */

@@ -2351,16 +2342,16 @@ UtfToUtfProc(
 	} else if (!Tcl_UtfCharComplete(src, srcEnd - src)) {
 	    /*
 	     * Always check before using TclUtfToUniChar. Not doing can so
-	     * cause it run beyond the end of the buffer! If we happen such an
-	     * incomplete char its bytes are made to represent themselves.
+	     * cause it run beyond the endof the buffer! If we happen such an
+	     * incomplete char its byts are made to represent themselves.
 	     */

-	    *chPtr = (unsigned char) *src;
+	    ch = (unsigned char) *src;
 	    src += 1;
-	    dst += Tcl_UniCharToUtf(*chPtr, dst);
+	    dst += Tcl_UniCharToUtf(ch, dst);
 	} else {
-	    src += TclUtfToUniChar(src, chPtr);
-	    dst += Tcl_UniCharToUtf(*chPtr, dst);
+	    src += TclUtfToUniChar(src, &ch);
+	    dst += Tcl_UniCharToUtf(ch, dst);
 	}
    }

@@ -2416,11 +2407,8 @@ UnicodeToUtfProc(
    const char *srcStart, *srcEnd;
    const char *dstEnd, *dstStart;
    int result, numChars, charLimit = INT_MAX;
-    Tcl_UniChar *chPtr = (Tcl_UniChar *) statePtr;
+    Tcl_UniChar ch;

-    if (flags & TCL_ENCODING_START) {
-    	*statePtr = 0;
-    }
    if (flags & TCL_ENCODING_CHAR_LIMIT) {
 	charLimit = *dstCharsPtr;
    }
@@ -2448,11 +2436,11 @@ UnicodeToUtfProc(
 	 * Tcl_UniChar-size data.
 	 */

-	*chPtr = *(Tcl_UniChar *)src;
-	if (*chPtr && *chPtr < 0x80) {
-	    *dst++ = (*chPtr & 0xFF);
+	ch = *(Tcl_UniChar *)src;
+	if (ch && ch < 0x80) {
+	    *dst++ = (ch & 0xFF);
 	} else {
-	    dst += Tcl_UniCharToUtf(*chPtr, dst);
+	    dst += Tcl_UniCharToUtf(ch, dst);
 	}
 	src += sizeof(Tcl_UniChar);
    }
@@ -2509,11 +2497,8 @@ UtfToUnicodeProc(
 {
    const char *srcStart, *srcEnd, *srcClose, *dstStart, *dstEnd;
    int result, numChars;
-    Tcl_UniChar *chPtr = (Tcl_UniChar *) statePtr;
+    Tcl_UniChar ch;

-    if (flags & TCL_ENCODING_START) {
-    	*statePtr = 0;
-    }
    srcStart = src;
    srcEnd = src + srcLen;
    srcClose = srcEnd;
@@ -2539,7 +2524,7 @@ UtfToUnicodeProc(
 	    result = TCL_CONVERT_NOSPACE;
 	    break;
 	}
-	src += TclUtfToUniChar(src, chPtr);
+	src += TclUtfToUniChar(src, &ch);

 	/*
 	 * Need to handle this in a way that won't cause misalignment by
@@ -2548,23 +2533,23 @@ UtfToUnicodeProc(

 #ifdef WORDS_BIGENDIAN
 #if TCL_UTF_MAX > 4
-	*dst++ = (*chPtr >> 24);
-	*dst++ = ((*chPtr >> 16) & 0xFF);
-	*dst++ = ((*chPtr >> 8) & 0xFF);
-	*dst++ = (*chPtr & 0xFF);
+	*dst++ = (ch >> 24);
+	*dst++ = ((ch >> 16) & 0xFF);
+	*dst++ = ((ch >> 8) & 0xFF);
+	*dst++ = (ch & 0xFF);
 #else
-	*dst++ = (*chPtr >> 8);
-	*dst++ = (*chPtr & 0xFF);
+	*dst++ = (ch >> 8);
+	*dst++ = (ch & 0xFF);
 #endif
 #else
 #if TCL_UTF_MAX > 4
-	*dst++ = (*chPtr & 0xFF);
-	*dst++ = ((*chPtr >> 8) & 0xFF);
-	*dst++ = ((*chPtr >> 16) & 0xFF);
-	*dst++ = (*chPtr >> 24);
+	*dst++ = (ch & 0xFF);
+	*dst++ = ((ch >> 8) & 0xFF);
+	*dst++ = ((ch >> 16) & 0xFF);
+	*dst++ = (ch >> 24);
 #else
-	*dst++ = (*chPtr & 0xFF);
-	*dst++ = (*chPtr >> 8);
+	*dst++ = (ch & 0xFF);
+	*dst++ = (ch >> 8);
 #endif
 #endif
    }
@@ -2622,7 +2607,7 @@ TableToUtfProc(
    const char *srcStart, *srcEnd;
    const char *dstEnd, *dstStart, *prefixBytes;
    int result, byte, numChars, charLimit = INT_MAX;
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar ch;
    const unsigned short *const *toUnicode;
    const unsigned short *pageZero;
    TableEncodingData *dataPtr = clientData;
@@ -2734,7 +2719,7 @@ TableFromUtfProc(
 {
    const char *srcStart, *srcEnd, *srcClose;
    const char *dstStart, *dstEnd, *prefixBytes;
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar ch;
    int result, len, word, numChars;
    TableEncodingData *dataPtr = clientData;
    const unsigned short *const *fromUnicode;
@@ -2868,7 +2853,7 @@ Iso88591ToUtfProc(

    result = TCL_OK;
    for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) {
-	Tcl_UniChar ch = 0;
+	Tcl_UniChar ch;

 	if (dst > dstEnd) {
 	    result = TCL_CONVERT_NOSPACE;
@@ -2954,7 +2939,7 @@ Iso88591FromUtfProc(
    dstEnd = dst + dstLen - 1;

    for (numChars = 0; src < srcEnd; numChars++) {
-	Tcl_UniChar ch = 0;
+	Tcl_UniChar ch;
 	int len;

 	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
@@ -3341,7 +3326,7 @@ EscapeFromUtfProc(
    for (numChars = 0; src < srcEnd; numChars++) {
 	unsigned len;
 	int word;
-	Tcl_UniChar ch = 0;
+	Tcl_UniChar ch;

 	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
 	    /*
@@ -3386,7 +3371,7 @@ EscapeFromUtfProc(

 	    /*
 	     * The state variable has the value of oldState when word is 0.
-	     * In this case, the escape sequence should not be copied to dst
+	     * In this case, the escape sequense should not be copied to dst
 	     * because the current character set is not changed.
 	     */

@@ -3611,7 +3596,7 @@ unilen(
 static void
 InitializeEncodingSearchPath(
    char **valuePtr,
-    unsigned int *lengthPtr,
+    size_t *lengthPtr,
    Tcl_Encoding *encodingPtr)
 {
    const char *bytes;
@@ -92,7 +92,7 @@ static const Tcl_ObjType ensembleCmdType = {
 */

 typedef struct {
-    unsigned int epoch;         /* Used to confirm when the data in this
+    size_t epoch;               /* Used to confirm when the data in this
                                 * really structure matches up with the
                                 * ensemble. */
    Command *token;             /* Reference to the command for which this
@@ -146,12 +146,10 @@ TclNamespaceEnsembleCmd(
    Tcl_Obj *const objv[])
 {
    Tcl_Namespace *namespacePtr;
-    Namespace *nsPtr = (Namespace *) TclGetCurrentNamespace(interp), *cxtPtr,
-    	*foundNsPtr, *altFoundNsPtr, *actualCxtPtr;
+    Namespace *nsPtr = (Namespace *) TclGetCurrentNamespace(interp);
    Tcl_Command token;
    Tcl_DictSearch search;
    Tcl_Obj *listObj;
-    const char *simpleName;
    int index, done;

    if (nsPtr == NULL || nsPtr->flags & NS_DYING) {
@@ -197,8 +195,13 @@ TclNamespaceEnsembleCmd(
 	objv += 2;
 	objc -= 2;

-	name = nsPtr->name;
-	cxtPtr = (Namespace *) nsPtr->parentPtr;
+	/*
+	 * Work out what name to use for the command to create. If supplied,
+	 * it is either fully specified or relative to the current namespace.
+	 * If not supplied, it is exactly the name of the current namespace.
+	 */
+
+	name = nsPtr->fullName;

 	/*
 	 * Parse the option list, applying type checks as we go. Note that we
@@ -218,7 +221,6 @@ TclNamespaceEnsembleCmd(
 	    switch ((enum EnsCreateOpts) index) {
 	    case CRT_CMD:
 		name = TclGetString(objv[1]);
-		cxtPtr = nsPtr;
 		continue;
 	    case CRT_SUBCMDS:
 		if (TclListObjLength(interp, objv[1], &len) != TCL_OK) {
@@ -335,10 +337,6 @@ TclNamespaceEnsembleCmd(
 	    }
 	}

-	TclGetNamespaceForQualName(interp, name, cxtPtr,
-	TCL_CREATE_NS_IF_UNKNOWN, &foundNsPtr, &altFoundNsPtr, &actualCxtPtr,
-	&simpleName);
-
 	/*
 	 * Create the ensemble. Note that this might delete another ensemble
 	 * linked to the same namespace, so we must be careful. However, we
@@ -346,9 +344,8 @@ TclNamespaceEnsembleCmd(
 	 * we've created it (and after any deletions have occurred.)
 	 */

-	token = TclCreateEnsembleInNs(interp, simpleName,
-	     (Tcl_Namespace *) foundNsPtr, (Tcl_Namespace *) nsPtr,
-	     (permitPrefix ? TCL_ENSEMBLE_PREFIX : 0));
+	token = Tcl_CreateEnsemble(interp, name, NULL,
+		(permitPrefix ? TCL_ENSEMBLE_PREFIX : 0));
 	Tcl_SetEnsembleSubcommandList(interp, token, subcmdObj);
 	Tcl_SetEnsembleMappingDict(interp, token, mapObj);
 	Tcl_SetEnsembleUnknownHandler(interp, token, unknownObj);
@@ -639,38 +636,48 @@ TclNamespaceEnsembleCmd(
 /*
 *----------------------------------------------------------------------
 *
- * TclCreateEnsembleInNs --
+ * Tcl_CreateEnsemble --
 *
- *	Like Tcl_CreateEnsemble, but additionally accepts as an argument the
- *	name of the namespace to create the command in.
+ *	Create a simple ensemble attached to the given namespace.
+ *
+ * Results:
+ *	The token for the command created.
+ *
+ * Side effects:
+ *	The ensemble is created and marked for compilation.
 *
 *----------------------------------------------------------------------
 */

 Tcl_Command
-TclCreateEnsembleInNs(
+Tcl_CreateEnsemble(
    Tcl_Interp *interp,
-
-    const char *name,   /* Simple name of command to create (no */
-			/* namespace components). */
-    Tcl_Namespace       /* Name of namespace to create the command in. */
-    *nameNsPtr,
-    Tcl_Namespace
-    *ensembleNsPtr,	/* Name of the namespace for the ensemble. */
-    int flags
-    )
+    const char *name,
+    Tcl_Namespace *namespacePtr,
+    int flags)
 {
-    Namespace *nsPtr = (Namespace *) ensembleNsPtr;
-    EnsembleConfig *ensemblePtr;
-    Tcl_Command token;
+    Namespace *nsPtr = (Namespace *) namespacePtr;
+    EnsembleConfig *ensemblePtr = ckalloc(sizeof(EnsembleConfig));
+    Tcl_Obj *nameObj = NULL;

-    ensemblePtr = ckalloc(sizeof(EnsembleConfig));
-    token = TclNRCreateCommandInNs(interp, name,
-	(Tcl_Namespace *) nameNsPtr, NsEnsembleImplementationCmd,
-	NsEnsembleImplementationCmdNR, ensemblePtr, DeleteEnsembleConfig);
-    if (token == NULL) {
-	ckfree(ensemblePtr);
-	return NULL;
+    if (nsPtr == NULL) {
+	nsPtr = (Namespace *) TclGetCurrentNamespace(interp);
+    }
+
+    /*
+     * Make the name of the ensemble into a fully qualified name. This might
+     * allocate a temporary object.
+     */
+
+    if (!(name[0] == ':' && name[1] == ':')) {
+	nameObj = NewNsObj((Tcl_Namespace *) nsPtr);
+	if (nsPtr->parentPtr == NULL) {
+	    Tcl_AppendStringsToObj(nameObj, name, NULL);
+	} else {
+	    Tcl_AppendStringsToObj(nameObj, "::", name, NULL);
+	}
+	Tcl_IncrRefCount(nameObj);
+	name = TclGetString(nameObj);
    }

    ensemblePtr->nsPtr = nsPtr;
@@ -683,7 +690,9 @@ TclCreateEnsembleInNs(
    ensemblePtr->numParameters = 0;
    ensemblePtr->parameterList = NULL;
    ensemblePtr->unknownHandler = NULL;
-    ensemblePtr->token = token;
+    ensemblePtr->token = Tcl_NRCreateCommand(interp, name,
+	    NsEnsembleImplementationCmd, NsEnsembleImplementationCmdNR,
+	    ensemblePtr, DeleteEnsembleConfig);
    ensemblePtr->next = (EnsembleConfig *) nsPtr->ensembles;
    nsPtr->ensembles = (Tcl_Ensemble *) ensemblePtr;

@@ -700,52 +709,11 @@ TclCreateEnsembleInNs(
 	((Command *) ensemblePtr->token)->compileProc = TclCompileEnsemble;
    }

-    return ensemblePtr->token;
-
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateEnsemble
- *
- *	Create a simple ensemble attached to the given namespace.
- *
- *	Deprecated by TclCreateEnsembleInNs.
- *
- * Value
- *
- *	The token for the command created.
- *
- * Effect
- *	The ensemble is created and marked for compilation.
- *
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Command
-Tcl_CreateEnsemble(
-    Tcl_Interp *interp,
-    const char *name,
-    Tcl_Namespace *namespacePtr,
-    int flags)
-{
-    Namespace *nsPtr = (Namespace *)namespacePtr, *foundNsPtr, *altNsPtr,
-    	*actualNsPtr;
-    const char * simpleName;
-
-    if (nsPtr == NULL) {
-	nsPtr = (Namespace *) TclGetCurrentNamespace(interp);
+    if (nameObj != NULL) {
+	TclDecrRefCount(nameObj);
    }
-
-    TclGetNamespaceForQualName(interp, name, nsPtr, TCL_CREATE_NS_IF_UNKNOWN,
-    	&foundNsPtr, &altNsPtr, &actualNsPtr, &simpleName);
-    return TclCreateEnsembleInNs(interp, simpleName,
-	(Tcl_Namespace *) foundNsPtr, (Tcl_Namespace *) nsPtr, flags);
+    return ensemblePtr->token;
 }
-

 /*
 *----------------------------------------------------------------------
@@ -1917,7 +1885,6 @@ NsEnsembleImplementationCmdNR(

 	TclSkipTailcall(interp);
 	Tcl_ListObjGetElements(NULL, copyPtr, &copyObjc, &copyObjv);
-	((Interp *)interp)->lookupNsPtr = ensemblePtr->nsPtr;
 	return TclNREvalObjv(interp, copyObjc, copyObjv, TCL_EVAL_INVOKE, NULL);
    }

@@ -2431,32 +2398,14 @@ MakeCachedEnsembleCommand(
 *----------------------------------------------------------------------
 */

-static void
-ClearTable(
-    EnsembleConfig *ensemblePtr)
-{
-    Tcl_HashTable *hash = &ensemblePtr->subcommandTable;
-
-    if (hash->numEntries != 0) {
-        Tcl_HashSearch search;
-        Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(hash, &search);
-
-        while (hPtr != NULL) {
-            Tcl_Obj *prefixObj = Tcl_GetHashValue(hPtr);
-            Tcl_DecrRefCount(prefixObj);
-            hPtr = Tcl_NextHashEntry(&search);
-        }
-        ckfree((char *) ensemblePtr->subcommandArrayPtr);
-    }
-    Tcl_DeleteHashTable(hash);
-}
-
 static void
 DeleteEnsembleConfig(
    ClientData clientData)
 {
    EnsembleConfig *ensemblePtr = clientData;
    Namespace *nsPtr = ensemblePtr->nsPtr;
+    Tcl_HashSearch search;
+    Tcl_HashEntry *hEnt;

    /*
     * Unlink from the ensemble chain if it has not been marked as having been
@@ -2490,7 +2439,17 @@ DeleteEnsembleConfig(
     * Kill the pointer-containing fields.
     */

-    ClearTable(ensemblePtr);
+    if (ensemblePtr->subcommandTable.numEntries != 0) {
+	ckfree(ensemblePtr->subcommandArrayPtr);
+    }
+    hEnt = Tcl_FirstHashEntry(&ensemblePtr->subcommandTable, &search);
+    while (hEnt != NULL) {
+	Tcl_Obj *prefixObj = Tcl_GetHashValue(hEnt);
+
+	Tcl_DecrRefCount(prefixObj);
+	hEnt = Tcl_NextHashEntry(&search);
+    }
+    Tcl_DeleteHashTable(&ensemblePtr->subcommandTable);
    if (ensemblePtr->subcmdList != NULL) {
 	Tcl_DecrRefCount(ensemblePtr->subcmdList);
    }
@@ -2546,101 +2505,100 @@ BuildEnsembleConfig(
    int i, j, isNew;
    Tcl_HashTable *hash = &ensemblePtr->subcommandTable;
    Tcl_HashEntry *hPtr;
-    Tcl_Obj *mapDict = ensemblePtr->subcommandDict;
-    Tcl_Obj *subList = ensemblePtr->subcmdList;

-    ClearTable(ensemblePtr);
-    Tcl_InitHashTable(hash, TCL_STRING_KEYS);
+    if (hash->numEntries != 0) {
+	/*
+	 * Remove pre-existing table.
+	 */

-    if (subList) {
-        int subc;
-        Tcl_Obj **subv, *target, *cmdObj, *cmdPrefixObj;
-        char *name;
+	ckfree(ensemblePtr->subcommandArrayPtr);
+	hPtr = Tcl_FirstHashEntry(hash, &search);
+	while (hPtr != NULL) {
+	    Tcl_Obj *prefixObj = Tcl_GetHashValue(hPtr);

-        /*
-         * There is a list of exactly what subcommands go in the table.
-         * Must determine the target for each.
-         */
+	    Tcl_DecrRefCount(prefixObj);
+	    hPtr = Tcl_NextHashEntry(&search);
+	}
+	Tcl_DeleteHashTable(hash);
+	Tcl_InitHashTable(hash, TCL_STRING_KEYS);
+    }

-        Tcl_ListObjGetElements(NULL, subList, &subc, &subv);
-        if (subList == mapDict) {
-            /*
-             * Strange case where explicit list of subcommands is same value
-             * as the dict mapping to targets.
-             */
+    /*
+     * See if we've got an export list. If so, we will only export exactly
+     * those commands, which may be either implemented by the prefix in the
+     * subcommandDict or mapped directly onto the namespace's commands.
+     */

-            for (i = 0; i < subc; i += 2) {
-                name = TclGetString(subv[i]);
-                hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
-                if (!isNew) {
-                    cmdObj = (Tcl_Obj *)Tcl_GetHashValue(hPtr);
-                    Tcl_DecrRefCount(cmdObj);
-                }
-                Tcl_SetHashValue(hPtr, subv[i+1]);
-                Tcl_IncrRefCount(subv[i+1]);
+    if (ensemblePtr->subcmdList != NULL) {
+	Tcl_Obj **subcmdv, *target, *cmdObj, *cmdPrefixObj;
+	int subcmdc;

-                name = TclGetString(subv[i+1]);
-                hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
-                if (isNew) {
-                    cmdObj = Tcl_NewStringObj(name, -1);
-                    cmdPrefixObj = Tcl_NewListObj(1, &cmdObj);
-                    Tcl_SetHashValue(hPtr, cmdPrefixObj);
-                    Tcl_IncrRefCount(cmdPrefixObj);
-                }
-            }
-        } else {
-            /* Usual case where we can freely act on the list and dict. */
+	TclListObjGetElements(NULL, ensemblePtr->subcmdList, &subcmdc,
+		&subcmdv);
+	for (i=0 ; i<subcmdc ; i++) {
+	    const char *name = TclGetString(subcmdv[i]);

-            for (i = 0; i < subc; i++) {
-                name = TclGetString(subv[i]);
-                hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
-                if (!isNew) {
-                    continue;
-                }
+	    hPtr = Tcl_CreateHashEntry(hash, name, &isNew);

-                /* Lookup target in the dictionary */
-                if (mapDict) {
-                    Tcl_DictObjGet(NULL, mapDict, subv[i], &target);
-                    if (target) {
-                        Tcl_SetHashValue(hPtr, target);
-                        Tcl_IncrRefCount(target);
-                        continue;
-                    }
-                }
+	    /*
+	     * Skip non-unique cases.
+	     */

-                /*
-                 * target was not in the dictionary so map onto the namespace.
-                 * Note in this case that we do not guarantee that the
-                 * command is actually there; that is the programmer's
-                 * responsibility (or [::unknown] of course).
-                 */
-                cmdObj = Tcl_NewStringObj(name, -1);
-                cmdPrefixObj = Tcl_NewListObj(1, &cmdObj);
-                Tcl_SetHashValue(hPtr, cmdPrefixObj);
-                Tcl_IncrRefCount(cmdPrefixObj);
-            }
-        }
-    } else if (mapDict) {
-        /*
-         * No subcmd list, but we do have a mapping dictionary so we should
-         * use the keys of that. Convert the dictionary's contents into the
-         * form required for the ensemble's internal hashtable.
-         */
+	    if (!isNew) {
+		continue;
+	    }

-        Tcl_DictSearch dictSearch;
-        Tcl_Obj *keyObj, *valueObj;
-        int done;
+	    /*
+	     * Look in our dictionary (if present) for the command.
+	     */

-        Tcl_DictObjFirst(NULL, ensemblePtr->subcommandDict, &dictSearch,
-                &keyObj, &valueObj, &done);
-        while (!done) {
-            char *name = TclGetString(keyObj);
+	    if (ensemblePtr->subcommandDict != NULL) {
+		Tcl_DictObjGet(NULL, ensemblePtr->subcommandDict, subcmdv[i],
+			&target);
+		if (target != NULL) {
+		    Tcl_SetHashValue(hPtr, target);
+		    Tcl_IncrRefCount(target);
+		    continue;
+		}
+	    }

-            hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
-            Tcl_SetHashValue(hPtr, valueObj);
-            Tcl_IncrRefCount(valueObj);
-            Tcl_DictObjNext(&dictSearch, &keyObj, &valueObj, &done);
-        }
+	    /*
+	     * Not there, so map onto the namespace. Note in this case that we
+	     * do not guarantee that the command is actually there; that is
+	     * the programmer's responsibility (or [::unknown] of course).
+	     */
+
+	    cmdObj = NewNsObj((Tcl_Namespace *) ensemblePtr->nsPtr);
+	    if (ensemblePtr->nsPtr->parentPtr != NULL) {
+		Tcl_AppendStringsToObj(cmdObj, "::", name, NULL);
+	    } else {
+		Tcl_AppendStringsToObj(cmdObj, name, NULL);
+	    }
+	    cmdPrefixObj = Tcl_NewListObj(1, &cmdObj);
+	    Tcl_SetHashValue(hPtr, cmdPrefixObj);
+	    Tcl_IncrRefCount(cmdPrefixObj);
+	}
+    } else if (ensemblePtr->subcommandDict != NULL) {
+	/*
+	 * No subcmd list, but we do have a mapping dictionary so we should
+	 * use the keys of that. Convert the dictionary's contents into the
+	 * form required for the ensemble's internal hashtable.
+	 */
+
+	Tcl_DictSearch dictSearch;
+	Tcl_Obj *keyObj, *valueObj;
+	int done;
+
+	Tcl_DictObjFirst(NULL, ensemblePtr->subcommandDict, &dictSearch,
+		&keyObj, &valueObj, &done);
+	while (!done) {
+	    const char *name = TclGetString(keyObj);
+
+	    hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
+	    Tcl_SetHashValue(hPtr, valueObj);
+	    Tcl_IncrRefCount(valueObj);
+	    Tcl_DictObjNext(&dictSearch, &keyObj, &valueObj, &done);
+	}
    } else {
 	/*
 	 * Discover what commands are actually exported by the namespace.
@@ -2676,7 +2634,11 @@ BuildEnsembleConfig(
 		    if (isNew) {
 			Tcl_Obj *cmdObj, *cmdPrefixObj;

-			cmdObj = Tcl_NewStringObj(nsCmdName, -1);
+			TclNewObj(cmdObj);
+			Tcl_AppendStringsToObj(cmdObj,
+				ensemblePtr->nsPtr->fullName,
+				(ensemblePtr->nsPtr->parentPtr ? "::" : ""),
+				nsCmdName, NULL);
 			cmdPrefixObj = Tcl_NewListObj(1, &cmdObj);
 			Tcl_SetHashValue(hPtr, cmdPrefixObj);
 			Tcl_IncrRefCount(cmdPrefixObj);
@@ -130,7 +130,6 @@ TclSetupEnv(
 		 * '='; ignore the entry.
 		 */

-		Tcl_DStringFree(&envString);
 		continue;
 	    }
 	    p2++;
@@ -1057,6 +1057,7 @@ TclInitSubsystems(void)
 					 * mutexes. */
 	    TclInitIOSubsystem();	/* Inits a tsd key (noop). */
 	    TclInitEncodingSubsystem();	/* Process wide encoding init. */
+	    TclpSetInterfaces();
 	    TclInitNamespaceSubsystem();/* Register ns obj type (mutexed). */
 	    subsystemsInitialized = 1;
 	}
@@ -1904,7 +1904,7 @@ TclGlob(
    }

    /*
-     * To process a [glob] invocation, this function may be called multiple
+     * To process a [glob] invokation, this function may be called multiple
     * times. Each time, the previously discovered filenames are in the
     * interpreter result. We stash that away here so the result is free for
     * error messsages.
@@ -142,7 +142,7 @@ Tcl_GetBoolean(
 	Tcl_Panic("invalid sharing of Tcl_Obj on C stack");
    }
    if (code == TCL_OK) {
-	TclGetBooleanFromObj(NULL, &obj, boolPtr);
+	*boolPtr = obj.internalRep.longValue;
    }
    return code;
 }
@@ -45,6 +45,19 @@ static Tcl_HashEntry *	AllocArrayEntry(Tcl_HashTable *tablePtr, void *keyPtr);
 static int		CompareArrayKeys(void *keyPtr, Tcl_HashEntry *hPtr);
 static TCL_HASH_TYPE	HashArrayKey(Tcl_HashTable *tablePtr, void *keyPtr);

+/*
+ * Prototypes for the one word hash key methods. Not actually declared because
+ * this is a critical path that is implemented in the core hash table access
+ * function.
+ */
+
+#if 0
+static Tcl_HashEntry *	AllocOneWordEntry(Tcl_HashTable *tablePtr,
+			    void *keyPtr);
+static int		CompareOneWordKeys(void *keyPtr, Tcl_HashEntry *hPtr);
+static unsigned int	HashOneWordKey(Tcl_HashTable *tablePtr, void *keyPtr);
+#endif
+
 /*
 * Prototypes for the string hash key methods.
 */
@@ -985,18 +998,12 @@ static void
 RebuildTable(
    register Tcl_HashTable *tablePtr)	/* Table to enlarge. */
 {
-    int count, index, oldSize = tablePtr->numBuckets;
-    Tcl_HashEntry **oldBuckets = tablePtr->buckets;
+    int oldSize, count, index;
+    Tcl_HashEntry **oldBuckets;
    register Tcl_HashEntry **oldChainPtr, **newChainPtr;
    register Tcl_HashEntry *hPtr;
    const Tcl_HashKeyType *typePtr;

-    /* Avoid outgrowing capability of the memory allocators */
-    if (oldSize > (int)(UINT_MAX / (4 * sizeof(Tcl_HashEntry *)))) {
-	tablePtr->rebuildSize = INT_MAX;
-	return;
-    }
-
    if (tablePtr->keyType == TCL_STRING_KEYS) {
 	typePtr = &tclStringHashKeyType;
    } else if (tablePtr->keyType == TCL_ONE_WORD_KEYS) {
@@ -1008,6 +1015,9 @@ RebuildTable(
 	typePtr = &tclArrayHashKeyType;
    }

+    oldSize = tablePtr->numBuckets;
+    oldBuckets = tablePtr->buckets;
+
    /*
     * Allocate and initialize the new bucket array, and set up hashing
     * constants for new array size.
@@ -721,18 +721,17 @@ Tcl_SetStdChannel(
 {
    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);

-    int init = channel ? 1 : -1;
    switch (type) {
    case TCL_STDIN:
-	tsdPtr->stdinInitialized = init;
+	tsdPtr->stdinInitialized = 1;
 	tsdPtr->stdinChannel = channel;
 	break;
    case TCL_STDOUT:
-	tsdPtr->stdoutInitialized = init;
+	tsdPtr->stdoutInitialized = 1;
 	tsdPtr->stdoutChannel = channel;
 	break;
    case TCL_STDERR:
-	tsdPtr->stderrInitialized = init;
+	tsdPtr->stderrInitialized = 1;
 	tsdPtr->stderrChannel = channel;
 	break;
    }
@@ -769,8 +768,8 @@ Tcl_GetStdChannel(
    switch (type) {
    case TCL_STDIN:
 	if (!tsdPtr->stdinInitialized) {
-	    tsdPtr->stdinInitialized = -1;
 	    tsdPtr->stdinChannel = TclpGetDefaultStdChannel(TCL_STDIN);
+	    tsdPtr->stdinInitialized = 1;

 	    /*
 	     * Artificially bump the refcount to ensure that the channel is
@@ -782,7 +781,6 @@ Tcl_GetStdChannel(
 	     */

 	    if (tsdPtr->stdinChannel != NULL) {
-		tsdPtr->stdinInitialized = 1;
 		Tcl_RegisterChannel(NULL, tsdPtr->stdinChannel);
 	    }
 	}
@@ -790,10 +788,9 @@ Tcl_GetStdChannel(
 	break;
    case TCL_STDOUT:
 	if (!tsdPtr->stdoutInitialized) {
-	    tsdPtr->stdoutInitialized = -1;
 	    tsdPtr->stdoutChannel = TclpGetDefaultStdChannel(TCL_STDOUT);
+	    tsdPtr->stdoutInitialized = 1;
 	    if (tsdPtr->stdoutChannel != NULL) {
-		tsdPtr->stdoutInitialized = 1;
 		Tcl_RegisterChannel(NULL, tsdPtr->stdoutChannel);
 	    }
 	}
@@ -801,10 +798,9 @@ Tcl_GetStdChannel(
 	break;
    case TCL_STDERR:
 	if (!tsdPtr->stderrInitialized) {
-	    tsdPtr->stderrInitialized = -1;
 	    tsdPtr->stderrChannel = TclpGetDefaultStdChannel(TCL_STDERR);
+	    tsdPtr->stderrInitialized = 1;
 	    if (tsdPtr->stderrChannel != NULL) {
-		tsdPtr->stderrInitialized = 1;
 		Tcl_RegisterChannel(NULL, tsdPtr->stderrChannel);
 	    }
 	}
@@ -1072,7 +1068,7 @@ CheckForStdChannelsBeingClosed(
    ChannelState *statePtr = ((Channel *) chan)->state;
    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);

-    if (tsdPtr->stdinInitialized == 1
+    if (tsdPtr->stdinInitialized
 	    && tsdPtr->stdinChannel != NULL
 	    && statePtr == ((Channel *)tsdPtr->stdinChannel)->state) {
 	if (statePtr->refCount < 2) {
@@ -1080,7 +1076,7 @@ CheckForStdChannelsBeingClosed(
 	    tsdPtr->stdinChannel = NULL;
 	    return;
 	}
-    } else if (tsdPtr->stdoutInitialized == 1
+    } else if (tsdPtr->stdoutInitialized
 	    && tsdPtr->stdoutChannel != NULL
 	    && statePtr == ((Channel *)tsdPtr->stdoutChannel)->state) {
 	if (statePtr->refCount < 2) {
@@ -1088,7 +1084,7 @@ CheckForStdChannelsBeingClosed(
 	    tsdPtr->stdoutChannel = NULL;
 	    return;
 	}
-    } else if (tsdPtr->stderrInitialized == 1
+    } else if (tsdPtr->stderrInitialized
 	    && tsdPtr->stderrChannel != NULL
 	    && statePtr == ((Channel *)tsdPtr->stderrChannel)->state) {
 	if (statePtr->refCount < 2) {
@@ -6712,7 +6708,7 @@ Tcl_Flush(
    chanPtr = statePtr->topChanPtr;

    if (CheckChannelErrors(statePtr, TCL_WRITABLE) != 0) {
-	return TCL_ERROR;
+	return -1;
    }

    result = FlushChannel(NULL, chanPtr, 0);
@@ -9036,7 +9032,6 @@ ZeroTransferTimerProc(
 *----------------------------------------------------------------------
 */

-#if !defined(TCL_NO_DEPRECATED)
 int
 TclCopyChannelOld(
    Tcl_Interp *interp,		/* Current interpreter. */
@@ -9048,7 +9043,6 @@ TclCopyChannelOld(
    return TclCopyChannel(interp, inChan, outChan, (Tcl_WideInt) toRead,
            cmdPtr);
 }
-#endif

 int
 TclCopyChannel(
@@ -137,7 +137,7 @@ Tcl_PutsObjCmd(
 	    chanObjPtr = objv[2];
 	    string = objv[3];
 	    break;
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#if TCL_MAJOR_VERSION < 9
 	} else if (strcmp(TclGetString(objv[3]), "nonewline") == 0) {
 	    /*
 	     * The code below provides backwards compatibility with an old
@@ -439,7 +439,7 @@ Tcl_ReadObjCmd(
    if (i < objc) {
 	if ((TclGetIntFromObj(interp, objv[i], &toRead) != TCL_OK)
 		|| (toRead < 0)) {
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#if TCL_MAJOR_VERSION < 9
 	    /*
 	     * The code below provides backwards compatibility with an old
 	     * form of the command that is no longer recommended or
@@ -454,7 +454,7 @@ Tcl_ReadObjCmd(
 			TclGetString(objv[i])));
 		Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", NULL);
 		return TCL_ERROR;
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#if TCL_MAJOR_VERSION < 9
 	    }
 	    newline = 1;
 #endif
@@ -41,8 +41,6 @@ static void		ReflectWatch(ClientData clientData, int mask);
 static int		ReflectBlock(ClientData clientData, int mode);
 #ifdef TCL_THREADS
 static void		ReflectThread(ClientData clientData, int action);
-static int		ReflectEventRun(Tcl_Event *ev, int flags);
-static int		ReflectEventDelete(Tcl_Event *ev, ClientData cd);
 #endif
 static Tcl_WideInt	ReflectSeekWide(ClientData clientData,
 			    Tcl_WideInt offset, int mode, int *errorCodePtr);
@@ -750,7 +748,6 @@ TclChanCreateObjCmd(
 *----------------------------------------------------------------------
 */

-#ifdef TCL_THREADS
 typedef struct {
    Tcl_Event header;
    ReflectedChannel *rcPtr;
@@ -794,7 +791,6 @@ ReflectEventDelete(
    }
    return 1;
 }
-#endif

 int
 TclChanPostEventObjCmd(
@@ -87,7 +87,7 @@ static const Tcl_ChannelType tclRTransformType = {
 * layers upon reading from the channel, plus the functions to manage such.
 */

-typedef struct {
+typedef struct _ResultBuffer_ {
    unsigned char *buf;		/* Reference to the buffer area. */
    int allocated;		/* Allocated size of the buffer area. */
    int used;			/* Number of bytes in the buffer,
@@ -253,7 +253,7 @@ typedef enum {
 * sharing problems.
 */

-typedef struct {
+typedef struct ForwardParamBase {
    int code;			/* O: Ok/Fail of the cmd handler */
    char *msgStr;		/* O: Error message for handler failure */
    int mustFree;		/* O: True if msgStr is allocated, false if
@@ -298,7 +298,7 @@ typedef struct ForwardingResult ForwardingResult;
 * General event structure, with reference to operation specific data.
 */

-typedef struct {
+typedef struct ForwardingEvent {
    Tcl_Event event;		/* Basic event data, has to be first item */
    ForwardingResult *resultPtr;
    ForwardedOperation op;	/* Forwarded driver operation */
@@ -245,7 +245,7 @@ static Tcl_ThreadDataKey fsDataKey;
 * code.
 */

-typedef struct {
+typedef struct FsDivertLoad {
    Tcl_LoadHandle loadHandle;
    Tcl_FSUnloadFileProc *unloadProcPtr;
    Tcl_Obj *divertedFile;
@@ -412,6 +412,7 @@ Tcl_GetCwd(
    return Tcl_DStringValue(cwdPtr);
 }

+/* Obsolete */
 int
 Tcl_EvalFile(
    Tcl_Interp *interp,		/* Interpreter in which to process file. */
@@ -830,6 +831,15 @@ TclResetFilesystem(void)
    if (++theFilesystemEpoch == 0) {
 	++theFilesystemEpoch;
    }
+
+#ifdef _WIN32
+    /*
+     * Cleans up the win32 API filesystem proc lookup table. This must happen
+     * very late in finalization so that deleting of copied dlls can occur.
+     */
+
+    TclWinResetInterfaces();
+#endif
 }

 /*
@@ -1754,7 +1764,7 @@ Tcl_FSEvalFileEx(
     * this cross-platform to allow for scripted documents. [Bug: 2040]
     */

-    Tcl_SetChannelOption(interp, chan, "-eofchar", "\32 {}");
+    Tcl_SetChannelOption(interp, chan, "-eofchar", "\32");

    /*
     * If the encoding is specified, set it for the channel. Else don't touch
@@ -1889,7 +1899,7 @@ TclNREvalFile(
     * this cross-platform to allow for scripted documents. [Bug: 2040]
     */

-    Tcl_SetChannelOption(interp, chan, "-eofchar", "\32 {}");
+    Tcl_SetChannelOption(interp, chan, "-eofchar", "\32");

    /*
     * If the encoding is specified, set it for the channel. Else don't touch
@@ -876,8 +876,7 @@ Tcl_WrongNumArgs(
 				 * NULL. */
 {
    Tcl_Obj *objPtr;
-    int i, len, elemLen;
-    char flags;
+    int i, len, elemLen, flags;
    Interp *iPtr = (Interp *) interp;
    const char *elementStr;

@@ -50,7 +50,7 @@ declare 6 {
 declare 7 {
    int TclCopyAndCollapse(int count, const char *src, char *dst)
 }
-declare 8 {deprecated {}} {
+declare 8 {
    int TclCopyChannelOld(Tcl_Interp *interp, Tcl_Channel inChan,
 	    Tcl_Channel outChan, int toRead, Tcl_Obj *cmdPtr)
 }
@@ -73,7 +73,7 @@ declare 11 {
 declare 12 {
    void TclDeleteVars(Interp *iPtr, TclVarHashTable *tablePtr)
 }
-# Removed in 8.5:
+# Removed in 8.5
 #declare 13 {
 #    int TclDoGlob(Tcl_Interp *interp, char *separators,
 #	    Tcl_DString *headPtr, char *tail, Tcl_GlobTypeData *types)
@@ -88,7 +88,7 @@ declare 14 {
 declare 16 {
    void TclExprFloatError(Tcl_Interp *interp, double value)
 }
-# Removed in 8.4:
+# Removed in 8.4
 #declare 17 {
 #    int TclFileAttrsCmd(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 #}
@@ -114,7 +114,7 @@ declare 23 {
 }
 # Replaced with macro (see tclInt.h) in Tcl 8.5.0, restored in 8.5.10
 declare 24 {
-    int TclFormatInt(char *buffer, Tcl_WideInt n)
+    int TclFormatInt(char *buffer, long n)
 }
 declare 25 {
    void TclFreePackageInfo(Interp *iPtr)
@@ -123,7 +123,7 @@ declare 25 {
 #  declare 26 {
 #      char *TclGetCwd(Tcl_Interp *interp)
 #  }
-# Removed in 8.5:
+# Removed in 8.5
 #declare 27 {
 #    int TclGetDate(char *p, unsigned long now, long zone,
 #	    unsigned long *timePtr)
@@ -147,7 +147,7 @@ declare 32 {
    int TclGetFrame(Tcl_Interp *interp, const char *str,
 	    CallFrame **framePtrPtr)
 }
-# Removed in 8.5:
+# Removed in Tcl 8.5
 #declare 33 {
 #    TclCmdProcType TclGetInterpProc(void)
 #}
@@ -160,7 +160,7 @@ declare 34 {
 #    Tcl_Obj *TclGetIndexedScalar(Tcl_Interp *interp, int localIndex,
 #	    int flags)
 #}
-# Removed in 8.6a2:
+# Removed in 8.6a2
 #declare 36 {
 #    int TclGetLong(Tcl_Interp *interp, const char *str, long *longPtr)
 #}
@@ -185,9 +185,9 @@ declare 41 {
 declare 42 {
    CONST86 char *TclpGetUserHome(const char *name, Tcl_DString *bufferPtr)
 }
-# Removed in 8.5a2:
+# Removed in Tcl 8.5a2
 #declare 43 {
-#    int TclGlobalInvoke(Tcl_Interp *interp, int argc, const char **argv,
+#    int TclGlobalInvoke(Tcl_Interp *interp, int argc, CONST84 char **argv,
 #	    int flags)
 #}
 declare 44 {
@@ -220,14 +220,14 @@ declare 50 {
 declare 51 {
    int TclInterpInit(Tcl_Interp *interp)
 }
-# Removed in 8.5a2:
+# Removed in Tcl 8.5a2
 #declare 52 {
-#    int TclInvoke(Tcl_Interp *interp, int argc, const char **argv,
+#    int TclInvoke(Tcl_Interp *interp, int argc, CONST84 char **argv,
 #	    int flags)
 #}
 declare 53 {
    int TclInvokeObjectCommand(ClientData clientData, Tcl_Interp *interp,
-	    int argc, const char **argv)
+	    int argc, CONST84 char **argv)
 }
 declare 54 {
    int TclInvokeStringCommand(ClientData clientData, Tcl_Interp *interp,
@@ -273,7 +273,7 @@ declare 64 {
    int TclObjInvoke(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[],
 	    int flags)
 }
-# Removed in 8.5a2:
+# Removed in Tcl 8.5a2
 #declare 65 {
 #    int TclObjInvokeGlobal(Tcl_Interp *interp, int objc,
 #	    Tcl_Obj *const objv[], int flags)
@@ -313,7 +313,9 @@ declare 75 {
 declare 76 {
    unsigned long TclpGetSeconds(void)
 }
-declare 77 {deprecated {}} {
+
+# deprecated
+declare 77 {
    void TclpGetTime(Tcl_Time *time)
 }
 # Removed in 8.6:
@@ -355,7 +357,7 @@ declare 81 {
 #  declare 87 {
 #      void TclPlatformInit(Tcl_Interp *interp)
 #  }
-declare 88 {deprecated {}} {
+declare 88 {
    char *TclPrecTraceProc(ClientData clientData, Tcl_Interp *interp,
 	    const char *name1, const char *name2, int flags)
 }
@@ -378,7 +380,7 @@ declare 92 {
 declare 93 {
    void TclProcDeleteProc(ClientData clientData)
 }
-# Removed in 8.5:
+# Removed in Tcl 8.5:
 #declare 94 {
 #    int TclProcInterpProc(ClientData clientData, Tcl_Interp *interp,
 #	    int argc, const char **argv)
@@ -417,7 +419,7 @@ declare 103 {
    int TclSockGetPort(Tcl_Interp *interp, const char *str, const char *proto,
 	    int *portPtr)
 }
-declare 104 {deprecated {}} {
+declare 104 {
    int TclSockMinimumBuffersOld(int sock, int size)
 }
 # Replaced by Tcl_FSStat in 8.4:
@@ -453,26 +455,26 @@ declare 111 {
 	    Tcl_ResolveCompiledVarProc *compiledVarProc)
 }
 declare 112 {
-    int TclAppendExportList(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+    int Tcl_AppendExportList(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
 	    Tcl_Obj *objPtr)
 }
 declare 113 {
-    Tcl_Namespace *TclCreateNamespace(Tcl_Interp *interp, const char *name,
+    Tcl_Namespace *Tcl_CreateNamespace(Tcl_Interp *interp, const char *name,
 	    ClientData clientData, Tcl_NamespaceDeleteProc *deleteProc)
 }
 declare 114 {
-    void TclDeleteNamespace(Tcl_Namespace *nsPtr)
+    void Tcl_DeleteNamespace(Tcl_Namespace *nsPtr)
 }
 declare 115 {
-    int TclExport(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+    int Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
 	    const char *pattern, int resetListFirst)
 }
 declare 116 {
-    Tcl_Command TclFindCommand(Tcl_Interp *interp, const char *name,
+    Tcl_Command Tcl_FindCommand(Tcl_Interp *interp, const char *name,
 	    Tcl_Namespace *contextNsPtr, int flags)
 }
 declare 117 {
-    Tcl_Namespace *TclFindNamespace(Tcl_Interp *interp, const char *name,
+    Tcl_Namespace *Tcl_FindNamespace(Tcl_Interp *interp, const char *name,
 	    Tcl_Namespace *contextNsPtr, int flags)
 }
 declare 118 {
@@ -488,28 +490,28 @@ declare 120 {
 	    Tcl_Namespace *contextNsPtr, int flags)
 }
 declare 121 {
-    int TclForgetImport(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+    int Tcl_ForgetImport(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
 	    const char *pattern)
 }
 declare 122 {
-    Tcl_Command TclGetCommandFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
+    Tcl_Command Tcl_GetCommandFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
 }
 declare 123 {
-    void TclGetCommandFullName(Tcl_Interp *interp, Tcl_Command command,
+    void Tcl_GetCommandFullName(Tcl_Interp *interp, Tcl_Command command,
 	    Tcl_Obj *objPtr)
 }
 declare 124 {
-    Tcl_Namespace *TclGetCurrentNamespace_(Tcl_Interp *interp)
+    Tcl_Namespace *Tcl_GetCurrentNamespace(Tcl_Interp *interp)
 }
 declare 125 {
-    Tcl_Namespace *TclGetGlobalNamespace_(Tcl_Interp *interp)
+    Tcl_Namespace *Tcl_GetGlobalNamespace(Tcl_Interp *interp)
 }
 declare 126 {
    void Tcl_GetVariableFullName(Tcl_Interp *interp, Tcl_Var variable,
 	    Tcl_Obj *objPtr)
 }
 declare 127 {
-    int TclImport(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+    int Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
 	    const char *pattern, int allowOverwrite)
 }
 declare 128 {
@@ -530,7 +532,7 @@ declare 131 {
 declare 132 {
    int TclpHasSockets(Tcl_Interp *interp)
 }
-declare 133 {deprecated {}} {
+declare 133 {
    struct tm *TclpGetDate(const time_t *time, int useGMT)
 }
 # Removed in 8.5
@@ -548,7 +550,7 @@ declare 133 {deprecated {}} {
 #   int TclpChdir(const char *dirName)
 #}
 declare 138 {
-    const char *TclGetEnv(const char *name, Tcl_DString *valuePtr)
+    CONST84_RETURN char *TclGetEnv(const char *name, Tcl_DString *valuePtr)
 }
 #declare 139 {
 #    int TclpLoadFile(Tcl_Interp *interp, char *fileName, char *sym1,
@@ -560,7 +562,7 @@ declare 138 {
 #}
 # This is used by TclX, but should otherwise be considered private
 declare 141 {
-    const char *TclpGetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr)
+    CONST84_RETURN char *TclpGetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr)
 }
 declare 142 {
    int TclSetByteCodeFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr,
@@ -623,10 +625,12 @@ declare 156 {
 declare 157 {
    Var *TclVarTraceExists(Tcl_Interp *interp, const char *varName)
 }
-declare 158 {deprecated {use public Tcl_SetStartupScript()}} {
+# REMOVED (except from stub table) - use public Tcl_SetStartupScript()
+declare 158 {
    void TclSetStartupScriptFileName(const char *filename)
 }
-declare 159 {deprecated {use public Tcl_GetStartupScript()}} {
+# REMOVED (except from stub table) - use public Tcl_GetStartupScript()
+declare 159 {
    const char *TclGetStartupScriptFileName(void)
 }
 #declare 160 {
@@ -672,10 +676,13 @@ declare 166 {
 	    int index, Tcl_Obj *valuePtr)
 }

-declare 167 {deprecated {use public Tcl_SetStartupScript()}} {
+# VFS-aware versions of Tcl*StartupScriptFileName (158 and 159 above)
+# REMOVED (except from stub table) - use public Tcl_SetStartupScript()
+declare 167 {
    void TclSetStartupScriptPath(Tcl_Obj *pathPtr)
 }
-declare 168 {deprecated {use public Tcl_GetStartupScript()}} {
+# REMOVED (except from stub table) - use public Tcl_GetStartupScript()
+declare 168 {
    Tcl_Obj *TclGetStartupScriptPath(void)
 }
 # variant of Tcl_UtfNCmp that takes n as bytes, not chars
@@ -723,11 +730,12 @@ declare 177 {
    void TclVarErrMsg(Tcl_Interp *interp, const char *part1, const char *part2,
 	    const char *operation, const char *reason)
 }
+# TIP 338 made these public - now declared in tcl.h too
 declare 178 {
-    void TclSetStartupScript(Tcl_Obj *pathPtr, const char *encodingName)
+    void Tcl_SetStartupScript(Tcl_Obj *pathPtr, const char *encodingName)
 }
 declare 179 {
-    Tcl_Obj *TclGetStartupScript(const char **encodingNamePtr)
+    Tcl_Obj *Tcl_GetStartupScript(const char **encodingNamePtr)
 }

 # REMOVED
@@ -740,10 +748,12 @@ declare 179 {
 #	    const char *file, int line)
 #}

-declare 182 {deprecated {}} {
+# TclpGmtime and TclpLocaltime promoted to the generic interface from unix
+
+declare 182 {
     struct tm *TclpLocaltime(const time_t *clock)
 }
-declare 183 {deprecated {}}  {
+declare 183 {
     struct tm *TclpGmtime(const time_t *clock)
 }

@@ -927,7 +937,10 @@ declare 234 {
 declare 235 {
    void TclInitVarHashTable(TclVarHashTable *tablePtr, Namespace *nsPtr)
 }
-declare 236 {deprecated {use Tcl_BackgroundException}} {
+
+
+# TIP 337 made this one public
+declare 236 {
    void TclBackgroundException(Tcl_Interp *interp, int code)
 }

@@ -1077,7 +1090,7 @@ declare 9 win {
 declare 10 win {
    Tcl_DirEntry *TclpReaddir(DIR *dir)
 }
-# Removed in 8.3.1 (for Win32s only):
+# Removed in 8.3.1 (for Win32s only)
 #declare 10 win {
 #    int TclWinSynchSpawn(void *args, int type, void **trans, Tcl_Pid *pidPtr)
 #}
@@ -1127,6 +1140,7 @@ declare 19 win {
 declare 20 win {
    void TclWinAddProcess(HANDLE hProcess, DWORD id)
 }
+# new for 8.4.20+/8.5.12+
 declare 21 win {
    char *TclpInetNtoa(struct in_addr addr)
 }
@@ -160,13 +160,13 @@ typedef struct Tcl_ResolvedVarInfo {
 } Tcl_ResolvedVarInfo;

 typedef int (Tcl_ResolveCompiledVarProc)(Tcl_Interp *interp,
-	const char *name, int length, Tcl_Namespace *context,
+	CONST84 char *name, int length, Tcl_Namespace *context,
 	Tcl_ResolvedVarInfo **rPtr);

-typedef int (Tcl_ResolveVarProc)(Tcl_Interp *interp, const char *name,
+typedef int (Tcl_ResolveVarProc)(Tcl_Interp *interp, CONST84 char *name,
 	Tcl_Namespace *context, int flags, Tcl_Var *rPtr);

-typedef int (Tcl_ResolveCmdProc)(Tcl_Interp *interp, const char *name,
+typedef int (Tcl_ResolveCmdProc)(Tcl_Interp *interp, CONST84 char *name,
 	Tcl_Namespace *context, int flags, Tcl_Command *rPtr);

 typedef struct Tcl_ResolverInfo {
@@ -265,7 +265,7 @@ typedef struct Namespace {
 				 * strings; values have type (Namespace *). If
 				 * NULL, there are no children. */
 #endif
-    unsigned long nsId;		/* Unique id for the namespace. */
+    size_t nsId;		/* Unique id for the namespace. */
    Tcl_Interp *interp;		/* The interpreter containing this
 				 * namespace. */
    int flags;			/* OR-ed combination of the namespace status
@@ -274,7 +274,7 @@ typedef struct Namespace {
 				 * frames for this namespace that are on the
 				 * Tcl call stack. The namespace won't be
 				 * freed until activationCount becomes zero. */
-    unsigned int refCount;	/* Count of references by namespaceName
+    int refCount;		/* Count of references by namespaceName
 				 * objects. The namespace can't be freed until
 				 * refCount becomes zero. */
    Tcl_HashTable cmdTable;	/* Contains all the commands currently
@@ -299,12 +299,12 @@ typedef struct Namespace {
 				 * registered using "namespace export". */
    int maxExportPatterns;	/* Mumber of export patterns for which space
 				 * is currently allocated. */
-    unsigned int cmdRefEpoch;	/* Incremented if a newly added command
+    size_t cmdRefEpoch;		/* Incremented if a newly added command
 				 * shadows a command for which this namespace
 				 * has already cached a Command* pointer; this
 				 * causes all its cached Command* pointers to
 				 * be invalidated. */
-    unsigned int resolverEpoch;	/* Incremented whenever (a) the name
+    size_t resolverEpoch;	/* Incremented whenever (a) the name
 				 * resolution rules change for this namespace
 				 * or (b) a newly added command shadows a
 				 * command that is compiled to bytecodes. This
@@ -331,7 +331,7 @@ typedef struct Namespace {
 				 * LookupCompiledLocal to resolve variable
 				 * references within the namespace at compile
 				 * time. */
-    unsigned int exportLookupEpoch;	/* Incremented whenever a command is added to
+    size_t exportLookupEpoch;	/* Incremented whenever a command is added to
 				 * a namespace, removed from a namespace or
 				 * the exports of a namespace are changed.
 				 * Allows TIP#112-driven command lists to be
@@ -426,13 +426,13 @@ struct NamespacePathEntry {
 */

 typedef struct EnsembleConfig {
-    Namespace *nsPtr;		/* The namespace backing this ensemble up. */
+    Namespace *nsPtr;		/* The namspace backing this ensemble up. */
    Tcl_Command token;		/* The token for the command that provides
 				 * ensemble support for the namespace, or NULL
 				 * if the command has been deleted (or never
 				 * existed; the global namespace never has an
 				 * ensemble command.) */
-    unsigned int epoch;		/* The epoch at which this ensemble's table of
+    size_t epoch;		/* The epoch at which this ensemble's table of
 				 * exported commands is valid. */
    char **subcommandArrayPtr;	/* Array of ensemble subcommand names. At all
 				 * consistent points, this will have the same
@@ -545,7 +545,7 @@ typedef struct CommandTrace {
    struct CommandTrace *nextPtr;
 				/* Next in list of traces associated with a
 				 * particular command. */
-    size_t refCount;	/* Used to ensure this structure is not
+    int refCount;		/* Used to ensure this structure is not
 				 * deleted too early. Keeps track of how many
 				 * pieces of code have a pointer to this
 				 * structure. */
@@ -618,7 +618,7 @@ typedef struct Var {

 typedef struct VarInHash {
    Var var;
-    unsigned int refCount;	/* Counts number of active uses of this
+    int refCount;		/* Counts number of active uses of this
 				 * variable: 1 for the entry in the hash
 				 * table, 1 for each additional variable whose
 				 * linkPtr points here, 1 for each nested
@@ -950,7 +950,7 @@ typedef struct CompiledLocal {
 typedef struct Proc {
    struct Interp *iPtr;	/* Interpreter for which this command is
 				 * defined. */
-    unsigned int refCount;	/* Reference count: 1 if still present in
+    int refCount;		/* Reference count: 1 if still present in
 				 * command table plus 1 for each call to the
 				 * procedure that is currently active. This
 				 * structure can be freed when refCount
@@ -1067,7 +1067,7 @@ typedef struct AssocData {
 */

 typedef struct LocalCache {
-    unsigned int refCount;
+    int refCount;
    int numVars;
    Tcl_Obj *varName0;
 } LocalCache;
@@ -1229,7 +1229,7 @@ typedef struct CmdFrame {
 typedef struct CFWord {
    CmdFrame *framePtr;		/* CmdFrame to access. */
    int word;			/* Index of the word in the command. */
-    unsigned int refCount;	/* Number of times the word is on the
+    int refCount;		/* Number of times the word is on the
 				 * stack. */
 } CFWord;

@@ -1492,11 +1492,11 @@ typedef struct LiteralEntry {
 				 * NULL if end of chain. */
    Tcl_Obj *objPtr;		/* Points to Tcl object that holds the
 				 * literal's bytes and length. */
-    size_t refCount;		/* If in an interpreter's global literal
+    int refCount;		/* If in an interpreter's global literal
 				 * table, the number of ByteCode structures
 				 * that share the literal object; the literal
 				 * entry can be freed when refCount drops to
-				 * 0. If in a local literal table, (size_t)-1. */
+				 * 0. If in a local literal table, -1. */
    Namespace *nsPtr;		/* Namespace in which this literal is used. We
 				 * try to avoid sharing literal non-FQ command
 				 * names among different namespaces to reduce
@@ -1516,7 +1516,7 @@ typedef struct LiteralTable {
 				 * table. */
    int rebuildSize;		/* Enlarge table when numEntries gets to be
 				 * this large. */
-    unsigned int mask;		/* Mask value used in hashing function. */
+    int mask;			/* Mask value used in hashing function. */
 } LiteralTable;

 /*
@@ -1634,12 +1634,12 @@ typedef struct Command {
 				 * recreated). */
    Namespace *nsPtr;		/* Points to the namespace containing this
 				 * command. */
-    unsigned int refCount;	/* 1 if in command hashtable plus 1 for each
+    int refCount;		/* 1 if in command hashtable plus 1 for each
 				 * reference from a CmdName Tcl object
 				 * representing a command's name in a ByteCode
 				 * instruction sequence. This structure can be
 				 * freed when refCount becomes zero. */
-    unsigned int cmdEpoch;	/* Incremented to invalidate any references
+    size_t cmdEpoch;		/* Incremented to invalidate any references
 				 * that point to this command when it is
 				 * renamed, deleted, hidden, or exposed. */
    CompileProc *compileProc;	/* Procedure called to compile command. NULL
@@ -1826,7 +1826,7 @@ typedef struct Interp {
 				 * unused space in interp was repurposed for
 				 * pluggable bytecode optimizers. The core
 				 * contains one optimizer, which can be
-				 * selectively overridden by extensions. */
+				 * selectively overriden by extensions. */
    } extra;

    /*
@@ -1862,7 +1862,7 @@ typedef struct Interp {
     * See Tcl_AppendResult code for details.
     */

-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
    char *appendResult;		/* Storage space for results generated by
 				 * Tcl_AppendResult. Ckalloc-ed. NULL means
 				 * not yet allocated. */
@@ -1936,13 +1936,11 @@ typedef struct Interp {
 				 * string. Returned by Tcl_ObjSetVar2 when
 				 * variable traces change a variable in a
 				 * gross way. */
-#if TCL_MAJOR_VERSION < 9
-# if !defined(TCL_NO_DEPRECATED)
-    char resultSpace[TCL_DSTRING_STATIC_SIZE+1];
+#ifndef TCL_NO_DEPRECATED
+    char resultSpace[TCL_RESULT_SIZE+1];
 				/* Static space holding small results. */
-# else
-    char resultSpaceDontUse[TCL_DSTRING_STATIC_SIZE+1];
-# endif
+#else
+    char resultSpaceDontUse[TCL_RESULT_SIZE+1];
 #endif
    Tcl_Obj *objResultPtr;	/* If the last command returned an object
 				 * result, this points to it. Should not be
@@ -2253,7 +2251,7 @@ typedef struct Interp {
 *			use the rand() or srand() functions.
 * SAFE_INTERP:		Non zero means that the current interp is a safe
 *			interp (i.e. it has only the safe commands installed,
- *			less privilege than a regular interp).
+ *			less priviledge than a regular interp).
 * INTERP_DEBUG_FRAME:	Used for switching on various extra interpreter
 *			debug/info mechanisms (e.g. info frame eval/uplevel
 *			tracing) which are performance intensive.
@@ -2386,7 +2384,7 @@ typedef enum TclEolTranslation {
 */

 typedef struct List {
-    unsigned int refCount;
+    int refCount;
    int maxElemCount;		/* Total number of element array slots. */
    int elemCount;		/* Current number of list elements. */
    int canonicalFlag;		/* Set if the string representation was
@@ -2394,7 +2392,7 @@ typedef struct List {
 				 * be ignored if there is no string rep at
 				 * all.*/
    Tcl_Obj *elements;		/* First list element; the struct is grown to
-				 * accommodate all elements. */
+				 * accomodate all elements. */
 } List;

 #define LIST_MAX \
@@ -2447,46 +2445,32 @@ typedef struct List {
 #define TCL_EACH_COLLECT    1	/* Collect iteration result like [lmap] */

 /*
- * Macros providing a faster path to booleans and integers:
- * Tcl_GetBooleanFromObj, Tcl_GetLongFromObj, Tcl_GetIntFromObj
- * and TclGetIntForIndex.
+ * Macros providing a faster path to integers: Tcl_GetLongFromObj everywhere,
+ * Tcl_GetIntFromObj and TclGetIntForIndex on platforms where longs are ints.
 *
 * WARNING: these macros eval their args more than once.
 */

-#define TclGetBooleanFromObj(interp, objPtr, boolPtr) \
-    (((objPtr)->typePtr == &tclIntType)			\
-	? (*(boolPtr) = ((objPtr)->internalRep.wideValue!=0), TCL_OK)	\
-	: ((objPtr)->typePtr == &tclBooleanType)			\
-	? (*(boolPtr) = ((objPtr)->internalRep.longValue!=0), TCL_OK)	\
-	: Tcl_GetBooleanFromObj((interp), (objPtr), (boolPtr)))
-
-#ifdef TCL_WIDE_INT_IS_LONG
 #define TclGetLongFromObj(interp, objPtr, longPtr) \
    (((objPtr)->typePtr == &tclIntType)	\
-	    ? ((*(longPtr) = (objPtr)->internalRep.wideValue), TCL_OK) \
+	    ? ((*(longPtr) = (objPtr)->internalRep.longValue), TCL_OK) \
 	    : Tcl_GetLongFromObj((interp), (objPtr), (longPtr)))
-#else
-#define TclGetLongFromObj(interp, objPtr, longPtr) \
-    (((objPtr)->typePtr == &tclIntType \
-	    && (objPtr)->internalRep.wideValue >= -(Tcl_WideInt)(ULONG_MAX) \
-	    && (objPtr)->internalRep.wideValue <= (Tcl_WideInt)(ULONG_MAX))	\
-	    ? ((*(longPtr) = (long)(objPtr)->internalRep.wideValue), TCL_OK) \
-	    : Tcl_GetLongFromObj((interp), (objPtr), (longPtr)))
-#endif

+#if (LONG_MAX == INT_MAX)
 #define TclGetIntFromObj(interp, objPtr, intPtr) \
-    (((objPtr)->typePtr == &tclIntType \
-	    && (objPtr)->internalRep.wideValue >= -(Tcl_WideInt)(UINT_MAX) \
-	    && (objPtr)->internalRep.wideValue <= (Tcl_WideInt)(UINT_MAX))	\
-	    ? ((*(intPtr) = (int)(objPtr)->internalRep.wideValue), TCL_OK) \
+    (((objPtr)->typePtr == &tclIntType)	\
+	    ? ((*(intPtr) = (objPtr)->internalRep.longValue), TCL_OK) \
 	    : Tcl_GetIntFromObj((interp), (objPtr), (intPtr)))
 #define TclGetIntForIndexM(interp, objPtr, endValue, idxPtr) \
-    (((objPtr)->typePtr == &tclIntType \
-	    && (objPtr)->internalRep.wideValue >= INT_MIN \
-	    && (objPtr)->internalRep.wideValue <= INT_MAX)	\
-	    ? ((*(idxPtr) = (int)(objPtr)->internalRep.wideValue), TCL_OK) \
+    (((objPtr)->typePtr == &tclIntType)	\
+	    ? ((*(idxPtr) = (objPtr)->internalRep.longValue), TCL_OK) \
 	    : TclGetIntForIndex((interp), (objPtr), (endValue), (idxPtr)))
+#else
+#define TclGetIntFromObj(interp, objPtr, intPtr) \
+    Tcl_GetIntFromObj((interp), (objPtr), (intPtr))
+#define TclGetIntForIndexM(interp, objPtr, ignore, idxPtr)	\
+    TclGetIntForIndex(interp, objPtr, ignore, idxPtr)
+#endif

 /*
 * Macro used to save a function call for common uses of
@@ -2496,11 +2480,21 @@ typedef struct List {
 *			Tcl_WideInt *wideIntPtr);
 */

+#ifdef TCL_WIDE_INT_IS_LONG
 #define TclGetWideIntFromObj(interp, objPtr, wideIntPtr) \
    (((objPtr)->typePtr == &tclIntType)					\
 	? (*(wideIntPtr) = (Tcl_WideInt)				\
-		((objPtr)->internalRep.wideValue), TCL_OK) :		\
+		((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().
@@ -2512,13 +2506,13 @@ typedef struct List {
 * tip of the path, so duplication of shared objects should be done along the
 * way.
 *
- * DICT_PATH_EXISTS indicates that we are performing an existence test and a
+ * DICT_PATH_EXISTS indicates that we are performing an existance test and a
 * lookup failure should therefore not be an error. If (and only if) this flag
 * is set, TclTraceDictPath() will return the special value
 * DICT_PATH_NON_EXISTENT if the path is not traceable.
 *
 * DICT_PATH_CREATE (which also requires the DICT_PATH_UPDATE bit to be set)
- * indicates that we are to create non-existent dictionaries on the path.
+ * indicates that we are to create non-existant dictionaries on the path.
 */

 #define DICT_PATH_READ		0
@@ -2624,7 +2618,7 @@ typedef Tcl_ObjCmdProc *TclObjCmdProcType;
 *----------------------------------------------------------------
 */

-typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, unsigned int *lengthPtr,
+typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, size_t *lengthPtr,
 	Tcl_Encoding *encodingPtr);

 /*
@@ -2636,9 +2630,9 @@ typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, unsigned int *leng
 */

 typedef struct ProcessGlobalValue {
-    unsigned int epoch;		/* Epoch counter to detect changes in the
+    size_t epoch;		/* Epoch counter to detect changes in the
 				 * master value. */
-    unsigned int numBytes;	/* Length of the master string. */
+    size_t numBytes;		/* Length of the master string. */
    char *value;		/* The master string value. */
    Tcl_Encoding encoding;	/* system encoding when master string was
 				 * initialized. */
@@ -2726,6 +2720,9 @@ MODULE_SCOPE const Tcl_ObjType tclDictType;
 MODULE_SCOPE const Tcl_ObjType tclProcBodyType;
 MODULE_SCOPE const Tcl_ObjType tclStringType;
 MODULE_SCOPE const Tcl_ObjType tclEnsembleCmdType;
+#ifndef TCL_WIDE_INT_IS_LONG
+MODULE_SCOPE const Tcl_ObjType tclWideIntType;
+#endif
 MODULE_SCOPE const Tcl_ObjType tclRegexpType;
 MODULE_SCOPE Tcl_ObjType tclCmdNameType;

@@ -2775,7 +2772,6 @@ MODULE_SCOPE Tcl_ObjCmdProc TclNRForObjCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclNRForeachCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclNRIfObjCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclNRLmapCmd;
-MODULE_SCOPE Tcl_ObjCmdProc TclNRPackageObjCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclNRSourceObjCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclNRSubstObjCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclNRSwitchObjCmd;
@@ -2904,8 +2900,6 @@ MODULE_SCOPE int	TclChanCaughtErrorBypass(Tcl_Interp *interp,
 			    Tcl_Channel chan);
 MODULE_SCOPE Tcl_ObjCmdProc TclChannelNamesCmd;
 MODULE_SCOPE Tcl_NRPostProc TclClearRootEnsemble;
-MODULE_SCOPE int	TclCompareTwoNumbers(Tcl_Obj *valuePtr,
-			    Tcl_Obj *value2Ptr);
 MODULE_SCOPE ContLineLoc *TclContinuationsEnter(Tcl_Obj *objPtr, int num,
 			    int *loc);
 MODULE_SCOPE void	TclContinuationsEnterDerived(Tcl_Obj *objPtr,
@@ -2915,25 +2909,12 @@ MODULE_SCOPE void	TclContinuationsCopy(Tcl_Obj *objPtr,
 			    Tcl_Obj *originObjPtr);
 MODULE_SCOPE int	TclConvertElement(const char *src, int length,
 			    char *dst, int flags);
-MODULE_SCOPE Tcl_Command TclCreateObjCommandInNs (
-			    Tcl_Interp *interp,
-			    const char *cmdName,
-			    Tcl_Namespace *nsPtr,
-			    Tcl_ObjCmdProc *proc,
-			    ClientData clientData,
-			    Tcl_CmdDeleteProc *deleteProc);
-MODULE_SCOPE Tcl_Command TclCreateEnsembleInNs(
-			    Tcl_Interp *interp,
-			    const char *name,
-			    Tcl_Namespace *nameNamespacePtr,
-			    Tcl_Namespace *ensembleNamespacePtr,
-			    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 evaluation, with line information. */
+/* 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,
 			    int *clNextOuter, const char *outerScript);
@@ -2956,8 +2937,6 @@ MODULE_SCOPE char *	TclDStringAppendDString(Tcl_DString *dsPtr,
 MODULE_SCOPE Tcl_Obj *	TclDStringToObj(Tcl_DString *dsPtr);
 MODULE_SCOPE Tcl_Obj *const *	TclFetchEnsembleRoot(Tcl_Interp *interp,
 			    Tcl_Obj *const *objv, int objc, int *objcPtr);
-MODULE_SCOPE Tcl_Namespace * 	TclEnsureNamespace(Tcl_Interp *interp,
-			    Tcl_Namespace *namespacePtr);
 MODULE_SCOPE void	TclFinalizeAllocSubsystem(void);
 MODULE_SCOPE void	TclFinalizeAsync(void);
 MODULE_SCOPE void	TclFinalizeDoubleConversion(void);
@@ -2984,15 +2963,6 @@ MODULE_SCOPE double	TclFloor(const mp_int *a);
 MODULE_SCOPE void	TclFormatNaN(double value, char *buffer);
 MODULE_SCOPE int	TclFSFileAttrIndex(Tcl_Obj *pathPtr,
 			    const char *attributeName, int *indexPtr);
-MODULE_SCOPE Tcl_Command TclNRCreateCommandInNs (
-			    Tcl_Interp *interp,
-			    const char *cmdName,
-			    Tcl_Namespace *nsPtr,
-			    Tcl_ObjCmdProc *proc,
-			    Tcl_ObjCmdProc *nreProc,
-			    ClientData clientData,
-			    Tcl_CmdDeleteProc *deleteProc);
-
 MODULE_SCOPE int	TclNREvalFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
 			    const char *encodingName);
 MODULE_SCOPE void	TclFSUnloadTempFile(Tcl_LoadHandle loadHandle);
@@ -3037,9 +3007,6 @@ MODULE_SCOPE int	TclInfoLocalsCmd(ClientData dummy, Tcl_Interp *interp,
 MODULE_SCOPE int	TclInfoVarsCmd(ClientData dummy, Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
 MODULE_SCOPE void	TclInitAlloc(void);
-MODULE_SCOPE void	TclInitBignumFromLong(mp_int *, long);
-MODULE_SCOPE void	TclInitBignumFromWideInt(mp_int *, Tcl_WideInt);
-MODULE_SCOPE void	TclInitBignumFromWideUInt(mp_int *, Tcl_WideUInt);
 MODULE_SCOPE void	TclInitDbCkalloc(void);
 MODULE_SCOPE void	TclInitDoubleConversion(void);
 MODULE_SCOPE void	TclInitEmbeddedConfigurationInformation(
@@ -3065,8 +3032,6 @@ MODULE_SCOPE Tcl_Obj *	TclLindexFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
 MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, int line, int n,
 			    int *lines, Tcl_Obj *const *elems);
 MODULE_SCOPE Tcl_Obj *	TclListObjCopy(Tcl_Interp *interp, Tcl_Obj *listPtr);
-MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Obj *listPtr, int fromIdx,
-			    int toIdx);
 MODULE_SCOPE Tcl_Obj *	TclLsetList(Tcl_Interp *interp, Tcl_Obj *listPtr,
 			    Tcl_Obj *indexPtr, Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Obj *	TclLsetFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
@@ -3121,7 +3086,7 @@ MODULE_SCOPE int	TclpThreadCreate(Tcl_ThreadId *idPtr,
 			    int stackSize, int flags);
 MODULE_SCOPE int	TclpFindVariable(const char *name, int *lengthPtr);
 MODULE_SCOPE void	TclpInitLibraryPath(char **valuePtr,
-			    unsigned int *lengthPtr, Tcl_Encoding *encodingPtr);
+			    size_t *lengthPtr, Tcl_Encoding *encodingPtr);
 MODULE_SCOPE void	TclpInitLock(void);
 MODULE_SCOPE void	TclpInitPlatform(void);
 MODULE_SCOPE void	TclpInitUnlock(void);
@@ -3155,6 +3120,7 @@ MODULE_SCOPE Tcl_Obj *	TclPathPart(Tcl_Interp *interp, Tcl_Obj *pathPtr,
 			    Tcl_PathPart portion);
 MODULE_SCOPE char *	TclpReadlink(const char *fileName,
 			    Tcl_DString *linkPtr);
+MODULE_SCOPE void	TclpSetInterfaces(void);
 MODULE_SCOPE void	TclpSetVariables(Tcl_Interp *interp);
 MODULE_SCOPE void *	TclThreadStorageKeyGet(Tcl_ThreadDataKey *keyPtr);
 MODULE_SCOPE void	TclThreadStorageKeySet(Tcl_ThreadDataKey *keyPtr,
@@ -3168,7 +3134,7 @@ MODULE_SCOPE int	TclReToGlob(Tcl_Interp *interp, const char *reStr,
 			    int reStrLen, Tcl_DString *dsPtr, int *flagsPtr,
 			    int *quantifiersFoundPtr);
 MODULE_SCOPE int	TclScanElement(const char *string, int length,
-			    char *flagPtr);
+			    int *flagPtr);
 MODULE_SCOPE void	TclSetBgErrorHandler(Tcl_Interp *interp,
 			    Tcl_Obj *cmdPrefix);
 MODULE_SCOPE void	TclSetBignumIntRep(Tcl_Obj *objPtr,
@@ -3185,10 +3151,20 @@ MODULE_SCOPE void	TclSpellFix(Tcl_Interp *interp,
 			    Tcl_Obj *bad, Tcl_Obj *fix);
 MODULE_SCOPE void *	TclStackRealloc(Tcl_Interp *interp, void *ptr,
 			    int numBytes);
+MODULE_SCOPE int	TclStringCatObjv(Tcl_Interp *interp, int inPlace,
+			    int objc, Tcl_Obj *const objv[],
+			    Tcl_Obj **objPtrPtr);
+MODULE_SCOPE int	TclStringFind(Tcl_Obj *needle, Tcl_Obj *haystack,
+			    int start);
+MODULE_SCOPE int	TclStringLast(Tcl_Obj *needle, Tcl_Obj *haystack,
+			    int last);
 MODULE_SCOPE int	TclStringMatch(const char *str, int strLen,
 			    const char *pattern, int ptnLen, int flags);
 MODULE_SCOPE int	TclStringMatchObj(Tcl_Obj *stringObj,
 			    Tcl_Obj *patternObj, int flags);
+MODULE_SCOPE Tcl_Obj *	TclStringObjReverse(Tcl_Obj *objPtr);
+MODULE_SCOPE int	TclStringRepeat(Tcl_Interp *interp, Tcl_Obj *objPtr,
+			    int count, Tcl_Obj **objPtrPtr);
 MODULE_SCOPE void	TclSubstCompile(Tcl_Interp *interp, const char *bytes,
 			    int numBytes, int flags, int line,
 			    struct CompileEnv *envPtr);
@@ -3200,13 +3176,10 @@ MODULE_SCOPE void	TclSubstParse(Tcl_Interp *interp, const char *bytes,
 MODULE_SCOPE int	TclSubstTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr,
 			    int count, int *tokensLeftPtr, int line,
 			    int *clNextOuter, const char *outerScript);
-MODULE_SCOPE int	TclTrim(const char *bytes, int numBytes,
-			    const char *trim, int numTrim, int *trimRight);
 MODULE_SCOPE int	TclTrimLeft(const char *bytes, int numBytes,
 			    const char *trim, int numTrim);
 MODULE_SCOPE int	TclTrimRight(const char *bytes, int numBytes,
 			    const char *trim, int numTrim);
-MODULE_SCOPE int	TclUtfCmp(const char *cs, const char *ct);
 MODULE_SCOPE int	TclUtfCasecmp(const char *cs, const char *ct);
 MODULE_SCOPE int	TclUtfCount(int ch);
 MODULE_SCOPE Tcl_Obj *	TclpNativeToNormalized(ClientData clientData);
@@ -3256,7 +3229,7 @@ MODULE_SCOPE Tcl_Command TclInitBinaryCmd(Tcl_Interp *interp);
 MODULE_SCOPE int	Tcl_BreakObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 MODULE_SCOPE int	Tcl_CaseObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
@@ -3995,29 +3968,6 @@ MODULE_SCOPE int	TclCompileAssembleCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);

-/*
- * Routines that provide the [string] ensemble functionality. Possible
- * candidates for public interface.
- */
-
-MODULE_SCOPE Tcl_Obj *	TclStringCat(Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[], int flags);
-MODULE_SCOPE int	TclStringFirst(Tcl_Obj *needle, Tcl_Obj *haystack,
-			    int start);
-MODULE_SCOPE int	TclStringLast(Tcl_Obj *needle, Tcl_Obj *haystack,
-			    int last);
-MODULE_SCOPE Tcl_Obj *	TclStringRepeat(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    int count, int flags);
-MODULE_SCOPE Tcl_Obj *	TclStringReplace(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    int first, int count, Tcl_Obj *insertPtr,
-			    int flags);
-MODULE_SCOPE Tcl_Obj *	TclStringReverse(Tcl_Obj *objPtr, int flags);
-
-/* Flag values for the [string] ensemble functions. */
-
-#define TCL_STRING_MATCH_NOCASE TCL_MATCH_NOCASE /* (1<<0) in tcl.h */
-#define TCL_STRING_IN_PLACE (1<<1)
-
 /*
 * Functions defined in generic/tclVar.c and currently exported only for use
 * by the bytecode compiler and engine. Some of these could later be placed in
@@ -4073,45 +4023,6 @@ MODULE_SCOPE TCL_HASH_TYPE TclHashObjKey(Tcl_HashTable *tablePtr, void *keyPtr);

 MODULE_SCOPE int	TclFullFinalizationRequested(void);

-/*
- * TIP #462.
- */
-
-/*
- * The following enum values give the status of a spawned process.
- */
-
-typedef enum TclProcessWaitStatus {
-    TCL_PROCESS_ERROR = -1,	/* Error waiting for process to exit */
-    TCL_PROCESS_UNCHANGED = 0,	/* No change since the last call. */
-    TCL_PROCESS_EXITED = 1,	/* Process has exited. */
-    TCL_PROCESS_SIGNALED = 2,	/* Child killed because of a signal. */
-    TCL_PROCESS_STOPPED = 3,	/* Child suspended because of a signal. */
-    TCL_PROCESS_UNKNOWN_STATUS = 4 
-				/* Child wait status didn't make sense. */
-} TclProcessWaitStatus;
-
-MODULE_SCOPE Tcl_Command TclInitProcessCmd(Tcl_Interp *interp);
-MODULE_SCOPE void	TclProcessCreated(Tcl_Pid pid);
-MODULE_SCOPE TclProcessWaitStatus TclProcessWait(Tcl_Pid pid, int options,
-			    int *codePtr, Tcl_Obj **msgObjPtr,
-			    Tcl_Obj **errorObjPtr);
-
-/*
- * Utility routines for encoding index values as integers. Used by both
- * some of the command compilers and by [lsort] and [lsearch].
- */
-
-MODULE_SCOPE int	TclIndexEncode(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    int before, int after, int *indexPtr);
-MODULE_SCOPE int	TclIndexDecode(int encoded, int endValue);
-
-/* Constants used in index value encoding routines. */
-#define TCL_INDEX_END           (-2)
-#define TCL_INDEX_BEFORE        (-1)
-#define TCL_INDEX_START         (0)
-#define TCL_INDEX_AFTER         (INT_MAX)
-
 /*
 *----------------------------------------------------------------
 * Macros used by the Tcl core to create and release Tcl objects.
@@ -4496,8 +4407,8 @@ MODULE_SCOPE void	TclDbInitNewObj(Tcl_Obj *objPtr, const char *file,
 */

 #define TclUtfToUniChar(str, chPtr) \
-	((((unsigned char) *(str)) < 0x80) ?		\
-	    ((*(chPtr) = (unsigned char) *(str)), 1)	\
+	((((unsigned char) *(str)) < 0xC0) ?		\
+	    ((*(chPtr) = (Tcl_UniChar) *(str)), 1)	\
 	    : Tcl_UtfToUniChar(str, chPtr))

 /*
@@ -4561,7 +4472,7 @@ MODULE_SCOPE int	TclIsPureByteArray(Tcl_Obj *objPtr);

 /*
 *----------------------------------------------------------------
- * Macro used by the Tcl core to increment a namespace's export epoch
+ * Macro used by the Tcl core to increment a namespace's export export epoch
 * counter. The ANSI C "prototype" for this macro is:
 *
 * MODULE_SCOPE void	TclInvalidateNsCmdLookup(Namespace *nsPtr);
@@ -4621,19 +4532,30 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
 * core. They should only be called on unshared objects. The ANSI C
 * "prototypes" for these macros are:
 *
- * MODULE_SCOPE void	TclSetIntObj(Tcl_Obj *objPtr, Tcl_WideInt w);
+ * MODULE_SCOPE void	TclSetLongObj(Tcl_Obj *objPtr, long longValue);
+ * MODULE_SCOPE void	TclSetWideIntObj(Tcl_Obj *objPtr, Tcl_WideInt w);
 * MODULE_SCOPE void	TclSetDoubleObj(Tcl_Obj *objPtr, double d);
 *----------------------------------------------------------------
 */

-#define TclSetIntObj(objPtr, i) \
+#define TclSetLongObj(objPtr, i) \
    do {						\
 	TclInvalidateStringRep(objPtr);			\
 	TclFreeIntRep(objPtr);				\
-	(objPtr)->internalRep.wideValue = (Tcl_WideInt)(i);	\
+	(objPtr)->internalRep.longValue = (long)(i);	\
 	(objPtr)->typePtr = &tclIntType;		\
    } while (0)

+#ifndef TCL_WIDE_INT_IS_LONG
+#define TclSetWideIntObj(objPtr, w) \
+    do {							\
+	TclInvalidateStringRep(objPtr);				\
+	TclFreeIntRep(objPtr);					\
+	(objPtr)->internalRep.wideValue = (Tcl_WideInt)(w);	\
+	(objPtr)->typePtr = &tclWideIntType;			\
+    } while (0)
+#endif
+
 #define TclSetDoubleObj(objPtr, d) \
    do {							\
 	TclInvalidateStringRep(objPtr);				\
@@ -4648,7 +4570,8 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
 * types, avoiding the corresponding function calls in time critical parts of
 * the core. The ANSI C "prototypes" for these macros are:
 *
- * MODULE_SCOPE void	TclNewIntObj(Tcl_Obj *objPtr, Tcl_WideInt w);
+ * MODULE_SCOPE void	TclNewLongObj(Tcl_Obj *objPtr, long l);
+ * MODULE_SCOPE void	TclNewWideObj(Tcl_Obj *objPtr, Tcl_WideInt w);
 * MODULE_SCOPE void	TclNewDoubleObj(Tcl_Obj *objPtr, double d);
 * MODULE_SCOPE void	TclNewStringObj(Tcl_Obj *objPtr, const char *s, int len);
 * MODULE_SCOPE void	TclNewLiteralStringObj(Tcl_Obj*objPtr, const char *sLiteral);
@@ -4657,13 +4580,13 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
 */

 #ifndef TCL_MEM_DEBUG
-#define TclNewIntObj(objPtr, i) \
+#define TclNewLongObj(objPtr, i) \
    do {						\
 	TclIncrObjsAllocated();				\
 	TclAllocObjStorage(objPtr);			\
 	(objPtr)->refCount = 0;				\
 	(objPtr)->bytes = NULL;				\
-	(objPtr)->internalRep.wideValue = (Tcl_WideInt)(i);	\
+	(objPtr)->internalRep.longValue = (long)(i);	\
 	(objPtr)->typePtr = &tclIntType;		\
 	TCL_DTRACE_OBJ_CREATE(objPtr);			\
    } while (0)
@@ -4690,8 +4613,8 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
    } while (0)

 #else /* TCL_MEM_DEBUG */
-#define TclNewIntObj(objPtr, w) \
-    (objPtr) = Tcl_NewWideIntObj(w)
+#define TclNewLongObj(objPtr, l) \
+    (objPtr) = Tcl_NewLongObj(l)

 #define TclNewDoubleObj(objPtr, d) \
    (objPtr) = Tcl_NewDoubleObj(d)
@@ -28,21 +28,21 @@
 #   endif
 #endif

-#if !defined(TCL_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
-/* Those macro's are especially for Itcl 3.4 compatibility */
-#   define tclCreateNamespace tcl_CreateNamespace
-#   define tclDeleteNamespace tcl_DeleteNamespace
-#   define tclAppendExportList tcl_AppendExportList
-#   define tclExport tcl_Export
-#   define tclImport tcl_Import
-#   define tclForgetImport tcl_ForgetImport
-#   define tclGetCurrentNamespace_ tcl_GetCurrentNamespace
-#   define tclGetGlobalNamespace_ tcl_GetGlobalNamespace
-#   define tclFindNamespace tcl_FindNamespace
-#   define tclFindCommand tcl_FindCommand
-#   define tclGetCommandFromObj tcl_GetCommandFromObj
-#   define tclGetCommandFullName tcl_GetCommandFullName
-#endif /* !defined(TCL_NO_DEPRECATED) */
+/* [Bug #803489] Tcl_FindNamespace problem in the Stubs table */
+#undef Tcl_CreateNamespace
+#undef Tcl_DeleteNamespace
+#undef Tcl_AppendExportList
+#undef Tcl_Export
+#undef Tcl_Import
+#undef Tcl_ForgetImport
+#undef Tcl_GetCurrentNamespace
+#undef Tcl_GetGlobalNamespace
+#undef Tcl_FindNamespace
+#undef Tcl_FindCommand
+#undef Tcl_GetCommandFromObj
+#undef Tcl_GetCommandFullName
+#undef Tcl_SetStartupScript
+#undef Tcl_GetStartupScript

 /*
 * WARNING: This file is automatically generated by the tools/genStubs.tcl
@@ -75,8 +75,7 @@ EXTERN void		TclCleanupCommand(Command *cmdPtr);
 EXTERN int		TclCopyAndCollapse(int count, const char *src,
 				char *dst);
 /* 8 */
-TCL_DEPRECATED("")
-int			TclCopyChannelOld(Tcl_Interp *interp,
+EXTERN int		TclCopyChannelOld(Tcl_Interp *interp,
 				Tcl_Channel inChan, Tcl_Channel outChan,
 				int toRead, Tcl_Obj *cmdPtr);
 /* 9 */
@@ -114,7 +113,7 @@ EXTERN int		TclFindElement(Tcl_Interp *interp,
 /* 23 */
 EXTERN Proc *		TclFindProc(Interp *iPtr, const char *procName);
 /* 24 */
-EXTERN int		TclFormatInt(char *buffer, Tcl_WideInt n);
+EXTERN int		TclFormatInt(char *buffer, long n);
 /* 25 */
 EXTERN void		TclFreePackageInfo(Interp *iPtr);
 /* Slot 26 is reserved */
@@ -174,7 +173,7 @@ EXTERN int		TclInterpInit(Tcl_Interp *interp);
 /* 53 */
 EXTERN int		TclInvokeObjectCommand(ClientData clientData,
 				Tcl_Interp *interp, int argc,
-				const char **argv);
+				CONST84 char **argv);
 /* 54 */
 EXTERN int		TclInvokeStringCommand(ClientData clientData,
 				Tcl_Interp *interp, int objc,
@@ -219,8 +218,7 @@ EXTERN unsigned long	TclpGetClicks(void);
 /* 76 */
 EXTERN unsigned long	TclpGetSeconds(void);
 /* 77 */
-TCL_DEPRECATED("")
-void			TclpGetTime(Tcl_Time *time);
+EXTERN void		TclpGetTime(Tcl_Time *time);
 /* Slot 78 is reserved */
 /* Slot 79 is reserved */
 /* Slot 80 is reserved */
@@ -233,8 +231,7 @@ EXTERN char *		TclpRealloc(char *ptr, unsigned int size);
 /* Slot 86 is reserved */
 /* Slot 87 is reserved */
 /* 88 */
-TCL_DEPRECATED("")
-char *			TclPrecTraceProc(ClientData clientData,
+EXTERN char *		TclPrecTraceProc(ClientData clientData,
 				Tcl_Interp *interp, const char *name1,
 				const char *name2, int flags);
 /* 89 */
@@ -270,8 +267,7 @@ EXTERN void		TclSetupEnv(Tcl_Interp *interp);
 EXTERN int		TclSockGetPort(Tcl_Interp *interp, const char *str,
 				const char *proto, int *portPtr);
 /* 104 */
-TCL_DEPRECATED("")
-int			TclSockMinimumBuffersOld(int sock, int size);
+EXTERN int		TclSockMinimumBuffersOld(int sock, int size);
 /* Slot 105 is reserved */
 /* Slot 106 is reserved */
 /* Slot 107 is reserved */
@@ -288,22 +284,22 @@ EXTERN void		Tcl_AddInterpResolvers(Tcl_Interp *interp,
 				Tcl_ResolveVarProc *varProc,
 				Tcl_ResolveCompiledVarProc *compiledVarProc);
 /* 112 */
-EXTERN int		TclAppendExportList(Tcl_Interp *interp,
+EXTERN int		Tcl_AppendExportList(Tcl_Interp *interp,
 				Tcl_Namespace *nsPtr, Tcl_Obj *objPtr);
 /* 113 */
-EXTERN Tcl_Namespace *	TclCreateNamespace(Tcl_Interp *interp,
+EXTERN Tcl_Namespace *	Tcl_CreateNamespace(Tcl_Interp *interp,
 				const char *name, ClientData clientData,
 				Tcl_NamespaceDeleteProc *deleteProc);
 /* 114 */
-EXTERN void		TclDeleteNamespace(Tcl_Namespace *nsPtr);
+EXTERN void		Tcl_DeleteNamespace(Tcl_Namespace *nsPtr);
 /* 115 */
-EXTERN int		TclExport(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+EXTERN int		Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
 				const char *pattern, int resetListFirst);
 /* 116 */
-EXTERN Tcl_Command	TclFindCommand(Tcl_Interp *interp, const char *name,
+EXTERN Tcl_Command	Tcl_FindCommand(Tcl_Interp *interp, const char *name,
 				Tcl_Namespace *contextNsPtr, int flags);
 /* 117 */
-EXTERN Tcl_Namespace *	TclFindNamespace(Tcl_Interp *interp,
+EXTERN Tcl_Namespace *	Tcl_FindNamespace(Tcl_Interp *interp,
 				const char *name,
 				Tcl_Namespace *contextNsPtr, int flags);
 /* 118 */
@@ -318,23 +314,23 @@ EXTERN Tcl_Var		Tcl_FindNamespaceVar(Tcl_Interp *interp,
 				const char *name,
 				Tcl_Namespace *contextNsPtr, int flags);
 /* 121 */
-EXTERN int		TclForgetImport(Tcl_Interp *interp,
+EXTERN int		Tcl_ForgetImport(Tcl_Interp *interp,
 				Tcl_Namespace *nsPtr, const char *pattern);
 /* 122 */
-EXTERN Tcl_Command	TclGetCommandFromObj(Tcl_Interp *interp,
+EXTERN Tcl_Command	Tcl_GetCommandFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr);
 /* 123 */
-EXTERN void		TclGetCommandFullName(Tcl_Interp *interp,
+EXTERN void		Tcl_GetCommandFullName(Tcl_Interp *interp,
 				Tcl_Command command, Tcl_Obj *objPtr);
 /* 124 */
-EXTERN Tcl_Namespace *	TclGetCurrentNamespace_(Tcl_Interp *interp);
+EXTERN Tcl_Namespace *	Tcl_GetCurrentNamespace(Tcl_Interp *interp);
 /* 125 */
-EXTERN Tcl_Namespace *	TclGetGlobalNamespace_(Tcl_Interp *interp);
+EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace(Tcl_Interp *interp);
 /* 126 */
 EXTERN void		Tcl_GetVariableFullName(Tcl_Interp *interp,
 				Tcl_Var variable, Tcl_Obj *objPtr);
 /* 127 */
-EXTERN int		TclImport(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+EXTERN int		Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr,
 				const char *pattern, int allowOverwrite);
 /* 128 */
 EXTERN void		Tcl_PopCallFrame(Tcl_Interp *interp);
@@ -354,18 +350,19 @@ EXTERN void		Tcl_SetNamespaceResolvers(
 /* 132 */
 EXTERN int		TclpHasSockets(Tcl_Interp *interp);
 /* 133 */
-TCL_DEPRECATED("")
-struct tm *		TclpGetDate(const time_t *time, int useGMT);
+EXTERN struct tm *	TclpGetDate(const time_t *time, int useGMT);
 /* Slot 134 is reserved */
 /* Slot 135 is reserved */
 /* Slot 136 is reserved */
 /* Slot 137 is reserved */
 /* 138 */
-EXTERN const char *	TclGetEnv(const char *name, Tcl_DString *valuePtr);
+EXTERN CONST84_RETURN char * TclGetEnv(const char *name,
+				Tcl_DString *valuePtr);
 /* Slot 139 is reserved */
 /* Slot 140 is reserved */
 /* 141 */
-EXTERN const char *	TclpGetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr);
+EXTERN CONST84_RETURN char * TclpGetCwd(Tcl_Interp *interp,
+				Tcl_DString *cwdPtr);
 /* 142 */
 EXTERN int		TclSetByteCodeFromAny(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, CompileHookProc *hookProc,
@@ -404,11 +401,9 @@ EXTERN void		TclRegError(Tcl_Interp *interp, const char *msg,
 EXTERN Var *		TclVarTraceExists(Tcl_Interp *interp,
 				const char *varName);
 /* 158 */
-TCL_DEPRECATED("use public Tcl_SetStartupScript()")
-void			TclSetStartupScriptFileName(const char *filename);
+EXTERN void		TclSetStartupScriptFileName(const char *filename);
 /* 159 */
-TCL_DEPRECATED("use public Tcl_GetStartupScript()")
-const char *		TclGetStartupScriptFileName(void);
+EXTERN const char *	TclGetStartupScriptFileName(void);
 /* Slot 160 is reserved */
 /* 161 */
 EXTERN int		TclChannelTransform(Tcl_Interp *interp,
@@ -427,11 +422,9 @@ EXTERN int		TclListObjSetElement(Tcl_Interp *interp,
 				Tcl_Obj *listPtr, int index,
 				Tcl_Obj *valuePtr);
 /* 167 */
-TCL_DEPRECATED("use public Tcl_SetStartupScript()")
-void			TclSetStartupScriptPath(Tcl_Obj *pathPtr);
+EXTERN void		TclSetStartupScriptPath(Tcl_Obj *pathPtr);
 /* 168 */
-TCL_DEPRECATED("use public Tcl_GetStartupScript()")
-Tcl_Obj *		TclGetStartupScriptPath(void);
+EXTERN Tcl_Obj *	TclGetStartupScriptPath(void);
 /* 169 */
 EXTERN int		TclpUtfNcmp2(const char *s1, const char *s2,
 				unsigned long n);
@@ -464,18 +457,16 @@ EXTERN void		TclVarErrMsg(Tcl_Interp *interp, const char *part1,
 				const char *part2, const char *operation,
 				const char *reason);
 /* 178 */
-EXTERN void		TclSetStartupScript(Tcl_Obj *pathPtr,
+EXTERN void		Tcl_SetStartupScript(Tcl_Obj *pathPtr,
 				const char *encodingName);
 /* 179 */
-EXTERN Tcl_Obj *	TclGetStartupScript(const char **encodingNamePtr);
+EXTERN Tcl_Obj *	Tcl_GetStartupScript(const char **encodingNamePtr);
 /* Slot 180 is reserved */
 /* Slot 181 is reserved */
 /* 182 */
-TCL_DEPRECATED("")
-struct tm *		TclpLocaltime(const time_t *clock);
+EXTERN struct tm *	TclpLocaltime(const time_t *clock);
 /* 183 */
-TCL_DEPRECATED("")
-struct tm *		TclpGmtime(const time_t *clock);
+EXTERN struct tm *	TclpGmtime(const time_t *clock);
 /* Slot 184 is reserved */
 /* Slot 185 is reserved */
 /* Slot 186 is reserved */
@@ -579,8 +570,7 @@ EXTERN Var *		TclVarHashCreateVar(TclVarHashTable *tablePtr,
 EXTERN void		TclInitVarHashTable(TclVarHashTable *tablePtr,
 				Namespace *nsPtr);
 /* 236 */
-TCL_DEPRECATED("use Tcl_BackgroundException")
-void			TclBackgroundException(Tcl_Interp *interp, int code);
+EXTERN void		TclBackgroundException(Tcl_Interp *interp, int code);
 /* 237 */
 EXTERN int		TclResetCancellation(Tcl_Interp *interp, int force);
 /* 238 */
@@ -662,7 +652,7 @@ typedef struct TclIntStubs {
    int (*tclCleanupChildren) (Tcl_Interp *interp, int numPids, Tcl_Pid *pidPtr, Tcl_Channel errorChan); /* 5 */
    void (*tclCleanupCommand) (Command *cmdPtr); /* 6 */
    int (*tclCopyAndCollapse) (int count, const char *src, char *dst); /* 7 */
-    TCL_DEPRECATED_API("") int (*tclCopyChannelOld) (Tcl_Interp *interp, Tcl_Channel inChan, Tcl_Channel outChan, int toRead, Tcl_Obj *cmdPtr); /* 8 */
+    int (*tclCopyChannelOld) (Tcl_Interp *interp, Tcl_Channel inChan, Tcl_Channel outChan, int toRead, Tcl_Obj *cmdPtr); /* 8 */
    int (*tclCreatePipeline) (Tcl_Interp *interp, int argc, const char **argv, Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, TclFile *outPipePtr, TclFile *errFilePtr); /* 9 */
    int (*tclCreateProc) (Tcl_Interp *interp, Namespace *nsPtr, const char *procName, Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr, Proc **procPtrPtr); /* 10 */
    void (*tclDeleteCompiledLocalVars) (Interp *iPtr, CallFrame *framePtr); /* 11 */
@@ -678,7 +668,7 @@ typedef struct TclIntStubs {
    void (*reserved21)(void);
    int (*tclFindElement) (Tcl_Interp *interp, const char *listStr, int listLength, const char **elementPtr, const char **nextPtr, int *sizePtr, int *bracePtr); /* 22 */
    Proc * (*tclFindProc) (Interp *iPtr, const char *procName); /* 23 */
-    int (*tclFormatInt) (char *buffer, Tcl_WideInt n); /* 24 */
+    int (*tclFormatInt) (char *buffer, long n); /* 24 */
    void (*tclFreePackageInfo) (Interp *iPtr); /* 25 */
    void (*reserved26)(void);
    void (*reserved27)(void);
@@ -707,7 +697,7 @@ typedef struct TclIntStubs {
    void (*tclInitCompiledLocals) (Tcl_Interp *interp, CallFrame *framePtr, Namespace *nsPtr); /* 50 */
    int (*tclInterpInit) (Tcl_Interp *interp); /* 51 */
    void (*reserved52)(void);
-    int (*tclInvokeObjectCommand) (ClientData clientData, Tcl_Interp *interp, int argc, const char **argv); /* 53 */
+    int (*tclInvokeObjectCommand) (ClientData clientData, Tcl_Interp *interp, int argc, CONST84 char **argv); /* 53 */
    int (*tclInvokeStringCommand) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 54 */
    Proc * (*tclIsProc) (Command *cmdPtr); /* 55 */
    void (*reserved56)(void);
@@ -731,7 +721,7 @@ typedef struct TclIntStubs {
    void (*tclpFree) (char *ptr); /* 74 */
    unsigned long (*tclpGetClicks) (void); /* 75 */
    unsigned long (*tclpGetSeconds) (void); /* 76 */
-    TCL_DEPRECATED_API("") void (*tclpGetTime) (Tcl_Time *time); /* 77 */
+    void (*tclpGetTime) (Tcl_Time *time); /* 77 */
    void (*reserved78)(void);
    void (*reserved79)(void);
    void (*reserved80)(void);
@@ -742,7 +732,7 @@ typedef struct TclIntStubs {
    void (*reserved85)(void);
    void (*reserved86)(void);
    void (*reserved87)(void);
-    TCL_DEPRECATED_API("") char * (*tclPrecTraceProc) (ClientData clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags); /* 88 */
+    char * (*tclPrecTraceProc) (ClientData clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags); /* 88 */
    int (*tclPreventAliasLoop) (Tcl_Interp *interp, Tcl_Interp *cmdInterp, Tcl_Command cmd); /* 89 */
    void (*reserved90)(void);
    void (*tclProcCleanupProc) (Proc *procPtr); /* 91 */
@@ -758,7 +748,7 @@ typedef struct TclIntStubs {
    CONST86 char * (*tclSetPreInitScript) (const char *string); /* 101 */
    void (*tclSetupEnv) (Tcl_Interp *interp); /* 102 */
    int (*tclSockGetPort) (Tcl_Interp *interp, const char *str, const char *proto, int *portPtr); /* 103 */
-    TCL_DEPRECATED_API("") int (*tclSockMinimumBuffersOld) (int sock, int size); /* 104 */
+    int (*tclSockMinimumBuffersOld) (int sock, int size); /* 104 */
    void (*reserved105)(void);
    void (*reserved106)(void);
    void (*reserved107)(void);
@@ -766,36 +756,36 @@ typedef struct TclIntStubs {
    int (*tclUpdateReturnInfo) (Interp *iPtr); /* 109 */
    int (*tclSockMinimumBuffers) (void *sock, int size); /* 110 */
    void (*tcl_AddInterpResolvers) (Tcl_Interp *interp, const char *name, Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, Tcl_ResolveCompiledVarProc *compiledVarProc); /* 111 */
-    int (*tclAppendExportList) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *objPtr); /* 112 */
-    Tcl_Namespace * (*tclCreateNamespace) (Tcl_Interp *interp, const char *name, ClientData clientData, Tcl_NamespaceDeleteProc *deleteProc); /* 113 */
-    void (*tclDeleteNamespace) (Tcl_Namespace *nsPtr); /* 114 */
-    int (*tclExport) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern, int resetListFirst); /* 115 */
-    Tcl_Command (*tclFindCommand) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 116 */
-    Tcl_Namespace * (*tclFindNamespace) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 117 */
+    int (*tcl_AppendExportList) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *objPtr); /* 112 */
+    Tcl_Namespace * (*tcl_CreateNamespace) (Tcl_Interp *interp, const char *name, ClientData clientData, Tcl_NamespaceDeleteProc *deleteProc); /* 113 */
+    void (*tcl_DeleteNamespace) (Tcl_Namespace *nsPtr); /* 114 */
+    int (*tcl_Export) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern, int resetListFirst); /* 115 */
+    Tcl_Command (*tcl_FindCommand) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 116 */
+    Tcl_Namespace * (*tcl_FindNamespace) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 117 */
    int (*tcl_GetInterpResolvers) (Tcl_Interp *interp, const char *name, Tcl_ResolverInfo *resInfo); /* 118 */
    int (*tcl_GetNamespaceResolvers) (Tcl_Namespace *namespacePtr, Tcl_ResolverInfo *resInfo); /* 119 */
    Tcl_Var (*tcl_FindNamespaceVar) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 120 */
-    int (*tclForgetImport) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern); /* 121 */
-    Tcl_Command (*tclGetCommandFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 122 */
-    void (*tclGetCommandFullName) (Tcl_Interp *interp, Tcl_Command command, Tcl_Obj *objPtr); /* 123 */
-    Tcl_Namespace * (*tclGetCurrentNamespace_) (Tcl_Interp *interp); /* 124 */
-    Tcl_Namespace * (*tclGetGlobalNamespace_) (Tcl_Interp *interp); /* 125 */
+    int (*tcl_ForgetImport) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern); /* 121 */
+    Tcl_Command (*tcl_GetCommandFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 122 */
+    void (*tcl_GetCommandFullName) (Tcl_Interp *interp, Tcl_Command command, Tcl_Obj *objPtr); /* 123 */
+    Tcl_Namespace * (*tcl_GetCurrentNamespace) (Tcl_Interp *interp); /* 124 */
+    Tcl_Namespace * (*tcl_GetGlobalNamespace) (Tcl_Interp *interp); /* 125 */
    void (*tcl_GetVariableFullName) (Tcl_Interp *interp, Tcl_Var variable, Tcl_Obj *objPtr); /* 126 */
-    int (*tclImport) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern, int allowOverwrite); /* 127 */
+    int (*tcl_Import) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, const char *pattern, int allowOverwrite); /* 127 */
    void (*tcl_PopCallFrame) (Tcl_Interp *interp); /* 128 */
    int (*tcl_PushCallFrame) (Tcl_Interp *interp, Tcl_CallFrame *framePtr, Tcl_Namespace *nsPtr, int isProcCallFrame); /* 129 */
    int (*tcl_RemoveInterpResolvers) (Tcl_Interp *interp, const char *name); /* 130 */
    void (*tcl_SetNamespaceResolvers) (Tcl_Namespace *namespacePtr, Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, Tcl_ResolveCompiledVarProc *compiledVarProc); /* 131 */
    int (*tclpHasSockets) (Tcl_Interp *interp); /* 132 */
-    TCL_DEPRECATED_API("") struct tm * (*tclpGetDate) (const time_t *time, int useGMT); /* 133 */
+    struct tm * (*tclpGetDate) (const time_t *time, int useGMT); /* 133 */
    void (*reserved134)(void);
    void (*reserved135)(void);
    void (*reserved136)(void);
    void (*reserved137)(void);
-    const char * (*tclGetEnv) (const char *name, Tcl_DString *valuePtr); /* 138 */
+    CONST84_RETURN char * (*tclGetEnv) (const char *name, Tcl_DString *valuePtr); /* 138 */
    void (*reserved139)(void);
    void (*reserved140)(void);
-    const char * (*tclpGetCwd) (Tcl_Interp *interp, Tcl_DString *cwdPtr); /* 141 */
+    CONST84_RETURN char * (*tclpGetCwd) (Tcl_Interp *interp, Tcl_DString *cwdPtr); /* 141 */
    int (*tclSetByteCodeFromAny) (Tcl_Interp *interp, Tcl_Obj *objPtr, CompileHookProc *hookProc, ClientData clientData); /* 142 */
    int (*tclAddLiteralObj) (struct CompileEnv *envPtr, Tcl_Obj *objPtr, LiteralEntry **litPtrPtr); /* 143 */
    void (*tclHideLiteral) (Tcl_Interp *interp, struct CompileEnv *envPtr, int index); /* 144 */
@@ -812,8 +802,8 @@ typedef struct TclIntStubs {
    void (*reserved155)(void);
    void (*tclRegError) (Tcl_Interp *interp, const char *msg, int status); /* 156 */
    Var * (*tclVarTraceExists) (Tcl_Interp *interp, const char *varName); /* 157 */
-    TCL_DEPRECATED_API("use public Tcl_SetStartupScript()") void (*tclSetStartupScriptFileName) (const char *filename); /* 158 */
-    TCL_DEPRECATED_API("use public Tcl_GetStartupScript()") const char * (*tclGetStartupScriptFileName) (void); /* 159 */
+    void (*tclSetStartupScriptFileName) (const char *filename); /* 158 */
+    const char * (*tclGetStartupScriptFileName) (void); /* 159 */
    void (*reserved160)(void);
    int (*tclChannelTransform) (Tcl_Interp *interp, Tcl_Channel chan, Tcl_Obj *cmdObjPtr); /* 161 */
    void (*tclChannelEventScriptInvoker) (ClientData clientData, int flags); /* 162 */
@@ -821,8 +811,8 @@ typedef struct TclIntStubs {
    void (*tclExpandCodeArray) (void *envPtr); /* 164 */
    void (*tclpSetInitialEncodings) (void); /* 165 */
    int (*tclListObjSetElement) (Tcl_Interp *interp, Tcl_Obj *listPtr, int index, Tcl_Obj *valuePtr); /* 166 */
-    TCL_DEPRECATED_API("use public Tcl_SetStartupScript()") void (*tclSetStartupScriptPath) (Tcl_Obj *pathPtr); /* 167 */
-    TCL_DEPRECATED_API("use public Tcl_GetStartupScript()") Tcl_Obj * (*tclGetStartupScriptPath) (void); /* 168 */
+    void (*tclSetStartupScriptPath) (Tcl_Obj *pathPtr); /* 167 */
+    Tcl_Obj * (*tclGetStartupScriptPath) (void); /* 168 */
    int (*tclpUtfNcmp2) (const char *s1, const char *s2, unsigned long n); /* 169 */
    int (*tclCheckInterpTraces) (Tcl_Interp *interp, const char *command, int numChars, Command *cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *const objv[]); /* 170 */
    int (*tclCheckExecutionTraces) (Tcl_Interp *interp, const char *command, int numChars, Command *cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *const objv[]); /* 171 */
@@ -832,12 +822,12 @@ typedef struct TclIntStubs {
    int (*tclCallVarTraces) (Interp *iPtr, Var *arrayPtr, Var *varPtr, const char *part1, const char *part2, int flags, int leaveErrMsg); /* 175 */
    void (*tclCleanupVar) (Var *varPtr, Var *arrayPtr); /* 176 */
    void (*tclVarErrMsg) (Tcl_Interp *interp, const char *part1, const char *part2, const char *operation, const char *reason); /* 177 */
-    void (*tclSetStartupScript) (Tcl_Obj *pathPtr, const char *encodingName); /* 178 */
-    Tcl_Obj * (*tclGetStartupScript) (const char **encodingNamePtr); /* 179 */
+    void (*tcl_SetStartupScript) (Tcl_Obj *pathPtr, const char *encodingName); /* 178 */
+    Tcl_Obj * (*tcl_GetStartupScript) (const char **encodingNamePtr); /* 179 */
    void (*reserved180)(void);
    void (*reserved181)(void);
-    TCL_DEPRECATED_API("") struct tm * (*tclpLocaltime) (const time_t *clock); /* 182 */
-    TCL_DEPRECATED_API("") struct tm * (*tclpGmtime) (const time_t *clock); /* 183 */
+    struct tm * (*tclpLocaltime) (const time_t *clock); /* 182 */
+    struct tm * (*tclpGmtime) (const time_t *clock); /* 183 */
    void (*reserved184)(void);
    void (*reserved185)(void);
    void (*reserved186)(void);
@@ -890,7 +880,7 @@ typedef struct TclIntStubs {
    void (*tclGetSrcInfoForPc) (CmdFrame *contextPtr); /* 233 */
    Var * (*tclVarHashCreateVar) (TclVarHashTable *tablePtr, const char *key, int *newPtr); /* 234 */
    void (*tclInitVarHashTable) (TclVarHashTable *tablePtr, Namespace *nsPtr); /* 235 */
-    TCL_DEPRECATED_API("use Tcl_BackgroundException") void (*tclBackgroundException) (Tcl_Interp *interp, int code); /* 236 */
+    void (*tclBackgroundException) (Tcl_Interp *interp, int code); /* 236 */
    int (*tclResetCancellation) (Tcl_Interp *interp, int force); /* 237 */
    int (*tclNRInterpProc) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 238 */
    int (*tclNRInterpProcCore) (Tcl_Interp *interp, Tcl_Obj *procNameObj, int skip, ProcErrorProc *errorProc); /* 239 */
@@ -1098,38 +1088,38 @@ extern const TclIntStubs *tclIntStubsPtr;
 	(tclIntStubsPtr->tclSockMinimumBuffers) /* 110 */
 #define Tcl_AddInterpResolvers \
 	(tclIntStubsPtr->tcl_AddInterpResolvers) /* 111 */
-#define TclAppendExportList \
-	(tclIntStubsPtr->tclAppendExportList) /* 112 */
-#define TclCreateNamespace \
-	(tclIntStubsPtr->tclCreateNamespace) /* 113 */
-#define TclDeleteNamespace \
-	(tclIntStubsPtr->tclDeleteNamespace) /* 114 */
-#define TclExport \
-	(tclIntStubsPtr->tclExport) /* 115 */
-#define TclFindCommand \
-	(tclIntStubsPtr->tclFindCommand) /* 116 */
-#define TclFindNamespace \
-	(tclIntStubsPtr->tclFindNamespace) /* 117 */
+#define Tcl_AppendExportList \
+	(tclIntStubsPtr->tcl_AppendExportList) /* 112 */
+#define Tcl_CreateNamespace \
+	(tclIntStubsPtr->tcl_CreateNamespace) /* 113 */
+#define Tcl_DeleteNamespace \
+	(tclIntStubsPtr->tcl_DeleteNamespace) /* 114 */
+#define Tcl_Export \
+	(tclIntStubsPtr->tcl_Export) /* 115 */
+#define Tcl_FindCommand \
+	(tclIntStubsPtr->tcl_FindCommand) /* 116 */
+#define Tcl_FindNamespace \
+	(tclIntStubsPtr->tcl_FindNamespace) /* 117 */
 #define Tcl_GetInterpResolvers \
 	(tclIntStubsPtr->tcl_GetInterpResolvers) /* 118 */
 #define Tcl_GetNamespaceResolvers \
 	(tclIntStubsPtr->tcl_GetNamespaceResolvers) /* 119 */
 #define Tcl_FindNamespaceVar \
 	(tclIntStubsPtr->tcl_FindNamespaceVar) /* 120 */
-#define TclForgetImport \
-	(tclIntStubsPtr->tclForgetImport) /* 121 */
-#define TclGetCommandFromObj \
-	(tclIntStubsPtr->tclGetCommandFromObj) /* 122 */
-#define TclGetCommandFullName \
-	(tclIntStubsPtr->tclGetCommandFullName) /* 123 */
-#define TclGetCurrentNamespace_ \
-	(tclIntStubsPtr->tclGetCurrentNamespace_) /* 124 */
-#define TclGetGlobalNamespace_ \
-	(tclIntStubsPtr->tclGetGlobalNamespace_) /* 125 */
+#define Tcl_ForgetImport \
+	(tclIntStubsPtr->tcl_ForgetImport) /* 121 */
+#define Tcl_GetCommandFromObj \
+	(tclIntStubsPtr->tcl_GetCommandFromObj) /* 122 */
+#define Tcl_GetCommandFullName \
+	(tclIntStubsPtr->tcl_GetCommandFullName) /* 123 */
+#define Tcl_GetCurrentNamespace \
+	(tclIntStubsPtr->tcl_GetCurrentNamespace) /* 124 */
+#define Tcl_GetGlobalNamespace \
+	(tclIntStubsPtr->tcl_GetGlobalNamespace) /* 125 */
 #define Tcl_GetVariableFullName \
 	(tclIntStubsPtr->tcl_GetVariableFullName) /* 126 */
-#define TclImport \
-	(tclIntStubsPtr->tclImport) /* 127 */
+#define Tcl_Import \
+	(tclIntStubsPtr->tcl_Import) /* 127 */
 #define Tcl_PopCallFrame \
 	(tclIntStubsPtr->tcl_PopCallFrame) /* 128 */
 #define Tcl_PushCallFrame \
@@ -1220,10 +1210,10 @@ extern const TclIntStubs *tclIntStubsPtr;
 	(tclIntStubsPtr->tclCleanupVar) /* 176 */
 #define TclVarErrMsg \
 	(tclIntStubsPtr->tclVarErrMsg) /* 177 */
-#define TclSetStartupScript \
-	(tclIntStubsPtr->tclSetStartupScript) /* 178 */
-#define TclGetStartupScript \
-	(tclIntStubsPtr->tclGetStartupScript) /* 179 */
+#define Tcl_SetStartupScript \
+	(tclIntStubsPtr->tcl_SetStartupScript) /* 178 */
+#define Tcl_GetStartupScript \
+	(tclIntStubsPtr->tcl_GetStartupScript) /* 179 */
 /* Slot 180 is reserved */
 /* Slot 181 is reserved */
 #define TclpLocaltime \
@@ -1360,28 +1350,58 @@ extern const TclIntStubs *tclIntStubsPtr;
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT

-#if defined(USE_TCL_STUBS)
-#   undef TclGetStartupScriptFileName
-#   undef TclSetStartupScriptFileName
-#   undef TclGetStartupScriptPath
-#   undef TclSetStartupScriptPath
-#   undef TclBackgroundException
-#   undef TclSetStartupScript
-#   undef TclGetStartupScript
-#   undef TclCreateNamespace
-#   undef TclDeleteNamespace
-#   undef TclAppendExportList
-#   undef TclExport
-#   undef TclImport
-#   undef TclForgetImport
-#   undef TclGetCurrentNamespace_
-#   undef TclGetGlobalNamespace_
-#   undef TclFindNamespace
-#   undef TclFindCommand
-#   undef TclGetCommandFromObj
-#   undef TclGetCommandFullName
-#   undef TclCopyChannelOld
-#   undef TclSockMinimumBuffersOld
+#undef TclGetStartupScriptFileName
+#undef TclSetStartupScriptFileName
+#undef TclGetStartupScriptPath
+#undef TclSetStartupScriptPath
+#undef TclBackgroundException
+
+#if defined(USE_TCL_STUBS) && defined(TCL_NO_DEPRECATED)
+#   undef Tcl_SetStartupScript
+#   define Tcl_SetStartupScript \
+	    (tclStubsPtr->tcl_SetStartupScript) /* 622 */
+#   undef Tcl_GetStartupScript
+#   define Tcl_GetStartupScript \
+	    (tclStubsPtr->tcl_GetStartupScript) /* 623 */
+#   undef Tcl_CreateNamespace
+#   define Tcl_CreateNamespace \
+	   (tclStubsPtr->tcl_CreateNamespace) /* 506 */
+#   undef Tcl_DeleteNamespace
+#   define Tcl_DeleteNamespace \
+	   (tclStubsPtr->tcl_DeleteNamespace) /* 507 */
+#   undef Tcl_AppendExportList
+#   define Tcl_AppendExportList \
+	   (tclStubsPtr->tcl_AppendExportList) /* 508 */
+#   undef Tcl_Export
+#   define Tcl_Export \
+	   (tclStubsPtr->tcl_Export) /* 509 */
+#   undef Tcl_Import
+#   define Tcl_Import \
+	   (tclStubsPtr->tcl_Import) /* 510 */
+#   undef Tcl_ForgetImport
+#   define Tcl_ForgetImport \
+	   (tclStubsPtr->tcl_ForgetImport) /* 511 */
+#   undef Tcl_GetCurrentNamespace
+#   define Tcl_GetCurrentNamespace \
+	   (tclStubsPtr->tcl_GetCurrentNamespace) /* 512 */
+#   undef Tcl_GetGlobalNamespace
+#   define Tcl_GetGlobalNamespace \
+	   (tclStubsPtr->tcl_GetGlobalNamespace) /* 513 */
+#   undef Tcl_FindNamespace
+#   define Tcl_FindNamespace \
+	   (tclStubsPtr->tcl_FindNamespace) /* 514 */
+#   undef Tcl_FindCommand
+#   define Tcl_FindCommand \
+	   (tclStubsPtr->tcl_FindCommand) /* 515 */
+#   undef Tcl_GetCommandFromObj
+#   define Tcl_GetCommandFromObj \
+	   (tclStubsPtr->tcl_GetCommandFromObj) /* 516 */
+#   undef Tcl_GetCommandFullName
+#   define Tcl_GetCommandFullName \
+	   (tclStubsPtr->tcl_GetCommandFullName) /* 517 */
 #endif

+#undef TclCopyChannelOld
+#undef TclSockMinimumBuffersOld
+
 #endif /* _TCLINTDECLS */
@@ -555,18 +555,10 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 #   undef TclWinGetServByName
 #   undef TclWinGetSockOpt
 #   undef TclWinSetSockOpt
-#   undef TclWinGetPlatformId
-#   undef TclWinResetInterfaces
-#   undef TclWinSetInterfaces
-#   if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-#	define TclWinNToHS ntohs
-#	define TclWinGetServByName getservbyname
-#	define TclWinGetSockOpt getsockopt
-#	define TclWinSetSockOpt setsockopt
-#	define TclWinGetPlatformId() (2) /* VER_PLATFORM_WIN32_NT */
-#	define TclWinResetInterfaces() /* nop */
-#	define TclWinSetInterfaces(dummy) /* nop */
-#   endif /* TCL_NO_DEPRECATED */
+#   define TclWinNToHS ntohs
+#   define TclWinGetServByName getservbyname
+#   define TclWinGetSockOpt getsockopt
+#   define TclWinSetSockOpt setsockopt
 #else
 #   undef TclpGetPid
 #   define TclpGetPid(pid) ((unsigned long) (pid))
@@ -3208,6 +3208,10 @@ Tcl_MakeSafe(

 	(void) Tcl_EvalEx(interp,
 		"namespace eval ::tcl {namespace eval mathfunc {}}", -1, 0);
+	(void) Tcl_CreateAlias(interp, "::tcl::mathfunc::min", master,
+		"::tcl::mathfunc::min", 0, NULL);
+	(void) Tcl_CreateAlias(interp, "::tcl::mathfunc::max", master,
+		"::tcl::mathfunc::max", 0, NULL);
    }

    iPtr->flags |= SAFE_INTERP;
@@ -654,7 +654,7 @@ static Tcl_ObjType invalidRealType = {
    NULL,				/* freeIntRepProc */
    NULL,				/* dupIntRepProc */
    NULL,				/* updateStringProc */
-    NULL				/* setFromAnyProc */
+    SetInvalidRealFromAny		/* setFromAnyProc */
 };

 static int
@@ -692,7 +692,7 @@ SetInvalidRealFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr) {
 /*
 * This function checks for integer representations, which are valid
 * when linking with C variables, but which are invalid in other
- * contexts in Tcl. Handled are "+", "-", "", "0x", "0b", "0d" and "0o"
+ * contexts in Tcl. Handled are "+", "-", "", "0x", "0b" and "0o"
 * (upperand lowercase). See bug [39f6304c2e].
 */
 int
@@ -701,7 +701,7 @@ GetInvalidIntFromObj(Tcl_Obj *objPtr, int *intPtr)
    const char *str = TclGetString(objPtr);

    if ((objPtr->length == 0) ||
-	    ((objPtr->length == 2) && (str[0] == '0') && strchr("xXbBoOdD", str[1]))) {
+	    ((objPtr->length == 2) && (str[0] == '0') && strchr("xXbBoO", str[1]))) {
 	*intPtr = 0;
 	return TCL_OK;
    } else if ((objPtr->length == 1) && strchr("+-", str[0])) {
@@ -420,87 +420,6 @@ TclListObjCopy(
    return copyPtr;
 }

-/*
- *----------------------------------------------------------------------
- *
- * TclListObjRange --
- *
- *	Makes a slice of a list value.
- *      *listPtr must be known to be a valid list.
- *
- * Results:
- *	Returns a pointer to the sliced list.
- *      This may be a new object or the same object if not shared.
- *
- * Side effects:
- *	The possible conversion of the object referenced by listPtr
- *	to a list object.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-TclListObjRange(
-    Tcl_Obj *listPtr,		/* List object to take a range from. */
-    int fromIdx,		/* Index of first element to include. */
-    int toIdx)			/* Index of last element to include. */
-{
-    Tcl_Obj **elemPtrs;
-    int listLen, i, newLen;
-    List *listRepPtr;
-
-    TclListObjGetElements(NULL, listPtr, &listLen, &elemPtrs);
-
-    if (fromIdx < 0) {
-	fromIdx = 0;
-    }
-    if (toIdx >= listLen) {
-	toIdx = listLen-1;
-    }
-    if (fromIdx > toIdx) {
-	return Tcl_NewObj();
-    }
-
-    newLen = toIdx - fromIdx + 1;
-
-    if (Tcl_IsShared(listPtr) ||
-	    ((ListRepPtr(listPtr)->refCount > 1))) {
-	return Tcl_NewListObj(newLen, &elemPtrs[fromIdx]);
-    }
-
-    /*
-     * In-place is possible.
-     */
-
-    /*
-     * Even if nothing below cause any changes, we still want the
-     * string-canonizing effect of [lrange 0 end].
-     */
-
-    TclInvalidateStringRep(listPtr);
-
-    /*
-     * Delete elements that should not be included.
-     */
-
-    for (i = 0; i < fromIdx; i++) {
-	TclDecrRefCount(elemPtrs[i]);
-    }
-    for (i = toIdx + 1; i < listLen; i++) {
-	TclDecrRefCount(elemPtrs[i]);
-    }
-
-    if (fromIdx > 0) {
-	memmove(elemPtrs, &elemPtrs[fromIdx],
-		(size_t) newLen * sizeof(Tcl_Obj*));
-    }
-
-    listRepPtr = ListRepPtr(listPtr);
-    listRepPtr->elemCount = newLen;
-
-    return listPtr;
-}
-
 /*
 *----------------------------------------------------------------------
 *
@@ -1246,11 +1165,17 @@ TclLindexList(
 	return TclLindexFlat(interp, listPtr, 1, &argPtr);
    }

-    {
-	int indexCount = -1;		/* Size of the array of list indices. */
-	Tcl_Obj **indices = NULL; 	/* Array of list indices. */
+    if (indexListCopy->typePtr == &tclListType) {
+	List *listRepPtr = ListRepPtr(indexListCopy);

-	TclListObjGetElements(NULL, indexListCopy, &indexCount, &indices);
+	listPtr = TclLindexFlat(interp, listPtr, listRepPtr->elemCount,
+		&listRepPtr->elements);
+    } else {
+	int indexCount = -1;	/* Size of the array of list indices. */
+	Tcl_Obj **indices = NULL;
+				/* Array of list indices. */
+
+	Tcl_ListObjGetElements(NULL, indexListCopy, &indexCount, &indices);
 	listPtr = TclLindexFlat(interp, listPtr, indexCount, indices);
    }
    Tcl_DecrRefCount(indexListCopy);
@@ -2032,8 +1957,8 @@ static void
 UpdateStringOfList(
    Tcl_Obj *listPtr)		/* List object with string rep to update. */
 {
-#   define LOCAL_SIZE 64
-    char localFlags[LOCAL_SIZE], *flagPtr = NULL;
+#   define LOCAL_SIZE 20
+    int localFlags[LOCAL_SIZE], *flagPtr = NULL;
    List *listRepPtr = ListRepPtr(listPtr);
    int numElems = listRepPtr->elemCount;
    int i, length, bytesNeeded = 0;
@@ -2070,7 +1995,7 @@ UpdateStringOfList(
 	 * We know numElems <= LIST_MAX, so this is safe.
 	 */

-	flagPtr = ckalloc(numElems);
+	flagPtr = ckalloc(numElems * sizeof(int));
    }
    elemPtrs = &listRepPtr->elements;
    for (i = 0; i < numElems; i++) {
@@ -186,7 +186,7 @@ TclCreateLiteral(
 {
    LiteralTable *globalTablePtr = &iPtr->literalTable;
    LiteralEntry *globalPtr;
-    unsigned int globalHash;
+    int globalHash;
    Tcl_Obj *objPtr;

    /*
@@ -393,8 +393,7 @@ TclRegisterLiteral(
    LiteralEntry *globalPtr, *localPtr;
    Tcl_Obj *objPtr;
    unsigned hash;
-    unsigned int localHash;
-    int objIndex, new;
+    int localHash, objIndex, new;
    Namespace *nsPtr;

    if (length < 0) {
@@ -538,8 +537,7 @@ TclHideLiteral(
 {
    LiteralEntry **nextPtrPtr, *entryPtr, *lPtr;
    LiteralTable *localTablePtr = &envPtr->localLitTable;
-    unsigned int localHash;
-    int length;
+    int localHash, length;
    const char *bytes;
    Tcl_Obj *newObjPtr;

@@ -558,7 +556,7 @@ TclHideLiteral(
    lPtr->objPtr = newObjPtr;

    bytes = TclGetStringFromObj(newObjPtr, &length);
-    localHash = HashString(bytes, length) & localTablePtr->mask;
+    localHash = (HashString(bytes, length) & localTablePtr->mask);
    nextPtrPtr = &localTablePtr->buckets[localHash];

    for (entryPtr=*nextPtrPtr ; entryPtr!=NULL ; entryPtr=*nextPtrPtr) {
@@ -614,7 +612,7 @@ TclAddLiteralObj(
    lPtr = &envPtr->literalArrayPtr[objIndex];
    lPtr->objPtr = objPtr;
    Tcl_IncrRefCount(objPtr);
-    lPtr->refCount = (size_t)-1;	/* i.e., unused */
+    lPtr->refCount = -1;	/* i.e., unused */
    lPtr->nextPtr = NULL;

    if (litPtrPtr) {
@@ -811,8 +809,7 @@ TclReleaseLiteral(
    LiteralTable *globalTablePtr;
    register LiteralEntry *entryPtr, *prevPtr;
    const char *bytes;
-    int length;
-    unsigned int index;
+    int length, index;

    if (iPtr == NULL) {
 	goto done;
@@ -831,13 +828,15 @@ TclReleaseLiteral(
    for (prevPtr=NULL, entryPtr=globalTablePtr->buckets[index];
 	    entryPtr!=NULL ; prevPtr=entryPtr, entryPtr=entryPtr->nextPtr) {
 	if (entryPtr->objPtr == objPtr) {
+	    entryPtr->refCount--;
+
 	    /*
 	     * If the literal is no longer being used by any ByteCode, delete
 	     * the entry then remove the reference corresponding to the global
 	     * literal table entry (decrement the ref count of the object).
 	     */

-	    if (entryPtr->refCount-- <= 1) {
+	    if (entryPtr->refCount == 0) {
 		if (prevPtr == NULL) {
 		    globalTablePtr->buckets[index] = entryPtr->nextPtr;
 		} else {
@@ -955,8 +954,8 @@ RebuildLiteralTable(
    register LiteralEntry *entryPtr;
    LiteralEntry **bucketPtr;
    const char *bytes;
-    unsigned int oldSize, index;
-    int count, length;
+    unsigned int oldSize;
+    int count, index, length;

    oldSize = tablePtr->numBuckets;
    oldBuckets = tablePtr->buckets;
@@ -130,7 +130,7 @@ Tcl_LoadObjCmd(
    Tcl_PackageInitProc *initProc;
    const char *p, *fullFileName, *packageName;
    Tcl_LoadHandle loadHandle;
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar ch;
    unsigned len;
    int index, flags = 0;
    Tcl_Obj *const *savedobjv = objv;
@@ -470,19 +470,6 @@ Tcl_LoadObjCmd(
     */

    if (code != TCL_OK) {
-#if defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8
-	Interp *iPtr = (Interp *) target;
-	if (iPtr->result && *(iPtr->result) && !iPtr->freeProc) {
-	    /*
-	     * A call to Tcl_InitStubs() determined the caller extension and
-	     * this interp are incompatible in their stubs mechanisms, and
-	     * recorded the error in the oldest legacy place we have to do so.
-	     */
-	    Tcl_SetObjResult(target, Tcl_NewStringObj(iPtr->result, -1));
-	    iPtr->result =  &tclEmptyString;
-	    iPtr->freeProc = NULL;
-	}
-#endif /* defined(TCL_NO_DEPRECATED) */
 	Tcl_TransferResult(target, code, interp);
 	goto done;
    }
@@ -266,14 +266,18 @@ Tcl_SourceRCFile(

 	    c = Tcl_OpenFileChannel(NULL, fullName, "r", 0);
 	    if (c != NULL) {
+		Tcl_Obj *fullNameObj = Tcl_NewStringObj(fullName, -1);
+
 		Tcl_Close(NULL, c);
-		if (Tcl_EvalFile(interp, fullName) != TCL_OK) {
+		Tcl_IncrRefCount(fullNameObj);
+		if (Tcl_FSEvalFileEx(interp, fullNameObj, NULL) != TCL_OK) {
 		    chan = Tcl_GetStdChannel(TCL_STDERR);
 		    if (chan) {
 			Tcl_WriteObj(chan, Tcl_GetObjResult(interp));
 			Tcl_WriteChars(chan, "\n", 1);
 		    }
 		}
+		Tcl_DecrRefCount(fullNameObj);
 	    }
 	}
 	Tcl_DStringFree(&temp);
@@ -32,7 +32,7 @@
 */

 typedef struct {
-    unsigned long numNsCreated;	/* Count of the number of namespaces created
+    size_t numNsCreated;	/* Count of the number of namespaces created
 				 * within the thread. This value is used as a
 				 * unique id for each namespace. Cannot be
 				 * per-interp because the nsId is used to
@@ -402,7 +402,7 @@ Tcl_PopCallFrame(
    }
    if (framePtr->numCompiledLocals > 0) {
 	TclDeleteCompiledLocalVars(iPtr, framePtr);
-	if (framePtr->localCachePtr->refCount-- <= 1) {
+	if (--framePtr->localCachePtr->refCount == 0) {
 	    TclFreeLocalCache(interp, framePtr->localCachePtr);
 	}
 	framePtr->localCachePtr = NULL;
@@ -915,11 +915,6 @@ Tcl_DeleteNamespace(
    Tcl_HashSearch search;
    Command *cmdPtr;

-    /*
-     * Ensure that this namespace doesn't get deallocated in the meantime.
-     */
-    nsPtr->refCount++;
-
    /*
     * Give anyone interested - notably TclOO - a chance to use this namespace
     * normally despite the fact that the namespace is going to go. Allows the
@@ -1052,7 +1047,16 @@ Tcl_DeleteNamespace(
 #endif
 	    Tcl_DeleteHashTable(&nsPtr->cmdTable);

-	    nsPtr ->flags |= NS_DEAD;
+	    /*
+	     * If the reference count is 0, then discard the namespace.
+	     * Otherwise, mark it as "dead" so that it can't be used.
+	     */
+
+	    if (nsPtr->refCount == 0) {
+		NamespaceFree(nsPtr);
+	    } else {
+		nsPtr->flags |= NS_DEAD;
+	    }
 	} else {
 	    /*
 	     * Restore the ::errorInfo and ::errorCode traces.
@@ -1069,7 +1073,6 @@ Tcl_DeleteNamespace(
 	    nsPtr->flags &= ~(NS_DYING|NS_KILLED);
 	}
    }
-    TclNsDecrRefCount(nsPtr);
 }

 /*
@@ -2418,35 +2421,6 @@ TclGetNamespaceForQualName(
    return TCL_OK;
 }

-/*
- *----------------------------------------------------------------------
- *
- * TclEnsureNamespace --
- *
- *	Provide a namespace that is not deleted.
- *
- * Value
- *
- *	namespacePtr, if it is not scheduled for deletion, or a pointer to a
- *	new namespace with the same name otherwise.
- *
- * Effect
- *	None.
- *
- *----------------------------------------------------------------------
- */
-Tcl_Namespace *
-TclEnsureNamespace(
-    Tcl_Interp *interp,
-    Tcl_Namespace *namespacePtr)
-{
-    Namespace *nsPtr = (Namespace *) namespacePtr;
-    if (!(nsPtr->flags & NS_DYING)) {
-	    return namespacePtr;
-    }
-    return Tcl_CreateNamespace(interp, nsPtr->fullName, NULL, NULL);
-}
-
 /*
 *----------------------------------------------------------------------
 *
@@ -2664,7 +2638,7 @@ Tcl_FindCommand(
 	Namespace *nsPtr[2];
 	register int search;

-	TclGetNamespaceForQualName(interp, name, cxtNsPtr,
+	TclGetNamespaceForQualName(interp, name, (Namespace *) contextNsPtr,
 		flags, &nsPtr[0], &nsPtr[1], &cxtNsPtr, &simpleName);

 	/*
@@ -24,7 +24,7 @@
 * win/tclooConfig.sh
 */

-#define TCLOO_VERSION "1.2.0"
+#define TCLOO_VERSION "1.0.4"
 #define TCLOO_PATCHLEVEL TCLOO_VERSION

 #include "tcl.h"
@@ -1206,10 +1206,22 @@ TclOOCopyObjectCmd(
 	o2Ptr = Tcl_CopyObjectInstance(interp, oPtr, NULL, NULL);
    } else {
 	const char *name, *namespaceName;
+	Tcl_DString buffer;

 	name = TclGetString(objv[2]);
+	Tcl_DStringInit(&buffer);
 	if (name[0] == '\0') {
 	    name = NULL;
+	} else if (name[0]!=':' || name[1]!=':') {
+	    Interp *iPtr = (Interp *) interp;
+
+	    if (iPtr->varFramePtr != NULL) {
+		Tcl_DStringAppend(&buffer,
+			iPtr->varFramePtr->nsPtr->fullName, -1);
+	    }
+	    TclDStringAppendLiteral(&buffer, "::");
+	    Tcl_DStringAppend(&buffer, name, -1);
+	    name = Tcl_DStringValue(&buffer);
 	}

 	/*
@@ -1231,6 +1243,7 @@ TclOOCopyObjectCmd(
 	}

 	o2Ptr = Tcl_CopyObjectInstance(interp, oPtr, name, namespaceName);
+	Tcl_DStringFree(&buffer);
    }

    if (o2Ptr == NULL) {
@@ -53,8 +53,7 @@ static void		AddClassFiltersToCallContext(Object *const oPtr,
 			    Class *clsPtr, struct ChainBuilder *const cbPtr,
 			    Tcl_HashTable *const doneFilters, int flags);
 static void		AddClassMethodNames(Class *clsPtr, const int flags,
-			    Tcl_HashTable *const namesPtr,
-			    Tcl_HashTable *const examinedClassesPtr);
+			    Tcl_HashTable *const namesPtr);
 static inline void	AddMethodToCallChain(Method *const mPtr,
 			    struct ChainBuilder *const cbPtr,
 			    Tcl_HashTable *const doneFilters,
@@ -110,12 +109,7 @@ TclOODeleteContext(
    TclOODeleteChain(contextPtr->callPtr);
    if (oPtr != NULL) {
 	TclStackFree(oPtr->fPtr->interp, contextPtr);
-
-	/*
-	 * Corresponding AddRef() in TclOO.c/TclOOObjectCmdCore
-	 */
-
-	TclOODecrRefCount(oPtr);
+	DelRef(oPtr);
    }
 }

@@ -238,7 +232,7 @@ FreeMethodNameRep(
 * TclOOInvokeContext --
 *
 *	Invokes a single step along a method call-chain context. Note that the
- *	invocation of a step along the chain can cause further steps along the
+ *	invokation of a step along the chain can cause further steps along the
 *	chain to be invoked. Note that this function is written to be as light
 *	in stack usage as possible.
 *
@@ -373,10 +367,6 @@ TclOOGetSortedMethodList(
 {
    Tcl_HashTable names;	/* Tcl_Obj* method name to "wanted in list"
 				 * mapping. */
-    Tcl_HashTable examinedClasses;
-				/* Used to track what classes have been looked
-				 * at. Is set-like in nature and keyed by
-				 * pointer to class. */
    FOREACH_HASH_DECLS;
    int i;
    Class *mixinPtr;
@@ -386,7 +376,6 @@ TclOOGetSortedMethodList(
    void *isWanted;

    Tcl_InitObjHashTable(&names);
-    Tcl_InitHashTable(&examinedClasses, TCL_ONE_WORD_KEYS);

    /*
     * Name the bits used in the names table values.
@@ -447,14 +436,11 @@ TclOOGetSortedMethodList(
     * hierarchy.
     */

-    AddClassMethodNames(oPtr->selfCls, flags, &names, &examinedClasses);
+    AddClassMethodNames(oPtr->selfCls, flags, &names);
    FOREACH(mixinPtr, oPtr->mixins) {
-	AddClassMethodNames(mixinPtr, flags|TRAVERSED_MIXIN, &names,
-		&examinedClasses);
+	AddClassMethodNames(mixinPtr, flags|TRAVERSED_MIXIN, &names);
    }

-    Tcl_DeleteHashTable(&examinedClasses);
-
    /*
     * See how many (visible) method names there are. If none, we do not (and
     * should not) try to sort the list of them.
@@ -509,24 +495,18 @@ TclOOGetSortedClassMethodList(
 {
    Tcl_HashTable names;	/* Tcl_Obj* method name to "wanted in list"
 				 * mapping. */
-    Tcl_HashTable examinedClasses;
-				/* Used to track what classes have been looked
-				 * at. Is set-like in nature and keyed by
-				 * pointer to class. */
    FOREACH_HASH_DECLS;
    int i;
    Tcl_Obj *namePtr;
    void *isWanted;

    Tcl_InitObjHashTable(&names);
-    Tcl_InitHashTable(&examinedClasses, TCL_ONE_WORD_KEYS);

    /*
     * Process method names from the class hierarchy and the mixin hierarchy.
     */

-    AddClassMethodNames(clsPtr, flags, &names, &examinedClasses);
-    Tcl_DeleteHashTable(&examinedClasses);
+    AddClassMethodNames(clsPtr, flags, &names);

    /*
     * See how many (visible) method names there are. If none, we do not (and
@@ -601,28 +581,14 @@ AddClassMethodNames(
    Class *clsPtr,		/* Class to get method names from. */
    const int flags,		/* Whether we are interested in just the
 				 * public method names. */
-    Tcl_HashTable *const namesPtr,
+    Tcl_HashTable *const namesPtr)
 				/* Reference to the hash table to put the
 				 * information in. The hash table maps the
 				 * Tcl_Obj * method name to an integral value
 				 * describing whether the method is wanted.
 				 * This ensures that public/private override
-				 * semantics are handled correctly. */
-    Tcl_HashTable *const examinedClassesPtr)
-				/* Hash table that tracks what classes have
-				 * already been looked at. The keys are the
-				 * pointers to the classes, and the values are
-				 * immaterial. */
+				 * semantics are handled correctly.*/
 {
-    /*
-     * If we've already started looking at this class, stop working on it now
-     * to prevent repeated work.
-     */
-
-    if (Tcl_FindHashEntry(examinedClassesPtr, (char *) clsPtr)) {
-	return;
-    }
-
    /*
     * Scope all declarations so that the compiler can stand a good chance of
     * making the recursive step highly efficient. We also hand-implement the
@@ -630,31 +596,24 @@ AddClassMethodNames(
     * tail-recursion optimization usefully.
     */

+    if (clsPtr->mixins.num != 0) {
+	Class *mixinPtr;
+	int i;
+
+	/* TODO: Beware of infinite loops! */
+	FOREACH(mixinPtr, clsPtr->mixins) {
+	    AddClassMethodNames(mixinPtr, flags|TRAVERSED_MIXIN, namesPtr);
+	}
+    }
+
    while (1) {
 	FOREACH_HASH_DECLS;
 	Tcl_Obj *namePtr;
 	Method *mPtr;
-	int isNew;
-
-	(void) Tcl_CreateHashEntry(examinedClassesPtr, (char *) clsPtr,
-		&isNew);
-	if (!isNew) {
-	    break;
-	}
-
-	if (clsPtr->mixins.num != 0) {
-	    Class *mixinPtr;
-	    int i;
-
-	    FOREACH(mixinPtr, clsPtr->mixins) {
-		if (mixinPtr != clsPtr) {
-		    AddClassMethodNames(mixinPtr, flags|TRAVERSED_MIXIN,
-			    namesPtr, examinedClassesPtr);
-		}
-	    }
-	}

 	FOREACH_HASH(namePtr, mPtr, &clsPtr->classMethods) {
+	    int isNew;
+
 	    hPtr = Tcl_CreateHashEntry(namesPtr, (char *) namePtr, &isNew);
 	    if (isNew) {
 		int isWanted = (!(flags & PUBLIC_METHOD)
@@ -681,8 +640,7 @@ AddClassMethodNames(
 	int i;

 	FOREACH(superPtr, clsPtr->superclasses) {
-	    AddClassMethodNames(superPtr, flags, namesPtr,
-		    examinedClassesPtr);
+	    AddClassMethodNames(superPtr, flags, namesPtr);
 	}
    }
 }
@@ -835,7 +793,7 @@ AddMethodToCallChain(
 	     * Call chain semantics states that methods come as *late* in the
 	     * call chain as possible. This is done by copying down the
 	     * following methods. Note that this does not change the number of
-	     * method invocations in the call chain; it just rearranges them.
+	     * method invokations in the call chain; it just rearranges them.
 	     */

 	    Class *declCls = callPtr->chain[i].filterDeclarer;
@@ -905,7 +863,6 @@ InitCallChain(
 * ----------------------------------------------------------------------
 *
 * IsStillValid --
- *
 *	Calculates whether the given call chain can be used for executing a
 *	method for the given object. The condition on a chain from a cached
 *	location being reusable is:
@@ -941,7 +898,7 @@ IsStillValid(
 * TclOOGetCallContext --
 *
 *	Responsible for constructing the call context, an ordered list of all
- *	method implementations to be called as part of a method invocation.
+ *	method implementations to be called as part of a method invokation.
 *	This method is central to the whole operation of the OO system.
 *
 * ----------------------------------------------------------------------
@@ -1177,11 +1134,6 @@ TclOOGetCallContext(
  returnContext:
    contextPtr = TclStackAlloc(oPtr->fPtr->interp, sizeof(CallContext));
    contextPtr->oPtr = oPtr;
-
-    /*
-     * Corresponding TclOODecrRefCount() in TclOODeleteContext
-     */
-
    AddRef(oPtr);
    contextPtr->callPtr = callPtr;
    contextPtr->skip = 2;
@@ -1528,7 +1480,7 @@ TclOORenderCallChain(
    /*
     * Do the actual construction of the descriptions. They consist of a list
     * of triples that describe the details of how a method is understood. For
-     * each triple, the first word is the type of invocation ("method" is
+     * each triple, the first word is the type of invokation ("method" is
     * normal, "unknown" is special because it adds the method name as an
     * extra argument when handled by some method types, and "filter" is
     * special because it's a filter method). The second word is the name of
@@ -123,7 +123,6 @@ static const struct DeclaredSlot slots[] = {
 * ----------------------------------------------------------------------
 *
 * BumpGlobalEpoch --
- *
 *	Utility that ensures that call chains that are invalid will get thrown
 *	away at an appropriate time. Note that exactly which epoch gets
 *	advanced will depend on exactly what the class is tangled up in; in
@@ -168,7 +167,6 @@ BumpGlobalEpoch(
 * ----------------------------------------------------------------------
 *
 * RecomputeClassCacheFlag --
- *
 *	Determine whether the object is prototypical of its class, and hence
 *	able to use the class's method chain cache.
 *
@@ -191,7 +189,6 @@ RecomputeClassCacheFlag(
 * ----------------------------------------------------------------------
 *
 * TclOOObjectSetFilters --
- *
 *	Install a list of filter method names into an object.
 *
 * ----------------------------------------------------------------------
@@ -250,7 +247,6 @@ TclOOObjectSetFilters(
 * ----------------------------------------------------------------------
 *
 * TclOOClassSetFilters --
- *
 *	Install a list of filter method names into a class.
 *
 * ----------------------------------------------------------------------
@@ -313,7 +309,6 @@ TclOOClassSetFilters(
 * ----------------------------------------------------------------------
 *
 * TclOOObjectSetMixins --
- *
 *	Install a list of mixin classes into an object.
 *
 * ----------------------------------------------------------------------
@@ -331,8 +326,9 @@ TclOOObjectSetMixins(
    if (numMixins == 0) {
 	if (oPtr->mixins.num != 0) {
 	    FOREACH(mixinPtr, oPtr->mixins) {
-		TclOORemoveFromInstances(oPtr, mixinPtr);
-		TclOODecrRefCount(mixinPtr->thisPtr);
+		if (mixinPtr) {
+		    TclOORemoveFromInstances(oPtr, mixinPtr);
+		}
 	    }
 	    ckfree(oPtr->mixins.list);
 	    oPtr->mixins.num = 0;
@@ -344,7 +340,6 @@ TclOOObjectSetMixins(
 		if (mixinPtr && mixinPtr != oPtr->selfCls) {
 		    TclOORemoveFromInstances(oPtr, mixinPtr);
 		}
-		TclOODecrRefCount(mixinPtr->thisPtr);
 	    }
 	    oPtr->mixins.list = ckrealloc(oPtr->mixins.list,
 		    sizeof(Class *) * numMixins);
@@ -357,8 +352,6 @@ TclOOObjectSetMixins(
 	FOREACH(mixinPtr, oPtr->mixins) {
 	    if (mixinPtr != oPtr->selfCls) {
 		TclOOAddToInstances(oPtr, mixinPtr);
-		/* For the new copy created by memcpy */
-		AddRef(mixinPtr->thisPtr);
 	    }
 	}
    }
@@ -369,7 +362,6 @@ TclOOObjectSetMixins(
 * ----------------------------------------------------------------------
 *
 * TclOOClassSetMixins --
- *
 *	Install a list of mixin classes into a class.
 *
 * ----------------------------------------------------------------------
@@ -389,7 +381,6 @@ TclOOClassSetMixins(
 	if (classPtr->mixins.num != 0) {
 	    FOREACH(mixinPtr, classPtr->mixins) {
 		TclOORemoveFromMixinSubs(classPtr, mixinPtr);
-		TclOODecrRefCount(mixinPtr->thisPtr);
 	    }
 	    ckfree(classPtr->mixins.list);
 	    classPtr->mixins.num = 0;
@@ -398,7 +389,6 @@ TclOOClassSetMixins(
 	if (classPtr->mixins.num != 0) {
 	    FOREACH(mixinPtr, classPtr->mixins) {
 		TclOORemoveFromMixinSubs(classPtr, mixinPtr);
-		TclOODecrRefCount(mixinPtr->thisPtr);
 	    }
 	    classPtr->mixins.list = ckrealloc(classPtr->mixins.list,
 		    sizeof(Class *) * numMixins);
@@ -409,8 +399,6 @@ TclOOClassSetMixins(
 	memcpy(classPtr->mixins.list, mixins, sizeof(Class *) * numMixins);
 	FOREACH(mixinPtr, classPtr->mixins) {
 	    TclOOAddToMixinSubs(classPtr, mixinPtr);
-	    /* For the new copy created by memcpy */
-	    AddRef(mixinPtr->thisPtr);
 	}
    }
    BumpGlobalEpoch(interp, classPtr);
@@ -420,7 +408,6 @@ TclOOClassSetMixins(
 * ----------------------------------------------------------------------
 *
 * RenameDeleteMethod --
- *
 *	Core of the code to rename and delete methods.
 *
 * ----------------------------------------------------------------------
@@ -510,7 +497,6 @@ RenameDeleteMethod(
 * ----------------------------------------------------------------------
 *
 * TclOOUnknownDefinition --
- *
 *	Handles what happens when an unknown command is encountered during the
 *	processing of a definition script. Works by finding a command in the
 *	operating definition namespace that the requested command is a unique
@@ -589,7 +575,6 @@ TclOOUnknownDefinition(
 * ----------------------------------------------------------------------
 *
 * FindCommand --
- *
 *	Specialized version of Tcl_FindCommand that handles command prefixes
 *	and disallows namespace magic.
 *
@@ -650,7 +635,6 @@ FindCommand(
 * ----------------------------------------------------------------------
 *
 * InitDefineContext --
- *
 *	Does the magic incantations necessary to push the special stack frame
 *	used when processing object definitions. It is up to the caller to
 *	dispose of the frame (with TclPopStackFrame) when finished.
@@ -676,9 +660,7 @@ InitDefineContext(
 	return TCL_ERROR;
    }

-    /*
-     * framePtrPtr is needed to satisfy GCC 3.3's strict aliasing rules.
-     */
+    /* framePtrPtr is needed to satisfy GCC 3.3's strict aliasing rules */

    (void) TclPushStackFrame(interp, (Tcl_CallFrame **) framePtrPtr,
 	    namespacePtr, FRAME_IS_OO_DEFINE);
@@ -693,7 +675,6 @@ InitDefineContext(
 * ----------------------------------------------------------------------
 *
 * TclOOGetDefineCmdContext --
- *
 *	Extracts the magic token from the current stack frame, or returns NULL
 *	(and leaves an error message) otherwise.
 *
@@ -730,7 +711,6 @@ TclOOGetDefineCmdContext(
 * ----------------------------------------------------------------------
 *
 * GetClassInOuterContext --
- *
 *	Wrapper round Tcl_GetObjectFromObj to perform the lookup in the
 *	context that called oo::define (or equivalent). Note that this may
 *	have to go up multiple levels to get the level that we started doing
@@ -773,7 +753,6 @@ GetClassInOuterContext(
 * ----------------------------------------------------------------------
 *
 * GenerateErrorInfo --
- *
 *	Factored out code to generate part of the error trace messages.
 *
 * ----------------------------------------------------------------------
@@ -812,7 +791,6 @@ GenerateErrorInfo(
 * ----------------------------------------------------------------------
 *
 * MagicDefinitionInvoke --
- *
 *	Part of the implementation of the "oo::define" and "oo::objdefine"
 *	commands that is used to implement the more-than-one-argument case,
 *	applying ensemble-like tricks with dispatch so that error messages are
@@ -876,7 +854,6 @@ MagicDefinitionInvoke(
 * ----------------------------------------------------------------------
 *
 * TclOODefineObjCmd --
- *
 *	Implementation of the "oo::define" command. Works by effectively doing
 *	the same as 'namespace eval', but with extra magic applied so that the
 *	object to be modified is known to the commands in the target
@@ -937,7 +914,7 @@ TclOODefineObjCmd(
    } else {
 	result = MagicDefinitionInvoke(interp, fPtr->defineNs, 2, objc, objv);
    }
-    TclOODecrRefCount(oPtr);
+    DelRef(oPtr);

    /*
     * Restore the previous "current" namespace.
@@ -951,7 +928,6 @@ TclOODefineObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOOObjDefObjCmd --
- *
 *	Implementation of the "oo::objdefine" command. Works by effectively
 *	doing the same as 'namespace eval', but with extra magic applied so
 *	that the object to be modified is known to the commands in the target
@@ -1005,7 +981,7 @@ TclOOObjDefObjCmd(
    } else {
 	result = MagicDefinitionInvoke(interp, fPtr->objdefNs, 2, objc, objv);
    }
-    TclOODecrRefCount(oPtr);
+    DelRef(oPtr);

    /*
     * Restore the previous "current" namespace.
@@ -1019,7 +995,6 @@ TclOOObjDefObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOODefineSelfObjCmd --
- *
 *	Implementation of the "self" subcommand of the "oo::define" command.
 *	Works by effectively doing the same as 'namespace eval', but with
 *	extra magic applied so that the object to be modified is known to the
@@ -1073,7 +1048,7 @@ TclOODefineSelfObjCmd(
    } else {
 	result = MagicDefinitionInvoke(interp, fPtr->objdefNs, 1, objc, objv);
    }
-    TclOODecrRefCount(oPtr);
+    DelRef(oPtr);

    /*
     * Restore the previous "current" namespace.
@@ -1087,7 +1062,6 @@ TclOODefineSelfObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOODefineObjSelfObjCmd --
- *
 *	Implementation of the "self" subcommand of the "oo::objdefine"
 *	command.
 *
@@ -1121,7 +1095,6 @@ TclOODefineObjSelfObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOODefineClassObjCmd --
- *
 *	Implementation of the "class" subcommand of the "oo::objdefine"
 *	command.
 *
@@ -1137,6 +1110,7 @@ TclOODefineClassObjCmd(
 {
    Object *oPtr;
    Class *clsPtr;
+    Foundation *fPtr = TclOOGetFoundation(interp);

    /*
     * Parse the context to get the object to operate on.
@@ -1173,6 +1147,20 @@ TclOODefineClassObjCmd(
 	return TCL_ERROR;
    }

+    /*
+     * Apply semantic checks. In particular, classes and non-classes are not
+     * interchangable (too complicated to do the conversion!) so we must
+     * produce an error if any attempt is made to swap from one to the other.
+     */
+
+    if ((oPtr->classPtr==NULL) == TclOOIsReachable(fPtr->classCls, clsPtr)) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"may not change a %sclass object into a %sclass object",
+		(oPtr->classPtr==NULL ? "non-" : ""),
+		(oPtr->classPtr==NULL ? "" : "non-")));
+	Tcl_SetErrorCode(interp, "TCL", "OO", "TRANSMUTATION", NULL);
+	return TCL_ERROR;
+    }

    /*
     * Set the object's class.
@@ -1180,11 +1168,11 @@ TclOODefineClassObjCmd(

    if (oPtr->selfCls != clsPtr) {
 	TclOORemoveFromInstances(oPtr, oPtr->selfCls);
-	TclOODecrRefCount(oPtr->selfCls->thisPtr);
 	oPtr->selfCls = clsPtr;
-	AddRef(oPtr->selfCls->thisPtr);
 	TclOOAddToInstances(oPtr, oPtr->selfCls);
-
+	if (!(clsPtr->thisPtr->flags & OBJECT_DELETED)) {
+	    oPtr->flags &= ~CLASS_GONE;
+	}
 	if (oPtr->classPtr != NULL) {
 	    BumpGlobalEpoch(interp, oPtr->classPtr);
 	} else {
@@ -1198,7 +1186,6 @@ TclOODefineClassObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOODefineConstructorObjCmd --
- *
 *	Implementation of the "constructor" subcommand of the "oo::define"
 *	command.
 *
@@ -1267,7 +1254,6 @@ TclOODefineConstructorObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOODefineDeleteMethodObjCmd --
- *
 *	Implementation of the "deletemethod" subcommand of the "oo::define"
 *	and "oo::objdefine" commands.
 *
@@ -1324,7 +1310,6 @@ TclOODefineDeleteMethodObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOODefineDestructorObjCmd --
- *
 *	Implementation of the "destructor" subcommand of the "oo::define"
 *	command.
 *
@@ -1389,7 +1374,6 @@ TclOODefineDestructorObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOODefineExportObjCmd --
- *
 *	Implementation of the "export" subcommand of the "oo::define" and
 *	"oo::objdefine" commands.
 *
@@ -1484,7 +1468,6 @@ TclOODefineExportObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOODefineForwardObjCmd --
- *
 *	Implementation of the "forward" subcommand of the "oo::define" and
 *	"oo::objdefine" commands.
 *
@@ -1545,7 +1528,6 @@ TclOODefineForwardObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOODefineMethodObjCmd --
- *
 *	Implementation of the "method" subcommand of the "oo::define" and
 *	"oo::objdefine" commands.
 *
@@ -1603,7 +1585,6 @@ TclOODefineMethodObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOODefineMixinObjCmd --
- *
 *	Implementation of the "mixin" subcommand of the "oo::define" and
 *	"oo::objdefine" commands.
 *
@@ -1667,7 +1648,6 @@ TclOODefineMixinObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOODefineRenameMethodObjCmd --
- *
 *	Implementation of the "renamemethod" subcommand of the "oo::define"
 *	and "oo::objdefine" commands.
 *
@@ -1724,7 +1704,6 @@ TclOODefineRenameMethodObjCmd(
 * ----------------------------------------------------------------------
 *
 * TclOODefineUnexportObjCmd --
- *
 *	Implementation of the "unexport" subcommand of the "oo::define" and
 *	"oo::objdefine" commands.
 *
@@ -1819,7 +1798,6 @@ TclOODefineUnexportObjCmd(
 * ----------------------------------------------------------------------
 *
 * Tcl_ClassSetConstructor, Tcl_ClassSetDestructor --
- *
 *	How to install a constructor or destructor into a class; API to call
 *	from C.
 *
@@ -1874,7 +1852,6 @@ Tcl_ClassSetDestructor(
 * ----------------------------------------------------------------------
 *
 * TclOODefineSlots --
- *
 *	Create the "::oo::Slot" class and its standard instances. Class
 *	definition is empty at the stage (added by scripting).
 *
@@ -1918,7 +1895,6 @@ TclOODefineSlots(
 * ----------------------------------------------------------------------
 *
 * ClassFilterGet, ClassFilterSet --
- *
 *	Implementation of the "filter" slot accessors of the "oo::define"
 *	command.
 *
@@ -1998,7 +1974,6 @@ ClassFilterSet(
 * ----------------------------------------------------------------------
 *
 * ClassMixinGet, ClassMixinSet --
- *
 *	Implementation of the "mixin" slot accessors of the "oo::define"
 *	command.
 *
@@ -2080,7 +2055,6 @@ ClassMixinSet(
 	mixins[i] = GetClassInOuterContext(interp, mixinv[i],
 		"may only mix in classes");
 	if (mixins[i] == NULL) {
-	    i--;
 	    goto freeAndError;
 	}
 	if (TclOOIsReachable(oPtr->classPtr, mixins[i])) {
@@ -2104,7 +2078,6 @@ ClassMixinSet(
 * ----------------------------------------------------------------------
 *
 * ClassSuperGet, ClassSuperSet --
- *
 *	Implementation of the "superclass" slot accessors of the "oo::define"
 *	command.
 *
@@ -2199,19 +2172,16 @@ ClassSuperSet(

    if (superc == 0) {
 	superclasses = ckrealloc(superclasses, sizeof(Class *));
+	superclasses[0] = oPtr->fPtr->objectCls;
+	superc = 1;
 	if (TclOOIsReachable(oPtr->fPtr->classCls, oPtr->classPtr)) {
 	    superclasses[0] = oPtr->fPtr->classCls;
-	} else {
-	    superclasses[0] = oPtr->fPtr->objectCls;
 	}
-	superc = 1;
-	AddRef(superclasses[0]->thisPtr);
    } else {
 	for (i=0 ; i<superc ; i++) {
 	    superclasses[i] = GetClassInOuterContext(interp, superv[i],
 		    "only a class can be a superclass");
 	    if (superclasses[i] == NULL) {
-		i--;
 		goto failedAfterAlloc;
 	    }
 	    for (j=0 ; j<i ; j++) {
@@ -2228,19 +2198,9 @@ ClassSuperSet(
 			"attempt to form circular dependency graph", -1));
 		Tcl_SetErrorCode(interp, "TCL", "OO", "CIRCULARITY", NULL);
 	    failedAfterAlloc:
-		for (; i > 0; i--) {
-		    TclOODecrRefCount(superclasses[i]->thisPtr);
-		}
 		ckfree(superclasses);
 		return TCL_ERROR;
 	    }
-
-	    /*
-	     * Corresponding TclOODecrRefCount() is near the end of this
-	     * function.
-	     */
-
-	    AddRef(superclasses[i]->thisPtr);
 	}
    }

@@ -2254,7 +2214,6 @@ ClassSuperSet(
    if (oPtr->classPtr->superclasses.num != 0) {
 	FOREACH(superPtr, oPtr->classPtr->superclasses) {
 	    TclOORemoveFromSubclasses(oPtr->classPtr, superPtr);
-	    TclOODecrRefCount(superPtr->thisPtr);
 	}
 	ckfree(oPtr->classPtr->superclasses.list);
    }
@@ -2272,7 +2231,6 @@ ClassSuperSet(
 * ----------------------------------------------------------------------
 *
 * ClassVarsGet, ClassVarsSet --
- *
 *	Implementation of the "variable" slot accessors of the "oo::define"
 *	command.
 *
@@ -2415,7 +2373,6 @@ ClassVarsSet(
 * ----------------------------------------------------------------------
 *
 * ObjectFilterGet, ObjectFilterSet --
- *
 *	Implementation of the "filter" slot accessors of the "oo::objdefine"
 *	command.
 *
@@ -2483,7 +2440,6 @@ ObjFilterSet(
 * ----------------------------------------------------------------------
 *
 * ObjectMixinGet, ObjectMixinSet --
- *
 *	Implementation of the "mixin" slot accessors of the "oo::objdefine"
 *	command.
 *
@@ -2569,7 +2525,6 @@ ObjMixinSet(
 * ----------------------------------------------------------------------
 *
 * ObjectVarsGet, ObjectVarsSet --
- *
 *	Implementation of the "variable" slot accessors of the "oo::objdefine"
 *	command.
 *
@@ -149,8 +149,8 @@ typedef struct Object {
    struct Foundation *fPtr;	/* The basis for the object system. Putting
 				 * this here allows the avoidance of quite a
 				 * lot of hash lookups on the critical path
-				 * for object invocation and creation. */
-    Tcl_Namespace *namespacePtr;/* This object's namespace. */
+				 * for object invokation and creation. */
+    Tcl_Namespace *namespacePtr;/* This object's tame namespace. */
    Tcl_Command command;	/* Reference to this object's public
 				 * command. */
    Tcl_Command myCommand;	/* Reference to this object's internal
@@ -162,12 +162,12 @@ typedef struct Object {
 				/* Classes mixed into this object. */
    LIST_STATIC(Tcl_Obj *) filters;
 				/* List of filter names. */
-    struct Class *classPtr;	/* This is non-NULL for all classes, and NULL
-				 *  for everything else. It points to the class
-				 *  structure. */
+    struct Class *classPtr;	/* All classes have this non-NULL; it points
+				 * to the class structure. Everything else has
+				 * this NULL. */
    int refCount;		/* Number of strong references to this object.
 				 * Note that there may be many more weak
-				 * references; this mechanism exists to
+				 * references; this mechanism is there to
 				 * avoid Tcl_Preserve. */
    int flags;
    int creationEpoch;		/* Unique value to make comparisons of objects
@@ -193,10 +193,9 @@ typedef struct Object {
 				 * destroyed. */
 #define DESTRUCTOR_CALLED 2	/* Flag to say that the destructor has been
 				 * called. */
-#define CLASS_GONE	4	/* Obsolete. Indicates that the class of this
-				 * object has been deleted, and so the object
-				 * should not attempt to remove itself from its
-				 * class. */
+#define CLASS_GONE	4	/* Indicates that the class of this object has
+				 * been deleted, and so the object should not
+				 * attempt to remove itself from its class. */
 #define ROOT_OBJECT 0x1000	/* Flag to say that this object is the root of
 				 * the class hierarchy and should be treated
 				 * specially during teardown. */
@@ -223,6 +222,10 @@ typedef struct Object {
 typedef struct Class {
    Object *thisPtr;		/* Reference to the object associated with
 				 * this class. */
+    int refCount;		/* Number of strong references to this class.
+				 * Weak references are not counted; the
+				 * purpose of this is to avoid Tcl_Preserve as
+				 * that is quite slow. */
    int flags;			/* Assorted flags. */
    LIST_STATIC(struct Class *) superclasses;
 				/* List of superclasses, used for generation
@@ -320,7 +323,7 @@ typedef struct Foundation {
 } Foundation;

 /*
- * A call context structure is built when a method is called. It contains the
+ * A call context structure is built when a method is called. They contain the
 * chain of method implementations that are to be invoked by a particular
 * call, and the process of calling walks the chain, with the [next] command
 * proceeding to the next entry in the chain.
@@ -331,7 +334,7 @@ typedef struct Foundation {
 struct MInvoke {
    Method *mPtr;		/* Reference to the method implementation
 				 * record. */
-    int isFilter;		/* Whether this is a filter invocation. */
+    int isFilter;		/* Whether this is a filter invokation. */
    Class *filterDeclarer;	/* What class decided to add the filter; if
 				 * NULL, it was added by the object. */
 };
@@ -492,11 +495,6 @@ MODULE_SCOPE int	TclNRNewObjectInstance(Tcl_Interp *interp,
 			    const char *nsNameStr, int objc,
 			    Tcl_Obj *const *objv, int skip,
 			    Tcl_Object *objectPtr);
-MODULE_SCOPE Object *	TclNewObjectInstanceCommon(Tcl_Interp *interp,
-			    Class *classPtr,
-			    const char *nameStr,
-			    const char *nsNameStr);
-MODULE_SCOPE int	TclOODecrRefCount(Object *oPtr);
 MODULE_SCOPE int	TclOODefineSlots(Foundation *fPtr);
 MODULE_SCOPE void	TclOODeleteChain(CallChain *callPtr);
 MODULE_SCOPE void	TclOODeleteChainCache(Tcl_HashTable *tablePtr);
@@ -526,10 +524,10 @@ MODULE_SCOPE int	TclNRObjectContextInvokeNext(Tcl_Interp *interp,
 MODULE_SCOPE void	TclOONewBasicMethod(Tcl_Interp *interp, Class *clsPtr,
 			    const DeclaredClassMethod *dcm);
 MODULE_SCOPE Tcl_Obj *	TclOOObjectName(Tcl_Interp *interp, Object *oPtr);
-MODULE_SCOPE int	TclOORemoveFromInstances(Object *oPtr, Class *clsPtr);
-MODULE_SCOPE int	TclOORemoveFromMixinSubs(Class *subPtr,
+MODULE_SCOPE void	TclOORemoveFromInstances(Object *oPtr, Class *clsPtr);
+MODULE_SCOPE void	TclOORemoveFromMixinSubs(Class *subPtr,
 			    Class *mixinPtr);
-MODULE_SCOPE int	TclOORemoveFromSubclasses(Class *subPtr,
+MODULE_SCOPE void	TclOORemoveFromSubclasses(Class *subPtr,
 			    Class *superPtr);
 MODULE_SCOPE Tcl_Obj *	TclOORenderCallChain(Tcl_Interp *interp,
 			    CallChain *callPtr);
@@ -543,22 +541,19 @@ MODULE_SCOPE void	TclOOSetupVariableResolver(Tcl_Namespace *nsPtr);

 #include "tclOOIntDecls.h"

-/*
- * Alternatives to Tcl_Preserve/Tcl_EventuallyFree/Tcl_Release.
- */
-
-#define AddRef(ptr) ((ptr)->refCount++)
-
 /*
 * A convenience macro for iterating through the lists used in the internal
- * memory management of objects.
+ * memory management of objects. This is a bit gnarly because we want to do
+ * the assignment of the picked-out value only when the body test succeeds,
+ * but we cannot rely on the assigned value being useful, forcing us to do
+ * some nasty stuff with the comma operator. The compiler's optimizer should
+ * be able to sort it all out!
+ *
 * REQUIRES DECLARATION: int i;
 */

 #define FOREACH(var,ary) \
-    for(i=0 ; i<(ary).num; i++) if ((ary).list[i] == NULL) { \
-	continue; \
-    } else if (var = (ary).list[i], 1) 
+	for(i=0 ; (i<(ary).num?((var=(ary).list[i]),1):0) ; i++)

 /*
 * Convenience macros for iterating through hash tables. FOREACH_HASH_DECLS
@@ -593,6 +588,17 @@ MODULE_SCOPE void	TclOOSetupVariableResolver(Tcl_Namespace *nsPtr);
 	} \
    } while(0)

+/*
+ * Alternatives to Tcl_Preserve/Tcl_EventuallyFree/Tcl_Release.
+ */
+
+#define AddRef(ptr) ((ptr)->refCount++)
+#define DelRef(ptr) do {			\
+	if ((ptr)->refCount-- <= 1) {		\
+	    ckfree(ptr);			\
+	}					\
+    } while(0)
+
 #endif /* TCL_OO_INTERNAL_H */

 /*
@@ -1314,7 +1314,6 @@ CloneProcedureMethod(
     */

    bodyObj = Tcl_DuplicateObj(pmPtr->procPtr->bodyPtr);
-    Tcl_GetString(bodyObj);
    TclFreeIntRep(bodyObj);

    /*
@@ -210,8 +210,9 @@ static int		SetDoubleFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static int		SetIntFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static void		UpdateStringOfDouble(Tcl_Obj *objPtr);
 static void		UpdateStringOfInt(Tcl_Obj *objPtr);
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 && !defined(TCL_WIDE_INT_IS_LONG)
-static void		UpdateStringOfOldInt(Tcl_Obj *objPtr);
+#ifndef TCL_WIDE_INT_IS_LONG
+static void		UpdateStringOfWideInt(Tcl_Obj *objPtr);
+static int		SetWideIntFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 #endif
 static void		FreeBignum(Tcl_Obj *objPtr);
 static void		DupBignum(Tcl_Obj *objPtr, Tcl_Obj *copyPtr);
@@ -241,7 +242,6 @@ static int		SetCmdNameFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 * implementations.
 */

-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 static const Tcl_ObjType oldBooleanType = {
    "boolean",			/* name */
    NULL,			/* freeIntRepProc */
@@ -249,7 +249,6 @@ static const Tcl_ObjType oldBooleanType = {
    NULL,			/* updateStringProc */
    TclSetBooleanFromAny		/* setFromAnyProc */
 };
-#endif
 const Tcl_ObjType tclBooleanType = {
    "booleanString",		/* name */
    NULL,			/* freeIntRepProc */
@@ -265,23 +264,19 @@ const Tcl_ObjType tclDoubleType = {
    SetDoubleFromAny		/* setFromAnyProc */
 };
 const Tcl_ObjType tclIntType = {
-#if defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8 || defined(TCL_WIDE_INT_IS_LONG)
    "int",			/* name */
-#else
-    "wideInt",		/* name, keeping maximum compatibility with Tcl 8.6 on 32-bit platforms*/
-#endif
    NULL,			/* freeIntRepProc */
    NULL,			/* dupIntRepProc */
    UpdateStringOfInt,		/* updateStringProc */
    SetIntFromAny		/* setFromAnyProc */
 };
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 && !defined(TCL_WIDE_INT_IS_LONG)
-static const Tcl_ObjType oldIntType = {
-    "int",			/* name */
+#ifndef TCL_WIDE_INT_IS_LONG
+const Tcl_ObjType tclWideIntType = {
+    "wideInt",			/* name */
    NULL,			/* freeIntRepProc */
    NULL,			/* dupIntRepProc */
-    UpdateStringOfOldInt,		/* updateStringProc */
-    SetIntFromAny		/* setFromAnyProc */
+    UpdateStringOfWideInt,	/* updateStringProc */
+    SetWideIntFromAny		/* setFromAnyProc */
 };
 #endif
 const Tcl_ObjType tclBignumType = {
@@ -349,17 +344,17 @@ typedef struct ResolvedCmdName {
 				 * reference (not the namespace that contains
 				 * the referenced command). NULL if the name
 				 * is fully qualified.*/
-    unsigned long refNsId;		/* refNsPtr's unique namespace id. Used to
+    size_t refNsId;		/* refNsPtr's unique namespace id. Used to
 				 * verify that refNsPtr is still valid (e.g.,
 				 * it's possible that the cmd's containing
 				 * namespace was deleted and a new one created
 				 * at the same address). */
-    unsigned int refNsCmdEpoch;	/* Value of the referencing namespace's
+    size_t refNsCmdEpoch;	/* Value of the referencing namespace's
 				 * cmdRefEpoch when the pointer was cached.
 				 * Before using the cached pointer, we check
 				 * if the namespace's epoch was incremented;
 				 * if so, this cached pointer is invalid. */
-    unsigned int cmdEpoch; /* Value of the command's cmdEpoch when this
+    size_t cmdEpoch;		/* Value of the command's cmdEpoch when this
 				 * pointer was cached. Before using the cached
 				 * pointer, we check if the cmd's epoch was
 				 * incremented; if so, the cmd was renamed,
@@ -400,6 +395,8 @@ TclInitObjSubsystem(void)

    Tcl_RegisterObjType(&tclByteArrayType);
    Tcl_RegisterObjType(&tclDoubleType);
+    Tcl_RegisterObjType(&tclEndOffsetType);
+    Tcl_RegisterObjType(&tclIntType);
    Tcl_RegisterObjType(&tclStringType);
    Tcl_RegisterObjType(&tclListType);
    Tcl_RegisterObjType(&tclDictType);
@@ -409,12 +406,9 @@ TclInitObjSubsystem(void)
    Tcl_RegisterObjType(&tclProcBodyType);

    /* For backward compatibility only ... */
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-    Tcl_RegisterObjType(&tclIntType);
-#if !defined(TCL_WIDE_INT_IS_LONG)
-    Tcl_RegisterObjType(&oldIntType);
-#endif
    Tcl_RegisterObjType(&oldBooleanType);
+#ifndef TCL_WIDE_INT_IS_LONG
+    Tcl_RegisterObjType(&tclWideIntType);
 #endif

 #ifdef TCL_COMPILE_STATS
@@ -1768,7 +1762,7 @@ Tcl_NewBooleanObj(
 {
    register Tcl_Obj *objPtr;

-    TclNewIntObj(objPtr, boolValue!=0);
+    TclNewLongObj(objPtr, boolValue!=0);
    return objPtr;
 }
 #endif /* TCL_MEM_DEBUG */
@@ -1816,7 +1810,7 @@ Tcl_DbNewBooleanObj(
    TclDbNewObj(objPtr, file, line);
    objPtr->bytes = NULL;

-    objPtr->internalRep.wideValue = (boolValue != 0);
+    objPtr->internalRep.longValue = (boolValue != 0);
    objPtr->typePtr = &tclIntType;
    return objPtr;
 }
@@ -1863,7 +1857,7 @@ Tcl_SetBooleanObj(
 	Tcl_Panic("%s called with shared object", "Tcl_SetBooleanObj");
    }

-    TclSetIntObj(objPtr, boolValue!=0);
+    TclSetLongObj(objPtr, boolValue!=0);
 }
 #endif /* TCL_NO_DEPRECATED */

@@ -1894,11 +1888,11 @@ Tcl_GetBooleanFromObj(
 {
    do {
 	if (objPtr->typePtr == &tclIntType) {
-	    *boolPtr = (objPtr->internalRep.wideValue != 0);
+	    *boolPtr = (objPtr->internalRep.longValue != 0);
 	    return TCL_OK;
 	}
 	if (objPtr->typePtr == &tclBooleanType) {
-	    *boolPtr = objPtr->internalRep.longValue != 0;
+	    *boolPtr = (int) objPtr->internalRep.longValue;
 	    return TCL_OK;
 	}
 	if (objPtr->typePtr == &tclDoubleType) {
@@ -1922,6 +1916,12 @@ Tcl_GetBooleanFromObj(
 	    *boolPtr = 1;
 	    return TCL_OK;
 	}
+#ifndef TCL_WIDE_INT_IS_LONG
+	if (objPtr->typePtr == &tclWideIntType) {
+	    *boolPtr = (objPtr->internalRep.wideValue != 0);
+	    return TCL_OK;
+	}
+#endif
    } while ((ParseBoolean(objPtr) == TCL_OK) || (TCL_OK ==
 	    TclParseNumber(interp, objPtr, "boolean value", NULL,-1,NULL,0)));
    return TCL_ERROR;
@@ -1942,12 +1942,7 @@ Tcl_GetBooleanFromObj(
 *
 * Side effects:
 *	If no error occurs, an integer 1 or 0 is stored as "objPtr"s internal
- *	representation and the type of "objPtr" is set to boolean or int/wideInt.
- *
- *  Warning: If the returned type is "wideInt" (32-bit platforms) and your
- *  platform is bigendian, you cannot use internalRep.longValue to distinguish
- *  between false and true. On Windows and most other platforms this still will
- *  work fine, but basically it is non-portable.
+ *	representation and the type of "objPtr" is set to boolean.
 *
 *----------------------------------------------------------------------
 */
@@ -1965,7 +1960,8 @@ TclSetBooleanFromAny(

    if (objPtr->bytes == NULL) {
 	if (objPtr->typePtr == &tclIntType) {
-	    if ((Tcl_WideUInt)objPtr->internalRep.wideValue < 2) {
+	    switch (objPtr->internalRep.longValue) {
+	    case 0L: case 1L:
 		return TCL_OK;
 	    }
 	    goto badBoolean;
@@ -1975,6 +1971,12 @@ TclSetBooleanFromAny(
 	    goto badBoolean;
 	}

+#ifndef TCL_WIDE_INT_IS_LONG
+	if (objPtr->typePtr == &tclWideIntType) {
+	    goto badBoolean;
+	}
+#endif
+
 	if (objPtr->typePtr == &tclDoubleType) {
 	    goto badBoolean;
 	}
@@ -2111,7 +2113,7 @@ ParseBoolean(

  numericBoolean:
    TclFreeIntRep(objPtr);
-    objPtr->internalRep.wideValue = newBool;
+    objPtr->internalRep.longValue = newBool;
    objPtr->typePtr = &tclIntType;
    return TCL_OK;
 }
@@ -2292,7 +2294,7 @@ Tcl_GetDoubleFromObj(
 	    return TCL_OK;
 	}
 	if (objPtr->typePtr == &tclIntType) {
-	    *dblPtr = (double) objPtr->internalRep.wideValue;
+	    *dblPtr = objPtr->internalRep.longValue;
 	    return TCL_OK;
 	}
 	if (objPtr->typePtr == &tclBignumType) {
@@ -2302,6 +2304,12 @@ Tcl_GetDoubleFromObj(
 	    *dblPtr = TclBignumToDouble(&big);
 	    return TCL_OK;
 	}
+#ifndef TCL_WIDE_INT_IS_LONG
+	if (objPtr->typePtr == &tclWideIntType) {
+	    *dblPtr = (double) objPtr->internalRep.wideValue;
+	    return TCL_OK;
+	}
+#endif
    } while (SetDoubleFromAny(interp, objPtr) == TCL_OK);
    return TCL_ERROR;
 }
@@ -2419,7 +2427,7 @@ Tcl_NewIntObj(
 {
    register Tcl_Obj *objPtr;

-    TclNewIntObj(objPtr, intValue);
+    TclNewLongObj(objPtr, intValue);
    return objPtr;
 }
 #endif /* if TCL_MEM_DEBUG */
@@ -2452,7 +2460,7 @@ Tcl_SetIntObj(
 	Tcl_Panic("%s called with shared object", "Tcl_SetIntObj");
    }

-    TclSetIntObj(objPtr, intValue);
+    TclSetLongObj(objPtr, intValue);
 }

 /*
@@ -2530,8 +2538,9 @@ SetIntFromAny(
    Tcl_Interp *interp,		/* Tcl interpreter */
    Tcl_Obj *objPtr)		/* Pointer to the object to convert */
 {
-    Tcl_WideInt w;
-    return Tcl_GetWideIntFromObj(interp, objPtr, &w);
+    long l;
+
+    return TclGetLongFromObj(interp, objPtr, &l);
 }

 /*
@@ -2560,28 +2569,12 @@ UpdateStringOfInt(
    char buffer[TCL_INTEGER_SPACE];
    register int len;

-    len = TclFormatInt(buffer, objPtr->internalRep.wideValue);
-
-    objPtr->bytes = ckalloc(len + 1);
-    memcpy(objPtr->bytes, buffer, (unsigned) len + 1);
-    objPtr->length = len;
-}
-
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 && !defined(TCL_WIDE_INT_IS_LONG)
-static void
-UpdateStringOfOldInt(
-    register Tcl_Obj *objPtr)	/* Int object whose string rep to update. */
-{
-    char buffer[TCL_INTEGER_SPACE];
-    register int len;
-
    len = TclFormatInt(buffer, objPtr->internalRep.longValue);

    objPtr->bytes = ckalloc(len + 1);
    memcpy(objPtr->bytes, buffer, (unsigned) len + 1);
    objPtr->length = len;
 }
-#endif

 /*
 *----------------------------------------------------------------------
@@ -2613,8 +2606,8 @@ UpdateStringOfOldInt(
 *----------------------------------------------------------------------
 */

-#undef Tcl_NewLongObj
 #ifdef TCL_MEM_DEBUG
+#undef Tcl_NewLongObj

 Tcl_Obj *
 Tcl_NewLongObj(
@@ -2633,7 +2626,7 @@ Tcl_NewLongObj(
 {
    register Tcl_Obj *objPtr;

-    TclNewIntObj(objPtr, longValue);
+    TclNewLongObj(objPtr, longValue);
    return objPtr;
 }
 #endif /* if TCL_MEM_DEBUG */
@@ -2670,7 +2663,6 @@ Tcl_NewLongObj(
 *----------------------------------------------------------------------
 */

-#undef Tcl_DbNewLongObj
 #ifdef TCL_MEM_DEBUG

 Tcl_Obj *
@@ -2687,7 +2679,7 @@ Tcl_DbNewLongObj(
    TclDbNewObj(objPtr, file, line);
    objPtr->bytes = NULL;

-    objPtr->internalRep.wideValue = longValue;
+    objPtr->internalRep.longValue = longValue;
    objPtr->typePtr = &tclIntType;
    return objPtr;
 }
@@ -2725,7 +2717,6 @@ Tcl_DbNewLongObj(
 *----------------------------------------------------------------------
 */

-#undef Tcl_SetLongObj
 void
 Tcl_SetLongObj(
    register Tcl_Obj *objPtr,	/* Object whose internal rep to init. */
@@ -2736,7 +2727,7 @@ Tcl_SetLongObj(
 	Tcl_Panic("%s called with shared object", "Tcl_SetLongObj");
    }

-    TclSetIntObj(objPtr, longValue);
+    TclSetLongObj(objPtr, longValue);
 }

 /*
@@ -2767,13 +2758,12 @@ Tcl_GetLongFromObj(
    register long *longPtr)	/* Place to store resulting long. */
 {
    do {
-#ifdef TCL_WIDE_INT_IS_LONG
 	if (objPtr->typePtr == &tclIntType) {
-	    *longPtr = objPtr->internalRep.wideValue;
+	    *longPtr = objPtr->internalRep.longValue;
 	    return TCL_OK;
 	}
-#else
-	if (objPtr->typePtr == &tclIntType) {
+#ifndef TCL_WIDE_INT_IS_LONG
+	if (objPtr->typePtr == &tclWideIntType) {
 	    /*
 	     * We return any integer in the range -ULONG_MAX to ULONG_MAX
 	     * converted to a long, ignoring overflow. The rule preserves
@@ -2846,6 +2836,49 @@ Tcl_GetLongFromObj(
 	    TCL_PARSE_INTEGER_ONLY)==TCL_OK);
    return TCL_ERROR;
 }
+#ifndef TCL_WIDE_INT_IS_LONG
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * UpdateStringOfWideInt --
+ *
+ *	Update the string representation for a wide integer object. Note: this
+ *	function does not free an existing old string rep so storage will be
+ *	lost if this has not already been done.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	The object's string is set to a valid string that results from the
+ *	wideInt-to-string conversion.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static void
+UpdateStringOfWideInt(
+    register Tcl_Obj *objPtr)	/* Int object whose string rep to update. */
+{
+    char buffer[TCL_INTEGER_SPACE+2];
+    register unsigned len;
+    register Tcl_WideInt wideVal = objPtr->internalRep.wideValue;
+
+    /*
+     * Note that sprintf will generate a compiler warning under Mingw claiming
+     * %I64 is an unknown format specifier. Just ignore this warning. We can't
+     * use %L as the format specifier since that gets printed as a 32 bit
+     * value.
+     */
+
+    sprintf(buffer, "%" TCL_LL_MODIFIER "d", wideVal);
+    len = strlen(buffer);
+    objPtr->bytes = ckalloc(len + 1);
+    memcpy(objPtr->bytes, buffer, len + 1);
+    objPtr->length = len;
+}
+#endif /* !TCL_WIDE_INT_IS_LONG */

 /*
 *----------------------------------------------------------------------
@@ -2895,7 +2928,7 @@ Tcl_NewWideIntObj(
    register Tcl_Obj *objPtr;

    TclNewObj(objPtr);
-    TclSetIntObj(objPtr, wideValue);
+    Tcl_SetWideIntObj(objPtr, wideValue);
    return objPtr;
 }
 #endif /* if TCL_MEM_DEBUG */
@@ -2947,7 +2980,7 @@ Tcl_DbNewWideIntObj(
    register Tcl_Obj *objPtr;

    TclDbNewObj(objPtr, file, line);
-    TclSetIntObj(objPtr, wideValue);
+    Tcl_SetWideIntObj(objPtr, wideValue);
    return objPtr;
 }

@@ -2996,7 +3029,19 @@ Tcl_SetWideIntObj(
 	Tcl_Panic("%s called with shared object", "Tcl_SetWideIntObj");
    }

-    TclSetIntObj(objPtr, wideValue);
+    if ((wideValue >= (Tcl_WideInt) LONG_MIN)
+	    && (wideValue <= (Tcl_WideInt) LONG_MAX)) {
+	TclSetLongObj(objPtr, (long) wideValue);
+    } else {
+#ifndef TCL_WIDE_INT_IS_LONG
+	TclSetWideIntObj(objPtr, wideValue);
+#else
+	mp_int big;
+
+	TclBNInitBignumFromWideInt(&big, wideValue);
+	Tcl_SetBignumObj(objPtr, &big);
+#endif
+    }
 }

 /*
@@ -3028,10 +3073,16 @@ Tcl_GetWideIntFromObj(
 				/* Place to store resulting long. */
 {
    do {
-	if (objPtr->typePtr == &tclIntType) {
+#ifndef TCL_WIDE_INT_IS_LONG
+	if (objPtr->typePtr == &tclWideIntType) {
 	    *wideIntPtr = objPtr->internalRep.wideValue;
 	    return TCL_OK;
 	}
+#endif
+	if (objPtr->typePtr == &tclIntType) {
+	    *wideIntPtr = (Tcl_WideInt) objPtr->internalRep.longValue;
+	    return TCL_OK;
+	}
 	if (objPtr->typePtr == &tclDoubleType) {
 	    if (interp != NULL) {
                Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -3082,6 +3133,33 @@ Tcl_GetWideIntFromObj(
 	    TCL_PARSE_INTEGER_ONLY)==TCL_OK);
    return TCL_ERROR;
 }
+#ifndef TCL_WIDE_INT_IS_LONG
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * SetWideIntFromAny --
+ *
+ *	Attempts to force the internal representation for a Tcl object to
+ *	tclWideIntType, specifically.
+ *
+ * Results:
+ *	The return value is a standard object Tcl result. If an error occurs
+ *	during conversion, an error message is left in the interpreter's
+ *	result unless "interp" is NULL.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+SetWideIntFromAny(
+    Tcl_Interp *interp,		/* Tcl interpreter */
+    Tcl_Obj *objPtr)		/* Pointer to the object to convert */
+{
+    Tcl_WideInt w;
+    return Tcl_GetWideIntFromObj(interp, objPtr, &w);
+}
+#endif /* !TCL_WIDE_INT_IS_LONG */

 /*
 *----------------------------------------------------------------------
@@ -3324,10 +3402,16 @@ GetBignumFromObj(
 	    return TCL_OK;
 	}
 	if (objPtr->typePtr == &tclIntType) {
-	    TclInitBignumFromWideInt(bignumValue,
+	    TclBNInitBignumFromLong(bignumValue, objPtr->internalRep.longValue);
+	    return TCL_OK;
+	}
+#ifndef TCL_WIDE_INT_IS_LONG
+	if (objPtr->typePtr == &tclWideIntType) {
+	    TclBNInitBignumFromWideInt(bignumValue,
 		    objPtr->internalRep.wideValue);
 	    return TCL_OK;
 	}
+#endif
 	if (objPtr->typePtr == &tclDoubleType) {
 	    if (interp != NULL) {
                Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -3437,12 +3521,37 @@ Tcl_SetBignumObj(
 	Tcl_Panic("%s called with shared object", "Tcl_SetBignumObj");
    }
    if ((size_t) bignumValue->used
-	    <= (CHAR_BIT * sizeof(Tcl_WideUInt) + DIGIT_BIT - 1) / DIGIT_BIT) {
-	Tcl_WideUInt value = 0;
-	unsigned long numBytes = sizeof(Tcl_WideUInt);
-	Tcl_WideUInt scratch;
+	    <= (CHAR_BIT * sizeof(long) + DIGIT_BIT - 1) / DIGIT_BIT) {
+	unsigned long value = 0, numBytes = sizeof(long);
+	long scratch;
 	unsigned char *bytes = (unsigned char *) &scratch;

+	if (mp_to_unsigned_bin_n(bignumValue, bytes, &numBytes) != MP_OKAY) {
+	    goto tooLargeForLong;
+	}
+	while (numBytes-- > 0) {
+	    value = (value << CHAR_BIT) | *bytes++;
+	}
+	if (value > (((~(unsigned long)0) >> 1) + bignumValue->sign)) {
+	    goto tooLargeForLong;
+	}
+	if (bignumValue->sign) {
+	    TclSetLongObj(objPtr, -(long)value);
+	} else {
+	    TclSetLongObj(objPtr, (long)value);
+	}
+	mp_clear(bignumValue);
+	return;
+    }
+  tooLargeForLong:
+#ifndef TCL_WIDE_INT_IS_LONG
+    if ((size_t) bignumValue->used
+	    <= (CHAR_BIT * sizeof(Tcl_WideInt) + DIGIT_BIT - 1) / DIGIT_BIT) {
+	Tcl_WideUInt value = 0;
+	unsigned long numBytes = sizeof(Tcl_WideInt);
+	Tcl_WideInt scratch;
+	unsigned char *bytes = (unsigned char *)&scratch;
+
 	if (mp_to_unsigned_bin_n(bignumValue, bytes, &numBytes) != MP_OKAY) {
 	    goto tooLargeForWide;
 	}
@@ -3453,14 +3562,15 @@ Tcl_SetBignumObj(
 	    goto tooLargeForWide;
 	}
 	if (bignumValue->sign) {
-	    TclSetIntObj(objPtr, -(Tcl_WideInt)value);
+	    TclSetWideIntObj(objPtr, -(Tcl_WideInt)value);
 	} else {
-	    TclSetIntObj(objPtr, (Tcl_WideInt)value);
+	    TclSetWideIntObj(objPtr, (Tcl_WideInt)value);
 	}
 	mp_clear(bignumValue);
 	return;
    }
  tooLargeForWide:
+#endif
    TclInvalidateStringRep(objPtr);
    TclFreeIntRep(objPtr);
    TclSetBignumIntRep(objPtr, bignumValue);
@@ -3542,10 +3652,17 @@ TclGetNumberFromObj(
 	    return TCL_OK;
 	}
 	if (objPtr->typePtr == &tclIntType) {
+	    *typePtr = TCL_NUMBER_LONG;
+	    *clientDataPtr = &objPtr->internalRep.longValue;
+	    return TCL_OK;
+	}
+#ifndef TCL_WIDE_INT_IS_LONG
+	if (objPtr->typePtr == &tclWideIntType) {
 	    *typePtr = TCL_NUMBER_WIDE;
 	    *clientDataPtr = &objPtr->internalRep.wideValue;
 	    return TCL_OK;
 	}
+#endif
 	if (objPtr->typePtr == &tclBignumType) {
 	    static Tcl_ThreadDataKey bignumKey;
 	    mp_int *bigPtr = Tcl_GetThreadData(&bignumKey,
@@ -111,7 +111,7 @@ Tcl_PanicVA(
 	__builtin_trap();
 #   elif defined(_WIN64)
 	__debugbreak();
-#   elif defined(_MSC_VER) && defined (_M_IX86)
+#   elif defined(_MSC_VER)
 	_asm {int 3}
 #   else
 	DebugBreak();
@@ -829,7 +829,7 @@ TclParseBackslash(
 				 * written there. */
 {
    register const char *p = src+1;
-    Tcl_UniChar unichar = 0;
+    Tcl_UniChar unichar;
    int result;
    int count;
    char buf[TCL_UTF_MAX];
@@ -13,7 +13,6 @@

 #include "tclInt.h"
 #include "tclFileSystem.h"
-#include <assert.h>

 /*
 * Prototypes for functions defined later in this file.
@@ -850,20 +849,18 @@ TclJoinPath(
    int elements,
    Tcl_Obj * const objv[])
 {
-    Tcl_Obj *res = NULL;
+    Tcl_Obj *res;
    int i;
    const Tcl_Filesystem *fsPtr = NULL;

-    assert ( elements >= 0 );
+    res = NULL;

-    if (elements == 0) {
-	return Tcl_NewObj();
-    }
-
-    assert ( elements > 0 );
-
-    if (elements == 2) {
-	Tcl_Obj *elt = objv[0];
+    for (i = 0; i < elements; i++) {
+	int driveNameLength, strEltLen, length;
+	Tcl_PathType type;
+	char *strElt, *ptr;
+	Tcl_Obj *driveName = NULL;
+	Tcl_Obj *elt = objv[i];

 	/*
 	 * This is a special case where we can be much more efficient, where
@@ -872,17 +869,18 @@ TclJoinPath(
 	 * object which can be normalized more efficiently. Currently we only
 	 * use the special case when we have exactly two elements, but we
 	 * could expand that in the future.
-	 *
-	 * Bugfix [a47641a0]. TclNewFSPathObj requires first argument
-	 * to be an absolute path. Added a check for that elt is absolute.
+         *
+         * Bugfix [a47641a0]. TclNewFSPathObj requires first argument
+         * to be an absolute path. Added a check for that elt is absolute.
 	 */

-	if ((elt->typePtr == &tclFsPathType)
+	if ((i == (elements-2)) && (i == 0)
+                && (elt->typePtr == &tclFsPathType)
 		&& !((elt->bytes != NULL) && (elt->bytes[0] == '\0'))
                && TclGetPathType(elt, NULL, NULL, NULL) == TCL_PATH_ABSOLUTE) {
-            Tcl_Obj *tailObj = objv[1];
-	    Tcl_PathType type = TclGetPathType(tailObj, NULL, NULL, NULL);
+            Tcl_Obj *tailObj = objv[i+1];

+	    type = TclGetPathType(tailObj, NULL, NULL, NULL);
 	    if (type == TCL_PATH_RELATIVE) {
 		const char *str;
 		int len;
@@ -895,6 +893,9 @@ TclJoinPath(
 		     * the base itself is just fine!
 		     */

+		    if (res != NULL) {
+			TclDecrRefCount(res);
+		    }
 		    return elt;
 		}

@@ -917,6 +918,9 @@ TclJoinPath(

 		    if ((tclPlatform != TCL_PLATFORM_WINDOWS)
 			    || (strchr(Tcl_GetString(elt), '\\') == NULL)) {
+			if (res != NULL) {
+			    TclDecrRefCount(res);
+			}

 			if (PATHFLAGS(elt)) {
 			    return TclNewFSPathObj(elt, str, len);
@@ -936,28 +940,23 @@ TclJoinPath(
 		 * more general code below handle things.
 		 */
 	    } else if (tclPlatform == TCL_PLATFORM_UNIX) {
+		if (res != NULL) {
+		    TclDecrRefCount(res);
+		}
 		return tailObj;
 	    } else {
 		const char *str = TclGetString(tailObj);

 		if (tclPlatform == TCL_PLATFORM_WINDOWS) {
 		    if (strchr(str, '\\') == NULL) {
+			if (res != NULL) {
+			    TclDecrRefCount(res);
+			}
 			return tailObj;
 		    }
 		}
 	    }
 	}
-    }
-
-    assert ( res == NULL );
-
-    for (i = 0; i < elements; i++) {
-	int driveNameLength, strEltLen, length;
-	Tcl_PathType type;
-	char *strElt, *ptr;
-	Tcl_Obj *driveName = NULL;
-	Tcl_Obj *elt = objv[i];
-
 	strElt = TclGetStringFromObj(elt, &strEltLen);
 	driveNameLength = 0;
 	type = TclGetPathType(elt, &fsPtr, &driveNameLength, &driveName);
@@ -1052,8 +1051,10 @@ TclJoinPath(
    noQuickReturn:
 	if (res == NULL) {
 	    res = Tcl_NewObj();
+	    ptr = TclGetStringFromObj(res, &length);
+	} else {
+	    ptr = TclGetStringFromObj(res, &length);
 	}
-	ptr = TclGetStringFromObj(res, &length);

 	/*
 	 * Strip off any './' before a tilde, unless this is the beginning of
@@ -1086,7 +1087,6 @@ TclJoinPath(

 		if (sep != NULL) {
 		    separator = TclGetString(sep)[0];
-		    TclDecrRefCount(sep);
 		}
 		/* Safety check in case the VFS driver caused sharing */
 		if (Tcl_IsShared(res)) {
@@ -1122,7 +1122,9 @@ TclJoinPath(
 	    Tcl_SetObjLength(res, length);
 	}
    }
-    assert ( res != NULL );
+    if (res == NULL) {
+	res = Tcl_NewObj();
+    }
    return res;
 }

@@ -1809,6 +1811,7 @@ Tcl_FSGetNormalizedPath(
 	 */

 	(void) TclGetStringFromObj(dir, &cwdLen);
+	cwdLen += (Tcl_GetString(copy)[cwdLen] == '/');

 	/* Normalize the combined string. */

@@ -1830,12 +1833,12 @@ Tcl_FSGetNormalizedPath(
 	     * normalized head, we can more efficiently normalize the combined
 	     * path by passing over only the unnormalized tail portion. When
 	     * this is sufficient, prior developers claim this should be much
-	     * faster. We use 'cwdLen' so that we are already pointing at
+	     * faster. We use 'cwdLen-1' so that we are already pointing at
 	     * the dir-separator that we know about. The normalization code
 	     * will actually start off directly after that separator.
 	     */

-	    TclFSNormalizeToUniquePath(interp, copy, cwdLen);
+	    TclFSNormalizeToUniquePath(interp, copy, cwdLen-1);
 	}

 	/* Now we need to construct the new path object. */
@@ -221,13 +221,13 @@ Tcl_ReapDetachedProcs(void)
 {
    register Detached *detPtr;
    Detached *nextPtr, *prevPtr;
-    int status, code;
+    int status;
+    Tcl_Pid pid;

    Tcl_MutexLock(&pipeMutex);
    for (detPtr = detList, prevPtr = NULL; detPtr != NULL; ) {
-	status = TclProcessWait(detPtr->pid, WNOHANG, &code, NULL, NULL);
-	if (status == TCL_PROCESS_UNCHANGED || (status == TCL_PROCESS_ERROR
-		&& code != ECHILD)) {
+	pid = Tcl_WaitPid(detPtr->pid, &status, WNOHANG);
+	if ((pid == 0) || ((pid == (Tcl_Pid) -1) && (errno != ECHILD))) {
 	    prevPtr = detPtr;
 	    detPtr = detPtr->nextPtr;
 	    continue;
@@ -277,21 +277,38 @@ TclCleanupChildren(
 {
    int result = TCL_OK;
    int i, abnormalExit, anyErrorInfo;
-    TclProcessWaitStatus waitStatus;
-    int code;
-    Tcl_Obj *msg, *error;
+    Tcl_Pid pid;
+    int waitStatus;
+    const char *msg;
+    unsigned long resolvedPid;

    abnormalExit = 0;
    for (i = 0; i < numPids; i++) {
-	waitStatus = TclProcessWait(pidPtr[i], 0, &code, &msg, &error);
-	if (waitStatus == TCL_PROCESS_ERROR) {
+	/*
+	 * We need to get the resolved pid before we wait on it as the windows
+	 * implementation of Tcl_WaitPid deletes the information such that any
+	 * following calls to TclpGetPid fail.
+	 */
+
+	resolvedPid = TclpGetPid(pidPtr[i]);
+	pid = Tcl_WaitPid(pidPtr[i], &waitStatus, 0);
+	if (pid == (Tcl_Pid) -1) {
 	    result = TCL_ERROR;
 	    if (interp != NULL) {
-		Tcl_SetObjErrorCode(interp, error);
-		Tcl_SetObjResult(interp, msg);
+		msg = Tcl_PosixError(interp);
+		if (errno == ECHILD) {
+		    /*
+		     * This changeup in message suggested by Mark Diekhans to
+		     * remind people that ECHILD errors can occur on some
+		     * systems if SIGCHLD isn't in its default state.
+		     */
+
+		    msg =
+			"child process lost (is SIGCHLD ignored or trapped?)";
+		}
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"error waiting for process to exit: %s", msg));
 	    }
-	    Tcl_DecrRefCount(error);
-	    Tcl_DecrRefCount(msg);
 	    continue;
 	}

@@ -302,19 +319,39 @@ TclCleanupChildren(
 	 * removed).
 	 */

-	if (waitStatus != TCL_PROCESS_EXITED || code != 0) {
+	if (!WIFEXITED(waitStatus) || (WEXITSTATUS(waitStatus) != 0)) {
+	    char msg1[TCL_INTEGER_SPACE], msg2[TCL_INTEGER_SPACE];
+
 	    result = TCL_ERROR;
-	    if (waitStatus == TCL_PROCESS_EXITED) {
+	    sprintf(msg1, "%lu", resolvedPid);
+	    if (WIFEXITED(waitStatus)) {
 		if (interp != NULL) {
-		    Tcl_SetObjErrorCode(interp, error);
+		    sprintf(msg2, "%u", WEXITSTATUS(waitStatus));
+		    Tcl_SetErrorCode(interp, "CHILDSTATUS", msg1, msg2, NULL);
 		}
 		abnormalExit = 1;
 	    } else if (interp != NULL) {
-		Tcl_SetObjErrorCode(interp, error);
-		Tcl_SetObjResult(interp, msg);
+		const char *p;
+
+		if (WIFSIGNALED(waitStatus)) {
+		    p = Tcl_SignalMsg(WTERMSIG(waitStatus));
+		    Tcl_SetErrorCode(interp, "CHILDKILLED", msg1,
+			    Tcl_SignalId(WTERMSIG(waitStatus)), p, NULL);
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "child killed: %s\n", p));
+		} else if (WIFSTOPPED(waitStatus)) {
+		    p = Tcl_SignalMsg(WSTOPSIG(waitStatus));
+		    Tcl_SetErrorCode(interp, "CHILDSUSP", msg1,
+			    Tcl_SignalId(WSTOPSIG(waitStatus)), p, NULL);
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "child suspended: %s\n", p));
+		} else {
+		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
+			    "child wait status didn't make sense\n", -1));
+		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC",
+			    "ODDWAITRESULT", msg1, NULL);
+		}
 	    }
-	    Tcl_DecrRefCount(error);
-	    Tcl_DecrRefCount(msg);
 	}
    }

@@ -631,13 +668,7 @@ TclCreatePipeline(
 	    if (*p == '>') {
 		p++;
 		atOK = 0;
-
-		/*
-		 * Note that the O_APPEND flag only has an effect on POSIX
-		 * platforms. On Windows, we just have to carry on regardless.
-		 */
-
-		flags = O_WRONLY | O_CREAT | O_APPEND;
+		flags = O_WRONLY | O_CREAT;
 	    }
 	    if (errorClose != 0) {
 		errorClose = 0;
@@ -899,7 +930,6 @@ TclCreatePipeline(

 	pidPtr[numPids] = pid;
 	numPids++;
-	TclProcessCreated(pid);

 	/*
 	 * Close off our copies of file descriptors that were set up for this
@@ -65,18 +65,6 @@ typedef struct Package {
    const void *clientData;	/* Client data. */
 } Package;

-typedef struct Require {
-    void * clientDataPtr;
-    const char *name;
-    Package *pkgPtr;
-    char *versionToProvide;
-} Require;
-
-typedef struct RequireProcArgs {
-    const char *name;
-    void *clientDataPtr;
-} RequireProcArgs;
-
 /*
 * Prototypes for functions defined in this file:
 */
@@ -97,15 +85,9 @@ static void		AddRequirementsToResult(Tcl_Interp *interp, int reqc,
 static void		AddRequirementsToDString(Tcl_DString *dstring,
 			    int reqc, Tcl_Obj *const reqv[]);
 static Package *	FindPackage(Tcl_Interp *interp, const char *name);
-static int		PkgRequireCore(ClientData data[], Tcl_Interp *interp, int result);
-static int		PkgRequireCoreFinal(ClientData data[], Tcl_Interp *interp, int result);
-static int		PkgRequireCoreCleanup(ClientData data[], Tcl_Interp *interp, int result);
-static int		PkgRequireCoreStep1(ClientData data[], Tcl_Interp *interp, int result);
-static int		PkgRequireCoreStep2(ClientData data[], Tcl_Interp *interp, int result);
-static int		TclNRPkgRequireProc(ClientData clientData, Tcl_Interp *interp, int reqc, Tcl_Obj *const reqv[]);
-static int		SelectPackage(ClientData data[], Tcl_Interp *interp, int result);
-static int		SelectPackageFinal(ClientData data[], Tcl_Interp *interp, int result);
-static int		TclNRPackageObjCmdCleanup(ClientData data[], Tcl_Interp *interp, int result);
+static const char *	PkgRequireCore(Tcl_Interp *interp, const char *name,
+			    int reqc, Tcl_Obj *const reqv[],
+			    void *clientDataPtr);

 /*
 * Helper macros.
@@ -349,8 +331,8 @@ Tcl_PkgRequireEx(
 	 *
 	 * Second, how does this work? If we reach this point, then the global
 	 * variable tclEmptyStringRep has the value NULL. Compare that with
-	 * the definition of tclEmptyStringRep near the top of this file.
-	 * It clearly should not have the value NULL; it
+	 * the definition of tclEmptyStringRep near the top of the file
+	 * generic/tclObj.c. It clearly should not have the value NULL; it
 	 * should point to the char tclEmptyString. If we see it having the
 	 * value NULL, then somehow we are seeing a Tcl library that isn't
 	 * completely initialized, and that's an indicator for the error
@@ -366,11 +348,18 @@ Tcl_PkgRequireEx(
 	 * After all, two Tcl libraries can't be a good thing!)
 	 *
 	 * Trouble is that's going to be tricky. We're now using a Tcl library
-	 * that's not fully initialized. Functions in it may not work
-	 * reliably, so be very careful about adding any other calls here
-	 * without checking how they behave when initialization is incomplete.
+	 * that's not fully initialized. In particular, it doesn't have a
+	 * proper value for tclEmptyStringRep. The Tcl_Obj system heavily
+	 * depends on the value of tclEmptyStringRep and all of Tcl depends
+	 * (increasingly) on the Tcl_Obj system, we need to correct that flaw
+	 * before making the calls to set the interpreter result to the error
+	 * message. That's the only flaw corrected; other problems with
+	 * initialization of the Tcl library are not remedied, so be very
+	 * careful about adding any other calls here without checking how they
+	 * behave when initialization is incomplete.
 	 */

+	tclEmptyStringRep = &tclEmptyString;
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"Cannot load package \"%s\" in standalone executable:"
 		" This package is not compiled with stub support", name));
@@ -383,10 +372,7 @@ Tcl_PkgRequireEx(
     */

    if (version == NULL) {
-	if (Tcl_PkgRequireProc(interp, name, 0, NULL, clientDataPtr) == TCL_OK) {
-	    result = Tcl_GetStringResult(interp);
-	    Tcl_ResetResult(interp);
-	}
+	result = PkgRequireCore(interp, name, 0, NULL, clientDataPtr);
    } else {
 	if (exact && TCL_OK
 		!= CheckVersionAndConvert(interp, version, NULL, NULL)) {
@@ -397,12 +383,10 @@ Tcl_PkgRequireEx(
 	    Tcl_AppendStringsToObj(ov, "-", version, NULL);
 	}
 	Tcl_IncrRefCount(ov);
-	if (Tcl_PkgRequireProc(interp, name, 1, &ov, clientDataPtr) == TCL_OK) {
-	    result = Tcl_GetStringResult(interp);
-	    Tcl_ResetResult(interp);
-	}
+	result = PkgRequireCore(interp, name, 1, &ov, clientDataPtr);
 	TclDecrRefCount(ov);
    }
+
    return result;
 }

@@ -417,130 +401,320 @@ Tcl_PkgRequireProc(
 				 * available. */
    void *clientDataPtr)
 {
-    RequireProcArgs args;
-    args.name = name;
-    args.clientDataPtr = clientDataPtr;
-    return Tcl_NRCallObjProc(interp, TclNRPkgRequireProc, (void *)&args, reqc, reqv);
-}
+    const char *result =
+	    PkgRequireCore(interp, name, reqc, reqv, clientDataPtr);

-static int
-TclNRPkgRequireProc(
-    ClientData clientData,
-    Tcl_Interp *interp,
-    int reqc,
-    Tcl_Obj *const reqv[]) {
-    RequireProcArgs *args = clientData;
-    Tcl_NRAddCallback(interp, PkgRequireCore, (void *)args->name, INT2PTR(reqc), (void *)reqv, args->clientDataPtr);
+    if (result == NULL) {
+	return TCL_ERROR;
+    }
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(result, -1));
    return TCL_OK;
 }

-static int
-PkgRequireCore(ClientData data[], Tcl_Interp *interp, int result)
+static const char *
+PkgRequireCore(
+    Tcl_Interp *interp,		/* Interpreter in which package is now
+				 * available. */
+    const char *name,		/* Name of desired package. */
+    int reqc,			/* Requirements constraining the desired
+				 * version. */
+    Tcl_Obj *const reqv[],	/* 0 means to use the latest version
+				 * available. */
+    void *clientDataPtr)
 {
-    const char *name = data[0];
-    int reqc = PTR2INT(data[1]);
-    Tcl_Obj *const *reqv = data[2];
-    int code = CheckAllRequirements(interp, reqc, reqv);
-    Require *reqPtr;
-    if (code != TCL_OK) {
-	return code;
-    }
-    reqPtr = ckalloc(sizeof(Require));
-    Tcl_NRAddCallback(interp, PkgRequireCoreCleanup, reqPtr, NULL, NULL, NULL);
-    reqPtr->clientDataPtr = data[3];
-    reqPtr->name = name;
-    reqPtr->pkgPtr = FindPackage(interp, name);
-    if (reqPtr->pkgPtr->version == NULL) {
-	Tcl_NRAddCallback(interp, SelectPackage, reqPtr, INT2PTR(reqc), (void *)reqv, PkgRequireCoreStep1);
-    } else {
-	Tcl_NRAddCallback(interp, PkgRequireCoreFinal, reqPtr, INT2PTR(reqc), (void *)reqv, NULL);
-    }
-    return TCL_OK;
-}
-
-static int
-PkgRequireCoreStep1(ClientData data[], Tcl_Interp *interp, int result) {
+    Interp *iPtr = (Interp *) interp;
+    Package *pkgPtr;
+    PkgAvail *availPtr, *bestPtr, *bestStablePtr;
+    char *availVersion, *bestVersion;
+				/* Internal rep. of versions */
+    int availStable, code, satisfies, pass;
+    char *script, *pkgVersionI;
    Tcl_DString command;
-    char *script;
-    Require *reqPtr = data[0];
-    int reqc = PTR2INT(data[1]);
-    Tcl_Obj **const reqv = data[2];
-    const char *name = reqPtr->name /* Name of desired package. */;
-    if (reqPtr->pkgPtr->version == NULL) {
+
+    if (TCL_OK != CheckAllRequirements(interp, reqc, reqv)) {
+	return NULL;
+    }
+
+    /*
+     * It can take up to three passes to find the package: one pass to run the
+     * "package unknown" script, one to run the "package ifneeded" script for
+     * a specific version, and a final pass to lookup the package loaded by
+     * the "package ifneeded" script.
+     */
+
+    for (pass=1 ;; pass++) {
+	pkgPtr = FindPackage(interp, name);
+	if (pkgPtr->version != NULL) {
+	    break;
+	}
+
+	/*
+	 * Check whether we're already attempting to load some version of this
+	 * package (circular dependency detection).
+	 */
+
+	if (pkgPtr->clientData != NULL) {
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "circular package dependency:"
+		    " attempt to provide %s %s requires %s",
+		    name, (char *) pkgPtr->clientData, name));
+	    AddRequirementsToResult(interp, reqc, reqv);
+	    Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "CIRCULARITY", NULL);
+	    return NULL;
+	}
+
+	/*
+	 * The package isn't yet present. Search the list of available
+	 * versions and invoke the script for the best available version. We
+	 * are actually locating the best, and the best stable version. One of
+	 * them is then chosen based on the selection mode.
+	 */
+
+	bestPtr = NULL;
+	bestStablePtr = NULL;
+	bestVersion = NULL;
+
+	for (availPtr = pkgPtr->availPtr; availPtr != NULL;
+		availPtr = availPtr->nextPtr) {
+	    if (CheckVersionAndConvert(interp, availPtr->version,
+		    &availVersion, &availStable) != TCL_OK) {
+		/*
+		 * The provided version number has invalid syntax. This
+		 * should not happen. This should have been caught by the
+		 * 'package ifneeded' registering the package.
+		 */
+
+		continue;
+	    }
+
+	    if (bestPtr != NULL) {
+		int res = CompareVersions(availVersion, bestVersion, NULL);
+
+		/*
+		 * Note: Use internal reps!
+		 */
+
+		if (res <= 0) {
+		    /*
+		     * The version of the package sought is not as good as the
+		     * currently selected version. Ignore it.
+		     */
+
+		    ckfree(availVersion);
+		    availVersion = NULL;
+		    continue;
+		}
+	    }
+
 	    /*
-	     * The package is not in the database. If there is a "package unknown"
-	     * command, invoke it.
+	     * We have found a version which is better than our max.
 	     */

-	    script = ((Interp *) interp)->packageUnknown;
-	    if (script == NULL) {
-		Tcl_NRAddCallback(interp, PkgRequireCoreFinal, reqPtr, INT2PTR(reqc), (void *)reqv, NULL);
-	    } else {
-		Tcl_DStringInit(&command);
-		Tcl_DStringAppend(&command, script, -1);
-		Tcl_DStringAppendElement(&command, name);
-		AddRequirementsToDString(&command, reqc, reqv);
+	    if (reqc > 0) {
+		/* Check satisfaction of requirements. */

-		Tcl_NRAddCallback(interp, PkgRequireCoreStep2, reqPtr, INT2PTR(reqc), (void *)reqv, NULL);
-		Tcl_NREvalObj(interp,
-		    Tcl_NewStringObj(Tcl_DStringValue(&command), Tcl_DStringLength(&command)),
-		    TCL_EVAL_GLOBAL
-		);
-		Tcl_DStringFree(&command);
+		satisfies = SomeRequirementSatisfied(availVersion, reqc, reqv);
+		if (!satisfies) {
+		    ckfree(availVersion);
+		    availVersion = NULL;
+		    continue;
+		}
 	    }
-	    return TCL_OK;
-    } else {
-	Tcl_NRAddCallback(interp, PkgRequireCoreFinal, reqPtr, INT2PTR(reqc), (void *)reqv, NULL);
-    }
-    return TCL_OK;
-}

-static int
-PkgRequireCoreStep2(ClientData data[], Tcl_Interp *interp, int result) {
-    Require *reqPtr = data[0];
-    int reqc = PTR2INT(data[1]);
-    Tcl_Obj **const reqv = data[2];
-    const char *name = reqPtr->name /* Name of desired package. */;
-    if ((result != TCL_OK) && (result != TCL_ERROR)) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"bad return code: %d", result));
-	Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "BADRESULT", NULL);
-	result = TCL_ERROR;
-    }
-    if (result == TCL_ERROR) {
-	Tcl_AddErrorInfo(interp,
-		"\n    (\"package unknown\" script)");
-	return result;
-    }
-    Tcl_ResetResult(interp);
-    /* pkgPtr may now be invalid, so refresh it. */
-    reqPtr->pkgPtr = FindPackage(interp, name);
-    Tcl_NRAddCallback(interp, SelectPackage, reqPtr, INT2PTR(reqc), (void *)reqv, PkgRequireCoreFinal);
-    return TCL_OK;
-}
+	    bestPtr = availPtr;

-static int
-PkgRequireCoreFinal(ClientData data[], Tcl_Interp *interp, int result) {
-    Require *reqPtr = data[0];
-    int reqc = PTR2INT(data[1]), satisfies;
-    Tcl_Obj **const reqv = data[2];
-    char *pkgVersionI;
-    void *clientDataPtr = reqPtr->clientDataPtr;
-    const char *name = reqPtr->name /* Name of desired package. */;
-    if (reqPtr->pkgPtr->version == NULL) {
+	    if (bestVersion != NULL) {
+		ckfree(bestVersion);
+	    }
+	    bestVersion = availVersion;
+
+	    /*
+	     * If this new best version is stable then it also has to be
+	     * better than the max stable version found so far.
+	     */
+
+	    if (availStable) {
+		bestStablePtr = availPtr;
+	    }
+	}
+
+	if (bestVersion != NULL) {
+	    ckfree(bestVersion);
+	}
+
+	/*
+	 * Now choose a version among the two best. For 'latest' we simply
+	 * take (actually keep) the best. For 'stable' we take the best
+	 * stable, if there is any, or the best if there is nothing stable.
+	 */
+
+	if ((iPtr->packagePrefer == PKG_PREFER_STABLE)
+		&& (bestStablePtr != NULL)) {
+	    bestPtr = bestStablePtr;
+	}
+
+	if (bestPtr != NULL) {
+	    /*
+	     * We found an ifneeded script for the package. Be careful while
+	     * executing it: this could cause reentrancy, so (a) protect the
+	     * script itself from deletion and (b) don't assume that bestPtr
+	     * will still exist when the script completes.
+	     */
+
+	    char *versionToProvide = bestPtr->version;
+	    PkgFiles *pkgFiles;
+	    PkgName *pkgName;
+	    script = bestPtr->script;
+
+	    pkgPtr->clientData = versionToProvide;
+	    Tcl_Preserve(versionToProvide);
+	    Tcl_Preserve(script);
+	    pkgFiles = TclInitPkgFiles(interp);
+	    /* Push "ifneeded" package name in "tclPkgFiles" assocdata. */
+	    pkgName = ckalloc(sizeof(PkgName) + strlen(name));
+	    pkgName->nextPtr = pkgFiles->names;
+	    strcpy(pkgName->name, name);
+	    pkgFiles->names = pkgName;
+	    if (bestPtr->pkgIndex) {
+		TclPkgFileSeen(interp, bestPtr->pkgIndex);
+	    }
+	    code = Tcl_EvalEx(interp, script, -1, TCL_EVAL_GLOBAL);
+	    /* Pop the "ifneeded" package name from "tclPkgFiles" assocdata*/
+	    pkgFiles->names = pkgName->nextPtr;
+	    ckfree(pkgName);
+	    Tcl_Release(script);
+
+	    pkgPtr = FindPackage(interp, name);
+	    if (code == TCL_OK) {
+		Tcl_ResetResult(interp);
+		if (pkgPtr->version == NULL) {
+		    code = TCL_ERROR;
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "attempt to provide package %s %s failed:"
+			    " no version of package %s provided",
+			    name, versionToProvide, name));
+		    Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "UNPROVIDED",
+			    NULL);
+		} else {
+		    char *pvi, *vi;
+
+		    if (CheckVersionAndConvert(interp, pkgPtr->version, &pvi,
+			    NULL) != TCL_OK) {
+			code = TCL_ERROR;
+		    } else if (CheckVersionAndConvert(interp,
+			    versionToProvide, &vi, NULL) != TCL_OK) {
+			ckfree(pvi);
+			code = TCL_ERROR;
+		    } else {
+			int res = CompareVersions(pvi, vi, NULL);
+
+			ckfree(pvi);
+			ckfree(vi);
+			if (res != 0) {
+			    code = TCL_ERROR;
+			    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+				    "attempt to provide package %s %s failed:"
+				    " package %s %s provided instead",
+				    name, versionToProvide,
+				    name, pkgPtr->version));
+			    Tcl_SetErrorCode(interp, "TCL", "PACKAGE",
+				    "WRONGPROVIDE", NULL);
+			}
+		    }
+		}
+	    } else if (code != TCL_ERROR) {
+		Tcl_Obj *codePtr = Tcl_NewIntObj(code);
+
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"attempt to provide package %s %s failed:"
+			" bad return code: %s",
+			name, versionToProvide, TclGetString(codePtr)));
+		Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "BADRESULT", NULL);
+		TclDecrRefCount(codePtr);
+		code = TCL_ERROR;
+	    }
+
+	    if (code == TCL_ERROR) {
+		Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
+			"\n    (\"package ifneeded %s %s\" script)",
+			name, versionToProvide));
+	    }
+	    Tcl_Release(versionToProvide);
+
+	    if (code != TCL_OK) {
+		/*
+		 * Take a non-TCL_OK code from the script as an indication the
+		 * package wasn't loaded properly, so the package system
+		 * should not remember an improper load.
+		 *
+		 * This is consistent with our returning NULL. If we're not
+		 * willing to tell our caller we got a particular version, we
+		 * shouldn't store that version for telling future callers
+		 * either.
+		 */
+
+		if (pkgPtr->version != NULL) {
+		    ckfree(pkgPtr->version);
+		    pkgPtr->version = NULL;
+		}
+		pkgPtr->clientData = NULL;
+		return NULL;
+	    }
+
+	    break;
+	}
+
+	/*
+	 * The package is not in the database. If there is a "package unknown"
+	 * command, invoke it (but only on the first pass; after that, we
+	 * should not get here in the first place).
+	 */
+
+	if (pass > 1) {
+	    break;
+	}
+
+	script = ((Interp *) interp)->packageUnknown;
+	if (script != NULL) {
+	    Tcl_DStringInit(&command);
+	    Tcl_DStringAppend(&command, script, -1);
+	    Tcl_DStringAppendElement(&command, name);
+	    AddRequirementsToDString(&command, reqc, reqv);
+
+	    code = Tcl_EvalEx(interp, Tcl_DStringValue(&command),
+		    Tcl_DStringLength(&command), TCL_EVAL_GLOBAL);
+	    Tcl_DStringFree(&command);
+
+	    if ((code != TCL_OK) && (code != TCL_ERROR)) {
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"bad return code: %d", code));
+		Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "BADRESULT", NULL);
+		code = TCL_ERROR;
+	    }
+	    if (code == TCL_ERROR) {
+		Tcl_AddErrorInfo(interp,
+			"\n    (\"package unknown\" script)");
+		return NULL;
+	    }
+	    Tcl_ResetResult(interp);
+	}
+    }
+
+    if (pkgPtr->version == NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't find package %s", name));
 	Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "UNFOUND", NULL);
 	AddRequirementsToResult(interp, reqc, reqv);
-	return TCL_ERROR;
+	return NULL;
    }

    /*
-     * Ensure that the provided version meets the current requirements.
+     * At this point we know that the package is present. Make sure that the
+     * provided version meets the current requirements.
     */

    if (reqc != 0) {
-	CheckVersionAndConvert(interp, reqPtr->pkgPtr->version, &pkgVersionI, NULL);
+	CheckVersionAndConvert(interp, pkgPtr->version, &pkgVersionI, NULL);
 	satisfies = SomeRequirementSatisfied(pkgVersionI, reqc, reqv);

 	ckfree(pkgVersionI);
@@ -548,301 +722,20 @@ PkgRequireCoreFinal(ClientData data[], Tcl_Interp *interp, int result) {
 	if (!satisfies) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "version conflict for package \"%s\": have %s, need",
-		    name, reqPtr->pkgPtr->version));
+		    name, pkgPtr->version));
 	    Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "VERSIONCONFLICT",
 		    NULL);
 	    AddRequirementsToResult(interp, reqc, reqv);
-	    return TCL_ERROR;
+	    return NULL;
 	}
    }

    if (clientDataPtr) {
 	const void **ptr = (const void **) clientDataPtr;

-	*ptr = reqPtr->pkgPtr->clientData;
+	*ptr = pkgPtr->clientData;
    }
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(reqPtr->pkgPtr->version, -1));
-    return TCL_OK;
-}
-
-static int
-PkgRequireCoreCleanup(ClientData data[], Tcl_Interp *interp, int result) {
-    ckfree(data[0]);
-    return result;
-}
-
-
-static int
-SelectPackage(ClientData data[], Tcl_Interp *interp, int result) {
-    PkgAvail *availPtr, *bestPtr, *bestStablePtr;
-    char *availVersion, *bestVersion, *bestStableVersion;
-				/* Internal rep. of versions */
-    int availStable, satisfies; 
-    Require *reqPtr = data[0];
-    int reqc = PTR2INT(data[1]);
-    Tcl_Obj **const reqv = data[2];
-    const char *name = reqPtr->name;
-    Package *pkgPtr = reqPtr->pkgPtr;
-    Interp *iPtr = (Interp *) interp;
-
-    /*
-     * Check whether we're already attempting to load some version of this
-     * package (circular dependency detection).
-     */
-
-    if (pkgPtr->clientData != NULL) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"circular package dependency:"
-		" attempt to provide %s %s requires %s",
-		name, (char *) pkgPtr->clientData, name));
-	AddRequirementsToResult(interp, reqc, reqv);
-	Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "CIRCULARITY", NULL);
-	return TCL_ERROR;
-    }
-
-    /*
-     * The package isn't yet present. Search the list of available
-     * versions and invoke the script for the best available version. We
-     * are actually locating the best, and the best stable version. One of
-     * them is then chosen based on the selection mode.
-     */
-
-    bestPtr = NULL;
-    bestStablePtr = NULL;
-    bestVersion = NULL;
-    bestStableVersion = NULL;
-
-    for (availPtr = pkgPtr->availPtr; availPtr != NULL;
-	    availPtr = availPtr->nextPtr) {
-	if (CheckVersionAndConvert(interp, availPtr->version,
-		&availVersion, &availStable) != TCL_OK) {
-	    /*
-	     * The provided version number has invalid syntax. This
-	     * should not happen. This should have been caught by the
-	     * 'package ifneeded' registering the package.
-	     */
-
-	    continue;
-	}
-
-	/* Check satisfaction of requirements before considering the current version further. */
-	if (reqc > 0) {
-	    satisfies = SomeRequirementSatisfied(availVersion, reqc, reqv);
-	    if (!satisfies) {
-		ckfree(availVersion);
-		availVersion = NULL;
-		continue;
-	    }
-	}
-
-	if (bestPtr != NULL) {
-	    int res = CompareVersions(availVersion, bestVersion, NULL);
-
-	    /*
-	     * Note: Used internal reps in the comparison!
-	     */
-
-	    if (res > 0) {
-		/*
-		 * The version of the package sought is better than the
-		 * currently selected version.
-		 */
-		ckfree(bestVersion);
-		bestVersion = NULL;
-		goto newbest;
-	    }
-	} else {
-	newbest:
-	    /* We have found a version which is better than our max. */
-
-	    bestPtr = availPtr;
-	    CheckVersionAndConvert(interp, bestPtr->version, &bestVersion, NULL);
-	}
-
-	if (!availStable) {
-	    ckfree(availVersion);
-	    availVersion = NULL;
-	    continue;
-	}
-
-	if (bestStablePtr != NULL) {
-	    int res = CompareVersions(availVersion, bestStableVersion, NULL);
-
-	    /*
-	     * Note: Used internal reps in the comparison!
-	     */
-
-	    if (res > 0) {
-		/*
-		 * This stable version of the package sought is better
-		 * than the currently selected stable version.
-		 */
-		ckfree(bestStableVersion);
-		bestStableVersion = NULL;
-		goto newstable;
-	    }
-	} else {
-	newstable:
-	    /* We have found a stable version which is better than our max stable. */
-	    bestStablePtr = availPtr;
-	    CheckVersionAndConvert(interp, bestStablePtr->version, &bestStableVersion, NULL);
-	}
-
-	ckfree(availVersion);
-	availVersion = NULL;
-    } /* end for */
-
-    /*
-     * Clean up memorized internal reps, if any.
-     */
-
-    if (bestVersion != NULL) {
-	ckfree(bestVersion);
-	bestVersion = NULL;
-    }
-
-    if (bestStableVersion != NULL) {
-	ckfree(bestStableVersion);
-	bestStableVersion = NULL;
-    }
-
-    /*
-     * Now choose a version among the two best. For 'latest' we simply
-     * take (actually keep) the best. For 'stable' we take the best
-     * stable, if there is any, or the best if there is nothing stable.
-     */
-
-    if ((iPtr->packagePrefer == PKG_PREFER_STABLE)
-	    && (bestStablePtr != NULL)) {
-	bestPtr = bestStablePtr;
-    }
-
-    if (bestPtr == NULL) {
-	Tcl_NRAddCallback(interp, data[3], reqPtr, INT2PTR(reqc), (void *)reqv, NULL);
-    } else {
-	/*
-	 * We found an ifneeded script for the package. Be careful while
-	 * executing it: this could cause reentrancy, so (a) protect the
-	 * script itself from deletion and (b) don't assume that bestPtr
-	 * will still exist when the script completes.
-	 */
-
-	char *versionToProvide = bestPtr->version;
-	PkgFiles *pkgFiles;
-	PkgName *pkgName;
-
-	Tcl_Preserve(versionToProvide);
-	pkgPtr->clientData = versionToProvide;
-
-	pkgFiles = TclInitPkgFiles(interp);
-	/* Push "ifneeded" package name in "tclPkgFiles" assocdata. */
-	pkgName = ckalloc(sizeof(PkgName) + strlen(name));
-	pkgName->nextPtr = pkgFiles->names;
-	strcpy(pkgName->name, name);
-	pkgFiles->names = pkgName;
-	if (bestPtr->pkgIndex) {
-	    TclPkgFileSeen(interp, bestPtr->pkgIndex);
-	}
-	reqPtr->versionToProvide = versionToProvide;
-	Tcl_NRAddCallback(interp, SelectPackageFinal, reqPtr, INT2PTR(reqc), (void *)reqv, data[3]);
-	Tcl_NREvalObj(interp, Tcl_NewStringObj(bestPtr->script, -1), TCL_EVAL_GLOBAL);
-    }
-    return TCL_OK;
-}
-
-static int
-SelectPackageFinal(ClientData data[], Tcl_Interp *interp, int result) {
-    Require *reqPtr = data[0];
-    int reqc = PTR2INT(data[1]);
-    Tcl_Obj **const reqv = data[2];
-    const char *name = reqPtr->name;
-    char *versionToProvide = reqPtr->versionToProvide;
-
-    /* Pop the "ifneeded" package name from "tclPkgFiles" assocdata*/
-    PkgFiles *pkgFiles = Tcl_GetAssocData(interp, "tclPkgFiles", NULL);
-    PkgName *pkgName = pkgFiles->names;
-    pkgFiles->names = pkgName->nextPtr;
-    ckfree(pkgName);
-
-    reqPtr->pkgPtr = FindPackage(interp, name);
-    if (result == TCL_OK) {
-	Tcl_ResetResult(interp);
-	if (reqPtr->pkgPtr->version == NULL) {
-	    result = TCL_ERROR;
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "attempt to provide package %s %s failed:"
-		    " no version of package %s provided",
-		    name, versionToProvide, name));
-	    Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "UNPROVIDED",
-		    NULL);
-	} else {
-	    char *pvi, *vi;
-
-	    if (CheckVersionAndConvert(interp, reqPtr->pkgPtr->version, &pvi,
-		    NULL) != TCL_OK) {
-		result = TCL_ERROR;
-	    } else if (CheckVersionAndConvert(interp,
-		    versionToProvide, &vi, NULL) != TCL_OK) {
-		ckfree(pvi);
-		result = TCL_ERROR;
-	    } else {
-		int res = CompareVersions(pvi, vi, NULL);
-
-		ckfree(pvi);
-		ckfree(vi);
-		if (res != 0) {
-		    result = TCL_ERROR;
-		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "attempt to provide package %s %s failed:"
-			    " package %s %s provided instead",
-			    name, versionToProvide,
-			    name, reqPtr->pkgPtr->version));
-		    Tcl_SetErrorCode(interp, "TCL", "PACKAGE",
-			    "WRONGPROVIDE", NULL);
-		}
-	    }
-	}
-    } else if (result != TCL_ERROR) {
-	Tcl_Obj *codePtr = Tcl_NewIntObj(result);
-
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"attempt to provide package %s %s failed:"
-		" bad return code: %s",
-		name, versionToProvide, TclGetString(codePtr)));
-	Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "BADRESULT", NULL);
-	TclDecrRefCount(codePtr);
-	result = TCL_ERROR;
-    }
-
-    if (result == TCL_ERROR) {
-	Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
-		"\n    (\"package ifneeded %s %s\" script)",
-		name, versionToProvide));
-    }
-    Tcl_Release(versionToProvide);
-
-    if (result != TCL_OK) {
-	/*
-	 * Take a non-TCL_OK code from the script as an indication the
-	 * package wasn't loaded properly, so the package system
-	 * should not remember an improper load.
-	 *
-	 * This is consistent with our returning NULL. If we're not
-	 * willing to tell our caller we got a particular version, we
-	 * shouldn't store that version for telling future callers
-	 * either.
-	 */
-
-	if (reqPtr->pkgPtr->version != NULL) {
-	    ckfree(reqPtr->pkgPtr->version);
-	    reqPtr->pkgPtr->version = NULL;
-	}
-	reqPtr->pkgPtr->clientData = NULL;
-	return result;
-    }
-
-    Tcl_NRAddCallback(interp, data[3], reqPtr, INT2PTR(reqc), (void *)reqv, NULL);
-    return TCL_OK;
+    return pkgPtr->version;
 }

 /*
@@ -948,19 +841,10 @@ Tcl_PkgPresentEx(
 *
 *----------------------------------------------------------------------
 */
-int
-Tcl_PackageObjCmd(
-    ClientData dummy,		/* Not used. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
-{
-    return Tcl_NRCallObjProc(interp, TclNRPackageObjCmd, NULL, objc, objv);
-}

 	/* ARGSUSED */
 int
-TclNRPackageObjCmd(
+Tcl_PackageObjCmd(
    ClientData dummy,		/* Not used. */
    Tcl_Interp *interp,		/* Current interpreter. */
    int objc,			/* Number of arguments. */
@@ -977,7 +861,7 @@ TclNRPackageObjCmd(
 	PKG_VERSIONS, PKG_VSATISFIES
    };
    Interp *iPtr = (Interp *) interp;
-    int optionIndex, exact, i, newobjc, satisfies;
+    int optionIndex, exact, i, satisfies;
    PkgAvail *availPtr, *prevPtr;
    Package *pkgPtr;
    Tcl_HashEntry *hPtr;
@@ -986,7 +870,6 @@ TclNRPackageObjCmd(
    const char *version;
    const char *argv2, *argv3, *argv4;
    char *iva = NULL, *ivb = NULL;
-    Tcl_Obj *objvListPtr, **newObjvPtr;

    if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
@@ -1045,7 +928,6 @@ TclNRPackageObjCmd(
 		Tcl_EventuallyFree(availPtr->script, TCL_DYNAMIC);
 		if (availPtr->pkgIndex) {
 		    Tcl_EventuallyFree(availPtr->pkgIndex, TCL_DYNAMIC);
-		    availPtr->pkgIndex = NULL;
 		}
 		ckfree(availPtr);
 	    }
@@ -1099,7 +981,6 @@ TclNRPackageObjCmd(
 		Tcl_EventuallyFree(availPtr->script, TCL_DYNAMIC);
 		if (availPtr->pkgIndex) {
 		    Tcl_EventuallyFree(availPtr->pkgIndex, TCL_DYNAMIC);
-		    availPtr->pkgIndex = NULL;
 		}
 		break;
 	    }
@@ -1111,7 +992,7 @@ TclNRPackageObjCmd(
 	}
 	if (availPtr == NULL) {
 	    availPtr = ckalloc(sizeof(PkgAvail));
-	    availPtr->pkgIndex = NULL;
+	    availPtr->pkgIndex = 0;
 	    DupBlock(availPtr->version, argv3, (unsigned) length + 1);

 	    if (prevPtr == NULL) {
@@ -1232,6 +1113,7 @@ TclNRPackageObjCmd(
 	argv2 = TclGetString(objv[2]);
 	if ((argv2[0] == '-') && (strcmp(argv2, "-exact") == 0)) {
 	    Tcl_Obj *ov;
+	    int res;

 	    if (objc != 5) {
 		goto requireSyntax;
@@ -1251,38 +1133,17 @@ TclNRPackageObjCmd(
 	    Tcl_AppendStringsToObj(ov, "-", version, NULL);
 	    version = NULL;
 	    argv3 = TclGetString(objv[3]);
-	    Tcl_IncrRefCount(objv[3]);

-	    objvListPtr = Tcl_NewListObj(0, NULL);
-	    Tcl_IncrRefCount(objvListPtr);
-	    Tcl_ListObjAppendElement(interp, objvListPtr, ov);
-	    Tcl_ListObjGetElements(interp, objvListPtr, &newobjc, &newObjvPtr);
-
-	    Tcl_NRAddCallback(interp, TclNRPackageObjCmdCleanup, objv[3], objvListPtr, NULL, NULL);
-	    Tcl_NRAddCallback(interp, PkgRequireCore, (void *)argv3, INT2PTR(newobjc), newObjvPtr, NULL);
-	    return TCL_OK;
+	    Tcl_IncrRefCount(ov);
+	    res = Tcl_PkgRequireProc(interp, argv3, 1, &ov, NULL);
+	    TclDecrRefCount(ov);
+	    return res;
 	} else {
-	    int i, newobjc = objc-3;
-	    Tcl_Obj *const *newobjv = objv + 3;
 	    if (CheckAllRequirements(interp, objc-3, objv+3) != TCL_OK) {
 		return TCL_ERROR;
 	    }
-	    objvListPtr = Tcl_NewListObj(0, NULL);
-	    Tcl_IncrRefCount(objvListPtr);
-	    Tcl_IncrRefCount(objv[2]);
-	    for (i = 0; i < newobjc; i++) {

-		/*
-		 * Tcl_Obj structures may have come from another interpreter,
-		 * so duplicate them.
-		 */
-
-		Tcl_ListObjAppendElement(interp, objvListPtr, Tcl_DuplicateObj(newobjv[i]));
-	    }
-	    Tcl_ListObjGetElements(interp, objvListPtr, &newobjc, &newObjvPtr);
-	    Tcl_NRAddCallback(interp, TclNRPackageObjCmdCleanup, objv[2], objvListPtr, NULL, NULL);
-	    Tcl_NRAddCallback(interp, PkgRequireCore, (void *)argv2, INT2PTR(newobjc), newObjvPtr, NULL);
-	    return TCL_OK;
+	    return Tcl_PkgRequireProc(interp, argv2, objc-3, objv+3, NULL);
 	}
 	break;
    case PKG_UNKNOWN: {
@@ -1422,13 +1283,6 @@ TclNRPackageObjCmd(
    }
    return TCL_OK;
 }
-
-static int
-TclNRPackageObjCmdCleanup(ClientData data[], Tcl_Interp *interp, int result) {
-    TclDecrRefCount((Tcl_Obj *)data[0]);
-    TclDecrRefCount((Tcl_Obj *)data[1]);
-    return result;
-}

 /*
 *----------------------------------------------------------------------
@@ -1510,7 +1364,6 @@ TclFreePackageInfo(
 	    Tcl_EventuallyFree(availPtr->script, TCL_DYNAMIC);
 	    if (availPtr->pkgIndex) {
 		Tcl_EventuallyFree(availPtr->pkgIndex, TCL_DYNAMIC);
-		availPtr->pkgIndex = NULL;
 	    }
 	    ckfree(availPtr);
 	}
@@ -124,10 +124,11 @@ Tcl_ProcObjCmd(
 {
    register Interp *iPtr = (Interp *) interp;
    Proc *procPtr;
-    const char *procName;
-    const char *simpleName, *procArgs, *procBody;
+    const char *fullName;
+    const char *procName, *procArgs, *procBody;
    Namespace *nsPtr, *altNsPtr, *cxtNsPtr;
    Tcl_Command cmd;
+    Tcl_DString ds;

    if (objc != 4) {
 	Tcl_WrongNumArgs(interp, 1, objv, "name args body");
@@ -140,21 +141,29 @@ Tcl_ProcObjCmd(
     * namespace.
     */

-    procName = TclGetString(objv[1]);
-    TclGetNamespaceForQualName(interp, procName, NULL, 0,
-	    &nsPtr, &altNsPtr, &cxtNsPtr, &simpleName);
+    fullName = TclGetString(objv[1]);
+    TclGetNamespaceForQualName(interp, fullName, NULL, 0,
+	    &nsPtr, &altNsPtr, &cxtNsPtr, &procName);

    if (nsPtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't create procedure \"%s\": unknown namespace",
-		procName));
+		fullName));
 	Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", NULL);
 	return TCL_ERROR;
    }
-    if (simpleName == NULL) {
+    if (procName == NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't create procedure \"%s\": bad procedure name",
-		procName));
+		fullName));
+	Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", NULL);
+	return TCL_ERROR;
+    }
+    if ((nsPtr != iPtr->globalNsPtr)
+	    && (procName != NULL) && (procName[0] == ':')) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"can't create procedure \"%s\" in non-global namespace with"
+		" name starting with \":\"", procName));
 	Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", NULL);
 	return TCL_ERROR;
    }
@@ -163,16 +172,31 @@ Tcl_ProcObjCmd(
     * Create the data structure to represent the procedure.
     */

-    if (TclCreateProc(interp, nsPtr, simpleName, objv[2], objv[3],
+    if (TclCreateProc(interp, nsPtr, procName, objv[2], objv[3],
 	    &procPtr) != TCL_OK) {
 	Tcl_AddErrorInfo(interp, "\n    (creating proc \"");
-	Tcl_AddErrorInfo(interp, simpleName);
+	Tcl_AddErrorInfo(interp, procName);
 	Tcl_AddErrorInfo(interp, "\")");
 	return TCL_ERROR;
    }

-    cmd = TclNRCreateCommandInNs(interp, simpleName, (Tcl_Namespace *) nsPtr,
-	TclObjInterpProc, TclNRInterpProc, procPtr, TclProcDeleteProc);
+    /*
+     * Now create a command for the procedure. This will initially be in the
+     * current namespace unless the procedure's name included namespace
+     * qualifiers. To create the new command in the right namespace, we
+     * generate a fully qualified name for it.
+     */
+
+    Tcl_DStringInit(&ds);
+    if (nsPtr != iPtr->globalNsPtr) {
+	Tcl_DStringAppend(&ds, nsPtr->fullName, -1);
+	TclDStringAppendLiteral(&ds, "::");
+    }
+    Tcl_DStringAppend(&ds, procName, -1);
+
+    cmd = Tcl_NRCreateCommand(interp, Tcl_DStringValue(&ds), TclObjInterpProc,
+	    TclNRInterpProc, procPtr, TclProcDeleteProc);
+    Tcl_DStringFree(&ds);

    /*
     * Now initialize the new procedure's cmdPtr field. This will be used
@@ -369,13 +393,13 @@ TclCreateProc(
    Proc **procPtrPtr)		/* Returns: pointer to proc data. */
 {
    Interp *iPtr = (Interp *) interp;
+    const char **argArray = NULL;

    register Proc *procPtr;
-    int i, result, numArgs, plen;
-    const char *bytes, *argname, *argnamei;
-    char argnamelast;
+    int i, length, result, numArgs;
+    const char *args, *bytes, *p;
    register CompiledLocal *localPtr = NULL;
-    Tcl_Obj *defPtr, *errorObj, **argArray;
+    Tcl_Obj *defPtr;
    int precompiled = 0;

    if (bodyPtr->typePtr == &tclProcBodyType) {
@@ -412,7 +436,6 @@ TclCreateProc(
 	 */

 	if (Tcl_IsShared(bodyPtr)) {
-	    int length;
 	    Tcl_Obj *sharedBodyPtr = bodyPtr;

 	    bytes = TclGetStringFromObj(bodyPtr, &length);
@@ -450,9 +473,12 @@ TclCreateProc(
     * argument specifier. If the body is precompiled, processing is limited
     * to checking that the parsed argument is consistent with the one stored
     * in the Proc.
+     *
+     * THIS FAILS IF THE ARG LIST OBJECT'S STRING REP CONTAINS NULS.
     */

-    result = Tcl_ListObjGetElements(interp , argsPtr ,&numArgs ,&argArray);
+    args = TclGetStringFromObj(argsPtr, &length);
+    result = Tcl_SplitList(interp, args, &numArgs, &argArray);
    if (result != TCL_OK) {
 	goto procError;
    }
@@ -476,28 +502,28 @@ TclCreateProc(
    for (i = 0; i < numArgs; i++) {
 	int fieldCount, nameLength;
 	size_t valueLength;
-	Tcl_Obj **fieldValues;
+	const char **fieldValues;

 	/*
 	 * Now divide the specifier up into name and default.
 	 */

-	result = Tcl_ListObjGetElements(interp, argArray[i], &fieldCount,
+	result = Tcl_SplitList(interp, argArray[i], &fieldCount,
 		&fieldValues);
 	if (result != TCL_OK) {
 	    goto procError;
 	}
 	if (fieldCount > 2) {
-	    errorObj = Tcl_NewStringObj(
-		"too many fields in argument specifier \"", -1);
-	    Tcl_AppendObjToObj(errorObj, argArray[i]);
-	    Tcl_AppendToObj(errorObj, "\"", -1);
-	    Tcl_SetObjResult(interp, errorObj);
+	    ckfree(fieldValues);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "too many fields in argument specifier \"%s\"",
+		    argArray[i]));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
 		    "FORMALARGUMENTFORMAT", NULL);
 	    goto procError;
 	}
-	if ((fieldCount == 0) || (fieldValues[0]->length == 0)) {
+	if ((fieldCount == 0) || (*fieldValues[0] == 0)) {
+	    ckfree(fieldValues);
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "argument with no name", -1));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
@@ -505,10 +531,9 @@ TclCreateProc(
 	    goto procError;
 	}

-	nameLength = Tcl_NumUtfChars(Tcl_GetString(fieldValues[0]), fieldValues[0]->length);
+	nameLength = strlen(fieldValues[0]);
 	if (fieldCount == 2) {
-	    valueLength = Tcl_NumUtfChars(Tcl_GetString(fieldValues[1]),
-		fieldValues[1]->length);
+	    valueLength = strlen(fieldValues[1]);
 	} else {
 	    valueLength = 0;
 	}
@@ -517,29 +542,33 @@ TclCreateProc(
 	 * Check that the formal parameter name is a scalar.
 	 */

-	argname = Tcl_GetStringFromObj(fieldValues[0], &plen);
-	argnamei = argname;
-	argnamelast = argname[plen-1];
-	while (plen--) {
-	    if (argnamei[0] == '(') {
-		if (argnamelast == ')') {	/* We have an array element. */
+	p = fieldValues[0];
+	while (*p != '\0') {
+	    if (*p == '(') {
+		const char *q = p;
+		do {
+		    q++;
+		} while (*q != '\0');
+		q--;
+		if (*q == ')') {	/* We have an array element. */
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			    "formal parameter \"%s\" is an array element",
-			    Tcl_GetString(fieldValues[0])));
+			    fieldValues[0]));
+		    ckfree(fieldValues);
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
 			    "FORMALARGUMENTFORMAT", NULL);
 		    goto procError;
 		}
-	    } else if ((argnamei[0] == ':') && (argnamei[1] == ':')) {
-		errorObj = Tcl_NewStringObj("formal parameter \"", -1);
-		Tcl_AppendObjToObj(errorObj, fieldValues[0]);
-		Tcl_AppendToObj(errorObj, "\" is not a simple name", -1);
-		Tcl_SetObjResult(interp, errorObj);
+	    } else if ((*p == ':') && (*(p+1) == ':')) {
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"formal parameter \"%s\" is not a simple name",
+			fieldValues[0]));
+		ckfree(fieldValues);
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
 			"FORMALARGUMENTFORMAT", NULL);
 		goto procError;
 	    }
-	    argnamei = Tcl_UtfNext(argnamei);
+	    p++;
 	}

 	if (precompiled) {
@@ -555,7 +584,7 @@ TclCreateProc(
 	     */

 	    if ((localPtr->nameLength != nameLength)
-		    || (Tcl_UtfNcmp(localPtr->name, argname, nameLength))
+		    || (strcmp(localPtr->name, fieldValues[0]))
 		    || (localPtr->frameIndex != i)
 		    || !(localPtr->flags & VAR_ARGUMENT)
 		    || (localPtr->defValuePtr == NULL && fieldCount == 2)
@@ -563,6 +592,7 @@ TclCreateProc(
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"procedure \"%s\": formal parameter %d is "
 			"inconsistent with precompiled body", procName, i));
+		ckfree(fieldValues);
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
 			"BYTECODELIES", NULL);
 		goto procError;
@@ -577,13 +607,12 @@ TclCreateProc(
 		size_t tmpLength = localPtr->defValuePtr->length;

 		if ((valueLength != tmpLength) ||
-			Tcl_UtfNcmp(Tcl_GetString(fieldValues[1]), tmpPtr, tmpLength)) {
-		    errorObj = Tcl_ObjPrintf(
-			    "procedure \"%s\": formal parameter \"" ,procName);
-		    Tcl_AppendObjToObj(errorObj, fieldValues[0]);
-		    Tcl_AppendToObj(errorObj, "\" has "
-			"default value inconsistent with precompiled body", -1);
-		    Tcl_SetObjResult(interp, errorObj);
+			strncmp(fieldValues[1], tmpPtr, tmpLength)) {
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "procedure \"%s\": formal parameter \"%s\" has "
+			    "default value inconsistent with precompiled body",
+			    procName, fieldValues[0]));
+		    ckfree(fieldValues);
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
 			    "BYTECODELIES", NULL);
 		    goto procError;
@@ -603,7 +632,7 @@ TclCreateProc(
 	     * local variables for the argument.
 	     */

-	    localPtr = ckalloc(TclOffset(CompiledLocal, name) + fieldValues[0]->length +1);
+	    localPtr = ckalloc(TclOffset(CompiledLocal, name) + nameLength+1);
 	    if (procPtr->firstLocalPtr == NULL) {
 		procPtr->firstLocalPtr = procPtr->lastLocalPtr = localPtr;
 	    } else {
@@ -611,18 +640,19 @@ TclCreateProc(
 		procPtr->lastLocalPtr = localPtr;
 	    }
 	    localPtr->nextPtr = NULL;
-	    localPtr->nameLength = Tcl_NumUtfChars(argname, fieldValues[0]->length);
+	    localPtr->nameLength = nameLength;
 	    localPtr->frameIndex = i;
 	    localPtr->flags = VAR_ARGUMENT;
 	    localPtr->resolveInfo = NULL;

 	    if (fieldCount == 2) {
-		localPtr->defValuePtr = fieldValues[1];
+		localPtr->defValuePtr =
+			Tcl_NewStringObj(fieldValues[1], valueLength);
 		Tcl_IncrRefCount(localPtr->defValuePtr);
 	    } else {
 		localPtr->defValuePtr = NULL;
 	    }
-	    memcpy(localPtr->name, argname, fieldValues[0]->length + 1);
+	    memcpy(localPtr->name, fieldValues[0], nameLength + 1);
 	    if ((i == numArgs - 1)
 		    && (localPtr->nameLength == 4)
 		    && (localPtr->name[0] == 'a')
@@ -630,9 +660,12 @@ TclCreateProc(
 		localPtr->flags |= VAR_IS_ARGS;
 	    }
 	}
+
+	ckfree(fieldValues);
    }

    *procPtrPtr = procPtr;
+    ckfree(argArray);
    return TCL_OK;

  procError:
@@ -653,6 +686,9 @@ TclCreateProc(
 	}
 	ckfree(procPtr);
    }
+    if (argArray != NULL) {
+	ckfree(argArray);
+    }
    return TCL_ERROR;
 }

@@ -790,7 +826,7 @@ TclObjGetFrame(
 	level = curLevel - level;
 	result = 1;
    } else if (objPtr->typePtr == &levelReferenceType) {
-	level = (int) objPtr->internalRep.wideValue;
+	level = (int) objPtr->internalRep.longValue;
 	result = 1;
    } else {
 	name = TclGetString(objPtr);
@@ -798,7 +834,7 @@ TclObjGetFrame(
 	    if (TCL_OK == Tcl_GetInt(NULL, name+1, &level) && level >= 0) {
 		TclFreeIntRep(objPtr);
 		objPtr->typePtr = &levelReferenceType;
-		objPtr->internalRep.wideValue = level;
+		objPtr->internalRep.longValue = level;
 		result = 1;
 	    } else {
 		result = -1;
@@ -2380,7 +2416,7 @@ FreeLambdaInternalRep(
    Proc *procPtr = objPtr->internalRep.twoPtrValue.ptr1;
    Tcl_Obj *nsObjPtr = objPtr->internalRep.twoPtrValue.ptr2;

-    if (procPtr->refCount-- <= 1) {
+    if (procPtr->refCount-- == 1) {
 	TclProcCleanupProc(procPtr);
    }
    TclDecrRefCount(nsObjPtr);
@@ -1,957 +0,0 @@
-/*
- * tclProcess.c --
- *
- *	This file implements the "tcl::process" ensemble for subprocess 
- *	management as defined by TIP #462.
- *
- * Copyright (c) 2017 Frederic Bonnet.
- *
- * See the file "license.terms" for information on usage and redistribution of
- * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- */
-
-#include "tclInt.h"
-
-/*
- * Autopurge flag. Process-global because of the way Tcl manages child 
- * processes (see tclPipe.c).
- */
-
-static int autopurge = 1;	/* Autopurge flag. */
-
-/*
- * Hash tables that keeps track of all child process statuses. Keys are the 
- * child process ids and resolved pids, values are (ProcessInfo *).
- */
-
-typedef struct ProcessInfo {
-    Tcl_Pid pid;		/* Process id. */
-    int resolvedPid;		/* Resolved process id. */
-    int purge;			/* Purge eventualy. */
-    TclProcessWaitStatus status;/* Process status. */
-    int code;			/* Error code, exit status or signal 
-				   number. */
-    Tcl_Obj *msg;		/* Error message. */
-    Tcl_Obj *error;		/* Error code. */
-} ProcessInfo;
-static Tcl_HashTable infoTablePerPid;
-static Tcl_HashTable infoTablePerResolvedPid;
-static int infoTablesInitialized = 0;	/* 0 means not yet initialized. */
-TCL_DECLARE_MUTEX(infoTablesMutex)
-
- /*
- * Prototypes for functions defined later in this file:
- */
-
-static void		InitProcessInfo(ProcessInfo *info, Tcl_Pid pid,
-			    int resolvedPid);
-static void		FreeProcessInfo(ProcessInfo *info);
-static int		RefreshProcessInfo(ProcessInfo *info, int options);
-static TclProcessWaitStatus WaitProcessStatus(Tcl_Pid pid, int resolvedPid, 
-			    int options, int *codePtr, Tcl_Obj **msgPtr,
-			    Tcl_Obj **errorObjPtr);
-static Tcl_Obj *	BuildProcessStatusObj(ProcessInfo *info);
-static int		ProcessListObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		ProcessStatusObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		ProcessPurgeObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		ProcessAutopurgeObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-
-/*
- *----------------------------------------------------------------------
- *
- * InitProcessInfo --
- *
- *	Initializes the ProcessInfo structure.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory written.
- *
- *----------------------------------------------------------------------
- */
-
-void
-InitProcessInfo(
-    ProcessInfo *info,		/* Structure to initialize. */
-    Tcl_Pid pid,		/* Process id. */
-    int resolvedPid)		/* Resolved process id. */
-{
-    info->pid = pid;
-    info->resolvedPid = resolvedPid;
-    info->purge = 0;
-    info->status = TCL_PROCESS_UNCHANGED;
-    info->code = 0;
-    info->msg = NULL;
-    info->error = NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FreeProcessInfo --
- *
- *	Free the ProcessInfo structure.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory deallocated, Tcl_Obj refcount decreased.
- *
- *----------------------------------------------------------------------
- */
-
-void
-FreeProcessInfo(
-    ProcessInfo *info)		/* Structure to free. */
-{
-    /*
-     * Free stored Tcl_Objs.
-     */
-
-    if (info->msg) {
-	Tcl_DecrRefCount(info->msg);
-    }
-    if (info->error) {
-	Tcl_DecrRefCount(info->error);
-    }
-
-    /*
-     * Free allocated structure.
-     */
-
-    ckfree(info);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * RefreshProcessInfo --
- *
- *	Refresh process info.
- *
- * Results:
- *	Nonzero if state changed, else zero.
- *
- * Side effects:
- *	May call WaitProcessStatus, which can block if WNOHANG option is set.
- *
- *----------------------------------------------------------------------
- */
-
-int
-RefreshProcessInfo(
-    ProcessInfo *info,		/* Structure to refresh. */
-    int options			/* Options passed to WaitProcessStatus. */
-)
-{
-    if (info->status == TCL_PROCESS_UNCHANGED) {
-	/*
-	 * Refresh & store status.
-	 */
-
-	info->status = WaitProcessStatus(info->pid, info->resolvedPid, 
-		options, &info->code, &info->msg, &info->error);
-	if (info->msg) Tcl_IncrRefCount(info->msg);
-	if (info->error) Tcl_IncrRefCount(info->error);
-	return (info->status != TCL_PROCESS_UNCHANGED);
-    } else {
-	/*
-	 * No change.
-	 */
-
-	return 0;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * WaitProcessStatus --
- *
- *	Wait for process status to change.
- *
- * Results:
- *	TclProcessWaitStatus enum value.
- *
- * Side effects:
- *	May call WaitProcessStatus, which can block if WNOHANG option is set.
- *
- *----------------------------------------------------------------------
- */
-
-TclProcessWaitStatus
-WaitProcessStatus(
-    Tcl_Pid pid,		/* Process id. */
-    int resolvedPid,		/* Resolved process id. */
-    int options,		/* Options passed to Tcl_WaitPid. */
-    int *codePtr,		/* If non-NULL, will receive either:
-				 *  - 0 for normal exit.
-				 *  - errno in case of error.
-				 *  - non-zero exit code for abormal exit.
-				 *  - signal number if killed or suspended.
-				 *  - Tcl_WaitPid status in all other cases.
-				 */
-    Tcl_Obj **msgObjPtr,	/* If non-NULL, will receive error message. */
-    Tcl_Obj **errorObjPtr)	/* If non-NULL, will receive error code. */
-{
-    int waitStatus;
-    Tcl_Obj *errorStrings[5];
-    const char *msg;
-
-    pid = Tcl_WaitPid(pid, &waitStatus, options);
-    if (pid == 0) {
-	/*
-	 * No change.
-	 */
-	
-	return TCL_PROCESS_UNCHANGED;
-    }
-
-    /*
-     * Get process status.
-     */
-
-    if (pid == (Tcl_Pid) -1) {
-	/*
-	 * POSIX errName msg
-	 */
-
-	msg = Tcl_ErrnoMsg(errno);
-	if (errno == ECHILD) {
-	    /*
-	     * This changeup in message suggested by Mark Diekhans to
-	     * remind people that ECHILD errors can occur on some
-	     * systems if SIGCHLD isn't in its default state.
-	     */
-
-	    msg = "child process lost (is SIGCHLD ignored or trapped?)";
-	}
-	if (codePtr) *codePtr = errno;
-	if (msgObjPtr) *msgObjPtr = Tcl_ObjPrintf(
-		"error waiting for process to exit: %s", msg);
-	if (errorObjPtr) {
-	    errorStrings[0] = Tcl_NewStringObj("POSIX", -1);
-	    errorStrings[1] = Tcl_NewStringObj(Tcl_ErrnoId(), -1);
-	    errorStrings[2] = Tcl_NewStringObj(msg, -1);
-	    *errorObjPtr = Tcl_NewListObj(3, errorStrings);
-	}
-	return TCL_PROCESS_ERROR;
-    } else if (WIFEXITED(waitStatus)) {
-	if (codePtr) *codePtr = WEXITSTATUS(waitStatus);
-	if (!WEXITSTATUS(waitStatus)) {
-	    /*
-	     * Normal exit.
-	     */
-
-	    if (msgObjPtr) *msgObjPtr = NULL;
-	    if (errorObjPtr) *errorObjPtr = NULL;
-	} else {
-	    /*
-	     * CHILDSTATUS pid code
-	     *
-	     * Child exited with a non-zero exit status.
-	     */
-
-	    if (msgObjPtr) *msgObjPtr = Tcl_NewStringObj(
-		    "child process exited abnormally", -1);
-	    if (errorObjPtr) {
-		errorStrings[0] = Tcl_NewStringObj("CHILDSTATUS", -1);
-		errorStrings[1] = Tcl_NewIntObj(resolvedPid);
-		errorStrings[2] = Tcl_NewIntObj(WEXITSTATUS(waitStatus));
-		*errorObjPtr = Tcl_NewListObj(3, errorStrings);
-	    }
-	}
-	return TCL_PROCESS_EXITED;
-    } else if (WIFSIGNALED(waitStatus)) {
-	/*
-	 * CHILDKILLED pid sigName msg
-	 *
-	 * Child killed because of a signal.
-	 */
-
-	msg = Tcl_SignalMsg(WTERMSIG(waitStatus));
-	if (codePtr) *codePtr = WTERMSIG(waitStatus);
-	if (msgObjPtr) *msgObjPtr = Tcl_ObjPrintf(
-		"child killed: %s", msg);
-	if (errorObjPtr) {
-	    errorStrings[0] = Tcl_NewStringObj("CHILDKILLED", -1);
-	    errorStrings[1] = Tcl_NewIntObj(resolvedPid);
-	    errorStrings[2] = Tcl_NewStringObj(Tcl_SignalId(WTERMSIG(waitStatus)), -1);
-	    errorStrings[3] = Tcl_NewStringObj(msg, -1);
-	    *errorObjPtr = Tcl_NewListObj(4, errorStrings);
-	}
-	return TCL_PROCESS_SIGNALED;
-    } else if (WIFSTOPPED(waitStatus)) {
-	/*
-	 * CHILDSUSP pid sigName msg
-	 *
-	 * Child suspended because of a signal.
-	 */
-
-	msg = Tcl_SignalMsg(WSTOPSIG(waitStatus));
-	if (codePtr) *codePtr = WSTOPSIG(waitStatus);
-	if (msgObjPtr) *msgObjPtr = Tcl_ObjPrintf(
-		"child suspended: %s", msg);
-	if (errorObjPtr) {
-	    errorStrings[0] = Tcl_NewStringObj("CHILDSUSP", -1);
-	    errorStrings[1] = Tcl_NewIntObj(resolvedPid);
-	    errorStrings[2] = Tcl_NewStringObj(Tcl_SignalId(WSTOPSIG(waitStatus)), -1);
-	    errorStrings[3] = Tcl_NewStringObj(msg, -1);
-	    *errorObjPtr = Tcl_NewListObj(4, errorStrings);
-	}
-	return TCL_PROCESS_STOPPED;
-    } else {
-	/*
-	 * TCL OPERATION EXEC ODDWAITRESULT
-	 *
-	 * Child wait status didn't make sense.
-	 */
-
-	if (codePtr) *codePtr = waitStatus;
-	if (msgObjPtr) *msgObjPtr = Tcl_NewStringObj(
-		"child wait status didn't make sense\n", -1);
-	if (errorObjPtr) {
-	    errorStrings[0] = Tcl_NewStringObj("TCL", -1);
-	    errorStrings[1] = Tcl_NewStringObj("OPERATION", -1);
-	    errorStrings[2] = Tcl_NewStringObj("EXEC", -1);
-	    errorStrings[3] = Tcl_NewStringObj("ODDWAITRESULT", -1);
-	    errorStrings[4] = Tcl_NewIntObj(resolvedPid);
-	    *errorObjPtr = Tcl_NewListObj(5, errorStrings);
-	}
-	return TCL_PROCESS_UNKNOWN_STATUS;
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * BuildProcessStatusObj --
- *
- *	Build a list object with process status. The first element is always
- *	a standard Tcl return value, which can be either TCL_OK or TCL_ERROR.
- *	In the latter case, the second element is the error message and the
- *	third element is a Tcl error code (see tclvars).
- *
- * Results:
- *	A list object.
- *
- * Side effects:
- *	Tcl_Objs are created.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-BuildProcessStatusObj(
-    ProcessInfo *info)
-{
-    Tcl_Obj *resultObjs[3];
-
-    if (info->status == TCL_PROCESS_UNCHANGED) {
-	/*
-	 * Process still running, return empty obj.
-	 */
-
-	return Tcl_NewObj();
-    }
-    if (info->status == TCL_PROCESS_EXITED && info->code == 0) {
-	/*
-	 * Normal exit, return TCL_OK.
-	 */
-	
-	return Tcl_NewIntObj(TCL_OK);
-    }
-
-    /*
-     * Abnormal exit, return {TCL_ERROR msg error}
-     */
-
-    resultObjs[0] = Tcl_NewIntObj(TCL_ERROR);
-    resultObjs[1] = info->msg;
-    resultObjs[2] = info->error;
-    return Tcl_NewListObj(3, resultObjs);
-}
-
-/*----------------------------------------------------------------------
- *
- * ProcessListObjCmd --
- *
- *	This function implements the 'tcl::process list' Tcl command. 
- *	Refer to the user documentation for details on what it does.
- *
- * Results:
- *	Returns a standard Tcl result.
- *
- * Side effects:
- *	Access to the internal structures is protected by infoTablesMutex.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ProcessListObjCmd(
-    ClientData clientData,	/* Not used. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
-{
-    Tcl_Obj *list;
-    Tcl_HashEntry *entry;
-    Tcl_HashSearch search;
-    ProcessInfo *info;
-
-    if (objc != 1) {
-	Tcl_WrongNumArgs(interp, 1, objv, NULL);
-	return TCL_ERROR;
-    }
-
-    /*
-     * Return the list of all chid process ids.
-     */
-
-    list = Tcl_NewListObj(0, NULL);
-    Tcl_MutexLock(&infoTablesMutex);
-    for (entry = Tcl_FirstHashEntry(&infoTablePerResolvedPid, &search); 
-	    entry != NULL; entry = Tcl_NextHashEntry(&search)) {
-	info = (ProcessInfo *) Tcl_GetHashValue(entry);
-	Tcl_ListObjAppendElement(interp, list, 
-		Tcl_NewIntObj(info->resolvedPid));
-    }
-    Tcl_MutexUnlock(&infoTablesMutex);
-    Tcl_SetObjResult(interp, list);
-    return TCL_OK;
-}
-
-/*----------------------------------------------------------------------
- *
- * ProcessStatusObjCmd --
- *
- *	This function implements the 'tcl::process status' Tcl command. 
- *	Refer to the user documentation for details on what it does.
- *
- * Results:
- *	Returns a standard Tcl result.
- *
- * Side effects:
- *	Access to the internal structures is protected by infoTablesMutex.
- *	Calls RefreshProcessInfo, which can block if -wait switch is given.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ProcessStatusObjCmd(
-    ClientData clientData,	/* Not used. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
-{
-    Tcl_Obj *dict;
-    int index, options = WNOHANG;
-    Tcl_HashEntry *entry;
-    Tcl_HashSearch search;
-    ProcessInfo *info;
-    int numPids;
-    Tcl_Obj **pidObjs;
-    int result;
-    int i;
-    int pid;
-    Tcl_Obj *const *savedobjv = objv;
-    static const char *const switches[] = {
-	"-wait", "--", NULL
-    };
-    enum switches {
-	STATUS_WAIT, STATUS_LAST
-    };
-
-    while (objc > 1) {
-	if (TclGetString(objv[1])[0] != '-') {
-	    break;
-	}
-	if (Tcl_GetIndexFromObj(interp, objv[1], switches, "switches", 0,
-		&index) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	++objv; --objc;
-	if (STATUS_WAIT == (enum switches) index) {
-	    options = 0;
-	} else {
-	    break;
-	}
-    }
-
-    if (objc != 1 && objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, savedobjv, "?switches? ?pids?");
-	return TCL_ERROR;
-    }
-
-    if (objc == 1) {
-	/*
-	* Return a dict with all child process statuses.
-	*/
-
-	dict = Tcl_NewDictObj();
-	Tcl_MutexLock(&infoTablesMutex);
-	for (entry = Tcl_FirstHashEntry(&infoTablePerResolvedPid, &search); 
-		entry != NULL; entry = Tcl_NextHashEntry(&search)) {
-	    info = (ProcessInfo *) Tcl_GetHashValue(entry);
-	    RefreshProcessInfo(info, options);
-
-	    if (info->purge && autopurge) {
-		/*
-		 * Purge entry.
-		 */
-		
-		Tcl_DeleteHashEntry(entry);
-		entry = Tcl_FindHashEntry(&infoTablePerPid, info->pid);
-		Tcl_DeleteHashEntry(entry);
-		FreeProcessInfo(info);
-	    } else {
-		/*
-		 * Add to result.
-		 */
-
-		Tcl_DictObjPut(interp, dict, Tcl_NewIntObj(info->resolvedPid), 
-			BuildProcessStatusObj(info));
-	    }
-	}
-	Tcl_MutexUnlock(&infoTablesMutex);
-    } else {
-	/*
-	 * Only return statuses of provided processes.
-	 */
-	
-	result = Tcl_ListObjGetElements(interp, objv[1], &numPids, &pidObjs);
-	if (result != TCL_OK) {
-	    return result;
-	}
-	dict = Tcl_NewDictObj();
-	Tcl_MutexLock(&infoTablesMutex);
-	for (i = 0; i < numPids; i++) {
-	    result = Tcl_GetIntFromObj(interp, pidObjs[i], (int *) &pid);
-	    if (result != TCL_OK) {
-		Tcl_MutexUnlock(&infoTablesMutex);
-		Tcl_DecrRefCount(dict);
-		return result;
-	    }
-
-	    entry = Tcl_FindHashEntry(&infoTablePerResolvedPid, INT2PTR(pid));
-	    if (!entry) {
-		/*
-		 * Skip unknown process.
-		 */
-		
-		continue;
-	    }
-	    
-	    info = (ProcessInfo *) Tcl_GetHashValue(entry);
-	    RefreshProcessInfo(info, options);
-
-	    if (info->purge && autopurge) {
-		/*
-		 * Purge entry.
-		 */
-		
-		Tcl_DeleteHashEntry(entry);
-		entry = Tcl_FindHashEntry(&infoTablePerPid, info->pid);
-		Tcl_DeleteHashEntry(entry);
-		FreeProcessInfo(info);
-	    } else {
-		/*
-		 * Add to result.
-		 */
-
-		Tcl_DictObjPut(interp, dict, Tcl_NewIntObj(info->resolvedPid), 
-			BuildProcessStatusObj(info));
-	    }
-	}
-	Tcl_MutexUnlock(&infoTablesMutex);
-    }
-    Tcl_SetObjResult(interp, dict);
-    return TCL_OK;
-}
-
-/*----------------------------------------------------------------------
- *
- * ProcessPurgeObjCmd --
- *
- *	This function implements the 'tcl::process purge' Tcl command. 
- *	Refer to the user documentation for details on what it does.
- *
- * Results:
- *	Returns a standard Tcl result.
- *
- * Side effects:
- *	Frees all ProcessInfo structures with their purge flag set.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ProcessPurgeObjCmd(
-    ClientData clientData,	/* Not used. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
-{
-    Tcl_HashEntry *entry;
-    Tcl_HashSearch search;
-    ProcessInfo *info;
-    int numPids;
-    Tcl_Obj **pidObjs;
-    int result;
-    int i;
-    int pid;
-
-    if (objc != 1 && objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?pids?");
-	return TCL_ERROR;
-    }
-
-    /*
-     * First reap detached procs so that their purge flag is up-to-date.
-     */
-
-    Tcl_ReapDetachedProcs();
-
-    if (objc == 1) {
-	/*
-	 * Purge all terminated processes.
-	 */
-
-	Tcl_MutexLock(&infoTablesMutex);
-	for (entry = Tcl_FirstHashEntry(&infoTablePerResolvedPid, &search); 
-		entry != NULL; entry = Tcl_NextHashEntry(&search)) {
-	    info = (ProcessInfo *) Tcl_GetHashValue(entry);
-	    if (info->purge) {
-		Tcl_DeleteHashEntry(entry);
-		entry = Tcl_FindHashEntry(&infoTablePerPid, info->pid);
-		Tcl_DeleteHashEntry(entry);
-		FreeProcessInfo(info);
-	    }
-	}
-	Tcl_MutexUnlock(&infoTablesMutex);
-    } else {
-	/*
-	 * Purge only provided processes.
-	 */
-	
-	result = Tcl_ListObjGetElements(interp, objv[1], &numPids, &pidObjs);
-	if (result != TCL_OK) {
-	    return result;
-	}
-	Tcl_MutexLock(&infoTablesMutex);
-	for (i = 0; i < numPids; i++) {
-	    result = Tcl_GetIntFromObj(interp, pidObjs[i], (int *) &pid);
-	    if (result != TCL_OK) {
-		Tcl_MutexUnlock(&infoTablesMutex);
-		return result;
-	    }
-
-	    entry = Tcl_FindHashEntry(&infoTablePerResolvedPid, INT2PTR(pid));
-	    if (!entry) {
-		/*
-		 * Skip unknown process.
-		 */
-		
-		continue;
-	    }
-
-	    info = (ProcessInfo *) Tcl_GetHashValue(entry);
-	    if (info->purge) {
-		Tcl_DeleteHashEntry(entry);
-		entry = Tcl_FindHashEntry(&infoTablePerPid, info->pid);
-		Tcl_DeleteHashEntry(entry);
-		FreeProcessInfo(info);
-	    }
-	}
-	Tcl_MutexUnlock(&infoTablesMutex);
-    }
-
-    return TCL_OK;
-}
-
-/*----------------------------------------------------------------------
- *
- * ProcessAutopurgeObjCmd --
- *
- *	This function implements the 'tcl::process autopurge' Tcl command. 
- *	Refer to the user documentation for details on what it does.
- *
- * Results:
- *	Returns a standard Tcl result.
- *
- * Side effects:
- *	Alters detached process handling by Tcl_ReapDetachedProcs().
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ProcessAutopurgeObjCmd(
-    ClientData clientData,	/* Not used. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
-{
-    if (objc != 1 && objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?flag?");
-	return TCL_ERROR;
-    }
-
-    if (objc == 2) {
-	/*
-	 * Set given value.
-	 */
-	
-	int flag;
-	int result = Tcl_GetBooleanFromObj(interp, objv[1], &flag);
-	if (result != TCL_OK) {
-	    return result;
-	}
-
-	autopurge = !!flag;
-    }
-
-    /* 
-     * Return current value. 
-     */
-
-    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(autopurge));
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInitProcessCmd --
- *
- *	This procedure creates the "tcl::process" Tcl command. See the user
- *	documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Command
-TclInitProcessCmd(
-    Tcl_Interp *interp)		/* Current interpreter. */
-{
-    static const EnsembleImplMap processImplMap[] = {
-	{"list", ProcessListObjCmd, TclCompileBasic0ArgCmd, NULL, NULL, 1},
-	{"status", ProcessStatusObjCmd, TclCompileBasicMin0ArgCmd, NULL, NULL, 1},
-	{"purge", ProcessPurgeObjCmd, TclCompileBasic0Or1ArgCmd, NULL, NULL, 1},
-	{"autopurge", ProcessAutopurgeObjCmd, TclCompileBasic0Or1ArgCmd, NULL, NULL, 1},
-	{NULL, NULL, NULL, NULL, NULL, 0}
-    };
-    Tcl_Command processCmd;
-
-    if (infoTablesInitialized == 0) {
-	Tcl_MutexLock(&infoTablesMutex);
-	if (infoTablesInitialized == 0) {
-	    Tcl_InitHashTable(&infoTablePerPid, TCL_ONE_WORD_KEYS);
-	    Tcl_InitHashTable(&infoTablePerResolvedPid, TCL_ONE_WORD_KEYS);
-	    infoTablesInitialized = 1;
-	}
-	Tcl_MutexUnlock(&infoTablesMutex);
-    }
-
-    processCmd = TclMakeEnsemble(interp, "::tcl::process", processImplMap);
-    Tcl_Export(interp, Tcl_FindNamespace(interp, "::tcl", NULL, 0),
-	    "process", 0);
-    return processCmd;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclProcessCreated --
- *
- *	Called when a child process has been created by Tcl.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Internal structures are updated with a new ProcessInfo.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclProcessCreated(
-    Tcl_Pid pid)		/* Process id. */
-{
-    int resolvedPid;
-    Tcl_HashEntry *entry, *entry2;
-    int isNew;
-    ProcessInfo *info;
-
-    /*
-     * Get resolved pid first.
-     */
-
-    resolvedPid = TclpGetPid(pid);
-
-    Tcl_MutexLock(&infoTablesMutex);
-
-    /*
-     * Create entry in pid table.
-     */
-
-    entry = Tcl_CreateHashEntry(&infoTablePerPid, pid, &isNew);
-    if (!isNew) {
-	/*
-	 * Pid was reused, free old info and reuse structure.
-	 */
-	
-	info = (ProcessInfo *) Tcl_GetHashValue(entry);
-	entry2 = Tcl_FindHashEntry(&infoTablePerResolvedPid, 
-		INT2PTR(resolvedPid));
-	if (entry2) Tcl_DeleteHashEntry(entry2);
-	FreeProcessInfo(info);
-    }
-
-    /*
-     * Allocate and initialize info structure.
-     */
-
-    info = (ProcessInfo *) ckalloc(sizeof(ProcessInfo));
-    InitProcessInfo(info, pid, resolvedPid);
-
-    /*
-     * Add entry to tables.
-     */
-
-    Tcl_SetHashValue(entry, info);
-    entry = Tcl_CreateHashEntry(&infoTablePerResolvedPid, INT2PTR(resolvedPid),
-	    &isNew);
-    Tcl_SetHashValue(entry, info);
-
-    Tcl_MutexUnlock(&infoTablesMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclProcessWait --
- *
- *	Wait for process status to change.
- *
- * Results:
- *	TclProcessWaitStatus enum value.
- *
- * Side effects:
- *	Completed process info structures are purged immediately (autopurge on)
- *	or eventually (autopurge off).
- *
- *----------------------------------------------------------------------
- */
-
-TclProcessWaitStatus
-TclProcessWait(
-    Tcl_Pid pid,		/* Process id. */
-    int options,		/* Options passed to WaitProcessStatus. */
-    int *codePtr,		/* If non-NULL, will receive either:
-				 *  - 0 for normal exit.
-				 *  - errno in case of error.
-				 *  - non-zero exit code for abormal exit.
-				 *  - signal number if killed or suspended.
-				 *  - Tcl_WaitPid status in all other cases.
-				 */
-    Tcl_Obj **msgObjPtr,	/* If non-NULL, will receive error message. */
-    Tcl_Obj **errorObjPtr)	/* If non-NULL, will receive error code. */
-{
-    Tcl_HashEntry *entry;
-    ProcessInfo *info;
-    TclProcessWaitStatus result;
-
-    /*
-     * First search for pid in table.
-     */
-
-    Tcl_MutexLock(&infoTablesMutex);
-    entry = Tcl_FindHashEntry(&infoTablePerPid, pid);
-    if (!entry) {
-	/*
-	 * Unknown process, just call WaitProcessStatus and return.
-	 */
-	
-	result = WaitProcessStatus(pid, TclpGetPid(pid), options, codePtr, 
-		msgObjPtr, errorObjPtr);
-	if (msgObjPtr && *msgObjPtr) Tcl_IncrRefCount(*msgObjPtr);
-	if (errorObjPtr && *errorObjPtr) Tcl_IncrRefCount(*errorObjPtr);
-    Tcl_MutexUnlock(&infoTablesMutex);
-	return result;
-    }
-
-    info = (ProcessInfo *) Tcl_GetHashValue(entry);
-    if (info->purge) {
-	/*
-	 * Process has completed but TclProcessWait has already been called,
-	 * so report no change.
-	 */
-    Tcl_MutexUnlock(&infoTablesMutex);
-	
-	return TCL_PROCESS_UNCHANGED;
-    }
-
-    RefreshProcessInfo(info, options);
-    if (info->status == TCL_PROCESS_UNCHANGED) {
-	/*
-	 * No change, stop there.
-	 */
-    Tcl_MutexUnlock(&infoTablesMutex);
-	
-	return TCL_PROCESS_UNCHANGED;
-    }
-
-    /*
-     * Set return values.
-     */
-
-    result = info->status;
-    if (codePtr) *codePtr = info->code;
-    if (msgObjPtr) *msgObjPtr = info->msg;
-    if (errorObjPtr) *errorObjPtr = info->error;
-    if (msgObjPtr && *msgObjPtr) Tcl_IncrRefCount(*msgObjPtr);
-    if (errorObjPtr && *errorObjPtr) Tcl_IncrRefCount(*errorObjPtr);
-
-    if (autopurge) {
-	/*
-	 * Purge now.
-	 */
-
-	Tcl_DeleteHashEntry(entry);
-	entry = Tcl_FindHashEntry(&infoTablePerResolvedPid, 
-		INT2PTR(info->resolvedPid));
-	Tcl_DeleteHashEntry(entry);
-	FreeProcessInfo(info);
-    } else {
-	/*
-	 * Eventually purge. Subsequent calls will return
-	 * TCL_PROCESS_UNCHANGED.
-	 */
-
-	info->purge = 1;
-    }
-    Tcl_MutexUnlock(&infoTablesMutex);
-    return result;
-}
@@ -37,7 +37,7 @@ typedef struct TclRegexp {
 				 * of subexpressions. */
    rm_detail_t details;	/* Detailed information on match (currently
 				 * used only for REG_EXPECT). */
-    size_t refCount;		/* Count of number of references to this
+    unsigned int refCount;	/* Count of number of references to this
 				 * compiled regexp. */
 } TclRegexp;

@@ -651,6 +651,23 @@ Tcl_AppendResultVA(
    }
    Tcl_AppendStringsToObjVA(objPtr, argList);
    Tcl_SetObjResult(interp, objPtr);
+
+    /*
+     * Strictly we should call Tcl_GetStringResult(interp) here to make sure
+     * that interp->result is correct according to the old contract, but that
+     * makes the performance of much code (e.g. in Tk) absolutely awful. So we
+     * leave it out; code that really wants interp->result can just insert the
+     * calls to Tcl_GetStringResult() itself. [Patch 1041072 discussion]
+     */
+
+#ifdef USE_INTERP_RESULT
+    /*
+     * Ensure that the interp->result is legal so old Tcl 7.* code still
+     * works. There's still embarrasingly much of it about...
+     */
+
+    (void) Tcl_GetStringResult(interp);
+#endif /* USE_INTERP_RESULT */
 }

 /*
@@ -10,7 +10,6 @@
 */

 #include "tclInt.h"
-#include "tommath.h"

 /*
 * Flag values used by Tcl_ScanObjCmd.
@@ -73,7 +72,7 @@ BuildCharSet(
    CharSet *cset,
    const char *format)		/* Points to first char of set. */
 {
-    Tcl_UniChar ch = 0, start;
+    Tcl_UniChar ch, start;
    int offset, nranges;
    const char *end;

@@ -258,7 +257,7 @@ ValidateFormat(
 {
    int gotXpg, gotSequential, value, i, flags;
    char *end;
-    Tcl_UniChar ch = 0;
+    Tcl_UniChar ch;
    int objIndex, xpgSize, nspace = numVars;
    int *nassign = TclStackAlloc(interp, nspace * sizeof(int));
    char buf[TCL_UTF_MAX+1];
@@ -416,7 +415,14 @@ ValidateFormat(
 	case 'x':
 	case 'X':
 	case 'b':
+	    break;
 	case 'u':
+	    if (flags & SCAN_BIG) {
+		Tcl_SetObjResult(interp, Tcl_NewStringObj(
+			"unsigned bignum scans are invalid", -1));
+		Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADUNSIGNED",NULL);
+		goto error;
+	    }
 	    break;
 	    /*
 	     * Bracket terms need special checking
@@ -576,7 +582,7 @@ Tcl_ScanObjCmd(
    char op = 0;
    int width, underflow = 0;
    Tcl_WideInt wideValue;
-    Tcl_UniChar ch = 0, sch = 0;
+    Tcl_UniChar ch, sch;
    Tcl_Obj **objs = NULL, *objPtr = NULL;
    int flags;
    char buf[513];		/* Temporary buffer to hold scanned number
@@ -879,17 +885,9 @@ Tcl_ScanObjCmd(
 	     * Scan a single Unicode character.
 	     */

-	    offset = TclUtfToUniChar(string, &sch);
-	    i = (int)sch;
-#if TCL_UTF_MAX == 4
-	    if (!offset) {
-		offset = TclUtfToUniChar(string, &sch);
-		i = (((i<<10) & 0x0FFC00) + 0x10000) + (sch & 0x3FF);
-	    }
-#endif
-	    string += offset;
+	    string += TclUtfToUniChar(string, &sch);
 	    if (!(flags & SCAN_SUPPRESS)) {
-		objPtr = Tcl_NewIntObj(i);
+		objPtr = Tcl_NewIntObj((int)sch);
 		Tcl_IncrRefCount(objPtr);
 		CLANG_ASSERT(objs);
 		objs[objIndex++] = objPtr;
@@ -926,9 +924,9 @@ Tcl_ScanObjCmd(
 	    }
 	    if (flags & SCAN_LONGER) {
 		if (Tcl_GetWideIntFromObj(NULL, objPtr, &wideValue) != TCL_OK) {
-		    wideValue = LLONG_MAX;
+		    wideValue = ~(Tcl_WideUInt)0 >> 1;	/* WIDE_MAX */
 		    if (TclGetString(objPtr)[0] == '-') {
-			wideValue = LLONG_MIN;
+			wideValue++;	/* WIDE_MAX + 1 = WIDE_MIN */
 		    }
 		}
 		if ((flags & SCAN_UNSIGNED) && (wideValue < 0)) {
@@ -936,33 +934,9 @@ Tcl_ScanObjCmd(
 			    (Tcl_WideUInt)wideValue);
 		    Tcl_SetStringObj(objPtr, buf, -1);
 		} else {
-		    TclSetIntObj(objPtr, wideValue);
+		    Tcl_SetWideIntObj(objPtr, wideValue);
 		}
-	    } else if (flags & SCAN_BIG) {
-		if (flags & SCAN_UNSIGNED) {
-		    mp_int big;
-		    int code = Tcl_GetBignumFromObj(interp, objPtr, &big);
-
-		    if (code == TCL_OK) {
-			if (mp_isneg(&big)) {
-			    code = TCL_ERROR;
-			}
-			mp_clear(&big);
-		    }
-
-		    if (code == TCL_ERROR) {
-			if (objs != NULL) {
-			    ckfree(objs);
-			}
-			Tcl_DecrRefCount(objPtr);
-			Tcl_SetObjResult(interp, Tcl_NewStringObj(
-				"unsigned bignum scans are invalid", -1));
-			Tcl_SetErrorCode(interp, "TCL", "FORMAT",
-				"BADUNSIGNED",NULL);
-			return TCL_ERROR;
-		    }
-		}
-	    } else {
+	    } else if (!(flags & SCAN_BIG)) {
 		if (TclGetLongFromObj(NULL, objPtr, &value) != TCL_OK) {
 		    if (TclGetString(objPtr)[0] == '-') {
 			value = LONG_MIN;
@@ -974,7 +948,7 @@ Tcl_ScanObjCmd(
 		    sprintf(buf, "%lu", value);	/* INTL: ISO digit */
 		    Tcl_SetStringObj(objPtr, buf, -1);
 		} else {
-		    TclSetIntObj(objPtr, value);
+		    Tcl_SetLongObj(objPtr, value);
 		}
 	    }
 	    objs[objIndex++] = objPtr;
@@ -482,7 +482,7 @@ TclParseNumber(
 {
    enum State {
 	INITIAL, SIGNUM, ZERO, ZERO_X,
-	ZERO_O, ZERO_B, ZERO_D, BINARY,
+	ZERO_O, ZERO_B, BINARY,
 	HEXADECIMAL, OCTAL, BAD_OCTAL, DECIMAL,
 	LEADING_RADIX_POINT, FRACTION,
 	EXPONENT_START, EXPONENT_SIGNUM, EXPONENT,
@@ -664,10 +664,6 @@ TclParseNumber(
 		state = ZERO_O;
 		break;
 	    }
-	    if (c == 'd' || c == 'D') {
-		state = ZERO_D;
-		break;
-	    }
 #ifdef TCL_NO_DEPRECATED
 	    goto decimal;
 #endif
@@ -711,7 +707,7 @@ TclParseNumber(
 				|| (octalSignificandWide >
 					(~(Tcl_WideUInt)0 >> shift)))) {
 			    octalSignificandOverflow = 1;
-			    TclInitBignumFromWideUInt(&octalSignificandBig,
+			    TclBNInitBignumFromWideUInt(&octalSignificandBig,
 				    octalSignificandWide);
 			}
 		    }
@@ -828,7 +824,7 @@ TclParseNumber(
 			    ((size_t)shift >= CHAR_BIT*sizeof(Tcl_WideUInt) ||
 			    significandWide > (~(Tcl_WideUInt)0 >> shift))) {
 			significandOverflow = 1;
-			TclInitBignumFromWideUInt(&significandBig,
+			TclBNInitBignumFromWideUInt(&significandBig,
 				significandWide);
 		    }
 		}
@@ -869,7 +865,7 @@ TclParseNumber(
 			    ((size_t)shift >= CHAR_BIT*sizeof(Tcl_WideUInt) ||
 			    significandWide > (~(Tcl_WideUInt)0 >> shift))) {
 			significandOverflow = 1;
-			TclInitBignumFromWideUInt(&significandBig,
+			TclBNInitBignumFromWideUInt(&significandBig,
 				significandWide);
 		    }
 		}
@@ -884,16 +880,6 @@ TclParseNumber(
 	    state = BINARY;
 	    break;

-	case ZERO_D:
-	    if (c == '0') {
-		numTrailZeros++;
-	    } else if ( ! isdigit(UCHAR(c))) {
-		goto endgame;
-	    }
-	    state = DECIMAL;
-	    flags |= TCL_PARSE_INTEGER_ONLY;
-	    /* FALLTHROUGH */
-
 	case DECIMAL:
 	    /*
 	     * Scanned an optional + or - followed by a string of decimal
@@ -1190,7 +1176,6 @@ TclParseNumber(
 	case ZERO_X:
 	case ZERO_O:
 	case ZERO_B:
-	case ZERO_D:
 	case LEADING_RADIX_POINT:
 	case EXPONENT_START:
 	case EXPONENT_SIGNUM:
@@ -1214,7 +1199,7 @@ TclParseNumber(
 		    ((size_t)shift >= CHAR_BIT*sizeof(Tcl_WideUInt) ||
 		    significandWide > (MOST_BITS + signum) >> shift)) {
 		significandOverflow = 1;
-		TclInitBignumFromWideUInt(&significandBig, significandWide);
+		TclBNInitBignumFromWideUInt(&significandBig, significandWide);
 	    }
 	    if (shift) {
 		if (!significandOverflow) {
@@ -1235,7 +1220,7 @@ TclParseNumber(
 		    ((size_t)shift >= CHAR_BIT*sizeof(Tcl_WideUInt) ||
 		    significandWide > (MOST_BITS + signum) >> shift)) {
 		significandOverflow = 1;
-		TclInitBignumFromWideUInt(&significandBig, significandWide);
+		TclBNInitBignumFromWideUInt(&significandBig, significandWide);
 	    }
 	    if (shift) {
 		if (!significandOverflow) {
@@ -1256,7 +1241,7 @@ TclParseNumber(
 		    ((size_t)shift >= CHAR_BIT*sizeof(Tcl_WideUInt) ||
 		    octalSignificandWide > (MOST_BITS + signum) >> shift)) {
 		octalSignificandOverflow = 1;
-		TclInitBignumFromWideUInt(&octalSignificandBig,
+		TclBNInitBignumFromWideUInt(&octalSignificandBig,
 			octalSignificandWide);
 	    }
 	    if (shift) {
@@ -1268,18 +1253,32 @@ TclParseNumber(
 		}
 	    }
 	    if (!octalSignificandOverflow) {
-		if (octalSignificandWide > (MOST_BITS + signum)) {
-		    TclInitBignumFromWideUInt(&octalSignificandBig,
+		if (octalSignificandWide >
+			(Tcl_WideUInt)(((~(unsigned long)0) >> 1) + signum)) {
+#ifndef TCL_WIDE_INT_IS_LONG
+		    if (octalSignificandWide <= (MOST_BITS + signum)) {
+			objPtr->typePtr = &tclWideIntType;
+			if (signum) {
+			    objPtr->internalRep.wideValue =
+				    - (Tcl_WideInt) octalSignificandWide;
+			} else {
+			    objPtr->internalRep.wideValue =
+				    (Tcl_WideInt) octalSignificandWide;
+			}
+			break;
+		    }
+#endif
+		    TclBNInitBignumFromWideUInt(&octalSignificandBig,
 			    octalSignificandWide);
 		    octalSignificandOverflow = 1;
 		} else {
 		    objPtr->typePtr = &tclIntType;
 		    if (signum) {
-			objPtr->internalRep.wideValue =
-				- (Tcl_WideInt) octalSignificandWide;
+			objPtr->internalRep.longValue =
+				- (long) octalSignificandWide;
 		    } else {
-			objPtr->internalRep.wideValue =
-				(Tcl_WideInt) octalSignificandWide;
+			objPtr->internalRep.longValue =
+				(long) octalSignificandWide;
 		    }
 		}
 	    }
@@ -1297,22 +1296,36 @@ TclParseNumber(
 		    &significandWide, &significandBig, significandOverflow);
 	    if (!significandOverflow && (significandWide > MOST_BITS+signum)){
 		significandOverflow = 1;
-		TclInitBignumFromWideUInt(&significandBig, significandWide);
+		TclBNInitBignumFromWideUInt(&significandBig, significandWide);
 	    }
 	returnInteger:
 	    if (!significandOverflow) {
-		if (significandWide > MOST_BITS+signum) {
-		    TclInitBignumFromWideUInt(&significandBig,
+		if (significandWide >
+			(Tcl_WideUInt)(((~(unsigned long)0) >> 1) + signum)) {
+#ifndef TCL_WIDE_INT_IS_LONG
+		    if (significandWide <= MOST_BITS+signum) {
+			objPtr->typePtr = &tclWideIntType;
+			if (signum) {
+			    objPtr->internalRep.wideValue =
+				    - (Tcl_WideInt) significandWide;
+			} else {
+			    objPtr->internalRep.wideValue =
+				    (Tcl_WideInt) significandWide;
+			}
+			break;
+		    }
+#endif
+		    TclBNInitBignumFromWideUInt(&significandBig,
 			    significandWide);
 		    significandOverflow = 1;
 		} else {
 		    objPtr->typePtr = &tclIntType;
 		    if (signum) {
-			objPtr->internalRep.wideValue =
-				- (Tcl_WideInt) significandWide;
+			objPtr->internalRep.longValue =
+				- (long) significandWide;
 		    } else {
-			objPtr->internalRep.wideValue =
-				(Tcl_WideInt) significandWide;
+			objPtr->internalRep.longValue =
+				(long) significandWide;
 		    }
 		}
 	    }
@@ -1457,7 +1470,7 @@ AccumulateDecimalDigit(
 	     * bignum and fall through into the bignum case.
 	     */

-	    TclInitBignumFromWideUInt(bignumRepPtr, w);
+	    TclBNInitBignumFromWideUInt(bignumRepPtr, w);
 	} else {
 	    /*
 	     * Wide multiplication.
@@ -1600,7 +1613,7 @@ MakeLowPrecisionDouble(
     * call MakeHighPrecisionDouble to do it the hard way.
     */

-    TclInitBignumFromWideUInt(&significandBig, significand);
+    TclBNInitBignumFromWideUInt(&significandBig, significand);
    retval = MakeHighPrecisionDouble(0, &significandBig, numSigDigs,
 	    exponent);
    mp_clear(&significandBig);
@@ -1967,7 +1980,7 @@ RefineApproximation(
 *----------------------------------------------------------------------
 */

-static inline void
+inline static void
 MulPow5(
    mp_int *base, 		/* Number to multiply. */
    unsigned n,			/* Power of 5 to multiply by. */
@@ -2012,7 +2025,7 @@ MulPow5(
 *----------------------------------------------------------------------
 */

-static inline int
+inline static int
 NormalizeRightward(
    Tcl_WideUInt *wPtr)		/* INOUT: Number to shift. */
 {
@@ -2103,7 +2116,7 @@ RequiredPrecision(
 *----------------------------------------------------------------------
 */

-static inline void
+inline static void
 DoubleToExpAndSig(
    double dv,			/* Number to convert. */
    Tcl_WideUInt *significand,	/* OUTPUT: Significand of the number. */
@@ -2151,7 +2164,7 @@ DoubleToExpAndSig(
 *----------------------------------------------------------------------
 */

-static inline void
+inline static void
 TakeAbsoluteValue(
    Double *d,			/* Number to replace with absolute value. */
    int *sign)			/* Place to put the signum. */
@@ -2182,7 +2195,7 @@ TakeAbsoluteValue(
 *----------------------------------------------------------------------
 */

-static inline char *
+inline static char *
 FormatInfAndNaN(
    Double *d,			/* Exceptional number to format. */
    int *decpt,			/* Decimal point to set to a bogus value. */
@@ -2224,7 +2237,7 @@ FormatInfAndNaN(
 *----------------------------------------------------------------------
 */

-static inline char *
+inline static char *
 FormatZero(
    int *decpt,			/* Location of the decimal point. */
    char **endPtr)		/* Pointer to the end of the formatted data */
@@ -2254,7 +2267,7 @@ FormatZero(
 *----------------------------------------------------------------------
 */

-static inline int
+inline static int
 ApproximateLog10(
    Tcl_WideUInt bw,		/* Integer significand of the number. */
    int be,			/* Power of two to scale bw. */
@@ -2302,7 +2315,7 @@ ApproximateLog10(
 *----------------------------------------------------------------------
 */

-static inline int
+inline static int
 BetterLog10(
    double d,			/* Original number to format. */
    int k,			/* Characteristic(Log base 10) of the
@@ -2345,7 +2358,7 @@ BetterLog10(
 *----------------------------------------------------------------------
 */

-static inline void
+inline static void
 ComputeScale(
    int be,			/* Exponent part of number: d = bw * 2**be. */
    int k,			/* Characteristic of log10(number). */
@@ -2408,7 +2421,7 @@ ComputeScale(
 *----------------------------------------------------------------------
 */

-static inline void
+inline static void
 SetPrecisionLimits(
    int convType,		/* Type of conversion: TCL_DD_SHORTEST,
 				 * TCL_DD_STEELE0, TCL_DD_E_FMT,
@@ -2469,7 +2482,7 @@ SetPrecisionLimits(
 *----------------------------------------------------------------------
 */

-static inline char *
+inline static char *
 BumpUp(
    char *s,		    	/* Cursor pointing one past the end of the
 				 * string. */
@@ -2503,7 +2516,7 @@ BumpUp(
 *----------------------------------------------------------------------
 */

-static inline int
+inline static int
 AdjustRange(
    double *dPtr,		/* INOUT: Number to adjust. */
    int k)			/* IN: floor(log10(d)) */
@@ -2576,7 +2589,7 @@ AdjustRange(
 *----------------------------------------------------------------------
 */

-static inline char *
+inline static char *
 ShorteningQuickFormat(
    double d,			/* Number to convert. */
    int k,			/* floor(log10(d)) */
@@ -2651,7 +2664,7 @@ ShorteningQuickFormat(
 *----------------------------------------------------------------------
 */

-static inline char *
+inline static char *
 StrictQuickFormat(
    double d,			/* Number to convert. */
    int k,			/* floor(log10(d)) */
@@ -2725,7 +2738,7 @@ StrictQuickFormat(
 *----------------------------------------------------------------------
 */

-static inline char *
+inline static char *
 QuickConversion(
    double e,			/* Number to format. */
    int k,			/* floor(log10(d)), approximately. */
@@ -2830,7 +2843,7 @@ QuickConversion(
 *----------------------------------------------------------------------
 */

-static inline void
+inline static void
 CastOutPowersOf2(
    int *b2,			/* Power of 2 to multiply the significand. */
    int *m2,			/* Power of 2 to multiply 1/2 ulp. */
@@ -2874,7 +2887,7 @@ CastOutPowersOf2(
 *----------------------------------------------------------------------
 */

-static inline char *
+inline static char *
 ShorteningInt64Conversion(
    Double *dPtr,		/* Original number to convert. */
    int convType,		/* Type of conversion (shortest, Steele,
@@ -3043,7 +3056,7 @@ ShorteningInt64Conversion(
 *----------------------------------------------------------------------
 */

-static inline char *
+inline static char *
 StrictInt64Conversion(
    Double *dPtr,		/* Original number to convert. */
    int convType,		/* Type of conversion (shortest, Steele,
@@ -3149,7 +3162,7 @@ StrictInt64Conversion(
 *----------------------------------------------------------------------
 */

-static inline int
+inline static int
 ShouldBankerRoundUpPowD(
    mp_int *b,			/* Numerator of the fraction. */
    int sd,			/* Denominator is 2**(sd*DIGIT_BIT). */
@@ -3187,7 +3200,7 @@ ShouldBankerRoundUpPowD(
 *----------------------------------------------------------------------
 */

-static inline int
+inline static int
 ShouldBankerRoundUpToNextPowD(
    mp_int *b,			/* Numerator of the fraction. */
    mp_int *m,			/* Numerator of the rounding tolerance. */
@@ -3250,7 +3263,7 @@ ShouldBankerRoundUpToNextPowD(
 *----------------------------------------------------------------------
 */

-static inline char *
+inline static char *
 ShorteningBignumConversionPowD(
    Double *dPtr,		/* Original number to convert. */
    int convType,		/* Type of conversion (shortest, Steele,
@@ -3287,7 +3300,7 @@ ShorteningBignumConversionPowD(
     * mminus = 5**m5
     */

-    TclInitBignumFromWideUInt(&b, bw);
+    TclBNInitBignumFromWideUInt(&b, bw);
    mp_init_set_int(&mminus, 1);
    MulPow5(&b, b5, &b);
    mp_mul_2d(&b, b2, &b);
@@ -3443,7 +3456,7 @@ ShorteningBignumConversionPowD(
 *----------------------------------------------------------------------
 */

-static inline char *
+inline static char *
 StrictBignumConversionPowD(
    Double *dPtr,		/* Original number to convert. */
    int convType,		/* Type of conversion (shortest, Steele,
@@ -3474,7 +3487,7 @@ StrictBignumConversionPowD(
     * b = bw * 2**b2 * 5**b5
     */

-    TclInitBignumFromWideUInt(&b, bw);
+    TclBNInitBignumFromWideUInt(&b, bw);
    MulPow5(&b, b5, &b);
    mp_mul_2d(&b, b2, &b);

@@ -3559,7 +3572,7 @@ StrictBignumConversionPowD(
 *----------------------------------------------------------------------
 */

-static inline int
+inline static int
 ShouldBankerRoundUp(
    mp_int *twor,		/* 2x the remainder from thd division that
 				 * produced the last digit. */
@@ -3594,7 +3607,7 @@ ShouldBankerRoundUp(
 *----------------------------------------------------------------------
 */

-static inline int
+inline static int
 ShouldBankerRoundUpToNext(
    mp_int *b,			/* Remainder from the division that produced
 				 * the last digit. */
@@ -3648,7 +3661,7 @@ ShouldBankerRoundUpToNext(
 *----------------------------------------------------------------------
 */

-static inline char *
+inline static char *
 ShorteningBignumConversion(
    Double *dPtr,		/* Original number being converted. */
    int convType,		/* Conversion type. */
@@ -3682,7 +3695,7 @@ ShorteningBignumConversion(
     * S = 2**s2 * 5*s5
     */

-    TclInitBignumFromWideUInt(&b, bw);
+    TclBNInitBignumFromWideUInt(&b, bw);
    mp_mul_2d(&b, b2, &b);
    mp_init_set_int(&S, 1);
    MulPow5(&S, s5, &S); mp_mul_2d(&S, s2, &S);
@@ -3864,7 +3877,7 @@ ShorteningBignumConversion(
 *----------------------------------------------------------------------
 */

-static inline char *
+inline static char *
 StrictBignumConversion(
    Double *dPtr,		/* Original number being converted. */
    int convType,		/* Conversion type. */
@@ -3895,7 +3908,7 @@ StrictBignumConversion(
     */

    mp_init_multi(&temp, &dig, NULL);
-    TclInitBignumFromWideUInt(&b, bw);
+    TclBNInitBignumFromWideUInt(&b, bw);
    mp_mul_2d(&b, b2, &b);
    mp_init_set_int(&S, 1);
    MulPow5(&S, s5, &S); mp_mul_2d(&S, s2, &S);
@@ -4551,7 +4564,7 @@ Tcl_InitBignumFromDouble(
 	Tcl_WideInt w = (Tcl_WideInt) ldexp(fract, mantBits);
 	int shift = expt - mantBits;

-	TclInitBignumFromWideInt(b, w);
+	TclBNInitBignumFromWideInt(b, w);
 	if (shift < 0) {
 	    mp_div_2d(b, -shift, b, NULL);
 	} else if (shift > 0) {
@@ -4697,7 +4710,7 @@ TclCeil(
    mp_int b;

    mp_init(&b);
-    if (mp_isneg(a)) {
+    if (mp_cmp_d(a, 0) == MP_LT) {
 	mp_neg(a, &b);
 	r = -TclFloor(&b);
    } else {
@@ -4754,7 +4767,7 @@ TclFloor(
    mp_int b;

    mp_init(&b);
-    if (mp_isneg(a)) {
+    if (mp_cmp_d(a, 0) == MP_LT) {
 	mp_neg(a, &b);
 	r = -TclCeil(&b);
    } else {
@@ -86,7 +86,6 @@ typedef struct {
 #define GET_STRING(objPtr) \
    ((String *) (objPtr)->internalRep.twoPtrValue.ptr1)
 #define SET_STRING(objPtr, stringPtr) \
-    ((objPtr)->internalRep.twoPtrValue.ptr2 = NULL),			\
    ((objPtr)->internalRep.twoPtrValue.ptr1 = (void *) (stringPtr))

 /*
@@ -31,7 +31,6 @@
 #undef Tcl_NewIntObj
 #undef Tcl_NewListObj
 #undef Tcl_NewLongObj
-#undef Tcl_DbNewLongObj
 #undef Tcl_NewObj
 #undef Tcl_NewStringObj
 #undef Tcl_DumpActiveMemory
@@ -43,7 +42,6 @@
 #undef TclpGetPid
 #undef TclSockMinimumBuffers
 #undef Tcl_SetIntObj
-#undef Tcl_SetLongObj
 #undef TclpInetNtoa
 #undef TclWinGetServByName
 #undef TclWinGetSockOpt
@@ -51,7 +49,7 @@
 #undef TclWinNToHS

 /* See bug 510001: TclSockMinimumBuffers needs plat imp */
-#if defined(_WIN64) || defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8
+#if defined(_WIN64) || defined(TCL_NO_DEPRECATED)
 #   define TclSockMinimumBuffersOld 0
 #else
 #define TclSockMinimumBuffersOld sockMinimumBuffersOld
@@ -61,31 +59,16 @@ static int TclSockMinimumBuffersOld(int sock, int size)
 }
 #endif

-#if defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8
+#if defined(TCL_NO_DEPRECATED)
 #   define TclSetStartupScriptPath 0
 #   define TclGetStartupScriptPath 0
 #   define TclSetStartupScriptFileName 0
 #   define TclGetStartupScriptFileName 0
-#   define TclPrecTraceProc 0
 #   define TclpInetNtoa 0
 #   define TclWinGetServByName 0
 #   define TclWinGetSockOpt 0
 #   define TclWinSetSockOpt 0
 #   define TclWinNToHS 0
-#   define TclWinGetPlatformId 0
-#   define TclWinResetInterfaces 0
-#   define TclWinSetInterfaces 0
-#   define TclWinGetPlatformId 0
-#   define TclBNInitBignumFromWideUInt 0
-#   define TclBNInitBignumFromWideInt 0
-#   define TclBNInitBignumFromLong 0
-#   define Tcl_Backslash 0
-#   define Tcl_GetDefaultEncodingDir 0
-#   define Tcl_SetDefaultEncodingDir 0
-#   define Tcl_EvalTokens 0
-#   define Tcl_CreateMathFunc 0
-#   define Tcl_GetMathFuncInfo 0
-#   define Tcl_ListMathFuncs 0
 #else
 #define TclSetStartupScriptPath setStartupScriptPath
 static void TclSetStartupScriptPath(Tcl_Obj *path)
@@ -112,32 +95,14 @@ static const char *TclGetStartupScriptFileName(void)
    }
    return Tcl_GetString(path);
 }
+
 #if defined(_WIN32) || defined(__CYGWIN__)
 #undef TclWinNToHS
-#undef TclWinGetPlatformId
-#undef TclWinResetInterfaces
-#undef TclWinSetInterfaces
-static void
-doNothing(void)
-{
-    /* dummy implementation, no need to do anything */
-}
 #define TclWinNToHS winNToHS
 static unsigned short TclWinNToHS(unsigned short ns) {
 	return ntohs(ns);
 }
-#define TclWinGetPlatformId winGetPlatformId
-static int
-TclWinGetPlatformId(void)
-{
-    return 2; /* VER_PLATFORM_WIN32_NT */;
-}
-#define TclWinResetInterfaces doNothing
-#define TclWinSetInterfaces (void (*) (int)) doNothing
 #endif
-#   define TclBNInitBignumFromWideUInt TclInitBignumFromWideUInt
-#   define TclBNInitBignumFromWideInt TclInitBignumFromWideInt
-#   define TclBNInitBignumFromLong TclInitBignumFromLong
 #endif /* TCL_NO_DEPRECATED */

 #ifdef _WIN32
@@ -148,15 +113,12 @@ TclWinGetPlatformId(void)
 #   define TclpIsAtty 0
 #elif defined(__CYGWIN__)
 #   define TclpIsAtty TclPlatIsAtty
-#if defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8
-static void
-doNothing(void)
-{
-    /* dummy implementation, no need to do anything */
-}
-#endif
+#   define TclWinSetInterfaces (void (*) (int)) doNothing
 #   define TclWinAddProcess (void (*) (void *, unsigned int)) doNothing
 #   define TclWinFlushDirtyChannels doNothing
+#   define TclWinResetInterfaces doNothing
+
+static Tcl_Encoding winTCharEncoding;

 static int
 TclpIsAtty(int fd)
@@ -164,15 +126,24 @@ TclpIsAtty(int fd)
    return isatty(fd);
 }

+#define TclWinGetPlatformId winGetPlatformId
+static int
+TclWinGetPlatformId()
+{
+    /* Don't bother to determine the real platform on cygwin,
+     * because VER_PLATFORM_WIN32_NT is the only supported platform */
+    return 2; /* VER_PLATFORM_WIN32_NT */;
+}
+
 void *TclWinGetTclInstance()
 {
    void *hInstance = NULL;
    GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
-	    (const char *)&TclpIsAtty, &hInstance);
+	    (const char *)&winTCharEncoding, &hInstance);
    return hInstance;
 }

-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 #define TclWinSetSockOpt winSetSockOpt
 static int
 TclWinSetSockOpt(SOCKET s, int level, int optname,
@@ -217,23 +188,23 @@ TclpGetPid(Tcl_Pid pid)
    return (int) (size_t) pid;
 }

+static void
+doNothing(void)
+{
+    /* dummy implementation, no need to do anything */
+}
+
 char *
 Tcl_WinUtfToTChar(
    const char *string,
    int len,
    Tcl_DString *dsPtr)
 {
-    WCHAR *wp;
-    int size = MultiByteToWideChar(CP_UTF8, 0, string, len, 0, 0);
-
-    Tcl_DStringInit(dsPtr);
-    Tcl_DStringSetLength(dsPtr, 2*size+2);
-    wp = (WCHAR *)Tcl_DStringValue(dsPtr);
-    MultiByteToWideChar(CP_UTF8, 0, string, len, wp, size+1);
-    if (len == -1) --size; /* account for 0-byte at string end */
-    Tcl_DStringSetLength(dsPtr, 2*size);
-    wp[size] = 0;
-    return (char *)wp;
+    if (!winTCharEncoding) {
+	winTCharEncoding = Tcl_GetEncoding(0, "unicode");
+    }
+    return Tcl_UtfToExternalDString(winTCharEncoding,
+	    string, len, dsPtr);
 }

 char *
@@ -242,21 +213,11 @@ Tcl_WinTCharToUtf(
    int len,
    Tcl_DString *dsPtr)
 {
-    char *p;
-    int size;
-
-    if (len > 0) {
-	len /= 2;
+    if (!winTCharEncoding) {
+	winTCharEncoding = Tcl_GetEncoding(0, "unicode");
    }
-    size = WideCharToMultiByte(CP_UTF8, 0, string, len, 0, 0, NULL, NULL);
-    Tcl_DStringInit(dsPtr);
-    Tcl_DStringSetLength(dsPtr, size+1);
-    p = (char *)Tcl_DStringValue(dsPtr);
-    WideCharToMultiByte(CP_UTF8, 0, string, len, p, size, NULL, NULL);
-    if (len == -1) --size; /* account for 0-byte at string end */
-    Tcl_DStringSetLength(dsPtr, size);
-    p[size] = 0;
-    return p;
+    return Tcl_ExternalToUtfDString(winTCharEncoding,
+	    string, len, dsPtr);
 }

 #if defined(TCL_WIDE_INT_IS_LONG)
@@ -265,6 +226,28 @@ Tcl_WinTCharToUtf(
 * signature. Tcl 9 must find a better solution, but that cannot be done
 * without introducing a binary incompatibility.
 */
+#define Tcl_DbNewLongObj ((Tcl_Obj*(*)(long,const char*,int))dbNewLongObj)
+static Tcl_Obj *dbNewLongObj(
+    int intValue,
+    const char *file,
+    int line
+) {
+#ifdef TCL_MEM_DEBUG
+    register Tcl_Obj *objPtr;
+
+    TclDbNewObj(objPtr, file, line);
+    objPtr->bytes = NULL;
+
+    objPtr->internalRep.longValue = (long) intValue;
+    objPtr->typePtr = &tclIntType;
+    return objPtr;
+#else
+    return Tcl_NewIntObj(intValue);
+#endif
+}
+#define Tcl_GetLongFromObj (int(*)(Tcl_Interp*,Tcl_Obj*,long*))Tcl_GetIntFromObj
+#define Tcl_NewLongObj (Tcl_Obj*(*)(long))Tcl_NewIntObj
+#define Tcl_SetLongObj (void(*)(Tcl_Obj*,long))Tcl_SetIntObj
 static int exprInt(Tcl_Interp *interp, const char *expr, int *ptr){
    long longValue;
    int result = Tcl_ExprLong(interp, expr, &longValue);
@@ -313,12 +296,16 @@ static int uniCharNcasecmp(const Tcl_UniChar *ucs, const Tcl_UniChar *uct, unsig
   return Tcl_UniCharNcasecmp(ucs, uct, (unsigned long)n);
 }
 #define Tcl_UniCharNcasecmp (int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned long))uniCharNcasecmp
+static int formatInt(char *buffer, int n){
+   return TclFormatInt(buffer, (long)n);
+}
+#define TclFormatInt (int(*)(char *, long))formatInt

 #endif /* TCL_WIDE_INT_IS_LONG */

 #endif /* __CYGWIN__ */

-#if defined(TCL_NO_DEPRECATED)
+#ifdef TCL_NO_DEPRECATED
 #   define Tcl_SeekOld 0
 #   define Tcl_TellOld 0
 #   undef Tcl_SetBooleanObj
@@ -373,26 +360,6 @@ static int uniCharNcasecmp(const Tcl_UniChar *ucs, const Tcl_UniChar *uct, unsig
 #   define TclBackgroundException 0
 #   undef TclpReaddir
 #   define TclpReaddir 0
-#   define TclSetStartupScript 0
-#   define TclGetStartupScript 0
-#   define TclCreateNamespace 0
-#   define TclDeleteNamespace 0
-#   define TclAppendExportList 0
-#   define TclExport 0
-#   define TclImport 0
-#   define TclForgetImport 0
-#   define TclGetCurrentNamespace_ 0
-#   define TclGetGlobalNamespace_ 0
-#   define TclFindNamespace 0
-#   define TclFindCommand 0
-#   define TclGetCommandFromObj 0
-#   define TclGetCommandFullName 0
-#   define TclCopyChannelOld 0
-#   define Tcl_AppendResultVA 0
-#   define Tcl_AppendStringsToObjVA 0
-#   define Tcl_SetErrorCodeVA 0
-#   define Tcl_PanicVA 0
-#   define Tcl_VarEvalVA 0
 #   undef TclpGetDate
 #   define TclpGetDate 0
 #   undef TclpLocaltime
@@ -405,20 +372,6 @@ static int uniCharNcasecmp(const Tcl_UniChar *ucs, const Tcl_UniChar *uct, unsig
 #   define Tcl_SeekOld seekOld
 #   define Tcl_TellOld tellOld
 #   define TclBackgroundException Tcl_BackgroundException
-#   define TclSetStartupScript Tcl_SetStartupScript
-#   define TclGetStartupScript Tcl_GetStartupScript
-#   define TclCreateNamespace Tcl_CreateNamespace
-#   define TclDeleteNamespace Tcl_DeleteNamespace
-#   define TclAppendExportList Tcl_AppendExportList
-#   define TclExport Tcl_Export
-#   define TclImport Tcl_Import
-#   define TclForgetImport Tcl_ForgetImport
-#   define TclGetCurrentNamespace_ Tcl_GetCurrentNamespace
-#   define TclGetGlobalNamespace_ Tcl_GetGlobalNamespace
-#   define TclFindNamespace Tcl_FindNamespace
-#   define TclFindCommand Tcl_FindCommand
-#   define TclGetCommandFromObj Tcl_GetCommandFromObj
-#   define TclGetCommandFullName Tcl_GetCommandFullName
 #   define TclpLocaltime_unix TclpLocaltime
 #   define TclpGmtime_unix TclpGmtime

@@ -571,22 +524,22 @@ static const TclIntStubs tclIntStubs = {
    TclUpdateReturnInfo, /* 109 */
    TclSockMinimumBuffers, /* 110 */
    Tcl_AddInterpResolvers, /* 111 */
-    TclAppendExportList, /* 112 */
-    TclCreateNamespace, /* 113 */
-    TclDeleteNamespace, /* 114 */
-    TclExport, /* 115 */
-    TclFindCommand, /* 116 */
-    TclFindNamespace, /* 117 */
+    Tcl_AppendExportList, /* 112 */
+    Tcl_CreateNamespace, /* 113 */
+    Tcl_DeleteNamespace, /* 114 */
+    Tcl_Export, /* 115 */
+    Tcl_FindCommand, /* 116 */
+    Tcl_FindNamespace, /* 117 */
    Tcl_GetInterpResolvers, /* 118 */
    Tcl_GetNamespaceResolvers, /* 119 */
    Tcl_FindNamespaceVar, /* 120 */
-    TclForgetImport, /* 121 */
-    TclGetCommandFromObj, /* 122 */
-    TclGetCommandFullName, /* 123 */
-    TclGetCurrentNamespace_, /* 124 */
-    TclGetGlobalNamespace_, /* 125 */
+    Tcl_ForgetImport, /* 121 */
+    Tcl_GetCommandFromObj, /* 122 */
+    Tcl_GetCommandFullName, /* 123 */
+    Tcl_GetCurrentNamespace, /* 124 */
+    Tcl_GetGlobalNamespace, /* 125 */
    Tcl_GetVariableFullName, /* 126 */
-    TclImport, /* 127 */
+    Tcl_Import, /* 127 */
    Tcl_PopCallFrame, /* 128 */
    Tcl_PushCallFrame, /* 129 */
    Tcl_RemoveInterpResolvers, /* 130 */
@@ -637,8 +590,8 @@ static const TclIntStubs tclIntStubs = {
    TclCallVarTraces, /* 175 */
    TclCleanupVar, /* 176 */
    TclVarErrMsg, /* 177 */
-    TclSetStartupScript, /* 178 */
-    TclGetStartupScript, /* 179 */
+    Tcl_SetStartupScript, /* 178 */
+    Tcl_GetStartupScript, /* 179 */
    0, /* 180 */
    0, /* 181 */
    TclpLocaltime, /* 182 */
@@ -906,10 +859,6 @@ const TclTomMathStubs tclTomMathStubs = {
    TclBNInitBignumFromWideInt, /* 65 */
    TclBNInitBignumFromWideUInt, /* 66 */
    TclBN_mp_expt_d_ex, /* 67 */
-    TclBN_mp_set_long_long, /* 68 */
-    TclBN_mp_get_long_long, /* 69 */
-    TclBN_mp_set_long, /* 70 */
-    TclBN_mp_get_long, /* 71 */
 };

 static const TclStubHooks tclStubHooks = {
@@ -227,9 +227,6 @@ static int		TestasyncCmd(ClientData dummy,
 static int		TestbytestringObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
-static int		TeststringbytesObjCmd(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,
@@ -305,6 +302,14 @@ static int		TestlinkCmd(ClientData dummy,
 static int		TestlocaleCmd(ClientData dummy,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
+#ifndef TCL_NO_DEPRECATED
+static int		TestMathFunc(ClientData clientData,
+			    Tcl_Interp *interp, Tcl_Value *args,
+			    Tcl_Value *resultPtr);
+static int		TestMathFunc2(ClientData clientData,
+			    Tcl_Interp *interp, Tcl_Value *args,
+			    Tcl_Value *resultPtr);
+#endif /* TCL_NO_DEPRECATED */
 static int		TestmainthreadCmd(ClientData dummy,
 			    Tcl_Interp *interp, int argc, const char **argv);
 static int		TestsetmainloopCmd(ClientData dummy,
@@ -416,12 +421,6 @@ static Tcl_FSMatchInDirectoryProc SimpleMatchInDirectory;
 static int		TestNumUtfCharsCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
-static int		TestFindFirstCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		TestFindLastCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
 static int		TestHashSystemHashCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
@@ -547,6 +546,10 @@ int
 Tcltest_Init(
    Tcl_Interp *interp)		/* Interpreter for application. */
 {
+#ifndef TCL_NO_DEPRECATED
+    Tcl_ValueType t3ArgTypes[2];
+#endif /* TCL_NO_DEPRECATED */
+
    Tcl_Obj *listPtr;
    Tcl_Obj **objv;
    int objc, index;
@@ -578,7 +581,6 @@ Tcltest_Init(
    Tcl_CreateCommand(interp, "noop", NoopCmd, NULL, NULL);
    Tcl_CreateObjCommand(interp, "noop", NoopObjCmd, NULL, NULL);
    Tcl_CreateObjCommand(interp, "testbytestring", TestbytestringObjCmd, NULL, NULL);
-    Tcl_CreateObjCommand(interp, "teststringbytes", TeststringbytesObjCmd, NULL, NULL);
    Tcl_CreateObjCommand(interp, "testwrongnumargs", TestWrongNumArgsObjCmd,
 	    NULL, NULL);
    Tcl_CreateObjCommand(interp, "testfilesystem", TestFilesystemObjCmd,
@@ -686,10 +688,6 @@ Tcltest_Init(
 	    TestsetobjerrorcodeCmd, NULL, NULL);
    Tcl_CreateObjCommand(interp, "testnumutfchars",
 	    TestNumUtfCharsCmd, NULL, NULL);
-    Tcl_CreateObjCommand(interp, "testfindfirst",
-	    TestFindFirstCmd, NULL, NULL);
-    Tcl_CreateObjCommand(interp, "testfindlast",
-	    TestFindLastCmd, NULL, NULL);
    Tcl_CreateCommand(interp, "testsetplatform", TestsetplatformCmd,
 	    NULL, NULL);
    Tcl_CreateCommand(interp, "testsocket", TestSocketCmd,
@@ -699,6 +697,10 @@ Tcltest_Init(
    Tcl_CreateCommand(interp, "testtranslatefilename",
 	    TesttranslatefilenameCmd, NULL, NULL);
    Tcl_CreateCommand(interp, "testupvar", TestupvarCmd, NULL, NULL);
+#ifndef TCL_NO_DEPRECATED
+    Tcl_CreateMathFunc(interp, "T1", 0, NULL, TestMathFunc, (ClientData) 123);
+    Tcl_CreateMathFunc(interp, "T2", 0, NULL, TestMathFunc, (ClientData) 345);
+#endif /* TCL_NO_DEPRECATED */
    Tcl_CreateCommand(interp, "testmainthread", TestmainthreadCmd, NULL,
 	    NULL);
    Tcl_CreateCommand(interp, "testsetmainloop", TestsetmainloopCmd,
@@ -709,6 +711,13 @@ Tcltest_Init(
    Tcl_CreateObjCommand(interp, "testcpuid", TestcpuidCmd,
 	    (ClientData) 0, NULL);
 #endif
+#ifndef TCL_NO_DEPRECATED
+    t3ArgTypes[0] = TCL_EITHER;
+    t3ArgTypes[1] = TCL_EITHER;
+    Tcl_CreateMathFunc(interp, "T3", 2, t3ArgTypes, TestMathFunc2,
+	    NULL);
+#endif /* TCL_NO_DEPRECATED */
+
    Tcl_CreateObjCommand(interp, "testnreunwind", TestNREUnwind,
 	    NULL, NULL);
    Tcl_CreateObjCommand(interp, "testnrelevels", TestNRELevels,
@@ -1976,12 +1985,9 @@ TestencodingObjCmd(
 	if (objc != 3) {
 	    return TCL_ERROR;
 	}
-	if (TCL_OK != Tcl_GetEncodingFromObj(interp, objv[2], &encoding)) {
-	    return TCL_ERROR;
-	}
-	Tcl_FreeEncoding(encoding);	/* Free returned reference */
-	Tcl_FreeEncoding(encoding);	/* Free to match CREATE */
-	TclFreeIntRep(objv[2]);		/* Free the cached ref */
+	encoding = Tcl_GetEncoding(NULL, Tcl_GetString(objv[2]));
+	Tcl_FreeEncoding(encoding);
+	Tcl_FreeEncoding(encoding);
 	break;
    }
    return TCL_OK;
@@ -3331,6 +3337,146 @@ TestlocaleCmd(
    return TCL_OK;
 }

+/*
+ *----------------------------------------------------------------------
+ *
+ * TestMathFunc --
+ *
+ *	This is a user-defined math procedure to test out math procedures
+ *	with no arguments.
+ *
+ * Results:
+ *	A normal Tcl completion code.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+	/* ARGSUSED */
+#ifndef TCL_NO_DEPRECATED
+static int
+TestMathFunc(
+    ClientData clientData,	/* Integer value to return. */
+    Tcl_Interp *interp,		/* Not used. */
+    Tcl_Value *args,		/* Not used. */
+    Tcl_Value *resultPtr)	/* Where to store result. */
+{
+    resultPtr->type = TCL_INT;
+    resultPtr->intValue = PTR2INT(clientData);
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TestMathFunc2 --
+ *
+ *	This is a user-defined math procedure to test out math procedures
+ *	that do have arguments, in this case 2.
+ *
+ * Results:
+ *	A normal Tcl completion code.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+	/* ARGSUSED */
+static int
+TestMathFunc2(
+    ClientData clientData,	/* Integer value to return. */
+    Tcl_Interp *interp,		/* Used to report errors. */
+    Tcl_Value *args,		/* Points to an array of two Tcl_Value structs
+				 * for the two arguments. */
+    Tcl_Value *resultPtr)	/* Where to store the result. */
+{
+    int result = TCL_OK;
+
+    /*
+     * Return the maximum of the two arguments with the correct type.
+     */
+
+    if (args[0].type == TCL_INT) {
+	int i0 = args[0].intValue;
+
+	if (args[1].type == TCL_INT) {
+	    int i1 = args[1].intValue;
+
+	    resultPtr->type = TCL_INT;
+	    resultPtr->intValue = ((i0 > i1)? i0 : i1);
+	} else if (args[1].type == TCL_DOUBLE) {
+	    double d0 = i0;
+	    double d1 = args[1].doubleValue;
+
+	    resultPtr->type = TCL_DOUBLE;
+	    resultPtr->doubleValue = ((d0 > d1)? d0 : d1);
+	} else if (args[1].type == TCL_WIDE_INT) {
+	    Tcl_WideInt w0 = Tcl_LongAsWide(i0);
+	    Tcl_WideInt w1 = args[1].wideValue;
+
+	    resultPtr->type = TCL_WIDE_INT;
+	    resultPtr->wideValue = ((w0 > w1)? w0 : w1);
+	} else {
+	    Tcl_AppendResult(interp, "T3: wrong type for arg 2", NULL);
+	    result = TCL_ERROR;
+	}
+    } else if (args[0].type == TCL_DOUBLE) {
+	double d0 = args[0].doubleValue;
+
+	if (args[1].type == TCL_INT) {
+	    double d1 = args[1].intValue;
+
+	    resultPtr->type = TCL_DOUBLE;
+	    resultPtr->doubleValue = ((d0 > d1)? d0 : d1);
+	} else if (args[1].type == TCL_DOUBLE) {
+	    double d1 = args[1].doubleValue;
+
+	    resultPtr->type = TCL_DOUBLE;
+	    resultPtr->doubleValue = ((d0 > d1)? d0 : d1);
+	} else if (args[1].type == TCL_WIDE_INT) {
+	    double d1 = Tcl_WideAsDouble(args[1].wideValue);
+
+	    resultPtr->type = TCL_DOUBLE;
+	    resultPtr->doubleValue = ((d0 > d1)? d0 : d1);
+	} else {
+	    Tcl_AppendResult(interp, "T3: wrong type for arg 2", NULL);
+	    result = TCL_ERROR;
+	}
+    } else if (args[0].type == TCL_WIDE_INT) {
+	Tcl_WideInt w0 = args[0].wideValue;
+
+	if (args[1].type == TCL_INT) {
+	    Tcl_WideInt w1 = Tcl_LongAsWide(args[1].intValue);
+
+	    resultPtr->type = TCL_WIDE_INT;
+	    resultPtr->wideValue = ((w0 > w1)? w0 : w1);
+	} else if (args[1].type == TCL_DOUBLE) {
+	    double d0 = Tcl_WideAsDouble(w0);
+	    double d1 = args[1].doubleValue;
+
+	    resultPtr->type = TCL_DOUBLE;
+	    resultPtr->doubleValue = ((d0 > d1)? d0 : d1);
+	} else if (args[1].type == TCL_WIDE_INT) {
+	    Tcl_WideInt w1 = args[1].wideValue;
+
+	    resultPtr->type = TCL_WIDE_INT;
+	    resultPtr->wideValue = ((w0 > w1)? w0 : w1);
+	} else {
+	    Tcl_AppendResult(interp, "T3: wrong type for arg 2", NULL);
+	    result = TCL_ERROR;
+	}
+    } else {
+	Tcl_AppendResult(interp, "T3: wrong type for arg 1", NULL);
+	result = TCL_ERROR;
+    }
+    return result;
+}
+#endif /* TCL_NO_DEPRECATED */
+
 /*
 *----------------------------------------------------------------------
 *
@@ -4897,40 +5043,6 @@ NoopObjCmd(
    return TCL_OK;
 }

-/*
- *----------------------------------------------------------------------
- *
- * TeststringbytesObjCmd --
- *	Returns bytearray value of the bytes in argument string rep
- *
- * Results:
- *	Returns the TCL_OK result code.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TeststringbytesObjCmd(
-    ClientData unused,		/* Not used. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* The argument objects. */
-{
-    int n;
-    const unsigned char *p;
-
-    if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "value");
-	return TCL_ERROR;
-    }
-    p = (const unsigned char *)Tcl_GetStringFromObj(objv[1], &n);
-    Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(p, n));
-    return TCL_OK;
-}
-
 /*
 *----------------------------------------------------------------------
 *
@@ -5207,7 +5319,7 @@ TestmainthreadCmd(
    const char **argv)		/* Argument strings. */
 {
    if (argc == 1) {
-	Tcl_Obj *idObj = Tcl_NewWideIntObj((Tcl_WideInt)(size_t)Tcl_GetCurrentThread());
+	Tcl_Obj *idObj = Tcl_NewLongObj((long)(size_t)Tcl_GetCurrentThread());

 	Tcl_SetObjResult(interp, idObj);
 	return TCL_OK;
@@ -5604,8 +5716,8 @@ TestChannelCmd(
 	    return TCL_ERROR;
 	}

-	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(
-		(Tcl_WideInt) (size_t) Tcl_GetChannelThread(chan)));
+	TclFormatInt(buf, (size_t) Tcl_GetChannelThread(chan));
+	Tcl_AppendResult(interp, buf, NULL);
 	return TCL_OK;
    }

@@ -6732,50 +6844,6 @@ TestNumUtfCharsCmd(
    return TCL_OK;
 }

-/*
- * Used to check correct operation of Tcl_UtfFindFirst
- */
-
-static int
-TestFindFirstCmd(
-    ClientData clientData,
-    Tcl_Interp *interp,
-    int objc,
-    Tcl_Obj *const objv[])
-{
-    if (objc > 1) {
-	int len = -1;
-
-	if (objc > 2) {
-	    (void) Tcl_GetIntFromObj(interp, objv[2], &len);
-	}
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_UtfFindFirst(Tcl_GetString(objv[1]), len), -1));
-    }
-    return TCL_OK;
-}
-
-/*
- * Used to check correct operation of Tcl_UtfFindLast
- */
-
-static int
-TestFindLastCmd(
-    ClientData clientData,
-    Tcl_Interp *interp,
-    int objc,
-    Tcl_Obj *const objv[])
-{
-    if (objc > 1) {
-	int len = -1;
-
-	if (objc > 2) {
-	    (void) Tcl_GetIntFromObj(interp, objv[2], &len);
-	}
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_UtfFindLast(Tcl_GetString(objv[1]), len), -1));
-    }
-    return TCL_OK;
-}
-
 #if defined(HAVE_CPUID) || defined(_WIN32)
 /*
 *----------------------------------------------------------------------
@@ -1088,9 +1088,6 @@ TestobjCmd(
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj("none", -1));
 	} else {
 	    typeName = objv[2]->typePtr->name;
-#ifndef TCL_WIDE_INT_IS_LONG
-	    if (!strcmp(typeName, "wideInt")) typeName = "int";
-#endif
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(typeName, -1));
 	}
    } else if (strcmp(subCmd, "refcount") == 0) {
@@ -1118,11 +1115,6 @@ TestobjCmd(
 	}
 	if (varPtr[varIndex]->typePtr == NULL) { /* a string! */
 	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "string", -1);
-#ifndef TCL_WIDE_INT_IS_LONG
-	} else if (!strcmp(varPtr[varIndex]->typePtr->name, "wideInt")) {
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    "int", -1);
-#endif
 	} else {
 	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
 		    varPtr[varIndex]->typePtr->name, -1);
@@ -248,7 +248,7 @@ ThreadObjCmd(

    switch ((enum options)option) {
    case THREAD_CANCEL: {
-	Tcl_WideInt id;
+	long id;
 	const char *result;
 	int flags, arg;

@@ -264,7 +264,7 @@ ThreadObjCmd(
 		arg++;
 	    }
 	}
-	if (Tcl_GetWideIntFromObj(interp, objv[arg], &id) != TCL_OK) {
+	if (Tcl_GetLongFromObj(interp, objv[arg], &id) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	arg++;
@@ -819,6 +819,9 @@ Tcl_AfterObjCmd(
     */

    if (objv[1]->typePtr == &tclIntType
+#ifndef TCL_WIDE_INT_IS_LONG
+	    || objv[1]->typePtr == &tclWideIntType
+#endif
 	    || objv[1]->typePtr == &tclBignumType
 	    || (Tcl_GetIndexFromObj(NULL, objv[1], afterSubCmds, "", 0,
 		    &index) != TCL_OK)) {
@@ -1042,27 +1045,37 @@ AfterDelay(
 	if (iPtr->limit.timeEvent == NULL
 		|| TCL_TIME_BEFORE(endTime, iPtr->limit.time)) {
 	    diff = TCL_TIME_DIFF_MS_CEILING(endTime, now);
+#ifndef TCL_WIDE_INT_IS_LONG
+	    if (diff > LONG_MAX) {
+		diff = LONG_MAX;
+	    }
+#endif
 	    if (diff > TCL_TIME_MAXIMUM_SLICE) {
 		diff = TCL_TIME_MAXIMUM_SLICE;
 	    }
-	    if (diff == 0 && TCL_TIME_BEFORE(now, endTime)) {
-		diff = 1;
-	    }
+            if (diff == 0 && TCL_TIME_BEFORE(now, endTime)) {
+                diff = 1;
+            }
 	    if (diff > 0) {
-		Tcl_Sleep((int) diff);
-		if (diff < SLEEP_OFFLOAD_GETTIMEOFDAY) {
-		    break;
-		}
+		Tcl_Sleep((long) diff);
+                if (diff < SLEEP_OFFLOAD_GETTIMEOFDAY) {
+                    break;
+                }
 	    } else {
-		break;
-	    }
+                break;
+            }
 	} else {
 	    diff = TCL_TIME_DIFF_MS(iPtr->limit.time, now);
+#ifndef TCL_WIDE_INT_IS_LONG
+	    if (diff > LONG_MAX) {
+		diff = LONG_MAX;
+	    }
+#endif
 	    if (diff > TCL_TIME_MAXIMUM_SLICE) {
 		diff = TCL_TIME_MAXIMUM_SLICE;
 	    }
 	    if (diff > 0) {
-		Tcl_Sleep((int) diff);
+		Tcl_Sleep((long) diff);
 	    }
 	    if (Tcl_AsyncReady()) {
 		if (Tcl_AsyncInvoke(interp, TCL_OK) != TCL_OK) {
@@ -1076,7 +1089,7 @@ AfterDelay(
 		return TCL_ERROR;
 	    }
 	}
-	Tcl_GetTime(&now);
+        Tcl_GetTime(&now);
    } while (TCL_TIME_BEFORE(now, endTime));
    return TCL_OK;
 }
@@ -30,13 +30,13 @@ declare 1 {
 }

 declare 2 {
-    int TclBN_mp_add(const mp_int *a, const mp_int *b, mp_int *c)
+    int TclBN_mp_add(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 3 {
-    int TclBN_mp_add_d(const mp_int *a, mp_digit b, mp_int *c)
+    int TclBN_mp_add_d(mp_int *a, mp_digit b, mp_int *c)
 }
 declare 4 {
-    int TclBN_mp_and(const mp_int *a, const mp_int *b, mp_int *c)
+    int TclBN_mp_and(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 5 {
    void TclBN_mp_clamp(mp_int *a)
@@ -63,25 +63,25 @@ declare 12 {
    int TclBN_mp_count_bits(const mp_int *a)
 }
 declare 13 {
-    int TclBN_mp_div(const mp_int *a, const mp_int *b, mp_int *q, mp_int *r)
+    int TclBN_mp_div(mp_int *a, mp_int *b, mp_int *q, mp_int *r)
 }
 declare 14 {
-    int TclBN_mp_div_d(const mp_int *a, mp_digit b, mp_int *q, mp_digit *r)
+    int TclBN_mp_div_d(mp_int *a, mp_digit b, mp_int *q, mp_digit *r)
 }
 declare 15 {
-    int TclBN_mp_div_2(const mp_int *a, mp_int *q)
+    int TclBN_mp_div_2(mp_int *a, mp_int *q)
 }
 declare 16 {
    int TclBN_mp_div_2d(const mp_int *a, int b, mp_int *q, mp_int *r)
 }
 declare 17 {
-    int TclBN_mp_div_3(const mp_int *a, mp_int *q, mp_digit *r)
+    int TclBN_mp_div_3(mp_int *a, mp_int *q, mp_digit *r)
 }
 declare 18 {
    void TclBN_mp_exch(mp_int *a, mp_int *b)
 }
 declare 19 {
-    int TclBN_mp_expt_d(const mp_int *a, mp_digit b, mp_int *c)
+    int TclBN_mp_expt_d(mp_int *a, mp_digit b, mp_int *c)
 }
 declare 20 {
    int TclBN_mp_grow(mp_int *a, int size)
@@ -105,19 +105,19 @@ declare 26 {
    int TclBN_mp_lshd(mp_int *a, int shift)
 }
 declare 27 {
-    int TclBN_mp_mod(const mp_int *a, const mp_int *b, mp_int *r)
+    int TclBN_mp_mod(mp_int *a, mp_int *b, mp_int *r)
 }
 declare 28 {
    int TclBN_mp_mod_2d(const mp_int *a, int b, mp_int *r)
 }
 declare 29 {
-    int TclBN_mp_mul(const mp_int *a, const mp_int *b, mp_int *p)
+    int TclBN_mp_mul(mp_int *a, mp_int *b, mp_int *p)
 }
 declare 30 {
-    int TclBN_mp_mul_d(const mp_int *a, mp_digit b, mp_int *p)
+    int TclBN_mp_mul_d(mp_int *a, mp_digit b, mp_int *p)
 }
 declare 31 {
-    int TclBN_mp_mul_2(const mp_int *a, mp_int *p)
+    int TclBN_mp_mul_2(mp_int *a, mp_int *p)
 }
 declare 32 {
    int TclBN_mp_mul_2d(const mp_int *a, int d, mp_int *p)
@@ -126,7 +126,7 @@ declare 33 {
    int TclBN_mp_neg(const mp_int *a, mp_int *b)
 }
 declare 34 {
-    int TclBN_mp_or(const mp_int *a, const mp_int *b, mp_int *c)
+    int TclBN_mp_or(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 35 {
    int TclBN_mp_radix_size(const mp_int *a, int radix, int *size)
@@ -144,32 +144,32 @@ declare 39 {
    void TclBN_mp_set(mp_int *a, mp_digit b)
 }
 declare 40 {
-    int TclBN_mp_sqr(const mp_int *a, mp_int *b)
+    int TclBN_mp_sqr(mp_int *a, mp_int *b)
 }
 declare 41 {
-    int TclBN_mp_sqrt(const mp_int *a, mp_int *b)
+    int TclBN_mp_sqrt(mp_int *a, mp_int *b)
 }
 declare 42 {
-    int TclBN_mp_sub(const mp_int *a, const mp_int *b, mp_int *c)
+    int TclBN_mp_sub(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 43 {
-    int TclBN_mp_sub_d(const mp_int *a, mp_digit b, mp_int *c)
+    int TclBN_mp_sub_d(mp_int *a, mp_digit b, mp_int *c)
 }
 declare 44 {
-    int TclBN_mp_to_unsigned_bin(const mp_int *a, unsigned char *b)
+    int TclBN_mp_to_unsigned_bin(mp_int *a, unsigned char *b)
 }
 declare 45 {
-    int TclBN_mp_to_unsigned_bin_n(const mp_int *a, unsigned char *b,
+    int TclBN_mp_to_unsigned_bin_n(mp_int *a, unsigned char *b,
 	    unsigned long *outlen)
 }
 declare 46 {
-    int TclBN_mp_toradix_n(const mp_int *a, char *str, int radix, int maxlen)
+    int TclBN_mp_toradix_n(mp_int *a, char *str, int radix, int maxlen)
 }
 declare 47 {
-    int TclBN_mp_unsigned_bin_size(const mp_int *a)
+    int TclBN_mp_unsigned_bin_size(mp_int *a)
 }
 declare 48 {
-    int TclBN_mp_xor(const mp_int *a, const mp_int *b, mp_int *c)
+    int TclBN_mp_xor(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 49 {
    void TclBN_mp_zero(mp_int *a)
@@ -182,34 +182,34 @@ declare 50 {
    void TclBN_reverse(unsigned char *s, int len)
 }
 declare 51 {
-    int TclBN_fast_s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs)
+    int TclBN_fast_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, int digs)
 }
 declare 52 {
-    int TclBN_fast_s_mp_sqr(const mp_int *a, mp_int *b)
+    int TclBN_fast_s_mp_sqr(mp_int *a, mp_int *b)
 }
 declare 53 {
-    int TclBN_mp_karatsuba_mul(const mp_int *a, const mp_int *b, mp_int *c)
+    int TclBN_mp_karatsuba_mul(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 54 {
-    int TclBN_mp_karatsuba_sqr(const mp_int *a, mp_int *b)
+    int TclBN_mp_karatsuba_sqr(mp_int *a, mp_int *b)
 }
 declare 55 {
-    int TclBN_mp_toom_mul(const mp_int *a, const mp_int *b, mp_int *c)
+    int TclBN_mp_toom_mul(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 56 {
-    int TclBN_mp_toom_sqr(const mp_int *a, mp_int *b)
+    int TclBN_mp_toom_sqr(mp_int *a, mp_int *b)
 }
 declare 57 {
-    int TclBN_s_mp_add(const mp_int *a, const mp_int *b, mp_int *c)
+    int TclBN_s_mp_add(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 58 {
-    int TclBN_s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs)
+    int TclBN_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, int digs)
 }
 declare 59 {
-    int TclBN_s_mp_sqr(const mp_int *a, mp_int *b)
+    int TclBN_s_mp_sqr(mp_int *a, mp_int *b)
 }
 declare 60 {
-    int TclBN_s_mp_sub(const mp_int *a, const mp_int *b, mp_int *c)
+    int TclBN_s_mp_sub(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 61 {
    int TclBN_mp_init_set_int(mp_int *a, unsigned long i)
@@ -223,32 +223,19 @@ declare 63 {

 # Formerly internal API to allow initialisation of bignums without knowing the
 # typedefs of how a bignum works internally.
-declare 64 {deprecated {Use mp_init() + mp_set_long_long()}} {
+declare 64 {
    void TclBNInitBignumFromLong(mp_int *bignum, long initVal)
 }
-declare 65 {deprecated {Use mp_init() + mp_set_long_long()}} {
+declare 65 {
    void TclBNInitBignumFromWideInt(mp_int *bignum, Tcl_WideInt initVal)
 }
-declare 66 {deprecated {Use mp_init() + mp_set_long_long()}} {
+declare 66 {
    void TclBNInitBignumFromWideUInt(mp_int *bignum, Tcl_WideUInt initVal)
 }

 # Added in libtommath 1.0
 declare 67 {
-    int TclBN_mp_expt_d_ex(const mp_int *a, mp_digit b, mp_int *c, int fast)
-}
-# Added in libtommath 1.0.1
-declare 68 {
-    int TclBN_mp_set_long_long(mp_int *a, Tcl_WideUInt i)
-}
-declare 69 {
-    Tcl_WideUInt TclBN_mp_get_long_long(const mp_int *a)
-}
-declare 70 {
-    int TclBN_mp_set_long(mp_int *a, unsigned long i)
-}
-declare 71 {
-    unsigned long TclBN_mp_get_long(const mp_int *a)
+    int TclBN_mp_expt_d_ex(mp_int *a, mp_digit b, mp_int *c, int fast)
 }

 # Local Variables:
@@ -26,16 +26,11 @@
 extern "C" {
 #endif

-/* MS Visual C++ doesn't have a 128bit type for words, so fall back to 32bit MPI's (where words are 64bit) */
-#if defined(_MSC_VER) || defined(__LLP64__)
-#   define MP_32BIT
-#endif
-
 /* detect 64-bit mode if possible */
-#if defined(NEVER)
-#   if !(defined(MP_32BIT) || defined(MP_16BIT) || defined(MP_8BIT) || defined(_MSC_VER))
-#      define MP_64BIT
-#   endif
+#if defined(NEVER) /* 128-bit ints fail in too many places */
+   #if !(defined(MP_32BIT) || defined(MP_16BIT) || defined(MP_8BIT))
+      #define MP_64BIT
+   #endif
 #endif

 /* some default configurations.
@@ -48,89 +43,89 @@ extern "C" {
 */
 #ifdef MP_8BIT
 #ifndef MP_DIGIT_DECLARED
-typedef uint8_t              mp_digit;
+   typedef uint8_t              mp_digit;
 #define MP_DIGIT_DECLARED
 #endif
-#ifndef MP_WORD_DECLARED
-typedef uint16_t             mp_word;
-#define MP_WORD_DECLARED
+   typedef uint16_t             mp_word;
+#define MP_SIZEOF_MP_DIGIT      1
+#ifdef DIGIT_BIT
+#error You must not define DIGIT_BIT when using MP_8BIT
 #endif
-#   define MP_SIZEOF_MP_DIGIT 1
-#   ifdef DIGIT_BIT
-#      error You must not define DIGIT_BIT when using MP_8BIT
-#   endif
 #elif defined(MP_16BIT)
 #ifndef MP_DIGIT_DECLARED
-typedef uint16_t             mp_digit;
+   typedef uint16_t             mp_digit;
 #define MP_DIGIT_DECLARED
 #endif
-#ifndef MP_WORD_DECLARED
-typedef uint32_t             mp_word;
-#define MP_WORD_DECLARED
+   typedef uint32_t             mp_word;
+#define MP_SIZEOF_MP_DIGIT      2
+#ifdef DIGIT_BIT
+#error You must not define DIGIT_BIT when using MP_16BIT
 #endif
-#   define MP_SIZEOF_MP_DIGIT 2
-#   ifdef DIGIT_BIT
-#      error You must not define DIGIT_BIT when using MP_16BIT
-#   endif
 #elif defined(MP_64BIT)
-/* for GCC only on supported platforms */
+   /* for GCC only on supported platforms */
+#ifndef CRYPT
+   typedef unsigned long long   ulong64;
+   typedef signed long long     long64;
+#endif
+
 #ifndef MP_DIGIT_DECLARED
-typedef uint64_t mp_digit;
+   typedef ulong64 mp_digit;
 #define MP_DIGIT_DECLARED
 #endif
-#   if defined(__GNUC__)
-typedef unsigned long        mp_word __attribute__((mode(TI)));
-#   else
-/* it seems you have a problem
- * but we assume you can somewhere define your own uint128_t */
-#ifndef MP_WORD_DECLARED
-typedef uint128_t            mp_word;
-#define MP_WORD_DECLARED
-#endif
-#   endif
-
-#   define DIGIT_BIT 60
+#if defined(_WIN32)
+   typedef unsigned __int128    mp_word;
+#elif defined(__GNUC__)
+   typedef unsigned long        mp_word __attribute__ ((mode(TI)));
 #else
-/* this is the default case, 28-bit digits */
+   /* it seems you have a problem
+    * but we assume you can somewhere define your own uint128_t */
+   typedef uint128_t            mp_word;
+#endif
+
+   #define DIGIT_BIT            60
+#else
+   /* this is the default case, 28-bit digits */
+
+   /* this is to make porting into LibTomCrypt easier :-) */
+#ifndef CRYPT
+   typedef unsigned long long   ulong64;
+   typedef signed long long     long64;
+#endif

-/* this is to make porting into LibTomCrypt easier :-) */
 #ifndef MP_DIGIT_DECLARED
-typedef uint32_t             mp_digit;
+   typedef uint32_t             mp_digit;
 #define MP_DIGIT_DECLARED
 #endif
-#ifndef MP_WORD_DECLARED
-typedef uint64_t             mp_word;
-#define MP_WORD_DECLARED
-#endif
+   typedef ulong64              mp_word;

-#   ifdef MP_31BIT
-/* this is an extension that uses 31-bit digits */
-#      define DIGIT_BIT 31
-#   else
-/* default case is 28-bit digits, defines MP_28BIT as a handy macro to test */
-#      define DIGIT_BIT 28
-#      define MP_28BIT
-#   endif
+#ifdef MP_31BIT
+   /* this is an extension that uses 31-bit digits */
+   #define DIGIT_BIT            31
+#else
+   /* default case is 28-bit digits, defines MP_28BIT as a handy macro to test */
+   #define DIGIT_BIT            28
+   #define MP_28BIT
+#endif
 #endif

 /* otherwise the bits per digit is calculated automatically from the size of a mp_digit */
 #ifndef DIGIT_BIT
-#   define DIGIT_BIT (((CHAR_BIT * MP_SIZEOF_MP_DIGIT) - 1))  /* bits per digit */
-typedef uint_least32_t mp_min_u32;
+   #define DIGIT_BIT     (((CHAR_BIT * MP_SIZEOF_MP_DIGIT) - 1))  /* bits per digit */
+   typedef uint_least32_t mp_min_u32;
 #else
-typedef mp_digit mp_min_u32;
+   typedef mp_digit mp_min_u32;
+#endif
+
+/* platforms that can use a better rand function */
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+    #define MP_USE_ALT_RAND 1
 #endif

 /* use arc4random on platforms that support it */
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-#   define MP_GEN_RANDOM()    arc4random()
-#   define MP_GEN_RANDOM_MAX  0xffffffffu
-#endif
-
-/* use rand() as fall-back if there's no better rand function */
-#ifndef MP_GEN_RANDOM
-#   define MP_GEN_RANDOM()    rand()
-#   define MP_GEN_RANDOM_MAX  RAND_MAX
+#ifdef MP_USE_ALT_RAND
+    #define MP_GEN_RANDOM()    arc4random()
+#else
+    #define MP_GEN_RANDOM()    rand()
 #endif

 #define MP_DIGIT_BIT     DIGIT_BIT
@@ -163,9 +158,9 @@ typedef int           mp_err;
 /* you'll have to tune these... */
 #if defined(BUILD_tcl) || !defined(_WIN32)
 MODULE_SCOPE int KARATSUBA_MUL_CUTOFF,
-       KARATSUBA_SQR_CUTOFF,
-       TOOM_MUL_CUTOFF,
-       TOOM_SQR_CUTOFF;
+           KARATSUBA_SQR_CUTOFF,
+           TOOM_MUL_CUTOFF,
+           TOOM_SQR_CUTOFF;
 #endif

 /* define this to use lower memory usage routines (exptmods mostly) */
@@ -173,15 +168,15 @@ MODULE_SCOPE int KARATSUBA_MUL_CUTOFF,

 /* default precision */
 #ifndef MP_PREC
-#   ifndef MP_LOW_MEM
-#      define MP_PREC 32        /* default digits of precision */
-#   else
-#      define MP_PREC 8         /* default digits of precision */
-#   endif
+   #ifndef MP_LOW_MEM
+      #define MP_PREC                 32     /* default digits of precision */
+   #else
+      #define MP_PREC                 8      /* default digits of precision */
+   #endif
 #endif

 /* size of comba arrays, should be at least 2 * 2**(BITS_PER_WORD - BITS_PER_DIGIT*2) */
-#define MP_WARRAY               (1u << (((sizeof(mp_word) * CHAR_BIT) - (2 * DIGIT_BIT)) + 1))
+#define MP_WARRAY               (1 << (((sizeof(mp_word) * CHAR_BIT) - (2 * DIGIT_BIT)) + 1))

 /* the infamous mp_int structure */
 #ifndef MP_INT_DECLARED
@@ -189,17 +184,17 @@ MODULE_SCOPE int KARATSUBA_MUL_CUTOFF,
 typedef struct mp_int mp_int;
 #endif
 struct mp_int {
-   int used, alloc, sign;
-   mp_digit *dp;
+    int used, alloc, sign;
+    mp_digit *dp;
 };

 /* callback for mp_prime_random, should fill dst with random bytes and return how many read [upto len] */
 typedef int ltm_prime_callback(unsigned char *dst, int len, void *dat);


-#define USED(m)     ((m)->used)
-#define DIGIT(m, k) ((m)->dp[(k)])
-#define SIGN(m)     ((m)->sign)
+#define USED(m)    ((m)->used)
+#define DIGIT(m,k) ((m)->dp[(k)])
+#define SIGN(m)    ((m)->sign)

 /* error code to char* string */
 const char *mp_error_to_string(int code);
@@ -271,34 +266,28 @@ int mp_set_int(mp_int *a, unsigned long b);
 int mp_set_long(mp_int *a, unsigned long b);
 */

-/* set a platform dependent Tcl_WideUInt value */
+/* set a platform dependent unsigned long long value */
 /*
-int mp_set_long_long(mp_int *a, Tcl_WideUInt b);
+int mp_set_long_long(mp_int *a, unsigned long long b);
 */

 /* get a 32-bit value */
-/*
-unsigned long mp_get_int(const mp_int *a);
-*/
+unsigned long mp_get_int(mp_int * a);

 /* get a platform dependent unsigned long value */
-/*
-unsigned long mp_get_long(const mp_int *a);
-*/
+unsigned long mp_get_long(mp_int * a);

-/* get a platform dependent Tcl_WideUInt value */
-/*
-Tcl_WideUInt mp_get_long_long(const mp_int *a);
-*/
+/* get a platform dependent unsigned long long value */
+unsigned long long mp_get_long_long(mp_int * a);

 /* initialize and set a digit */
 /*
-int mp_init_set(mp_int *a, mp_digit b);
+int mp_init_set (mp_int * a, mp_digit b);
 */

 /* initialize and set 32-bit value */
 /*
-int mp_init_set_int(mp_int *a, unsigned long b);
+int mp_init_set_int (mp_int * a, unsigned long b);
 */

 /* copy, b = a */
@@ -318,12 +307,12 @@ void mp_clamp(mp_int *a);

 /* import binary data */
 /*
-int mp_import(mp_int *rop, size_t count, int order, size_t size, int endian, size_t nails, const void *op);
+int mp_import(mp_int* rop, size_t count, int order, size_t size, int endian, size_t nails, const void* op);
 */

 /* export binary data */
 /*
-int mp_export(void *rop, size_t *countp, int order, size_t size, int endian, size_t nails, const mp_int *op);
+int mp_export(void* rop, size_t* countp, int order, size_t size, int endian, size_t nails, mp_int* op);
 */

 /* ---> digit manipulation <--- */
@@ -345,7 +334,7 @@ int mp_div_2d(const mp_int *a, int b, mp_int *c, mp_int *d);

 /* b = a/2 */
 /*
-int mp_div_2(const mp_int *a, mp_int *b);
+int mp_div_2(mp_int *a, mp_int *b);
 */

 /* c = a * 2**b, implemented as c = a << b */
@@ -355,7 +344,7 @@ int mp_mul_2d(const mp_int *a, int b, mp_int *c);

 /* b = a*2 */
 /*
-int mp_mul_2(const mp_int *a, mp_int *b);
+int mp_mul_2(mp_int *a, mp_int *b);
 */

 /* c = a mod 2**b */
@@ -383,17 +372,17 @@ int mp_rand(mp_int *a, int digits);
 /* ---> binary operations <--- */
 /* c = a XOR b  */
 /*
-int mp_xor(const mp_int *a, const mp_int *b, mp_int *c);
+int mp_xor(mp_int *a, mp_int *b, mp_int *c);
 */

 /* c = a OR b */
 /*
-int mp_or(const mp_int *a, const mp_int *b, mp_int *c);
+int mp_or(mp_int *a, mp_int *b, mp_int *c);
 */

 /* c = a AND b */
 /*
-int mp_and(const mp_int *a, const mp_int *b, mp_int *c);
+int mp_and(mp_int *a, mp_int *b, mp_int *c);
 */

 /* ---> Basic arithmetic <--- */
@@ -405,7 +394,7 @@ int mp_neg(const mp_int *a, mp_int *b);

 /* b = |a| */
 /*
-int mp_abs(const mp_int *a, mp_int *b);
+int mp_abs(mp_int *a, mp_int *b);
 */

 /* compare a to b */
@@ -420,32 +409,32 @@ int mp_cmp_mag(const mp_int *a, const mp_int *b);

 /* c = a + b */
 /*
-int mp_add(const mp_int *a, const mp_int *b, mp_int *c);
+int mp_add(mp_int *a, mp_int *b, mp_int *c);
 */

 /* c = a - b */
 /*
-int mp_sub(const mp_int *a, const mp_int *b, mp_int *c);
+int mp_sub(mp_int *a, mp_int *b, mp_int *c);
 */

 /* c = a * b */
 /*
-int mp_mul(const mp_int *a, const mp_int *b, mp_int *c);
+int mp_mul(mp_int *a, mp_int *b, mp_int *c);
 */

 /* b = a*a  */
 /*
-int mp_sqr(const mp_int *a, mp_int *b);
+int mp_sqr(mp_int *a, mp_int *b);
 */

 /* a/b => cb + d == a */
 /*
-int mp_div(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d);
+int mp_div(mp_int *a, mp_int *b, mp_int *c, mp_int *d);
 */

 /* c = a mod b, 0 <= c < b  */
 /*
-int mp_mod(const mp_int *a, const mp_int *b, mp_int *c);
+int mp_mod(mp_int *a, mp_int *b, mp_int *c);
 */

 /* ---> single digit functions <--- */
@@ -457,82 +446,82 @@ int mp_cmp_d(const mp_int *a, mp_digit b);

 /* c = a + b */
 /*
-int mp_add_d(const mp_int *a, mp_digit b, mp_int *c);
+int mp_add_d(mp_int *a, mp_digit b, mp_int *c);
 */

 /* c = a - b */
 /*
-int mp_sub_d(const mp_int *a, mp_digit b, mp_int *c);
+int mp_sub_d(mp_int *a, mp_digit b, mp_int *c);
 */

 /* c = a * b */
 /*
-int mp_mul_d(const mp_int *a, mp_digit b, mp_int *c);
+int mp_mul_d(mp_int *a, mp_digit b, mp_int *c);
 */

 /* a/b => cb + d == a */
 /*
-int mp_div_d(const mp_int *a, mp_digit b, mp_int *c, mp_digit *d);
+int mp_div_d(mp_int *a, mp_digit b, mp_int *c, mp_digit *d);
 */

 /* a/3 => 3c + d == a */
 /*
-int mp_div_3(const mp_int *a, mp_int *c, mp_digit *d);
+int mp_div_3(mp_int *a, mp_int *c, mp_digit *d);
 */

 /* c = a**b */
 /*
-int mp_expt_d(const mp_int *a, mp_digit b, mp_int *c);
+int mp_expt_d(mp_int *a, mp_digit b, mp_int *c);
 */
 /*
-int mp_expt_d_ex(const mp_int *a, mp_digit b, mp_int *c, int fast);
+int mp_expt_d_ex (mp_int * a, mp_digit b, mp_int * c, int fast);
 */

 /* c = a mod b, 0 <= c < b  */
 /*
-int mp_mod_d(const mp_int *a, mp_digit b, mp_digit *c);
+int mp_mod_d(mp_int *a, mp_digit b, mp_digit *c);
 */

 /* ---> number theory <--- */

 /* d = a + b (mod c) */
 /*
-int mp_addmod(const mp_int *a, const mp_int *b, const mp_int *c, mp_int *d);
+int mp_addmod(mp_int *a, mp_int *b, mp_int *c, mp_int *d);
 */

 /* d = a - b (mod c) */
 /*
-int mp_submod(const mp_int *a, const mp_int *b, const mp_int *c, mp_int *d);
+int mp_submod(mp_int *a, mp_int *b, mp_int *c, mp_int *d);
 */

 /* d = a * b (mod c) */
 /*
-int mp_mulmod(const mp_int *a, const mp_int *b, const mp_int *c, mp_int *d);
+int mp_mulmod(mp_int *a, mp_int *b, mp_int *c, mp_int *d);
 */

 /* c = a * a (mod b) */
 /*
-int mp_sqrmod(const mp_int *a, const mp_int *b, mp_int *c);
+int mp_sqrmod(mp_int *a, mp_int *b, mp_int *c);
 */

 /* c = 1/a (mod b) */
 /*
-int mp_invmod(const mp_int *a, const mp_int *b, mp_int *c);
+int mp_invmod(mp_int *a, mp_int *b, mp_int *c);
 */

 /* c = (a, b) */
 /*
-int mp_gcd(const mp_int *a, const mp_int *b, mp_int *c);
+int mp_gcd(mp_int *a, mp_int *b, mp_int *c);
 */

 /* produces value such that U1*a + U2*b = U3 */
 /*
-int mp_exteuclid(const mp_int *a, const mp_int *b, mp_int *U1, mp_int *U2, mp_int *U3);
+int mp_exteuclid(mp_int *a, mp_int *b, mp_int *U1, mp_int *U2, mp_int *U3);
 */

 /* c = [a, b] or (a*b)/(a, b) */
 /*
-int mp_lcm(const mp_int *a, const mp_int *b, mp_int *c);
+int mp_lcm(mp_int *a, mp_int *b, mp_int *c);
 */

 /* finds one of the b'th root of a, such that |c|**b <= |a|
@@ -540,120 +529,120 @@ int mp_lcm(const mp_int *a, const mp_int *b, mp_int *c);
 * returns error if a < 0 and b is even
 */
 /*
-int mp_n_root(const mp_int *a, mp_digit b, mp_int *c);
+int mp_n_root(mp_int *a, mp_digit b, mp_int *c);
 */
 /*
-int mp_n_root_ex(const mp_int *a, mp_digit b, mp_int *c, int fast);
+int mp_n_root_ex (mp_int * a, mp_digit b, mp_int * c, int fast);
 */

 /* special sqrt algo */
 /*
-int mp_sqrt(const mp_int *arg, mp_int *ret);
+int mp_sqrt(mp_int *arg, mp_int *ret);
 */

 /* special sqrt (mod prime) */
 /*
-int mp_sqrtmod_prime(const mp_int *n, const mp_int *prime, mp_int *ret);
+int mp_sqrtmod_prime(mp_int *arg, mp_int *prime, mp_int *ret);
 */

 /* is number a square? */
 /*
-int mp_is_square(const mp_int *arg, int *ret);
+int mp_is_square(mp_int *arg, int *ret);
 */

 /* computes the jacobi c = (a | n) (or Legendre if b is prime)  */
 /*
-int mp_jacobi(const mp_int *a, const mp_int *n, int *c);
+int mp_jacobi(mp_int *a, mp_int *n, int *c);
 */

 /* used to setup the Barrett reduction for a given modulus b */
 /*
-int mp_reduce_setup(mp_int *a, const mp_int *b);
+int mp_reduce_setup(mp_int *a, mp_int *b);
 */

 /* Barrett Reduction, computes a (mod b) with a precomputed value c
 *
- * Assumes that 0 < x <= m*m, note if 0 > x > -(m*m) then you can merely
- * compute the reduction as -1 * mp_reduce(mp_abs(x)) [pseudo code].
+ * Assumes that 0 < a <= b*b, note if 0 > a > -(b*b) then you can merely
+ * compute the reduction as -1 * mp_reduce(mp_abs(a)) [pseudo code].
 */
 /*
-int mp_reduce(mp_int *x, const mp_int *m, const mp_int *mu);
+int mp_reduce(mp_int *a, mp_int *b, mp_int *c);
 */

 /* setups the montgomery reduction */
 /*
-int mp_montgomery_setup(const mp_int *n, mp_digit *rho);
+int mp_montgomery_setup(mp_int *a, mp_digit *mp);
 */

 /* computes a = B**n mod b without division or multiplication useful for
 * normalizing numbers in a Montgomery system.
 */
 /*
-int mp_montgomery_calc_normalization(mp_int *a, const mp_int *b);
+int mp_montgomery_calc_normalization(mp_int *a, mp_int *b);
 */

 /* computes x/R == x (mod N) via Montgomery Reduction */
 /*
-int mp_montgomery_reduce(mp_int *x, const mp_int *n, mp_digit rho);
+int mp_montgomery_reduce(mp_int *a, mp_int *m, mp_digit mp);
 */

 /* returns 1 if a is a valid DR modulus */
 /*
-int mp_dr_is_modulus(const mp_int *a);
+int mp_dr_is_modulus(mp_int *a);
 */

 /* sets the value of "d" required for mp_dr_reduce */
 /*
-void mp_dr_setup(const mp_int *a, mp_digit *d);
+void mp_dr_setup(mp_int *a, mp_digit *d);
 */

-/* reduces a modulo n using the Diminished Radix method */
+/* reduces a modulo b using the Diminished Radix method */
 /*
-int mp_dr_reduce(mp_int *x, const mp_int *n, mp_digit k);
+int mp_dr_reduce(mp_int *a, mp_int *b, mp_digit mp);
 */

 /* returns true if a can be reduced with mp_reduce_2k */
 /*
-int mp_reduce_is_2k(const mp_int *a);
+int mp_reduce_is_2k(mp_int *a);
 */

 /* determines k value for 2k reduction */
 /*
-int mp_reduce_2k_setup(const mp_int *a, mp_digit *d);
+int mp_reduce_2k_setup(mp_int *a, mp_digit *d);
 */

 /* reduces a modulo b where b is of the form 2**p - k [0 <= a] */
 /*
-int mp_reduce_2k(mp_int *a, const mp_int *n, mp_digit d);
+int mp_reduce_2k(mp_int *a, mp_int *n, mp_digit d);
 */

 /* returns true if a can be reduced with mp_reduce_2k_l */
 /*
-int mp_reduce_is_2k_l(const mp_int *a);
+int mp_reduce_is_2k_l(mp_int *a);
 */

 /* determines k value for 2k reduction */
 /*
-int mp_reduce_2k_setup_l(const mp_int *a, mp_int *d);
+int mp_reduce_2k_setup_l(mp_int *a, mp_int *d);
 */

 /* reduces a modulo b where b is of the form 2**p - k [0 <= a] */
 /*
-int mp_reduce_2k_l(mp_int *a, const mp_int *n, const mp_int *d);
+int mp_reduce_2k_l(mp_int *a, mp_int *n, mp_int *d);
 */

-/* Y = G**X (mod P) */
+/* d = a**b (mod c) */
 /*
-int mp_exptmod(const mp_int *G, const mp_int *X, const mp_int *P, mp_int *Y);
+int mp_exptmod(mp_int *a, mp_int *b, mp_int *c, mp_int *d);
 */

 /* ---> Primes <--- */

 /* number of primes */
 #ifdef MP_8BIT
-#  define PRIME_SIZE 31
+#  define PRIME_SIZE      31
 #else
-#  define PRIME_SIZE 256
+#  define PRIME_SIZE      256
 #endif

 /* table of first PRIME_SIZE primes */
@@ -663,21 +652,21 @@ MODULE_SCOPE const mp_digit ltm_prime_tab[PRIME_SIZE];

 /* result=1 if a is divisible by one of the first PRIME_SIZE primes */
 /*
-int mp_prime_is_divisible(const mp_int *a, int *result);
+int mp_prime_is_divisible(mp_int *a, int *result);
 */

 /* performs one Fermat test of "a" using base "b".
 * Sets result to 0 if composite or 1 if probable prime
 */
 /*
-int mp_prime_fermat(const mp_int *a, const mp_int *b, int *result);
+int mp_prime_fermat(mp_int *a, mp_int *b, int *result);
 */

 /* performs one Miller-Rabin test of "a" using base "b".
 * Sets result to 0 if composite or 1 if probable prime
 */
 /*
-int mp_prime_miller_rabin(const mp_int *a, const mp_int *b, int *result);
+int mp_prime_miller_rabin(mp_int *a, mp_int *b, int *result);
 */

 /* This gives [for a given bit size] the number of trials required
@@ -695,7 +684,7 @@ int mp_prime_rabin_miller_trials(int size);
 * Sets result to 1 if probably prime, 0 otherwise
 */
 /*
-int mp_prime_is_prime(const mp_int *a, int t, int *result);
+int mp_prime_is_prime(mp_int *a, int t, int *result);
 */

 /* finds the next prime after the number "a" using "t" trials
@@ -741,39 +730,39 @@ int mp_count_bits(const mp_int *a);
 */

 /*
-int mp_unsigned_bin_size(const mp_int *a);
+int mp_unsigned_bin_size(mp_int *a);
 */
 /*
 int mp_read_unsigned_bin(mp_int *a, const unsigned char *b, int c);
 */
 /*
-int mp_to_unsigned_bin(const mp_int *a, unsigned char *b);
+int mp_to_unsigned_bin(mp_int *a, unsigned char *b);
 */
 /*
-int mp_to_unsigned_bin_n(const mp_int *a, unsigned char *b, unsigned long *outlen);
+int mp_to_unsigned_bin_n (mp_int * a, unsigned char *b, unsigned long *outlen);
 */

 /*
-int mp_signed_bin_size(const mp_int *a);
+int mp_signed_bin_size(mp_int *a);
 */
 /*
 int mp_read_signed_bin(mp_int *a, const unsigned char *b, int c);
 */
 /*
-int mp_to_signed_bin(const mp_int *a,  unsigned char *b);
+int mp_to_signed_bin(mp_int *a,  unsigned char *b);
 */
 /*
-int mp_to_signed_bin_n(const mp_int *a, unsigned char *b, unsigned long *outlen);
+int mp_to_signed_bin_n (mp_int * a, unsigned char *b, unsigned long *outlen);
 */

 /*
 int mp_read_radix(mp_int *a, const char *str, int radix);
 */
 /*
-int mp_toradix(const mp_int *a, char *str, int radix);
+int mp_toradix(mp_int *a, char *str, int radix);
 */
 /*
-int mp_toradix_n(const mp_int *a, char *str, int radix, int maxlen);
+int mp_toradix_n(mp_int * a, char *str, int radix, int maxlen);
 */
 /*
 int mp_radix_size(const mp_int *a, int radix, int *size);
@@ -784,7 +773,7 @@ int mp_radix_size(const mp_int *a, int radix, int *size);
 int mp_fread(mp_int *a, int radix, FILE *stream);
 */
 /*
-int mp_fwrite(const mp_int *a, int radix, FILE *stream);
+int mp_fwrite(mp_int *a, int radix, FILE *stream);
 */
 #endif

@@ -801,13 +790,13 @@ int mp_fwrite(const mp_int *a, int radix, FILE *stream);
 #define mp_tohex(M, S)     mp_toradix((M), (S), 16)

 #ifdef __cplusplus
-}
+   }
 #endif

 #endif


-/* ref:         $Format:%D$ */
-/* git commit:  $Format:%H$ */
-/* commit time: $Format:%ai$ */
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */

@@ -74,9 +74,6 @@
 #define mp_exch TclBN_mp_exch
 #define mp_expt_d TclBN_mp_expt_d
 #define mp_expt_d_ex TclBN_mp_expt_d_ex
-#define mp_get_int TclBN_mp_get_int
-#define mp_get_long TclBN_mp_get_long
-#define mp_get_long_long TclBN_mp_get_long_long
 #define mp_grow TclBN_mp_grow
 #define mp_init TclBN_mp_init
 #define mp_init_copy TclBN_mp_init_copy
@@ -101,8 +98,6 @@
 #define mp_s_rmap TclBNMpSRmap
 #define mp_set TclBN_mp_set
 #define mp_set_int TclBN_mp_set_int
-#define mp_set_long TclBN_mp_set_long
-#define mp_set_long_long TclBN_mp_set_long_long
 #define mp_shrink TclBN_mp_shrink
 #define mp_sqr TclBN_mp_sqr
 #define mp_sqrt TclBN_mp_sqrt
@@ -153,14 +148,11 @@ EXTERN int		TclBN_epoch(void);
 /* 1 */
 EXTERN int		TclBN_revision(void);
 /* 2 */
-EXTERN int		TclBN_mp_add(const mp_int *a, const mp_int *b,
-				mp_int *c);
+EXTERN int		TclBN_mp_add(mp_int *a, mp_int *b, mp_int *c);
 /* 3 */
-EXTERN int		TclBN_mp_add_d(const mp_int *a, mp_digit b,
-				mp_int *c);
+EXTERN int		TclBN_mp_add_d(mp_int *a, mp_digit b, mp_int *c);
 /* 4 */
-EXTERN int		TclBN_mp_and(const mp_int *a, const mp_int *b,
-				mp_int *c);
+EXTERN int		TclBN_mp_and(mp_int *a, mp_int *b, mp_int *c);
 /* 5 */
 EXTERN void		TclBN_mp_clamp(mp_int *a);
 /* 6 */
@@ -178,24 +170,22 @@ EXTERN int		TclBN_mp_copy(const mp_int *a, mp_int *b);
 /* 12 */
 EXTERN int		TclBN_mp_count_bits(const mp_int *a);
 /* 13 */
-EXTERN int		TclBN_mp_div(const mp_int *a, const mp_int *b,
-				mp_int *q, mp_int *r);
+EXTERN int		TclBN_mp_div(mp_int *a, mp_int *b, mp_int *q,
+				mp_int *r);
 /* 14 */
-EXTERN int		TclBN_mp_div_d(const mp_int *a, mp_digit b,
-				mp_int *q, mp_digit *r);
+EXTERN int		TclBN_mp_div_d(mp_int *a, mp_digit b, mp_int *q,
+				mp_digit *r);
 /* 15 */
-EXTERN int		TclBN_mp_div_2(const mp_int *a, mp_int *q);
+EXTERN int		TclBN_mp_div_2(mp_int *a, mp_int *q);
 /* 16 */
 EXTERN int		TclBN_mp_div_2d(const mp_int *a, int b, mp_int *q,
 				mp_int *r);
 /* 17 */
-EXTERN int		TclBN_mp_div_3(const mp_int *a, mp_int *q,
-				mp_digit *r);
+EXTERN int		TclBN_mp_div_3(mp_int *a, mp_int *q, mp_digit *r);
 /* 18 */
 EXTERN void		TclBN_mp_exch(mp_int *a, mp_int *b);
 /* 19 */
-EXTERN int		TclBN_mp_expt_d(const mp_int *a, mp_digit b,
-				mp_int *c);
+EXTERN int		TclBN_mp_expt_d(mp_int *a, mp_digit b, mp_int *c);
 /* 20 */
 EXTERN int		TclBN_mp_grow(mp_int *a, int size);
 /* 21 */
@@ -211,25 +201,21 @@ EXTERN int		TclBN_mp_init_size(mp_int *a, int size);
 /* 26 */
 EXTERN int		TclBN_mp_lshd(mp_int *a, int shift);
 /* 27 */
-EXTERN int		TclBN_mp_mod(const mp_int *a, const mp_int *b,
-				mp_int *r);
+EXTERN int		TclBN_mp_mod(mp_int *a, mp_int *b, mp_int *r);
 /* 28 */
 EXTERN int		TclBN_mp_mod_2d(const mp_int *a, int b, mp_int *r);
 /* 29 */
-EXTERN int		TclBN_mp_mul(const mp_int *a, const mp_int *b,
-				mp_int *p);
+EXTERN int		TclBN_mp_mul(mp_int *a, mp_int *b, mp_int *p);
 /* 30 */
-EXTERN int		TclBN_mp_mul_d(const mp_int *a, mp_digit b,
-				mp_int *p);
+EXTERN int		TclBN_mp_mul_d(mp_int *a, mp_digit b, mp_int *p);
 /* 31 */
-EXTERN int		TclBN_mp_mul_2(const mp_int *a, mp_int *p);
+EXTERN int		TclBN_mp_mul_2(mp_int *a, mp_int *p);
 /* 32 */
 EXTERN int		TclBN_mp_mul_2d(const mp_int *a, int d, mp_int *p);
 /* 33 */
 EXTERN int		TclBN_mp_neg(const mp_int *a, mp_int *b);
 /* 34 */
-EXTERN int		TclBN_mp_or(const mp_int *a, const mp_int *b,
-				mp_int *c);
+EXTERN int		TclBN_mp_or(mp_int *a, mp_int *b, mp_int *c);
 /* 35 */
 EXTERN int		TclBN_mp_radix_size(const mp_int *a, int radix,
 				int *size);
@@ -243,59 +229,52 @@ EXTERN int		TclBN_mp_shrink(mp_int *a);
 /* 39 */
 EXTERN void		TclBN_mp_set(mp_int *a, mp_digit b);
 /* 40 */
-EXTERN int		TclBN_mp_sqr(const mp_int *a, mp_int *b);
+EXTERN int		TclBN_mp_sqr(mp_int *a, mp_int *b);
 /* 41 */
-EXTERN int		TclBN_mp_sqrt(const mp_int *a, mp_int *b);
+EXTERN int		TclBN_mp_sqrt(mp_int *a, mp_int *b);
 /* 42 */
-EXTERN int		TclBN_mp_sub(const mp_int *a, const mp_int *b,
-				mp_int *c);
+EXTERN int		TclBN_mp_sub(mp_int *a, mp_int *b, mp_int *c);
 /* 43 */
-EXTERN int		TclBN_mp_sub_d(const mp_int *a, mp_digit b,
-				mp_int *c);
+EXTERN int		TclBN_mp_sub_d(mp_int *a, mp_digit b, mp_int *c);
 /* 44 */
-EXTERN int		TclBN_mp_to_unsigned_bin(const mp_int *a,
-				unsigned char *b);
+EXTERN int		TclBN_mp_to_unsigned_bin(mp_int *a, unsigned char *b);
 /* 45 */
-EXTERN int		TclBN_mp_to_unsigned_bin_n(const mp_int *a,
+EXTERN int		TclBN_mp_to_unsigned_bin_n(mp_int *a,
 				unsigned char *b, unsigned long *outlen);
 /* 46 */
-EXTERN int		TclBN_mp_toradix_n(const mp_int *a, char *str,
-				int radix, int maxlen);
+EXTERN int		TclBN_mp_toradix_n(mp_int *a, char *str, int radix,
+				int maxlen);
 /* 47 */
-EXTERN int		TclBN_mp_unsigned_bin_size(const mp_int *a);
+EXTERN int		TclBN_mp_unsigned_bin_size(mp_int *a);
 /* 48 */
-EXTERN int		TclBN_mp_xor(const mp_int *a, const mp_int *b,
-				mp_int *c);
+EXTERN int		TclBN_mp_xor(mp_int *a, mp_int *b, mp_int *c);
 /* 49 */
 EXTERN void		TclBN_mp_zero(mp_int *a);
 /* 50 */
 EXTERN void		TclBN_reverse(unsigned char *s, int len);
 /* 51 */
-EXTERN int		TclBN_fast_s_mp_mul_digs(const mp_int *a,
-				const mp_int *b, mp_int *c, int digs);
-/* 52 */
-EXTERN int		TclBN_fast_s_mp_sqr(const mp_int *a, mp_int *b);
-/* 53 */
-EXTERN int		TclBN_mp_karatsuba_mul(const mp_int *a,
-				const mp_int *b, mp_int *c);
-/* 54 */
-EXTERN int		TclBN_mp_karatsuba_sqr(const mp_int *a, mp_int *b);
-/* 55 */
-EXTERN int		TclBN_mp_toom_mul(const mp_int *a, const mp_int *b,
-				mp_int *c);
-/* 56 */
-EXTERN int		TclBN_mp_toom_sqr(const mp_int *a, mp_int *b);
-/* 57 */
-EXTERN int		TclBN_s_mp_add(const mp_int *a, const mp_int *b,
-				mp_int *c);
-/* 58 */
-EXTERN int		TclBN_s_mp_mul_digs(const mp_int *a, const mp_int *b,
+EXTERN int		TclBN_fast_s_mp_mul_digs(mp_int *a, mp_int *b,
 				mp_int *c, int digs);
-/* 59 */
-EXTERN int		TclBN_s_mp_sqr(const mp_int *a, mp_int *b);
-/* 60 */
-EXTERN int		TclBN_s_mp_sub(const mp_int *a, const mp_int *b,
+/* 52 */
+EXTERN int		TclBN_fast_s_mp_sqr(mp_int *a, mp_int *b);
+/* 53 */
+EXTERN int		TclBN_mp_karatsuba_mul(mp_int *a, mp_int *b,
 				mp_int *c);
+/* 54 */
+EXTERN int		TclBN_mp_karatsuba_sqr(mp_int *a, mp_int *b);
+/* 55 */
+EXTERN int		TclBN_mp_toom_mul(mp_int *a, mp_int *b, mp_int *c);
+/* 56 */
+EXTERN int		TclBN_mp_toom_sqr(mp_int *a, mp_int *b);
+/* 57 */
+EXTERN int		TclBN_s_mp_add(mp_int *a, mp_int *b, mp_int *c);
+/* 58 */
+EXTERN int		TclBN_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c,
+				int digs);
+/* 59 */
+EXTERN int		TclBN_s_mp_sqr(mp_int *a, mp_int *b);
+/* 60 */
+EXTERN int		TclBN_s_mp_sub(mp_int *a, mp_int *b, mp_int *c);
 /* 61 */
 EXTERN int		TclBN_mp_init_set_int(mp_int *a, unsigned long i);
 /* 62 */
@@ -303,27 +282,16 @@ EXTERN int		TclBN_mp_set_int(mp_int *a, unsigned long i);
 /* 63 */
 EXTERN int		TclBN_mp_cnt_lsb(const mp_int *a);
 /* 64 */
-TCL_DEPRECATED("Use mp_init() + mp_set_long_long()")
-void			TclBNInitBignumFromLong(mp_int *bignum, long initVal);
+EXTERN void		TclBNInitBignumFromLong(mp_int *bignum, long initVal);
 /* 65 */
-TCL_DEPRECATED("Use mp_init() + mp_set_long_long()")
-void			TclBNInitBignumFromWideInt(mp_int *bignum,
+EXTERN void		TclBNInitBignumFromWideInt(mp_int *bignum,
 				Tcl_WideInt initVal);
 /* 66 */
-TCL_DEPRECATED("Use mp_init() + mp_set_long_long()")
-void			TclBNInitBignumFromWideUInt(mp_int *bignum,
+EXTERN void		TclBNInitBignumFromWideUInt(mp_int *bignum,
 				Tcl_WideUInt initVal);
 /* 67 */
-EXTERN int		TclBN_mp_expt_d_ex(const mp_int *a, mp_digit b,
-				mp_int *c, int fast);
-/* 68 */
-EXTERN int		TclBN_mp_set_long_long(mp_int *a, Tcl_WideUInt i);
-/* 69 */
-EXTERN Tcl_WideUInt	TclBN_mp_get_long_long(const mp_int *a);
-/* 70 */
-EXTERN int		TclBN_mp_set_long(mp_int *a, unsigned long i);
-/* 71 */
-EXTERN unsigned long	TclBN_mp_get_long(const mp_int *a);
+EXTERN int		TclBN_mp_expt_d_ex(mp_int *a, mp_digit b, mp_int *c,
+				int fast);

 typedef struct TclTomMathStubs {
    int magic;
@@ -331,9 +299,9 @@ typedef struct TclTomMathStubs {

    int (*tclBN_epoch) (void); /* 0 */
    int (*tclBN_revision) (void); /* 1 */
-    int (*tclBN_mp_add) (const mp_int *a, const mp_int *b, mp_int *c); /* 2 */
-    int (*tclBN_mp_add_d) (const mp_int *a, mp_digit b, mp_int *c); /* 3 */
-    int (*tclBN_mp_and) (const mp_int *a, const mp_int *b, mp_int *c); /* 4 */
+    int (*tclBN_mp_add) (mp_int *a, mp_int *b, mp_int *c); /* 2 */
+    int (*tclBN_mp_add_d) (mp_int *a, mp_digit b, mp_int *c); /* 3 */
+    int (*tclBN_mp_and) (mp_int *a, mp_int *b, mp_int *c); /* 4 */
    void (*tclBN_mp_clamp) (mp_int *a); /* 5 */
    void (*tclBN_mp_clear) (mp_int *a); /* 6 */
    void (*tclBN_mp_clear_multi) (mp_int *a, ...); /* 7 */
@@ -342,13 +310,13 @@ typedef struct TclTomMathStubs {
    int (*tclBN_mp_cmp_mag) (const mp_int *a, const mp_int *b); /* 10 */
    int (*tclBN_mp_copy) (const mp_int *a, mp_int *b); /* 11 */
    int (*tclBN_mp_count_bits) (const mp_int *a); /* 12 */
-    int (*tclBN_mp_div) (const mp_int *a, const mp_int *b, mp_int *q, mp_int *r); /* 13 */
-    int (*tclBN_mp_div_d) (const mp_int *a, mp_digit b, mp_int *q, mp_digit *r); /* 14 */
-    int (*tclBN_mp_div_2) (const mp_int *a, mp_int *q); /* 15 */
+    int (*tclBN_mp_div) (mp_int *a, mp_int *b, mp_int *q, mp_int *r); /* 13 */
+    int (*tclBN_mp_div_d) (mp_int *a, mp_digit b, mp_int *q, mp_digit *r); /* 14 */
+    int (*tclBN_mp_div_2) (mp_int *a, mp_int *q); /* 15 */
    int (*tclBN_mp_div_2d) (const mp_int *a, int b, mp_int *q, mp_int *r); /* 16 */
-    int (*tclBN_mp_div_3) (const mp_int *a, mp_int *q, mp_digit *r); /* 17 */
+    int (*tclBN_mp_div_3) (mp_int *a, mp_int *q, mp_digit *r); /* 17 */
    void (*tclBN_mp_exch) (mp_int *a, mp_int *b); /* 18 */
-    int (*tclBN_mp_expt_d) (const mp_int *a, mp_digit b, mp_int *c); /* 19 */
+    int (*tclBN_mp_expt_d) (mp_int *a, mp_digit b, mp_int *c); /* 19 */
    int (*tclBN_mp_grow) (mp_int *a, int size); /* 20 */
    int (*tclBN_mp_init) (mp_int *a); /* 21 */
    int (*tclBN_mp_init_copy) (mp_int *a, const mp_int *b); /* 22 */
@@ -356,51 +324,47 @@ typedef struct TclTomMathStubs {
    int (*tclBN_mp_init_set) (mp_int *a, mp_digit b); /* 24 */
    int (*tclBN_mp_init_size) (mp_int *a, int size); /* 25 */
    int (*tclBN_mp_lshd) (mp_int *a, int shift); /* 26 */
-    int (*tclBN_mp_mod) (const mp_int *a, const mp_int *b, mp_int *r); /* 27 */
+    int (*tclBN_mp_mod) (mp_int *a, mp_int *b, mp_int *r); /* 27 */
    int (*tclBN_mp_mod_2d) (const mp_int *a, int b, mp_int *r); /* 28 */
-    int (*tclBN_mp_mul) (const mp_int *a, const mp_int *b, mp_int *p); /* 29 */
-    int (*tclBN_mp_mul_d) (const mp_int *a, mp_digit b, mp_int *p); /* 30 */
-    int (*tclBN_mp_mul_2) (const mp_int *a, mp_int *p); /* 31 */
+    int (*tclBN_mp_mul) (mp_int *a, mp_int *b, mp_int *p); /* 29 */
+    int (*tclBN_mp_mul_d) (mp_int *a, mp_digit b, mp_int *p); /* 30 */
+    int (*tclBN_mp_mul_2) (mp_int *a, mp_int *p); /* 31 */
    int (*tclBN_mp_mul_2d) (const mp_int *a, int d, mp_int *p); /* 32 */
    int (*tclBN_mp_neg) (const mp_int *a, mp_int *b); /* 33 */
-    int (*tclBN_mp_or) (const mp_int *a, const mp_int *b, mp_int *c); /* 34 */
+    int (*tclBN_mp_or) (mp_int *a, mp_int *b, mp_int *c); /* 34 */
    int (*tclBN_mp_radix_size) (const mp_int *a, int radix, int *size); /* 35 */
    int (*tclBN_mp_read_radix) (mp_int *a, const char *str, int radix); /* 36 */
    void (*tclBN_mp_rshd) (mp_int *a, int shift); /* 37 */
    int (*tclBN_mp_shrink) (mp_int *a); /* 38 */
    void (*tclBN_mp_set) (mp_int *a, mp_digit b); /* 39 */
-    int (*tclBN_mp_sqr) (const mp_int *a, mp_int *b); /* 40 */
-    int (*tclBN_mp_sqrt) (const mp_int *a, mp_int *b); /* 41 */
-    int (*tclBN_mp_sub) (const mp_int *a, const mp_int *b, mp_int *c); /* 42 */
-    int (*tclBN_mp_sub_d) (const mp_int *a, mp_digit b, mp_int *c); /* 43 */
-    int (*tclBN_mp_to_unsigned_bin) (const mp_int *a, unsigned char *b); /* 44 */
-    int (*tclBN_mp_to_unsigned_bin_n) (const mp_int *a, unsigned char *b, unsigned long *outlen); /* 45 */
-    int (*tclBN_mp_toradix_n) (const mp_int *a, char *str, int radix, int maxlen); /* 46 */
-    int (*tclBN_mp_unsigned_bin_size) (const mp_int *a); /* 47 */
-    int (*tclBN_mp_xor) (const mp_int *a, const mp_int *b, mp_int *c); /* 48 */
+    int (*tclBN_mp_sqr) (mp_int *a, mp_int *b); /* 40 */
+    int (*tclBN_mp_sqrt) (mp_int *a, mp_int *b); /* 41 */
+    int (*tclBN_mp_sub) (mp_int *a, mp_int *b, mp_int *c); /* 42 */
+    int (*tclBN_mp_sub_d) (mp_int *a, mp_digit b, mp_int *c); /* 43 */
+    int (*tclBN_mp_to_unsigned_bin) (mp_int *a, unsigned char *b); /* 44 */
+    int (*tclBN_mp_to_unsigned_bin_n) (mp_int *a, unsigned char *b, unsigned long *outlen); /* 45 */
+    int (*tclBN_mp_toradix_n) (mp_int *a, char *str, int radix, int maxlen); /* 46 */
+    int (*tclBN_mp_unsigned_bin_size) (mp_int *a); /* 47 */
+    int (*tclBN_mp_xor) (mp_int *a, mp_int *b, mp_int *c); /* 48 */
    void (*tclBN_mp_zero) (mp_int *a); /* 49 */
    void (*tclBN_reverse) (unsigned char *s, int len); /* 50 */
-    int (*tclBN_fast_s_mp_mul_digs) (const mp_int *a, const mp_int *b, mp_int *c, int digs); /* 51 */
-    int (*tclBN_fast_s_mp_sqr) (const mp_int *a, mp_int *b); /* 52 */
-    int (*tclBN_mp_karatsuba_mul) (const mp_int *a, const mp_int *b, mp_int *c); /* 53 */
-    int (*tclBN_mp_karatsuba_sqr) (const mp_int *a, mp_int *b); /* 54 */
-    int (*tclBN_mp_toom_mul) (const mp_int *a, const mp_int *b, mp_int *c); /* 55 */
-    int (*tclBN_mp_toom_sqr) (const mp_int *a, mp_int *b); /* 56 */
-    int (*tclBN_s_mp_add) (const mp_int *a, const mp_int *b, mp_int *c); /* 57 */
-    int (*tclBN_s_mp_mul_digs) (const mp_int *a, const mp_int *b, mp_int *c, int digs); /* 58 */
-    int (*tclBN_s_mp_sqr) (const mp_int *a, mp_int *b); /* 59 */
-    int (*tclBN_s_mp_sub) (const mp_int *a, const mp_int *b, mp_int *c); /* 60 */
+    int (*tclBN_fast_s_mp_mul_digs) (mp_int *a, mp_int *b, mp_int *c, int digs); /* 51 */
+    int (*tclBN_fast_s_mp_sqr) (mp_int *a, mp_int *b); /* 52 */
+    int (*tclBN_mp_karatsuba_mul) (mp_int *a, mp_int *b, mp_int *c); /* 53 */
+    int (*tclBN_mp_karatsuba_sqr) (mp_int *a, mp_int *b); /* 54 */
+    int (*tclBN_mp_toom_mul) (mp_int *a, mp_int *b, mp_int *c); /* 55 */
+    int (*tclBN_mp_toom_sqr) (mp_int *a, mp_int *b); /* 56 */
+    int (*tclBN_s_mp_add) (mp_int *a, mp_int *b, mp_int *c); /* 57 */
+    int (*tclBN_s_mp_mul_digs) (mp_int *a, mp_int *b, mp_int *c, int digs); /* 58 */
+    int (*tclBN_s_mp_sqr) (mp_int *a, mp_int *b); /* 59 */
+    int (*tclBN_s_mp_sub) (mp_int *a, mp_int *b, mp_int *c); /* 60 */
    int (*tclBN_mp_init_set_int) (mp_int *a, unsigned long i); /* 61 */
    int (*tclBN_mp_set_int) (mp_int *a, unsigned long i); /* 62 */
    int (*tclBN_mp_cnt_lsb) (const mp_int *a); /* 63 */
-    TCL_DEPRECATED_API("Use mp_init() + mp_set_long_long()") void (*tclBNInitBignumFromLong) (mp_int *bignum, long initVal); /* 64 */
-    TCL_DEPRECATED_API("Use mp_init() + mp_set_long_long()") void (*tclBNInitBignumFromWideInt) (mp_int *bignum, Tcl_WideInt initVal); /* 65 */
-    TCL_DEPRECATED_API("Use mp_init() + mp_set_long_long()") void (*tclBNInitBignumFromWideUInt) (mp_int *bignum, Tcl_WideUInt initVal); /* 66 */
-    int (*tclBN_mp_expt_d_ex) (const mp_int *a, mp_digit b, mp_int *c, int fast); /* 67 */
-    int (*tclBN_mp_set_long_long) (mp_int *a, Tcl_WideUInt i); /* 68 */
-    Tcl_WideUInt (*tclBN_mp_get_long_long) (const mp_int *a); /* 69 */
-    int (*tclBN_mp_set_long) (mp_int *a, unsigned long i); /* 70 */
-    unsigned long (*tclBN_mp_get_long) (const mp_int *a); /* 71 */
+    void (*tclBNInitBignumFromLong) (mp_int *bignum, long initVal); /* 64 */
+    void (*tclBNInitBignumFromWideInt) (mp_int *bignum, Tcl_WideInt initVal); /* 65 */
+    void (*tclBNInitBignumFromWideUInt) (mp_int *bignum, Tcl_WideUInt initVal); /* 66 */
+    int (*tclBN_mp_expt_d_ex) (mp_int *a, mp_digit b, mp_int *c, int fast); /* 67 */
 } TclTomMathStubs;

 extern const TclTomMathStubs *tclTomMathStubsPtr;
@@ -551,14 +515,6 @@ extern const TclTomMathStubs *tclTomMathStubsPtr;
 	(tclTomMathStubsPtr->tclBNInitBignumFromWideUInt) /* 66 */
 #define TclBN_mp_expt_d_ex \
 	(tclTomMathStubsPtr->tclBN_mp_expt_d_ex) /* 67 */
-#define TclBN_mp_set_long_long \
-	(tclTomMathStubsPtr->tclBN_mp_set_long_long) /* 68 */
-#define TclBN_mp_get_long_long \
-	(tclTomMathStubsPtr->tclBN_mp_get_long_long) /* 69 */
-#define TclBN_mp_set_long \
-	(tclTomMathStubsPtr->tclBN_mp_set_long) /* 70 */
-#define TclBN_mp_get_long \
-	(tclTomMathStubsPtr->tclBN_mp_get_long) /* 71 */

 #endif /* defined(USE_TCL_STUBS) */

@@ -89,11 +89,86 @@ TclBN_revision(void)
 {
    return TCLTOMMATH_REVISION;
 }
+#if 0

 /*
 *----------------------------------------------------------------------
 *
- * TclInitBignumFromLong --
+ * TclBNAlloc --
+ *
+ *	Allocate memory for libtommath.
+ *
+ * Results:
+ *	Returns a pointer to the allocated block.
+ *
+ * This procedure is a wrapper around Tcl_Alloc, needed because of a
+ * mismatched type signature between Tcl_Alloc and malloc.
+ *
+ *----------------------------------------------------------------------
+ */
+
+extern void *
+TclBNAlloc(
+    size_t x)
+{
+    return (void *) ckalloc((unsigned int) x);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclBNRealloc --
+ *
+ *	Change the size of an allocated block of memory in libtommath
+ *
+ * Results:
+ *	Returns a pointer to the allocated block.
+ *
+ * This procedure is a wrapper around Tcl_Realloc, needed because of a
+ * mismatched type signature between Tcl_Realloc and realloc.
+ *
+ *----------------------------------------------------------------------
+ */
+
+void *
+TclBNRealloc(
+    void *p,
+    size_t s)
+{
+    return (void *) ckrealloc((char *) p, (unsigned int) s);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclBNFree --
+ *
+ *	Free allocated memory in libtommath.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Memory is freed.
+ *
+ * This function is simply a wrapper around Tcl_Free, needed in libtommath
+ * because of a type mismatch between free and Tcl_Free.
+ *
+ *----------------------------------------------------------------------
+ */
+
+extern void
+TclBNFree(
+    void *p)
+{
+    ckree((char *) p);
+}
+#endif
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclBNInitBignumFromLong --
 *
 *	Allocate and initialize a 'bignum' from a native 'long'.
 *
@@ -106,20 +181,47 @@ TclBN_revision(void)
 *----------------------------------------------------------------------
 */

-void
-TclInitBignumFromLong(
+extern void
+TclBNInitBignumFromLong(
    mp_int *a,
-    long v)
+    long initVal)
 {
-    if (mp_init_size(a, (CHAR_BIT * sizeof(long) + DIGIT_BIT - 1) / DIGIT_BIT) != MP_OKAY) {
-	Tcl_Panic("initialization failure in TclInitBignumFromLong");
+    int status;
+    unsigned long v;
+    mp_digit *p;
+
+    /*
+     * Allocate enough memory to hold the largest possible long
+     */
+
+    status = mp_init_size(a,
+	    (CHAR_BIT * sizeof(long) + DIGIT_BIT - 1) / DIGIT_BIT);
+    if (status != MP_OKAY) {
+	Tcl_Panic("initialization failure in TclBNInitBignumFromLong");
    }
-    if (v < (long)0) {
-	mp_set_long_long(a, (Tcl_WideUInt)(-(Tcl_WideInt)v));
-	mp_neg(a, a);
+
+    /*
+     * Convert arg to sign and magnitude.
+     */
+
+    if (initVal < 0) {
+	a->sign = MP_NEG;
+	v = -initVal;
    } else {
-	mp_set_long_long(a, (Tcl_WideUInt)v);
+	a->sign = MP_ZPOS;
+	v = initVal;
    }
+
+    /*
+     * Store the magnitude in the bignum.
+     */
+
+    p = a->dp;
+    while (v) {
+	*p++ = (mp_digit) (v & MP_MASK);
+	v >>= MP_DIGIT_BIT;
+    }
+    a->used = p - a->dp;
 }

 /*
@@ -138,19 +240,16 @@ TclInitBignumFromLong(
 *----------------------------------------------------------------------
 */

-void
-TclInitBignumFromWideInt(
+extern void
+TclBNInitBignumFromWideInt(
    mp_int *a,			/* Bignum to initialize */
    Tcl_WideInt v)		/* Initial value */
 {
-	if (mp_init_size(a, (CHAR_BIT * sizeof(Tcl_WideUInt) + DIGIT_BIT - 1) / DIGIT_BIT) != MP_OKAY) {
-		Tcl_Panic("initialization failure in TclInitBignumFromWideInt");
-	}
    if (v < (Tcl_WideInt)0) {
-	mp_set_long_long(a, (Tcl_WideUInt)(-v));
+	TclBNInitBignumFromWideUInt(a, (Tcl_WideUInt)(-v));
 	mp_neg(a, a);
    } else {
-	mp_set_long_long(a, (Tcl_WideUInt)v);
+	TclBNInitBignumFromWideUInt(a, (Tcl_WideUInt)v);
    }
 }

@@ -170,15 +269,36 @@ TclInitBignumFromWideInt(
 *----------------------------------------------------------------------
 */

-void
-TclInitBignumFromWideUInt(
+extern void
+TclBNInitBignumFromWideUInt(
    mp_int *a,			/* Bignum to initialize */
    Tcl_WideUInt v)		/* Initial value */
 {
-	if (mp_init_size(a, (CHAR_BIT * sizeof(Tcl_WideUInt) + DIGIT_BIT - 1) / DIGIT_BIT) != MP_OKAY) {
-	    Tcl_Panic("initialization failure in TclInitBignumFromWideUInt");
-	}
-	mp_set_long_long(a, v);
+    int status;
+    mp_digit *p;
+
+    /*
+     * Allocate enough memory to hold the largest possible Tcl_WideUInt.
+     */
+
+    status = mp_init_size(a,
+	    (CHAR_BIT * sizeof(Tcl_WideUInt) + DIGIT_BIT - 1) / DIGIT_BIT);
+    if (status != MP_OKAY) {
+	Tcl_Panic("initialization failure in TclBNInitBignumFromWideUInt");
+    }
+
+    a->sign = MP_ZPOS;
+
+    /*
+     * Store the magnitude in the bignum.
+     */
+
+    p = a->dp;
+    while (v) {
+	*p++ = (mp_digit) (v & MP_MASK);
+	v >>= MP_DIGIT_BIT;
+    }
+    a->used = p - a->dp;
 }

 /*
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dkf	2c25652324	Checkpoint of work in progress.	2017-09-21 22:00:43 +00:00
dkf	3c1b27e3cd	Add in the URL parsing as a general service.	2017-07-04 14:31:08 +00:00
dkf	3f7351e88d	Rethinking how to hold the bits of configuration.	2017-06-27 18:21:57 +00:00
dkf	71a34fe05a	Start of work on developing a new major version of the HTTP package.	2017-06-25 22:16:08 +00:00