From 72b4eecdc514387ab3b1c105cfd49436c9eb1e8d Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 25 Oct 2020 05:10:08 -0400
Subject: Some improvements to the Lux syntax parser.

---
 lux-jvm/source/luxc/lang/host/jvm/def.lux                   | 2 +-
 lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux | 4 ++--
 lux-jvm/source/luxc/lang/translation/jvm/function.lux       | 6 +++---
 lux-jvm/source/luxc/lang/translation/jvm/loop.lux           | 4 ++--
 lux-jvm/source/luxc/lang/translation/jvm/structure.lux      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'lux-jvm/source/luxc')

diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index 642f42018..0f841ba96 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/def.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux
@@ -79,7 +79,7 @@
   (let [output (host.array java/lang/String (list.size values))]
     (exec (list@map (function (_ [idx value])
                       (host.array-write idx value output))
-                    (list.enumerate values))
+                    (list.enumeration values))
       output)))
 
 (def: (version-flag version)
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 f0de62d52..26db95ac1 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
@@ -998,7 +998,7 @@
                                      set.to-list)
                global-mapping (|> total-environment
                                   ## Give them names as "foreign" variables.
-                                  list.enumerate
+                                  list.enumeration
                                   (list@map (function (_ [id capture])
                                               [capture (#variable.Foreign id)]))
                                   (dictionary.from-list synthesis.hash))
@@ -1008,7 +1008,7 @@
                                                            self-name arguments returnT exceptionsT
                                                            body]])
                                               (let [local-mapping (|> environment
-                                                                      list.enumerate
+                                                                      list.enumeration
                                                                       (list@map (function (_ [foreign-id capture])
                                                                                   [(synthesis.variable/foreign foreign-id)
                                                                                    (|> global-mapping
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/function.lux b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
index 2a792612c..97b32f8c2 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/function.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
@@ -201,7 +201,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.zip2 (enum.range n.enum 0 num-partials))
+                   (list.zip/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))
@@ -259,7 +259,7 @@
 
 (def: #export with-environment
   (-> (Environment Synthesis) Def)
-  (|>> list.enumerate
+  (|>> list.enumeration
        (list@map (.function (_ [env-idx env-source])
                    (def.field #$.Private $.finalF (reference.foreign-name env-idx) //.$Value)))
        def.fuse))
@@ -324,7 +324,7 @@
     [functionI (generate archive functionS)
      argsI (monad.map @ (generate archive) argsS)
      #let [applyI (|> argsI
-                      (list.split-all //runtime.num-apply-variants)
+                      (list.chunk //runtime.num-apply-variants)
                       (list@map (.function (_ chunkI+)
                                   (|>> (_.CHECKCAST //.$Function)
                                        (_.fuse chunkI+)
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/loop.lux b/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
index 27a7d58f9..1d22b0e63 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
@@ -39,7 +39,7 @@
   (do {@ phase.monad}
     [[@begin start] generation.anchor
      #let [pairs (|> argsS
-                     list.enumerate
+                     list.enumeration
                      (list@map (function (_ [register argument])
                                  [(n.+ start register) argument])))]
      ## It may look weird that first I compile the values separately,
@@ -73,7 +73,7 @@
      initsI+ (monad.map @ (translate archive) initsS+)
      iterationI (generation.with-anchor [@begin start]
                   (translate archive iterationS))
-     #let [initializationI (|> (list.enumerate initsI+)
+     #let [initializationI (|> (list.enumeration initsI+)
                                (list@map (function (_ [register initI])
                                            (|>> initI
                                                 (_.ASTORE (n.+ start register)))))
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
index 4a4c30e0f..c268cb14a 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
@@ -47,7 +47,7 @@
      _ (phase.assert not-a-tuple size
                      (n.>= 2 size))
      membersI (|> members
-                  list.enumerate
+                  list.enumeration
                   (monad.map @ (function (_ [idx member])
                                  (do @
                                    [memberI (generate archive member)]
-- 
cgit v1.2.3