diff options
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/conf/janetconf.h | 6 | ||||
| -rw-r--r-- | src/core/corelib.c | 2 | ||||
| -rw-r--r-- | src/core/ffi.c | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c007d26..cc93ca45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog All notable changes to this project will be documented in this file. +## ??? - Unreleased +- Fix error message bug in FFI library. + ## 1.25.1 - 2022-10-29 - Add `memcmp` function to core library. - Fix bug in `os/open` with `:rw` permissions not correct on Linux. diff --git a/meson.build b/meson.build index 9a7f9b2b..2b504f73 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.25.1') + version : '1.25.2') # 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 a39fb25c..1a3a269c 100644 --- a/src/conf/janetconf.h +++ b/src/conf/janetconf.h @@ -5,9 +5,9 @@ #define JANET_VERSION_MAJOR 1 #define JANET_VERSION_MINOR 25 -#define JANET_VERSION_PATCH 1 -#define JANET_VERSION_EXTRA "" -#define JANET_VERSION "1.25.1" +#define JANET_VERSION_PATCH 2 +#define JANET_VERSION_EXTRA "-dev" +#define JANET_VERSION "1.25.2-dev" /* #define JANET_BUILD "local" */ diff --git a/src/core/corelib.c b/src/core/corelib.c index ed474178..ffc1d2df 100644 --- a/src/core/corelib.c +++ b/src/core/corelib.c @@ -1008,7 +1008,7 @@ JanetTable *janet_core_env(JanetTable *replacements) { "than x, and 0 otherwise. To return 0, x and y must be the exact same type.")); janet_quick_asm(env, JANET_FUN_NEXT, "next", 2, 1, 2, 2, next_asm, sizeof(next_asm), - JDOC("(next ds &opt key)\n\n" + JDOC("(next ds &opt key)\n\n(peg/match '(uint 4 :le) "abcd")" "Gets the next key in a data structure. Can be used to iterate through " "the keys of a data structure in an unspecified order. Keys are guaranteed " "to be seen only once per iteration if they data structure is not mutated " diff --git a/src/core/ffi.c b/src/core/ffi.c index c4f61b34..5a2a3321 100644 --- a/src/core/ffi.c +++ b/src/core/ffi.c @@ -425,7 +425,7 @@ JANET_CORE_FN(cfun_ffi_align, static void *janet_ffi_getpointer(const Janet *argv, int32_t n) { switch (janet_type(argv[n])) { default: - janet_panicf("bad slot #%d, expected ffi pointer convertable type, got %v", argv[n]); + janet_panicf("bad slot #%d, expected ffi pointer convertable type, got %v", n, argv[n]); case JANET_POINTER: case JANET_STRING: case JANET_KEYWORD: |