diff options
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/program/compositor.lux | 28 | ||||
| -rw-r--r-- | stdlib/source/program/compositor/export.lux | 10 | ||||
| -rw-r--r-- | stdlib/source/program/compositor/import.lux | 4 |
3 files changed, 21 insertions, 21 deletions
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index f18f45e54..783502215 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -63,13 +63,13 @@ (do async.monad [?output action] (case ?output - {#try.Failure error} + {try.#Failure error} (exec (debug.log! (format text.new_line failure_description text.new_line error text.new_line)) (io.run! (\ world/program.default exit +1))) - {#try.Success output} + {try.#Success output} (in output)))) (def: (timed process) @@ -87,11 +87,11 @@ (def: (package! fs host_dependencies [packager package] static archive context) (-> (file.System Async) (Dictionary file.Path Binary) [Packager file.Path] Static Archive Context (Async (Try Any))) (case (packager host_dependencies archive context) - {#try.Success content} + {try.#Success content} (\ fs write content package) - {#try.Failure error} - (\ async.monad in {#try.Failure error}))) + {try.#Failure error} + (\ async.monad in {try.#Failure error}))) (def: (load_host_dependencies fs host_dependencies) (-> (file.System Async) (List file.Path) (Async (Try (Dictionary file.Path Binary)))) @@ -101,10 +101,10 @@ output (: (Dictionary file.Path Binary) (dictionary.empty text.hash))] (case pending - #.End + {.#End} (in output) - {#.Item head tail} + {.#Item head tail} (do ! [content (\ fs read head)] (recur tail @@ -131,12 +131,12 @@ (do [! async.monad] [platform (async.future platform)] (case service - {#/cli.Compilation compilation} + {/cli.#Compilation compilation} (<| (or_crash! "Compilation failed:") ..timed (do (try.with async.monad) [.let [[compilation_sources compilation_host_dependencies compilation_libraries compilation_target compilation_module] compilation] - import (/import.import (value@ #platform.&file_system platform) compilation_libraries) + import (/import.import (value@ platform.#&file_system platform) compilation_libraries) [state archive phase_wrapper] (:sharing [<parameters>] (Platform <parameters>) platform @@ -152,9 +152,9 @@ (Async (Try [Archive (directive.State+ <parameters>)])) (:expected (platform.compile phase_wrapper import static expander platform compilation [archive state]))) - _ (ioW.freeze (value@ #platform.&file_system platform) static archive) + _ (ioW.freeze (value@ platform.#&file_system platform) static archive) program_context (async\in ($/program.context archive)) - host_dependencies (..load_host_dependencies (value@ #platform.&file_system platform) compilation_host_dependencies) + host_dependencies (..load_host_dependencies (value@ platform.#&file_system platform) compilation_host_dependencies) _ (..package! (for [@.old (file.async file.default) @.jvm (file.async file.default) @.js file.default]) @@ -165,14 +165,14 @@ program_context)] (in (debug.log! "Compilation complete!")))) - {#/cli.Export export} + {/cli.#Export export} (<| (or_crash! "Export failed:") (do (try.with async.monad) - [_ (/export.export (value@ #platform.&file_system platform) + [_ (/export.export (value@ platform.#&file_system platform) export)] (in (debug.log! "Export complete!")))) - {#/cli.Interpretation interpretation} + {/cli.#Interpretation interpretation} ... TODO: Fix the interpreter... (undefined) ... (<| (or_crash! "Interpretation failed:") diff --git a/stdlib/source/program/compositor/export.lux b/stdlib/source/program/compositor/export.lux index 3588e1dde..90234875a 100644 --- a/stdlib/source/program/compositor/export.lux +++ b/stdlib/source/program/compositor/export.lux @@ -34,10 +34,10 @@ (def: no_ownership tar.Ownership (let [commons (: tar.Owner - [#tar.name tar.anonymous - #tar.id tar.no_id])] - [#tar.user commons - #tar.group commons])) + [tar.#name tar.anonymous + tar.#id tar.no_id])] + [tar.#user commons + tar.#group commons])) (def: .public (library fs sources) (-> (file.System Async) (List Source) (Async (Try tar.Tar))) @@ -51,7 +51,7 @@ (text.replaced (\ fs separator) .module_separator) tar.path) source_code (tar.content source_code)] - (in {#tar.Normal [path + (in {tar.#Normal [path (instant.of_millis +0) ($_ tar.and tar.read_by_owner tar.write_by_owner diff --git a/stdlib/source/program/compositor/import.lux b/stdlib/source/program/compositor/import.lux index 278e992fb..9b84e22c6 100644 --- a/stdlib/source/program/compositor/import.lux +++ b/stdlib/source/program/compositor/import.lux @@ -54,10 +54,10 @@ (\ ! each (|>> row.list (monad.mix ! (function (_ entry import) (case entry - {#tar.Normal [path instant mode ownership content]} + {tar.#Normal [path instant mode ownership content]} (let [path (tar.from_path path)] (case (dictionary.has' path (tar.data content) import) - {#try.Failure error} + {try.#Failure error} (exception.except ..duplicate [library path]) import' |