From 14e96f5e5dad439383d63e60a52169cc2e7aaa5c Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 20 May 2018 21:04:03 -0400
Subject: - Re-named "Top" to "Any", and "Bottom" to "Nothing". - Removed some
 modules that should have been deleted before.

---
 new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux    | 12 ++++++------
 new-luxc/source/luxc/lang/translation/jvm/eval.jvm.lux      |  2 +-
 new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux
index 29db94d07..1d8da2893 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux
@@ -66,13 +66,13 @@
     (case (action (update@ #.host
                            (|>> (:! Host)
                                 (set@ #artifacts (dict.new text.Hash<Text>))
-                                (:! Bottom))
+                                (:! Nothing))
                            compiler))
       (#e.Success [compiler' output])
       (#e.Success [(update@ #.host
                             (|>> (:! Host)
                                  (set@ #artifacts (|> (get@ #.host compiler) (:! Host) (get@ #artifacts)))
-                                 (:! Bottom))
+                                 (:! Nothing))
                             compiler')
                    [(|> compiler' (get@ #.host) (:! Host) (get@ #artifacts))
                     output]])
@@ -81,19 +81,19 @@
       (#e.Error error))))
 
 (def: #export (record-artifact name content)
-  (-> Text Blob (Meta Top))
+  (-> Text Blob (Meta Any))
   (function (_ compiler)
     (if (|> compiler (get@ #.host) (:! Host) (get@ #artifacts) (dict.contains? name))
       (ex.throw Cannot-Overwrite-Artifact name)
       (#e.Success [(update@ #.host
                             (|>> (:! Host)
                                  (update@ #artifacts (dict.put name content))
-                                 (:! Bottom))
+                                 (:! Nothing))
                             compiler)
                    []]))))
 
 (def: #export (store-class name byte-code)
-  (-> Text Bytecode (Meta Top))
+  (-> Text Bytecode (Meta Any))
   (function (_ compiler)
     (let [store (|> (get@ #.host compiler)
                     (:! Host)
@@ -116,7 +116,7 @@
 (def: #export $Object $.Type ($t.class "java.lang.Object" (list)))
 
 (def: #export (load-definition compiler)
-  (-> Lux (-> Ident Blob (Error Top)))
+  (-> Lux (-> Ident Blob (Error Any)))
   (function (_ (^@ def-ident [def-module def-name]) def-bytecode)
     (let [normal-name (format (lang.normalize-name def-name) (%n (text/hash def-name)))
           class-name (format (text.replace-all "/" "." def-module) "." normal-name)]
diff --git a/new-luxc/source/luxc/lang/translation/jvm/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/eval.jvm.lux
index c326895a2..d8e8ffd5e 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/eval.jvm.lux
@@ -21,7 +21,7 @@
   (getField [String] Field))
 
 (def: #export (eval valueI)
-  (-> $.Inst (Meta Top))
+  (-> $.Inst (Meta Any))
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      class-name (:: @ map %code (macro.gensym (format current-module "/eval")))
diff --git a/new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux
index 4400c1e90..4c52231f3 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux
@@ -37,7 +37,7 @@
   (getField [String] #try Field))
 
 (def: #export (translate-def def-name valueT valueI metaV)
-  (-> Text Type $.Inst Code (Meta Top))
+  (-> Text Type $.Inst Code (Meta Any))
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module def-name]]]
@@ -65,7 +65,7 @@
                                                        $i.RETURN))))]
          _ (commonT.store-class class-name bytecode)
          class (commonT.load-class class-name)
-         valueV (: (Meta Top)
+         valueV (: (Meta Any)
                    (case (do e.Monad<Error>
                            [field (Class::getField [commonT.value-field] class)]
                            (Field::get [#.None] field))
@@ -93,7 +93,7 @@
         (commonT.record-artifact (format bytecode-name ".class") bytecode)))))
 
 (def: #export (translate-program programI)
-  (-> $.Inst (Meta Top))
+  (-> $.Inst (Meta Any))
   (let [nilI runtimeT.noneI
         num-inputsI (|>> ($i.ALOAD +0) $i.ARRAYLENGTH)
         decI (|>> ($i.int 1) $i.ISUB)
-- 
cgit v1.2.3