Made JVM "import:" syntax consistent with the other "import:"s.

1 files changed, 44 insertions, 38 deletions

diff --git a/lux-scheme/source/program.lux b/lux-scheme/source/program.lux
index e04ba5ac2..05714c13a 100644
--- a/lux-scheme/source/program.lux
+++ b/lux-scheme/source/program.lux
@@ -65,71 +65,77 @@
    ["[1][0]" cli]
    ["[1][0]" static]]])
 
-(ffi.import: java/lang/Boolean)
-(ffi.import: java/lang/String)
+(ffi.import: java/lang/Boolean
+  "[1]::[0]")
 
-(ffi.import: (java/lang/Class a))
+(ffi.import: java/lang/String
+  "[1]::[0]")
+
+(ffi.import: (java/lang/Class a)
+  "[1]::[0]")
 
 (ffi.import: java/lang/Object
-  ["[1]::[0]"
-   (toString [] java/lang/String)
-   (getClass [] (java/lang/Class java/lang/Object))])
+  "[1]::[0]"
+  (toString [] java/lang/String)
+  (getClass [] (java/lang/Class java/lang/Object)))
 
 (ffi.import: java/lang/Long
-  ["[1]::[0]"
-   (intValue [] java/lang/Integer)])
+  "[1]::[0]"
+  (intValue [] java/lang/Integer))
 
 (ffi.import: java/lang/Integer
-  ["[1]::[0]"
-   (longValue [] java/lang/Long)])
+  "[1]::[0]"
+  (longValue [] java/lang/Long))
 
 (ffi.import: gnu/math/IntNum
-  ["[1]::[0]"
-   (new "manual" [int])
-   (longValue [] long)])
+  "[1]::[0]"
+  (new "manual" [int])
+  (longValue [] long))
 
 (ffi.import: gnu/math/DFloNum
-  ["[1]::[0]"
-   (doubleValue [] double)])
+  "[1]::[0]"
+  (doubleValue [] double))
 
 (ffi.import: gnu/lists/FString
-  ["[1]::[0]"
-   (toString [] String)])
+  "[1]::[0]"
+  (toString [] String))
 
 (ffi.import: gnu/lists/IString
-  ["[1]::[0]"
-   (toString [] String)])
+  "[1]::[0]"
+  (toString [] String))
 
 (ffi.import: gnu/lists/Pair
-  ["[1]::[0]"
-   (getCar [] java/lang/Object)
-   (getCdr [] java/lang/Object)])
+  "[1]::[0]"
+  (getCar [] java/lang/Object)
+  (getCdr [] java/lang/Object))
 
 (ffi.import: gnu/lists/EmptyList
-  ["[1]::[0]"
-   ("static" emptyList gnu/lists/EmptyList)])
+  "[1]::[0]"
+  ("static" emptyList gnu/lists/EmptyList))
 
 (ffi.import: (gnu/lists/FVector E)
-  ["[1]::[0]"
-   (getBufferLength [] int)
-   (getRaw [int] E)])
+  "[1]::[0]"
+  (getBufferLength [] int)
+  (getRaw [int] E))
 
-(ffi.import: gnu/lists/U8Vector)
+(ffi.import: gnu/lists/U8Vector
+  "[1]::[0]")
 
 (ffi.import: gnu/mapping/Procedure
-  ["[1]::[0]"
-   (apply2 [java/lang/Object java/lang/Object] "try" java/lang/Object)
-   (applyN [[java/lang/Object]] "try" java/lang/Object)])
+  "[1]::[0]"
+  (apply2 [java/lang/Object java/lang/Object] "try" java/lang/Object)
+  (applyN [[java/lang/Object]] "try" java/lang/Object))
 
-(ffi.import: gnu/mapping/Environment)
+(ffi.import: gnu/mapping/Environment
+  "[1]::[0]")
 
 (ffi.import: gnu/expr/Language
-  ["[1]::[0]"
-   (eval [java/lang/String] "try" java/lang/Object)])
+  "[1]::[0]"
+  (eval [java/lang/String] "try" java/lang/Object))
 
 (ffi.import: kawa/standard/Scheme
-  ["[1]::[0]"
-   ("static" getR7rsInstance [] kawa/standard/Scheme)])
+  "[1]::[0]"
+  ("static" getR7rsInstance [] kawa/standard/Scheme))
 
 (def: (variant? value)
   (-> Any Bit)
@@ -158,8 +164,8 @@
      (getValue [] java/lang/Object))
 
    (`` (ffi.import: (~~ (template.symbol ["program/" <name>]))
-         ["[1]::[0]"
-          (getValue [] java/lang/Object)]))]
+         "[1]::[0]"
+         (getValue [] java/lang/Object)))]
 
   [VariantValue]
   [TupleValue]