Merge 8.7. Update doc

8 files changed, 21 insertions, 44 deletions

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 2c19545..bb6861b 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2457,11 +2457,11 @@ declare 668 {
 
 declare 674 {
     int Tcl_GetBool(Tcl_Interp *interp, const char *src, int flags,
-	    char *boolPtr)
+	    char *charPtr)
 }
 declare 675 {
     int Tcl_GetBoolFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    int flags, char *boolPtr)
+	    int flags, char *charPtr)
 }
 
 
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index 839fbde..da557a4 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -17,7 +17,6 @@
 #include "tclInt.h"
 #include "tclCompile.h"
 #include <assert.h>
-#include <stdbool.h>
 
 /*
  * Prototypes for procedures defined later in this file:
@@ -186,7 +185,7 @@ TclCompileIfCmd(
     const char *word;
     int realCond = 1;		/* Set to 0 for static conditions:
 				 * "if 0 {..}" */
-    bool boolVal;		/* Value of static condition. */
+    int boolVal;		/* Value of static condition. */
     int compileScripts = 1;
 
     /*
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index fa490a1..cd3bd37 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -18,7 +18,6 @@
 #include "tclInt.h"
 #include "tclCompile.h"
 #include "tclStringTrim.h"
-#include <stdbool.h>
 
 /*
  * Prototypes for procedures defined later in this file:
@@ -3760,8 +3759,7 @@ TclCompileWhileCmd(
     DefineLineInformation;	/* TIP #280 */
     Tcl_Token *testTokenPtr, *bodyTokenPtr;
     JumpFixup jumpEvalCondFixup;
-    int testCodeOffset, bodyCodeOffset, jumpDist, range, code;
-    bool boolVal;
+    int testCodeOffset, bodyCodeOffset, jumpDist, range, code, boolVal;
     int loopMayEnd = 1;		/* This is set to 0 if it is recognized as an
 				 * infinite loop. */
     Tcl_Obj *boolObj;
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index c245b4e..23d8711 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -13,7 +13,6 @@
 
 #include "tclInt.h"
 #include "tclCompile.h"		/* CompileEnv */
-#include <stdbool.h>
 
 /*
  * Expression parsing takes place in the routine ParseExpr(). It takes a
@@ -709,7 +708,7 @@ ParseExpr(
 	 */
 
 	if ((NODE_TYPE & lexeme) == 0) {
-	    bool b;
+	    int b;
 
 	    switch (lexeme) {
 	    case COMMENT:
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 79b6ba8..80d0502 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1972,10 +1972,10 @@ EXTERN int		Tcl_UniCharLen(const int *uniStr);
 /* Slot 673 is reserved */
 /* 674 */
 EXTERN int		Tcl_GetBool(Tcl_Interp *interp, const char *src,
-				int flags, char *boolPtr);
+				int flags, char *charPtr);
 /* 675 */
 EXTERN int		Tcl_GetBoolFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, int flags, char *boolPtr);
