Merge 8.7. Add TclAppendUnicodeToObj() to internal stubs, since it is needed in tclTestObj.c

6 files changed, 50 insertions, 43 deletions

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 6f4a641..5b3688a 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -155,7 +155,7 @@ declare 35 {
 	    double *doublePtr)
 }
 # Removed in 9.0, replaced by macro.
-#declare 36 {deprecated {No longer in use, changed to macro}} {
+#declare 36 {
 #    int Tcl_GetIndexFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 #	    const char *const *tablePtr, const char *msg, int flags, int *indexPtr)
 #}
@@ -260,11 +260,11 @@ declare 65 {
     void Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes, size_t length)
 }
 # Removed in 9.0, replaced by macro.
-#declare 66 {deprecated {No longer in use, changed to macro}} {
+#declare 66 {
 #    void Tcl_AddErrorInfo(Tcl_Interp *interp, const char *message)
 #}
 # Removed in 9.0, replaced by macro.
-#declare 67 {deprecated {No longer in use, changed to macro}} {
+#declare 67 {
 #    void Tcl_AddObjErrorInfo(Tcl_Interp *interp, const char *message,
 #	    int length)
 #}
@@ -294,11 +294,11 @@ declare 75 {
     int Tcl_AsyncReady(void)
 }
 # Removed in 9.0
-#declare 76 {deprecated {No longer in use, changed to macro}} {
+#declare 76 {
 #    void Tcl_BackgroundError(Tcl_Interp *interp)
 #}
 # Removed in 9.0:
-#declare 77 {deprecated {Use Tcl_UtfBackslash}} {
+#declare 77 {
 #    char Tcl_Backslash(const char *src, int *readPtr)
 #}
 declare 78 {
@@ -366,7 +366,7 @@ declare 94 {
     Tcl_Interp *Tcl_CreateInterp(void)
 }
 # Removed in 9.0:
-#declare 95 {deprecated {}} {
+#declare 95 {
 #    void Tcl_CreateMathFunc(Tcl_Interp *interp, const char *name,
 #	    int numArgs, Tcl_ValueType *argTypes,
 #	    Tcl_MathProc *proc, void *clientData)
@@ -643,7 +643,7 @@ declare 173 {
 #    const char *Tcl_GetStringResult(Tcl_Interp *interp)
 #}
 # Removed in 9.0, replaced by macro.
-#declare 175 {deprecated {No longer in use, changed to macro}} {
+#declare 175 {
 #    const char *Tcl_GetVar(Tcl_Interp *interp, const char *varName,
 #	    int flags)
 #}
@@ -859,7 +859,7 @@ declare 236 {
     void Tcl_SetStdChannel(Tcl_Channel channel, int type)
 }
 # Removed in 9.0, replaced by macro.
-#declare 237 {deprecated {No longer in use, changed to macro}} {
+#declare 237 {
 #    const char *Tcl_SetVar(Tcl_Interp *interp, const char *varName,
 #	    const char *newValue, int flags)
 #}
@@ -898,7 +898,7 @@ declare 243 {
 #    int Tcl_TellOld(Tcl_Channel chan)
 #}
 # Removed in 9.0, replaced by macro.
-#declare 247 {deprecated {No longer in use, changed to macro}} {
+#declare 247 {
 #    int Tcl_TraceVar(Tcl_Interp *interp, const char *varName, int flags,
 #	    Tcl_VarTraceProc *proc, ClientData clientData)
 #}
@@ -920,7 +920,7 @@ declare 252 {
     int Tcl_UnregisterChannel(Tcl_Interp *interp, Tcl_Channel chan)
 }
 # Removed in 9.0, replaced by macro.
-#declare 253 {deprecated {No longer in use, changed to macro}} {
+#declare 253 {
 #    int Tcl_UnsetVar(Tcl_Interp *interp, const char *varName, int flags)
 #}
 declare 254 {
@@ -928,7 +928,7 @@ declare 254 {
 	    int flags)
 }
 # Removed in 9.0, replaced by macro.
-#declare 255 {deprecated {No longer in use, changed to macro}} {
+#declare 255 {
 #    void Tcl_UntraceVar(Tcl_Interp *interp, const char *varName, int flags,
 #	    Tcl_VarTraceProc *proc, ClientData clientData)
 #}
@@ -941,7 +941,7 @@ declare 257 {
     void Tcl_UpdateLinkedVar(Tcl_Interp *interp, const char *varName)
 }
 # Removed in 9.0, replaced by macro.
-#declare 258 {deprecated {No longer in use, changed to macro}} {
+#declare 258 {
 #    int Tcl_UpVar(Tcl_Interp *interp, const char *frameName,
 #	    const char *varName, const char *localName, int flags)
 #}
@@ -953,7 +953,7 @@ declare 260 {
     int Tcl_VarEval(Tcl_Interp *interp, ...)
 }
 # Removed in 9.0, replaced by macro.
-#declare 261 {deprecated {No longer in use, changed to macro}} {
+#declare 261 {
 #    ClientData Tcl_VarTraceInfo(Tcl_Interp *interp, const char *varName,
 #	    int flags, Tcl_VarTraceProc *procPtr, ClientData prevClientData)
 #}
@@ -991,7 +991,7 @@ declare 270 {
 	    const char **termPtr)
 }
 # Removed in 9.0, replaced by macro.
-#declare 271 {deprecated {No longer in use, changed to macro}} {
+#declare 271 {
 #    const char *Tcl_PkgPresent(Tcl_Interp *interp, const char *name,
 #	    const char *version, int exact)
 #}
@@ -1001,13 +1001,13 @@ declare 272 {
 	    void *clientDataPtr)
 }
 # Removed in 9.0, replaced by macro.
-#declare 273 {deprecated {No longer in use, changed to macro}} {
+#declare 273 {
 #    int Tcl_PkgProvide(Tcl_Interp *interp, const char *name,
 #	    const char *version)
 #}
 # TIP #268: The internally used new Require function is in slot 573.
 # Removed in 9.0, replaced by macro.
-#declare 274 {deprecated {No longer in use, changed to macro}} {
+#declare 274 {
 #    const char *Tcl_PkgRequire(Tcl_Interp *interp, const char *name,
 #	    const char *version, int exact)
 #}
@@ -1167,11 +1167,11 @@ declare 313 {
 	    size_t charsToRead, int appendFlag)
 }
 # Removed in 9.0, replaced by macro.
