From a59fc865aee240afe21b82ffef2681bb9a6ea693 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 29 Jul 2018 02:30:13 -0400 Subject: Adapted new-luxc to some of the latest changes to Lux. --- new-luxc/source/program.lux | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) (limited to 'new-luxc/source/program.lux') diff --git a/new-luxc/source/program.lux b/new-luxc/source/program.lux index bc5f65e5d..62c3ad03d 100644 --- a/new-luxc/source/program.lux +++ b/new-luxc/source/program.lux @@ -1,17 +1,25 @@ (.module: - lux - (lux (control [monad #+ do] - ["p" parser]) - (concurrency [promise #+ Promise] - [task #+ Task]) - (data ["e" error] - text/format) - [io #- run] - (time [instant]) - [cli #+ program: CLI] - (world [file #+ File])) - (luxc [repl] - (lang [".L" translation]))) + [lux #* + [control + [monad (#+ do)] + ["p" parser]] + [concurrency + ["." promise (#+ Promise)] + [task (#+ Task)]] + [data + ["e" error] + [text + format]] + ["." io (#- run)] + [time + ["." instant]] + ["." cli (#+ CLI program:)] + [world + [file (#+ File)]]] + [luxc + ["." repl] + [lang + [".L" translation]]]) (type: Build {#build-sources (List File) @@ -46,8 +54,8 @@ (def: service (CLI Service) - (p.alt (p.after (cli.this "build") build) - (p.after (cli.this "repl") repl))) + (p.or (p.after (cli.this "build") build) + (p.after (cli.this "repl") repl))) (def: (or-crash! failure-describer action) (All [a] (-> Text (Task a) (Promise a))) -- cgit v1.2.3