- Migrated new-luxc to latest version of stdlib.

- Some refactoring.

2 files changed, 14 insertions, 13 deletions

diff --git a/new-luxc/source/luxc/generator/host/jvm/def.lux b/new-luxc/source/luxc/generator/host/jvm/def.lux
index 18cd4f945..7dd78ceb3 100644
--- a/new-luxc/source/luxc/generator/host/jvm/def.lux
+++ b/new-luxc/source/luxc/generator/host/jvm/def.lux
@@ -4,7 +4,7 @@
              text/format
              [product]
              (coll ["a" array]
-                   [list "L/" Functor<List>]))
+                   [list "list/" Functor<List>]))
        [host #+ do-to])
   ["$" ..]
   (.. ["$t" type]))
@@ -56,13 +56,13 @@
   (visitEnd [] void)
   (visitField [int String String String Object] FieldVisitor)
   (visitMethod [int String String String (Array String)] MethodVisitor)
-  (toByteArray [] Byte-Array))
+  (toByteArray [] (Array byte)))
 
 ## [Defs]
 (def: (string-array values)
   (-> (List Text) (a;Array Text))
   (let [output (host;array String (list;size values))]
-    (exec (L/map (function [[idx value]]
+    (exec (list/map (function [[idx value]]
                    (host;array-write idx value output))
                  (list;enumerate values))
       output)))
@@ -70,7 +70,7 @@
 (def: exceptions-array
   (-> $;Method (a;Array Text))
   (|>. (get@ #$;exceptions)
-       (L/map (|>. #$;Generic $t;descriptor))
+       (list/map (|>. #$;Generic $t;descriptor))
        string-array))
 
 (def: (version-flag version)
@@ -127,7 +127,7 @@
   (format name
           (param-signature super)
           (|> interfaces
-              (L/map param-signature)
+              (list/map param-signature)
               (text;join-with ""))))
 
 (def: (parameters-signature parameters super interfaces)
@@ -137,13 +137,13 @@
                         ""
                         (format "<"
                                 (|> parameters
-                                    (L/map formal-param)
+                                    (list/map formal-param)
                                     (text;join-with ""))
                                 ">"))]
     (format formal-params
             (|> super class-to-type $t;signature)
             (|> interfaces
-                (L/map (|>. class-to-type $t;signature))
+                (list/map (|>. class-to-type $t;signature))
                 (text;join-with "")))))
 
 (def: class-computes
@@ -156,7 +156,7 @@
   [(def: #export (<name> version visibility config name parameters super interfaces
                          definitions)
      (-> $;Version $;Visibility $;Class-Config Text (List $;Parameter) $;Class (List $;Class) $;Def
-         host;Byte-Array)
+         (host;type (Array byte)))
      (let [writer (|> (do-to (ClassWriter.new class-computes)
                         (ClassWriter.visit [(version-flag version)
                                             ($_ i.+
@@ -168,7 +168,7 @@
                                             (parameters-signature parameters super interfaces)
                                             (|> super product;left $t;binary-name)
                                             (|> interfaces
-                                                (L/map (|>. product;left $t;binary-name))
+                                                (list/map (|>. product;left $t;binary-name))
                                                 string-array)]))
                       definitions)
            _ (ClassWriter.visitEnd [] writer)]
@@ -183,7 +183,7 @@
 (def: #export (interface version visibility config name parameters interfaces
                          definitions)
   (-> $;Version $;Visibility $;Class-Config Text (List $;Parameter) (List $;Class) $;Def
-      host;Byte-Array)
+      (host;type (Array byte)))
   (let [writer (|> (do-to (ClassWriter.new class-computes)
                      (ClassWriter.visit [(version-flag version)
                                          ($_ i.+
@@ -195,7 +195,7 @@
                                          (parameters-signature parameters $Object interfaces)
                                          (|> $Object product;left $t;binary-name)
                                          (|> interfaces
-                                             (L/map (|>. product;left $t;binary-name))
+                                             (list/map (|>. product;left $t;binary-name))
                                              string-array)]))
                    definitions)
         _ (ClassWriter.visitEnd [] writer)]
diff --git a/new-luxc/source/luxc/generator/host/jvm/inst.lux b/new-luxc/source/luxc/generator/host/jvm/inst.lux
index 02027294a..aa9a852dd 100644
--- a/new-luxc/source/luxc/generator/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/generator/host/jvm/inst.lux
@@ -2,8 +2,9 @@
   [lux #- char]
   (lux (control monad
                 ["p" parser])
-       (data text/format
+       (data [maybe]
              ["R" result]
+             text/format
              (coll [list "L/" Functor<List>]))
        [host #+ do-to]
        [macro]
@@ -262,7 +263,7 @@
           _ (loop [idx +0]
               (if (n.< num-labels idx)
                 (exec (host;array-write idx
-                                        (assume (list;nth idx labels))
+                                        (maybe;assume (list;nth idx labels))
                                         labels-array)
                   (recur (n.inc idx)))
                 []))]