diff --git a/CHANGELOG.md b/CHANGELOG.md index de900ee16..91f0c5f96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # Changelog All notable changes to this project will be documented in this file. -## Unreleased - ??? +## 1.32.0 - 2023-10-14 +- Fix return value from C function `janet_dobytes` when called on Janet functions that yield to event loop. - Change C API for event loop interaction - get rid of JanetListener and instead use `janet_async_start` and `janet_async_end`. - Rework event loop to make fewer system calls on kqueue and epoll. - Expose atomic refcount abstraction in janet.h diff --git a/Makefile b/Makefile index 5bd9bfe4c..abee818dc 100644 --- a/Makefile +++ b/Makefile @@ -196,9 +196,9 @@ build/%.bin.o: src/%.c $(JANET_HEADERS) $(JANET_LOCAL_HEADERS) Makefile ######################## ifeq ($(UNAME), Darwin) -SONAME=libjanet.1.31.dylib +SONAME=libjanet.1.32.dylib else -SONAME=libjanet.so.1.31 +SONAME=libjanet.so.1.32 endif build/c/shell.c: src/mainclient/shell.c diff --git a/meson.build b/meson.build index b58b5d963..577fa0d1e 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ project('janet', 'c', default_options : ['c_std=c99', 'build.c_std=c99', 'b_lundef=false', 'default_library=both'], - version : '1.31.0') + version : '1.32.0') # Global settings janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h index 831360fbe..c48150298 100644 --- a/src/conf/janetconf.h +++ b/src/conf/janetconf.h @@ -4,10 +4,10 @@ #define JANETCONF_H #define JANET_VERSION_MAJOR 1 -#define JANET_VERSION_MINOR 31 +#define JANET_VERSION_MINOR 32 #define JANET_VERSION_PATCH 0 #define JANET_VERSION_EXTRA "" -#define JANET_VERSION "1.31.0" +#define JANET_VERSION "1.32.0" /* #define JANET_BUILD "local" */ diff --git a/src/core/ffi.c b/src/core/ffi.c index 03fccfd1b..6aed7e325 100644 --- a/src/core/ffi.c +++ b/src/core/ffi.c @@ -999,13 +999,13 @@ typedef struct { uint64_t x; } sysv64_sseint_return; typedef sysv64_int_return janet_sysv64_variant_1(uint64_t a, uint64_t b, uint64_t c, uint64_t d, uint64_t e, uint64_t f, - double r1, double r2, double r3, double r4, double r5, double r6, double r7, double r8); + double r1, double r2, double r3, double r4, double r5, double r6, double r7, double r8); typedef sysv64_sse_return janet_sysv64_variant_2(uint64_t a, uint64_t b, uint64_t c, uint64_t d, uint64_t e, uint64_t f, - double r1, double r2, double r3, double r4, double r5, double r6, double r7, double r8); + double r1, double r2, double r3, double r4, double r5, double r6, double r7, double r8); typedef sysv64_intsse_return janet_sysv64_variant_3(uint64_t a, uint64_t b, uint64_t c, uint64_t d, uint64_t e, uint64_t f, - double r1, double r2, double r3, double r4, double r5, double r6, double r7, double r8); + double r1, double r2, double r3, double r4, double r5, double r6, double r7, double r8); typedef sysv64_sseint_return janet_sysv64_variant_4(uint64_t a, uint64_t b, uint64_t c, uint64_t d, uint64_t e, uint64_t f, - double r1, double r2, double r3, double r4, double r5, double r6, double r7, double r8); + double r1, double r2, double r3, double r4, double r5, double r6, double r7, double r8); static Janet janet_ffi_sysv64(JanetFFISignature *signature, void *function_pointer, const Janet *argv) { union { diff --git a/src/core/fiber.c b/src/core/fiber.c index d5f515997..73871a4aa 100644 --- a/src/core/fiber.c +++ b/src/core/fiber.c @@ -239,8 +239,8 @@ int janet_fiber_funcframe(JanetFiber *fiber, JanetFunction *func) { fiber->data + tuplehead, oldtop - tuplehead) : janet_wrap_tuple(janet_tuple_n( - fiber->data + tuplehead, - oldtop - tuplehead)); + fiber->data + tuplehead, + oldtop - tuplehead)); } } @@ -370,8 +370,8 @@ int janet_fiber_funcframe_tail(JanetFiber *fiber, JanetFunction *func) { fiber->data + tuplehead, fiber->stacktop - tuplehead) : janet_wrap_tuple(janet_tuple_n( - fiber->data + tuplehead, - fiber->stacktop - tuplehead)); + fiber->data + tuplehead, + fiber->stacktop - tuplehead)); } stacksize = tuplehead - fiber->stackstart + 1; } else {