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.

---
 lux-jvm/source/luxc/lang/translation/jvm.lux | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

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

diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux
index 30a130150..dce3017f5 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm.lux
@@ -42,13 +42,16 @@
   )
 
 (import: java/lang/reflect/Field
-  (get [#? java/lang/Object] #try #? java/lang/Object))
+  ["#::."
+   (get [#? java/lang/Object] #try #? java/lang/Object)])
 
 (import: (java/lang/Class a)
-  (getField [java/lang/String] #try java/lang/reflect/Field))
+  ["#::."
+   (getField [java/lang/String] #try java/lang/reflect/Field)])
 
 (import: java/lang/Object
-  (getClass [] (java/lang/Class java/lang/Object)))
+  ["#::."
+   (getClass [] (java/lang/Class java/lang/Object))])
 
 (import: java/lang/ClassLoader)
 
@@ -124,7 +127,7 @@
     (io.run (do (try.with io.monad)
               [_ (loader.store eval-class bytecode library)
                class (loader.load eval-class loader)
-               value (:: io.monad wrap (..class-value eval-class class))]
+               value (\ io.monad wrap (..class-value eval-class class))]
               (wrap [value
                      [eval-class bytecode]])))))
 
@@ -132,7 +135,7 @@
   (-> Library java/lang/ClassLoader Definition (Try Any))
   (io.run (do (try.with io.monad)
             [existing-class? (|> (atom.read library)
-                                 (:: io.monad map (dictionary.contains? class-name))
+                                 (\ io.monad map (dictionary.contains? class-name))
                                  (try.lift io.monad)
                                  (: (IO (Try Bit))))
              _ (if existing-class?
@@ -153,8 +156,8 @@
         (: Host
            (structure
             (def: (evaluate! context valueI)
-              (:: try.monad map product.left
-                  (..evaluate! library loader context valueI)))
+              (\ try.monad map product.left
+                 (..evaluate! library loader context valueI)))
             
             (def: execute!
               (..execute! library loader))
@@ -175,7 +178,7 @@
                  [#let [class-name (..class-name context)]
                   _ (loader.store class-name bytecode library)
                   class (loader.load class-name loader)]
-                 (:: io.monad wrap (..class-value class-name class))))))))))
+                 (\ io.monad wrap (..class-value class-name class))))))))))
 
 (def: #export $Variant (type.array ..$Value))
 (def: #export $Tuple (type.array ..$Value))
-- 
cgit v1.2.3