Relocated maybe and lazy from data to control.

17 files changed, 38 insertions, 40 deletions

diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 9e6ff8244..9f9963731 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -11,7 +11,6 @@
       ["<.>" text]]]
     [data
      ["." product]
-     ["." maybe]
      ["." text
       ["%" format]]
      [format
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index 00380e59b..58df179e2 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -13,7 +13,6 @@
       ["." async (#+ Async) ("#\." monad)]]]
     [data
      ["." product]
-     ["." maybe]
      ["." text ("#\." order)
       ["%" format (#+ format)]]
      [collection
@@ -218,7 +217,7 @@
                                                    (async.upon! recur
                                                                 (\ process <capability> []))))
                                                (console.write_line line console)))))
-                 io.run)]
+                 io.run!)]
        read!))]
 
   [log_output! read]
@@ -232,7 +231,7 @@
 (def: windows?
   Bit
   (|> (java/lang/System::getProperty "os.name")
-      io.run
+      io.run!
       (try.else "")
       text.lower_cased
       (text.starts_with? "windows")))
diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux
index 2ff5ca8fb..cbddc9b27 100644
--- a/stdlib/source/program/aedifex/command/deploy.lux
+++ b/stdlib/source/program/aedifex/command/deploy.lux
@@ -63,7 +63,7 @@
                  (get@ #/.sources)
                  set.list
                  (export.library fs)
-                 (\ ! map (binary.run tar.writer)))
+                 (\ ! map (binary.result tar.writer)))
      pom (\ async.monad in (///pom.write profile))
      _ (///dependency/deployment.one
         repository
diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux
index 9dbabbfca..185bd6229 100644
--- a/stdlib/source/program/aedifex/command/deps.lux
+++ b/stdlib/source/program/aedifex/command/deps.lux
@@ -59,19 +59,19 @@
                   (///dependency/deployment.all local))
        _ (console.write_line (exception.report
                               ["Local successes" (|> local_successes
-                                                     (list.sort (\ ///dependency.order <))
+                                                     (list.sorted (\ ///dependency.order <))
                                                      (exception.listing ..format))]
                               ["Local failures" (|> local_failures
-                                                    (list.sort (\ ///dependency.order <))
+                                                    (list.sorted (\ ///dependency.order <))
                                                     (exception.listing ..format))]
                               ["Remote successes" (|> remote_successes
                                                       (set.of_list ///dependency.hash)
                                                       (set.difference (set.of_list ///dependency.hash local_successes))
                                                       set.list
-                                                      (list.sort (\ ///dependency.order <))
+                                                      (list.sorted (\ ///dependency.order <))
                                                       (exception.listing ..format))]
                               ["Remote failures" (|> remote_failures
-                                                     (list.sort (\ ///dependency.order <))
+                                                     (list.sorted (\ ///dependency.order <))
                                                      (exception.listing ..format))])
                              console)]
       (in resolution))))
diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux
index c86400b6a..9b06daaec 100644
--- a/stdlib/source/program/aedifex/command/install.lux
+++ b/stdlib/source/program/aedifex/command/install.lux
@@ -67,7 +67,7 @@
                                                           (\ xml.codec encode)
                                                           (\ utf8.codec encode))]
                                          {#///package.origin (#///origin.Local "")
-                                          #///package.library (let [library (binary.run tar.writer package)]
+                                          #///package.library (let [library (binary.result tar.writer package)]
                                                                 [library (///dependency/status.verified library)])
                                           #///package.pom [pom
                                                            pom_data
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index ed4303ac5..d86bef56b 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -8,6 +8,7 @@
      [equivalence (#+ Equivalence)]
      [monad (#+ do)]]
     [control
+     ["." maybe]
      ["." try (#+ Try) ("#\." functor)]
      ["." exception (#+ Exception exception:)]
      ["<>" parser
@@ -17,7 +18,6 @@
     [data
      ["." binary (#+ Binary)]
      ["." name]
-     ["." maybe]
      ["." text
       ["%" format (#+ format)]
       [encoding
@@ -138,7 +138,7 @@
          (do try.monad
            [pom (\ utf8.codec decode pom_data)
             pom (\ xml.codec decode pom)
-            profile (<xml>.run ///pom.parser (list pom))]
+            profile (<xml>.result ///pom.parser (list pom))]
            (in {#///package.origin (#///repository/origin.Remote "")
                 #///package.library library_&_status
                 #///package.pom [pom pom_data pom_status]}))))))
diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux
index 2e46286ea..46a6fc67a 100644
--- a/stdlib/source/program/aedifex/hash.lux
+++ b/stdlib/source/program/aedifex/hash.lux
@@ -121,7 +121,7 @@
       (if (n.= size hash_size)
         (loop [input encoded
                chunk 0
-               output (binary.create hash_size)]
+               output (binary.empty hash_size)]
           (let [index (n.* chunk i64.bytes_per_i64)]
             (case (text.split ..hex_per_chunk input)
               (#.Some [head tail])
diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux
index 6a635589e..58f37e252 100644
--- a/stdlib/source/program/aedifex/input.lux
+++ b/stdlib/source/program/aedifex/input.lux
@@ -44,7 +44,7 @@
   (|>> (do> try.monad
             [(\ utf8.codec decode)]
             [..lux_parser]
-            [(list) (<code>.run //parser.project)])))
+            [(list) (<code>.result //parser.project)])))
 
 (def: .public (read monad fs profile)
   (All [!] (-> (Monad !) (file.System !) Text (! (Try Profile))))
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index 0bd6d4a12..f4971546f 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -182,7 +182,7 @@
               (do> try.monad
                    [(\ utf8.codec decode)]
                    [(\ xml.codec decode)]
-                   [list (<xml>.run ..parser)])))
+                   [list (<xml>.result ..parser)])))
       
       (#try.Failure error)
       (in (#try.Success
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index 69e3432fa..90fa9bb86 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -132,7 +132,7 @@
               (do> try.monad
                    [(\ utf8.codec decode)]
                    [(\ xml.codec decode)]
-                   [list (<xml>.run ..parser)])))
+                   [list (<xml>.result ..parser)])))
       
       (#try.Failure error)
       (in (#try.Success
diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux
index ea9c2a6d8..6b65a936d 100644
--- a/stdlib/source/program/aedifex/package.lux
+++ b/stdlib/source/program/aedifex/package.lux
@@ -64,7 +64,7 @@
   (|>> (get@ #pom)
        product.left
        list
-       (<xml>.run //pom.parser)
+       (<xml>.result //pom.parser)
        (try\map (get@ #/.dependencies))))
 
 (def: .public repositories
@@ -72,7 +72,7 @@
   (|>> (get@ #pom)
        product.left
        list
-       (<xml>.run //pom.parser)
+       (<xml>.result //pom.parser)
        (try\map (get@ #/.repositories))))
 
 (def: .public equivalence
diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux
index e2ad11079..d18bd9209 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -5,13 +5,13 @@
      [monad (#+ do)]]
     [control
      [pipe (#+ case>)]
+     ["." maybe ("#\." functor)]
      ["." try (#+ Try)]
      ["." exception]
      ["<>" parser
       ["<.>" xml (#+ Parser)]]]
     [data
      ["." name]
-     ["." maybe ("#\." functor)]
      ["." text]
      [format
       ["_" xml (#+ Tag XML)]]
@@ -223,7 +223,7 @@
            repositories (|> ..repositories_parser
                             <xml>.somewhere
                             (<>.else (list)))
-           _ (<>.some <xml>.ignore)]
+           _ (<>.some <xml>.any)]
           (in (|> (\ /.monoid identity)
                   (update@ #/.dependencies (function (_ empty)
                                              (list\fold set.add empty dependencies)))
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux
index ffd549c06..2ff458967 100644
--- a/stdlib/source/program/aedifex/profile.lux
+++ b/stdlib/source/program/aedifex/profile.lux
@@ -5,10 +5,10 @@
      [monoid (#+ Monoid)]
      [equivalence (#+ Equivalence)]]
     [control
+     ["." maybe ("#\." monoid)]
      ["." exception (#+ exception:)]]
     [data
      ["." product]
-     ["." maybe ("#\." monoid)]
      ["." text ("#\." equivalence)]
      [collection
       ["." dictionary (#+ Dictionary)]
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index f19575859..a88eb93a5 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -67,7 +67,7 @@
       (exec (debug.log! (format text.new_line
                                 failure_description text.new_line
                                 error text.new_line))
-        (io.run (\ world/program.default exit +1)))
+        (io.run! (\ world/program.default exit +1)))
 
       (#try.Success output)
       (in output))))
@@ -76,9 +76,9 @@
   (All [a]
     (-> (Async (Try a)) (Async (Try a))))
   (do async.monad
-    [.let [start (io.run instant.now)]
+    [.let [start (io.run! instant.now)]
      output process
-     .let [_ ("lux io log" (|> (io.run instant.now)
+     .let [_ ("lux io log" (|> (io.run! instant.now)
                                (instant.span start)
                                %.duration
                                (format "Duration: ")))]]
@@ -179,5 +179,5 @@
         ...       [console (|> console.default
         ...                    async.future
         ...                    (\ ! map (|>> try.assumed console.async)))]
-        ...       (interpreter.run (try.with async.monad) console platform interpretation generation_bundle)))
+        ...       (interpreter.run! (try.with async.monad) console platform interpretation generation_bundle)))
         ))))
diff --git a/stdlib/source/program/compositor/export.lux b/stdlib/source/program/compositor/export.lux
index b229b36ba..309678908 100644
--- a/stdlib/source/program/compositor/export.lux
+++ b/stdlib/source/program/compositor/export.lux
@@ -65,7 +65,7 @@
 (def: .public (export fs [sources target])
   (-> (file.System Async) Export (Async (Try Any)))
   (do {! (try.with async.monad)}
-    [tar (\ ! map (binary.run tar.writer)
+    [tar (\ ! map (binary.result tar.writer)
             (..library fs sources))]
     (|> ..file
         (format target (\ fs separator))
diff --git a/stdlib/source/program/compositor/import.lux b/stdlib/source/program/compositor/import.lux
index a96f722d9..ca72f9749 100644
--- a/stdlib/source/program/compositor/import.lux
+++ b/stdlib/source/program/compositor/import.lux
@@ -48,7 +48,7 @@
     (|> library
         (\ system read)
         (\ ! map (let [! try.monad]
-                   (|>> (\ ! map (<binary>.run tar.parser))
+                   (|>> (\ ! map (<binary>.result tar.parser))
                         (\ ! join)
                         (\ ! map (|>> row.list
                                       (monad.fold ! (function (_ entry import)
diff --git a/stdlib/source/program/scriptum.lux b/stdlib/source/program/scriptum.lux
index b18ce7bff..9128fdc60 100644
--- a/stdlib/source/program/scriptum.lux
+++ b/stdlib/source/program/scriptum.lux
@@ -9,12 +9,12 @@
      ["." enum]]
     [control
      [pipe (#+ when> new>)]
+     ["." maybe]
      ["." try (#+ Try)]
      ["." exception (#+ exception:)]
      ["." io (#+ IO io)]
      ["." function]]
     [data
-     ["." maybe]
      ["." product]
      [format
       ["md" markdown (#+ Markdown Span Block)]]
@@ -214,20 +214,20 @@
       (format "(primitive " (%.text name) ")")
 
       _
-      (format "(primitive " (%.text name) " " (|> params (list\map (pprint_type level type_func_name module)) (list.interpose " ") (text.join_with "")) ")"))
+      (format "(primitive " (%.text name) " " (|> params (list\map (pprint_type level type_func_name module)) (list.interposed " ") (text.join_with "")) ")"))
 
     (#.Sum _)
     (let [members (type.flat_variant type)]
-      (format "(Or " (|> members (list\map (pprint_type level type_func_name module)) (list.interpose " ") (text.join_with "")) ")"))
+      (format "(Or " (|> members (list\map (pprint_type level type_func_name module)) (list.interposed " ") (text.join_with "")) ")"))
 
     (#.Product _)
     (let [members (type.flat_tuple type)]
-      (format "[" (|> members (list\map (pprint_type level type_func_name module)) (list.interpose " ") (text.join_with "")) "]"))
+      (format "[" (|> members (list\map (pprint_type level type_func_name module)) (list.interposed " ") (text.join_with "")) "]"))
 
     (#.Function input output)
     (let [[ins out] (type.flat_function type)]
       (format  "(-> "
-               (|> ins (list\map (pprint_type level type_func_name module)) (list.interpose " ") (text.join_with ""))
+               (|> ins (list\map (pprint_type level type_func_name module)) (list.interposed " ") (text.join_with ""))
                " "
                (pprint_type level type_func_name module out)
                ")"))
@@ -246,7 +246,7 @@
        (let [[level' body] (<flat> type)
              args (level_parameters level level')
              body_doc (pprint_type (n.+ level level') type_func_name module body)]
-         (format "(" <name> " " "[" (|> args (list.interpose " ") (text.join_with "")) "]"
+         (format "(" <name> " " "[" (|> args (list.interposed " ") (text.join_with "")) "]"
                  (format " " body_doc)
                  ")"))])
     ([#.UnivQ "All" type.flat_univ_q]
@@ -254,7 +254,7 @@
 
     (#.Apply param fun)
     (let [[type_func type_arguments] (type.flat_application type)]
-      (format  "(" (pprint_type level type_func_name module type_func) " " (|> type_arguments (list\map (pprint_type level type_func_name module)) (list.interpose " ") (text.join_with "")) ")"))
+      (format  "(" (pprint_type level type_func_name module type_func) " " (|> type_arguments (list\map (pprint_type level type_func_name module)) (list.interposed " ") (text.join_with "")) ")"))
 
     (#.Named [_module _name] type)
     (if (text\= module _module)
@@ -319,10 +319,10 @@
               #implementations (list)
               #values (list)}]
     (|> (list\fold add_definition init defs)
-        (update@ #types (list.sort name_sort))
-        (update@ #macros (list.sort name_sort))
-        (update@ #implementations (list.sort name_sort))
-        (update@ #values (list.sort name_sort)))))
+        (update@ #types (list.sorted name_sort))
+        (update@ #macros (list.sorted name_sort))
+        (update@ #implementations (list.sorted name_sort))
+        (update@ #values (list.sorted name_sort)))))
 
 (def: (unravel_type_func level type)
   (-> Nat Type Type)
@@ -506,13 +506,13 @@
     [all_modules meta.modules
      .let [lux_modules (|> all_modules
                            (list.only (function.compose lux_module? product.left))
-                           (list.sort name_sort))]
+                           (list.sorted name_sort))]
      lux_exports (monad.map ! (function.compose meta.exports product.left)
                             lux_modules)
      module_documentation (|> (list\map organize_definitions lux_exports)
                               (list.zipped/2 lux_modules)
                               (monad.map ! document_module))
-     .let [_ (io.run (monad.map io.monad save_documentation! module_documentation))]]
+     .let [_ (io.run! (monad.map io.monad save_documentation! module_documentation))]]
     (in (list))))
 
 (gen_documentation!)