Merge 8.6

15 files changed, 75 insertions, 70 deletions

diff --git a/README.md b/README.md
index ae0a833..bb726cc 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # README:  Tcl
 
 This is the **Tcl 8.6.9** source distribution.
-	
+
 You can get any source release of Tcl from [our distribution
 site](https://sourceforge.net/projects/tcl/files/Tcl/).
 
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index 1a5e5f4..39930a7 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -2256,7 +2256,7 @@ GetListIndexOperand(
     if (GetNextOperand(assemEnvPtr, tokenPtrPtr, &value) != TCL_OK) {
 	return TCL_ERROR;
     }
-     
+
     /* Convert to an integer, advance to the next token and return. */
     /*
      * NOTE: Indexing a list with an index before it yields the
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 61e5b03..94c5413 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -1960,7 +1960,7 @@ InfoProcsCmd(
 	/*
 	 * If "info procs" worked like "info commands", returning the commands
 	 * also seen in the global namespace, then you would include this
-	 * code. As this could break backwards compatibilty with 8.0-8.2, we
+	 * code. As this could break backwards compatibility with 8.0-8.2, we
 	 * decided not to "fix" it in 8.3, leaving the behavior slightly
 	 * different.
 	 */
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index 1094352..324db41 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -35,7 +35,7 @@ static int		IndexTailVarIfKnown(Tcl_Interp *interp,
  * TclGetIndexFromToken --
  *
  *	Parse a token to determine if an index value is known at
- *	compile time. 
+ *	compile time.
  *
  * Returns:
  *	TCL_OK if parsing succeeded, and TCL_ERROR if it failed.
@@ -1536,7 +1536,7 @@ TclCompileLreplaceCmd(
 
 	emptyPrefix = 0;
     }
-     
+
     if ((idx1 == suffixStart) && (parsePtr->numWords == 4)) {
 	/*
 	 * This is a "no-op". Example: [lreplace {a b c} 2 0]
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index 53bff6e..1d59cc6 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -1002,13 +1002,13 @@ TclCompileStringReplaceCmd(
     if (parsePtr->numWords < 4 || parsePtr->numWords > 5) {
 	return TCL_ERROR;
     }
- 
+
     /* Bytecode to compute/push string argument being replaced */
     valueTokenPtr = TokenAfter(parsePtr->tokenPtr);
     CompileWord(envPtr, valueTokenPtr, interp, 1);
 
     /*
-     * Check for first index known and useful at compile time. 
+     * Check for first index known and useful at compile time.
      */
     tokenPtr = TokenAfter(valueTokenPtr);
     if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_AFTER,
@@ -1017,7 +1017,7 @@ TclCompileStringReplaceCmd(
     }
 
     /*
-     * Check for last index known and useful at compile time. 
+     * Check for last index known and useful at compile time.
      */
     tokenPtr = TokenAfter(tokenPtr);
     if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_BEFORE, TCL_INDEX_AFTER,
@@ -1025,7 +1025,7 @@ TclCompileStringReplaceCmd(
 	goto genericReplace;
     }
 
-    /* 
+    /*
      * [string replace] is an odd bird.  For many arguments it is
      * a conventional substring replacer.  However it also goes out
      * of its way to become a no-op for many cases where it would be
@@ -1108,12 +1108,12 @@ TclCompileStringReplaceCmd(
      * Finally we need, third:
      *
      *		(first <= last)
-     * 
+     *
      * Considered in combination with the constraints we already have,
      * we see that we can proceed when (first == TCL_INDEX_BEFORE)
      * or (last == TCL_INDEX_AFTER). These also permit simplification
      * of the prefix|replace|suffix construction. The other constraints,
-     * though, interfere with getting a guarantee that first <= last. 
+     * though, interfere with getting a guarantee that first <= last.
      */
 
     if ((first == TCL_INDEX_BEFORE) && (last >= TCL_INDEX_START)) {
@@ -1141,7 +1141,7 @@ TclCompileStringReplaceCmd(
 	/* FLOW THROUGH TO genericReplace */
 
     } else {
-	/* 
+	/*
 	 * When we have no replacement string to worry about, we may
 	 * have more luck, because the forbidden empty string replacements
 	 * are harmless when they are replaced by another empty string.
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 3352d1f..03bbf03 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -649,12 +649,12 @@ TclNamespaceEnsembleCmd(
 
 Tcl_Command
 TclCreateEnsembleInNs(
-    Tcl_Interp *interp, 
-			
+    Tcl_Interp *interp,
+
     const char *name,   /* Simple name of command to create (no */
 			/* namespace components). */
-    Tcl_Namespace       /* Name of namespace to create the command in. */ 
-    *nameNsPtr,	
+    Tcl_Namespace       /* Name of namespace to create the command in. */
+    *nameNsPtr,
     Tcl_Namespace
     *ensembleNsPtr,	/* Name of the namespace for the ensemble. */
     int flags
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index b0bfc15..79985ed 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -944,12 +944,12 @@ Tcl_Exit(
     currentAppExitPtr = appExitPtr;
     Tcl_MutexUnlock(&exitMutex);
 
-    /* 
+    /*
      * Warning: this function SHOULD NOT return, as there is code that depends
      * on Tcl_Exit never returning. In fact, we will Tcl_Panic if anyone
      * returns, so critical is this dependcy.
      *
-     * If subsystems are not (yet) initialized, proper Tcl-finalization is 
+     * If subsystems are not (yet) initialized, proper Tcl-finalization is
      * impossible, so fallback to system exit, see bug-[f8a33ce3db5d8cc2].
      */
 
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 413c753..cdf0c5d 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -9001,7 +9001,7 @@ ExecuteExtendedBinaryMathOp(
 	}
 	Tcl_TakeBignumFromObj(NULL, valuePtr, &big1);
 	mp_init(&bigResult);
-	mp_expt_d(&big1, w2, &bigResult);
+	mp_expt_d(&big1, (mp_digit)w2, &bigResult);
 	mp_clear(&big1);
 	BIG_RESULT(&bigResult);
     }
diff --git a/generic/tclOOInt.h b/generic/tclOOInt.h
index e59fe8a..d90b407 100644
--- a/generic/tclOOInt.h
+++ b/generic/tclOOInt.h
@@ -563,7 +563,7 @@ MODULE_SCOPE void	TclOOSetupVariableResolver(Tcl_Namespace *nsPtr);
 #define FOREACH(var,ary) \
     for(i=0 ; i<(ary).num; i++) if ((ary).list[i] == NULL) { \
 	continue; \
-    } else if (var = (ary).list[i], 1) 
+    } else if (var = (ary).list[i], 1)
 
 /*
  * Convenience macros for iterating through hash tables. FOREACH_HASH_DECLS
diff --git a/tests-perf/clock.perf.tcl b/tests-perf/clock.perf.tcl
index d574c2c..f80746f 100644
--- a/tests-perf/clock.perf.tcl
+++ b/tests-perf/clock.perf.tcl
@@ -2,18 +2,18 @@
 # ------------------------------------------------------------------------
 #
 # test-performance.tcl --
-# 
+#
 #  This file provides common performance tests for comparison of tcl-speed
 #  degradation by switching between branches.
 #  (currently for clock ensemble only)
 #
 # ------------------------------------------------------------------------
-# 
+#
 # Copyright (c) 2014 Serg G. Brester (aka sebres)
-# 
+#
 # See the file "license.terms" for information on usage and redistribution
 # of this file.
-# 
+#
 
 array set in {-time 500}
 if {[info exists ::argv0] && [file tail $::argv0] eq [file tail [info script]]} {
@@ -215,7 +215,7 @@ proc test-freescan {{reptime 1000}} {
     {clock scan "next January" -base 0 -gmt 1}
     # FreeScan : relative week
     {clock scan "next Fri" -base 0 -gmt 1}
-    # FreeScan : relative weekday and week offset 
+    # FreeScan : relative weekday and week offset
     {clock scan "next January + 2 week" -base 0 -gmt 1}
     # FreeScan : time only with base
     {clock scan "19:18:30" -base 148863600 -gmt 1}
@@ -300,7 +300,7 @@ proc test-convert {{reptime 1000}} {
     {clock format [clock scan "19:18:30 EST" -base 148863600] -format "%H:%M:%S %z" -timezone EST}
 
     # Format locale 1x: comparison values
-    {clock format 0 -gmt 1 -locale en} 
+    {clock format 0 -gmt 1 -locale en}
     {clock format 0 -gmt 1 -locale de}
     {clock format 0 -gmt 1 -locale fr}
     # Format locale 2x: without switching locale (en, en)
@@ -340,7 +340,7 @@ proc test-convert {{reptime 1000}} {
     {clock scan "19:18:30 MST" -base 148863600; clock scan "19:18:30 EST" -base 148863600}
     # FreeScan TZ 2x (+1 gmt, +1 system-default)
     {clock scan "19:18:30 MST" -base 148863600 -gmt 1; clock scan "19:18:30 EST" -base 148863600}
-    
+
     # Scan TZ: comparison included in scan string vs. given
     {clock scan "2009-06-30T18:30:00 CEST" -format "%Y-%m-%dT%H:%M:%S %z"}
     {clock scan "2009-06-30T18:30:00 CET" -format "%Y-%m-%dT%H:%M:%S %z"}
diff --git a/tests-perf/test-performance.tcl b/tests-perf/test-performance.tcl
index a05c380..78189e6 100644
--- a/tests-perf/test-performance.tcl
+++ b/tests-perf/test-performance.tcl
@@ -1,19 +1,19 @@
 # ------------------------------------------------------------------------
 #
 # test-performance.tcl --
-# 
+#
 #  This file provides common performance tests for comparison of tcl-speed
 #  degradation or regression by switching between branches.
 #
 #  To execute test case evaluate direct corresponding file "tests-perf\*.perf.tcl".
 #
 # ------------------------------------------------------------------------
-# 
+#
 # Copyright (c) 2014 Serg G. Brester (aka sebres)
-# 
+#
 # See the file "license.terms" for information on usage and redistribution
 # of this file.
-# 
+#
 
 namespace eval ::tclTestPerf {
 # warm-up interpeter compiler env, calibrate timerate measurement functionality:
@@ -33,7 +33,7 @@ if {[lindex [timerate {} 10] 6] >= (10-1)} {
 }
 
 proc {**STOP**} {args} {
-  return -code error -level 4 "**STOP** in [info level [expr {[info level]-2}]] [join $args { }]" 
+  return -code error -level 4 "**STOP** in [info level [expr {[info level]-2}]] [join $args { }]"
 }
 
 proc _test_get_commands {lst} {
diff --git a/tests-perf/timer-event.perf.tcl b/tests-perf/timer-event.perf.tcl
index c5a7d45..f68a56a 100644
--- a/tests-perf/timer-event.perf.tcl
+++ b/tests-perf/timer-event.perf.tcl
@@ -3,17 +3,17 @@
 # ------------------------------------------------------------------------
 #
 # timer-event.perf.tcl --
-# 
+#
 #  This file provides performance tests for comparison of tcl-speed
 #  of timer events (event-driven tcl-handling).
 #
 # ------------------------------------------------------------------------
-# 
+#
 # Copyright (c) 2014 Serg G. Brester (aka sebres)
-# 
+#
 # See the file "license.terms" for information on usage and redistribution
 # of this file.
-# 
+#
 
 
 if {![namespace exists ::tclTestPerf]} {
@@ -40,7 +40,7 @@ proc test-queue {{reptime {1000 10000}}} {
     {after idle {set foo bar}}
     # update / after idle:
     {update; if {![llength [after info]]} break}
-    
+
     # generate up to $howmuch idle-events:
     {after idle {set foo bar}}
     # update idletasks / after idle:
@@ -50,7 +50,7 @@ proc test-queue {{reptime {1000 10000}}} {
     {after 0 {set foo bar}}
     # update / after 0:
     {update; if {![llength [after info]]} break}
-    
+
     # generate up to $howmuch 1-ms events:
     {after 1 {set foo bar}}
     setup {after 1}
@@ -83,7 +83,7 @@ proc test-queue {{reptime {1000 10000}}} {
     setup {set le $i; incr i; list $le .. 1; # cancel up to $howmuch events}
     {after cancel $ev([incr i -1]); if {$i <= 1} break}
     cleanup {update; unset -nocomplain ev}
-    
+
     # end $howmuch events.
     cleanup {if [llength [after info]] {error "unexpected: [llength [after info]] events are still there."}}
   }]
@@ -149,7 +149,7 @@ proc test-long {{reptime 1000}} {
     {time {after idle {after 30}} 10; after 1 {set important 1}; vwait important;}
     cleanup {foreach i [after info] {after cancel $i}}
     # in-between important event (of new generation) by amount of idle events:
-    {time {after idle {after 30}} 10; after 1 {after 0 {set important 1}}; vwait important;} 
+    {time {after idle {after 30}} 10; after 1 {after 0 {set important 1}}; vwait important;}
     cleanup {foreach i [after info] {after cancel $i}}
   }
 }
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index 5243eca..f3334e2 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.test
@@ -97,8 +97,13 @@ if {[testConstraint testvolumetype]} {
 # NB: filename is chosen to be short but unlikely to clash with other apps
 if {[file exists c:/] && [file exists d:/]} {
     catch {file delete d:/TclTmpF.1}
-    if {[catch {createfile d:/TclTmpF.1 {}}] == 0} {
-	file delete d:/TclTmpF.1
+    catch {file delete d:/TclTmpD.1}
+    catch {file delete c:/TclTmpC.1}
+    if {![catch {createfile d:/TclTmpF.1 {}}] && [file isfile d:/TclTmpF.1]
+	&& ![catch {file mkdir d:/TclTmpD.1}] && [file isdirectory d:/TclTmpD.1]
+	&& ![catch {file mkdir c:/TclTmpC.1}] && [file isdirectory c:/TclTmpC.1]
+    } {
+	file delete d:/TclTmpF.1 d:/TclTmpD.1 c:/TclTmpC.1
 	testConstraint exdev 1
     }
 }
@@ -178,12 +183,12 @@ test winFCmd-1.9 {TclpRenameFile: errno: ENOTDIR} -setup {
     testfile mv td1 tf1
 } -returnCodes error -result ENOTDIR
 test winFCmd-1.10 {TclpRenameFile: errno: EXDEV} -setup {
-    file delete -force d:/tf1
+    file delete -force d:/TclTmpD.1
 } -constraints {win exdev testfile} -body {
-    file mkdir c:/tf1
-    testfile mv c:/tf1 d:/tf1
+    file mkdir c:/TclTmpC.1
+    testfile mv c:/TclTmpC.1 d:/TclTmpD.1
 } -cleanup {
-    file delete -force c:/tf1
+    file delete -force c:/TclTmpC.1
 } -returnCodes error -result EXDEV
 test winFCmd-1.11 {TclpRenameFile: errno: EACCES} -setup {
     cleanup
@@ -333,15 +338,15 @@ test winFCmd-1.32 {TclpRenameFile: TclpRemoveDirectory succeeds} -setup {
 } -result {0 1 1}
 test winFCmd-1.33 {TclpRenameFile: After removing dst dir, MoveFile fails} \
 	-constraints {win exdev testfile testchmod} -body {
-    file mkdir d:/td1
-    testchmod 0 d:/td1
-    file mkdir c:/tf1
-    catch {testfile mv c:/tf1 d:/td1} msg
-    list $msg [file writable d:/td1]
-} -cleanup {
-    catch {testchmod 0o666 d:/td1}
-    file delete d:/td1
-    file delete -force c:/tf1
+    file mkdir d:/TclTmpD.1
+    testchmod 0 d:/TclTmpD.1
+    file mkdir c:/TclTmpC.1
+    catch {testfile mv c:/TclTmpC.1 d:/TclTmpD.1} msg
+    list $msg [file writable d:/TclTmpD.1]
+} -cleanup {
+    catch {testchmod 0o666 d:/TclTmpD.1}
+    file delete d:/TclTmpD.1
+    file delete -force c:/TclTmpC.1
 } -result {EXDEV 0}
 test winFCmd-1.34 {TclpRenameFile: src is dir, dst is not} -setup {
     cleanup
@@ -1070,13 +1075,13 @@ test winFCmd-12.5 {ConvertFileNameFormat: absolute path} -body {
     list [file attributes / -longname] [file attributes \\ -longname]
 } -constraints {win} -result {/ /}
 test winFCmd-12.6 {ConvertFileNameFormat: absolute path with drive} -setup {
-    catch {file delete -force -- c:/td1}
+    catch {file delete -force -- c:/TclTmpC.1}
 } -constraints {win win2000orXP} -body {
-    createfile c:/td1 {}
-    string tolower [file attributes c:/td1 -longname]
+    createfile c:/TclTmpC.1 {}
+    string tolower [file attributes c:/TclTmpC.1 -longname]
 } -cleanup {
-    file delete -force -- c:/td1
-} -result {c:/td1}
+    file delete -force -- c:/TclTmpC.1
+} -result [string tolower {c:/TclTmpC.1}]
 test winFCmd-12.6.2 {ConvertFileNameFormat: absolute path with drive (in temp folder)} -setup {
     catch {file delete -force -- $::env(TEMP)/td1}
 } -constraints {win} -body {
diff --git a/win/makefile.vc b/win/makefile.vc
index 0b36580..bbc66a8 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -55,7 +55,7 @@
 #       c:\tcl_src\win\>nmake -f makefile.vc release

 #       c:\tcl_src\win\>nmake -f makefile.vc test

 #       c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl

-#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=pdbs 

+#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=pdbs

 #       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=symbols

 #

 

diff --git a/win/rules.vc b/win/rules.vc
index 485a0f7..3059abf 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -394,7 +394,7 @@ MSG = ^
 

 

 # If INSTALLDIR set to Tcl installation root dir then reset to the

-# lib dir for installing extensions 

+# lib dir for installing extensions

 !if exist("$(_INSTALLDIR)\include\tcl.h")

 _INSTALLDIR=$(_INSTALLDIR)\lib

 !endif

@@ -561,7 +561,7 @@ NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c
 # The following macros are set:

 # OPTIMIZATIONS - the compiler flags to be used for optimized builds

 # DEBUGFLAGS - the compiler flags to be used for debug builds

-# LINKERFLAGS - Flags passed to the linker 

+# LINKERFLAGS - Flags passed to the linker

 #

 # Note that these are the compiler settings *available*, not those

 # that will be *used*. The latter depends on the OPTS macro settings

@@ -1343,7 +1343,7 @@ USE_WIDECHAR_API = 0
 !endif

 

 !if $(USE_WIDECHAR_API)

-COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE 

+COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE

 !endif

 

 # Like the TEA system only set this non empty for non-Tk extensions

@@ -1353,7 +1353,7 @@ COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE
 PKGNAMEFLAGS = -DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

                -DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

                -DPACKAGE_VERSION="\"$(DOTVERSION)\"" \

-               -DMODULE_SCOPE=extern 

+               -DMODULE_SCOPE=extern

 !endif

 

 # crt picks the C run time based on selected OPTS

@@ -1446,7 +1446,7 @@ pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)
 # compiled with another VC version. Check for this and fix accordingly.

 stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl -DSTATIC_BUILD $(INCLUDES)

 

-# Link flags 

+# Link flags

 

 !if $(DEBUG)

 ldebug	= -debug -debugtype:cv

@@ -1462,7 +1462,7 @@ ldebug	= $(ldebug) -debug -debugtype:cv
 ldebug= $(ldebug) -profile

 !endif

 

-### Declarations common to all linker versions 

+### Declarations common to all linker versions

 lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)

 

 !if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

@@ -1527,7 +1527,7 @@ RESCMD  = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
 	    -DVERSION=\"$(VERSION)\" \

 	    -DSUFX=\"$(SUFX)\" \

             -DPROJECT=\"$(PROJECT)\" \

-            -DPRJLIBNAME=\"$(PRJLIBNAME)\" 

+            -DPRJLIBNAME=\"$(PRJLIBNAME)\"

 

 !ifndef DEFAULT_BUILD_TARGET

 DEFAULT_BUILD_TARGET = $(PROJECT)

@@ -1646,7 +1646,7 @@ default-shell: default-setup $(PROJECT)
 	@if exist $(LIBDIR) for %f in ("$(LIBDIR)\*.tcl") do @$(COPY) %f "$(OUT_DIR)"

 	$(DEBUGGER) $(TCLSH)

 

-# Generation of Windows version resource 

+# Generation of Windows version resource

 !ifdef RCFILE

 

 # Note: don't use $** in below rule because there may be other dependencies

@@ -1685,7 +1685,7 @@ BEGIN
             VALUE "OriginalFilename", PRJLIBNAME

             VALUE "FileVersion",      DOTVERSION

             VALUE "ProductName",      "Package " PROJECT " for Tcl"

-            VALUE "ProductVersion",   DOTVERSION 

+            VALUE "ProductVersion",   DOTVERSION

         END

     END

     BLOCK "VarFileInfo"