stop looking at the C-stack depth

2013-08-23 18:30:22 +00:00
57 changed files with 492 additions and 1357 deletions
@@ -1,58 +1,3 @@
-A NOTE ON THE CHANGELOG:
-Starting in early 2011, Tcl source code has been under the management of
-fossil, hosted at http://core.tcl.tk/tcl/ .  Fossil presents a "Timeline"
-view of changes made that is superior in every way to a hand edited log file.
-Because of this, many Tcl developers are now out of the habit of maintaining
-this log file.  You may still find useful things in it, but the Timeline is
-a better first place to look now.
-============================================================================
-
-2013-09-19  Don Porter  <dgp@users.sourceforge.net>
-
-	*** 8.6.1 TAGGED FOR RELEASE ***
-
-	* generic/tcl.h:	Bump version number to 8.6.1.
-	* library/init.tcl:
-	* unix/configure.in:
-	* win/configure.in:
-	* unix/tcl.spec:
-	* README:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-2013-09-19  Donal Fellows  <dkf@users.sf.net>
-
-	* doc/next.n (METHOD SEARCH ORDER): Bug [3606943]: Corrected
-	description of method search order.
-
-2013-09-18  Donal Fellows  <dkf@users.sf.net>
-
-	Bump TclOO version to 1.0.1 for release.
-
-2013-09-17  Donal Fellows  <dkf@users.sf.net>
-
-	* generic/tclBinary.c (BinaryEncodeUu, BinaryDecodeUu): [Bug 2152292]:
-	Corrected implementation of the core of uuencode handling so that the
-	line length processing is correctly applied.
-	***POTENTIAL INCOMPATIBILITY***
-	Existing code that was using the old versions and working around the
-	limitations will now need to do far less. The -maxlen option now has
-	strict limits on the range of supported lengths; this is a limitation
-	of the format itself.
-
-2013-09-09  Donal Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOMethod.c (CloneProcedureMethod): [Bug 3609693]: Strip
-	the internal representation of method bodies during cloning in order
-	to ensure that any bound references to instance variables are removed.
-
-2013-09-01  Donal Fellows  <dkf@users.sf.net>
-
-	* generic/tclBinary.c (BinaryDecodeHex): [Bug b98fa55285]: Ensure that
-	whitespace at the end of a string don't cause the decoder to drop the
-	last decoded byte.
-
 2013-08-03  Donal Fellows  <dkf@users.sf.net>

 	* library/auto.tcl: [Patch 3611643]: Allow TclOO classes to be found
@@ -91,13 +36,12 @@ a better first place to look now.

 2013-06-27  Jan Nijtmans  <nijtmans@users.sf.net>

-	* generic/tclConfig.c: Bug [9b2e636361]: Tcl_CreateInterp() needs
-	* generic/tclMain.c:   initialized encodings.
+	* generic/tclConfig.c: Bug [9b2e636361]: Tcl_CreateInterp() needs initialized
+	* generic/tclMain.c:   encodings.

 2013-06-18  Jan Nijtmans  <nijtmans@users.sf.net>

-	* generic/tclEvent.c: Bug [3611974]: InitSubsystems multiple thread
-	issue.
+	* generic/tclEvent.c: Bug [3611974]: InitSubsystems multiple thread issue.

 2013-06-17  Jan Nijtmans  <nijtmans@users.sf.net>

@@ -209,10 +153,10 @@ a better first place to look now.

 	* generic/tclStubInit.c: Add support for Cygwin64, which has a 64-bit
 	* generic/tclDecls.h: "long" type. Binary compatibility with win64
-	requires that all stub entries use 32-bit long's, therefore the need
-	for various wrapper functions/macros. For Tcl 9 a better solution is
-	needed, but that cannot be done without introducing binary
-	incompatibility.
+	requires that all stub entries use 32-bit long's, therefore the
+	need for various wrapper functions/macros. For Tcl 9 a better
+	solution is needed, but that cannot be done without introducing
+	binary incompatibility.

 2013-04-30  Andreas Kupries  <andreask@activestate.com>

@@ -230,8 +174,8 @@ a better first place to look now.

 	* generic/tclDecls.h: Implement Tcl_NewBooleanObj, Tcl_DbNewBooleanObj
 	and Tcl_SetBooleanObj as macros using Tcl_NewIntObj, Tcl_DbNewLongObj
-	and Tcl_SetIntObj. Starting with Tcl 8.5, this is exactly the same, it
-	only eliminates code duplication.
+	and Tcl_SetIntObj. Starting with Tcl 8.5, this is exactly the same,
+	it only eliminates code duplication.
 	* generic/tclInt.h: Eliminate use of NO_WIDE_TYPE everywhere: It's
 	exactly the same as TCL_WIDE_INT_IS_LONG

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

@@ -8164,143 +8164,6 @@ Dropped support for OS X versions less than 10.4 (Tiger) (fellows)

 --- Released 8.6.0, December 20, 2012 --- See ChangeLog for details ---

