1
0
mirror of https://github.com/janet-lang/janet synced 2024-10-31 22:16:16 +00:00

Merge branch 'master' into ev

This commit is contained in:
Calvin Rose 2020-07-25 14:07:47 -05:00
commit d393fbf360
8 changed files with 13 additions and 10 deletions

View File

@ -1,11 +1,13 @@
# 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 ## 1.11.1 - 2020-07-25
- Fix jpm and git with multiple git installs on Windows - Fix jpm and git with multiple git installs on Windows
- Fix importing a .so file in the current directory - Fix importing a .so file in the current directory
- Allow passing byte sequence types directly to typed-array constructors. - Allow passing byte sequence types directly to typed-array constructors.
- Fix bug sending files between threads. - Fix bug sending files between threads.
- Disable PRF by default.
- Update the soname.
## 1.11.0 - 2020-07-18 ## 1.11.0 - 2020-07-18
- Add `forever` macro. - Add `forever` macro.

View File

@ -318,7 +318,6 @@ test-install:
cd test/install && jpm --verbose --test --modpath=./modpath install https://github.com/janet-lang/jhydro.git cd test/install && jpm --verbose --test --modpath=./modpath install https://github.com/janet-lang/jhydro.git
cd test/install && jpm --verbose --test --modpath=./modpath install https://github.com/janet-lang/path.git cd test/install && jpm --verbose --test --modpath=./modpath install https://github.com/janet-lang/path.git
cd test/install && jpm --verbose --test --modpath=./modpath install https://github.com/janet-lang/argparse.git cd test/install && jpm --verbose --test --modpath=./modpath install https://github.com/janet-lang/argparse.git
cd test/install && jpm --verbose --modpath=./modpath install https://github.com/bakpakin/x43bot.git
help: help:
@echo @echo

View File

@ -64,7 +64,7 @@ conf.set('JANET_NO_EV', not get_option('ev'))
conf.set('JANET_REDUCED_OS', get_option('reduced_os')) conf.set('JANET_REDUCED_OS', get_option('reduced_os'))
conf.set('JANET_NO_TYPED_ARRAY', not get_option('typed_array')) conf.set('JANET_NO_TYPED_ARRAY', not get_option('typed_array'))
conf.set('JANET_NO_INT_TYPES', not get_option('int_types')) conf.set('JANET_NO_INT_TYPES', not get_option('int_types'))
conf.set('JANET_NO_PRF', not get_option('prf')) conf.set('JANET_PRF', get_option('prf'))
conf.set('JANET_RECURSION_GUARD', get_option('recursion_guard')) conf.set('JANET_RECURSION_GUARD', get_option('recursion_guard'))
conf.set('JANET_MAX_PROTO_DEPTH', get_option('max_proto_depth')) conf.set('JANET_MAX_PROTO_DEPTH', get_option('max_proto_depth'))
conf.set('JANET_MAX_MACRO_EXPAND', get_option('max_macro_expand')) conf.set('JANET_MAX_MACRO_EXPAND', get_option('max_macro_expand'))

View File

@ -10,7 +10,7 @@ option('assembler', type : 'boolean', value : true)
option('peg', type : 'boolean', value : true) option('peg', type : 'boolean', value : true)
option('typed_array', type : 'boolean', value : true) option('typed_array', type : 'boolean', value : true)
option('int_types', type : 'boolean', value : true) option('int_types', type : 'boolean', value : true)
option('prf', type : 'boolean', value : true) option('prf', type : 'boolean', value : false)
option('net', type : 'boolean', value : true) option('net', type : 'boolean', value : true)
option('ev', type : 'boolean', value : true) option('ev', type : 'boolean', value : true)
option('processes', type : 'boolean', value : true) option('processes', type : 'boolean', value : true)

View File

@ -29,8 +29,8 @@
#define JANET_VERSION_MAJOR 1 #define JANET_VERSION_MAJOR 1
#define JANET_VERSION_MINOR 11 #define JANET_VERSION_MINOR 11
#define JANET_VERSION_PATCH 1 #define JANET_VERSION_PATCH 1
#define JANET_VERSION_EXTRA "-dev" #define JANET_VERSION_EXTRA ""
#define JANET_VERSION "1.11.1-dev" #define JANET_VERSION "1.11.1"
/* #define JANET_BUILD "local" */ /* #define JANET_BUILD "local" */
@ -58,7 +58,7 @@
/* #define JANET_NO_UMASK */ /* #define JANET_NO_UMASK */
/* Other settings */ /* Other settings */
/* #define JANET_NO_PRF */ /* #define JANET_PRF */
/* #define JANET_NO_UTC_MKTIME */ /* #define JANET_NO_UTC_MKTIME */
/* #define JANET_OUT_OF_MEMORY do { printf("janet out of memory\n"); exit(1); } while (0) */ /* #define JANET_OUT_OF_MEMORY do { printf("janet out of memory\n"); exit(1); } while (0) */
/* #define JANET_EXIT(msg) do { printf("C assert failed executing janet: %s\n", msg); exit(1); } while (0) */ /* #define JANET_EXIT(msg) do { printf("C assert failed executing janet: %s\n", msg); exit(1); } while (0) */

View File

@ -97,7 +97,7 @@ const char *const janet_status_names[16] = {
"alive" "alive"
}; };
#ifdef JANET_NO_PRF #ifndef JANET_PRF
int32_t janet_string_calchash(const uint8_t *str, int32_t len) { int32_t janet_string_calchash(const uint8_t *str, int32_t len) {
const uint8_t *end = str + len; const uint8_t *end = str + len;

View File

@ -1468,7 +1468,7 @@ JANET_API int janet_verify(JanetFuncDef *def);
JANET_API JanetBuffer *janet_pretty(JanetBuffer *buffer, int depth, int flags, Janet x); JANET_API JanetBuffer *janet_pretty(JanetBuffer *buffer, int depth, int flags, Janet x);
/* Misc */ /* Misc */
#ifndef JANET_NO_PRF #ifdef JANET_PRF
#define JANET_HASH_KEY_SIZE 16 #define JANET_HASH_KEY_SIZE 16
JANET_API void janet_init_hash_key(uint8_t key[JANET_HASH_KEY_SIZE]); JANET_API void janet_init_hash_key(uint8_t key[JANET_HASH_KEY_SIZE]);
#endif #endif

View File

@ -48,7 +48,9 @@
(defn check-image (defn check-image
"Run a marshaling test using the make-image and load-image functions." "Run a marshaling test using the make-image and load-image functions."
[x msg] [x msg]
(assert-no-error msg (load-image (make-image x)))) (def im (make-image x))
# (printf "\nimage-hash: %d" (-> im string hash))
(assert-no-error msg (load-image im)))
(check-image (fn [] (fn [] 1)) "marshal nested functions") (check-image (fn [] (fn [] 1)) "marshal nested functions")
(check-image (fiber/new (fn [] (fn [] 1))) "marshal nested functions in fiber") (check-image (fiber/new (fn [] (fn [] 1))) "marshal nested functions in fiber")