From 36303d6cb2ce3ab9e36d045b9516c997bd461862 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 24 Aug 2021 05:23:45 -0400
Subject: Outsourced the syntax for labelled type definitions to macros.

---
 lux-jvm/source/luxc/lang/host/jvm/def.lux  | 16 ++++++++--------
 lux-jvm/source/luxc/lang/host/jvm/inst.lux |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index 130e0bb56..b772435cd 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/def.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux
@@ -82,9 +82,9 @@
 (def: (string_array values)
   (-> (List Text) (Array Text))
   (let [output (ffi.array java/lang/String (list.size values))]
-    (exec (list@map (function (_ [idx value])
-                      (ffi.write! idx value output))
-                    (list.enumeration values))
+    (exec (list@each (function (_ [idx value])
+                       (ffi.write! idx value output))
+                     (list.enumeration values))
       output)))
 
 (def: (version_flag version)
@@ -137,7 +137,7 @@
   (format name
           (param_signature super)
           (|> interfaces
-              (list@map param_signature)
+              (list@each param_signature)
               (text.interposed ""))))
 
 (def: (constraints_signature constraints super interfaces)
@@ -147,13 +147,13 @@
                         ""
                         (format "<"
                                 (|> constraints
-                                    (list@map formal_param)
+                                    (list@each formal_param)
                                     (text.interposed ""))
                                 ">"))]
     (format formal_params
             (..signature super)
             (|> interfaces
-                (list@map ..signature)
+                (list@each ..signature)
                 (text.interposed "")))))
 
 (def: class_computes
@@ -181,7 +181,7 @@
                                                               (constraints_signature constraints super interfaces)
                                                               (..class_name super)
                                                               (|> interfaces
-                                                                  (list@map ..class_name)
+                                                                  (list@each ..class_name)
                                                                   string_array)))
                       definitions)
            _ (org/objectweb/asm/ClassWriter::visitEnd writer)]
@@ -210,7 +210,7 @@
                                                            (constraints_signature constraints $Object interfaces)
                                                            (..class_name $Object)
                                                            (|> interfaces
-                                                               (list@map ..class_name)
+                                                               (list@each ..class_name)
                                                                string_array)))
                    definitions)
         _ (org/objectweb/asm/ClassWriter::visitEnd writer)]
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index e0402d924..2dac20c54 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -46,7 +46,7 @@
 
 (syntax: (declare [codes (p.many s.local_identifier)])
   (|> codes
-      (list@map (function (_ code) (` ((~' #static) (~ (code.local_identifier code)) (~' int)))))
+      (list@each (function (_ code) (` ((~' #static) (~ (code.local_identifier code)) (~' int)))))
       in))
 
 (`` (import: org/objectweb/asm/Opcodes
-- 
cgit v1.2.3