From 62b3abfcc014ca1c19d62aacdd497f6a250b372c Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 25 Jul 2021 03:12:17 -0400
Subject: Better syntax for "library/lux.^multi".

---
 stdlib/source/program/aedifex/pom.lux | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 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 be03d36f5..b458c7a21 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -154,7 +154,7 @@
     _
     (exception.throw /.no_identity [])))
 
-(def: parse_property
+(def: property_parser
   (Parser [Tag Text])
   (do {! <>.monad}
     [tag <xml>.tag]
@@ -162,14 +162,14 @@
         (\ ! map (|>> [tag]))
         <xml>.text)))
 
-(def: (parse_dependency own_version parent_version)
+(def: (dependency_parser own_version parent_version)
   (-> Text Text (Parser Dependency))
   (do {! <>.monad}
-    [properties (\ ! map (dictionary.from_list name.hash)
+    [properties (\ ! map (dictionary.of_list name.hash)
                    (<| (<xml>.node ["" ..dependency_tag])
-                       (<>.some ..parse_property)))]
+                       (<>.some ..property_parser)))]
     (<| <>.lift
-        try.from_maybe
+        try.of_maybe
         (do maybe.monad
           [group (dictionary.get ["" ..group_tag] properties)
            artifact (dictionary.get ["" ..artifact_tag] properties)]
@@ -184,21 +184,21 @@
                                         (dictionary.get ["" "type"])
                                         (maybe.default //artifact/type.jvm_library))})))))
 
-(def: (parse_dependencies own_version parent_version)
+(def: (dependencies_parser own_version parent_version)
   (-> Text Text (Parser (List Dependency)))
   (<| (<xml>.node ["" ..dependencies_tag])
-      (<>.some (..parse_dependency own_version parent_version))))
+      (<>.some (..dependency_parser own_version parent_version))))
 
-(def: parse_repository
+(def: repository_parser
   (Parser Address)
   (<| (<xml>.node ["" ..repository_tag])
       (<xml>.node ["" ..url_tag])
       <xml>.text))
 
-(def: parse_repositories
+(def: repositories_parser
   (Parser (List Address))
   (<| (<xml>.node ["" ..repositories_tag])
-      (<>.some ..parse_repository)))
+      (<>.some ..repository_parser)))
 
 (def: own_version
   (Parser Text)
@@ -217,10 +217,10 @@
      parent_version (<>.default "" (<xml>.somewhere ..parent_version))]
     (<| (<xml>.node ["" ..project_tag])
         (do !
-          [dependencies (|> (..parse_dependencies own_version parent_version)
+          [dependencies (|> (..dependencies_parser own_version parent_version)
                             <xml>.somewhere
                             (<>.default (list)))
-           repositories (|> ..parse_repositories
+           repositories (|> ..repositories_parser
                             <xml>.somewhere
                             (<>.default (list)))
            _ (<>.some <xml>.ignore)]
-- 
cgit v1.2.3