From dbb658bd7976c073a2bf314f194b36b30c45784b Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 26 Nov 2020 19:37:11 -0400
Subject: Allow name formatting for JVM imports, similar to Lux module imports.

---
 stdlib/source/lux/target/jvm/bytecode.lux |  6 ++++--
 stdlib/source/lux/target/jvm/constant.lux |  6 ++++--
 stdlib/source/lux/target/jvm/loader.lux   | 20 +++++++++++++-------
 3 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'stdlib/source/lux/target/jvm')

diff --git a/stdlib/source/lux/target/jvm/bytecode.lux b/stdlib/source/lux/target/jvm/bytecode.lux
index 008610b11..80121e692 100644
--- a/stdlib/source/lux/target/jvm/bytecode.lux
+++ b/stdlib/source/lux/target/jvm/bytecode.lux
@@ -457,10 +457,12 @@
       (..bytecode $0 $1 @_ _.ldc-w/string [index]))))
 
 (import: java/lang/Float
-  (#static floatToRawIntBits #manual [float] int))
+  ["#::."
+   (#static floatToRawIntBits #manual [float] int)])
 
 (import: java/lang/Double
-  (#static doubleToRawLongBits #manual [double] int))
+  ["#::."
+   (#static doubleToRawLongBits #manual [double] int)])
 
 (template [<name> <type> <constructor> <constant> <wide> <to-lux> <specializations>]
   [(def: #export (<name> value)
diff --git a/stdlib/source/lux/target/jvm/constant.lux b/stdlib/source/lux/target/jvm/constant.lux
index 894de4367..c58608867 100644
--- a/stdlib/source/lux/target/jvm/constant.lux
+++ b/stdlib/source/lux/target/jvm/constant.lux
@@ -59,7 +59,8 @@
   )
 
 (import: java/lang/Float
-  (#static floatToRawIntBits #manual [float] int))
+  ["#::."
+   (#static floatToRawIntBits #manual [float] int)])
 
 (structure: #export float-equivalence
   (Equivalence java/lang/Float)
@@ -74,7 +75,8 @@
            ("jvm object cast" subject))})))
 
 (import: java/lang/Double
-  (#static doubleToRawLongBits [double] long))
+  ["#::."
+   (#static doubleToRawLongBits [double] long)])
 
 (abstract: #export (Value kind)
   kind
diff --git a/stdlib/source/lux/target/jvm/loader.lux b/stdlib/source/lux/target/jvm/loader.lux
index 14c19bb86..74bfabc44 100644
--- a/stdlib/source/lux/target/jvm/loader.lux
+++ b/stdlib/source/lux/target/jvm/loader.lux
@@ -36,25 +36,31 @@
    ["Error" error]))
 
 (import: java/lang/Object
-  (getClass [] (java/lang/Class java/lang/Object)))
+  ["#::."
+   (getClass [] (java/lang/Class java/lang/Object))])
 
 (import: java/lang/String)
 
 (import: java/lang/reflect/Method
-  (invoke [java/lang/Object [java/lang/Object]] #try java/lang/Object))
+  ["#::."
+   (invoke [java/lang/Object [java/lang/Object]] #try java/lang/Object)])
 
 (import: (java/lang/Class a)
-  (getDeclaredMethod [java/lang/String [(java/lang/Class [? < java/lang/Object])]] java/lang/reflect/Method))
+  ["#::."
+   (getDeclaredMethod [java/lang/String [(java/lang/Class [? < java/lang/Object])]] java/lang/reflect/Method)])
 
 (import: java/lang/Integer
-  (#static TYPE (java/lang/Class java/lang/Integer)))
+  ["#::."
+   (#static TYPE (java/lang/Class java/lang/Integer))])
 
 (import: java/lang/reflect/AccessibleObject
-  (setAccessible [boolean] void))
+  ["#::."
+   (setAccessible [boolean] void)])
 
 (import: java/lang/ClassLoader
-  (loadClass [java/lang/String]
-             #io #try (java/lang/Class java/lang/Object)))
+  ["#::."
+   (loadClass [java/lang/String]
+              #io #try (java/lang/Class java/lang/Object))])
 
 (with-expansions [<elemT> (as-is (java/lang/Class java/lang/Object))]
   (def: java/lang/ClassLoader::defineClass
-- 
cgit v1.2.3