- Re-named "jvm-import" to "import".

11 files changed, 57 insertions, 57 deletions

diff --git a/new-luxc/source/luxc/generator.lux b/new-luxc/source/luxc/generator.lux
index b447dd7a8..00a50fbed 100644
--- a/new-luxc/source/luxc/generator.lux
+++ b/new-luxc/source/luxc/generator.lux
@@ -9,7 +9,7 @@
              (coll ["D" dict]
                    [array #+ Array]))
        [macro #+ Monad<Lux>]
-       host
+       [host]
        [io])
   (luxc ["&" base]
         ["&;" io]
@@ -108,7 +108,7 @@
       (#R;Error error)
       (wrap (#R;Error error)))))
 
-(jvm-import org.objectweb.asm.MethodVisitor)
+(host;import org.objectweb.asm.MethodVisitor)
 
 (def: init-cursor Cursor ["" +0 +0])
 
diff --git a/new-luxc/source/luxc/generator/common.jvm.lux b/new-luxc/source/luxc/generator/common.jvm.lux
index c5fe8fc0a..095f41945 100644
--- a/new-luxc/source/luxc/generator/common.jvm.lux
+++ b/new-luxc/source/luxc/generator/common.jvm.lux
@@ -5,21 +5,21 @@
        (data ["R" result]
              (coll ["d" dict])
              text/format)
-       [host #+ jvm-import])
+       [host])
   (luxc (generator (host ["$" jvm]
                          (jvm ["$t" type]
                               ["$d" def]
                               ["$i" inst])))))
 
 ## [Host]
-(jvm-import org.objectweb.asm.Opcodes
+(host;import org.objectweb.asm.Opcodes
   (#static V1_6 int))
 
-(jvm-import java.lang.Object)
+(host;import java.lang.Object)
 
-(jvm-import (java.lang.Class a))
+(host;import (java.lang.Class a))
 
-(jvm-import java.lang.ClassLoader
+(host;import java.lang.ClassLoader
   (loadClass [String] (Class Object)))
 
 ## [Types]
diff --git a/new-luxc/source/luxc/generator/eval.jvm.lux b/new-luxc/source/luxc/generator/eval.jvm.lux
index e7567f1fa..e6650953f 100644
--- a/new-luxc/source/luxc/generator/eval.jvm.lux
+++ b/new-luxc/source/luxc/generator/eval.jvm.lux
@@ -4,7 +4,7 @@
        (data ["R" result]
              text/format)
        [macro #+ Monad<Lux> "Lux/" Monad<Lux>]
-       [host #+ jvm-import do-to])
+       [host #+ do-to])
   (luxc ["&" base]
         (lang ["la" analysis]
               ["ls" synthesis])
@@ -17,16 +17,16 @@
                               ["$i" inst])))
         ))
 
-(jvm-import java.lang.Object)
-(jvm-import java.lang.String)
+(host;import java.lang.Object)
+(host;import java.lang.String)
 
-(jvm-import java.lang.reflect.Field
+(host;import java.lang.reflect.Field
   (get [Object] Object))
 
-(jvm-import (java.lang.Class a)
+(host;import (java.lang.Class a)
   (getField [String] Field))
 
-(jvm-import org.objectweb.asm.Opcodes
+(host;import org.objectweb.asm.Opcodes
   (#static ACC_PUBLIC int)
   (#static ACC_SUPER int)
   (#static ACC_FINAL int)
@@ -36,7 +36,7 @@
   (#static V1_6 int)
   )
 
-(jvm-import org.objectweb.asm.MethodVisitor
+(host;import org.objectweb.asm.MethodVisitor
   (visitCode [] void)
   (visitEnd [] void)
   (visitLdcInsn [Object] void)
@@ -44,10 +44,10 @@
   (visitInsn [int] void)
   (visitMaxs [int int] void))
 
-(jvm-import org.objectweb.asm.FieldVisitor
+(host;import org.objectweb.asm.FieldVisitor
   (visitEnd [] void))
 
-(jvm-import org.objectweb.asm.ClassWriter
+(host;import org.objectweb.asm.ClassWriter
   (#static COMPUTE_MAXS int)
   (new [int])
   (visit [int int String String String (Array String)] void)
diff --git a/new-luxc/source/luxc/generator/host/jvm.lux b/new-luxc/source/luxc/generator/host/jvm.lux
index d67b6ef91..4b4b1d38e 100644
--- a/new-luxc/source/luxc/generator/host/jvm.lux
+++ b/new-luxc/source/luxc/generator/host/jvm.lux
@@ -6,14 +6,14 @@
        [macro]
        (macro [code]
               ["s" syntax #+ syntax:])
-       [host #+ jvm-import]))
+       [host]))
 
 ## [Host]
-(jvm-import org.objectweb.asm.MethodVisitor)
+(host;import org.objectweb.asm.MethodVisitor)
 
-(jvm-import org.objectweb.asm.ClassWriter)
+(host;import org.objectweb.asm.ClassWriter)
 
-(jvm-import #long org.objectweb.asm.Label
+(host;import #long org.objectweb.asm.Label
   (new []))
 
 ## [Type]
diff --git a/new-luxc/source/luxc/generator/host/jvm/def.lux b/new-luxc/source/luxc/generator/host/jvm/def.lux
index 8b961b29a..bb1d2cd94 100644
--- a/new-luxc/source/luxc/generator/host/jvm/def.lux
+++ b/new-luxc/source/luxc/generator/host/jvm/def.lux
@@ -5,15 +5,15 @@
              [product]
              (coll ["a" array]
                    [list "L/" Functor<List>]))
-       [host #+ jvm-import do-to])
+       [host #+ do-to])
   ["$" ..]
   (.. ["$t" type]))
 
 ## [Host]
-(jvm-import #long java.lang.Object)
-(jvm-import #long java.lang.String)
+(host;import #long java.lang.Object)
+(host;import #long java.lang.String)
 
-(jvm-import org.objectweb.asm.Opcodes
+(host;import org.objectweb.asm.Opcodes
   (#static ACC_PUBLIC int)
   (#static ACC_PROTECTED int)
   (#static ACC_PRIVATE int)
@@ -40,15 +40,15 @@
   (#static V1_8 int)
   )
 
-(jvm-import org.objectweb.asm.FieldVisitor
+(host;import org.objectweb.asm.FieldVisitor
   (visitEnd [] void))
 
-(jvm-import org.objectweb.asm.MethodVisitor
+(host;import org.objectweb.asm.MethodVisitor
   (visitCode [] void)
   (visitMaxs [int int] void)
   (visitEnd [] void))
 
-(jvm-import org.objectweb.asm.ClassWriter
+(host;import org.objectweb.asm.ClassWriter
   (#static COMPUTE_MAXS int)
   (new [int])
   (visit [int int String String String (Array String)] void)
diff --git a/new-luxc/source/luxc/generator/host/jvm/inst.lux b/new-luxc/source/luxc/generator/host/jvm/inst.lux
index af5f6f6d8..6085ff72b 100644
--- a/new-luxc/source/luxc/generator/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/generator/host/jvm/inst.lux
@@ -4,7 +4,7 @@
                 ["p" parser])
        (data text/format
              (coll [list "L/" Functor<List>]))
-       [host #+ jvm-import do-to]
+       [host #+ do-to]
        [macro]
        (macro [code]
               ["s" syntax #+ syntax:]))
@@ -12,8 +12,8 @@
   (.. ["$t" type]))
 
 ## [Host]
-(jvm-import #long java.lang.Object)
-(jvm-import #long java.lang.String)
+(host;import #long java.lang.Object)
+(host;import #long java.lang.String)
 
 (syntax: (declare [codes (p;many s;local-symbol)])
   (|> codes
@@ -34,7 +34,7 @@
                                          LADD LSUB LMUL LDIV LREM LCMP
                                          DADD DSUB DMUL DDIV DREM DCMPG)
                   <return> (declare RETURN IRETURN LRETURN DRETURN ARETURN)]
-  (jvm-import org.objectweb.asm.Opcodes
+  (host;import org.objectweb.asm.Opcodes
     <primitive>
 
     (#static CHECKCAST int)
@@ -82,13 +82,13 @@
     <return>
     ))
 
-(jvm-import org.objectweb.asm.FieldVisitor
+(host;import org.objectweb.asm.FieldVisitor
   (visitEnd [] void))
 
-(jvm-import org.objectweb.asm.Label
+(host;import org.objectweb.asm.Label
   (new []))
 
-(jvm-import org.objectweb.asm.MethodVisitor
+(host;import org.objectweb.asm.MethodVisitor
   (visitCode [] void)
   (visitMaxs [int int] void)
   (visitEnd [] void)
diff --git a/new-luxc/source/luxc/generator/procedure/common.jvm.lux b/new-luxc/source/luxc/generator/procedure/common.jvm.lux
index 106b6a0f5..d04a91141 100644
--- a/new-luxc/source/luxc/generator/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/generator/procedure/common.jvm.lux
@@ -8,7 +8,7 @@
        [macro #+ Monad<Lux> with-gensyms]
        (macro [code]
               ["s" syntax #+ syntax:])
-       [host #+ jvm-import])
+       [host])
   (luxc ["&" base]
         (lang ["la" analysis]
               ["ls" synthesis])
@@ -22,11 +22,11 @@
                               ["$d" def]
                               ["$i" inst])))))
 
-(jvm-import java.lang.Long
+(host;import java.lang.Long
   (#static MIN_VALUE Long)
   (#static MAX_VALUE Long))
 
-(jvm-import java.lang.Double
+(host;import java.lang.Double
   (#static MIN_VALUE Double)
   (#static MAX_VALUE Double)
   (#static NaN Double)
diff --git a/new-luxc/source/luxc/generator/runtime.jvm.lux b/new-luxc/source/luxc/generator/runtime.jvm.lux
index fe7a4b2cb..e094334c0 100644
--- a/new-luxc/source/luxc/generator/runtime.jvm.lux
+++ b/new-luxc/source/luxc/generator/runtime.jvm.lux
@@ -5,7 +5,7 @@
              text/format)
        [math]
        [macro #+ Monad<Lux> "Lux/" Monad<Lux>]
-       [host #+ jvm-import do-to])
+       [host #+ do-to])
   (luxc ["&" base]
         (lang ["la" analysis]
               ["ls" synthesis])
@@ -17,23 +17,23 @@
                               ["$d" def]
                               ["$i" inst])))))
 
-(jvm-import java.lang.Object)
-(jvm-import java.lang.String)
+(host;import java.lang.Object)
+(host;import java.lang.String)
 
-(jvm-import java.lang.reflect.Field
+(host;import java.lang.reflect.Field
   (get [Object] #try Object))
 
-(jvm-import (java.lang.Class a)
+(host;import (java.lang.Class a)
   (getField [String] Field))
 
-(jvm-import org.objectweb.asm.Opcodes
+(host;import org.objectweb.asm.Opcodes
   (#static ACC_PUBLIC int)
   (#static ACC_SUPER int)
   (#static ACC_FINAL int)
   (#static ACC_STATIC int)
   (#static V1_6 int))
 
-(jvm-import org.objectweb.asm.ClassWriter
+(host;import org.objectweb.asm.ClassWriter
   (#static COMPUTE_MAXS int)
   (new [int])
   (visit [int int String String String (Array String)] void)
diff --git a/new-luxc/source/luxc/generator/structure.jvm.lux b/new-luxc/source/luxc/generator/structure.jvm.lux
index 8662aaa8d..64848546f 100644
--- a/new-luxc/source/luxc/generator/structure.jvm.lux
+++ b/new-luxc/source/luxc/generator/structure.jvm.lux
@@ -5,7 +5,7 @@
        (data text/format
              (coll [list]))
        [macro #+ Monad<Lux> "Lux/" Monad<Lux>]
-       [host #+ jvm-import do-to])
+       [host #+ do-to])
   (luxc ["&" base]
         (lang ["la" analysis]
               ["ls" synthesis])
diff --git a/new-luxc/source/luxc/host.jvm.lux b/new-luxc/source/luxc/host.jvm.lux
index 00957f3d4..e22ab4fd1 100644
--- a/new-luxc/source/luxc/host.jvm.lux
+++ b/new-luxc/source/luxc/host.jvm.lux
@@ -8,28 +8,28 @@
              (coll ["d" dict]
                    [array #+ Array]))
        [macro #+ Monad<Lux>]
-       [host #+ jvm-import do-to object]
+       [host #+ do-to object]
        [io])
   (luxc ["&" base]
         (generator ["&&;" common])
         ))
 
-(jvm-import java.lang.reflect.AccessibleObject
+(host;import java.lang.reflect.AccessibleObject
   (setAccessible [boolean] void))
 
-(jvm-import java.lang.reflect.Method
+(host;import java.lang.reflect.Method
   (invoke [Object (Array Object)] #try Object))
 
-(jvm-import (java.lang.Class a)
+(host;import (java.lang.Class a)
   (getDeclaredMethod [String (Array (Class Object))] #try Method))
 
-(jvm-import java.lang.Object
+(host;import java.lang.Object
   (getClass [] (Class Object)))
 
-(jvm-import java.lang.Integer
+(host;import java.lang.Integer
   (#static TYPE (Class Integer)))
 
-(jvm-import java.lang.ClassLoader)
+(host;import java.lang.ClassLoader)
 
 (def: ClassLoader::defineClass
   Method
diff --git a/new-luxc/source/luxc/io.jvm.lux b/new-luxc/source/luxc/io.jvm.lux
index cb37c69a9..e8f403d6d 100644
--- a/new-luxc/source/luxc/io.jvm.lux
+++ b/new-luxc/source/luxc/io.jvm.lux
@@ -7,20 +7,20 @@
              [text "T/" Eq<Text>]
              text/format)
        [macro]
-       host)
+       [host])
   (luxc ["&" base]))
 
-(jvm-import java.io.File
+(host;import java.io.File
   (new [String String])
   (exists [] #io #try boolean))
 
-(jvm-import java.io.Reader
+(host;import java.io.Reader
   (close [] #io #try void))
 
-(jvm-import java.io.FileReader
+(host;import java.io.FileReader
   (new [File]))
 
-(jvm-import java.io.BufferedReader
+(host;import java.io.BufferedReader
   (new [Reader])
   (readLine [] #io #try #? String))