From 0f9bc13a34b729d9ae9db31276feb2a66785d06b Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 14 Aug 2022 21:02:22 -0400 Subject: Documentation changes for v0.7.0 --- stdlib/source/program/aedifex.lux | 2 +- stdlib/source/program/aedifex/format.lux | 1 - stdlib/source/program/aedifex/parser.lux | 1 - stdlib/source/program/aedifex/pom.lux | 25 ++++++++++++++++++------- stdlib/source/program/aedifex/profile.lux | 7 ++----- stdlib/source/test/aedifex/profile.lux | 1 - 6 files changed, 21 insertions(+), 16 deletions(-) (limited to 'stdlib/source') diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux index dc378103b..182ebf233 100644 --- a/stdlib/source/program/aedifex.lux +++ b/stdlib/source/program/aedifex.lux @@ -9,7 +9,7 @@ ["[0]" io (.only IO)] ["[0]" maybe] ["[0]" try (.only Try) (.use "[1]#[0]" functor)] - ["[0]" exception] + ["[0]" exception (.only Exception)] [concurrency ["[0]" async (.only Async) (.use "[1]#[0]" monad)]]] [data diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux index 771bcc9de..4d76b23e2 100644 --- a/stdlib/source/program/aedifex/format.lux +++ b/stdlib/source/program/aedifex/format.lux @@ -115,7 +115,6 @@ (def (info value) (Format /.Info) (|> ..empty - (..on_maybe "name" (the /.#name value) code.text) (..on_maybe "url" (the /.#url value) code.text) (..on_maybe "scm" (the /.#scm value) code.text) (..on_maybe "description" (the /.#description value) code.text) diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux index 6e64f5bf2..96a717dbc 100644 --- a/stdlib/source/program/aedifex/parser.lux +++ b/stdlib/source/program/aedifex/parser.lux @@ -126,7 +126,6 @@ (.tuple (<>.some (<>.and .text .any))))] (all <>.and - (<>.maybe (..singular input "name" ..name)) (<>.maybe (..singular input "url" ..url)) (<>.maybe (..singular input "scm" ..scm)) (<>.maybe (..singular input "description" ..description)) diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index eed536317..cafb480a2 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -126,10 +126,10 @@ [contributor /.Contributor "contributor"] ) -(def (info value) - (-> /.Info (List XML)) +(def (info identity value) + (-> Artifact /.Info (List XML)) (all list#composite - (|> value (the /.#name) (maybe#each (..property "name")) maybe.list) + (|> identity (the //artifact.#name) (..property "name") list) (|> value (the /.#url) (maybe#each (..property ..url_tag)) maybe.list) (|> value (the /.#description) (maybe#each (..property "description")) maybe.list) (|> value (the /.#licenses) (list#each ..license) (..group "licenses") list) @@ -144,16 +144,27 @@ (when (the /.#identity value) {.#Some identity} {try.#Success - {xml.#Node ["" ..project_tag] xml.attributes + {xml.#Node ["" ..project_tag] + xml.attributes (all list#composite (list ..version) (..artifact identity) (|> value (the /.#info) - (maybe#each ..info) + (maybe#each (..info identity)) (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) + (|> value + (the /.#repositories) + set.list + (list#each ..repository) + (..group "repositories") + list) + (|> value + (the /.#dependencies) + set.list + (list#each ..dependency) + (..group ..dependencies_tag) + list) )}} _ diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index e887160b5..674865cdd 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -107,8 +107,7 @@ (type .public Info (Record - [#name (Maybe Text) - #url (Maybe URL) + [#url (Maybe URL) #scm (Maybe SCM) #description (Maybe Text) #licenses (List License) @@ -122,7 +121,6 @@ (maybe.equivalence text.equivalence) (maybe.equivalence text.equivalence) (maybe.equivalence text.equivalence) - (maybe.equivalence text.equivalence) (list.equivalence ..license_equivalence) (maybe.equivalence ..organization_equivalence) (list.equivalence ..developer_equivalence) @@ -130,8 +128,7 @@ (def .public default_info Info - [#name {.#None} - #url {.#None} + [#url {.#None} #scm {.#None} #description {.#None} #licenses (list) diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux index 4d964ebdd..25eccfa43 100644 --- a/stdlib/source/test/aedifex/profile.lux +++ b/stdlib/source/test/aedifex/profile.lux @@ -98,7 +98,6 @@ (def info (Random /.Info) (all random.and - (random.maybe (random.alphabetic 1)) (random.maybe (random.alphabetic 2)) (random.maybe ..scm) (random.maybe (random.alphabetic 3)) -- cgit v1.2.3