Re-named wrap => in && unwrap => out.

8 files changed, 12 insertions, 12 deletions

diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux
index b377c1b38..6a5849f43 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot.lux
@@ -51,7 +51,7 @@
 (def: local_copy_parser
   (Parser Any)
   (<| (<xml>.node ..<local_copy>)
-      (<text>.embed (<text>.this ..local_copy_value))
+      (<text>.then (<text>.this ..local_copy_value))
       <xml>.text))
 
 (def: #export (format snapshot)
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/build.lux b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
index 0e8692054..37bb3ca2d 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
@@ -38,5 +38,5 @@
 (def: #export parser
   (Parser Build)
   (<| (<xml>.node ..tag)
-      (<text>.embed (<>.codec nat.decimal (<text>.many <text>.decimal)))
+      (<text>.then (<>.codec nat.decimal (<text>.many <text>.decimal)))
       <xml>.text))
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
index 147369711..0e9cba494 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
@@ -46,7 +46,7 @@
 (def: time_parser
   (Parser Time)
   (<| (<xml>.node <timestamp>)
-      (<text>.embed //time.parser)
+      (<text>.then //time.parser)
       <xml>.text))
 
 (def: #export parser
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/time.lux b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
index 46c9b149e..08f8b8035 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
@@ -43,4 +43,4 @@
     [date ///time/date.parser
      _ (<text>.this ..separator)
      time ///time/time.parser]
-    (wrap [date time])))
+    (in [date time])))
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
index 89af452e2..c1341cf98 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
@@ -62,6 +62,6 @@
       ($_ <>.and
           (<xml>.somewhere (..text ..<extension>))
           (<xml>.somewhere (..text ..<value>))
-          (<xml>.somewhere (<text>.embed ///time.parser
-                                         (..text ..<updated>)))
+          (<xml>.somewhere (<text>.then ///time.parser
+                                        (..text ..<updated>)))
           )))
diff --git a/stdlib/source/program/aedifex/artifact/time.lux b/stdlib/source/program/aedifex/artifact/time.lux
index 524b68bb1..c8452a477 100644
--- a/stdlib/source/program/aedifex/artifact/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time.lux
@@ -36,8 +36,8 @@
   (-> Instant (Try Time))
   (do try.monad
     [date (/date.date (instant.date instant))]
-    (wrap [date
-           (instant.time instant)])))
+    (in [date
+         (instant.time instant)])))
 
 (def: #export equivalence
   (Equivalence Time)
@@ -54,4 +54,4 @@
   (do <>.monad
     [date /date.parser
      time /time.parser]
-    (wrap [date time])))
+    (in [date time])))
diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux
index f6b8ae5a9..b392a5569 100644
--- a/stdlib/source/program/aedifex/artifact/time/date.lux
+++ b/stdlib/source/program/aedifex/artifact/time/date.lux
@@ -51,7 +51,7 @@
       (if (and (i.>= ..min_year year)
                (i.<= ..max_year year))
         (#try.Success (:abstraction raw))
-        (exception.throw ..year_is_out_of_range [(date.year raw)]))))
+        (exception.except ..year_is_out_of_range [(date.year raw)]))))
 
   (def: #export value
     (-> Date date.Date)
@@ -79,4 +79,4 @@
        month (<>.lift (month.by_number month))
        day_of_month (<>.codec n.decimal (<text>.exactly 2 <text>.decimal))
        date (<>.lift (date.date year month day_of_month))]
-      (wrap (:abstraction date)))))
+      (in (:abstraction date)))))
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 9c9805571..37adedea1 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -77,7 +77,7 @@
 
 (def: last_updated_parser
   (Parser //time.Time)
-  (<| (<text>.embed //time.parser)
+  (<| (<text>.then //time.parser)
       (..text ..<last_updated>)))
 
 (def: #export parser