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

- Removed some modules that should have been deleted before.

6 files changed, 107 insertions, 107 deletions

diff --git a/new-luxc/test/test/luxc/common.lux b/new-luxc/test/test/luxc/common.lux
index 01e3d1aaa..1fd647ba9 100644
--- a/new-luxc/test/test/luxc/common.lux
+++ b/new-luxc/test/test/luxc/common.lux
@@ -14,50 +14,50 @@
                                 [".T_jvm" eval]
                                 [".T_jvm" runtime]
                                 [".T_jvm" statement])
-                           [js]
-                           (js [".T_js" expression]
-                               [".T_js" eval]
-                               [".T_js" runtime]
-                               [".T_js" statement])
-                           [lua]
-                           (lua [".T_lua" expression]
-                                [".T_lua" eval]
-                                [".T_lua" runtime]
-                                [".T_lua" statement])
-                           [ruby]
-                           (ruby [".T_ruby" expression]
-                                 [".T_ruby" eval]
-                                 [".T_ruby" runtime]
-                                 [".T_ruby" statement])
-                           [python]
-                           (python [".T_python" expression]
-                                   [".T_python" eval]
-                                   [".T_python" runtime]
-                                   [".T_python" statement])
-                           [r]
-                           (r [".T_r" expression]
-                              [".T_r" eval]
-                              [".T_r" runtime]
-                              [".T_r" statement])
-                           [scheme]
-                           (scheme [".T_scheme" expression]
-                                   [".T_scheme" eval]
-                                   [".T_scheme" runtime]
-                                   [".T_scheme" statement])
-                           [common-lisp]
-                           (common-lisp [".T_common-lisp" expression]
-                                        [".T_common-lisp" eval]
-                                        [".T_common-lisp" runtime]
-                                        [".T_common-lisp" statement])
-                           [php]
-                           (php [".T_php" expression]
-                                [".T_php" eval]
-                                [".T_php" runtime]
-                                [".T_php" statement])
+                           ## [js]
+                           ## (js [".T_js" expression]
+                           ##     [".T_js" eval]
+                           ##     [".T_js" runtime]
+                           ##     [".T_js" statement])
+                           ## [lua]
+                           ## (lua [".T_lua" expression]
+                           ##      [".T_lua" eval]
+                           ##      [".T_lua" runtime]
+                           ##      [".T_lua" statement])
+                           ## [ruby]
+                           ## (ruby [".T_ruby" expression]
+                           ##       [".T_ruby" eval]
+                           ##       [".T_ruby" runtime]
+                           ##       [".T_ruby" statement])
+                           ## [python]
+                           ## (python [".T_python" expression]
+                           ##         [".T_python" eval]
+                           ##         [".T_python" runtime]
+                           ##         [".T_python" statement])
+                           ## [r]
+                           ## (r [".T_r" expression]
+                           ##    [".T_r" eval]
+                           ##    [".T_r" runtime]
+                           ##    [".T_r" statement])
+                           ## [scheme]
+                           ## (scheme [".T_scheme" expression]
+                           ##         [".T_scheme" eval]
+                           ##         [".T_scheme" runtime]
+                           ##         [".T_scheme" statement])
+                           ## [common-lisp]
+                           ## (common-lisp [".T_common-lisp" expression]
+                           ##              [".T_common-lisp" eval]
+                           ##              [".T_common-lisp" runtime]
+                           ##              [".T_common-lisp" statement])
+                           ## [php]
+                           ## (php [".T_php" expression]
+                           ##      [".T_php" eval]
+                           ##      [".T_php" runtime]
+                           ##      [".T_php" statement])
                            ))))
 
