From a62ce3f9c2b605e0033f4772b0f64c4525de4d86 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 11 Aug 2021 02:38:59 -0400 Subject: Relocated maybe and lazy from data to control. --- stdlib/source/test/aedifex/artifact/snapshot.lux | 2 +- stdlib/source/test/aedifex/artifact/snapshot/build.lux | 2 +- stdlib/source/test/aedifex/artifact/snapshot/stamp.lux | 2 +- stdlib/source/test/aedifex/artifact/snapshot/time.lux | 2 +- stdlib/source/test/aedifex/artifact/snapshot/version.lux | 2 +- stdlib/source/test/aedifex/artifact/time.lux | 2 +- stdlib/source/test/aedifex/artifact/time/date.lux | 2 +- stdlib/source/test/aedifex/artifact/time/time.lux | 2 +- stdlib/source/test/aedifex/artifact/versioning.lux | 4 ++-- stdlib/source/test/aedifex/cli.lux | 4 ++-- stdlib/source/test/aedifex/command/auto.lux | 2 +- stdlib/source/test/aedifex/command/deploy.lux | 4 ++-- stdlib/source/test/aedifex/command/install.lux | 2 +- stdlib/source/test/aedifex/command/version.lux | 2 +- stdlib/source/test/aedifex/dependency/deployment.lux | 4 ++-- stdlib/source/test/aedifex/metadata/artifact.lux | 4 ++-- stdlib/source/test/aedifex/metadata/snapshot.lux | 4 ++-- stdlib/source/test/aedifex/parser.lux | 4 ++-- stdlib/source/test/aedifex/pom.lux | 2 +- stdlib/source/test/aedifex/repository.lux | 2 +- stdlib/source/test/aedifex/repository/remote.lux | 10 +++++----- stdlib/source/test/aedifex/runtime.lux | 3 ++- 22 files changed, 34 insertions(+), 33 deletions(-) (limited to 'stdlib/source/test/aedifex') diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux index f196586ac..c4ebdfc66 100644 --- a/stdlib/source/test/aedifex/artifact/snapshot.lux +++ b/stdlib/source/test/aedifex/artifact/snapshot.lux @@ -39,7 +39,7 @@ (|> expected /.format list - (.run /.parser) + (.result /.parser) (try\map (\ /.equivalence = expected)) (try.else false)))) diff --git a/stdlib/source/test/aedifex/artifact/snapshot/build.lux b/stdlib/source/test/aedifex/artifact/snapshot/build.lux index e613c2f92..d207053c9 100644 --- a/stdlib/source/test/aedifex/artifact/snapshot/build.lux +++ b/stdlib/source/test/aedifex/artifact/snapshot/build.lux @@ -33,7 +33,7 @@ (|> expected /.format list - (.run /.parser) + (.result /.parser) (try\map (\ /.equivalence = expected)) (try.else false)))) )))) diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux index 2a2c19e4f..ed77767cb 100644 --- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux +++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux @@ -40,7 +40,7 @@ (_.cover [/.format /.parser] (|> expected /.format - (.run /.parser) + (.result /.parser) (try\map (\ /.equivalence = expected)) (try.else false)))) ))) diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux index a658d3e29..7f33a9e86 100644 --- a/stdlib/source/test/aedifex/artifact/snapshot/time.lux +++ b/stdlib/source/test/aedifex/artifact/snapshot/time.lux @@ -35,7 +35,7 @@ (_.cover [/.format /.parser] (|> expected /.format - (.run /.parser) + (.result /.parser) (try\map (\ /.equivalence = expected)) (try.else false))) )) diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux index c5ec63398..3976d7054 100644 --- a/stdlib/source/test/aedifex/artifact/snapshot/version.lux +++ b/stdlib/source/test/aedifex/artifact/snapshot/version.lux @@ -42,7 +42,7 @@ (|> expected /.format list - (.run /.parser) + (.result /.parser) (try\map (\ /.equivalence = expected)) (try.else false)))) diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux index ed60f6389..8270969fd 100644 --- a/stdlib/source/test/aedifex/artifact/time.lux +++ b/stdlib/source/test/aedifex/artifact/time.lux @@ -42,7 +42,7 @@ (_.cover [/.format /.parser] (|> expected /.format - (.run /.parser) + (.result /.parser) (try\map (\ /.equivalence = expected)) (try.else false)))) (do random.monad diff --git a/stdlib/source/test/aedifex/artifact/time/date.lux b/stdlib/source/test/aedifex/artifact/time/date.lux index e58ed00f9..212aa01dd 100644 --- a/stdlib/source/test/aedifex/artifact/time/date.lux +++ b/stdlib/source/test/aedifex/artifact/time/date.lux @@ -48,7 +48,7 @@ (_.cover [/.format /.parser] (|> expected /.format - (.run /.parser) + (.result /.parser) (try\map (\ /.equivalence = expected)) (try.else false))) (_.cover [/.value /.date] diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux index 9358e7bab..4dcdac3cc 100644 --- a/stdlib/source/test/aedifex/artifact/time/time.lux +++ b/stdlib/source/test/aedifex/artifact/time/time.lux @@ -32,7 +32,7 @@ (_.cover [/.format /.parser] (|> expected /.format - (.run /.parser) + (.result /.parser) (try\map (\ time.equivalence = expected)) (try.else false)))) ))) diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux index 5a0b2df20..aa90619cb 100644 --- a/stdlib/source/test/aedifex/artifact/versioning.lux +++ b/stdlib/source/test/aedifex/artifact/versioning.lux @@ -41,14 +41,14 @@ (|> expected /.format list - (.run /.parser) + (.result /.parser) (try\map (\ /.equivalence = expected)) (try.else false)))) (_.cover [/.init] (|> /.init /.format list - (.run /.parser) + (.result /.parser) (try\map (\ /.equivalence = /.init)) (try.else false))) ))) diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux index 4b5e79ac5..45ec92f4e 100644 --- a/stdlib/source/test/aedifex/cli.lux +++ b/stdlib/source/test/aedifex/cli.lux @@ -73,7 +73,7 @@ (_.test "Without profile." (|> expected ..format - (cli.run /.command) + (cli.result /.command) (case> (#try.Success [name actual]) (and (text\= //.default name) (\ /.equivalence = expected actual)) @@ -90,7 +90,7 @@ (|> expected_command ..format (list& "with" expected_profile) - (cli.run /.command) + (cli.result /.command) (case> (#try.Success [actual_profile actual_command]) (and (text\= expected_profile actual_profile) (\ /.equivalence = expected_command actual_command)) diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux index 074eeab5e..934810e0c 100644 --- a/stdlib/source/test/aedifex/command/auto.lux +++ b/stdlib/source/test/aedifex/command/auto.lux @@ -98,7 +98,7 @@ (in (do async.monad [verdict (do ///action.monad [_ (\ fs make_directory source) - _ (\ fs write (binary.create 0) dummy_path) + _ (\ fs write (binary.empty 0) dummy_path) .let [[@runs command] (..command expected_runs end_signal fs dummy_path)] _ (\ watcher poll [])] (do {! async.monad} diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux index 4bdbafd59..4d11234bd 100644 --- a/stdlib/source/test/aedifex/command/deploy.lux +++ b/stdlib/source/test/aedifex/command/deploy.lux @@ -5,13 +5,13 @@ [abstract [monad (#+ do)]] [control + ["." maybe] ["." try (#+ Try)] [concurrency ["." async (#+ Async)]] [parser ["." environment]]] [data - ["." maybe] ["." binary ("#\." equivalence)] ["." text ("#\." equivalence) ["%" format (#+ format)] @@ -84,7 +84,7 @@ (get@ #///.sources) set.list (export.library fs) - (\ ! map (format.run tar.writer))) + (\ ! map (format.result tar.writer))) actual_pom (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact ///artifact/extension.pom)) actual_library (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact ///artifact/extension.lux_library)) diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux index a3cd99edd..86fe5ebea 100644 --- a/stdlib/source/test/aedifex/command/install.lux +++ b/stdlib/source/test/aedifex/command/install.lux @@ -50,7 +50,7 @@ [_ (: (Async (Try Any)) (file.make_directories async.monad fs head))] (: (Async (Try Any)) - (file.make_file async.monad fs (binary.create 0) (format head / head ".lux"))))))))) + (file.make_file async.monad fs (binary.empty 0) (format head / head ".lux"))))))))) (def: (execute! program fs sample) (-> (Program Async) (file.System Async) ///.Profile (Async (Try Text))) diff --git a/stdlib/source/test/aedifex/command/version.lux b/stdlib/source/test/aedifex/command/version.lux index f1c424289..0400cbc58 100644 --- a/stdlib/source/test/aedifex/command/version.lux +++ b/stdlib/source/test/aedifex/command/version.lux @@ -5,12 +5,12 @@ [abstract [monad (#+ do)]] [control + ["." maybe] ["." try] ["." exception (#+ exception:)] [concurrency ["." async (#+ Async)]]] [data - ["." maybe] ["." text ("#\." equivalence) ["%" format (#+ format)]]] [math diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux index 0add3a487..7352de63a 100644 --- a/stdlib/source/test/aedifex/dependency/deployment.lux +++ b/stdlib/source/test/aedifex/dependency/deployment.lux @@ -7,13 +7,13 @@ ["." hash (#+ Hash)]] [control ["." io (#+ IO)] + ["." maybe ("#\." functor)] ["." try ("#\." functor)] [concurrency ["." atom (#+ Atom)] ["." async]]] [data ["." product] - ["." maybe ("#\." functor)] ["." binary (#+ Binary) ("#\." equivalence)] ["." text ["%" format (#+ format)]] @@ -54,7 +54,7 @@ [http/status.created {#@http.headers (http.headers (list)) #@http.body (function (_ _) - (|> [0 (binary.create 0)] + (|> [0 (binary.empty 0)] #try.Success io.io))}]) diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux index 2e6a8e10f..7bcb0bd91 100644 --- a/stdlib/source/test/aedifex/metadata/artifact.lux +++ b/stdlib/source/test/aedifex/metadata/artifact.lux @@ -7,6 +7,7 @@ [\\specification ["$." equivalence]]] [control + ["." maybe] ["." try ("#\." functor)] [parser ["." environment] @@ -14,7 +15,6 @@ [concurrency ["." async]]] [data - ["." maybe] ["." text ("#\." equivalence)] [collection ["." list]]] @@ -88,7 +88,7 @@ (|> expected /.format list - (.run /.parser) + (.result /.parser) (try\map (\ /.equivalence = expected)) (try.else false)))) (_.cover [/.uri] diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux index 7b375d42c..5683178c4 100644 --- a/stdlib/source/test/aedifex/metadata/snapshot.lux +++ b/stdlib/source/test/aedifex/metadata/snapshot.lux @@ -7,6 +7,7 @@ [\\specification ["$." equivalence]]] [control + ["." maybe] ["." try ("#\." functor)] [parser ["." environment] @@ -14,7 +15,6 @@ [concurrency ["." async]]] [data - ["." maybe] ["." text ("#\." equivalence)] [collection ["." list]]] @@ -100,7 +100,7 @@ (|> expected /.format list - (.run /.parser) + (.result /.parser) (try\map (\ /.equivalence = expected)) (try.else false))) (_.cover [/.uri] diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux index 4c882ea4a..354352d6a 100644 --- a/stdlib/source/test/aedifex/parser.lux +++ b/stdlib/source/test/aedifex/parser.lux @@ -74,7 +74,7 @@ (|> expected //format.profile list - (.run /.project) + (.result /.project) (case> (#try.Success actual) (|> expected ..with_default_sources @@ -99,7 +99,7 @@ (|> expected //format.project list - (.run /.project) + (.result /.project) (case> (#try.Success actual) (|> expected ..with_empty_profile diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux index 657c6192d..f51ac9abc 100644 --- a/stdlib/source/test/aedifex/pom.lux +++ b/stdlib/source/test/aedifex/pom.lux @@ -37,7 +37,7 @@ (get@ #//.identity expected)] [(#try.Success pom) (#.Some _)] - (case (.run /.parser (list pom)) + (case (.result /.parser (list pom)) (#try.Success actual) (\ //.equivalence = (|> (\ //.monoid identity) diff --git a/stdlib/source/test/aedifex/repository.lux b/stdlib/source/test/aedifex/repository.lux index 478f02d7e..33f719efc 100644 --- a/stdlib/source/test/aedifex/repository.lux +++ b/stdlib/source/test/aedifex/repository.lux @@ -98,7 +98,7 @@ (dictionary.put (remote.uri ..invalid_version (..artifact ..invalid_version) //artifact/extension.lux_library) - (binary.create 0))))))) + (binary.empty 0))))))) /identity.test /origin.test diff --git a/stdlib/source/test/aedifex/repository/remote.lux b/stdlib/source/test/aedifex/repository/remote.lux index 0ff764bdd..8cca4aee8 100644 --- a/stdlib/source/test/aedifex/repository/remote.lux +++ b/stdlib/source/test/aedifex/repository/remote.lux @@ -6,12 +6,12 @@ [monad (#+ do)]] [control ["." io (#+ IO)] + ["." maybe ("#\." functor)] ["." try ("#\." monad)] ["." exception] ["." function]] [data ["." binary ("#\." equivalence)] - ["." maybe ("#\." functor)] ["." text ("#\." equivalence) ["%" format (#+ format)] [encoding @@ -99,20 +99,20 @@ #//identity.password password}) address)] (and (|> (\ repo download uri) - io.run + io.run! (try\map (\ utf8.codec decode)) try\join (try\map (text\= (format address uri))) (try.else false)) (|> (\ repo upload uri content) - io.run + io.run! (try\map (function.constant true)) (try.else false))))) (_.cover [/.upload_failure] (let [repo (/.repository (..good_http user password) #.None address)] - (case (io.run (\ repo upload uri content)) + (case (io.run! (\ repo upload uri content)) (#try.Failure error) (exception.match? /.upload_failure error) @@ -122,7 +122,7 @@ (let [repo (/.repository ..bad_http #.None address)] - (case (io.run (\ repo download uri)) + (case (io.run! (\ repo download uri)) (#try.Failure error) (exception.match? /.download_failure error) diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux index 7508239ad..c9e61b017 100644 --- a/stdlib/source/test/aedifex/runtime.lux +++ b/stdlib/source/test/aedifex/runtime.lux @@ -6,8 +6,9 @@ [monad (#+ do)] [\\specification ["$." equivalence]]] + [control + ["." maybe ("#\." functor)]] [data - ["." maybe ("#\." functor)] ["." text ("#\." equivalence)] [collection ["." list ("#\." functor)] -- cgit v1.2.3