The Python compiler can now be compiled by the new JVM compiler.

2 files changed, 40 insertions, 40 deletions

diff --git a/lux-jvm/test/test/luxc/lang/analysis/host.jvm.lux b/lux-jvm/test/test/luxc/lang/analysis/host.jvm.lux
index 77f5b34bc..f3af659fa 100644
--- a/lux-jvm/test/test/luxc/lang/analysis/host.jvm.lux
+++ b/lux-jvm/test/test/luxc/lang/analysis/host.jvm.lux
@@ -11,7 +11,7 @@
      format]
     [collection
      ["." array]
-     [list ("list/" Fold<List>)]
+     [list ("list/" Mix<List>)]
      ["dict" dictionary]]]
    [math
     ["r" random "r/" Monad<Random>]]
@@ -38,8 +38,8 @@
            [... runtime-bytecode @runtime.translate
             ]
            (default.with-scope
-             (typeA.with-type output-type
-               (_primitive.analyse (` ((~ (code.text procedure)) (~+ params)))))))
+            (typeA.with-type output-type
+                             (_primitive.analyse (` ((~ (code.text procedure)) (~+ params)))))))
          (analysis.with-current-module "")
          (macro.result (initL.compiler []))
          (case> (#e.Success _)
@@ -59,8 +59,8 @@
            [... runtime-bytecode @runtime.translate
             ]
            (default.with-scope
-             (typeA.with-type output-type
-               (_primitive.analyse syntax))))
+            (typeA.with-type output-type
+                             (_primitive.analyse syntax))))
          (analysis.with-current-module "")
          (macro.result (initL.compiler []))
          (case> (#e.Success _)
@@ -87,9 +87,9 @@
                                     ["jvm convert float-to-int" "java.lang.Float" hostAE.Integer]
                                     ["jvm convert float-to-long" "java.lang.Float" hostAE.Long]
                                     )]
-    ($_ seq
-        <conversions>
-        )))
+                   ($_ seq
+                       <conversions>
+                       )))
 
 (context: "Conversions [int]."
   (with-expansions [<conversions> (template [<procedure> <from> <to>]
@@ -105,9 +105,9 @@
                                     ["jvm convert int-to-long" "java.lang.Integer" hostAE.Long]
                                     ["jvm convert int-to-short" "java.lang.Integer" hostAE.Short]
                                     )]
-    ($_ seq
-        <conversions>
-        )))
+                   ($_ seq
+                       <conversions>
+                       )))
 
 (context: "Conversions [long]."
   (with-expansions [<conversions> (template [<procedure> <from> <to>]
@@ -122,9 +122,9 @@
                                     ["jvm convert long-to-short" "java.lang.Long" hostAE.Short]
                                     ["jvm convert long-to-byte" "java.lang.Long" hostAE.Byte]
                                     )]
-    ($_ seq
-        <conversions>
-        )))
+                   ($_ seq
+                       <conversions>
+                       )))
 
 (context: "Conversions [char + byte + short]."
   (with-expansions [<conversions> (template [<procedure> <from> <to>]
@@ -140,9 +140,9 @@
                                     ["jvm convert byte-to-long" "java.lang.Byte" hostAE.Long]
                                     ["jvm convert short-to-long" "java.lang.Short" hostAE.Long]
                                     )]
-    ($_ seq
-        <conversions>
-        )))
+                   ($_ seq
+                       <conversions>
+                       )))
 
 (template [<domain> <boxed> <type>]
   [(context: (format "Arithmetic " "[" <domain> "].")
@@ -159,9 +159,9 @@
                                         [(format "jvm " <domain> " /") <boxed> <boxed> <type>]
                                         [(format "jvm " <domain> " %") <boxed> <boxed> <type>]
                                         )]
-       ($_ seq
-           <instructions>
-           )))
+                      ($_ seq
+                          <instructions>
+                          )))
 
    (context: (format "Order " "[" <domain> "].")
      (with-expansions [<instructions> (template [<procedure> <subject> <param> <output>]
@@ -174,9 +174,9 @@
                                         [(format "jvm " <domain> " =") <boxed> <boxed> hostAE.Boolean]
                                         [(format "jvm " <domain> " <") <boxed> <boxed> hostAE.Boolean]
                                         )]
-       ($_ seq
-           <instructions>
-           )))
+                      ($_ seq
+                          <instructions>
+                          )))
 
    (context: (format "Bitwise " "[" <domain> "].")
      (with-expansions [<instructions> (template [<procedure> <subject> <param> <output>]
@@ -193,9 +193,9 @@
                                         [(format "jvm " <domain> " shr") <boxed> "java.lang.Integer" <type>]
                                         [(format "jvm " <domain> " ushr") <boxed> "java.lang.Integer" <type>]
                                         )]
-       ($_ seq
-           <instructions>
-           )))]
+                      ($_ seq
+                          <instructions>
+                          )))]
 
 
   ["int" "java.lang.Integer" hostAE.Integer]
