From 34e310622bdeb1d0588c0664c0e78cbaa84f837c Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 2 Dec 2020 06:42:20 -0400
Subject: Re-named "::" and ":::" macros to "\" and "\\", to be consistent with
 the convention that only macros that deal with types may start with a colon.

---
 .../luxc/lang/translation/jvm/extension/common.lux     |  5 +++--
 .../luxc/lang/translation/jvm/extension/host.lux       | 18 +++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'lux-jvm/source/luxc/lang/translation/jvm/extension')

diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
index 0388c5c7f..e73ea068e 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
@@ -53,8 +53,9 @@
       (phase.throw extension.invalid-syntax [extension-name %synthesis input]))))
 
 (import: java/lang/Double
-  (#static MIN_VALUE java/lang/Double)
-  (#static MAX_VALUE java/lang/Double))
+  ["#::."
+   (#static MIN_VALUE java/lang/Double)
+   (#static MAX_VALUE java/lang/Double)])
 
 (def: $String (type.class "java.lang.String" (list)))
 (def: $CharSequence (type.class "java.lang.CharSequence" (list)))
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
index 86b814bad..77f421703 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
@@ -956,20 +956,20 @@
            _.ARETURN)
       
       (#.Right returnT)
-      (cond (or (:: type.equivalence = type.boolean returnT)
-                (:: type.equivalence = type.byte returnT)
-                (:: type.equivalence = type.short returnT)
-                (:: type.equivalence = type.int returnT)
-                (:: type.equivalence = type.char returnT))
+      (cond (or (\ type.equivalence = type.boolean returnT)
+                (\ type.equivalence = type.byte returnT)
+                (\ type.equivalence = type.short returnT)
+                (\ type.equivalence = type.int returnT)
+                (\ type.equivalence = type.char returnT))
             _.IRETURN
 
-            (:: type.equivalence = type.long returnT)
+            (\ type.equivalence = type.long returnT)
             _.LRETURN
 
-            (:: type.equivalence = type.float returnT)
+            (\ type.equivalence = type.float returnT)
             _.FRETURN
 
-            ## (:: type.equivalence = type.double returnT)
+            ## (\ type.equivalence = type.double returnT)
             _.DRETURN))))
 
 (def: class::anonymous
@@ -1038,7 +1038,7 @@
                                                                                   returnT
                                                                                   exceptionsT])
                                                                     (|>> bodyG (returnI returnT)))))))
-                                (:: @ map _def.fuse))
+                                (\ @ map _def.fuse))
          #let [directive [anonymous-class-name
                           (_def.class #$.V1_6 #$.Public $.finalC
                                       anonymous-class-name (list)
-- 
cgit v1.2.3