-#declare 314 {deprecated {No longer in use, changed to macro}} {
+#declare 314 {
 #    void Tcl_RestoreResult(Tcl_Interp *interp, Tcl_SavedResult *statePtr)
 #}
 # Removed in 9.0, replaced by macro.
-#declare 315 {deprecated {No longer in use, changed to macro}} {
+#declare 315 {
 #    void Tcl_SaveResult(Tcl_Interp *interp, Tcl_SavedResult *statePtr)
 #}
 declare 316 {
@@ -1256,11 +1256,11 @@ declare 340 {
     char *Tcl_GetString(Tcl_Obj *objPtr)
 }
 # Removed in 9.0:
-#declare 341 {deprecated {Use Tcl_GetEncodingSearchPath}} {
+#declare 341 {
 #    const char *Tcl_GetDefaultEncodingDir(void)
 #}
 # Removed in 9.0:
-#declare 342 {deprecated {Use Tcl_SetEncodingSearchPath}} {
+#declare 342 {
 #    void Tcl_SetDefaultEncodingDir(const char *path)
 #}
 declare 343 {
@@ -1295,7 +1295,7 @@ declare 351 {
 #    size_t Tcl_UniCharLen(const Tcl_UniChar *uniStr)
 #}
 # Removed in 9.0:
-#declare 353 {deprecated {Use Tcl_UtfNcmp}} {
+#declare 353 {
 #    int Tcl_UniCharNcmp(const Tcl_UniChar *ucs, const Tcl_UniChar *uct,
 #	    size_t numChars)
 #}
@@ -1312,7 +1312,7 @@ declare 356 {
 	    int flags)
 }
 # Removed in 9.0:
-#declare 357 {deprecated {Use Tcl_EvalTokensStandard}} {
+#declare 357 {
 #    Tcl_Obj *Tcl_EvalTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr,
 #	    int count)
 #}
@@ -1387,10 +1387,10 @@ declare 376 {
 declare 377 {
     void Tcl_RegExpGetInfo(Tcl_RegExp regexp, Tcl_RegExpInfo *infoPtr)
 }
-declare 378 {deprecated {Use Tcl_UniCharToUtfDString}} {
+declare 378 {
     Tcl_Obj *Tcl_NewUnicodeObj(const Tcl_UniChar *unicode, size_t numChars)
 }
-declare 379 {deprecated {Use Tcl_UniCharToUtfDString}} {
+declare 379 {
     void Tcl_SetUnicodeObj(Tcl_Obj *objPtr, const Tcl_UniChar *unicode,
 	    size_t numChars)
 }
@@ -1401,14 +1401,14 @@ declare 381 {
     int Tcl_GetUniChar(Tcl_Obj *objPtr, size_t index)
 }
 # Removed in 9.0, replaced by macro.
-#declare 382 {deprecated {No longer in use, changed to macro}} {
+#declare 382 {
 #    Tcl_UniChar *Tcl_GetUnicode(Tcl_Obj *objPtr)
 #}
 declare 383 {
     Tcl_Obj *Tcl_GetRange(Tcl_Obj *objPtr, size_t first, size_t last)
 }
-# Removed in 9.0, replaced by macro.
-#declare 384 {deprecated {Use Tcl_AppendStringsToObj}} {
+# Removed in 9.0
+#declare 384 {
 #    void Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr, const Tcl_UniChar *unicode,
 #	    size_t length)
 #}
@@ -1535,12 +1535,12 @@ declare 418 {
     int Tcl_IsChannelExisting(const char *channelName)
 }
 # Removed in 9.0:
-#declare 419 {deprecated {Use Tcl_UtfNcasecmp}} {
+#declare 419 {
 #    int Tcl_UniCharNcasecmp(const Tcl_UniChar *ucs, const Tcl_UniChar *uct,
 #	    size_t numChars)
 #}
 # Removed in 9.0:
-#declare 420 {deprecated {Use Tcl_StringCaseMatch}} {
+#declare 420 {
 #    int Tcl_UniCharCaseMatch(const Tcl_UniChar *uniStr,
 #	    const Tcl_UniChar *uniPattern, int nocase)
 #}
@@ -1596,19 +1596,19 @@ declare 433 {
 }
 
 # introduced in 8.4a3
-declare 434 {deprecated {Use Tcl_UtfToUniCharDString}} {
+declare 434 {
     Tcl_UniChar *Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr, int *lengthPtr)
 }
 
 # TIP#15 (math function introspection) dkf
 # Removed in 9.0:
-#declare 435 {deprecated {}} {
+#declare 435 {
 #    int Tcl_GetMathFuncInfo(Tcl_Interp *interp, const char *name,
 #	    int *numArgsPtr, Tcl_ValueType **argTypesPtr,
 #	    Tcl_MathProc **procPtr, void **clientDataPtr)
 #}
 # Removed in 9.0:
-#declare 436 {deprecated {}} {
+#declare 436 {
 #    Tcl_Obj *Tcl_ListMathFuncs(Tcl_Interp *interp, const char *pattern)
 #}
 
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index bdf56f3..bc2db64 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1013,12 +1013,10 @@ EXTERN int		Tcl_RegExpExecObj(Tcl_Interp *interp,
 EXTERN void		Tcl_RegExpGetInfo(Tcl_RegExp regexp,
 				Tcl_RegExpInfo *infoPtr);
 /* 378 */
-TCL_DEPRECATED("Use Tcl_UniCharToUtfDString")
-Tcl_Obj *		Tcl_NewUnicodeObj(const Tcl_UniChar *unicode,
+EXTERN Tcl_Obj *	Tcl_NewUnicodeObj(const Tcl_UniChar *unicode,
 				size_t numChars);
 /* 379 */
-TCL_DEPRECATED("Use Tcl_UniCharToUtfDString")
-void			Tcl_SetUnicodeObj(Tcl_Obj *objPtr,
+EXTERN void		Tcl_SetUnicodeObj(Tcl_Obj *objPtr,
 				const Tcl_UniChar *unicode, size_t numChars);
 /* 380 */
 EXTERN size_t		Tcl_GetCharLength(Tcl_Obj *objPtr);
@@ -1156,8 +1154,7 @@ EXTERN int		Tcl_AttemptSetObjLength(Tcl_Obj *objPtr,
 /* 433 */
 EXTERN Tcl_ThreadId	Tcl_GetChannelThread(Tcl_Channel channel);
 /* 434 */
-TCL_DEPRECATED("Use Tcl_UtfToUniCharDString")
-Tcl_UniChar *		Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr,
+EXTERN Tcl_UniChar *	Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr,
 				int *lengthPtr);
 /* Slot 435 is reserved */
 /* Slot 436 is reserved */
@@ -2174,8 +2171,8 @@ typedef struct TclStubs {
     int (*tcl_UniCharIsPunct) (int ch); /* 375 */
     int (*tcl_RegExpExecObj) (Tcl_Interp *interp, Tcl_RegExp regexp, Tcl_Obj *textObj, size_t offset, size_t nmatches, int flags); /* 376 */
     void (*tcl_RegExpGetInfo) (Tcl_RegExp regexp, Tcl_RegExpInfo *infoPtr); /* 377 */
-    TCL_DEPRECATED_API("Use Tcl_UniCharToUtfDString") Tcl_Obj * (*tcl_NewUnicodeObj) (const Tcl_UniChar *unicode, size_t numChars); /* 378 */
-    TCL_DEPRECATED_API("Use Tcl_UniCharToUtfDString") void (*tcl_SetUnicodeObj) (Tcl_Obj *objPtr, const Tcl_UniChar *unicode, size_t numChars); /* 379 */
+    Tcl_Obj * (*tcl_NewUnicodeObj) (const Tcl_UniChar *unicode, size_t numChars); /* 378 */
+    void (*tcl_SetUnicodeObj) (Tcl_Obj *objPtr, const Tcl_UniChar *unicode, size_t numChars); /* 379 */
     size_t (*tcl_GetCharLength) (Tcl_Obj *objPtr); /* 380 */
     int (*tcl_GetUniChar) (Tcl_Obj *objPtr, size_t index); /* 381 */
     void (*reserved382)(void);
@@ -2230,7 +2227,7 @@ typedef struct TclStubs {
     void * (*tcl_AttemptDbCkrealloc) (void *ptr, size_t size, const char *file, int line); /* 431 */
     int (*tcl_AttemptSetObjLength) (Tcl_Obj *objPtr, size_t length); /* 432 */
     Tcl_ThreadId (*tcl_GetChannelThread) (Tcl_Channel channel); /* 433 */
-    TCL_DEPRECATED_API("Use Tcl_UtfToUniCharDString") Tcl_UniChar * (*tcl_GetUnicodeFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 434 */
+    Tcl_UniChar * (*tcl_GetUnicodeFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 434 */
     void (*reserved435)(void);
     void (*reserved436)(void);
     Tcl_Obj * (*tcl_SubstObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 437 */
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 8b1b3a6..5477f5f 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -1065,6 +1065,11 @@ declare 258 {
     Tcl_Obj *TclpCreateTemporaryDirectory(Tcl_Obj *dirObj,
 	    Tcl_Obj *basenameObj)
 }
+# TIP 542
+declare 259 {
+    void TclAppendUnicodeToObj(Tcl_Obj *objPtr,
+	    const Tcl_UniChar *unicode, size_t length)
+}
 
 ##############################################################################
 
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 562e976..f483e36 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4057,8 +4057,6 @@ MODULE_SCOPE int	TclFullFinalizationRequested(void);
 MODULE_SCOPE size_t TclUniCharLen(const Tcl_UniChar *uniStr);
 MODULE_SCOPE int TclUniCharNcmp(const Tcl_UniChar *ucs,
 				const Tcl_UniChar *uct, size_t numChars);
-MODULE_SCOPE void TclAppendUnicodeToObj(Tcl_Obj *objPtr,
-				const Tcl_UniChar *unicode, size_t length);
 MODULE_SCOPE int TclUniCharNcasecmp(const Tcl_UniChar *ucs,
 				const Tcl_UniChar *uct, size_t numChars);
 MODULE_SCOPE int TclUniCharCaseMatch(const Tcl_UniChar *uniStr,
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 580c959..939134b 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -581,6 +581,9 @@ EXTERN void		TclStaticPackage(Tcl_Interp *interp,
 /* 258 */
 EXTERN Tcl_Obj *	TclpCreateTemporaryDirectory(Tcl_Obj *dirObj,
 				Tcl_Obj *basenameObj);
+/* 259 */
+EXTERN void		TclAppendUnicodeToObj(Tcl_Obj *objPtr,
+				const Tcl_UniChar *unicode, size_t length);
 
 typedef struct TclIntStubs {
     int magic;
@@ -845,6 +848,7 @@ typedef struct TclIntStubs {
     int (*tclPtrUnsetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, const int flags); /* 256 */
     void (*tclStaticPackage) (Tcl_Interp *interp, const char *pkgName, Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc); /* 257 */
     Tcl_Obj * (*tclpCreateTemporaryDirectory) (Tcl_Obj *dirObj, Tcl_Obj *basenameObj); /* 258 */
+    void (*tclAppendUnicodeToObj) (Tcl_Obj *objPtr, const Tcl_UniChar *unicode, size_t length); /* 259 */
 } TclIntStubs;
 
 extern const TclIntStubs *tclIntStubsPtr;
@@ -1262,6 +1266,8 @@ extern const TclIntStubs *tclIntStubsPtr;
 	(tclIntStubsPtr->tclStaticPackage) /* 257 */
 #define TclpCreateTemporaryDirectory \
 	(tclIntStubsPtr->tclpCreateTemporaryDirectory) /* 258 */
+#define TclAppendUnicodeToObj \
+	(tclIntStubsPtr->tclAppendUnicodeToObj) /* 259 */
 
 #endif /* defined(USE_TCL_STUBS) */
 
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index af2f7b7..88c6cf1 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -526,6 +526,7 @@ static const TclIntStubs tclIntStubs = {
     TclPtrUnsetVar, /* 256 */
     TclStaticPackage, /* 257 */
     TclpCreateTemporaryDirectory, /* 258 */
+    TclAppendUnicodeToObj, /* 259 */
 };
 
 static const TclIntPlatStubs tclIntPlatStubs = {