From 706ce9e4916b65c4df5101bd3cc1b4da3b2057af Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 9 Jan 2021 12:58:50 -0400 Subject: Turned I64 and variant creation functions into constructors for JS. --- stdlib/source/program/aedifex/artifact/value.lux | 18 ++++++------------ stdlib/source/program/compositor.lux | 11 ++++++----- 2 files changed, 12 insertions(+), 17 deletions(-) (limited to 'stdlib/source/program') diff --git a/stdlib/source/program/aedifex/artifact/value.lux b/stdlib/source/program/aedifex/artifact/value.lux index eb5c33c22..3e92dbf16 100644 --- a/stdlib/source/program/aedifex/artifact/value.lux +++ b/stdlib/source/program/aedifex/artifact/value.lux @@ -1,25 +1,19 @@ (.module: - [lux (#- Name Type) + [lux #* [abstract [equivalence (#+ Equivalence)]] [data ["." product] ["." text ["%" format]] - [format - ["." xml]] [collection ["." list ("#\." functor)]]] [math [number - ["n" nat]]] - ["." time (#+ Time) - ["." instant (#+ Instant)] - ["." date (#+ Date)] - ["." year] - ["." month]]] + ["." nat]]] + [time + ["." instant]]] [// (#+ Version) - [type (#+ Type)] ["." time_stamp (#+ Time_Stamp)]]) (type: #export Build @@ -35,7 +29,7 @@ ($_ product.equivalence text.equivalence instant.equivalence - n.equivalence + nat.equivalence )) (def: separator @@ -44,7 +38,7 @@ (def: snapshot "SNAPSHOT") -(def: #export (format [version time_stamp build]) +(def: #export (format (^slots [#version #time_stamp #build])) (%.Format Value) (%.format (text.replace_all ..snapshot (time_stamp.format time_stamp) diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index 2788783cc..63325ff0b 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -1,6 +1,7 @@ (.module: [lux (#- Module) [type (#+ :share)] + ["." debug] ["@" target (#+ Host)] [abstract [monad (#+ Monad do)]] @@ -62,9 +63,9 @@ [?output action] (case ?output (#try.Failure error) - (exec (log! (format text.new_line - failure_description text.new_line - error text.new_line)) + (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) @@ -141,14 +142,14 @@ _ (ioW.freeze (get@ #platform.&file_system platform) static archive) program_context (promise\wrap ($/program.context archive)) _ (promise.future (..package! io.monad file.default packager,package static archive program_context))] - (wrap (log! "Compilation complete!")))) + (wrap (debug.log! "Compilation complete!")))) (#/cli.Export export) (<| (or_crash! "Export failed:") (do (try.with promise.monad) [_ (/export.export (get@ #platform.&file_system platform) export)] - (wrap (log! "Export complete!")))) + (wrap (debug.log! "Export complete!")))) (#/cli.Interpretation interpretation) ## TODO: Fix the interpreter... -- cgit v1.2.3