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

1 files changed, 88 insertions, 74 deletions

diff --git a/lux-ruby/source/program.lux b/lux-ruby/source/program.lux
index 30a276d58..1d47453aa 100644
--- a/lux-ruby/source/program.lux
+++ b/lux-ruby/source/program.lux
@@ -73,74 +73,85 @@
  [program
   ["/" compositor]])
 
-(import: java/lang/String)
+(import: java/lang/String
+  "[1]::[0]")
 
 (import: (java/lang/Class a)
-  ["[1]::[0]"
-   (getSuperclass [] (java/lang/Class ?))
-   (isInstance [java/lang/Object] boolean)])
+  "[1]::[0]"
+  (getSuperclass [] (java/lang/Class ?))
+  (isInstance [java/lang/Object] boolean))
 
 (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/Integer
-  ["[1]::[0]"
-   (longValue [] long)])
+  "[1]::[0]"
+  (longValue [] long))
 
 (import: java/lang/Long
-  ["[1]::[0]"
-   (intValue [] int)])
+  "[1]::[0]"
+  (intValue [] int))
 
 (import: org/jruby/RubyString
-  ["[1]::[0]"
-   ("static" newInternalFromJavaExternal [org/jruby/Ruby java/lang/String] org/jruby/RubyString)
-   (asJavaString [] java/lang/String)])
+  "[1]::[0]"
+  ("static" newInternalFromJavaExternal [org/jruby/Ruby java/lang/String] org/jruby/RubyString)
+  (asJavaString [] java/lang/String))
 
 (import: org/jruby/RubySymbol
-  ["[1]::[0]"
-   (asJavaString [] java/lang/String)])
+  "[1]::[0]"
+  (asJavaString [] java/lang/String))
 
-(import: org/jruby/runtime/builtin/IRubyObject)
+(import: org/jruby/runtime/builtin/IRubyObject
+  "[1]::[0]")
 
 (import: org/jruby/Ruby
-  ["[1]::[0]"
-   (getCurrentContext [] org/jruby/runtime/ThreadContext)
-   (getNil [] org/jruby/runtime/builtin/IRubyObject)])
+  "[1]::[0]"
+  (getCurrentContext [] org/jruby/runtime/ThreadContext)
+  (getNil [] org/jruby/runtime/builtin/IRubyObject))
 
-(import: org/jruby/RubyClass)
+(import: org/jruby/RubyClass
+  "[1]::[0]")
 
 (import: org/jruby/RubyArray
-  ["[1]::[0]"
-   (getLength [] int)
-   (get [int] "?" Object)])
+  "[1]::[0]"
+  (getLength [] int)
+  (get [int] "?" Object))
 
 (import: org/jruby/RubyHash
-  ["[1]::[0]"
-   (get [java/lang/Object] "?" java/lang/Object)])
+  "[1]::[0]"
+  (get [java/lang/Object] "?" java/lang/Object))
 
-(import: org/jruby/runtime/ThreadContext)
+(import: org/jruby/runtime/ThreadContext
+  "[1]::[0]")
 
 (import: org/jruby/RubyRange
-  ["[1]::[0]"
-   (first [org/jruby/runtime/ThreadContext] org/jruby/runtime/builtin/IRubyObject)
-   (size [org/jruby/runtime/ThreadContext] org/jruby/runtime/builtin/IRubyObject)])
+  "[1]::[0]"
+  (first [org/jruby/runtime/ThreadContext] org/jruby/runtime/builtin/IRubyObject)
+  (size [org/jruby/runtime/ThreadContext] org/jruby/runtime/builtin/IRubyObject))
 
-(import: org/jruby/runtime/JavaSites$CheckedSites)
-(import: org/jruby/runtime/builtin/Variable)
-(import: org/jruby/runtime/builtin/InstanceVariables)
-(import: org/jruby/runtime/builtin/InternalVariables)
+(import: org/jruby/runtime/JavaSites$CheckedSites
+  "[1]::[0]")
+
+(import: org/jruby/runtime/builtin/Variable
+  "[1]::[0]")
+
+(import: org/jruby/runtime/builtin/InstanceVariables
+  "[1]::[0]")
+
+(import: org/jruby/runtime/builtin/InternalVariables
+  "[1]::[0]")
 
 (import: org/jruby/embed/internal/LocalContextProvider
-  ["[1]::[0]"
-   (getRuntime [] org/jruby/Ruby)])
+  "[1]::[0]"
+  (getRuntime [] org/jruby/Ruby))
 
 (import: org/jruby/embed/ScriptingContainer
-  ["[1]::[0]"
-   (new [])
-   (runScriptlet [java/lang/String] "try" "?" java/lang/Object)
-   (getProvider [] org/jruby/embed/internal/LocalContextProvider)])
+  "[1]::[0]"
+  (new [])
+  (runScriptlet [java/lang/String] "try" "?" java/lang/Object)
+  (getProvider [] org/jruby/embed/internal/LocalContextProvider))
 
 ... TODO; Figure out a way to not need "interpreter" to be a global variable.
 (def: interpreter
@@ -159,61 +170,64 @@
   (!ruby_runtime))
 
 (import: org/jruby/java/proxies/JavaProxy
-  ["[1]::[0]"
-   (new [org/jruby/Ruby org/jruby/RubyClass java/lang/Object])
-   (getObject [] java/lang/Object)])
+  "[1]::[0]"
+  (new [org/jruby/Ruby org/jruby/RubyClass java/lang/Object])
+  (getObject [] java/lang/Object))
 
