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

5 files changed, 15 insertions, 15 deletions

diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index 9447861e3..e86504d60 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -303,7 +303,7 @@
               (do_to visitor
                 (org/objectweb/asm/MethodVisitor::visitTypeInsn (<inst>) (..class_name class)))))]
 
-         (~~ (template.splice <instructions>+))))]
+         (~~ (template.spliced <instructions>+))))]
 
   [Object
    [[CHECKCAST  org/objectweb/asm/Opcodes::CHECKCAST]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux
index 425a259aa..1b916d925 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm.lux
@@ -139,7 +139,7 @@
             [existing_class? (|> (atom.read library)
                                  (\ io.monad map (function (_ library)
                                                    (dictionary.key? library class_name)))
-                                 (try.lift io.monad)
+                                 (try.lifted io.monad)
                                  (: (IO (Try Bit))))
              _ (if existing_class?
                  (wrap [])
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
index 89c7053f9..4f8210a47 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
@@ -102,7 +102,7 @@
         (wrap elementJT)
 
         #.None
-        (<>.fail (exception.construct ..not_an_object_array arrayJT)))
+        (<>.failure (exception.construct ..not_an_object_array arrayJT)))
       
       #.None
       (undefined))))
@@ -619,7 +619,7 @@
             [(reflection.reflection reflection.float) type.float]
             [(reflection.reflection reflection.double) type.double]
             [(reflection.reflection reflection.char) type.char])
-      (dictionary.from_list text.hash)))
+      (dictionary.of_list text.hash)))
 
 (def: get::static
   Handler
@@ -1096,14 +1096,14 @@
                                      ## Combine them.
                                      list\join
                                      ## Remove duplicates.
-                                     (set.from_list synthesis.hash)
+                                     (set.of_list synthesis.hash)
                                      set.to_list)
                global_mapping (|> total_environment
                                   ## Give them names as "foreign" variables.
                                   list.enumeration
                                   (list\map (function (_ [id capture])
                                               [capture (#variable.Foreign id)]))
-                                  (dictionary.from_list synthesis.hash))
+                                  (dictionary.of_list synthesis.hash))
                normalized_methods (list\map (function (_ [environment
                                                           [ownerT name
                                                            strict_fp? annotations vars
@@ -1116,7 +1116,7 @@
                                                                                    (|> global_mapping
                                                                                        (dictionary.get capture)
                                                                                        maybe.assume)]))
-                                                                      (dictionary.from_list synthesis.hash))]
+                                                                      (dictionary.of_list synthesis.hash))]
                                                 [ownerT name
                                                  strict_fp? annotations vars
                                                  self_name arguments returnT exceptionsT
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/function.lux b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
index 9e0f9f225..fcbfe1277 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/function.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
@@ -204,7 +204,7 @@
         @labels (list@map $.new_label (list.repeat num_partials []))
         over_extent (|> (.int function_arity) (i.- (.int apply_arity)))
         casesI (|> (list@compose @labels (list @default))
-                   (list.zip/2 (enum.range n.enum 0 num_partials))
+                   (list.zipped/2 (enum.range n.enum 0 num_partials))
                    (list@map (.function (_ [stage @label])
                                (let [load_partialsI (if (n.> 0 stage)
                                                       (|> (enum.range n.enum 0 (dec stage))
diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux
index fa0e19109..60fb953aa 100644
--- a/lux-jvm/source/program.lux
+++ b/lux-jvm/source/program.lux
@@ -10,7 +10,7 @@
      ["." io (#+ IO)]
      ["." try (#+ Try)]
      [concurrency
-      ["." promise (#+ Promise)]]]
+      ["." async (#+ Async)]]]
     [data
      ["." product]
      [text
@@ -213,7 +213,7 @@
     [instanceG (function.function' (#.Some [0 (.nat -1)]) expression.translate archive [(list) 4 ..how_to_wrap_a_phase])
      phase_wrapper (generation.evaluate! [0 (.nat -2)] instanceG)]
     (wrap (function (_ phase)
-            (<| try.assume
+            (<| try.assumed
                 (: (Try java/lang/Object))
                 (do try.monad
                   [apply_method (|> phase_wrapper
@@ -255,7 +255,7 @@
       (:as Operation)
       (function (@self state))
       (:as Try)
-      try.assume
+      try.assumed
       (:as Try)
       (do try.monad
         [method (|> handler
@@ -273,16 +273,16 @@
          method))))
 
 (def: (declare_success! _)
-  (-> Any (Promise Any))
-  (promise.future (\ world/program.default exit +0)))
+  (-> Any (Async Any))
+  (async.future (\ world/program.default exit +0)))
 
 (program: [{service /cli.service}]
   (let [static {#/static.host @.jvm
                 #/static.host_module_extension ".jvm"
                 #/static.target (/cli.target service)
                 #/static.artifact_extension ".class"}]
-    (exec (do promise.monad
-            [[loader platform] (promise.future ..platform)
+    (exec (do async.monad
+            [[loader platform] (async.future ..platform)
              _ (/.compiler {#/static.host @.jvm
                             #/static.host_module_extension ".jvm"
                             #/static.target (/cli.target service)