- Updated new-luxc to the latest stdlib changes.

7 files changed, 20 insertions, 20 deletions

diff --git a/new-luxc/source/luxc/lang/translation/php.lux b/new-luxc/source/luxc/lang/translation/php.lux
index eeaa95309..8cbcaad3a 100644
--- a/new-luxc/source/luxc/lang/translation/php.lux
+++ b/new-luxc/source/luxc/lang/translation/php.lux
@@ -54,7 +54,7 @@
 (type: #export Host
   {#context [Text Nat]
    #anchor (Maybe Anchor)
-   #loader (-> Statement (Error Unit))
+   #loader (-> Statement (Error Top))
    #interpreter (-> Expression (Error Object))
    #module-buffer (Maybe StringBuilder)
    #program-buffer StringBuilder})
@@ -77,12 +77,12 @@
 (def: #export module-name Text (format "module" extension))
 
 (def: #export init-module-buffer
-  (Meta Unit)
+  (Meta Top)
   (function (_ compiler)
     (#e.Success [(update@ #.host
                           (|>> (:! Host)
                                (set@ #module-buffer (#.Some (StringBuilder::new [])))
-                               (:! Void))
+                               (:! Bottom))
                           compiler)
                  []])))
 
@@ -93,13 +93,13 @@
           [old-name old-sub] (get@ #context old)
           new-name (format old-name "___" (%i (nat-to-int old-sub)))]
       (case (expr (set@ #.host
-                        (:! Void (set@ #context [new-name +0] old))
+                        (:! Bottom (set@ #context [new-name +0] old))
                         compiler))
         (#e.Success [compiler' output])
         (#e.Success [(update@ #.host
                               (|>> (:! Host)
                                    (set@ #context [old-name (n/inc old-sub)])
-                                   (:! Void))
+                                   (:! Bottom))
                               compiler')
                      [new-name output]])
 
@@ -121,13 +121,13 @@
   (function (_ compiler)
     (let [old (:! Host (get@ #.host compiler))]
       (case (expr (set@ #.host
-                        (:! Void (set@ #anchor (#.Some anchor) old))
+                        (:! Bottom (set@ #anchor (#.Some anchor) old))
                         compiler))
         (#e.Success [compiler' output])
         (#e.Success [(update@ #.host
                               (|>> (:! Host)
                                    (set@ #anchor (get@ #anchor old))
-                                   (:! Void))
+                                   (:! Bottom))
                               compiler')
                      output])
 
@@ -171,7 +171,7 @@
            (#e.Success output)
            (#e.Success [compiler output])))))]
 
-  [load!     #loader      Statement  Unit]
+  [load!     #loader      Statement  Top]
   [interpret #interpreter Expression Object]
   )
 
@@ -186,7 +186,7 @@
   (lang.normalize-name (format module "$" name)))
 
 (def: #export (save code)
-  (-> Statement (Meta Unit))
+  (-> Statement (Meta Top))
   (do macro.Monad<Meta>
     [module-buffer module-buffer
      #let [_ (Appendable::append [(:! CharSequence (_.code code))]
@@ -194,7 +194,7 @@
     (load! code)))
 
 (def: #export (save-module! target)
-  (-> File (Meta (Process Unit)))
+  (-> File (Meta (Process Top)))
   (do macro.Monad<Meta>
     [module macro.current-module-name
      module-buffer module-buffer
diff --git a/new-luxc/source/luxc/lang/translation/php/case.jvm.lux b/new-luxc/source/luxc/lang/translation/php/case.jvm.lux
index 0868811e7..0cfd66729 100644
--- a/new-luxc/source/luxc/lang/translation/php/case.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/case.jvm.lux
@@ -6,7 +6,7 @@
              [text]
              text/format
              (coll [list "list/" Functor<List> Fold<List>]
-                   [set #+ Set]))
+                   (set ["set" unordered #+ Set])))
        [macro #+ "meta/" Monad<Meta>]
        (macro [code]))
   (luxc [lang]
diff --git a/new-luxc/source/luxc/lang/translation/php/procedure.jvm.lux b/new-luxc/source/luxc/lang/translation/php/procedure.jvm.lux
index 9748167ca..ab73cddee 100644
--- a/new-luxc/source/luxc/lang/translation/php/procedure.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/procedure.jvm.lux
@@ -5,7 +5,7 @@
        (data [maybe]
              [text]
              text/format
-             (coll [dict])))
+             (coll (dictionary ["dict" unordered #+ Dict]))))
   (luxc ["&" lang]
         (lang ["ls" synthesis]
               (host ["_" php #+ Expression Statement])))
diff --git a/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux
index 384a88056..bcbea37cf 100644
--- a/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux
@@ -8,7 +8,7 @@
              text/format
              [number]
              (coll [list "list/" Functor<List>]
-                   [dict #+ Dict]))
+                   (dictionary ["dict" unordered #+ Dict])))
        [macro #+ with-gensyms]
        (macro [code]
               ["s" syntax #+ syntax:])
@@ -33,7 +33,7 @@
 (type: #export Bundle
   (Dict Text Proc))
 
-(syntax: (Vector [size s.nat] elemT)
+(syntax: (Vector {size s.nat} elemT)
   (wrap (list (` [(~+ (list.repeat size elemT))]))))
 
 (type: #export Nullary (-> (Vector +0 Expression) Expression))
@@ -61,7 +61,7 @@
           "Expected: " (|> expected nat-to-int %i) "\n"
           "  Actual: " (|> actual nat-to-int %i)))
 
-(syntax: (arity: [name s.local-symbol] [arity s.nat])
+(syntax: (arity: {name s.local-symbol} {arity s.nat})
   (with-gensyms [g!_ g!proc g!name g!translate g!inputs]
     (do @
       [g!input+ (monad.seq @ (list.repeat arity (macro.gensym "input")))]
diff --git a/new-luxc/source/luxc/lang/translation/php/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/php/procedure/host.jvm.lux
index c1b43da2f..af82491b6 100644
--- a/new-luxc/source/luxc/lang/translation/php/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/procedure/host.jvm.lux
@@ -4,7 +4,7 @@
        (data [text]
              text/format
              (coll [list "list/" Functor<List>]
-                   [dict #+ Dict]))
+                   (dictionary ["dict" unordered #+ Dict])))
        [macro "macro/" Monad<Meta>])
   (luxc ["&" lang]
         (lang ["la" analysis]
diff --git a/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux
index fe02cf2fc..66827025e 100644
--- a/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux
@@ -57,7 +57,7 @@
   (p.either (p.seq s.local-symbol (p/wrap (list)))
             (s.form (p.seq s.local-symbol (p.some s.local-symbol)))))
 
-(syntax: (runtime: [[name args] declaration]
+(syntax: (runtime: {[name args] declaration}
            definition)
   (let [implementation (code.local-symbol (format "@@" name))
         runtime (format "__" prefix "__" (lang.normalize-name name))
@@ -87,7 +87,7 @@
                                             ((~! list/map) _.parameter (list (~+ argsLC+)))
                                             (~ definition))))))))))))
 
-(syntax: (with-vars [vars (s.tuple (p.many s.local-symbol))]
+(syntax: (with-vars {vars (s.tuple (p.many s.local-symbol))}
            body)
   (wrap (list (` (let [(~+ (|> vars
                                (list/map (function (_ var)
@@ -433,7 +433,7 @@
 (def: #export artifact Text (format prefix //.extension))
 
 (def: #export translate
-  (Meta (Process Unit))
+  (Meta (Process Top))
   (do macro.Monad<Meta>
     [_ //.init-module-buffer
      _ (//.save runtime)]
diff --git a/new-luxc/source/luxc/lang/translation/php/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/php/statement.jvm.lux
index 592e579cf..afbf7e476 100644
--- a/new-luxc/source/luxc/lang/translation/php/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/statement.jvm.lux
@@ -11,7 +11,7 @@
       [".T" eval]))
 
 (def: #export (translate-def name expressionT expressionO metaV)
-  (-> Text Type Expression Code (Meta Unit))
+  (-> Text Type Expression Code (Meta Top))
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module name]]]