- Improvements to import syntax [part 0].

8 files changed, 39 insertions, 39 deletions

diff --git a/stdlib/source/lux/type/abstract.lux b/stdlib/source/lux/type/abstract.lux
index 10095805f..226ce491a 100644
--- a/stdlib/source/lux/type/abstract.lux
+++ b/stdlib/source/lux/type/abstract.lux
@@ -1,17 +1,17 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 ["p" parser])
        (data [text "text/" Equivalence<Text> Monoid<Text>]
              [error]
              (collection [list "list/" Functor<List> Monoid<List>]))
-       [macro #+ "meta/" Monad<Meta>]
+       [macro "meta/" Monad<Meta>]
        (macro [code]
-              ["s" syntax #+ syntax:]
+              ["s" syntax (#+ syntax:)]
               (syntax ["cs" common]
                       (common ["csr" reader]
                               ["csw" writer])))
-       (language [type #+ :cast])))
+       (language [type (#+ :cast)])))
 
 (def: (get k plist)
   (All [a]
diff --git a/stdlib/source/lux/type/implicit.lux b/stdlib/source/lux/type/implicit.lux
index 12dee41b4..94b81f409 100644
--- a/stdlib/source/lux/type/implicit.lux
+++ b/stdlib/source/lux/type/implicit.lux
@@ -1,21 +1,21 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 ["eq" equivalence]
                 ["p" parser])
        (data [text "text/" Equivalence<Text>]
              text/format
              [number]
              (collection [list "list/" Monad<List> Fold<List>]
-                         ["dict" dictionary #+ Dictionary])
+                         ["dict" dictionary (#+ Dictionary)])
              [bool]
              [product]
              [maybe])
-       [macro #+ Monad<Meta>]
+       [macro (#+ Monad<Meta>)]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])
+              ["s" syntax (#+ syntax: Syntax)])
        (language [type]
-                 (type ["tc" check #+ Check]))
+                 (type ["tc" check (#+ Check)]))
        ))
 
 (def: (find-type-var id env)
diff --git a/stdlib/source/lux/type/object/interface.lux b/stdlib/source/lux/type/object/interface.lux
index d6a31d1f8..8ff12d167 100644
--- a/stdlib/source/lux/type/object/interface.lux
+++ b/stdlib/source/lux/type/object/interface.lux
@@ -1,17 +1,17 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 ["p" parser "p/" Monad<Parser>])
        (data [text]
              text/format
              [product]
              [maybe]
-             [ident #+ "ident/" Equivalence<Ident>]
+             [ident "ident/" Equivalence<Ident>]
              (collection [list "list/" Functor<List> Fold<List> Monoid<List>]
-                         [set #+ Set]))
-       [macro #+ Monad<Meta> "meta/" Monad<Meta>]
+                         [set (#+ Set)]))
+       [macro (#+ Monad<Meta>) "meta/" Monad<Meta>]
        (macro [code]
-              ["s" syntax #+ syntax:]
+              ["s" syntax (#+ syntax:)]
               (syntax ["cs" common]
                       (common ["csr" reader]
                               ["csw" writer])))
diff --git a/stdlib/source/lux/type/object/protocol.lux b/stdlib/source/lux/type/object/protocol.lux
index 5407b8f3f..87c7d4207 100644
--- a/stdlib/source/lux/type/object/protocol.lux
+++ b/stdlib/source/lux/type/object/protocol.lux
@@ -1,12 +1,12 @@
 (.module:
   lux
   (lux (control ["p" parser]
-                [monad #+ do])
+                [monad (#+ do)])
        (data [sum]
              (collection [list "list/" Functor<List>]))
        [macro "meta/" Monad<Meta>]
        (macro [code]
-              ["s" syntax #+ syntax:]
+              ["s" syntax (#+ syntax:)]
               (syntax ["cs" common]
                       (common ["csr" reader]
                               ["csw" writer])))))
diff --git a/stdlib/source/lux/type/quotient.lux b/stdlib/source/lux/type/quotient.lux
index 958e5eda9..99e750a93 100644
--- a/stdlib/source/lux/type/quotient.lux
+++ b/stdlib/source/lux/type/quotient.lux
@@ -1,12 +1,12 @@
 (.module:
-  [lux #- type]
-  (lux (control [monad #+ do]
+  [lux (#- type)]
+  (lux (control [monad (#+ do)]
                 ["p" parser])
-       (data ["e" error #+ Error])
+       (data ["e" error (#+ Error)])
        (language [type])
        (type abstract)
        [macro]
-       (macro ["s" syntax #+ syntax:]
+       (macro ["s" syntax (#+ syntax:)]
               [poly])))
 
 (abstract: #export (Class t c q)
diff --git a/stdlib/source/lux/type/refinement.lux b/stdlib/source/lux/type/refinement.lux
index d7de1a67a..3652764d4 100644
--- a/stdlib/source/lux/type/refinement.lux
+++ b/stdlib/source/lux/type/refinement.lux
@@ -1,13 +1,13 @@
 (.module:
-  [lux #- type]
-  (lux (control [predicate #+ Predicate]
-                [monad #+ do]
+  [lux (#- type)]
+  (lux (control [predicate (#+ Predicate)]
+                [monad (#+ do)]
                 ["p" parser])
-       (data ["e" error #+ Error])
+       (data ["e" error (#+ Error)])
        (language [type "type/" Equivalence<Type>])
        (type abstract)
        [macro]
-       (macro ["s" syntax #+ syntax:]
+       (macro ["s" syntax (#+ syntax:)]
               [poly])))
 
 (abstract: #export (Refined t r)
diff --git a/stdlib/source/lux/type/resource.lux b/stdlib/source/lux/type/resource.lux
index 636939a1b..f01ce53c9 100644
--- a/stdlib/source/lux/type/resource.lux
+++ b/stdlib/source/lux/type/resource.lux
@@ -1,23 +1,23 @@
 (.module:
   lux
   (lux (control ["p" parser]
-                ["ex" exception #+ exception:]
-                [monad #+ Monad do]
-                (monad [indexed #+ IxMonad]))
-       (data [identity #+ Identity]
+                ["ex" exception (#+ exception:)]
+                [monad (#+ Monad do)]
+                (monad [indexed (#+ IxMonad)]))
+       (data [identity (#+ Identity)]
              [maybe]
              [product]
              [number]
              text/format
-             (collection ["dict" dictionary #+ Dictionary]
+             (collection ["dict" dictionary (#+ Dictionary)]
                          [set]
-                         [row #+ Row]
+                         [row (#+ Row)]
                          [list "list/" Functor<List> Fold<List>]))
-       (concurrency [promise #+ Promise])
+       (concurrency [promise (#+ Promise)])
        [macro]
-       (macro ["s" syntax #+ Syntax syntax:])
+       (macro ["s" syntax (#+ Syntax syntax:)])
        (type abstract)
-       [io #+ IO]))
+       [io (#+ IO)]))
 
 (type: #export (Procedure monad input output value)
   (-> input (monad [output value])))
diff --git a/stdlib/source/lux/type/unit.lux b/stdlib/source/lux/type/unit.lux
index 9a5c2d054..3668d492a 100644
--- a/stdlib/source/lux/type/unit.lux
+++ b/stdlib/source/lux/type/unit.lux
@@ -1,15 +1,15 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 ["p" parser "p/" Monad<Parser>]
-                [equivalence #+ Equivalence]
-                [order #+ Order]
-                [enum #+ Enum])
+                [equivalence (#+ Equivalence)]
+                [order (#+ Order)]
+                [enum (#+ Enum)])
        (data text/format
              (number ["r" ratio]))
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax:]
+              ["s" syntax (#+ syntax:)]
               (syntax ["cs" common]
                       (common ["csr" reader]
                               ["csw" writer])))