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

7 files changed, 31 insertions, 31 deletions

diff --git a/stdlib/source/library/lux/time.lux b/stdlib/source/library/lux/time.lux
index cf1f340c0..e726ad968 100644
--- a/stdlib/source/library/lux/time.lux
+++ b/stdlib/source/library/lux/time.lux
@@ -54,7 +54,7 @@
   (<>.either (|> (<text>.at_most 3 <text>.decimal)
                  (<>.codec n.decimal)
                  (<>.after (<text>.this ".")))
-             (\ <>.monad wrap 0)))
+             (\ <>.monad in 0)))
 
 (template [<maximum> <parser> <exception> <sub_parser>]
   [(exception: #export (<exception> {value Nat})
@@ -68,8 +68,8 @@
      (do <>.monad
        [value <sub_parser>]
        (if (n.< <maximum> value)
-         (wrap value)
-         (<>.lift (exception.throw <exception> [value])))))]
+         (in value)
+         (<>.lift (exception.except <exception> [value])))))]
 
   [..hours hour_parser invalid_hour ..section_parser]
   [..minutes minute_parser invalid_minute ..section_parser]
@@ -90,7 +90,7 @@
     (-> Nat (Try Time))
     (if (n.< ..limit milli_seconds)
       (#try.Success (:abstraction milli_seconds))
-      (exception.throw ..time_exceeds_a_day [milli_seconds])))
+      (exception.except ..time_exceeds_a_day [milli_seconds])))
 
   (def: #export to_millis
     (-> Time Nat)
@@ -140,12 +140,12 @@
          _ (<text>.this ..separator)
          utc_second ..second_parser
          utc_millis ..millis_parser]
-        (wrap (:abstraction
-               ($_ n.+
-                   (n.* utc_hour hour)
-                   (n.* utc_minute minute)
-                   (n.* utc_second second)
-                   (n.* utc_millis millis)))))))
+        (in (:abstraction
+             ($_ n.+
+                 (n.* utc_hour hour)
+                 (n.* utc_minute minute)
+                 (n.* utc_second second)
+                 (n.* utc_millis millis)))))))
   )
 
 (def: (pad value)
diff --git a/stdlib/source/library/lux/time/date.lux b/stdlib/source/library/lux/time/date.lux
index c2ad8d025..79250a35e 100644
--- a/stdlib/source/library/lux/time/date.lux
+++ b/stdlib/source/library/lux/time/date.lux
@@ -11,7 +11,7 @@
      ["." try (#+ Try)]
      ["." exception (#+ exception:)]
      ["<>" parser
-      ["<text>" text (#+ Parser)]]]
+      ["<.>" text (#+ Parser)]]]
     [data
      ["." maybe]
      ["." text ("#\." monoid)]
@@ -80,7 +80,7 @@
         {#year year
          #month month
          #day day}))
-      (exception.throw ..invalid_day [year month day])))
+      (exception.except ..invalid_day [year month day])))
 
   (def: #export epoch
     Date
@@ -147,7 +147,7 @@
   (<>.either (|> (<text>.at_most 3 <text>.decimal)
                  (<>.codec n.decimal)
                  (<>.after (<text>.this ".")))
-             (\ <>.monad wrap 0)))
+             (\ <>.monad in 0)))
 
 (template [<minimum> <maximum> <parser> <exception>]
   [(exception: #export (<exception> {value Nat})
@@ -162,8 +162,8 @@
        [value ..section_parser]
        (if (and (n.>= <minimum> value)
                 (n.<= <maximum> value))
-         (wrap value)
-         (<>.lift (exception.throw <exception> [value])))))]
+         (in value)
+         (<>.lift (exception.except <exception> [value])))))]
 
   [1 12 month_parser invalid_month]
   )
diff --git a/stdlib/source/library/lux/time/day.lux b/stdlib/source/library/lux/time/day.lux
index 157dd6c1f..d5379cdc1 100644
--- a/stdlib/source/library/lux/time/day.lux
+++ b/stdlib/source/library/lux/time/day.lux
@@ -118,4 +118,4 @@
        [#..Friday]
        [#..Saturday]
        [#..Sunday])
-      _ (exception.throw ..not_a_day_of_the_week [value]))))
+      _ (exception.except ..not_a_day_of_the_week [value]))))
diff --git a/stdlib/source/library/lux/time/duration.lux b/stdlib/source/library/lux/time/duration.lux
index bcc65a0d3..5e0907481 100644
--- a/stdlib/source/library/lux/time/duration.lux
+++ b/stdlib/source/library/lux/time/duration.lux
@@ -179,9 +179,9 @@
                       (..merge (..up minutes ..minute))
                       (..merge (..up seconds ..second))
                       (..merge (..up millis ..milli_second)))]]
