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

- Removed some modules that should have been deleted before.

4 files changed, 18 insertions, 18 deletions

diff --git a/new-luxc/source/luxc/lang/extension.lux b/new-luxc/source/luxc/lang/extension.lux
index ef7a4f864..254dd18ca 100644
--- a/new-luxc/source/luxc/lang/extension.lux
+++ b/new-luxc/source/luxc/lang/extension.lux
@@ -27,7 +27,7 @@
 
 (type: #export Analysis
   (-> (-> Code (Meta Code))
-      (-> Type Code (Meta Top))
+      (-> Type Code (Meta Any))
       (List Code) (Meta Code)))
 
 (type: #export Synthesis
@@ -39,7 +39,7 @@
   (-> (List Code) (Meta Code)))
 
 (type: #export Statement
-  (-> (List Code) (Meta Top)))
+  (-> (List Code) (Meta Any)))
 
 (type: #export Extensions
   {#analysis (Dict Text Analysis)
@@ -61,9 +61,9 @@
                  (|> compiler (get@ #.extensions) (:! Extensions))])))
 
 (def: (set extensions)
-  (-> Extensions (Meta Top))
+  (-> Extensions (Meta Any))
   (function (_ compiler)
-    (#e.Success [(set@ #.extensions (:! Bottom extensions) compiler)
+    (#e.Success [(set@ #.extensions (:! Nothing extensions) compiler)
                  []])))
 
 (do-template [<name> <type> <category> <exception>]
@@ -99,7 +99,7 @@
 
 (do-template [<name> <type> <category> <exception>]
   [(def: #export (<name> name extension)
-     (-> Text <type> (Meta Top))
+     (-> Text <type> (Meta Any))
      (do macro.Monad<Meta>
        [extensions ..get
         _ (//.assert <exception> name
diff --git a/new-luxc/source/luxc/lang/extension/analysis/common.lux b/new-luxc/source/luxc/lang/extension/analysis/common.lux
index 9f2ac5aa8..f22cdcdd1 100644
--- a/new-luxc/source/luxc/lang/extension/analysis/common.lux
+++ b/new-luxc/source/luxc/lang/extension/analysis/common.lux
@@ -191,9 +191,9 @@
   Bundle
   (<| (prefix "io")
       (|> (dict.new text.Hash<Text>)
-          (install "log" (unary Text Top))
-          (install "error" (unary Text Bottom))
-          (install "exit" (unary Int Bottom))
+          (install "log" (unary Text Any))
+          (install "error" (unary Text Nothing))
+          (install "exit" (unary Int Nothing))
           (install "current-time" (nullary Int)))))
 
 (def: bit-procs
@@ -410,7 +410,7 @@
     (do macro.Monad<Meta>
       [[thread-id threadT] (&.with-type-env tc.var)
        [var-id varT] (&.with-type-env tc.var)]
-      ((binary varT (type (Box threadT varT)) Top proc)
+      ((binary varT (type (Box threadT varT)) Any proc)
        analyse eval args))))
 
 (def: box-procs
@@ -427,7 +427,7 @@
   (<| (prefix "process")
       (|> (dict.new text.Hash<Text>)
           (install "parallelism-level" (nullary Nat))
-          (install "schedule" (binary Nat (type (io.IO Top)) Top))
+          (install "schedule" (binary Nat (type (io.IO Any)) Any))
           )))
 
 (def: #export procedures
diff --git a/new-luxc/source/luxc/lang/extension/analysis/host.jvm.lux b/new-luxc/source/luxc/lang/extension/analysis/host.jvm.lux
index 08ad014be..9ef06a4b1 100644
--- a/new-luxc/source/luxc/lang/extension/analysis/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/extension/analysis/host.jvm.lux
@@ -477,12 +477,12 @@
     (case args
       (^ (list exceptionC))
       (do macro.Monad<Meta>
-        [_ (&.infer Bottom)
+        [_ (&.infer Nothing)
          [exceptionT exceptionA] (&common.with-unknown-type
                                    (analyse exceptionC))
          exception-class (check-object exceptionT)
          ? (sub-class? "java.lang.Throwable" exception-class)
-         _ (: (Meta Top)
+         _ (: (Meta Any)
               (if ?
                 (wrap [])
                 (&.throw Non-Throwable exception-class)))]
@@ -571,7 +571,7 @@
             (java-type-to-lux-type mappings bound)
             
             _
-            (macro/wrap Top)))
+            (macro/wrap Any)))
 
         (host.instance? Class java-type)
         (let [java-type (:! (Class Object) java-type)
@@ -818,7 +818,7 @@
       (case [classC fieldC]
         [[_ (#.Text class)] [_ (#.Text field)]]
         (do macro.Monad<Meta>
-          [_ (&.infer Top)
+          [_ (&.infer Any)
            [fieldT final?] (static-field class field)
            _ (&.assert Cannot-Set-Final-Field (format class "#" field)
                        (not final?))
@@ -1130,7 +1130,7 @@
 (def: (invoke//special proc)
   (-> Text ///.Analysis)
   (function (_ analyse eval args)
-    (case (: (e.Error [(List Code) [Text Text Code (List [Text Code]) Top]])
+    (case (: (e.Error [(List Code) [Text Text Code (List [Text Code]) Any]])
              (p.run args ($_ p.seq s.text s.text s.any (p.some (s.tuple (p.seq s.text s.any))) s.end!)))
       (#e.Success [_ [class method objectC argsTC _]])
       (do macro.Monad<Meta>
diff --git a/new-luxc/source/luxc/lang/extension/statement.lux b/new-luxc/source/luxc/lang/extension/statement.lux
index f607ac154..a92995630 100644
--- a/new-luxc/source/luxc/lang/extension/statement.lux
+++ b/new-luxc/source/luxc/lang/extension/statement.lux
@@ -52,7 +52,7 @@
     (wrap [annsI (:! Code annsV)])))
 
 (def: (ensure-valid-alias def-name annotations value)
-  (-> Text Code Code (Meta Top))
+  (-> Text Code Code (Meta Any))
   (case [annotations value]
     (^multi [[_ (#.Record pairs)] [_ (#.Symbol _)]]
             (|> pairs list.size (n/= +1)))
@@ -76,7 +76,7 @@
               (do @
                 [_ (ensure-valid-alias def-name annotationsV valueC)
                  _ (lang.with-scope
-                     (statementT.translate-def def-name Bottom id annotationsV))]
+                     (statementT.translate-def def-name Nothing id annotationsV))]
                 (wrap []))
 
               #.None
@@ -107,7 +107,7 @@
       (do macro.Monad<Meta>
         [[_ programA] (<| lang.with-scope
                           (scopeL.with-local [args (type (List Text))])
-                          (lang.with-type (type (IO Top)))
+                          (lang.with-type (type (IO Any)))
                           (expressionA.analyser evalL.eval programC))
          syntheses //.all-syntheses
          programI (expressionT.translate (expressionS.synthesize syntheses programA))