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

1 files changed, 59 insertions, 51 deletions

diff --git a/lux-r/source/program.lux b/lux-r/source/program.lux
index 570a52b4e..2ba9794ad 100644
--- a/lux-r/source/program.lux
+++ b/lux-r/source/program.lux
@@ -68,100 +68,108 @@
    ["[1][0]" cli]
    ["[1][0]" static]]])
 
-(ffi.import: java/lang/String)
+(ffi.import: java/lang/String
+  "[1]::[0]")
 
 (ffi.import: (java/lang/Class a)
-  ["[1]::[0]"
-   ("static" forName [java/lang/String] "try" (java/lang/Class java/lang/Object))])
+  "[1]::[0]"
+  ("static" forName [java/lang/String] "try" (java/lang/Class java/lang/Object)))
 
 (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 [] long)])
+  "[1]::[0]"
+  (longValue [] long))
 
 (ffi.import: java/lang/Number
-  ["[1]::[0]"
-   (intValue [] java/lang/Integer)
-   (longValue [] long)
-   (doubleValue [] double)])
+  "[1]::[0]"
+  (intValue [] java/lang/Integer)
+  (longValue [] long)
+  (doubleValue [] double))
 
 (ffi.import: org/renjin/sexp/SEXP
-  ["[1]::[0]"
-   (asInt [] int)])
+  "[1]::[0]"
+  (asInt [] int))
 
 (ffi.import: org/renjin/sexp/AttributeMap
-  ["[1]::[0]"
-   ("static" EMPTY org/renjin/sexp/AttributeMap)])
+  "[1]::[0]"
+  ("static" EMPTY org/renjin/sexp/AttributeMap))
 
-(ffi.import: org/renjin/sexp/AbstractSEXP)
+(ffi.import: org/renjin/sexp/AbstractSEXP
+  "[1]::[0]")
 
-(ffi.import: org/renjin/sexp/IntArrayVector)
+(ffi.import: org/renjin/sexp/IntArrayVector
+  "[1]::[0]")
 
 (ffi.import: org/renjin/sexp/Logical
-  ["[1]::[0]"
-   (toBooleanStrict [] boolean)])
+  "[1]::[0]"
+  (toBooleanStrict [] boolean))
 
 (ffi.import: org/renjin/sexp/LogicalVector
-  ["[1]::[0]"
-   (asLogical [] org/renjin/sexp/Logical)])
+  "[1]::[0]"
+  (asLogical [] org/renjin/sexp/Logical))
 
 (ffi.import: org/renjin/sexp/LogicalArrayVector)
 
 (ffi.import: org/renjin/sexp/StringVector
-  ["[1]::[0]"
-   (asString [] java/lang/String)])
+  "[1]::[0]"
+  (asString [] java/lang/String))
 
-(ffi.import: org/renjin/sexp/StringArrayVector)
+(ffi.import: org/renjin/sexp/StringArrayVector
+  "[1]::[0]")
 
-(ffi.import: org/renjin/sexp/Null)
+(ffi.import: org/renjin/sexp/Null
+  "[1]::[0]")
 
 (ffi.import: org/renjin/sexp/ListVector
-  ["[1]::[0]"
-   (get "as" get_index [int] org/renjin/sexp/SEXP)
-   (get "as" get_field [java/lang/String] org/renjin/sexp/SEXP)
-   (length [] int)])
+  "[1]::[0]"
+  (get "as" get_index [int] org/renjin/sexp/SEXP)
+  (get "as" get_field [java/lang/String] org/renjin/sexp/SEXP)
+  (length [] int))
 
-(ffi.import: org/renjin/sexp/PairList)
+(ffi.import: org/renjin/sexp/PairList
+  "[1]::[0]")
 
 (ffi.import: org/renjin/sexp/PairList$Builder
-  ["[1]::[0]"
-   (new [])
-   (add [org/renjin/sexp/SEXP] org/renjin/sexp/PairList$Builder)
-   (build [] org/renjin/sexp/PairList)])
+  "[1]::[0]"
+  (new [])
+  (add [org/renjin/sexp/SEXP] org/renjin/sexp/PairList$Builder)
+  (build [] org/renjin/sexp/PairList))
 
-(ffi.import: org/renjin/eval/Context)
+(ffi.import: org/renjin/eval/Context
+  "[1]::[0]")
 
-(ffi.import: org/renjin/sexp/Environment)
+(ffi.import: org/renjin/sexp/Environment
+  "[1]::[0]")
 
 (ffi.import: org/renjin/sexp/FunctionCall
-  ["[1]::[0]"
-   (new [org/renjin/sexp/SEXP org/renjin/sexp/PairList])
-   (eval [org/renjin/eval/Context org/renjin/sexp/Environment] "try" org/renjin/sexp/SEXP)])
+  "[1]::[0]"
+  (new [org/renjin/sexp/SEXP org/renjin/sexp/PairList])
+  (eval [org/renjin/eval/Context org/renjin/sexp/Environment] "try" org/renjin/sexp/SEXP))
 
 (ffi.import: org/renjin/sexp/Closure
-  ["[1]::[0]"
-   (getEnclosingEnvironment [] org/renjin/sexp/Environment)])
+  "[1]::[0]"
+  (getEnclosingEnvironment [] org/renjin/sexp/Environment))
 
 (ffi.import: javax/script/ScriptEngine
-  ["[1]::[0]"
-   (eval [java/lang/String] "try" java/lang/Object)])
+  "[1]::[0]"
+  (eval [java/lang/String] "try" java/lang/Object))
 
 (ffi.import: org/renjin/script/RenjinScriptEngine
-  ["[1]::[0]"
-   (getRuntimeContext [] org/renjin/eval/Context)])
+  "[1]::[0]"
+  (getRuntimeContext [] org/renjin/eval/Context))
 
 (ffi.import: org/renjin/script/RenjinScriptEngineFactory
-  ["[1]::[0]"
-   (new [])
-   (getScriptEngine [] org/renjin/script/RenjinScriptEngine)])
+  "[1]::[0]"
+  (new [])
+  (getScriptEngine [] org/renjin/script/RenjinScriptEngine))
 
 (template [<name>]
   [(exception: (<name> [object java/lang/Object])