From 36303d6cb2ce3ab9e36d045b9516c997bd461862 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 24 Aug 2021 05:23:45 -0400
Subject: Outsourced the syntax for labelled type definitions to macros.

---
 stdlib/source/program/aedifex/pom.lux | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'stdlib/source/program/aedifex/pom.lux')

diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux
index 7f9464e5c..a093a4091 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -85,8 +85,8 @@
   (-> Dependency XML)
   (#_.Node ["" ..dependency_tag]
            _.attributes
-           (list\compose (..artifact (value@ #//dependency.artifact value))
-                         (list (..property "type" (value@ #//dependency.type value))))))
+           (list\composite (..artifact (value@ #//dependency.artifact value))
+                           (list (..property "type" (value@ #//dependency.type value))))))
 
 (def: (group tag)
   (-> Text (-> (List XML) XML))
@@ -114,7 +114,7 @@
     (-> /.Developer (List XML))
     (list& (..property "name" name)
            (..property "email" email)
-           (|> organization (maybe\map ..developer_organization) (maybe.else (list)))))
+           (|> organization (maybe\each ..developer_organization) (maybe.else (list)))))
 
   (template [<name> <type> <tag>]
     [(def: <name>
@@ -127,14 +127,14 @@
 
   (def: (info value)
     (-> /.Info (List XML))
-    ($_ list\compose
-        (|> value (value@ #/.url) (maybe\map (..property ..url_tag)) maybe.list)
-        (|> value (value@ #/.description) (maybe\map (..property "description")) maybe.list)
-        (|> value (value@ #/.licenses) (list\map ..license) (..group "licenses") list)
-        (|> value (value@ #/.scm) (maybe\map ..scm) maybe.list)
-        (|> value (value@ #/.organization) (maybe\map ..organization) maybe.list)
-        (|> value (value@ #/.developers) (list\map ..developer) (..group "developers") list)
-        (|> value (value@ #/.contributors) (list\map ..contributor) (..group "contributors") list)
+    ($_ list\composite
+        (|> value (value@ #/.url) (maybe\each (..property ..url_tag)) maybe.list)
+        (|> value (value@ #/.description) (maybe\each (..property "description")) maybe.list)
+        (|> value (value@ #/.licenses) (list\each ..license) (..group "licenses") list)
+        (|> value (value@ #/.scm) (maybe\each ..scm) maybe.list)
+        (|> value (value@ #/.organization) (maybe\each ..organization) maybe.list)
+        (|> value (value@ #/.developers) (list\each ..developer) (..group "developers") list)
+        (|> value (value@ #/.contributors) (list\each ..contributor) (..group "contributors") list)
         ))
   )
 
@@ -144,11 +144,11 @@
     (#.Some identity)
     (#try.Success
      (#_.Node ["" ..project_tag] _.attributes
-              ($_ list\compose
+              ($_ list\composite
                   (list ..version)
                   (..artifact identity)
-                  (|> value (value@ #/.repositories) set.list (list\map ..repository) (..group "repositories") list)
-                  (|> value (value@ #/.dependencies) set.list (list\map ..dependency) (..group ..dependencies_tag) list)
+                  (|> value (value@ #/.repositories) set.list (list\each ..repository) (..group "repositories") list)
+                  (|> value (value@ #/.dependencies) set.list (list\each ..dependency) (..group ..dependencies_tag) list)
                   )))
 
     _
@@ -159,13 +159,13 @@
   (do {! <>.monad}
     [tag <xml>.tag]
     (<| (<xml>.node tag)
-        (\ ! map (|>> [tag]))
+        (\ ! each (|>> [tag]))
         <xml>.text)))
 
 (def: (dependency_parser own_version parent_version)
   (-> Text Text (Parser Dependency))
   (do {! <>.monad}
-    [properties (\ ! map (dictionary.of_list name.hash)
+    [properties (\ ! each (dictionary.of_list name.hash)
                    (<| (<xml>.node ["" ..dependency_tag])
                        (<>.some ..property_parser)))]
     (<| <>.lifted
-- 
cgit v1.2.3