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

1 files changed, 40 insertions, 36 deletions

diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux
index 487415185..2e74bf203 100644
--- a/lux-js/source/program.lux
+++ b/lux-js/source/program.lux
@@ -77,71 +77,75 @@
     "???"))
 
 (for @.jvm
-     (as_is (import: java/lang/String)
+     (as_is (import: java/lang/String
+              "[1]::[0]")
 
-            (import: (java/lang/Class a))
+            (import: (java/lang/Class a)
+              "[1]::[0]")
 
             (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)))
 
             (import: java/lang/Long
-              ["[1]::[0]"
-               (intValue [] int)])
+              "[1]::[0]"
+              (intValue [] int))
 
             (import: java/lang/Integer
-              ["[1]::[0]"
-               (longValue [] long)])
+              "[1]::[0]"
+              (longValue [] long))
 
             (import: java/lang/Number
-              ["[1]::[0]"
-               (intValue [] int)
-               (longValue [] long)
-               (doubleValue [] double)])
+              "[1]::[0]"
+              (intValue [] int)
+              (longValue [] long)
+              (doubleValue [] double))
 
             (import: java/util/Arrays
-              ["[1]::[0]"
-               ("static" [t] copyOfRange [[t] int int] [t])])
+              "[1]::[0]"
+              ("static" [t] copyOfRange [[t] int int] [t]))
 
             (import: javax/script/ScriptEngine
-              ["[1]::[0]"
-               (eval [java/lang/String] "try" "?" java/lang/Object)])
+              "[1]::[0]"
+              (eval [java/lang/String] "try" "?" java/lang/Object))
 
             (import: javax/script/ScriptEngineFactory
-              ["[1]::[0]"
-               (getScriptEngine [] javax/script/ScriptEngine)])
+              "[1]::[0]"
+              (getScriptEngine [] javax/script/ScriptEngine))
 
             (import: org/openjdk/nashorn/api/scripting/NashornScriptEngineFactory
-              ["[1]::[0]"
-               (new [])])
+              "[1]::[0]"
+              (new []))
 
             (import: org/openjdk/nashorn/api/scripting/JSObject
-              ["[1]::[0]"
-               (isArray [] boolean)
-               (isFunction [] boolean)
-               (getSlot [int] "?" java/lang/Object)
-               (getMember [java/lang/String] "?" java/lang/Object)
-               (hasMember [java/lang/String] boolean)
-               (call ["?" java/lang/Object [java/lang/Object]] "try" java/lang/Object)])
+              "[1]::[0]"
+              (isArray [] boolean)
+              (isFunction [] boolean)
+              (getSlot [int] "?" java/lang/Object)
+              (getMember [java/lang/String] "?" java/lang/Object)
+              (hasMember [java/lang/String] boolean)
+              (call ["?" java/lang/Object [java/lang/Object]] "try" java/lang/Object))
 
-            (import: org/openjdk/nashorn/api/scripting/AbstractJSObject)
+            (import: org/openjdk/nashorn/api/scripting/AbstractJSObject
+              "[1]::[0]")
 
             (import: org/openjdk/nashorn/api/scripting/ScriptObjectMirror
-              ["[1]::[0]"
-               (size [] int)
-               (toString [] java/lang/String)
-               (getOwnKeys [boolean] [java/lang/String])])
+              "[1]::[0]"
+              (size [] int)
+              (toString [] java/lang/String)
+              (getOwnKeys [boolean] [java/lang/String]))
 
-            (import: org/openjdk/nashorn/internal/runtime/Undefined)
+            (import: org/openjdk/nashorn/internal/runtime/Undefined
+              "[1]::[0]")
 
             (template [<name>]
               [(ffi.interface: <name>
                  (getValue [] java/lang/Object))
 
                (import: <name>
-                 ["[1]::[0]"
-                  (getValue [] java/lang/Object)])]
+                 "[1]::[0]"
+                 (getValue [] java/lang/Object))]
 
               [IntValue]
               [StructureValue]