mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-11-25 01:37:19 +00:00
Code Issues 1 Releases Wiki Activity

Expose an easy to use debugger function.

Browse Source
This commit is contained in:
Calvin Rose 2022-06-10 15:38:30 -05:00
parent a5b66029d3
commit c3648331f1
2 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
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 - ??? ## Unreleased - ???
- Add `debugger` - an easy to use debugger function that just takes a fiber.
- `dofile` will now start a debugger on errors if the environment it is passed has `:debug` set. - `dofile` will now start a debugger on errors if the environment it is passed has `:debug` set.
- Add `debugger-on-status` function, which can be passed to `run-context` to start a debugger on - Add `debugger-on-status` function, which can be passed to `run-context` to start a debugger on
abnormal fiber signals. abnormal fiber signals.

34
src/boot/boot.janet
View File

@ -2750,17 +2750,17 @@
"An environment that contains dot prefixed functions for debugging." "An environment that contains dot prefixed functions for debugging."
@{}) @{})
(defn debugger-on-status (var- debugger-on-status-var nil)
"Create a function that can be passed to `run-context`'s `:on-status`
argument that will drop into a debugger on errors." (defn debugger
[env &opt level is-repl] "Run a repl-based debugger on a fiber. Optionally pass in a level
to differentiate nested debuggers."
[fiber &opt level]
(default level 1) (default level 1)
(defn enter-debugger (def nextenv (make-env (fiber/getenv fiber)))
[f x] (put nextenv :fiber fiber)
(def nextenv (make-env env))
(put nextenv :fiber f)
(put nextenv :debug-level level) (put nextenv :debug-level level)
(put nextenv :signal x) (put nextenv :signal (fiber/last-value fiber))
(merge-into nextenv debugger-env) (merge-into nextenv debugger-env)
(defn debugger-chunks [buf p] (defn debugger-chunks [buf p]
(def status (:state p :delimiters)) (def status (:state p :delimiters))
@ -2771,11 +2771,19 @@
(flush) (flush)
(run-context (run-context
{:chunks debugger-chunks {:chunks debugger-chunks
:on-status (debugger-on-status nextenv (+ 1 level) true) :on-status (debugger-on-status-var nextenv (+ 1 level) true)
:env nextenv}) :env nextenv})
(print "exiting debug[" level "]") (print "exiting debug[" level "]")
(flush) (flush)
(nextenv :resume-value)) (nextenv :resume-value))
(defn debugger-on-status
"Create a function that can be passed to `run-context`'s `:on-status`
argument that will drop into a debugger on errors. The debugger will
only start on abmnormal signals if the env table has the `:debug` dyn
set to a truthy value."
[env &opt level is-repl]
(default level 1)
(fn [f x] (fn [f x]
(def fs (fiber/status f)) (def fs (fiber/status f))
(if (= :dead fs) (if (= :dead fs)
@ -2786,8 +2794,9 @@
(do (do
(debug/stacktrace f x "") (debug/stacktrace f x "")
(eflush) (eflush)
(if (get env :debug) (enter-debugger f x)))))) (if (get env :debug) (debugger f level))))))
(set debugger-on-status-var debugger-on-status)
(defn dofile (defn dofile
``Evaluate a file, file path, or stream and return the resulting environment. :env, :expander, ``Evaluate a file, file path, or stream and return the resulting environment. :env, :expander,
@ -3697,8 +3706,9 @@
(main ;subargs)) (main ;subargs))
(def f (fiber/new wrap-main guard)) (def f (fiber/new wrap-main guard))
(fiber/setenv f env) (fiber/setenv f env)
(var res nil)
(while (fiber/can-resume? f) (while (fiber/can-resume? f)
(def res (resume f)) (set res (resume f res))
(when (not= :dead (fiber/status f)) (when (not= :dead (fiber/status f))
((debugger-on-status env) f res))))) ((debugger-on-status env) f res)))))