- Updated new-luxc to the latest stdlib changes.

2 files changed, 9 insertions, 9 deletions

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>