aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/program/aedifex
diff options
context:
space:
mode:
authorEduardo Julian2021-08-11 02:38:59 -0400
committerEduardo Julian2021-08-11 02:38:59 -0400
commita62ce3f9c2b605e0033f4772b0f64c4525de4d86 (patch)
treeecbabe8f110d82b2e6481cf7c0532d4bd4386570 /stdlib/source/program/aedifex
parent464b6e8f5e6c62f58fa8c7ff61ab2ad215e98bd1 (diff)
Relocated maybe and lazy from data to control.
Diffstat (limited to '')
-rw-r--r--stdlib/source/program/aedifex/artifact/versioning.lux1
-rw-r--r--stdlib/source/program/aedifex/command/build.lux5
-rw-r--r--stdlib/source/program/aedifex/command/deploy.lux2
-rw-r--r--stdlib/source/program/aedifex/command/deps.lux8
-rw-r--r--stdlib/source/program/aedifex/command/install.lux2
-rw-r--r--stdlib/source/program/aedifex/dependency/resolution.lux4
-rw-r--r--stdlib/source/program/aedifex/hash.lux2
-rw-r--r--stdlib/source/program/aedifex/input.lux2
-rw-r--r--stdlib/source/program/aedifex/metadata/artifact.lux2
-rw-r--r--stdlib/source/program/aedifex/metadata/snapshot.lux2
-rw-r--r--stdlib/source/program/aedifex/package.lux4
-rw-r--r--stdlib/source/program/aedifex/pom.lux4
-rw-r--r--stdlib/source/program/aedifex/profile.lux2
13 files changed, 19 insertions, 21 deletions
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 9e6ff8244..9f9963731 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -11,7 +11,6 @@
["<.>" text]]]
[data
["." product]
- ["." maybe]
["." text
["%" format]]
[format
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index 00380e59b..58df179e2 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -13,7 +13,6 @@
["." async (#+ Async) ("#\." monad)]]]
[data
["." product]
- ["." maybe]
["." text ("#\." order)
["%" format (#+ format)]]
[collection
@@ -218,7 +217,7 @@
(async.upon! recur
(\ process <capability> []))))
(console.write_line line console)))))
- io.run)]
+ io.run!)]
read!))]
[log_output! read]
@@ -232,7 +231,7 @@
(def: windows?
Bit
(|> (java/lang/System::getProperty "os.name")
- io.run
+ io.run!
(try.else "")
text.lower_cased
(text.starts_with? "windows")))
diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux
index 2ff5ca8fb..cbddc9b27 100644
--- a/stdlib/source/program/aedifex/command/deploy.lux
+++ b/stdlib/source/program/aedifex/command/deploy.lux
@@ -63,7 +63,7 @@
(get@ #/.sources)
set.list
(export.library fs)
- (\ ! map (binary.run tar.writer)))
+ (\ ! map (binary.result tar.writer)))
pom (\ async.monad in (///pom.write profile))
_ (///dependency/deployment.one
repository
diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux
index 9dbabbfca..185bd6229 100644
--- a/stdlib/source/program/aedifex/command/deps.lux
+++ b/stdlib/source/program/aedifex/command/deps.lux
@@ -59,19 +59,19 @@
(///dependency/deployment.all local))
_ (console.write_line (exception.report
["Local successes" (|> local_successes
- (list.sort (\ ///dependency.order <))
+ (list.sorted (\ ///dependency.order <))
(exception.listing ..format))]
["Local failures" (|> local_failures
- (list.sort (\ ///dependency.order <))
+ (list.sorted (\ ///dependency.order <))
(exception.listing ..format))]
["Remote successes" (|> remote_successes
(set.of_list ///dependency.hash)
(set.difference (set.of_list ///dependency.hash local_successes))
set.list
- (list.sort (\ ///dependency.order <))
+ (list.sorted (\ ///dependency.order <))
(exception.listing ..format))]
["Remote failures" (|> remote_failures
- (list.sort (\ ///dependency.order <))
+ (list.sorted (\ ///dependency.order <))
(exception.listing ..format))])
console)]
(in resolution))))
diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux
index c86400b6a..9b06daaec 100644
--- a/stdlib/source/program/aedifex/command/install.lux
+++ b/stdlib/source/program/aedifex/command/install.lux
@@ -67,7 +67,7 @@
(\ xml.codec encode)
(\ utf8.codec encode))]
{#///package.origin (#///origin.Local "")
- #///package.library (let [library (binary.run tar.writer package)]
+ #///package.library (let [library (binary.result tar.writer package)]
[library (///dependency/status.verified library)])
#///package.pom [pom
pom_data
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index ed4303ac5..d86bef56b 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -8,6 +8,7 @@
[equivalence (#+ Equivalence)]
[monad (#+ do)]]
[control
+ ["." maybe]
["." try (#+ Try) ("#\." functor)]
["." exception (#+ Exception exception:)]
["<>" parser
@@ -17,7 +18,6 @@
[data
["." binary (#+ Binary)]
["." name]
- ["." maybe]
["." text
["%" format (#+ format)]
[encoding
@@ -138,7 +138,7 @@
(do try.monad
[pom (\ utf8.codec decode pom_data)
pom (\ xml.codec decode pom)
- profile (<xml>.run ///pom.parser (list pom))]
+ profile (<xml>.result ///pom.parser (list pom))]
(in {#///package.origin (#///repository/origin.Remote "")
#///package.library library_&_status
#///package.pom [pom pom_data pom_status]}))))))
diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux
index 2e46286ea..46a6fc67a 100644
--- a/stdlib/source/program/aedifex/hash.lux
+++ b/stdlib/source/program/aedifex/hash.lux
@@ -121,7 +121,7 @@
(if (n.= size hash_size)
(loop [input encoded
chunk 0
- output (binary.create hash_size)]
+ output (binary.empty hash_size)]
(let [index (n.* chunk i64.bytes_per_i64)]
(case (text.split ..hex_per_chunk input)
(#.Some [head tail])
diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux
index 6a635589e..58f37e252 100644
--- a/stdlib/source/program/aedifex/input.lux
+++ b/stdlib/source/program/aedifex/input.lux
@@ -44,7 +44,7 @@
(|>> (do> try.monad
[(\ utf8.codec decode)]
[..lux_parser]
- [(list) (<code>.run //parser.project)])))
+ [(list) (<code>.result //parser.project)])))
(def: .public (read monad fs profile)
(All [!] (-> (Monad !) (file.System !) Text (! (Try Profile))))
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index 0bd6d4a12..f4971546f 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -182,7 +182,7 @@
(do> try.monad
[(\ utf8.codec decode)]
[(\ xml.codec decode)]
- [list (<xml>.run ..parser)])))
+ [list (<xml>.result ..parser)])))
(#try.Failure error)
(in (#try.Success
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index 69e3432fa..90fa9bb86 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -132,7 +132,7 @@
(do> try.monad
[(\ utf8.codec decode)]
[(\ xml.codec decode)]
- [list (<xml>.run ..parser)])))
+ [list (<xml>.result ..parser)])))
(#try.Failure error)
(in (#try.Success
diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux
index ea9c2a6d8..6b65a936d 100644
--- a/stdlib/source/program/aedifex/package.lux
+++ b/stdlib/source/program/aedifex/package.lux
@@ -64,7 +64,7 @@
(|>> (get@ #pom)
product.left
list
- (<xml>.run //pom.parser)
+ (<xml>.result //pom.parser)
(try\map (get@ #/.dependencies))))
(def: .public repositories
@@ -72,7 +72,7 @@
(|>> (get@ #pom)
product.left
list
- (<xml>.run //pom.parser)
+ (<xml>.result //pom.parser)
(try\map (get@ #/.repositories))))
(def: .public equivalence
diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux
index e2ad11079..d18bd9209 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -5,13 +5,13 @@
[monad (#+ do)]]
[control
[pipe (#+ case>)]
+ ["." maybe ("#\." functor)]
["." try (#+ Try)]
["." exception]
["<>" parser
["<.>" xml (#+ Parser)]]]
[data
["." name]
- ["." maybe ("#\." functor)]
["." text]
[format
["_" xml (#+ Tag XML)]]
@@ -223,7 +223,7 @@
repositories (|> ..repositories_parser
<xml>.somewhere
(<>.else (list)))
- _ (<>.some <xml>.ignore)]
+ _ (<>.some <xml>.any)]
(in (|> (\ /.monoid identity)
(update@ #/.dependencies (function (_ empty)
(list\fold set.add empty dependencies)))
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux
index ffd549c06..2ff458967 100644
--- a/stdlib/source/program/aedifex/profile.lux
+++ b/stdlib/source/program/aedifex/profile.lux
@@ -5,10 +5,10 @@
[monoid (#+ Monoid)]
[equivalence (#+ Equivalence)]]
[control
+ ["." maybe ("#\." monoid)]
["." exception (#+ exception:)]]
[data
["." product]
- ["." maybe ("#\." monoid)]
["." text ("#\." equivalence)]
[collection
["." dictionary (#+ Dictionary)]