From 74a835634fc9ee5457f3cc7109af069dad9f2d2f Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 11 Oct 2017 18:57:44 -0400
Subject: - Migrated new-luxc to latest version of stdlib. - Some refactoring.

---
 new-luxc/source/luxc/generator/host/jvm.lux | 36 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'new-luxc/source/luxc/generator/host/jvm.lux')

diff --git a/new-luxc/source/luxc/generator/host/jvm.lux b/new-luxc/source/luxc/generator/host/jvm.lux
index 149fbf123..4fb3fa77d 100644
--- a/new-luxc/source/luxc/generator/host/jvm.lux
+++ b/new-luxc/source/luxc/generator/host/jvm.lux
@@ -2,7 +2,7 @@
   [lux #- Type Def]
   (lux (control monad
                 ["p" parser])
-       (data (coll [list "L/" Functor<List>]))
+       (data (coll [list "list/" Functor<List>]))
        [macro]
        (macro [code]
               ["s" syntax #+ syntax:])
@@ -86,32 +86,32 @@
            [options (s;tuple (p;many s;local-symbol))])
   (let [g!type (code;local-symbol type)
         g!none (code;local-symbol none)
-        g!tags+ (L/map code;local-tag options)
+        g!tags+ (list/map code;local-tag options)
         g!_left (code;local-symbol "_left")
         g!_right (code;local-symbol "_right")
-        g!options+ (L/map (function [option]
-                            (` (def: (~' #export) (~ (code;local-symbol option))
-                                 (~ g!type)
-                                 (|> (~ g!none)
-                                     (set@ (~ (code;local-tag option)) true)))))
-                          options)]
+        g!options+ (list/map (function [option]
+                               (` (def: (~' #export) (~ (code;local-symbol option))
+                                    (~ g!type)
+                                    (|> (~ g!none)
+                                        (set@ (~ (code;local-tag option)) true)))))
+                             options)]
     (wrap (list& (` (type: (~' #export) (~ g!type)
-                      (~ (code;record (L/map (function [tag]
-                                               [tag (` ;Bool)])
-                                             g!tags+)))))
+                      (~ (code;record (list/map (function [tag]
+                                                  [tag (` ;Bool)])
+                                                g!tags+)))))
 
                  (` (def: (~' #export) (~ g!none)
                       (~ g!type)
-                      (~ (code;record (L/map (function [tag]
-                                               [tag (` false)])
-                                             g!tags+)))))
+                      (~ (code;record (list/map (function [tag]
+                                                  [tag (` false)])
+                                                g!tags+)))))
 
                  (` (def: (~' #export) ((~ (code;local-symbol ++)) (~ g!_left) (~ g!_right))
                       (-> (~ g!type) (~ g!type) (~ g!type))
-                      (~ (code;record (L/map (function [tag]
-                                               [tag (` (and (get@ (~ tag) (~ g!_left))
-                                                            (get@ (~ tag) (~ g!_right))))])
-                                             g!tags+)))))
+                      (~ (code;record (list/map (function [tag]
+                                                  [tag (` (and (get@ (~ tag) (~ g!_left))
+                                                               (get@ (~ tag) (~ g!_right))))])
+                                                g!tags+)))))
 
                  g!options+))))
 
-- 
cgit v1.2.3