1
0
mirror of https://github.com/janet-lang/janet synced 2024-12-27 17:00:27 +00:00

Allow source location in run-context to be updated

This commit is contained in:
Michael Camilleri 2021-02-22 12:38:56 +09:00
parent a5f237993d
commit 855a9a01fc
No known key found for this signature in database
GPG Key ID: 7EB218A48DF8B572

View File

@ -2098,7 +2098,7 @@
:on-parse-error on-parse-error :on-parse-error on-parse-error
:fiber-flags guard :fiber-flags guard
:evaluator evaluator :evaluator evaluator
:source where :source default-where
:parser parser :parser parser
:read read :read read
:expander expand} opts) :expander expand} opts)
@ -2108,9 +2108,11 @@
(default on-compile-error bad-compile) (default on-compile-error bad-compile)
(default on-parse-error bad-parse) (default on-parse-error bad-parse)
(default evaluator (fn evaluate [x &] (x))) (default evaluator (fn evaluate [x &] (x)))
(default where "<anonymous>") (default default-where "<anonymous>")
(default guard :ydt) (default guard :ydt)
(var where default-where)
# Evaluate 1 source form in a protected manner # Evaluate 1 source form in a protected manner
(defn eval1 [source &opt l c] (defn eval1 [source &opt l c]
(def source (if expand (expand source) source)) (def source (if expand (expand source) source))
@ -2163,11 +2165,16 @@
(while parser-not-done (while parser-not-done
(if (env :exit) (break)) (if (env :exit) (break))
(buffer/clear buf) (buffer/clear buf)
(if (= (chunks buf p) :cancel) (match (= (chunks buf p))
:cancel
(do (do
# A :cancel chunk represents a cancelled form in the REPL, so reset. # A :cancel chunk represents a cancelled form in the REPL, so reset.
(:flush p) (:flush p)
(buffer/clear buf)) (buffer/clear buf))
[:source new-where]
(set where new-where)
(do (do
(var pindex 0) (var pindex 0)
(var pstatus nil) (var pstatus nil)