diff --git a/CHANGELOG.md b/CHANGELOG.md index c13352e3..924d909e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ All notable changes to this project will be documented in this file. ## Unreleased - ??? +- Add `merge-module` to core. - During installation and release, merge janetconf.h into janet.h for easier install. - Add `upscope` special form. - `os/execute` and `os/spawn` can take streams for redirecting IO. diff --git a/src/boot/boot.janet b/src/boot/boot.janet index bc3ea089..42687a5f 100644 --- a/src/boot/boot.janet +++ b/src/boot/boot.janet @@ -2489,11 +2489,22 @@ [path & args] (require-1 path args (struct ;args))) +(defn merge-module + "Merge a module source into the target environment with a prefix, as with the import macro. + This lets users emulate the behavior of import with a custom module table. + If export is truthy, then merged functions are not marked as private. Returns + the modified target environment." + [target source &opt prefix export] + (loop [[k v] :pairs source :when (symbol? k) :when (not (v :private))] + (def newv (table/setproto @{:private (not export)} v)) + (put target (symbol prefix k) newv)) + target) + (defn import* "Function form of import. Same parameters, but the path and other symbol parameters should be strings instead." [path & args] - (def env (fiber/getenv (fiber/current))) + (def env (curenv)) (def kargs (table ;args)) (def {:as as :prefix prefix @@ -2503,9 +2514,7 @@ (and as (string as "/")) prefix (string (last (string/split "/" path)) "/"))) - (loop [[k v] :pairs newenv :when (symbol? k) :when (not (v :private))] - (def newv (table/setproto @{:private (not ep)} v)) - (put env (symbol prefix k) newv))) + (merge-module env newenv prefix ep)) (undef require-1)