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

- Removed some modules that should have been deleted before.

3 files changed, 9 insertions, 9 deletions

diff --git a/new-luxc/source/luxc/lang/translation/r/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/r/eval.jvm.lux
index 05d16f871..66e157e40 100644
--- a/new-luxc/source/luxc/lang/translation/r/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/eval.jvm.lux
@@ -50,10 +50,10 @@
 (host.import org/renjin/sexp/Null) 
 
 (def: (parse-tuple lux-object host-object)
-  (-> (-> Object (Error Top)) ListVector (Error Top))
+  (-> (-> Object (Error Any)) ListVector (Error Any))
   (let [size (:! Nat (ListVector::length [] host-object))]
     (loop [idx +0
-           output (:! (Array Top) (array.new size))]
+           output (:! (Array Any) (array.new size))]
       (if (n/< size idx)
         (case (ListVector::getElementAsSEXP [(:! Int idx)] host-object)
           (#e.Error error)
@@ -65,11 +65,11 @@
             (#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: (parse-variant lux-object host-object)
-  (-> (-> Object (Error Top)) ListVector (Error Top))
+  (-> (-> Object (Error Any)) ListVector (Error Any))
   (do e.Monad<Error>
     [tag (ListVector::get-field-sexp [//.variant-tag-field] host-object)
      flag (ListVector::get-field-sexp [//.variant-flag-field] host-object)
@@ -79,7 +79,7 @@
                (:! IntArrayVector)
                (IntArrayVector::getElementAsInt [0])
                (Long::intValue []))
-           (: Top
+           (: Any
               (if (host.instance? Null flag)
                 (host.null)
                 //.unit))
@@ -100,7 +100,7 @@
                      low))))))
 
 (def: (lux-object host-object)
-  (-> Object (Error Top))
+  (-> Object (Error Any))
   (cond (host.instance? StringArrayVector host-object)
         (#e.Success (StringArrayVector::getElementAsString [0] (:! StringArrayVector host-object)))
 
@@ -132,7 +132,7 @@
           (ex.throw Unknown-Kind-Of-Host-Object (format object-class " --- " text-representation)))))
 
 (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/r/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
index f13329e26..7cdc82064 100644
--- a/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
@@ -882,7 +882,7 @@
 (def: #export artifact Text (format prefix ".r"))
 
 (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/r/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/r/statement.jvm.lux
index 7ff6a23e8..62349abcf 100644
--- a/new-luxc/source/luxc/lang/translation/r/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/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]]]