mirrors
/
janet
mirror of https://github.com/janet-lang/janet
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Merge branch 'master' of github.com:janet-lang/janet

This commit is contained in:
Calvin Rose 2021-01-16 18:29:23 -06:00
parent 6dfb689d1f 95af205681
commit 70e23df6f8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
## Unreleased - ??? ## Unreleased - ???
- Add `doc-of` for reverse documentation lookup. - Add `doc-of` for reverse documentation lookup.
- Add `ev/give-supervsior` to send a message to the supervising channel.
- Add `ev/gather` and `chan` argument to `ev/go`. This new argument allows "supervisor channels" - Add `ev/gather` and `chan` argument to `ev/go`. This new argument allows "supervisor channels"
for fibers to enable structured concurrency. for fibers to enable structured concurrency.
- Make `-k` flag work on stdin if no files are given. - Make `-k` flag work on stdin if no files are given.
@ -28,7 +29,8 @@ All notable changes to this project will be documented in this file.
the project root. This is backwards incompatible and dependencies should be updated for this. the project root. This is backwards incompatible and dependencies should be updated for this.
- Change hash function for numbers. - Change hash function for numbers.
- Improve error handling of `dofile`. - Improve error handling of `dofile`.
- Bug fixes in networking code and improvements in doc strings. - Bug fixes in networking and subprocess code.
- Use markdown formatting in more places for docstrings.
## 1.13.1 - 2020-12-13 ## 1.13.1 - 2020-12-13
- Pretty printing a table with a prototype will look for `:_name` instead of `:name` - Pretty printing a table with a prototype will look for `:_name` instead of `:name`

10
src/boot/boot.janet
View File

@ -3285,7 +3285,8 @@
(if-let [jp (getenv-alias "JANET_PATH")] (setdyn :syspath jp)) (if-let [jp (getenv-alias "JANET_PATH")] (setdyn :syspath jp))
(if-let [jp (getenv-alias "JANET_HEADERPATH")] (setdyn :headerpath jp)) (if-let [jp (getenv-alias "JANET_HEADERPATH")] (setdyn :headerpath jp))
(if-let [jprofile (getenv-alias "JANET_PROFILE")] (setdyn :profilepath jprofile))
# Flag handlers # Flag handlers
(def handlers (def handlers
{"h" (fn [&] {"h" (fn [&]
@ -3299,6 +3300,7 @@
-e code : Execute a string of janet -e code : Execute a string of janet
-d : Set the debug flag in the REPL -d : Set the debug flag in the REPL
-r : Enter the REPL after running all scripts -r : Enter the REPL after running all scripts
-R : Disables loading profile.janet when JANET_PROFILE is present
-p : Keep on executing if there is a top-level error (persistent) -p : Keep on executing if there is a top-level error (persistent)
-q : Hide logo (quiet) -q : Hide logo (quiet)
-k : Compile scripts but do not execute (flycheck) -k : Compile scripts but do not execute (flycheck)
@ -3332,7 +3334,8 @@
(set *no-file* false) (set *no-file* false)
(eval-string (in args (+ i 1))) (eval-string (in args (+ i 1)))
2) 2)
"d" (fn [&] (set *debug* true) 1)}) "d" (fn [&] (set *debug* true) 1)
"R" (fn [&] (setdyn :profilepath nil) 1)})
(defn- dohandler [n i &] (defn- dohandler [n i &]
(def h (in handlers n)) (def h (in handlers n))
@ -3374,6 +3377,9 @@
(file/flush stdout) (file/flush stdout)
(file/read stdin :line buf)) (file/read stdin :line buf))
(def env (make-env)) (def env (make-env))
(when-let [profile.janet (dyn :profilepath)]
(def new-env (dofile profile.janet :exit true))
(merge-module env new-env "" false))
(if *debug* (put env :debug true)) (if *debug* (put env :debug true))
(def getter (if *raw-stdin* getstdin getline)) (def getter (if *raw-stdin* getstdin getline))
(defn getchunk [buf p] (defn getchunk [buf p]