From 3289b9dcf9d5d1c1e5c380e3185065c8fd32535f Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 16 Aug 2021 01:12:01 -0400
Subject: Made extension-definition macros specify their bindings the same way
 as syntax:.

---
 stdlib/source/program/aedifex/artifact.lux           |  2 +-
 stdlib/source/program/aedifex/artifact/time/date.lux |  6 +++---
 stdlib/source/program/aedifex/artifact/time/time.lux | 10 +++++-----
 stdlib/source/program/aedifex/command/build.lux      |  2 +-
 stdlib/source/program/aedifex/metadata/artifact.lux  | 16 ++++++++--------
 stdlib/source/program/aedifex/pom.lux                |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'stdlib/source/program/aedifex')

diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux
index e37894330..cd53db5c4 100644
--- a/stdlib/source/program/aedifex/artifact.lux
+++ b/stdlib/source/program/aedifex/artifact.lux
@@ -88,7 +88,7 @@
   (-> Text Group Text)
   (|> group
       (text.all_split_by ..group_separator)
-      (text.join_with separator)))
+      (text.interposed separator)))
 
 (def: .public (uri version artifact)
   (-> Version Artifact URI)
diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux
index 6e84811e6..c3c0b9cc1 100644
--- a/stdlib/source/program/aedifex/artifact/time/date.lux
+++ b/stdlib/source/program/aedifex/artifact/time/date.lux
@@ -76,9 +76,9 @@
     (Parser Date)
     (do <>.monad
       [year (<>.codec n.decimal (<text>.exactly 4 <text>.decimal))
-       year (<>.lift (year.year (.int year)))
+       year (<>.lifted (year.year (.int year)))
        month (<>.codec n.decimal (<text>.exactly 2 <text>.decimal))
-       month (<>.lift (month.by_number month))
+       month (<>.lifted (month.by_number month))
        day_of_month (<>.codec n.decimal (<text>.exactly 2 <text>.decimal))
-       date (<>.lift (date.date year month day_of_month))]
+       date (<>.lifted (date.date year month day_of_month))]
       (in (:abstraction date)))))
diff --git a/stdlib/source/program/aedifex/artifact/time/time.lux b/stdlib/source/program/aedifex/artifact/time/time.lux
index 8b33d5732..0db035d56 100644
--- a/stdlib/source/program/aedifex/artifact/time/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time/time.lux
@@ -32,8 +32,8 @@
     [hour (<>.codec n.decimal (<text>.exactly 2 <text>.decimal))
      minute (<>.codec n.decimal (<text>.exactly 2 <text>.decimal))
      second (<>.codec n.decimal (<text>.exactly 2 <text>.decimal))]
-    (<>.lift (time.time
-              {#time.hour hour
-               #time.minute minute
-               #time.second second
-               #time.milli_second 0}))))
+    (<>.lifted (time.time
+                {#time.hour hour
+                 #time.minute minute
+                 #time.second second
+                 #time.milli_second 0}))))
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index 41668665e..ff469d896 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -245,7 +245,7 @@
   (-> (List Path) Text)
   (|> host_dependencies
       (#.Item ".")
-      (text.join_with ..jvm_class_path_separator)
+      (text.interposed ..jvm_class_path_separator)
       %.text))
 
 (def: .public (with_jvm_class_path host_dependencies runtime)
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index f4971546f..0d6f86c2c 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -115,11 +115,11 @@
   (<text>.Parser Date)
   (do <>.monad
     [year (<>.codec n.decimal (<text>.exactly 4 <text>.decimal))
-     year (<>.lift (year.year (.int year)))
+     year (<>.lifted (year.year (.int year)))
      month (<>.codec n.decimal (<text>.exactly 2 <text>.decimal))
-     month (<>.lift (month.by_number month))
+     month (<>.lifted (month.by_number month))
      day_of_month (<>.codec n.decimal (<text>.exactly 2 <text>.decimal))]
-    (<>.lift (date.date year month day_of_month))))
+    (<>.lifted (date.date year month day_of_month))))
 
 (def: time_parser
   (<text>.Parser Time)
@@ -127,11 +127,11 @@
     [hour (<>.codec n.decimal (<text>.exactly 2 <text>.decimal))
      minute (<>.codec n.decimal (<text>.exactly 2 <text>.decimal))
      second (<>.codec n.decimal (<text>.exactly 2 <text>.decimal))]
-    (<>.lift (time.time
-              {#time.hour hour
-               #time.minute minute
-               #time.second second
-               #time.milli_second 0}))))
+    (<>.lifted (time.time
+                {#time.hour hour
+                 #time.minute minute
+                 #time.second second
+                 #time.milli_second 0}))))
 
 (def: last_updated_parser
   (Parser Instant)
diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux
index f3a945d66..36e3ff440 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -168,7 +168,7 @@
     [properties (\ ! map (dictionary.of_list name.hash)
                    (<| (<xml>.node ["" ..dependency_tag])
                        (<>.some ..property_parser)))]
-    (<| <>.lift
+    (<| <>.lifted
         try.of_maybe
         (do maybe.monad
           [group (dictionary.value ["" ..group_tag] properties)
-- 
cgit v1.2.3