Skip to content

Commit 604b786

Browse files
committed
Update version.
1 parent 614e026 commit 604b786

Some content is hidden

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

117 files changed

+46413
-15698
lines changed

janet/janet.c

Lines changed: 17294 additions & 15677 deletions
Large diffs are not rendered by default.

janet/janet.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
#define JANETCONF_H
2727

2828
#define JANET_VERSION_MAJOR 1
29-
#define JANET_VERSION_MINOR 28
30-
#define JANET_VERSION_PATCH 0
29+
#define JANET_VERSION_MINOR 29
30+
#define JANET_VERSION_PATCH 1
3131
#define JANET_VERSION_EXTRA ""
32-
#define JANET_VERSION "1.28.0"
32+
#define JANET_VERSION "1.29.1"
3333

3434
/* #define JANET_BUILD "local" */
3535

@@ -248,7 +248,7 @@ extern "C" {
248248
/* Enable or disable the FFI library. Currently, FFI only enabled on
249249
* x86-64 operating systems. */
250250
#ifndef JANET_NO_FFI
251-
#if !defined(__EMSCRIPTEN__) && (defined(__x86_64__) || defined(_M_X64))
251+
#if !defined(__EMSCRIPTEN__)
252252
#define JANET_FFI
253253
#endif
254254
#endif
@@ -420,7 +420,6 @@ typedef struct JanetOSRWLock JanetOSRWLock;
420420
#include <stddef.h>
421421
#include <stdio.h>
422422

423-
424423
/* What to do when out of memory */
425424
#ifndef JANET_OUT_OF_MEMORY
426425
#define JANET_OUT_OF_MEMORY do { fprintf(stderr, "%s:%d - janet out of memory\n", __FILE__, __LINE__); exit(1); } while (0)
@@ -634,6 +633,7 @@ typedef void *JanetAbstract;
634633
#define JANET_STREAM_WRITABLE 0x400
635634
#define JANET_STREAM_ACCEPTABLE 0x800
636635
#define JANET_STREAM_UDPSERVER 0x1000
636+
#define JANET_STREAM_TOCLOSE 0x10000
637637

638638
typedef enum {
639639
JANET_ASYNC_EVENT_INIT,
@@ -1545,6 +1545,7 @@ JANET_API void janet_ev_readchunk(JanetStream *stream, JanetBuffer *buf, int32_t
15451545
JANET_API void janet_ev_recv(JanetStream *stream, JanetBuffer *buf, int32_t nbytes, int flags);
15461546
JANET_API void janet_ev_recvchunk(JanetStream *stream, JanetBuffer *buf, int32_t nbytes, int flags);
15471547
JANET_API void janet_ev_recvfrom(JanetStream *stream, JanetBuffer *buf, int32_t nbytes, int flags);
1548+
JANET_API void janet_ev_connect(JanetStream *stream, int flags);
15481549
#endif
15491550

15501551
/* Write async to a stream */
@@ -1873,13 +1874,16 @@ JANET_API void janet_stacktrace_ext(JanetFiber *fiber, Janet err, const char *pr
18731874
#define JANET_SANDBOX_SUBPROCESS 2
18741875
#define JANET_SANDBOX_NET_CONNECT 4
18751876
#define JANET_SANDBOX_NET_LISTEN 8
1876-
#define JANET_SANDBOX_FFI 16
1877+
#define JANET_SANDBOX_FFI_DEFINE 16
18771878
#define JANET_SANDBOX_FS_WRITE 32
18781879
#define JANET_SANDBOX_FS_READ 64
18791880
#define JANET_SANDBOX_HRTIME 128
18801881
#define JANET_SANDBOX_ENV 256
18811882
#define JANET_SANDBOX_DYNAMIC_MODULES 512
18821883
#define JANET_SANDBOX_FS_TEMP 1024
1884+
#define JANET_SANDBOX_FFI_USE 2048
1885+
#define JANET_SANDBOX_FFI_JIT 4096
1886+
#define JANET_SANDBOX_FFI (JANET_SANDBOX_FFI_DEFINE | JANET_SANDBOX_FFI_USE | JANET_SANDBOX_FFI_JIT)
18831887
#define JANET_SANDBOX_FS (JANET_SANDBOX_FS_WRITE | JANET_SANDBOX_FS_READ | JANET_SANDBOX_FS_TEMP)
18841888
#define JANET_SANDBOX_NET (JANET_SANDBOX_NET_CONNECT | JANET_SANDBOX_NET_LISTEN)
18851889
#define JANET_SANDBOX_ALL (UINT32_MAX)
@@ -1966,7 +1970,6 @@ JANET_API Janet janet_resolve_core(const char *name);
19661970
#define JANET_DEF_SD(ENV, JNAME, VAL, DOC) \
19671971
janet_def_sm(ENV, JNAME, VAL, DOC, __FILE__, __LINE__)
19681972

1969-
19701973
/* Choose defaults for source mapping and docstring based on config defs */
19711974
#if defined(JANET_NO_SOURCEMAPS) && defined(JANET_NO_DOCSTRINGS)
19721975
#define JANET_REG JANET_REG_

janet/shell.c

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#ifdef _WIN32
3131
#include <windows.h>
3232
#include <shlwapi.h>
33-
#include <versionhelpers.h>
3433
#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
3534
#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
3635
#endif
@@ -147,9 +146,8 @@ static void setup_console_output(void) {
147146
HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE);
148147
DWORD dwMode = 0;
149148
GetConsoleMode(hOut, &dwMode);
150-
if (IsWindows10OrGreater()) {
151-
dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
152-
}
149+
dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
150+
dwMode |= ENABLE_PROCESSED_OUTPUT;
153151
SetConsoleMode(hOut, dwMode);
154152
if (IsValidCodePage(65001)) {
155153
SetConsoleOutputCP(65001);
@@ -165,10 +163,8 @@ static int rawmode(void) {
165163
dwMode &= ~ENABLE_LINE_INPUT;
166164
dwMode &= ~ENABLE_INSERT_MODE;
167165
dwMode &= ~ENABLE_ECHO_INPUT;
168-
if (IsWindows10OrGreater()) {
169-
dwMode |= ENABLE_VIRTUAL_TERMINAL_INPUT;
170-
dwMode &= ~ENABLE_PROCESSED_INPUT;
171-
}
166+
dwMode |= ENABLE_VIRTUAL_TERMINAL_INPUT;
167+
dwMode &= ~ENABLE_PROCESSED_INPUT;
172168
if (!SetConsoleMode(hOut, dwMode)) return 1;
173169
gbl_israwmode = 1;
174170
return 0;
@@ -183,10 +179,8 @@ static void norawmode(void) {
183179
dwMode |= ENABLE_LINE_INPUT;
184180
dwMode |= ENABLE_INSERT_MODE;
185181
dwMode |= ENABLE_ECHO_INPUT;
186-
if (IsWindows10OrGreater()) {
187-
dwMode &= ~ENABLE_VIRTUAL_TERMINAL_INPUT;
188-
dwMode |= ENABLE_PROCESSED_INPUT;
189-
}
182+
dwMode &= ~ENABLE_VIRTUAL_TERMINAL_INPUT;
183+
dwMode |= ENABLE_PROCESSED_INPUT;
190184
SetConsoleMode(hOut, dwMode);
191185
gbl_israwmode = 0;
192186
}
@@ -554,7 +548,6 @@ static void kdeletew(void) {
554548
refresh();
555549
}
556550

557-
558551
/* See tools/symchargen.c */
559552
static int is_symbol_char_gen(uint8_t c) {
560553
if (c & 0x80) return 1;

0 commit comments

Comments
 (0)