diff --git a/CHANGELOG.md b/CHANGELOG.md index 97cf0fa5..d4316ecd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ # Changelog All notable changes to this project will be documented in this file. -### Unreleased -- Fix bug when printing buffer to self in some cases. +### 1.5.1 - 2019-11-16 +- Fix bug when printing buffer to self in some edge cases. +- Fix bug with `jpm` on windows. +- Fix `update` return value. ## 1.5.0 - 2019-11-10 - `os/date` now defaults to UTC. diff --git a/appveyor.yml b/appveyor.yml index 2c2432ac..1fab060a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,7 @@ install: - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %platform% - build_win test-install - set janet_outname=%appveyor_repo_tag_name% - - if "%janet_outname%"=="" set janet_outname=v1.5.0 + - if "%janet_outname%"=="" set janet_outname=v1.5.1 build: off artifacts: diff --git a/janet-installer.nsi b/janet-installer.nsi index 5d5452eb..45279727 100644 --- a/janet-installer.nsi +++ b/janet-installer.nsi @@ -1,5 +1,5 @@ # Version -!define VERSION "1.5.0" +!define VERSION "1.5.1" !define PRODUCT_VERSION "${VERSION}.0" VIProductVersion "${PRODUCT_VERSION}" VIFileVersion "${PRODUCT_VERSION}" diff --git a/meson.build b/meson.build index a76051a9..9e482cab 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ project('janet', 'c', default_options : ['c_std=c99', 'b_lundef=false', 'default_library=both'], - version : '1.5.0') + version : '1.5.1') # Global settings janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') diff --git a/src/boot/boot.janet b/src/boot/boot.janet index 6e62bea2..fb4fd83c 100644 --- a/src/boot/boot.janet +++ b/src/boot/boot.janet @@ -966,13 +966,13 @@ (defn zipcoll "Creates a table from two arrays/tuples. Returns a new table." - [keys vals] + [ks vs] (def res @{}) - (def lk (length keys)) - (def lv (length vals)) + (def lk (length ks)) + (def lv (length vs)) (def len (if (< lk lv) lk lv)) (for i 0 len - (put res (in keys i) (in vals i))) + (put res (in ks i) (in vs i))) res) (defn get-in @@ -981,7 +981,7 @@ [ds ks &opt dflt] (var d ds) (loop [k :in ks :while d] (set d (get d k))) - (or d dflt)) + (if (= nil d) dflt d)) (defn update-in "Update a value in a nested data structure by applying f to the current value. diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h index 09879171..a5908ece 100644 --- a/src/conf/janetconf.h +++ b/src/conf/janetconf.h @@ -28,9 +28,9 @@ #define JANET_VERSION_MAJOR 1 #define JANET_VERSION_MINOR 5 -#define JANET_VERSION_PATCH 0 +#define JANET_VERSION_PATCH 1 #define JANET_VERSION_EXTRA "" -#define JANET_VERSION "1.5.0" +#define JANET_VERSION "1.5.1" /* #define JANET_BUILD "local" */