From 93eb82e1bf6d2f2a6b3b0adb85f4ab93cbb766a9 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Mon, 14 Mar 2022 03:33:01 -0400 Subject: De-sigil-ification: @ --- stdlib/source/test/aedifex/command/auto.lux | 96 +++++++++---------- stdlib/source/test/aedifex/command/build.lux | 82 ++++++++-------- stdlib/source/test/aedifex/command/clean.lux | 70 +++++++------- stdlib/source/test/aedifex/command/deploy.lux | 110 ++++++++++----------- stdlib/source/test/aedifex/command/deps.lux | 126 ++++++++++++------------- stdlib/source/test/aedifex/command/install.lux | 82 ++++++++-------- stdlib/source/test/aedifex/command/pom.lux | 60 ++++++------ stdlib/source/test/aedifex/command/test.lux | 84 ++++++++--------- 8 files changed, 355 insertions(+), 355 deletions(-) (limited to 'stdlib/source/test/aedifex/command') diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux index 9e315ebde..a9e9c56fb 100644 --- a/stdlib/source/test/aedifex/command/auto.lux +++ b/stdlib/source/test/aedifex/command/auto.lux @@ -1,48 +1,48 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - [pipe {"+" case>}] - ["[0]" try] - [parser - ["[0]" environment]] - [concurrency - ["[0]" atom {"+" Atom}] - ["[0]" async {"+" Async}]]] - [data - ["[0]" binary] - ["[0]" text - ["%" format {"+" format}] - [encoding - ["[0]" utf8]]] - [collection - ["[0]" set]]] - [math - ["[0]" random] - [number - ["n" nat]]] - [time - ["[0]" instant]] - [world - [console {"+" Console}] - ["[0]" shell {"+" Exit Shell}] - ["[0]" program {"+" Program}] - ["[0]" file - ["[0]" watch]]]]] - ["[0]" // "_" - ["$[0]" version] - ["$[0]" build]] - [\\program - ["[0]" / - ["//[1]" /// "_" - [command {"+" Command}] - ["[1]" profile {"+" Profile}] - ["[1][0]" action] - [dependency - [resolution {"+" Resolution}]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + [pipe {"+" case>}] + ["[0]" try] + [parser + ["[0]" environment]] + [concurrency + ["[0]" atom {"+" Atom}] + ["[0]" async {"+" Async}]]] + [data + ["[0]" binary] + ["[0]" text + ["%" format {"+" format}] + [encoding + ["[0]" utf8]]] + [collection + ["[0]" set]]] + [math + ["[0]" random] + [number + ["n" nat]]] + [time + ["[0]" instant]] + [world + [console {"+" Console}] + ["[0]" shell {"+" Exit Shell}] + ["[0]" program {"+" Program}] + ["[0]" file + ["[0]" watch]]]]] + ["[0]" // "_" + ["$[0]" version] + ["$[0]" build]] + [\\program + ["[0]" / + ["//[1]" /// "_" + [command {"+" Command}] + ["[1]" profile {"+" Profile}] + ["[1][0]" action] + [dependency + [resolution {"+" Resolution}]]]]]) (def: (command expected_runs end_signal fs dummy_file) (-> Nat Text (file.System Async) file.Path @@ -77,14 +77,14 @@ .let [empty_profile (: Profile (# ///.monoid identity)) with_target (: (-> Profile Profile) - (with@ ///.#target target)) + (has ///.#target target)) with_program (: (-> Profile Profile) - (with@ ///.#program {.#Some program})) + (has ///.#program {.#Some program})) profile (|> empty_profile with_program with_target - (with@ ///.#sources (set.of_list text.hash (list source))))] + (has ///.#sources (set.of_list text.hash (list source))))] home (random.ascii/alpha 5) working_directory (random.ascii/alpha 5) @@ -103,7 +103,7 @@ _ (# watcher poll [])] (do [! async.monad] [no_dangling_process! (|> profile - (with@ ///.#compiler compiler) + (has ///.#compiler compiler) ((/.do! 1 watcher command) ($version.echo "") (program.async (program.mock environment.empty home working_directory)) diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux index 4237bc8af..0b8eac768 100644 --- a/stdlib/source/test/aedifex/command/build.lux +++ b/stdlib/source/test/aedifex/command/build.lux @@ -1,41 +1,41 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - [pipe {"+" case>}] - [io {"+" IO}] - ["[0]" try] - ["[0]" exception] - [concurrency - ["[0]" async {"+" Async}]] - [parser - ["[0]" environment]]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [collection - ["[0]" dictionary]]] - [math - ["[0]" random {"+" Random}]] - [world - ["[0]" file] - ["[0]" shell {"+" Shell}] - ["[0]" program]]]] - ["[0]" // "_" - ["@[0]" version] - ["$/[1]" // "_" - ["[1][0]" package]]] - [\\program - ["[0]" / - ["//[1]" /// "_" - ["[1]" profile {"+" Profile}] - ["[1][0]" action] - ["[1][0]" artifact - ["[1]/[0]" type]] - ["[1][0]" dependency {"+" Dependency} - ["[1]/[0]" resolution {"+" Resolution}]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + [pipe {"+" case>}] + [io {"+" IO}] + ["[0]" try] + ["[0]" exception] + [concurrency + ["[0]" async {"+" Async}]] + [parser + ["[0]" environment]]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [collection + ["[0]" dictionary]]] + [math + ["[0]" random {"+" Random}]] + [world + ["[0]" file] + ["[0]" shell {"+" Shell}] + ["[0]" program]]]] + ["[0]" // "_" + ["@[0]" version] + ["$/[1]" // "_" + ["[1][0]" package]]] + [\\program + ["[0]" / + ["//[1]" /// "_" + ["[1]" profile {"+" Profile}] + ["[1][0]" action] + ["[1][0]" artifact + ["[1]/[0]" type]] + ["[1][0]" dependency {"+" Dependency} + ["[1]/[0]" resolution {"+" Resolution}]]]]]) (def: .public good_shell (-> Any (Shell IO)) @@ -151,9 +151,9 @@ .let [empty_profile (: Profile (# ///.monoid identity)) with_target (: (-> Profile Profile) - (with@ ///.#target target)) + (has ///.#target target)) with_program (: (-> Profile Profile) - (with@ ///.#program {.#Some program})) + (has ///.#program {.#Some program})) profile (|> empty_profile with_program @@ -185,7 +185,7 @@ [verdict (do ///action.monad [_ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs shell resolution - (with@ ///.#compiler compiler profile)) + (has ///.#compiler compiler profile)) start (# console read_line []) end (# console read_line [])] (in (and (text#= /.start start) @@ -207,7 +207,7 @@ [verdict (do ///action.monad [_ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs (shell.async (..bad_shell [])) resolution - (with@ ///.#compiler compiler profile)) + (has ///.#compiler compiler profile)) start (# console read_line []) end (# console read_line [])] (in (and (text#= /.start start) diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux index c66150d63..6a2210f1b 100644 --- a/stdlib/source/test/aedifex/command/clean.lux +++ b/stdlib/source/test/aedifex/command/clean.lux @@ -1,40 +1,40 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}]]] - [data - [binary {"+" Binary}] - ["[0]" product] - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor)] - ["[0]" set]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]] - [world - ["[0]" file {"+" Path}]]]] + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}]]] + [data + [binary {"+" Binary}] + ["[0]" product] + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor)] + ["[0]" set]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]] + [world + ["[0]" file {"+" Path}]]]] + [// + ["@[0]" version] [// - ["@[0]" version] + ["@[0]" profile] [// - ["@[0]" profile] - [// - [lux - [data - ["$[0]" binary]]]]]] - [\\program - ["[0]" / - ["//[1]" /// "_" - ["[1]" profile] - ["[1][0]" action {"+" Action}]]]]) + [lux + [data + ["$[0]" binary]]]]]] + [\\program + ["[0]" / + ["//[1]" /// "_" + ["[1]" profile] + ["[1][0]" action {"+" Action}]]]]) (def: node_name (Random Text) @@ -103,7 +103,7 @@ context_exists!/pre (..directory_exists? fs context) target_exists!/pre (..assets_exist? fs target_path direct_files) sub_exists!/pre (..assets_exist? fs sub_path sub_files) - _ (/.do! console fs (with@ ///.#target target_path dummy)) + _ (/.do! console fs (has ///.#target target_path dummy)) context_exists!/post (..directory_exists? fs context) target_exists!/post (..assets_exist? fs target_path direct_files) sub_exists!/post (..assets_exist? fs sub_path sub_files) diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux index 62c1ef931..7cdba510d 100644 --- a/stdlib/source/test/aedifex/command/deploy.lux +++ b/stdlib/source/test/aedifex/command/deploy.lux @@ -1,53 +1,53 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" maybe] - ["[0]" try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}]] - [parser - ["[0]" environment]]] - [data - ["[0]" binary ("[1]#[0]" equivalence)] - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}] - [encoding - ["[0]" utf8]]] - ["[0]" format "_" - ["[1]" binary] - ["[0]" tar] - ["[0]" xml]] - [collection - ["[0]" set]]] - [math - ["[0]" random]] - [world - ["[0]" file] - ["[0]" program {"+" Program}]]]] - [program - [compositor - ["[0]" export]]] + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" maybe] + ["[0]" try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}]] + [parser + ["[0]" environment]]] + [data + ["[0]" binary ("[1]#[0]" equivalence)] + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}] + [encoding + ["[0]" utf8]]] + ["[0]" format "_" + ["[1]" binary] + ["[0]" tar] + ["[0]" xml]] + [collection + ["[0]" set]]] + [math + ["[0]" random]] + [world + ["[0]" file] + ["[0]" program {"+" Program}]]]] + [program + [compositor + ["[0]" export]]] + [// + ["$[0]" install] + ["$[0]" version] [// - ["$[0]" install] - ["$[0]" version] - [// - ["$[0]" profile] - ["$[0]" repository]]] - [\\program - ["[0]" / - ["//[1]" /// "_" - ["[1]" profile] - ["[1][0]" action] - ["[1][0]" pom] - ["[1][0]" hash] - ["[1][0]" repository {"+" Repository} - ["[1]/[0]" remote]] - ["[1][0]" artifact {"+" Artifact} - ["[1]/[0]" extension]]]]]) + ["$[0]" profile] + ["$[0]" repository]]] + [\\program + ["[0]" / + ["//[1]" /// "_" + ["[1]" profile] + ["[1][0]" action] + ["[1][0]" pom] + ["[1][0]" hash] + ["[1][0]" repository {"+" Repository} + ["[1]/[0]" remote]] + ["[1][0]" artifact {"+" Artifact} + ["[1]/[0]" extension]]]]]) (def: (execute! program repository fs artifact profile) (-> (Program Async) (Repository Async) (file.System Async) @@ -55,7 +55,7 @@ (Async (Try Text))) (do ///action.monad [.let [console ($version.echo "")] - _ ($install.make_sources! fs (value@ ///.#sources profile)) + _ ($install.make_sources! fs (the ///.#sources profile)) _ (/.do! console repository fs artifact profile)] (# console read_line []))) @@ -66,7 +66,7 @@ [[artifact expected_pom profile] (random.one (function (_ profile) (do maybe.monad - [artifact (value@ ///.#identity profile) + [artifact (the ///.#identity profile) expected_pom (try.maybe (///pom.write profile))] (in [artifact expected_pom profile]))) $profile.random) @@ -81,19 +81,19 @@ [verdict (do [! ///action.monad] [logging (..execute! program repository fs artifact profile) expected_library (|> profile - (value@ ///.#sources) + (the ///.#sources) set.list (export.library fs) (# ! each (format.result tar.writer))) - actual_pom (# repository download (///repository/remote.uri (value@ ///artifact.#version artifact) artifact ///artifact/extension.pom)) - actual_library (# repository download (///repository/remote.uri (value@ ///artifact.#version artifact) artifact ///artifact/extension.lux_library)) - actual_sha-1 (# repository download (///repository/remote.uri (value@ ///artifact.#version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1))) + actual_pom (# repository download (///repository/remote.uri (the ///artifact.#version artifact) artifact ///artifact/extension.pom)) + actual_library (# repository download (///repository/remote.uri (the ///artifact.#version artifact) artifact ///artifact/extension.lux_library)) + actual_sha-1 (# repository download (///repository/remote.uri (the ///artifact.#version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1))) actual_sha-1 (# async.monad in (do try.monad [actual_sha-1 (# utf8.codec decoded actual_sha-1)] (# ///hash.sha-1_codec decoded actual_sha-1))) - actual_md5 (# repository download (///repository/remote.uri (value@ ///artifact.#version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.md5))) + actual_md5 (# repository download (///repository/remote.uri (the ///artifact.#version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.md5))) actual_md5 (# async.monad in (do try.monad [actual_md5 (# utf8.codec decoded actual_md5)] diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux index 0362bce14..5b6c42a9c 100644 --- a/stdlib/source/test/aedifex/command/deps.lux +++ b/stdlib/source/test/aedifex/command/deps.lux @@ -1,56 +1,56 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - ["[0]" predicate]] - [control - ["[0]" try] - [concurrency - ["[0]" async]] - [parser - ["[0]" environment]]] - [data - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}] - [encoding - ["[0]" utf8]]] - [collection - ["[0]" dictionary] - ["[0]" set]] - [format - ["[0]" xml]]] - [math - ["[0]" random {"+" Random}]] - [world - ["[0]" program] - ["[0]" file]]]] - ["[0]" // "_" - ["@[0]" version] - ["$/[1]" // "_" - ["[1][0]" package] - ["[1][0]" artifact] - ["[1][0]" dependency "_" - ["[1]/[0]" resolution]]]] - [\\program - ["[0]" / + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + ["[0]" predicate]] + [control + ["[0]" try] + [concurrency + ["[0]" async]] + [parser + ["[0]" environment]]] + [data + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}] + [encoding + ["[0]" utf8]]] + [collection + ["[0]" dictionary] + ["[0]" set]] + [format + ["[0]" xml]]] + [math + ["[0]" random {"+" Random}]] + [world + ["[0]" program] + ["[0]" file]]]] + ["[0]" // "_" + ["@[0]" version] + ["$/[1]" // "_" + ["[1][0]" package] + ["[1][0]" artifact] + ["[1][0]" dependency "_" + ["[1]/[0]" resolution]]]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1][0]" clean] ["/[1]" // "_" - ["[1][0]" clean] - ["/[1]" // "_" - ["[1]" profile] - ["[1][0]" action] - ["[1][0]" pom] - ["[1][0]" package] - ["[1][0]" artifact - ["[1]/[0]" type]] - ["[1][0]" dependency - ["[1]/[0]" resolution] - ["[1]/[0]" deployment] - ["[1]/[0]" status]] - ["[1][0]" repository - ["[1]/[0]" origin] - ["[1]/[0]" local]]]]]]) + ["[1]" profile] + ["[1][0]" action] + ["[1][0]" pom] + ["[1][0]" package] + ["[1][0]" artifact + ["[1]/[0]" type]] + ["[1][0]" dependency + ["[1]/[0]" resolution] + ["[1]/[0]" deployment] + ["[1]/[0]" status]] + ["[1][0]" repository + ["[1]/[0]" origin] + ["[1]/[0]" local]]]]]]) (def: .public test Test @@ -73,25 +73,25 @@ ///dependency.#type ///artifact/type.lux_library] dependee_pom (|> (# ///.monoid identity) - (with@ ///.#identity {.#Some dependee_artifact}) + (has ///.#identity {.#Some dependee_artifact}) ///pom.write try.trusted) depender_pom (|> (# ///.monoid identity) - (with@ ///.#identity {.#Some depender_artifact}) - (with@ ///.#dependencies (set.of_list ///dependency.hash (list dependee))) + (has ///.#identity {.#Some depender_artifact}) + (has ///.#dependencies (set.of_list ///dependency.hash (list dependee))) ///pom.write try.trusted) dependee_package (|> dependee_package - (with@ ///package.#origin {///repository/origin.#Remote ""}) - (with@ ///package.#pom [dependee_pom - (|> dependee_pom (# xml.codec encoded) (# utf8.codec encoded)) - {///dependency/status.#Unverified}])) + (has ///package.#origin {///repository/origin.#Remote ""}) + (has ///package.#pom [dependee_pom + (|> dependee_pom (# xml.codec encoded) (# utf8.codec encoded)) + {///dependency/status.#Unverified}])) depender_package (|> depender_package - (with@ ///package.#origin {///repository/origin.#Remote ""}) - (with@ ///package.#pom [depender_pom - (|> depender_pom (# xml.codec encoded) (# utf8.codec encoded)) - {///dependency/status.#Unverified}])) + (has ///package.#origin {///repository/origin.#Remote ""}) + (has ///package.#pom [depender_pom + (|> depender_pom (# xml.codec encoded) (# utf8.codec encoded)) + {///dependency/status.#Unverified}])) fs (file.mock (# file.default separator)) program (program.async (program.mock environment.empty home working_directory))]] @@ -103,7 +103,7 @@ (dictionary.has dependee dependee_package) (///dependency/deployment.all local)) post (|> (# ///.monoid identity) - (with@ ///.#dependencies (set.of_list ///dependency.hash (list dependee depender))) + (has ///.#dependencies (set.of_list ///dependency.hash (list dependee depender))) (/.do! console local (list (///repository.mock ($///dependency/resolution.single depender_artifact depender_package) [])) diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux index 4d1509924..fd4780195 100644 --- a/stdlib/source/test/aedifex/command/install.lux +++ b/stdlib/source/test/aedifex/command/install.lux @@ -1,43 +1,43 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" try {"+" Try} ("[1]#[0]" functor)] - ["[0]" exception] - [concurrency - ["[0]" async {"+" Async}]] - [parser - ["[0]" environment]]] - [data - ["[0]" binary] - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}]] - [collection - ["[0]" set {"+" Set}]]] - [math - ["[0]" random]] - [world - ["[0]" file] - ["[0]" program {"+" Program}]]]] + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" try {"+" Try} ("[1]#[0]" functor)] + ["[0]" exception] + [concurrency + ["[0]" async {"+" Async}]] + [parser + ["[0]" environment]]] + [data + ["[0]" binary] + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}]] + [collection + ["[0]" set {"+" Set}]]] + [math + ["[0]" random]] + [world + ["[0]" file] + ["[0]" program {"+" Program}]]]] + [// + ["$[0]" version] [// - ["$[0]" version] - [// - ["$[0]" profile] - ["$[0]" artifact]]] - [\\program - ["[0]" / + ["$[0]" profile] + ["$[0]" artifact]]] + [\\program + ["[0]" / + ["/[1]" // "_" ["/[1]" // "_" - ["/[1]" // "_" - ["[1]" profile] - ["[1][0]" action {"+" Action}] - ["[1][0]" local] - ["[1][0]" artifact - ["[1]/[0]" extension]] - ["[1][0]" repository "_" - ["[1]/[0]" local]]]]]]) + ["[1]" profile] + ["[1][0]" action {"+" Action}] + ["[1][0]" local] + ["[1][0]" artifact + ["[1]/[0]" extension]] + ["[1][0]" repository "_" + ["[1]/[0]" local]]]]]]) (def: .public (make_sources! fs sources) (-> (file.System Async) (Set file.Path) (Action (List Any))) @@ -56,7 +56,7 @@ (-> (Program Async) (file.System Async) ///.Profile (Async (Try Text))) (do ///action.monad [.let [console ($version.echo "")] - _ (..make_sources! fs (value@ ///.#sources sample)) + _ (..make_sources! fs (the ///.#sources sample)) _ (/.do! console fs (///repository/local.repository program fs) sample)] (# console read_line []))) @@ -65,7 +65,7 @@ (<| (_.covering /._) (do [! random.monad] [identity $artifact.random - sample (# ! each (with@ ///.#identity {.#Some identity}) + sample (# ! each (has ///.#identity {.#Some identity}) $profile.random) home (random.ascii/alpha 5) working_directory (random.ascii/alpha 5) @@ -75,7 +75,7 @@ [.let [fs (file.mock /) program (program.async (program.mock environment.empty home working_directory)) - artifact_path (///local.uri (value@ ///artifact.#version identity) identity) + artifact_path (///local.uri (the ///artifact.#version identity) identity) library_path (format artifact_path ///artifact/extension.lux_library) pom_path (format artifact_path ///artifact/extension.pom)] verdict (do [! ///action.monad] @@ -97,7 +97,7 @@ (in (do [! async.monad] [.let [fs (file.mock /) program (program.async (program.mock environment.empty home working_directory))] - logging (..execute! program fs (with@ ///.#identity {.#None} sample))] + logging (..execute! program fs (has ///.#identity {.#None} sample))] (_.cover' [/.failure] (|> logging (try#each (text#= /.failure)) diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux index 82ca558ae..464189af0 100644 --- a/stdlib/source/test/aedifex/command/pom.lux +++ b/stdlib/source/test/aedifex/command/pom.lux @@ -1,34 +1,34 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" try ("[1]#[0]" functor)] - [concurrency - ["[0]" async]]] - [data - ["[0]" binary ("[1]#[0]" equivalence)] - ["[0]" text ("[1]#[0]" equivalence) - [encoding - ["[0]" utf8]]] - [format - ["[0]" xml]]] - [math - ["[0]" random]] - [world - ["[0]" file]]]] + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" try ("[1]#[0]" functor)] + [concurrency + ["[0]" async]]] + [data + ["[0]" binary ("[1]#[0]" equivalence)] + ["[0]" text ("[1]#[0]" equivalence) + [encoding + ["[0]" utf8]]] + [format + ["[0]" xml]]] + [math + ["[0]" random]] + [world + ["[0]" file]]]] + [// + ["@[0]" version] [// - ["@[0]" version] - [// - ["@[0]" profile]]] - [\\program - ["[0]" / - ["//[1]" /// "_" - ["[1]" profile] - ["[1][0]" action] - ["[1][0]" pom]]]]) + ["@[0]" profile]]] + [\\program + ["[0]" / + ["//[1]" /// "_" + ["[1]" profile] + ["[1][0]" action] + ["[1][0]" pom]]]]) (def: .public test Test @@ -62,7 +62,7 @@ {try.#Failure error} (_.cover' [/.do!] - (case (value@ ///.#identity sample) + (case (the ///.#identity sample) {.#Some _} false diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux index 7be97a8bb..e992f87bc 100644 --- a/stdlib/source/test/aedifex/command/test.lux +++ b/stdlib/source/test/aedifex/command/test.lux @@ -1,43 +1,43 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" try] - ["[0]" exception] - [concurrency - ["[0]" async]] - [parser - ["[0]" environment]]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [collection - ["[0]" dictionary] - ["[0]" list]]] - [math - ["[0]" random]] - [world - ["[0]" file] - ["[0]" shell] - ["[0]" program]]]] - ["[0]" // "_" - ["@[0]" version] - ["@[0]" build] - ["$/[1]" // "_" - ["[1][0]" package]]] - [\\program - ["[0]" / + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" try] + ["[0]" exception] + [concurrency + ["[0]" async]] + [parser + ["[0]" environment]]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [collection + ["[0]" dictionary] + ["[0]" list]]] + [math + ["[0]" random]] + [world + ["[0]" file] + ["[0]" shell] + ["[0]" program]]]] + ["[0]" // "_" + ["@[0]" version] + ["@[0]" build] + ["$/[1]" // "_" + ["[1][0]" package]]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1][0]" build] ["/[1]" // "_" - ["[1][0]" build] - ["/[1]" // "_" - ["[1]" profile {"+" Profile}] - ["[1][0]" action] - ["[1][0]" artifact - ["[1]/[0]" type]] - ["[1][0]" dependency - ["[1]/[0]" resolution]]]]]]) + ["[1]" profile {"+" Profile}] + ["[1][0]" action] + ["[1][0]" artifact + ["[1]/[0]" type]] + ["[1][0]" dependency + ["[1]/[0]" resolution]]]]]]) (def: .public test Test @@ -50,9 +50,9 @@ .let [empty_profile (: Profile (# ///.monoid identity)) with_target (: (-> Profile Profile) - (with@ ///.#target target)) + (has ///.#target target)) with_test (: (-> Profile Profile) - (with@ ///.#test {.#Some test})) + (has ///.#test {.#Some test})) profile (|> empty_profile with_test @@ -65,7 +65,7 @@ [verdict (do ///action.monad [_ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs (shell.async (@build.good_shell [])) resolution - (with@ ///.#compiler compiler profile)) + (has ///.#compiler compiler profile)) build_start (# console read_line []) build_end (# console read_line []) test_start (# console read_line []) @@ -101,7 +101,7 @@ [])] _ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs (shell.async bad_shell) resolution - (with@ ///.#compiler compiler profile)) + (has ///.#compiler compiler profile)) build_start (# console read_line []) build_end (# console read_line []) test_start (# console read_line []) -- cgit v1.2.3