diff options
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/lux/concurrency/promise.lux | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/stdlib/source/lux/concurrency/promise.lux b/stdlib/source/lux/concurrency/promise.lux index c68b1fc17..f84b659ff 100644 --- a/stdlib/source/lux/concurrency/promise.lux +++ b/stdlib/source/lux/concurrency/promise.lux @@ -1,5 +1,5 @@ (.module: - [lux #* + [lux (#- and or) [control [functor (#+ Functor)] [apply (#+ Apply)] @@ -108,7 +108,7 @@ mma) ma)))) -(def: #export (seq left right) +(def: #export (and left right) {#.doc "Sequencing combinator."} (All [a b] (-> (Promise a) (Promise b) (Promise [a b]))) (do Monad<Promise> @@ -116,7 +116,7 @@ b right] (wrap [a b]))) -(def: #export (alt left right) +(def: #export (or left right) {#.doc "Heterogeneous alternative combinator."} (All [a b] (-> (Promise a) (Promise b) (Promise (| a b)))) (let [a|b (promise #.None)] @@ -170,4 +170,4 @@ (def: #export (time-out time-millis promise) {#.doc "Wait for a promise to be resolved within the specified amount of milliseconds."} (All [a] (-> Nat (Promise a) (Promise (Maybe a)))) - (alt (wait time-millis) promise)) + (..or (wait time-millis) promise)) |