-      (wrap (case sign
-              (#.Left _) (..inverse span)
-              (#.Right _) span)))))
+      (in (case sign
+            (#.Left _) (..inverse span)
+            (#.Right _) span)))))
 
 (implementation: #export codec
   (Codec Text Duration)
diff --git a/stdlib/source/library/lux/time/instant.lux b/stdlib/source/library/lux/time/instant.lux
index a73a603ba..8445ed977 100644
--- a/stdlib/source/library/lux/time/instant.lux
+++ b/stdlib/source/library/lux/time/instant.lux
@@ -139,13 +139,13 @@
      _ (<text>.this ..date_suffix)
      time (\ ! map //.to_millis //.parser)
      _ (<text>.this ..time_suffix)]
-    (wrap (|> (if (i.< +0 days)
-                (|> duration.day
-                    (duration.up (.nat (i.* -1 days)))
-                    duration.inverse)
-                (duration.up (.nat days) duration.day))
-              (duration.merge (duration.up time duration.milli_second))
-              ..absolute))))
+    (in (|> (if (i.< +0 days)
+              (|> duration.day
+                  (duration.up (.nat (i.* -1 days)))
+                  duration.inverse)
+              (duration.up (.nat days) duration.day))
+            (duration.merge (duration.up time duration.milli_second))
+            ..absolute))))
 
 (implementation: #export codec
   {#.doc (doc "Based on ISO 8601."
diff --git a/stdlib/source/library/lux/time/month.lux b/stdlib/source/library/lux/time/month.lux
index 381094933..89dc069f2 100644
--- a/stdlib/source/library/lux/time/month.lux
+++ b/stdlib/source/library/lux/time/month.lux
@@ -89,7 +89,7 @@
       (^template [<number> <month>]
         [<number> (#try.Success <month>)])
       (<pairs>)
-      _ (exception.throw ..invalid_month [number])))
+      _ (exception.except ..invalid_month [number])))
   )
 
 (implementation: #export hash
@@ -222,4 +222,4 @@
        [#..October]
        [#..November]
        [#..December])
-      _ (exception.throw ..not_a_month_of_the_year [value]))))
+      _ (exception.except ..not_a_month_of_the_year [value]))))
diff --git a/stdlib/source/library/lux/time/year.lux b/stdlib/source/library/lux/time/year.lux
index b3f3e7ecf..5388b5ef8 100644
--- a/stdlib/source/library/lux/time/year.lux
+++ b/stdlib/source/library/lux/time/year.lux
@@ -40,7 +40,7 @@
   (def: #export (year value)
     (-> Int (Try Year))
     (case value
-      +0 (exception.throw ..there_is_no_year_0 [])
+      +0 (exception.except ..there_is_no_year_0 [])
       _ (#try.Success (:abstraction (..internal value)))))
 
   (def: #export value
@@ -112,9 +112,9 @@
 (def: #export parser
   (Parser Year)
   (do {! <>.monad}
-    [sign (<>.or (<t>.this "-") (wrap []))
+    [sign (<>.or (<t>.this "-") (in []))
      digits (<t>.many <t>.decimal)
-     raw_year (<>.codec i.decimal (wrap (text\compose "+" digits)))]
+     raw_year (<>.codec i.decimal (in (text\compose "+" digits)))]
     (<>.lift (..year (case sign
                        (#.Left _)  (i.* -1 raw_year)
                        (#.Right _) raw_year)))))