Skip to content

Commit

Permalink
Rebase to 9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jan.nijtmans committed Sep 13, 2023
2 parents 6e62967 + 3824998 commit 44c2b79
Show file tree
Hide file tree
Showing 96 changed files with 2,093 additions and 2,110 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/win-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
matrix:
cfgopt:
- ""
- "CHECKS=nodep"
- "OPTS=static"
- "OPTS=symbols"
- "OPTS=symbols STATS=compdbg,memdbg"
Expand Down Expand Up @@ -65,7 +64,6 @@ jobs:
matrix:
cfgopt:
- ""
- "CFLAGS=-DTCL_NO_DEPRECATED=1"
- "--disable-shared"
- "--enable-symbols"
- "--enable-symbols=mem"
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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/).
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion generic/tcl.decls
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
24 changes: 13 additions & 11 deletions generic/tcl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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, \
Expand Down
6 changes: 3 additions & 3 deletions generic/tclAssembly.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
Loading

0 comments on commit 44c2b79

Please sign in to comment.