From f621a133e6e0a516c0586270fea8eaffb4829d82 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 8 Aug 2021 17:56:15 -0400 Subject: No more #export magic syntax. --- stdlib/source/program/compositor/cli.lux | 18 +++++++++--------- stdlib/source/program/compositor/export.lux | 4 ++-- stdlib/source/program/compositor/import.lux | 8 ++++---- stdlib/source/program/compositor/static.lux | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'stdlib/source/program/compositor') diff --git a/stdlib/source/program/compositor/cli.lux b/stdlib/source/program/compositor/cli.lux index f0fdb80be..394869517 100644 --- a/stdlib/source/program/compositor/cli.lux +++ b/stdlib/source/program/compositor/cli.lux @@ -13,25 +13,25 @@ [world [file (#+ Path)]]]]) -(type: #export Source +(type: .public Source Path) -(type: #export Host_Dependency +(type: .public Host_Dependency Path) -(type: #export Library +(type: .public Library Path) -(type: #export Target +(type: .public Target Path) -(type: #export Compilation +(type: .public Compilation [(List Source) (List Host_Dependency) (List Library) Target Module]) -(type: #export Export +(type: .public Export [(List Source) Target]) -(type: #export Service +(type: .public Service (#Compilation Compilation) (#Interpretation Compilation) (#Export Export)) @@ -48,7 +48,7 @@ [module_parser "--module" Module] ) -(def: #export service +(def: .public service (Parser Service) ($_ <>.or (<>.after (cli.this "build") @@ -71,7 +71,7 @@ ..target_parser)) )) -(def: #export target +(def: .public target (-> Service Target) (|>> (case> (^or (#Compilation [sources host_dependencies libraries target module]) (#Interpretation [sources host_dependencies libraries target module]) diff --git a/stdlib/source/program/compositor/export.lux b/stdlib/source/program/compositor/export.lux index 239341e5d..ade242f57 100644 --- a/stdlib/source/program/compositor/export.lux +++ b/stdlib/source/program/compositor/export.lux @@ -39,7 +39,7 @@ {#tar.user commons #tar.group commons})) -(def: #export (library fs sources) +(def: .public (library fs sources) (-> (file.System Async) (List Source) (Async (Try tar.Tar))) (do (try.with async.monad) [files (io.listing fs sources)] @@ -62,7 +62,7 @@ (\ try.monad map row.of_list) (\ async.monad in)))) -(def: #export (export fs [sources target]) +(def: .public (export fs [sources target]) (-> (file.System Async) Export (Async (Try Any))) (do {! (try.with async.monad)} [tar (\ ! map (binary.run tar.writer) diff --git a/stdlib/source/program/compositor/import.lux b/stdlib/source/program/compositor/import.lux index b8e27ebc4..a96f722d9 100644 --- a/stdlib/source/program/compositor/import.lux +++ b/stdlib/source/program/compositor/import.lux @@ -32,14 +32,14 @@ (def: Action (type (All [a] (Async (Try a))))) -(exception: #export useless_tar_entry) +(exception: .public useless_tar_entry) -(exception: #export (duplicate {library Library} {module Module}) +(exception: .public (duplicate {library Library} {module Module}) (exception.report ["Module" (%.text module)] ["Library" (%.text library)])) -(type: #export Import +(type: .public Import (Dictionary file.Path Binary)) (def: (import_library system library import) @@ -67,7 +67,7 @@ import))) (\ ! join))))))) -(def: #export (import system libraries) +(def: .public (import system libraries) (-> (file.System Async) (List Library) (Action Import)) (monad.fold (: (Monad Action) (try.with async.monad)) diff --git a/stdlib/source/program/compositor/static.lux b/stdlib/source/program/compositor/static.lux index ee65f9f72..1208687b3 100644 --- a/stdlib/source/program/compositor/static.lux +++ b/stdlib/source/program/compositor/static.lux @@ -5,7 +5,7 @@ [world [file (#+ Path)]]]]) -(type: #export Static +(type: .public Static {#host Target #host_module_extension Text #target Path -- cgit v1.2.3