aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/program/aedifex
diff options
context:
space:
mode:
authorEduardo Julian2022-06-16 02:16:07 -0400
committerEduardo Julian2022-06-16 02:16:07 -0400
commite00e0b5f1e5fb509cf8f32424397110f524b8148 (patch)
treead15496975ea945d5f8fb2c795414d561561d2b6 /stdlib/source/program/aedifex
parent9e2f1e76f2c8df01ed7687d934c3210fcf676bd6 (diff)
New "parser" hierarchy. [Part 3]
Diffstat (limited to 'stdlib/source/program/aedifex')
-rw-r--r--stdlib/source/program/aedifex/artifact/snapshot.lux6
-rw-r--r--stdlib/source/program/aedifex/artifact/snapshot/build.lux6
-rw-r--r--stdlib/source/program/aedifex/artifact/snapshot/stamp.lux6
-rw-r--r--stdlib/source/program/aedifex/artifact/snapshot/time.lux6
-rw-r--r--stdlib/source/program/aedifex/artifact/snapshot/version.lux6
-rw-r--r--stdlib/source/program/aedifex/artifact/versioning.lux6
-rw-r--r--stdlib/source/program/aedifex/dependency/resolution.lux5
-rw-r--r--stdlib/source/program/aedifex/metadata/artifact.lux6
-rw-r--r--stdlib/source/program/aedifex/metadata/snapshot.lux6
-rw-r--r--stdlib/source/program/aedifex/package.lux7
-rw-r--r--stdlib/source/program/aedifex/pom.lux58
11 files changed, 58 insertions, 60 deletions
diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux
index 4966eb80f..45b54e2cd 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot.lux
@@ -5,14 +5,14 @@
[equivalence (.only Equivalence)]
[monad (.only do)]]
[control
- ["<>" parser (.only)
- ["<[0]>" xml (.only Parser)]]]
+ ["<>" parser]]
[data
["[0]" sum]
["[0]" text
["<[1]>" \\parser]]
[format
- ["[0]" xml (.only XML)]]]]]
+ ["[0]" xml (.only XML)
+ ["<[1]>" \\parser (.only Parser)]]]]]]
["[0]" /
["[1][0]" stamp (.only Stamp)]])
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/build.lux b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
index f0a0c7d18..05570de3e 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
@@ -5,14 +5,14 @@
[equivalence (.only Equivalence)]
[monad (.only do)]]
[control
- ["<>" parser
- ["<[0]>" xml (.only Parser)]]]
+ ["<>" parser]]
[data
["[0]" text
["%" \\format]
["<[1]>" \\parser]]
[format
- ["[0]" xml (.only XML)]]]
+ ["[0]" xml (.only XML)
+ ["<[1]>" \\parser (.only Parser)]]]]
[math
[number
["[0]" nat]]]]])
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
index 2f82cf020..1886b5b3e 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
@@ -5,14 +5,14 @@
[equivalence (.only Equivalence)]
[monad (.only do)]]
[control
- ["<>" parser (.only)
- ["<[0]>" xml (.only Parser)]]]
+ ["<>" parser]]
[data
["[0]" text
["<[1]>" \\parser]]
["[0]" product]
[format
- ["[0]" xml (.only XML)]]]]]
+ ["[0]" xml (.only XML)
+ ["<[1]>" \\parser (.only Parser)]]]]]]
["[0]" //
["[1][0]" time (.only Time)]
["[1][0]" build (.only Build)]])
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/time.lux b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
index 38a60ede0..87203845f 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
@@ -6,14 +6,14 @@
[monad (.only do)]]
[control
["[0]" exception (.only exception:)]
- ["<>" parser (.only)
- ["<[0]>" xml (.only Parser)]]]
+ ["<>" parser]]
[data
["[0]" text
["%" \\format]
["<[1]>" \\parser]]
[format
- ["[0]" xml (.only XML)]]]
+ ["[0]" xml (.only XML)
+ ["<[1]>" \\parser (.only Parser)]]]]
[time
["[0]" instant (.only Instant)]]]]
["[0]" ///
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
index e38534c8f..48af92b72 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
@@ -5,14 +5,14 @@
[equivalence (.only Equivalence)]
[monad (.only do)]]
[control
- ["<>" parser (.only)
- ["<[0]>" xml (.only Parser)]]]
+ ["<>" parser]]
[data
["[0]" product]
["[0]" text
["<[1]>" \\parser]]
[format
- ["[0]" xml (.only XML)]]]]]
+ ["[0]" xml (.only XML)
+ ["<[1]>" \\parser (.only Parser)]]]]]]
["[0]" ///
["[1][0]" type (.only Type)]
["[1][0]" time (.only Time)]])
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 811db7ab9..62a6e8fd2 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -6,15 +6,15 @@
[monad (.only do)]]
[control
["[0]" exception (.only exception:)]
- ["<>" parser (.only)
- ["<[0]>" xml (.only Parser)]]]
+ ["<>" parser]]
[data
["[0]" product]
["[0]" text (.only)
["%" \\format]
["<[1]>" \\parser]]
[format
- ["[0]" xml (.only XML)]]
+ ["[0]" xml (.only XML)
+ ["<[1]>" \\parser (.only Parser)]]]
[collection
["[0]" list (.open: "[1]#[0]" functor)]]]
[math
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index 08ca4d1a8..dc647464a 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -13,8 +13,6 @@
["[0]" maybe]
["[0]" try (.only Try) (.open: "[1]#[0]" functor)]
["[0]" exception (.only Exception exception:)]
- ["<>" parsernone
- ["<[0]>" xml (.only Parser)]]
[concurrency
["[0]" async (.only Async)]]]
[data
@@ -24,7 +22,8 @@
[encoding
["[0]" utf8]]]
[format
- ["[0]" xml (.only Tag XML)]]
+ ["[0]" xml (.only Tag XML)
+ ["<[1]>" \\parser (.only Parser)]]]
[collection
["[0]" dictionary (.only Dictionary)]
["[0]" set]
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index 01271437e..9bbb002bb 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -7,8 +7,7 @@
[control
["[0]" pipe]
["[0]" try (.only Try)]
- ["<>" parser (.only)
- ["<[0]>" xml (.only Parser)]]
+ ["<>" parser]
[concurrency
["[0]" async (.only Async)]]]
[data
@@ -19,7 +18,8 @@
[encoding
["[0]" utf8]]]
[format
- ["[0]" xml (.only XML)]]
+ ["[0]" xml (.only XML)
+ ["<[1]>" \\parser (.only Parser)]]]
[collection
["[0]" list (.open: "[1]#[0]" functor)]]]
[math
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index 4479fe244..1ea744765 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -8,8 +8,7 @@
["[0]" pipe]
["[0]" try (.only Try)]
["[0]" exception (.only exception:)]
- ["<>" parser (.only)
- ["<[0]>" xml (.only Parser)]]
+ ["<>" parser]
[concurrency
["[0]" async (.only Async)]]]
[data
@@ -20,7 +19,8 @@
[encoding
["[0]" utf8]]]
[format
- ["[0]" xml (.only XML)]]
+ ["[0]" xml (.only XML)
+ ["<[1]>" \\parser (.only Parser)]]]
[collection
["[0]" list (.open: "[1]#[0]" functor)]]]
[math
diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux
index 258a80c2f..46a40927b 100644
--- a/stdlib/source/program/aedifex/package.lux
+++ b/stdlib/source/program/aedifex/package.lux
@@ -4,9 +4,7 @@
[abstract
[equivalence (.only Equivalence)]]
[control
- ["[0]" try (.only Try) (.open: "[1]#[0]" functor)]
- [parser
- ["<[0]>" xml]]]
+ ["[0]" try (.only Try) (.open: "[1]#[0]" functor)]]
[data
["[0]" sum]
["[0]" product]
@@ -15,7 +13,8 @@
[encoding
["[0]" utf8]]]
[format
- ["[0]" xml (.only XML)]]
+ ["[0]" xml (.only XML)
+ ["<[1]>" \\parser]]]
[collection
[set (.only Set)]]]]]
["[0]" //
diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux
index 0f5d3b50e..334a06f46 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -8,12 +8,12 @@
["[0]" maybe (.open: "[1]#[0]" functor)]
["[0]" try (.only Try)]
["[0]" exception]
- ["<>" parser (.only)
- ["<[0]>" xml (.only Parser)]]]
+ ["<>" parser]]
[data
["[0]" text]
[format
- ["_" xml (.only Tag XML)]]
+ ["[0]" xml (.only Tag XML)
+ ["<[1]>" \\parser (.only Parser)]]]
[collection
["[0]" list (.open: "[1]#[0]" monoid functor mix)]
["[0]" set]
@@ -48,14 +48,14 @@
(def version
XML
- {_.#Node ["" "modelVersion"] _.attributes
- (list {_.#Text "4.0.0"})})
+ {xml.#Node ["" "modelVersion"] xml.attributes
+ (list {xml.#Text "4.0.0"})})
(def (property tag value)
(-> Text Text XML)
- {_.#Node ["" tag]
- _.attributes
- (list {_.#Text value})})
+ {xml.#Node ["" tag]
+ xml.attributes
+ (list {xml.#Text value})})
(def (artifact value)
(-> Artifact (List XML))
@@ -75,36 +75,36 @@
(|> (list (..property "name" name)
(..property ..url_tag url)
(..distribution distribution))
- {_.#Node ["" "license"] _.attributes}))
+ {xml.#Node ["" "license"] xml.attributes}))
(def repository
(-> Address XML)
(|>> (..property ..url_tag)
list
- {_.#Node ["" ..repository_tag] _.attributes}))
+ {xml.#Node ["" ..repository_tag] xml.attributes}))
(def (dependency value)
(-> Dependency XML)
- {_.#Node ["" ..dependency_tag]
- _.attributes
- (list#composite (..artifact (the //dependency.#artifact value))
- (list (..property "type" (the //dependency.#type value))))})
+ {xml.#Node ["" ..dependency_tag]
+ xml.attributes
+ (list#composite (..artifact (the //dependency.#artifact value))
+ (list (..property "type" (the //dependency.#type value))))})
(def (group tag)
(-> Text (-> (List XML) XML))
- (|>> {_.#Node ["" tag] _.attributes}))
+ (|>> {xml.#Node ["" tag] xml.attributes}))
(def scm
(-> /.SCM XML)
(|>> (..property ..url_tag)
list
- {_.#Node ["" "scm"] _.attributes}))
+ {xml.#Node ["" "scm"] xml.attributes}))
(def (organization [name url])
(-> /.Organization XML)
(|> (list (..property "name" name)
(..property ..url_tag url))
- {_.#Node ["" "organization"] _.attributes}))
+ {xml.#Node ["" "organization"] xml.attributes}))
(def (developer_organization [name url])
(-> /.Organization (List XML))
@@ -120,7 +120,7 @@
(with_template [<name> <type> <tag>]
[(def <name>
(-> <type> XML)
- (|>> ..developer' {_.#Node ["" <tag>] _.attributes}))]
+ (|>> ..developer' {xml.#Node ["" <tag>] xml.attributes}))]
[developer /.Developer "developer"]
[contributor /.Contributor "contributor"]
@@ -144,17 +144,17 @@
(case (the /.#identity value)
{.#Some identity}
{try.#Success
- {_.#Node ["" ..project_tag] _.attributes
- (all list#composite
- (list ..version)
- (..artifact identity)
- (|> value
- (the /.#info)
- (maybe#each ..info)
- (maybe.else (list)))
- (|> value (the /.#repositories) set.list (list#each ..repository) (..group "repositories") list)
- (|> value (the /.#dependencies) set.list (list#each ..dependency) (..group ..dependencies_tag) list)
- )}}
+ {xml.#Node ["" ..project_tag] xml.attributes
+ (all list#composite
+ (list ..version)
+ (..artifact identity)
+ (|> value
+ (the /.#info)
+ (maybe#each ..info)
+ (maybe.else (list)))
+ (|> value (the /.#repositories) set.list (list#each ..repository) (..group "repositories") list)
+ (|> value (the /.#dependencies) set.list (list#each ..dependency) (..group ..dependencies_tag) list)
+ )}}
_
(exception.except /.no_identity [])))