-2012-12-22 (bug fix)[3598150] DString to Tcl_Obj memleak (afredd)
-
-2012-12-27 (bug fix)[3598580] Tcl_ListObjReplace() refcount fix (nijtmans)
-
-2013-01-04 (bug fix) memleak in [format] compiler (fellows)
-
-2013-01-08 (bug fix)[3092089,3587096] [file normalize] on junction points
-
-2013-01-09 (bug fix)[3599395] status line processing (nijtmans)
-2013-01-23 (bug fix)[2911139] repair async connection management (fellows)
-=> http 2.8.6
-
-2013-01-26 (bug fix)[3601804] Darwin segfault platformCPUID (nijtmans)
-
-2013-01-28 (enhancement) improve ensemble bytecode (fellows)
-
-2013-01-30 (enhancement) selected script code improvements (fradin)
-=> tcltest 2.3.6
-
-2013-01-30 (bug fix)[3599098] update to handle glibc banner changes (kupries)
-=> platform 1.0.11
-
-2013-01-31 (bug fix)[3598282] make install DESTDIR support (cassoff)
-
-2013-02-05 (bug fix)[3603434] [file normalize a:/] flaw in VFS (porter,griffin)
-
-2013-02-09 (bug fix)[3603695] $obj varname resolution rules (venable,fellows)
-
-2013-02-11 (bug fix)[3603553] zlib flushing errors (vampiera,fellows)
-
-2013-02-14 (bug fix)[3604576] msgcat use of Windows registry (oehlmann,nijtmans)
-=> msgcat 1.5.1
-
-2013-02-19 (bug fix)[2438181] report errors in trace handlers (yorick)
-
-2013-02-21 (bug fix)[3605447] unbreak [namespace export -clear] (porter)
-
-2013-02-23 (bug fix)[3599194] fallback IPv6 routines (afredd,max)
-
-2013-02-27 (bug fix)[3606139] stop crash in [regexp] (lane)
-
-2013-03-03 (bug fix)[3606258] major serial port update (english)
-
-2013-03-06 (bug fix)[3606683] [regexp (((((a)*)*)*)*)* {}] hangs
-(grathwohl,lane,porter)
-
-2013-03-12 (enhancement) better build support for Debian arch (shadura)
-
-2013-03-19 (bug fix)[2893771] [file stat] on locked files (thoyts,nijtmans)
-
-2013-03-21 (bug fix)[2102614] [auto_mkindex] ensemble support (griffin)
-
-2013-03-27 Tcl_Zlib*() routines tolerate NULL interps (porter
-
-2013-04-04 (bug fix) Support URLs with query but no path (max)
-=> http 2.8.7
-
-2013-04-08 (bug fix)[3610026] regexp crash on color overflow (linnakangas)
-
-2013-04-29 (enhancement) [array set] compile improvement (fellows)
-
-2013-04-30 (enhancement) broaden glibc version detection (kupries)
-=> platform 1.0.12
-
-2013-05-06 (platform support) Cygwin64 (nijtmans)
-
-2013-05-15 (enhancement) Improved [list {*}...] compile (fellows)
-
-2013-05-16 (platform support) mingw-4.0 (nijtmans)
-
-2013-05-19 (platform support) FreeBSD updates (cerutti)
-
-2013-05-20 (bug fix)[3613567] access error temp file creation (keene)
-
-2013-05-20 (bug fix)[3613569] temp file open fail can crash [load] (keene)
-
-2013-05-22 (bug fix)[3613609] [lsort -nocase] failed on non-ASCII (fellows)
-
-2013-05-28 (bug fix)[3036566] Use language packs (Vista+) locale (oehlmann)
+2013-05-08 (bug fix)[3036566] Honor language packs on Vista+ to get initial locale (oehlmann)
 => msgcat 1.5.2

-2013-05-29 (bug fix)[3614102] [apply {{} {list [if 1]}}] stack woes (porter)
-
-2013-06-03 Restored lost performance appending to long strings (elby,porter)
-
-2013-06-05 (bug fix)[2835313] [while 1 {foo [continue]}] crash (fellows)
-
-2013-06-17 (bug fix)[a876646] [:cntrl:] includes \x00 to \x1f (nijtmans)
-
-2013-06-27 (bug fix)[983509] missing encodings for config values (nijtmans)
-
-2013-06-27 (bug fix)[34538b] apply DST in 2099 (lang)
-
-2013-07-02 (bug fix)[32afa6] corrected dirent64 check (griffin)
-
-2013-07-06 tzdata updated to Olson's tzdata2013d (kenny)
-
-2013-07-10 (bug fix)[86fb5e] [info frame] in compiled ensembles (porter)
-
-2013-07-18 (bug fix)[1c17fb] revisd syntax errorinfo that shows error (porter)
-
-2013-07-26 (bug fix)[6585b2] regexp {(\w).*?\1} abb (lane)
-
-2013-07-29 [string is space \u202f] => 1 (nijtmans)
-
-2013-08-01 [a0bc85] Limited support for fork with threads (for Rivet) (nijtmans)
-
-2013-08-01 (bug fix)[1905562] RE recursion limit increased to support
-reported usage of large expressions (porter)
-
-2013-08-02 (bug fix)[9d6162] superclass slot empty crash (vdgoot,fellows)2013-08-02 (bug fix)[9d6162] superclass slot empty crash (vdgoot,fellows)
-
-2013-08-03 (enhancement)[3611643] [auto_mkindex] support TclOO (fellows)
-
-2013-08-14 (bug fix)[a16752] Missing command delete callbacks (porter)
-
-2013-08-15 (bug fix)[3610404] reresolve traced forwards (porter)
-
-2013-08-15 Errors from execution traces become errors of the command (porter)
-
-2013-08-23 (bug fix)[8ff0cb9] Tcl_NR*Eval*() schedule only, as doc'd (porter)
-
-2013-08-29 (bug fix)[2486550] enable [interp invokehidden {} yield] (porter)
-
-2013-09-01 (bug fix)[b98fa55] [binary decode] fail on whitespace (reche,fellows)
-
-2013-09-07 (bug fix)[86ceb4] have tm path favor first provider (neumann,porter)
-
-2013-09-09 (bug fix)[3609693] copied object member variable confusion (fellows)
-=> TclOO 1.0.1
-
-2013-09-17 (bug fix)[2152292] [binary encode uuencode] corrected (fellows)
-
-2013-09-19 (bug fix)[3487626] segfaults in [dict] compilers (porter)
-
-2013-09-19 (bug fix)[31661d2] mem leak in [lreplace] (ade,porter)
-
-Many optmizations, improvements, and tightened stack management in bytecode.
-
--- Released 8.6.1, Septemer 20, 2013 --- http://core.tcl.tk/tcl/ for details 
@@ -8,7 +8,8 @@
 .TH NRE 3 8.6 Tcl "Tcl Library Procedures"
 .BS
 .SH NAME
-Tcl_NRCreateCommand, Tcl_NRCallObjProc, Tcl_NREvalObj, Tcl_NREvalObjv, Tcl_NRCmdSwap, Tcl_NRExprObj, Tcl_NRAddCallback \- Non-Recursive (stackless) evaluation of Tcl scripts.
+Tcl_NRCreateCommand, Tcl_NRCallObjProc, Tcl_NREvalObj, Tcl_NREvalObjv,
+Tcl_NRCmdSwap, Tcl_NRExprObj, Tcl_NRAddCallback \- Non-Recursive (stackless) evaluation of Tcl scripts.
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -36,13 +36,6 @@ The \fBbinary encode\fR and \fBbinary decode\fR subcommands convert
 binary data to or from string encodings such as base64 (used in MIME
 messages for example).
 .VE 8.6
-.PP
-Note that other operations on binary data, such as taking a subsequence of it,
-getting its length, or reinterpreting it as a string in some encoding, are
-done by other Tcl commands (respectively \fBstring range\fR,
-\fBstring length\fR and \fBencoding convertfrom\fR in the example cases).  A
-binary string in Tcl is merely one where all the characters it contains are in
-the range \eu0000\-\eu00FF.
 .SH "BINARY ENCODE AND DECODE"
 .VS 8.6
 .PP
@@ -102,14 +95,13 @@ between Unix systems and on USENET, but is less common these days, having been
 largely superseded by the \fBbase64\fR binary encoding.
 .RS
 .PP
-During encoding, the following options are supported (though changing them may
-produce files that other implementations of decoders cannot process):
+During encoding, the following options are supported:
+'\" This is wrong! The uuencode format had more complexity than this!
 .TP
 \fB\-maxlen \fIlength\fR
 .
 Indicates that the output should be split into lines of no more than
-\fIlength\fR characters. By default, lines are split every 61 characters, and
-this must be in the range 3 to 85 due to limitations in the encoding.
+\fIlength\fR characters. By default, lines are not split.
 .TP
 \fB\-wrapchar \fIcharacter\fR
 .
@@ -122,11 +114,7 @@ During decoding, the following options are supported:
 .TP
 \fB\-strict\fR
 .
-Instructs the decoder to throw an error if it encounters unexpected whitespace
-characters. Otherwise it ignores them.
-.PP
-Note that neither the encoder nor the decoder handle the header and footer of
-the uuencode format.
+Instructs the decoder to throw an error if it encounters whitespace characters. Otherwise it ignores them.
 .RE
 .VE 8.6
 .SH "BINARY FORMAT"
@@ -867,7 +855,6 @@ architectures, use their textual representation (as produced by
 .PP
 This is a procedure to write a Tcl string to a binary-encoded channel as
 UTF-8 data preceded by a length word:
-.PP
 .CS
 proc \fIwriteString\fR {channel string} {
    set data [encoding convertto utf-8 $string]
@@ -878,7 +865,6 @@ proc \fIwriteString\fR {channel string} {
 .PP
 This procedure reads a string from a channel that was written by the
 previously presented \fIwriteString\fR procedure:
-.PP
 .CS
 proc \fIreadString\fR {channel} {
    if {![\fBbinary scan\fR [read $channel 4] I length]} {
@@ -891,7 +877,6 @@ proc \fIreadString\fR {channel} {
 .PP
 This converts the contents of a file (named in the variable \fIfilename\fR) to
 base64 and prints them:
-.PP
 .CS
 set f [open $filename rb]
 set data [read $f]
@@ -899,10 +884,9 @@ close $f
 puts [\fBbinary encode\fR base64 \-maxlen 64 $data]
 .CE
 .SH "SEE ALSO"
-encoding(n), format(n), scan(n), string(n), tcl_platform(n)
+format(n), scan(n), tcl_platform(n)
 .SH KEYWORDS
 binary, format, scan
 '\" Local Variables:
 '\" mode: nroff
-'\" fill-column: 78
 '\" End:
@@ -484,7 +484,7 @@ not the effective ones.
 .TP
 \fBWindows\fR\0\0\0\0
 .
-The \fBfile owned\fR subcommand currently always reports that the current user
+The \fbfile owned\fR subcommand currently always reports that the current user
 is the owner of the file, without regard for what the operating system
 believes to be true, making an ownership test useless. This issue (#3613671)
 may be fixed in a future release of Tcl.
@@ -62,14 +62,14 @@ The method chain is cached for future use.
 When constructing the method chain, method implementations are searched for in
 the following order:
 .IP [1]
+In the object.
+.IP [2]
 In the classes mixed into the object, in class traversal order. The list of
 mixins is checked in natural order.
-.IP [2]
+.IP [3]
 In the classes mixed into the classes of the object, with sources of mixing in
 being searched in class traversal order. Within each class, the list of mixins
 is processed in natural order.
-.IP [3]
-In the object itself.
 .IP [4]
 In the object's class.
 .IP [5]
@@ -77,10 +77,7 @@ In the superclasses of the class, following each superclass in a depth-first
 fashion in the natural order of the superclass list.
 .PP
 Any particular method implementation always comes as \fIlate\fR in the
-resulting list of implementations as possible; this means that if some class,
-A, is both mixed into a class, B, and is also a superclass of B, the instances
-of B will always treat A as a superclass from the perspective of inheritance.
-This is true even when the multiple inheritance is processed indirectly.
+resulting list of implementations as possible.
 .SS FILTERS
 .PP
 When an object has a list of filter names set upon it, or is an instance of a
@@ -56,10 +56,10 @@ extern "C" {
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   6
 #define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
-#define TCL_RELEASE_SERIAL  1
+#define TCL_RELEASE_SERIAL  0

 #define TCL_VERSION	    "8.6"
-#define TCL_PATCH_LEVEL	    "8.6.1"
+#define TCL_PATCH_LEVEL	    "8.6.0"

 /*
 *----------------------------------------------------------------------------
@@ -2617,7 +2617,6 @@ AllocBB(
    bb->minStackDepth = 0;
    bb->maxStackDepth = 0;
    bb->finalStackDepth = 0;
-    bb->catchDepth = 0;
    bb->enclosingCatch = NULL;
    bb->foreignExceptionBase = -1;
    bb->foreignExceptionCount = 0;
@@ -147,7 +147,7 @@ static int		TEOV_NotFound(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], Namespace *lookupNsPtr);
 static int		TEOV_RunEnterTraces(Tcl_Interp *interp,
 			    Command **cmdPtrPtr, Tcl_Obj *commandPtr, int objc,
-			    Tcl_Obj *const objv[]);
+			    Tcl_Obj *const objv[], Namespace *lookupNsPtr);
 static Tcl_NRPostProc	RewindCoroutineCallback;
 static Tcl_NRPostProc	TailcallCleanup;
 static Tcl_NRPostProc	TEOEx_ByteCodeCallback;
@@ -161,7 +161,6 @@ static Tcl_NRPostProc	EvalObjvCore;
 static Tcl_NRPostProc	Dispatch;

 static Tcl_ObjCmdProc NRCoroInjectObjCmd;
-static Tcl_NRPostProc NRPostInvoke;

 MODULE_SCOPE const TclStubs tclStubs;

@@ -2175,8 +2174,7 @@ Tcl_CreateCommand(
 *
 * Side effects:
 *	If a command named "cmdName" already exists for interp, it is
- *	first deleted.  Then the new command is created from the arguments.
- *	[***] (See below for exception).
+ * 	first deleted.  Then the new command is created from the arguments.
 *
 *	In the future, during bytecode evaluation when "cmdName" is seen as
 *	the name of a command by Tcl_EvalObj or Tcl_Eval, the object-based
@@ -2243,27 +2241,8 @@ Tcl_CreateObjCommand(
    if (!isNew) {
 	cmdPtr = Tcl_GetHashValue(hPtr);

-	/* Command already exists. */
-
 	/*
-	 * [***] This is wrong.  See Tcl Bug a16752c252.  
-	 * However, this buggy behavior is kept under particular
-	 * circumstances to accommodate deployed binaries of the
-	 * "tclcompiler" program. http://sourceforge.net/projects/tclpro/
-	 * that crash if the bug is fixed.
-	 */
-
-	if (cmdPtr->objProc == TclInvokeStringCommand
-		&& cmdPtr->clientData == clientData
-		&& cmdPtr->deleteData == clientData
-		&& cmdPtr->deleteProc == deleteProc) {
-	    cmdPtr->objProc = proc;
-	    cmdPtr->objClientData = clientData;
-	    return (Tcl_Command) cmdPtr;
-	}
-
-	/*
-	 * Otherwise, we delete the old command. Be careful to preserve any
+	 * Command already exists; delete it. 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.
@@ -4140,23 +4119,13 @@ EvalObjvCore(
    Tcl_Interp *interp,
    int result)
 {
-    Command *cmdPtr = NULL, *preCmdPtr = data[0];
+    Command *cmdPtr = data[0];
    int flags = PTR2INT(data[1]);
    int objc = PTR2INT(data[2]);
    Tcl_Obj **objv = data[3];
    Interp *iPtr = (Interp *) interp;
-    Namespace *lookupNsPtr = NULL;
-    int enterTracesDone = 0;
+    Namespace *lookupNsPtr = iPtr->lookupNsPtr;
    
-    /*
-     * Push records for task to be done on return, in INVERSE order. First, if
-     * needed, the exception handlers (as they should happen last).
-     */
-
-    if (!(flags & TCL_EVAL_NOERR)) {
-	TEOV_PushExceptionHandlers(interp, objc, objv, flags);
-    }
-
    if (TCL_OK != TclInterpReady(interp)) {
 	return TCL_ERROR;
    }
@@ -4169,121 +4138,73 @@ EvalObjvCore(
 	return TCL_ERROR;
    }

+    iPtr->lookupNsPtr = NULL;
+
+    if (cmdPtr) {
+	goto commandFound;
+    }
+
+    /*
+     * Push records for task to be done on return, in INVERSE order. First, if
+     * needed, the exception handlers (as they should happen last).
+     */
+
+    if (!(flags & TCL_EVAL_NOERR)) {
+	TEOV_PushExceptionHandlers(interp, objc, objv, flags);
+    }
+
    /*
     * Configure evaluation context to match the requested flags.
     */

-    if (iPtr->lookupNsPtr) {
-
-	/*
-	 * Capture the namespace we should do command name resolution in, as
-	 * instructed by our caller sneaking it in to us in a private interp
-	 * field.  Clear that field right away so we cannot possibly have its
-	 * use leak where it should not.  The sneaky message pass is done.
-	 *
-	 * Use of this mechanism overrides the TCL_EVAL_GLOBAL flag.
-	 * TODO: Is that a bug?
-	 */
-
-	lookupNsPtr = iPtr->lookupNsPtr;
-	iPtr->lookupNsPtr = NULL;
-    } else if (flags & TCL_EVAL_INVOKE) {
-	lookupNsPtr = iPtr->globalNsPtr;
+    if ((flags & TCL_EVAL_INVOKE) || lookupNsPtr) {
+	if (!lookupNsPtr) {
+	    lookupNsPtr = iPtr->globalNsPtr;
+	}
    } else {
+	if (flags & TCL_EVAL_GLOBAL) {
+	    TEOV_SwitchVarFrame(interp);
+	    lookupNsPtr = iPtr->globalNsPtr;
+	}

 	/*
 	 * TCL_EVAL_INVOKE was not set: clear rewrite rules
 	 */

 	iPtr->ensembleRewrite.sourceObjs = NULL;
-
-	if (flags & TCL_EVAL_GLOBAL) {
-	    TEOV_SwitchVarFrame(interp);
-	    lookupNsPtr = iPtr->globalNsPtr;
-	}
    }

    /*
-     * Lookup the Command to dispatch.
+     * Lookup the command
     */

-    reresolve:
-    assert(cmdPtr == NULL);
-    if (preCmdPtr) {
-	/* Caller gave it to us */
-	if (!(preCmdPtr->flags & CMD_IS_DELETED)) {
-	    /* So long as it exists, use it. */
-	    cmdPtr = preCmdPtr;
-	} else if (flags & TCL_EVAL_NORESOLVE) {
-	    /*
-	     * When it's been deleted, and we're told not to attempt
-	     * resolving it ourselves, all we can do is raise an error.
-	     */
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "attempt to invoke a deleted command"));
-	    Tcl_SetErrorCode(interp, "TCL", "EVAL", "DELETEDCOMMAND", NULL);
-	    return TCL_ERROR;
-	}
+    cmdPtr = TEOV_LookupCmdFromObj(interp, objv[0], lookupNsPtr);
+    if (!cmdPtr) {
+	return TEOV_NotFound(interp, objc, objv, lookupNsPtr);
    }
-    if (cmdPtr == NULL) {
-	cmdPtr = TEOV_LookupCmdFromObj(interp, objv[0], lookupNsPtr);
+
+    /*
+     * Found a command! The real work begins now ...
+     */
+
+  commandFound:
+    if (iPtr->tracePtr || (cmdPtr->flags & CMD_HAS_EXEC_TRACES)) {
+	/*
+	 * Call enter traces. They will schedule a call to the leave traces if
+	 * necessary.
+	 */
+
+	result = TEOV_RunEnterTraces(interp, &cmdPtr, TclGetSourceFromFrame(
+		flags & TCL_EVAL_SOURCE_IN_FRAME ?  iPtr->cmdFramePtr : NULL,
+		objc, objv), objc, objv, lookupNsPtr);
+	if (result != TCL_OK) {
+	    return result;
+	}
 	if (!cmdPtr) {
 	    return TEOV_NotFound(interp, objc, objv, lookupNsPtr);
 	}
    }

-    if (enterTracesDone || iPtr->tracePtr
-	    || (cmdPtr->flags & CMD_HAS_EXEC_TRACES)) {
-
-	Tcl_Obj *commandPtr = TclGetSourceFromFrame(
-		flags & TCL_EVAL_SOURCE_IN_FRAME ?  iPtr->cmdFramePtr : NULL,
-		objc, objv);
-	Tcl_IncrRefCount(commandPtr);
-
-	if (!enterTracesDone) {
-
-	    int code = TEOV_RunEnterTraces(interp, &cmdPtr, commandPtr,
-		    objc, objv);
-
-	    /*
-	     * Send any exception from enter traces back as an exception
-	     * raised by the traced command.
-	     * TODO: Is this a bug?  Letting an execution trace BREAK or
-	     * CONTINUE or RETURN in the place of the traced command?
-	     * Would either converting all exceptions to TCL_ERROR, or
-	     * just swallowing them be better?  (Swallowing them has the
-	     * problem of permanently hiding program errors.)
-	     */
-
-	    if (code != TCL_OK) {
-		Tcl_DecrRefCount(commandPtr);
-		return code;
-	    }
-
-	    /*
-	     * If the enter traces made the resolved cmdPtr unusable, go
-	     * back and resolve again, but next time don't run enter
-	     * traces again.
-	     */
-
-	    if (cmdPtr == NULL) {
-		enterTracesDone = 1;
-		Tcl_DecrRefCount(commandPtr);
-		goto reresolve;
-	    }
-	}
-
-	/* 
-	 * Schedule leave traces.  Raise the refCount on the resolved
-	 * cmdPtr, so that when it passes to the leave traces we know
-	 * it's still valid.
-	 */
-
-	cmdPtr->refCount++;
-	TclNRAddCallback(interp, TEOV_RunLeaveTraces, INT2PTR(objc),
-		    commandPtr, cmdPtr, objv);
-    }
-
    TclNRAddCallback(interp, Dispatch,
 	    cmdPtr->nreProc ? cmdPtr->nreProc : cmdPtr->objProc,
 	    cmdPtr->objClientData, INT2PTR(objc), objv);
@@ -4361,6 +4282,7 @@ TclNRRunCallbacks(
 	(void) Tcl_GetObjResult(interp);
    }

+    iPtr->execEnvPtr->stackLevel++;
    while (TOP_CB(interp) != rootPtr) {
 	callbackPtr = TOP_CB(interp);
 	procPtr = callbackPtr->procPtr;
@@ -4368,6 +4290,7 @@ TclNRRunCallbacks(
 	result = procPtr(callbackPtr->data, interp, result);
 	TCLNR_FREE(interp, callbackPtr);
    }
+    iPtr->execEnvPtr->stackLevel--;
    return result;
 }

@@ -4671,19 +4594,25 @@ TEOV_RunEnterTraces(
    Command **cmdPtrPtr,
    Tcl_Obj *commandPtr,
    int objc,
-    Tcl_Obj *const objv[])
+    Tcl_Obj *const objv[],
+    Namespace *lookupNsPtr)
 {
    Interp *iPtr = (Interp *) interp;
    Command *cmdPtr = *cmdPtrPtr;
-    int newEpoch, cmdEpoch = cmdPtr->cmdEpoch;
-    int length, traceCode = TCL_OK;
-    const char *command = Tcl_GetStringFromObj(commandPtr, &length);
+    int traceCode = TCL_OK;
+    int cmdEpoch = cmdPtr->cmdEpoch;
+    int newEpoch;
+    const char *command;
+    int length;
+
+    Tcl_IncrRefCount(commandPtr);
+    command = Tcl_GetStringFromObj(commandPtr, &length);

    /*
     * Call trace functions.
     * Execute any command or execution traces. Note that we bump up the
-     * command's reference count for the duration of the calling of the
-     * traces so that the structure doesn't go away underneath our feet.
+     * command's reference count for the duration of the calling of the traces
+     * so that the structure doesn't go away underneath our feet.
     */

    cmdPtr->refCount++;
@@ -4698,22 +4627,29 @@ TEOV_RunEnterTraces(
    newEpoch = cmdPtr->cmdEpoch;
    TclCleanupCommandMacro(cmdPtr);

-    if (traceCode != TCL_OK) {
-	if (traceCode == TCL_ERROR) {
-	    Tcl_Obj *info;
+    /*
+     * If the traces modified/deleted the command or any existing traces, they
+     * will update the command's epoch. We need to lookup again, but do not
+     * run enter traces on the newly found cmdPtr.
+     */

-	    TclNewLiteralStringObj(info, "\n    (enter trace on \"");
-	    Tcl_AppendLimitedToObj(info, command, length, 55, "...");
-	    Tcl_AppendToObj(info, "\")", 2);
-	    Tcl_AppendObjToErrorInfo(interp, info);
-	    iPtr->flags |= ERR_ALREADY_LOGGED;
-	}
-	return traceCode;
-    }
    if (cmdEpoch != newEpoch) {
-	*cmdPtrPtr = NULL;
+	cmdPtr = TEOV_LookupCmdFromObj(interp, objv[0], lookupNsPtr);
+	*cmdPtrPtr = cmdPtr;
    }
-    return TCL_OK;
+
+    if (cmdPtr && (traceCode == TCL_OK)) {
+	/*
+	 * Command was found: push a record to schedule the leave traces.
+	 */
+
+	TclNRAddCallback(interp, TEOV_RunLeaveTraces, INT2PTR(objc),
+		commandPtr, cmdPtr, objv);
+	cmdPtr->refCount++;
+    } else {
+	Tcl_DecrRefCount(commandPtr);
+    }
+    return traceCode;
 }

 static int
@@ -4728,10 +4664,12 @@ TEOV_RunLeaveTraces(
    Tcl_Obj *commandPtr = data[1];
    Command *cmdPtr = data[2];
    Tcl_Obj **objv = data[3];
-    int length;
-    const char *command = Tcl_GetStringFromObj(commandPtr, &length);
+

    if (!(cmdPtr->flags & CMD_IS_DELETED)) {
+	int length;
+	const char *command = Tcl_GetStringFromObj(commandPtr, &length);
+
 	if (cmdPtr->flags & CMD_HAS_EXEC_TRACES){
 	    traceCode = TclCheckExecutionTraces(interp, command, length,
 		    cmdPtr, result, TCL_TRACE_LEAVE_EXEC, objc, objv);
@@ -4741,6 +4679,7 @@ TEOV_RunLeaveTraces(
 		    cmdPtr, result, TCL_TRACE_LEAVE_EXEC, objc, objv);
 	}
    }
+    Tcl_DecrRefCount(commandPtr);

    /*
     * As cmdPtr is set, TclNRRunCallbacks is about to reduce the numlevels.
@@ -4751,18 +4690,8 @@ TEOV_RunLeaveTraces(
    TclCleanupCommandMacro(cmdPtr);

    if (traceCode != TCL_OK) {
-	if (traceCode == TCL_ERROR) {
-	    Tcl_Obj *info;
-
-	    TclNewLiteralStringObj(info, "\n    (leave trace on \"");
-	    Tcl_AppendLimitedToObj(info, command, length, 55, "...");
-	    Tcl_AppendToObj(info, "\")", 2);
-	    Tcl_AppendObjToErrorInfo(interp, info);
-	    iPtr->flags |= ERR_ALREADY_LOGGED;
-	}
-	result = traceCode;
+	return traceCode;
    }
-    Tcl_DecrRefCount(commandPtr);
    return result;
 }

@@ -4778,6 +4707,7 @@ TEOV_LookupCmdFromObj(

    if (lookupNsPtr) {
 	iPtr->varFramePtr->nsPtr = lookupNsPtr;
+	iPtr->lookupNsPtr = NULL;
    }
    cmdPtr = (Command *) Tcl_GetCommandFromObj(interp, namePtr);
    iPtr->varFramePtr->nsPtr = savedNsPtr;
@@ -6531,33 +6461,31 @@ TclObjInvoke(
    int flags)			/* Combination of flags controlling the call:
 				 * TCL_INVOKE_HIDDEN, TCL_INVOKE_NO_UNKNOWN,
 				 * or TCL_INVOKE_NO_TRACEBACK. */
-{
-    if (interp == NULL) {
-	return TCL_ERROR;
-    }
-    if ((objc < 1) || (objv == NULL)) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                "illegal argument vector", -1));
-	return TCL_ERROR;
-    }
-    if ((flags & TCL_INVOKE_HIDDEN) == 0) {
-	Tcl_Panic("TclObjInvoke: called without TCL_INVOKE_HIDDEN");
-    }
-    return Tcl_NRCallObjProc(interp, TclNRInvoke, NULL, objc, objv);
-}
-
-int
-TclNRInvoke(
-    ClientData clientData,
-    Tcl_Interp *interp,
-    int objc,
-    Tcl_Obj *const objv[])
 {
    register Interp *iPtr = (Interp *) interp;
    Tcl_HashTable *hTblPtr;	/* Table of hidden commands. */
    const char *cmdName;	/* Name of the command from objv[0]. */
    Tcl_HashEntry *hPtr = NULL;
    Command *cmdPtr;
+    int result;
+
+    if (interp == NULL) {
+	return TCL_ERROR;
+    }
+
+    if ((objc < 1) || (objv == NULL)) {
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(
+                "illegal argument vector", -1));
+	return TCL_ERROR;
+    }
+
+    if ((flags & TCL_INVOKE_HIDDEN) == 0) {
+	Tcl_Panic("TclObjInvoke: called without TCL_INVOKE_HIDDEN");
+    }
+
+    if (TclInterpReady(interp) == TCL_ERROR) {
+	return TCL_ERROR;
+    }

    cmdName = TclGetString(objv[0]);
    hTblPtr = iPtr->hiddenCmdTablePtr;
@@ -6573,27 +6501,36 @@ TclNRInvoke(
    }
    cmdPtr = Tcl_GetHashValue(hPtr);

-    /* Avoid the exception-handling brain damage when numLevels == 0 . */
-    iPtr->numLevels++;
-    Tcl_NRAddCallback(interp, NRPostInvoke, NULL, NULL, NULL, NULL);
-
    /*
-     * Normal command resolution of objv[0] isn't going to find cmdPtr.
-     * That's the whole point of **hidden** commands.  So tell the
-     * Eval core machinery not to even try (and risk finding something wrong).
+     * Invoke the command function.
     */

-    return TclNREvalObjv(interp, objc, objv, TCL_EVAL_NORESOLVE, cmdPtr);
-}
+    iPtr->cmdCount++;
+    if (cmdPtr->objProc != NULL) {
+	result = cmdPtr->objProc(cmdPtr->objClientData, interp, objc, objv);
+    } else {
+	result = Tcl_NRCallObjProc(interp, cmdPtr->nreProc,
+		cmdPtr->objClientData, objc, objv);
+    }

-static int
-NRPostInvoke(
-    ClientData clientData[],
-    Tcl_Interp *interp,
-    int result)
-{
-    Interp *iPtr = (Interp *)interp;
-    iPtr->numLevels--;
+    /*
+     * If an error occurred, record information about what was being executed
+     * when the error occurred.
+     */
+
+    if ((result == TCL_ERROR)
+	    && ((flags & TCL_INVOKE_NO_TRACEBACK) == 0)
+	    && ((iPtr->flags & ERR_ALREADY_LOGGED) == 0)) {
+	int length;
+	Tcl_Obj *command = Tcl_NewListObj(objc, objv);
+	const char *cmdString;
+
+	Tcl_IncrRefCount(command);
+	cmdString = Tcl_GetStringFromObj(command, &length);
+	Tcl_LogCommandInfo(interp, cmdString, cmdString, length);
+	Tcl_DecrRefCount(command);
+	iPtr->flags &= ~ERR_ALREADY_LOGGED;
+    }
    return result;
 }

@@ -8141,8 +8078,7 @@ Tcl_NRCmdSwap(
    Tcl_Obj *const objv[],
    int flags)
 {
-    return TclNREvalObjv(interp, objc, objv, flags|TCL_EVAL_NOERR,
-	    (Command *) cmd);
+    return TclNREvalObjv(interp, objc, objv, flags, (Command *) cmd);
 }

 /*****************************************************************************
@@ -8576,7 +8512,7 @@ NRCoroutineExitCallback(
    TclDeleteExecEnv(corPtr->eePtr);
    corPtr->eePtr = NULL;

-    corPtr->stackLevel = NULL;
+    corPtr->stackLevel = -1;

    /*
     * #280.
@@ -8620,10 +8556,9 @@ TclNRCoroutineActivateCallback(
 {
    CoroutineData *corPtr = data[0];
    int type = PTR2INT(data[1]);
-    int numLevels, unused;
-    int *stackLevel = &unused;
+    int numLevels;

-    if (!corPtr->stackLevel) {
+    if (COR_IS_SUSPENDED(corPtr)) {
        /*
         * -- Coroutine is suspended --
         * Push the callback to restore the caller's context on yield or
@@ -8638,7 +8573,7 @@ TclNRCoroutineActivateCallback(
         * the interp's environment to make it suitable to run this coroutine.
         */

-        corPtr->stackLevel = stackLevel;
+        corPtr->stackLevel = corPtr->eePtr->stackLevel;
        numLevels = corPtr->auxNumLevels;
        corPtr->auxNumLevels = iPtr->numLevels;

@@ -8652,7 +8587,7 @@ TclNRCoroutineActivateCallback(
         * Coroutine is active: yield
         */

-        if (corPtr->stackLevel != stackLevel) {
+        if (corPtr->stackLevel != corPtr->eePtr->stackLevel) {
            Tcl_SetObjResult(interp, Tcl_NewStringObj(
                    "cannot yield: C stack busy", -1));
            Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "CANT_YIELD",
@@ -8668,7 +8603,7 @@ TclNRCoroutineActivateCallback(
            Tcl_Panic("Yield received an option which is not implemented");
        }

-        corPtr->stackLevel = NULL;
+        corPtr->stackLevel = -1;

        numLevels = iPtr->numLevels;
        iPtr->numLevels = corPtr->auxNumLevels;
@@ -8912,7 +8847,7 @@ TclNRCoroutineObjCmd(
    corPtr->running.varFramePtr = iPtr->rootFramePtr;
    corPtr->running.cmdFramePtr = NULL;
    corPtr->running.lineLABCPtr = corPtr->lineLABCPtr;
-    corPtr->stackLevel = NULL;
+    corPtr->stackLevel = -1;
    corPtr->auxNumLevels = 0;

    /*
@@ -87,13 +87,10 @@ static int		BinaryDecodeHex(ClientData clientData,
 static int		BinaryEncode64(ClientData clientData,
 			    Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
-static int		BinaryDecode64(ClientData clientData,
+static int		BinaryDecodeUu(ClientData clientData,
 			    Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
-static int		BinaryEncodeUu(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		BinaryDecodeUu(ClientData clientData,
+static int		BinaryDecode64(ClientData clientData,
 			    Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);

@@ -142,9 +139,9 @@ static const EnsembleImplMap binaryMap[] = {
    { NULL, NULL, NULL, NULL, NULL, 0 }
 };
 static const EnsembleImplMap encodeMap[] = {
-    { "hex",      BinaryEncodeHex, TclCompileBasic1ArgCmd, NULL, NULL, 0 },
-    { "uuencode", BinaryEncodeUu,  NULL, NULL, NULL, 0 },
-    { "base64",   BinaryEncode64,  NULL, NULL, NULL, 0 },
+    { "hex",      BinaryEncodeHex, TclCompileBasic1ArgCmd, NULL, (ClientData)HexDigits, 0 },
+    { "uuencode", BinaryEncode64,  NULL, NULL, (ClientData)UueDigits, 0 },
+    { "base64",   BinaryEncode64,  NULL, NULL, (ClientData)B64Digits, 0 },
    { NULL, NULL, NULL, NULL, NULL, 0 }
 };
 static const EnsembleImplMap decodeMap[] = {
@@ -2315,6 +2312,7 @@ BinaryEncodeHex(
    Tcl_Obj *resultObj = NULL;
    unsigned char *data = NULL;
    unsigned char *cursor = NULL;
+    const char *digits = clientData;
    int offset = 0, count = 0;

    if (objc != 2) {
@@ -2326,8 +2324,8 @@ BinaryEncodeHex(
    data = Tcl_GetByteArrayFromObj(objv[1], &count);
    cursor = Tcl_SetByteArrayLength(resultObj, count * 2);
    for (offset = 0; offset < count; ++offset) {
-	*cursor++ = HexDigits[((data[offset] >> 4) & 0x0f)];
-	*cursor++ = HexDigits[(data[offset] & 0x0f)];
+	*cursor++ = digits[((data[offset] >> 4) & 0x0f)];
+	*cursor++ = digits[(data[offset] & 0x0f)];
    }
    Tcl_SetObjResult(interp, resultObj);
    return TCL_OK;
@@ -2388,32 +2386,29 @@ BinaryDecodeHex(
    while (data < dataend) {
 	value = 0;
 	for (i=0 ; i<2 ; i++) {
-	    if (data >= dataend) {
-		value <<= 4;
-		break;
-	    }
+	    if (data < dataend) {
+		c = *data++;

-	    c = *data++;
-	    if (!isxdigit((int) c)) {
-		if (strict || !isspace(c)) {
-		    goto badChar;
+		if (!isxdigit((int) c)) {
+		    if (strict || !isspace(c)) {
+			goto badChar;
+		    }
+		    i--;
+		    continue;
 		}
-		i--;
-		continue;
+		value <<= 4;
+		c -= '0';
+		if (c > 9) {
+		    c += ('0' - 'A') + 10;
+		}
+		if (c > 16) {
+		    c += ('A' - 'a');
+		}
+		value |= (c & 0xf);
+	    } else {
+		value <<= 4;
+		cut++;
 	    }
-
-	    value <<= 4;
-	    c -= '0';
-	    if (c > 9) {
-		c += ('0' - 'A') + 10;
-	    }
-	    if (c > 16) {
-		c += ('A' - 'a');
-	    }
-	    value |= (c & 0xf);
-	}
-	if (i < 2) {
-	    cut++;
 	}
 	*cursor++ = UCHAR(value);
 	value = 0;
@@ -2441,7 +2436,7 @@ BinaryDecodeHex(
 *	This implements a generic 6 bit binary encoding. Input is broken into
 *	6 bit chunks and a lookup table passed in via clientData is used to
 *	turn these values into output characters. This is used to implement
- *	base64 binary encodings.
+ *	base64 and uuencode binary encodings.
 *
 * Results:
 *	Interp result set to an encoded byte array object
@@ -2477,6 +2472,7 @@ BinaryEncode64(
 {
    Tcl_Obj *resultObj;
    unsigned char *data, *cursor, *limit;
+    const char *digits = clientData;
    int maxlen = 0;
    const char *wrapchar = "\n";
    int wrapcharlen = 1;
@@ -2499,12 +2495,6 @@ BinaryEncode64(
 	    if (Tcl_GetIntFromObj(interp, objv[i+1], &maxlen) != TCL_OK) {
 		return TCL_ERROR;
 	    }
-	    if (maxlen < 0) {
-		Tcl_SetResult(interp, "line length out of range", TCL_STATIC);
-		Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
-			"LINE_LENGTH", NULL);
-		return TCL_ERROR;
-	    }
 	    break;
 	case OPT_WRAPCHAR:
 	    wrapchar = Tcl_GetStringFromObj(objv[i+1], &wrapcharlen);
@@ -2535,17 +2525,17 @@ BinaryEncode64(
 	    for (i = 0; i < 3 && offset+i < count; ++i) {
 		d[i] = data[offset + i];
 	    }
-	    OUTPUT(B64Digits[d[0] >> 2]);
-	    OUTPUT(B64Digits[((d[0] & 0x03) << 4) | (d[1] >> 4)]);
+	    OUTPUT(digits[d[0] >> 2]);
+	    OUTPUT(digits[((d[0] & 0x03) << 4) | (d[1] >> 4)]);
 	    if (offset+1 < count) {
-		OUTPUT(B64Digits[((d[1] & 0x0f) << 2) | (d[2] >> 6)]);
+		OUTPUT(digits[((d[1] & 0x0f) << 2) | (d[2] >> 6)]);
 	    } else {
-		OUTPUT(B64Digits[64]);
+		OUTPUT(digits[64]);
 	    }
 	    if (offset+2 < count) {
-		OUTPUT(B64Digits[d[2] & 0x3f]);
+		OUTPUT(digits[d[2] & 0x3f]);
 	    } else {
-		OUTPUT(B64Digits[64]);
+		OUTPUT(digits[64]);
 	    }
 	}
    }
@@ -2554,124 +2544,6 @@ BinaryEncode64(
 }
 #undef OUTPUT

-/*
- *----------------------------------------------------------------------
- *
- * BinaryEncodeUu --
- *
- *	This implements the uuencode binary encoding. Input is broken into 6
- *	bit chunks and a lookup table is used to turn these values into output
- *	characters. This differs from the generic code above in that line
- *	lengths are also encoded.
- *
- * Results:
- *	Interp result set to an encoded byte array object
- *
- * Side effects:
- *	None
- *
- *----------------------------------------------------------------------
- */
-
-static int
-BinaryEncodeUu(
-    ClientData clientData,
-    Tcl_Interp *interp,
-    int objc,
-    Tcl_Obj *const objv[])
-{
-    Tcl_Obj *resultObj;
-    unsigned char *data, *start, *cursor;
-    int offset, count, rawLength, n, i, j, bits, index;
-    int lineLength = 61;
-    const unsigned char SingleNewline[] = { (unsigned char) '\n' };
-    const unsigned char *wrapchar = SingleNewline;
-    int wrapcharlen = sizeof(SingleNewline);
-    enum { OPT_MAXLEN, OPT_WRAPCHAR };
-    static const char *const optStrings[] = { "-maxlen", "-wrapchar", NULL };
-
-    if (objc < 2 || objc%2 != 0) {
-	Tcl_WrongNumArgs(interp, 1, objv,
-		"?-maxlen len? ?-wrapchar char? data");
-	return TCL_ERROR;
-    }
-    for (i = 1; i < objc-1; i += 2) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], optStrings, "option",
-		TCL_EXACT, &index) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	switch (index) {
-	case OPT_MAXLEN:
-	    if (Tcl_GetIntFromObj(interp, objv[i+1], &lineLength) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    if (lineLength < 3 || lineLength > 85) {
-		Tcl_SetResult(interp, "line length out of range", TCL_STATIC);
-		Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
-			"LINE_LENGTH", NULL);
-		return TCL_ERROR;
-	    }
-	    break;
-	case OPT_WRAPCHAR:
-	    wrapchar = Tcl_GetByteArrayFromObj(objv[i+1], &wrapcharlen);
-	    break;
-	}
-    }
-
-    /*
-     * Allocate the buffer. This is a little bit too long, but is "good
-     * enough".
-     */
-
-    resultObj = Tcl_NewObj();
-    offset = 0;
-    data = Tcl_GetByteArrayFromObj(objv[objc-1], &count);
-    rawLength = (lineLength - 1) * 3 / 4;
-    start = cursor = Tcl_SetByteArrayLength(resultObj,
-	    (lineLength + wrapcharlen) *
-	    ((count + (rawLength - 1)) / rawLength));
-    n = bits = 0;
-
-    /*
-     * Encode the data. Each output line first has the length of raw data
-     * encoded by the output line described in it by one encoded byte, then
-     * the encoded data follows (encoding each 6 bits as one character).
-     * Encoded lines are always terminated by a newline.
-     */
-
-    while (offset < count) {
-	int lineLen = count - offset;
-
-	if (lineLen > rawLength) {
-	    lineLen = rawLength;
-	}
-	*cursor++ = UueDigits[lineLen];
-	for (i=0 ; i<lineLen ; i++) {
-	    n <<= 8;
-	    n |= data[offset++];
-	    for (bits += 8; bits > 6 ; bits -= 6) {
-		*cursor++ = UueDigits[(n >> (bits-6)) & 0x3f];
-	    }
-	}
-	if (bits > 0) {
-	    n <<= 8;
-	    *cursor++ = UueDigits[(n >> (bits + 2)) & 0x3f];
-	    bits = 0;
-	}
-	for (j=0 ; j<wrapcharlen ; ++j) {
-	    *cursor++ = wrapchar[j];
-	}
-    }
-
-    /*
-     * Fix the length of the output bytearray.
-     */
-
-    Tcl_SetByteArrayLength(resultObj, cursor-start);
-    Tcl_SetObjResult(interp, resultObj);
-    return TCL_OK;
-}
-
 /*
 *----------------------------------------------------------------------
 *
@@ -2698,8 +2570,8 @@ BinaryDecodeUu(
    Tcl_Obj *resultObj = NULL;
    unsigned char *data, *datastart, *dataend;
    unsigned char *begin, *cursor;
-    int i, index, size, count = 0, strict = 0, lineLen;
-    unsigned char c;
+    int i, index, size, count = 0, cut = 0, strict = 0;
+    char c;
    enum {OPT_STRICT };
    static const char *const optStrings[] = { "-strict", NULL };

@@ -2725,112 +2597,44 @@ BinaryDecodeUu(
    dataend = data + count;
    size = ((count + 3) & ~3) * 3 / 4;
    begin = cursor = Tcl_SetByteArrayLength(resultObj, size);
-    lineLen = -1;
-
-    /*
-     * The decoding loop. First, we get the length of line (strictly, the
-     * number of data bytes we expect to generate from the line) we're
-     * processing this time round if it is not already known (i.e., when the
-     * lineLen variable is set to the magic value, -1).
-     */
-
    while (data < dataend) {
 	char d[4] = {0, 0, 0, 0};

-	if (lineLen < 0) {
-	    c = *data++;
-	    if (c < 32 || c > 96) {
-		if (strict || !isspace(c)) {
-		    goto badUu;
-		}
-		i--;
-		continue;
-	    }
-	    lineLen = (c - 32) & 0x3f;
-	}
-
-	/*
-	 * Now we read a four-character grouping.
-	 */
-
 	for (i=0 ; i<4 ; i++) {
 	    if (data < dataend) {
 		d[i] = c = *data++;
-		if (c < 32 || c > 96) {
-		    if (strict) {
-			if (!isspace(c)) {
-			    goto badUu;
-			} else if (c == '\n') {
-			    goto shortUu;
-			}
+		if (c < 33 || c > 96) {
+		    if (strict || !isspace(UCHAR(c))) {
+			goto badUu;
 		    }
 		    i--;
 		    continue;
 		}
+	    } else {
+		cut++;
 	    }
 	}
-
-	/*
-	 * Translate that grouping into (up to) three binary bytes output.
-	 */
-
-	if (lineLen > 0) {
-	    *cursor++ = (((d[0] - 0x20) & 0x3f) << 2)
-		    | (((d[1] - 0x20) & 0x3f) >> 4);
-	    if (--lineLen > 0) {
-		*cursor++ = (((d[1] - 0x20) & 0x3f) << 4)
-			| (((d[2] - 0x20) & 0x3f) >> 2);
-		if (--lineLen > 0) {
-		    *cursor++ = (((d[2] - 0x20) & 0x3f) << 6)
-			    | (((d[3] - 0x20) & 0x3f));
-		    lineLen--;
-		}
-	    }
-	}
-
-	/*
-	 * If we've reached the end of the line, skip until we process a
-	 * newline.
-	 */
-
-	if (lineLen == 0 && data < dataend) {
-	    lineLen = -1;
-	    do {
-		c = *data++;
-		if (c == '\n') {
-		    break;
-		} else if (c >= 32 && c <= 96) {
-		    data--;
-		    break;
-		} else if (strict || !isspace(c)) {
-		    goto badUu;
-		}
-	    } while (data < dataend);
+	if (cut > 3) {
+	    cut = 3;
 	}
+	*cursor++ = (((d[0] - 0x20) & 0x3f) << 2)
+		| (((d[1] - 0x20) & 0x3f) >> 4);
+	*cursor++ = (((d[1] - 0x20) & 0x3f) << 4)
+		| (((d[2] - 0x20) & 0x3f) >> 2);
+	*cursor++ = (((d[2] - 0x20) & 0x3f) << 6)
+		| (((d[3] - 0x20) & 0x3f));
    }
-
-    /*
-     * Sanity check, clean up and finish.
-     */
-
-    if (lineLen > 0 && strict) {
-	goto shortUu;
+    if (cut > size) {
+	cut = size;
    }
-    Tcl_SetByteArrayLength(resultObj, cursor - begin);
+    Tcl_SetByteArrayLength(resultObj, cursor - begin - cut);
    Tcl_SetObjResult(interp, resultObj);
    return TCL_OK;

-  shortUu:
-    Tcl_SetObjResult(interp, Tcl_ObjPrintf("short uuencode data"));
-    Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "SHORT", NULL);
-    TclDecrRefCount(resultObj);
-    return TCL_ERROR;
-
  badUu:
    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 	    "invalid uuencode character \"%c\" at position %d",
 	    c, (int) (data - datastart - 1)));
-    Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", NULL);
    TclDecrRefCount(resultObj);
    return TCL_ERROR;
 }
@@ -839,7 +839,7 @@ TclCompileDictSetCmd(
    CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
    Tcl_Token *tokenPtr;
-    int i, dictVarIndex;
+    int numWords, i, dictVarIndex;
    DefineLineInformation;	/* TIP #280 */
    Tcl_Token *varTokenPtr;

@@ -868,7 +868,8 @@ TclCompileDictSetCmd(
     */

    tokenPtr = TokenAfter(varTokenPtr);
-    for (i=2 ; i< parsePtr->numWords ; i++) {
+    numWords = parsePtr->numWords-1;
+    for (i=1 ; i<numWords ; i++) {
 	CompileWord(envPtr, tokenPtr, interp, i);
 	tokenPtr = TokenAfter(tokenPtr);
    }
@@ -877,7 +878,7 @@ TclCompileDictSetCmd(
     * Now emit the instruction to do the dict manipulation.
     */

-    TclEmitInstInt4( INST_DICT_SET, parsePtr->numWords-3,	envPtr);
+    TclEmitInstInt4( INST_DICT_SET, numWords-2,		envPtr);
    TclEmitInt4(     dictVarIndex,			envPtr);
    TclAdjustStackDepth(-1, envPtr);
    return TCL_OK;
@@ -949,7 +950,7 @@ TclCompileDictIncrCmd(
     * Emit the key and the code to actually do the increment.
     */

-    CompileWord(envPtr, keyTokenPtr, interp, 2);
+    CompileWord(envPtr, keyTokenPtr, interp, 3);
    TclEmitInstInt4( INST_DICT_INCR_IMM, incrAmount,	envPtr);
    TclEmitInt4(     dictVarIndex,			envPtr);
    return TCL_OK;
@@ -965,7 +966,7 @@ TclCompileDictGetCmd(
    CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
    Tcl_Token *tokenPtr;
-    int i;
+    int numWords, i;
    DefineLineInformation;	/* TIP #280 */

    /*
@@ -978,16 +979,17 @@ TclCompileDictGetCmd(
 	return TCL_ERROR;
    }
    tokenPtr = TokenAfter(parsePtr->tokenPtr);
+    numWords = parsePtr->numWords-1;

    /*
     * Only compile this because we need INST_DICT_GET anyway.
     */

-    for (i=1 ; i<parsePtr->numWords ; i++) {
+    for (i=0 ; i<numWords ; i++) {
 	CompileWord(envPtr, tokenPtr, interp, i);
 	tokenPtr = TokenAfter(tokenPtr);
    }
-    TclEmitInstInt4(INST_DICT_GET, parsePtr->numWords-2, envPtr);
+    TclEmitInstInt4(INST_DICT_GET, numWords-1, envPtr);
    TclAdjustStackDepth(-1, envPtr);
    return TCL_OK;
 }
@@ -1002,7 +1004,7 @@ TclCompileDictExistsCmd(
    CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
    Tcl_Token *tokenPtr;
-    int i;
+    int numWords, i;
    DefineLineInformation;	/* TIP #280 */

    /*
@@ -1015,16 +1017,17 @@ TclCompileDictExistsCmd(
 	return TCL_ERROR;
    }
    tokenPtr = TokenAfter(parsePtr->tokenPtr);
+    numWords = parsePtr->numWords-1;

    /*
     * Now we do the code generation.
     */

-    for (i=1 ; i<parsePtr->numWords ; i++) {
+    for (i=0 ; i<numWords ; i++) {
 	CompileWord(envPtr, tokenPtr, interp, i);
 	tokenPtr = TokenAfter(tokenPtr);
    }
-    TclEmitInstInt4(INST_DICT_EXISTS, parsePtr->numWords-2, envPtr);
+    TclEmitInstInt4(INST_DICT_EXISTS, numWords-1, envPtr);
    TclAdjustStackDepth(-1, envPtr);
    return TCL_OK;
 }
@@ -1423,7 +1426,7 @@ CompileDictEachCmd(
     * this point.
     */

-    CompileWord(envPtr, dictTokenPtr, interp, 2);
+    CompileWord(envPtr, dictTokenPtr, interp, 3);

    /*
     * Now we catch errors from here on so that we can finalize the search
@@ -1632,7 +1635,7 @@ TclCompileDictUpdateCmd(
    infoIndex = TclCreateAuxData(duiPtr, &tclDictUpdateInfoType, envPtr);

    for (i=0 ; i<numVars ; i++) {
-	CompileWord(envPtr, keyTokenPtrs[i], interp, 2*i+2);
+	CompileWord(envPtr, keyTokenPtrs[i], interp, i);
    }
    TclEmitInstInt4(	INST_LIST, numVars,			envPtr);
    TclEmitInstInt4(	INST_DICT_UPDATE_START, dictIndex,	envPtr);
@@ -1789,8 +1792,8 @@ TclCompileDictLappendCmd(
     * Issue the implementation.
     */

-    CompileWord(envPtr, keyTokenPtr, interp, 2);
-    CompileWord(envPtr, valueTokenPtr, interp, 3);
+    CompileWord(envPtr, keyTokenPtr, interp, 3);
+    CompileWord(envPtr, valueTokenPtr, interp, 4);
    TclEmitInstInt4(	INST_DICT_LAPPEND, dictVarIndex,	envPtr);
    return TCL_OK;
 }
@@ -1875,7 +1878,7 @@ TclCompileDictWithCmd(

 		tokenPtr = TokenAfter(varTokenPtr);
 		for (i=2 ; i<parsePtr->numWords-1 ; i++) {
-		    CompileWord(envPtr, tokenPtr, interp, i);
+		    CompileWord(envPtr, tokenPtr, interp, i-1);
 		    tokenPtr = TokenAfter(tokenPtr);
 		}
 		TclEmitInstInt4(INST_LIST, parsePtr->numWords-3,envPtr);
@@ -1902,7 +1905,7 @@ TclCompileDictWithCmd(

 		tokenPtr = varTokenPtr;
 		for (i=1 ; i<parsePtr->numWords-1 ; i++) {
-		    CompileWord(envPtr, tokenPtr, interp, i);
+		    CompileWord(envPtr, tokenPtr, interp, i-1);
 		    tokenPtr = TokenAfter(tokenPtr);
 		}
 		TclEmitInstInt4(INST_LIST, parsePtr->numWords-3,envPtr);
@@ -1916,7 +1919,7 @@ TclCompileDictWithCmd(
 		 * Case: Direct dict in non-simple var with empty body.
 		 */

-		CompileWord(envPtr, varTokenPtr, interp, 1);
+		CompileWord(envPtr, varTokenPtr, interp, 0);
 		TclEmitOpcode(	INST_DUP,			envPtr);
 		TclEmitOpcode(	INST_LOAD_STK,			envPtr);
 		PushStringLiteral(envPtr, "");
@@ -1951,13 +1954,13 @@ TclCompileDictWithCmd(
     */

    if (dictVar == -1) {
-	CompileWord(envPtr, varTokenPtr, interp, 1);
+	CompileWord(envPtr, varTokenPtr, interp, 0);
 	Emit14Inst(		INST_STORE_SCALAR, varNameTmp,	envPtr);
    }
    tokenPtr = TokenAfter(varTokenPtr);
    if (gotPath) {
 	for (i=2 ; i<parsePtr->numWords-1 ; i++) {
-	    CompileWord(envPtr, tokenPtr, interp, i);
+	    CompileWord(envPtr, tokenPtr, interp, i-1);
 	    tokenPtr = TokenAfter(tokenPtr);
 	}
 	TclEmitInstInt4(	INST_LIST, parsePtr->numWords-3,envPtr);
@@ -2225,7 +2228,7 @@ TclCompileForCmd(
 {
    Tcl_Token *startTokenPtr, *testTokenPtr, *nextTokenPtr, *bodyTokenPtr;
    JumpFixup jumpEvalCondFixup;
-    int bodyCodeOffset, nextCodeOffset, jumpDist;
+    int testCodeOffset, bodyCodeOffset, nextCodeOffset, jumpDist;
    int bodyRange, nextRange;
    DefineLineInformation;	/* TIP #280 */

@@ -2306,9 +2309,13 @@ TclCompileForCmd(
     * terminates the for.
     */

-    if (TclFixupForwardJumpToHere(envPtr, &jumpEvalCondFixup, 127)) {
+    testCodeOffset = CurrentOffset(envPtr);
+
+    jumpDist = testCodeOffset - jumpEvalCondFixup.codeOffset;
+    if (TclFixupForwardJump(envPtr, &jumpEvalCondFixup, jumpDist, 127)) {
 	bodyCodeOffset += 3;
 	nextCodeOffset += 3;
+	testCodeOffset += 3;
    }

    SetLineInformation(2);
@@ -85,17 +85,14 @@ TclCompileGlobalCmd(
     */

    varTokenPtr = TokenAfter(parsePtr->tokenPtr);
-    for (i=1; i<numWords; varTokenPtr = TokenAfter(varTokenPtr),i++) {
+    for (i=2; i<=numWords; varTokenPtr = TokenAfter(varTokenPtr),i++) {
 	localIndex = IndexTailVarIfKnown(interp, varTokenPtr, envPtr);

 	if (localIndex < 0) {
 	    return TCL_ERROR;
 	}

-	/* 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);
+	CompileWord(envPtr, varTokenPtr, interp, 1);
 	TclEmitInstInt4(	INST_NSUPVAR, localIndex,	envPtr);
    }

@@ -587,7 +584,6 @@ TclCompileInfoCommandsCmd(
     * that the result needs to be list-ified.
     */

-    /* TODO: Just push the known value */
    CompileWord(envPtr, tokenPtr,		interp, 1);
    TclEmitOpcode(	INST_RESOLVE_COMMAND,	envPtr);
    TclEmitOpcode(	INST_DUP,		envPtr);
@@ -1903,13 +1899,13 @@ TclCompileNamespaceUpvarCmd(
     */

    localTokenPtr = tokenPtr;
-    for (i=2; i<numWords; i+=2) {
+    for (i=3; i<=numWords; i+=2) {
 	otherTokenPtr = TokenAfter(localTokenPtr);
 	localTokenPtr = TokenAfter(otherTokenPtr);

-	CompileWord(envPtr, otherTokenPtr, interp, i);
+	CompileWord(envPtr, otherTokenPtr, interp, 1);
 	PushVarNameWord(interp, localTokenPtr, envPtr, 0,
-		&localIndex, &isScalar, i+1);
+		&localIndex, &isScalar, 1);

 	if ((localIndex < 0) || !isScalar) {
 	    return TCL_ERROR;
@@ -2572,14 +2568,16 @@ TclCompileUpvarCmd(
    Tcl_Token *tokenPtr, *otherTokenPtr, *localTokenPtr;
    int isScalar, localIndex, numWords, i;
    DefineLineInformation;	/* TIP #280 */
-    Tcl_Obj *objPtr;
+    Tcl_Obj *objPtr = Tcl_NewObj();

    if (envPtr->procPtr == NULL) {
+	Tcl_DecrRefCount(objPtr);
 	return TCL_ERROR;
    }

    numWords = parsePtr->numWords;
    if (numWords < 3) {
+	Tcl_DecrRefCount(objPtr);
 	return TCL_ERROR;
    }

@@ -2587,7 +2585,6 @@ TclCompileUpvarCmd(
     * Push the frame index if it is known at compile time
     */

-    objPtr = Tcl_NewObj();
    tokenPtr = TokenAfter(parsePtr->tokenPtr);
    if (TclWordKnownAtCompileTime(tokenPtr, objPtr)) {
 	CallFrame *framePtr;
@@ -2606,17 +2603,16 @@ TclCompileUpvarCmd(
 	    if (numWords%2) {
 		return TCL_ERROR;
 	    }
-	    /* TODO: Push the known value instead? */
 	    CompileWord(envPtr, tokenPtr, interp, 1);
 	    otherTokenPtr = TokenAfter(tokenPtr);
-	    i = 2;
+	    i = 4;
 	} else {
 	    if (!(numWords%2)) {
 		return TCL_ERROR;
 	    }
 	    PushStringLiteral(envPtr, "1");
 	    otherTokenPtr = tokenPtr;
-	    i = 1;
+	    i = 3;
 	}
    } else {
 	Tcl_DecrRefCount(objPtr);
@@ -2629,12 +2625,12 @@ TclCompileUpvarCmd(
     * be called at runtime.
     */

-    for (; i<numWords; i+=2, otherTokenPtr = TokenAfter(localTokenPtr)) {
+    for (; i<=numWords; i+=2, otherTokenPtr = TokenAfter(localTokenPtr)) {
 	localTokenPtr = TokenAfter(otherTokenPtr);

-	CompileWord(envPtr, otherTokenPtr, interp, i);
+	CompileWord(envPtr, otherTokenPtr, interp, 1);
 	PushVarNameWord(interp, localTokenPtr, envPtr, 0,
-		&localIndex, &isScalar, i+1);
+		&localIndex, &isScalar, 1);

 	if ((localIndex < 0) || !isScalar) {
 	    return TCL_ERROR;
@@ -2710,9 +2706,6 @@ TclCompileVariableCmd(
 	    return TCL_ERROR;
 	}

-	/* 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);
 	TclEmitInstInt4(	INST_VARIABLE, localIndex,	envPtr);

@@ -1864,7 +1864,6 @@ TclCompileTailcallCmd(
    }

    /* make room for the nsObjPtr */
-    /* TODO: Doesn't this have to be a known value? */
    CompileWord(envPtr, tokenPtr, interp, 0);
    for (i=1 ; i<parsePtr->numWords ; i++) {
 	tokenPtr = TokenAfter(tokenPtr);
@@ -2815,81 +2814,39 @@ TclCompileUnsetCmd(
    CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
    Tcl_Token *varTokenPtr;
-    int isScalar, localIndex, flags = 1, i, varCount = 0, haveFlags = 0;
+    int isScalar, localIndex, numWords, flags, i;
+    Tcl_Obj *leadingWord;
    DefineLineInformation;	/* TIP #280 */

    /* TODO: Consider support for compiling expanded args. */
-
-    /*
-     * Verify that all words - except the first non-option one - are known at
-     * compile time so that we can handle them without needing to do a nasty
-     * push/rotate. [Bug 3970f54c4e]
-     */
-
-    for (i=1,varTokenPtr=parsePtr->tokenPtr ; i<parsePtr->numWords ; i++) {
-	Tcl_Obj *leadingWord = Tcl_NewObj();
-
-	varTokenPtr = TokenAfter(varTokenPtr);
-	if (!TclWordKnownAtCompileTime(varTokenPtr, leadingWord)) {
-	    TclDecrRefCount(leadingWord);
-
-	    /*
-	     * We can tolerate non-trivial substitutions in the first variable
-	     * to be unset. If a '--' or '-nocomplain' was present, anything
-	     * goes in that one place! (All subsequent variable names must be
-	     * constants since we don't want to have to push them all first.)
-	     */
-
-	    if (varCount == 0) {
-		if (haveFlags) {
-		    continue;
-		}
-
-		/*
-		 * In fact, we're OK as long as we're the first argument *and*
-		 * we provably don't start with a '-'. If that is true, then
-		 * even if everything else is varying, we still can't be a
-		 * flag. Otherwise we'll spill to runtime to place a limit on
-		 * the trickiness.
-		 */
-
-		if (varTokenPtr->type == TCL_TOKEN_WORD
-			&& varTokenPtr[1].type == TCL_TOKEN_TEXT
-			&& varTokenPtr[1].size > 0
-			&& varTokenPtr[1].start[0] != '-') {
-		    continue;
-		}
-	    }
-	    return TCL_ERROR;
-	}
-	if (i == 1) {
-	    const char *bytes;
-	    int len;
-
-	    bytes = Tcl_GetStringFromObj(leadingWord, &len);
-	    if (len == 11 && !strncmp("-nocomplain", bytes, 11)) {
-		flags = 0;
-		haveFlags = 1;
-	    } else if (len == 2 && !strncmp("--", bytes, 2)) {
-		haveFlags = 1;
-	    } else {
-		varCount++;
-	    }
-	} else {
-	    varCount++;
-	}
-	TclDecrRefCount(leadingWord);
-    }
-
-    /*
-     * Issue instructions to unset each of the named variables.
-     */
-
+    numWords = parsePtr->numWords-1;
+    flags = 1;
    varTokenPtr = TokenAfter(parsePtr->tokenPtr);
-    if (haveFlags) {
-	varTokenPtr = TokenAfter(varTokenPtr);
+    leadingWord = Tcl_NewObj();
+    if (numWords > 0 && TclWordKnownAtCompileTime(varTokenPtr, leadingWord)) {
+	int len;
+	const char *bytes = Tcl_GetStringFromObj(leadingWord, &len);
+
+	if (len == 11 && !strncmp("-nocomplain", bytes, 11)) {
+	    flags = 0;
+	    varTokenPtr = TokenAfter(varTokenPtr);
+	    numWords--;
+	} else if (len == 2 && !strncmp("--", bytes, 2)) {
+	    varTokenPtr = TokenAfter(varTokenPtr);
+	    numWords--;
+	}
+    } else {
+	/*
+	 * Cannot guarantee that the first word is not '-nocomplain' at
+	 * evaluation with reasonable effort, so spill to interpreted version.
+	 */
+
+	TclDecrRefCount(leadingWord);
+	return TCL_ERROR;
    }
-    for (i=1+haveFlags ; i<parsePtr->numWords ; i++) {
+    TclDecrRefCount(leadingWord);
+
+    for (i=0 ; i<numWords ; i++) {
 	/*
 	 * Decide if we can use a frame slot for the var/array name or if we
 	 * need to emit code to compute and push the name at runtime. We use a
@@ -2899,7 +2856,7 @@ TclCompileUnsetCmd(
 	 */

 	PushVarNameWord(interp, varTokenPtr, envPtr, 0,
-		&localIndex, &isScalar, i);
+		&localIndex, &isScalar, 1);

 	/*
 	 * Emit instructions to unset the variable.
@@ -490,6 +490,13 @@ typedef struct JumpList {
    JumpFixup jump;		/* Pass this argument to matching calls of
 				 * TclEmitForwardJump() and 
 				 * TclFixupForwardJump(). */
+    int depth;			/* Remember the currStackDepth of the
+				 * CompileEnv here. */
+    int offset;			/* Data used to compute jump lengths to pass
+				 * to TclFixupForwardJump() */
+    int convert;		/* Temporary storage used to compute whether
+				 * numeric conversion will be needed following
+				 * the operator we're compiling. */
    struct JumpList *next;	/* Point to next item on the stack */
 } JumpList;

@@ -2254,8 +2261,30 @@ CompileExprTree(
 	if (nodePtr->mark == MARK_LEFT) {
 	    next = nodePtr->left;

-	    if (nodePtr->lexeme == QUESTION) {
+	    switch (nodePtr->lexeme) {
+	    case QUESTION:
+		newJump = TclStackAlloc(interp, sizeof(JumpList));
+		newJump->next = jumpPtr;
+		jumpPtr = newJump;
+		newJump = TclStackAlloc(interp, sizeof(JumpList));
+		newJump->next = jumpPtr;
+		jumpPtr = newJump;
+		jumpPtr->depth = envPtr->currStackDepth;
 		convert = 1;
+		break;
+	    case AND:
+	    case OR:
+		newJump = TclStackAlloc(interp, sizeof(JumpList));
+		newJump->next = jumpPtr;
+		jumpPtr = newJump;
+		newJump = TclStackAlloc(interp, sizeof(JumpList));
+		newJump->next = jumpPtr;
+		jumpPtr = newJump;
+		newJump = TclStackAlloc(interp, sizeof(JumpList));
+		newJump->next = jumpPtr;
+		jumpPtr = newJump;
+		jumpPtr->depth = envPtr->currStackDepth;
+		break;
 	    }
 	} else if (nodePtr->mark == MARK_RIGHT) {
 	    next = nodePtr->right;
@@ -2288,35 +2317,25 @@ CompileExprTree(
 		break;
 	    }
 	    case QUESTION:
-		newJump = TclStackAlloc(interp, sizeof(JumpList));
-		newJump->next = jumpPtr;
-		jumpPtr = newJump;
 		TclEmitForwardJump(envPtr, TCL_FALSE_JUMP, &jumpPtr->jump);
 		break;
 	    case COLON:
-		newJump = TclStackAlloc(interp, sizeof(JumpList));
-		newJump->next = jumpPtr;
-		jumpPtr = newJump;
+		CLANG_ASSERT(jumpPtr);
 		TclEmitForwardJump(envPtr, TCL_UNCONDITIONAL_JUMP,
-			&jumpPtr->jump);
-		TclAdjustStackDepth(-1, envPtr);
-		if (convert) {
-		    jumpPtr->jump.jumpType = TCL_TRUE_JUMP;
-		}
+			&jumpPtr->next->jump);
+		envPtr->currStackDepth = jumpPtr->depth;
+		jumpPtr->offset = (envPtr->codeNext - envPtr->codeStart);
+		jumpPtr->convert = convert;
 		convert = 1;
 		break;
 	    case AND:
+		TclEmitForwardJump(envPtr, TCL_FALSE_JUMP, &jumpPtr->jump);
+		break;
 	    case OR:
-		newJump = TclStackAlloc(interp, sizeof(JumpList));
-		newJump->next = jumpPtr;
-		jumpPtr = newJump;
-		TclEmitForwardJump(envPtr, (nodePtr->lexeme == AND)
-			?  TCL_FALSE_JUMP : TCL_TRUE_JUMP, &jumpPtr->jump);
+		TclEmitForwardJump(envPtr, TCL_TRUE_JUMP, &jumpPtr->jump);
 		break;
 	    }
 	} else {
-	    int pc1, pc2, target;
-
 	    switch (nodePtr->lexeme) {
 	    case START:
 	    case QUESTION:
@@ -2356,20 +2375,18 @@ CompileExprTree(
 		break;
 	    case COLON:
 		CLANG_ASSERT(jumpPtr);
-		if (jumpPtr->jump.jumpType == TCL_TRUE_JUMP) {
-		    jumpPtr->jump.jumpType = TCL_UNCONDITIONAL_JUMP;
-		    convert = 1;
-		}
-		target = jumpPtr->jump.codeOffset + 2;
-		if (TclFixupForwardJumpToHere(envPtr, &jumpPtr->jump, 127)) {
-		    target += 3;
+		if (TclFixupForwardJump(envPtr, &jumpPtr->next->jump,
+			(envPtr->codeNext - envPtr->codeStart)
+			- jumpPtr->next->jump.codeOffset, 127)) {
+		    jumpPtr->offset += 3;
 		}
+		TclFixupForwardJump(envPtr, &jumpPtr->jump,
+			jumpPtr->offset - jumpPtr->jump.codeOffset, 127);
+		convert |= jumpPtr->convert;
+		envPtr->currStackDepth = jumpPtr->depth + 1;
 		freePtr = jumpPtr;
 		jumpPtr = jumpPtr->next;
 		TclStackFree(interp, freePtr);
-		TclFixupForwardJump(envPtr, &jumpPtr->jump,
-			target - jumpPtr->jump.codeOffset, 127);
-
 		freePtr = jumpPtr;
 		jumpPtr = jumpPtr->next;
 		TclStackFree(interp, freePtr);
@@ -2377,24 +2394,30 @@ CompileExprTree(
 	    case AND:
 	    case OR:
 		CLANG_ASSERT(jumpPtr);
-		pc1 = CurrentOffset(envPtr);
-		TclEmitInstInt1((nodePtr->lexeme == AND) ? INST_JUMP_FALSE1
-			: INST_JUMP_TRUE1, 0, envPtr);
+		TclEmitForwardJump(envPtr, (nodePtr->lexeme == AND)
+			?  TCL_FALSE_JUMP : TCL_TRUE_JUMP,
+			&jumpPtr->next->jump);
 		TclEmitPush(TclRegisterNewLiteral(envPtr,
 			(nodePtr->lexeme == AND) ? "1" : "0", 1), envPtr);
-		pc2 = CurrentOffset(envPtr);
-		TclEmitInstInt1(INST_JUMP1, 0, envPtr);
+		TclEmitForwardJump(envPtr, TCL_UNCONDITIONAL_JUMP,
+			&jumpPtr->next->next->jump);
 		TclAdjustStackDepth(-1, envPtr);
-		TclStoreInt1AtPtr(CurrentOffset(envPtr) - pc1,
-			envPtr->codeStart + pc1 + 1);
+		TclFixupForwardJumpToHere(envPtr, &jumpPtr->next->jump, 127);
 		if (TclFixupForwardJumpToHere(envPtr, &jumpPtr->jump, 127)) {
-		    pc2 += 3;
+		    jumpPtr->next->next->jump.codeOffset += 3;
 		}
 		TclEmitPush(TclRegisterNewLiteral(envPtr,
 			(nodePtr->lexeme == AND) ? "0" : "1", 1), envPtr);
-		TclStoreInt1AtPtr(CurrentOffset(envPtr) - pc2,
-			envPtr->codeStart + pc2 + 1);
+		TclFixupForwardJumpToHere(envPtr, &jumpPtr->next->next->jump,
+			127);
 		convert = 0;
+		envPtr->currStackDepth = jumpPtr->depth + 1;
+		freePtr = jumpPtr;
+		jumpPtr = jumpPtr->next;
+		TclStackFree(interp, freePtr);
+		freePtr = jumpPtr;
+		jumpPtr = jumpPtr->next;
+		TclStackFree(interp, freePtr);
 		freePtr = jumpPtr;
 		jumpPtr = jumpPtr->next;
 		TclStackFree(interp, freePtr);
@@ -1171,6 +1171,8 @@ Tcl_Finalize(void)

    TclFinalizeEncodingSubsystem();

+    Tcl_SetPanicProc(NULL);
+
    /*
     * Repeat finalization of the thread local storage once more. Although
     * this step is already done by the Tcl_FinalizeThread call above, series
@@ -879,6 +879,7 @@ TclCreateExecEnv(
    eePtr->interp = interp;
    eePtr->callbackPtr = NULL;
    eePtr->corPtr = NULL;
+    eePtr->stackLevel = 0;
    eePtr->rewind = 0;

    esPtr->prevPtr = NULL;
@@ -4738,7 +4739,7 @@ TEBCresume(
 		if (listPtr->refCount == 1) {
 		    TRACE(("\"%.30s\" %d %d => ", O2S(valuePtr),
 			    TclGetInt4AtPtr(pc+1), TclGetInt4AtPtr(pc+5)));
-		    for (index=toIdx+1; index<objc ; index++) {
+		    for (index=toIdx+1 ; index<objc-1 ; index++) {
 			TclDecrRefCount(objv[index]);
 		    }
 		    listPtr->elemCount = toIdx+1;
@@ -1944,7 +1944,7 @@ TclNREvalFile(
    iPtr->evalFlags |= TCL_EVAL_FILE;
    TclNRAddCallback(interp, EvalFileCallback, oldScriptFile, pathPtr, objPtr,
 	    NULL);
-    return TclNREvalObjEx(interp, objPtr, TCL_EVAL_DIRECT, NULL, INT_MIN);
+    return TclNREvalObjEx(interp, objPtr, 0, NULL, INT_MIN);
 }

 static int
@@ -1438,7 +1438,7 @@ typedef struct CoroutineData {
    CorContext caller;
    CorContext running;
    Tcl_HashTable *lineLABCPtr;    /* See Interp.lineLABCPtr */
-    void *stackLevel;
+    int stackLevel;
    int auxNumLevels;		/* While the coroutine is running the
 				 * numLevels of the create/resume command is
 				 * stored here; for suspended coroutines it
@@ -1456,11 +1456,12 @@ typedef struct ExecEnv {
    struct NRE_callback *callbackPtr;
 				/* Top callback in NRE's stack. */
    struct CoroutineData *corPtr;
+    int stackLevel;
    int rewind;
 } ExecEnv;

 #define COR_IS_SUSPENDED(corPtr) \
-    ((corPtr)->stackLevel == NULL)
+    ((corPtr)->stackLevel == -1)

 /*
 * The definitions for the LiteralTable and LiteralEntry structures. Each
@@ -2201,7 +2202,6 @@ typedef struct Interp {
 #define TCL_ALLOW_EXCEPTIONS		0x04
 #define TCL_EVAL_FILE			0x02
 #define TCL_EVAL_SOURCE_IN_FRAME	0x10
-#define TCL_EVAL_NORESOLVE		0x20

 /*
 * Flag bits for Interp structures:
@@ -2726,7 +2726,6 @@ MODULE_SCOPE Tcl_ObjCmdProc TclNRCoroutineObjCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclNRYieldObjCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclNRYieldmObjCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclNRYieldToObjCmd;
-MODULE_SCOPE Tcl_ObjCmdProc TclNRInvoke;

 MODULE_SCOPE void  TclSetTailcall(Tcl_Interp *interp, Tcl_Obj *tailcallPtr);
 MODULE_SCOPE void  TclPushTailcallPoint(Tcl_Interp *interp);
@@ -279,12 +279,6 @@ static void		DeleteScriptLimitCallback(ClientData clientData);
 static void		RunLimitHandlers(LimitHandler *handlerPtr,
 			    Tcl_Interp *interp);
 static void		TimeLimitCallback(ClientData clientData);
-
-/* NRE enabling */
-static Tcl_NRPostProc	NRPostInvokeHidden;
-static Tcl_ObjCmdProc	NRInterpCmd;
-static Tcl_ObjCmdProc	NRSlaveCmd;
-

 /*
 *----------------------------------------------------------------------
@@ -487,8 +481,7 @@ TclInterpInit(
    slavePtr->interpCmd		= NULL;
    Tcl_InitHashTable(&slavePtr->aliasTable, TCL_STRING_KEYS);

-    Tcl_NRCreateCommand(interp, "interp", Tcl_InterpObjCmd, NRInterpCmd,
-	    NULL, NULL);
+    Tcl_CreateObjCommand(interp, "interp", Tcl_InterpObjCmd, NULL, NULL);

    Tcl_CallWhenDeleted(interp, InterpInfoDeleteProc, NULL);
    return TCL_OK;
@@ -596,16 +589,6 @@ Tcl_InterpObjCmd(
    Tcl_Interp *interp,			/* Current interpreter. */
    int objc,				/* Number of arguments. */
    Tcl_Obj *const objv[])		/* Argument objects. */
-{
-    return Tcl_NRCallObjProc(interp, NRInterpCmd, clientData, objc, objv);
-}
-
-static int
-NRInterpCmd(
-    ClientData clientData,		/* Unused. */
-    Tcl_Interp *interp,			/* Current interpreter. */
-    int objc,				/* Number of arguments. */
-    Tcl_Obj *const objv[])		/* Argument objects. */
 {
    Tcl_Interp *slaveInterp;
    int index;
@@ -2389,8 +2372,8 @@ SlaveCreate(
    slavePtr->masterInterp = masterInterp;
    slavePtr->slaveEntryPtr = hPtr;
    slavePtr->slaveInterp = slaveInterp;
-    slavePtr->interpCmd = Tcl_NRCreateCommand(masterInterp, path,
-	    SlaveObjCmd, NRSlaveCmd, slaveInterp, SlaveObjCmdDeleteProc);
+    slavePtr->interpCmd = Tcl_CreateObjCommand(masterInterp, path,
+	    SlaveObjCmd, slaveInterp, SlaveObjCmdDeleteProc);
    Tcl_InitHashTable(&slavePtr->aliasTable, TCL_STRING_KEYS);
    Tcl_SetHashValue(hPtr, slavePtr);
    Tcl_SetVar(slaveInterp, "tcl_interactive", "0", TCL_GLOBAL_ONLY);
@@ -2478,16 +2461,6 @@ SlaveObjCmd(
    Tcl_Interp *interp,		/* Current interpreter. */
    int objc,			/* Number of arguments. */
    Tcl_Obj *const objv[])	/* Argument objects. */
-{
-    return Tcl_NRCallObjProc(interp, NRSlaveCmd, clientData, objc, objv);
-}
-
-static int
-NRSlaveCmd(
-    ClientData clientData,	/* Slave interpreter. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
 {
    Tcl_Interp *slaveInterp = clientData;
    int index;
@@ -3079,11 +3052,7 @@ SlaveInvokeHidden(
    Tcl_AllowExceptions(slaveInterp);

    if (namespaceName == NULL) {
-	NRE_callback *rootPtr = TOP_CB(slaveInterp);
-
-	Tcl_NRAddCallback(interp, NRPostInvokeHidden, slaveInterp,
-		rootPtr, NULL, NULL);
-	return TclNRInvoke(NULL, slaveInterp, objc, objv);
+	result = TclObjInvoke(slaveInterp, objc, objv, TCL_INVOKE_HIDDEN);
    } else {
 	Namespace *nsPtr, *dummy1, *dummy2;
 	const char *tail;
@@ -3102,23 +3071,6 @@ SlaveInvokeHidden(
    Tcl_Release(slaveInterp);
    return result;
 }
-
-static int
-NRPostInvokeHidden(
-    ClientData data[],
-    Tcl_Interp *interp,
-    int result)
-{
-    Tcl_Interp *slaveInterp = (Tcl_Interp *)data[0];
-    NRE_callback *rootPtr = (NRE_callback *)data[1];
-
-    if (interp != slaveInterp) {
-	result = TclNRRunCallbacks(slaveInterp, result, rootPtr);
-	Tcl_TransferResult(slaveInterp, result, interp);
-    }
-    Tcl_Release(slaveInterp);
-    return result;
-}

 /*
 *----------------------------------------------------------------------
@@ -1942,7 +1942,7 @@ InvokeImportedNRCmd(
    Command *realCmdPtr = dataPtr->realCmdPtr;

    TclSkipTailcall(interp);
-    return TclNREvalObjv(interp, objc, objv, TCL_EVAL_NOERR, realCmdPtr);
+    return Tcl_NRCmdSwap(interp, (Tcl_Command) realCmdPtr, objc, objv, 0);
 }

 static int
@@ -39,7 +39,7 @@ extern const char *TclOOInitializeStubs(
 * win/tclooConfig.sh
 */

-#define TCLOO_VERSION "1.0.1"
+#define TCLOO_VERSION "1.0"
 #define TCLOO_PATCHLEVEL TCLOO_VERSION

 /*
@@ -4,7 +4,7 @@
 *	This file contains implementations of the "simple" commands and
 *	methods from the object-system core.
 *
- * Copyright (c) 2005-2013 by Donal K. Fellows
+ * Copyright (c) 2005-2012 by Donal K. Fellows
 *
 * See the file "license.terms" for information on usage and redistribution of
 * this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -4,7 +4,7 @@
 *	This file contains the implementation of the ::oo::define command,
 *	part of the object-system core (NB: not Tcl_Obj, but ::oo).
 *
- * Copyright (c) 2006-2013 by Donal K. Fellows
+ * Copyright (c) 2006-2012 by Donal K. Fellows
 *
 * See the file "license.terms" for information on usage and redistribution of
 * this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -1290,57 +1290,11 @@ CloneProcedureMethod(
    ClientData *newClientData)
 {
    ProcedureMethod *pmPtr = clientData;
-    ProcedureMethod *pm2Ptr;
-    Tcl_Obj *bodyObj, *argsObj;
-    CompiledLocal *localPtr;
+    ProcedureMethod *pm2Ptr = ckalloc(sizeof(ProcedureMethod));

-    /*
-     * Copy the argument list.
-     */
-
-    argsObj = Tcl_NewObj();
-    for (localPtr=pmPtr->procPtr->firstLocalPtr; localPtr!=NULL;
-	    localPtr=localPtr->nextPtr) {
-	if (TclIsVarArgument(localPtr)) {
-	    Tcl_Obj *argObj = Tcl_NewObj();
-
-	    Tcl_ListObjAppendElement(NULL, argObj,
-		    Tcl_NewStringObj(localPtr->name, -1));
-	    if (localPtr->defValuePtr != NULL) {
-		Tcl_ListObjAppendElement(NULL, argObj, localPtr->defValuePtr);
-	    }
-	    Tcl_ListObjAppendElement(NULL, argsObj, argObj);
-	}
-    }
-
-    /*
-     * Must strip the internal representation in order to ensure that any
-     * bound references to instance variables are removed. [Bug 3609693]
-     */
-
-    bodyObj = Tcl_DuplicateObj(pmPtr->procPtr->bodyPtr);
-    TclFreeIntRep(bodyObj);
-
-    /*
-     * Create the actual copy of the method record, manufacturing a new proc
-     * record.
-     */
-
-    pm2Ptr = ckalloc(sizeof(ProcedureMethod));
    memcpy(pm2Ptr, pmPtr, sizeof(ProcedureMethod));
    pm2Ptr->refCount = 1;
-    Tcl_IncrRefCount(argsObj);
-    Tcl_IncrRefCount(bodyObj);
-    if (TclCreateProc(interp, NULL, "", argsObj, bodyObj,
-	    &pm2Ptr->procPtr) != TCL_OK) {
-	Tcl_DecrRefCount(argsObj);
-	Tcl_DecrRefCount(bodyObj);
-	ckfree(pm2Ptr);
-	return TCL_ERROR;
-    }
-    Tcl_DecrRefCount(argsObj);
-    Tcl_DecrRefCount(bodyObj);
-
+    pm2Ptr->procPtr->refCount++;
    if (pmPtr->cloneClientdataProc) {
 	pm2Ptr->clientData = pmPtr->cloneClientdataProc(pmPtr->clientData);
    }
@@ -1467,7 +1421,7 @@ InvokeForwardMethod(
    Tcl_NRAddCallback(interp, FinalizeForwardCall, argObjs, NULL, NULL, NULL);
    ((Interp *)interp)->lookupNsPtr
 	    = (Namespace *) contextPtr->oPtr->namespacePtr;
-    return TclNREvalObjv(interp, len, argObjs, TCL_EVAL_NOERR, NULL);
+    return TclNREvalObjv(interp, len, argObjs, TCL_EVAL_INVOKE, NULL);
 }

 static int
@@ -13,9 +13,9 @@
 * this file, and for a DISCLAIMER OF ALL WARRANTIES.
 */
 
+#include <assert.h>
 #include "tclInt.h"
 #include "tclParse.h"
-#include <assert.h>

 /*
 * The following table provides parsing information about each possible 8-bit
@@ -4408,26 +4408,8 @@ TestseterrorcodeCmd(
 	Tcl_SetResult(interp, "too many args", TCL_STATIC);
 	return TCL_ERROR;
    }
-    switch (argc) {
-    case 1:
-	Tcl_SetErrorCode(interp, "NONE", NULL);
-	break;
-    case 2:
-	Tcl_SetErrorCode(interp, argv[1], NULL);
-	break;
-    case 3:
-	Tcl_SetErrorCode(interp, argv[1], argv[2], NULL);
-	break;
-    case 4:
-	Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], NULL);
-	break;
-    case 5:
-	Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], argv[4], NULL);
-	break;
-    case 6:
-	Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], argv[4],
-		argv[5], NULL);
-    }
+    Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], argv[4],
+	    argv[5], NULL);
    return TCL_ERROR;
 }

@@ -3580,9 +3580,10 @@ UpdateStringOfEndOffset(
    register Tcl_Obj *objPtr)
 {
    char buffer[TCL_INTEGER_SPACE + 5];
-    register int len = 3;
+    register int len;

    memcpy(buffer, "end", 4);
+    len = sizeof("end") - 1;
    if (objPtr->internalRep.longValue != 0) {
 	buffer[len++] = '-';
 	len += TclFormatInt(buffer+len, -(objPtr->internalRep.longValue));
@@ -513,32 +513,6 @@ proc auto_mkindex_parser::fullname {name} {
    return [string map [list \0 \$] $name]
 }

-# auto_mkindex_parser::indexEntry --
-#
-# Used by commands like "proc" within the auto_mkindex parser to add a
-# correctly-quoted entry to the index. This is shared code so it is done
-# *right*, in one place.
-#
-# Arguments:
-# name -		Name that is being added to index.
-
-proc auto_mkindex_parser::indexEntry {name} {
-    variable index
-    variable scriptFile
-
-    # We convert all metacharacters to their backslashed form, and pre-split
-    # the file name that we know about (which will be a proper list, and so
-    # correctly quoted).
-
-    set name [string range [list \}[fullname $name]] 2 end]
-    set filenameParts [file split $scriptFile]
-
-    append index [format \
-	    {set auto_index(%s) [list source [file join $dir %s]]%s} \
-	    $name $filenameParts \n]
-    return
-}
-
 if {[llength $::auto_mkindex_parser::initCommands]} {
    return
 }
@@ -550,7 +524,15 @@ if {[llength $::auto_mkindex_parser::initCommands]} {
 # Adds an entry to the auto index list for the given procedure name.

 auto_mkindex_parser::command proc {name args} {
-    indexEntry $name
+    variable index
+    variable scriptFile
+    # Do some fancy reformatting on the "source" call to handle platform
+    # differences with respect to pathnames.  Use format just so that the
+    # command is a little easier to read (otherwise it'd be full of
+    # backslashed dollar signs, etc.
+    append index [list set auto_index([fullname $name])] \
+	    [format { [list source [file join $dir %s]]} \
+	    [file split $scriptFile]] "\n"
 }

 # Conditionally add support for Tcl byte code files.  There are some tricky
@@ -577,7 +559,14 @@ auto_mkindex_parser::hook {
 	# procedure name.

 	auto_mkindex_parser::commandInit tbcload::bcproc {name args} {
-	    indexEntry $name
+	    variable index
+	    variable scriptFile
+	    # Do some nice reformatting of the "source" call, to get around
+	    # path differences on different platforms.  We use the format
+	    # command just so that the code is a little easier to read.
+	    append index [list set auto_index([fullname $name])] \
+		    [format { [list source [file join $dir %s]]} \
+		    [file split $scriptFile]] "\n"
 	}
    }
 }
@@ -621,13 +610,6 @@ auto_mkindex_parser::command namespace {op args} {
 	    variable contextStack
 	    if {[lindex $args 0] eq "create"} {
 		set name ::[join [lreverse $contextStack] ::]
-		catch {
-		    set name [dict get [lrange $args 1 end] -command]
-		    if {![string match ::* $name]} {
-			set name ::[join [lreverse $contextStack] ::]$name
-		    }
-		    regsub -all ::+ $name :: name
-		}
 		# create artifical proc to force an entry in the tclIndex
 		$parser eval [list ::proc $name {} {}]
 	    }
@@ -637,14 +619,15 @@ auto_mkindex_parser::command namespace {op args} {

 # AUTO MKINDEX:  oo::class create name ?definition?
 # Adds an entry to the auto index list for the given class name.
-auto_mkindex_parser::command oo::class {op name {body ""}} {
-    if {$op eq "create"} {
-	indexEntry $name
-    }
-}
-auto_mkindex_parser::command class {op name {body ""}} {
-    if {$op eq "create"} {
-	indexEntry $name
+foreach cmd {oo::class class} {
+    auto_mkindex_parser::command $cmd {ecmd name {body ""}} {
+	if {$cmd eq "create"} {
+	    variable index
+	    variable scriptFile
+	    append index [format "set %s \[list source \[%s]]\n" \
+			      [list auto_index([fullname $name])] \
+			      [list file join $dir {*}[file split $scriptFile]]]
+	}
    }
 }

@@ -16,7 +16,7 @@
 if {[info commands package] == ""} {
    error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.6.1
+package require -exact Tcl 8.6.0

 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
@@ -250,8 +250,7 @@ proc unknown args {
 	# Make sure we're not trying to load the same proc twice.
 	#
 	if {[info exists UnknownPending($name)]} {
-	    return -code error -errorcode [list TCL LOOKUP COMMAND $name] \
-		    "self-referential recursion\
+	    return -code error "self-referential recursion\
 		    in \"unknown\" for command \"$name\""
 	}
 	set UnknownPending($name) pending
@@ -400,12 +399,10 @@ proc unknown args {
 	    return -options $::tcl::UnknownOptions $::tcl::UnknownResult
 	}
 	if {[llength $cmds]} {
-	    return -code error -errorcode [list TCL LOOKUP COMMAND $name] \
-		    "ambiguous command name \"$name\": [lsort $cmds]"
+	    return -code error "ambiguous command name \"$name\": [lsort $cmds]"
 	}
    }
-    return -code error -errorcode [list TCL LOOKUP COMMAND $name] \
-	    "invalid command name \"$name\""
+    return -code error "invalid command name \"$name\""
 }

 # auto_load --
@@ -9,4 +9,4 @@
 # full path name of this file's directory.

 if {![package vsatisfies [package provide Tcl] 8.5]} {return}
-package ifneeded tcltest 2.3.6 [list source [file join $dir tcltest.tcl]]
+package ifneeded tcltest 2.3.5 [list source [file join $dir tcltest.tcl]]
@@ -22,7 +22,7 @@ namespace eval tcltest {
    # When the version number changes, be sure to update the pkgIndex.tcl file,
    # and the install directory in the Makefiles.  When the minor version
    # changes (new feature) be sure to update the man page as well.
-    variable Version 2.3.6
+    variable Version 2.3.5

    # Compatibility support for dumb variables defined in tcltest 1
    # Do not use these.  Call [package provide Tcl] and [info patchlevel]
@@ -238,15 +238,6 @@ proc ::tcl::tm::UnknownHandler {original name args} {
 			continue
 		    }

-		    if {[package ifneeded $pkgname $pkgversion] ne {}} {
-			# There's already a provide script registered for
-			# this version of this package.  Since all units of
-			# code claiming to be the same version of the same
-			# package ought to be identical, just stick with
-			# the one we already have.
-			continue
-		    }
-
 		    # We have found a candidate, generate a "provide script"
 		    # for it, and remember it.  Note that we are using ::list
 		    # to do this; locally [list] means something else without
@@ -39,7 +39,7 @@ needs to conform to the following conventions.
    distclean:	Delete all generated files. 

    dist:	Produce a copy of the package's source code distribution.
-		Must respect the DIST_ROOT variable determining where to
+		Must respect the DIST_ROOT variable determing where to
 		write the generated directory.

 Packages that are written to make use of the Tcl Extension Architecture (TEA)
@@ -2499,34 +2499,6 @@ test binary-71.9 {binary decode hex} -body {
 test binary-71.10 {binary decode hex} -body {
    string length [binary decode hex " "]
 } -result 0
-test binary-71.11 {binary decode hex: Bug b98fa55285} -body {
-    apply {{} {
-	set str "137b6f95e7519389e7c4b36599781e2ccf492699649249aae43fbe8c26\n"
-	set decoded [binary decode hex $str]
-	list [string length $decoded] [scan [string index $decoded end] %c]
-    }}
-} -result {29 38}
-test binary-71.12 {binary decode hex: Bug b98fa55285 cross check} -body {
-    apply {{} {
-	set str "137b6f95e7519389e7c4b36599781e2ccf492699649249aae43fbe8c2\n"
-	set decoded [binary decode hex $str]
-	list [string length $decoded] [scan [string index $decoded end] %c]
-    }}
-} -result {28 140}
-test binary-71.13 {binary decode hex: Bug b98fa55285 cross check} -body {
-    apply {{} {
-	set str "137b6f95e7519389e7c4b36599781e2ccf492699649249aae43fbe8c2\n\n"
-	set decoded [binary decode hex $str]
-	list [string length $decoded] [scan [string index $decoded end] %c]
-    }}
-} -result {28 140}
-test binary-71.14 {binary decode hex: Bug b98fa55285 cross check} -body {
-    apply {{} {
-	set str "137b6f95e7519389e7c4b36599781e2ccf492699649249aae43fbe8c2\n\n\n"
-	set decoded [binary decode hex $str]
-	list [string length $decoded] [scan [string index $decoded end] %c]
-    }}
-} -result {28 140}

 test binary-72.1 {binary encode base64} -body {
    binary encode base64
@@ -2705,116 +2677,105 @@ test binary-74.1 {binary encode uuencode} -body {
 } -returnCodes error -match glob -result "wrong # args: *"
 test binary-74.2 {binary encode uuencode} -body {
    binary encode uuencode abc
-} -result {#86)C
-}
+} -result {86)C}
 test binary-74.3 {binary encode uuencode} -body {
    binary encode uuencode {}
 } -result {}
 test binary-74.4 {binary encode uuencode} -body {
    binary encode uuencode [string repeat abc 20]
-} -result "M[string repeat 86)C 15]\n/[string repeat 86)C 5]\n"
+} -result [string repeat 86)C 20]
 test binary-74.5 {binary encode uuencode} -body {
    binary encode uuencode \0\1\2\3\4\0\1\2\3
-} -result ")``\$\"`P0``0(#\n"
+} -result "``\$\"`P0``0(#"
 test binary-74.6 {binary encode uuencode} -body {
    binary encode uuencode \0
-} -result {!``
-}
+} -result {````}
 test binary-74.7 {binary encode uuencode} -body {
    binary encode uuencode \0\0
-} -result "\"```
-"
+} -result {````}
 test binary-74.8 {binary encode uuencode} -body {
    binary encode uuencode \0\0\0
-} -result {#````
-}
+} -result {````}
 test binary-74.9 {binary encode uuencode} -body {
    binary encode uuencode \0\0\0\0
-} -result {$``````
-}
-test binary-74.10 {binary encode uuencode} -returnCodes error -body {
-    binary encode uuencode -foo 30 abcabcabc
-} -result {bad option "-foo": must be -maxlen or -wrapchar}
-test binary-74.11 {binary encode uuencode} -returnCodes error -body {
-    binary encode uuencode -maxlen 1 abcabcabc
-} -result {line length out of range}
-test binary-74.12 {binary encode uuencode} -body {
-    binary encode uuencode -maxlen 3 -wrapchar | abcabcabc
-} -result {!80|!8@|!8P|!80|!8@|!8P|!80|!8@|!8P|}
+} -result {````````}
+test binary-74.10 {binary encode uuencode} -body {
+    binary encode uuencode -maxlen 0 -wrapchar | abcabcabc
+} -result {86)C86)C86)C}
+test binary-74.11 {binary encode uuencode} -body {
+    binary encode uuencode -maxlen 1 -wrapchar | abcabcabc
+} -result {8|6|)|C|8|6|)|C|8|6|)|C}

 test binary-75.1 {binary decode uuencode} -body {
    binary decode uuencode
 } -returnCodes error -match glob -result "wrong # args: *"
 test binary-75.2 {binary decode uuencode} -body {
-    binary decode uuencode "#86)C\n"
+    binary decode uuencode 86)C
 } -result {abc}
 test binary-75.3 {binary decode uuencode} -body {
    binary decode uuencode {}
 } -result {}
-test binary-75.3.1 {binary decode uuencode} -body {
-    binary decode uuencode `\n
-} -result {}
 test binary-75.4 {binary decode uuencode} -body {
-    binary decode uuencode "M[string repeat 86)C 15]\n/[string repeat 86)C 5]\n"
+    binary decode uuencode [string repeat "86)C" 20]
 } -result [string repeat abc 20]
 test binary-75.5 {binary decode uuencode} -body {
-    binary decode uuencode ")``\$\"`P0``0(#"
+    binary decode uuencode "``\$\"`P0``0(#"
 } -result "\0\1\2\3\4\0\1\2\3"
 test binary-75.6 {binary decode uuencode} -body {
-    string length [binary decode uuencode "`\n"]
+    string length [binary decode uuencode {`}]
 } -result 0
 test binary-75.7 {binary decode uuencode} -body {
-    string length [binary decode uuencode "!`\n"]
+    string length [binary decode uuencode {``}]
 } -result 1
 test binary-75.8 {binary decode uuencode} -body {
-    string length [binary decode uuencode "\"``\n"]
+    string length [binary decode uuencode {```}]
 } -result 2
 test binary-75.9 {binary decode uuencode} -body {
-    string length [binary decode uuencode "#```\n"]
+    string length [binary decode uuencode {````}]
 } -result 3
 test binary-75.10 {binary decode uuencode} -body {
-    set s ">[string repeat 86)C 10]\n>[string repeat 86)C 10]"
+    set s "[string repeat 86)C 10]\n[string repeat 86)C 10]"
    binary decode uuencode $s
 } -result [string repeat abc 20]
 test binary-75.11 {binary decode uuencode} -body {
-    set s ">[string repeat 86)C 10]\n\t>\t[string repeat 86)C 10]\r"
+    set s "[string repeat 86)C 10]\n    [string repeat 86)C 10]"
    binary decode uuencode $s
 } -result [string repeat abc 20]
 test binary-75.12 {binary decode uuencode} -body {
    binary decode uuencode -strict "|86)C"
 } -returnCodes error -match glob -result {invalid uuencode character "|" at position 0}
 test binary-75.13 {binary decode uuencode} -body {
-    set s ">[string repeat 86)C 10]|[string repeat 86)C 10]"
+    set s "[string repeat 86)C 10]|[string repeat 86)C 10]"
    binary decode uuencode -strict $s
-} -returnCodes error -match glob -result {invalid uuencode character "|" at position 41}
+} -returnCodes error -match glob -result {invalid uuencode character "|" at position 40}
 test binary-75.14 {binary decode uuencode} -body {
-    set s ">[string repeat 86)C 10]\na[string repeat 86)C 10]"
+    set s "[string repeat 86)C 10]\n    [string repeat 86)C 10]"
    binary decode uuencode -strict $s
 } -returnCodes error -match glob -result {invalid uuencode character *}
 test binary-75.20 {binary decode uuencode} -body {
-    set r [binary decode uuencode " 8"]
+    set r [binary decode uuencode 8]
    list [string length $r] $r
 } -result {0 {}}
 test binary-75.21 {binary decode uuencode} -body {
-    set r [binary decode uuencode "!86"]
+    set r [binary decode uuencode 86]
    list [string length $r] $r
 } -result {1 a}
 test binary-75.22 {binary decode uuencode} -body {
-    set r [binary decode uuencode "\"86)"]
+    set r [binary decode uuencode 86)]
    list [string length $r] $r
 } -result {2 ab}
 test binary-75.23 {binary decode uuencode} -body {
-    set r [binary decode uuencode "#86)C"]
+    set r [binary decode uuencode 86)C]
    list [string length $r] $r
 } -result {3 abc}
 test binary-75.24 {binary decode uuencode} -body {
-    set s "#04)\# "
+    set s "04)\# "
    binary decode uuencode $s
 } -result ABC
 test binary-75.25 {binary decode uuencode} -body {
-    set s "#04)\#z"
+    set s "04)\#z"
    binary decode uuencode $s
-} -returnCodes error -match glob -result {invalid uuencode character "z" at position 5}
+} -returnCodes error -match glob -result {invalid uuencode character "z" at position 4}
 test binary-75.26 {binary decode uuencode} -body {
    string length [binary decode uuencode " "]
 } -result 0
@@ -633,15 +633,6 @@ test coroutine-7.6 {Early yield crashes} {
    rename foo {}
 } {}

-test coroutine-7.7 {Bug 2486550} -setup {
-    interp hide {} yield
-} -body {
-    coroutine demo interp invokehidden {} yield ok
-} -cleanup {
-    demo
-    interp expose {} yield
-} -result ok
-

 # cleanup
 unset lambda
@@ -1604,7 +1604,7 @@ test dict-23.1 {dict compilation crash: Bug 3487626} {
 	}
    }} [linenumber]}}
 } 5
-test dict-23.2 {dict compilation crash: Bug 3487626} {
+test dict-23.2 {dict compilation crash: Bug 3487626} knownBug {
    # Something isn't quite right in line number and continuation line
    # tracking; at time of writing, this test produces 7, not 5, which
    # indicates that the extra newlines in the non-script argument are
@@ -1838,7 +1838,7 @@ test dict-24.20.1 {dict compilation crash: 'dict for' bug 3487626} {
 	}
    }} [linenumber]}}
 } 5
-test dict-24.21 {dict compilation crash: 'dict for' bug 3487626} {
+test dict-24.21 {dict compilation crash: 'dict for' bug 3487626} knownBug {
    apply {{} {apply {n {
 	set e {}
 	set k {}
@@ -1865,77 +1865,6 @@ j
 	}
    }} [linenumber]}}
 } 5
-test dict-23.3 {CompileWord OBOE} {
-    # segfault when buggy
-    apply {{} {tcl::dict::lappend foo bar \
-	[format baz]}}
-} {bar baz}
-test dict-23.4 {CompileWord OBOE} {
-    apply {n {
-	dict set foo {*}{
-	} [return [incr n -[linenumber]]] val
-    }} [linenumber]
-} 1
-test dict-23.5 {CompileWord OBOE} {
-    # segfault when buggy
-    apply {{} {tcl::dict::incr foo \
-	[format bar]}}
-} {bar 1}
-test dict-23.6 {CompileWord OBOE} {
-    apply {n {
-	dict get {a b} {*}{
-	} [return [incr n -[linenumber]]]
-    }} [linenumber]
-} 1
-test dict-23.7 {CompileWord OBOE} {
-    apply {n {
-	dict for {a b} [return [incr n -[linenumber]]] {*}{
-	} {}
-    }} [linenumber]
-} 2
-test dict-23.8 {CompileWord OBOE} {
-    apply {n {
-	dict update foo {*}{
-	} [return [incr n -[linenumber]]] x {}
-    }} [linenumber]
-} 1
-test dict-23.9 {CompileWord OBOE} {
-    apply {n {
-	dict exists {} {*}{
-	} [return [incr n -[linenumber]]]
-    }} [linenumber]
-} 1
-test dict-23.10 {CompileWord OBOE} {
-    apply {n {
-	dict with foo {*}{
-	} [return [incr n -[linenumber]]] {}
-    }} [linenumber]
-} 1
-test dict-23.11 {CompileWord OBOE} {
-    apply {n {
-	dict with ::foo {*}{
-	} [return [incr n -[linenumber]]] {}
-    }} [linenumber]
-} 1
-test dict-23.12 {CompileWord OBOE} {
-    apply {n {
-	dict with {*}{
-	} [return [incr n -[linenumber]]] {}
-    }} [linenumber]
-} 1
-test dict-23.13 {CompileWord OBOE} {
-    apply {n {
-	dict with {*}{
-	} [return [incr n -[linenumber]]] {bar}
-    }} [linenumber]
-} 1
-test dict-23.14 {CompileWord OBOE} {
-    apply {n {
-	dict with foo {*}{
-	} [return [incr n -[linenumber]]] {bar}
-    }} [linenumber]
-} 1
-
 rename linenumber {}
 test dict-24.22 {dict map results (non-compiled)} {
    dict map {k v} [dict map {k v} {a 1 b 2 c 3 d 4} { list $v $k }] {
@@ -182,16 +182,6 @@ test error-4.7 {errorstack via options dict } -body {
    catch {f 12} m d
    dict get $d -errorstack
 } -match glob -result {INNER * CALL {g 1212} CALL {f 12} UP 1}
-test error-4.8 {errorstack from exec traces} -body {
-    proc foo args {}
-    proc goo {} foo
-    trace add execution foo enter {error bar;#}
-    catch goo m d
-    dict get $d -errorstack
-} -cleanup {
-    rename goo {}; rename foo {}
-    unset -nocomplain m d
-} -result {INNER {error bar} CALL goo UP 1}

 # Errors in error command itself

@@ -254,17 +254,6 @@ test foreach-9.1 {compiled empty var list} {
    list [catch { foo } msg] $msg
 } {1 {foreach varlist is empty}}

-test foreach-9.2 {line numbers} -setup {
-    proc linenumber {} {dict get [info frame -1] line}
-} -body {
-    apply {n {
-        foreach x y {*}{
-        } {return [incr n -[linenumber]]}
-    }} [linenumber]
-} -cleanup {
-    rename linenumber {}
-} -result 1
-
 test foreach-10.1 {foreach: [Bug 1671087]} -setup {
    proc demo {} {
 	set vals {1 2 3 4}
@@ -2,12 +2,12 @@
 # Sourcing this file into Tcl runs the tests and generates output for errors.
 # No output means no errors were found.
 #
-# Copyright (c) 2006-2013 Donal K. Fellows
+# Copyright (c) 2006-2012 Donal K. Fellows
 #
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.

-package require TclOO 1.0.1
+package require TclOO 1.0
 package require tcltest 2
 if {"::tcltest" in [namespace children]} {
    namespace import -force ::tcltest::*
@@ -1839,36 +1839,6 @@ test oo-15.9 {ensemble rewriting must not bleed through oo::copy} -setup {
 } -returnCodes error -cleanup {
    Foo destroy
 } -result {wrong # args: should be "::bar <cloned> a b"}
-test oo-15.10 {variable binding must not bleed through oo::copy} -setup {
-    oo::class create FooClass
-    set result {}
-} -body {
-    set obj1 [FooClass new]
-    oo::objdefine $obj1 {
-	variable var 
-	method m {} {
-	    set var foo
-	}
-	method get {} {
-	    return $var
-	}
-	export eval
-    }
-
-    $obj1 m
-    lappend result [$obj1 get]
-    set obj2 [oo::copy $obj1]
-    $obj2 eval {
-	set var bar
-    }
-    lappend result [$obj2 get]
-    $obj1 eval {
-	set var grill
-    }
-    lappend result [$obj1 get] [$obj2 get]
-} -cleanup {
-    FooClass destroy
-} -result {foo bar grill bar}

 test oo-16.1 {OO: object introspection} -body {
    info object
@@ -7,7 +7,7 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.

-package require TclOO 1.0.1
+package require TclOO 1.0
 package require tcltest 2
 if {"::tcltest" in [namespace children]} {
    namespace import -force ::tcltest::*
@@ -414,17 +414,6 @@ test upvar-9.7 {Tcl_UpVar procedure} testupvar {
 } {1234}
 catch {unset a}

-test upvar-10.1 {CompileWord OBOE} -setup {
-    proc linenumber {} {dict get [info frame -1] line}
-} -body {
-    apply {n {
-        upvar 1 {*}{
-        } [return [incr n -[linenumber]]] x
-    }} [linenumber]
-} -cleanup {
-    rename linenumber {}
-} -result 1
-
 #
 # Tests for 'namespace upvar'. As the implementation is essentially the same as
 # for 'upvar', we only test that the variables are linked correctly, i.e., we
@@ -547,38 +536,6 @@ test upvar-NS-2.2 {TIP 323} -setup {
 } -cleanup {
    namespace delete test_ns_1
 } -result {}
-
-test upvar-NS-3.1 {CompileWord OBOE} -setup {
-    proc linenumber {} {dict get [info frame -1] line}
-} -body {
-    apply {n {
-        namespace upvar {*}{
-        } [return [incr n -[linenumber]]] x y
-    }} [linenumber]
-} -cleanup {
-    rename linenumber {}
-} -result 1
-test upvar-NS-3.2 {CompileWord OBOE} -setup {
-    proc linenumber {} {dict get [info frame -1] line}
-} -body {
-    apply {n {
-        namespace upvar :: {*}{
-        } [return [incr n -[linenumber]]] x
-    }} [linenumber]
-} -cleanup {
-    rename linenumber {}
-} -result 1
-test upvar-NS-3.3 {CompileWord OBOE} -setup {
-    proc linenumber {} {dict get [info frame -1] line}
-} -body {
-    apply {n {
-        variable x {*}{
-        } [return [incr n -[linenumber]]]
-    }} [linenumber]
-} -cleanup {
-    rename linenumber {}
-} -result 1
-

 # cleanup
 ::tcltest::cleanupTests
@@ -748,9 +748,6 @@ test var-15.1 {segfault in [unset], [Bug 735335]} {
    namespace eval test A useSomeUnlikelyNameHere
    namespace eval test unset useSomeUnlikelyNameHere
 } {}
-test var-15.2 {compiled unset evaluation order, Bug 3970f54c4e} {
-    apply {{} {unset foo [return ok]}}
-} ok

 test var-16.1 {CallVarTraces: save/restore interp error state} {
    trace add variable ::errorCode write " ;#"
@@ -865,19 +862,6 @@ test var-20.8 {array set compilation correctness: Bug 3603163} -setup {
    }}
    array size x
 } -result 0
-
-test var-21.0 {PushVarNameWord OBOE in compiled unset} -setup {
-    proc linenumber {} {dict get [info frame -1] line}
-} -body {
-    apply {n {
-	set foo bar
-        unset foo {*}{
-        } [return [incr n -[linenumber]]]
-    }} [linenumber]
-} -cleanup {
-    rename linenumber {}
-} -result 1
-

 catch {namespace delete ns}
 catch {unset arr}
@@ -233,7 +233,7 @@ test zlib-8.7 {transformation and fconfigure} -setup {
 # Dictionary is that which is proposed _in_ SPDY draft
 set spdyHeaders "HTTP/1.0 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nX-Robots-Tag: noarchive\r\nLast-Modified: Tue, 05 Jun 2012 02:43:25 GMT\r\nETag: \"1338864205129|#public|0|en|||0\"\r\nExpires: Tue, 05 Jun 2012 16:17:11 GMT\r\nDate: Tue, 05 Jun 2012 16:17:06 GMT\r\nCache-Control: public, max-age=5\r\nX-Content-Type-Options: nosniff\r\nX-XSS-Protection: 1; mode=block\r\nServer: GSE\r\n"
 set spdyDict "optionsgetheadpostputdeletetraceacceptaccept-charsetaccept-encodingaccept-languageauthorizationexpectfromhostif-modified-sinceif-matchif-none-matchif-rangeif-unmodifiedsincemax-forwardsproxy-authorizationrangerefererteuser-agent100101200201202203204205206300301302303304305306307400401402403404405406407408409410411412413414415416417500501502503504505accept-rangesageetaglocationproxy-authenticatepublicretry-afterservervarywarningwww-authenticateallowcontent-basecontent-encodingcache-controlconnectiondatetrailertransfer-encodingupgradeviawarningcontent-languagecontent-lengthcontent-locationcontent-md5content-rangecontent-typeetagexpireslast-modifiedset-cookieMondayTuesdayWednesdayThursdayFridaySaturdaySundayJanFebMarAprMayJunJulAugSepOctNovDecchunkedtext/htmlimage/pngimage/jpgimage/gifapplication/xmlapplication/xhtmltext/plainpublicmax-agecharset=iso-8859-1utf-8gzipdeflateHTTP/1.1statusversionurl"
-test zlib-8.8 {transformation and fconfigure} -setup {
+test zlib-8.8 {transformtion and fconfigure} -setup {
    lassign [chan pipe] inSide outSide
 } -constraints zlib -body {
    zlib push compress $outSide -dictionary $spdyDict
@@ -250,7 +250,7 @@ test zlib-8.8 {transformation and fconfigure} -setup {
    catch {close $outSide}
    catch {close $inSide}
 } -result {260 222 {need dictionary} {TCL ZLIB NEED_DICT 2381337010} 2381337010}
-test zlib-8.9 {transformation and fconfigure} -setup {
+test zlib-8.9 {transformtion and fconfigure} -setup {
    lassign [chan pipe] inSide outSide
    set strm [zlib stream decompress]
 } -constraints zlib -body {
@@ -267,7 +267,7 @@ test zlib-8.9 {transformation and fconfigure} -setup {
    catch {close $inSide}
    catch {$strm close}
 } -result {3064818174 358 358}
-test zlib-8.10 {transformation and fconfigure} -setup {
+test zlib-8.10 {transformtion and fconfigure} -setup {
    lassign [chan pipe] inSide outSide
 } -constraints zlib -body {
    zlib push deflate $outSide -dictionary $spdyDict
@@ -276,10 +276,7 @@ test zlib-8.10 {transformation and fconfigure} -setup {
    puts -nonewline $outSide $spdyHeaders
    chan pop $outSide
    set compressed [read $inSide]
-    catch {
-	zlib inflate $compressed
-	throw UNREACHABLE "should be unreachable"
-    } err opt
+    catch {zlib inflate $compressed} err opt
    list [string length [zlib deflate $spdyHeaders]] \
 	[string length $compressed] \
 	$err [dict get $opt -errorcode]
@@ -287,7 +284,7 @@ test zlib-8.10 {transformation and fconfigure} -setup {
    catch {close $outSide}
    catch {close $inSide}
 } -result {254 212 {data error} {TCL ZLIB DATA}}
-test zlib-8.11 {transformation and fconfigure} -setup {
+test zlib-8.11 {transformtion and fconfigure} -setup {
    lassign [chan pipe] inSide outSide
    set strm [zlib stream inflate]
 } -constraints zlib -body {
@@ -303,7 +300,7 @@ test zlib-8.11 {transformation and fconfigure} -setup {
    catch {close $inSide}
    catch {$strm close}
 } -result {358 358}
-test zlib-8.12 {transformation and fconfigure} -setup {
+test zlib-8.12 {transformtion and fconfigure} -setup {
    lassign [chan pipe] inSide outSide
    set strm [zlib stream compress]
 } -constraints zlib -body {
@@ -320,7 +317,7 @@ test zlib-8.12 {transformation and fconfigure} -setup {
    catch {close $inSide}
    catch {$strm close}
 } -result {358 358 3064818174}
-test zlib-8.13 {transformation and fconfigure} -setup {
+test zlib-8.13 {transformtion and fconfigure} -setup {
    lassign [chan pipe] inSide outSide
    set strm [zlib stream compress]
 } -constraints zlib -body {
@@ -337,7 +334,7 @@ test zlib-8.13 {transformation and fconfigure} -setup {
    catch {close $inSide}
    catch {$strm close}
 } -result {358 358 3064818174}
-test zlib-8.14 {transformation and fconfigure} -setup {
+test zlib-8.14 {transformtion and fconfigure} -setup {
    lassign [chan pipe] inSide outSide
    set strm [zlib stream deflate]
 } -constraints zlib -body {
@@ -353,7 +350,7 @@ test zlib-8.14 {transformation and fconfigure} -setup {
    catch {close $inSide}
    catch {$strm close}
 } -result {358 358}
-test zlib-8.15 {transformation and fconfigure} -setup {
+test zlib-8.15 {transformtion and fconfigure} -setup {
    lassign [chan pipe] inSide outSide
    set strm [zlib stream deflate]
 } -constraints zlib -body {
@@ -850,8 +850,8 @@ install-libraries: libraries
 	    done;
 	@echo "Installing package msgcat 1.5.2 as a Tcl Module";
 	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm;
-	@echo "Installing package tcltest 2.3.6 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.6.tm;
+	@echo "Installing package tcltest 2.3.5 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.5.tm;

 	@echo "Installing package platform 1.0.12 as a Tcl Module";
 	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.12.tm;
@@ -1335,7 +1335,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL=".1"
+TCL_PATCH_LEVEL=".0"
 VERSION=${TCL_VERSION}

 #------------------------------------------------------------------------
@@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL=".1"
+TCL_PATCH_LEVEL=".0"
 VERSION=${TCL_VERSION}

 #------------------------------------------------------------------------
@@ -4,7 +4,7 @@

 Name:          tcl
 Summary:       Tcl scripting language development environment
-Version:       8.6.1
+Version:       8.6.0
 Release:       2
 License:       BSD
 Group:         Development/Languages
@@ -115,9 +115,6 @@
 /* Define to 1 if you have the `gmtime_r' function. */
 #undef HAVE_GMTIME_R

-/* Compiler support for module scope symbols */
-#undef HAVE_HIDDEN
-
 /* Do we have the intptr_t type? */
 #undef HAVE_INTPTR_T

@@ -346,6 +343,9 @@
 /* Do we have <values.h>? */
 #undef NO_VALUES_H

+/* Compiler support for module scope symbols */
+#undef HAVE_HIDDEN
+
 /* Do we have wait3() */
 #undef NO_WAIT3

@@ -462,10 +462,10 @@ DoCopyFile(
    switch ((int) (statBufPtr->st_mode & S_IFMT)) {
 #ifndef DJGPP
    case S_IFLNK: {
-	char linkBuf[MAXPATHLEN+1];
+	char linkBuf[MAXPATHLEN];
 	int length;

-	length = readlink(src, linkBuf, MAXPATHLEN);
+	length = readlink(src, linkBuf, sizeof(linkBuf));
 							/* INTL: Native. */
 	if (length == -1) {
 	    return TCL_ERROR;
@@ -1358,7 +1358,6 @@ Tcl_OpenTcpServer(
 		my_errno = errno;
 	    }       
            close(sock);
-            sock = -1;
            continue;
        }
        if (port == 0 && chosenport == 0) {
@@ -1381,7 +1380,6 @@ Tcl_OpenTcpServer(
 		my_errno = errno;
 	    }
            close(sock);
-            sock = -1;
            continue;
        }
        if (statePtr == NULL) {
@@ -16,4 +16,4 @@ TCLOO_STUB_LIB_SPEC=""
 TCLOO_INCLUDE_SPEC=""
 TCLOO_PRIVATE_INCLUDE_SPEC=""
 TCLOO_CFLAGS=""
-TCLOO_VERSION=1.0.1
+TCLOO_VERSION=1.0
@@ -584,23 +584,23 @@ install-binaries: binaries
 	    fi; \
 	    done
 	@if [ -f $(DDE_DLL_FILE) ]; then \
-	    echo Installing $(DDE_DLL_FILE); \
+	    echo installing $(DDE_DLL_FILE); \
 	    $(COPY) $(DDE_DLL_FILE) $(LIB_INSTALL_DIR)/dde${DDEDOTVER}; \
 	    $(COPY) $(ROOT_DIR)/library/dde/pkgIndex.tcl \
 		$(LIB_INSTALL_DIR)/dde${DDEDOTVER}; \
 	    fi
 	@if [ -f $(DDE_LIB_FILE) ]; then \
-	    echo Installing $(DDE_LIB_FILE); \
+	    echo installing $(DDE_LIB_FILE); \
 	    $(COPY) $(DDE_LIB_FILE) $(LIB_INSTALL_DIR)/dde${DDEDOTVER}; \
 	    fi
 	@if [ -f $(REG_DLL_FILE) ]; then \
-	    echo Installing $(REG_DLL_FILE); \
+	    echo installing $(REG_DLL_FILE); \
 	    $(COPY) $(REG_DLL_FILE) $(LIB_INSTALL_DIR)/reg${REGDOTVER}; \
 	    $(COPY) $(ROOT_DIR)/library/reg/pkgIndex.tcl \
 		$(LIB_INSTALL_DIR)/reg${REGDOTVER}; \
 	    fi
 	@if [ -f $(REG_LIB_FILE) ]; then \
-	    echo Installing $(REG_LIB_FILE); \
+	    echo installing $(REG_LIB_FILE); \
 	    $(COPY) $(REG_LIB_FILE) $(LIB_INSTALL_DIR)/reg${REGDOTVER}; \
 	    fi

@@ -650,8 +650,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    done;
 	@echo "Installing package msgcat 1.5.2 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.5.2.tm;
-	@echo "Installing package tcltest 2.3.6 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.6.tm;
+	@echo "Installing package tcltest 2.3.5 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.5.tm;
 	@echo "Installing package platform 1.0.12 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.12.tm;
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
@@ -1311,7 +1311,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL=".1"
+TCL_PATCH_LEVEL=".0"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION

 TCL_DDE_VERSION=1.4
@@ -14,7 +14,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL=".1"
+TCL_PATCH_LEVEL=".0"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION

 TCL_DDE_VERSION=1.4
@@ -409,57 +409,57 @@ $(CAT32): $(WINDIR)\cat.c
 install-binaries: $(TCLSH)
 	$(MKDIR) "$(BIN_INSTALL_DIR)"
 	$(MKDIR) "$(LIB_INSTALL_DIR)"
-	@echo Installing $(TCLDLLNAME)
+	@echo installing $(TCLDLLNAME)
 	@copy "$(TCLDLL)" "$(BIN_INSTALL_DIR)"
 	@copy "$(TCLLIB)" "$(LIB_INSTALL_DIR)"
-	@echo Installing "$(TCLSH)"
+	@echo installing "$(TCLSH)"
 	@copy "$(TCLSH)" "$(BIN_INSTALL_DIR)"
-	@echo Installing $(TCLSTUBLIBNAME)
+	@echo installing $(TCLSTUBLIBNAME)
 	@copy "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)"
-	@echo Installing $(WINDIR)\tclooConfig.sh
+	@echo installing $(WINDIR)\tclooConfig.sh
 	@copy "$(WINDIR)\tclooConfig.sh" "$(LIB_INSTALL_DIR)"

 install-libraries:
 	-@$(MKDIR) "$(LIB_INSTALL_DIR)"
 	-@$(MKDIR) "$(INCLUDE_INSTALL_DIR)"
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
-	@echo Installing http1.0
+	@echo installing http1.0
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http1.0"
 	-@copy "$(ROOT)\library\http1.0\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http1.0"
 	-@copy "$(ROOT)\library\http1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0"
-	@echo Installing http2.8
+	@echo installing http2.8
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.8"
 	-@copy "$(ROOT)\library\http\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http2.8"
 	-@copy "$(ROOT)\library\http\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.8"
-	@echo Installing opt0.4
+	@echo installing opt0.4
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
 	-@copy "$(ROOT)\library\opt\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
 	-@copy "$(ROOT)\library\opt\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
-	@echo Installing msgcat1.5
+	@echo installing msgcat1.5
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\msgcat1.5"
 	-@copy "$(ROOT)\library\msgcat\msgcat.tcl"   "$(SCRIPT_INSTALL_DIR)\msgcat1.5"
 	-@copy "$(ROOT)\library\msgcat\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\msgcat1.5"
-	@echo Installing tcltest2.3
+	@echo installing tcltest2.3
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\tcltest2.3"
 	-@copy "$(ROOT)\library\tcltest\tcltest.tcl"   "$(SCRIPT_INSTALL_DIR)\tcltest2.3"
 	-@copy "$(ROOT)\library\tcltest\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\tcltest2.3"
-	@echo Installing platform1.0
+	@echo installing platform1.0
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\platform1.0"
 	-@copy "$(ROOT)\library\platform\platform.tcl" "$(SCRIPT_INSTALL_DIR)\platform1.0"
 	-@copy "$(ROOT)\library\platform\shell.tcl"    "$(SCRIPT_INSTALL_DIR)\platform1.0"
 	-@copy "$(ROOT)\library\platform\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\platform1.0"
-	@echo Installing $(TCLDDEDLLNAME)
+	@echo installing $(TCLDDEDLLNAME)
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\dde1.3"
 	-@copy "$(TCLDDEDLL)" "$(SCRIPT_INSTALL_DIR)\dde1.3"
 	-@copy "$(ROOT)\library\dde\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\dde1.3"
-	@echo Installing $(TCLREGDLLNAME)
+	@echo installing $(TCLREGDLLNAME)
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\reg1.2"
 	-@copy "$(TCLREGDLL)" "$(SCRIPT_INSTALL_DIR)\reg1.3"
 	-@copy "$(ROOT)\library\reg\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\reg1.2"
-	@echo Installing encoding files
+	@echo installing encoding files
 	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\encoding"
 	-@copy "$(ROOT)\library\encoding\*.enc" "$(SCRIPT_INSTALL_DIR)\encoding"
-	@echo Installing library files
+	@echo installing library files
 	-@copy "$(GENERICDIR)\tcl.h"         "$(INCLUDE_INSTALL_DIR)"
 	-@copy "$(GENERICDIR)\tclDecls.h"    "$(INCLUDE_INSTALL_DIR)"
 	-@copy "$(GENERICDIR)\tclOO.h"       "$(INCLUDE_INSTALL_DIR)"
@@ -16,4 +16,4 @@ TCLOO_STUB_LIB_SPEC=""
 TCLOO_INCLUDE_SPEC=""
 TCLOO_PRIVATE_INCLUDE_SPEC=""
 TCLOO_CFLAGS=""
-TCLOO_VERSION=1.0.1
+TCLOO_VERSION=1.0