mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-06-14 20:44:13 +00:00
Code Issues 1 Releases Wiki Activity

Add dofile function.

Browse Source 
Abstracts the actually running of a file from
the require function, so a file can be easily
evaluated without being cached.
This commit is contained in:
Calvin Rose 2019-05-10 10:19:51 -04:00
parent 52ab9fb475
commit 3388acd2db
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/boot/boot.janet
View File

@ -1646,24 +1646,12 @@
circular dependencies." circular dependencies."
@{}) @{})
(defn require (defn dofile
"Require a module with the given name. Will search all of the paths in "Evaluate a file in a new environment and return the new environment."
module/paths, then the path as a raw file path. Returns the new environment
returned from compiling and running the file."
[path & args] [path & args]
(def {:exit exit-on-error} (table ;args)) (def {:exit exit-on-error} (table ;args))
(if-let [check (get module/cache path)] (def f (file/open path))
check
(do
(def [fullpath mod-kind] (module/find path))
(unless fullpath (error mod-kind))
(def env
(case mod-kind
:source (do
# Normal janet module
(def f (file/open fullpath))
(def newenv (make-env)) (def newenv (make-env))
(put module/loading fullpath true)
(defn chunks [buf _] (file/read f 2048 buf)) (defn chunks [buf _] (file/read f 2048 buf))
(defn bp [&opt x y] (defn bp [&opt x y]
(def ret (bad-parse x y)) (def ret (bad-parse x y))
@ -1681,10 +1669,27 @@
(when (not= (fiber/status f) :dead) (when (not= (fiber/status f) :dead)
(debug/stacktrace f x) (debug/stacktrace f x)
(if exit-on-error (os/exit 1)))) (if exit-on-error (os/exit 1))))
:source fullpath}) :source path})
(file/close f) (file/close f)
(put module/loading fullpath nil)
(table/setproto newenv nil)) (table/setproto newenv nil))
(defn require
"Require a module with the given name. Will search all of the paths in
module/paths, then the path as a raw file path. Returns the new environment
returned from compiling and running the file."
[path & args]
(if-let [check (get module/cache path)]
check
(do
(def [fullpath mod-kind] (module/find path))
(unless fullpath (error mod-kind))
(def env
(case mod-kind
:source (do
(put module/loading fullpath true)
(def newenv (dofile fullpath ;args))
(put module/loading fullpath nil)
newenv)
:native (native fullpath (make-env)) :native (native fullpath (make-env))
:image (load-image (slurp fullpath)))) :image (load-image (slurp fullpath))))
(put module/cache fullpath env) (put module/cache fullpath env)