From ec1f31b5a1492d5e0ab260397291d4449483bbd9 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 23 Aug 2021 02:30:53 -0400
Subject: The Python compiler can now be compiled by the new JVM compiler.

---
 lux-r/source/luxc/lang/synthesis/variable.lux | 22 +++++++++++-----------
 lux-r/source/program.lux                      |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'lux-r/source')

diff --git a/lux-r/source/luxc/lang/synthesis/variable.lux b/lux-r/source/luxc/lang/synthesis/variable.lux
index f747a82df..920c99057 100644
--- a/lux-r/source/luxc/lang/synthesis/variable.lux
+++ b/lux-r/source/luxc/lang/synthesis/variable.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (data [number]
-             (coll [list "list/" Fold<List> Monoid<List>]
+             (coll [list "list/" Mix<List> Monoid<List>]
                    ["s" set])))
   (luxc (lang ["la" analysis]
               ["ls" synthesis]
@@ -46,7 +46,7 @@
 (def: (unused-vars current-arity bound exprS)
   (-> ls.Arity (List Variable) ls.Synthesis (List Variable))
   (let [tracker (loop [exprS exprS
-                       tracker (list/fold s.has init-tracker bound)]
+                       tracker (list/mix s.has init-tracker bound)]
                   (case exprS
                     (#ls.Variable var)
                     (if (non-arg? current-arity var)
@@ -57,14 +57,14 @@
                     (recur memberS tracker)
 
                     (#ls.Tuple membersS)
-                    (list/fold recur tracker membersS)
+                    (list/mix recur tracker membersS)
 
                     (#ls.Call funcS argsS)
-                    (list/fold recur (recur funcS tracker) argsS)
+                    (list/mix recur (recur funcS tracker) argsS)
                     
                     (^or (#ls.Recur argsS)
                          (#ls.Procedure name argsS))
-                    (list/fold recur tracker argsS)
+                    (list/mix recur tracker argsS)
 
                     (#ls.Let offset inputS outputS)
                     (|> tracker (recur inputS) (recur outputS))
@@ -73,16 +73,16 @@
                     (|> tracker (recur testS) (recur thenS) (recur elseS))
 
                     (#ls.Loop offset initsS bodyS)
-                    (recur bodyS (list/fold recur tracker initsS))
+                    (recur bodyS (list/mix recur tracker initsS))
 
                     (#ls.Case inputS outputPS)
-                    (let [tracker' (list/fold s.has
-                                              (recur inputS tracker)
-                                              (bound-vars outputPS))]
-                      (list/fold recur tracker' (path-bodies outputPS)))
+                    (let [tracker' (list/mix s.has
+                                             (recur inputS tracker)
+                                             (bound-vars outputPS))]
+                      (list/mix recur tracker' (path-bodies outputPS)))
 
                     (#ls.Function arity env bodyS)
-                    (list/fold s.lacks tracker env)
+                    (list/mix s.lacks tracker env)
 
                     _
                     tracker
diff --git a/lux-r/source/program.lux b/lux-r/source/program.lux
index 9f956591c..ec4931eae 100644
--- a/lux-r/source/program.lux
+++ b/lux-r/source/program.lux
@@ -526,7 +526,7 @@
                    (wrap [global value definition]))))
 
              (def: (ingest context content)
-               (|> content (\ utf8.codec decode) try.trusted (:as _.Expression)))
+               (|> content (\ utf8.codec decoded) try.trusted (:as _.Expression)))
 
              (def: (re_learn context content)
                (run! content))
@@ -547,7 +547,7 @@
             #platform.host host
             #platform.phase r.generate
             #platform.runtime runtime.generate
-            #platform.write (|>> _.code (\ utf8.codec encode))}])))
+            #platform.write (|>> _.code (\ utf8.codec encoded))}])))
 
 (def: (program context program)
   (Program _.Expression _.Expression)
-- 
cgit v1.2.3