Mandatory long names for JVM imports, instead of having "long" be optional and short be default.

11 files changed, 32 insertions, 32 deletions

diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
index 7174516a3..3517a261c 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
@@ -755,22 +755,22 @@
           (wrap (#/////analysis.Extension extension-name (list (/////analysis.text sub-class) objectA)))
           (/////analysis.throw cannot-possibly-be-an-instance (format sub-class " !<= "  object-class)))))]))
 
-(import: #long java/lang/Object
+(import: java/lang/Object
   (equals [java/lang/Object] boolean))
 
-(import: #long java/lang/reflect/Type)
+(import: java/lang/reflect/Type)
 
-(import: #long (java/lang/reflect/TypeVariable d)
+(import: (java/lang/reflect/TypeVariable d)
   (getName [] java/lang/String)
   (getBounds [] [java/lang/reflect/Type]))
 
-(import: #long java/lang/reflect/Modifier
+(import: java/lang/reflect/Modifier
   (#static isStatic [int] boolean)
   (#static isFinal [int] boolean)
   (#static isInterface [int] boolean)
   (#static isAbstract [int] boolean))
 
-(import: #long java/lang/reflect/Method
+(import: java/lang/reflect/Method
   (getName [] java/lang/String)
   (getModifiers [] int)
   (getDeclaringClass [] (java/lang/Class java/lang/Object))
@@ -779,14 +779,14 @@
   (getGenericReturnType [] java/lang/reflect/Type)
   (getGenericExceptionTypes [] [java/lang/reflect/Type]))
 
-(import: #long (java/lang/reflect/Constructor c)
+(import: (java/lang/reflect/Constructor c)
   (getModifiers [] int)
   (getDeclaringClass [] (java/lang/Class c))
   (getTypeParameters [] [(java/lang/reflect/TypeVariable (java/lang/reflect/Constructor c))])
   (getGenericParameterTypes [] [java/lang/reflect/Type])
   (getGenericExceptionTypes [] [java/lang/reflect/Type]))
 
-(import: #long (java/lang/Class c)
+(import: (java/lang/Class c)
   (#static forName [java/lang/String] #try (java/lang/Class java/lang/Object))
   (getName [] java/lang/String)
   (getModifiers [] int)
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
index b87e6b901..546477aac 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
@@ -58,7 +58,7 @@
 
 ## [[Numbers]]
 (for {@.old
-      (as-is (import: #long java/lang/Double
+      (as-is (import: java/lang/Double
                (#static MIN_VALUE double)
                (#static MAX_VALUE double))
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux
index f925a2877..313620611 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux
@@ -187,7 +187,7 @@
   [i64::logical-right-shift    _.lushr]
   )
 
-(import: #long java/lang/Double
+(import: java/lang/Double
   (#static MIN_VALUE double)
   (#static MAX_VALUE double))
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
index e7e4ce933..eb3529f6d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
@@ -57,7 +57,7 @@
           (/.install "frac" (unary (_./ (_.float +1.0))))
           (/.install "char" (unary (!unary "string.char"))))))
 
-(import: #long java/lang/Double
+(import: java/lang/Double
   (#static MIN_VALUE double)
   (#static MAX_VALUE double))
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
index 5c6a0cee5..2c43370a6 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
@@ -54,7 +54,7 @@
           (/.install "frac" (unary _.float/1))
           (/.install "char" (unary _.chr/1)))))
 
-(import: #long java/lang/Double
+(import: java/lang/Double
   (#static MIN_VALUE double)
   (#static MAX_VALUE double))
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
index b7131e02b..ec5ba8e26 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
@@ -50,7 +50,7 @@
           (/.install "-" (binary (..keep-i64 (product.uncurry _.-))))
           )))
 
-(import: #long java/lang/Double
+(import: java/lang/Double
   (#static MIN_VALUE double)
   (#static MAX_VALUE double))
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp/extension/common.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp/extension/common.lux
index 0d56d70b6..701738854 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp/extension/common.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp/extension/common.lux
@@ -64,7 +64,7 @@
           (bundle.install "char" (unary (|>> _.code-char/1 _.string/1)))
           )))
 
-(import: #long java/lang/Double
+(import: java/lang/Double
   (#static MIN_VALUE double)
   (#static MAX_VALUE double))
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux
index 543c14a4b..cdf03d7b0 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux
@@ -41,16 +41,16 @@
    ["#." runtime (#+ Definition)]]
   )
 
-(import: #long java/lang/reflect/Field
+(import: java/lang/reflect/Field
   (get [#? java/lang/Object] #try #? java/lang/Object))
 
-(import: #long (java/lang/Class a)
+(import: (java/lang/Class a)
   (getField [java/lang/String] #try java/lang/reflect/Field))
 
-(import: #long java/lang/Object
+(import: java/lang/Object
   (getClass [] (java/lang/Class java/lang/Object)))
 
-(import: #long java/lang/ClassLoader)
+(import: java/lang/ClassLoader)
 
 (def: value::field "value")
 (def: value::type (type.class "java.lang.Object" (list)))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux
index 8f281fb3a..b6004b6c6 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux
@@ -72,7 +72,7 @@
 (def: wrap-f64
   (_.invokestatic $Double "valueOf" (type.method [(list type.double) $Double (list)])))
 
-(import: #long java/lang/Double
+(import: java/lang/Double
   (#static doubleToRawLongBits #manual [double] int))
 
 (def: #export (f64 value)
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux
index 07f76e258..234192ede 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux
@@ -56,7 +56,7 @@
           (bundle.install "frac" (unary _.floatval/1))
           (bundle.install "char" (unary _.chr/1)))))
 
-(import: #long java/lang/Double
+(import: java/lang/Double
   (#static MIN_VALUE double)
   (#static MAX_VALUE double))
 
diff --git a/stdlib/source/lux/tool/compiler/meta/packager/jvm.lux b/stdlib/source/lux/tool/compiler/meta/packager/jvm.lux
index 7478a3bc2..f4cf769eb 100644
--- a/stdlib/source/lux/tool/compiler/meta/packager/jvm.lux
+++ b/stdlib/source/lux/tool/compiler/meta/packager/jvm.lux
@@ -44,43 +44,43 @@
          [jvm
           ["." runtime (#+ Definition)]]]]]]]]])
 
-(import: #long java/lang/Object)
+(import: java/lang/Object)
 
-(import: #long java/lang/String)
+(import: java/lang/String)
 
-(import: #long java/util/jar/Attributes
+(import: java/util/jar/Attributes
   (put [java/lang/Object java/lang/Object] #? java/lang/Object))
 
-(import: #long java/util/jar/Attributes$Name
+(import: java/util/jar/Attributes$Name
   (#static MAIN_CLASS java/util/jar/Attributes$Name)
   (#static MANIFEST_VERSION java/util/jar/Attributes$Name))
 
-(import: #long java/util/jar/Manifest
+(import: java/util/jar/Manifest
   (new [])
   (getMainAttributes [] java/util/jar/Attributes))
 
-(import: #long java/io/Flushable
+(import: java/io/Flushable
   (flush [] void))
 
-(import: #long java/io/Closeable
+(import: java/io/Closeable
   (close [] void))
 
-(import: #long java/io/OutputStream)
+(import: java/io/OutputStream)
 
-(import: #long java/io/ByteArrayOutputStream
+(import: java/io/ByteArrayOutputStream
   (new [int])
   (toByteArray [] [byte]))
 
-(import: #long java/util/zip/ZipEntry)
+(import: java/util/zip/ZipEntry)
 
-(import: #long java/util/zip/ZipOutputStream
+(import: java/util/zip/ZipOutputStream
   (write [[byte] int int] void)
   (closeEntry [] void))
 
-(import: #long java/util/jar/JarEntry
+(import: java/util/jar/JarEntry
   (new [java/lang/String]))
 
-(import: #long java/util/jar/JarOutputStream
+(import: java/util/jar/JarOutputStream
   (new [java/io/OutputStream java/util/jar/Manifest])
   (putNextEntry [java/util/zip/ZipEntry] void))