diff options
| author | Eduardo Julian | 2021-01-08 19:23:52 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2021-01-08 19:23:52 -0400 |
| commit | 1ce30d50abaa330ab2125b110e245de6deda27c7 (patch) | |
| tree | 6b40e5d5f1282d33dbd31e64b1753fd0c31be79b /lux-js | |
| parent | 75102dcfa7c2c0afd32cb5bf5ac012df2db6a7a1 (diff) | |
Moved "log!" function under "lux/debug".
Diffstat (limited to 'lux-js')
| -rw-r--r-- | lux-js/project.clj | 2 | ||||
| -rw-r--r-- | lux-js/source/program.lux | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lux-js/project.clj b/lux-js/project.clj index 28fcfff87..dfaaf2f5d 100644 --- a/lux-js/project.clj +++ b/lux-js/project.clj @@ -22,7 +22,7 @@ :plugins [[com.github.luxlang/lein-luxc ~version]] :dependencies [[com.github.luxlang/lux-bootstrapper ~version] [com.github.luxlang/stdlib ~version] - [org.openjdk.nashorn/nashorn-core "15.0"]] + [org.openjdk.nashorn/nashorn-core "15.1"]] :manifest {"lux" ~version} :source-paths ["source"] diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux index e402a550f..80e53eade 100644 --- a/lux-js/source/program.lux +++ b/lux-js/source/program.lux @@ -382,7 +382,8 @@ #.None (if (org/openjdk/nashorn/api/scripting/JSObject::isFunction js_object) (exception.return js_object) - (exception.throw ..unknown_kind_of_host_object (:coerce java/lang/Object js_object)))))) + ## (exception.throw ..unknown_kind_of_host_object (:coerce java/lang/Object js_object)) + (exception.return js_object))))) #.None) ## else (exception.throw ..unknown_kind_of_host_object (:coerce java/lang/Object js_object)) @@ -540,7 +541,7 @@ (def: define! ..define!) (def: (ingest context content) - (|> content encoding.from_utf8 try.assume (:coerce _.Statement))) + (|> content (\ encoding.utf8 decode) try.assume (:coerce _.Statement))) (def: (re_learn context content) (..execute! content)) |