diff options
Diffstat (limited to 'stdlib/source/test/aedifex')
23 files changed, 895 insertions, 895 deletions
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux index 6e7947aff..fba89a430 100644 --- a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux +++ b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux @@ -1,32 +1,32 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" try ("[1]#[0]" functor)] - [parser - ["<[0]>" text]]] - [data - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}]]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat] - ["i" int]]] - [time - ["[0]" instant]]]] - ["$[0]" /// "_" - ["[1][0]" stamp]] - [\\program - ["[0]" / - ["//[1]" /// - ["[1][0]" stamp] - ["[1][0]" time]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" try ("[1]#[0]" functor)] + [parser + ["<[0]>" text]]] + [data + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}]]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat] + ["i" int]]] + [time + ["[0]" instant]]]] + ["$[0]" /// "_" + ["[1][0]" stamp]] + [\\program + ["[0]" / + ["//[1]" /// + ["[1][0]" stamp] + ["[1][0]" time]]]]) (def: .public random (Random /.Value) @@ -47,18 +47,18 @@ (do random.monad [sample random stamp $///stamp.random] - (let [version (value@ /.#version sample) + (let [version (the /.#version sample) local! (text#= version - (/.format (with@ /.#snapshot {///.#Local} sample))) + (/.format (has /.#snapshot {///.#Local} sample))) remote_format (/.format [/.#version (format version /.snapshot) /.#snapshot {///.#Remote stamp}]) remote! - (and (text.starts_with? (format version (///time.format (value@ ///stamp.#time stamp))) + (and (text.starts_with? (format version (///time.format (the ///stamp.#time stamp))) remote_format) - (text.ends_with? (%.nat (value@ ///stamp.#build stamp)) + (text.ends_with? (%.nat (the ///stamp.#build stamp)) remote_format))] (_.cover [/.snapshot /.format] (and local! diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux index 2b10fe559..64155f029 100644 --- a/stdlib/source/test/aedifex/artifact/time/time.lux +++ b/stdlib/source/test/aedifex/artifact/time/time.lux @@ -1,26 +1,26 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - ["[0]" time] - [abstract - [monad {"+" do}]] - [control - ["[0]" try ("[1]#[0]" functor)] - [parser - ["<[0]>" text]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat] - ["i" int]]]]] - [\\program - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + ["[0]" time] + [abstract + [monad {"+" do}]] + [control + ["[0]" try ("[1]#[0]" functor)] + [parser + ["<[0]>" text]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat] + ["i" int]]]]] + [\\program + ["[0]" /]]) (def: .public random (Random /.Time) (random.one (|>> time.clock - (with@ time.#milli_second 0) + (has time.#milli_second 0) time.time) random.time)) diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux index a392d6ae5..9888e2f58 100644 --- a/stdlib/source/test/aedifex/cache.lux +++ b/stdlib/source/test/aedifex/cache.lux @@ -1,49 +1,49 @@ (.using - [library - [lux {"-" Type type} - ["_" test {"+" Test}] - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" try] - [concurrency - ["[0]" async {"+" Async}]] - [parser - ["[0]" environment]]] - [data - [binary {"+" Binary}] - ["[0]" text] - [format - [xml {"+" XML}]] - [collection - ["[0]" set] - ["[0]" dictionary]]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat]]] - [world - ["[0]" file] - ["[0]" program]]]] + [library + [lux {"-" Type type} + ["_" test {"+" Test}] + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" try] + [concurrency + ["[0]" async {"+" Async}]] + [parser + ["[0]" environment]]] + [data + [binary {"+" Binary}] + ["[0]" text] + [format + [xml {"+" XML}]] + [collection + ["[0]" set] + ["[0]" dictionary]]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat]]] + [world + ["[0]" file] + ["[0]" program]]]] + [// + ["@[0]" profile] + ["@[0]" artifact] [// - ["@[0]" profile] - ["@[0]" artifact] - [// - [lux - [data - ["_[0]" binary]]]]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile {"+" Profile}] - ["[1][0]" package {"+" Package}] - ["[1][0]" pom] - ["[1][0]" dependency {"+" Dependency} - ["[1]/[0]" resolution {"+" Resolution}]] - ["[1][0]" artifact {"+" Artifact} - ["[1]/[0]" type {"+" Type}]] - ["[1][0]" repository "_" - ["[1]/[0]" origin]]]]]) + [lux + [data + ["_[0]" binary]]]]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile {"+" Profile}] + ["[1][0]" package {"+" Package}] + ["[1][0]" pom] + ["[1][0]" dependency {"+" Dependency} + ["[1]/[0]" resolution {"+" Resolution}]] + ["[1][0]" artifact {"+" Artifact} + ["[1]/[0]" type {"+" Type}]] + ["[1][0]" repository "_" + ["[1]/[0]" origin]]]]]) (def: type (Random Type) @@ -57,7 +57,7 @@ (try.maybe (do try.monad [pom (//pom.write profile) - identity (try.of_maybe (value@ //.#identity profile))] + identity (try.of_maybe (the //.#identity profile))] (in [identity profile pom])))) @profile.random)) @@ -75,7 +75,7 @@ content ..content] (in [[//dependency.#artifact identity //dependency.#type type] - (with@ //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))]))) + (has //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))]))) (def: resolution (Random Resolution) @@ -88,14 +88,14 @@ (do ! [pom (random.one (function (_ [identity profile pom]) (|> profile - (with@ //.#dependencies (set.empty //dependency.hash)) - (with@ //.#identity {.#Some (value@ //dependency.#artifact dependency)}) + (has //.#dependencies (set.empty //dependency.hash)) + (has //.#identity {.#Some (the //dependency.#artifact dependency)}) //pom.write try.maybe)) ..profile) content ..content] (in [dependency - (with@ //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))])))))] + (has //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))])))))] (in (dictionary.of_list //dependency.hash (list& [main_dependency main_package] dependencies))))) (def: singular @@ -116,7 +116,7 @@ [_ wrote! actual_package read!] (in (# //package.equivalence = - (with@ //package.#origin {//repository/origin.#Local ""} expected_package) + (has //package.#origin {//repository/origin.#Local ""} expected_package) actual_package))))))))) (def: plural @@ -138,7 +138,7 @@ actual read!] (in (# //dependency/resolution.equivalence = (# dictionary.functor each - (with@ //package.#origin {//repository/origin.#Local ""}) + (has //package.#origin {//repository/origin.#Local ""}) expected) actual))))))))) 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 []) diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux index 4a3946a53..c22121755 100644 --- a/stdlib/source/test/aedifex/dependency/deployment.lux +++ b/stdlib/source/test/aedifex/dependency/deployment.lux @@ -79,20 +79,20 @@ (-> Nat URL Package (Dictionary URL Binary) Artifact Artifact Bit) (let [url (: (-> URI URL) (|>> (format address))) - library_url (url (format (artifact.uri (value@ artifact.#version expected_artifact) + library_url (url (format (artifact.uri (the artifact.#version expected_artifact) expected_artifact) artifact/extension.lux_library)) - pom_url (url (format (artifact.uri (value@ artifact.#version expected_artifact) + pom_url (url (format (artifact.uri (the artifact.#version expected_artifact) expected_artifact) artifact/extension.pom)) artifact_metadata_url (url (metadata.remote_artifact_uri expected_artifact)) project_metadata_url (url (metadata.remote_project_uri expected_artifact)) expected_library (|> package - (value@ package.#library) + (the package.#library) product.left) expected_pom (|> package - (value@ package.#pom) + (the package.#pom) product.right product.left) @@ -136,7 +136,7 @@ (do random.monad [[profile package] $///package.random .let [artifact (|> profile - (value@ profile.#identity) + (the profile.#identity) maybe.trusted) dependency (: Dependency [artifact diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux index 3165a659d..5ea995021 100644 --- a/stdlib/source/test/aedifex/dependency/resolution.lux +++ b/stdlib/source/test/aedifex/dependency/resolution.lux @@ -1,52 +1,52 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - ["[0]" predicate] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" try] - ["[0]" exception] - [concurrency - ["[0]" async]]] - [data - [binary {"+" Binary}] - ["[0]" product] - ["[0]" text - ["%" format {"+" format}] - [encoding - ["[0]" utf8]]] - [format - ["[0]" xml]] - [collection - ["[0]" dictionary] - ["[0]" set] - ["[0]" list]]] - [math - ["[0]" random {"+" Random}]]]] - ["$[0]" /// "_" - ["[1][0]" package] - ["[1][0]" repository] - ["[1][0]" artifact] - [command - ["[1][0]" version]]] - [\\program - ["[0]" / - ["//[1]" /// "_" - ["[1]" profile] - ["[1][0]" package {"+" Package}] - ["[1][0]" hash] - ["[1][0]" dependency {"+" Dependency} ("[1]#[0]" equivalence) - ["[1]/[0]" status]] - ["[1][0]" pom] - ["[1][0]" artifact {"+" Artifact} - ["[1]/[0]" type] - ["[1]/[0]" extension]] - ["[1][0]" repository {"+" Mock} - ["[1]/[0]" origin]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + ["[0]" predicate] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" try] + ["[0]" exception] + [concurrency + ["[0]" async]]] + [data + [binary {"+" Binary}] + ["[0]" product] + ["[0]" text + ["%" format {"+" format}] + [encoding + ["[0]" utf8]]] + [format + ["[0]" xml]] + [collection + ["[0]" dictionary] + ["[0]" set] + ["[0]" list]]] + [math + ["[0]" random {"+" Random}]]]] + ["$[0]" /// "_" + ["[1][0]" package] + ["[1][0]" repository] + ["[1][0]" artifact] + [command + ["[1][0]" version]]] + [\\program + ["[0]" / + ["//[1]" /// "_" + ["[1]" profile] + ["[1][0]" package {"+" Package}] + ["[1][0]" hash] + ["[1][0]" dependency {"+" Dependency} ("[1]#[0]" equivalence) + ["[1]/[0]" status]] + ["[1][0]" pom] + ["[1][0]" artifact {"+" Artifact} + ["[1]/[0]" type] + ["[1]/[0]" extension]] + ["[1][0]" repository {"+" Mock} + ["[1]/[0]" origin]]]]]) (def: random (Random /.Resolution) @@ -98,7 +98,7 @@ (def: .public (single artifact package) (-> Artifact Package (Mock Any)) - (let [expected (///artifact.uri (value@ ///artifact.#version artifact) artifact)] + (let [expected (///artifact.uri (the ///artifact.#version artifact) artifact)] (implementation (def: the_description "[1]") @@ -106,11 +106,11 @@ (if (text.contains? expected uri) (let [library (: Binary (|> package - (value@ ///package.#library) + (the ///package.#library) product.left)) pom (: Binary (|> package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded)))] @@ -144,34 +144,34 @@ (def: the_description "[~SHA-1]") (def: (on_download uri state) - (if (text.contains? (///artifact.uri (value@ ///artifact.#version expected_artifact) expected_artifact) uri) + (if (text.contains? (///artifact.uri (the ///artifact.#version expected_artifact) expected_artifact) uri) (cond (text.ends_with? ///artifact/extension.lux_library uri) {try.#Success [state (|> expected_package - (value@ ///package.#library) + (the ///package.#library) product.left)]} (text.ends_with? ..lux_sha-1 uri) {try.#Success [state (|> expected_package - (value@ ///package.#library) + (the ///package.#library) product.left ..sha-1)]} (text.ends_with? ..lux_md5 uri) {try.#Success [state (|> expected_package - (value@ ///package.#library) + (the ///package.#library) product.left ..md5)]} (text.ends_with? ///artifact/extension.pom uri) {try.#Success [state (|> expected_package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded))]} (text.ends_with? ..pom_sha-1 uri) {try.#Success [state (|> dummy_package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded) @@ -179,7 +179,7 @@ (text.ends_with? ..pom_md5 uri) {try.#Success [state (|> expected_package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded) @@ -197,34 +197,34 @@ (def: the_description "[~MD5]") (def: (on_download uri state) - (if (text.contains? (///artifact.uri (value@ ///artifact.#version expected_artifact) expected_artifact) uri) + (if (text.contains? (///artifact.uri (the ///artifact.#version expected_artifact) expected_artifact) uri) (cond (text.ends_with? ///artifact/extension.lux_library uri) {try.#Success [state (|> expected_package - (value@ ///package.#library) + (the ///package.#library) product.left)]} (text.ends_with? ..lux_sha-1 uri) {try.#Success [state (|> expected_package - (value@ ///package.#library) + (the ///package.#library) product.left ..sha-1)]} (text.ends_with? ..lux_md5 uri) {try.#Success [state (|> dummy_package - (value@ ///package.#library) + (the ///package.#library) product.left ..md5)]} (text.ends_with? ///artifact/extension.pom uri) {try.#Success [state (|> expected_package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded))]} (text.ends_with? ..pom_sha-1 uri) {try.#Success [state (|> expected_package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded) @@ -232,7 +232,7 @@ (text.ends_with? ..pom_md5 uri) {try.#Success [state (|> dummy_package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded) @@ -250,7 +250,7 @@ [expected_artifact $///artifact.random [_ expected_package] $///package.random [_ dummy_package] (random.only (|>> product.right - (with@ ///package.#pom (value@ ///package.#pom expected_package)) + (has ///package.#pom (the ///package.#pom expected_package)) (# ///package.equivalence = expected_package) not) $///package.random) @@ -266,7 +266,7 @@ (case actual_package {try.#Success actual_package} (# ///package.equivalence = - (with@ ///package.#origin {///repository/origin.#Remote ""} expected_package) + (has ///package.#origin {///repository/origin.#Remote ""} expected_package) actual_package) {try.#Failure _} @@ -295,7 +295,7 @@ [expected_artifact $///artifact.random [_ expected_package] $///package.random [_ dummy_package] (random.only (|>> product.right - (with@ ///package.#pom (value@ ///package.#pom expected_package)) + (has ///package.#pom (the ///package.#pom expected_package)) (# ///package.equivalence = expected_package) not) $///package.random) @@ -315,7 +315,7 @@ (case actual_package {try.#Success actual_package} (# ///package.equivalence = - (with@ ///package.#origin {///repository/origin.#Remote ""} expected_package) + (has ///package.#origin {///repository/origin.#Remote ""} expected_package) actual_package) {try.#Failure _} @@ -366,34 +366,34 @@ ///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) ignored_pom (|> (# ///.monoid identity) - (with@ ///.#identity {.#Some ignored_artifact}) + (has ///.#identity {.#Some ignored_artifact}) ///pom.write try.trusted) - dependee_package (with@ ///package.#pom - [dependee_pom - (|> dependee_pom (# xml.codec encoded) (# utf8.codec encoded)) - {///dependency/status.#Unverified}] - dependee_package) - depender_package (with@ ///package.#pom - [depender_pom - (|> depender_pom (# xml.codec encoded) (# utf8.codec encoded)) - {///dependency/status.#Unverified}] - depender_package) - ignored_package (with@ ///package.#pom - [ignored_pom - (|> ignored_pom (# xml.codec encoded) (# utf8.codec encoded)) - {///dependency/status.#Unverified}] - ignored_package)]] + dependee_package (has ///package.#pom + [dependee_pom + (|> dependee_pom (# xml.codec encoded) (# utf8.codec encoded)) + {///dependency/status.#Unverified}] + dependee_package) + depender_package (has ///package.#pom + [depender_pom + (|> depender_pom (# xml.codec encoded) (# utf8.codec encoded)) + {///dependency/status.#Unverified}] + depender_package) + ignored_package (has ///package.#pom + [ignored_pom + (|> ignored_pom (# xml.codec encoded) (# utf8.codec encoded)) + {///dependency/status.#Unverified}] + ignored_package)]] (in [[dependee depender ignored] [dependee_package depender_package ignored_package]]))) diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux index 01db3538c..dedb9b33c 100644 --- a/stdlib/source/test/aedifex/input.lux +++ b/stdlib/source/test/aedifex/input.lux @@ -1,35 +1,35 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}]]] - [data - [text - ["%" format] - [encoding - ["[0]" utf8]]] - [collection - ["[0]" set {"+" Set}]]] - [math - ["[0]" random]] - [world - ["[0]" file]]]] - [// - ["$[0]" profile]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile {"+" Profile}] - ["[1][0]" project] - ["[1][0]" action] - ["[1][0]" format] - [repository - [remote {"+" Address}]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}]]] + [data + [text + ["%" format] + [encoding + ["[0]" utf8]]] + [collection + ["[0]" set {"+" Set}]]] + [math + ["[0]" random]] + [world + ["[0]" file]]]] + [// + ["$[0]" profile]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile {"+" Profile}] + ["[1][0]" project] + ["[1][0]" action] + ["[1][0]" format] + [repository + [remote {"+" Address}]]]]]) (def: (with_default_source sources) (-> (Set //.Source) (Set //.Source)) @@ -45,7 +45,7 @@ Test (<| (_.covering /._) (do [! random.monad] - [expected (# ! each (with@ //.#parents (list)) $profile.random) + [expected (# ! each (has //.#parents (list)) $profile.random) .let [fs (: (file.System Async) (file.mock (# file.default separator)))]] (in (do async.monad @@ -60,8 +60,8 @@ (/.read async.monad fs (list //.default)))] (in (# //.equivalence = (|> expected - (revised@ //.#sources ..with_default_source) - (revised@ //.#repositories ..with_default_repository)) + (revised //.#sources ..with_default_source) + (revised //.#repositories ..with_default_repository)) actual)))] (_.cover' [/.read] (try.else false verdict))))))) diff --git a/stdlib/source/test/aedifex/local.lux b/stdlib/source/test/aedifex/local.lux index babf58808..241915579 100644 --- a/stdlib/source/test/aedifex/local.lux +++ b/stdlib/source/test/aedifex/local.lux @@ -1,19 +1,19 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [data - ["[0]" text]] - [math - ["[0]" random {"+" Random}]]]] - [// - ["@[0]" artifact]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1][0]" artifact]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [data + ["[0]" text]] + [math + ["[0]" random {"+" Random}]]]] + [// + ["@[0]" artifact]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1][0]" artifact]]]]) (def: .public test Test @@ -23,5 +23,5 @@ ($_ _.and (_.cover [/.repository /.uri] (text.starts_with? /.repository - (/.uri (value@ //artifact.#version sample) sample))) + (/.uri (the //artifact.#version sample) sample))) )))) diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux index a77881197..bf94bf600 100644 --- a/stdlib/source/test/aedifex/metadata/artifact.lux +++ b/stdlib/source/test/aedifex/metadata/artifact.lux @@ -1,45 +1,45 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" maybe] - ["[0]" try ("[1]#[0]" functor)] - [parser - ["[0]" environment] - ["<[0]>" xml]] - [concurrency - ["[0]" async]]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [collection - ["[0]" list]]] - [macro - ["[0]" code]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]] - ["[0]" time - ["[0]" date] - ["[0]" year] - ["[0]" month] - ["[0]" instant] - ["[0]" duration]] - [world - ["[0]" file] - ["[0]" program]]]] - [\\program - ["[0]" / - ["/[1]" // - ["/[1]" // "_" - ["[1][0]" artifact] - ["[1][0]" repository "_" - ["[1]/[0]" local]]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" maybe] + ["[0]" try ("[1]#[0]" functor)] + [parser + ["[0]" environment] + ["<[0]>" xml]] + [concurrency + ["[0]" async]]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [collection + ["[0]" list]]] + [macro + ["[0]" code]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]] + ["[0]" time + ["[0]" date] + ["[0]" year] + ["[0]" month] + ["[0]" instant] + ["[0]" duration]] + [world + ["[0]" file] + ["[0]" program]]]] + [\\program + ["[0]" / + ["/[1]" // + ["/[1]" // "_" + ["[1][0]" artifact] + ["[1][0]" repository "_" + ["[1]/[0]" local]]]]]]) (def: .public random (Random /.Metadata) @@ -72,10 +72,10 @@ (_.for [/.Metadata]) (do random.monad [expected ..random - .let [artifact [///artifact.#group (value@ /.#group expected) - ///artifact.#name (value@ /.#name expected) + .let [artifact [///artifact.#group (the /.#group expected) + ///artifact.#name (the /.#name expected) ///artifact.#version (|> expected - (value@ /.#versions) + (the /.#versions) list.head (maybe.else ""))]]] ($_ _.and diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux index d59e79809..4735a6994 100644 --- a/stdlib/source/test/aedifex/metadata/snapshot.lux +++ b/stdlib/source/test/aedifex/metadata/snapshot.lux @@ -1,53 +1,53 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" maybe] - ["[0]" try ("[1]#[0]" functor)] - [parser - ["[0]" environment] - ["<[0]>" xml]] - [concurrency - ["[0]" async]]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [collection - ["[0]" list]]] - [macro - ["[0]" code]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat]]] - ["[0]" time - ["[0]" date] - ["[0]" year] - ["[0]" month] - ["[0]" instant {"+" Instant}] - ["[0]" duration]] - [world - ["[0]" file] - ["[0]" program]]]] - ["$[0]" /// "_" - ["[1][0]" artifact - ["[1]/[0]" type] - ["[1]/[0]" time] - ["[1]/[0]" snapshot "_" - ["[1]/[0]" version]]]] - [\\program - ["[0]" / - ["/[1]" // - ["/[1]" // "_" - [artifact - [versioning {"+" Versioning}] - ["[1][0]" snapshot]] - ["[1][0]" repository "_" - ["[1]/[0]" local]]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" maybe] + ["[0]" try ("[1]#[0]" functor)] + [parser + ["[0]" environment] + ["<[0]>" xml]] + [concurrency + ["[0]" async]]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [collection + ["[0]" list]]] + [macro + ["[0]" code]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat]]] + ["[0]" time + ["[0]" date] + ["[0]" year] + ["[0]" month] + ["[0]" instant {"+" Instant}] + ["[0]" duration]] + [world + ["[0]" file] + ["[0]" program]]]] + ["$[0]" /// "_" + ["[1][0]" artifact + ["[1]/[0]" type] + ["[1]/[0]" time] + ["[1]/[0]" snapshot "_" + ["[1]/[0]" version]]]] + [\\program + ["[0]" / + ["/[1]" // + ["/[1]" // "_" + [artifact + [versioning {"+" Versioning}] + ["[1][0]" snapshot]] + ["[1][0]" repository "_" + ["[1]/[0]" local]]]]]]) (def: random_instant (Random Instant) @@ -91,7 +91,7 @@ (_.for [/.Metadata]) (do random.monad [expected ..random - .let [artifact (value@ /.#artifact expected)]] + .let [artifact (the /.#artifact expected)]] ($_ _.and (_.for [/.equivalence] ($equivalence.spec /.equivalence ..random)) diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux index 9579f82db..af51453dd 100644 --- a/stdlib/source/test/aedifex/package.lux +++ b/stdlib/source/test/aedifex/package.lux @@ -1,44 +1,44 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" try]] - [data - ["[0]" product] - ["[0]" text - [encoding - ["[0]" utf8]]] - [format - ["[0]" xml {"+" XML}]] - [collection - ["[0]" set {"+" Set}]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]] - [world - ["[0]" file]]]] + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" try]] + [data + ["[0]" product] + ["[0]" text + [encoding + ["[0]" utf8]]] + [format + ["[0]" xml {"+" XML}]] + [collection + ["[0]" set {"+" Set}]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]] + [world + ["[0]" file]]]] + [// + ["$[0]" profile] [// - ["$[0]" profile] - [// - [lux - [data - ["$[0]" binary]]]]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile] - ["[1][0]" hash ("[1]#[0]" equivalence)] - ["[1][0]" pom] - [dependency - ["[1][0]" status]] - [repository - ["[1][0]" origin]]]]]) + [lux + [data + ["$[0]" binary]]]]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile] + ["[1][0]" hash ("[1]#[0]" equivalence)] + ["[1][0]" pom] + [dependency + ["[1][0]" status]] + [repository + ["[1][0]" origin]]]]]) (def: .public random (Random [//.Profile /.Package]) @@ -64,18 +64,18 @@ ($equivalence.spec /.equivalence (# ! each product.right ..random))) (_.cover [/.local?] - (/.local? (with@ /.#origin {//origin.#Local "~/yolo"} package))) + (/.local? (has /.#origin {//origin.#Local "~/yolo"} package))) (_.cover [/.remote?] - (/.remote? (with@ /.#origin {//origin.#Remote "https://example.com"} package))) + (/.remote? (has /.#origin {//origin.#Remote "https://example.com"} package))) (_.cover [/.local] - (let [expected_pom (|> package (value@ /.#pom) product.left) - expected_library (|> package (value@ /.#library) product.left) + (let [expected_pom (|> package (the /.#pom) product.left) + expected_library (|> package (the /.#library) product.left) local (/.local expected_pom expected_library) - [actual_pom binary_pom pom_status] (value@ /.#pom local) - [actual_library library_status] (value@ /.#library local)] - (and (case (value@ /.#origin local) + [actual_pom binary_pom pom_status] (the /.#pom local) + [actual_library library_status] (the /.#library local)] + (and (case (the /.#origin local) {//origin.#Local ""} true _ false) (let [expected_sha1 (//hash.sha-1 expected_library) @@ -104,7 +104,7 @@ _ false)))))) (_.cover [/.dependencies] - (let [expected (value@ //.#dependencies profile)] + (let [expected (the //.#dependencies profile)] (case (/.dependencies package) {try.#Success actual} (# set.equivalence = expected actual) @@ -112,7 +112,7 @@ {try.#Failure error} false))) (_.cover [/.repositories] - (let [expected (value@ //.#repositories profile)] + (let [expected (the //.#repositories profile)] (case (/.repositories package) {try.#Success actual} (# set.equivalence = expected actual) diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux index 5565875fb..1d3168d93 100644 --- a/stdlib/source/test/aedifex/parser.lux +++ b/stdlib/source/test/aedifex/parser.lux @@ -1,37 +1,37 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [hash {"+" Hash}]] - [control - [pipe {"+" case>}] - ["[0]" try] - [parser - ["<[0]>" code]]] - [data - ["[0]" text] - [collection - ["[0]" set {"+" Set}] - ["[0]" dictionary {"+" Dictionary}] - ["[0]" list ("[1]#[0]" functor)]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]] - [macro - ["[0]" code]]]] - [// - ["@[0]" profile]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile] - ["[1][0]" project {"+" Project}] - ["[1][0]" artifact {"+" Artifact}] - ["[1][0]" dependency {"+" Dependency}] - ["[1][0]" format]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [hash {"+" Hash}]] + [control + [pipe {"+" case>}] + ["[0]" try] + [parser + ["<[0]>" code]]] + [data + ["[0]" text] + [collection + ["[0]" set {"+" Set}] + ["[0]" dictionary {"+" Dictionary}] + ["[0]" list ("[1]#[0]" functor)]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]] + [macro + ["[0]" code]]]] + [// + ["@[0]" profile]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile] + ["[1][0]" project {"+" Project}] + ["[1][0]" artifact {"+" Artifact}] + ["[1][0]" dependency {"+" Dependency}] + ["[1][0]" format]]]]) (def: name (Random //.Name) @@ -55,16 +55,16 @@ (def: with_default_sources (-> //.Profile //.Profile) - (revised@ //.#sources - (: (-> (Set //.Source) (Set //.Source)) - (function (_ sources) - (if (set.empty? sources) - (set.of_list text.hash (list //.default_source)) - sources))))) + (revised //.#sources + (: (-> (Set //.Source) (Set //.Source)) + (function (_ sources) + (if (set.empty? sources) + (set.of_list text.hash (list //.default_source)) + sources))))) (def: with_default_repository (-> //.Profile //.Profile) - (revised@ //.#repositories (set.has //.default_repository))) + (revised //.#repositories (set.has //.default_repository))) (def: (with_empty_profile project) (-> Project Project) diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux index 5f5e351d9..e6d5340e2 100644 --- a/stdlib/source/test/aedifex/pom.lux +++ b/stdlib/source/test/aedifex/pom.lux @@ -1,26 +1,26 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" try] - ["[0]" exception] - ["<>" parser - ["<[0]>" xml]]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [format - ["[0]" xml]]] - [math - ["[0]" random]]]] - [// - ["@[0]" profile]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" try] + ["[0]" exception] + ["<>" parser + ["<[0]>" xml]]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [format + ["[0]" xml]]] + [math + ["[0]" random]]]] + [// + ["@[0]" profile]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile]]]]) (def: .public test Test @@ -34,15 +34,15 @@ [expected @profile.random] (_.cover [/.write /.parser] (case [(/.write expected) - (value@ //.#identity expected)] + (the //.#identity expected)] [{try.#Success pom} {.#Some _}] (case (<xml>.result /.parser (list pom)) {try.#Success actual} (# //.equivalence = (|> (# //.monoid identity) - (with@ //.#dependencies (value@ //.#dependencies expected)) - (with@ //.#repositories (value@ //.#repositories expected))) + (has //.#dependencies (the //.#dependencies expected)) + (has //.#repositories (the //.#repositories expected))) actual) {try.#Failure error} diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux index ff9cc4ab2..1cfc7eb40 100644 --- a/stdlib/source/test/aedifex/profile.lux +++ b/stdlib/source/test/aedifex/profile.lux @@ -1,38 +1,38 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [hash {"+" Hash}] - [\\specification - ["$[0]" equivalence] - ["$[0]" monoid]]] - [control - [pipe {"+" case>}] - ["[0]" try] - [parser - ["[0]" cli]]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [collection - ["[0]" set {"+" Set}] - ["[0]" dictionary {"+" Dictionary}]]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat]]]]] - [// - ["@[0]" artifact] - ["@[0]" dependency]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1][0]" runtime] - ["[1][0]" dependency {"+" Dependency}] - ["[1][0]" format] - [repository - [remote {"+" Address}]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [hash {"+" Hash}] + [\\specification + ["$[0]" equivalence] + ["$[0]" monoid]]] + [control + [pipe {"+" case>}] + ["[0]" try] + [parser + ["[0]" cli]]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [collection + ["[0]" set {"+" Set}] + ["[0]" dictionary {"+" Dictionary}]]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat]]]]] + [// + ["@[0]" artifact] + ["@[0]" dependency]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1][0]" runtime] + ["[1][0]" dependency {"+" Dependency}] + ["[1][0]" format] + [repository + [remote {"+" Address}]]]]]) (def: distribution (Random /.Distribution) @@ -154,10 +154,10 @@ (text#= "" /.default)) (_.cover [/.default_compiler] (|> (# /.monoid identity) - (value@ /.#compiler) + (the /.#compiler) (same? /.default_compiler))) (_.cover [/.default_target] (|> (# /.monoid identity) - (value@ /.#target) + (the /.#target) (same? /.default_target))) ))))) diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux index fdf778f28..c7bbe62c0 100644 --- a/stdlib/source/test/aedifex/project.lux +++ b/stdlib/source/test/aedifex/project.lux @@ -1,33 +1,33 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence] - ["$[0]" monoid]]] - [control - ["[0]" try ("[1]#[0]" functor)] - ["[0]" exception]] - [data - ["[0]" product] - ["[0]" text ("[1]#[0]" equivalence)]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat]]]]] - [// - ["@[0]" profile]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence] + ["$[0]" monoid]]] + [control + ["[0]" try ("[1]#[0]" functor)] + ["[0]" exception]] + [data + ["[0]" product] + ["[0]" text ("[1]#[0]" equivalence)]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat]]]]] + [// + ["@[0]" profile]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile]]]]) (def: profile (Random [//.Name //.Profile]) (|> @profile.random - (random#each (with@ //.#parents (list))) + (random#each (has //.#parents (list))) (random.and (random.ascii/alpha 1)))) (def: .public random @@ -66,11 +66,11 @@ .let [project ($_ (# /.monoid composite) (/.project super_name super_profile) (/.project dummy_name dummy_profile) - (/.project sub_name (with@ //.#parents (list super_name) sub_profile))) + (/.project sub_name (has //.#parents (list super_name) sub_profile))) circular ($_ (# /.monoid composite) - (/.project super_name (with@ //.#parents (list sub_name) super_profile)) + (/.project super_name (has //.#parents (list sub_name) super_profile)) (/.project dummy_name dummy_profile) - (/.project sub_name (with@ //.#parents (list super_name) sub_profile)))]] + (/.project sub_name (has //.#parents (list super_name) sub_profile)))]] ($_ _.and (_.cover [/.profile] (and (|> (/.profile project super_name) diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux index ec86419c2..99c1bd92d 100644 --- a/stdlib/source/test/aedifex/runtime.lux +++ b/stdlib/source/test/aedifex/runtime.lux @@ -1,24 +1,24 @@ - (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" maybe ("[1]#[0]" functor)]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [collection - ["[0]" list ("[1]#[0]" functor)] - ["[0]" set]]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat]]]]] - [\\program - ["[0]" /]]) +(.using + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" maybe ("[1]#[0]" functor)]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [collection + ["[0]" list ("[1]#[0]" functor)] + ["[0]" set]]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat]]]]] + [\\program + ["[0]" /]]) (def: .public random (Random /.Runtime) @@ -44,7 +44,7 @@ (~~ (template [<command>] [(_.cover [/.default_java /.default_js /.default_python /.default_lua /.default_ruby] (let [listing (|> (list /.default_java /.default_js /.default_python /.default_lua /.default_ruby) - (list#each (value@ /.#program))) + (list#each (the /.#program))) unique (set.of_list text.hash listing)] (n.= (list.size listing) (set.size unique))))] @@ -57,10 +57,10 @@ )) (_.cover [/.for] (let [runtime' (/.for runtime path)] - (and (text#= (value@ /.#program runtime) - (value@ /.#program runtime')) + (and (text#= (the /.#program runtime) + (the /.#program runtime')) (|> runtime' - (value@ /.#parameters) + (the /.#parameters) list.last (maybe#each (text#= path)) (maybe.else false))))) |