- Re-named "Top" to "Any", and "Bottom" to "Nothing".

- Removed some modules that should have been deleted before.

3 files changed, 11 insertions, 11 deletions

diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux
index ee2aac932..eef9a985f 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux
@@ -24,7 +24,7 @@
   (#static forName [String] #try (Class Object)))
 
 (def: _0
-  Top
+  Any
   (case (Class::forName "org.armedbear.lisp.Symbol")
     (#e.Success _)
     (log! "LOADED")
@@ -71,23 +71,23 @@
   (elt [int] LispObject))
 
 (def: (parse-tuple lux-object host-object)
-  (-> (-> Object (Error Top)) SimpleVector (Error Top))
+  (-> (-> Object (Error Any)) SimpleVector (Error Any))
   (let [size (:! Nat (SimpleVector::length [] host-object))]
     (loop [idx +0
-           output (:! (Array Top) (array.new size))]
+           output (:! (Array Any) (array.new size))]
       (if (n/< size idx)
         (case (lux-object (SimpleVector::elt [(:! Int idx)] host-object))
           (#e.Error error)
           (#e.Error error)
 
           (#e.Success lux-value)
-          (recur (n/inc idx) (array.write idx (:! Top lux-value) output)))
+          (recur (n/inc idx) (array.write idx (:! Any lux-value) output)))
         (#e.Success output)))))
 
 (def: (variant tag flag value)
-  (-> Nat Bool Top Top)
+  (-> Nat Bool Any Any)
   [(Long::intValue [] (:! Long tag))
-   (: Top
+   (: Any
       (if flag
         //.unit
         (host.null)))
@@ -98,7 +98,7 @@
   (cdr LispObject))
 
 (def: (parse-variant lux-object host-object)
-  (-> (-> Object (Error Top)) Cons (Error Top))
+  (-> (-> Object (Error Any)) Cons (Error Any))
   (let [variant-tag (Cons::car host-object)]
     (if (and (host.instance? org/armedbear/lisp/Symbol variant-tag)
              (text/= //.variant-tag (Symbol::getName [] (:! Symbol variant-tag))))
@@ -113,7 +113,7 @@
       (ex.throw invalid-variant (:! Text (Object::toString [] (:! Object host-object)))))))
 
 (def: (lux-object host-object)
-  (-> Object (Error Top))
+  (-> Object (Error Any))
   (cond (host.instance? org/armedbear/lisp/Bignum host-object)
         (#e.Success (Bignum::longValue [] (:! Bignum host-object)))
 
@@ -144,7 +144,7 @@
         (ex.throw Unknown-Kind-Of-Host-Object (:! Object host-object))))
 
 (def: #export (eval code)
-  (-> Expression (Meta Top))
+  (-> Expression (Meta Any))
   (function (_ compiler)
     (let [interpreter (|> compiler (get@ #.host) (:! //.Host) (get@ #//.interpreter))]
       (case (interpreter code)
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
index 96393c970..1819a8601 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
@@ -365,7 +365,7 @@
 (def: #export artifact Text (format prefix //.file-extension))
 
 (def: #export translate
-  (Meta (Process Top))
+  (Meta (Process Any))
   (do macro.Monad<Meta>
     [_ //.init-module-buffer
      _ (//.save runtime)]
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
index e73d88c96..dab065e62 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
@@ -11,7 +11,7 @@
       [".T" eval]))
 
 (def: #export (translate-def name expressionT expressionO metaV)
-  (-> Text Type Expression Code (Meta Top))
+  (-> Text Type Expression Code (Meta Any))
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module name]]]