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/translation/jvm.lux       | 15 ++--
 .../source/luxc/lang/translation/jvm/primitive.lux | 50 ++++++-------
 .../source/luxc/lang/translation/jvm/structure.lux | 86 +++++++++++-----------
 3 files changed, 76 insertions(+), 75 deletions(-)

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

diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux
index e2bd46f5d..e65d58052 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm.lux
@@ -42,18 +42,19 @@
  )
 
 (import: java/lang/reflect/Field
-  ["[1]::[0]"
-   (get ["?" java/lang/Object] "try" "?" java/lang/Object)])
+  "[1]::[0]"
+  (get ["?" java/lang/Object] "try" "?" java/lang/Object))
 
 (import: (java/lang/Class a)
-  ["[1]::[0]"
-   (getField [java/lang/String] "try" java/lang/reflect/Field)])
+  "[1]::[0]"
+  (getField [java/lang/String] "try" java/lang/reflect/Field))
 
 (import: java/lang/Object
-  ["[1]::[0]"
-   (getClass [] (java/lang/Class java/lang/Object))])
+  "[1]::[0]"
+  (getClass [] (java/lang/Class java/lang/Object)))
 
-(import: java/lang/ClassLoader)
+(import: java/lang/ClassLoader
+  "[1]::[0]")
 
 (type: .public ByteCode Binary)
 
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
index 0f2b64f9f..016639f2e 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
@@ -1,21 +1,21 @@
 (.using
-  [library
-   [lux {"-" i64}
-    ["[0]" ffi {"+" import:}]
-    [math
-     [number
-      ["i" int]]]
-    [target
-     [jvm
-      ["[0]" type]]]
-    [tool
-     [compiler
-      [phase ("operation@[0]" monad)]]]]]
-  [luxc
-   [lang
-    [host
-     ["[0]" jvm {"+" Inst Operation}
-      ["_" inst]]]]])
+ [library
+  [lux {"-" i64}
+   ["[0]" ffi {"+" import:}]
+   [math
+    [number
+     ["i" int]]]
+   [target
+    [jvm
+     ["[0]" type]]]
+   [tool
+    [compiler
+     [phase ("operation@[0]" monad)]]]]]
+ [luxc
+  [lang
+   [host
+    ["[0]" jvm {"+" Inst Operation}
+     ["_" inst]]]]])
 
 (def: .public bit
   (-> Bit (Operation Inst))
@@ -24,14 +24,14 @@
       (operation@in (_.GETSTATIC Boolean (if value "TRUE" "FALSE") Boolean)))))
 
 (import: java/lang/Byte
-  ["[1]::[0]"
-   ("static" MAX_VALUE byte)
-   ("static" MIN_VALUE byte)])
+  "[1]::[0]"
+  ("static" MAX_VALUE byte)
+  ("static" MIN_VALUE byte))
 
 (import: java/lang/Short
-  ["[1]::[0]"
-   ("static" MAX_VALUE short)
-   ("static" MIN_VALUE short)])
+  "[1]::[0]"
+  ("static" MAX_VALUE short)
+  ("static" MIN_VALUE short))
 
 (def: .public (i64 value)
   (-> (I64 Any) (Operation Inst))
@@ -67,8 +67,8 @@
       (operation@in (|>> constantI (_.wrap type.long))))))
 
 (import: java/lang/Double
-  ["[1]::[0]"
-   ("static" doubleToRawLongBits "manual" [double] int)])
+  "[1]::[0]"
+  ("static" doubleToRawLongBits "manual" [double] int))
 
 (def: d0-bits
   Int
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
index 9c8b8b52a..e7604be15 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
@@ -1,41 +1,41 @@
 (.using
-  [library
-   [lux {"-" Type Primitive}
-    ["[0]" ffi {"+" import:}]
-    [abstract
-     ["[0]" monad {"+" do}]]
-    [control
-     ["[0]" exception {"+" exception:}]]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]
-    [math
-     [number
-      ["n" nat]
-      ["i" int]]]
-    [target
-     [jvm
-      ["[0]" type {"+" Type}
-       ["[0]" category {"+" Void Value Return Primitive Object Class Array Var Parameter Method}]
-       ["[0]" descriptor {"+" Descriptor}]
-       ["[0]" signature {"+" Signature}]]]]
-    [tool
-     [compiler
-      ["[0]" phase]
-      [meta
-       [archive {"+" Archive}]]
-      [language
-       [lux
-        [synthesis {"+" Synthesis}]]]]]]]
-  [luxc
-   [lang
-    [host
-     [jvm {"+" Inst Operation Phase Generator}
-      ["_" inst]]]]]
-  ["[0]" //
-   ["[1][0]" runtime]])
+ [library
+  [lux {"-" Type Primitive}
+   ["[0]" ffi {"+" import:}]
+   [abstract
+    ["[0]" monad {"+" do}]]
+   [control
+    ["[0]" exception {"+" exception:}]]
+   [data
+    [text
+     ["%" format {"+" format}]]
+    [collection
+     ["[0]" list]]]
+   [math
+    [number
+     ["n" nat]
+     ["i" int]]]
+   [target
+    [jvm
+     ["[0]" type {"+" Type}
+      ["[0]" category {"+" Void Value Return Primitive Object Class Array Var Parameter Method}]
+      ["[0]" descriptor {"+" Descriptor}]
+      ["[0]" signature {"+" Signature}]]]]
+   [tool
+    [compiler
+     ["[0]" phase]
+     [meta
+      [archive {"+" Archive}]]
+     [language
+      [lux
+       [synthesis {"+" Synthesis}]]]]]]]
+ [luxc
+  [lang
+   [host
+    [jvm {"+" Inst Operation Phase Generator}
+     ["_" inst]]]]]
+ ["[0]" //
+  ["[1][0]" runtime]])
 
 (exception: .public (not_a_tuple [size Nat])
   (exception.report
@@ -63,14 +63,14 @@
              membersI))))
 
 (import: java/lang/Byte
-  ["[1]::[0]"
-   ("static" MAX_VALUE byte)
-   ("static" MIN_VALUE byte)])
+  "[1]::[0]"
+  ("static" MAX_VALUE byte)
+  ("static" MIN_VALUE byte))
 
 (import: java/lang/Short
-  ["[1]::[0]"
-   ("static" MAX_VALUE short)
-   ("static" MIN_VALUE short)])
+  "[1]::[0]"
+  ("static" MAX_VALUE short)
+  ("static" MIN_VALUE short))
 
 (def: .public (tagI lefts right?)
   (-> Nat Bit Inst)
-- 
cgit v1.2.3