+				Tcl_Obj *objPtr, int flags, char *charPtr);
 
 typedef struct {
     const struct TclPlatStubs *tclPlatStubs;
@@ -2685,8 +2685,8 @@ typedef struct TclStubs {
     void (*reserved671)(void);
     void (*reserved672)(void);
     void (*reserved673)(void);
-    int (*tcl_GetBool) (Tcl_Interp *interp, const char *src, int flags, char *boolPtr); /* 674 */
-    int (*tcl_GetBoolFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, char *boolPtr); /* 675 */
+    int (*tcl_GetBool) (Tcl_Interp *interp, const char *src, int flags, char *charPtr); /* 674 */
+    int (*tcl_GetBoolFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, char *charPtr); /* 675 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -4272,22 +4272,12 @@ extern const TclStubs *tclStubsPtr;
 	Tcl_GetUnicodeFromObj(objPtr, (int *)NULL)
 #undef Tcl_GetBytesFromObj
 #undef Tcl_GetIndexFromObjStruct
-#undef Tcl_GetBoolean
-#undef Tcl_GetBooleanFromObj
 #ifdef TCL_NO_DEPRECATED
 #undef Tcl_GetStringFromObj
 #undef Tcl_GetUnicodeFromObj
 #undef Tcl_GetByteArrayFromObj
 #endif
 #if defined(USE_TCL_STUBS)
-#define Tcl_GetBoolean(interp, objPtr, boolPtr) \
-	(sizeof(*(boolPtr)) == sizeof(int) ? tclStubsPtr->tcl_GetBoolean(interp, objPtr, (int *)(boolPtr)) : \
-	(sizeof(*(boolPtr)) == sizeof(char) ? tclStubsPtr->tcl_GetBool(interp, objPtr, 0, (char *)(boolPtr)) : \
-	(Tcl_Panic("Invalid boolean variable: sizeof() must be 1 or 4"), TCL_ERROR)))
-#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
-	(sizeof(*(boolPtr)) == sizeof(int) ? tclStubsPtr->tcl_GetBooleanFromObj(interp, objPtr, (int *)(boolPtr)) : \
-	(sizeof(*(boolPtr)) == sizeof(char) ? tclStubsPtr->tcl_GetBoolFromObj(interp, objPtr, 0, (char *)(boolPtr)) : \
-	(Tcl_Panic("Invalid boolean variable: sizeof() must be 1 or 4"), TCL_ERROR)))
 #define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tclGetBytesFromObj(interp, objPtr, (int *)(sizePtr)) : tclStubsPtr->tcl_GetBytesFromObj(interp, objPtr, (size_t *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
@@ -4301,14 +4291,6 @@ extern const TclStubs *tclStubsPtr;
 	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetUnicodeFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetUnicodeFromObj(objPtr, (size_t *)(sizePtr)))
 #endif
 #else
-#define Tcl_GetBoolean(interp, objPtr, boolPtr) \
-	(sizeof(*(boolPtr)) == sizeof(int) ? (Tcl_GetBoolean)(interp, objPtr, (int *)(boolPtr)) : \
-	(sizeof(*(boolPtr)) == sizeof(char) ? (Tcl_GetBool)(interp, objPtr, 0, (char *)(boolPtr)) : \
-	(Tcl_Panic("Invalid boolean variable: sizeof() must be 1 or 4"), TCL_ERROR)))
-#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
-	(sizeof(*(boolPtr)) == sizeof(int) ? (Tcl_GetBooleanFromObj)(interp, objPtr, (int *)(boolPtr)) : \
-	(sizeof(*(boolPtr)) == sizeof(char) ? (Tcl_GetBoolFromObj)(interp, objPtr, 0, (char *)(boolPtr)) : \
-	(Tcl_Panic("Invalid boolean variable: sizeof() must be 1 or 4"), TCL_ERROR)))
 #define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? (TclGetBytesFromObj)(interp, objPtr, (int *)(sizePtr)) : (Tcl_GetBytesFromObj)(interp, objPtr, (size_t *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
diff --git a/generic/tclGet.c b/generic/tclGet.c
index a60d3a6..9670450 100644
--- a/generic/tclGet.c
+++ b/generic/tclGet.c
@@ -110,7 +110,7 @@ Tcl_GetDouble(
  *	string.
  *
  * Results:
- *	The return value is normally TCL_OK; in this case *boolPtr will be set
+ *	The return value is normally TCL_OK; in this case *charPtr will be set
  *	to the 0/1 value equivalent to src. If src is improperly formed then
  *	TCL_ERROR is returned and an error message will be left in the
  *	interp's result.
@@ -128,14 +128,14 @@ Tcl_GetBool(
     const char *src,		/* String containing one of the boolean values
 				 * 1, 0, true, false, yes, no, on, off. */
     int flags,
-    char *boolPtr)		/* Place to store converted result, which will
+    char *charPtr)		/* Place to store converted result, which will
 				 * be 0 or 1. */
 {
     Tcl_Obj obj;
     int code;
 
     if ((src == NULL) || (*src == '\0')) {
-	return (Tcl_GetBoolFromObj)(interp, NULL, flags, boolPtr);
+	return (Tcl_GetBoolFromObj)(interp, NULL, flags, charPtr);
     }
     obj.refCount = 1;
     obj.bytes = (char *) src;
@@ -147,7 +147,7 @@ Tcl_GetBool(
 	Tcl_Panic("invalid sharing of Tcl_Obj on C stack");
     }
     if (code == TCL_OK) {
-	(Tcl_GetBoolFromObj)(NULL, &obj, flags, boolPtr);
+	(Tcl_GetBoolFromObj)(NULL, &obj, flags, charPtr);
     }
     return code;
 }
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 7842d0d..f7d9dfc 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -2161,7 +2161,7 @@ Tcl_GetBoolFromObj(
     Tcl_Interp *interp,         /* Used for error reporting if not NULL. */
     Tcl_Obj *objPtr,	/* The object from which to get boolean. */
     int flags,
-    char *boolPtr)	/* Place to store resulting boolean. */
+    char *charPtr)	/* Place to store resulting boolean. */
 {
     int result;
 
@@ -2206,8 +2206,8 @@ Tcl_GetBoolFromObj(
 	if (objPtr->typePtr == &tclBignumType) {
 	    result = 1;
 	boolEnd:
-	    if (boolPtr != NULL) {
-		*boolPtr = result;
+	    if (charPtr != NULL) {
+		*charPtr = result;
 	    }
 	    return TCL_OK;
 	}
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 39364d6..a5e35c1 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -30,7 +30,6 @@
 #endif
 #include "tclOO.h"
 #include <math.h>
-#include <stdbool.h>
 
 /*
  * Required for Testregexp*Cmd
@@ -2263,7 +2262,7 @@ TesteventProc(
     Tcl_Obj *command = ev->command;
     int result = Tcl_EvalObjEx(interp, command,
 	    TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT);
-    bool retval;
+    char retval;
 
     if (result != TCL_OK) {
 	Tcl_AddErrorInfo(interp,
@@ -2271,8 +2270,8 @@ TesteventProc(
 	Tcl_BackgroundException(interp, TCL_ERROR);
 	return 1;		/* Avoid looping on errors */
     }
-    if (Tcl_GetBooleanFromObj(interp, Tcl_GetObjResult(interp),
-	    &retval) != TCL_OK) {
+    if (Tcl_GetBoolFromObj(interp, Tcl_GetObjResult(interp),
+	    0, &retval) != TCL_OK) {
 	Tcl_AddErrorInfo(interp,
 		"    (return value from \"testevent\" callback)");
 	Tcl_BackgroundException(interp, TCL_ERROR);
@@ -5278,7 +5277,7 @@ TestsaveresultCmd(
 {
     Interp* iPtr = (Interp*) interp;
     int result, index;
-    bool discard;
+    char discard;
     Tcl_SavedResult state;
     Tcl_Obj *objPtr;
     static const char *const optionStrings[] = {
@@ -5300,7 +5299,7 @@ TestsaveresultCmd(
 	    &index) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (Tcl_GetBooleanFromObj(interp, objv[3], &discard) != TCL_OK) {
+    if (Tcl_GetBoolFromObj(interp, objv[3], 0, &discard) != TCL_OK) {
 	return TCL_ERROR;
     }