- Improvements to import syntax [part 0].

6 files changed, 15 insertions, 15 deletions

diff --git a/stdlib/source/lux/data/text/buffer.lux b/stdlib/source/lux/data/text/buffer.lux
index 8721b957d..f1b9b770b 100644
--- a/stdlib/source/lux/data/text/buffer.lux
+++ b/stdlib/source/lux/data/text/buffer.lux
@@ -2,10 +2,10 @@
   lux
   (lux (data [product]
              text/format
-             (collection [row #+ Row "row/" Fold<Row>]))
+             (collection [row (#+ Row) "row/" Fold<Row>]))
        (language ["_" host])
        (type abstract)
-       [host #+ import:])
+       [host (#+ import:)])
   [//])
 
 (`` (for {(~~ (static _.jvm))
diff --git a/stdlib/source/lux/data/text/encoding.lux b/stdlib/source/lux/data/text/encoding.lux
index b4e6fe113..7442faa68 100644
--- a/stdlib/source/lux/data/text/encoding.lux
+++ b/stdlib/source/lux/data/text/encoding.lux
@@ -1,9 +1,9 @@
 (.module:
   lux
-  (lux (data [error #+ Error])
-       (world [blob #+ Blob])
+  (lux (data [error (#+ Error)])
+       (world [blob (#+ Blob)])
        (language ["_" host])
-       [host #+ import:]))
+       [host (#+ import:)]))
 
 (`` (for {(~~ (static _.jvm))
           (as-is (def: utf8 Text "UTF-8")
diff --git a/stdlib/source/lux/data/text/format.lux b/stdlib/source/lux/data/text/format.lux
index 16651957e..ab04746c9 100644
--- a/stdlib/source/lux/data/text/format.lux
+++ b/stdlib/source/lux/data/text/format.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 ["p" parser])
        (data [bool]
              [number]
@@ -15,7 +15,7 @@
        (math [modular])
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])
+              ["s" syntax (#+ syntax: Syntax)])
        (language [type])
        ))
 
diff --git a/stdlib/source/lux/data/text/lexer.lux b/stdlib/source/lux/data/text/lexer.lux
index 9f8bbb664..3821c0081 100644
--- a/stdlib/source/lux/data/text/lexer.lux
+++ b/stdlib/source/lux/data/text/lexer.lux
@@ -1,6 +1,6 @@
 (.module:
-  [lux #- not]
-  (lux (control [monad #+ do Monad]
+  [lux (#- not)]
+  (lux (control [monad (#+ do Monad)]
                 ["p" parser])
        (data [text "text/" Monoid<Text>]
              [product]
diff --git a/stdlib/source/lux/data/text/regex.lux b/stdlib/source/lux/data/text/regex.lux
index f0e471ef4..d2cc4e725 100644
--- a/stdlib/source/lux/data/text/regex.lux
+++ b/stdlib/source/lux/data/text/regex.lux
@@ -10,9 +10,9 @@
              ["e" error]
              [maybe]
              (collection [list "list/" Fold<List> Monad<List>]))
-       [macro #+ with-gensyms]
+       [macro (#+ with-gensyms)]
        (macro [code]
-              ["s" syntax #+ syntax:])))
+              ["s" syntax (#+ syntax:)])))
 
 ## [Utils]
 (def: regex-char^
diff --git a/stdlib/source/lux/data/text/unicode.lux b/stdlib/source/lux/data/text/unicode.lux
index 8a88e1184..2bea5dbe2 100644
--- a/stdlib/source/lux/data/text/unicode.lux
+++ b/stdlib/source/lux/data/text/unicode.lux
@@ -1,10 +1,10 @@
 (.module:
   lux
-  (lux (control [interval #+ Interval]
-                [monoid #+ Monoid])
-       (data [number #+ hex "nat/" Interval<Nat>]
+  (lux (control [interval (#+ Interval)]
+                [monoid (#+ Monoid)])
+       (data [number (#+ hex) "nat/" Interval<Nat>]
              (collection [list]
-                         (tree [finger #+ Tree])))
+                         (tree [finger (#+ Tree)])))
        (type abstract)))
 
 (type: #export Char Nat)