Skip to content

Commit 3beb1f2

Browse files
committed
Merge trunk
2 parents 6925e85 + 807addf commit 3beb1f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+984
-948
lines changed

.github/tcltest.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "tcltest",
5+
"pattern": [
6+
{
7+
"regexp": "^==== ([-\\w]+) (.+) (FAILED)$",
8+
"severity": 3,
9+
"message": 2,
10+
"code": 1
11+
}
12+
]
13+
}
14+
]
15+
}

.github/workflows/linux-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ jobs:
8585
make runtest SCRIPT=../.github/workflows/info.tcl || echo 'get info failed'
8686
- name: Run Tests
8787
run: |
88+
echo "::add-matcher::.github/tcltest.json"
8889
make test
90+
echo "::remove-matcher::.github/tcltest.json"
8991
env:
9092
ERROR_ON_FAILURES: 1
9193
timeout-minutes: 30

.github/workflows/mac-build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ jobs:
5757
CFLAGS: -arch x86_64 -arch arm64
5858
timeout-minutes: 15
5959
- name: Run Tests
60-
run: make -j4 test styles=develop
60+
run: |
61+
echo "::add-matcher::.github/tcltest.json"
62+
make -j4 test styles=develop
6163
env:
6264
ERROR_ON_FAILURES: 1
6365
MAC_CI: 1
@@ -99,6 +101,7 @@ jobs:
99101
make runtest SCRIPT=../.github/workflows/info.tcl || echo 'get info failed'
100102
- name: Run Tests
101103
run: |
104+
echo "::add-matcher::.github/tcltest.json"
102105
make test
103106
env:
104107
ERROR_ON_FAILURES: 1

.github/workflows/onefiledist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
uses: actions/checkout@v5
6767
with:
6868
repository: create-dmg/create-dmg
69-
ref: v1.0.8
69+
ref: v1.2.2
7070
path: create-dmg
7171
- name: Prepare
7272
run: |

.github/workflows/win-build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ jobs:
8888
timeout-minutes: 5
8989
- name: Run Tests ${{ matrix.config }}
9090
run: |
91+
Write-Output "::add-matcher::.github/tcltest.json"
9192
&nmake -f makefile.vc ${{ matrix.config }} test
9293
if ($lastexitcode -ne 0) {
9394
throw "nmake exit code: $lastexitcode"
@@ -136,7 +137,9 @@ jobs:
136137
ulimit -a || echo 'get limit failed'
137138
make runtest SCRIPT=../.github/workflows/info.tcl || echo 'get info failed'
138139
- name: Run Tests
139-
run: make test
140+
run: |
141+
echo "::add-matcher::.github/tcltest.json"
142+
make test
140143
timeout-minutes: 30
141144
env:
142145
ERROR_ON_FAILURES: 1

generic/regc_nfa.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -928,11 +928,11 @@ mergeins(
928928
struct nfa * nfa,
929929
struct state * s,
930930
struct arc ** arcarray,
931-
int arccount)
931+
size_t arccount)
932932
{
933933
struct arc *na;
934-
int i;
935-
int j;
934+
size_t i;
935+
size_t j;
936936

937937
if (arccount <= 0) {
938938
return;
@@ -1875,7 +1875,7 @@ fixempties(
18751875
size_t totalinarcs;
18761876
struct arc **inarcsorig;
18771877
struct arc **arcarray;
1878-
int arccount;
1878+
size_t arccount;
18791879
size_t prevnins;
18801880
size_t nskip;
18811881

generic/regcomp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static void sortouts(struct nfa *, struct state *);
128128
static int sortouts_cmp(const void *, const void *);
129129
static void moveins(struct nfa *, struct state *, struct state *);
130130
static void copyins(struct nfa *, struct state *, struct state *);
131-
static void mergeins(struct nfa *, struct state *, struct arc **, int);
131+
static void mergeins(struct nfa *, struct state *, struct arc **, size_t);
132132
static void moveouts(struct nfa *, struct state *, struct state *);
133133
static void copyouts(struct nfa *, struct state *, struct state *);
134134
static void cloneouts(struct nfa *, struct state *, struct state *, struct state *, int);

generic/tcl.decls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ declare 198 {
620620
}
621621
declare 199 {
622622
Tcl_Channel Tcl_OpenTcpClient(Tcl_Interp *interp, int port,
623-
const char *address, const char *myaddr, int myport, int flags)
623+
const char *address, const char *myaddr, int myport, int async)
624624
}
625625
declare 200 {
626626
Tcl_Channel Tcl_OpenTcpServer(Tcl_Interp *interp, int port,

generic/tcl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2343,7 +2343,7 @@ EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv);
23432343
* table.
23442344
*/
23452345

2346-
#include "tclDecls.h"
2346+
#include "tclDecls.h" /* IWYU pragma: export */
23472347

23482348
/*
23492349
* Include platform specific public function declarations that are accessible
@@ -2356,7 +2356,7 @@ EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv);
23562356
# define TCLAPI MODULE_SCOPE
23572357
#endif
23582358

2359-
#include "tclPlatDecls.h"
2359+
#include "tclPlatDecls.h" /* IWYU pragma: export */
23602360

23612361
/*
23622362
*----------------------------------------------------------------------------

generic/tclArithSeries.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*/
1212

1313
#include "tclInt.h"
14-
#include <assert.h>
1514
#include <math.h>
1615

1716
/*

0 commit comments

Comments
 (0)