mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-12-27 00:40:26 +00:00
Code Issues 1 Releases Wiki Activity

Fix panicf call.

Browse Source
This commit is contained in:
Calvin Rose 2022-10-30 09:57:40 -05:00
parent 894cd0e022
commit e43eab5fd6
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,6 +1,9 @@
# Changelog # Changelog
All notable changes to this project will be documented in this file. 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 ## 1.25.1 - 2022-10-29
- Add `memcmp` function to core library. - Add `memcmp` function to core library.
- Fix bug in `os/open` with `:rw` permissions not correct on Linux. - Fix bug in `os/open` with `:rw` permissions not correct on Linux.

2
meson.build
View File

@ -20,7 +20,7 @@
project('janet', 'c', project('janet', 'c',
default_options : ['c_std=c99', 'build.c_std=c99', 'b_lundef=false', 'default_library=both'], 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 # Global settings
janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet')

6
src/conf/janetconf.h
View File

@ -5,9 +5,9 @@
#define JANET_VERSION_MAJOR 1 #define JANET_VERSION_MAJOR 1
#define JANET_VERSION_MINOR 25 #define JANET_VERSION_MINOR 25
#define JANET_VERSION_PATCH 1 #define JANET_VERSION_PATCH 2
#define JANET_VERSION_EXTRA "" #define JANET_VERSION_EXTRA "-dev"
#define JANET_VERSION "1.25.1" #define JANET_VERSION "1.25.2-dev"
/* #define JANET_BUILD "local" */ /* #define JANET_BUILD "local" */

2
src/core/corelib.c
View File

@ -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.")); "than x, and 0 otherwise. To return 0, x and y must be the exact same type."));
janet_quick_asm(env, JANET_FUN_NEXT, janet_quick_asm(env, JANET_FUN_NEXT,
"next", 2, 1, 2, 2, next_asm, sizeof(next_asm), "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 " "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 " "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 " "to be seen only once per iteration if they data structure is not mutated "

2
src/core/ffi.c
View File

@ -425,7 +425,7 @@ JANET_CORE_FN(cfun_ffi_align,
static void *janet_ffi_getpointer(const Janet *argv, int32_t n) { static void *janet_ffi_getpointer(const Janet *argv, int32_t n) {
switch (janet_type(argv[n])) { switch (janet_type(argv[n])) {
default: 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_POINTER:
case JANET_STRING: case JANET_STRING:
case JANET_KEYWORD: case JANET_KEYWORD: