From 8787650c4b1641832db9df2c35bc3046e886220e Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 6 May 2018 00:45:45 -0400 Subject: - Updated new-luxc to the latest stdlib changes. --- new-luxc/source/luxc/lang/extension/analysis.lux | 2 +- new-luxc/source/luxc/lang/extension/analysis/common.lux | 10 +++++----- new-luxc/source/luxc/lang/extension/analysis/host.jvm.lux | 8 ++++---- new-luxc/source/luxc/lang/extension/statement.lux | 8 ++++---- new-luxc/source/luxc/lang/extension/synthesis.lux | 2 +- new-luxc/source/luxc/lang/extension/translation.lux | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'new-luxc/source/luxc/lang/extension') 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] - [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] [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) - (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 [[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) (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 Functor Monoid] [array] - [dict #+ Dict])) + (dictionary ["dict" unordered #+ Dict]))) [macro "macro/" Monad] (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 - [_ (&.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 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] - [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 [[_ 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 -- cgit v1.2.3