-(type: #export Runner (-> Synthesis (e.Error Top)))
-(type: #export Definer (-> Ident Synthesis (e.Error Top)))
+(type: #export Runner (-> Synthesis (e.Error Any)))
+(type: #export Definer (-> Ident Synthesis (e.Error Any)))
 
 (do-template [<name> <host>]
   [(def: #export <name>
@@ -67,18 +67,18 @@
        (wrap (initL.compiler host))))]
 
   [init-jvm &host.init-host]
-  [init-js  js.init]
-  [init-lua lua.init]
-  [init-ruby ruby.init]
-  [init-python python.init]
-  [init-r r.init]
-  [init-scheme scheme.init]
-  [init-common-lisp common-lisp.init]
-  [init-php php.init]
+  ## [init-js  js.init]
+  ## [init-lua lua.init]
+  ## [init-ruby ruby.init]
+  ## [init-python python.init]
+  ## [init-r r.init]
+  ## [init-scheme scheme.init]
+  ## [init-common-lisp common-lisp.init]
+  ## [init-php php.init]
   )
 
 (def: (runner translate-runtime translate-expression eval init)
-  (All [a] (-> (Meta Top) (-> Synthesis (Meta a)) (-> a (Meta Top)) (IO Lux)
+  (All [a] (-> (Meta Any) (-> Synthesis (Meta a)) (-> a (Meta Any)) (IO Lux)
                Runner))
   (function (_ synthesis)
     (|> (do macro.Monad<Meta>
@@ -89,15 +89,15 @@
         (macro.run (io.run init)))))
 
 (def: (definer translate-runtime translate-expression eval init translate-def)
-  (All [a] (-> (Meta Top) (-> Synthesis (Meta a)) (-> a (Meta Top)) (IO Lux)
-               (-> Text Type a Code (Meta Top))
+  (All [a] (-> (Meta Any) (-> Synthesis (Meta a)) (-> a (Meta Any)) (IO Lux)
+               (-> Text Type a Code (Meta Any))
                Definer))
   (function (_ [module-name def-name] synthesis)
     (|> (do macro.Monad<Meta>
           [_ translate-runtime
            valueO (translate-expression synthesis)
            _ (moduleL.with-module +0 module-name
-               (translate-def def-name Top valueO (' {})))
+               (translate-def def-name Any valueO (' {})))
            sampleO (translate-expression (code.symbol [module-name def-name]))]
           (eval sampleO))
         (lang.with-current-module "")
@@ -106,26 +106,26 @@
 (def: #export run-jvm (runner runtimeT_jvm.translate expressionT_jvm.translate evalT_jvm.eval init-jvm))
 (def: #export def-jvm (definer runtimeT_jvm.translate expressionT_jvm.translate evalT_jvm.eval init-jvm statementT_jvm.translate-def))
 
-(def: #export run-js (runner runtimeT_js.translate expressionT_js.translate evalT_js.eval init-js))
-(def: #export def-js (definer runtimeT_js.translate expressionT_js.translate evalT_js.eval init-js statementT_js.translate-def))
+## (def: #export run-js (runner runtimeT_js.translate expressionT_js.translate evalT_js.eval init-js))
+## (def: #export def-js (definer runtimeT_js.translate expressionT_js.translate evalT_js.eval init-js statementT_js.translate-def))
 
-(def: #export run-lua (runner runtimeT_lua.translate expressionT_lua.translate evalT_lua.eval init-lua))
-(def: #export def-lua (definer runtimeT_lua.translate expressionT_lua.translate evalT_lua.eval init-lua statementT_lua.translate-def))
+## (def: #export run-lua (runner runtimeT_lua.translate expressionT_lua.translate evalT_lua.eval init-lua))
+## (def: #export def-lua (definer runtimeT_lua.translate expressionT_lua.translate evalT_lua.eval init-lua statementT_lua.translate-def))
 
-(def: #export run-ruby (runner runtimeT_ruby.translate expressionT_ruby.translate evalT_ruby.eval init-ruby))
-(def: #export def-ruby (definer runtimeT_ruby.translate expressionT_ruby.translate evalT_ruby.eval init-ruby statementT_ruby.translate-def))
+## (def: #export run-ruby (runner runtimeT_ruby.translate expressionT_ruby.translate evalT_ruby.eval init-ruby))
+## (def: #export def-ruby (definer runtimeT_ruby.translate expressionT_ruby.translate evalT_ruby.eval init-ruby statementT_ruby.translate-def))
 
-(def: #export run-python (runner runtimeT_python.translate expressionT_python.translate evalT_python.eval init-python))
-(def: #export def-python (definer runtimeT_python.translate expressionT_python.translate evalT_python.eval init-python statementT_python.translate-def))
+## (def: #export run-python (runner runtimeT_python.translate expressionT_python.translate evalT_python.eval init-python))
+## (def: #export def-python (definer runtimeT_python.translate expressionT_python.translate evalT_python.eval init-python statementT_python.translate-def))
 
-(def: #export run-r (runner runtimeT_r.translate expressionT_r.translate evalT_r.eval init-r))
-(def: #export def-r (definer runtimeT_r.translate expressionT_r.translate evalT_r.eval init-r statementT_r.translate-def))
+## (def: #export run-r (runner runtimeT_r.translate expressionT_r.translate evalT_r.eval init-r))
+## (def: #export def-r (definer runtimeT_r.translate expressionT_r.translate evalT_r.eval init-r statementT_r.translate-def))
 
-(def: #export run-scheme (runner runtimeT_scheme.translate expressionT_scheme.translate evalT_scheme.eval init-scheme))
-(def: #export def-scheme (definer runtimeT_scheme.translate expressionT_scheme.translate evalT_scheme.eval init-scheme statementT_scheme.translate-def))
+## (def: #export run-scheme (runner runtimeT_scheme.translate expressionT_scheme.translate evalT_scheme.eval init-scheme))
+## (def: #export def-scheme (definer runtimeT_scheme.translate expressionT_scheme.translate evalT_scheme.eval init-scheme statementT_scheme.translate-def))
 
-(def: #export run-common-lisp (runner runtimeT_common-lisp.translate expressionT_common-lisp.translate evalT_common-lisp.eval init-common-lisp))
-(def: #export def-common-lisp (definer runtimeT_common-lisp.translate expressionT_common-lisp.translate evalT_common-lisp.eval init-common-lisp statementT_common-lisp.translate-def))
+## (def: #export run-common-lisp (runner runtimeT_common-lisp.translate expressionT_common-lisp.translate evalT_common-lisp.eval init-common-lisp))
+## (def: #export def-common-lisp (definer runtimeT_common-lisp.translate expressionT_common-lisp.translate evalT_common-lisp.eval init-common-lisp statementT_common-lisp.translate-def))
 
-(def: #export run-php (runner runtimeT_php.translate expressionT_php.translate evalT_php.eval init-php))
-(def: #export def-php (definer runtimeT_php.translate expressionT_php.translate evalT_php.eval init-php statementT_php.translate-def))
+## (def: #export run-php (runner runtimeT_php.translate expressionT_php.translate evalT_php.eval init-php))
+## (def: #export def-php (definer runtimeT_php.translate expressionT_php.translate evalT_php.eval init-php statementT_php.translate-def))
diff --git a/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux b/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux
index 4cee3dce3..fba355a79 100644
--- a/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux
@@ -304,7 +304,7 @@
                   (check-success+ "lux process schedule"
                                   (list timeC
                                         (` ("lux function" (~' _) (~' _) (~ primC))))
-                                  Top))
+                                  Any))
             ))))
 
 (context: "IO procedures"
@@ -314,11 +314,11 @@
          exitC (|> r.int (:: @ map code.int))]
         ($_ seq
             (test "Can log messages to standard output."
-                  (check-success+ "lux io log" (list logC) Top))
+                  (check-success+ "lux io log" (list logC) Any))
             (test "Can throw a run-time error."
-                  (check-success+ "lux io error" (list logC) Bottom))
+                  (check-success+ "lux io error" (list logC) Nothing))
             (test "Can exit the program."
-                  (check-success+ "lux io exit" (list exitC) Bottom))
+                  (check-success+ "lux io exit" (list exitC) Nothing))
             (test "Can query the current time (as milliseconds since epoch)."
                   (check-success+ "lux io current-time" (list) Int))
             ))))
diff --git a/new-luxc/test/test/luxc/lang/analysis/procedure/host.jvm.lux b/new-luxc/test/test/luxc/lang/analysis/procedure/host.jvm.lux
index 0c27d14d1..3d0c76777 100644
--- a/new-luxc/test/test/luxc/lang/analysis/procedure/host.jvm.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/procedure/host.jvm.lux
@@ -374,7 +374,7 @@
                   (or (text/= "java.lang.Object" throwable)
                       (success "jvm object throw"
                                (list throwableC)
-                               Bottom)))
+                               Nothing)))
             (test "jvm object class"
                   (success "jvm object class"
                            (list (code.text boxed))
@@ -415,14 +415,14 @@
                            (code.text "allHtmlFlavor")
                            (`' ("lux check" (+0 "java.awt.datatransfer.DataFlavor" (+0))
                                 ("jvm object null"))))
-                     Top))
+                     Any))
       (test "jvm member static put (final)"
             (failure "jvm member static put"
                      (list (code.text "java.lang.System")
                            (code.text "out")
                            (`' ("lux check" (+0 "java.io.PrintStream" (+0))
                                 ("jvm object null"))))
-                     Top))
+                     Any))
       (test "jvm member static put (inheritance in)"
             (success "jvm member static put"
                      (list (code.text "java.awt.datatransfer.DataFlavor")
@@ -430,7 +430,7 @@
                            (`' ("jvm object cast"
                                 ("lux check" (+0 "javax.activation.ActivationDataFlavor" (+0))
                                  ("jvm object null")))))
-                     Top))
+                     Any))
       ))
 
 (context: "Member [Virtual Field]."
diff --git a/new-luxc/test/test/luxc/lang/translation/js.lux b/new-luxc/test/test/luxc/lang/translation/js.lux
index 68bc227f2..e6443cce8 100644
--- a/new-luxc/test/test/luxc/lang/translation/js.lux
+++ b/new-luxc/test/test/luxc/lang/translation/js.lux
@@ -28,7 +28,7 @@
              _
              false)))
 
-(type: Check (-> (e.Error Top) Bool))
+(type: Check (-> (e.Error Any) Bool))
 
 (do-template [<name> <type> <pre> <=>]
   [(def: (<name> angle)
diff --git a/new-luxc/test/test/luxc/lang/translation/jvm.lux b/new-luxc/test/test/luxc/lang/translation/jvm.lux
index 54966ae65..a835ce9d4 100644
--- a/new-luxc/test/test/luxc/lang/translation/jvm.lux
+++ b/new-luxc/test/test/luxc/lang/translation/jvm.lux
@@ -477,7 +477,7 @@
                       (lang.with-current-module "")
                       (macro.run (io.run init-jvm))
                       (case> (#e.Success outputT)
-                             (case (:! (e.Error Top) outputT)
+                             (case (:! (e.Error Any) outputT)
                                (#e.Error error)
                                (text.contains? exception-message error)
 
diff --git a/new-luxc/test/test/luxc/lang/translation/structure.lux b/new-luxc/test/test/luxc/lang/translation/structure.lux
index 2ca57cbac..6e512f3ec 100644
--- a/new-luxc/test/test/luxc/lang/translation/structure.lux
+++ b/new-luxc/test/test/luxc/lang/translation/structure.lux
@@ -30,7 +30,7 @@
     (test "Can translate tuple."
           (|> (run (code.tuple (list/map code.int tuple-in)))
               (case> (#e.Success tuple-out)
-                     (let [tuple-out (:! (Array Top) tuple-out)]
+                     (let [tuple-out (:! (Array Any) tuple-out)]
                        (and (n/= size (array.size tuple-out))
                             (list.every? (function (_ [left right])
                                            (i/= left (:! Int right)))
@@ -50,11 +50,11 @@
     (test "Can translate variant."
           (|> (run (` ((~ (code.nat tag-in)) (~ (code.bool last?-in)) (~ (code.int value-in)))))
               (case> (#e.Success valueT)
-                     (let [valueT (:! (Array Top) valueT)]
+                     (let [valueT (:! (Array Any) valueT)]
                        (and (n/= +3 (array.size valueT))
                             (let [tag-out (:! Integer (maybe.assume (array.read +0 valueT)))
                                   last?-out (array.read +1 valueT)
-                                  value-out (:! Top (maybe.assume (array.read +2 valueT)))
+                                  value-out (:! Any (maybe.assume (array.read +2 valueT)))
                                   same-tag? (n/= tag-in (|> tag-out host.int-to-long (:! Nat)))
                                   same-flag? (case last?-out
                                                (#.Some last?-out')
@@ -81,34 +81,34 @@
   (<| (times +100)
       (structure-spec run-jvm)))
 
-(context: "[JS] Structures."
-  (<| (times +100)
-      (structure-spec run-js)))
+## (context: "[JS] Structures."
+##   (<| (times +100)
+##       (structure-spec run-js)))
 
-(context: "[Lua] Structures."
-  (<| (times +100)
-      (structure-spec run-lua)))
+## (context: "[Lua] Structures."
+##   (<| (times +100)
+##       (structure-spec run-lua)))
 
-(context: "[Ruby] Structures."
-  (<| (times +100)
-      (structure-spec run-ruby)))
+## (context: "[Ruby] Structures."
+##   (<| (times +100)
+##       (structure-spec run-ruby)))
 
-(context: "[Python] Structures."
-  (<| (times +100)
-      (structure-spec run-python)))
+## (context: "[Python] Structures."
+##   (<| (times +100)
+##       (structure-spec run-python)))
 
-(context: "[R] Structures."
-  (<| (times +100)
-      (structure-spec run-r)))
+## (context: "[R] Structures."
+##   (<| (times +100)
+##       (structure-spec run-r)))
 
-(context: "[Scheme] Structures."
-  (<| (times +100)
-      (structure-spec run-scheme)))
+## (context: "[Scheme] Structures."
+##   (<| (times +100)
+##       (structure-spec run-scheme)))
 
-(context: "[Common Lisp] Structures."
-  (<| (times +100)
-      (structure-spec run-common-lisp)))
+## (context: "[Common Lisp] Structures."
+##   (<| (times +100)
+##       (structure-spec run-common-lisp)))
 
-(context: "[PHP] Structures."
-  (<| (times +100)
-      (structure-spec run-php)))
+## (context: "[PHP] Structures."
+##   (<| (times +100)
+##       (structure-spec run-php)))