- Updated new-luxc to the latest stdlib changes.

7 files changed, 21 insertions, 21 deletions

diff --git a/new-luxc/source/luxc/lang/extension.lux b/new-luxc/source/luxc/lang/extension.lux
index e8121b9b6..ef7a4f864 100644
--- a/new-luxc/source/luxc/lang/extension.lux
+++ b/new-luxc/source/luxc/lang/extension.lux
@@ -4,7 +4,7 @@
                 ["ex" exception #+ exception:])
        (data ["e" error]
              [text]
-             (coll [dict #+ Dict]))
+             (coll (dictionary ["dict" unordered #+ Dict])))
        [macro])
   [//]
   (// ["la" analysis]
@@ -39,7 +39,7 @@
   (-> (List Code) (Meta Code)))
 
 (type: #export Statement
-  (-> (List Code) (Meta Unit)))
+  (-> (List Code) (Meta Top)))
 
 (type: #export Extensions
   {#analysis (Dict Text Analysis)
@@ -61,9 +61,9 @@
                  (|> compiler (get@ #.extensions) (:! Extensions))])))
 
 (def: (set extensions)
-  (-> Extensions (Meta Unit))
+  (-> Extensions (Meta Top))
   (function (_ compiler)
-    (#e.Success [(set@ #.extensions (:! Void extensions) compiler)
+    (#e.Success [(set@ #.extensions (:! Bottom 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 Unit))
+     (-> Text <type> (Meta Top))
      (do macro.Monad<Meta>
        [extensions ..get
         _ (//.assert <exception> name
diff --git a/new-luxc/source/luxc/lang/extension/analysis.lux b/new-luxc/source/luxc/lang/extension/analysis.lux
index cc7de89b1..79fa3af88 100644
--- a/new-luxc/source/luxc/lang/extension/analysis.lux
+++ b/new-luxc/source/luxc/lang/extension/analysis.lux
@@ -2,7 +2,7 @@
   lux
   (lux (data [text]
              (coll [list "list/" Functor<List>]
-                   [dict #+ Dict])))
+                   (dictionary ["dict" unordered #+ Dict]))))
   [//]
   [/common]
   [/host])
diff --git a/new-luxc/source/luxc/lang/extension/analysis/common.lux b/new-luxc/source/luxc/lang/extension/analysis/common.lux
index 8ec031066..aa6b6a547 100644
--- a/new-luxc/source/luxc/lang/extension/analysis/common.lux
+++ b/new-luxc/source/luxc/lang/extension/analysis/common.lux
@@ -7,7 +7,7 @@
              text/format
              (coll [list "list/" Functor<List>]
                    [array]
-                   [dict #+ Dict]))
+                   (dictionary ["dict" unordered #+ Dict])))
        [macro]
        (macro [code])
        (lang (type ["tc" check]))
@@ -191,7 +191,7 @@
   Bundle
   (<| (prefix "io")
       (|> (dict.new text.Hash<Text>)
-          (install "log" (unary Text Unit))
+          (install "log" (unary Text Top))
           (install "error" (unary Text Bottom))
           (install "exit" (unary Int Bottom))
           (install "current-time" (nullary Int)))))
@@ -428,7 +428,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)) Unit proc)
+      ((binary varT (type (Box threadT varT)) Top proc)
        analyse eval args))))
 
 (def: box-procs
@@ -445,8 +445,8 @@
   (<| (prefix "process")
       (|> (dict.new text.Hash<Text>)
           (install "concurrency-level" (nullary Nat))
-          (install "future" (unary (type (io.IO Top)) Unit))
-          (install "schedule" (binary Nat (type (io.IO Top)) Unit))
+          (install "future" (unary (type (io.IO Top)) Top))
+          (install "schedule" (binary Nat (type (io.IO Top)) Top))
           )))
 
 (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 9d9fef5ac..08ad014be 100644
--- a/new-luxc/source/luxc/lang/extension/analysis/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/extension/analysis/host.jvm.lux
@@ -13,7 +13,7 @@
                    ["l" lexer])
              (coll [list "list/" Fold<List> Functor<List> Monoid<List>]
                    [array]
-                   [dict #+ Dict]))
+                   (dictionary ["dict" unordered #+ Dict])))
        [macro "macro/" Monad<Meta>]
        (macro [code]
               ["s" syntax])
@@ -482,7 +482,7 @@
                                    (analyse exceptionC))
          exception-class (check-object exceptionT)
          ? (sub-class? "java.lang.Throwable" exception-class)
-         _ (: (Meta Unit)
+         _ (: (Meta Top)
               (if ?
                 (wrap [])
                 (&.throw Non-Throwable exception-class)))]
@@ -818,7 +818,7 @@
       (case [classC fieldC]
         [[_ (#.Text class)] [_ (#.Text field)]]
         (do macro.Monad<Meta>
-          [_ (&.infer Unit)
+          [_ (&.infer Top)
            [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]) Unit]])
+    (case (: (e.Error [(List Code) [Text Text Code (List [Text Code]) Top]])
              (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 81b43f205..f607ac154 100644
--- a/new-luxc/source/luxc/lang/extension/statement.lux
+++ b/new-luxc/source/luxc/lang/extension/statement.lux
@@ -5,7 +5,7 @@
        (data [text]
              text/format
              (coll [list "list/" Functor<List>]
-                   [dict #+ Dict]))
+                   (dictionary ["dict" unordered #+ Dict])))
        [macro]
        (lang (type ["tc" check]))
        [io #+ IO])
@@ -52,7 +52,7 @@
     (wrap [annsI (:! Code annsV)])))
 
 (def: (ensure-valid-alias def-name annotations value)
-  (-> Text Code Code (Meta Unit))
+  (-> Text Code Code (Meta Top))
   (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 Void id annotationsV))]
+                     (statementT.translate-def def-name Bottom 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 Unit)))
+                          (lang.with-type (type (IO Top)))
                           (expressionA.analyser evalL.eval programC))
          syntheses //.all-syntheses
          programI (expressionT.translate (expressionS.synthesize syntheses programA))
diff --git a/new-luxc/source/luxc/lang/extension/synthesis.lux b/new-luxc/source/luxc/lang/extension/synthesis.lux
index 32d726796..c48f3e3a5 100644
--- a/new-luxc/source/luxc/lang/extension/synthesis.lux
+++ b/new-luxc/source/luxc/lang/extension/synthesis.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (data [text]
-             (coll [dict #+ Dict])))
+             (coll (dictionary ["dict" unordered #+ Dict]))))
   [//])
 
 (def: #export defaults
diff --git a/new-luxc/source/luxc/lang/extension/translation.lux b/new-luxc/source/luxc/lang/extension/translation.lux
index 663babdb6..bc95ed1f4 100644
--- a/new-luxc/source/luxc/lang/extension/translation.lux
+++ b/new-luxc/source/luxc/lang/extension/translation.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (data [text]
-             (coll [dict #+ Dict])))
+             (coll (dictionary ["dict" unordered #+ Dict]))))
   [//])
 
 (def: #export defaults