merge trunk

author: dgp <dgp@users.sourceforge.net> 2014-12-23 03:11:01 (GMT)
committer: dgp <dgp@users.sourceforge.net> 2014-12-23 03:11:01 (GMT)
commit: b49e834f28c9fd688fa615cb5809549c58f65788 (patch)
tree: a5328c9e7f0e9394621e84657c6454994d8084af
parent: 9b9c29e352eb0ae7a048fa4ca8a021a4100d2b40 (diff)
parent: dd4496550090acf79f5e144602c745533549eea5 (diff)
download: tcl-b49e834f28c9fd688fa615cb5809549c58f65788.zip
tcl-b49e834f28c9fd688fa615cb5809549c58f65788.tar.gz
tcl-b49e834f28c9fd688fa615cb5809549c58f65788.tar.bz2
81 files changed, 1014 insertions, 788 deletions
diff --git a/changes b/changes
index 1decfe2..79a242d 100644
--- a/changes
+++ b/changes
@@ -8491,3 +8491,5 @@ include ::oo::class (fellows)
 2014-11-06 (bug)[5adc35] Stop forcing EOF to be permanent (porter)
 
 --- Released 8.6.3, November 12, 2014 --- http://core.tcl.tk/tcl/ for details
+
+2014-12-17 (TIP 427) [fconfigure $h -connecting, -peername, -sockname] (oehlmann,rmax)
diff --git a/doc/socket.n b/doc/socket.n
index b7a4a45..492ca66 100644
--- a/doc/socket.n
+++ b/doc/socket.n
@@ -97,6 +97,10 @@ writable channel event on the socket to get notified when the
 asynchronous connection has succeeded or failed. See the \fBvwait\fR
 and the \fBchan\fR commands for more details on the event loop and
 channel events.
+.PP
+The \fBchan configure\fR option \fB-connecting\fR may be used to check if the connect is still running. To verify a successful connect, the option \fB-error\fR may be checked when \fB-connecting\fR returned 0. 
+.PP
+Operation without the event queue requires at the moment calls to \fBchan configure\fR to advance the internal state machine. 
 .RE
 .SH "SERVER SOCKETS"
 .PP
@@ -186,6 +190,11 @@ sockets, this option returns a list of three elements; these are the
 address, the host name and the port to which the peer socket is connected
 or bound. If the host name cannot be computed, the second element of the
 list is identical to the address, its first element.
