diff options
author | Eduardo Julian | 2018-05-10 00:04:20 -0400 |
---|---|---|
committer | Eduardo Julian | 2018-05-10 00:04:20 -0400 |
commit | 022ada35548ef5e0e3b9614f9bb96de9d2137ced (patch) | |
tree | 3e60f4dde470dbaf0c63292945aa2dda2685f881 /new-luxc/source/luxc/lang/translation/jvm/imports.jvm.lux | |
parent | 66def99fde5bc0f19138a0bacd1ea41ad979ab17 (diff) |
- Re-named "Compiler" type to "Lux".
Diffstat (limited to '')
-rw-r--r-- | new-luxc/source/luxc/lang/translation/jvm/imports.jvm.lux | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/new-luxc/source/luxc/lang/translation/jvm/imports.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/imports.jvm.lux index 44314fcf2..de75a4d75 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/imports.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/imports.jvm.lux @@ -45,7 +45,7 @@ (def: import (s.Syntax Import) (s.tuple (p.seq s.text s.text))) (def: compilations - (Var (Dict Text (CompletableFuture (Error Compiler)))) + (Var (Dict Text (CompletableFuture (Error Lux)))) (stm.var (dict.new text.Hash<Text>))) (def: (promise-to-future promise) @@ -61,12 +61,12 @@ (:: io.Monad<IO> map (|>> #e.Success))) (def: (translate-dependency translate-module dependency compiler) - (-> (-> Text Compiler (Process Compiler)) - (-> Text Compiler (IO (Future (Error Compiler))))) + (-> (-> Text Lux (Process Lux)) + (-> Text Lux (IO (Future (Error Lux))))) (<| (Future::get []) promise-to-future (do promise.Monad<Promise> - [[new? future] (stm.commit (: (STM [Bool (CompletableFuture (Error Compiler))]) + [[new? future] (stm.commit (: (STM [Bool (CompletableFuture (Error Lux))]) (do stm.Monad<STM> [current-compilations (stm.read compilations)] (case (dict.get dependency current-compilations) @@ -75,7 +75,7 @@ #.None (do @ - [#let [pending (: (CompletableFuture (Error Compiler)) + [#let [pending (: (CompletableFuture (Error Lux)) (CompletableFuture::new []))] _ (stm.write (dict.put dependency pending current-compilations) compilations)] @@ -104,15 +104,15 @@ from-current))) (def: (merge-compilers current-module dependency total) - (-> Text Compiler Compiler Compiler) + (-> Text Lux Lux Lux) (|> total (update@ #.modules (merge-modules current-module (get@ #.modules dependency))) (set@ #.seed (get@ #.seed dependency)))) (def: #export (translate-imports translate-module annotations) - (-> (-> Text Compiler (Process Compiler)) + (-> (-> Text Lux (Process Lux)) Code - (Meta (Process Compiler))) + (Meta (Process Lux))) (do macro.Monad<Meta> [_ (moduleL.set-annotations annotations) current-module macro.current-module-name @@ -124,7 +124,7 @@ (#e.Error error) (&.throw Invalid-Imports (%code (code.tuple imports))))) - dependencies (monad.map @ (: (-> [Text Text] (Meta (IO (Future (Error Compiler))))) + dependencies (monad.map @ (: (-> [Text Text] (Meta (IO (Future (Error Lux))))) (function (_ [dependency alias]) (do @ [_ (&.assert Module-Cannot-Import-Itself current-module |