From 62299ecdc93b39f6a22b1f89779f55dfa735fb3c Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 14 Mar 2022 17:03:38 -0400
Subject: Made JVM "import:" syntax consistent with the other "import:"s.

---
 lux-jvm/source/luxc/lang/host/jvm/def.lux | 87 ++++++++++++++++---------------
 1 file changed, 45 insertions(+), 42 deletions(-)

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

diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index e7174a61e..fd79d2119 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/def.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux
@@ -28,56 +28,59 @@
 (def: descriptor (|>> type.descriptor descriptor.descriptor))
 (def: class_name (|>> type.descriptor descriptor.class_name name.read))
 
-(import: java/lang/Object)
-(import: java/lang/String)
+(import: java/lang/Object
+  "[1]::[0]")
+
+(import: java/lang/String
+  "[1]::[0]")
 
 (import: org/objectweb/asm/Opcodes
-  ["[1]::[0]"
-   ("static" ACC_PUBLIC int)
-   ("static" ACC_PROTECTED int)
-   ("static" ACC_PRIVATE int)
-
-   ("static" ACC_TRANSIENT int)
-   ("static" ACC_VOLATILE int)
-
-   ("static" ACC_ABSTRACT int)
-   ("static" ACC_FINAL int)
-   ("static" ACC_STATIC int)
-   ("static" ACC_SYNCHRONIZED int)
-   ("static" ACC_STRICT int)
-
-   ("static" ACC_SUPER int)
-   ("static" ACC_INTERFACE int)
-
-   ("static" V1_1 int)
-   ("static" V1_2 int)
-   ("static" V1_3 int)
-   ("static" V1_4 int)
-   ("static" V1_5 int)
-   ("static" V1_6 int)
-   ("static" V1_7 int)
-   ("static" V1_8 int)])
+  "[1]::[0]"
+  ("static" ACC_PUBLIC int)
+  ("static" ACC_PROTECTED int)
+  ("static" ACC_PRIVATE int)
+
+  ("static" ACC_TRANSIENT int)
+  ("static" ACC_VOLATILE int)
+
+  ("static" ACC_ABSTRACT int)
+  ("static" ACC_FINAL int)
+  ("static" ACC_STATIC int)
+  ("static" ACC_SYNCHRONIZED int)
+  ("static" ACC_STRICT int)
+
+  ("static" ACC_SUPER int)
+  ("static" ACC_INTERFACE int)
+
+  ("static" V1_1 int)
+  ("static" V1_2 int)
+  ("static" V1_3 int)
+  ("static" V1_4 int)
+  ("static" V1_5 int)
+  ("static" V1_6 int)
+  ("static" V1_7 int)
+  ("static" V1_8 int))
 
 (import: org/objectweb/asm/FieldVisitor
-  ["[1]::[0]"
-   (visitEnd [] void)])
+  "[1]::[0]"
+  (visitEnd [] void))
 
 (import: org/objectweb/asm/MethodVisitor
-  ["[1]::[0]"
-   (visitCode [] void)
-   (visitMaxs [int int] void)
-   (visitEnd [] void)])
+  "[1]::[0]"
+  (visitCode [] void)
+  (visitMaxs [int int] void)
+  (visitEnd [] void))
 
 (import: org/objectweb/asm/ClassWriter
-  ["[1]::[0]"
-   ("static" COMPUTE_MAXS int)
-   ("static" COMPUTE_FRAMES int)
-   (new [int])
-   (visit [int int java/lang/String java/lang/String java/lang/String [java/lang/String]] void)
-   (visitEnd [] void)
-   (visitField [int java/lang/String java/lang/String java/lang/String java/lang/Object] org/objectweb/asm/FieldVisitor)
-   (visitMethod [int java/lang/String java/lang/String java/lang/String [java/lang/String]] org/objectweb/asm/MethodVisitor)
-   (toByteArray [] [byte])])
+  "[1]::[0]"
+  ("static" COMPUTE_MAXS int)
+  ("static" COMPUTE_FRAMES int)
+  (new [int])
+  (visit [int int java/lang/String java/lang/String java/lang/String [java/lang/String]] void)
+  (visitEnd [] void)
+  (visitField [int java/lang/String java/lang/String java/lang/String java/lang/Object] org/objectweb/asm/FieldVisitor)
+  (visitMethod [int java/lang/String java/lang/String java/lang/String [java/lang/String]] org/objectweb/asm/MethodVisitor)
+  (toByteArray [] [byte]))
 
 (def: (string_array values)
   (-> (List Text) (Array Text))
-- 
cgit v1.2.3