+.RE
+.TP
+\fB\-connecting\fR
+.
+This option is not supported by server sockets. For client sockets, this option returns 1 if an asyncroneous connect is still in progress, 0 otherwise.
 .PP
 .SH "EXAMPLES"
 .PP
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 18f4564..6a22a30 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -177,9 +177,9 @@ TclCompileAppendCmd(
      */
 
     varTokenPtr = TokenAfter(parsePtr->tokenPtr);
-    PushVarNameWord(interp, varTokenPtr, envPtr, TCL_NO_ELEMENT,
-	    &localIndex, &isScalar, 1);
-    if (!isScalar || localIndex < 0) {
+
+    localIndex = LocalScalarFromToken(varTokenPtr, envPtr);
+    if (localIndex < 0) {
 	return TCL_ERROR;
     }
 
@@ -2527,25 +2527,17 @@ CompileEachloopCmd(
 				 * (TCL_EACH_*) */
 {
     Proc *procPtr = envPtr->procPtr;
-    ForeachInfo *infoPtr;	/* Points to the structure describing this
+    ForeachInfo *infoPtr=NULL;	/* Points to the structure describing this
 				 * foreach command. Stored in a AuxData
 				 * record in the ByteCode. */
     
     Tcl_Token *tokenPtr, *bodyTokenPtr;
     int jumpBackOffset, infoIndex, range;
-    int numWords, numLists, numVars, loopIndex, i, j, code;
+    int numWords, numLists, i, j, code = TCL_OK;
+    Tcl_Obj *varListObj = NULL;
     DefineLineInformation;	/* TIP #280 */
 
     /*
-     * We parse the variable list argument words and create two arrays:
-     *    varcList[i] is number of variables in i-th var list.
-     *    varvList[i] points to array of var names in i-th var list.
-     */
-
-    int *varcList;
-    const char ***varvList;
-
-    /*
      * If the foreach command isn't in a procedure, don't compile it inline:
      * the payoff is too small.
      */
@@ -2573,105 +2565,73 @@ CompileEachloopCmd(
     }
 
     /*
-     * Allocate storage for the varcList and varvList arrays if necessary.
+     * Create and initialize the ForeachInfo and ForeachVarList data
+     * structures describing this command. Then create a AuxData record
+     * pointing to the ForeachInfo structure.
      */
 
     numLists = (numWords - 2)/2;
-    varcList = TclStackAlloc(interp, numLists * sizeof(int));
-    memset(varcList, 0, numLists * sizeof(int));
-    varvList = (const char ***) TclStackAlloc(interp,
-	    numLists * sizeof(const char **));
-    memset((char*) varvList, 0, numLists * sizeof(const char **));
+    infoPtr = ckalloc(sizeof(ForeachInfo)
+	    + (numLists - 1) * sizeof(ForeachVarList *));
+    infoPtr->numLists = 0;	/* Count this up as we go */
 
     /*
-     * Break up each var list and set the varcList and varvList arrays. Don't
+     * Parse each var list into sequence of var names.  Don't
      * compile the foreach inline if any var name needs substitutions or isn't
      * a scalar, or if any var list needs substitutions.
      */
 
-    loopIndex = 0;
+    varListObj = Tcl_NewObj();
     for (i = 0, tokenPtr = parsePtr->tokenPtr;
 	    i < numWords-1;
 	    i++, tokenPtr = TokenAfter(tokenPtr)) {
-	Tcl_DString varList;
+	ForeachVarList *varListPtr;
+	int numVars;
 
 	if (i%2 != 1) {
 	    continue;
 	}
-	if (tokenPtr->type != TCL_TOKEN_SIMPLE_WORD) {
-	    code = TCL_ERROR;
-	    goto done;
-	}
-
-	/*
-	 * Lots of copying going on here. Need a ListObj wizard to show a
-	 * better way.
-	 */
-
-	Tcl_DStringInit(&varList);
-	TclDStringAppendToken(&varList, &tokenPtr[1]);
-	code = Tcl_SplitList(NULL, Tcl_DStringValue(&varList),
-		&varcList[loopIndex], &varvList[loopIndex]);
-	Tcl_DStringFree(&varList);
-	if (code != TCL_OK) {
-	    code = TCL_ERROR;
-	    goto done;
-	}
-	numVars = varcList[loopIndex];
 
 	/*
 	 * If the variable list is empty, we can enter an infinite loop when
-	 * the interpreted version would not. Take care to ensure this does
-	 * not happen. [Bug 1671138]
+	 * the interpreted version would not.  Take care to ensure this does
+	 * not happen.  [Bug 1671138]
 	 */
 
-	if (numVars == 0) {
+	if (!TclWordKnownAtCompileTime(tokenPtr, varListObj) ||
+		TCL_OK != Tcl_ListObjLength(NULL, varListObj, &numVars) ||
+		numVars == 0) {
 	    code = TCL_ERROR;
 	    goto done;
 	}
 
-	for (j = 0;  j < numVars;  j++) {
-	    const char *varName = varvList[loopIndex][j];
+	varListPtr = ckalloc(sizeof(ForeachVarList)
+		+ (numVars - 1) * sizeof(int));
+	varListPtr->numVars = numVars;
+	infoPtr->varLists[i/2] = varListPtr;
+	infoPtr->numLists++;
 
-	    if (!TclIsLocalScalar(varName, (int) strlen(varName))) {
+	for (j = 0;  j < numVars;  j++) {
+	    Tcl_Obj *varNameObj;
+	    const char *bytes;
+	    int numBytes, varIndex;
+
+	    Tcl_ListObjIndex(NULL, varListObj, j, &varNameObj);
+	    bytes = Tcl_GetStringFromObj(varNameObj, &numBytes);
+	    varIndex = LocalScalar(bytes, numBytes, envPtr);
+	    if (varIndex < 0) {
 		code = TCL_ERROR;
 		goto done;
 	    }
+	    varListPtr->varIndexes[j] = varIndex;
 	}
-	loopIndex++;
+	Tcl_SetObjLength(varListObj, 0);
     }
 
     /*
      * We will compile the foreach command.
      */
 
-    code = TCL_OK;
-
-    /*
-     * Create and initialize the ForeachInfo and ForeachVarList data
-     * structures describing this command. Then create a AuxData record
-     * pointing to the ForeachInfo structure.
-     */
-
-    infoPtr = ckalloc(sizeof(ForeachInfo)
-	    + (numLists - 1) * sizeof(ForeachVarList *));
-    infoPtr->numLists = numLists;
-    for (loopIndex = 0;  loopIndex < numLists;  loopIndex++) {
-	ForeachVarList *varListPtr;
-
-	numVars = varcList[loopIndex];
-	varListPtr = ckalloc(sizeof(ForeachVarList)
-		+ (numVars - 1) * sizeof(int));
-	varListPtr->numVars = numVars;
-	for (j = 0;  j < numVars;  j++) {
-	    const char *varName = varvList[loopIndex][j];
-	    int nameChars = strlen(varName);
-
-	    varListPtr->varIndexes[j] = TclFindCompiledLocal(varName,
-		    nameChars, /*create*/ 1, envPtr);
-	}
-	infoPtr->varLists[loopIndex] = varListPtr;
-    }
     infoIndex = TclCreateAuxData(infoPtr, &tclNewForeachInfoType, envPtr);
 
     /*
@@ -2743,13 +2703,14 @@ CompileEachloopCmd(
     }
     
     done:
-    for (loopIndex = 0;  loopIndex < numLists;  loopIndex++) {
-	if (varvList[loopIndex] != NULL) {
-	    ckfree(varvList[loopIndex]);
+    if (code == TCL_ERROR) {
+	if (infoPtr) {
+	    FreeForeachInfo(infoPtr);
 	}
     }
-    TclStackFree(interp, (void *)varvList);
-    TclStackFree(interp, varcList);
+    if (varListObj) {
+	Tcl_DecrRefCount(varListObj);
+    }
     return code;
 }
 
@@ -3234,6 +3195,54 @@ TclCompileFormatCmd(
 /*
  *----------------------------------------------------------------------
  *
+ * TclLocalScalarFromToken --
+ *
+ *	Get the index into the table of compiled locals that corresponds
+ *	to a local scalar variable name.
+ *
+ * Results:
+ * 	Returns the non-negative integer index value into the table of
+ * 	compiled locals corresponding to a local scalar variable name.
+ * 	If the arguments passed in do not identify a local scalar variable
+ * 	then return -1.
+ *
+ * Side effects:
+ *	May add an entery into the table of compiled locals.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclLocalScalarFromToken(
+    Tcl_Token *tokenPtr,
+    CompileEnv *envPtr)
+{
+    int isScalar, index;
+
+    TclPushVarName(NULL, tokenPtr, envPtr, TCL_NO_ELEMENT, &index, &isScalar);
+    if (!isScalar) {
+	index = -1;
+    }
+    return index;
+}
+
+int
+TclLocalScalar(
+    const char *bytes,
+    int numBytes,
+    CompileEnv *envPtr)
+{
+    Tcl_Token token[2] =        {{TCL_TOKEN_SIMPLE_WORD, NULL, 0, 1},
+                                 {TCL_TOKEN_TEXT, NULL, 0, 0}};
+
+    token[1].start = bytes;
+    token[1].size = numBytes;
+    return TclLocalScalarFromToken(token, envPtr);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * TclPushVarName --
  *
  *	Procedure used in the compiling where pushing a variable name is
@@ -3289,16 +3298,7 @@ TclPushVarName(
     nameChars = elNameChars = 0;
     localIndex = -1;
 
-    /*
-     * Check not only that the type is TCL_TOKEN_SIMPLE_WORD, but whether
-     * curly braces surround the variable name. This really matters for array
-     * elements to handle things like
-     *    set {x($foo)} 5
-     * which raises an undefined var error if we are not careful here.
-     */
-
-    if ((varTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) &&
-	    (varTokenPtr->start[0] != '{')) {
+    if (varTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) {
 	/*
 	 * A simple variable name. Divide it up into "name" and "elName"
 	 * strings. If it is not a local variable, look it up at runtime.
@@ -3322,7 +3322,7 @@ TclPushVarName(
 		}
 	    }
 
-	    if ((elName != NULL) && elNameChars) {
+	    if (!(flags & TCL_NO_ELEMENT) && (elName != NULL) && elNameChars) {
 		/*
 		 * An array element, the element name is a simple string:
 		 * assemble the corresponding token.
@@ -3337,7 +3337,7 @@ TclPushVarName(
 		elemTokenCount = 1;
 	    }
 	}
-    } else if (((n = varTokenPtr->numComponents) > 1)
+    } else if (interp && ((n = varTokenPtr->numComponents) > 1)
 	    && (varTokenPtr[1].type == TCL_TOKEN_TEXT)
 	    && (varTokenPtr[n].type == TCL_TOKEN_TEXT)
 	    && (varTokenPtr[n].start[varTokenPtr[n].size - 1] == ')')) {
@@ -3373,9 +3373,10 @@ TclPushVarName(
 	    nameChars = p - varTokenPtr[1].start;
 	    elName = p + 1;
 	    remainingChars = (varTokenPtr[2].start - p) - 1;
-	    elNameChars = (varTokenPtr[n].start-p) + varTokenPtr[n].size - 2;
+	    elNameChars = (varTokenPtr[n].start-p) + varTokenPtr[n].size - 1;
 
-	    if (remainingChars) {
+	    if (!(flags & TCL_NO_ELEMENT)) {
+	      if (remainingChars) {
 		/*
 		 * Make a first token with the extra characters in the first
 		 * token.
@@ -3395,13 +3396,14 @@ TclPushVarName(
 
 		memcpy(elemTokenPtr+1, varTokenPtr+2,
 			(n-1) * sizeof(Tcl_Token));
-	    } else {
+	      } else {
 		/*
 		 * Use the already available tokens.
 		 */
 
 		elemTokenPtr = &varTokenPtr[2];
 		elemTokenCount = n - 1;
+	      }
 	    }
 	}
     }
@@ -3436,7 +3438,7 @@ TclPushVarName(
 		localIndex = -1;
 	    }
 	}
-	if (localIndex < 0) {
+	if (interp && localIndex < 0) {
 	    PushLiteral(envPtr, name, nameChars);
 	}
 
@@ -3453,7 +3455,7 @@ TclPushVarName(
 		PushStringLiteral(envPtr, "");
 	    }
 	}
-    } else {
+    } else if (interp) {
 	/*
 	 * The var name isn't simple: compile and push it.
 	 */
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index 98407f7..e2fb43d 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -2044,7 +2044,7 @@ TclCompileNamespaceUpvarCmd(
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
     Tcl_Token *tokenPtr, *otherTokenPtr, *localTokenPtr;
-    int isScalar, localIndex, numWords, i;
+    int localIndex, numWords, i;
     DefineLineInformation;	/* TIP #280 */
 
     if (envPtr->procPtr == NULL) {
@@ -2079,10 +2079,8 @@ TclCompileNamespaceUpvarCmd(
 	localTokenPtr = TokenAfter(otherTokenPtr);
 
 	CompileWord(envPtr, otherTokenPtr, interp, i);
-	PushVarNameWord(interp, localTokenPtr, envPtr, 0,
-		&localIndex, &isScalar, i+1);
-
-	if ((localIndex < 0) || !isScalar) {
+	localIndex = LocalScalarFromToken(localTokenPtr, envPtr);
+	if (localIndex < 0) {
 	    return TCL_ERROR;
 	}
 	TclEmitInstInt4(	INST_NSUPVAR, localIndex,	envPtr);
@@ -2763,7 +2761,7 @@ TclCompileUpvarCmd(
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
     Tcl_Token *tokenPtr, *otherTokenPtr, *localTokenPtr;
-    int isScalar, localIndex, numWords, i;
+    int localIndex, numWords, i;
     DefineLineInformation;	/* TIP #280 */
     Tcl_Obj *objPtr;
 
@@ -2826,10 +2824,8 @@ TclCompileUpvarCmd(
 	localTokenPtr = TokenAfter(otherTokenPtr);
 
 	CompileWord(envPtr, otherTokenPtr, interp, i);
-	PushVarNameWord(interp, localTokenPtr, envPtr, 0,
-		&localIndex, &isScalar, i+1);
-
-	if ((localIndex < 0) || !isScalar) {
+	localIndex = LocalScalarFromToken(localTokenPtr, envPtr);
+	if (localIndex < 0) {
 	    return TCL_ERROR;
 	}
 	TclEmitInstInt4(	INST_UPVAR, localIndex,		envPtr);
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 94c1bd6..38c1ceb 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -365,7 +365,7 @@ static const unsigned char prec[] = {
     0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  
+    0,
     /* Unary operator lexemes */
     PREC_UNARY,		/* UNARY_PLUS */
     PREC_UNARY,		/* UNARY_MINUS */
@@ -420,7 +420,7 @@ static const unsigned char instruction[] = {
     0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  
+    0,
     /* Unary operator lexemes */
     INST_UPLUS,		/* UNARY_PLUS */
     INST_UMINUS,	/* UNARY_MINUS */
@@ -488,7 +488,7 @@ static const unsigned char Lexeme[] = {
 
 typedef struct JumpList {
     JumpFixup jump;		/* Pass this argument to matching calls of
-				 * TclEmitForwardJump() and 
+				 * TclEmitForwardJump() and
 				 * TclFixupForwardJump(). */
     struct JumpList *next;	/* Point to next item on the stack */
 } JumpList;
@@ -838,7 +838,7 @@ ParseExpr(
 
 	    switch (lexeme) {
 	    case NUMBER:
-	    case BOOLEAN: 
+	    case BOOLEAN:
 		/*
 		 * TODO: Consider using a dict or hash to collapse all
 		 * duplicate literals into a single representative value.
@@ -861,7 +861,7 @@ ParseExpr(
 		start += scanned;
 		numBytes -= scanned;
 		continue;
-	    
+
 	    default:
 		break;
 	    }
@@ -1324,7 +1324,7 @@ ParseExpr(
 	    nodePtr->mark = MARK_LEFT;
 	    nodePtr->left = complete;
 
-	    /* 
+	    /*
 	     * The COMMA operator cannot be optimized, since the function
 	     * needs all of its arguments, and optimization would reduce the
 	     * number. Other binary operators root constant expressions when
@@ -1546,7 +1546,7 @@ ConvertTreeToTokens(
 	     * Tcl_ParseExpr() we do not change them now. Internally, we can
 	     * do better.
 	     */
-	
+
 	    int toCopy = tokenPtr->numComponents + 1;
 
 	    if (tokenPtr->numComponents == tokenPtr[1].numComponents + 1) {
@@ -1562,7 +1562,7 @@ ConvertTreeToTokens(
 		subExprTokenPtr->type = TCL_TOKEN_SUB_EXPR;
 		parsePtr->numTokens += toCopy;
 	    } else {
-		/* 
+		/*
 		 * Multiple element word. Create a TCL_TOKEN_SUB_EXPR token to
 		 * lead, with fields initialized from the leading token, then
 		 * copy entire set of word tokens.
@@ -1611,7 +1611,7 @@ ConvertTreeToTokens(
 	    case COMMA:
 	    case COLON:
 
-		/* 
+		/*
 		 * Historical practice has been to have no Tcl_Tokens for
 		 * these operators.
 		 */
@@ -1747,7 +1747,7 @@ ConvertTreeToTokens(
 		/*
 		 * Before we leave this node/operator/subexpression for the
 		 * last time, finish up its tokens....
-		 * 
+		 *
 		 * Our current position scanning the string is where the
 		 * substring for the subexpression ends.
 		 */
@@ -1967,7 +1967,7 @@ ParseLexeme(
 
     case 'i':
 	if ((numBytes > 1) && (start[1] == 'n')
-		&& ((numBytes == 2) || !isalpha(UCHAR(start[2])))) {
+		&& ((numBytes == 2) || start[2] & 0x80 || !isalpha(UCHAR(start[2])))) {
 	    /*
 	     * Must make this check so we can tell the difference between the
 	     * "in" operator and the "int" function name and the "infinity"
@@ -1981,14 +1981,15 @@ ParseLexeme(
 
     case 'e':
 	if ((numBytes > 1) && (start[1] == 'q')
-		&& ((numBytes == 2) || !isalpha(UCHAR(start[2])))) {
+		&& ((numBytes == 2) || start[2] & 0x80 || !isalpha(UCHAR(start[2])))) {
 	    *lexemePtr = STREQ;
 	    return 2;
 	}
 	break;
 
     case 'n':
-	if ((numBytes > 1) && ((numBytes == 2) || !isalpha(UCHAR(start[2])))) {
+	if ((numBytes > 1)
+		&& ((numBytes == 2) || start[2] & 0x80 || !isalpha(UCHAR(start[2])))) {
 	    switch (start[1]) {
 	    case 'e':
 		*lexemePtr = STRNEQ;
@@ -2003,9 +2004,8 @@ ParseLexeme(
     literal = Tcl_NewObj();
     if (TclParseNumber(NULL, literal, NULL, start, numBytes, &end,
 	    TCL_PARSE_NO_WHITESPACE) == TCL_OK) {
-	if (end < start + numBytes && !isalnum(UCHAR(*end))
-		&& UCHAR(*end) != '_') {
-	
+	if (end < start + numBytes && !TclIsBareword(*end)) {
+
 	number:
 	    TclInitStringRep(literal, start, end-start);
 	    *lexemePtr = NUMBER;
@@ -2029,9 +2029,9 @@ ParseLexeme(
 		const char *p = start;
 
 		while (p < end) {
-		    if (!isalnum(UCHAR(*p++))) {
+		    if (!TclIsBareword(*p++)) {
 			/*
-			 * The number has non-bareword characters, so we 
+			 * The number has non-bareword characters, so we
 			 * must treat it as a number.
 			 */
 			goto number;
@@ -2054,33 +2054,30 @@ ParseLexeme(
 	}
     }
 
-    if (Tcl_UtfCharComplete(start, numBytes)) {
-	scanned = Tcl_UtfToUniChar(start, &ch);
-    } else {
-	char utfBytes[TCL_UTF_MAX];
+    /*
+     * We reject leading underscores in bareword.  No sensible reason why.
+     * Might be inspired by reserved identifier rules in C, which of course
+     * have no direct relevance here.
+     */
 
-	memcpy(utfBytes, start, (size_t) numBytes);
-	utfBytes[numBytes] = '\0';
-	scanned = Tcl_UtfToUniChar(utfBytes, &ch);
-    }
-    if (!isalnum(UCHAR(ch))) {
-	*lexemePtr = INVALID;
-	Tcl_DecrRefCount(literal);
-	return scanned;
-    }
-    end = start;
-    while (isalnum(UCHAR(ch)) || (UCHAR(ch) == '_')) {
-	end += scanned;
-	numBytes -= scanned;
-	if (Tcl_UtfCharComplete(end, numBytes)) {
-	    scanned = Tcl_UtfToUniChar(end, &ch);
+    if (!TclIsBareword(*start) || *start == '_') {
+	if (Tcl_UtfCharComplete(start, numBytes)) {
+	    scanned = Tcl_UtfToUniChar(start, &ch);
 	} else {
 	    char utfBytes[TCL_UTF_MAX];
 
-	    memcpy(utfBytes, end, (size_t) numBytes);
+	    memcpy(utfBytes, start, (size_t) numBytes);
 	    utfBytes[numBytes] = '\0';
 	    scanned = Tcl_UtfToUniChar(utfBytes, &ch);
 	}
+	*lexemePtr = INVALID;
+	Tcl_DecrRefCount(literal);
+	return scanned;
+    }
+    end = start;
+    while (numBytes && TclIsBareword(*end)) {
+	end += 1;
+	numBytes -= 1;
     }
     *lexemePtr = BAREWORD;
     if (literalPtr) {
@@ -2098,7 +2095,7 @@ ParseLexeme(
  * TclCompileExpr --
  *
  *	This procedure compiles a string containing a Tcl expression into Tcl
- *	bytecodes. 
+ *	bytecodes.
  *
  * Results:
  *	None.
@@ -2333,7 +2330,7 @@ CompileExprTree(
 		 * Use the numWords count we've kept to invoke the function
 		 * command with the correct number of arguments.
 		 */
-		
+
 		if (numWords < 255) {
 		    TclEmitInvoke(envPtr, INST_INVOKE_STK1, numWords);
 		} else {
@@ -2427,7 +2424,7 @@ CompileExprTree(
 		const char *bytes = TclGetStringFromObj(literal, &length);
 		int index = TclRegisterNewLiteral(envPtr, bytes, length);
 		Tcl_Obj *objPtr = TclFetchLiteral(envPtr, index);
-		
+
 		if ((objPtr->typePtr == NULL) && (literal->typePtr != NULL)) {
 		    /*
 		     * Would like to do this:
@@ -2570,7 +2567,7 @@ TclSingleOpCmd(
  *
  * TclSortingOpCmd --
  *	Implements the commands:
- *		<, <=, >, >=, ==, eq 
+ *		<, <=, >, >=, ==, eq
  *	in the ::tcl::mathop namespace. These commands are defined for
  *	arbitrary number of arguments by computing the AND of the base
  *	operator applied to all neighbor argument pairs.
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 3736498..0f4dfaf 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -4342,10 +4342,11 @@ TclInitAuxDataTypeTable(void)
     Tcl_InitHashTable(&auxDataTypeTable, TCL_STRING_KEYS);
 
     /*
-     * There are only three AuxData types at this time, so register them here.
+     * There are only four AuxData types at this time, so register them here.
      */
 
     RegisterAuxDataType(&tclForeachInfoType);
+    RegisterAuxDataType(&tclNewForeachInfoType);
     RegisterAuxDataType(&tclJumptableInfoType);
     RegisterAuxDataType(&tclDictUpdateInfoType);
 }
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 51f0b34..c6c7a7c 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -1151,6 +1151,10 @@ MODULE_SCOPE void	TclFinalizeLoopExceptionRange(CompileEnv *envPtr,
 MODULE_SCOPE char *	TclLiteralStats(LiteralTable *tablePtr);
 MODULE_SCOPE int	TclLog2(int value);
 #endif
+MODULE_SCOPE int	TclLocalScalar(const char *bytes, int numBytes,
+			    CompileEnv *envPtr);
+MODULE_SCOPE int	TclLocalScalarFromToken(Tcl_Token *tokenPtr,
+			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclOptimizeBytecode(void *envPtr);
 #ifdef TCL_COMPILE_DEBUG
 MODULE_SCOPE void	TclPrintByteCodeObj(Tcl_Interp *interp,
@@ -1678,11 +1682,9 @@ MODULE_SCOPE int	TclPushProcCallFrame(ClientData clientData,
 #define AnonymousLocal(envPtr) \
     (TclFindCompiledLocal(NULL, /*nameChars*/ 0, /*create*/ 1, (envPtr)))
 #define LocalScalar(chars,len,envPtr) \
-    (!TclIsLocalScalar((chars), (len)) ? -1 : \
-	TclFindCompiledLocal((chars), (len), /*create*/ 1, (envPtr)))
+    TclLocalScalar(chars, len, envPtr)
 #define LocalScalarFromToken(tokenPtr,envPtr) \
-    ((tokenPtr)->type != TCL_TOKEN_SIMPLE_WORD ? -1 : \
-	LocalScalar((tokenPtr)[1].start, (tokenPtr)[1].size, (envPtr)))
+    TclLocalScalarFromToken(tokenPtr, envPtr)
 
 /*
  * Flags bits used by TclPushVarName.
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index f33e0e6..2a766d1 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -180,9 +180,9 @@ TCL_DECLARE_MUTEX(encodingMutex)
  * the system encoding will be used to perform the conversion.
  */
 
-static Tcl_Encoding defaultEncoding;
-static Tcl_Encoding systemEncoding;
-Tcl_Encoding tclIdentityEncoding;
+static Tcl_Encoding defaultEncoding = NULL;
+static Tcl_Encoding systemEncoding = NULL;
+Tcl_Encoding tclIdentityEncoding = NULL;
 
 /*
  * The following variable is used in the sparse matrix code for a
@@ -652,7 +652,10 @@ TclFinalizeEncodingSubsystem(void)
     Tcl_MutexLock(&encodingMutex);
     encodingsInitialized = 0;
     FreeEncoding(systemEncoding);
+    systemEncoding = NULL;
+    defaultEncoding = NULL;
     FreeEncoding(tclIdentityEncoding);
+    tclIdentityEncoding = NULL;
 
     hPtr = Tcl_FirstHashEntry(&encodingTable, &search);
     while (hPtr != NULL) {
@@ -2984,7 +2987,9 @@ TableFreeProc(
      */
 
     ckfree(dataPtr->toUnicode);
+    dataPtr->toUnicode = NULL;
     ckfree(dataPtr->fromUnicode);
+    dataPtr->fromUnicode = NULL;
     ckfree(dataPtr);
 }
 
@@ -3457,6 +3462,7 @@ EscapeFreeProc(
 	subTablePtr = dataPtr->subTables;
 	for (i = 0; i < dataPtr->numSubTables; i++) {
 	    FreeEncoding((Tcl_Encoding) subTablePtr->encodingPtr);
+	    subTablePtr->encodingPtr = NULL;
 	    subTablePtr++;
 	}
     }
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 3985767..6ca22a6 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -119,6 +119,7 @@ static char *		VwaitVarProc(ClientData clientData,
 			    Tcl_Interp *interp, const char *name1,
 			    const char *name2, int flags);
 static void		InvokeExitHandlers(void);
+static void		FinalizeThread(int quick);
 
 /*
  *----------------------------------------------------------------------
@@ -983,7 +984,7 @@ Tcl_Exit(
 	     * Tcl_Channels that may have data enqueued.
 	     */
 	    
-	    Tcl_FinalizeThread();
+	    FinalizeThread(/* quick */ 1);
 	}
 	TclpExit(status);
 	Tcl_Panic("OS exit failed!");
@@ -1183,7 +1184,7 @@ Tcl_Finalize(void)
      * This fixes the Tcl Bug #990552.
      */
 
-    TclFinalizeThreadData();
+    TclFinalizeThreadData(/* quick */ 0);
 
     /*
      * Now we can free constants for conversions to/from double.
@@ -1269,6 +1270,13 @@ Tcl_Finalize(void)
 void
 Tcl_FinalizeThread(void)
 {
+    FinalizeThread(/* quick */ 0);
+}
+
+void
+FinalizeThread(
+    int quick)
+{
     ExitHandler *exitPtr;
     ThreadSpecificData *tsdPtr;
 
@@ -1309,7 +1317,7 @@ Tcl_FinalizeThread(void)
      *
      * Fix [Bug #571002]
      */
-    TclFinalizeThreadData();
+    TclFinalizeThreadData(quick);
 }
 
 /*
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 337a75f..b9da8fc 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5410,8 +5410,8 @@ TEBCresume(
 		s1 = (char *) Tcl_GetByteArrayFromObj(valuePtr, &s1len);
 		s2 = (char *) Tcl_GetByteArrayFromObj(value2Ptr, &s2len);
 		memCmpFn = memcmp;
-	    } else if (((valuePtr->typePtr == &tclStringType)
-		    && (value2Ptr->typePtr == &tclStringType))) {
+	    } else if ((valuePtr->typePtr == &tclStringType)
+		    && (value2Ptr->typePtr == &tclStringType)) {
 		/*
 		 * Do a unicode-specific comparison if both of the args are of
 		 * String type. If the char length == byte length, we can do a
@@ -5422,7 +5422,9 @@ TEBCresume(
 		s1len = Tcl_GetCharLength(valuePtr);
 		s2len = Tcl_GetCharLength(value2Ptr);
 		if ((s1len == valuePtr->length)
-			&& (s2len == value2Ptr->length)) {
+			&& (valuePtr->bytes != NULL)
+			&& (s2len == value2Ptr->length)
+			&& (value2Ptr->bytes != NULL)) {
 		    s1 = valuePtr->bytes;
 		    s2 = value2Ptr->bytes;
 		    memCmpFn = memcmp;
diff --git a/generic/tclIO.c b/generic/tclIO.c
index f8b9bfa..79aa667 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -9216,6 +9216,9 @@ MBWrite(
     }
     outStatePtr->outQueueTail = tail;
     inStatePtr->inQueueHead = bufPtr;
+    if (inStatePtr->inQueueTail == tail) {
+	inStatePtr->inQueueTail = bufPtr;
+    }
     if (bufPtr == NULL) {
 	inStatePtr->inQueueTail = NULL;
     }
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 860c2a3..3f84717 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2927,7 +2927,7 @@ MODULE_SCOPE void	TclFinalizePreserve(void);
 MODULE_SCOPE void	TclFinalizeSynchronization(void);
 MODULE_SCOPE void	TclFinalizeThreadAlloc(void);
 MODULE_SCOPE void	TclFinalizeThreadAllocThread(void);
-MODULE_SCOPE void	TclFinalizeThreadData(void);
+MODULE_SCOPE void	TclFinalizeThreadData(int quick);
 MODULE_SCOPE void	TclFinalizeThreadObjects(void);
 MODULE_SCOPE double	TclFloor(const mp_int *a);
 MODULE_SCOPE void	TclFormatNaN(double value, char *buffer);
@@ -2985,8 +2985,8 @@ MODULE_SCOPE void	TclInitNotifier(void);
 MODULE_SCOPE void	TclInitObjSubsystem(void);
 MODULE_SCOPE void	TclInitSubsystems(void);
 MODULE_SCOPE int	TclInterpReady(Tcl_Interp *interp);
-MODULE_SCOPE int	TclIsLocalScalar(const char *src, int len);
 MODULE_SCOPE int	TclIsSpaceProc(char byte);
+MODULE_SCOPE int	TclIsBareword(char byte);
 MODULE_SCOPE Tcl_Obj *	TclJoinPath(int elements, Tcl_Obj * const objv[]);
 MODULE_SCOPE int	TclJoinThread(Tcl_ThreadId id, int *result);
 MODULE_SCOPE void	TclLimitRemoveAllHandlers(Tcl_Interp *interp);
diff --git a/generic/tclParse.c b/generic/tclParse.c
index ee0d4c4..5524979 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -621,6 +621,47 @@ TclIsSpaceProc(
 /*
  *----------------------------------------------------------------------
  *
+ * TclIsBareword--
+ *
+ *	Report whether byte is one that can be part of a "bareword".
+ *	This concept is named in expression parsing, where it determines
+ *	what can be a legal function name, but is the same definition used
+ *	in determining what variable names can be parsed as variable
+ *	substitutions without the benefit of enclosing braces.  The set of
+ *	ASCII chars that are accepted are the numeric chars ('0'-'9'),
+ *	the alphabetic chars ('a'-'z', 'A'-'Z')	and underscore ('_').
+ *
+ * Results:
+ *	Returns 1, if byte is in the accepted set of chars, 0 otherwise.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclIsBareword(
+    char byte)
+{
+    if (byte < '0' || byte > 'z') {
+	return 0;
+    }
+    if (byte <= '9' || byte >= 'a') {
+	return 1;
+    }
+    if (byte == '_') {
+	return 1;
+    }
+    if (byte < 'A' || byte > 'Z') {
+	return 0;
+    }
+    return 1;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * ParseWhiteSpace --
  *
  *	Scans up to numBytes bytes starting at src, consuming white space
@@ -1346,9 +1387,7 @@ Tcl_ParseVarName(
 {
     Tcl_Token *tokenPtr;
     register const char *src;
-    unsigned char c;
-    int varIndex, offset;
-    Tcl_UniChar ch;
+    int varIndex;
     unsigned array;
 
     if ((numBytes == 0) || (start == NULL)) {
@@ -1431,22 +1470,12 @@ Tcl_ParseVarName(
 	tokenPtr->numComponents = 0;
 
 	while (numBytes) {
-	    if (Tcl_UtfCharComplete(src, numBytes)) {
-		offset = Tcl_UtfToUniChar(src, &ch);
-	    } else {
-		char utfBytes[TCL_UTF_MAX];
-
-		memcpy(utfBytes, src, (size_t) numBytes);
-		utfBytes[numBytes] = '\0';
-		offset = Tcl_UtfToUniChar(utfBytes, &ch);
-	    }
-	    c = UCHAR(ch);
-	    if (isalnum(c) || (c == '_')) {	/* INTL: ISO only, UCHAR. */
-		src += offset;
-		numBytes -= offset;
+	    if (TclIsBareword(*src)) {
+		src += 1;
+		numBytes -= 1;
 		continue;
 	    }
-	    if ((c == ':') && (numBytes != 1) && (src[1] == ':')) {
+	    if ((src[0] == ':') && (numBytes != 1) && (src[1] == ':')) {
 		src += 2;
 		numBytes -= 2;
 		while (numBytes && (*src == ':')) {
@@ -2497,56 +2526,6 @@ TclObjCommandComplete(
 }
 
 /*
- *----------------------------------------------------------------------
- *
- * TclIsLocalScalar --
- *
- *	Check to see if a given string is a legal scalar variable name with no
- *	namespace qualifiers or substitutions.
- *
- * Results:
- *	Returns 1 if the variable is a local scalar.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclIsLocalScalar(
-    const char *src,
-    int len)
-{
-    const char *p;
-    const char *lastChar = src + (len - 1);
-
-    for (p=src ; p<=lastChar ; p++) {
-	if ((CHAR_TYPE(*p) != TYPE_NORMAL)
-		&& (CHAR_TYPE(*p) != TYPE_COMMAND_END)) {
-	    /*
-	     * TCL_COMMAND_END is returned for the last character of the
-	     * string. By this point we know it isn't an array or namespace
-	     * reference.
-	     */
-
-	    return 0;
-	}
-	if (*p == '(') {
-	    if (*lastChar == ')') {	/* We have an array element */
-		return 0;
-	    }
-	} else if (*p == ':') {
-	    if ((p != lastChar) && *(p+1) == ':') {	/* qualified name */
-		return 0;
-	    }
-	}
-    }
-
-    return 1;
-}
-
-/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tclThread.c b/generic/tclThread.c
index 5ac6a8d..198fa6a 100644
--- a/generic/tclThread.c
+++ b/generic/tclThread.c
@@ -353,11 +353,11 @@ Tcl_ConditionFinalize(
  */
 
 void
-TclFinalizeThreadData(void)
+TclFinalizeThreadData(int quick)
 {
     TclFinalizeThreadDataThread();
 #if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
-    if ((!TclInExit())||TclFullFinalizationRequested()) {
+    if (!quick) {
 	/*
 	 * Quick exit principle makes it useless to terminate allocators
 	 */
diff --git a/library/tzdata/Africa/Addis_Ababa b/library/tzdata/Africa/Addis_Ababa
index 4b92483..7aa5653 100644
--- a/library/tzdata/Africa/Addis_Ababa
+++ b/library/tzdata/Africa/Addis_Ababa
@@ -1,7 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Addis_Ababa) {
-    {-9223372036854775808 9288 0 LMT}
-    {-3155682888 9320 0 ADMT}
-    {-1062210920 10800 0 EAT}
+if {![info exists TZData(Africa/Nairobi)]} {
+    LoadTimeZoneFile Africa/Nairobi
 }
+set TZData(:Africa/Addis_Ababa) $TZData(:Africa/Nairobi)
diff --git a/library/tzdata/Africa/Asmara b/library/tzdata/Africa/Asmara
index 1f0f13e..3d33c94 100644
--- a/library/tzdata/Africa/Asmara
+++ b/library/tzdata/Africa/Asmara
@@ -1,8 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Asmara) {
-    {-9223372036854775808 9332 0 LMT}
-    {-3155682932 9332 0 AMT}
-    {-2524530932 9320 0 ADMT}
-    {-1062210920 10800 0 EAT}
+if {![info exists TZData(Africa/Nairobi)]} {
+    LoadTimeZoneFile Africa/Nairobi
 }
+set TZData(:Africa/Asmara) $TZData(:Africa/Nairobi)
diff --git a/library/tzdata/Africa/Bangui b/library/tzdata/Africa/Bangui
index 94f5058..0326a6c 100644
--- a/library/tzdata/Africa/Bangui
+++ b/library/tzdata/Africa/Bangui
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Bangui) {
-    {-9223372036854775808 4460 0 LMT}
-    {-1830388460 3600 0 WAT}
+if {![info exists TZData(Africa/Lagos)]} {
+    LoadTimeZoneFile Africa/Lagos
 }
+set TZData(:Africa/Bangui) $TZData(:Africa/Lagos)
diff --git a/library/tzdata/Africa/Bissau b/library/tzdata/Africa/Bissau
index d51cb9f..5693228 100644
--- a/library/tzdata/Africa/Bissau
+++ b/library/tzdata/Africa/Bissau
@@ -2,6 +2,6 @@
 
 set TZData(:Africa/Bissau) {
     {-9223372036854775808 -3740 0 LMT}
-    {-1849388260 -3600 0 WAT}
+    {-1830380260 -3600 0 WAT}
     {157770000 0 0 GMT}
 }
diff --git a/library/tzdata/Africa/Blantyre b/library/tzdata/Africa/Blantyre
index 17b58f4..9a404c5 100644
--- a/library/tzdata/Africa/Blantyre
+++ b/library/tzdata/Africa/Blantyre
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Blantyre) {
-    {-9223372036854775808 8400 0 LMT}
-    {-2109291600 7200 0 CAT}
+if {![info exists TZData(Africa/Maputo)]} {
+    LoadTimeZoneFile Africa/Maputo
 }
+set TZData(:Africa/Blantyre) $TZData(:Africa/Maputo)
diff --git a/library/tzdata/Africa/Brazzaville b/library/tzdata/Africa/Brazzaville
index b4e0923..111eff4 100644
--- a/library/tzdata/Africa/Brazzaville
+++ b/library/tzdata/Africa/Brazzaville
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Brazzaville) {
-    {-9223372036854775808 3668 0 LMT}
-    {-1830387668 3600 0 WAT}
+if {![info exists TZData(Africa/Lagos)]} {
+    LoadTimeZoneFile Africa/Lagos
 }
+set TZData(:Africa/Brazzaville) $TZData(:Africa/Lagos)
diff --git a/library/tzdata/Africa/Bujumbura b/library/tzdata/Africa/Bujumbura
index c26d053..1e463d8 100644
--- a/library/tzdata/Africa/Bujumbura
+++ b/library/tzdata/Africa/Bujumbura
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Bujumbura) {
-    {-9223372036854775808 7048 0 LMT}
-    {-2524528648 7200 0 CAT}
+if {![info exists TZData(Africa/Maputo)]} {
+    LoadTimeZoneFile Africa/Maputo
 }
+set TZData(:Africa/Bujumbura) $TZData(:Africa/Maputo)
diff --git a/library/tzdata/Africa/Dar_es_Salaam b/library/tzdata/Africa/Dar_es_Salaam
index 98151ec..00e8d4e 100644
--- a/library/tzdata/Africa/Dar_es_Salaam
+++ b/library/tzdata/Africa/Dar_es_Salaam
@@ -1,8 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Dar_es_Salaam) {
-    {-9223372036854775808 9428 0 LMT}
-    {-1230777428 10800 0 EAT}
-    {-694321200 9900 0 BEAUT}
-    {-284006700 10800 0 EAT}
+if {![info exists TZData(Africa/Nairobi)]} {
+    LoadTimeZoneFile Africa/Nairobi
 }
+set TZData(:Africa/Dar_es_Salaam) $TZData(:Africa/Nairobi)
diff --git a/library/tzdata/Africa/Djibouti b/library/tzdata/Africa/Djibouti
index 0ec510c..859ea32 100644
--- a/library/tzdata/Africa/Djibouti
+++ b/library/tzdata/Africa/Djibouti
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Djibouti) {
-    {-9223372036854775808 10356 0 LMT}
-    {-1846291956 10800 0 EAT}
+if {![info exists TZData(Africa/Nairobi)]} {
+    LoadTimeZoneFile Africa/Nairobi
 }
+set TZData(:Africa/Djibouti) $TZData(:Africa/Nairobi)
diff --git a/library/tzdata/Africa/Douala b/library/tzdata/Africa/Douala
index 301a530..892b16a 100644
--- a/library/tzdata/Africa/Douala
+++ b/library/tzdata/Africa/Douala
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Douala) {
-    {-9223372036854775808 2328 0 LMT}
-    {-1830386328 3600 0 WAT}
+if {![info exists TZData(Africa/Lagos)]} {
+    LoadTimeZoneFile Africa/Lagos
 }
+set TZData(:Africa/Douala) $TZData(:Africa/Lagos)
diff --git a/library/tzdata/Africa/Gaborone b/library/tzdata/Africa/Gaborone
index bd38673..56c0772 100644
--- a/library/tzdata/Africa/Gaborone
+++ b/library/tzdata/Africa/Gaborone
@@ -1,9 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Gaborone) {
-    {-9223372036854775808 6220 0 LMT}
-    {-2682294220 5400 0 SAST}
-    {-2109288600 7200 0 CAT}
-    {-829526400 10800 1 CAST}
-    {-813805200 7200 0 CAT}
+if {![info exists TZData(Africa/Maputo)]} {
+    LoadTimeZoneFile Africa/Maputo
 }
+set TZData(:Africa/Gaborone) $TZData(:Africa/Maputo)
diff --git a/library/tzdata/Africa/Harare b/library/tzdata/Africa/Harare
index 7482b15..644be26 100644
--- a/library/tzdata/Africa/Harare
+++ b/library/tzdata/Africa/Harare
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Harare) {
-    {-9223372036854775808 7452 0 LMT}
-    {-2109290652 7200 0 CAT}
+if {![info exists TZData(Africa/Maputo)]} {
+    LoadTimeZoneFile Africa/Maputo
 }
+set TZData(:Africa/Harare) $TZData(:Africa/Maputo)
diff --git a/library/tzdata/Africa/Kampala b/library/tzdata/Africa/Kampala
index 4cc9be1..1fbaffc 100644
--- a/library/tzdata/Africa/Kampala
+++ b/library/tzdata/Africa/Kampala
@@ -1,9 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Kampala) {
-    {-9223372036854775808 7780 0 LMT}
-    {-1309745380 10800 0 EAT}
-    {-1262314800 9000 0 BEAT}
-    {-694319400 9900 0 BEAUT}
-    {-410237100 10800 0 EAT}
+if {![info exists TZData(Africa/Nairobi)]} {
+    LoadTimeZoneFile Africa/Nairobi
 }
+set TZData(:Africa/Kampala) $TZData(:Africa/Nairobi)
diff --git a/library/tzdata/Africa/Kigali b/library/tzdata/Africa/Kigali
index f723bcd..192e0e8 100644
--- a/library/tzdata/Africa/Kigali
+++ b/library/tzdata/Africa/Kigali
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Kigali) {
-    {-9223372036854775808 7216 0 LMT}
-    {-1091498416 7200 0 CAT}
+if {![info exists TZData(Africa/Maputo)]} {
+    LoadTimeZoneFile Africa/Maputo
 }
+set TZData(:Africa/Kigali) $TZData(:Africa/Maputo)
diff --git a/library/tzdata/Africa/Kinshasa b/library/tzdata/Africa/Kinshasa
index 050c1fa..04dc62e 100644
--- a/library/tzdata/Africa/Kinshasa
+++ b/library/tzdata/Africa/Kinshasa
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Kinshasa) {
-    {-9223372036854775808 3672 0 LMT}
-    {-2276643672 3600 0 WAT}
+if {![info exists TZData(Africa/Lagos)]} {
+    LoadTimeZoneFile Africa/Lagos
 }
+set TZData(:Africa/Kinshasa) $TZData(:Africa/Lagos)
diff --git a/library/tzdata/Africa/Libreville b/library/tzdata/Africa/Libreville
index 8427551..ba1f686 100644
--- a/library/tzdata/Africa/Libreville
+++ b/library/tzdata/Africa/Libreville
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Libreville) {
-    {-9223372036854775808 2268 0 LMT}
-    {-1830386268 3600 0 WAT}
+if {![info exists TZData(Africa/Lagos)]} {
+    LoadTimeZoneFile Africa/Lagos
 }
+set TZData(:Africa/Libreville) $TZData(:Africa/Lagos)
diff --git a/library/tzdata/Africa/Luanda b/library/tzdata/Africa/Luanda
index cd1b29e..8dcd107 100644
--- a/library/tzdata/Africa/Luanda
+++ b/library/tzdata/Africa/Luanda
@@ -1,7 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Luanda) {
-    {-9223372036854775808 3176 0 LMT}
-    {-2461452776 3124 0 AOT}
-    {-1849395124 3600 0 WAT}
+if {![info exists TZData(Africa/Lagos)]} {
+    LoadTimeZoneFile Africa/Lagos
 }
+set TZData(:Africa/Luanda) $TZData(:Africa/Lagos)
diff --git a/library/tzdata/Africa/Lubumbashi b/library/tzdata/Africa/Lubumbashi
index bd67221..7da101a 100644
--- a/library/tzdata/Africa/Lubumbashi
+++ b/library/tzdata/Africa/Lubumbashi
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Lubumbashi) {
-    {-9223372036854775808 6592 0 LMT}
-    {-2276646592 7200 0 CAT}
+if {![info exists TZData(Africa/Maputo)]} {
+    LoadTimeZoneFile Africa/Maputo
 }
+set TZData(:Africa/Lubumbashi) $TZData(:Africa/Maputo)
diff --git a/library/tzdata/Africa/Lusaka b/library/tzdata/Africa/Lusaka
index ed9c30d..bcf519d 100644
--- a/library/tzdata/Africa/Lusaka
+++ b/library/tzdata/Africa/Lusaka
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Lusaka) {
-    {-9223372036854775808 6788 0 LMT}
-    {-2109289988 7200 0 CAT}
+if {![info exists TZData(Africa/Maputo)]} {
+    LoadTimeZoneFile Africa/Maputo
 }
+set TZData(:Africa/Lusaka) $TZData(:Africa/Maputo)
diff --git a/library/tzdata/Africa/Malabo b/library/tzdata/Africa/Malabo
index bec0524..7dcee39 100644
--- a/library/tzdata/Africa/Malabo
+++ b/library/tzdata/Africa/Malabo
@@ -1,7 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Malabo) {
-    {-9223372036854775808 2108 0 LMT}
-    {-1830386108 0 0 GMT}
-    {-190857600 3600 0 WAT}
+if {![info exists TZData(Africa/Lagos)]} {
+    LoadTimeZoneFile Africa/Lagos
 }
+set TZData(:Africa/Malabo) $TZData(:Africa/Lagos)
diff --git a/library/tzdata/Africa/Maseru b/library/tzdata/Africa/Maseru
index 21ca968..665f15d 100644
--- a/library/tzdata/Africa/Maseru
+++ b/library/tzdata/Africa/Maseru
@@ -1,8 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Maseru) {
-    {-9223372036854775808 6600 0 LMT}
-    {-2109289800 7200 0 SAST}
-    {-829526400 10800 1 SAST}
-    {-813805200 7200 0 SAST}
+if {![info exists TZData(Africa/Johannesburg)]} {
+    LoadTimeZoneFile Africa/Johannesburg
 }
+set TZData(:Africa/Maseru) $TZData(:Africa/Johannesburg)
diff --git a/library/tzdata/Africa/Mbabane b/library/tzdata/Africa/Mbabane
index 4d174d5..0edb590 100644
--- a/library/tzdata/Africa/Mbabane
+++ b/library/tzdata/Africa/Mbabane
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Mbabane) {
-    {-9223372036854775808 7464 0 LMT}
-    {-2109290664 7200 0 SAST}
+if {![info exists TZData(Africa/Johannesburg)]} {
+    LoadTimeZoneFile Africa/Johannesburg
 }
+set TZData(:Africa/Mbabane) $TZData(:Africa/Johannesburg)
diff --git a/library/tzdata/Africa/Mogadishu b/library/tzdata/Africa/Mogadishu
index 570d3ea..4220655 100644
--- a/library/tzdata/Africa/Mogadishu
+++ b/library/tzdata/Africa/Mogadishu
@@ -1,8 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Mogadishu) {
-    {-9223372036854775808 10888 0 LMT}
-    {-2403572488 10800 0 EAT}
-    {-1230778800 9000 0 BEAT}
-    {-410236200 10800 0 EAT}
+if {![info exists TZData(Africa/Nairobi)]} {
+    LoadTimeZoneFile Africa/Nairobi
 }
+set TZData(:Africa/Mogadishu) $TZData(:Africa/Nairobi)
diff --git a/library/tzdata/Africa/Niamey b/library/tzdata/Africa/Niamey
index 40ded06b..278571d 100644
--- a/library/tzdata/Africa/Niamey
+++ b/library/tzdata/Africa/Niamey
@@ -1,8 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Niamey) {
-    {-9223372036854775808 508 0 LMT}
-    {-1830384508 -3600 0 WAT}
-    {-1131231600 0 0 GMT}
-    {-315619200 3600 0 WAT}
+if {![info exists TZData(Africa/Lagos)]} {
+    LoadTimeZoneFile Africa/Lagos
 }
+set TZData(:Africa/Niamey) $TZData(:Africa/Lagos)
diff --git a/library/tzdata/Africa/Porto-Novo b/library/tzdata/Africa/Porto-Novo
index b89cf1b..3fa2b51 100644
--- a/library/tzdata/Africa/Porto-Novo
+++ b/library/tzdata/Africa/Porto-Novo
@@ -1,7 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Porto-Novo) {
-    {-9223372036854775808 628 0 LMT}
-    {-1830384628 0 0 GMT}
-    {-1131235200 3600 0 WAT}
+if {![info exists TZData(Africa/Lagos)]} {
+    LoadTimeZoneFile Africa/Lagos
 }
+set TZData(:Africa/Porto-Novo) $TZData(:Africa/Lagos)
diff --git a/library/tzdata/America/Grand_Turk b/library/tzdata/America/Grand_Turk
index 6c8ea4a..0edcf0b 100644
--- a/library/tzdata/America/Grand_Turk
+++ b/library/tzdata/America/Grand_Turk
@@ -4,6 +4,7 @@ set TZData(:America/Grand_Turk) {
     {-9223372036854775808 -17072 0 LMT}
     {-2524504528 -18431 0 KMT}
     {-1827687169 -18000 0 EST}
+    {284014800 -18000 0 EST}
     {294217200 -14400 1 EDT}
     {309938400 -18000 0 EST}
     {325666800 -14400 1 EDT}
@@ -77,173 +78,5 @@ set TZData(:America/Grand_Turk) {
     {1394348400 -14400 1 EDT}
     {1414908000 -18000 0 EST}
     {1425798000 -14400 1 EDT}
-    {1446357600 -18000 0 EST}
-    {1457852400 -14400 1 EDT}
-    {1478412000 -18000 0 EST}
-    {1489302000 -14400 1 EDT}
-    {1509861600 -18000 0 EST}
-    {1520751600 -14400 1 EDT}
-    {1541311200 -18000 0 EST}
-    {1552201200 -14400 1 EDT}
-    {1572760800 -18000 0 EST}
-    {1583650800 -14400 1 EDT}
-    {1604210400 -18000 0 EST}
-    {1615705200 -14400 1 EDT}
-    {1636264800 -18000 0 EST}
-    {1647154800 -14400 1 EDT}
-    {1667714400 -18000 0 EST}
-    {1678604400 -14400 1 EDT}
-    {1699164000 -18000 0 EST}
-    {1710054000 -14400 1 EDT}
-    {1730613600 -18000 0 EST}
-    {1741503600 -14400 1 EDT}
-    {1762063200 -18000 0 EST}
-    {1772953200 -14400 1 EDT}
-    {1793512800 -18000 0 EST}
-    {1805007600 -14400 1 EDT}
-    {1825567200 -18000 0 EST}
-    {1836457200 -14400 1 EDT}
-    {1857016800 -18000 0 EST}
-    {1867906800 -14400 1 EDT}
-    {1888466400 -18000 0 EST}
-    {1899356400 -14400 1 EDT}
-    {1919916000 -18000 0 EST}
-    {1930806000 -14400 1 EDT}
-    {1951365600 -18000 0 EST}
-    {1962860400 -14400 1 EDT}
-    {1983420000 -18000 0 EST}
-    {1994310000 -14400 1 EDT}
-    {2014869600 -18000 0 EST}
-    {2025759600 -14400 1 EDT}
-    {2046319200 -18000 0 EST}
-    {2057209200 -14400 1 EDT}
-    {2077768800 -18000 0 EST}
-    {2088658800 -14400 1 EDT}
-    {2109218400 -18000 0 EST}
-    {2120108400 -14400 1 EDT}
-    {2140668000 -18000 0 EST}
-    {2152162800 -14400 1 EDT}
-    {2172722400 -18000 0 EST}
-    {2183612400 -14400 1 EDT}
-    {2204172000 -18000 0 EST}
-    {2215062000 -14400 1 EDT}
-    {2235621600 -18000 0 EST}
-    {2246511600 -14400 1 EDT}
-    {2267071200 -18000 0 EST}
-    {2277961200 -14400 1 EDT}
-    {2298520800 -18000 0 EST}
-    {2309410800 -14400 1 EDT}
-    {2329970400 -18000 0 EST}
-    {2341465200 -14400 1 EDT}
-    {2362024800 -18000 0 EST}
-    {2372914800 -14400 1 EDT}
-    {2393474400 -18000 0 EST}
-    {2404364400 -14400 1 EDT}
-    {2424924000 -18000 0 EST}
-    {2435814000 -14400 1 EDT}
-    {2456373600 -18000 0 EST}
-    {2467263600 -14400 1 EDT}
-    {2487823200 -18000 0 EST}
-    {2499318000 -14400 1 EDT}
-    {2519877600 -18000 0 EST}
-    {2530767600 -14400 1 EDT}
-    {2551327200 -18000 0 EST}
-    {2562217200 -14400 1 EDT}
-    {2582776800 -18000 0 EST}
-    {2593666800 -14400 1 EDT}
-    {2614226400 -18000 0 EST}
-    {2625116400 -14400 1 EDT}
-    {2645676000 -18000 0 EST}
-    {2656566000 -14400 1 EDT}
-    {2677125600 -18000 0 EST}
-    {2688620400 -14400 1 EDT}
-    {2709180000 -18000 0 EST}
-    {2720070000 -14400 1 EDT}
-    {2740629600 -18000 0 EST}
-    {2751519600 -14400 1 EDT}
-    {2772079200 -18000 0 EST}
-    {2782969200 -14400 1 EDT}
-    {2803528800 -18000 0 EST}
-    {2814418800 -14400 1 EDT}
-    {2834978400 -18000 0 EST}
-    {2846473200 -14400 1 EDT}
-    {2867032800 -18000 0 EST}
-    {2877922800 -14400 1 EDT}
-    {2898482400 -18000 0 EST}
-    {2909372400 -14400 1 EDT}
-    {2929932000 -18000 0 EST}
-    {2940822000 -14400 1 EDT}
-    {2961381600 -18000 0 EST}
-    {2972271600 -14400 1 EDT}
-    {2992831200 -18000 0 EST}
-    {3003721200 -14400 1 EDT}
-    {3024280800 -18000 0 EST}
-    {3035775600 -14400 1 EDT}
-    {3056335200 -18000 0 EST}
-    {3067225200 -14400 1 EDT}
-    {3087784800 -18000 0 EST}
-    {3098674800 -14400 1 EDT}
-    {3119234400 -18000 0 EST}
-    {3130124400 -14400 1 EDT}
-    {3150684000 -18000 0 EST}
-    {3161574000 -14400 1 EDT}
-    {3182133600 -18000 0 EST}
-    {3193023600 -14400 1 EDT}
-    {3213583200 -18000 0 EST}
-    {3225078000 -14400 1 EDT}
-    {3245637600 -18000 0 EST}
-    {3256527600 -14400 1 EDT}
-    {3277087200 -18000 0 EST}
-    {3287977200 -14400 1 EDT}
-    {3308536800 -18000 0 EST}
-    {3319426800 -14400 1 EDT}
-    {3339986400 -18000 0 EST}
-    {3350876400 -14400 1 EDT}
-    {3371436000 -18000 0 EST}
-    {3382930800 -14400 1 EDT}
-    {3403490400 -18000 0 EST}
-    {3414380400 -14400 1 EDT}
-    {3434940000 -18000 0 EST}
-    {3445830000 -14400 1 EDT}
-    {3466389600 -18000 0 EST}
-    {3477279600 -14400 1 EDT}
-    {3497839200 -18000 0 EST}
-    {3508729200 -14400 1 EDT}
-    {3529288800 -18000 0 EST}
-    {3540178800 -14400 1 EDT}
-    {3560738400 -18000 0 EST}
-    {3572233200 -14400 1 EDT}
-    {3592792800 -18000 0 EST}
-    {3603682800 -14400 1 EDT}
-    {3624242400 -18000 0 EST}
-    {3635132400 -14400 1 EDT}
-    {3655692000 -18000 0 EST}
-    {3666582000 -14400 1 EDT}
-    {3687141600 -18000 0 EST}
-    {3698031600 -14400 1 EDT}
-    {3718591200 -18000 0 EST}
-    {3730086000 -14400 1 EDT}
-    {3750645600 -18000 0 EST}
-    {3761535600 -14400 1 EDT}
-    {3782095200 -18000 0 EST}
-    {3792985200 -14400 1 EDT}
-    {3813544800 -18000 0 EST}
-    {3824434800 -14400 1 EDT}
-    {3844994400 -18000 0 EST}
-    {3855884400 -14400 1 EDT}
-    {3876444000 -18000 0 EST}
-    {3887334000 -14400 1 EDT}
-    {3907893600 -18000 0 EST}
-    {3919388400 -14400 1 EDT}
-    {3939948000 -18000 0 EST}
-    {3950838000 -14400 1 EDT}
-    {3971397600 -18000 0 EST}
-    {3982287600 -14400 1 EDT}
-    {4002847200 -18000 0 EST}
-    {4013737200 -14400 1 EDT}
-    {4034296800 -18000 0 EST}
-    {4045186800 -14400 1 EDT}
-    {4065746400 -18000 0 EST}
-    {4076636400 -14400 1 EDT}
-    {4097196000 -18000 0 EST}
+    {1446361200 -14400 0 AST}
 }
diff --git a/library/tzdata/America/Jamaica b/library/tzdata/America/Jamaica
index 682e47c..f752842 100644
--- a/library/tzdata/America/Jamaica
+++ b/library/tzdata/America/Jamaica
@@ -4,7 +4,8 @@ set TZData(:America/Jamaica) {
     {-9223372036854775808 -18431 0 LMT}
     {-2524503169 -18431 0 KMT}
     {-1827687169 -18000 0 EST}
-    {136364400 -14400 0 EDT}
+    {126248400 -18000 0 EST}
+    {126687600 -14400 1 EDT}
     {152085600 -18000 0 EST}
     {162370800 -14400 1 EDT}
     {183535200 -18000 0 EST}
diff --git a/library/tzdata/Antarctica/Troll b/library/tzdata/Antarctica/Troll
new file mode 100644
index 0000000..7d2b042
--- /dev/null
+++ b/library/tzdata/Antarctica/Troll
@@ -0,0 +1,196 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:Antarctica/Troll) {
+    {-9223372036854775808 0 0 zzz}
+    {1108166400 0 0 UTC}
+    {1111885200 7200 1 CEST}
+    {1130634000 0 0 UTC}
+    {1143334800 7200 1 CEST}
+    {1162083600 0 0 UTC}
+    {1174784400 7200 1 CEST}
+    {1193533200 0 0 UTC}
+    {1206838800 7200 1 CEST}
+    {1224982800 0 0 UTC}
+    {1238288400 7200 1 CEST}
+    {1256432400 0 0 UTC}
+    {1269738000 7200 1 CEST}
+    {1288486800 0 0 UTC}
+    {1301187600 7200 1 CEST}
+    {1319936400 0 0 UTC}
+    {1332637200 7200 1 CEST}
+    {1351386000 0 0 UTC}
+    {1364691600 7200 1 CEST}
+    {1382835600 0 0 UTC}
+    {1396141200 7200 1 CEST}
+    {1414285200 0 0 UTC}
+    {1427590800 7200 1 CEST}
+    {1445734800 0 0 UTC}
+    {1459040400 7200 1 CEST}
+    {1477789200 0 0 UTC}
+    {1490490000 7200 1 CEST}
+    {1509238800 0 0 UTC}
+    {1521939600 7200 1 CEST}
+    {1540688400 0 0 UTC}
+    {1553994000 7200 1 CEST}
+    {1572138000 0 0 UTC}
+    {1585443600 7200 1 CEST}
+    {1603587600 0 0 UTC}
+    {1616893200 7200 1 CEST}
+    {1635642000 0 0 UTC}
+    {1648342800 7200 1 CEST}
+    {1667091600 0 0 UTC}
+    {1679792400 7200 1 CEST}
+    {1698541200 0 0 UTC}
+    {1711846800 7200 1 CEST}
+    {1729990800 0 0 UTC}
+    {1743296400 7200 1 CEST}
+    {1761440400 0 0 UTC}
+    {1774746000 7200 1 CEST}
+    {1792890000 0 0 UTC}
+    {1806195600 7200 1 CEST}
+    {1824944400 0 0 UTC}
+    {1837645200 7200 1 CEST}
+    {1856394000 0 0 UTC}
+    {1869094800 7200 1 CEST}
+    {1887843600 0 0 UTC}
+    {1901149200 7200 1 CEST}
+    {1919293200 0 0 UTC}
+    {1932598800 7200 1 CEST}
+    {1950742800 0 0 UTC}
+    {1964048400 7200 1 CEST}
+    {1982797200 0 0 UTC}
+    {1995498000 7200 1 CEST}
+    {2014246800 0 0 UTC}
+    {2026947600 7200 1 CEST}
+    {2045696400 0 0 UTC}
+    {2058397200 7200 1 CEST}
+    {2077146000 0 0 UTC}
+    {2090451600 7200 1 CEST}
+    {2108595600 0 0 UTC}
+    {2121901200 7200 1 CEST}
+    {2140045200 0 0 UTC}
+    {2153350800 7200 1 CEST}
+    {2172099600 0 0 UTC}
+    {2184800400 7200 1 CEST}
+    {2203549200 0 0 UTC}
+    {2216250000 7200 1 CEST}
+    {2234998800 0 0 UTC}
+    {2248304400 7200 1 CEST}
+    {2266448400 0 0 UTC}
+    {2279754000 7200 1 CEST}
+    {2297898000 0 0 UTC}
+    {2311203600 7200 1 CEST}
+    {2329347600 0 0 UTC}
+    {2342653200 7200 1 CEST}
+    {2361402000 0 0 UTC}
+    {2374102800 7200 1 CEST}
+    {2392851600 0 0 UTC}
+    {2405552400 7200 1 CEST}
+    {2424301200 0 0 UTC}
+    {2437606800 7200 1 CEST}
+    {2455750800 0 0 UTC}
+    {2469056400 7200 1 CEST}
+    {2487200400 0 0 UTC}
+    {2500506000 7200 1 CEST}
+    {2519254800 0 0 UTC}
+    {2531955600 7200 1 CEST}
+    {2550704400 0 0 UTC}
+    {2563405200 7200 1 CEST}
+    {2582154000 0 0 UTC}
+    {2595459600 7200 1 CEST}
+    {2613603600 0 0 UTC}
+    {2626909200 7200 1 CEST}
+    {2645053200 0 0 UTC}
+    {2658358800 7200 1 CEST}
+    {2676502800 0 0 UTC}
+    {2689808400 7200 1 CEST}
+    {2708557200 0 0 UTC}
+    {2721258000 7200 1 CEST}
+    {2740006800 0 0 UTC}
+    {2752707600 7200 1 CEST}
+    {2771456400 0 0 UTC}
+    {2784762000 7200 1 CEST}
+    {2802906000 0 0 UTC}
+    {2816211600 7200 1 CEST}
+    {2834355600 0 0 UTC}
+    {2847661200 7200 1 CEST}
+    {2866410000 0 0 UTC}
+    {2879110800 7200 1 CEST}
+    {2897859600 0 0 UTC}
+    {2910560400 7200 1 CEST}
+    {2929309200 0 0 UTC}
+    {2942010000 7200 1 CEST}
+    {2960758800 0 0 UTC}
+    {2974064400 7200 1 CEST}
+    {2992208400 0 0 UTC}
+    {3005514000 7200 1 CEST}
+    {3023658000 0 0 UTC}
+    {3036963600 7200 1 CEST}
+    {3055712400 0 0 UTC}
+    {3068413200 7200 1 CEST}
+    {3087162000 0 0 UTC}
+    {3099862800 7200 1 CEST}
+    {3118611600 0 0 UTC}
+    {3131917200 7200 1 CEST}
+    {3150061200 0 0 UTC}
+    {3163366800 7200 1 CEST}
+    {3181510800 0 0 UTC}
+    {3194816400 7200 1 CEST}
+    {3212960400 0 0 UTC}
+    {3226266000 7200 1 CEST}
+    {3245014800 0 0 UTC}
+    {3257715600 7200 1 CEST}
+    {3276464400 0 0 UTC}
+    {3289165200 7200 1 CEST}
+    {3307914000 0 0 UTC}
+    {3321219600 7200 1 CEST}
+    {3339363600 0 0 UTC}
+    {3352669200 7200 1 CEST}
+    {3370813200 0 0 UTC}
+    {3384118800 7200 1 CEST}
+    {3402867600 0 0 UTC}
+    {3415568400 7200 1 CEST}
+    {3434317200 0 0 UTC}
+    {3447018000 7200 1 CEST}
+    {3465766800 0 0 UTC}
+    {3479072400 7200 1 CEST}
+    {3497216400 0 0 UTC}
+    {3510522000 7200 1 CEST}
+    {3528666000 0 0 UTC}
+    {3541971600 7200 1 CEST}
+    {3560115600 0 0 UTC}
+    {3573421200 7200 1 CEST}
+    {3592170000 0 0 UTC}
+    {3604870800 7200 1 CEST}
+    {3623619600 0 0 UTC}
+    {3636320400 7200 1 CEST}
+    {3655069200 0 0 UTC}
+    {3668374800 7200 1 CEST}
+    {3686518800 0 0 UTC}
+    {3699824400 7200 1 CEST}
+    {3717968400 0 0 UTC}
+    {3731274000 7200 1 CEST}
+    {3750022800 0 0 UTC}
+    {3762723600 7200 1 CEST}
+    {3781472400 0 0 UTC}
+    {3794173200 7200 1 CEST}
+    {3812922000 0 0 UTC}
+    {3825622800 7200 1 CEST}
+    {3844371600 0 0 UTC}
+    {3857677200 7200 1 CEST}
+    {3875821200 0 0 UTC}
+    {3889126800 7200 1 CEST}
+    {3907270800 0 0 UTC}
+    {3920576400 7200 1 CEST}
+    {3939325200 0 0 UTC}
+    {3952026000 7200 1 CEST}
+    {3970774800 0 0 UTC}
+    {3983475600 7200 1 CEST}
+    {4002224400 0 0 UTC}
+    {4015530000 7200 1 CEST}
+    {4033674000 0 0 UTC}
+    {4046979600 7200 1 CEST}
+    {4065123600 0 0 UTC}
+    {4078429200 7200 1 CEST}
+    {4096573200 0 0 UTC}
+}
diff --git a/library/tzdata/Asia/Chita b/library/tzdata/Asia/Chita
new file mode 100644
index 0000000..eabce7f
--- /dev/null
+++ b/library/tzdata/Asia/Chita
@@ -0,0 +1,71 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:Asia/Chita) {
+    {-9223372036854775808 27232 0 LMT}
+    {-1579419232 28800 0 YAKT}
+    {-1247558400 32400 0 YAKMMTT}
+    {354898800 36000 1 YAKST}
+    {370706400 32400 0 YAKT}
+    {386434800 36000 1 YAKST}
+    {402242400 32400 0 YAKT}
+    {417970800 36000 1 YAKST}
+    {433778400 32400 0 YAKT}
+    {449593200 36000 1 YAKST}
+    {465325200 32400 0 YAKT}
+    {481050000 36000 1 YAKST}
+    {496774800 32400 0 YAKT}
+    {512499600 36000 1 YAKST}
+    {528224400 32400 0 YAKT}
+    {543949200 36000 1 YAKST}
+    {559674000 32400 0 YAKT}
+    {575398800 36000 1 YAKST}
+    {591123600 32400 0 YAKT}
+    {606848400 36000 1 YAKST}
+    {622573200 32400 0 YAKT}
+    {638298000 36000 1 YAKST}
+    {654627600 32400 0 YAKT}
+    {670352400 28800 0 YAKMMTT}
+    {670356000 32400 1 YAKST}
+    {686080800 28800 0 YAKT}
+    {695757600 32400 0 YAKMMTT}
+    {701791200 36000 1 YAKST}
+    {717512400 32400 0 YAKT}
+    {733251600 36000 1 YAKST}
+    {748976400 32400 0 YAKT}
+    {764701200 36000 1 YAKST}
+    {780426000 32400 0 YAKT}
+    {796150800 36000 1 YAKST}
+    {811875600 32400 0 YAKT}
+    {828205200 36000 1 YAKST}
+    {846349200 32400 0 YAKT}
+    {859654800 36000 1 YAKST}
+    {877798800 32400 0 YAKT}
+    {891104400 36000 1 YAKST}
+    {909248400 32400 0 YAKT}
+    {922554000 36000 1 YAKST}
+    {941302800 32400 0 YAKT}
+    {954003600 36000 1 YAKST}
+    {972752400 32400 0 YAKT}
+    {985453200 36000 1 YAKST}
+    {1004202000 32400 0 YAKT}
+    {1017507600 36000 1 YAKST}
+    {1035651600 32400 0 YAKT}
+    {1048957200 36000 1 YAKST}
+    {1067101200 32400 0 YAKT}
+    {1080406800 36000 1 YAKST}
+    {1099155600 32400 0 YAKT}
+    {1111856400 36000 1 YAKST}
+    {1130605200 32400 0 YAKT}
+    {1143306000 36000 1 YAKST}
+    {1162054800 32400 0 YAKT}
+    {1174755600 36000 1 YAKST}
+    {1193504400 32400 0 YAKT}
+    {1206810000 36000 1 YAKST}
+    {1224954000 32400 0 YAKT}
+    {1238259600 36000 1 YAKST}
+    {1256403600 32400 0 YAKT}
+    {1269709200 36000 1 YAKST}
+    {1288458000 32400 0 YAKT}
+    {1301158800 36000 0 YAKT}
+    {1414252800 28800 0 IRKT}
+}
diff --git a/library/tzdata/Asia/Dhaka b/library/tzdata/Asia/Dhaka
index e0c270d..6e8a334 100644
--- a/library/tzdata/Asia/Dhaka
+++ b/library/tzdata/Asia/Dhaka
@@ -10,5 +10,5 @@ set TZData(:Asia/Dhaka) {
     {38772000 21600 0 BDT}
     {1230746400 21600 0 BDT}
     {1245430800 25200 1 BDST}
-    {1262278740 21600 0 BDT}
+    {1262278800 21600 0 BDT}
 }
diff --git a/library/tzdata/Asia/Ho_Chi_Minh b/library/tzdata/Asia/Ho_Chi_Minh
index 777c8db..9da89f4 100644
--- a/library/tzdata/Asia/Ho_Chi_Minh
+++ b/library/tzdata/Asia/Ho_Chi_Minh
@@ -2,8 +2,13 @@
 
 set TZData(:Asia/Ho_Chi_Minh) {
     {-9223372036854775808 25600 0 LMT}
-    {-2005974400 25580 0 SMT}
-    {-1855983920 25200 0 ICT}
-    {-1819954800 28800 0 ICT}
-    {-1220428800 25200 0 ICT}
+    {-2004073600 25590 0 PLMT}
+    {-1851577590 25200 0 ICT}
+    {-852105600 28800 0 IDT}
+    {-782643600 32400 0 JST}
+    {-767869200 25200 0 ICT}
+    {-718095600 28800 0 IDT}
+    {-457776000 25200 0 ICT}
+    {-315648000 28800 0 IDT}
+    {171820800 25200 0 ICT}
 }
diff --git a/library/tzdata/Asia/Irkutsk b/library/tzdata/Asia/Irkutsk
index e344181..08e5798 100644
--- a/library/tzdata/Asia/Irkutsk
+++ b/library/tzdata/Asia/Irkutsk
@@ -1,9 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Irkutsk) {
-    {-9223372036854775808 25035 0 LMT}
-    {-2840165835 25035 0 IMT}
-    {-1575874635 25200 0 IRKT}
+    {-9223372036854775808 25025 0 LMT}
+    {-2840165825 25025 0 IMT}
+    {-1575874625 25200 0 IRKT}
     {-1247554800 28800 0 IRKMMTT}
     {354902400 32400 1 IRKST}
     {370710000 28800 0 IRKT}
diff --git a/library/tzdata/Asia/Krasnoyarsk b/library/tzdata/Asia/Krasnoyarsk
index 2770a51..17ea6c0 100644
--- a/library/tzdata/Asia/Krasnoyarsk
+++ b/library/tzdata/Asia/Krasnoyarsk
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Krasnoyarsk) {
-    {-9223372036854775808 22280 0 LMT}
-    {-1577513480 21600 0 KRAT}
+    {-9223372036854775808 22286 0 LMT}
+    {-1577513486 21600 0 KRAT}
     {-1247551200 25200 0 KRAMMTT}
     {354906000 28800 1 KRAST}
     {370713600 25200 0 KRAT}
diff --git a/library/tzdata/Asia/Novokuznetsk b/library/tzdata/Asia/Novokuznetsk
index d7e308e..ab3c2d5 100644
--- a/library/tzdata/Asia/Novokuznetsk
+++ b/library/tzdata/Asia/Novokuznetsk
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Novokuznetsk) {
-    {-9223372036854775808 20928 0 NMT}
-    {-1577512128 21600 0 KRAT}
+    {-9223372036854775808 20928 0 LMT}
+    {-1441259328 21600 0 KRAT}
     {-1247551200 25200 0 KRAMMTT}
     {354906000 28800 1 KRAST}
     {370713600 25200 0 KRAT}
diff --git a/library/tzdata/Asia/Omsk b/library/tzdata/Asia/Omsk
index a6b0db3..f25b8d4 100644
--- a/library/tzdata/Asia/Omsk
+++ b/library/tzdata/Asia/Omsk
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Omsk) {
-    {-9223372036854775808 17616 0 LMT}
-    {-1582088016 18000 0 OMST}
+    {-9223372036854775808 17610 0 LMT}
+    {-1582088010 18000 0 OMST}
     {-1247547600 21600 0 OMSMMTT}
     {354909600 25200 1 OMSST}
     {370717200 21600 0 OMST}
diff --git a/library/tzdata/Asia/Phnom_Penh b/library/tzdata/Asia/Phnom_Penh
index 4f28420..114c786 100644
--- a/library/tzdata/Asia/Phnom_Penh
+++ b/library/tzdata/Asia/Phnom_Penh
@@ -1,9 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Asia/Phnom_Penh) {
-    {-9223372036854775808 25180 0 LMT}
-    {-2005973980 25580 0 SMT}
-    {-1855983920 25200 0 ICT}
-    {-1819954800 28800 0 ICT}
-    {-1220428800 25200 0 ICT}
+if {![info exists TZData(Asia/Bangkok)]} {
+    LoadTimeZoneFile Asia/Bangkok
 }
+set TZData(:Asia/Phnom_Penh) $TZData(:Asia/Bangkok)
diff --git a/library/tzdata/Asia/Pyongyang b/library/tzdata/Asia/Pyongyang
index dd40311..fafed54 100644
--- a/library/tzdata/Asia/Pyongyang
+++ b/library/tzdata/Asia/Pyongyang
@@ -2,12 +2,8 @@
 
 set TZData(:Asia/Pyongyang) {
     {-9223372036854775808 30180 0 LMT}
-    {-2524551780 30600 0 KST}
-    {-2053931400 32400 0 JCST}
-    {-1325494800 30600 0 KST}
-    {-1199262600 32400 0 JCST}
+    {-1948782180 30600 0 KST}
+    {-1830414600 32400 0 JCST}
     {-1017824400 32400 0 JST}
     {-768646800 32400 0 KST}
-    {-498128400 28800 0 KST}
-    {-264931200 32400 0 KST}
 }
diff --git a/library/tzdata/Asia/Samarkand b/library/tzdata/Asia/Samarkand
index 6a1be11..4b3b49f 100644
--- a/library/tzdata/Asia/Samarkand
+++ b/library/tzdata/Asia/Samarkand
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Samarkand) {
-    {-9223372036854775808 16032 0 LMT}
-    {-1441168032 14400 0 SAMT}
+    {-9223372036854775808 16073 0 LMT}
+    {-1441168073 14400 0 SAMT}
     {-1247544000 18000 0 SAMT}
     {354913200 21600 1 SAMST}
     {370720800 21600 0 TAST}
diff --git a/library/tzdata/Asia/Seoul b/library/tzdata/Asia/Seoul
index 9625291..c24a1d8 100644
--- a/library/tzdata/Asia/Seoul
+++ b/library/tzdata/Asia/Seoul
@@ -2,19 +2,26 @@
 
 set TZData(:Asia/Seoul) {
     {-9223372036854775808 30472 0 LMT}
-    {-2524552072 30600 0 KST}
-    {-2053931400 32400 0 JCST}
-    {-1325494800 30600 0 KST}
-    {-1199262600 32400 0 JCST}
+    {-1948782472 30600 0 KST}
+    {-1830414600 32400 0 JCST}
     {-1017824400 32400 0 JST}
     {-767350800 32400 0 KST}
-    {-498128400 28800 0 KST}
-    {-303984000 32400 1 KDT}
-    {-293533200 28800 0 KST}
-    {-264931200 30600 0 KST}
-    {-39515400 32400 0 KST}
-    {547570800 36000 1 KDT}
-    {560872800 32400 0 KST}
-    {579020400 36000 1 KDT}
-    {592322400 32400 0 KST}
+    {-498128400 30600 0 KST}
+    {-462702600 34200 1 KDT}
+    {-451733400 30600 0 KST}
+    {-429784200 34200 1 KDT}
+    {-418296600 30600 0 KST}
+    {-399544200 34200 1 KDT}
+    {-387451800 30600 0 KST}
+    {-368094600 34200 1 KDT}
+    {-356002200 30600 0 KST}
+    {-336645000 34200 1 KDT}
+    {-324552600 30600 0 KST}
+    {-305195400 34200 1 KDT}
+    {-293103000 30600 0 KST}
+    {-264933000 32400 0 KST}
+    {547578000 36000 1 KDT}
+    {560883600 32400 0 KST}
+    {579027600 36000 1 KDT}
+    {592333200 32400 0 KST}
 }
diff --git a/library/tzdata/Asia/Srednekolymsk b/library/tzdata/Asia/Srednekolymsk
new file mode 100644
index 0000000..d1dd879
--- /dev/null
+++ b/library/tzdata/Asia/Srednekolymsk
@@ -0,0 +1,71 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:Asia/Srednekolymsk) {
+    {-9223372036854775808 36892 0 LMT}
+    {-1441188892 36000 0 MAGT}
+    {-1247565600 39600 0 MAGMMTT}
+    {354891600 43200 1 MAGST}
+    {370699200 39600 0 MAGT}
+    {386427600 43200 1 MAGST}
+    {402235200 39600 0 MAGT}
+    {417963600 43200 1 MAGST}
+    {433771200 39600 0 MAGT}
+    {449586000 43200 1 MAGST}
+    {465318000 39600 0 MAGT}
+    {481042800 43200 1 MAGST}
+    {496767600 39600 0 MAGT}
+    {512492400 43200 1 MAGST}
+    {528217200 39600 0 MAGT}
+    {543942000 43200 1 MAGST}
+    {559666800 39600 0 MAGT}
+    {575391600 43200 1 MAGST}
+    {591116400 39600 0 MAGT}
+    {606841200 43200 1 MAGST}
+    {622566000 39600 0 MAGT}
+    {638290800 43200 1 MAGST}
+    {654620400 39600 0 MAGT}
+    {670345200 36000 0 MAGMMTT}
+    {670348800 39600 1 MAGST}
+    {686073600 36000 0 MAGT}
+    {695750400 39600 0 MAGMMTT}
+    {701784000 43200 1 MAGST}
+    {717505200 39600 0 MAGT}
+    {733244400 43200 1 MAGST}
+    {748969200 39600 0 MAGT}
+    {764694000 43200 1 MAGST}
+    {780418800 39600 0 MAGT}
+    {796143600 43200 1 MAGST}
+    {811868400 39600 0 MAGT}
+    {828198000 43200 1 MAGST}
+    {846342000 39600 0 MAGT}
+    {859647600 43200 1 MAGST}
+    {877791600 39600 0 MAGT}
+    {891097200 43200 1 MAGST}
+    {909241200 39600 0 MAGT}
+    {922546800 43200 1 MAGST}
+    {941295600 39600 0 MAGT}
+    {953996400 43200 1 MAGST}
+    {972745200 39600 0 MAGT}
+    {985446000 43200 1 MAGST}
+    {1004194800 39600 0 MAGT}
+    {1017500400 43200 1 MAGST}
+    {1035644400 39600 0 MAGT}
+    {1048950000 43200 1 MAGST}
+    {1067094000 39600 0 MAGT}
+    {1080399600 43200 1 MAGST}
+    {1099148400 39600 0 MAGT}
+    {1111849200 43200 1 MAGST}
+    {1130598000 39600 0 MAGT}
+    {1143298800 43200 1 MAGST}
+    {1162047600 39600 0 MAGT}
+    {1174748400 43200 1 MAGST}
+    {1193497200 39600 0 MAGT}
+    {1206802800 43200 1 MAGST}
+    {1224946800 39600 0 MAGT}
+    {1238252400 43200 1 MAGST}
+    {1256396400 39600 0 MAGT}
+    {1269702000 43200 1 MAGST}
+    {1288450800 39600 0 MAGT}
+    {1301151600 43200 0 MAGT}
+    {1414245600 39600 0 SRET}
+}
diff --git a/library/tzdata/Asia/Tbilisi b/library/tzdata/Asia/Tbilisi
index 9f4a4bf..54b278a 100644
--- a/library/tzdata/Asia/Tbilisi
+++ b/library/tzdata/Asia/Tbilisi
@@ -1,9 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Tbilisi) {
-    {-9223372036854775808 10746 0 LMT}
-    {-2840151546 10746 0 TBMT}
-    {-1441162746 10800 0 TBIT}
+    {-9223372036854775808 10751 0 LMT}
+    {-2840151551 10751 0 TBMT}
+    {-1441162751 10800 0 TBIT}
     {-405140400 14400 0 TBIT}
     {354916800 18000 1 TBIST}
     {370724400 14400 0 TBIT}
diff --git a/library/tzdata/Asia/Vientiane b/library/tzdata/Asia/Vientiane
index 18ade4d..27b20ce 100644
--- a/library/tzdata/Asia/Vientiane
+++ b/library/tzdata/Asia/Vientiane
@@ -1,9 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Asia/Vientiane) {
-    {-9223372036854775808 24624 0 LMT}
-    {-2005973424 25580 0 SMT}
-    {-1855983920 25200 0 ICT}
-    {-1819954800 28800 0 ICT}
-    {-1220428800 25200 0 ICT}
+if {![info exists TZData(Asia/Bangkok)]} {
+    LoadTimeZoneFile Asia/Bangkok
 }
+set TZData(:Asia/Vientiane) $TZData(:Asia/Bangkok)
diff --git a/library/tzdata/Asia/Vladivostok b/library/tzdata/Asia/Vladivostok
index 396840d..119ff57 100644
--- a/library/tzdata/Asia/Vladivostok
+++ b/library/tzdata/Asia/Vladivostok
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Vladivostok) {
-    {-9223372036854775808 31654 0 LMT}
-    {-1487321254 32400 0 VLAT}
+    {-9223372036854775808 31651 0 LMT}
+    {-1487321251 32400 0 VLAT}
     {-1247562000 36000 0 VLAMMTT}
     {354895200 39600 1 VLAST}
     {370702800 36000 0 VLAT}
diff --git a/library/tzdata/Asia/Yakutsk b/library/tzdata/Asia/Yakutsk
index 98953c9..17493a6 100644
--- a/library/tzdata/Asia/Yakutsk
+++ b/library/tzdata/Asia/Yakutsk
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Yakutsk) {
-    {-9223372036854775808 31120 0 LMT}
-    {-1579423120 28800 0 YAKT}
+    {-9223372036854775808 31138 0 LMT}
+    {-1579423138 28800 0 YAKT}
     {-1247558400 32400 0 YAKMMTT}
     {354898800 36000 1 YAKST}
     {370706400 32400 0 YAKT}
diff --git a/library/tzdata/Asia/Yekaterinburg b/library/tzdata/Asia/Yekaterinburg
index 688ceca..2678958 100644
--- a/library/tzdata/Asia/Yekaterinburg
+++ b/library/tzdata/Asia/Yekaterinburg
@@ -2,7 +2,8 @@
 
 set TZData(:Asia/Yekaterinburg) {
     {-9223372036854775808 14553 0 LMT}
-    {-1592611353 14400 0 SVET}
+    {-1688270553 13505 0 PMT}
+    {-1592610305 14400 0 SVET}
     {-1247544000 18000 0 SVEMMTT}
     {354913200 21600 1 SVEST}
     {370720800 18000 0 SVET}
diff --git a/library/tzdata/Atlantic/Azores b/library/tzdata/Atlantic/Azores
index c476191..fd47ba5 100644
--- a/library/tzdata/Atlantic/Azores
+++ b/library/tzdata/Atlantic/Azores
@@ -3,7 +3,7 @@
 set TZData(:Atlantic/Azores) {
     {-9223372036854775808 -6160 0 LMT}
     {-2713904240 -6872 0 HMT}
-    {-1849557928 -7200 0 AZOT}
+    {-1830377128 -7200 0 AZOT}
     {-1689548400 -3600 1 AZOST}
     {-1677794400 -7200 0 AZOT}
     {-1667430000 -3600 1 AZOST}
diff --git a/library/tzdata/Atlantic/Madeira b/library/tzdata/Atlantic/Madeira
index 4960eeb..fac7f92 100644
--- a/library/tzdata/Atlantic/Madeira
+++ b/library/tzdata/Atlantic/Madeira
@@ -3,7 +3,7 @@
 set TZData(:Atlantic/Madeira) {
     {-9223372036854775808 -4056 0 LMT}
     {-2713906344 -4056 0 FMT}
-    {-1849560744 -3600 0 MADT}
+    {-1830379944 -3600 0 MADT}
     {-1689552000 0 1 MADST}
     {-1677798000 -3600 0 MADT}
     {-1667433600 0 1 MADST}
diff --git a/library/tzdata/Europe/Lisbon b/library/tzdata/Europe/Lisbon
index 79c688a..7168f96 100644
--- a/library/tzdata/Europe/Lisbon
+++ b/library/tzdata/Europe/Lisbon
@@ -1,9 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Europe/Lisbon) {
-    {-9223372036854775808 -2192 0 LMT}
-    {-2713908208 -2192 0 LMT}
-    {-1830381808 0 0 WET}
+    {-9223372036854775808 -2205 0 LMT}
+    {-2713908195 -2205 0 LMT}
+    {-1830381795 0 0 WET}
     {-1689555600 3600 1 WEST}
     {-1677801600 0 0 WET}
     {-1667437200 3600 1 WEST}
diff --git a/library/tzdata/Europe/Minsk b/library/tzdata/Europe/Minsk
index 1adcff8..0acb4aa 100644
--- a/library/tzdata/Europe/Minsk
+++ b/library/tzdata/Europe/Minsk
@@ -71,4 +71,5 @@ set TZData(:Europe/Minsk) {
     {1269734400 10800 1 EEST}
     {1288483200 7200 0 EET}
     {1301184000 10800 0 FET}
+    {1414274400 10800 0 MSK}
 }
diff --git a/library/tzdata/Europe/Riga b/library/tzdata/Europe/Riga
index 98cccc2..c829ffb 100644
--- a/library/tzdata/Europe/Riga
+++ b/library/tzdata/Europe/Riga
@@ -1,13 +1,13 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Europe/Riga) {
-    {-9223372036854775808 5788 0 LMT}
-    {-2840146588 5788 0 RMT}
-    {-1632008188 9388 1 LST}
-    {-1618702588 5788 0 RMT}
-    {-1601681788 9388 1 LST}
-    {-1597275388 5788 0 RMT}
-    {-1377308188 7200 0 EET}
+    {-9223372036854775808 5794 0 LMT}
+    {-2840146594 5794 0 RMT}
+    {-1632008194 9394 1 LST}
+    {-1618702594 5794 0 RMT}
+    {-1601681794 9394 1 LST}
+    {-1597275394 5794 0 RMT}
+    {-1377308194 7200 0 EET}
     {-928029600 10800 0 MSK}
     {-899521200 3600 0 CET}
     {-857257200 3600 0 CET}
diff --git a/library/tzdata/Europe/Samara b/library/tzdata/Europe/Samara
index 243a42f..ee9d989 100644
--- a/library/tzdata/Europe/Samara
+++ b/library/tzdata/Europe/Samara
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Europe/Samara) {
-    {-9223372036854775808 12036 0 LMT}
-    {-1593825636 10800 0 SAMT}
+    {-9223372036854775808 12020 0 LMT}
+    {-1593825620 10800 0 SAMT}
     {-1247540400 14400 0 SAMT}
     {-1102305600 14400 0 KUYMMTT}
     {354916800 18000 1 KUYST}
diff --git a/library/tzdata/Indian/Antananarivo b/library/tzdata/Indian/Antananarivo
index 217715e..c56a893 100644
--- a/library/tzdata/Indian/Antananarivo
+++ b/library/tzdata/Indian/Antananarivo
@@ -1,8 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Indian/Antananarivo) {
-    {-9223372036854775808 11404 0 LMT}
-    {-1846293004 10800 0 EAT}
-    {-499924800 14400 1 EAST}
-    {-492062400 10800 0 EAT}
+if {![info exists TZData(Africa/Nairobi)]} {
+    LoadTimeZoneFile Africa/Nairobi
 }
+set TZData(:Indian/Antananarivo) $TZData(:Africa/Nairobi)
diff --git a/library/tzdata/Indian/Comoro b/library/tzdata/Indian/Comoro
index 0b3c33a..06071de 100644
--- a/library/tzdata/Indian/Comoro
+++ b/library/tzdata/Indian/Comoro
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Indian/Comoro) {
-    {-9223372036854775808 10384 0 LMT}
-    {-1846291984 10800 0 EAT}
+if {![info exists TZData(Africa/Nairobi)]} {
+    LoadTimeZoneFile Africa/Nairobi
 }
+set TZData(:Indian/Comoro) $TZData(:Africa/Nairobi)
diff --git a/library/tzdata/Indian/Mayotte b/library/tzdata/Indian/Mayotte
index 0fe5f56..da55521 100644
--- a/library/tzdata/Indian/Mayotte
+++ b/library/tzdata/Indian/Mayotte
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Indian/Mayotte) {
-    {-9223372036854775808 10856 0 LMT}
-    {-1846292456 10800 0 EAT}
+if {![info exists TZData(Africa/Nairobi)]} {
+    LoadTimeZoneFile Africa/Nairobi
 }
+set TZData(:Indian/Mayotte) $TZData(:Africa/Nairobi)
diff --git a/library/tzdata/Pacific/Bougainville b/library/tzdata/Pacific/Bougainville
new file mode 100644
index 0000000..06996f9
--- /dev/null
+++ b/library/tzdata/Pacific/Bougainville
@@ -0,0 +1,10 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:Pacific/Bougainville) {
+    {-9223372036854775808 37336 0 LMT}
+    {-2840178136 35312 0 PMMT}
+    {-2366790512 36000 0 PGT}
+    {-868010400 32400 0 JST}
+    {-768906000 36000 0 PGT}
+    {1419696000 39600 0 BST}
+}
diff --git a/library/tzdata/Pacific/Fiji b/library/tzdata/Pacific/Fiji
index e1602ee..4aae330 100644
--- a/library/tzdata/Pacific/Fiji
+++ b/library/tzdata/Pacific/Fiji
@@ -17,175 +17,175 @@ set TZData(:Pacific/Fiji) {
     {1358604000 43200 0 FJT}
     {1382796000 46800 1 FJST}
     {1390050000 43200 0 FJT}
-    {1414245600 46800 1 FJST}
-    {1421499600 43200 0 FJT}
-    {1445695200 46800 1 FJST}
-    {1453554000 43200 0 FJT}
-    {1477144800 46800 1 FJST}
-    {1485003600 43200 0 FJT}
-    {1508594400 46800 1 FJST}
-    {1516453200 43200 0 FJT}
-    {1540044000 46800 1 FJST}
-    {1547902800 43200 0 FJT}
-    {1572098400 46800 1 FJST}
-    {1579352400 43200 0 FJT}
-    {1603548000 46800 1 FJST}
-    {1611406800 43200 0 FJT}
-    {1634997600 46800 1 FJST}
-    {1642856400 43200 0 FJT}
-    {1666447200 46800 1 FJST}
-    {1674306000 43200 0 FJT}
-    {1697896800 46800 1 FJST}
-    {1705755600 43200 0 FJT}
-    {1729951200 46800 1 FJST}
-    {1737205200 43200 0 FJT}
-    {1761400800 46800 1 FJST}
-    {1768654800 43200 0 FJT}
-    {1792850400 46800 1 FJST}
-    {1800709200 43200 0 FJT}
-    {1824300000 46800 1 FJST}
-    {1832158800 43200 0 FJT}
-    {1855749600 46800 1 FJST}
-    {1863608400 43200 0 FJT}
-    {1887199200 46800 1 FJST}
-    {1895058000 43200 0 FJT}
-    {1919253600 46800 1 FJST}
-    {1926507600 43200 0 FJT}
-    {1950703200 46800 1 FJST}
-    {1957957200 43200 0 FJT}
-    {1982152800 46800 1 FJST}
-    {1990011600 43200 0 FJT}
-    {2013602400 46800 1 FJST}
-    {2021461200 43200 0 FJT}
-    {2045052000 46800 1 FJST}
-    {2052910800 43200 0 FJT}
-    {2076501600 46800 1 FJST}
-    {2084360400 43200 0 FJT}
-    {2108556000 46800 1 FJST}
-    {2115810000 43200 0 FJT}
-    {2140005600 46800 1 FJST}
-    {2147864400 43200 0 FJT}
-    {2171455200 46800 1 FJST}
-    {2179314000 43200 0 FJT}
-    {2202904800 46800 1 FJST}
-    {2210763600 43200 0 FJT}
-    {2234354400 46800 1 FJST}
-    {2242213200 43200 0 FJT}
-    {2266408800 46800 1 FJST}
-    {2273662800 43200 0 FJT}
-    {2297858400 46800 1 FJST}
-    {2305112400 43200 0 FJT}
-    {2329308000 46800 1 FJST}
-    {2337166800 43200 0 FJT}
-    {2360757600 46800 1 FJST}
-    {2368616400 43200 0 FJT}
-    {2392207200 46800 1 FJST}
-    {2400066000 43200 0 FJT}
-    {2423656800 46800 1 FJST}
-    {2431515600 43200 0 FJT}
-    {2455711200 46800 1 FJST}
-    {2462965200 43200 0 FJT}
-    {2487160800 46800 1 FJST}
-    {2495019600 43200 0 FJT}
-    {2518610400 46800 1 FJST}
-    {2526469200 43200 0 FJT}
-    {2550060000 46800 1 FJST}
-    {2557918800 43200 0 FJT}
-    {2581509600 46800 1 FJST}
-    {2589368400 43200 0 FJT}
-    {2613564000 46800 1 FJST}
-    {2620818000 43200 0 FJT}
-    {2645013600 46800 1 FJST}
-    {2652267600 43200 0 FJT}
-    {2676463200 46800 1 FJST}
-    {2684322000 43200 0 FJT}
-    {2707912800 46800 1 FJST}
-    {2715771600 43200 0 FJT}
-    {2739362400 46800 1 FJST}
-    {2747221200 43200 0 FJT}
-    {2770812000 46800 1 FJST}
-    {2778670800 43200 0 FJT}
-    {2802866400 46800 1 FJST}
-    {2810120400 43200 0 FJT}
-    {2834316000 46800 1 FJST}
-    {2841570000 43200 0 FJT}
-    {2865765600 46800 1 FJST}
-    {2873624400 43200 0 FJT}
-    {2897215200 46800 1 FJST}
-    {2905074000 43200 0 FJT}
-    {2928664800 46800 1 FJST}
-    {2936523600 43200 0 FJT}
-    {2960114400 46800 1 FJST}
-    {2967973200 43200 0 FJT}
-    {2992168800 46800 1 FJST}
-    {2999422800 43200 0 FJT}
-    {3023618400 46800 1 FJST}
-    {3031477200 43200 0 FJT}
-    {3055068000 46800 1 FJST}
-    {3062926800 43200 0 FJT}
-    {3086517600 46800 1 FJST}
-    {3094376400 43200 0 FJT}
-    {3117967200 46800 1 FJST}
-    {3125826000 43200 0 FJT}
-    {3150021600 46800 1 FJST}
-    {3157275600 43200 0 FJT}
-    {3181471200 46800 1 FJST}
-    {3188725200 43200 0 FJT}
-    {3212920800 46800 1 FJST}
-    {3220779600 43200 0 FJT}
-    {3244370400 46800 1 FJST}
-    {3252229200 43200 0 FJT}
-    {3275820000 46800 1 FJST}
-    {3283678800 43200 0 FJT}
-    {3307269600 46800 1 FJST}
-    {3315128400 43200 0 FJT}
-    {3339324000 46800 1 FJST}
-    {3346578000 43200 0 FJT}
-    {3370773600 46800 1 FJST}
-    {3378632400 43200 0 FJT}
-    {3402223200 46800 1 FJST}
-    {3410082000 43200 0 FJT}
-    {3433672800 46800 1 FJST}
-    {3441531600 43200 0 FJT}
-    {3465122400 46800 1 FJST}
-    {3472981200 43200 0 FJT}
-    {3497176800 46800 1 FJST}
-    {3504430800 43200 0 FJT}
-    {3528626400 46800 1 FJST}
-    {3535880400 43200 0 FJT}
-    {3560076000 46800 1 FJST}
-    {3567934800 43200 0 FJT}
-    {3591525600 46800 1 FJST}
-    {3599384400 43200 0 FJT}
-    {3622975200 46800 1 FJST}
-    {3630834000 43200 0 FJT}
-    {3654424800 46800 1 FJST}
-    {3662283600 43200 0 FJT}
-    {3686479200 46800 1 FJST}
-    {3693733200 43200 0 FJT}
-    {3717928800 46800 1 FJST}
-    {3725182800 43200 0 FJT}
-    {3749378400 46800 1 FJST}
-    {3757237200 43200 0 FJT}
-    {3780828000 46800 1 FJST}
-    {3788686800 43200 0 FJT}
-    {3812277600 46800 1 FJST}
-    {3820136400 43200 0 FJT}
-    {3843727200 46800 1 FJST}
-    {3851586000 43200 0 FJT}
-    {3875781600 46800 1 FJST}
-    {3883035600 43200 0 FJT}
-    {3907231200 46800 1 FJST}
-    {3915090000 43200 0 FJT}
-    {3938680800 46800 1 FJST}
-    {3946539600 43200 0 FJT}
-    {3970130400 46800 1 FJST}
-    {3977989200 43200 0 FJT}
-    {4001580000 46800 1 FJST}
-    {4009438800 43200 0 FJT}
-    {4033634400 46800 1 FJST}
-    {4040888400 43200 0 FJT}
-    {4065084000 46800 1 FJST}
-    {4072338000 43200 0 FJT}
-    {4096533600 46800 1 FJST}
+    {1414850400 46800 1 FJST}
+    {1421503200 43200 0 FJT}
+    {1446300000 46800 1 FJST}
+    {1453557600 43200 0 FJT}
+    {1478354400 46800 1 FJST}
+    {1485007200 43200 0 FJT}
+    {1509804000 46800 1 FJST}
+    {1516456800 43200 0 FJT}
+    {1541253600 46800 1 FJST}
+    {1547906400 43200 0 FJT}
+    {1572703200 46800 1 FJST}
+    {1579356000 43200 0 FJT}
+    {1604152800 46800 1 FJST}
+    {1611410400 43200 0 FJT}
+    {1636207200 46800 1 FJST}
+    {1642860000 43200 0 FJT}
+    {1667656800 46800 1 FJST}
+    {1674309600 43200 0 FJT}
+    {1699106400 46800 1 FJST}
+    {1705759200 43200 0 FJT}
+    {1730556000 46800 1 FJST}
+    {1737208800 43200 0 FJT}
+    {1762005600 46800 1 FJST}
+    {1768658400 43200 0 FJT}
+    {1793455200 46800 1 FJST}
+    {1800712800 43200 0 FJT}
+    {1825509600 46800 1 FJST}
+    {1832162400 43200 0 FJT}
+    {1856959200 46800 1 FJST}
+    {1863612000 43200 0 FJT}
+    {1888408800 46800 1 FJST}
+    {1895061600 43200 0 FJT}
+    {1919858400 46800 1 FJST}
+    {1926511200 43200 0 FJT}
+    {1951308000 46800 1 FJST}
+    {1957960800 43200 0 FJT}
+    {1983362400 46800 1 FJST}
+    {1990015200 43200 0 FJT}
+    {2014812000 46800 1 FJST}
+    {2021464800 43200 0 FJT}
+    {2046261600 46800 1 FJST}
+    {2052914400 43200 0 FJT}
+    {2077711200 46800 1 FJST}
+    {2084364000 43200 0 FJT}
+    {2109160800 46800 1 FJST}
+    {2115813600 43200 0 FJT}
+    {2140610400 46800 1 FJST}
+    {2147868000 43200 0 FJT}
+    {2172664800 46800 1 FJST}
+    {2179317600 43200 0 FJT}
+    {2204114400 46800 1 FJST}
+    {2210767200 43200 0 FJT}
+    {2235564000 46800 1 FJST}
+    {2242216800 43200 0 FJT}
+    {2267013600 46800 1 FJST}
+    {2273666400 43200 0 FJT}
+    {2298463200 46800 1 FJST}
+    {2305116000 43200 0 FJT}
+    {2329912800 46800 1 FJST}
+    {2337170400 43200 0 FJT}
+    {2361967200 46800 1 FJST}
+    {2368620000 43200 0 FJT}
+    {2393416800 46800 1 FJST}
+    {2400069600 43200 0 FJT}
+    {2424866400 46800 1 FJST}
+    {2431519200 43200 0 FJT}
+    {2456316000 46800 1 FJST}
+    {2462968800 43200 0 FJT}
+    {2487765600 46800 1 FJST}
+    {2495023200 43200 0 FJT}
+    {2519820000 46800 1 FJST}
+    {2526472800 43200 0 FJT}
+    {2551269600 46800 1 FJST}
+    {2557922400 43200 0 FJT}
+    {2582719200 46800 1 FJST}
+    {2589372000 43200 0 FJT}
+    {2614168800 46800 1 FJST}
+    {2620821600 43200 0 FJT}
+    {2645618400 46800 1 FJST}
+    {2652271200 43200 0 FJT}
+    {2677068000 46800 1 FJST}
+    {2684325600 43200 0 FJT}
+    {2709122400 46800 1 FJST}
+    {2715775200 43200 0 FJT}
+    {2740572000 46800 1 FJST}
+    {2747224800 43200 0 FJT}
+    {2772021600 46800 1 FJST}
+    {2778674400 43200 0 FJT}
+    {2803471200 46800 1 FJST}
+    {2810124000 43200 0 FJT}
+    {2834920800 46800 1 FJST}
+    {2841573600 43200 0 FJT}
+    {2866975200 46800 1 FJST}
+    {2873628000 43200 0 FJT}
+    {2898424800 46800 1 FJST}
+    {2905077600 43200 0 FJT}
+    {2929874400 46800 1 FJST}
+    {2936527200 43200 0 FJT}
+    {2961324000 46800 1 FJST}
+    {2967976800 43200 0 FJT}
+    {2992773600 46800 1 FJST}
+    {2999426400 43200 0 FJT}
+    {3024223200 46800 1 FJST}
+    {3031480800 43200 0 FJT}
+    {3056277600 46800 1 FJST}
+    {3062930400 43200 0 FJT}
+    {3087727200 46800 1 FJST}
+    {3094380000 43200 0 FJT}
+    {3119176800 46800 1 FJST}
+    {3125829600 43200 0 FJT}
+    {3150626400 46800 1 FJST}
+    {3157279200 43200 0 FJT}
+    {3182076000 46800 1 FJST}
+    {3188728800 43200 0 FJT}
+    {3213525600 46800 1 FJST}
+    {3220783200 43200 0 FJT}
+    {3245580000 46800 1 FJST}
+    {3252232800 43200 0 FJT}
+    {3277029600 46800 1 FJST}
+    {3283682400 43200 0 FJT}
+    {3308479200 46800 1 FJST}
+    {3315132000 43200 0 FJT}
+    {3339928800 46800 1 FJST}
+    {3346581600 43200 0 FJT}
+    {3371378400 46800 1 FJST}
+    {3378636000 43200 0 FJT}
+    {3403432800 46800 1 FJST}
+    {3410085600 43200 0 FJT}
+    {3434882400 46800 1 FJST}
+    {3441535200 43200 0 FJT}
+    {3466332000 46800 1 FJST}
+    {3472984800 43200 0 FJT}
+    {3497781600 46800 1 FJST}
+    {3504434400 43200 0 FJT}
+    {3529231200 46800 1 FJST}
+    {3535884000 43200 0 FJT}
+    {3560680800 46800 1 FJST}
+    {3567938400 43200 0 FJT}
+    {3592735200 46800 1 FJST}
+    {3599388000 43200 0 FJT}
+    {3624184800 46800 1 FJST}
+    {3630837600 43200 0 FJT}
+    {3655634400 46800 1 FJST}
+    {3662287200 43200 0 FJT}
+    {3687084000 46800 1 FJST}
+    {3693736800 43200 0 FJT}
+    {3718533600 46800 1 FJST}
+    {3725186400 43200 0 FJT}
+    {3750588000 46800 1 FJST}
+    {3757240800 43200 0 FJT}
+    {3782037600 46800 1 FJST}
+    {3788690400 43200 0 FJT}
+    {3813487200 46800 1 FJST}
+    {3820140000 43200 0 FJT}
+    {3844936800 46800 1 FJST}
+    {3851589600 43200 0 FJT}
+    {3876386400 46800 1 FJST}
+    {3883039200 43200 0 FJT}
+    {3907836000 46800 1 FJST}
+    {3915093600 43200 0 FJT}
+    {3939890400 46800 1 FJST}
+    {3946543200 43200 0 FJT}
+    {3971340000 46800 1 FJST}
+    {3977992800 43200 0 FJT}
+    {4002789600 46800 1 FJST}
+    {4009442400 43200 0 FJT}
+    {4034239200 46800 1 FJST}
+    {4040892000 43200 0 FJT}
+    {4065688800 46800 1 FJST}
+    {4072341600 43200 0 FJT}
+    {4097138400 46800 1 FJST}
 }
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index d7b0d1d..54eea8e 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -100,7 +100,7 @@ INSTALL_TARGET		:= install
 
 export CPPROG		:= cp -p
 
-INSTALL_TARGETS		= install-binaries install-libraries
+INSTALL_TARGETS		= install-binaries install-headers install-libraries
 ifeq (${EMBEDDED_BUILD},)
 INSTALL_TARGETS		+= install-private-headers
 endif
diff --git a/tests/compile.test b/tests/compile.test
index 22ebc7d..d4a31d4 100644
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -455,14 +455,22 @@ test compile-13.1 {testing underestimate of maxStackSize in list cmd} {exec} {
     list [catch {exec [interpreter] << $script} msg] $msg
 } {0 OK}
 
-# Special test for compiling tokens from a copy of the source string. [Bug
-# 599788]
+# Tests compile-14.* for [Bug 599788] [Bug 0c043a175a47da8c2342]
 test compile-14.1 {testing errors in element name; segfault?} {} {
      catch {set a([error])} msg1
      catch {set bubba([join $abba $jubba]) $vol} msg2
      list $msg1 $msg2
 } {{wrong # args: should be "error message ?errorInfo? ?errorCode?"} {can't read "abba": no such variable}}
 
+test compile-14.2 {testing element name "$"} -body {
+    unset -nocomplain a
+    set a() 1
+    set a(1) 2 
+    set a($) 3
+    list [set a()] [set a(1)] [set a($)] [unset a() a(1); lindex [array names a] 0]
+} -cleanup {unset a} -result [list 1 2 3 {$}]
+
+
 # Tests compile-15.* cover Tcl Bug 633204
 test compile-15.1 {proper TCL_RETURN code from [return]} {
     apply {{} {catch return}}
diff --git a/tests/io.test b/tests/io.test
index b09d55a..cd8b014 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -7900,6 +7900,44 @@ test io-53.16 {[ed29c4da21] MBRead: fblocked seen as error} -setup {
     close $c
     removeFile out
 } -result 100
+test io-53.17 {[7c187a3773] MBWrite: proper inQueueTail handling} -setup {
+    proc driver {cmd args} {
+        variable buffer
+        variable index
+        set chan [lindex $args 0]
+        switch -- $cmd {
+            initialize {
+                set index($chan) 0
+                set buffer($chan) [encoding convertto utf-8 \
+                        line\n[string repeat a 100]line\n]
+                return {initialize finalize watch read}
+            }
+            finalize {
+                unset index($chan) buffer($chan)
+                return
+            }
+            watch {}
+            read {
+                set n [lindex $args 1]
+                set new [expr {$index($chan) + $n}]
+                set result [string range $buffer($chan) $index($chan) $new-1]
+                set index($chan) $new
+                return $result
+            }
+        }
+    }
+    set c [chan create read [namespace which driver]]
+    chan configure $c -encoding utf-8 -translation lf -buffersize 107
+    set out [makeFile {} out]
+    set outChan [open $out w]
+    chan configure $outChan -encoding utf-8 -translation lf
+} -body {
+    list [gets $c] [chan copy $c $outChan -size 100] [gets $c]
+} -cleanup {
+    close $outChan
+    close $c
+    removeFile out
+} -result {line 100 line}
 
 test io-54.1 {Recursive channel events} {socket fileevent} {
     # This test checks to see if file events are delivered during recursive
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 57f8d47..4fbc380 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -294,7 +294,7 @@ test iocmd-8.15.1 {fconfigure command / tcp channel} -constraints {socket unixOr
     close $srv
     unset cli srv port
     rename iocmdSRV {}
-} -returnCodes error -result {bad option "-blah": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -translation, -peername, or -sockname}
+} -returnCodes error -result {bad option "-blah": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -translation, -connecting, -peername, or -sockname}
 test iocmd-8.16 {fconfigure command / tcp channel} -constraints socket -setup {
     set srv [socket -server iocmdSRV -myaddr 127.0.0.1 0]
     set port [lindex [fconfigure $srv -sockname] 2]
diff --git a/tests/parse.test b/tests/parse.test
index 5d8afeb..d73c725 100644
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -663,6 +663,9 @@ test parse-12.24 {Tcl_ParseVarName procedure, missing close paren in array refer
 test parse-12.25 {Tcl_ParseVarName procedure, nested array reference} testparser {
     testparser {$x(a$y(b$z))} 0
 } {- {$x(a$y(b$z))} 1 word {$x(a$y(b$z))} 8 variable {$x(a$y(b$z))} 7 text x 0 text a 0 variable {$y(b$z)} 4 text y 0 text b 0 variable {$z} 1 text z 0 {}}
+test parse-12.26 {Tcl_ParseVarName [d2ffcca163] non-ascii} testparser {
+    testparser "$\u0433" -1
+} "- {$\u0433} 1 word {$\u0433} 2 text {$} 0 text \u0433 0 {}"
 
 test parse-13.1 {Tcl_ParseVar procedure} testparsevar {
     set abc 24
diff --git a/tests/parseExpr.test b/tests/parseExpr.test
index 5c7986a..ef05454 100644
--- a/tests/parseExpr.test
+++ b/tests/parseExpr.test
@@ -1064,6 +1064,15 @@ test parseExpr-22.18 {Bug 3401704} -constraints testexprparser -body {
     dict get $o -errorcode
 } -result {TCL PARSE EXPR BADNUMBER BINARY}
 
+test parseExpr-22.19 {Bug d2ffcca163} -constraints testexprparser -body {
+    testexprparser \u0433 -1
+} -returnCodes error -match glob -result {*invalid character*}
+test parseExpr-22.20 {Bug d2ffcca163} -constraints testexprparser -body {
+    testexprparser \u043f -1
+} -returnCodes error -match glob -result {*invalid character*}
+test parseExpr-22.21 {Bug d2ffcca163} -constraints testexprparser -body {
+    testexprparser in\u0433(0) -1
+} -returnCodes error -match glob -result {missing operand*}
 
 # cleanup
 cleanupTests
diff --git a/tests/socket.test b/tests/socket.test
index eeea044..4f90e51 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -2343,6 +2343,24 @@ test socket-14.17 {empty -sockname while [socket -async] connecting} \
         catch {close $client}
     } -result {}
 
+# test for bug c6ed4acfd8: running async socket connect with other connect
+# established will block tcl as it goes in an infinite loop in vwait
+test socket-14.18 {bug c6ed4acfd8: running async socket connect made other connect block} \
+    -constraints {socket} \
+    -body {
+        proc accept {channel address port} {}
+        set port [randport]
+        set ssock [socket -server accept $port]
+        set csock1 [socket -async localhost [randport]]
+        set csock2 [socket localhost $port]
+        after 1000 {set done ok}
+        vwait done
+} -cleanup {
+        catch {close $ssock}
+        catch {close $csock1}
+        catch {close $csock2}
+    } -result {}
+
 set num 0
 
 set x {localhost {socket} 127.0.0.1 {supported_inet} ::1 {supported_inet6}}
diff --git a/tests/stringComp.test b/tests/stringComp.test
index f9f6bda..a66525e 100644
--- a/tests/stringComp.test
+++ b/tests/stringComp.test
@@ -720,6 +720,14 @@ test stringComp-14.2 {Bug 82e7f67325} memory {
 	}} {a b}
     }
 } {0}
+test stringComp-14.3 {Bug 0dca3bfa8f} {
+    apply {arg {
+	set argCopy $arg
+	set arg [string replace $arg 1 2 aa]
+	# Crashes in comparison before fix
+	expr {$arg ne $argCopy}
+    }} abcde
+} 1
 
 ## string tolower
 ## not yet bc
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 0188ea6..9c5cd4b 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -905,7 +905,7 @@ TcpGetOptionProc(
     }
 
     if (len > 0) {
-	return Tcl_BadChannelOption(interp, optionName, "peername sockname");
+	return Tcl_BadChannelOption(interp, optionName, "connecting peername sockname");
     }
 
     return TCL_OK;
diff --git a/win/README b/win/README
index 1a2d501..5e060ef 100644
--- a/win/README
+++ b/win/README
@@ -79,7 +79,7 @@ Use the Makefile "install" target to install Tcl.  It will install it
 according to the prefix options you provided in the correct directory
 structure.
 
-Note that in order to run tclsh85.exe, you must ensure that tcl85.dll is
+Note that in order to run tclsh86.exe, you must ensure that tcl86.dll is
 on your path, in the system directory, or in the directory containing
 tclsh86.exe.
 
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 2c58224..a022ed5 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -1501,9 +1501,9 @@ TcpGetOptionProc(
     if (len > 0) {
 #ifdef TCL_FEATURE_KEEPALIVE_NAGLE
 	return Tcl_BadChannelOption(interp, optionName,
-		"peername sockname keepalive nagle");
+		"connecting peername sockname keepalive nagle");
 #else
-	return Tcl_BadChannelOption(interp, optionName, "peername sockname");
+	return Tcl_BadChannelOption(interp, optionName, "connecting peername sockname");
 #endif /*TCL_FEATURE_KEEPALIVE_NAGLE*/
     }
 
@@ -1739,7 +1739,7 @@ TcpConnect(
 		 */
 
 		for (statePtr2 = tsdPtr->socketList; statePtr2 != NULL;
-			statePtr2 = statePtr->nextPtr) {
+			statePtr2 = statePtr2->nextPtr) {
 		    if (statePtr2 == statePtr) {
 			in_socket_list = 1;
 			break;
author	dgp <dgp@users.sourceforge.net>	2014-12-23 03:11:01 (GMT)
committer	dgp <dgp@users.sourceforge.net>	2014-12-23 03:11:01 (GMT)
commit	b49e834f28c9fd688fa615cb5809549c58f65788 (patch)
tree	a5328c9e7f0e9394621e84657c6454994d8084af
parent	9b9c29e352eb0ae7a048fa4ca8a021a4100d2b40 (diff)
parent	dd4496550090acf79f5e144602c745533549eea5 (diff)
download	tcl-b49e834f28c9fd688fa615cb5809549c58f65788.zip tcl-b49e834f28c9fd688fa615cb5809549c58f65788.tar.gz tcl-b49e834f28c9fd688fa615cb5809549c58f65788.tar.bz2