- Updated new-luxc to the latest stdlib changes.

8 files changed, 28 insertions, 28 deletions

diff --git a/new-luxc/source/luxc/lang/host.jvm.lux b/new-luxc/source/luxc/lang/host.jvm.lux
index b9261f7b0..5819e5126 100644
--- a/new-luxc/source/luxc/lang/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/host.jvm.lux
@@ -7,7 +7,7 @@
        (data ["e" error]
              [text]
              text/format
-             (coll [dict]
+             (coll (dictionary ["dict" unordered])
                    [array]))
        [macro]
        [host #+ do-to object]
@@ -97,13 +97,13 @@
   (.function (_ compiler)
     (let [old (:! commonT.Host (get@ #.host compiler))]
       (case (expr (set@ #.host
-                        (:! Void (set@ #commonT.anchor (#.Some anchor) old))
+                        (:! Bottom (set@ #commonT.anchor (#.Some anchor) old))
                         compiler))
         (#e.Success [compiler' output])
         (#e.Success [(update@ #.host
                               (|>> (:! commonT.Host)
                                    (set@ #commonT.anchor (get@ #commonT.anchor old))
-                                   (:! Void))
+                                   (:! Bottom))
                               compiler')
                      output])
 
@@ -129,13 +129,13 @@
   (.function (_ compiler)
     (let [old (:! commonT.Host (get@ #.host compiler))]
       (case (expr (set@ #.host
-                        (:! Void (set@ #commonT.context [(&.normalize-name name) +0] old))
+                        (:! Bottom (set@ #commonT.context [(&.normalize-name name) +0] old))
                         compiler))
         (#e.Success [compiler' output])
         (#e.Success [(update@ #.host
                               (|>> (:! commonT.Host)
                                    (set@ #commonT.context (get@ #commonT.context old))
-                                   (:! Void))
+                                   (:! Bottom))
                               compiler')
                      output])
 
@@ -149,13 +149,13 @@
           [old-name old-sub] (get@ #commonT.context old)
           new-name (format old-name "$" (%i (nat-to-int old-sub)))]
       (case (expr (set@ #.host
-                        (:! Void (set@ #commonT.context [new-name +0] old))
+                        (:! Bottom (set@ #commonT.context [new-name +0] old))
                         compiler))
         (#e.Success [compiler' output])
         (#e.Success [(update@ #.host
                               (|>> (:! commonT.Host)
                                    (set@ #commonT.context [old-name (n/inc old-sub)])
-                                   (:! Void))
+                                   (:! Bottom))
                               compiler')
                      [new-name output]])
 
diff --git a/new-luxc/source/luxc/lang/host/common-lisp.lux b/new-luxc/source/luxc/lang/host/common-lisp.lux
index 3ab94b1a1..7ae024a07 100644
--- a/new-luxc/source/luxc/lang/host/common-lisp.lux
+++ b/new-luxc/source/luxc/lang/host/common-lisp.lux
@@ -8,8 +8,8 @@
              (coll [list "list/" Functor<List> Fold<List>]))
        (type abstract)))
 
-(abstract: #export Single {} Unit)
-(abstract: #export Poly {} Unit)
+(abstract: #export Single {} Top)
+(abstract: #export Poly {} Top)
 
 (abstract: #export (Var kind)
   {}
diff --git a/new-luxc/source/luxc/lang/host/jvm.lux b/new-luxc/source/luxc/lang/host/jvm.lux
index c76c5144d..3fb55d2f9 100644
--- a/new-luxc/source/luxc/lang/host/jvm.lux
+++ b/new-luxc/source/luxc/lang/host/jvm.lux
@@ -80,10 +80,10 @@
   #V1_8)
 
 ## [Values]
-(syntax: (config: [type s.local-symbol]
-           [none s.local-symbol]
-           [++ s.local-symbol]
-           [options (s.tuple (p.many s.local-symbol))])
+(syntax: (config: {type s.local-symbol}
+           {none s.local-symbol}
+           {++ s.local-symbol}
+           {options (s.tuple (p.many s.local-symbol))})
   (let [g!type (code.local-symbol type)
         g!none (code.local-symbol none)
         g!tags+ (list/map code.local-tag options)
@@ -122,7 +122,7 @@
 
 ## Labels
 (def: #export new-label
-  (-> Unit Label)
+  (-> Top Label)
   org/objectweb/asm/Label::new)
 
 (def: #export (simple-class name)
diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux
index f993f0c48..d088c5324 100644
--- a/new-luxc/source/luxc/lang/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux
@@ -18,7 +18,7 @@
 (host.import #long java/lang/Object)
 (host.import #long java/lang/String)
 
-(syntax: (declare [codes (p.many s.local-symbol)])
+(syntax: (declare {codes (p.many s.local-symbol)})
   (|> codes
       (list/map (function (_ code) (` ((~' #static) (~ (code.local-symbol code)) (~' int)))))
       wrap))
@@ -135,7 +135,7 @@
   [string  Text id]
   )
 
-(syntax: (prefix [base s.local-symbol])
+(syntax: (prefix {base s.local-symbol})
   (wrap (list (code.local-symbol (format "Opcodes::" base)))))
 
 (def: #export NULL
diff --git a/new-luxc/source/luxc/lang/host/php.lux b/new-luxc/source/luxc/lang/host/php.lux
index 6d21da21f..982989320 100644
--- a/new-luxc/source/luxc/lang/host/php.lux
+++ b/new-luxc/source/luxc/lang/host/php.lux
@@ -7,11 +7,11 @@
              (coll [list "list/" Functor<List> Fold<List>]))
        (type abstract)))
 
-(abstract: Global' {} Unit)
-(abstract: Var' {} Unit)
-(abstract: Computation' {} Unit)
-(abstract: (Expression' k) {} Unit)
-(abstract: Statement' {} Unit)
+(abstract: Global' {} Top)
+(abstract: Var' {} Top)
+(abstract: Computation' {} Top)
+(abstract: (Expression' k) {} Top)
+(abstract: Statement' {} Top)
 
 (abstract: (Code' k)
   {}
diff --git a/new-luxc/source/luxc/lang/host/python.lux b/new-luxc/source/luxc/lang/host/python.lux
index 8e42ff0a5..128de5811 100644
--- a/new-luxc/source/luxc/lang/host/python.lux
+++ b/new-luxc/source/luxc/lang/host/python.lux
@@ -7,9 +7,9 @@
              (coll [list "list/" Functor<List> Fold<List>]))
        (type abstract)))
 
-(abstract: #export Single {} Unit)
-(abstract: #export Poly {} Unit)
-(abstract: #export Keyword {} Unit)
+(abstract: #export Single {} Top)
+(abstract: #export Poly {} Top)
+(abstract: #export Keyword {} Top)
 
 (abstract: #export (Var kind)
   {}
diff --git a/new-luxc/source/luxc/lang/host/r.lux b/new-luxc/source/luxc/lang/host/r.lux
index 6af15d058..76e80d3d9 100644
--- a/new-luxc/source/luxc/lang/host/r.lux
+++ b/new-luxc/source/luxc/lang/host/r.lux
@@ -8,8 +8,8 @@
              (coll [list "list/" Functor<List> Fold<List>]))
        (type abstract)))
 
-(abstract: #export Single {} Unit)
-(abstract: #export Poly {} Unit)
+(abstract: #export Single {} Top)
+(abstract: #export Poly {} Top)
 
 (abstract: #export (Var kind)
   {}
diff --git a/new-luxc/source/luxc/lang/host/scheme.lux b/new-luxc/source/luxc/lang/host/scheme.lux
index db91b94ce..218903ca0 100644
--- a/new-luxc/source/luxc/lang/host/scheme.lux
+++ b/new-luxc/source/luxc/lang/host/scheme.lux
@@ -8,8 +8,8 @@
              (coll [list "list/" Functor<List> Fold<List>]))
        (type abstract)))
 
-(abstract: #export Single {} Unit)
-(abstract: #export Poly {} Unit)
+(abstract: #export Single {} Top)
+(abstract: #export Poly {} Top)
 
 (abstract: #export (Var kind)
   {}