diff --git a/CHANGELOG.md b/CHANGELOG.md index 184e826b..ed5c83d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,13 @@ # Changelog 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 importing a .so file in the current directory - Allow passing byte sequence types directly to typed-array constructors. - Fix bug sending files between threads. +- Disable PRF by default. +- Update the soname. ## 1.11.0 - 2020-07-18 - Add `forever` macro. diff --git a/Makefile b/Makefile index 8fb212ba..496818fb 100644 --- a/Makefile +++ b/Makefile @@ -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/path.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: @echo diff --git a/meson.build b/meson.build index 9bc2bfe9..95ad504b 100644 --- a/meson.build +++ b/meson.build @@ -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_NO_TYPED_ARRAY', not get_option('typed_array')) 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_MAX_PROTO_DEPTH', get_option('max_proto_depth')) conf.set('JANET_MAX_MACRO_EXPAND', get_option('max_macro_expand')) diff --git a/meson_options.txt b/meson_options.txt index 6a6503cb..17bf888d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,7 +10,7 @@ option('assembler', type : 'boolean', value : true) option('peg', type : 'boolean', value : true) option('typed_array', 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('ev', type : 'boolean', value : true) option('processes', type : 'boolean', value : true) diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h index b96ec231..247e6377 100644 --- a/src/conf/janetconf.h +++ b/src/conf/janetconf.h @@ -29,8 +29,8 @@ #define JANET_VERSION_MAJOR 1 #define JANET_VERSION_MINOR 11 #define JANET_VERSION_PATCH 1 -#define JANET_VERSION_EXTRA "-dev" -#define JANET_VERSION "1.11.1-dev" +#define JANET_VERSION_EXTRA "" +#define JANET_VERSION "1.11.1" /* #define JANET_BUILD "local" */ @@ -58,7 +58,7 @@ /* #define JANET_NO_UMASK */ /* Other settings */ -/* #define JANET_NO_PRF */ +/* #define JANET_PRF */ /* #define JANET_NO_UTC_MKTIME */ /* #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) */ diff --git a/src/core/util.c b/src/core/util.c index d4af5667..31855c8f 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -97,7 +97,7 @@ const char *const janet_status_names[16] = { "alive" }; -#ifdef JANET_NO_PRF +#ifndef JANET_PRF int32_t janet_string_calchash(const uint8_t *str, int32_t len) { const uint8_t *end = str + len; diff --git a/src/include/janet.h b/src/include/janet.h index f7375b48..a1a5d05c 100644 --- a/src/include/janet.h +++ b/src/include/janet.h @@ -1468,7 +1468,7 @@ JANET_API int janet_verify(JanetFuncDef *def); JANET_API JanetBuffer *janet_pretty(JanetBuffer *buffer, int depth, int flags, Janet x); /* Misc */ -#ifndef JANET_NO_PRF +#ifdef JANET_PRF #define JANET_HASH_KEY_SIZE 16 JANET_API void janet_init_hash_key(uint8_t key[JANET_HASH_KEY_SIZE]); #endif diff --git a/test/suite4.janet b/test/suite4.janet index 3b20de96..208f7cc4 100644 --- a/test/suite4.janet +++ b/test/suite4.janet @@ -48,7 +48,9 @@ (defn check-image "Run a marshaling test using the make-image and load-image functions." [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 (fiber/new (fn [] (fn [] 1))) "marshal nested functions in fiber")