Rebase to 9.0

tcltk · Sep 13, 2023 · 44c2b79 · 44c2b79
2 parents 6e62967 + 3824998
commit 44c2b79
Show file tree

Hide file tree

Showing 96 changed files with 2,093 additions and 2,110 deletions.
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
@@ -22,7 +22,6 @@ jobs:
       matrix:
         cfgopt:
           - ""
-          - "CHECKS=nodep"
           - "OPTS=static"
           - "OPTS=symbols"
           - "OPTS=symbols STATS=compdbg,memdbg"
@@ -65,7 +64,6 @@ jobs:
       matrix:
         cfgopt:
           - ""
-          - "CFLAGS=-DTCL_NO_DEPRECATED=1"
           - "--disable-shared"
           - "--enable-symbols"
           - "--enable-symbols=mem"

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # README:  Tcl
 
-This is the **Tcl 9.0a4** source distribution.
+This is the **Tcl 9.0a0** source distribution.
 
 You can get any source release of Tcl from [our distribution
 site](https://sourceforge.net/projects/tcl/files/Tcl/).
@@ -19,6 +19,11 @@ site](https://sourceforge.net/projects/tcl/files/Tcl/).
 [![Build Status](https://github.com/tcltk/tcl/workflows/Linux/badge.svg?branch=main)](https://github.com/tcltk/tcl/actions?query=workflow%3A%22Linux%22+branch%3Amain)
 [![Build Status](https://github.com/tcltk/tcl/workflows/Windows/badge.svg?branch=main)](https://github.com/tcltk/tcl/actions?query=workflow%3A%22Windows%22+branch%3Amain)
 [![Build Status](https://github.com/tcltk/tcl/workflows/macOS/badge.svg?branch=main)](https://github.com/tcltk/tcl/actions?query=workflow%3A%22macOS%22+branch%3Amain)
+<br>
+9.1 (unofficial, with TIP #626))
+[![Build Status](https://github.com/tcltk/tcl/workflows/Linux/badge.svg?branch=tip-626)](https://github.com/tcltk/tcl/actions?query=workflow%3A%22Linux%22+branch%3Atip-626)
+[![Build Status](https://github.com/tcltk/tcl/workflows/Windows/badge.svg?branch=tip-626)](https://github.com/tcltk/tcl/actions?query=workflow%3A%22Windows%22+branch%3Atip-626)
+[![Build Status](https://github.com/tcltk/tcl/workflows/macOS/badge.svg?branch=tip-626)](https://github.com/tcltk/tcl/actions?query=workflow%3A%22macOS%22+branch%3Atip-626)
 
 ## Contents
  1. [Introduction](#intro)

diff --git a/generic/tcl.decls b/generic/tcl.decls
@@ -1137,7 +1137,7 @@ declare 303 {
 }
 declare 304 {
     int Tcl_GetIndexFromObjStruct(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    const void *tablePtr, Tcl_Size offset, const char *msg, int flags,
+	    const void *tablePtr, size_t offset, const char *msg, int flags,
 	    void *indexPtr)
 }
 declare 305 {

diff --git a/generic/tcl.h b/generic/tcl.h
@@ -51,12 +51,12 @@ extern "C" {
 #   define TCL_MAJOR_VERSION   9
 #endif
 #if TCL_MAJOR_VERSION == 9
-#   define TCL_MINOR_VERSION   0
+#   define TCL_MINOR_VERSION   1
 #   define TCL_RELEASE_LEVEL   TCL_ALPHA_RELEASE
-#   define TCL_RELEASE_SERIAL  4
+#   define TCL_RELEASE_SERIAL  0
 
-#   define TCL_VERSION	    "9.0"
-#   define TCL_PATCH_LEVEL	    "9.0a4"
+#   define TCL_VERSION	    "9.1"
+#   define TCL_PATCH_LEVEL	    "9.1a0"
 #endif /* TCL_MAJOR_VERSION */
 
 #if defined(RC_INVOKED)
@@ -555,9 +555,11 @@ typedef int (Tcl_CmdProc) (void *clientData, Tcl_Interp *interp,
 typedef void (Tcl_CmdTraceProc) (void *clientData, Tcl_Interp *interp,
 	int level, char *command, Tcl_CmdProc *proc,
 	void *cmdClientData, int argc, const char *argv[]);
+#ifndef TCL_NO_DEPRECATED
 typedef int (Tcl_CmdObjTraceProc) (void *clientData, Tcl_Interp *interp,
 	int level, const char *command, Tcl_Command commandInfo, int objc,
 	struct Tcl_Obj *const *objv);
+#endif /* TCL_NO_DEPRECATED */
 #if TCL_MAJOR_VERSION > 8
 typedef int (Tcl_CmdObjTraceProc2) (void *clientData, Tcl_Interp *interp,
 	Tcl_Size level, const char *command, Tcl_Command commandInfo, Tcl_Size objc,
@@ -585,8 +587,10 @@ typedef void (Tcl_IdleProc) (void *clientData);
 typedef void (Tcl_InterpDeleteProc) (void *clientData,
 	Tcl_Interp *interp);
 typedef void (Tcl_NamespaceDeleteProc) (void *clientData);
+#ifndef TCL_NO_DEPRECATED
 typedef int (Tcl_ObjCmdProc) (void *clientData, Tcl_Interp *interp,
 	int objc, struct Tcl_Obj *const *objv);
+#endif /* TCL_NO_DEPRECATED */
 #if TCL_MAJOR_VERSION > 8
 typedef int (Tcl_ObjCmdProc2) (void *clientData, Tcl_Interp *interp,
 	Tcl_Size objc, struct Tcl_Obj *const *objv);
@@ -835,8 +839,13 @@ typedef struct {
 				 * Tcl_CreateObjCommand; 2 if objProc was registered by
 				 * a call to Tcl_CreateObjCommand2; 0 otherwise.
 				 * Tcl_SetCmdInfo does not modify this field. */
+#ifdef TCL_NO_DEPRECATED
+    void *objProcNotUsed;	/* Command's object-based function. */
+    void *objClientDataNotUsed;	/* ClientData for object proc. */
+#else
     Tcl_ObjCmdProc *objProc;	/* Command's object-based function. */
     void *objClientData;	/* ClientData for object proc. */
+#endif
     Tcl_CmdProc *proc;		/* Command's string-based function. */
     void *clientData;	/* ClientData for string proc. */
     Tcl_CmdDeleteProc *deleteProc;
@@ -2320,17 +2329,10 @@ void *			TclStubCall(void *arg);
 
 #ifdef USE_TCL_STUBS
 #if TCL_MAJOR_VERSION < 9
-# if TCL_UTF_MAX < 4
 #   define Tcl_InitStubs(interp, version, exact) \
 	(Tcl_InitStubs)(interp, version, \
 	    (exact)|(TCL_MAJOR_VERSION<<8)|(0xFF<<16), \
 	    TCL_STUB_MAGIC)
-# else
-#   define Tcl_InitStubs(interp, version, exact) \
-	(Tcl_InitStubs)(interp, "8.7.0", \
-	    (exact)|(TCL_MAJOR_VERSION<<8)|(0xFF<<16), \
-	    TCL_STUB_MAGIC)
-# endif
 #elif TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE
 #   define Tcl_InitStubs(interp, version, exact) \
 	(Tcl_InitStubs)(interp, version, \

diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
@@ -773,22 +773,22 @@ int
 Tcl_AssembleObjCmd(
     void *clientData,		/* clientData */
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     /*
      * Boilerplate - make sure that there is an NRE trampoline on the C stack
      * because there needs to be one in place to execute bytecode.
      */
 
-    return Tcl_NRCallObjProc(interp, TclNRAssembleObjCmd, clientData, objc, objv);
+    return Tcl_NRCallObjProc2(interp, TclNRAssembleObjCmd, clientData, objc, objv);
 }
 
 int
 TclNRAssembleObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     ByteCode *codePtr;		/* Pointer to the bytecode to execute */