- Improvements to import syntax [part 2].

7 files changed, 86 insertions, 70 deletions

diff --git a/stdlib/source/lux/data/text.lux b/stdlib/source/lux/data/text.lux
index 3ceceb171..a7fbd8a18 100644
--- a/stdlib/source/lux/data/text.lux
+++ b/stdlib/source/lux/data/text.lux
@@ -1,13 +1,15 @@
 (.module:
-  lux
-  (lux (control [monoid (#+ Monoid)]
-                [equivalence (#+ Equivalence)]
-                [order]
-                [monad (#+ do Monad)]
-                [codec (#+ Codec)]
-                hash)
-       (data (collection [list])
-             [maybe])))
+  [lux #*
+   [control
+    [monoid (#+ Monoid)]
+    [equivalence (#+ Equivalence)]
+    [order]
+    [monad (#+ do Monad)]
+    [codec (#+ Codec)]
+    hash]
+   [data
+    [collection [list]]
+    [maybe]]])
 
 ## [Functions]
 (def: #export (size x)
diff --git a/stdlib/source/lux/data/text/buffer.lux b/stdlib/source/lux/data/text/buffer.lux
index 5b8f8e56e..33708932e 100644
--- a/stdlib/source/lux/data/text/buffer.lux
+++ b/stdlib/source/lux/data/text/buffer.lux
@@ -1,11 +1,14 @@
 (.module:
-  lux
-  (lux (data [product]
-             text/format
-             (collection [row (#+ Row) ("row/" Fold<Row>)]))
-       (language ["_" host])
-       (type abstract)
-       [host (#+ import:)])
+  [lux #*
+   [data
+    [product]
+    [text format]
+    [collection [row (#+ Row) ("row/" Fold<Row>)]]]
+   [language
+    ["_" host]]
+   [type
+    abstract]
+   [host (#+ import:)]]
   [//])
 
 (`` (for {(~~ (static _.jvm))
diff --git a/stdlib/source/lux/data/text/encoding.lux b/stdlib/source/lux/data/text/encoding.lux
index 7442faa68..2ea8e4a76 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)])
-       (language ["_" host])
-       [host (#+ import:)]))
+  [lux #*
+   [data [error (#+ Error)]]
+   [world [blob (#+ Blob)]]
+   [language ["_" host]]
+   [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 977592479..d32862024 100644
--- a/stdlib/source/lux/data/text/format.lux
+++ b/stdlib/source/lux/data/text/format.lux
@@ -1,23 +1,27 @@
 (.module:
-  lux
-  (lux (control [monad (#+ do Monad)]
-                ["p" parser])
-       (data [bool]
-             [number]
-             [text]
-             [ident]
-             (collection [list ("list/" Monad<List>)])
-             (format [xml]
-                     [json]))
-       (time [instant]
-             [duration]
-             [date])
-       (math [modular])
-       [macro]
-       (macro [code]
-              ["s" syntax (#+ syntax: Syntax)])
-       (language [type])
-       ))
+  [lux #*
+   [control
+    [monad (#+ do Monad)]
+    ["p" parser]]
+   [data
+    [bool]
+    [number]
+    [text]
+    [ident]
+    [collection [list ("list/" Monad<List>)]]
+    [format
+     [xml]
+     [json]]]
+   [time
+    [instant]
+    [duration]
+    [date]]
+   [math [modular]]
+   ["." macro
+    [code]
+    ["s" syntax (#+ syntax: Syntax)]]
+   [language [type]]
+   ])
 
 ## [Syntax]
 (syntax: #export (format {fragments (p.many s.any)})
diff --git a/stdlib/source/lux/data/text/lexer.lux b/stdlib/source/lux/data/text/lexer.lux
index c45361800..13c49ef8f 100644
--- a/stdlib/source/lux/data/text/lexer.lux
+++ b/stdlib/source/lux/data/text/lexer.lux
@@ -1,13 +1,15 @@
 (.module:
-  [lux (#- not)]
-  (lux (control [monad (#+ do Monad)]
-                ["p" parser])
-       (data [text ("text/" Monoid<Text>)]
-             [product]
-             [maybe]
-             ["e" error]
-             (collection [list]))
-       (macro [code])))
+  [lux (#- not)
+   [control
+    [monad (#+ do Monad)]
+    ["p" parser]]
+   [data
+    [text ("text/" Monoid<Text>)]
+    [product]
+    [maybe]
+    ["e" error]
+    [collection [list]]]
+   [macro [code]]])
 
 (type: Offset Nat)
 
diff --git a/stdlib/source/lux/data/text/regex.lux b/stdlib/source/lux/data/text/regex.lux
index 6a71ca24d..8b35b770c 100644
--- a/stdlib/source/lux/data/text/regex.lux
+++ b/stdlib/source/lux/data/text/regex.lux
@@ -1,18 +1,20 @@
 (.module:
-  lux
-  (lux (control monad
-                ["p" parser ("parser/" Monad<Parser>)])
-       (data [text]
-             ["l" text/lexer]
-             text/format
-             [number ("int/" Codec<Text,Int>)]
-             [product]
-             ["e" error]
-             [maybe]
-             (collection [list ("list/" Fold<List> Monad<List>)]))
-       [macro (#+ with-gensyms)]
-       (macro [code]
-              ["s" syntax (#+ syntax:)])))
+  [lux #*
+   [control
+    monad
+    ["p" parser ("parser/" Monad<Parser>)]]
+   [data
+    [number ("int/" Codec<Text,Int>)]
+    [product]
+    ["e" error]
+    [maybe]
+    ["." text
+     ["l" lexer]
+     format]
+    [collection [list ("list/" Fold<List> Monad<List>)]]]
+   [macro (#+ with-gensyms)
+    [code]
+    ["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 5c946c84f..10b9692ee 100644
--- a/stdlib/source/lux/data/text/unicode.lux
+++ b/stdlib/source/lux/data/text/unicode.lux
@@ -1,11 +1,14 @@
 (.module:
-  lux
-  (lux (control [interval (#+ Interval)]
-                [monoid (#+ Monoid)])
-       (data [number (#+ hex) ("nat/" Interval<Nat>)]
-             (collection [list]
-                         (tree [finger (#+ Tree)])))
-       (type abstract)))
+  [lux #*
+   [control
+    [interval (#+ Interval)]
+    [monoid (#+ Monoid)]]
+   [data
+    [number (#+ hex) ("nat/" Interval<Nat>)]
+    [collection
+     [list]
+     [tree [finger (#+ Tree)]]]]
+   [type abstract]])
 
 (type: #export Char Nat)