diff options
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/lux/control/concurrency/actor.lux | 16 | ||||
-rw-r--r-- | stdlib/source/lux/control/concurrency/frp.lux | 12 |
2 files changed, 13 insertions, 15 deletions
diff --git a/stdlib/source/lux/control/concurrency/actor.lux b/stdlib/source/lux/control/concurrency/actor.lux index aa30efa76..97c080273 100644 --- a/stdlib/source/lux/control/concurrency/actor.lux +++ b/stdlib/source/lux/control/concurrency/actor.lux @@ -7,7 +7,7 @@ ["." function] ["." try (#+ Try)] ["." exception (#+ exception:)] - ["." io (#+ IO io) ("#@." monad)] + ["." io (#+ IO io)] ["<>" parser ["<c>" code (#+ Parser)]]] [data @@ -17,7 +17,7 @@ [text ["%" format (#+ format)]] [collection - ["." list ("#@." monoid monad fold)]]] + ["." list ("#\." monoid monad fold)]]] [macro ["." code] [syntax (#+ syntax:) @@ -30,7 +30,7 @@ ["." abstract (#+ abstract: :representation :abstraction)]]] [// ["." atom (#+ Atom atom)] - ["." promise (#+ Promise Resolver) ("#@." monad)] + ["." promise (#+ Promise Resolver) ("#\." monad)] ["." frp (#+ Channel)]]) (exception: #export poisoned) @@ -200,7 +200,7 @@ (def: (default-on-stop cause state) (All [s] (-> Text s (Promise Any))) - (promise@wrap [])) + (promise\wrap [])) (def: #export default (All [s] (Behavior s s)) @@ -312,7 +312,7 @@ (do meta.monad [g!type (meta.gensym (format name "-abstract-type")) #let [g!actor (code.local-identifier name) - g!vars (list@map code.local-identifier vars)]] + g!vars (list\map code.local-identifier vars)]] (wrap (list (` ((~! abstract:) (~+ (csw.export export)) ((~ g!type) (~+ g!vars)) (~ state-type) @@ -376,9 +376,9 @@ #let [g!type (code.local-identifier (get@ #abstract.name actor-scope)) g!message (code.local-identifier (get@ #name signature)) g!actor-vars (get@ #abstract.type-vars actor-scope) - g!all-vars (|> (get@ #vars signature) (list@map code.local-identifier) (list@compose g!actor-vars)) - g!inputsC (|> (get@ #inputs signature) (list@map product.left)) - g!inputsT (|> (get@ #inputs signature) (list@map product.right)) + g!all-vars (|> (get@ #vars signature) (list\map code.local-identifier) (list\compose g!actor-vars)) + g!inputsC (|> (get@ #inputs signature) (list\map product.left)) + g!inputsT (|> (get@ #inputs signature) (list\map product.right)) g!state (|> signature (get@ #state) code.local-identifier) g!self (|> signature (get@ #self) code.local-identifier)]] (wrap (list (` (def: (~+ (csw.export export)) ((~ g!message) (~+ g!inputsC)) diff --git a/stdlib/source/lux/control/concurrency/frp.lux b/stdlib/source/lux/control/concurrency/frp.lux index fdec66a61..f4dbffe81 100644 --- a/stdlib/source/lux/control/concurrency/frp.lux +++ b/stdlib/source/lux/control/concurrency/frp.lux @@ -11,14 +11,12 @@ ["." exception (#+ exception:)] ["." io (#+ IO io)]] [data - ["." maybe ("#@." functor)] - [collection - ["." list ("#@." monoid)]]] + ["." maybe ("#\." functor)]] [type (#+ :share) abstract]] [// ["." atom (#+ Atom)] - ["." promise (#+ Promise) ("#@." functor)]]) + ["." promise (#+ Promise) ("#\." functor)]]) (type: #export (Channel a) {#.doc "An asynchronous channel to distribute values."} @@ -89,8 +87,8 @@ (Functor Channel) (def: (map f) - (promise@map - (maybe@map + (promise\map + (maybe\map (function (_ [head tail]) [(f head) (map f tail)]))))) @@ -185,7 +183,7 @@ (def: #export (from-promise promise) (All [a] (-> (Promise a) (Channel a))) - (promise@map (function (_ value) + (promise\map (function (_ value) (#.Some [value ..empty])) promise)) |