Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merge 8.6 |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | core-8-branch |
Files: | files | file ages | folders |
SHA3-256: |
95cc4a3738d249cc7464dfa732e1bbd6 |
User & Date: | jan.nijtmans 2024-04-19 12:36:57 |
Context
2024-04-19
| ||
19:45 | Merge 8.6 check-in: fe28cb7ea9 user: jan.nijtmans tags: core-8-branch | |
13:23 | Merge 8.7 check-in: 41ac78bd66 user: jan.nijtmans tags: trunk, main | |
12:36 | Merge 8.6 check-in: 95cc4a3738 user: jan.nijtmans tags: core-8-branch | |
11:49 | Reserve 2 more stub entries for TIP #648 check-in: 926f8b18c9 user: jan.nijtmans tags: core-8-6-branch | |
08:15 | More indenting check-in: 9a45160d30 user: jan.nijtmans tags: core-8-branch | |
Changes
Changes to generic/tcl.decls.
︙ | ︙ | |||
2504 2505 2506 2507 2508 2509 2510 | } declare 687 { int TclUtfNcasecmp(const char *s1, const char *s2, size_t n) } # ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- # | | | 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 | } declare 687 { int TclUtfNcasecmp(const char *s1, const char *s2, size_t n) } # ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- # declare 690 { void TclUnusedStubEntry(void) } ############################################################################## # Define the platform specific public Tcl interface. These functions are only # available on the designated platform. |
︙ | ︙ |
Changes to generic/tclDecls.h.
︙ | ︙ | |||
2014 2015 2016 2017 2018 2019 2020 | /* 685 */ EXTERN Tcl_Obj * Tcl_DStringToObj(Tcl_DString *dsPtr); /* 686 */ EXTERN int TclUtfNcmp(const char *s1, const char *s2, size_t n); /* 687 */ EXTERN int TclUtfNcasecmp(const char *s1, const char *s2, size_t n); | > > | | 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 | /* 685 */ EXTERN Tcl_Obj * Tcl_DStringToObj(Tcl_DString *dsPtr); /* 686 */ EXTERN int TclUtfNcmp(const char *s1, const char *s2, size_t n); /* 687 */ EXTERN int TclUtfNcasecmp(const char *s1, const char *s2, size_t n); /* Slot 688 is reserved */ /* Slot 689 is reserved */ /* 690 */ EXTERN void TclUnusedStubEntry(void); typedef struct { const struct TclPlatStubs *tclPlatStubs; const struct TclIntStubs *tclIntStubs; const struct TclIntPlatStubs *tclIntPlatStubs; } TclStubHooks; |
︙ | ︙ | |||
2739 2740 2741 2742 2743 2744 2745 | int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, Tcl_Size numBytes, void **clientDataPtr, int *typePtr); /* 681 */ int (*tcl_RemoveChannelMode) (Tcl_Interp *interp, Tcl_Channel chan, int mode); /* 682 */ Tcl_Size (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */ int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 684 */ Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 685 */ int (*tclUtfNcmp) (const char *s1, const char *s2, size_t n); /* 686 */ int (*tclUtfNcasecmp) (const char *s1, const char *s2, size_t n); /* 687 */ | > > | | 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 | int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, Tcl_Size numBytes, void **clientDataPtr, int *typePtr); /* 681 */ int (*tcl_RemoveChannelMode) (Tcl_Interp *interp, Tcl_Channel chan, int mode); /* 682 */ Tcl_Size (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */ int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 684 */ Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 685 */ int (*tclUtfNcmp) (const char *s1, const char *s2, size_t n); /* 686 */ int (*tclUtfNcasecmp) (const char *s1, const char *s2, size_t n); /* 687 */ void (*reserved688)(void); void (*reserved689)(void); void (*tclUnusedStubEntry) (void); /* 690 */ } TclStubs; extern const TclStubs *tclStubsPtr; #ifdef __cplusplus } #endif |
︙ | ︙ | |||
4130 4131 4132 4133 4134 4135 4136 4137 | (tclStubsPtr->tcl_GetWideUIntFromObj) /* 684 */ #define Tcl_DStringToObj \ (tclStubsPtr->tcl_DStringToObj) /* 685 */ #define TclUtfNcmp \ (tclStubsPtr->tclUtfNcmp) /* 686 */ #define TclUtfNcasecmp \ (tclStubsPtr->tclUtfNcasecmp) /* 687 */ #define TclUnusedStubEntry \ | > > | | 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 | (tclStubsPtr->tcl_GetWideUIntFromObj) /* 684 */ #define Tcl_DStringToObj \ (tclStubsPtr->tcl_DStringToObj) /* 685 */ #define TclUtfNcmp \ (tclStubsPtr->tclUtfNcmp) /* 686 */ #define TclUtfNcasecmp \ (tclStubsPtr->tclUtfNcasecmp) /* 687 */ /* Slot 688 is reserved */ /* Slot 689 is reserved */ #define TclUnusedStubEntry \ (tclStubsPtr->tclUnusedStubEntry) /* 690 */ #endif /* defined(USE_TCL_STUBS) */ /* !END!: Do not edit above this line. */ #undef TclUnusedStubEntry |
︙ | ︙ |
Changes to generic/tclIO.c.
︙ | ︙ | |||
5040 5041 5042 5043 5044 5045 5046 | /* * Update the notifier state so we don't block while there is still data * in the buffers. */ done: assert(!GotFlag(statePtr, CHANNEL_EOF) | | < | 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 | /* * Update the notifier state so we don't block while there is still data * in the buffers. */ done: assert(!GotFlag(statePtr, CHANNEL_EOF) || GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR) || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0); assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED) == (CHANNEL_EOF|CHANNEL_BLOCKED))); /* * Regenerate the top channel, in case it was changed due to * self-modifying reflected transforms. |
︙ | ︙ | |||
6169 6170 6171 6172 6173 6174 6175 | /* * Update the notifier state so we don't block while there is still data * in the buffers. */ assert(!GotFlag(statePtr, CHANNEL_EOF) | | < | 6168 6169 6170 6171 6172 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 | /* * Update the notifier state so we don't block while there is still data * in the buffers. */ assert(!GotFlag(statePtr, CHANNEL_EOF) || GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR) || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0); assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED) == (CHANNEL_EOF|CHANNEL_BLOCKED))); UpdateInterest(chanPtr); /* This must comes after UpdateInterest(), which may set errno */ if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR) |
︙ | ︙ | |||
10402 10403 10404 10405 10406 10407 10408 | } } if (bytesToRead == 0) { ResetFlag(statePtr, CHANNEL_BLOCKED); } assert(!GotFlag(statePtr, CHANNEL_EOF) | | < | 10400 10401 10402 10403 10404 10405 10406 10407 10408 10409 10410 10411 10412 10413 10414 | } } if (bytesToRead == 0) { ResetFlag(statePtr, CHANNEL_BLOCKED); } assert(!GotFlag(statePtr, CHANNEL_EOF) || GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR) || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0); assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED) == (CHANNEL_EOF|CHANNEL_BLOCKED))); UpdateInterest(chanPtr); TclChannelRelease((Tcl_Channel)chanPtr); return (int)(p - dst); } |
︙ | ︙ |
Changes to generic/tclIORChan.c.
︙ | ︙ | |||
1620 1621 1622 1623 1624 1625 1626 | Tcl_IncrRefCount(baseObj); if (InvokeTclMethod(rcPtr, METH_SEEK, offObj, baseObj, &resObj)!=TCL_OK) { Tcl_SetChannelError(rcPtr->chan, resObj); goto invalid; } | | | 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 | Tcl_IncrRefCount(baseObj); if (InvokeTclMethod(rcPtr, METH_SEEK, offObj, baseObj, &resObj)!=TCL_OK) { Tcl_SetChannelError(rcPtr->chan, resObj); goto invalid; } if (TclGetWideIntFromObj(rcPtr->interp, resObj, &newLoc) != TCL_OK) { Tcl_SetChannelError(rcPtr->chan, MarshallError(rcPtr->interp)); goto invalid; } if (newLoc < 0) { SetChannelErrorStr(rcPtr->chan, msg_seek_beforestart); goto invalid; |
︙ | ︙ | |||
3232 3233 3234 3235 3236 3237 3238 | /* * Process a regular result. If the type is wrong this may change * into an error. */ Tcl_WideInt newLoc; | | | 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 | /* * Process a regular result. If the type is wrong this may change * into an error. */ Tcl_WideInt newLoc; if (TclGetWideIntFromObj(interp, resObj, &newLoc) == TCL_OK) { if (newLoc < 0) { ForwardSetStaticError(paramPtr, msg_seek_beforestart); paramPtr->seek.offset = -1; } else { paramPtr->seek.offset = newLoc; } } else { |
︙ | ︙ |
Changes to generic/tclStubInit.c.
︙ | ︙ | |||
1980 1981 1982 1983 1984 1985 1986 | Tcl_GetNumber, /* 681 */ Tcl_RemoveChannelMode, /* 682 */ Tcl_GetEncodingNulLength, /* 683 */ Tcl_GetWideUIntFromObj, /* 684 */ Tcl_DStringToObj, /* 685 */ TclUtfNcmp, /* 686 */ TclUtfNcasecmp, /* 687 */ | > > | | 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 | Tcl_GetNumber, /* 681 */ Tcl_RemoveChannelMode, /* 682 */ Tcl_GetEncodingNulLength, /* 683 */ Tcl_GetWideUIntFromObj, /* 684 */ Tcl_DStringToObj, /* 685 */ TclUtfNcmp, /* 686 */ TclUtfNcasecmp, /* 687 */ 0, /* 688 */ 0, /* 689 */ TclUnusedStubEntry, /* 690 */ }; /* !END!: Do not edit above this line. */ |