-(import: org/jruby/internal/runtime/methods/DynamicMethod)
+(import: org/jruby/internal/runtime/methods/DynamicMethod
+  "[1]::[0]")
 
 (import: org/jruby/runtime/callsite/CacheEntry
-  ["[1]::[0]"
-   (new [org/jruby/internal/runtime/methods/DynamicMethod int])])
+  "[1]::[0]"
+  (new [org/jruby/internal/runtime/methods/DynamicMethod int]))
 
 (import: org/jruby/RubyFixnum
-  ["[1]::[0]"
-   (new [org/jruby/Ruby long])
-   (getLongValue [] long)])
+  "[1]::[0]"
+  (new [org/jruby/Ruby long])
+  (getLongValue [] long))
 
 (import: org/jruby/RubyFloat
-  ["[1]::[0]"
-   (new [org/jruby/Ruby double])])
+  "[1]::[0]"
+  (new [org/jruby/Ruby double]))
 
 (import: org/jruby/RubyBoolean
-  ["[1]::[0]"
-   ("static" newBoolean [org/jruby/Ruby boolean] org/jruby/RubyBoolean)])
+  "[1]::[0]"
+  ("static" newBoolean [org/jruby/Ruby boolean] org/jruby/RubyBoolean))
 
 (import: org/jruby/RubyNil
-  ["[1]::[0]"
-   (new [org/jruby/Ruby])])
+  "[1]::[0]"
+  (new [org/jruby/Ruby]))
 
 (import: org/jruby/runtime/Block$Type
-  ["[1]::[0]"
-   ("enum" PROC)])
+  "[1]::[0]"
+  ("enum" PROC))
 
 (import: org/jruby/runtime/Signature
-  ["[1]::[0]"
-   ("static" THREE_ARGUMENTS org/jruby/runtime/Signature)])
+  "[1]::[0]"
+  ("static" THREE_ARGUMENTS org/jruby/runtime/Signature))
 
-(import: org/jruby/parser/StaticScope)
+(import: org/jruby/parser/StaticScope
+  "[1]::[0]")
 
 (import: org/jruby/parser/StaticScopeFactory
-  ["[1]::[0]"
-   (new [org/jruby/Ruby])
-   (getDummyScope [] org/jruby/parser/StaticScope)])
+  "[1]::[0]"
+  (new [org/jruby/Ruby])
+  (getDummyScope [] org/jruby/parser/StaticScope))
 
-(import: org/jruby/runtime/BlockBody)
+(import: org/jruby/runtime/BlockBody
+  "[1]::[0]")
 
 (import: org/jruby/runtime/Block
-  ["[1]::[0]"
-   ("static" NULL_BLOCK org/jruby/runtime/Block)
-   (type org/jruby/runtime/Block$Type)
-   (getBody [] org/jruby/runtime/BlockBody)])
+  "[1]::[0]"
+  ("static" NULL_BLOCK org/jruby/runtime/Block)
+  (type org/jruby/runtime/Block$Type)
+  (getBody [] org/jruby/runtime/BlockBody))
 
 (import: org/jruby/RubyProc
-  ["[1]::[0]"
-   ("static" newProc [org/jruby/Ruby org/jruby/runtime/Block org/jruby/runtime/Block$Type] org/jruby/RubyProc)
-   (call [org/jruby/runtime/ThreadContext [org/jruby/runtime/builtin/IRubyObject]]
-         "try" org/jruby/runtime/builtin/IRubyObject)])
+  "[1]::[0]"
+  ("static" newProc [org/jruby/Ruby org/jruby/runtime/Block org/jruby/runtime/Block$Type] org/jruby/RubyProc)
+  (call [org/jruby/runtime/ThreadContext [org/jruby/runtime/builtin/IRubyObject]]
+        "try" org/jruby/runtime/builtin/IRubyObject))
 
 (type: Translator
   (-> java/lang/Object (Try Any)))
@@ -350,8 +364,8 @@
                 ffi.of_string)]))
 
 (import: java/util/Arrays
-  ["[1]::[0]"
-   ("static" [t] copyOfRange [[t] int int] [t])])
+  "[1]::[0]"
+  ("static" [t] copyOfRange [[t] int int] [t]))
 
 (exception: (invalid_arity [arity Nat])
   (exception.report