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

- Removed some modules that should have been deleted before.

4 files changed, 21 insertions, 21 deletions

diff --git a/new-luxc/source/luxc/lang/translation/common-lisp.lux b/new-luxc/source/luxc/lang/translation/common-lisp.lux
index 704dfe91e..1ae046d33 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp.lux
@@ -52,7 +52,7 @@
 (type: #export Host
   {#context [Text Nat]
    #anchor (Maybe Anchor)
-   #loader (-> Expression (Error Top))
+   #loader (-> Expression (Error Any))
    #interpreter (-> Expression (Error LispObject))
    #module-buffer (Maybe StringBuilder)
    #program-buffer StringBuilder})
@@ -80,12 +80,12 @@
 (def: #export r-module-name Text (format "module" file-extension))
 
 (def: #export init-module-buffer
-  (Meta Top)
+  (Meta Any)
   (function (_ compiler)
     (#e.Success [(update@ #.host
                           (|>> (:! Host)
                                (set@ #module-buffer (#.Some (StringBuilder::new [])))
-                               (:! Bottom))
+                               (:! Nothing))
                           compiler)
                  []])))
 
@@ -96,13 +96,13 @@
           [old-name old-sub] (get@ #context old)
           new-name (format old-name "f___" (%i (nat-to-int old-sub)))]
       (case (expr (set@ #.host
-                        (:! Bottom (set@ #context [new-name +0] old))
+                        (:! Nothing (set@ #context [new-name +0] old))
                         compiler))
         (#e.Success [compiler' output])
         (#e.Success [(update@ #.host
                               (|>> (:! Host)
                                    (set@ #context [old-name (n/inc old-sub)])
-                                   (:! Bottom))
+                                   (:! Nothing))
                               compiler')
                      [new-name output]])
 
@@ -124,13 +124,13 @@
   (function (_ compiler)
     (let [old (:! Host (get@ #.host compiler))]
       (case (expr (set@ #.host
-                        (:! Bottom (set@ #anchor (#.Some anchor) old))
+                        (:! Nothing (set@ #anchor (#.Some anchor) old))
                         compiler))
         (#e.Success [compiler' output])
         (#e.Success [(update@ #.host
                               (|>> (:! Host)
                                    (set@ #anchor (get@ #anchor old))
-                                   (:! Bottom))
+                                   (:! Nothing))
                               compiler')
                      output])
 
@@ -174,7 +174,7 @@
            (#e.Success output)
            (#e.Success [compiler output])))))]
 
-  [load!     #loader      Top]
+  [load!     #loader      Any]
   [interpret #interpreter LispObject]
   )
 
@@ -187,7 +187,7 @@
   (lang.normalize-name (format module "$" name)))
 
 (def: #export (save code)
-  (-> Expression (Meta Top))
+  (-> Expression (Meta Any))
   (do macro.Monad<Meta>
     [module-buffer module-buffer
      #let [_ (Appendable::append [(:! CharSequence (_.expression code))]
@@ -197,7 +197,7 @@
 (def: #export run interpret)
 
 (def: #export (save-module! target)
-  (-> File (Meta (Process Top)))
+  (-> File (Meta (Process Any)))
   (do macro.Monad<Meta>
     [module macro.current-module-name
      module-buffer module-buffer
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]]]