diff options
-rw-r--r-- | generic/tclEnsemble.c | 2 | ||||
-rw-r--r-- | generic/tclIO.c | 104 | ||||
-rw-r--r-- | generic/tclIO.h | 4 | ||||
-rw-r--r-- | generic/tclInt.h | 2 | ||||
-rw-r--r-- | generic/tclLoad.c | 25 | ||||
-rw-r--r-- | generic/tclStringRep.h | 2 | ||||
-rw-r--r-- | library/tzdata/America/Punta_Arenas | 12 | ||||
-rw-r--r-- | library/tzdata/America/Santiago | 14 | ||||
-rw-r--r-- | library/tzdata/Asia/Gaza | 202 | ||||
-rw-r--r-- | library/tzdata/Asia/Hebron | 202 | ||||
-rw-r--r-- | library/tzdata/Europe/Kiev | 20 | ||||
-rw-r--r-- | library/tzdata/Europe/Simferopol | 12 | ||||
-rw-r--r-- | library/tzdata/Europe/Uzhgorod | 22 | ||||
-rw-r--r-- | library/tzdata/Europe/Zaporozhye | 21 | ||||
-rw-r--r-- | tests/pkgMkIndex.test | 2 | ||||
-rwxr-xr-x | tools/tclZIC.tcl | 4 |
16 files changed, 333 insertions, 317 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c index 738668f..59961d9 100644 --- a/generic/tclEnsemble.c +++ b/generic/tclEnsemble.c @@ -2106,7 +2106,7 @@ void TclSpellFix( Tcl_Interp *interp, Tcl_Obj *const *objv, - int objc, + size_t objc, size_t badIdx, Tcl_Obj *bad, Tcl_Obj *fix) diff --git a/generic/tclIO.c b/generic/tclIO.c index 177cb2e..ee847ac 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -275,21 +275,21 @@ static int WillRead(Channel *chanPtr); * -------------------------------------------------------------------------- */ -#define BytesLeft(bufPtr) (((size_t)(bufPtr)->nextAdded - (size_t)(bufPtr)->nextRemoved)) +#define BytesLeft(bufPtr) (((bufPtr)->nextAdded1 - (bufPtr)->nextRemoved1)) -#define SpaceLeft(bufPtr) (((bufPtr)->bufLength - (size_t)(bufPtr)->nextAdded)) +#define SpaceLeft(bufPtr) (((bufPtr)->bufLength - (bufPtr)->nextAdded1)) -#define IsBufferReady(bufPtr) ((bufPtr)->nextAdded > (bufPtr)->nextRemoved) +#define IsBufferReady(bufPtr) ((bufPtr)->nextAdded1 > (bufPtr)->nextRemoved1) -#define IsBufferEmpty(bufPtr) ((bufPtr)->nextAdded == (bufPtr)->nextRemoved) +#define IsBufferEmpty(bufPtr) ((bufPtr)->nextAdded1 == (bufPtr)->nextRemoved1) -#define IsBufferFull(bufPtr) ((bufPtr) && (size_t)(bufPtr)->nextAdded >= (bufPtr)->bufLength) +#define IsBufferFull(bufPtr) ((bufPtr) && (bufPtr)->nextAdded1 >= (bufPtr)->bufLength) -#define IsBufferOverflowing(bufPtr) ((size_t)(bufPtr)->nextAdded>(bufPtr)->bufLength) +#define IsBufferOverflowing(bufPtr) ((bufPtr)->nextAdded1>(bufPtr)->bufLength) -#define InsertPoint(bufPtr) (&(bufPtr)->buf[(bufPtr)->nextAdded]) +#define InsertPoint(bufPtr) (&(bufPtr)->buf[(bufPtr)->nextAdded1]) -#define RemovePoint(bufPtr) (&(bufPtr)->buf[(bufPtr)->nextRemoved]) +#define RemovePoint(bufPtr) (&(bufPtr)->buf[(bufPtr)->nextRemoved1]) /* * For working with channel state flag bits. @@ -2453,8 +2453,8 @@ AllocChannelBuffer( n = length + CHANNELBUFFER_HEADER_SIZE + BUFFER_PADDING + BUFFER_PADDING; bufPtr = (ChannelBuffer *)Tcl_Alloc(n); - bufPtr->nextAdded = BUFFER_PADDING; - bufPtr->nextRemoved = BUFFER_PADDING; + bufPtr->nextAdded1 = BUFFER_PADDING; + bufPtr->nextRemoved1 = BUFFER_PADDING; bufPtr->bufLength = length + BUFFER_PADDING; bufPtr->nextPtr = NULL; bufPtr->refCount = 1; @@ -2572,8 +2572,8 @@ RecycleBuffer( return; keepBuffer: - bufPtr->nextRemoved = BUFFER_PADDING; - bufPtr->nextAdded = BUFFER_PADDING; + bufPtr->nextRemoved1 = BUFFER_PADDING; + bufPtr->nextAdded1 = BUFFER_PADDING; bufPtr->nextPtr = NULL; } @@ -2865,7 +2865,7 @@ FlushChannel( wroteSome = 1; } - bufPtr->nextRemoved += written; + bufPtr->nextRemoved1 += written; /* * If this buffer is now empty, recycle it. @@ -4326,7 +4326,7 @@ Write( */ memcpy(InsertPoint(bufPtr), safe, saved); - bufPtr->nextAdded += saved; + bufPtr->nextAdded1 += saved; saved = 0; } PreserveChannelBuffer(bufPtr); @@ -4357,7 +4357,7 @@ Write( break; } - bufPtr->nextAdded += dstWrote; + bufPtr->nextAdded1 += dstWrote; src += srcRead; srcLen -= srcRead; total += dstWrote; @@ -4393,7 +4393,7 @@ Write( dstLen + BUFFER_PADDING, &srcRead, &dstWrote, NULL); assert(srcRead == nlLen); - bufPtr->nextAdded += dstWrote; + bufPtr->nextAdded1 += dstWrote; src++; srcLen--; total += dstWrote; @@ -4414,7 +4414,7 @@ Write( saved = 1 + ~SpaceLeft(bufPtr); memcpy(safe, dst + dstLen, saved); - bufPtr->nextAdded = bufPtr->bufLength; + bufPtr->nextAdded1 = bufPtr->bufLength; } if ((srcLen + saved == 0) && (result == TCL_OK)) { @@ -4588,7 +4588,7 @@ Tcl_GetsObj( oldState = statePtr->inputEncodingState; oldRemoved = BUFFER_PADDING; if (bufPtr != NULL) { - oldRemoved = bufPtr->nextRemoved; + oldRemoved = bufPtr->nextRemoved1; } /* @@ -4722,7 +4722,7 @@ Tcl_GetsObj( gs.rawRead, statePtr->inputEncodingFlags | TCL_ENCODING_NO_TERMINATE, &gs.state, tmp, sizeof(tmp), &rawRead, NULL, NULL); - bufPtr->nextRemoved += rawRead; + bufPtr->nextRemoved1 += rawRead; gs.rawRead -= rawRead; gs.bytesWrote--; gs.charsWrote--; @@ -4826,7 +4826,7 @@ Tcl_GetsObj( &statePtr->inputEncodingState, dst, eol - dst + skip + TCL_UTF_MAX - 1, &gs.rawRead, NULL, &gs.charsWrote); - bufPtr->nextRemoved += gs.rawRead; + bufPtr->nextRemoved1 += gs.rawRead; /* * Recycle all the emptied buffers. @@ -4856,12 +4856,12 @@ Tcl_GetsObj( } bufPtr = statePtr->inQueueHead; if (bufPtr != NULL) { - bufPtr->nextRemoved = oldRemoved; + bufPtr->nextRemoved1 = oldRemoved; bufPtr = bufPtr->nextPtr; } for ( ; bufPtr != NULL; bufPtr = bufPtr->nextPtr) { - bufPtr->nextRemoved = BUFFER_PADDING; + bufPtr->nextRemoved1 = BUFFER_PADDING; } CommonGetsCleanup(chanPtr); @@ -4971,7 +4971,7 @@ TclGetsObjBinary( oldRemoved = BUFFER_PADDING; oldLength = byteLen; if (bufPtr != NULL) { - oldRemoved = bufPtr->nextRemoved; + oldRemoved = bufPtr->nextRemoved1; } rawLen = 0; @@ -4993,13 +4993,13 @@ TclGetsObjBinary( */ if (bufPtr != NULL) { - bufPtr->nextRemoved += rawLen; + bufPtr->nextRemoved1 += rawLen; if (!IsBufferReady(bufPtr)) { bufPtr = bufPtr->nextPtr; } } - if ((bufPtr == NULL) || (bufPtr->nextAdded == BUFFER_PADDING)) { + if ((bufPtr == NULL) || (bufPtr->nextAdded1 == BUFFER_PADDING)) { /* * All channel buffers were exhausted and the caller still hasn't * seen EOL. Need to read more bytes from the channel device. Side @@ -5115,7 +5115,7 @@ TclGetsObjBinary( byteArray = Tcl_SetByteArrayLength(objPtr, byteLen + rawLen); memcpy(byteArray + byteLen, dst, rawLen); byteLen += rawLen; - bufPtr->nextRemoved += rawLen + skip; + bufPtr->nextRemoved1 += rawLen + skip; /* * Convert the buffer if there was an encoding. @@ -5143,12 +5143,12 @@ TclGetsObjBinary( restore: bufPtr = statePtr->inQueueHead; if (bufPtr) { - bufPtr->nextRemoved = oldRemoved; + bufPtr->nextRemoved1 = oldRemoved; bufPtr = bufPtr->nextPtr; } for ( ; bufPtr != NULL; bufPtr = bufPtr->nextPtr) { - bufPtr->nextRemoved = BUFFER_PADDING; + bufPtr->nextRemoved1 = BUFFER_PADDING; } CommonGetsCleanup(chanPtr); @@ -5277,14 +5277,14 @@ FilterInputBytes( bufPtr = gsPtr->bufPtr; if (bufPtr != NULL) { - bufPtr->nextRemoved += gsPtr->rawRead; + bufPtr->nextRemoved1 += gsPtr->rawRead; if (!IsBufferReady(bufPtr)) { bufPtr = bufPtr->nextPtr; } } gsPtr->totalChars += gsPtr->charsWrote; - if ((bufPtr == NULL) || (bufPtr->nextAdded == BUFFER_PADDING)) { + if ((bufPtr == NULL) || (bufPtr->nextAdded1 == BUFFER_PADDING)) { /* * All channel buffers were exhausted and the caller still hasn't seen * EOL. Need to read more bytes from the channel device. Side effect @@ -5392,7 +5392,7 @@ FilterInputBytes( * device. Fall through, returning that nothing was found. */ - bufPtr->nextRemoved = bufPtr->nextAdded; + bufPtr->nextRemoved1 = bufPtr->nextAdded1; } else { /* * There are no more cached raw bytes left. See if we can get @@ -5410,8 +5410,8 @@ FilterInputBytes( extra = rawLen - gsPtr->rawRead; memcpy(nextPtr->buf + (BUFFER_PADDING - extra), raw + gsPtr->rawRead, extra); - nextPtr->nextRemoved -= extra; - bufPtr->nextAdded -= extra; + nextPtr->nextRemoved1 -= extra; + bufPtr->nextAdded1 -= extra; } } @@ -5497,7 +5497,7 @@ PeekAhead( return; cleanup: - bufPtr->nextRemoved += gsPtr->rawRead; + bufPtr->nextRemoved1 += gsPtr->rawRead; gsPtr->rawRead = 0; gsPtr->totalChars += gsPtr->charsWrote; gsPtr->bytesWrote = 0; @@ -5559,8 +5559,8 @@ CommonGetsCleanup( memcpy(InsertPoint(bufPtr), nextPtr->buf + (BUFFER_PADDING - extra), (size_t) extra); - bufPtr->nextAdded += extra; - nextPtr->nextRemoved = BUFFER_PADDING; + bufPtr->nextAdded1 += extra; + nextPtr->nextRemoved1 = BUFFER_PADDING; } bufPtr = nextPtr; } @@ -5665,7 +5665,7 @@ Tcl_ReadRaw( */ memcpy(readBuf, RemovePoint(bufPtr), toCopy); - bufPtr->nextRemoved += toCopy; + bufPtr->nextRemoved1 += toCopy; copied += toCopy; readBuf += toCopy; bytesToRead -= toCopy; @@ -6034,7 +6034,7 @@ ReadBytes( TclAppendBytesToByteArray(objPtr, (unsigned char *) RemovePoint(bufPtr), toRead); - bufPtr->nextRemoved += toRead; + bufPtr->nextRemoved1 += toRead; return toRead; } @@ -6297,10 +6297,10 @@ ReadChars( if (buffer[1] == '\n') { /* \r\n translate to \n */ dst[0] = '\n'; - bufPtr->nextRemoved += read; + bufPtr->nextRemoved1 += read; } else { dst[0] = '\r'; - bufPtr->nextRemoved += srcRead; + bufPtr->nextRemoved1 += srcRead; } statePtr->inputEncodingFlags &= ~TCL_ENCODING_START; @@ -6316,7 +6316,7 @@ ReadChars( */ dst[0] = '\r'; - bufPtr->nextRemoved = bufPtr->nextAdded; + bufPtr->nextRemoved1 = bufPtr->nextAdded1; Tcl_SetObjLength(objPtr, numBytes + 1); return 1; } @@ -6412,11 +6412,11 @@ ReadChars( * precautions. */ - if (nextPtr->nextRemoved - srcLen < 0) { + if (nextPtr->nextRemoved1 - srcLen < 0) { Tcl_Panic("Buffer Underflow, BUFFER_PADDING not enough"); } - nextPtr->nextRemoved -= srcLen; + nextPtr->nextRemoved1 -= srcLen; memcpy(RemovePoint(nextPtr), src, srcLen); RecycleBuffer(statePtr, bufPtr, 0); statePtr->inQueueHead = nextPtr; @@ -6427,7 +6427,7 @@ ReadChars( statePtr->inputEncodingFlags &= ~TCL_ENCODING_START; consume: - bufPtr->nextRemoved += srcRead; + bufPtr->nextRemoved1 += srcRead; /* * If this read contained multibyte characters, revise factorPtr so @@ -6681,7 +6681,7 @@ Tcl_Ungets( bufPtr = AllocChannelBuffer(len); memcpy(InsertPoint(bufPtr), str, len); - bufPtr->nextAdded += len; + bufPtr->nextAdded1 += len; if (statePtr->inQueueHead == NULL) { bufPtr->nextPtr = NULL; @@ -6936,7 +6936,7 @@ GetInput( result = Tcl_GetErrno(); } else { result = 0; - bufPtr->nextAdded += nread; + bufPtr->nextAdded1 += nread; } ReleaseChannelBuffer(bufPtr); @@ -9406,9 +9406,9 @@ MBWrite( bufPtr = AllocChannelBuffer(extra); - tail->nextAdded -= extra; + tail->nextAdded1 -= extra; memcpy(InsertPoint(bufPtr), InsertPoint(tail), extra); - bufPtr->nextAdded += extra; + bufPtr->nextAdded1 += extra; bufPtr->nextPtr = tail->nextPtr; tail->nextPtr = NULL; inBytes = csPtr->toRead; @@ -9927,7 +9927,7 @@ DoRead( TranslateInputEOL(statePtr, p, RemovePoint(bufPtr), &bytesWritten, &bytesRead); - bufPtr->nextRemoved += bytesRead; + bufPtr->nextRemoved1 += bytesRead; p += bytesWritten; bytesToRead -= bytesWritten; @@ -9972,7 +9972,7 @@ DoRead( *p++ = '\r'; bytesToRead--; - bufPtr->nextRemoved++; + bufPtr->nextRemoved1++; } else if (statePtr->flags & CHANNEL_BLOCKED) { /* * ...and we cannot get more now. @@ -9996,9 +9996,9 @@ DoRead( ChannelBuffer *nextPtr = bufPtr->nextPtr; - nextPtr->nextRemoved -= 1; + nextPtr->nextRemoved1 -= 1; RemovePoint(nextPtr)[0] = '\r'; - bufPtr->nextRemoved++; + bufPtr->nextRemoved1++; } } diff --git a/generic/tclIO.h b/generic/tclIO.h index 8f9d721..64e8ca5 100644 --- a/generic/tclIO.h +++ b/generic/tclIO.h @@ -37,9 +37,9 @@ typedef struct ChannelBuffer { size_t refCount; /* Current uses count */ - int nextAdded; /* The next position into which a character + size_t nextAdded1; /* The next position into which a character * will be put in the buffer. */ - int nextRemoved; /* Position of next byte to be removed from + size_t nextRemoved1; /* Position of next byte to be removed from * the buffer. */ size_t bufLength; /* How big is the buffer? */ struct ChannelBuffer *nextPtr; diff --git a/generic/tclInt.h b/generic/tclInt.h index 99f80c2..964822a 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -3161,7 +3161,7 @@ MODULE_SCOPE void TclSetProcessGlobalValue(ProcessGlobalValue *pgvPtr, Tcl_Obj *newValue, Tcl_Encoding encoding); MODULE_SCOPE void TclSignalExitThread(Tcl_ThreadId id, int result); MODULE_SCOPE void TclSpellFix(Tcl_Interp *interp, - Tcl_Obj *const *objv, int objc, size_t subIdx, + Tcl_Obj *const *objv, size_t objc, size_t subIdx, Tcl_Obj *bad, Tcl_Obj *fix); MODULE_SCOPE void * TclStackRealloc(Tcl_Interp *interp, void *ptr, size_t numBytes); diff --git a/generic/tclLoad.c b/generic/tclLoad.c index 8fc10ac..23372d9 100644 --- a/generic/tclLoad.c +++ b/generic/tclLoad.c @@ -536,7 +536,7 @@ Tcl_LoadObjCmd( * * Tcl_UnloadObjCmd -- * - * This function is invoked to process the "unload" Tcl command. See the + * Implements the the "unload" Tcl command. See the * user documentation for details on what it does. * * Results: @@ -754,6 +754,23 @@ Tcl_UnloadObjCmd( return code; } + +/* + *---------------------------------------------------------------------- + * + * UnloadLibrary -- + * + * Unloads a library from an interpreter, and also from the process if it + * is unloadable, i.e. if it provides an "unload" function. + * + * Results: + * A standard Tcl result. + * + * Side effects: + * See description. + * + *---------------------------------------------------------------------- + */ static int UnloadLibrary( Tcl_Interp *interp, @@ -874,11 +891,9 @@ UnloadLibrary( } /* - * The unload function executed fine. Examine the reference count to see - * if we unload the DLL. + * The unload function was called succesfully. */ - Tcl_MutexLock(&libraryMutex); if (Tcl_IsSafe(target)) { libraryPtr->safeInterpRefCount--; @@ -907,7 +922,7 @@ UnloadLibrary( code = TCL_OK; if (libraryPtr->safeInterpRefCount <= 0 && libraryPtr->interpRefCount <= 0 - && !keepLibrary) { + && (unloadProc != NULL) && !keepLibrary) { /* * Unload the shared library from the application memory... */ diff --git a/generic/tclStringRep.h b/generic/tclStringRep.h index fdbe119..425f08c 100644 --- a/generic/tclStringRep.h +++ b/generic/tclStringRep.h @@ -69,7 +69,7 @@ typedef struct { } String; #define STRING_SIZE(numChars) \ - (offsetof(String, unicode) + (((numChars) + 1U) * sizeof(Tcl_UniChar))) + (offsetof(String, unicode) + sizeof(Tcl_UniChar) + ((numChars) * sizeof(Tcl_UniChar))) #define stringAttemptAlloc(numChars) \ (String *) Tcl_AttemptAlloc(STRING_SIZE(numChars)) #define stringAlloc(numChars) \ diff --git a/library/tzdata/America/Punta_Arenas b/library/tzdata/America/Punta_Arenas index 5e8202a..959a0c1 100644 --- a/library/tzdata/America/Punta_Arenas +++ b/library/tzdata/America/Punta_Arenas @@ -2,12 +2,12 @@ set TZData(:America/Punta_Arenas) { {-9223372036854775808 -17020 0 LMT} - {-2524504580 -16966 0 SMT} - {-1892661434 -18000 0 -05} - {-1688410800 -16966 0 SMT} - {-1619205434 -14400 0 -04} - {-1593806400 -16966 0 SMT} - {-1335986234 -18000 0 -05} + {-2524504580 -16965 0 SMT} + {-1892661435 -18000 0 -05} + {-1688410800 -16965 0 SMT} + {-1619205435 -14400 0 -04} + {-1593806400 -16965 0 SMT} + {-1335986235 -18000 0 -05} {-1335985200 -14400 1 -05} {-1317585600 -18000 0 -05} {-1304362800 -14400 1 -05} diff --git a/library/tzdata/America/Santiago b/library/tzdata/America/Santiago index 55212b9..801d3f2 100644 --- a/library/tzdata/America/Santiago +++ b/library/tzdata/America/Santiago @@ -1,13 +1,13 @@ # created by tools/tclZIC.tcl - do not edit set TZData(:America/Santiago) { - {-9223372036854775808 -16966 0 LMT} - {-2524504634 -16966 0 SMT} - {-1892661434 -18000 0 -05} - {-1688410800 -16966 0 SMT} - {-1619205434 -14400 0 -04} - {-1593806400 -16966 0 SMT} - {-1335986234 -18000 0 -05} + {-9223372036854775808 -16965 0 LMT} + {-2524504635 -16965 0 SMT} + {-1892661435 -18000 0 -05} + {-1688410800 -16965 0 SMT} + {-1619205435 -14400 0 -04} + {-1593806400 -16965 0 SMT} + {-1335986235 -18000 0 -05} {-1335985200 -14400 1 -05} {-1317585600 -18000 0 -05} {-1304362800 -14400 1 -05} diff --git a/library/tzdata/Asia/Gaza b/library/tzdata/Asia/Gaza index 86282fa..e819d87 100644 --- a/library/tzdata/Asia/Gaza +++ b/library/tzdata/Asia/Gaza @@ -125,160 +125,160 @@ set TZData(:Asia/Gaza) { {1603490400 7200 0 EET} {1616796000 10800 1 EEST} {1635458400 7200 0 EET} - {1648245600 10800 1 EEST} + {1648332000 10800 1 EEST} {1666908000 7200 0 EET} - {1679695200 10800 1 EEST} + {1679781600 10800 1 EEST} {1698357600 7200 0 EET} - {1711749600 10800 1 EEST} + {1711836000 10800 1 EEST} {1729807200 7200 0 EET} - {1743199200 10800 1 EEST} - {1761861600 7200 0 EET} - {1774648800 10800 1 EEST} - {1793311200 7200 0 EET} - {1806098400 10800 1 EEST} + {1743285600 10800 1 EEST} + {1761256800 7200 0 EET} + {1774735200 10800 1 EEST} + {1792706400 7200 0 EET} + {1806184800 10800 1 EEST} {1824760800 7200 0 EET} - {1837548000 10800 1 EEST} + {1837634400 10800 1 EEST} {1856210400 7200 0 EET} - {1868997600 10800 1 EEST} + {1869084000 10800 1 EEST} {1887660000 7200 0 EET} - {1901052000 10800 1 EEST} + {1901138400 10800 1 EEST} {1919109600 7200 0 EET} - {1932501600 10800 1 EEST} - {1951164000 7200 0 EET} - {1963951200 10800 1 EEST} + {1932588000 10800 1 EEST} + {1950559200 7200 0 EET} + {1964037600 10800 1 EEST} {1982613600 7200 0 EET} - {1995400800 10800 1 EEST} + {1995487200 10800 1 EEST} {2014063200 7200 0 EET} - {2026850400 10800 1 EEST} + {2026936800 10800 1 EEST} {2045512800 7200 0 EET} - {2058300000 10800 1 EEST} + {2058386400 10800 1 EEST} {2076962400 7200 0 EET} - {2090354400 10800 1 EEST} - {2109016800 7200 0 EET} - {2121804000 10800 1 EEST} - {2140466400 7200 0 EET} - {2153253600 10800 1 EEST} + {2090440800 10800 1 EEST} + {2108412000 7200 0 EET} + {2121890400 10800 1 EEST} + {2139861600 7200 0 EET} + {2153340000 10800 1 EEST} {2171916000 7200 0 EET} - {2184703200 10800 1 EEST} + {2184789600 10800 1 EEST} {2203365600 7200 0 EET} - {2216152800 10800 1 EEST} + {2216239200 10800 1 EEST} {2234815200 7200 0 EET} - {2248207200 10800 1 EEST} + {2248293600 10800 1 EEST} {2266264800 7200 0 EET} - {2279656800 10800 1 EEST} - {2298319200 7200 0 EET} - {2311106400 10800 1 EEST} - {2329768800 7200 0 EET} - {2342556000 10800 1 EEST} + {2279743200 10800 1 EEST} + {2297714400 7200 0 EET} + {2311192800 10800 1 EEST} + {2329164000 7200 0 EET} + {2342642400 10800 1 EEST} {2361218400 7200 0 EET} - {2374005600 10800 1 EEST} + {2374092000 10800 1 EEST} {2392668000 7200 0 EET} - {2405455200 10800 1 EEST} + {2405541600 10800 1 EEST} {2424117600 7200 0 EET} - {2437509600 10800 1 EEST} + {2437596000 10800 1 EEST} {2455567200 7200 0 EET} - {2468959200 10800 1 EEST} - {2487621600 7200 0 EET} - {2500408800 10800 1 EEST} + {2469045600 10800 1 EEST} + {2487016800 7200 0 EET} + {2500495200 10800 1 EEST} {2519071200 7200 0 EET} - {2531858400 10800 1 EEST} + {2531944800 10800 1 EEST} {2550520800 7200 0 EET} - {2563308000 10800 1 EEST} + {2563394400 10800 1 EEST} {2581970400 7200 0 EET} - {2595362400 10800 1 EEST} + {2595448800 10800 1 EEST} {2613420000 7200 0 EET} - {2626812000 10800 1 EEST} - {2645474400 7200 0 EET} - {2658261600 10800 1 EEST} - {2676924000 7200 0 EET} - {2689711200 10800 1 EEST} + {2626898400 10800 1 EEST} + {2644869600 7200 0 EET} + {2658348000 10800 1 EEST} + {2676319200 7200 0 EET} + {2689797600 10800 1 EEST} {2708373600 7200 0 EET} - {2721160800 10800 1 EEST} + {2721247200 10800 1 EEST} {2739823200 7200 0 EET} - {2752610400 10800 1 EEST} + {2752696800 10800 1 EEST} {2771272800 7200 0 EET} - {2784664800 10800 1 EEST} + {2784751200 10800 1 EEST} {2802722400 7200 0 EET} - {2816114400 10800 1 EEST} - {2834776800 7200 0 EET} - {2847564000 10800 1 EEST} + {2816200800 10800 1 EEST} + {2834172000 7200 0 EET} + {2847650400 10800 1 EEST} {2866226400 7200 0 EET} - {2879013600 10800 1 EEST} + {2879100000 10800 1 EEST} {2897676000 7200 0 EET} - {2910463200 10800 1 EEST} + {2910549600 10800 1 EEST} {2929125600 7200 0 EET} - {2941912800 10800 1 EEST} + {2941999200 10800 1 EEST} {2960575200 7200 0 EET} - {2973967200 10800 1 EEST} - {2992629600 7200 0 EET} - {3005416800 10800 1 EEST} - {3024079200 7200 0 EET} - {3036866400 10800 1 EEST} + {2974053600 10800 1 EEST} + {2992024800 7200 0 EET} + {3005503200 10800 1 EEST} + {3023474400 7200 0 EET} + {3036952800 10800 1 EEST} {3055528800 7200 0 EET} - {3068316000 10800 1 EEST} + {3068402400 10800 1 EEST} {3086978400 7200 0 EET} - {3099765600 10800 1 EEST} + {3099852000 10800 1 EEST} {3118428000 7200 0 EET} - {3131820000 10800 1 EEST} + {3131906400 10800 1 EEST} {3149877600 7200 0 EET} - {3163269600 10800 1 EEST} - {3181932000 7200 0 EET} - {3194719200 10800 1 EEST} - {3213381600 7200 0 EET} - {3226168800 10800 1 EEST} + {3163356000 10800 1 EEST} + {3181327200 7200 0 EET} + {3194805600 10800 1 EEST} + {3212776800 7200 0 EET} + {3226255200 10800 1 EEST} {3244831200 7200 0 EET} - {3257618400 10800 1 EEST} + {3257704800 10800 1 EEST} {3276280800 7200 0 EET} - {3289068000 10800 1 EEST} + {3289154400 10800 1 EEST} {3307730400 7200 0 EET} - {3321122400 10800 1 EEST} + {3321208800 10800 1 EEST} {3339180000 7200 0 EET} - {3352572000 10800 1 EEST} - {3371234400 7200 0 EET} - {3384021600 10800 1 EEST} + {3352658400 10800 1 EEST} + {3370629600 7200 0 EET} + {3384108000 10800 1 EEST} {3402684000 7200 0 EET} - {3415471200 10800 1 EEST} + {3415557600 10800 1 EEST} {3434133600 7200 0 EET} - {3446920800 10800 1 EEST} + {3447007200 10800 1 EEST} {3465583200 7200 0 EET} - {3478975200 10800 1 EEST} + {3479061600 10800 1 EEST} {3497032800 7200 0 EET} - {3510424800 10800 1 EEST} - {3529087200 7200 0 EET} - {3541874400 10800 1 EEST} - {3560536800 7200 0 EET} - {3573324000 10800 1 EEST} + {3510511200 10800 1 EEST} + {3528482400 7200 0 EET} + {3541960800 10800 1 EEST} + {3559932000 7200 0 EET} + {3573410400 10800 1 EEST} {3591986400 7200 0 EET} - {3604773600 10800 1 EEST} + {3604860000 10800 1 EEST} {3623436000 7200 0 EET} - {3636223200 10800 1 EEST} + {3636309600 10800 1 EEST} {3654885600 7200 0 EET} - {3668277600 10800 1 EEST} + {3668364000 10800 1 EEST} {3686335200 7200 0 EET} - {3699727200 10800 1 EEST} - {3718389600 7200 0 EET} - {3731176800 10800 1 EEST} + {3699813600 10800 1 EEST} + {3717784800 7200 0 EET} + {3731263200 10800 1 EEST} {3749839200 7200 0 EET} - {3762626400 10800 1 EEST} + {3762712800 10800 1 EEST} {3781288800 7200 0 EET} - {3794076000 10800 1 EEST} + {3794162400 10800 1 EEST} {3812738400 7200 0 EET} - {3825525600 10800 1 EEST} + {3825612000 10800 1 EEST} {3844188000 7200 0 EET} - {3857580000 10800 1 EEST} - {3876242400 7200 0 EET} - {3889029600 10800 1 EEST} - {3907692000 7200 0 EET} - {3920479200 10800 1 EEST} + {3857666400 10800 1 EEST} + {3875637600 7200 0 EET} + {3889116000 10800 1 EEST} + {3907087200 7200 0 EET} + {3920565600 10800 1 EEST} {3939141600 7200 0 EET} - {3951928800 10800 1 EEST} + {3952015200 10800 1 EEST} {3970591200 7200 0 EET} - {3983378400 10800 1 EEST} + {3983464800 10800 1 EEST} {4002040800 7200 0 EET} - {4015432800 10800 1 EEST} + {4015519200 10800 1 EEST} {4033490400 7200 0 EET} - {4046882400 10800 1 EEST} - {4065544800 7200 0 EET} - {4078332000 10800 1 EEST} - {4096994400 7200 0 EET} + {4046968800 10800 1 EEST} + {4064940000 7200 0 EET} + {4078418400 10800 1 EEST} + {4096389600 7200 0 EET} } diff --git a/library/tzdata/Asia/Hebron b/library/tzdata/Asia/Hebron index 7559347..b484c6f 100644 --- a/library/tzdata/Asia/Hebron +++ b/library/tzdata/Asia/Hebron @@ -124,160 +124,160 @@ set TZData(:Asia/Hebron) { {1603490400 7200 0 EET} {1616796000 10800 1 EEST} {1635458400 7200 0 EET} - {1648245600 10800 1 EEST} + {1648332000 10800 1 EEST} {1666908000 7200 0 EET} - {1679695200 10800 1 EEST} + {1679781600 10800 1 EEST} {1698357600 7200 0 EET} - {1711749600 10800 1 EEST} + {1711836000 10800 1 EEST} {1729807200 7200 0 EET} - {1743199200 10800 1 EEST} - {1761861600 7200 0 EET} - {1774648800 10800 1 EEST} - {1793311200 7200 0 EET} - {1806098400 10800 1 EEST} + {1743285600 10800 1 EEST} + {1761256800 7200 0 EET} + {1774735200 10800 1 EEST} + {1792706400 7200 0 EET} + {1806184800 10800 1 EEST} {1824760800 7200 0 EET} - {1837548000 10800 1 EEST} + {1837634400 10800 1 EEST} {1856210400 7200 0 EET} - {1868997600 10800 1 EEST} + {1869084000 10800 1 EEST} {1887660000 7200 0 EET} - {1901052000 10800 1 EEST} + {1901138400 10800 1 EEST} {1919109600 7200 0 EET} - {1932501600 10800 1 EEST} - {1951164000 7200 0 EET} - {1963951200 10800 1 EEST} + {1932588000 10800 1 EEST} + {1950559200 7200 0 EET} + {1964037600 10800 1 EEST} {1982613600 7200 0 EET} - {1995400800 10800 1 EEST} + {1995487200 10800 1 EEST} {2014063200 7200 0 EET} - {2026850400 10800 1 EEST} + {2026936800 10800 1 EEST} {2045512800 7200 0 EET} - {2058300000 10800 1 EEST} + {2058386400 10800 1 EEST} {2076962400 7200 0 EET} - {2090354400 10800 1 EEST} - {2109016800 7200 0 EET} - {2121804000 10800 1 EEST} - {2140466400 7200 0 EET} - {2153253600 10800 1 EEST} + {2090440800 10800 1 EEST} + {2108412000 7200 0 EET} + {2121890400 10800 1 EEST} + {2139861600 7200 0 EET} + {2153340000 10800 1 EEST} {2171916000 7200 0 EET} - {2184703200 10800 1 EEST} + {2184789600 10800 1 EEST} {2203365600 7200 0 EET} - {2216152800 10800 1 EEST} + {2216239200 10800 1 EEST} {2234815200 7200 0 EET} - {2248207200 10800 1 EEST} + {2248293600 10800 1 EEST} {2266264800 7200 0 EET} - {2279656800 10800 1 EEST} - {2298319200 7200 0 EET} - {2311106400 10800 1 EEST} - {2329768800 7200 0 EET} - {2342556000 10800 1 EEST} + {2279743200 10800 1 EEST} + {2297714400 7200 0 EET} + {2311192800 10800 1 EEST} + {2329164000 7200 0 EET} + {2342642400 10800 1 EEST} {2361218400 7200 0 EET} - {2374005600 10800 1 EEST} + {2374092000 10800 1 EEST} {2392668000 7200 0 EET} - {2405455200 10800 1 EEST} + {2405541600 10800 1 EEST} {2424117600 7200 0 EET} - {2437509600 10800 1 EEST} + {2437596000 10800 1 EEST} {2455567200 7200 0 EET} - {2468959200 10800 1 EEST} - {2487621600 7200 0 EET} - {2500408800 10800 1 EEST} + {2469045600 10800 1 EEST} + {2487016800 7200 0 EET} + {2500495200 10800 1 EEST} {2519071200 7200 0 EET} - {2531858400 10800 1 EEST} + {2531944800 10800 1 EEST} {2550520800 7200 0 EET} - {2563308000 10800 1 EEST} + {2563394400 10800 1 EEST} {2581970400 7200 0 EET} - {2595362400 10800 1 EEST} + {2595448800 10800 1 EEST} {2613420000 7200 0 EET} - {2626812000 10800 1 EEST} - {2645474400 7200 0 EET} - {2658261600 10800 1 EEST} - {2676924000 7200 0 EET} - {2689711200 10800 1 EEST} + {2626898400 10800 1 EEST} + {2644869600 7200 0 EET} + {2658348000 10800 1 EEST} + {2676319200 7200 0 EET} + {2689797600 10800 1 EEST} {2708373600 7200 0 EET} - {2721160800 10800 1 EEST} + {2721247200 10800 1 EEST} {2739823200 7200 0 EET} - {2752610400 10800 1 EEST} + {2752696800 10800 1 EEST} {2771272800 7200 0 EET} - {2784664800 10800 1 EEST} + {2784751200 10800 1 EEST} {2802722400 7200 0 EET} - {2816114400 10800 1 EEST} - {2834776800 7200 0 EET} - {2847564000 10800 1 EEST} + {2816200800 10800 1 EEST} + {2834172000 7200 0 EET} + {2847650400 10800 1 EEST} {2866226400 7200 0 EET} - {2879013600 10800 1 EEST} + {2879100000 10800 1 EEST} {2897676000 7200 0 EET} - {2910463200 10800 1 EEST} + {2910549600 10800 1 EEST} {2929125600 7200 0 EET} - {2941912800 10800 1 EEST} + {2941999200 10800 1 EEST} {2960575200 7200 0 EET} - {2973967200 10800 1 EEST} - {2992629600 7200 0 EET} - {3005416800 10800 1 EEST} - {3024079200 7200 0 EET} - {3036866400 10800 1 EEST} + {2974053600 10800 1 EEST} + {2992024800 7200 0 EET} + {3005503200 10800 1 EEST} + {3023474400 7200 0 EET} + {3036952800 10800 1 EEST} {3055528800 7200 0 EET} - {3068316000 10800 1 EEST} + {3068402400 10800 1 EEST} {3086978400 7200 0 EET} - {3099765600 10800 1 EEST} + {3099852000 10800 1 EEST} {3118428000 7200 0 EET} - {3131820000 10800 1 EEST} + {3131906400 10800 1 EEST} {3149877600 7200 0 EET} - {3163269600 10800 1 EEST} - {3181932000 7200 0 EET} - {3194719200 10800 1 EEST} - {3213381600 7200 0 EET} - {3226168800 10800 1 EEST} + {3163356000 10800 1 EEST} + {3181327200 7200 0 EET} + {3194805600 10800 1 EEST} + {3212776800 7200 0 EET} + {3226255200 10800 1 EEST} {3244831200 7200 0 EET} - {3257618400 10800 1 EEST} + {3257704800 10800 1 EEST} {3276280800 7200 0 EET} - {3289068000 10800 1 EEST} + {3289154400 10800 1 EEST} {3307730400 7200 0 EET} - {3321122400 10800 1 EEST} + {3321208800 10800 1 EEST} {3339180000 7200 0 EET} - {3352572000 10800 1 EEST} - {3371234400 7200 0 EET} - {3384021600 10800 1 EEST} + {3352658400 10800 1 EEST} + {3370629600 7200 0 EET} + {3384108000 10800 1 EEST} {3402684000 7200 0 EET} - {3415471200 10800 1 EEST} + {3415557600 10800 1 EEST} {3434133600 7200 0 EET} - {3446920800 10800 1 EEST} + {3447007200 10800 1 EEST} {3465583200 7200 0 EET} - {3478975200 10800 1 EEST} + {3479061600 10800 1 EEST} {3497032800 7200 0 EET} - {3510424800 10800 1 EEST} - {3529087200 7200 0 EET} - {3541874400 10800 1 EEST} - {3560536800 7200 0 EET} - {3573324000 10800 1 EEST} + {3510511200 10800 1 EEST} + {3528482400 7200 0 EET} + {3541960800 10800 1 EEST} + {3559932000 7200 0 EET} + {3573410400 10800 1 EEST} {3591986400 7200 0 EET} - {3604773600 10800 1 EEST} + {3604860000 10800 1 EEST} {3623436000 7200 0 EET} - {3636223200 10800 1 EEST} + {3636309600 10800 1 EEST} {3654885600 7200 0 EET} - {3668277600 10800 1 EEST} + {3668364000 10800 1 EEST} {3686335200 7200 0 EET} - {3699727200 10800 1 EEST} - {3718389600 7200 0 EET} - {3731176800 10800 1 EEST} + {3699813600 10800 1 EEST} + {3717784800 7200 0 EET} + {3731263200 10800 1 EEST} {3749839200 7200 0 EET} - {3762626400 10800 1 EEST} + {3762712800 10800 1 EEST} {3781288800 7200 0 EET} - {3794076000 10800 1 EEST} + {3794162400 10800 1 EEST} {3812738400 7200 0 EET} - {3825525600 10800 1 EEST} + {3825612000 10800 1 EEST} {3844188000 7200 0 EET} - {3857580000 10800 1 EEST} - {3876242400 7200 0 EET} - {3889029600 10800 1 EEST} - {3907692000 7200 0 EET} - {3920479200 10800 1 EEST} + {3857666400 10800 1 EEST} + {3875637600 7200 0 EET} + {3889116000 10800 1 EEST} + {3907087200 7200 0 EET} + {3920565600 10800 1 EEST} {3939141600 7200 0 EET} - {3951928800 10800 1 EEST} + {3952015200 10800 1 EEST} {3970591200 7200 0 EET} - {3983378400 10800 1 EEST} + {3983464800 10800 1 EEST} {4002040800 7200 0 EET} - {4015432800 10800 1 EEST} + {4015519200 10800 1 EEST} {4033490400 7200 0 EET} - {4046882400 10800 1 EEST} - {4065544800 7200 0 EET} - {4078332000 10800 1 EEST} - {4096994400 7200 0 EET} + {4046968800 10800 1 EEST} + {4064940000 7200 0 EET} + {4078418400 10800 1 EEST} + {4096389600 7200 0 EET} } diff --git a/library/tzdata/Europe/Kiev b/library/tzdata/Europe/Kiev index 55015fa..8da7061 100644 --- a/library/tzdata/Europe/Kiev +++ b/library/tzdata/Europe/Kiev @@ -31,16 +31,16 @@ set TZData(:Europe/Kiev) { {638319600 14400 1 MSD} {646786800 10800 1 EEST} {686102400 7200 0 EET} - {701820000 10800 1 EEST} - {717541200 7200 0 EET} - {733269600 10800 1 EEST} - {748990800 7200 0 EET} - {764719200 10800 1 EEST} - {780440400 7200 0 EET} - {788911200 7200 0 EET} - {796179600 10800 1 EEST} - {811904400 7200 0 EET} - {828234000 10800 1 EEST} + {701827200 10800 1 EEST} + {717552000 7200 0 EET} + {733276800 10800 1 EEST} + {749001600 7200 0 EET} + {764726400 10800 1 EEST} + {780451200 7200 0 EET} + {796176000 10800 1 EEST} + {811900800 7200 0 EET} + {828230400 10800 1 EEST} + {831938400 10800 0 EEST} {846378000 7200 0 EET} {859683600 10800 1 EEST} {877827600 7200 0 EET} diff --git a/library/tzdata/Europe/Simferopol b/library/tzdata/Europe/Simferopol index 3e4b60a..e296862 100644 --- a/library/tzdata/Europe/Simferopol +++ b/library/tzdata/Europe/Simferopol @@ -31,12 +31,12 @@ set TZData(:Europe/Simferopol) { {622594800 10800 0 MSK} {631141200 10800 0 MSK} {646786800 7200 0 EET} - {694216800 7200 0 EET} - {701820000 10800 1 EEST} - {717541200 7200 0 EET} - {733269600 10800 1 EEST} - {748990800 7200 0 EET} - {764719200 10800 1 EEST} + {701042400 7200 0 EET} + {701827200 10800 1 EEST} + {717552000 7200 0 EET} + {733276800 10800 1 EEST} + {749001600 7200 0 EET} + {764726400 10800 1 EEST} {767743200 14400 0 MSD} {780436800 10800 0 MSK} {796165200 14400 1 MSD} diff --git a/library/tzdata/Europe/Uzhgorod b/library/tzdata/Europe/Uzhgorod index f6e580b..0a058db 100644 --- a/library/tzdata/Europe/Uzhgorod +++ b/library/tzdata/Europe/Uzhgorod @@ -33,17 +33,17 @@ set TZData(:Europe/Uzhgorod) { {631141200 10800 0 MSK} {646786800 3600 0 CET} {670384800 7200 0 EET} - {694216800 7200 0 EET} - {701820000 10800 1 EEST} - {717541200 7200 0 EET} - {733269600 10800 1 EEST} - {748990800 7200 0 EET} - {764719200 10800 1 EEST} - {780440400 7200 0 EET} - {788911200 7200 0 EET} - {796179600 10800 1 EEST} - {811904400 7200 0 EET} - {828234000 10800 1 EEST} + {701042400 7200 0 EET} + {701827200 10800 1 EEST} + {717552000 7200 0 EET} + {733276800 10800 1 EEST} + {749001600 7200 0 EET} + {764726400 10800 1 EEST} + {780451200 7200 0 EET} + {796176000 10800 1 EEST} + {811900800 7200 0 EET} + {828230400 10800 1 EEST} + {831938400 10800 0 EEST} {846378000 7200 0 EET} {859683600 10800 1 EEST} {877827600 7200 0 EET} diff --git a/library/tzdata/Europe/Zaporozhye b/library/tzdata/Europe/Zaporozhye index 478a61c..8ae9604 100644 --- a/library/tzdata/Europe/Zaporozhye +++ b/library/tzdata/Europe/Zaporozhye @@ -32,16 +32,17 @@ set TZData(:Europe/Zaporozhye) { {654649200 10800 0 MSK} {670374000 10800 0 EEST} {686091600 7200 0 EET} - {701820000 10800 1 EEST} - {717541200 7200 0 EET} - {733269600 10800 1 EEST} - {748990800 7200 0 EET} - {764719200 10800 1 EEST} - {780440400 7200 0 EET} - {788911200 7200 0 EET} - {796179600 10800 1 EEST} - {811904400 7200 0 EET} - {828234000 10800 1 EEST} + {701042400 7200 0 EET} + {701827200 10800 1 EEST} + {717552000 7200 0 EET} + {733276800 10800 1 EEST} + {749001600 7200 0 EET} + {764726400 10800 1 EEST} + {780451200 7200 0 EET} + {796176000 10800 1 EEST} + {811900800 7200 0 EET} + {828230400 10800 1 EEST} + {831938400 10800 0 EEST} {846378000 7200 0 EET} {859683600 10800 1 EEST} {877827600 7200 0 EET} diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test index ad5c68c..390154a 100644 --- a/tests/pkgMkIndex.test +++ b/tests/pkgMkIndex.test @@ -591,7 +591,7 @@ test pkgMkIndex-10.2 {package in DLL hidden by -load} [list exec $dll] { "[list pkg_mkIndex -lazy -load Pkg* $fullPkgPath [file tail $x]]" exec [interpreter] << $script pkgtest::runCreatedIndex {0 {}} -lazy -load Pkg* -- $fullPkgPath pkga[info sharedlibextension] -} "0 {{pkga:1.0 {tclPkgSetup {tcl9pkga[info sharedlibextension] load {pkga_eq pkga_quote}}}}}" +} "0 {}" if {[testConstraint $dll]} { file delete -force [file join $fullPkgPath [file tail $x]] diff --git a/tools/tclZIC.tcl b/tools/tclZIC.tcl index b04669e..b3dd667 100755 --- a/tools/tclZIC.tcl +++ b/tools/tclZIC.tcl @@ -3,14 +3,14 @@ # tclZIC.tcl -- # # Take the time zone data source files from Arthur Olson's -# repository at elsie.nci.nih.gov, and prepare time zone +# repository at https://www.iana.org/time-zones, and prepare time zone # information files for Tcl. # # Usage: # tclsh tclZIC.tcl inputDir outputDir # # Parameters: -# inputDir - Directory (e.g., tzdata2003e) where Olson's source +# inputDir - Directory (e.g., tzdata2022a) where Olson's source # files are to be found. # outputDir - Directory (e.g., ../library/tzdata) where # the time zone information files are to be placed. |