Better syntax for parallel-hierarchy imports.

9 files changed, 29 insertions, 30 deletions

diff --git a/stdlib/source/test/lux/world/console.lux b/stdlib/source/test/lux/world/console.lux
index b196199fc..b153e84e9 100644
--- a/stdlib/source/test/lux/world/console.lux
+++ b/stdlib/source/test/lux/world/console.lux
@@ -12,10 +12,10 @@
      ["%" format (#+ format)]]]
    [math
     ["." random]]]
-  {1
-   ["." /]}
-  {[1 #spec]
-   ["$." /]})
+  [\\
+   ["." /]]
+  [\\spec
+   ["$." /]])
 
 (exception: dead)
 
diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux
index 4b9f8655a..0e5c61c8f 100644
--- a/stdlib/source/test/lux/world/file.lux
+++ b/stdlib/source/test/lux/world/file.lux
@@ -9,10 +9,10 @@
     ["." random]]]
   ["." / #_
    ["#." watch]]
-  {1
-   ["." /]}
-  {[1 #spec]
-   ["$." /]})
+  [\\
+   ["." /]]
+  [\\spec
+   ["$." /]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/lux/world/file/watch.lux b/stdlib/source/test/lux/world/file/watch.lux
index 57511136e..9b9937a25 100644
--- a/stdlib/source/test/lux/world/file/watch.lux
+++ b/stdlib/source/test/lux/world/file/watch.lux
@@ -17,9 +17,9 @@
      ["." list]]]
    [math
     ["." random (#+ Random) ("#\." monad)]]]
-  {1
+  [\\
    ["." /
-    ["/#" //]]}
+    ["/#" //]]]
   [////
    [data
     ["$." binary]]])
diff --git a/stdlib/source/test/lux/world/input/keyboard.lux b/stdlib/source/test/lux/world/input/keyboard.lux
index 1dde1aaa7..b58bff96f 100644
--- a/stdlib/source/test/lux/world/input/keyboard.lux
+++ b/stdlib/source/test/lux/world/input/keyboard.lux
@@ -15,8 +15,8 @@
     ["." random (#+ Random)]
     [number
      ["n" nat]]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (with_expansions [<groups> (as_is [keys/commands
                                    [/.back_space
diff --git a/stdlib/source/test/lux/world/net/http/client.lux b/stdlib/source/test/lux/world/net/http/client.lux
index 0ac51bad0..612d599ff 100644
--- a/stdlib/source/test/lux/world/net/http/client.lux
+++ b/stdlib/source/test/lux/world/net/http/client.lux
@@ -19,10 +19,10 @@
     ["." random (#+ Random)]
     [number
      ["." nat]]]]
-  {1
+  [\\
    ["." /
     ["/#" //
-     ["#." status]]]})
+     ["#." status]]]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/lux/world/net/http/status.lux b/stdlib/source/test/lux/world/net/http/status.lux
index 801dc1b43..84fbf4b2c 100644
--- a/stdlib/source/test/lux/world/net/http/status.lux
+++ b/stdlib/source/test/lux/world/net/http/status.lux
@@ -10,9 +10,9 @@
    [math
     [number
      ["n" nat]]]]
-  {1
+  [\\
    ["." /
-    ["/#" //]]})
+    ["/#" //]]])
 
 (with_expansions [<categories> (as_is [informational
                                        [/.continue
diff --git a/stdlib/source/test/lux/world/output/video/resolution.lux b/stdlib/source/test/lux/world/output/video/resolution.lux
index b7684ed2f..ebeec3a65 100644
--- a/stdlib/source/test/lux/world/output/video/resolution.lux
+++ b/stdlib/source/test/lux/world/output/video/resolution.lux
@@ -3,10 +3,9 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]
-      ["$." hash]]}]
+    [\spec
+     ["$." equivalence]
+     ["$." hash]]]
    [data
     ["." maybe]
     [collection
@@ -16,8 +15,8 @@
     ["." random (#+ Random)]
     [number
      ["n" nat]]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (with_expansions [<resolutions> (as_is /.svga
                                        /.wsvga
diff --git a/stdlib/source/test/lux/world/program.lux b/stdlib/source/test/lux/world/program.lux
index 91484bf50..d91d7fc62 100644
--- a/stdlib/source/test/lux/world/program.lux
+++ b/stdlib/source/test/lux/world/program.lux
@@ -10,12 +10,12 @@
     ["." text]]
    [math
     ["." random (#+ Random)]]]
-  {1
+  [\\
    ["." /
     [//
-     [file (#+ Path)]]]}
-  {[1 #spec]
-   ["$." /]})
+     [file (#+ Path)]]]]
+  [\\spec
+   ["$." /]])
 
 (def: environment
   (Random Environment)
diff --git a/stdlib/source/test/lux/world/shell.lux b/stdlib/source/test/lux/world/shell.lux
index 64fa47d28..4cbdb27ed 100644
--- a/stdlib/source/test/lux/world/shell.lux
+++ b/stdlib/source/test/lux/world/shell.lux
@@ -20,12 +20,12 @@
     [number
      ["n" nat]
      ["i" int]]]]
-  {1
+  [\\
    ["." /
     [//
-     [file (#+ Path)]]]}
-  {[1 #spec]
-   ["$." /]})
+     [file (#+ Path)]]]]
+  [\\spec
+   ["$." /]])
 
 (exception: dead)