@@ -217,9 +217,9 @@
                                         [(format "jvm " <domain> " /") <boxed> <boxed> <type>]
                                         [(format "jvm " <domain> " %") <boxed> <boxed> <type>]
                                         )]
-       ($_ seq
-           <instructions>
-           )))
+                      ($_ seq
+                          <instructions>
+                          )))
 
    (context: (format "Order " "[" <domain> "].")
      (with-expansions [<instructions> (template [<procedure> <subject> <param> <output>]
@@ -232,9 +232,9 @@
                                         [(format "jvm " <domain> " =") <boxed> <boxed> hostAE.Boolean]
                                         [(format "jvm " <domain> " <") <boxed> <boxed> hostAE.Boolean]
                                         )]
-       ($_ seq
-           <instructions>
-           )))]
+                      ($_ seq
+                          <instructions>
+                          )))]
 
 
   ["float" "java.lang.Float" hostAE.Float]
@@ -253,9 +253,9 @@
                                         [(format "jvm " <domain> " =") <boxed> <boxed> hostAE.Boolean]
                                         [(format "jvm " <domain> " <") <boxed> <boxed> hostAE.Boolean]
                                         )]
-       ($_ seq
-           <instructions>
-           )))]
+                      ($_ seq
+                          <instructions>
+                          )))]
 
 
   ["char" "java.lang.Character" hostAE.Character]
@@ -287,10 +287,10 @@
                            ("jvm array new" (~ (code.nat size)))))
                boxedT (#.Primitive boxed (list))
                boxedTC (` (+0 (~ (code.text boxed)) (+0)))
-               multi-arrayT (list/fold (function (_ _ innerT)
-                                         (|> innerT (list) (#.Primitive "#Array")))
-                                       boxedT
-                                       (list.n/range +1 level))]]
+               multi-arrayT (list/mix (function (_ _ innerT)
+                                        (|> innerT (list) (#.Primitive "#Array")))
+                                      boxedT
+                                      (list.n/range +1 level))]]
         ($_ seq
             (test "jvm array new"
                   (success "jvm array new"
diff --git a/lux-jvm/test/test/luxc/lang/synthesis/loop.lux b/lux-jvm/test/test/luxc/lang/synthesis/loop.lux
index 7aeafab5f..2b09fb3e7 100644
--- a/lux-jvm/test/test/luxc/lang/synthesis/loop.lux
+++ b/lux-jvm/test/test/luxc/lang/synthesis/loop.lux
@@ -4,7 +4,7 @@
        (control [monad #+ do])
        (data [bit "bit/" Eq<Bit>]
              [number]
-             (coll [list "list/" Functor<List> Fold<List>]
+             (coll [list "list/" Functor<List>]
                    (set ["set" unordered]))
              text/format)
        (macro [code])